diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/CommunicationsPreferences/Utils.php b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/CommunicationsPreferences/Utils.php
index 84eab41b2..0e119b8d1 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/CommunicationsPreferences/Utils.php
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/CommunicationsPreferences/Utils.php
@@ -520,12 +520,12 @@ public static function updateCommsPrefByFormValues($contactId, $submittedValues)
       ]);
 
       $existingPreferredMethod = $apiResult['preferred_communication_method'];
-      
+
         if( !is_array( $existingPreferredMethod ) ){
           // create an empty array to avoid error message
           $existingPreferredMethod = [];
         }
-      
+
       $existingPreferredMethod = array_fill_keys($existingPreferredMethod, 1);
     } catch (Exception $e) {
       CRM_Core_Error::debug_var('updateCommsPrefByFormValues', $e);
@@ -540,7 +540,7 @@ public static function updateCommsPrefByFormValues($contactId, $submittedValues)
       $name  = str_replace($containerPrefix, '', $key);
       if (!empty($submittedValues[$key])) {
         $channelValue = $submittedValues[$key];
-        $commPref = array_merge($commPref, $commPrefMapper[$name][$channelValue]);
+        $commPref = array_merge($commPref, ($commPrefMapper[$name][$channelValue] ?? []));
 
         if ($name == 'post') {
           $name = 'postal mail';
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Form/CommunicationsPreferences.php b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Form/CommunicationsPreferences.php
index 4eaf90904..7b0535289 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Form/CommunicationsPreferences.php
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Form/CommunicationsPreferences.php
@@ -312,7 +312,7 @@ public function setDefaultValues() {
       // If value is missing in the setting, take the corresponding value from the
       // group.
       foreach($map as $setting_key => $group_key) {
-        $item[$setting_key] = $item[$setting_key] ?? $grp['frontend_' . $group_key] ?? $grp[$group_key];
+        $item[$setting_key] = $item[$setting_key] ?? $grp['frontend_' . $group_key] ?? $grp[$group_key] ?? '';
       }
       // Set default weight.
       if (empty($item['group_weight'])) {
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Form/ContributionPage/TermsAndConditions.php b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Form/ContributionPage/TermsAndConditions.php
index 5f606cf8c..d1ef2524e 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Form/ContributionPage/TermsAndConditions.php
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Form/ContributionPage/TermsAndConditions.php
@@ -23,7 +23,7 @@ public function preProcess() {
     $this->_id = $this->id = $this->_entityId = CRM_Utils_Request::retrieve('id', 'Positive');
     $group_id = $this->getGroupId();
     if (method_exists('CRM_Custom_Form_CustomData', 'setGroupTree')) {
-      CRM_Custom_Form_CustomData::setGroupTree($this, '', $group_id, $this->_onlySubtype);
+      CRM_Custom_Form_CustomData::setGroupTree($this, '', $group_id);
     }
     else {
       // 4.6
@@ -37,7 +37,7 @@ public function preProcess() {
       $this->_groupTree = $formatted_tree;
     }
   }
-  
+
   /**
    * Get the Id of the custom group for terms and conditions.
    */
@@ -52,7 +52,7 @@ private function getGroupId() {
     }
     return $this->groupId;
   }
-  
+
   /**
    * Gets Custom field from the group tree by name.
    */
@@ -83,7 +83,7 @@ private function getFieldByName($field_name) {
     }
     return $fields[$field_name] ? $fields[$field_name] : [];
   }
-  
+
   /**
    * Fetches a Custom Field definition from the API.
    */
@@ -153,10 +153,10 @@ public function buildQuickForm() {
         'Terms & Conditions File'
       );
       $tc_current = [
-        'url' => $tc_field['element_value'],
-        'label' => basename($tc_field['element_value']),
+        'url' => $tc_field['element_value'] ?? '',
+        'label' => basename($tc_field['element_value'] ?? ''),
       ];
-      $tc_value = $tc_field['element_value'];
+      $tc_value = $tc_field['element_value'] ?? '';
       // Provide some variables so the template can display the upload field in
       // place of the link field.
       $this->assign('terms_conditions_link_element_name', $tc_field['element_name']);
@@ -184,7 +184,7 @@ private function versionIs($version) {
   }
   public function postProcess() {
     $this->saveValues();
-    
+
     // Calling parent::endPostProcess() will not direct to the right url since
     // this form is not included in the ContributionPage State Machine.
     CRM_Core_Session::setStatus(E::ts("Terms & Conditions information has been saved."), E::ts('Saved'), 'success');
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Form/ManageEvent/TermsAndConditions.php b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Form/ManageEvent/TermsAndConditions.php
index 12336111c..e77c26ae5 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Form/ManageEvent/TermsAndConditions.php
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Form/ManageEvent/TermsAndConditions.php
@@ -158,10 +158,10 @@ public function buildQuickForm() {
         'Terms & Conditions File'
       );
       $tc_current = [
-        'url' => $tc_field['element_value'],
-        'label' => basename($tc_field['element_value']),
+        'url' => $tc_field['element_value'] ?? '',
+        'label' => basename($tc_field['element_value'] ?? ''),
       ];
-      $tc_value = $tc_field['element_value'];
+      $tc_value = $tc_field['element_value'] ?? '';
       // Provide some variables so the template can display the upload field in
       // place of the link field.
       $this->assign('terms_conditions_link_element_name', $tc_field['element_name']);
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Hook.php b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Hook.php
index 1374b209f..6ee17d9c7 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Hook.php
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Hook.php
@@ -41,7 +41,7 @@ class CRM_Gdpr_Hook {
    */
   static function alterAnonymizeContactParams(&$params) {
     return CRM_Utils_Hook::singleton()
-      ->invoke(1, $params, CRM_Utils_Hook::$_nullObject, CRM_Utils_Hook::$_nullObject, CRM_Utils_Hook::$_nullObject,
+      ->invoke(['params'], $params, CRM_Utils_Hook::$_nullObject, CRM_Utils_Hook::$_nullObject, CRM_Utils_Hook::$_nullObject,
         CRM_Utils_Hook::$_nullObject, CRM_Utils_Hook::$_nullObject, 'civicrm_gdpr_alterAnonymizeContactParams');
   }
 
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/SLA/Entity.php b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/SLA/Entity.php
index 5d4af3fd7..121223f7c 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/SLA/Entity.php
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/SLA/Entity.php
@@ -190,16 +190,16 @@ public function addField($form) {
               break;
           }
         }
-
-        $text = $settings['entity_tc_checkbox_text'];
-        if (!empty($links['entity'])) {
-          $form->add('checkbox', 'accept_entity_tc', $text, [], TRUE);
-        }
       }
     }
 
+    if (!empty($links['entity'])) {
+      $text = $settings['entity_tc_checkbox_text'];
+      $form->add('checkbox', 'accept_entity_tc', $text, NULL, TRUE);
+    }
+
     if (!empty($links['global'])) {
-      $form->add('checkbox', 'accept_tc', CRM_Gdpr_SLA_Utils::getCheckboxText(), [], TRUE);
+      $form->add('checkbox', 'accept_tc', CRM_Gdpr_SLA_Utils::getCheckboxText(), NULL, TRUE);
     }
     if (!empty($links)) {
       $tc_vars = [
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Upgrader.php b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Upgrader.php
index d3863c740..14e7a9e73 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Upgrader.php
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Upgrader.php
@@ -4,7 +4,7 @@
 /**
  * Collection of upgrade steps.
  */
-class CRM_Gdpr_Upgrader extends CRM_Gdpr_Upgrader_Base {
+class CRM_Gdpr_Upgrader extends CRM_Extension_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).
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Upgrader/Base.php b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Upgrader/Base.php
deleted file mode 100644
index 457bb2751..000000000
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Upgrader/Base.php
+++ /dev/null
@@ -1,396 +0,0 @@
-<?php
-
-// AUTO-GENERATED FILE -- Civix may overwrite any changes made to this file
-use CRM_Gdpr_ExtensionUtil as E;
-
-/**
- * Base class which provides helpers to execute upgrade logic
- */
-class CRM_Gdpr_Upgrader_Base {
-
-  /**
-   * @var CRM_Gdpr_Upgrader_Base
-   */
-  public 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
-   *   sorted numerically
-   */
-  private $revisions;
-
-  /**
-   * @var bool
-   *   Flag to clean up extension revision data in civicrm_setting
-   */
-  private $revisionStorageIsDeprecated = FALSE;
-
-  /**
-   * Obtain a reference to the active upgrade handler.
-   */
-  public static function instance() {
-    if (!self::$instance) {
-      self::$instance = new CRM_Gdpr_Upgrader(
-        'uk.co.vedaconsulting.gdpr',
-        E::path()
-      );
-    }
-    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.
-   *
-   * ```
-   * CRM_Gdpr_Upgrader_Base::_queueAdapter($ctx, 'methodName', 'arg1', 'arg2');
-   * ```
-   */
-  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([$instance, $method], $args);
-  }
-
-  /**
-   * CRM_Gdpr_Upgrader_Base constructor.
-   *
-   * @param $extensionName
-   * @param $extensionDir
-   */
-  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 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;
-  }
-
-  /**
-   * 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.
-    $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 syntactic sugar for queueing several tasks that
-   * run different queries
-   *
-   * @return bool
-   */
-  public function executeSql($query, $params = []) {
-    // FIXME verify that we raise an exception on error
-    CRM_Core_DAO::executeQuery($query, $params);
-    return TRUE;
-  }
-
-  /**
-   * 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.
-   *
-   * 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(
-      [get_class($this), '_queueAdapter'],
-      $args,
-      $title
-    );
-    return $this->queue->createItem($task, ['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.
-   *
-   * @param CRM_Queue_Queue $queue
-   */
-  public function enqueuePendingRevisions(CRM_Queue_Queue $queue) {
-    $this->queue = $queue;
-
-    $currentRevision = $this->getCurrentRevision();
-    foreach ($this->getRevisions() as $revision) {
-      if ($revision > $currentRevision) {
-        $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(
-          [get_class($this), '_queueAdapter'],
-          ['upgrade_' . $revision],
-          $title
-        );
-        $this->queue->createItem($task);
-
-        $task = new CRM_Queue_Task(
-          [get_class($this), '_queueAdapter'],
-          ['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 = [];
-
-      $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 = \Civi::settings()->get($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([$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([$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([$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([$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([$this, 'disable'])) {
-      $this->disable();
-    }
-  }
-
-  public function onUpgrade($op, CRM_Queue_Queue $queue = NULL) {
-    switch ($op) {
-      case 'check':
-        return [$this->hasPendingRevisions()];
-
-      case 'enqueue':
-        return $this->enqueuePendingRevisions($queue);
-
-      default:
-    }
-  }
-
-}
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Utils.php b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Utils.php
index a37ab56a4..4867403d4 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Utils.php
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/CRM/Gdpr/Utils.php
@@ -781,7 +781,6 @@ public static function setItem($value, $group, $name) {
     } else {
       CRM_Core_BAO_Setting::setItem($value, $group, $name);
     }
-    return $settingValue;
   }
 
 }//End Class
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/composer.json b/www/civi-extensions/uk.co.vedaconsulting.gdpr/composer.json
new file mode 100644
index 000000000..780089939
--- /dev/null
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/composer.json
@@ -0,0 +1,5 @@
+{
+    "name": "civicrm/gdpr",
+    "type": "civicrm-ext",
+    "description": "General Data Protection Regulation"
+}
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/docs/hooks.md b/www/civi-extensions/uk.co.vedaconsulting.gdpr/docs/hooks.md
new file mode 100644
index 000000000..c0061e085
--- /dev/null
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/docs/hooks.md
@@ -0,0 +1,10 @@
+# Hooks
+
+The following hooks are made available...
+
+* `hook_civicrm_gdpr_alterAnonymizeContactParams( &$params )`
+
+  This hook allows to alter contact parameters when anonymizing contact.
+
+  `$params` - Parameters for the anonymous contact.
+
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/gdpr.civix.php b/www/civi-extensions/uk.co.vedaconsulting.gdpr/gdpr.civix.php
index 24ee691f4..778662807 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/gdpr.civix.php
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/gdpr.civix.php
@@ -24,7 +24,7 @@ class CRM_Gdpr_ExtensionUtil {
    *   Translated text.
    * @see ts
    */
-  public static function ts($text, $params = []) {
+  public static function ts($text, $params = []): string {
     if (!array_key_exists('domain', $params)) {
       $params['domain'] = [self::LONG_NAME, NULL];
     }
@@ -41,7 +41,7 @@ public static function ts($text, $params = []) {
    *   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) {
+  public static function url($file = NULL): string {
     if ($file === NULL) {
       return rtrim(CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME), '/');
     }
@@ -79,45 +79,29 @@ public static function findClass($suffix) {
 
 use CRM_Gdpr_ExtensionUtil as E;
 
+function _gdpr_civix_mixin_polyfill() {
+  if (!class_exists('CRM_Extension_MixInfo')) {
+    $polyfill = __DIR__ . '/mixin/polyfill.php';
+    (require $polyfill)(E::LONG_NAME, E::SHORT_NAME, E::path());
+  }
+}
+
 /**
  * (Delegated) Implements hook_civicrm_config().
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
  */
-function _gdpr_civix_civicrm_config(&$config = NULL) {
+function _gdpr_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];
-  }
-
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $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 _gdpr_civix_civicrm_xmlMenu(&$files) {
-  foreach (_gdpr_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
-    $files[] = $file;
-  }
+  _gdpr_civix_mixin_polyfill();
 }
 
 /**
@@ -127,35 +111,7 @@ function _gdpr_civix_civicrm_xmlMenu(&$files) {
  */
 function _gdpr_civix_civicrm_install() {
   _gdpr_civix_civicrm_config();
-  if ($upgrader = _gdpr_civix_upgrader()) {
-    $upgrader->onInstall();
-  }
-}
-
-/**
- * Implements hook_civicrm_postInstall().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
- */
-function _gdpr_civix_civicrm_postInstall() {
-  _gdpr_civix_civicrm_config();
-  if ($upgrader = _gdpr_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 _gdpr_civix_civicrm_uninstall() {
-  _gdpr_civix_civicrm_config();
-  if ($upgrader = _gdpr_civix_upgrader()) {
-    $upgrader->onUninstall();
-  }
+  _gdpr_civix_mixin_polyfill();
 }
 
 /**
@@ -163,212 +119,9 @@ function _gdpr_civix_civicrm_uninstall() {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
  */
-function _gdpr_civix_civicrm_enable() {
-  _gdpr_civix_civicrm_config();
-  if ($upgrader = _gdpr_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 _gdpr_civix_civicrm_disable() {
+function _gdpr_civix_civicrm_enable(): void {
   _gdpr_civix_civicrm_config();
-  if ($upgrader = _gdpr_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 _gdpr_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
-  if ($upgrader = _gdpr_civix_upgrader()) {
-    return $upgrader->onUpgrade($op, $queue);
-  }
-}
-
-/**
- * @return CRM_Gdpr_Upgrader
- */
-function _gdpr_civix_upgrader() {
-  if (!file_exists(__DIR__ . '/CRM/Gdpr/Upgrader.php')) {
-    return NULL;
-  }
-  else {
-    return CRM_Gdpr_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 _gdpr_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 (_gdpr_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 _gdpr_civix_civicrm_managed(&$entities) {
-  $mgdFiles = _gdpr_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 _gdpr_civix_civicrm_caseTypes(&$caseTypes) {
-  if (!is_dir(__DIR__ . '/xml/case')) {
-    return;
-  }
-
-  foreach (_gdpr_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 _gdpr_civix_civicrm_angularModules(&$angularModules) {
-  if (!is_dir(__DIR__ . '/ang')) {
-    return;
-  }
-
-  $files = _gdpr_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 _gdpr_civix_civicrm_themes(&$themes) {
-  $files = _gdpr_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 _gdpr_civix_glob($pattern) {
-  $result = glob($pattern);
-  return is_array($result) ? $result : [];
+  _gdpr_civix_mixin_polyfill();
 }
 
 /**
@@ -387,8 +140,8 @@ function _gdpr_civix_insert_navigation_menu(&$menu, $path, $item) {
   if (empty($path)) {
     $menu[] = [
       'attributes' => array_merge([
-        'label'      => CRM_Utils_Array::value('name', $item),
-        'active'     => 1,
+        'label' => $item['name'] ?? NULL,
+        'active' => 1,
       ], $item),
     ];
     return TRUE;
@@ -452,26 +205,3 @@ function _gdpr_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) {
     }
   }
 }
-
-/**
- * (Delegated) Implements hook_civicrm_alterSettingsFolders().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
- */
-function _gdpr_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 _gdpr_civix_civicrm_entityTypes(&$entityTypes) {
-  $entityTypes = array_merge($entityTypes, []);
-}
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/gdpr.php b/www/civi-extensions/uk.co.vedaconsulting.gdpr/gdpr.php
index 518ffe701..5f8f1d8df 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/gdpr.php
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/gdpr.php
@@ -12,16 +12,6 @@ function gdpr_civicrm_config(&$config) {
   _gdpr_civix_civicrm_config($config);
 }
 
-
-/**
- * Implements hook_civicrm_xmlMenu().
- *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu
- */
-function gdpr_civicrm_xmlMenu(&$files) {
-  _gdpr_civix_civicrm_xmlMenu($files);
-}
-
 /**
  * Implements hook_civicrm_install().
  *
@@ -46,15 +36,6 @@ function gdpr_civicrm_install() {
   _gdpr_civix_civicrm_install();
 }
 
-/**
- * Implements hook_civicrm_postInstall().
- *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_postInstall
- */
-function gdpr_civicrm_postInstall() {
-  _gdpr_civix_civicrm_postInstall();
-}
-
 /**
  * Implements hook_civicrm_uninstall().
  *
@@ -77,7 +58,6 @@ function gdpr_civicrm_uninstall() {
       ]);
     }
   }
-  _gdpr_civix_civicrm_uninstall();
 }
 
 /**
@@ -89,73 +69,6 @@ function gdpr_civicrm_enable() {
   _gdpr_civix_civicrm_enable();
 }
 
-/**
- * Implements hook_civicrm_disable().
- *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
- */
-function gdpr_civicrm_disable() {
-  _gdpr_civix_civicrm_disable();
-}
-
-/**
- * Implements hook_civicrm_upgrade().
- *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_upgrade
- */
-function gdpr_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
-  return _gdpr_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 gdpr_civicrm_managed(&$entities) {
-  _gdpr_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 gdpr_civicrm_caseTypes(&$caseTypes) {
-  _gdpr_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 gdpr_civicrm_angularModules(&$angularModules) {
-  _gdpr_civix_civicrm_angularModules($angularModules);
-}
-
-/**
- * Implements hook_civicrm_alterSettingsFolders().
- *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
- */
-function gdpr_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
-  _gdpr_civix_civicrm_alterSettingsFolders($metaDataFolders);
-}
-
-
 /**
  * Implementation of hook_civicrm_alterContent
  *
@@ -334,7 +247,6 @@ function gdpr_civicrm_postProcess($formName, $form) {
   }
 }
 
-
 /**
  * Implements hook_civicrm_post().
  */
@@ -372,7 +284,6 @@ function gdpr_civicrm_tabset($tabsetName, &$tabs, $context) {
   }
 }
 
-
 /**
  * Implements hook_civicrm_export().
  */
@@ -578,16 +489,16 @@ function gdpr_civicrm_permission(&$permissions) {
   $prefix = E::ts('CiviGDPR') . ': ';
   $permissions += [
     'access GDPR' => [
-      $prefix . E::ts('access GDPR'),
-      E::ts('View GDPR related information'),
+      'label' => $prefix . E::ts('access GDPR'),
+      'description' => E::ts('View GDPR related information'),
     ],
     'forget contact' => [
-      $prefix . E::ts('forget contact'),
-      E::ts('Anonymize contacts'),
+      'label' => $prefix . E::ts('forget contact'),
+      'description' => E::ts('Anonymize contacts'),
     ],
     'administer GDPR' => [
-      $prefix . E::ts('administer GDPR'),
-      E::ts('Manage GDPR settings'),
+      'label' => $prefix . E::ts('administer GDPR'),
+      'description' => E::ts('Manage GDPR settings'),
     ],
   ];
 }
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/info.xml b/www/civi-extensions/uk.co.vedaconsulting.gdpr/info.xml
index c713c351a..1e9c27526 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/info.xml
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/info.xml
@@ -9,18 +9,29 @@
     <email>support@vedaconsulting.co.uk</email>
   </maintainer>
   <urls>
-    <url desc="Main Extension Page">https://github.com/veda-consulting/uk.co.vedaconsulting.gdpr</url>
+    <url desc="Main Extension Page">https://lab.civicrm.org/extensions/gdpr</url>
     <url desc="Documentation">https://docs.civicrm.org/gdpr/en/latest/</url>
     <url desc="Support">https://vedaconsulting.co.uk</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2021-10-24</releaseDate>
-  <version>3.5</version>
+  <releaseDate>2024-04-18</releaseDate>
+  <version>3.6</version>
   <develStage>stable</develStage>
   <compatibility>
-    <ver>5.22</ver>
+    <ver>5.69</ver>
   </compatibility>
   <civix>
     <namespace>CRM/Gdpr</namespace>
+    <format>23.02.1</format>
   </civix>
+  <mixins>
+    <mixin>menu-xml@1.0.0</mixin>
+    <mixin>mgd-php@1.0.0</mixin>
+    <mixin>smarty-v2@1.0.1</mixin>
+  </mixins>
+  <classloader>
+    <psr0 prefix="CRM_" path="."/>
+    <psr4 prefix="Civi\" path="Civi"/>
+  </classloader>
+  <upgrader>CRM_Gdpr_Upgrader</upgrader>
 </extension>
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/mixin/menu-xml@1.0.0.mixin.php b/www/civi-extensions/uk.co.vedaconsulting.gdpr/mixin/menu-xml@1.0.0.mixin.php
new file mode 100644
index 000000000..4c0b2276c
--- /dev/null
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/mixin/menu-xml@1.0.0.mixin.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Auto-register "xml/Menu/*.xml" files.
+ *
+ * @mixinName menu-xml
+ * @mixinVersion 1.0.0
+ *
+ * @param CRM_Extension_MixInfo $mixInfo
+ *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.
+ * @param \CRM_Extension_BootCache $bootCache
+ *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.
+ */
+return function ($mixInfo, $bootCache) {
+
+  /**
+   * @param \Civi\Core\Event\GenericHookEvent $e
+   * @see CRM_Utils_Hook::xmlMenu()
+   */
+  Civi::dispatcher()->addListener('hook_civicrm_xmlMenu', function ($e) use ($mixInfo) {
+    if (!$mixInfo->isActive()) {
+      return;
+    }
+
+    $files = (array) glob($mixInfo->getPath('xml/Menu/*.xml'));
+    foreach ($files as $file) {
+      $e->files[] = $file;
+    }
+  });
+
+};
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/mixin/mgd-php@1.0.0.mixin.php b/www/civi-extensions/uk.co.vedaconsulting.gdpr/mixin/mgd-php@1.0.0.mixin.php
new file mode 100644
index 000000000..39d45b14a
--- /dev/null
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/mixin/mgd-php@1.0.0.mixin.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Auto-register "**.mgd.php" files.
+ *
+ * @mixinName mgd-php
+ * @mixinVersion 1.0.0
+ *
+ * @param CRM_Extension_MixInfo $mixInfo
+ *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.
+ * @param \CRM_Extension_BootCache $bootCache
+ *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.
+ */
+return function ($mixInfo, $bootCache) {
+
+  /**
+   * @param \Civi\Core\Event\GenericHookEvent $e
+   * @see CRM_Utils_Hook::managed()
+   */
+  Civi::dispatcher()->addListener('hook_civicrm_managed', function ($event) use ($mixInfo) {
+    // When deactivating on a polyfill/pre-mixin system, listeners may not cleanup automatically.
+    if (!$mixInfo->isActive()) {
+      return;
+    }
+
+    $mgdFiles = CRM_Utils_File::findFiles($mixInfo->getPath(), '*.mgd.php');
+    sort($mgdFiles);
+    foreach ($mgdFiles as $file) {
+      $es = include $file;
+      foreach ($es as $e) {
+        if (empty($e['module'])) {
+          $e['module'] = $mixInfo->longName;
+        }
+        if (empty($e['params']['version'])) {
+          $e['params']['version'] = '3';
+        }
+        $event->entities[] = $e;
+      }
+    }
+  });
+
+};
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/mixin/polyfill.php b/www/civi-extensions/uk.co.vedaconsulting.gdpr/mixin/polyfill.php
new file mode 100644
index 000000000..17ba1df3b
--- /dev/null
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/mixin/polyfill.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * When deploying on systems that lack mixin support, fake it.
+ *
+ * @mixinFile polyfill.php
+ *
+ * This polyfill does some (persnickity) deduplication, but it doesn't allow upgrades or shipping replacements in core.
+ *
+ * Note: The polyfill.php is designed to be copied into extensions for interoperability. Consequently, this file is
+ * not used 'live' by `civicrm-core`. However, the file does need a canonical home, and it's convenient to keep it
+ * adjacent to the actual mixin files.
+ *
+ * @param string $longName
+ * @param string $shortName
+ * @param string $basePath
+ */
+return function ($longName, $shortName, $basePath) {
+  // Construct imitations of the mixin services. These cannot work as well (e.g. with respect to
+  // number of file-reads, deduping, upgrading)... but they should be OK for a few months while
+  // the mixin services become available.
+
+  // List of active mixins; deduped by version
+  $mixinVers = [];
+  foreach ((array) glob($basePath . '/mixin/*.mixin.php') as $f) {
+    [$name, $ver] = explode('@', substr(basename($f), 0, -10));
+    if (!isset($mixinVers[$name]) || version_compare($ver, $mixinVers[$name], '>')) {
+      $mixinVers[$name] = $ver;
+    }
+  }
+  $mixins = [];
+  foreach ($mixinVers as $name => $ver) {
+    $mixins[] = "$name@$ver";
+  }
+
+  // Imitate CRM_Extension_MixInfo.
+  $mixInfo = new class() {
+
+    /**
+     * @var string
+     */
+    public $longName;
+
+    /**
+     * @var string
+     */
+    public $shortName;
+
+    public $_basePath;
+
+    public function getPath($file = NULL) {
+      return $this->_basePath . ($file === NULL ? '' : (DIRECTORY_SEPARATOR . $file));
+    }
+
+    public function isActive() {
+      return \CRM_Extension_System::singleton()->getMapper()->isActiveModule($this->shortName);
+    }
+
+  };
+  $mixInfo->longName = $longName;
+  $mixInfo->shortName = $shortName;
+  $mixInfo->_basePath = $basePath;
+
+  // Imitate CRM_Extension_BootCache.
+  $bootCache = new class() {
+
+    public function define($name, $callback) {
+      $envId = \CRM_Core_Config_Runtime::getId();
+      $oldExtCachePath = \Civi::paths()->getPath("[civicrm.compile]/CachedExtLoader.{$envId}.php");
+      $stat = stat($oldExtCachePath);
+      $file = Civi::paths()->getPath('[civicrm.compile]/CachedMixin.' . md5($name . ($stat['mtime'] ?? 0)) . '.php');
+      if (file_exists($file)) {
+        return include $file;
+      }
+      else {
+        $data = $callback();
+        file_put_contents($file, '<' . "?php\nreturn " . var_export($data, 1) . ';');
+        return $data;
+      }
+    }
+
+  };
+
+  // Imitate CRM_Extension_MixinLoader::run()
+  // Parse all live mixins before trying to scan any classes.
+  global $_CIVIX_MIXIN_POLYFILL;
+  foreach ($mixins as $mixin) {
+    // If the exact same mixin is defined by multiple exts, just use the first one.
+    if (!isset($_CIVIX_MIXIN_POLYFILL[$mixin])) {
+      $_CIVIX_MIXIN_POLYFILL[$mixin] = include_once $basePath . '/mixin/' . $mixin . '.mixin.php';
+    }
+  }
+  foreach ($mixins as $mixin) {
+    // If there's trickery about installs/uninstalls/resets, then we may need to register a second time.
+    if (!isset(\Civi::$statics[$longName][$mixin])) {
+      \Civi::$statics[$longName][$mixin] = 1;
+      $func = $_CIVIX_MIXIN_POLYFILL[$mixin];
+      $func($mixInfo, $bootCache);
+    }
+  }
+};
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/mixin/smarty-v2@1.0.1.mixin.php b/www/civi-extensions/uk.co.vedaconsulting.gdpr/mixin/smarty-v2@1.0.1.mixin.php
new file mode 100644
index 000000000..5972dbdc5
--- /dev/null
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/mixin/smarty-v2@1.0.1.mixin.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Auto-register "templates/" folder.
+ *
+ * @mixinName smarty-v2
+ * @mixinVersion 1.0.1
+ * @since 5.59
+ *
+ * @param CRM_Extension_MixInfo $mixInfo
+ *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.
+ * @param \CRM_Extension_BootCache $bootCache
+ *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.
+ */
+return function ($mixInfo, $bootCache) {
+  $dir = $mixInfo->getPath('templates');
+  if (!file_exists($dir)) {
+    return;
+  }
+
+  $register = function() use ($dir) {
+    // This implementation has a theoretical edge-case bug on older versions of CiviCRM where a template could
+    // be registered more than once.
+    CRM_Core_Smarty::singleton()->addTemplateDir($dir);
+  };
+
+  // Let's figure out what environment we're in -- so that we know the best way to call $register().
+
+  if (!empty($GLOBALS['_CIVIX_MIXIN_POLYFILL'])) {
+    // Polyfill Loader (v<=5.45): We're already in the middle of firing `hook_config`.
+    if ($mixInfo->isActive()) {
+      $register();
+    }
+    return;
+  }
+
+  if (CRM_Extension_System::singleton()->getManager()->extensionIsBeingInstalledOrEnabled($mixInfo->longName)) {
+    // New Install, Standard Loader: The extension has just been enabled, and we're now setting it up.
+    // System has already booted. New templates may be needed for upcoming installation steps.
+    $register();
+    return;
+  }
+
+  // Typical Pageview, Standard Loader: Defer the actual registration for a moment -- to ensure that Smarty is online.
+  \Civi::dispatcher()->addListener('hook_civicrm_config', function() use ($mixInfo, $register) {
+    if ($mixInfo->isActive()) {
+      $register();
+    }
+  });
+
+};
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/package-lock.json b/www/civi-extensions/uk.co.vedaconsulting.gdpr/package-lock.json
index 198c279af..2a26fc6dc 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/package-lock.json
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/package-lock.json
@@ -15,10 +15,10 @@
         "husky": "^6.0.0",
         "lint-staged": "^11.0.0",
         "sass": "^1.35.1",
-        "stylelint": "^13.13.1",
-        "stylelint-config-sass-guidelines": "^8.0.0",
-        "stylelint-order": "^4.1.0",
-        "stylelint-scss": "^3.19.0"
+        "stylelint": "^15.10.3",
+        "stylelint-config-sass-guidelines": "^10.0.0",
+        "stylelint-order": "^6.0.3",
+        "stylelint-scss": "^5.2.1"
       },
       "engines": {
         "node": ">=12",
@@ -37,227 +37,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/compat-data": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz",
-      "integrity": "sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz",
-      "integrity": "sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.14.5",
-        "@babel/helper-compilation-targets": "^7.14.5",
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helpers": "^7.14.6",
-        "@babel/parser": "^7.14.6",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/core/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz",
-      "integrity": "sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.14.5",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/generator/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz",
-      "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
-      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
-      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
-      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz",
-      "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
-      "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz",
-      "integrity": "sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-simple-access": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
-      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz",
-      "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz",
-      "integrity": "sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
-      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-validator-identifier": {
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz",
@@ -267,29 +46,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz",
-      "integrity": "sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/highlight": {
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
@@ -366,63 +122,90 @@
         "node": ">=4"
       }
     },
-    "node_modules/@babel/parser": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz",
-      "integrity": "sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==",
+    "node_modules/@csstools/css-parser-algorithms": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.2.tgz",
+      "integrity": "sha512-sLYGdAdEY2x7TSw9FtmdaTrh2wFtRJO5VMbBrA8tEqEod7GEggFmxTSK9XqExib3yMuYNcvcTdCZIP6ukdjAIA==",
       "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
       "engines": {
-        "node": ">=6.0.0"
+        "node": "^14 || ^16 || >=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-tokenizer": "^2.2.1"
       }
     },
-    "node_modules/@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+    "node_modules/@csstools/css-tokenizer": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.2.1.tgz",
+      "integrity": "sha512-Zmsf2f/CaEPWEVgw29odOj+WEVoiJy9s9NOv5GgNY9mZ1CZ7394By6wONrONrTsnNDv6F9hR02nvFihrGVGHBg==",
       "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^14 || ^16 || >=18"
       }
     },
-    "node_modules/@babel/traverse": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.7.tgz",
-      "integrity": "sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==",
+    "node_modules/@csstools/media-query-list-parser": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.5.tgz",
+      "integrity": "sha512-IxVBdYzR8pYe89JiyXQuYk4aVVoCPhMJkz6ElRwlVysjwURTsTk/bmY/z4FfeRE+CRBMlykPwXEVUg8lThv7AQ==",
       "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/parser": "^7.14.7",
-        "@babel/types": "^7.14.5",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^14 || ^16 || >=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^2.3.2",
+        "@csstools/css-tokenizer": "^2.2.1"
       }
     },
-    "node_modules/@babel/types": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz",
-      "integrity": "sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==",
+    "node_modules/@csstools/selector-specificity": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.0.tgz",
+      "integrity": "sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "to-fast-properties": "^2.0.0"
-      },
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^14 || ^16 || >=18"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.0.13"
       }
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -448,9 +231,9 @@
       }
     },
     "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
-      "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
@@ -460,52 +243,16 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@stylelint/postcss-css-in-js": {
-      "version": "0.37.2",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz",
-      "integrity": "sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": ">=7.9.0"
-      },
-      "peerDependencies": {
-        "postcss": ">=7.0.0",
-        "postcss-syntax": ">=0.36.2"
-      }
-    },
-    "node_modules/@stylelint/postcss-markdown": {
-      "version": "0.36.2",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz",
-      "integrity": "sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==",
-      "dev": true,
-      "dependencies": {
-        "remark": "^13.0.0",
-        "unist-util-find-all-after": "^3.0.2"
-      },
-      "peerDependencies": {
-        "postcss": ">=7.0.0",
-        "postcss-syntax": ">=0.36.2"
-      }
-    },
-    "node_modules/@types/mdast": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz",
-      "integrity": "sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "*"
-      }
-    },
     "node_modules/@types/minimist": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
-      "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.3.tgz",
+      "integrity": "sha512-ZYFzrvyWUNhaPomn80dsMNgMeXxNWZBdkuG/hWlUvXvbdUH8ZERNBGXnU87McuGcWDsyzX2aChCv/SVN348k3A==",
       "dev": true
     },
     "node_modules/@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
+      "integrity": "sha512-lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A==",
       "dev": true
     },
     "node_modules/@types/parse-json": {
@@ -514,12 +261,6 @@
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
       "dev": true
     },
-    "node_modules/@types/unist": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
-      "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==",
-      "dev": true
-    },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
@@ -534,9 +275,9 @@
       }
     },
     "node_modules/ajv": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-      "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -589,9 +330,9 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -661,6 +402,12 @@
       "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
       "dev": true
     },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
     "node_modules/arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -808,7 +555,7 @@
     "node_modules/arrify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -877,28 +624,6 @@
         "node": ">= 4.5.0"
       }
     },
-    "node_modules/autoprefixer": {
-      "version": "9.8.6",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
-      "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.12.0",
-        "caniuse-lite": "^1.0.30001109",
-        "colorette": "^1.2.1",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.32",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "bin": {
-        "autoprefixer": "bin/autoprefixer"
-      },
-      "funding": {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-      }
-    },
     "node_modules/bach": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
@@ -919,16 +644,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/bail": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
-      "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/balanced-match": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
@@ -1021,29 +736,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/browserslist": {
-      "version": "4.16.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
-      "dev": true,
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001219",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.723",
-        "escalade": "^3.1.1",
-        "node-releases": "^1.1.71"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
-    },
     "node_modules/buffer-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
@@ -1102,39 +794,45 @@
       }
     },
     "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/camelcase-keys": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz",
+      "integrity": "sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==",
       "dev": true,
       "dependencies": {
-        "camelcase": "^5.3.1",
-        "map-obj": "^4.0.0",
-        "quick-lru": "^4.0.1"
+        "camelcase": "^6.3.0",
+        "map-obj": "^4.1.0",
+        "quick-lru": "^5.1.1",
+        "type-fest": "^1.2.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001239",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz",
-      "integrity": "sha512-cyBkXJDMeI4wthy8xJ2FvDU6+0dtcZSJW3voUF8+e9f1bBeuvyZfc3PNbkOETyhbR+dGCPzn9E7MA3iwzusOhQ==",
+    "node_modules/camelcase-keys/node_modules/type-fest": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
       "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/chalk": {
@@ -1153,36 +851,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/character-entities": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/character-entities-legacy": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/character-reference-invalid": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/child-process-promise": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz",
@@ -1468,27 +1136,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/clone-regexp": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
-      "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
-      "dev": true,
-      "dependencies": {
-        "is-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone-regexp/node_modules/is-regexp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/clone-stats": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
@@ -1569,6 +1216,12 @@
         "color-support": "bin.js"
       }
     },
+    "node_modules/colord": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+      "dev": true
+    },
     "node_modules/colorette": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
@@ -1671,6 +1324,28 @@
         "which": "^1.2.9"
       }
     },
+    "node_modules/css-functions-list": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.0.tgz",
+      "integrity": "sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      }
+    },
+    "node_modules/css-tree": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.30",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+      }
+    },
     "node_modules/cssesc": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
@@ -1694,9 +1369,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -1720,9 +1395,9 @@
       }
     },
     "node_modules/decamelize-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
+      "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
       "dev": true,
       "dependencies": {
         "decamelize": "^1.1.0",
@@ -1730,12 +1405,15 @@
       },
       "engines": {
         "node": ">=0.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/decamelize-keys/node_modules/map-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -1823,62 +1501,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/dom-serializer/node_modules/domelementtype": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/dom-serializer/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
-    "node_modules/domhandler": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
     "node_modules/duplexify": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
@@ -1913,12 +1535,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/electron-to-chromium": {
-      "version": "1.3.758",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.758.tgz",
-      "integrity": "sha512-StYtiDbgZdjcck3OLwsVVVif7QDuD5m5v2gF+XpETp5lHa7X0y3129YBlYaHRPyj1fep1oAaC6i//gAdp+rhbw==",
-      "dev": true
-    },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -1955,12 +1571,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
-    },
     "node_modules/error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -2014,15 +1624,6 @@
         "es6-symbol": "^3.1.1"
       }
     },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -2084,18 +1685,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/execall": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
-      "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
-      "dev": true,
-      "dependencies": {
-        "clone-regexp": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -2307,20 +1896,19 @@
       "dev": true
     },
     "node_modules/fast-glob": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
-      "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
+        "micromatch": "^4.0.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.6.0"
       }
     },
     "node_modules/fast-glob/node_modules/braces": {
@@ -2369,13 +1957,13 @@
       }
     },
     "node_modules/fast-glob/node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
       "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       },
       "engines": {
         "node": ">=8.6"
@@ -2400,15 +1988,18 @@
       "dev": true
     },
     "node_modules/fastest-levenshtein": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
-      "dev": true
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.9.1"
+      }
     },
     "node_modules/fastq": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -2449,16 +2040,19 @@
       }
     },
     "node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^5.0.0",
+        "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/findup-sync": {
@@ -2629,15 +2223,6 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/get-caller-file": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
@@ -2664,18 +2249,6 @@
       "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
       "dev": true
     },
-    "node_modules/get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/get-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@@ -2808,26 +2381,17 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/globby": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -2855,21 +2419,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/gonzales-pe": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
-      "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "gonzales": "bin/gonzales.js"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
     "node_modules/graceful-fs": {
       "version": "4.2.6",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
@@ -3077,9 +2626,9 @@
       }
     },
     "node_modules/hosted-git-info": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-      "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -3107,40 +2656,15 @@
       "dev": true
     },
     "node_modules/html-tags": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
-      "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
+      "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
-      }
-    },
-    "node_modules/htmlparser2": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
-      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^1.3.1",
-        "domhandler": "^2.3.0",
-        "domutils": "^1.5.1",
-        "entities": "^1.1.1",
-        "inherits": "^2.0.1",
-        "readable-stream": "^3.1.1"
-      }
-    },
-    "node_modules/htmlparser2/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
       },
-      "engines": {
-        "node": ">= 6"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/human-signals": {
@@ -3165,9 +2689,9 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -3201,7 +2725,7 @@
     "node_modules/imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
       "engines": {
         "node": ">=0.8.19"
@@ -3290,30 +2814,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-alphabetical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/is-alphanumerical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
-      "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
-      "dev": true,
-      "dependencies": {
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -3332,33 +2832,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-buffer": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/is-core-module": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -3388,16 +2865,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-decimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/is-descriptor": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
@@ -3455,19 +2922,9 @@
       "dev": true,
       "dependencies": {
         "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-hexadecimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/is-negated-glob": {
@@ -3521,7 +2978,7 @@
     "node_modules/is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -3566,12 +3023,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
-    },
     "node_modules/is-unc-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
@@ -3647,16 +3098,16 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
+      "dependencies": {
+        "argparse": "^2.0.1"
       },
-      "engines": {
-        "node": ">=4"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
     "node_modules/json-parse-even-better-errors": {
@@ -3677,18 +3128,6 @@
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/just-debounce": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
@@ -3705,9 +3144,9 @@
       }
     },
     "node_modules/known-css-properties": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz",
-      "integrity": "sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.28.0.tgz",
+      "integrity": "sha512-9pSL5XB4J+ifHP0e0jmmC98OGC1nL8/JjS+fi6mnTlIf//yt/MfVLtKg7S6nCtj/8KTcWX7nRlY0XywoYY1ISQ==",
       "dev": true
     },
     "node_modules/last-run": {
@@ -3933,15 +3372,18 @@
       }
     },
     "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
       "dependencies": {
-        "p-locate": "^4.1.0"
+        "p-locate": "^5.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/lodash": {
@@ -3950,16 +3392,10 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "node_modules/lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
       "dev": true
     },
     "node_modules/log-symbols": {
@@ -4027,16 +3463,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/longest-streak": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz",
-      "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
@@ -4078,9 +3504,9 @@
       }
     },
     "node_modules/map-obj": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
-      "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
@@ -4153,70 +3579,43 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/mdast-util-from-markdown": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
-      "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/mdast": "^3.0.0",
-        "mdast-util-to-string": "^2.0.0",
-        "micromark": "~2.11.0",
-        "parse-entities": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-to-markdown": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz",
-      "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "longest-streak": "^2.0.0",
-        "mdast-util-to-string": "^2.0.0",
-        "parse-entities": "^2.0.0",
-        "repeat-string": "^1.0.0",
-        "zwitch": "^1.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/mdast-util-to-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
-      "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
+    "node_modules/mdn-data": {
+      "version": "2.0.30",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
+      "dev": true
     },
     "node_modules/meow": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+      "version": "10.1.5",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-10.1.5.tgz",
+      "integrity": "sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==",
       "dev": true,
       "dependencies": {
-        "@types/minimist": "^1.2.0",
-        "camelcase-keys": "^6.2.2",
-        "decamelize": "^1.2.0",
+        "@types/minimist": "^1.2.2",
+        "camelcase-keys": "^7.0.0",
+        "decamelize": "^5.0.0",
         "decamelize-keys": "^1.1.0",
         "hard-rejection": "^2.1.0",
         "minimist-options": "4.1.0",
-        "normalize-package-data": "^3.0.0",
-        "read-pkg-up": "^7.0.1",
-        "redent": "^3.0.0",
-        "trim-newlines": "^3.0.0",
-        "type-fest": "^0.18.0",
-        "yargs-parser": "^20.2.3"
+        "normalize-package-data": "^3.0.2",
+        "read-pkg-up": "^8.0.0",
+        "redent": "^4.0.0",
+        "trim-newlines": "^4.0.2",
+        "type-fest": "^1.2.2",
+        "yargs-parser": "^20.2.9"
       },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/meow/node_modules/decamelize": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-5.0.1.tgz",
+      "integrity": "sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -4225,9 +3624,9 @@
       }
     },
     "node_modules/meow/node_modules/type-fest": {
-      "version": "0.18.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
       "dev": true,
       "engines": {
         "node": ">=10"
@@ -4251,26 +3650,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/micromark": {
-      "version": "2.11.4",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz",
-      "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "GitHub Sponsors",
-          "url": "https://github.com/sponsors/unifiedjs"
-        },
-        {
-          "type": "OpenCollective",
-          "url": "https://opencollective.com/unified"
-        }
-      ],
-      "dependencies": {
-        "debug": "^4.0.0",
-        "parse-entities": "^2.0.0"
-      }
-    },
     "node_modules/micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -4371,15 +3750,6 @@
         "node": "*"
       }
     },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/minimist-options": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
@@ -4462,6 +3832,24 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/nanoid": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
     "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -4536,12 +3924,6 @@
       "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
       "dev": true
     },
-    "node_modules/node-releases": {
-      "version": "1.1.73",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
-      "dev": true
-    },
     "node_modules/node-version": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz",
@@ -4552,13 +3934,13 @@
       }
     },
     "node_modules/normalize-package-data": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
-      "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
       "dev": true,
       "dependencies": {
         "hosted-git-info": "^4.0.1",
-        "resolve": "^1.20.0",
+        "is-core-module": "^2.5.0",
         "semver": "^7.3.4",
         "validate-npm-package-license": "^3.0.1"
       },
@@ -4566,39 +3948,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/normalize-package-data/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -4608,21 +3957,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-selector": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-      "dev": true
-    },
     "node_modules/now-and-later": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
@@ -4647,12 +3981,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-      "dev": true
-    },
     "node_modules/number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -4891,30 +4219,33 @@
       }
     },
     "node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
       "dependencies": {
-        "p-try": "^2.0.0"
+        "yocto-queue": "^0.1.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "p-limit": "^3.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-map": {
@@ -4932,15 +4263,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -4953,24 +4275,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/parse-entities": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
-      "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
-      "dev": true,
-      "dependencies": {
-        "character-entities": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "character-reference-invalid": "^1.0.0",
-        "is-alphanumerical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-hexadecimal": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/parse-filepath": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -5099,10 +4403,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true
+    },
     "node_modules/picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
       "engines": {
         "node": ">=8.6"
@@ -5212,46 +4522,31 @@
       }
     },
     "node_modules/postcss": {
-      "version": "7.0.36",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      }
-    },
-    "node_modules/postcss-html": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz",
-      "integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==",
-      "dev": true,
-      "dependencies": {
-        "htmlparser2": "^3.10.0"
-      },
-      "peerDependencies": {
-        "postcss": ">=5.0.0",
-        "postcss-syntax": ">=0.36.0"
-      }
-    },
-    "node_modules/postcss-less": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz",
-      "integrity": "sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "dependencies": {
-        "postcss": "^7.0.14"
+        "nanoid": "^3.3.6",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
       },
       "engines": {
-        "node": ">=6.14.4"
+        "node": "^10 || ^12 || >=14"
       }
     },
     "node_modules/postcss-media-query-parser": {
@@ -5267,154 +4562,75 @@
       "dev": true
     },
     "node_modules/postcss-safe-parser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz",
-      "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.26"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-sass": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz",
-      "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==",
-      "dev": true,
-      "dependencies": {
-        "gonzales-pe": "^4.3.0",
-        "postcss": "^7.0.21"
-      }
-    },
-    "node_modules/postcss-scss": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
-      "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
+      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
       "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.6"
-      },
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
+        "node": ">=12.0"
       },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-sorting": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-5.0.1.tgz",
-      "integrity": "sha512-Y9fUFkIhfrm6i0Ta3n+89j56EFqaNRdUKqXyRp6kvTcSXnmgEjaVowCXH+JBe9+YKWqd4nc28r2sgwnzJalccA==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.14",
-        "postcss": "^7.0.17"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       },
-      "engines": {
-        "node": ">=8.7.0"
-      }
-    },
-    "node_modules/postcss-syntax": {
-      "version": "0.36.2",
-      "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz",
-      "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==",
-      "dev": true,
       "peerDependencies": {
-        "postcss": ">=5.0.0"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
-      "dev": true
-    },
-    "node_modules/postcss/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "postcss": "^8.3.3"
       }
     },
-    "node_modules/postcss/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+    "node_modules/postcss-scss": {
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz",
+      "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==",
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss-scss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "engines": {
-        "node": ">=4"
+        "node": ">=12.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.29"
       }
     },
-    "node_modules/postcss/node_modules/chalk/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/postcss-selector-parser": {
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/postcss/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+    "node_modules/postcss-sorting": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-8.0.2.tgz",
+      "integrity": "sha512-M9dkSrmU00t/jK7rF6BZSZauA5MAaBW4i5EnJXspMwt4iqTh/L9j6fgMnbElEOfyRyfLfVbIHj/R52zHzAPe1Q==",
       "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
+      "peerDependencies": {
+        "postcss": "^8.4.20"
       }
     },
-    "node_modules/postcss/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
       "dev": true
     },
-    "node_modules/postcss/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
@@ -5464,9 +4680,9 @@
       }
     },
     "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -5493,89 +4709,74 @@
       ]
     },
     "node_modules/quick-lru": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz",
+      "integrity": "sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==",
       "dev": true,
       "dependencies": {
         "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
+        "normalize-package-data": "^3.0.2",
+        "parse-json": "^5.2.0",
+        "type-fest": "^1.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-8.0.0.tgz",
+      "integrity": "sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==",
       "dev": true,
       "dependencies": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
+        "find-up": "^5.0.0",
+        "read-pkg": "^6.0.0",
+        "type-fest": "^1.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
       "dev": true,
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/read-pkg/node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/read-pkg/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/readable-stream": {
@@ -5620,16 +4821,31 @@
       }
     },
     "node_modules/redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-4.0.0.tgz",
+      "integrity": "sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==",
       "dev": true,
       "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
+        "indent-string": "^5.0.0",
+        "strip-indent": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/redent/node_modules/indent-string": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz",
+      "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/regex-not": {
@@ -5682,47 +4898,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/remark": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz",
-      "integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==",
-      "dev": true,
-      "dependencies": {
-        "remark-parse": "^9.0.0",
-        "remark-stringify": "^9.0.0",
-        "unified": "^9.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/remark-parse": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
-      "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==",
-      "dev": true,
-      "dependencies": {
-        "mdast-util-from-markdown": "^0.8.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/remark-stringify": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz",
-      "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==",
-      "dev": true,
-      "dependencies": {
-        "mdast-util-to-markdown": "^0.6.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/remove-bom-buffer": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
@@ -6142,12 +5317,18 @@
       }
     },
     "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
       "bin": {
         "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/semver-compare": {
@@ -6168,6 +5349,24 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/semver/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -6439,6 +5638,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/source-map-resolve": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
@@ -6499,15 +5707,6 @@
       "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==",
       "dev": true
     },
-    "node_modules/specificity": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
-      "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
-      "dev": true,
-      "bin": {
-        "specificity": "bin/specificity"
-      }
-    },
     "node_modules/split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -6690,14 +5889,14 @@
       }
     },
     "node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=8"
@@ -6718,12 +5917,12 @@
       }
     },
     "node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
         "node": ">=8"
@@ -6751,15 +5950,18 @@
       }
     },
     "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz",
+      "integrity": "sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==",
       "dev": true,
       "dependencies": {
-        "min-indent": "^1.0.0"
+        "min-indent": "^1.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/style-search": {
@@ -6769,65 +5971,57 @@
       "dev": true
     },
     "node_modules/stylelint": {
-      "version": "13.13.1",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.13.1.tgz",
-      "integrity": "sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==",
+      "version": "15.10.3",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.10.3.tgz",
+      "integrity": "sha512-aBQMMxYvFzJJwkmg+BUUg3YfPyeuCuKo2f+LOw7yYbU8AZMblibwzp9OV4srHVeQldxvSFdz0/Xu8blq2AesiA==",
       "dev": true,
       "dependencies": {
-        "@stylelint/postcss-css-in-js": "^0.37.2",
-        "@stylelint/postcss-markdown": "^0.36.2",
-        "autoprefixer": "^9.8.6",
+        "@csstools/css-parser-algorithms": "^2.3.1",
+        "@csstools/css-tokenizer": "^2.2.0",
+        "@csstools/media-query-list-parser": "^2.1.4",
+        "@csstools/selector-specificity": "^3.0.0",
         "balanced-match": "^2.0.0",
-        "chalk": "^4.1.1",
-        "cosmiconfig": "^7.0.0",
-        "debug": "^4.3.1",
-        "execall": "^2.0.0",
-        "fast-glob": "^3.2.5",
-        "fastest-levenshtein": "^1.0.12",
+        "colord": "^2.9.3",
+        "cosmiconfig": "^8.2.0",
+        "css-functions-list": "^3.2.0",
+        "css-tree": "^2.3.1",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.1",
+        "fastest-levenshtein": "^1.0.16",
         "file-entry-cache": "^6.0.1",
-        "get-stdin": "^8.0.0",
         "global-modules": "^2.0.0",
-        "globby": "^11.0.3",
+        "globby": "^11.1.0",
         "globjoin": "^0.1.4",
-        "html-tags": "^3.1.0",
-        "ignore": "^5.1.8",
+        "html-tags": "^3.3.1",
+        "ignore": "^5.2.4",
         "import-lazy": "^4.0.0",
         "imurmurhash": "^0.1.4",
-        "known-css-properties": "^0.21.0",
-        "lodash": "^4.17.21",
-        "log-symbols": "^4.1.0",
+        "is-plain-object": "^5.0.0",
+        "known-css-properties": "^0.28.0",
         "mathml-tag-names": "^2.1.3",
-        "meow": "^9.0.0",
-        "micromatch": "^4.0.4",
-        "normalize-selector": "^0.2.0",
-        "postcss": "^7.0.35",
-        "postcss-html": "^0.36.0",
-        "postcss-less": "^3.1.4",
-        "postcss-media-query-parser": "^0.2.3",
+        "meow": "^10.1.5",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.27",
         "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-safe-parser": "^4.0.2",
-        "postcss-sass": "^0.4.4",
-        "postcss-scss": "^2.1.1",
-        "postcss-selector-parser": "^6.0.5",
-        "postcss-syntax": "^0.36.2",
-        "postcss-value-parser": "^4.1.0",
+        "postcss-safe-parser": "^6.0.0",
+        "postcss-selector-parser": "^6.0.13",
+        "postcss-value-parser": "^4.2.0",
         "resolve-from": "^5.0.0",
-        "slash": "^3.0.0",
-        "specificity": "^0.4.1",
-        "string-width": "^4.2.2",
-        "strip-ansi": "^6.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
         "style-search": "^0.1.0",
-        "sugarss": "^2.0.0",
+        "supports-hyperlinks": "^3.0.0",
         "svg-tags": "^1.0.0",
-        "table": "^6.6.0",
-        "v8-compile-cache": "^2.3.0",
-        "write-file-atomic": "^3.0.3"
+        "table": "^6.8.1",
+        "write-file-atomic": "^5.0.1"
       },
       "bin": {
-        "stylelint": "bin/stylelint.js"
+        "stylelint": "bin/stylelint.mjs"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": "^14.13.1 || >=16.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -6835,52 +6029,64 @@
       }
     },
     "node_modules/stylelint-config-sass-guidelines": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-sass-guidelines/-/stylelint-config-sass-guidelines-8.0.0.tgz",
-      "integrity": "sha512-v21iDWtzpfhuKJlYKpoE1vjp+GT8Cr6ZBWwMx/jf+eCEblZgAIDVVjgAELoDLhVj17DcEFwlIKJBMfrdAmXg0Q==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-sass-guidelines/-/stylelint-config-sass-guidelines-10.0.0.tgz",
+      "integrity": "sha512-+Rr2Dd4b72CWA4qoj1Kk+y449nP/WJsrD0nzQAWkmPPIuyVcy2GMIcfNr0Z8JJOLjRvtlkKxa49FCNXMePBikQ==",
       "dev": true,
       "dependencies": {
-        "stylelint-order": "^4.0.0",
-        "stylelint-scss": "^3.18.0"
+        "postcss-scss": "^4.0.6",
+        "stylelint-scss": "^4.4.0"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": "^14.13.1 || >=16.13.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.21",
+        "stylelint": "^15.2.0"
+      }
+    },
+    "node_modules/stylelint-config-sass-guidelines/node_modules/stylelint-scss": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.7.0.tgz",
+      "integrity": "sha512-TSUgIeS0H3jqDZnby1UO1Qv3poi1N8wUYIJY6D1tuUq2MN3lwp/rITVo0wD+1SWTmRm0tNmGO0b7nKInnqF6Hg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-selector-parser": "^6.0.11",
+        "postcss-value-parser": "^4.2.0"
       },
       "peerDependencies": {
-        "stylelint": "^13.7.0"
+        "stylelint": "^14.5.1 || ^15.0.0"
       }
     },
     "node_modules/stylelint-order": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-4.1.0.tgz",
-      "integrity": "sha512-sVTikaDvMqg2aJjh4r48jsdfmqLT+nqB1MOsaBnvM3OwLx4S+WXcsxsgk5w18h/OZoxZCxuyXMh61iBHcj9Qiw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-6.0.3.tgz",
+      "integrity": "sha512-1j1lOb4EU/6w49qZeT2SQVJXm0Ht+Qnq9GMfUa3pMwoyojIWfuA+JUDmoR97Bht1RLn4ei0xtLGy87M7d29B1w==",
       "dev": true,
       "dependencies": {
-        "lodash": "^4.17.15",
-        "postcss": "^7.0.31",
-        "postcss-sorting": "^5.0.1"
+        "postcss": "^8.4.21",
+        "postcss-sorting": "^8.0.2"
       },
       "peerDependencies": {
-        "stylelint": "^10.0.1 || ^11.0.0 || ^12.0.0 || ^13.0.0"
+        "stylelint": "^14.0.0 || ^15.0.0"
       }
     },
     "node_modules/stylelint-scss": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.19.0.tgz",
-      "integrity": "sha512-Ic5bsmpS4wVucOw44doC1Yi9f5qbeVL4wPFiEOaUElgsOuLEN6Ofn/krKI8BeNL2gAn53Zu+IcVV4E345r6rBw==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-5.2.1.tgz",
+      "integrity": "sha512-ZoTJUM85/qqpQHfEppjW/St//8s6p9Qsg8deWlYlr56F9iUgC9vXeIDQvH4odkRRJLTLFQzYMALSOFCQ3MDkgw==",
       "dev": true,
       "dependencies": {
-        "lodash": "^4.17.15",
+        "known-css-properties": "^0.28.0",
         "postcss-media-query-parser": "^0.2.3",
         "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "postcss-selector-parser": "^6.0.13",
+        "postcss-value-parser": "^4.2.0"
       },
       "peerDependencies": {
-        "stylelint": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0"
+        "stylelint": "^14.5.1 || ^15.0.0"
       }
     },
     "node_modules/stylelint/node_modules/braces": {
@@ -6895,6 +6101,32 @@
         "node": ">=8"
       }
     },
+    "node_modules/stylelint/node_modules/cosmiconfig": {
+      "version": "8.3.6",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
+      "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
+      "dev": true,
+      "dependencies": {
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0",
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/stylelint/node_modules/fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -6952,13 +6184,13 @@
       }
     },
     "node_modules/stylelint/node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
       "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       },
       "engines": {
         "node": ">=8.6"
@@ -6985,15 +6217,6 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/sugarss": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz",
-      "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^7.0.2"
-      }
-    },
     "node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -7006,6 +6229,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/supports-hyperlinks": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz",
+      "integrity": "sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=14.18"
+      }
+    },
     "node_modules/sver-compat": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
@@ -7023,17 +6259,16 @@
       "dev": true
     },
     "node_modules/table": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
+      "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
       "dev": true,
       "dependencies": {
         "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
         "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0"
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=10.0.0"
@@ -7113,15 +6348,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
@@ -7246,22 +6472,15 @@
       "dev": true
     },
     "node_modules/trim-newlines": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.1.1.tgz",
+      "integrity": "sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==",
       "dev": true,
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/trough": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
-      "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
-      "dev": true,
+        "node": ">=12"
+      },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/tslib": {
@@ -7294,15 +6513,6 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
-    "node_modules/typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dev": true,
-      "dependencies": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
     "node_modules/unc-path-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
@@ -7342,33 +6552,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/unified": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz",
-      "integrity": "sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==",
-      "dev": true,
-      "dependencies": {
-        "bail": "^1.0.0",
-        "extend": "^3.0.0",
-        "is-buffer": "^2.0.0",
-        "is-plain-obj": "^2.0.0",
-        "trough": "^1.0.0",
-        "vfile": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unified/node_modules/is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -7394,42 +6577,6 @@
         "through2-filter": "^3.0.0"
       }
     },
-    "node_modules/unist-util-find-all-after": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz",
-      "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==",
-      "dev": true,
-      "dependencies": {
-        "unist-util-is": "^4.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-is": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
-      "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/unist-util-stringify-position": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
-      "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -7519,12 +6666,6 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
     "node_modules/v8flags": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
@@ -7556,36 +6697,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/vfile": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
-      "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0",
-        "vfile-message": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
-    "node_modules/vfile-message": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
-      "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
-    },
     "node_modules/vinyl": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
@@ -7740,15 +6851,28 @@
       "dev": true
     },
     "node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+      "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
       "dev": true,
       "dependencies": {
         "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/write-file-atomic/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/xtend": {
@@ -7970,14 +7094,16 @@
         "object.assign": "^4.1.0"
       }
     },
-    "node_modules/zwitch": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
-      "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     }
   },
@@ -7991,199 +7117,12 @@
         "@babel/highlight": "^7.14.5"
       }
     },
-    "@babel/compat-data": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz",
-      "integrity": "sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==",
-      "dev": true
-    },
-    "@babel/core": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz",
-      "integrity": "sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.14.5",
-        "@babel/helper-compilation-targets": "^7.14.5",
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helpers": "^7.14.6",
-        "@babel/parser": "^7.14.6",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "@babel/generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz",
-      "integrity": "sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.14.5",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "@babel/helper-compilation-targets": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz",
-      "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
-        "semver": "^6.3.0"
-      }
-    },
-    "@babel/helper-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
-      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-get-function-arity": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
-      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
-      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-member-expression-to-functions": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz",
-      "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
-      "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz",
-      "integrity": "sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-simple-access": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
-      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-replace-supers": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz",
-      "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz",
-      "integrity": "sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
-      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
     "@babel/helper-validator-identifier": {
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz",
       "integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==",
       "dev": true
     },
-    "@babel/helper-validator-option": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
-      "dev": true
-    },
-    "@babel/helpers": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz",
-      "integrity": "sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      }
-    },
     "@babel/highlight": {
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
@@ -8247,49 +7186,32 @@
         }
       }
     },
-    "@babel/parser": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz",
-      "integrity": "sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==",
-      "dev": true
-    },
-    "@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
+    "@csstools/css-parser-algorithms": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.2.tgz",
+      "integrity": "sha512-sLYGdAdEY2x7TSw9FtmdaTrh2wFtRJO5VMbBrA8tEqEod7GEggFmxTSK9XqExib3yMuYNcvcTdCZIP6ukdjAIA==",
       "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      }
+      "requires": {}
+    },
+    "@csstools/css-tokenizer": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.2.1.tgz",
+      "integrity": "sha512-Zmsf2f/CaEPWEVgw29odOj+WEVoiJy9s9NOv5GgNY9mZ1CZ7394By6wONrONrTsnNDv6F9hR02nvFihrGVGHBg==",
+      "dev": true
     },
-    "@babel/traverse": {
-      "version": "7.14.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.7.tgz",
-      "integrity": "sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==",
+    "@csstools/media-query-list-parser": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.5.tgz",
+      "integrity": "sha512-IxVBdYzR8pYe89JiyXQuYk4aVVoCPhMJkz6ElRwlVysjwURTsTk/bmY/z4FfeRE+CRBMlykPwXEVUg8lThv7AQ==",
       "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/parser": "^7.14.7",
-        "@babel/types": "^7.14.5",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      }
+      "requires": {}
     },
-    "@babel/types": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz",
-      "integrity": "sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==",
+    "@csstools/selector-specificity": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.0.tgz",
+      "integrity": "sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g==",
       "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "to-fast-properties": "^2.0.0"
-      }
+      "requires": {}
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
@@ -8308,53 +7230,25 @@
       "dev": true
     },
     "@nodelib/fs.walk": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
-      "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
       "requires": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
       }
     },
-    "@stylelint/postcss-css-in-js": {
-      "version": "0.37.2",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz",
-      "integrity": "sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==",
-      "dev": true,
-      "requires": {
-        "@babel/core": ">=7.9.0"
-      }
-    },
-    "@stylelint/postcss-markdown": {
-      "version": "0.36.2",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz",
-      "integrity": "sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==",
-      "dev": true,
-      "requires": {
-        "remark": "^13.0.0",
-        "unist-util-find-all-after": "^3.0.2"
-      }
-    },
-    "@types/mdast": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz",
-      "integrity": "sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "*"
-      }
-    },
     "@types/minimist": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
-      "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.3.tgz",
+      "integrity": "sha512-ZYFzrvyWUNhaPomn80dsMNgMeXxNWZBdkuG/hWlUvXvbdUH8ZERNBGXnU87McuGcWDsyzX2aChCv/SVN348k3A==",
       "dev": true
     },
     "@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
+      "integrity": "sha512-lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A==",
       "dev": true
     },
     "@types/parse-json": {
@@ -8363,12 +7257,6 @@
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
       "dev": true
     },
-    "@types/unist": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
-      "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==",
-      "dev": true
-    },
     "aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
@@ -8380,9 +7268,9 @@
       }
     },
     "ajv": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-      "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
@@ -8419,9 +7307,9 @@
       }
     },
     "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true
     },
     "ansi-styles": {
@@ -8475,6 +7363,12 @@
       "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
       "dev": true
     },
+    "argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
     "arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -8584,7 +7478,7 @@
     "arrify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
       "dev": true
     },
     "assign-symbols": {
@@ -8632,21 +7526,6 @@
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true
     },
-    "autoprefixer": {
-      "version": "9.8.6",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
-      "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.12.0",
-        "caniuse-lite": "^1.0.30001109",
-        "colorette": "^1.2.1",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.32",
-        "postcss-value-parser": "^4.1.0"
-      }
-    },
     "bach": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
@@ -8664,12 +7543,6 @@
         "now-and-later": "^2.0.0"
       }
     },
-    "bail": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
-      "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
-      "dev": true
-    },
     "balanced-match": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
@@ -8754,19 +7627,6 @@
         "to-regex": "^3.0.1"
       }
     },
-    "browserslist": {
-      "version": "4.16.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
-      "dev": true,
-      "requires": {
-        "caniuse-lite": "^1.0.30001219",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.723",
-        "escalade": "^3.1.1",
-        "node-releases": "^1.1.71"
-      }
-    },
     "buffer-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
@@ -8813,28 +7673,31 @@
       "dev": true
     },
     "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "dev": true
     },
     "camelcase-keys": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz",
+      "integrity": "sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==",
       "dev": true,
       "requires": {
-        "camelcase": "^5.3.1",
-        "map-obj": "^4.0.0",
-        "quick-lru": "^4.0.1"
+        "camelcase": "^6.3.0",
+        "map-obj": "^4.1.0",
+        "quick-lru": "^5.1.1",
+        "type-fest": "^1.2.1"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+          "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
+          "dev": true
+        }
       }
     },
-    "caniuse-lite": {
-      "version": "1.0.30001239",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz",
-      "integrity": "sha512-cyBkXJDMeI4wthy8xJ2FvDU6+0dtcZSJW3voUF8+e9f1bBeuvyZfc3PNbkOETyhbR+dGCPzn9E7MA3iwzusOhQ==",
-      "dev": true
-    },
     "chalk": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
@@ -8845,24 +7708,6 @@
         "supports-color": "^7.1.0"
       }
     },
-    "character-entities": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
-      "dev": true
-    },
-    "character-entities-legacy": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
-      "dev": true
-    },
-    "character-reference-invalid": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
-      "dev": true
-    },
     "child-process-promise": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz",
@@ -9090,27 +7935,10 @@
       "dev": true
     },
     "clone-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-      "dev": true
-    },
-    "clone-regexp": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
-      "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
-      "dev": true,
-      "requires": {
-        "is-regexp": "^2.0.0"
-      },
-      "dependencies": {
-        "is-regexp": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-          "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-          "dev": true
-        }
-      }
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
+      "dev": true
     },
     "clone-stats": {
       "version": "1.0.0",
@@ -9177,6 +8005,12 @@
       "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
       "dev": true
     },
+    "colord": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+      "dev": true
+    },
     "colorette": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
@@ -9267,6 +8101,22 @@
         "which": "^1.2.9"
       }
     },
+    "css-functions-list": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.0.tgz",
+      "integrity": "sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==",
+      "dev": true
+    },
+    "css-tree": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+      "dev": true,
+      "requires": {
+        "mdn-data": "2.0.30",
+        "source-map-js": "^1.0.1"
+      }
+    },
     "cssesc": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
@@ -9284,9 +8134,9 @@
       }
     },
     "debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "requires": {
         "ms": "2.1.2"
@@ -9299,9 +8149,9 @@
       "dev": true
     },
     "decamelize-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
+      "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
       "dev": true,
       "requires": {
         "decamelize": "^1.1.0",
@@ -9311,7 +8161,7 @@
         "map-obj": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+          "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
           "dev": true
         }
       }
@@ -9377,55 +8227,6 @@
         "path-type": "^4.0.0"
       }
     },
-    "dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-          "dev": true
-        },
-        "entities": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-          "dev": true
-        }
-      }
-    },
-    "domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
-    "domhandler": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1"
-      }
-    },
-    "domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
     "duplexify": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
@@ -9459,12 +8260,6 @@
         }
       }
     },
-    "electron-to-chromium": {
-      "version": "1.3.758",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.758.tgz",
-      "integrity": "sha512-StYtiDbgZdjcck3OLwsVVVif7QDuD5m5v2gF+XpETp5lHa7X0y3129YBlYaHRPyj1fep1oAaC6i//gAdp+rhbw==",
-      "dev": true
-    },
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -9497,12 +8292,6 @@
         }
       }
     },
-    "entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
-    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -9556,12 +8345,6 @@
         "es6-symbol": "^3.1.1"
       }
     },
-    "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true
-    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -9607,15 +8390,6 @@
         }
       }
     },
-    "execall": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
-      "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
-      "dev": true,
-      "requires": {
-        "clone-regexp": "^2.1.0"
-      }
-    },
     "expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -9801,17 +8575,16 @@
       "dev": true
     },
     "fast-glob": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
-      "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
+        "micromatch": "^4.0.4"
       },
       "dependencies": {
         "braces": {
@@ -9848,13 +8621,13 @@
           "dev": true
         },
         "micromatch": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+          "version": "4.0.5",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+          "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
           "dev": true,
           "requires": {
-            "braces": "^3.0.1",
-            "picomatch": "^2.2.3"
+            "braces": "^3.0.2",
+            "picomatch": "^2.3.1"
           }
         },
         "to-regex-range": {
@@ -9875,15 +8648,15 @@
       "dev": true
     },
     "fastest-levenshtein": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
       "dev": true
     },
     "fastq": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -9918,12 +8691,12 @@
       }
     },
     "find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
       "requires": {
-        "locate-path": "^5.0.0",
+        "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
       }
     },
@@ -10064,12 +8837,6 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
-    "gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true
-    },
     "get-caller-file": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
@@ -10093,12 +8860,6 @@
       "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
       "dev": true
     },
-    "get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-      "dev": true
-    },
     "get-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@@ -10203,23 +8964,17 @@
         "which": "^1.2.14"
       }
     },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true
-    },
     "globby": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
       "requires": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
         "slash": "^3.0.0"
       }
     },
@@ -10238,15 +8993,6 @@
         "sparkles": "^1.0.0"
       }
     },
-    "gonzales-pe": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
-      "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
     "graceful-fs": {
       "version": "4.2.6",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
@@ -10408,9 +9154,9 @@
       }
     },
     "hosted-git-info": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-      "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
       "dev": true,
       "requires": {
         "lru-cache": "^6.0.0"
@@ -10434,38 +9180,11 @@
       }
     },
     "html-tags": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
-      "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
+      "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
       "dev": true
     },
-    "htmlparser2": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
-      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^1.3.1",
-        "domhandler": "^2.3.0",
-        "domutils": "^1.5.1",
-        "entities": "^1.1.1",
-        "inherits": "^2.0.1",
-        "readable-stream": "^3.1.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "human-signals": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
@@ -10479,9 +9198,9 @@
       "dev": true
     },
     "ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true
     },
     "import-fresh": {
@@ -10503,7 +9222,7 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true
     },
     "indent-string": {
@@ -10573,22 +9292,6 @@
         }
       }
     },
-    "is-alphabetical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-      "dev": true
-    },
-    "is-alphanumerical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
-      "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
-      "dev": true,
-      "requires": {
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0"
-      }
-    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -10604,16 +9307,10 @@
         "binary-extensions": "^1.0.0"
       }
     },
-    "is-buffer": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-      "dev": true
-    },
     "is-core-module": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
@@ -10636,12 +9333,6 @@
         }
       }
     },
-    "is-decimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
-      "dev": true
-    },
     "is-descriptor": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
@@ -10688,12 +9379,6 @@
         "is-extglob": "^2.1.1"
       }
     },
-    "is-hexadecimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
-      "dev": true
-    },
     "is-negated-glob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
@@ -10735,7 +9420,7 @@
     "is-plain-obj": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
       "dev": true
     },
     "is-plain-object": {
@@ -10765,12 +9450,6 @@
       "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
       "dev": true
     },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
-    },
     "is-unc-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
@@ -10828,11 +9507,14 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
+    "js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "requires": {
+        "argparse": "^2.0.1"
+      }
     },
     "json-parse-even-better-errors": {
       "version": "2.3.1",
@@ -10852,12 +9534,6 @@
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
-    "json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true
-    },
     "just-debounce": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
@@ -10871,9 +9547,9 @@
       "dev": true
     },
     "known-css-properties": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz",
-      "integrity": "sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.28.0.tgz",
+      "integrity": "sha512-9pSL5XB4J+ifHP0e0jmmC98OGC1nL8/JjS+fi6mnTlIf//yt/MfVLtKg7S6nCtj/8KTcWX7nRlY0XywoYY1ISQ==",
       "dev": true
     },
     "last-run": {
@@ -11054,12 +9730,12 @@
       }
     },
     "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
       "requires": {
-        "p-locate": "^4.1.0"
+        "p-locate": "^5.0.0"
       }
     },
     "lodash": {
@@ -11068,16 +9744,10 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
     "lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
       "dev": true
     },
     "log-symbols": {
@@ -11126,12 +9796,6 @@
         }
       }
     },
-    "longest-streak": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz",
-      "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
-      "dev": true
-    },
     "lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
@@ -11166,9 +9830,9 @@
       "dev": true
     },
     "map-obj": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
-      "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
       "dev": true
     },
     "map-visit": {
@@ -11221,63 +9885,42 @@
       "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
       "dev": true
     },
-    "mdast-util-from-markdown": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
-      "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==",
-      "dev": true,
-      "requires": {
-        "@types/mdast": "^3.0.0",
-        "mdast-util-to-string": "^2.0.0",
-        "micromark": "~2.11.0",
-        "parse-entities": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
-      }
-    },
-    "mdast-util-to-markdown": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz",
-      "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "^2.0.0",
-        "longest-streak": "^2.0.0",
-        "mdast-util-to-string": "^2.0.0",
-        "parse-entities": "^2.0.0",
-        "repeat-string": "^1.0.0",
-        "zwitch": "^1.0.0"
-      }
-    },
-    "mdast-util-to-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
-      "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
+    "mdn-data": {
+      "version": "2.0.30",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
       "dev": true
     },
     "meow": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+      "version": "10.1.5",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-10.1.5.tgz",
+      "integrity": "sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==",
       "dev": true,
       "requires": {
-        "@types/minimist": "^1.2.0",
-        "camelcase-keys": "^6.2.2",
-        "decamelize": "^1.2.0",
+        "@types/minimist": "^1.2.2",
+        "camelcase-keys": "^7.0.0",
+        "decamelize": "^5.0.0",
         "decamelize-keys": "^1.1.0",
         "hard-rejection": "^2.1.0",
         "minimist-options": "4.1.0",
-        "normalize-package-data": "^3.0.0",
-        "read-pkg-up": "^7.0.1",
-        "redent": "^3.0.0",
-        "trim-newlines": "^3.0.0",
-        "type-fest": "^0.18.0",
-        "yargs-parser": "^20.2.3"
+        "normalize-package-data": "^3.0.2",
+        "read-pkg-up": "^8.0.0",
+        "redent": "^4.0.0",
+        "trim-newlines": "^4.0.2",
+        "type-fest": "^1.2.2",
+        "yargs-parser": "^20.2.9"
       },
       "dependencies": {
+        "decamelize": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-5.0.1.tgz",
+          "integrity": "sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==",
+          "dev": true
+        },
         "type-fest": {
-          "version": "0.18.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-          "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+          "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
           "dev": true
         }
       }
@@ -11294,16 +9937,6 @@
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true
     },
-    "micromark": {
-      "version": "2.11.4",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz",
-      "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.0.0",
-        "parse-entities": "^2.0.0"
-      }
-    },
     "micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -11382,12 +10015,6 @@
         "brace-expansion": "^1.1.7"
       }
     },
-    "minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true
-    },
     "minimist-options": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
@@ -11456,6 +10083,12 @@
       "dev": true,
       "optional": true
     },
+    "nanoid": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+      "dev": true
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -11517,12 +10150,6 @@
       "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
       "dev": true
     },
-    "node-releases": {
-      "version": "1.1.73",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
-      "dev": true
-    },
     "node-version": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz",
@@ -11530,41 +10157,15 @@
       "dev": true
     },
     "normalize-package-data": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
-      "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
       "dev": true,
       "requires": {
         "hosted-git-info": "^4.0.1",
-        "resolve": "^1.20.0",
+        "is-core-module": "^2.5.0",
         "semver": "^7.3.4",
         "validate-npm-package-license": "^3.0.1"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
       }
     },
     "normalize-path": {
@@ -11573,18 +10174,6 @@
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true
     },
-    "normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "dev": true
-    },
-    "normalize-selector": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-      "dev": true
-    },
     "now-and-later": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
@@ -11603,12 +10192,6 @@
         "path-key": "^3.0.0"
       }
     },
-    "num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-      "dev": true
-    },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -11794,21 +10377,21 @@
       }
     },
     "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
       "requires": {
-        "p-try": "^2.0.0"
+        "yocto-queue": "^0.1.0"
       }
     },
     "p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
       "requires": {
-        "p-limit": "^2.2.0"
+        "p-limit": "^3.0.2"
       }
     },
     "p-map": {
@@ -11820,12 +10403,6 @@
         "aggregate-error": "^3.0.0"
       }
     },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
-    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -11835,20 +10412,6 @@
         "callsites": "^3.0.0"
       }
     },
-    "parse-entities": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
-      "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
-      "dev": true,
-      "requires": {
-        "character-entities": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "character-reference-invalid": "^1.0.0",
-        "is-alphanumerical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-hexadecimal": "^1.0.0"
-      }
-    },
     "parse-filepath": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -11941,10 +10504,16 @@
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true
     },
+    "picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true
+    },
     "picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true
     },
     "pify": {
@@ -11984,137 +10553,56 @@
       "dev": true,
       "requires": {
         "ansi-colors": "^1.0.1",
-        "arr-diff": "^4.0.0",
-        "arr-union": "^3.1.0",
-        "extend-shallow": "^3.0.2"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        },
-        "is-plain-object": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-          "dev": true,
-          "requires": {
-            "isobject": "^3.0.1"
-          }
-        }
-      }
-    },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true
-    },
-    "postcss": {
-      "version": "7.0.36",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
           }
         },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "color-name": "1.1.3"
+            "is-plain-object": "^2.0.4"
           }
         },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "isobject": "^3.0.1"
           }
         }
       }
     },
-    "postcss-html": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz",
-      "integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==",
-      "dev": true,
-      "requires": {
-        "htmlparser2": "^3.10.0"
-      }
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
     },
-    "postcss-less": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz",
-      "integrity": "sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==",
+    "postcss": {
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.14"
+        "nanoid": "^3.3.6",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
       }
     },
     "postcss-media-query-parser": {
@@ -12130,37 +10618,23 @@
       "dev": true
     },
     "postcss-safe-parser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz",
-      "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.26"
-      }
-    },
-    "postcss-sass": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz",
-      "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
+      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
       "dev": true,
-      "requires": {
-        "gonzales-pe": "^4.3.0",
-        "postcss": "^7.0.21"
-      }
+      "requires": {}
     },
     "postcss-scss": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
-      "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz",
+      "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==",
       "dev": true,
-      "requires": {
-        "postcss": "^7.0.6"
-      }
+      "requires": {}
     },
     "postcss-selector-parser": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dev": true,
       "requires": {
         "cssesc": "^3.0.0",
@@ -12168,26 +10642,16 @@
       }
     },
     "postcss-sorting": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-5.0.1.tgz",
-      "integrity": "sha512-Y9fUFkIhfrm6i0Ta3n+89j56EFqaNRdUKqXyRp6kvTcSXnmgEjaVowCXH+JBe9+YKWqd4nc28r2sgwnzJalccA==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.14",
-        "postcss": "^7.0.17"
-      }
-    },
-    "postcss-syntax": {
-      "version": "0.36.2",
-      "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz",
-      "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-8.0.2.tgz",
+      "integrity": "sha512-M9dkSrmU00t/jK7rF6BZSZauA5MAaBW4i5EnJXspMwt4iqTh/L9j6fgMnbElEOfyRyfLfVbIHj/R52zHzAPe1Q==",
       "dev": true,
       "requires": {}
     },
     "postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
       "dev": true
     },
     "pretty-hrtime": {
@@ -12236,9 +10700,9 @@
       }
     },
     "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
       "dev": true
     },
     "queue-microtask": {
@@ -12248,70 +10712,46 @@
       "dev": true
     },
     "quick-lru": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
       "dev": true
     },
     "read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz",
+      "integrity": "sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==",
       "dev": true,
       "requires": {
         "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
+        "normalize-package-data": "^3.0.2",
+        "parse-json": "^5.2.0",
+        "type-fest": "^1.0.1"
       },
       "dependencies": {
-        "hosted-git-info": {
-          "version": "2.8.9",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-          "dev": true
-        },
-        "normalize-package-data": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-          "dev": true,
-          "requires": {
-            "hosted-git-info": "^2.1.4",
-            "resolve": "^1.10.0",
-            "semver": "2 || 3 || 4 || 5",
-            "validate-npm-package-license": "^3.0.1"
-          }
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        },
         "type-fest": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-          "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+          "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
           "dev": true
         }
       }
     },
     "read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-8.0.0.tgz",
+      "integrity": "sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==",
       "dev": true,
       "requires": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
+        "find-up": "^5.0.0",
+        "read-pkg": "^6.0.0",
+        "type-fest": "^1.0.1"
       },
       "dependencies": {
         "type-fest": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+          "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
           "dev": true
         }
       }
@@ -12352,13 +10792,21 @@
       }
     },
     "redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-4.0.0.tgz",
+      "integrity": "sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==",
       "dev": true,
       "requires": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
+        "indent-string": "^5.0.0",
+        "strip-indent": "^4.0.0"
+      },
+      "dependencies": {
+        "indent-string": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz",
+          "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==",
+          "dev": true
+        }
       }
     },
     "regex-not": {
@@ -12401,35 +10849,6 @@
         }
       }
     },
-    "remark": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz",
-      "integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==",
-      "dev": true,
-      "requires": {
-        "remark-parse": "^9.0.0",
-        "remark-stringify": "^9.0.0",
-        "unified": "^9.1.0"
-      }
-    },
-    "remark-parse": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
-      "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==",
-      "dev": true,
-      "requires": {
-        "mdast-util-from-markdown": "^0.8.0"
-      }
-    },
-    "remark-stringify": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz",
-      "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==",
-      "dev": true,
-      "requires": {
-        "mdast-util-to-markdown": "^0.6.0"
-      }
-    },
     "remove-bom-buffer": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
@@ -12740,10 +11159,30 @@
       }
     },
     "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^6.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
     },
     "semver-compare": {
       "version": "1.0.0",
@@ -12986,6 +11425,12 @@
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true
     },
+    "source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "dev": true
+    },
     "source-map-resolve": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
@@ -13043,12 +11488,6 @@
       "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==",
       "dev": true
     },
-    "specificity": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
-      "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
-      "dev": true
-    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -13200,14 +11639,14 @@
       "dev": true
     },
     "string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^6.0.1"
       }
     },
     "stringify-object": {
@@ -13222,12 +11661,12 @@
       }
     },
     "strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "requires": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       }
     },
     "strip-bom": {
@@ -13246,12 +11685,12 @@
       "dev": true
     },
     "strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz",
+      "integrity": "sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==",
       "dev": true,
       "requires": {
-        "min-indent": "^1.0.0"
+        "min-indent": "^1.0.1"
       }
     },
     "style-search": {
@@ -13261,59 +11700,51 @@
       "dev": true
     },
     "stylelint": {
-      "version": "13.13.1",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.13.1.tgz",
-      "integrity": "sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==",
+      "version": "15.10.3",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.10.3.tgz",
+      "integrity": "sha512-aBQMMxYvFzJJwkmg+BUUg3YfPyeuCuKo2f+LOw7yYbU8AZMblibwzp9OV4srHVeQldxvSFdz0/Xu8blq2AesiA==",
       "dev": true,
       "requires": {
-        "@stylelint/postcss-css-in-js": "^0.37.2",
-        "@stylelint/postcss-markdown": "^0.36.2",
-        "autoprefixer": "^9.8.6",
+        "@csstools/css-parser-algorithms": "^2.3.1",
+        "@csstools/css-tokenizer": "^2.2.0",
+        "@csstools/media-query-list-parser": "^2.1.4",
+        "@csstools/selector-specificity": "^3.0.0",
         "balanced-match": "^2.0.0",
-        "chalk": "^4.1.1",
-        "cosmiconfig": "^7.0.0",
-        "debug": "^4.3.1",
-        "execall": "^2.0.0",
-        "fast-glob": "^3.2.5",
-        "fastest-levenshtein": "^1.0.12",
+        "colord": "^2.9.3",
+        "cosmiconfig": "^8.2.0",
+        "css-functions-list": "^3.2.0",
+        "css-tree": "^2.3.1",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.1",
+        "fastest-levenshtein": "^1.0.16",
         "file-entry-cache": "^6.0.1",
-        "get-stdin": "^8.0.0",
         "global-modules": "^2.0.0",
-        "globby": "^11.0.3",
+        "globby": "^11.1.0",
         "globjoin": "^0.1.4",
-        "html-tags": "^3.1.0",
-        "ignore": "^5.1.8",
+        "html-tags": "^3.3.1",
+        "ignore": "^5.2.4",
         "import-lazy": "^4.0.0",
         "imurmurhash": "^0.1.4",
-        "known-css-properties": "^0.21.0",
-        "lodash": "^4.17.21",
-        "log-symbols": "^4.1.0",
+        "is-plain-object": "^5.0.0",
+        "known-css-properties": "^0.28.0",
         "mathml-tag-names": "^2.1.3",
-        "meow": "^9.0.0",
-        "micromatch": "^4.0.4",
-        "normalize-selector": "^0.2.0",
-        "postcss": "^7.0.35",
-        "postcss-html": "^0.36.0",
-        "postcss-less": "^3.1.4",
-        "postcss-media-query-parser": "^0.2.3",
+        "meow": "^10.1.5",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.27",
         "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-safe-parser": "^4.0.2",
-        "postcss-sass": "^0.4.4",
-        "postcss-scss": "^2.1.1",
-        "postcss-selector-parser": "^6.0.5",
-        "postcss-syntax": "^0.36.2",
-        "postcss-value-parser": "^4.1.0",
+        "postcss-safe-parser": "^6.0.0",
+        "postcss-selector-parser": "^6.0.13",
+        "postcss-value-parser": "^4.2.0",
         "resolve-from": "^5.0.0",
-        "slash": "^3.0.0",
-        "specificity": "^0.4.1",
-        "string-width": "^4.2.2",
-        "strip-ansi": "^6.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
         "style-search": "^0.1.0",
-        "sugarss": "^2.0.0",
+        "supports-hyperlinks": "^3.0.0",
         "svg-tags": "^1.0.0",
-        "table": "^6.6.0",
-        "v8-compile-cache": "^2.3.0",
-        "write-file-atomic": "^3.0.3"
+        "table": "^6.8.1",
+        "write-file-atomic": "^5.0.1"
       },
       "dependencies": {
         "braces": {
@@ -13325,6 +11756,18 @@
             "fill-range": "^7.0.1"
           }
         },
+        "cosmiconfig": {
+          "version": "8.3.6",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
+          "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
+          "dev": true,
+          "requires": {
+            "import-fresh": "^3.3.0",
+            "js-yaml": "^4.1.0",
+            "parse-json": "^5.2.0",
+            "path-type": "^4.0.0"
+          }
+        },
         "fill-range": {
           "version": "7.0.1",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -13367,13 +11810,13 @@
           "dev": true
         },
         "micromatch": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+          "version": "4.0.5",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+          "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
           "dev": true,
           "requires": {
-            "braces": "^3.0.1",
-            "picomatch": "^2.2.3"
+            "braces": "^3.0.2",
+            "picomatch": "^2.3.1"
           }
         },
         "resolve-from": {
@@ -13394,46 +11837,50 @@
       }
     },
     "stylelint-config-sass-guidelines": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-sass-guidelines/-/stylelint-config-sass-guidelines-8.0.0.tgz",
-      "integrity": "sha512-v21iDWtzpfhuKJlYKpoE1vjp+GT8Cr6ZBWwMx/jf+eCEblZgAIDVVjgAELoDLhVj17DcEFwlIKJBMfrdAmXg0Q==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-sass-guidelines/-/stylelint-config-sass-guidelines-10.0.0.tgz",
+      "integrity": "sha512-+Rr2Dd4b72CWA4qoj1Kk+y449nP/WJsrD0nzQAWkmPPIuyVcy2GMIcfNr0Z8JJOLjRvtlkKxa49FCNXMePBikQ==",
       "dev": true,
       "requires": {
-        "stylelint-order": "^4.0.0",
-        "stylelint-scss": "^3.18.0"
+        "postcss-scss": "^4.0.6",
+        "stylelint-scss": "^4.4.0"
+      },
+      "dependencies": {
+        "stylelint-scss": {
+          "version": "4.7.0",
+          "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.7.0.tgz",
+          "integrity": "sha512-TSUgIeS0H3jqDZnby1UO1Qv3poi1N8wUYIJY6D1tuUq2MN3lwp/rITVo0wD+1SWTmRm0tNmGO0b7nKInnqF6Hg==",
+          "dev": true,
+          "requires": {
+            "postcss-media-query-parser": "^0.2.3",
+            "postcss-resolve-nested-selector": "^0.1.1",
+            "postcss-selector-parser": "^6.0.11",
+            "postcss-value-parser": "^4.2.0"
+          }
+        }
       }
     },
     "stylelint-order": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-4.1.0.tgz",
-      "integrity": "sha512-sVTikaDvMqg2aJjh4r48jsdfmqLT+nqB1MOsaBnvM3OwLx4S+WXcsxsgk5w18h/OZoxZCxuyXMh61iBHcj9Qiw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-6.0.3.tgz",
+      "integrity": "sha512-1j1lOb4EU/6w49qZeT2SQVJXm0Ht+Qnq9GMfUa3pMwoyojIWfuA+JUDmoR97Bht1RLn4ei0xtLGy87M7d29B1w==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.15",
-        "postcss": "^7.0.31",
-        "postcss-sorting": "^5.0.1"
+        "postcss": "^8.4.21",
+        "postcss-sorting": "^8.0.2"
       }
     },
     "stylelint-scss": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.19.0.tgz",
-      "integrity": "sha512-Ic5bsmpS4wVucOw44doC1Yi9f5qbeVL4wPFiEOaUElgsOuLEN6Ofn/krKI8BeNL2gAn53Zu+IcVV4E345r6rBw==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-5.2.1.tgz",
+      "integrity": "sha512-ZoTJUM85/qqpQHfEppjW/St//8s6p9Qsg8deWlYlr56F9iUgC9vXeIDQvH4odkRRJLTLFQzYMALSOFCQ3MDkgw==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.15",
+        "known-css-properties": "^0.28.0",
         "postcss-media-query-parser": "^0.2.3",
         "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      }
-    },
-    "sugarss": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz",
-      "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.2"
+        "postcss-selector-parser": "^6.0.13",
+        "postcss-value-parser": "^4.2.0"
       }
     },
     "supports-color": {
@@ -13445,6 +11892,16 @@
         "has-flag": "^4.0.0"
       }
     },
+    "supports-hyperlinks": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz",
+      "integrity": "sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      }
+    },
     "sver-compat": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
@@ -13462,17 +11919,16 @@
       "dev": true
     },
     "table": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
+      "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
       "dev": true,
       "requires": {
         "ajv": "^8.0.1",
-        "lodash.clonedeep": "^4.5.0",
         "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0"
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
       },
       "dependencies": {
         "slice-ansi": {
@@ -13541,12 +11997,6 @@
         "is-negated-glob": "^1.0.0"
       }
     },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true
-    },
     "to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
@@ -13653,15 +12103,9 @@
       "dev": true
     },
     "trim-newlines": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-      "dev": true
-    },
-    "trough": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
-      "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.1.1.tgz",
+      "integrity": "sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==",
       "dev": true
     },
     "tslib": {
@@ -13688,15 +12132,6 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dev": true,
-      "requires": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
     "unc-path-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
@@ -13727,28 +12162,6 @@
       "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
       "dev": true
     },
-    "unified": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz",
-      "integrity": "sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==",
-      "dev": true,
-      "requires": {
-        "bail": "^1.0.0",
-        "extend": "^3.0.0",
-        "is-buffer": "^2.0.0",
-        "is-plain-obj": "^2.0.0",
-        "trough": "^1.0.0",
-        "vfile": "^4.0.0"
-      },
-      "dependencies": {
-        "is-plain-obj": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-          "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-          "dev": true
-        }
-      }
-    },
     "union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -13771,30 +12184,6 @@
         "through2-filter": "^3.0.0"
       }
     },
-    "unist-util-find-all-after": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz",
-      "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==",
-      "dev": true,
-      "requires": {
-        "unist-util-is": "^4.0.0"
-      }
-    },
-    "unist-util-is": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
-      "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
-      "dev": true
-    },
-    "unist-util-stringify-position": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
-      "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "^2.0.2"
-      }
-    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -13868,12 +12257,6 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
     "v8flags": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
@@ -13899,28 +12282,6 @@
       "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
       "dev": true
     },
-    "vfile": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
-      "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0",
-        "vfile-message": "^2.0.0"
-      }
-    },
-    "vfile-message": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
-      "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
-      "dev": true,
-      "requires": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
-      }
-    },
     "vinyl": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
@@ -14056,15 +12417,21 @@
       "dev": true
     },
     "write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+      "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
       "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
+        "signal-exit": "^4.0.1"
+      },
+      "dependencies": {
+        "signal-exit": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+          "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+          "dev": true
+        }
       }
     },
     "xtend": {
@@ -14246,10 +12613,10 @@
       "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true
     },
-    "zwitch": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
-      "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true
     }
   }
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/package.json b/www/civi-extensions/uk.co.vedaconsulting.gdpr/package.json
index 203d2769a..6617c21d3 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/package.json
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/package.json
@@ -15,9 +15,9 @@
     "husky": "^6.0.0",
     "lint-staged": "^11.0.0",
     "sass": "^1.35.1",
-    "stylelint": "^13.13.1",
-    "stylelint-config-sass-guidelines": "^8.0.0",
-    "stylelint-order": "^4.1.0",
-    "stylelint-scss": "^3.19.0"
+    "stylelint": "^15.10.3",
+    "stylelint-config-sass-guidelines": "^10.0.0",
+    "stylelint-order": "^6.0.3",
+    "stylelint-scss": "^5.2.1"
   }
 }
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/CommunicationsPreferences.tpl b/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/CommunicationsPreferences.tpl
index 42deabc9c..8a84d409a 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/CommunicationsPreferences.tpl
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/CommunicationsPreferences.tpl
@@ -3,7 +3,7 @@
 
 <div>
    <div class="help">
-   {if $communications_preferences_page_url }
+   {if $communications_preferences_page_url}
    {ts}Configure the display of the <a title="Your personalised GDPR page. Do not distribute this URL as it allows access to your data. Use tokens or the Contact Action link instead." href="{$communications_preferences_page_url}" target="blank">Communications Preferences page</a>.{/ts}
    {/if}
    </div>
@@ -12,7 +12,7 @@
     <div class="crm-section">
       <div class="label">{$form.$elementName.label}</div>
       <div class="content">{$form.$elementName.html}
-      {if $descriptions.$elementName}
+      {if array_key_exists($elementName, $descriptions)}
         <div class="description">{$descriptions.$elementName}</div>
       {/if}
       </div>
@@ -27,7 +27,7 @@
   {* Channels block *}
   <div class="crm-block crm-form-block crm-gdpr-comms-prefs-form-block">
     <div class="crm-section">
-      <div class="label">{ $form.enable_channels.label }</div>
+      <div class="label">{$form.enable_channels.label}</div>
       <div class="content">{$form.enable_channels.html}
       </div>
       <div class="clear"></div>
@@ -151,7 +151,7 @@
     <div class="clear"></div>
   </div> {* end Completion block *}
     {* Confirmation Email Block *}
-  <fieldset id="mail" class="crm-collapsible {if $defaultsEmpty}collapsed{/if}">
+  <fieldset id="mail" class="crm-collapsible {if isset($defaultsEmpty) && $defaultsEmpty}collapsed{/if}">
     <legend class="collapsible-title">{ts}Confirmation Email{/ts}</legend>
     <div>
       <table class="form-layout-compressed">
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/ContributionPage/TermsAndConditions.tpl b/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/ContributionPage/TermsAndConditions.tpl
index 95d064c19..6bcf36335 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/ContributionPage/TermsAndConditions.tpl
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/ContributionPage/TermsAndConditions.tpl
@@ -10,7 +10,7 @@
       <div class="crm-section">
         <div class="label">{$form.$terms_conditions_file_element_name.label}</div>
         <div class="content">{$form.$terms_conditions_file_element_name.html}
-        {if {$terms_conditions_current.url}
+        {if $terms_conditions_current.url}
           <div class="terms-conditions-file-url">{ts}Current: <a href="{$terms_conditions_current.url}">{$terms_conditions_current.label}{/ts}</a>
         {/if}
 
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/ManageEvent/TermsAndConditions.tpl b/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/ManageEvent/TermsAndConditions.tpl
index d1833c96f..c4143de65 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/ManageEvent/TermsAndConditions.tpl
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/ManageEvent/TermsAndConditions.tpl
@@ -10,7 +10,7 @@
       <div class="crm-section">
         <div class="label">{$form.$terms_conditions_file_element_name.label}</div>
         <div class="content">{$form.$terms_conditions_file_element_name.html}
-        {if {$terms_conditions_current.url}
+        {if $terms_conditions_current.url}
           <div class="terms-conditions-file-url">{ts}Current: <a href="{$terms_conditions_current.url}">{$terms_conditions_current.label}{/ts}</a>
         {/if}
 
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/Settings.tpl b/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/Settings.tpl
index 332368dd9..0bd3b0805 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/Settings.tpl
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/Settings.tpl
@@ -200,7 +200,7 @@
 		<br />
 	      {if $sla_tc_version}
 	        <span class="description">Version: {$sla_tc_version}. <br />
-	          {if $sla_tc_updated}
+	          {if isset($sla_tc_updated) && $sla_tc_updated}
 	             Updated: {$sla_tc_updated}
 	          {/if}
 	        </span>
@@ -268,11 +268,10 @@
 <div class="crm-block crm-form-block crm-gdpr-settings-form-block">
   <div class="help">{ts}Set defaults for Terms &amp Conditions. You can override these in the settings for individual Events and Contribution Pages.{/ts}
   </div>{* end .help *}
- {foreach from="$entity_tc_elements" item="elem"}
+ {foreach from=$entity_tc_elements item="elem"}
   <div class="crm-section">
     <div class="label">{$form.$elem.label}</div>
     <div class="content">{$form.$elem.html}
-      <br /><span class="description"><i></i></span>
     </div>{* end .content *}
   </div>{* end .section *}
   <div class="clear"></div>
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/Task/Contact.tpl b/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/Task/Contact.tpl
index 73bd57223..fdcf80b05 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/Task/Contact.tpl
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/Task/Contact.tpl
@@ -13,9 +13,11 @@
         {if ($help_text)}
             <div class="help">{$help_text}</div>
         {/if}
-        {foreach from=$fields item=field}
-            {include file=$field.template field=$field}
-        {/foreach}
+        {if isset($fields)}
+            {foreach from=$fields item=field}
+                {include file=$field.template field=$field}
+            {/foreach}
+        {/if}
     </div>
 
     <div class="crm-submit-buttons">
diff --git a/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/UpdatePreference.tpl b/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/UpdatePreference.tpl
index 0d3171627..8195f641f 100644
--- a/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/UpdatePreference.tpl
+++ b/www/civi-extensions/uk.co.vedaconsulting.gdpr/templates/CRM/Gdpr/Form/UpdatePreference.tpl
@@ -86,7 +86,7 @@
       <div class="clear"></div>
       <!-- GDPR Terms and conditions url link and checkbox -->
       <fieldset id="crm-communications-preferences-datapolicy" class="data-policy-fieldset">
-          {if $isContactDueAcceptance}
+          {if isset($isContactDueAcceptance) && $isContactDueAcceptance}
             <div class="data-policy-intro section-sescription">
                 {$tcIntro}
             </div>
@@ -114,7 +114,7 @@
     </div>
     </fieldset>
 
-      {if $isCaptcha}
+      {if isset($isCaptcha) && $isCaptcha}
           {include file='CRM/common/ReCAPTCHA.tpl'}
       {/if}
 
diff --git a/www/modules/civicrm/CRM/ACL/DAO/ACL.php b/www/modules/civicrm/CRM/ACL/DAO/ACL.php
index 8655c8371..19960049f 100644
--- a/www/modules/civicrm/CRM/ACL/DAO/ACL.php
+++ b/www/modules/civicrm/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:3d1a53d2aa2092299ce1a5b5ceb468f1)
+ * (GenCodeChecksum:53fb81cdf46cf58449634432851c0458)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/ACL/DAO/ACLCache.php b/www/modules/civicrm/CRM/ACL/DAO/ACLCache.php
index 5687af27e..afe4b8085 100644
--- a/www/modules/civicrm/CRM/ACL/DAO/ACLCache.php
+++ b/www/modules/civicrm/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:a4f7301d73ae6c7771075e585f120059)
+ * (GenCodeChecksum:171d575d22da5093f2acfdbb405817f7)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/ACL/DAO/ACLEntityRole.php b/www/modules/civicrm/CRM/ACL/DAO/ACLEntityRole.php
index 795da1199..3568a715c 100644
--- a/www/modules/civicrm/CRM/ACL/DAO/ACLEntityRole.php
+++ b/www/modules/civicrm/CRM/ACL/DAO/ACLEntityRole.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/ACLEntityRole.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:864dfaaffafb1aac5963e88c3b847c56)
+ * (GenCodeChecksum:9c0a932ecd4829b419ef162612857399)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/ACL/Form/WordPress/Permissions.php b/www/modules/civicrm/CRM/ACL/Form/WordPress/Permissions.php
index 5839aaf0a..e3fa4697d 100644
--- a/www/modules/civicrm/CRM/ACL/Form/WordPress/Permissions.php
+++ b/www/modules/civicrm/CRM/ACL/Form/WordPress/Permissions.php
@@ -68,8 +68,8 @@ public function buildQuickForm() {
 
     $descArray = [];
     foreach ($permissionsDesc as $perm => $attr) {
-      if (count($attr) > 1) {
-        $descArray[$perm] = $attr['description'] ?? $attr[1];
+      if (!empty($attr['description'])) {
+        $descArray[$perm] = $attr['description'];
       }
     }
 
diff --git a/www/modules/civicrm/CRM/Activity/ActionMapping.php b/www/modules/civicrm/CRM/Activity/ActionMapping.php
index 3f472bbc8..d150cad29 100644
--- a/www/modules/civicrm/CRM/Activity/ActionMapping.php
+++ b/www/modules/civicrm/CRM/Activity/ActionMapping.php
@@ -40,7 +40,7 @@ public function getEntityName(): string {
     return 'Activity';
   }
 
-  public function modifySpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
+  public function modifyApiSpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
     $spec->getFieldByName('entity_value')
       ->setLabel(ts('Activity Type'));
     $spec->getFieldByName('entity_status')
diff --git a/www/modules/civicrm/CRM/Activity/BAO/Activity.php b/www/modules/civicrm/CRM/Activity/BAO/Activity.php
index 1b9722d5c..c64c7885a 100644
--- a/www/modules/civicrm/CRM/Activity/BAO/Activity.php
+++ b/www/modules/civicrm/CRM/Activity/BAO/Activity.php
@@ -1161,6 +1161,12 @@ public static function getAttachmentFileIds($activityID, $attachments) {
    * @param array $contactIds
    * @param int $sourceContactId This is the source contact Id
    *
+   * @deprecated since 5.71.
+   *
+   * This function has no core usage. There is some non-core usage. At some point
+   * we should add a suitable api & noisily deprecate this / set an tentative
+   * removal date.
+   *
    * @return array(bool $sent, int $activityId, int $success)
    * @throws CRM_Core_Exception
    */
@@ -1415,62 +1421,6 @@ public static function sendMessage(
     return TRUE;
   }
 
-  /**
-   * Combine all the importable fields from the lower levels object.
-   *
-   * The ordering is important, since currently we do not have a weight
-   * scheme. Adding weight is super important and should be done in the
-   * next week or so, before this can be called complete.
-   *
-   * @param bool $status
-   * @deprecated
-   * @return array
-   *   array of importable Fields
-   */
-  public static function &importableFields($status = FALSE) {
-    CRM_Core_Error::deprecatedFunctionWarning('api');
-    if (empty(Civi::$statics[__CLASS__][__FUNCTION__])) {
-      Civi::$statics[__CLASS__][__FUNCTION__] = [];
-      if (!$status) {
-        $fields = ['' => ['title' => ts('- do not import -')]];
-      }
-      else {
-        $fields = ['' => ['title' => ts('- Activity Fields -')]];
-      }
-
-      $tmpFields = CRM_Activity_DAO_Activity::import();
-      $contactFields = CRM_Contact_BAO_Contact::importableFields('Individual', NULL);
-
-      // Using new Dedupe rule.
-      $ruleParams = [
-        'contact_type' => 'Individual',
-        'used' => 'Unsupervised',
-      ];
-      $fieldsArray = CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($ruleParams);
-
-      $tmpConatctField = [];
-      if (is_array($fieldsArray)) {
-        foreach ($fieldsArray as $value) {
-          $customFieldId = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomField',
-            $value,
-            'id',
-            'column_name'
-          );
-          $value = $customFieldId ? 'custom_' . $customFieldId : $value;
-          $tmpConatctField[trim($value)] = $contactFields[trim($value)];
-          $tmpConatctField[trim($value)]['title'] = $tmpConatctField[trim($value)]['title'] . " (match to contact)";
-        }
-      }
-      $tmpConatctField['external_identifier'] = $contactFields['external_identifier'];
-      $tmpConatctField['external_identifier']['title'] = $contactFields['external_identifier']['title'] . " (match to contact)";
-      $fields = array_merge($fields, $tmpConatctField);
-      $fields = array_merge($fields, $tmpFields);
-      $fields = array_merge($fields, CRM_Core_BAO_CustomField::getFieldsForImport('Activity'));
-      Civi::$statics[__CLASS__][__FUNCTION__] = $fields;
-    }
-    return Civi::$statics[__CLASS__][__FUNCTION__];
-  }
-
   /**
    * @deprecated - use the api instead.
    *
@@ -2387,11 +2337,11 @@ public static function getContactActivitySelector(&$params) {
         $activity['DT_RowAttr']['data-entity'] = 'activity';
         $activity['DT_RowAttr']['data-id'] = $activityId;
 
-        $activity['activity_type'] = (!empty($activityIcons[$values['activity_type_id']]) ? '<span class="crm-i ' . $activityIcons[$values['activity_type_id']] . '" aria-hidden="true"></span> ' : '') . $values['activity_type'];
+        $activity['activity_type'] = (!empty($activityIcons[$values['activity_type_id']]) ? '<span class="crm-i ' . $activityIcons[$values['activity_type_id']] . '" aria-hidden="true"></span> ' : '') . htmlentities($values['activity_type']);
         $activity['subject'] = $values['subject'];
 
         if ($params['contact_id'] == $values['source_contact_id']) {
-          $activity['source_contact_name'] = $values['source_contact_name'];
+          $activity['source_contact_name'] = htmlentities($values['source_contact_name']);
         }
         elseif ($values['source_contact_id']) {
           $srcTypeImage = "";
@@ -2423,7 +2373,7 @@ public static function getContactActivitySelector(&$params) {
 
           // The first target may not be accessable to the logged in user dev/core#1052
           if ($firstTargetName) {
-            $targetLink = CRM_Utils_System::href($firstTargetName, 'civicrm/contact/view', "reset=1&cid={$firstTargetContactID}");
+            $targetLink = CRM_Utils_System::href(htmlentities($firstTargetName), 'civicrm/contact/view', "reset=1&cid={$firstTargetContactID}");
             if ($showContactOverlay) {
               $targetTypeImage = CRM_Contact_BAO_Contact_Utils::getImage(
                 CRM_Contact_BAO_Contact::getContactType($firstTargetContactID),
@@ -2457,7 +2407,7 @@ public static function getContactActivitySelector(&$params) {
           foreach ($values['assignee_contact_name'] as $acID => $acName) {
             if ($acID && $count < 5) {
               $assigneeTypeImage = "";
-              $assigneeLink = CRM_Utils_System::href($acName, 'civicrm/contact/view', "reset=1&cid={$acID}");
+              $assigneeLink = CRM_Utils_System::href(htmlentities($acName), 'civicrm/contact/view', "reset=1&cid={$acID}");
               if ($showContactOverlay) {
                 $assigneeTypeImage = CRM_Contact_BAO_Contact_Utils::getImage(
                   CRM_Contact_BAO_Contact::getContactType($acID),
@@ -2774,18 +2724,22 @@ public static function getEntityRefFilters() {
    *
    * @param string $entityName
    *   Always "Activity".
-   * @param int $entityId
+   * @param int|null $entityId
    *   Id of the activity.
    * @throws CRM_Core_Exception
    */
-  public static function getEntityIcon(string $entityName, int $entityId) {
+  public static function getEntityIcon(string $entityName, int $entityId = NULL): ?string {
+    $default = parent::getEntityIcon($entityName);
+    if (!$entityId) {
+      return $default;
+    }
     $field = Civi\Api4\Activity::getFields(FALSE)
       ->addWhere('name', '=', 'activity_type_id')
       ->setLoadOptions(['id', 'label', 'icon'])
       ->execute()->single();
     $activityTypes = array_column($field['options'], NULL, 'id');
     $activityType = CRM_Core_DAO::getFieldValue(parent::class, $entityId, 'activity_type_id');
-    return $activityTypes[$activityType]['icon'] ?? self::$_icon;
+    return $activityTypes[$activityType]['icon'] ?? $default;
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Activity/DAO/Activity.php b/www/modules/civicrm/CRM/Activity/DAO/Activity.php
index d24acdc68..37ea5538a 100644
--- a/www/modules/civicrm/CRM/Activity/DAO/Activity.php
+++ b/www/modules/civicrm/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:18d2e627738109617e50c084979441c0)
+ * (GenCodeChecksum:b7bf5b93144ffcea75b773a0893c3d5f)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Activity/DAO/ActivityContact.php b/www/modules/civicrm/CRM/Activity/DAO/ActivityContact.php
index 7e7ae0675..1df82812c 100644
--- a/www/modules/civicrm/CRM/Activity/DAO/ActivityContact.php
+++ b/www/modules/civicrm/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:1e56caf678b48133edb050534211993a)
+ * (GenCodeChecksum:12d0981e5fe8f5a0bb152553b009336d)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Activity/Form/Activity.php b/www/modules/civicrm/CRM/Activity/Form/Activity.php
index c6d0379af..1260904f2 100644
--- a/www/modules/civicrm/CRM/Activity/Form/Activity.php
+++ b/www/modules/civicrm/CRM/Activity/Form/Activity.php
@@ -21,6 +21,7 @@
 class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
 
   use CRM_Activity_Form_ActivityFormTrait;
+  use CRM_Custom_Form_CustomDataTrait;
 
   /**
    * The id of the object being edited / created
@@ -430,16 +431,15 @@ public function preProcess() {
 
     // when custom data is included in this page
     $this->assign('cid', $this->_currentlyViewedContactId);
-    if (!empty($_POST['hidden_custom'])) {
-      // We need to set it in the session for the code below to work.
-      // CRM-3014
-      // Need to assign custom data subtype to the template.
-      $this->set('type', 'Activity');
-      $this->set('subType', $this->_activityTypeId);
-      $this->set('entityId', $this->_activityId);
-      CRM_Custom_Form_CustomData::preProcess($this, NULL, $this->_activityTypeId, 1, 'Activity', $this->_activityId);
-      CRM_Custom_Form_CustomData::buildQuickForm($this);
-      CRM_Custom_Form_CustomData::setDefaultValues($this);
+    if ($this->isSubmitted()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('Activity', array_filter([
+        'id' => $this->getActivityID(),
+        'activity_type_id' => $this->_activityTypeId,
+      ]));
     }
 
     // add attachments part
@@ -727,8 +727,7 @@ public function buildQuickForm() {
       $this->getElement('source_contact_id')->freeze();
     }
 
-    //need to assign custom data type and subtype to the template
-    $this->assign('customDataType', 'Activity');
+    //need to assign custom data subtype to the template for the initial loading of the custom data.
     $this->assign('customDataSubType', $this->_activityTypeId);
     $this->assign('entityID', $this->_activityId);
 
@@ -910,12 +909,10 @@ public function postProcess($params = NULL) {
       $params['activity_type_id'] = $this->_activityTypeId;
     }
 
-    if (!empty($params['hidden_custom']) && !isset($params['custom'])) {
-      $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params,
-        $this->_activityId,
-        'Activity'
-      );
-    }
+    $params['custom'] = CRM_Core_BAO_CustomField::postProcess($this->getSubmittedValues(),
+      $this->_activityId,
+      'Activity'
+    );
 
     // format params as arrays
     foreach (['target', 'assignee', 'followup_assignee'] as $name) {
diff --git a/www/modules/civicrm/CRM/Activity/Form/Task/PDF.php b/www/modules/civicrm/CRM/Activity/Form/Task/PDF.php
index 69c1387a4..9fab52a5d 100644
--- a/www/modules/civicrm/CRM/Activity/Form/Task/PDF.php
+++ b/www/modules/civicrm/CRM/Activity/Form/Task/PDF.php
@@ -61,9 +61,9 @@ public function postProcess() {
    *
    * @return \Civi\Token\TokenProcessor
    */
-  public function createTokenProcessor() {
+  public function createTokenProcessor(): TokenProcessor {
     return new TokenProcessor(\Civi::dispatcher(), [
-      'controller' => get_class(),
+      'controller' => __CLASS__,
       'smarty' => FALSE,
       'schema' => ['activityId'],
     ]);
@@ -76,10 +76,8 @@ public function createTokenProcessor() {
    * @param  array $activityIds  array of activity ids
    * @param  string $html_message message text with tokens
    * @param  array $formValues   formValues from the form
-   *
-   * @return array
    */
-  public function createDocument($activityIds, $html_message, $formValues) {
+  public function createDocument($activityIds, $html_message, $formValues): void {
     $tp = $this->createTokenProcessor();
     $tp->addMessage('body_html', $html_message, 'text/html');
 
@@ -88,13 +86,13 @@ public function createDocument($activityIds, $html_message, $formValues) {
     }
     $tp->evaluate();
 
-    return $this->renderFromRows($tp->getRows(), 'body_html', $formValues);
+    $this->renderFromRows($tp->getRows(), 'body_html', $formValues);
   }
 
   /**
    * Render html from rows
    *
-   * @param array $rows
+   * @param \Traversable $rows
    * @param string $msgPart
    *   The name registered with the TokenProcessor
    * @param array $formValues
diff --git a/www/modules/civicrm/CRM/Activity/Form/Task/SMS.php b/www/modules/civicrm/CRM/Activity/Form/Task/SMS.php
index a90c4969e..ed4881dfd 100644
--- a/www/modules/civicrm/CRM/Activity/Form/Task/SMS.php
+++ b/www/modules/civicrm/CRM/Activity/Form/Task/SMS.php
@@ -19,6 +19,8 @@
  */
 class CRM_Activity_Form_Task_SMS extends CRM_Activity_Form_Task {
 
+  use CRM_Contact_Form_Task_SMSTrait;
+
   /**
    * Are we operating in "single mode", i.e. sending sms to one
    * specific contact?
@@ -39,7 +41,19 @@ class CRM_Activity_Form_Task_SMS extends CRM_Activity_Form_Task {
    */
   public function preProcess() {
     parent::preProcess();
-    CRM_Contact_Form_Task_SMSCommon::preProcessProvider($this);
+    $form = $this;
+    $this->bounceOnNoActiveProviders();
+    $activityCheck = 0;
+    foreach ($this->_activityHolderIds as $value) {
+      if (CRM_Core_DAO::getFieldValue('CRM_Activity_DAO_Activity', $value, 'subject', 'id') != CRM_Contact_Form_Task_SMSCommon::RECIEVED_SMS_ACTIVITY_SUBJECT) {
+        $activityCheck++;
+      }
+    }
+    if ($activityCheck == count($this->_activityHolderIds)) {
+      CRM_Core_Error::statusBounce(ts("The Reply SMS Could only be sent for activities with '%1' subject.",
+        [1 => CRM_Contact_Form_Task_SMSCommon::RECIEVED_SMS_ACTIVITY_SUBJECT]
+      ));
+    }
     $this->assign('single', $this->_single);
   }
 
@@ -47,26 +61,81 @@ public function preProcess() {
    * Build the form object.
    */
   public function buildQuickForm() {
-    // Enable form element.
-    $this->assign('SMSTask', TRUE);
-    CRM_Contact_Form_Task_SMSCommon::buildQuickForm($this);
+    $this->buildSmsForm();
   }
 
   /**
-   * Process the form after the input has been submitted and validated.
+   * Get the relevant activity name.
+   *
+   * This is likely to be further refactored/ clarified.
+   *
+   * @internal
+   *
+   * @return string
    */
-  public function postProcess() {
-    CRM_Contact_Form_Task_SMSCommon::postProcess($this);
+  protected function getActivityName() {
+    return 'SMS Received';
   }
 
   /**
-   * List available tokens for this form.
-   *
-   * @return array
+   * @throws \CRM_Core_Exception
    */
-  public function listTokens() {
-    $tokens = CRM_Core_SelectValues::contactTokens();
-    return $tokens;
+  protected function filterContactIDs(): void {
+    $form = $this;
+    if (!empty($this->_activityHolderIds)) {
+      $extendTargetContacts = 0;
+      $invalidActivity = 0;
+      $validActivities = 0;
+      foreach ($form->_activityHolderIds as $id) {
+        //valid activity check
+        if (CRM_Core_DAO::getFieldValue('CRM_Activity_DAO_Activity', $id, 'subject', 'id') !== $this->getActivityName()) {
+          $invalidActivity++;
+          continue;
+        }
+
+        $activityContacts = CRM_Activity_BAO_ActivityContact::buildOptions('record_type_id', 'validate');
+        $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts);
+        //target contacts limit check
+        $ids = array_keys(CRM_Activity_BAO_ActivityContact::getNames($id, $targetID));
+
+        if (count($ids) > 1) {
+          $extendTargetContacts++;
+          continue;
+        }
+        $validActivities++;
+        $form->_contactIds = empty($form->_contactIds) ? $ids : array_unique(array_merge($form->_contactIds, $ids));
+      }
+
+      if (!$validActivities) {
+        $errorMess = "";
+        if ($extendTargetContacts) {
+          $errorMess = ts('One selected activity consists of more than one target contact.', [
+            'count' => $extendTargetContacts,
+            'plural' => '%count selected activities consist of more than one target contact.',
+          ]);
+        }
+        if ($invalidActivity) {
+          $errorMess = ($errorMess ? ' ' : '');
+          $errorMess .= ts('The selected activity is invalid.', [
+            'count' => $invalidActivity,
+            'plural' => '%count selected activities are invalid.',
+          ]);
+        }
+        CRM_Core_Error::statusBounce(ts("%1: SMS Reply will not be sent.", [1 => $errorMess]));
+      }
+    }
+
+    //activity related variables
+    $form->assign('invalidActivity', $invalidActivity ?? NULL);
+    $form->assign('extendTargetContacts', $extendTargetContacts ?? NULL);
+  }
+
+  protected function isInvalidRecipient($contactID): bool {
+    //to check for "if the contact id belongs to a specified activity type"
+    // @todo use the api instead - function is deprecated.
+    $actDetails = CRM_Activity_BAO_Activity::getContactActivity($contactID);
+    return $this->getActivityName() !==
+      CRM_Utils_Array::retrieveValueRecursive($actDetails, 'subject');
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Activity/Import/Controller.php b/www/modules/civicrm/CRM/Activity/Import/Controller.php
deleted file mode 100644
index 772c14620..000000000
--- a/www/modules/civicrm/CRM/Activity/Import/Controller.php
+++ /dev/null
@@ -1,41 +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
- */
-class CRM_Activity_Import_Controller extends CRM_Core_Controller {
-
-  /**
-   * Class constructor.
-   *
-   * @param string $title
-   * @param bool|int $action
-   * @param bool $modal
-   */
-  public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $modal = TRUE) {
-    parent::__construct($title, $modal);
-
-    set_time_limit(0);
-
-    $this->_stateMachine = new CRM_Import_StateMachine($this, $action);
-
-    // create and instantiate the pages
-    $this->addPages($this->_stateMachine, $action);
-
-    // add all the actions
-    $config = CRM_Core_Config::singleton();
-    $this->addActions($config->uploadDir, ['uploadFile']);
-  }
-
-}
diff --git a/www/modules/civicrm/CRM/Activity/Selector/Search.php b/www/modules/civicrm/CRM/Activity/Selector/Search.php
index 6b2babead..34700a363 100644
--- a/www/modules/civicrm/CRM/Activity/Selector/Search.php
+++ b/www/modules/civicrm/CRM/Activity/Selector/Search.php
@@ -268,7 +268,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
       if ($this->_context === 'search') {
         $row['checkbox'] = CRM_Core_Form::CB_PREFIX . $result->activity_id;
       }
-      $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? $result->contact_sub_type : $result->contact_type, FALSE, $result->contact_id
+      $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ?: $result->contact_type, FALSE, $result->contact_id
       );
       $accessMailingReport = FALSE;
       $activityTypeId = $row['activity_type_id'];
diff --git a/www/modules/civicrm/CRM/Admin/Form.php b/www/modules/civicrm/CRM/Admin/Form.php
index dad95d94a..545709698 100644
--- a/www/modules/civicrm/CRM/Admin/Form.php
+++ b/www/modules/civicrm/CRM/Admin/Form.php
@@ -74,7 +74,7 @@ public function preProcess() {
     $this->_BAOName = $this->get('BAOName');
     // Otherwise, look it up from the api entity name
     if (!$this->_BAOName) {
-      $this->_BAOName = CRM_Core_DAO_AllCoreTables::getBAOClassName(CRM_Core_DAO_AllCoreTables::getFullName($this->getDefaultEntity()));
+      $this->_BAOName = CRM_Core_DAO_AllCoreTables::getBAOClassName(CRM_Core_DAO_AllCoreTables::getDAONameForEntity($this->getDefaultEntity()));
     }
     $this->retrieveValues();
     $this->setPageTitle($this->_BAOName::getEntityTitle());
diff --git a/www/modules/civicrm/CRM/Admin/Form/CMSUser.php b/www/modules/civicrm/CRM/Admin/Form/CMSUser.php
index 1d7f61458..8036ea43a 100644
--- a/www/modules/civicrm/CRM/Admin/Form/CMSUser.php
+++ b/www/modules/civicrm/CRM/Admin/Form/CMSUser.php
@@ -25,6 +25,15 @@ class CRM_Admin_Form_CMSUser extends CRM_Core_Form {
    */
   public $submitOnce = TRUE;
 
+  /**
+   * Disable on Standalone
+   */
+  public function preProcess() {
+    if (!\CRM_Utils_System::allowSynchronizeUsers()) {
+      \CRM_Core_Error::statusBounce(ts('This framework doesn\'t allow for syncing CMS users.'));
+    }
+  }
+
   /**
    * Build the form object.
    */
@@ -47,7 +56,7 @@ public function buildQuickForm() {
    * Process the form submission.
    */
   public function postProcess() {
-    $result = CRM_Utils_System::synchronizeUsers();
+    $result = CRM_Utils_System::synchronizeUsersIfAllowed();
 
     $status = ts('Checked one user record.',
         [
diff --git a/www/modules/civicrm/CRM/Admin/Form/MessageTemplates.php b/www/modules/civicrm/CRM/Admin/Form/MessageTemplates.php
index b38f1ff5a..ea23f9711 100644
--- a/www/modules/civicrm/CRM/Admin/Form/MessageTemplates.php
+++ b/www/modules/civicrm/CRM/Admin/Form/MessageTemplates.php
@@ -175,11 +175,11 @@ public function buildQuickForm() {
 
     $this->assign('tokens', CRM_Utils_Token::formatTokensForDisplay($tokens));
 
-    // if not a system message use a wysiwyg editor, CRM-5971
-    if ($this->_id &&
-      CRM_Core_DAO::getFieldValue('CRM_Core_DAO_MessageTemplate',
-        $this->_id,
-        'workflow_id'
+    // if not a system message use a wysiwyg editor, CRM-5971 and dev/core#5154
+    if (
+      $this->_id && (
+        CRM_Core_DAO::getFieldValue('CRM_Core_DAO_MessageTemplate', $this->_id, 'workflow_id') ||
+        CRM_Core_DAO::getFieldValue('CRM_Core_DAO_MessageTemplate', $this->_id, 'workflow_name')
       )
     ) {
       $this->add('textarea', 'msg_html', ts('HTML Message'),
@@ -334,4 +334,12 @@ public function postProcess() {
     }
   }
 
+  /**
+   * Override
+   * @return array
+   */
+  protected function getFieldsToExcludeFromPurification(): array {
+    return ['msg_html'];
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Admin/Form/Options.php b/www/modules/civicrm/CRM/Admin/Form/Options.php
index d63a96389..65aaf7c2f 100644
--- a/www/modules/civicrm/CRM/Admin/Form/Options.php
+++ b/www/modules/civicrm/CRM/Admin/Form/Options.php
@@ -23,6 +23,8 @@
  */
 class CRM_Admin_Form_Options extends CRM_Admin_Form {
 
+  use CRM_Core_Form_EntityFormTrait;
+
   /**
    * The option group name.
    *
@@ -48,6 +50,20 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form {
    */
   public $submitOnce = TRUE;
 
+  /**
+   * Explicitly declare the entity api name.
+   */
+  public function getDefaultEntity() {
+    return 'OptionValue';
+  }
+
+  /**
+   * The Option Group ID.
+   * @var int
+   * @internal
+   */
+  protected $_gid;
+
   /**
    * Pre-process
    */
@@ -98,13 +114,23 @@ public function preProcess() {
 
     $session->pushUserContext(CRM_Utils_System::url($url, $params));
     $this->assign('id', $this->_id);
-
+    $this->setDeleteMessage(ts('WARNING: Deleting this option will result in the loss of all %1 related records which use the option.', [1 => $this->_gLabel]) . ts('This may mean the loss of a substantial amount of data, and the action cannot be undone.') . ts('Do you want to continue?'));
     if ($this->_id && CRM_Core_OptionGroup::isDomainOptionGroup($this->_gName)) {
       $domainID = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionValue', $this->_id, 'domain_id', 'id');
       if (CRM_Core_Config::domainID() != $domainID) {
         CRM_Core_Error::statusBounce(ts('You do not have permission to access this page.'));
       }
     }
+    if ($this->isSubmitted()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('OptionValue', array_filter([
+        'id' => $this->_id,
+        'option_group_id' => $this->_gid,
+      ]));
+    }
   }
 
   /**
@@ -156,6 +182,7 @@ public function buildQuickForm(): void {
     $this->setPageTitle(ts('%1 Option', [1 => $this->_gLabel]));
 
     if ($this->_action & CRM_Core_Action::DELETE) {
+      $this->buildDeleteForm();
       return;
     }
 
@@ -353,6 +380,9 @@ public function buildQuickForm(): void {
     }
 
     $this->addFormRule(['CRM_Admin_Form_Options', 'formRule'], $this);
+    //need to assign subtype to the template
+    $this->assign('customDataSubType', $this->_gid);
+    $this->assign('entityID', $this->_id);
   }
 
   /**
@@ -472,7 +502,7 @@ public function postProcess() {
       }
     }
     else {
-      $params = $this->exportValues();
+      $params = $this->getSubmittedValues();
       if ($this->isGreetingOptionGroup()) {
         $params['filter'] = $params['contact_type_id'];
       }
@@ -494,7 +524,10 @@ public function postProcess() {
       if (isset($params['color']) && strtolower($params['color']) == '#ffffff') {
         $params['color'] = 'null';
       }
-
+      $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params,
+        $this->_id,
+        'OptionValue'
+      );
       $optionValue = CRM_Core_OptionValue::addOptionValue($params, $this->_gName, $this->_action, $this->_id);
 
       CRM_Core_Session::setStatus(ts('The %1 \'%2\' has been saved.', [
@@ -520,4 +553,15 @@ protected function isGreetingOptionGroup(): bool {
     return in_array($this->getOptionGroupName(), ['email_greeting', 'postal_greeting', 'addressee'], TRUE);
   }
 
+  /**
+   * Override
+   * @return array
+   */
+  protected function getFieldsToExcludeFromPurification(): array {
+    if ($this->_gName === 'from_email_address') {
+      return ['label'];
+    }
+    return [];
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Admin/Form/ScheduleReminders.php b/www/modules/civicrm/CRM/Admin/Form/ScheduleReminders.php
index 0fbc86e76..62d947ad2 100644
--- a/www/modules/civicrm/CRM/Admin/Form/ScheduleReminders.php
+++ b/www/modules/civicrm/CRM/Admin/Form/ScheduleReminders.php
@@ -55,6 +55,13 @@ public function getDefaultEntity(): string {
     return 'ActionSchedule';
   }
 
+  /**
+   * @return array
+   */
+  protected function getFieldsToExcludeFromPurification(): array {
+    return ['body_html', 'html_message'];
+  }
+
   /**
    * Because `CRM_Mailing_BAO_Mailing::commonCompose` uses different fieldNames than `CRM_Core_DAO_ActionSchedule`.
    * @var array
@@ -179,7 +186,7 @@ public function buildQuickForm(): void {
     $this->add('select', 'absolute_or_relative_date', ts('When (trigger date)'), ['relative' => ts('Relative Date'), 'absolute' => ts('Choose Date')], TRUE);
 
     // SMS-only fields
-    $providersCount = CRM_SMS_BAO_Provider::activeProviderCount();
+    $providersCount = CRM_SMS_BAO_SmsProvider::activeProviderCount();
     $this->assign('sms', $providersCount);
     if ($providersCount) {
       $this->addField('mode', ['placeholder' => FALSE, 'option_url' => FALSE], TRUE)->setAttribute('class', 'crm-form-select');
@@ -190,8 +197,10 @@ public function buildQuickForm(): void {
     $multilingual = CRM_Core_I18n::isMultilingual();
     $this->assign('multilingual', $multilingual);
     if ($multilingual) {
-      $this->addField('filter_contact_language', ['placeholder' => ts('Any language')]);
-      $this->addField('communication_language', ['placeholder' => 'System default language']);
+      $filterLanguages = \CRM_Core_BAO_ActionSchedule::getFilterContactLanguageOptions();
+      $this->addField('filter_contact_language', ['placeholder' => ts('Any language'), 'options' => $filterLanguages]);
+      $communicationLanguages = \CRM_Core_BAO_ActionSchedule::getCommunicationLanguageOptions();
+      $this->addField('communication_language', ['placeholder' => 'System default language', 'options' => $communicationLanguages]);
     }
 
     // Message fields
diff --git a/www/modules/civicrm/CRM/Admin/Form/Setting.php b/www/modules/civicrm/CRM/Admin/Form/Setting.php
index 745bd5881..154da5b91 100644
--- a/www/modules/civicrm/CRM/Admin/Form/Setting.php
+++ b/www/modules/civicrm/CRM/Admin/Form/Setting.php
@@ -22,6 +22,14 @@ class CRM_Admin_Form_Setting extends CRM_Core_Form {
 
   use CRM_Admin_Form_SettingTrait;
 
+  /**
+   * Subset of settings on the page as defined using the legacy method.
+   *
+   * @var array
+   *
+   * @deprecated - do not add new settings here - the page to display
+   * settings on should be defined in the setting metadata.
+   */
   protected $_settings = [];
 
   /**
diff --git a/www/modules/civicrm/CRM/Admin/Form/Setting/Case.php b/www/modules/civicrm/CRM/Admin/Form/Setting/Case.php
index c952ac24d..481bd27b9 100644
--- a/www/modules/civicrm/CRM/Admin/Form/Setting/Case.php
+++ b/www/modules/civicrm/CRM/Admin/Form/Setting/Case.php
@@ -20,7 +20,16 @@
  */
 class CRM_Admin_Form_Setting_Case extends CRM_Admin_Form_Setting {
 
+  /**
+   * Subset of settings on the page as defined using the legacy method.
+   *
+   * @var array
+   *
+   * @deprecated - do not add new settings here - the page to display
+   * settings on should be defined in the setting metadata.
+   */
   protected $_settings = [
+    // @todo remove these, define any not yet defined in the setting metadata.
     'civicaseRedactActivityEmail' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
     'civicaseAllowMultipleClients' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
     'civicaseNaturalActivityTypeSort' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
diff --git a/www/modules/civicrm/CRM/Admin/Form/Setting/Component.php b/www/modules/civicrm/CRM/Admin/Form/Setting/Component.php
index 070e9b393..de53c3a03 100644
--- a/www/modules/civicrm/CRM/Admin/Form/Setting/Component.php
+++ b/www/modules/civicrm/CRM/Admin/Form/Setting/Component.php
@@ -21,7 +21,16 @@
 class CRM_Admin_Form_Setting_Component extends CRM_Admin_Form_Setting {
   protected $_components;
 
+  /**
+   * Subset of settings on the page as defined using the legacy method.
+   *
+   * @var array
+   *
+   * @deprecated - do not add new settings here - the page to display
+   * settings on should be defined in the setting metadata.
+   */
   protected $_settings = [
+    // @todo remove these, define any not yet defined in the setting metadata.
     'enable_components' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
   ];
 
diff --git a/www/modules/civicrm/CRM/Admin/Form/Setting/Date.php b/www/modules/civicrm/CRM/Admin/Form/Setting/Date.php
index a85078cd8..a773ec294 100644
--- a/www/modules/civicrm/CRM/Admin/Form/Setting/Date.php
+++ b/www/modules/civicrm/CRM/Admin/Form/Setting/Date.php
@@ -20,7 +20,16 @@
  */
 class CRM_Admin_Form_Setting_Date extends CRM_Admin_Form_Setting {
 
-  public $_settings = [
+  /**
+   * Subset of settings on the page as defined using the legacy method.
+   *
+   * @var array
+   *
+   * @deprecated - do not add new settings here - the page to display
+   * settings on should be defined in the setting metadata.
+   */
+  protected $_settings = [
+    // @todo remove these, define any not yet defined in the setting metadata.
     'dateformatDatetime' => CRM_Core_BAO_Setting::LOCALIZATION_PREFERENCES_NAME,
     'dateformatFull' => CRM_Core_BAO_Setting::LOCALIZATION_PREFERENCES_NAME,
     'dateformatPartial' => CRM_Core_BAO_Setting::LOCALIZATION_PREFERENCES_NAME,
diff --git a/www/modules/civicrm/CRM/Admin/Form/Setting/Debugging.php b/www/modules/civicrm/CRM/Admin/Form/Setting/Debugging.php
index a328af40c..fe4e7676d 100644
--- a/www/modules/civicrm/CRM/Admin/Form/Setting/Debugging.php
+++ b/www/modules/civicrm/CRM/Admin/Form/Setting/Debugging.php
@@ -20,7 +20,16 @@
  */
 class CRM_Admin_Form_Setting_Debugging extends CRM_Admin_Form_Setting {
 
+  /**
+   * Subset of settings on the page as defined using the legacy method.
+   *
+   * @var array
+   *
+   * @deprecated - do not add new settings here - the page to display
+   * settings on should be defined in the setting metadata.
+   */
   protected $_settings = [
+    // @todo remove these, define any not yet defined in the setting metadata.
     'debug_enabled' => CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME,
     'backtrace' => CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME,
     'fatalErrorHandler' => CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME,
diff --git a/www/modules/civicrm/CRM/Admin/Form/Setting/Localization.php b/www/modules/civicrm/CRM/Admin/Form/Setting/Localization.php
index 6d4f6ac70..28a3198ba 100644
--- a/www/modules/civicrm/CRM/Admin/Form/Setting/Localization.php
+++ b/www/modules/civicrm/CRM/Admin/Form/Setting/Localization.php
@@ -23,7 +23,16 @@
  */
 class CRM_Admin_Form_Setting_Localization extends CRM_Admin_Form_Setting {
 
+  /**
+   * Subset of settings on the page as defined using the legacy method.
+   *
+   * @var array
+   *
+   * @deprecated - do not add new settings here - the page to display
+   * settings on should be defined in the setting metadata.
+   */
   protected $_settings = [
+    // @todo remove these, define any not yet defined in the setting metadata.
     'contact_default_language' => CRM_Core_BAO_Setting::LOCALIZATION_PREFERENCES_NAME,
     'countryLimit' => CRM_Core_BAO_Setting::LOCALIZATION_PREFERENCES_NAME,
     'customTranslateFunction' => CRM_Core_BAO_Setting::LOCALIZATION_PREFERENCES_NAME,
diff --git a/www/modules/civicrm/CRM/Admin/Form/Setting/Mail.php b/www/modules/civicrm/CRM/Admin/Form/Setting/Mail.php
index 358c87f81..c3392067f 100644
--- a/www/modules/civicrm/CRM/Admin/Form/Setting/Mail.php
+++ b/www/modules/civicrm/CRM/Admin/Form/Setting/Mail.php
@@ -20,7 +20,16 @@
  */
 class CRM_Admin_Form_Setting_Mail extends CRM_Admin_Form_Setting {
 
+  /**
+   * Subset of settings on the page as defined using the legacy method.
+   *
+   * @var array
+   *
+   * @deprecated - do not add new settings here - the page to display
+   * settings on should be defined in the setting metadata.
+   */
   protected $_settings = [
+    // @todo remove these, define any not yet defined in the setting metadata.
     'mailerBatchLimit' => CRM_Core_BAO_Setting::MAILING_PREFERENCES_NAME,
     'mailThrottleTime' => CRM_Core_BAO_Setting::MAILING_PREFERENCES_NAME,
     'mailerJobSize' => CRM_Core_BAO_Setting::MAILING_PREFERENCES_NAME,
diff --git a/www/modules/civicrm/CRM/Admin/Form/Setting/Mapping.php b/www/modules/civicrm/CRM/Admin/Form/Setting/Mapping.php
index 69b7fb7c9..99a674b96 100644
--- a/www/modules/civicrm/CRM/Admin/Form/Setting/Mapping.php
+++ b/www/modules/civicrm/CRM/Admin/Form/Setting/Mapping.php
@@ -20,7 +20,16 @@
  */
 class CRM_Admin_Form_Setting_Mapping extends CRM_Admin_Form_Setting {
 
+  /**
+   * Subset of settings on the page as defined using the legacy method.
+   *
+   * @var array
+   *
+   * @deprecated - do not add new settings here - the page to display
+   * settings on should be defined in the setting metadata.
+   */
   protected $_settings = [
+    // @todo remove these, define any not yet defined in the setting metadata.
     'mapAPIKey' => CRM_Core_BAO_Setting::MAP_PREFERENCES_NAME,
     'mapProvider' => CRM_Core_BAO_Setting::MAP_PREFERENCES_NAME,
     'geoAPIKey' => CRM_Core_BAO_Setting::MAP_PREFERENCES_NAME,
diff --git a/www/modules/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php b/www/modules/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php
index 76c80cf4f..62bc2c30b 100644
--- a/www/modules/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php
+++ b/www/modules/civicrm/CRM/Admin/Form/Setting/Miscellaneous.php
@@ -20,7 +20,16 @@
  */
 class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting {
 
+  /**
+   * Subset of settings on the page as defined using the legacy method.
+   *
+   * @var array
+   *
+   * @deprecated - do not add new settings here - the page to display
+   * settings on should be defined in the setting metadata.
+   */
   protected $_settings = [
+    // @todo remove these, define any not yet defined in the setting metadata.
     'max_attachments' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
     'max_attachments_backend' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
     'contact_undelete' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
diff --git a/www/modules/civicrm/CRM/Admin/Form/Setting/Path.php b/www/modules/civicrm/CRM/Admin/Form/Setting/Path.php
index e30462e34..e728319ec 100644
--- a/www/modules/civicrm/CRM/Admin/Form/Setting/Path.php
+++ b/www/modules/civicrm/CRM/Admin/Form/Setting/Path.php
@@ -20,7 +20,16 @@
  */
 class CRM_Admin_Form_Setting_Path extends CRM_Admin_Form_Setting {
 
+  /**
+   * Subset of settings on the page as defined using the legacy method.
+   *
+   * @var array
+   *
+   * @deprecated - do not add new settings here - the page to display
+   * settings on should be defined in the setting metadata.
+   */
   protected $_settings = [
+    // @todo remove these, define any not yet defined in the setting metadata.
     'uploadDir' => CRM_Core_BAO_Setting::DIRECTORY_PREFERENCES_NAME,
     'imageUploadDir' => CRM_Core_BAO_Setting::DIRECTORY_PREFERENCES_NAME,
     'customFileUploadDir' => CRM_Core_BAO_Setting::DIRECTORY_PREFERENCES_NAME,
diff --git a/www/modules/civicrm/CRM/Admin/Form/Setting/Smtp.php b/www/modules/civicrm/CRM/Admin/Form/Setting/Smtp.php
index 6670e4a63..fe967d919 100644
--- a/www/modules/civicrm/CRM/Admin/Form/Setting/Smtp.php
+++ b/www/modules/civicrm/CRM/Admin/Form/Setting/Smtp.php
@@ -20,7 +20,17 @@
  */
 class CRM_Admin_Form_Setting_Smtp extends CRM_Admin_Form_Setting {
   protected $_testButtonName;
+
+  /**
+   * Subset of settings on the page as defined using the legacy method.
+   *
+   * @var array
+   *
+   * @deprecated - do not add new settings here - the page to display
+   * settings on should be defined in the setting metadata.
+   */
   protected $_settings = [
+    // @todo remove these, define any not yet defined in the setting metadata.
     'allow_mail_from_logged_in_contact' => CRM_Core_BAO_Setting::DIRECTORY_PREFERENCES_NAME,
   ];
 
@@ -120,9 +130,6 @@ public function postProcess() {
 
         $to = '"' . $toDisplayName . '"' . "<$toEmail>";
         $from = '"' . $domainEmailName . '" <' . $domainEmailAddress . '>';
-        $testMailStatusMsg = ts('Sending test email') . ':<br />'
-          . ts('From: %1', [1 => $domainEmailAddress]) . '<br />'
-          . ts('To: %1', [1 => $toEmail]) . '<br />';
 
         $params = [];
         if ($formValues['outBound_option'] == CRM_Mailing_Config::OUTBOUND_OPTION_SMTP) {
@@ -163,32 +170,16 @@ public function postProcess() {
           $mailerName = 'mail';
         }
 
-        $headers = [
-          'From' => $from,
-          'To' => $to,
-          'Subject' => $subject,
+        $mailParams = [
+          'from' => $from,
+          'to' => $to,
+          'subject' => $subject,
+          'text' => $message,
+          'toEmail' => $toEmail,
         ];
 
         $mailer = CRM_Utils_Mail::_createMailer($mailerName, $params);
-
-        try {
-          $mailer->send($toEmail, $headers, $message);
-          if (defined('CIVICRM_MAIL_LOG') && defined('CIVICRM_MAIL_LOG_AND_SEND')) {
-            $testMailStatusMsg .= '<br />' . ts('You have defined CIVICRM_MAIL_LOG_AND_SEND - mail will be logged.') . '<br /><br />';
-          }
-          if (defined('CIVICRM_MAIL_LOG') && !defined('CIVICRM_MAIL_LOG_AND_SEND')) {
-            CRM_Core_Session::setStatus($testMailStatusMsg . ts('You have defined CIVICRM_MAIL_LOG - no mail will be sent.  Your %1 settings have not been tested.', [1 => strtoupper($mailerName)]), ts("Mail not sent"), "warning");
-          }
-          else {
-            CRM_Core_Session::setStatus($testMailStatusMsg . ts('Your %1 settings are correct. A test email has been sent to your email address.', [1 => strtoupper($mailerName)]), ts("Mail Sent"), "success");
-          }
-        }
-        catch (Exception $e) {
-          $result = $e;
-          Civi::log()->error($e->getMessage());
-          $errorMessage = CRM_Utils_Mail::errorMessage($mailer, $result);
-          CRM_Core_Session::setStatus($testMailStatusMsg . ts('Oops. Your %1 settings are incorrect. No test mail has been sent.', [1 => strtoupper($mailerName)]) . $errorMessage, ts("Mail Not Sent"), "error");
-        }
+        CRM_Utils_Mail::sendTest($mailer, $mailParams);
       }
     }
 
diff --git a/www/modules/civicrm/CRM/Admin/Form/Setting/UF.php b/www/modules/civicrm/CRM/Admin/Form/Setting/UF.php
index 041a3f5ff..4ab621792 100644
--- a/www/modules/civicrm/CRM/Admin/Form/Setting/UF.php
+++ b/www/modules/civicrm/CRM/Admin/Form/Setting/UF.php
@@ -20,8 +20,6 @@
  */
 class CRM_Admin_Form_Setting_UF extends CRM_Admin_Form_Setting {
 
-  protected $_settings = [];
-
   protected $_uf = NULL;
 
   /**
diff --git a/www/modules/civicrm/CRM/Admin/Form/Setting/Url.php b/www/modules/civicrm/CRM/Admin/Form/Setting/Url.php
index 85151cbe7..6d4463219 100644
--- a/www/modules/civicrm/CRM/Admin/Form/Setting/Url.php
+++ b/www/modules/civicrm/CRM/Admin/Form/Setting/Url.php
@@ -19,9 +19,21 @@
  * This class generates form components for Site Url.
  */
 class CRM_Admin_Form_Setting_Url extends CRM_Admin_Form_Setting {
+
+  /**
+   * Subset of settings on the page as defined using the legacy method.
+   *
+   * @var array
+   *
+   * @deprecated - do not add new settings here - the page to display
+   * settings on should be defined in the setting metadata.
+   */
   protected $_settings = [
+    // @todo remove these, define any not yet defined in the setting metadata.
     'disable_core_css' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
     'defaultExternUrl' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
+    'enableSSL' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
+    'verifySSL' => CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
     'userFrameworkResourceURL' => CRM_Core_BAO_Setting::URL_PREFERENCES_NAME,
     'imageUploadURL' => CRM_Core_BAO_Setting::URL_PREFERENCES_NAME,
     'customCSSURL' => CRM_Core_BAO_Setting::URL_PREFERENCES_NAME,
@@ -33,15 +45,6 @@ class CRM_Admin_Form_Setting_Url extends CRM_Admin_Form_Setting {
    */
   public function buildQuickForm() {
     $this->setTitle(ts('Settings - Resource URLs'));
-    $settingFields = civicrm_api('setting', 'getfields', [
-      'version' => 3,
-    ]);
-
-    $this->addYesNo('enableSSL', ts('Force Secure URLs (SSL)'));
-    $this->addYesNo('verifySSL', ts('Verify SSL Certs'));
-    // FIXME: verifySSL should use $_settings instead of manually adding fields
-    $this->assign('verifySSL_description', $settingFields['values']['verifySSL']['description']);
-
     $this->addFormRule(['CRM_Admin_Form_Setting_Url', 'formRule']);
 
     parent::buildQuickForm();
diff --git a/www/modules/civicrm/CRM/Admin/Page/AJAX.php b/www/modules/civicrm/CRM/Admin/Page/AJAX.php
index 5552495c4..0151966b5 100644
--- a/www/modules/civicrm/CRM/Admin/Page/AJAX.php
+++ b/www/modules/civicrm/CRM/Admin/Page/AJAX.php
@@ -241,7 +241,21 @@ public static function getStatusMsg() {
 
         case 'CRM_Contact_BAO_Group':
           $ret['content'] = ts('Are you sure you want to disable this Group?');
-          $ret['content'] .= '<br /><br /><strong>' . ts('WARNING - Disabling this group will disable all the child groups associated if any.') . '</strong>';
+          $sgContent = '';
+          $sgReferencingThisGroup = CRM_Contact_BAO_SavedSearch::getSmartGroupsUsingGroup($recordID);
+          if (!empty($sgReferencingThisGroup)) {
+            $sgContent .= '<br /><br /><strong>' . ts('WARNING - This Group is currently referenced by %1 smart group(s).', [
+              1 => count($sgReferencingThisGroup),
+            ]) . '</strong><ul>';
+            foreach ($sgReferencingThisGroup as $gid => $group) {
+              $sgContent .= '<li>' . ts('%1 <a class="action-item crm-hover-button" href="%2" target="_blank">Edit Smart Group Criteria</a>', [
+                1 => $group['title'],
+                2 => $group['editSearchURL'],
+              ]) . '</li>';
+            }
+            $sgContent .= '</ul>' . ts('Disabling this group will cause these groups to no longer restrict members based on membership in this group. Please edit and remove this group as a criteria from these smart groups.');
+          }
+          $ret['content'] .= $sgContent . '<br /><br /><strong>' . ts('WARNING - Disabling this group will disable all the child groups associated if any.') . '</strong>';
           break;
 
         case 'CRM_Core_BAO_OptionGroup':
@@ -337,7 +351,7 @@ public static function getTagTree() {
             'is_selectable' => (bool) $dao->is_selectable,
             'is_reserved' => (bool) $dao->is_reserved,
             'used_for' => $usedFor,
-            'color' => $dao->color ? $dao->color : '#ffffff',
+            'color' => $dao->color ?: '#ffffff',
             'usages' => civicrm_api3('EntityTag', 'getcount', [
               'entity_table' => ['IN' => $usedFor],
               'tag_id' => $dao->id,
diff --git a/www/modules/civicrm/CRM/Admin/Page/Extensions.php b/www/modules/civicrm/CRM/Admin/Page/Extensions.php
index d04ad328e..27505fa06 100644
--- a/www/modules/civicrm/CRM/Admin/Page/Extensions.php
+++ b/www/modules/civicrm/CRM/Admin/Page/Extensions.php
@@ -270,7 +270,7 @@ public function formatRemoteExtensionRows($localExtensionRows) {
       );
       if (isset($localExtensionRows[$info->key])) {
         if (array_key_exists('version', $localExtensionRows[$info->key])) {
-          if (version_compare($localExtensionRows[$info->key]['version'], $info->version, '<')) {
+          if (version_compare($localExtensionRows[$info->key]['version'] ?? '', $info->version, '<')) {
             $row['upgradelink'] = $mapper->getUpgradeLink($remoteExtensions[$info->key], $localExtensionRows[$info->key]);
           }
         }
@@ -361,6 +361,7 @@ private static function fillMissingInfoKeys(array $info) {
       'comments' => FALSE,
     ];
     $info = array_merge($defaultKeys, $info);
+    $info['is_stable'] = $info['develStage'] === 'stable' && !preg_match(";(alpha|beta|dev);", $info['version']);
     foreach ($info['authors'] as &$author) {
       $author = array_merge(['homepage' => ''], $author);
     }
diff --git a/www/modules/civicrm/CRM/Admin/Page/MessageTemplates.php b/www/modules/civicrm/CRM/Admin/Page/MessageTemplates.php
index 1de19bfc7..e50a43033 100644
--- a/www/modules/civicrm/CRM/Admin/Page/MessageTemplates.php
+++ b/www/modules/civicrm/CRM/Admin/Page/MessageTemplates.php
@@ -260,6 +260,10 @@ public function browse() {
     $messageTemplate->find();
     while ($messageTemplate->fetch()) {
       $values[$messageTemplate->id] = ['class' => ''];
+      // Make the subject a empty string if it isn't defined
+      if (!isset($messageTemplate->msg_subject)) {
+        $messageTemplate->msg_subject = "";
+      }
       CRM_Core_DAO::storeValues($messageTemplate, $values[$messageTemplate->id]);
       // populate action links
       $this->action($messageTemplate, $action, $values[$messageTemplate->id], $links, CRM_Core_Permission::EDIT);
@@ -281,6 +285,7 @@ public function browse() {
     $this->assign('canEditSystemTemplates', CRM_Core_Permission::check('edit system workflow message templates'));
     $this->assign('canEditMessageTemplates', CRM_Core_Permission::check('edit message templates'));
     $this->assign('canEditUserDrivenMessageTemplates', CRM_Core_Permission::check('edit user-driven message templates'));
+    $this->assign('isCiviMailEnabled', CRM_Core_Component::isEnabled('CiviMail'));
     Civi::resources()
       ->addScriptFile('civicrm', 'templates/CRM/common/TabHeader.js', 1, 'html-header')
       ->addSetting([
diff --git a/www/modules/civicrm/CRM/Admin/Page/Options.php b/www/modules/civicrm/CRM/Admin/Page/Options.php
index 19954130e..a092c0663 100644
--- a/www/modules/civicrm/CRM/Admin/Page/Options.php
+++ b/www/modules/civicrm/CRM/Admin/Page/Options.php
@@ -83,6 +83,8 @@ public function preProcess() {
     }
     // If we don't have a group we will browse all groups
     if (!self::$_gName) {
+      // Ensure that gName is assigned to the template to prevent smarty notice.
+      $this->assign('gName');
       return;
     }
     $this->set('gName', self::$_gName);
diff --git a/www/modules/civicrm/CRM/Badge/BAO/Layout.php b/www/modules/civicrm/CRM/Badge/BAO/Layout.php
index b41486847..6d2bf4545 100644
--- a/www/modules/civicrm/CRM/Badge/BAO/Layout.php
+++ b/www/modules/civicrm/CRM/Badge/BAO/Layout.php
@@ -100,6 +100,7 @@ public static function del($printLabelId) {
    */
   public static function getList() {
     $printLabel = new CRM_Core_DAO_PrintLabel();
+    $printLabel->is_active = 1;
     $printLabel->find();
 
     $labels = [];
diff --git a/www/modules/civicrm/CRM/Batch/DAO/Batch.php b/www/modules/civicrm/CRM/Batch/DAO/Batch.php
index b0731fcf1..e35876b29 100644
--- a/www/modules/civicrm/CRM/Batch/DAO/Batch.php
+++ b/www/modules/civicrm/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:9b0fed60412874a7e3ebcaabe143bb18)
+ * (GenCodeChecksum:bb8185601a849ffb9d02740709d60674)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Batch/DAO/EntityBatch.php b/www/modules/civicrm/CRM/Batch/DAO/EntityBatch.php
index 3f49ec82b..015ee6fa3 100644
--- a/www/modules/civicrm/CRM/Batch/DAO/EntityBatch.php
+++ b/www/modules/civicrm/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:c2622d64e4cab3d7fb2a2b1cc2424efd)
+ * (GenCodeChecksum:1a1671244f5bfc0adb9c7c5e4aa80b50)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Batch/Form/Entry.php b/www/modules/civicrm/CRM/Batch/Form/Entry.php
index 01b40c1da..50fa0f531 100644
--- a/www/modules/civicrm/CRM/Batch/Form/Entry.php
+++ b/www/modules/civicrm/CRM/Batch/Form/Entry.php
@@ -22,13 +22,6 @@
  */
 class CRM_Batch_Form_Entry extends CRM_Core_Form {
 
-  /**
-   * Maximum profile fields that will be displayed.
-   *
-   * @var int
-   */
-  protected $_rowCount = 1;
-
   /**
    * Batch id.
    *
@@ -71,13 +64,6 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
    */
   protected $currentRowIsRenewOption;
 
-  /**
-   * Contact fields.
-   *
-   * @var array
-   */
-  protected $_contactFields = [];
-
   /**
    * Fields array of fields in the batch profile.
    *
@@ -135,7 +121,7 @@ public function setCurrentRowContributionID(int $currentRowContributionID): void
   }
 
   /**
-   * @return mixed
+   * @return int
    */
   public function getCurrentRowMembershipID() {
     return $this->currentRowMembershipID;
@@ -207,7 +193,7 @@ public function preProcess() {
       $this->assign('batchTotal', !empty($this->_batchInfo['total']) ? $this->_batchInfo['total'] : NULL);
       $this->assign('batchType', $this->_batchInfo['type_id']);
 
-      // get the profile id associted with this batch type
+      // get the profile id associated with this batch type
       $this->_profileId = CRM_Batch_BAO_Batch::getProfileId($this->_batchInfo['type_id']);
     }
     CRM_Core_Resources::singleton()
@@ -239,7 +225,7 @@ public function setBatchID($id) {
    *
    * @throws \CRM_Core_Exception
    */
-  public function buildQuickForm() {
+  public function buildQuickForm(): void {
     if (!$this->_profileId) {
       CRM_Core_Error::statusBounce(ts('Profile for bulk data entry is missing.'));
     }
@@ -260,14 +246,7 @@ public function buildQuickForm() {
 
     $this->_fields = CRM_Core_BAO_UFGroup::getFields($this->_profileId, FALSE, CRM_Core_Action::VIEW);
 
-    // remove file type field and then limit fields
-    $suppressFields = FALSE;
     foreach ($this->_fields as $name => $field) {
-      if ($cfID = CRM_Core_BAO_CustomField::getKeyID($name) && $this->_fields[$name]['html_type'] == 'Autocomplete-Select') {
-        $suppressFields = TRUE;
-        unset($this->_fields[$name]);
-      }
-
       //fix to reduce size as we are using this field in grid
       if (is_array($field['attributes']) && $this->_fields[$name]['attributes']['size'] > 19) {
         //shrink class to "form-text-medium"
@@ -321,7 +300,7 @@ public function buildQuickForm() {
         'placeholder' => ts('- select -'),
       ]);
 
-      // special field specific to membership batch udpate
+      // special field specific to membership batch update
       if ($this->_batchInfo['type_id'] == 2) {
         $options = [
           1 => ts('Add Membership'),
@@ -350,7 +329,7 @@ public function buildQuickForm() {
         $this->add('select', "open_pledges[$rowNumber]", '', $options);
       }
 
-      foreach ($this->_fields as $name => $field) {
+      foreach ($this->_fields as $field) {
         if (in_array($field['field_type'], $contactTypes)) {
           $fld = explode('-', $field['name']);
           $contactReturnProperties[$field['name']] = $fld[0];
@@ -385,10 +364,6 @@ public function buildQuickForm() {
 
     // don't set the status message when form is submitted.
     $buttonName = $this->controller->getButtonName('submit');
-
-    if ($suppressFields && $buttonName != '_qf_Entry_next') {
-      CRM_Core_Session::setStatus(ts("File type field(s) in the selected profile are not supported for Update multiple records."), ts('Some Fields Excluded'), 'info');
-    }
   }
 
   /**
@@ -403,6 +378,7 @@ public function buildQuickForm() {
    *
    * @return array
    *   list of errors to be posted back to the form
+   * @throws \CRM_Core_Exception
    */
   public static function formRule($params, $files, $self) {
     $errors = [];
@@ -436,7 +412,7 @@ public static function formRule($params, $files, $self) {
 
     $batchTotal = 0;
     foreach ($params['field'] as $key => $value) {
-      $batchTotal += ($value['total_amount'] ?: 0);
+      $batchTotal += (float) (CRM_Utils_Rule::cleanMoney($value['total_amount'] ?: 0));
 
       //validate for soft credit fields
       if (!empty($params['soft_credit_contact_id'][$key]) && empty($params['soft_credit_amount'][$key])) {
@@ -566,7 +542,7 @@ public function postProcess() {
    *
    * @throws \CRM_Core_Exception
    */
-  private function processContribution(&$params) {
+  private function processContribution(array &$params): bool {
 
     foreach ($this->submittableMoneyFields as $moneyField) {
       foreach ($params['field'] as $index => $fieldValues) {
@@ -703,8 +679,8 @@ private function processContribution(&$params) {
           if (is_numeric($pledgeId)) {
             $result = CRM_Pledge_BAO_PledgePayment::getPledgePayments($pledgeId);
             $pledgePaymentId = 0;
-            foreach ($result as $key => $values) {
-              if ($values['status'] != 'Completed') {
+            foreach ($result as $values) {
+              if ($values['status'] !== 'Completed') {
                 $pledgePaymentId = $values['id'];
                 break;
               }
@@ -771,7 +747,7 @@ private function processMembership(array $params) {
     $batchTotal = 0;
     // get the price set associated with offline membership
     $priceSetId = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceSet', 'default_membership_type_amount', 'id', 'name');
-    $this->_priceSet = $priceSets = current(CRM_Price_BAO_PriceSet::getSetDetail($priceSetId));
+    $this->_priceSet = current(CRM_Price_BAO_PriceSet::getSetDetail($priceSetId));
 
     if (isset($params['field'])) {
       // @todo - most of the wrangling in this function is because the api is not being used, especially date stuff.
@@ -868,7 +844,7 @@ private function processMembership(array $params) {
               'total_amount' => $order->getTotalAmount() + $order->getTotalTaxAmount(),
               'check_number' => $this->currentRow['check_number'] ?? '',
               'trxn_date' => $this->currentRow['receive_date'],
-              'trxn_id' => $this->currentRow['trxn_id'],
+              'trxn_id' => $this->currentRow['trxn_id'] ?? '',
               'payment_instrument_id' => $this->currentRow['payment_instrument_id'],
               'contribution_id' => $this->getCurrentRowContributionID(),
               'is_send_contribution_notification' => FALSE,
@@ -885,13 +861,10 @@ private function processMembership(array $params) {
         //process premiums
         if (!empty($value['product_name'])) {
           if ($value['product_name'][0] > 0) {
-            [$products, $options] = CRM_Contribute_BAO_Premium::getPremiumProductInfo();
+            [, $options] = CRM_Contribute_BAO_Premium::getPremiumProductInfo();
 
             $value['hidden_Premium'] = 1;
-            $value['product_option'] = CRM_Utils_Array::value(
-              $value['product_name'][1],
-              $options[$value['product_name'][0]]
-            );
+            $value['product_option'] = $options[$value['product_name'][0]][$value['product_name'][1]] ?? NULL;
 
             $premiumParams = [
               'product_id' => $value['product_name'][0],
@@ -941,11 +914,11 @@ protected function emailReceipt($form, &$formValues): bool {
 
     if (!empty($formValues['contribution_status_id'])) {
       $form->assign('contributionStatusID', $formValues['contribution_status_id']);
-      $form->assign('contributionStatus', CRM_Contribute_PseudoConstant::contributionStatus($formValues['contribution_status_id'], 'name'));
+      $form->assign('contributionStatus', CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $formValues['contribution_status_id']));
     }
 
     $form->assign('receiptType', $this->currentRowIsRenew() ? 'membership renewal' : 'membership signup');
-    $form->assign('receive_date', CRM_Utils_Array::value('receive_date', $formValues));
+    $form->assign('receive_date', $formValues['receive_date'] ?? NULL);
     $form->assign('formValues', $formValues);
 
     $form->assign('mem_start_date', CRM_Utils_Date::formatDateOnlyLong($membership->start_date));
@@ -988,6 +961,9 @@ protected function emailReceipt($form, &$formValues): bool {
    *
    * @param array $value
    *   Associated array of submitted values.
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \Civi\API\Exception\UnauthorizedException
    */
   private function updateContactInfo(array &$value) {
     $value['preserveDBName'] = $this->_preserveDefault;
@@ -1008,7 +984,8 @@ private function updateContactInfo(array &$value) {
    *
    * @param array $params
    *
-   * @return bool
+   * @return float
+   * @throws \CRM_Core_Exception
    */
   public function testProcessMembership($params) {
     return $this->processMembership($params);
@@ -1189,7 +1166,7 @@ private function currentRowIsRenew(): bool {
    */
   protected function getCurrentMembership() {
     if (!isset($this->currentRowExistingMembership)) {
-      // CRM-7297 - allow membership type to be be changed during renewal so long as the parent org of new membershipType
+      // CRM-7297 - allow membership type to 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
       $this->currentRowExistingMembership = CRM_Member_BAO_Membership::getContactMembership($this->getCurrentRowContactID(), $this->getCurrentRowMembershipTypeID(),
         FALSE, NULL, TRUE
@@ -1206,6 +1183,7 @@ protected function getCurrentMembership() {
    * Get the params as related to the membership entity.
    *
    * @return array
+   * @throws \CRM_Core_Exception
    */
   private function getCurrentRowMembershipParams(): array {
     return array_merge($this->getCurrentRowCustomParams(), [
diff --git a/www/modules/civicrm/CRM/Campaign/BAO/Survey.php b/www/modules/civicrm/CRM/Campaign/BAO/Survey.php
index 9976b33dc..10b529230 100644
--- a/www/modules/civicrm/CRM/Campaign/BAO/Survey.php
+++ b/www/modules/civicrm/CRM/Campaign/BAO/Survey.php
@@ -159,14 +159,13 @@ public static function getSurveyActivityType($returnColumn = 'label', $includePe
   }
 
   /**
-   * Get Surveys custom groups.
+   * @deprecated since 5.71 will be removed around 5.85.
    *
    * @param array $surveyTypes
-   *   an array of survey type id.
-   *
    * @return array
    */
   public static function getSurveyCustomGroups($surveyTypes = []) {
+    CRM_Core_Error::deprecatedFunctionWarning('API');
     $customGroups = [];
     if (!is_array($surveyTypes)) {
       $surveyTypes = [$surveyTypes];
@@ -311,7 +310,7 @@ public static function voterDetails($voterIds, $returnProperties = []) {
         foreach ($returnProperties as $property => $ignore) {
           $voterDetails[$contact->contactId][$property] = $contact->$property;
         }
-        $image = CRM_Contact_BAO_Contact_Utils::getImage($contact->contact_sub_type ? $contact->contact_sub_type : $contact->contact_type,
+        $image = CRM_Contact_BAO_Contact_Utils::getImage($contact->contact_sub_type ?: $contact->contact_type,
           FALSE,
           $contact->contactId
         );
diff --git a/www/modules/civicrm/CRM/Campaign/DAO/Campaign.php b/www/modules/civicrm/CRM/Campaign/DAO/Campaign.php
index e30faa115..2beb14bc1 100644
--- a/www/modules/civicrm/CRM/Campaign/DAO/Campaign.php
+++ b/www/modules/civicrm/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:a54430a3a190945a3252b69151eb26ff)
+ * (GenCodeChecksum:3115ee8f5bd37452063eca7928cd7af3)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Campaign/DAO/CampaignGroup.php b/www/modules/civicrm/CRM/Campaign/DAO/CampaignGroup.php
index f57f680fa..badbc5298 100644
--- a/www/modules/civicrm/CRM/Campaign/DAO/CampaignGroup.php
+++ b/www/modules/civicrm/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:f76990e9e90197859805296c8ce7818e)
+ * (GenCodeChecksum:7d0f19548e33f52e85689ce7e61f1969)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Campaign/DAO/Survey.php b/www/modules/civicrm/CRM/Campaign/DAO/Survey.php
index 8e083d7d8..3bbf118cc 100644
--- a/www/modules/civicrm/CRM/Campaign/DAO/Survey.php
+++ b/www/modules/civicrm/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:6b7ed7c668ff78b88eff06644a9673c8)
+ * (GenCodeChecksum:18f75c5ca402c23c569b37f7a2438b12)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Campaign/Form/Campaign.php b/www/modules/civicrm/CRM/Campaign/Form/Campaign.php
index 441033281..e9eabf0db 100644
--- a/www/modules/civicrm/CRM/Campaign/Form/Campaign.php
+++ b/www/modules/civicrm/CRM/Campaign/Form/Campaign.php
@@ -19,6 +19,29 @@
  * This class generates form components for processing a campaign.
  */
 class CRM_Campaign_Form_Campaign extends CRM_Core_Form {
+  use CRM_Custom_Form_CustomDataTrait;
+  use CRM_Campaign_Form_CampaignFormTrait;
+
+  /**
+   * Fields for the entity to be assigned to the template.
+   *
+   * Note this form is not implementing the EntityFormTrait but
+   * is following it's syntax for consistency.
+   *
+   * Fields may have keys
+   *  - name (required to show in tpl from the array)
+   *  - description (optional, will appear below the field)
+   *  - not-auto-addable - this class will not attempt to add the field using addField.
+   *    (this will be automatically set if the field does not have html in it's metadata
+   *    or is not a core field on the form's entity).
+   *  - help (option) add help to the field - e.g ['id' => 'id-source', 'file' => 'CRM/Contact/Form/Contact']]
+   *  - template - use a field specific template to render this field
+   *  - required
+   *  - is_freeze (field should be frozen).
+   *
+   * @var array
+   */
+  protected array $entityFields = [];
 
   /**
    * Action
@@ -35,31 +58,30 @@ class CRM_Campaign_Form_Campaign extends CRM_Core_Form {
   protected $_context;
 
   /**
-   * Object values.
-   *
-   * @var array
-   */
-  protected $_values;
-
-  /**
-   * The id of the campaign we are proceessing
+   * The id of the campaign we are processing
    *
    * @var int
+   *
+   * @deprecated use getCampaignID()
    */
   protected $_campaignId;
 
   /**
    * Explicitly declare the entity api name.
    */
-  public function getDefaultEntity() {
+  public function getDefaultEntity(): string {
     return 'Campaign';
   }
 
-  public function preProcess() {
+  /**
+   * @throws \CRM_Core_Exception
+   */
+  public function preProcess(): void {
     if (!CRM_Campaign_BAO_Campaign::accessCampaign()) {
       CRM_Utils_System::permissionDenied();
     }
 
+    $this->setEntityFields();
     $this->_context = CRM_Utils_Request::retrieve('context', 'Alphanumeric', $this);
 
     $this->assign('context', $this->_context);
@@ -82,60 +104,57 @@ public function preProcess() {
     $session->pushUserContext(CRM_Utils_System::url('civicrm/campaign', 'reset=1&subPage=campaign'));
     $this->assign('action', $this->_action);
 
-    //load the values;
-    $this->_values = $this->get('values');
-    if (!is_array($this->_values)) {
-      $this->_values = [];
-
-      // if we are editing
-      if (isset($this->_campaignId) && $this->_campaignId) {
-        $params = ['id' => $this->_campaignId];
-        CRM_Campaign_BAO_Campaign::retrieve($params, $this->_values);
-      }
-
-      //lets use current object session.
-      $this->set('values', $this->_values);
+    if ($this->isSubmitted()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('Campaign', array_filter([
+        'id' => $this->getCampaignID(),
+        'campaign_type_id' => $this->getSubmittedValue('campaign_type_id'),
+      ]));
     }
+  }
 
-    // when custom data is included in form.
-    if (!empty($_POST['hidden_custom'])) {
-      $campaignTypeId = empty($_POST['campaign_type_id']) ? NULL : $_POST['campaign_type_id'];
-      $this->set('type', 'Campaign');
-      $this->set('subType', $campaignTypeId);
-      $this->set('entityId', $this->_campaignId);
-
-      CRM_Custom_Form_CustomData::preProcess($this, NULL, $campaignTypeId, 1, 'Campaign', $this->_campaignId);
-      CRM_Custom_Form_CustomData::buildQuickForm($this);
-      CRM_Custom_Form_CustomData::setDefaultValues($this);
-    }
+  /**
+   * Set entity fields to be assigned to the form.
+   */
+  protected function setEntityFields(): void {
+    $this->entityFields = [
+      'title' => ['name' => 'title'],
+      'description' => ['name' => 'description'],
+      'start_date' => ['name' => 'start_date', 'default' => date('Y-m-d H:i:s')],
+      'end_date' => ['name' => 'start_date'],
+      'campaign_type_id' => ['name' => 'campaign_type_id'],
+      'status_id' => ['name' => 'status_id'],
+      'goal_general' => ['name' => 'goal_general'],
+      'goal_revenue' => ['name' => 'goal_revenue'],
+      'external_identifier' => ['name' => 'external_identifier'],
+      'is_active' => ['name' => 'is_active', 'default' => 1],
+    ];
   }
 
   /**
    * Set default values for the form. Note that in edit/view mode
    * the default values are retrieved from the database
    *
-   *
    * @return array
+   * @throws \CRM_Core_Exception
    */
-  public function setDefaultValues() {
-    $defaults = $this->_values;
-
-    if (empty($defaults['start_date'])) {
-      $defaults['start_date'] = date('Y-m-d H:i:s');
+  public function setDefaultValues(): array {
+    $defaults = [];
+    foreach ($this->entityFields as $field) {
+      $defaults[$field['name']] = $this->getCampaignValue($field['name']) ?? ($field['default'] ?? '');
     }
 
-    if (!isset($defaults['is_active'])) {
-      $defaults['is_active'] = 1;
-    }
-
-    if (!$this->_campaignId) {
+    if (!$this->getCampaignID()) {
       return $defaults;
     }
 
     $dao = new CRM_Campaign_DAO_CampaignGroup();
 
     $campaignGroups = [];
-    $dao->campaign_id = $this->_campaignId;
+    $dao->campaign_id = $this->getCampaignID();
     $dao->find();
 
     while ($dao->fetch()) {
@@ -148,8 +167,11 @@ public function setDefaultValues() {
     return $defaults;
   }
 
-  public function buildQuickForm() {
-    $this->add('hidden', 'id', $this->_campaignId);
+  /**
+   * @throws \CRM_Core_Exception
+   */
+  public function buildQuickForm(): void {
+    $this->add('hidden', 'id', $this->getCampaignID());
     if ($this->_action & CRM_Core_Action::DELETE) {
 
       $this->addButtons([
@@ -168,29 +190,17 @@ public function buildQuickForm() {
 
     $this->applyFilter('__ALL__', 'trim');
 
-    //lets assign custom data type and subtype.
-    $this->assign('customDataType', 'Campaign');
-    $this->assign('entityID', $this->_campaignId);
-    $this->assign('customDataSubType', CRM_Utils_Array::value('campaign_type_id', $this->_values));
+    // Assign custom data subtype for initial ajax load of custom data.
+    $this->assign('entityID', $this->getCampaignID());
+    $this->assign('customDataSubType', $this->getSubmittedValue('campaign_type_id') ?: $this->getCampaignValue('campaign_type_id'));
 
     $attributes = CRM_Core_DAO::getAttribute('CRM_Campaign_DAO_Campaign');
 
-    // add comaign title.
     $this->add('text', 'title', ts('Title'), $attributes['title'], TRUE);
-
-    // add description
     $this->add('textarea', 'description', ts('Description'), $attributes['description']);
-
-    // add campaign start date
     $this->add('datepicker', 'start_date', ts('Start Date'), [], TRUE);
-
-    // add campaign end date
     $this->add('datepicker', 'end_date', ts('End Date'));
-
-    // add campaign type
     $this->addSelect('campaign_type_id', ['placeholder' => ts('- select type -'), 'onChange' => "CRM.buildCustomData( 'Campaign', this.value );"], TRUE);
-
-    // add campaign status
     $this->addSelect('status_id', ['placeholder' => ts('- select status -')]);
 
     // add External Identifier Element
@@ -199,7 +209,7 @@ public function buildQuickForm() {
     );
 
     // add Campaign Parent Id
-    $campaigns = CRM_Campaign_BAO_Campaign::getCampaigns(CRM_Utils_Array::value('parent_id', $this->_values), $this->_campaignId);
+    $campaigns = CRM_Campaign_BAO_Campaign::getCampaigns($this->getCampaignValue('parent_id'), $this->getCampaignID());
     if (!empty($campaigns)) {
       $this->addElement('select', 'parent_id', ts('Parent ID'),
         ['' => ts('- select Parent -')] + $campaigns,
@@ -245,6 +255,22 @@ public function buildQuickForm() {
     $this->addFormRule(['CRM_Campaign_Form_Campaign', 'formRule']);
   }
 
+  /**
+   * Get the selected Campaign ID.
+   *
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
+   *
+   * @noinspection PhpUnhandledExceptionInspection
+   */
+  public function getCampaignID(): ?int {
+    if (!isset($this->_campaignId)) {
+      $this->_campaignId = CRM_Utils_Request::retrieve('id', 'Positive') ?: NULL;
+    }
+    return $this->_campaignId;
+  }
+
   /**
    * add the rules (mainly global rules) for form.
    * All local rules are added near the element
@@ -268,11 +294,11 @@ public static function formRule($fields) {
   /**
    * Form submission of new/edit campaign is processed.
    */
-  public function postProcess() {
+  public function postProcess(): void {
     // store the submitted values in an array
 
     $session = CRM_Core_Session::singleton();
-    $params = $this->controller->exportValues($this->_name);
+    $params = $this->getSubmittedValues();
     // To properly save the DAO we need to ensure we don't have a blank id key passed through.
     if (empty($params['id'])) {
       unset($params['id']);
@@ -314,7 +340,7 @@ public function postProcess() {
   public static function submit($params, $form) {
     $groups = [];
     if (!empty($params['includeGroups']) && is_array($params['includeGroups'])) {
-      foreach ($params['includeGroups'] as $key => $id) {
+      foreach ($params['includeGroups'] as $id) {
         if ($id) {
           $groups['include'][] = $id;
         }
@@ -340,8 +366,7 @@ public static function submit($params, $form) {
 
     // dev/core#1067 Clean Money before passing onto BAO to do the create.
     $params['goal_revenue'] = CRM_Utils_Rule::cleanMoney($params['goal_revenue']);
-    $result = civicrm_api3('Campaign', 'create', $params);
-    return $result;
+    return civicrm_api3('Campaign', 'create', $params);
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Campaign/Form/CampaignFormTrait.php b/www/modules/civicrm/CRM/Campaign/Form/CampaignFormTrait.php
new file mode 100644
index 000000000..17c966b83
--- /dev/null
+++ b/www/modules/civicrm/CRM/Campaign/Form/CampaignFormTrait.php
@@ -0,0 +1,51 @@
+<?php
+
+use Civi\API\EntityLookupTrait;
+
+/**
+ * Trait implements functions to retrieve activity related values.
+ */
+trait CRM_Campaign_Form_CampaignFormTrait {
+
+  use EntityLookupTrait;
+
+  /**
+   * Get the value for a field relating to the Campaign.
+   *
+   * All values returned in apiv4 format. Escaping may be required.
+   *
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
+   *
+   * @param string $fieldName
+   *
+   * @return mixed
+   * @throws \CRM_Core_Exception
+   */
+  public function getCampaignValue(string $fieldName) {
+    if ($this->isDefined('Campaign')) {
+      return $this->lookup('Campaign', $fieldName);
+    }
+    $id = $this->getCampaignID();
+    if ($id) {
+      $this->define('Campaign', 'Campaign', ['id' => $id]);
+      return $this->lookup('Campaign', $fieldName);
+    }
+    return NULL;
+  }
+
+  /**
+   * Get the selected Campaign ID.
+   *
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
+   *
+   * @noinspection PhpUnhandledExceptionInspection
+   */
+  public function getCampaignID(): ?int {
+    throw new CRM_Core_Exception('`getCampaignID` must be implemented');
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Campaign/Form/Petition.php b/www/modules/civicrm/CRM/Campaign/Form/Petition.php
index c12a653c1..202d91ad5 100644
--- a/www/modules/civicrm/CRM/Campaign/Form/Petition.php
+++ b/www/modules/civicrm/CRM/Campaign/Form/Petition.php
@@ -19,6 +19,7 @@
  * This class generates form components for adding a petition.
  */
 class CRM_Campaign_Form_Petition extends CRM_Core_Form {
+  use CRM_Custom_Form_CustomDataTrait;
 
   /**
    * Making this public so we can reference it in the formRule
@@ -42,6 +43,24 @@ public function getEntityId() {
     return $this->_surveyId;
   }
 
+  /**
+   * Get the survey ID.
+   *
+   * @api supported for external use.
+   *
+   * @return int|null
+   * @throws \CRM_Core_Exception
+   */
+  public function getSurveyID(): ?int {
+    if (!isset($this->_surveyId)) {
+      $this->_surveyId = CRM_Utils_Request::retrieve('id', 'Positive', $this);
+    }
+    return $this->_surveyId;
+  }
+
+  /**
+   * @throws \CRM_Core_Exception
+   */
   public function preProcess() {
     if (!CRM_Campaign_BAO_Campaign::accessCampaign()) {
       CRM_Utils_System::permissionDenied();
@@ -64,8 +83,15 @@ public function preProcess() {
       }
     }
 
-    // Add custom data to form
-    CRM_Custom_Form_CustomData::addToForm($this);
+    if ($this->isSubmitted()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('Survey', array_filter([
+        'id' => $this->getSurveyID(),
+      ]));
+    }
 
     $session = CRM_Core_Session::singleton();
     $url = CRM_Utils_System::url('civicrm/campaign', 'reset=1&subPage=survey');
@@ -341,9 +367,7 @@ public function postProcess() {
       CRM_Core_BAO_UFJoin::create($ufJoinParams);
     }
 
-    if (!is_a($surveyId, 'CRM_Core_Error')) {
-      CRM_Core_Session::setStatus(ts('Petition has been saved.'), ts('Saved'), 'success');
-    }
+    CRM_Core_Session::setStatus(ts('Petition has been saved.'), ts('Saved'), 'success');
 
     $buttonName = $this->controller->getButtonName();
     if ($buttonName == $this->getButtonName('next', 'new')) {
diff --git a/www/modules/civicrm/CRM/Campaign/Form/Survey.php b/www/modules/civicrm/CRM/Campaign/Form/Survey.php
index 74d1563da..e57f18591 100644
--- a/www/modules/civicrm/CRM/Campaign/Form/Survey.php
+++ b/www/modules/civicrm/CRM/Campaign/Form/Survey.php
@@ -19,11 +19,14 @@
  * This class generates form components for processing a survey.
  */
 class CRM_Campaign_Form_Survey extends CRM_Core_Form {
+  use CRM_Custom_Form_CustomDataTrait;
 
   /**
    * The id of the object being edited.
    *
    * @var int
+   *
+   * @internal
    */
   protected $_surveyId;
 
@@ -51,12 +54,17 @@ public function getDefaultEntity() {
   /**
    * Get the entity id being edited.
    *
+   * @internal
+   *
    * @return int|null
    */
   public function getEntityId() {
     return $this->_surveyId;
   }
 
+  /**
+   * @throws \CRM_Core_Exception
+   */
   public function preProcess() {
     // Multistep form doesn't play well with popups
     $this->preventAjaxSubmit();
@@ -66,9 +74,7 @@ public function preProcess() {
     }
 
     $this->_action = CRM_Utils_Request::retrieve('action', 'String', $this, FALSE, 'add', 'REQUEST');
-    $this->_surveyId = CRM_Utils_Request::retrieve('id', 'Positive', $this, FALSE);
-
-    if ($this->_surveyId) {
+    if ($this->getSurveyID()) {
       $this->_single = TRUE;
 
       $params = ['id' => $this->_surveyId];
@@ -79,10 +85,17 @@ public function preProcess() {
     }
 
     $this->assign('action', $this->_action);
-    $this->assign('surveyId', $this->_surveyId);
+    $this->assign('surveyId', $this->getSurveyID());
 
-    // Add custom data to form
-    CRM_Custom_Form_CustomData::addToForm($this);
+    if ($this->isSubmitted()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('Survey', array_filter([
+        'id' => $this->getSurveyID(),
+      ]));
+    }
 
     // CRM-11480, CRM-11682
     // Preload libraries required by the "Questions" tab
@@ -90,13 +103,141 @@ public function preProcess() {
     CRM_UF_Page_ProfileEditor::registerProfileScripts();
     CRM_UF_Page_ProfileEditor::registerSchemas(['IndividualModel', 'ActivityModel']);
 
-    CRM_Campaign_Form_Survey_TabHeader::build($this);
+    $this->build();
+  }
+
+  /**
+   * Get the survey ID.
+   *
+   * @api supported for external use.
+   *
+   * @return int|null
+   * @throws \CRM_Core_Exception
+   */
+  public function getSurveyID(): ?int {
+    if (!isset($this->_surveyId)) {
+      $this->_surveyId = CRM_Utils_Request::retrieve('id', 'Positive', $this);
+    }
+    return $this->_surveyId;
+  }
+
+  /**
+   * Build tab header.
+   *
+   * @return array
+   */
+  private function build() {
+    $form = $this;
+    $tabs = $form->get('tabHeader');
+    if (!$tabs || empty($_GET['reset'])) {
+      $tabs = $this->processSurveyForm();
+      $form->set('tabHeader', $tabs);
+    }
+    $form->assign('tabHeader', $tabs);
+    CRM_Core_Resources::singleton()
+      ->addScriptFile('civicrm', 'templates/CRM/common/TabHeader.js', 1, 'html-header')
+      ->addSetting([
+        'tabSettings' => [
+          'active' => $this->getCurrentTab($tabs),
+        ],
+      ]);
+    return $tabs;
+  }
+
+  /**
+   * @param array $tabs
+   *
+   * @return int|string
+   */
+  private function getCurrentTab($tabs) {
+    static $current = FALSE;
+
+    if ($current) {
+      return $current;
+    }
+
+    if (is_array($tabs)) {
+      foreach ($tabs as $subPage => $pageVal) {
+        if ($pageVal['current'] === TRUE) {
+          $current = $subPage;
+          break;
+        }
+      }
+    }
+
+    $current = $current ?: 'main';
+    return $current;
+  }
+
+  /**
+   *
+   * @return array
+   * @throws \CRM_Core_Exception
+   */
+  private function processSurveyForm() {
+    $form = $this;
+    if ($this->getSurveyID() <= 0) {
+      return NULL;
+    }
+
+    $tabs = [
+      'main' => [
+        'title' => ts('Main Information'),
+        'link' => NULL,
+        'valid' => FALSE,
+        'active' => FALSE,
+        'current' => FALSE,
+      ],
+      'questions' => [
+        'title' => ts('Questions'),
+        'link' => NULL,
+        'valid' => FALSE,
+        'active' => FALSE,
+        'current' => FALSE,
+      ],
+      'results' => [
+        'title' => ts('Results'),
+        'link' => NULL,
+        'valid' => FALSE,
+        'active' => FALSE,
+        'current' => FALSE,
+      ],
+    ];
+
+    $surveyID = $this->getSurveyID();
+    $class = $this->_name;
+    $class = CRM_Utils_String::getClassName($class);
+    $class = strtolower($class);
+
+    if (array_key_exists($class, $tabs)) {
+      $tabs[$class]['current'] = TRUE;
+      $qfKey = $form->get('qfKey');
+      if ($qfKey) {
+        $tabs[$class]['qfKey'] = "&qfKey={$qfKey}";
+      }
+    }
+
+    if ($surveyID) {
+      $reset = !empty($_GET['reset']) ? 'reset=1&' : '';
+
+      foreach ($tabs as $key => $value) {
+        if (!isset($tabs[$key]['qfKey'])) {
+          $tabs[$key]['qfKey'] = NULL;
+        }
+
+        $tabs[$key]['link'] = CRM_Utils_System::url("civicrm/survey/configure/{$key}",
+          "{$reset}action=update&id={$surveyID}{$tabs[$key]['qfKey']}"
+        );
+        $tabs[$key]['active'] = $tabs[$key]['valid'] = TRUE;
+      }
+    }
+    return $tabs;
   }
 
   /**
    * Build the form object.
    */
-  public function buildQuickForm() {
+  public function buildQuickForm(): void {
     $session = CRM_Core_Session::singleton();
     if ($this->_surveyId) {
       $buttons = [
@@ -131,7 +272,7 @@ public function endPostProcess() {
     // make submit buttons keep the current working tab opened.
     if ($this->_action & (CRM_Core_Action::UPDATE | CRM_Core_Action::ADD)) {
       $tabTitle = $className = CRM_Utils_String::getClassName($this->_name);
-      if ($tabTitle == 'Main') {
+      if ($tabTitle === 'Main') {
         $tabTitle = 'Main settings';
       }
       $subPage = strtolower($className);
@@ -143,11 +284,11 @@ public function endPostProcess() {
         CRM_Utils_System::redirect(CRM_Utils_System::url("civicrm/survey/configure/questions",
           "action=update&reset=1&id={$this->_surveyId}"));
       }
-      if ($this->controller->getButtonName('submit') == "_qf_{$className}_upload_done") {
+      if ($this->controller->getButtonName('submit') === "_qf_{$className}_upload_done") {
         CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/campaign', 'reset=1&subPage=survey'));
       }
-      elseif ($this->controller->getButtonName('submit') == "_qf_{$className}_upload_next") {
-        $subPage = CRM_Campaign_Form_Survey_TabHeader::getNextTab($this);
+      elseif ($this->controller->getButtonName('submit') === "_qf_{$className}_upload_next") {
+        $subPage = $this->getNextTab();
         CRM_Utils_System::redirect(CRM_Utils_System::url("civicrm/survey/configure/{$subPage}",
           "action=update&reset=1&id={$this->_surveyId}"));
       }
@@ -170,4 +311,33 @@ public function getTemplateFileName(): string {
     return 'CRM/Campaign/Form/Survey/Tab.tpl';
   }
 
+  /**
+   *
+   * @return int|string
+   */
+  private function getNextTab() {
+    $form = $this;
+    static $next = FALSE;
+    if ($next) {
+      return $next;
+    }
+
+    $tabs = $form->get('tabHeader');
+    if (is_array($tabs)) {
+      $current = FALSE;
+      foreach ($tabs as $subPage => $pageVal) {
+        if ($current) {
+          $next = $subPage;
+          break;
+        }
+        if ($pageVal['current'] === TRUE) {
+          $current = $subPage;
+        }
+      }
+    }
+
+    $next = $next ?: 'main';
+    return $next;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Campaign/Form/Survey/Main.php b/www/modules/civicrm/CRM/Campaign/Form/Survey/Main.php
index 88aa3c9eb..20bf3f5a1 100644
--- a/www/modules/civicrm/CRM/Campaign/Form/Survey/Main.php
+++ b/www/modules/civicrm/CRM/Campaign/Form/Survey/Main.php
@@ -50,8 +50,15 @@ public function preProcess() {
       $this->setTitle(ts('Configure Survey') . ' - ' . $this->_surveyTitle);
     }
 
-    // Add custom data to form
-    CRM_Custom_Form_CustomData::addToForm($this);
+    if ($this->isSubmitted()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('Survey', array_filter([
+        'id' => $this->getSurveyID(),
+      ]));
+    }
 
     if ($this->_name != 'Petition') {
       $url = CRM_Utils_System::url('civicrm/campaign', 'reset=1&subPage=survey');
@@ -98,7 +105,7 @@ public function setDefaultValues() {
   /**
    * Build the form object.
    */
-  public function buildQuickForm() {
+  public function buildQuickForm(): void {
     $this->add('text', 'title', ts('Title'), CRM_Core_DAO::getAttribute('CRM_Campaign_DAO_Survey', 'title'), TRUE);
 
     // Activity Type id
@@ -158,7 +165,7 @@ public function postProcess() {
     $params['is_active'] ??= 0;
     $params['is_default'] ??= 0;
 
-    $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, $this->getEntityId(), $this->getDefaultEntity());
+    $params['custom'] = CRM_Core_BAO_CustomField::postProcess($this->getSubmittedValues(), $this->getSurveyID(), 'Survey');
 
     $survey = CRM_Campaign_BAO_Survey::create($params);
     $this->_surveyId = $survey->id;
diff --git a/www/modules/civicrm/CRM/Campaign/Form/Survey/Questions.php b/www/modules/civicrm/CRM/Campaign/Form/Survey/Questions.php
index 3dae1e491..7ec61dc46 100644
--- a/www/modules/civicrm/CRM/Campaign/Form/Survey/Questions.php
+++ b/www/modules/civicrm/CRM/Campaign/Form/Survey/Questions.php
@@ -47,9 +47,9 @@ public function setDefaultValues() {
   /**
    * Build the form object.
    */
-  public function buildQuickForm() {
+  public function buildQuickForm(): void {
     $subTypeId = CRM_Core_DAO::getFieldValue('CRM_Campaign_DAO_Survey', $this->_surveyId, 'activity_type_id');
-    if (!CRM_Core_BAO_CustomGroup::autoCreateByActivityType($subTypeId)) {
+    if (!self::autoCreateCustomGroup($subTypeId)) {
       // everything
       $activityTypes = CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'label', TRUE, FALSE);
       // FIXME: Displays weird "/\ Array" message; doesn't work with tabs
@@ -80,6 +80,26 @@ public function buildQuickForm() {
     parent::buildQuickForm();
   }
 
+  public static function autoCreateCustomGroup($activityTypeId) {
+    $existing = CRM_Core_BAO_CustomGroup::getAll(['extends' => 'Activity', 'extends_entity_column_value' => $activityTypeId]);
+    if ($existing) {
+      return TRUE;
+    }
+    // everything
+    $activityTypes = CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'label', TRUE, FALSE);
+    $params = [
+      'version' => 3,
+      'extends' => 'Activity',
+      'extends_entity_column_id' => NULL,
+      'extends_entity_column_value' => CRM_Utils_Array::implodePadded([$activityTypeId]),
+      'title' => ts('%1 Questions', [1 => $activityTypes[$activityTypeId]]),
+      'style' => 'Inline',
+      'is_active' => 1,
+    ];
+    $result = civicrm_api('CustomGroup', 'create', $params);
+    return !$result['is_error'];
+  }
+
   /**
    * Process the form.
    */
diff --git a/www/modules/civicrm/CRM/Campaign/Form/Survey/Results.php b/www/modules/civicrm/CRM/Campaign/Form/Survey/Results.php
index 27121645e..fdc2e54df 100644
--- a/www/modules/civicrm/CRM/Campaign/Form/Survey/Results.php
+++ b/www/modules/civicrm/CRM/Campaign/Form/Survey/Results.php
@@ -83,7 +83,7 @@ public function setDefaultValues() {
   /**
    * Build the form object.
    */
-  public function buildQuickForm() {
+  public function buildQuickForm(): void {
     $optionGroups = CRM_Campaign_BAO_Survey::getResultSets();
 
     if (empty($optionGroups)) {
diff --git a/www/modules/civicrm/CRM/Campaign/Form/Survey/TabHeader.php b/www/modules/civicrm/CRM/Campaign/Form/Survey/TabHeader.php
index 2856c09a3..c8b7ceae1 100644
--- a/www/modules/civicrm/CRM/Campaign/Form/Survey/TabHeader.php
+++ b/www/modules/civicrm/CRM/Campaign/Form/Survey/TabHeader.php
@@ -16,24 +16,27 @@
  */
 
 /**
- * Helper class to build navigation links
+ * @deprecated since 5.71 will be removed around 5.77
  */
 class CRM_Campaign_Form_Survey_TabHeader {
 
   /**
    * Build tab header.
    *
+   * @deprecated since 5.71 will be removed around 5.77
+   *
    * @param CRM_Core_Form $form
    *
    * @return array
    */
   public static function build(&$form) {
+    CRM_Core_Error::deprecatedFunctionWarning('no alternative');
     $tabs = $form->get('tabHeader');
     if (!$tabs || empty($_GET['reset'])) {
       $tabs = self::process($form);
       $form->set('tabHeader', $tabs);
     }
-    $form->assign_by_ref('tabHeader', $tabs);
+    $form->assign('tabHeader', $tabs);
     CRM_Core_Resources::singleton()
       ->addScriptFile('civicrm', 'templates/CRM/common/TabHeader.js', 1, 'html-header')
       ->addSetting([
@@ -48,8 +51,11 @@ public static function build(&$form) {
    * @param CRM_Core_Form $form
    *
    * @return array
+   *
+   * @deprecated since 5.71 will be removed around 5.77
    */
   public static function process(&$form) {
+    CRM_Core_Error::deprecatedFunctionWarning('no alternative');
     if ($form->getVar('_surveyId') <= 0) {
       return NULL;
     }
@@ -110,8 +116,11 @@ public static function process(&$form) {
 
   /**
    * @param CRM_Core_Form $form
+   *
+   * @deprecated since 5.71 will be removed around 5.77
    */
   public static function reset(&$form) {
+    CRM_Core_Error::deprecatedFunctionWarning('no alternative');
     $tabs = self::process($form);
     $form->set('tabHeader', $tabs);
   }
@@ -120,8 +129,11 @@ public static function reset(&$form) {
    * @param array $tabs
    *
    * @return int|string
+   *
+   * @deprecated since 5.71 will be removed around 5.77
    */
   public static function getCurrentTab($tabs) {
+    CRM_Core_Error::deprecatedFunctionWarning('no alternative');
     static $current = FALSE;
 
     if ($current) {
@@ -145,8 +157,11 @@ public static function getCurrentTab($tabs) {
    * @param CRM_Core_Form $form
    *
    * @return int|string
+   *
+   * @deprecated since 5.71 will be removed around 5.77
    */
   public static function getNextTab(&$form) {
+    CRM_Core_Error::deprecatedFunctionWarning('no alternative');
     static $next = FALSE;
     if ($next) {
       return $next;
diff --git a/www/modules/civicrm/CRM/Campaign/Info.php b/www/modules/civicrm/CRM/Campaign/Info.php
index 6727a595d..f1252e5df 100644
--- a/www/modules/civicrm/CRM/Campaign/Info.php
+++ b/www/modules/civicrm/CRM/Campaign/Info.php
@@ -41,49 +41,37 @@ public function getInfo() {
 
   /**
    * @inheritDoc
-   * @param bool $getAllUnconditionally
-   * @param bool $descriptions
-   *   Whether to return permission descriptions
-   *
-   * @return array
    */
-  public function getPermissions($getAllUnconditionally = FALSE, $descriptions = FALSE) {
+  public function getPermissions(): array {
     $permissions = [
       'administer CiviCampaign' => [
-        ts('administer CiviCampaign'),
-        ts('Create new campaign, survey and petition types and their status'),
+        'label' => ts('administer CiviCampaign'),
+        'description' => ts('Create new campaign, survey and petition types and their status'),
       ],
       'manage campaign' => [
-        ts('manage campaign'),
-        ts('Create new campaigns, surveys and petitions, reserve respondents'),
+        'label' => ts('manage campaign'),
+        'description' => ts('Create new campaigns, surveys and petitions, reserve respondents'),
       ],
       'reserve campaign contacts' => [
-        ts('reserve campaign contacts'),
-        ts('Reserve campaign contacts for surveys and petitions'),
+        'label' => ts('reserve campaign contacts'),
+        'description' => ts('Reserve campaign contacts for surveys and petitions'),
       ],
       'release campaign contacts' => [
-        ts('release campaign contacts'),
-        ts('Release reserved campaign contacts for surveys and petitions'),
+        'label' => ts('release campaign contacts'),
+        'description' => ts('Release reserved campaign contacts for surveys and petitions'),
       ],
       'interview campaign contacts' => [
-        ts('interview campaign contacts'),
-        ts('Record survey and petition responses from their reserved contacts'),
+        'label' => ts('interview campaign contacts'),
+        'description' => ts('Record survey and petition responses from their reserved contacts'),
       ],
       'gotv campaign contacts' => [
-        ts('GOTV campaign contacts'),
-        ts('Record that contacts voted'),
+        'label' => ts('GOTV campaign contacts'),
+        'description' => ts('Record that contacts voted'),
       ],
       'sign CiviCRM Petition' => [
-        ts('sign CiviCRM Petition'),
+        'label' => ts('sign CiviCRM Petition'),
       ],
     ];
-
-    if (!$descriptions) {
-      foreach ($permissions as $name => $attr) {
-        $permissions[$name] = array_shift($attr);
-      }
-    }
-
     return $permissions;
   }
 
diff --git a/www/modules/civicrm/CRM/Campaign/Page/AJAX.php b/www/modules/civicrm/CRM/Campaign/Page/AJAX.php
index 7d99c2f66..8643c4d76 100644
--- a/www/modules/civicrm/CRM/Campaign/Page/AJAX.php
+++ b/www/modules/civicrm/CRM/Campaign/Page/AJAX.php
@@ -290,7 +290,7 @@ public static function voterList() {
       );
       while ($result->fetch()) {
         $contactID = $result->contact_id;
-        $typeImage = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? $result->contact_sub_type : $result->contact_type,
+        $typeImage = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ?: $result->contact_type,
           FALSE,
           $result->contact_id
         );
diff --git a/www/modules/civicrm/CRM/Campaign/Page/Petition/ThankYou.php b/www/modules/civicrm/CRM/Campaign/Page/Petition/ThankYou.php
index d2bf89eca..6c0ede29d 100644
--- a/www/modules/civicrm/CRM/Campaign/Page/Petition/ThankYou.php
+++ b/www/modules/civicrm/CRM/Campaign/Page/Petition/ThankYou.php
@@ -28,11 +28,11 @@ public function run() {
     $petition = [];
     CRM_Campaign_BAO_Survey::retrieve($params, $petition);
     $this->assign('petitionTitle', $petition['title']);
-    $this->assign('thankyou_title', CRM_Utils_Array::value('thankyou_title', $petition));
-    $this->assign('thankyou_text', CRM_Utils_Array::value('thankyou_text', $petition));
+    $this->assign('thankyou_title', $petition['thankyou_title'] ?? NULL);
+    $this->assign('thankyou_text', $petition['thankyou_text'] ?? NULL);
     $this->assign('survey_id', $petition_id);
     $this->assign('status_id', $id);
-    $this->assign('is_share', CRM_Utils_Array::value('is_share', $petition));
+    $this->assign('is_share', $petition['is_share'] ?? NULL);
     CRM_Utils_System::setTitle(CRM_Utils_Array::value('thankyou_title', $petition));
 
     // send thank you or email verification emails
diff --git a/www/modules/civicrm/CRM/Campaign/Selector/Search.php b/www/modules/civicrm/CRM/Campaign/Selector/Search.php
index 097178b9b..a7d6a3aa9 100644
--- a/www/modules/civicrm/CRM/Campaign/Selector/Search.php
+++ b/www/modules/civicrm/CRM/Campaign/Selector/Search.php
@@ -146,10 +146,31 @@ public function __construct(
     // type of selector
     $this->_action = $action;
 
-    $this->_query = new CRM_Contact_BAO_Query($this->_queryParams,
-      NULL, NULL, FALSE, FALSE,
-      CRM_Contact_BAO_Query::MODE_CAMPAIGN,
-      TRUE
+    $params = $this->_queryParams;
+    $returnProperties = NULL;
+    $fields = NULL;
+    $includeContactIds = FALSE;
+    $strict = FALSE;
+    $mode = CRM_Contact_BAO_Query::MODE_CAMPAIGN;
+    $skipPermission = TRUE;
+    $searchDescendentGroups = TRUE;
+    $smartGroupCache = TRUE;
+    $displayRelationshipType = NULL;
+    $operator = 'AND';
+    $apiEntity = NULL;
+    // This is flipped from the default of NULL. When primaryLocationOnly is NULL
+    // it will be based on the value of the 'searchPrimaryDetailsOnly' setting, which is often
+    // set to FALSE so you can search for non-primary location fields in advanced search. But,
+    // when reserving people for a survey, we only want each person listed once, not once for
+    // every combination of location types they have for email, phone, and address.
+    $primaryLocationOnly = TRUE;
+
+    $this->_query = new CRM_Contact_BAO_Query(
+      $params, $returnProperties, $fields,
+      $includeContactIds, $strict, $mode,
+      $skipPermission, $searchDescendentGroups,
+      $smartGroupCache, $displayRelationshipType,
+      $operator, $apiEntity, $primaryLocationOnly
     );
   }
 
diff --git a/www/modules/civicrm/CRM/Case/Audit/Audit.php b/www/modules/civicrm/CRM/Case/Audit/Audit.php
index 9f9128241..187430900 100644
--- a/www/modules/civicrm/CRM/Case/Audit/Audit.php
+++ b/www/modules/civicrm/CRM/Case/Audit/Audit.php
@@ -225,7 +225,7 @@ public static function run($xmlString, $clientID, $caseID) {
     $activities = $audit->getActivities(TRUE);
 
     $template = CRM_Core_Smarty::singleton();
-    $template->assign_by_ref('activities', $activities);
+    $template->assign('activities', $activities);
 
     $reportDate = CRM_Utils_Date::customFormat(date('Y-m-d H:i'));
     $template->assign('reportDate', $reportDate);
diff --git a/www/modules/civicrm/CRM/Case/BAO/Case.php b/www/modules/civicrm/CRM/Case/BAO/Case.php
index f58198ba4..2c6952aad 100644
--- a/www/modules/civicrm/CRM/Case/BAO/Case.php
+++ b/www/modules/civicrm/CRM/Case/BAO/Case.php
@@ -1405,7 +1405,6 @@ public static function sendActivityCopy($clientId, $activityId, $contacts, $atta
 
       [$result[$info['contact_id'] ?? NULL], $subject, $message, $html] = CRM_Core_BAO_MessageTemplate::sendTemplate(
         [
-          'groupName' => 'msg_tpl_workflow_case',
           'workflow' => 'case_activity',
           'contactId' => $info['contact_id'] ?? NULL,
           'tplParams' => $tplParams,
@@ -1413,6 +1412,12 @@ public static function sendActivityCopy($clientId, $activityId, $contacts, $atta
           'toName' => $displayName,
           'toEmail' => $mail,
           'attachments' => $attachments,
+          'modelProps' => $caseId ? [
+            'activityID' => $activityId,
+            'caseID' => $caseId,
+          ] : [
+            'activityID' => $activityId,
+          ],
         ]
       );
 
@@ -2990,11 +2995,28 @@ public static function buildOptions($fieldName, $context = NULL, $props = []) {
 
       // Filter status id by case type id
       case 'status_id':
-        if (!empty($props['case_type_id']) && is_scalar($props['case_type_id'])) {
-          $idField = is_numeric($props['case_type_id']) ? 'id' : 'name';
-          $caseType = civicrm_api3('CaseType', 'getsingle', [$idField => $props['case_type_id'], 'return' => 'definition']);
-          if (!empty($caseType['definition']['statuses'])) {
-            $params['condition'] = 'v.name IN ("' . implode('","', $caseType['definition']['statuses']) . '")';
+        if (!empty($props['case_type_id'])) {
+          // cast single values to a single value array
+          $caseTypeIdValues = (array) $props['case_type_id'];
+
+          $idField = is_numeric($caseTypeIdValues[0]) ? 'id' : 'name';
+          $caseTypeDefs = (array) \Civi\Api4\CaseType::get(FALSE)
+            ->addSelect('definition')
+            ->addWhere($idField, 'IN', $caseTypeIdValues)
+            ->execute()->column('definition');
+
+          $allowAll = FALSE;
+          $statuses = [];
+          foreach ($caseTypeDefs as $definition) {
+            if (empty($definition['statuses'])) {
+              // if any case type has no status restrictions, we want to allow all options
+              $allowAll = TRUE;
+              break;
+            }
+            $statuses = array_unique(array_merge($statuses, $definition['statuses']));
+          }
+          if (!$allowAll) {
+            $params['condition'] = 'v.name IN ("' . implode('","', $statuses) . '")';
           }
         }
         break;
diff --git a/www/modules/civicrm/CRM/Case/DAO/Case.php b/www/modules/civicrm/CRM/Case/DAO/Case.php
index ad30a3f24..9eaf5e838 100644
--- a/www/modules/civicrm/CRM/Case/DAO/Case.php
+++ b/www/modules/civicrm/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:ae2ebb6d7b065ab0e098e67f581cc874)
+ * (GenCodeChecksum:d8669ec8aecbc1ba74f28e993a0013e5)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Case/DAO/CaseActivity.php b/www/modules/civicrm/CRM/Case/DAO/CaseActivity.php
index 422de4f51..085cb3dc1 100644
--- a/www/modules/civicrm/CRM/Case/DAO/CaseActivity.php
+++ b/www/modules/civicrm/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:0800682b3ed520cf7a9295226219cef2)
+ * (GenCodeChecksum:cbe351d41cb72378e89bd5cbab7210d7)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Case/DAO/CaseContact.php b/www/modules/civicrm/CRM/Case/DAO/CaseContact.php
index 44e776cf2..fcfa30ea7 100644
--- a/www/modules/civicrm/CRM/Case/DAO/CaseContact.php
+++ b/www/modules/civicrm/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:e86592582af3784c253cac8744460ffe)
+ * (GenCodeChecksum:83e20edc6a43864c63bc9fa6a2068f69)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Case/DAO/CaseType.php b/www/modules/civicrm/CRM/Case/DAO/CaseType.php
index 19676df01..febca8aa0 100644
--- a/www/modules/civicrm/CRM/Case/DAO/CaseType.php
+++ b/www/modules/civicrm/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:942b11d00fab3506535e81984187a767)
+ * (GenCodeChecksum:93766f240762bc60eec5a44f549a34ce)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Case/Form/Activity.php b/www/modules/civicrm/CRM/Case/Form/Activity.php
index 6a8287090..98be72cdb 100644
--- a/www/modules/civicrm/CRM/Case/Form/Activity.php
+++ b/www/modules/civicrm/CRM/Case/Form/Activity.php
@@ -49,6 +49,32 @@ class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity {
    */
   public $_caseTypeDefinition;
 
+  /**
+   * This is here to avoid php 8 warnings but it should be converted to
+   * some mechanism more local to ChangeCaseStatus. It also doesn't make sense
+   * that it's an array.
+   *
+   * @var array
+   * @internal
+   */
+  public $_oldCaseStatus;
+
+  /**
+   * This is here to avoid php 8 warnings but it should be converted to
+   * some mechanism more local to ChangeCaseStatus. It also doesn't make sense
+   * that it's an array.
+   *
+   * @var array
+   * @internal
+   */
+  public $_defaultCaseStatus;
+
+  /**
+   * @var int
+   * Used by ChangeCaseStartDate. See getter/setter below.
+   */
+  private $openCaseActivityId;
+
   /**
    * Build the form object.
    */
@@ -401,35 +427,33 @@ public function postProcess($params = NULL) {
     }
 
     // format activity custom data
-    if (!empty($params['hidden_custom'])) {
-      if ($this->_activityId) {
-        // retrieve and include the custom data of old Activity
-        $oldActivity = civicrm_api3('Activity', 'getsingle', ['id' => $this->_activityId]);
-        $params = array_merge($oldActivity, $params);
-
-        // unset custom fields-id from params since we want custom
-        // fields to be saved for new activity.
-        foreach ($params as $key => $value) {
-          $match = [];
-          if (preg_match('/^(custom_\d+_)(\d+)$/', $key, $match)) {
-            $params[$match[1] . '-1'] = $params[$key];
-
-            // for autocomplete transfer hidden value instead of label
-            if ($params[$key] && isset($params[$key . '_id'])) {
-              $params[$match[1] . '-1_id'] = $params[$key . '_id'];
-              unset($params[$key . '_id']);
-            }
-            unset($params[$key]);
+    if ($this->_activityId) {
+      // retrieve and include the custom data of old Activity
+      $oldActivity = civicrm_api3('Activity', 'getsingle', ['id' => $this->_activityId]);
+      $params = array_merge($oldActivity, $params);
+
+      // unset custom fields-id from params since we want custom
+      // fields to be saved for new activity.
+      foreach ($params as $key => $value) {
+        $match = [];
+        if (preg_match('/^(custom_\d+_)(\d+)$/', $key, $match)) {
+          $params[$match[1] . '-1'] = $params[$key];
+
+          // for autocomplete transfer hidden value instead of label
+          if ($params[$key] && isset($params[$key . '_id'])) {
+            $params[$match[1] . '-1_id'] = $params[$key . '_id'];
+            unset($params[$key . '_id']);
           }
+          unset($params[$key]);
         }
       }
-
-      $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params,
-        $this->_activityId,
-        'Activity'
-      );
     }
 
+    $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params,
+      $this->_activityId,
+      'Activity'
+    );
+
     // assigning formatted value
     if (!empty($params['assignee_contact_id'])) {
       $params['assignee_contact_id'] = explode(',', $params['assignee_contact_id']);
@@ -445,7 +469,7 @@ public function postProcess($params = NULL) {
       }
 
       // @todo This is called newActParams because it USED TO create new activity revisions. But at the moment just changing the part that is broken.
-      // hidden_custom is always 1, so see above where $params gets merged with the existing activity data every time, including the activity id.
+      // $params gets merged with the existing activity data every time, including the activity id.
       $newActParams = $params;
 
       // add target contact values in update mode
@@ -798,4 +822,22 @@ public static function getMaxInstancesBounceMessage($editUrl, $activityTypeName,
     return $bounceMessage;
   }
 
+  /**
+   * Getter used by ChangeCaseStartDate
+   * @return int|null
+   * @internal
+   */
+  public function getOpenCaseActivityId(): ?int {
+    return $this->openCaseActivityId;
+  }
+
+  /**
+   * Setter used by ChangeCaseStartDate
+   * @param int $id
+   * @internal
+   */
+  public function setOpenCaseActivityId(int $id): void {
+    $this->openCaseActivityId = $id;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Case/Form/Activity/ChangeCaseStartDate.php b/www/modules/civicrm/CRM/Case/Form/Activity/ChangeCaseStartDate.php
index 1a62ae2c9..399a7b663 100644
--- a/www/modules/civicrm/CRM/Case/Form/Activity/ChangeCaseStartDate.php
+++ b/www/modules/civicrm/CRM/Case/Form/Activity/ChangeCaseStartDate.php
@@ -58,7 +58,7 @@ public static function setDefaultValues(&$form) {
       $openCaseInfo = current($openCaseInfo);
 
       // store activity id for updating it later
-      $form->openCaseActivityId = $openCaseInfo['id'];
+      $form->setOpenCaseActivityId($openCaseInfo['id']);
 
       $defaults['start_date'] = $openCaseInfo['activity_date'];
     }
@@ -164,10 +164,10 @@ public static function endPostProcess(&$form, &$params, $activity) {
 
     // 2.5 Update open case activity date
     // @todo Since revisioning code has been removed this can be refactored more
-    if ($form->openCaseActivityId) {
+    if ($form->getOpenCaseActivityId()) {
 
       $abao = new CRM_Activity_BAO_Activity();
-      $oldParams = ['id' => $form->openCaseActivityId];
+      $oldParams = ['id' => $form->getOpenCaseActivityId()];
       $oldActivityDefaults = [];
       $oldActivity = $abao->retrieve($oldParams, $oldActivityDefaults);
 
diff --git a/www/modules/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php b/www/modules/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php
index 77a30468f..fad64e52f 100644
--- a/www/modules/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php
+++ b/www/modules/civicrm/CRM/Case/Form/Activity/ChangeCaseStatus.php
@@ -50,6 +50,7 @@ public static function preProcess(&$form) {
   public static function setDefaultValues(&$form) {
     $defaults = [];
     // Retrieve current case status
+    // @todo this var is created as an array below, but the form field is single-valued. See also comment about _oldCaseStatus in endPostProcess.
     $defaults['case_status_id'] = $form->_defaultCaseStatus;
 
     return $defaults;
@@ -58,13 +59,13 @@ public static function setDefaultValues(&$form) {
   /**
    * @param CRM_Core_Form $form
    */
-  public static function buildQuickForm(&$form) {
+  public static function buildQuickForm($form) {
     $form->removeElement('status_id');
     $form->removeElement('priority_id');
 
     $caseTypes = [];
 
-    $form->_caseStatus = CRM_Case_PseudoConstant::caseStatus();
+    $statusLabels = CRM_Case_PseudoConstant::caseStatus();
     $statusNames = CRM_Case_PseudoConstant::caseStatus('name');
 
     // Limit case statuses to allowed types for these case(s)
@@ -75,9 +76,9 @@ public static function buildQuickForm(&$form) {
     $caseTypes = civicrm_api3('CaseType', 'get', ['id' => ['IN' => $caseTypes]]);
     foreach ($caseTypes['values'] as $ct) {
       if (!empty($ct['definition']['statuses'])) {
-        foreach ($form->_caseStatus as $id => $label) {
+        foreach ($statusLabels as $id => $label) {
           if (!in_array($statusNames[$id], $ct['definition']['statuses'])) {
-            unset($form->_caseStatus[$id]);
+            unset($statusLabels[$id]);
           }
         }
       }
@@ -88,12 +89,12 @@ public static function buildQuickForm(&$form) {
     }
 
     foreach ($form->_defaultCaseStatus as $keydefault => $valdefault) {
-      if (!array_key_exists($valdefault, $form->_caseStatus)) {
-        $form->_caseStatus[$valdefault] = CRM_Core_PseudoConstant::getLabel('CRM_Case_BAO_Case', 'status_id', $valdefault);
+      if (!array_key_exists($valdefault, $statusLabels)) {
+        $statusLabels[$valdefault] = CRM_Core_PseudoConstant::getLabel('CRM_Case_BAO_Case', 'status_id', $valdefault);
       }
     }
     $element = $form->add('select', 'case_status_id', ts('Case Status'),
-      $form->_caseStatus, TRUE
+      $statusLabels, TRUE
     );
     // check if the case status id passed in url is a valid one, set as default and freeze
     if (CRM_Utils_Request::retrieve('case_status_id', 'Positive', $form)) {
@@ -191,11 +192,15 @@ public static function endPostProcess(&$form, &$params, $activity) {
     $params['priority_id'] = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'priority_id', 'Normal');
     $activity->priority_id = $params['priority_id'];
 
+    // Note here we don't need to do the filtering that happens in buildForm.
+    // All we want is the label for a given id so we can put it in the subject.
+    $statusLabels = CRM_Case_PseudoConstant::caseStatus();
     foreach ($form->_oldCaseStatus as $statusval) {
+      // @todo we store all old statuses but then we only use the first one.
       if ($activity->subject == 'null') {
         $activity->subject = ts('Case status changed from %1 to %2', [
-          1 => $form->_caseStatus[$statusval] ?? NULL,
-          2 => $form->_caseStatus[$params['case_status_id']] ?? NULL,
+          1 => $statusLabels[$statusval] ?? NULL,
+          2 => $statusLabels[$params['case_status_id']] ?? NULL,
         ]);
         $activity->save();
       }
diff --git a/www/modules/civicrm/CRM/Case/Form/Activity/OpenCase.php b/www/modules/civicrm/CRM/Case/Form/Activity/OpenCase.php
index 6f01cce1b..db4692411 100644
--- a/www/modules/civicrm/CRM/Case/Form/Activity/OpenCase.php
+++ b/www/modules/civicrm/CRM/Case/Form/Activity/OpenCase.php
@@ -31,8 +31,8 @@ class CRM_Case_Form_Activity_OpenCase {
    *
    * @throws \CRM_Core_Exception
    */
-  public static function preProcess(&$form) {
-    if ($form->_context == 'caseActivity') {
+  public static function preProcess(&$form): void {
+    if ($form->_context === 'caseActivity') {
       $contactID = CRM_Utils_Request::retrieve('cid', 'Positive', $form);
       $atype = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Change Case Start Date');
       $caseId = CRM_Utils_Array::first($form->_caseId);
@@ -74,7 +74,7 @@ public static function preProcess(&$form) {
    */
   public static function setDefaultValues(&$form) {
     $defaults = [];
-    if ($form->_context == 'caseActivity') {
+    if ($form->_context === 'caseActivity') {
       return $defaults;
     }
 
@@ -249,8 +249,8 @@ public static function formRule($fields, $files, $form) {
    *
    * @throws \Exception
    */
-  public static function endPostProcess(&$form, &$params) {
-    if ($form->_context == 'caseActivity') {
+  public static function endPostProcess($form, &$params): void {
+    if ($form->_context === 'caseActivity') {
       return;
     }
 
diff --git a/www/modules/civicrm/CRM/Case/Form/Case.php b/www/modules/civicrm/CRM/Case/Form/Case.php
index da3c6cda7..130b0b422 100644
--- a/www/modules/civicrm/CRM/Case/Form/Case.php
+++ b/www/modules/civicrm/CRM/Case/Form/Case.php
@@ -19,6 +19,8 @@
  * This class generates form components for case activity.
  */
 class CRM_Case_Form_Case extends CRM_Core_Form {
+  use CRM_Custom_Form_CustomDataTrait;
+  use CRM_Case_Form_CaseFormTrait;
 
   /**
    * The context
@@ -29,7 +31,12 @@ class CRM_Case_Form_Case extends CRM_Core_Form {
 
   /**
    * Case Id
+   *
    * @var int
+   *
+   * @internal
+   *
+   * use getCaseID to access.
    */
   public $_caseId = NULL;
 
@@ -77,6 +84,21 @@ class CRM_Case_Form_Case extends CRM_Core_Form {
 
   public $submitOnce = TRUE;
 
+  /**
+   * @var float|int|mixed|string|null
+   *
+   * This is inconsistently set & likely to be replaced by a local variable or getter.
+   */
+  public $_contactID;
+
+  /**
+   * @var float|int|mixed|string|null
+   * @deprecated
+   *
+   * This is inconsistently set & likely to be replaced by a local variable or getter.
+   */
+  public $_caseStatusId;
+
   /**
    * Explicitly declare the entity api name.
    */
@@ -95,6 +117,8 @@ public function getEntityId() {
 
   /**
    * Build the form object.
+   *
+   * @throws \CRM_Core_Exception
    */
   public function preProcess() {
     if (empty($this->_action)) {
@@ -177,22 +201,42 @@ public function preProcess() {
     }
     $this->assign('clientName', isset($this->_currentlyViewedContactId) ? $contact->display_name : NULL);
 
-    $session = CRM_Core_Session::singleton();
-    $this->_currentUserId = $session->get('userID');
-
-    //Add activity custom data is included in this page
-    CRM_Custom_Form_CustomData::preProcess($this, NULL, $this->_activityTypeId, 1, 'Activity');
-    $className = "CRM_Case_Form_Activity_{$this->_activityTypeFile}";
-    $className::preProcess($this);
-    $activityGroupTree = $this->_groupTree;
-
-    // Add case custom data to form
-    $caseTypeId = CRM_Utils_Array::value('case_type_id', CRM_Utils_Request::exportValues(), $this->_caseTypeId);
-    CRM_Custom_Form_CustomData::addToForm($this, $caseTypeId);
+    $this->_currentUserId = CRM_Core_Session::getLoggedInContactID();
+
+    CRM_Case_Form_Activity_OpenCase::preProcess($this);
+
+    if ($this->isSubmitted()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('Case', array_filter([
+        'id' => $this->getCaseID(),
+        'case_type_id' => $this->getSubmittedValue('case_type_id'),
+      ]));
+      $this->addCustomDataFieldsToForm('Activity', [
+        'activity_type_id' => $this->_activityTypeId,
+      ]);
+    }
+    // Used for loading custom data fields
+    $this->assign('activityTypeID', $this->_activityTypeId);
+    $this->assign('caseTypeID', $this->getSubmittedValue('case_type_id') ?: $this->getCaseValue('case_type_id'));
+  }
 
-    // so that grouptree is not populated with case fields, since the grouptree is used
-    // for populating activity custom fields.
-    $this->_groupTree = $activityGroupTree;
+  /**
+   * Get the selected Case ID.
+   *
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
+   *
+   * @noinspection PhpUnhandledExceptionInspection
+   */
+  public function getCaseID(): ?int {
+    if (!isset($this->_caseId)) {
+      $this->_caseId = CRM_Utils_Request::retrieve('id', 'Positive', $this);
+    }
+    return $this->_caseId;
   }
 
   /**
@@ -202,10 +246,7 @@ public function setDefaultValues(): array {
     if ($this->_action & CRM_Core_Action::DELETE || $this->_action & CRM_Core_Action::RENEW) {
       return [];
     }
-    $className = "CRM_Case_Form_Activity_{$this->_activityTypeFile}";
-    $defaults = $className::setDefaultValues($this);
-    $defaults = array_merge($defaults, CRM_Custom_Form_CustomData::setDefaultValues($this));
-    return $defaults;
+    return CRM_Case_Form_Activity_OpenCase::setDefaultValues($this);
   }
 
   public function buildQuickForm() {
@@ -233,9 +274,6 @@ public function buildQuickForm() {
       return;
     }
 
-    // Add the activity custom data to the form
-    CRM_Custom_Form_CustomData::buildQuickForm($this);
-
     // we don't want to show button on top of custom form
     $this->assign('noPreCustomButton', TRUE);
 
@@ -274,8 +312,7 @@ public function buildQuickForm() {
       ],
     ]);
 
-    $className = "CRM_Case_Form_Activity_{$this->_activityTypeFile}";
-    $className::buildQuickForm($this);
+    CRM_Case_Form_Activity_OpenCase::buildQuickForm($this);
   }
 
   /**
@@ -287,7 +324,7 @@ public function addRules() {
     if ($this->_action & CRM_Core_Action::DELETE || $this->_action & CRM_Core_Action::RENEW) {
       return TRUE;
     }
-    $className = "CRM_Case_Form_Activity_{$this->_activityTypeFile}";
+    $className = "CRM_Case_Form_Activity_OpenCase";
     $this->addFormRule([$className, 'formRule'], $this);
     $this->addFormRule(['CRM_Case_Form_Case', 'formRule'], $this);
   }
@@ -308,25 +345,6 @@ public static function formRule($values, $files, $form) {
     return TRUE;
   }
 
-  /**
-   * Wrapper for unit testing the post process submit function.
-   *
-   * @param $params
-   * @param $activityTypeFile
-   * @param $contactId
-   * @param $context
-   * @return CRM_Case_BAO_Case
-   */
-  public function testSubmit($params, $activityTypeFile, $contactId, $context = "case") {
-    $this->controller = new CRM_Core_Controller();
-
-    $this->_activityTypeFile = $activityTypeFile;
-    $this->_currentUserId = $contactId;
-    $this->_context = $context;
-
-    return $this->submit($params);
-  }
-
   /**
    * Submit the form with given params.
    *
@@ -337,19 +355,14 @@ public function submit(&$params) {
 
     // 1. call begin post process
     if ($this->_activityTypeFile) {
-      $className = "CRM_Case_Form_Activity_{$this->_activityTypeFile}";
-      $className::beginPostProcess($this, $params);
+      CRM_Case_Form_Activity_OpenCase::beginPostProcess($this, $params);
     }
 
-    if (!empty($params['hidden_custom']) &&
-      !isset($params['custom'])
-    ) {
-      $params['custom'] = CRM_Core_BAO_CustomField::postProcess(
-        $params,
-        NULL,
-        'Case'
-      );
-    }
+    $params['custom'] = CRM_Core_BAO_CustomField::postProcess(
+      $this->getSubmittedValues(),
+      NULL,
+      'Case'
+    );
 
     // 2. create/edit case
     if (!empty($params['case_type_id'])) {
@@ -388,16 +401,14 @@ public function submit(&$params) {
     CRM_Core_Session::singleton()->pushUserContext($url);
 
     // 3. format activity custom data
-    if (!empty($params['hidden_custom'])) {
-      $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params,
-        $this->_activityId,
-        'Activity'
-      );
-    }
+    $params['custom'] = CRM_Core_BAO_CustomField::postProcess($this->getSubmittedValues(),
+      $this->_activityId,
+      'Activity'
+    );
 
     // 4. call end post process
     if ($this->_activityTypeFile) {
-      $className::endPostProcess($this, $params);
+      CRM_Case_Form_Activity_OpenCase::endPostProcess($this, $params);
     }
 
     return $caseObj;
diff --git a/www/modules/civicrm/CRM/Case/Form/CaseFormTrait.php b/www/modules/civicrm/CRM/Case/Form/CaseFormTrait.php
new file mode 100644
index 000000000..960f878a5
--- /dev/null
+++ b/www/modules/civicrm/CRM/Case/Form/CaseFormTrait.php
@@ -0,0 +1,51 @@
+<?php
+
+use Civi\API\EntityLookupTrait;
+
+/**
+ * Trait implements functions to retrieve activity related values.
+ */
+trait CRM_Case_Form_CaseFormTrait {
+
+  use EntityLookupTrait;
+
+  /**
+   * Get the value for a field relating to the Case.
+   *
+   * All values returned in apiv4 format. Escaping may be required.
+   *
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
+   *
+   * @param string $fieldName
+   *
+   * @return mixed
+   * @throws \CRM_Core_Exception
+   */
+  public function getCaseValue(string $fieldName) {
+    if ($this->isDefined('Case')) {
+      return $this->lookup('Case', $fieldName);
+    }
+    $id = $this->getCaseID();
+    if ($id) {
+      $this->define('Case', 'Case', ['id' => $id]);
+      return $this->lookup('Case', $fieldName);
+    }
+    return NULL;
+  }
+
+  /**
+   * Get the selected Case ID.
+   *
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
+   *
+   * @noinspection PhpUnhandledExceptionInspection
+   */
+  public function getCaseID(): ?int {
+    throw new CRM_Core_Exception('`getCaseID` must be implemented');
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Case/Form/CaseView.php b/www/modules/civicrm/CRM/Case/Form/CaseView.php
index 6ef33b6d8..c7a62ffd2 100644
--- a/www/modules/civicrm/CRM/Case/Form/CaseView.php
+++ b/www/modules/civicrm/CRM/Case/Form/CaseView.php
@@ -239,6 +239,8 @@ public function buildQuickForm() {
       return;
     }
 
+    $this->assign('hasAllACLs', CRM_Core_Permission::giveMeAllACLs());
+
     $allowedRelationshipTypes = CRM_Contact_BAO_Relationship::getContactRelationshipType($this->_contactID);
     $relationshipTypeMetadata = CRM_Contact_Form_Relationship::getRelationshipTypeMetadata($allowedRelationshipTypes);
 
diff --git a/www/modules/civicrm/CRM/Case/Form/CustomData.php b/www/modules/civicrm/CRM/Case/Form/CustomData.php
index 47dbd939b..b0eb6f26b 100644
--- a/www/modules/civicrm/CRM/Case/Form/CustomData.php
+++ b/www/modules/civicrm/CRM/Case/Form/CustomData.php
@@ -159,25 +159,26 @@ public function postProcess(): void {
    */
   public function formatCustomDataChangesForDetail(array $params): string {
     $formattedDetails = [];
-    foreach ($params as $customField => $newCustomValue) {
-      if (strpos($customField, 'custom_') === 0) {
-        if (($this->_defaults[$customField] ?? '') === $newCustomValue) {
+    foreach ($params as $fieldKey => $newCustomValue) {
+      if (str_starts_with($fieldKey, 'custom_')) {
+        if (($this->_defaults[$fieldKey] ?? '') === $newCustomValue) {
           // Don't show values that did not change
           continue;
         }
         // We need custom field ID from custom_XX_1
-        [, $customFieldId] = explode('_', $customField);
+        [, $customFieldId] = explode('_', $fieldKey);
 
         if (!empty($customFieldId) && is_numeric($customFieldId)) {
           // Got a custom field ID
-          $label = civicrm_api3('CustomField', 'getvalue', ['id' => $customFieldId, 'return' => 'label']);
+          $customField = CRM_Core_BAO_CustomField::getField($customFieldId);
+          $label = $customField['label'];
 
           // Convert dropdown and other machine values to human labels.
           // Money is special for non-US locales because at this point it's in human format so we don't
           // want to try to convert it.
-          $oldValue = $this->_defaults[$customField] ?? '';
+          $oldValue = $this->_defaults[$fieldKey] ?? '';
           $newValue = $newCustomValue;
-          if ('Money' !== (string) civicrm_api3('CustomField', 'getvalue', ['id' => $customFieldId, 'return' => 'data_type'])) {
+          if ('Money' !== $customField['data_type']) {
             $oldValue = civicrm_api3('CustomValue', 'getdisplayvalue', [
               'custom_field_id' => $customFieldId,
               'entity_id' => $this->_entityID,
diff --git a/www/modules/civicrm/CRM/Case/Form/Report.php b/www/modules/civicrm/CRM/Case/Form/Report.php
index d28648431..7e5360af1 100644
--- a/www/modules/civicrm/CRM/Case/Form/Report.php
+++ b/www/modules/civicrm/CRM/Case/Form/Report.php
@@ -42,6 +42,8 @@ class CRM_Case_Form_Report extends CRM_Core_Form {
 
   /**
    * Build the form object.
+   *
+   * @throws \CRM_Core_Exception
    */
   public function preProcess() {
     $this->_caseID = CRM_Utils_Request::retrieve('caseid', 'Integer', $this, TRUE);
@@ -50,7 +52,7 @@ public function preProcess() {
 
     $this->_report = $this->get('report');
     if ($this->_report) {
-      $this->assign_by_ref('report', $this->_report);
+      $this->assign('report', $this->_report);
     }
 
     // user context
diff --git a/www/modules/civicrm/CRM/Case/Info.php b/www/modules/civicrm/CRM/Case/Info.php
index 7f1e548c4..e36287dbc 100644
--- a/www/modules/civicrm/CRM/Case/Info.php
+++ b/www/modules/civicrm/CRM/Case/Info.php
@@ -42,42 +42,30 @@ public function getInfo() {
 
   /**
    * @inheritDoc
-   * @param bool $getAllUnconditionally
-   * @param bool $descriptions
-   *   Whether to return permission descriptions
-   *
-   * @return array
    */
-  public function getPermissions($getAllUnconditionally = FALSE, $descriptions = FALSE) {
+  public function getPermissions(): array {
     $permissions = [
       'delete in CiviCase' => [
-        ts('delete in CiviCase'),
-        ts('Delete cases'),
+        'label' => ts('delete in CiviCase'),
+        'description' => ts('Delete cases'),
       ],
       'administer CiviCase' => [
-        ts('administer CiviCase'),
-        ts('Define case types, access deleted cases'),
+        'label' => ts('administer CiviCase'),
+        'description' => ts('Define case types, access deleted cases'),
       ],
       'access my cases and activities' => [
-        ts('access my cases and activities'),
-        ts('View and edit only those cases managed by this user'),
+        'label' => ts('access my cases and activities'),
+        'description' => ts('View and edit only those cases managed by this user'),
       ],
       'access all cases and activities' => [
-        ts('access all cases and activities'),
-        ts('View and edit all cases (for visible contacts)'),
+        'label' => ts('access all cases and activities'),
+        'description' => ts('View and edit all cases (for visible contacts)'),
       ],
       'add cases' => [
-        ts('add cases'),
-        ts('Open a new case'),
+        'label' => ts('add cases'),
+        'description' => ts('Open a new case'),
       ],
     ];
-
-    if (!$descriptions) {
-      foreach ($permissions as $name => $attr) {
-        $permissions[$name] = array_shift($attr);
-      }
-    }
-
     return $permissions;
   }
 
diff --git a/www/modules/civicrm/CRM/Case/ManagedEntities.php b/www/modules/civicrm/CRM/Case/ManagedEntities.php
index 6c6d3d1f8..ec302e7be 100644
--- a/www/modules/civicrm/CRM/Case/ManagedEntities.php
+++ b/www/modules/civicrm/CRM/Case/ManagedEntities.php
@@ -43,7 +43,7 @@ public static function createManagedCaseTypes() {
             'description' => (string) $xml->description,
             'is_reserved' => 1,
             'is_active' => 1,
-            'weight' => $xml->weight ? $xml->weight : 1,
+            'weight' => $xml->weight ?: 1,
           ],
         ];
       }
diff --git a/www/modules/civicrm/CRM/Case/Selector/Search.php b/www/modules/civicrm/CRM/Case/Selector/Search.php
index a55665fc3..9e777fafd 100644
--- a/www/modules/civicrm/CRM/Case/Selector/Search.php
+++ b/www/modules/civicrm/CRM/Case/Selector/Search.php
@@ -335,7 +335,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
         $result->case_id
       );
 
-      $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? $result->contact_sub_type : $result->contact_type
+      $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ?: $result->contact_type
       );
 
       //adding case manager to case selector.CRM-4510.
diff --git a/www/modules/civicrm/CRM/Case/WorkflowMessage/ActivityExamples.php b/www/modules/civicrm/CRM/Case/WorkflowMessage/ActivityExamples.php
new file mode 100644
index 000000000..47fb4e755
--- /dev/null
+++ b/www/modules/civicrm/CRM/Case/WorkflowMessage/ActivityExamples.php
@@ -0,0 +1,69 @@
+<?php
+
+use Civi\Api4\WorkflowMessage;
+use Civi\WorkflowMessage\WorkflowMessageExample;
+
+/**
+ * Basic contribution example for contribution templates.
+ *
+ * @noinspection PhpUnused
+ */
+class CRM_Case_WorkflowMessage_ActivityExamples extends WorkflowMessageExample {
+
+  /**
+   * Get the examples this class is able to deliver.
+   */
+  public function getExamples(): iterable {
+    $workflows = ['case_activity'];
+    foreach ($workflows as $workflow) {
+      foreach ([TRUE, FALSE] as $caseID) {
+        yield [
+          'name' => 'workflow/' . $workflow . '/activity' . (bool) $caseID,
+          'title' => $caseID ? ts('Case Activity') : ts('Activity'),
+          'tags' => ['preview'],
+          'workflow' => $workflow,
+          'case_id' => $caseID,
+        ];
+      }
+    }
+  }
+
+  /**
+   * Build an example to use when rendering the workflow.
+   *
+   * @param array $example
+   *
+   * @throws \API_Exception
+   */
+  public function build(array &$example): void {
+    $workFlow = WorkflowMessage::get(TRUE)->addWhere('name', '=', $example['workflow'])->execute()->first();
+    $this->setWorkflowName($workFlow['name']);
+    $messageTemplate = new $workFlow['class']();
+    $this->addExampleData($messageTemplate, $example);
+    $example['data'] = $this->toArray($messageTemplate);
+  }
+
+  /**
+   * Add relevant example data.
+   *
+   * @param \CRM_Case_WorkflowMessage_CaseActivity $messageTemplate
+   * @param array $example
+   *
+   * @throws \API_Exception
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
+   * @throws \Civi\API\Exception\UnauthorizedException
+   */
+  private function addExampleData(CRM_Case_WorkflowMessage_CaseActivity $messageTemplate, array $example): void {
+    $messageTemplate->setContact(\Civi\Test::example('entity/Contact/Barb'));
+    $messageTemplate->setActivity([
+      'activity_type_id:label' => ts('Follow up'),
+      // Ideally something better but let's not add more strings until we hae a good one.
+      'subject' => ('Follow up'),
+    ]);
+    if (!empty($example['case_id'])) {
+      $messageTemplate->setCase(['subject' => ts('Sample case')]);
+    }
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Case/WorkflowMessage/CaseActivity.php b/www/modules/civicrm/CRM/Case/WorkflowMessage/CaseActivity.php
new file mode 100644
index 000000000..0a97a41eb
--- /dev/null
+++ b/www/modules/civicrm/CRM/Case/WorkflowMessage/CaseActivity.php
@@ -0,0 +1,90 @@
+<?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       |
+ +--------------------------------------------------------------------+
+ */
+
+use Civi\WorkflowMessage\GenericWorkflowMessage;
+
+/**
+ * When an activity is created in a case, the "case_activity" email is sent.
+ * Generally, the email is sent to the assignee, although (depending on
+ * the configuration/add-ons) additional copies may be sent.
+ *
+ * @method $this setActivityID(int $activityID)
+ * @method $this setCaseID(int $caseID)
+ * @method int getActivityID()
+ * @method int getCaseID()
+ *
+ * @see CRM_Case_BAO_Case::sendActivityCopy
+ *
+ * @support template-only
+ */
+class CRM_Case_WorkflowMessage_CaseActivity extends GenericWorkflowMessage {
+
+  public const WORKFLOW = 'case_activity';
+
+  /**
+   * The activity.
+   *
+   * @var array|null
+   *
+   * @scope tokenContext as activity
+   */
+  public $activity;
+
+  /**
+   * @var int
+   *
+   * @scope tokenContext as activityId
+   */
+  public $activityID;
+
+  /**
+   * The activity.
+   *
+   * @var array|null
+   *
+   * @scope tokenContext as case
+   */
+  public $case;
+
+  /**
+   * @var int
+   *
+   * @scope tokenContext as caseId
+   */
+  public $caseID;
+
+  /**
+   * @param array $activity
+   *
+   * @return CRM_Case_WorkflowMessage_CaseActivity
+   */
+  public function setActivity(array $activity): CRM_Case_WorkflowMessage_CaseActivity {
+    $this->activity = $activity;
+    if (!empty($activity['id'])) {
+      $this->activityID = $activity['id'];
+    }
+    return $this;
+  }
+
+  /**
+   * @param array $case
+   *
+   * @return CRM_Case_WorkflowMessage_CaseActivity
+   */
+  public function setCase(array $case): CRM_Case_WorkflowMessage_CaseActivity {
+    $this->case = $case;
+    if (!empty($case['id'])) {
+      $this->caseID = $case['id'];
+    }
+    return $this;
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Case/XMLProcessor/Report.php b/www/modules/civicrm/CRM/Case/XMLProcessor/Report.php
index 6e42fb4bf..2f0f4a988 100644
--- a/www/modules/civicrm/CRM/Case/XMLProcessor/Report.php
+++ b/www/modules/civicrm/CRM/Case/XMLProcessor/Report.php
@@ -753,7 +753,7 @@ public static function populateCaseReportTemplate($clientID, $caseID, $activityS
 
     // first get all case information
     $case = $form->caseInfo($clientID, $caseID);
-    $template->assign_by_ref('case', $case);
+    $template->assign('case', $case);
 
     if (($params['include_activities'] ?? NULL) == 1) {
       $template->assign('includeActivities', 'All');
@@ -785,12 +785,12 @@ public static function populateCaseReportTemplate($clientID, $caseID, $activityS
       'includeActivities' => 'All',
       'redact' => 'false',
     ];
-    $template->assign_by_ref('activitySet', $activitySet);
+    $template->assign('activitySet', $activitySet);
 
     //now collect all the information about activities
     $activities = [];
     $form->getActivities($clientID, $caseID, $activityTypes, $activities);
-    $template->assign_by_ref('activities', $activities);
+    $template->assign('activities', $activities);
 
     return $template;
   }
@@ -959,7 +959,7 @@ public static function printCaseReport() {
 
     // Retrieve custom values for cases.
     $customValues = CRM_Core_BAO_CustomValueTable::getEntityValues($caseID, 'Case');
-    $extends = ['case'];
+    $extends = ['Case'];
     $groupTree = CRM_Core_BAO_CustomGroup::getGroupDetail(NULL, NULL, $extends);
     $caseCustomFields = [];
     foreach ($groupTree as $gid => $group_values) {
diff --git a/www/modules/civicrm/CRM/Contact/AccessTrait.php b/www/modules/civicrm/CRM/Contact/AccessTrait.php
index efd40ee09..9c952aa78 100644
--- a/www/modules/civicrm/CRM/Contact/AccessTrait.php
+++ b/www/modules/civicrm/CRM/Contact/AccessTrait.php
@@ -15,30 +15,33 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
+use Civi\Api4\Event\AuthorizeRecordEvent;
+use Civi\Api4\Utils\CoreUtil;
+
 /**
  * Trait shared with entities attached to the contact record.
  */
 trait CRM_Contact_AccessTrait {
 
   /**
-   * @param string $entityName
-   * @param string $action
-   * @param array $record
-   * @param int $userID
-   * @return bool
    * @see \Civi\Api4\Utils\CoreUtil::checkAccessRecord
    */
-  public static function _checkAccess(string $entityName, string $action, array $record, int $userID) {
+  public static function self_civi_api4_authorizeRecord(AuthorizeRecordEvent $e): void {
+    $record = $e->getRecord();
+    $userID = $e->getUserID();
+    $delegateAction = $e->getActionName() === 'get' ? 'get' : 'update';
     $cid = $record['contact_id'] ?? NULL;
     if (!$cid && !empty($record['id'])) {
       $cid = CRM_Core_DAO::getFieldValue(__CLASS__, $record['id'], 'contact_id');
     }
     if (!$cid) {
       // With no contact id this must be part of an event locblock
-      return in_array(__CLASS__, ['CRM_Core_BAO_Phone', 'CRM_Core_BAO_Email', 'CRM_Core_BAO_Address']) &&
-        CRM_Core_Permission::check('edit all events', $userID);
+      $e->setAuthorized(in_array(__CLASS__, ['CRM_Core_BAO_Phone', 'CRM_Core_BAO_Email', 'CRM_Core_BAO_Address']) &&
+        CRM_Core_Permission::check('edit all events', $userID));
+    }
+    else {
+      $e->setAuthorized(CoreUtil::checkAccessDelegated('Contact', $delegateAction, ['id' => $cid], $userID));
     }
-    return \Civi\Api4\Utils\CoreUtil::checkAccessDelegated('Contact', 'update', ['id' => $cid], $userID);
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Contact/ActionMapping.php b/www/modules/civicrm/CRM/Contact/ActionMapping.php
index ca2788fad..af325a864 100644
--- a/www/modules/civicrm/CRM/Contact/ActionMapping.php
+++ b/www/modules/civicrm/CRM/Contact/ActionMapping.php
@@ -36,7 +36,7 @@ public function getEntityName(): string {
     return 'Contact';
   }
 
-  public function modifySpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
+  public function modifyApiSpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
     $spec->getFieldByName('entity_value')
       ->setLabel(ts('Date Field'))
       ->setInputAttr('multiple', FALSE);
@@ -47,15 +47,18 @@ public function modifySpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
   }
 
   public function getValueLabels(): array {
-    $allCustomFields = \CRM_Core_BAO_CustomField::getFields('');
+    $filter = ['extends' => 'Contact', 'is_multiple' => FALSE, 'is_active' => TRUE];
+    $contactCustomGroups = \CRM_Core_BAO_CustomGroup::getAll($filter);
     $dateFields = [
       'birth_date' => ts('Birth Date'),
       'created_date' => ts('Created Date'),
       'modified_date' => ts('Modified Date'),
     ];
-    foreach ($allCustomFields as $fieldID => $field) {
-      if ($field['data_type'] == 'Date') {
-        $dateFields["custom_$fieldID"] = $field['label'];
+    foreach ($contactCustomGroups as $customGroup) {
+      foreach ($customGroup['fields'] as $field) {
+        if ($field['data_type'] == 'Date') {
+          $dateFields["custom_{$field['id']}"] = $field['label'];
+        }
       }
     }
     return $dateFields;
diff --git a/www/modules/civicrm/CRM/Contact/BAO/Contact.php b/www/modules/civicrm/CRM/Contact/BAO/Contact.php
index 253b4d023..424ca4998 100644
--- a/www/modules/civicrm/CRM/Contact/BAO/Contact.php
+++ b/www/modules/civicrm/CRM/Contact/BAO/Contact.php
@@ -9,6 +9,8 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\Contact;
+use Civi\Api4\Event\AuthorizeRecordEvent;
 use Civi\Token\TokenProcessor;
 
 /**
@@ -757,10 +759,6 @@ protected static function contactTrash($contact): bool {
     ];
     CRM_Utils_Hook::pre('edit', $contact->contact_type, $contact->id, $updateParams);
 
-    $params = [1 => [$contact->id, 'Integer']];
-    $query = 'DELETE FROM civicrm_uf_match WHERE contact_id = %1';
-    CRM_Core_DAO::executeQuery($query, $params);
-
     $contact->copyValues($updateParams);
     $contact->save();
     CRM_Core_BAO_Log::register($contact->id, 'civicrm_contact', $contact->id);
@@ -913,6 +911,15 @@ public static function deleteContact($id, $restore = FALSE, $skipUndelete = FALS
       return FALSE;
     }
 
+    // Note: we're not using CRM_Core_BAO_UFMatch::getUFId() because that's cached.
+    $ufmatch = new CRM_Core_DAO_UFMatch();
+    $ufmatch->contact_id = $id;
+    $ufmatch->domain_id = CRM_Core_Config::domainID();
+    if ($ufmatch->find(TRUE)) {
+      // Do not permit a contact to be deleted if it is linked to a site user.
+      return FALSE;
+    }
+
     $contactType = $contact->contact_type;
     if ($restore) {
       // @todo deprecate calling contactDelete with the intention to restore.
@@ -1145,7 +1152,11 @@ public static function processImage() {
         // $controller is not used at all but we need the CRM_Core_Controller object as in it's constructor
         // It retrieves the qfKey from GET or POST and then passes it to CRM_Core_Key::validate the generated key and redirects to a standard error message if fails
         $controller = new CRM_Core_Controller_Simple($formName, ts('New Contact'), NULL, TRUE, FALSE);
-        if (!CRM_Contact_BAO_Contact::_checkAccess('Contact', 'update', ['id' => $cid], NULL)) {
+
+        if (!Contact::checkAccess()
+          ->setAction('update')
+          ->addValue('id', $cid)
+          ->execute()->first()['access']) {
           CRM_Utils_System::permissionDenied();
         }
         CRM_Contact_BAO_Contact::deleteContactImage($cid);
@@ -2651,7 +2662,7 @@ public static function getCountComponent(string $type, int $contactId, ?string $
       default:
         if (!$tableName) {
           $custom = explode('_', $type);
-          $tableName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $custom[1], 'table_name');
+          $tableName = CRM_Core_BAO_CustomGroup::getGroup(['id' => $custom[1]])['table_name'];
         }
         $queryString = "SELECT count(id) FROM $tableName WHERE entity_id = $contactId";
         return (int) CRM_Core_DAO::singleValueQuery($queryString);
@@ -3361,7 +3372,7 @@ public static function on_hook_civicrm_post(\Civi\Core\Event\PostEvent $event) {
       !empty($event->object->is_primary) &&
       !empty($event->object->contact_id)
     ) {
-      $daoClass = CRM_Core_DAO_AllCoreTables::getFullName($event->entity);
+      $daoClass = CRM_Core_DAO_AllCoreTables::getDAONameForEntity($event->entity);
       $dao = new $daoClass();
       $dao->contact_id = $event->object->contact_id;
       $dao->is_primary = 1;
@@ -3592,17 +3603,17 @@ public static function getEntityRefFilters() {
   }
 
   /**
-   * @param string $entityName
-   * @param string $action
-   * @param array $record
-   * @param $userID
-   * @return bool
+   * Check contact access.
    * @see \Civi\Api4\Utils\CoreUtil::checkAccessRecord
    */
-  public static function _checkAccess(string $entityName, string $action, array $record, $userID): bool {
-    switch ($action) {
+  public static function self_civi_api4_authorizeRecord(AuthorizeRecordEvent $e): void {
+    $record = $e->getRecord();
+    $userID = $e->getUserID();
+
+    switch ($e->getActionName()) {
       case 'create':
-        return CRM_Core_Permission::check('add contacts', $userID);
+        $e->setAuthorized(CRM_Core_Permission::check('add contacts', $userID));
+        return;
 
       case 'get':
         $actionType = CRM_Core_Permission::VIEW;
@@ -3617,7 +3628,7 @@ public static function _checkAccess(string $entityName, string $action, array $r
         break;
     }
 
-    return CRM_Contact_BAO_Contact_Permission::allow($record['id'], $actionType, $userID);
+    $e->setAuthorized(CRM_Contact_BAO_Contact_Permission::allow($record['id'], $actionType, $userID));
   }
 
   /**
@@ -3631,7 +3642,11 @@ public static function _checkAccess(string $entityName, string $action, array $r
    *   Id of the contact.
    * @throws CRM_Core_Exception
    */
-  public static function getEntityIcon(string $entityName, int $entityId) {
+  public static function getEntityIcon(string $entityName, int $entityId = NULL): ?string {
+    $default = parent::getEntityIcon($entityName);
+    if (!$entityId) {
+      return $default;
+    }
     $contactTypes = CRM_Contact_BAO_ContactType::getAllContactTypes();
     $subTypes = CRM_Utils_Array::explodePadded(CRM_Core_DAO::getFieldValue(parent::class, $entityId, 'contact_sub_type'));
     foreach ((array) $subTypes as $subType) {
@@ -3641,7 +3656,7 @@ public static function getEntityIcon(string $entityName, int $entityId) {
     }
     // If no sub-type icon, lookup contact type
     $contactType = CRM_Core_DAO::getFieldValue(parent::class, $entityId, 'contact_type');
-    return $contactTypes[$contactType]['icon'] ?? self::$_icon;
+    return $contactTypes[$contactType]['icon'] ?? $default;
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Contact/BAO/ContactType.php b/www/modules/civicrm/CRM/Contact/BAO/ContactType.php
index b0b44710f..0985a35af 100644
--- a/www/modules/civicrm/CRM/Contact/BAO/ContactType.php
+++ b/www/modules/civicrm/CRM/Contact/BAO/ContactType.php
@@ -9,6 +9,8 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\Event\AuthorizeRecordEvent;
+
 /**
  *
  * @package CRM
@@ -42,35 +44,27 @@ public static function isActive($contactType) {
   }
 
   /**
-   * Retrieve basic contact type information.
+   * Retrieve base contact type information.
    *
    * @param bool $includeInactive
    *
-   * @return array
-   *   Array of basic contact types information.
-   *
-   * @throws \CRM_Core_Exception
-   * @throws \Civi\API\Exception\UnauthorizedException
+   * @return array[]
+   *   Array of base contact types keyed by name.
    */
-  public static function basicTypeInfo($includeInactive = FALSE) {
+  public static function basicTypeInfo($includeInactive = FALSE): array {
     return array_filter(self::getAllContactTypes(), function($type) use ($includeInactive) {
       return empty($type['parent']) && ($includeInactive || $type['is_active']);
     });
   }
 
   /**
-   * Retrieve all basic contact types.
-   *
-   * @param bool $all
-   *
-   * @return array
-   *   Array of basic contact types
+   * Get names of base contact types e.g. [Individual, Household, Organization]
    *
-   * @throws \CRM_Core_Exception
-   * @throws \Civi\API\Exception\UnauthorizedException
+   * @param bool $includeInactive
+   * @return string[]
    */
-  public static function basicTypes($all = FALSE): array {
-    return array_keys(self::basicTypeInfo($all));
+  public static function basicTypes($includeInactive = FALSE): array {
+    return array_keys(self::basicTypeInfo($includeInactive));
   }
 
   /**
@@ -244,81 +238,43 @@ public static function contactTypePairs($all = FALSE, $typeName = NULL, $delimit
    * @param bool $isSeparator
    * @param string $separator
    *
-   * @return mixed
-   * @throws \Civi\Core\Exception\DBQueryException
+   * @return array
    */
   public static function getSelectElements(
     $all = FALSE,
     $isSeparator = TRUE,
     $separator = '__'
-  ) {
-    // @todo - use Cache class - ie like Civi::cache('contactTypes')
-    static $_cache = NULL;
-
-    if ($_cache === NULL) {
-      $_cache = [];
-    }
-
-    // @todo - call getAllContactTypes & return filtered results.
-    $argString = $all ? 'CRM_CT_GSE_1' : 'CRM_CT_GSE_0';
-    $argString .= $isSeparator ? '_1' : '_0';
-    $argString .= $separator;
-    $argString = CRM_Utils_Cache::cleanKey($argString);
-    if (!array_key_exists($argString, $_cache)) {
-      $cache = CRM_Utils_Cache::singleton();
-      $_cache[$argString] = $cache->get($argString);
-
-      if (!$_cache[$argString]) {
-        $_cache[$argString] = [];
-
-        $sql = '
-SELECT    c.name as child_name , c.label as child_label , c.id as child_id,
-          p.name as parent_name, p.label as parent_label, p.id as parent_id
-FROM      civicrm_contact_type c
-LEFT JOIN civicrm_contact_type p ON ( c.parent_id = p.id )
-WHERE     ( c.name IS NOT NULL )
-';
-
-        if ($all === FALSE) {
-          $sql .= '
-AND   c.is_active = 1
-AND   ( p.is_active = 1 OR p.id IS NULL )
-';
-        }
-        $sql .= " ORDER BY c.id";
-
-        $values = [];
-        $dao = CRM_Core_DAO::executeQuery($sql);
-        while ($dao->fetch()) {
-          if (!empty($dao->parent_id)) {
-            $key = $isSeparator ? $dao->parent_name . $separator . $dao->child_name : $dao->child_name;
-            $label = "- {$dao->child_label}";
-            $pName = $dao->parent_name;
-          }
-          else {
-            $key = $dao->child_name;
-            $label = $dao->child_label;
-            $pName = $dao->child_name;
-          }
-
-          if (!isset($values[$pName])) {
-            $values[$pName] = [];
-          }
-          $values[$pName][] = ['key' => $key, 'label' => $label];
-        }
+  ): array {
+    $contactTypes = self::getAllContactTypes();
+    foreach ($contactTypes as $contactType) {
+      $parent = $contactType['parent'] ? $contactTypes[$contactType['parent']] : NULL;
+      if (!$all && (!$contactType['is_active'] || ($parent && !$parent['is_active']))) {
+        continue;
+      }
+      if ($parent) {
+        $key = $isSeparator ? $parent['name'] . $separator . $contactType['name'] : $contactType['name'];
+        $label = "- {$contactType['label']}";
+        $pName = $parent['name'];
+      }
+      else {
+        $key = $contactType['name'];
+        $label = $contactType['label'];
+        $pName = $contactType['name'];
+      }
 
-        $selectElements = [];
-        foreach ($values as $pName => $elements) {
-          foreach ($elements as $element) {
-            $selectElements[$element['key']] = $element['label'];
-          }
-        }
-        $_cache[$argString] = $selectElements;
+      if (!isset($values[$pName])) {
+        $values[$pName] = [];
+      }
+      $values[$pName][] = ['key' => $key, 'label' => $label];
+    }
 
-        $cache->set($argString, $_cache[$argString]);
+    $selectElements = [];
+    foreach ($values as $elements) {
+      foreach ($elements as $element) {
+        $selectElements[$element['key']] = $element['label'];
       }
     }
-    return $_cache[$argString];
+    return $selectElements;
   }
 
   /**
@@ -339,40 +295,15 @@ public static function isaSubType($subType, $ignoreCache = FALSE) {
    * Retrieve the basic contact type associated with given subType.
    *
    * @param array|string $subType contact subType.
-   * @return array|string
+   * @return array|string|null
+   *   Return value will be a string if input is a string, otherwise an array
    */
   public static function getBasicType($subType) {
-    // @todo - use Cache class - ie like Civi::cache('contactTypes')
-    static $_cache = NULL;
-    if ($_cache === NULL) {
-      $_cache = [];
-    }
-
-    $isArray = TRUE;
-    if ($subType && !is_array($subType)) {
-      $subType = [$subType];
-      $isArray = FALSE;
+    $allSubTypes = array_column(self::subTypeInfo(NULL, TRUE), 'parent', 'name');
+    if (is_array($subType)) {
+      return array_intersect_key($allSubTypes, array_flip($subType));
     }
-    $argString = implode('_', $subType);
-
-    if (!array_key_exists($argString, $_cache)) {
-      $_cache[$argString] = [];
-
-      $sql = "
-SELECT subtype.name as contact_subtype, type.name as contact_type
-FROM   civicrm_contact_type subtype
-INNER JOIN civicrm_contact_type type ON ( subtype.parent_id = type.id )
-WHERE  subtype.name IN ('" . implode("','", $subType) . "' )";
-      $dao = CRM_Core_DAO::executeQuery($sql);
-      while ($dao->fetch()) {
-        if (!$isArray) {
-          $_cache[$argString] = $dao->contact_type;
-          break;
-        }
-        $_cache[$argString][$dao->contact_subtype] = $dao->contact_type;
-      }
-    }
-    return $_cache[$argString];
+    return $allSubTypes[$subType] ?? NULL;
   }
 
   /**
@@ -480,13 +411,15 @@ public static function self_hook_civicrm_pre(\Civi\Core\Event\PreEvent $event) {
     // Before deleting a contactType, check references by custom groups
     if ($event->action === 'delete') {
       $name = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_ContactType', $event->id);
-      $sep = CRM_Core_DAO::VALUE_SEPARATOR;
-      $custom = new CRM_Core_DAO_CustomGroup();
-      $custom->whereAdd("extends_entity_column_value LIKE '%{$sep}{$name}{$sep}%'");
-      if ($custom->find()) {
-        throw new CRM_Core_Exception(ts("You can not delete this contact type -- it is used by %1 custom field group(s). The custom fields must be deleted first.", [1 => $custom->N]));
+      $customGroups = CRM_Core_BAO_CustomGroup::getAll([
+        'extends' => 'Contact',
+        'extends_entity_column_value' => $name,
+      ]);
+      if ($customGroups) {
+        throw new CRM_Core_Exception(ts("You can not delete this contact type -- it is used by %1 custom field group(s). The custom fields must be deleted first.", [1 => count($customGroups)]));
       }
     }
+    Civi::cache('contactTypes')->clear();
   }
 
   /**
@@ -631,27 +564,25 @@ public static function isAllowEdit($contactId, $subType = NULL) {
   }
 
   /**
+   * Checks to see if a given contact has custom data specific to a particular sub-type.
+   *
    * @param string $contactType
    * @param int $contactId
    *
    * @return bool
    */
   public static function hasCustomData($contactType, $contactId = NULL) {
-    $subTypeClause = '';
-
+    $filters = [
+      'extends' => [$contactType],
+    ];
     if (self::isaSubType($contactType)) {
-      $subType = $contactType;
-      $contactType = self::getBasicType($subType);
-
-      // check for empty custom data which extends subtype
-      $subTypeValue = CRM_Core_DAO::VALUE_SEPARATOR . $subType . CRM_Core_DAO::VALUE_SEPARATOR;
-      $subTypeClause = " AND extends_entity_column_value LIKE '%{$subTypeValue}%' ";
+      $filters['extends'] = [self::getBasicType($contactType)];
+      $filters['extends_entity_column_value'] = [$contactType];
     }
-    $query = "SELECT table_name FROM civicrm_custom_group WHERE extends = '{$contactType}' {$subTypeClause}";
+    $customGroups = CRM_Core_BAO_CustomGroup::getAll($filters);
 
-    $dao = CRM_Core_DAO::executeQuery($query);
-    while ($dao->fetch()) {
-      $sql = "SELECT count(id) FROM {$dao->table_name}";
+    foreach ($customGroups as $customGroup) {
+      $sql = "SELECT count(id) FROM {$customGroup['table_name']}";
       if ($contactId) {
         $sql .= " WHERE entity_id = {$contactId}";
       }
@@ -774,7 +705,7 @@ public static function deleteCustomRowsOfSubtype($gID, $subtypes = [], $subtypes
       return FALSE;
     }
 
-    $tableName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $gID, 'table_name');
+    $tableName = CRM_Core_BAO_CustomGroup::getGroup(['id' => $gID])['table_name'];
 
     // drop triggers CRM-13587
     CRM_Core_DAO::dropTriggers($tableName);
@@ -828,10 +759,9 @@ public static function deleteCustomRowsForEntityID($customTable, $entityID) {
    * Note, this function is used within APIv4 Entity.get, so must use a
    * SQL query instead of calling APIv4 to avoid an infinite loop.
    *
-   * @return array
-   * @throws \CRM_Core_Exception
+   * @return array[]
    */
-  public static function getAllContactTypes() {
+  public static function getAllContactTypes(): array {
     $cache = Civi::cache('contactTypes');
     $cacheKey = 'all_' . $GLOBALS['tsLocale'];
     $contactTypes = $cache->get($cacheKey);
@@ -842,15 +772,13 @@ public static function getAllContactTypes() {
       $dao = CRM_Core_DAO::executeQuery($query->toSQL());
       $contactTypes = array_column($dao->fetchAll(), NULL, 'name');
       $parents = array_column($contactTypes, NULL, 'id');
-      foreach ($contactTypes as $name => $contactType) {
-        $contactTypes[$name]['parent'] = $contactType['parent_id'] ? $parents[$contactType['parent_id']]['name'] : NULL;
-        $contactTypes[$name]['parent_label'] = $contactType['parent_id'] ? $parents[$contactType['parent_id']]['label'] : NULL;
+      foreach ($contactTypes as &$contactType) {
         // Cast int/bool types.
-        $contactTypes[$name]['id'] = (int) $contactType['id'];
-        $contactTypes[$name]['parent_id'] = ((int) $contactType['parent_id']) ?: NULL;
-        $contactTypes[$name]['is_active'] = (bool) $contactType['is_active'];
-        $contactTypes[$name]['is_reserved'] = (bool) $contactType['is_reserved'];
-        $contactTypes[$name]['icon'] = $contactType['icon'] ?? $parents[$contactType['parent_id']]['icon'] ?? NULL;
+        self::formatFieldValues($contactType);
+        // Fill data from parents
+        $contactType['parent'] = $parents[$contactType['parent_id']]['name'] ?? NULL;
+        $contactType['parent_label'] = $parents[$contactType['parent_id']]['label'] ?? NULL;
+        $contactType['icon'] ??= $parents[$contactType['parent_id']]['icon'] ?? NULL;
       }
       $cache->set($cacheKey, $contactTypes);
     }
@@ -868,23 +796,18 @@ public static function getContactType(string $name): ?array {
   }
 
   /**
-   * @param string $entityName
-   * @param string $action
-   * @param array $record
-   * @param $userID
-   * @return bool
+   * Check write access.
    * @see \Civi\Api4\Utils\CoreUtil::checkAccessRecord
    */
-  public static function _checkAccess(string $entityName, string $action, array $record, $userID): bool {
+  public static function self_civi_api4_authorizeRecord(AuthorizeRecordEvent $e): void {
     // Only records with a parent may be deleted
-    if ($action === 'delete') {
+    if ($e->getActionName() === 'delete') {
+      $record = $e->getRecord();
       if (!array_key_exists('parent_id', $record)) {
         $record['parent_id'] = CRM_Core_DAO::getFieldValue(parent::class, $record['id'], 'parent_id');
       }
-      return (bool) $record['parent_id'];
+      $e->setAuthorized((bool) $record['parent_id']);
     }
-    // Gatekeeper permissions suffice for everything else
-    return TRUE;
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Contact/BAO/Group.php b/www/modules/civicrm/CRM/Contact/BAO/Group.php
index 4fb0a5d68..5e0a0f5f1 100644
--- a/www/modules/civicrm/CRM/Contact/BAO/Group.php
+++ b/www/modules/civicrm/CRM/Contact/BAO/Group.php
@@ -9,14 +9,16 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\Event\AuthorizeRecordEvent;
 use Civi\Api4\Group;
+use Civi\Core\HookInterface;
 
 /**
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
-class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group {
+class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group implements HookInterface {
 
   /**
    * @deprecated
@@ -710,8 +712,8 @@ public static function createHiddenSmartGroup($params) {
       //create group only when new saved search.
       $groupParams = [
         'title' => "Hidden Smart Group {$ssId}",
-        'is_active' => CRM_Utils_Array::value('is_active', $params, 1),
-        'is_hidden' => CRM_Utils_Array::value('is_hidden', $params, 1),
+        'is_active' => $params['is_active'] ?? 1,
+        'is_hidden' => $params['is_hidden'] ?? 1,
         'group_type' => $params['group_type'] ?? NULL,
         'visibility' => $params['visibility'] ?? NULL,
         'saved_search_id' => $ssId,
@@ -1441,32 +1443,26 @@ public static function filterActiveGroups($parentArray) {
   }
 
   /**
-   * @param string $entityName
-   * @param string $action
-   * @param array $record
-   * @param $userID
-   * @return bool
+   * Check write access.
    * @see \Civi\Api4\Utils\CoreUtil::checkAccessRecord
    */
-  public static function _checkAccess(string $entityName, string $action, array $record, $userID): bool {
-    switch ($action) {
-      case 'create':
-        $groupType = (array) ($record['group_type:name'] ?? []);
-        // If not already in :name format, transform to name
-        foreach ((array) ($record['group_type'] ?? []) as $typeId) {
-          $groupType[] = CRM_Core_PseudoConstant::getName(self::class, 'group_type', $typeId);
-        }
-        if ($groupType === ['Mailing List']) {
-          // If it's only a Mailing List, edit groups OR create mailings will work
-          return CRM_Core_Permission::check(['access CiviCRM', ['edit groups', 'access CiviMail', 'create mailings']], $userID);
-        }
-        else {
-          return CRM_Core_Permission::check(['access CiviCRM', 'edit groups'], $userID);
-        }
-
-      default:
-        // All other actions just rely on gatekeeper permissions
-        return TRUE;
+  public static function self_civi_api4_authorizeRecord(AuthorizeRecordEvent $e): void {
+    $record = $e->getRecord();
+    $userID = $e->getUserID();
+    // Check create permission (all other actions just rely on gatekeeper permissions)
+    if ($e->getActionName() === 'create') {
+      $groupType = (array) ($record['group_type:name'] ?? []);
+      // If not already in :name format, transform to name
+      foreach ((array) ($record['group_type'] ?? []) as $typeId) {
+        $groupType[] = CRM_Core_PseudoConstant::getName(self::class, 'group_type', $typeId);
+      }
+      if ($groupType === ['Mailing List']) {
+        // If it's only a Mailing List, edit groups OR create mailings will work
+        $e->setAuthorized(CRM_Core_Permission::check(['access CiviCRM', ['edit groups', 'access CiviMail', 'create mailings']], $userID));
+      }
+      else {
+        $e->setAuthorized(CRM_Core_Permission::check(['access CiviCRM', 'edit groups'], $userID));
+      }
     }
   }
 
diff --git a/www/modules/civicrm/CRM/Contact/BAO/Individual.php b/www/modules/civicrm/CRM/Contact/BAO/Individual.php
index fc375bb4a..ae8b21068 100644
--- a/www/modules/civicrm/CRM/Contact/BAO/Individual.php
+++ b/www/modules/civicrm/CRM/Contact/BAO/Individual.php
@@ -55,10 +55,10 @@ public static function format(&$params, $contact) {
     $firstName = trim($params['first_name'] ?? '');
     $middleName = trim($params['middle_name'] ?? '');
     $lastName = trim($params['last_name'] ?? '');
-    $nickName = CRM_Utils_Array::value('nick_name', $params, '');
-    $prefix_id = CRM_Utils_Array::value('prefix_id', $params, '');
-    $suffix_id = CRM_Utils_Array::value('suffix_id', $params, '');
-    $formalTitle = CRM_Utils_Array::value('formal_title', $params, '');
+    $nickName = $params['nick_name'] ?? '';
+    $prefix_id = $params['prefix_id'] ?? '';
+    $suffix_id = $params['suffix_id'] ?? '';
+    $formalTitle = $params['formal_title'] ?? '';
 
     // get prefix and suffix names
     $params['prefix_id:label'] = $prefix = CRM_Core_PseudoConstant::getLabel('CRM_Contact_DAO_Contact', 'prefix_id', $prefix_id);
@@ -73,15 +73,17 @@ public static function format(&$params, $contact) {
         //lets allow to update single name field though preserveDBName
         //but if db having null value and params contain value, CRM-4330.
         $useDBNames = [];
-
-        foreach (['last', 'middle', 'first', 'nick'] as $name) {
-          $dbName = "{$name}_name";
-          $value = $individual->$dbName;
-
-          // the db has name values
-          if ($value && !empty($params['preserveDBName'])) {
-            $useDBNames[] = $name;
-          }
+        if ($individual->last_name && !empty($params['preserveDBName'])) {
+          $useDBNames[] = 'last';
+        }
+        if ($individual->middle_name && !empty($params['preserveDBName'])) {
+          $useDBNames[] = 'middle';
+        }
+        if ($individual->first_name && !empty($params['preserveDBName'])) {
+          $useDBNames[] = 'first';
+        }
+        if ($individual->nick_name && !empty($params['preserveDBName'])) {
+          $useDBNames[] = 'nick';
         }
 
         if ($individual->suffix_id && !empty($params['preserveDBName'])) {
@@ -100,22 +102,52 @@ public static function format(&$params, $contact) {
         //1. preserve db name if want
         //2. lets get value from param if exists.
         //3. if not in params, lets get from db.
+        if (in_array('last', $useDBNames)) {
+          $params['last_name'] = $individual->last_name;
+          $contact->last_name = $individual->last_name;
+          $lastName = $individual->last_name;
+        }
+        elseif (array_key_exists('last_name', $params)) {
+          $lastName = $params['last_name'];
+        }
+        elseif ($individual->last_name) {
+          $lastName = $individual->last_name;
+        }
 
-        foreach (['last', 'middle', 'first', 'nick'] as $name) {
-          $phpName = "{$name}Name";
-          $dbName = "{$name}_name";
-          $value = $individual->$dbName;
-          if (in_array($name, $useDBNames)) {
-            $params[$dbName] = $value;
-            $contact->$dbName = $value;
-            $$phpName = $value;
-          }
-          elseif (array_key_exists($dbName, $params)) {
-            $$phpName = $params[$dbName];
-          }
-          elseif ($value) {
-            $$phpName = $value;
-          }
+        if (in_array('middle', $useDBNames)) {
+          $params['middle_name'] = $individual->middle_name;
+          $contact->middle_name = $individual->middle_name;
+          $middleName = $individual->middle_name;
+        }
+        elseif (array_key_exists('middle_name', $params)) {
+          $middleName = $params['middle_name'];
+        }
+        elseif ($individual->middle_name) {
+          $middleName = $individual->middle_name;
+        }
+
+        if (in_array('first', $useDBNames)) {
+          $params['first_name'] = $individual->first_name;
+          $contact->first_name = $individual->first_name;
+          $firstName = $individual->first_name;
+        }
+        elseif (array_key_exists('first_name', $params)) {
+          $firstName = $params['first_name'];
+        }
+        elseif ($individual->first_name) {
+          $firstName = $individual->first_name;
+        }
+
+        if (in_array('nick', $useDBNames)) {
+          $params['nick_name'] = $individual->nick_name;
+          $contact->nick_name = $individual->nick_name;
+          $nickName = $individual->nick_name;
+        }
+        elseif (array_key_exists('nick_name', $params)) {
+          $nickName = $params['nick_name'];
+        }
+        elseif ($individual->nick_name) {
+          $nickName = $individual->nick_name;
         }
 
         foreach (['prefix', 'suffix'] as $name) {
@@ -178,15 +210,6 @@ public static function format(&$params, $contact) {
         }
       }
 
-      $tokens = [];
-      CRM_Utils_Hook::tokens($tokens);
-      $tokenFields = [];
-      foreach ($tokens as $catTokens) {
-        foreach ($catTokens as $token => $label) {
-          $tokenFields[] = $token;
-        }
-      }
-
       $formatted['id'] = $contact->id ?? $params['id'] ?? 0;
       $tokenProcessor = new TokenProcessor(\Civi::dispatcher(), [
         'class' => __CLASS__,
diff --git a/www/modules/civicrm/CRM/Contact/BAO/Query.php b/www/modules/civicrm/CRM/Contact/BAO/Query.php
index b4b6ff3d3..69cdae134 100644
--- a/www/modules/civicrm/CRM/Contact/BAO/Query.php
+++ b/www/modules/civicrm/CRM/Contact/BAO/Query.php
@@ -1276,10 +1276,6 @@ public function addHierarchicalElements() {
 
                   //build locationType join
                   $locationTypeJoin[$tName] = " ( `$tName`.location_type_id = $ltName.id )";
-
-                  if ($addWhere) {
-                    $this->_whereTables[$tName] = $this->_tables[$tName];
-                  }
                   break;
 
                 case 'civicrm_state_province':
@@ -4580,6 +4576,8 @@ public static function getQuery($params = NULL, $returnProperties = NULL, $count
    *
    * @return array
    * @throws \CRM_Core_Exception
+   *
+   * @deprecated since 5.71 - will be removed after all core usages are fully removed.
    */
   public static function apiQuery(
     $params = NULL,
@@ -4766,9 +4764,8 @@ public static function isCustomDateField($fieldName) {
       return FALSE;
     }
     try {
-      $customFieldData = CRM_Core_BAO_CustomField::getFieldObject($customFieldID);
-      $customFieldDataType = $customFieldData->data_type;
-      if ('Date' == $customFieldDataType) {
+      $customFieldData = CRM_Core_BAO_CustomField::getField($customFieldID);
+      if ($customFieldData && 'Date' == $customFieldData['data_type']) {
         return TRUE;
       }
     }
@@ -5502,7 +5499,7 @@ public function ageRangeQueryBuilder(
 
     $asofDateValues = $this->getWhereValues("{$fieldName}_asof_date", $grouping);
     // will be treated as current day
-    $asofDate = NULL;
+    $asofDate = '';
     if ($asofDateValues) {
       $asofDate = CRM_Utils_Date::processDate($asofDateValues[2]);
       $asofDateFormat = CRM_Utils_Date::customFormat(substr($asofDate, 0, 8));
@@ -6887,7 +6884,7 @@ protected function getMetadataForField($fieldName) {
     if (!empty($field) && empty($field['name'])) {
       // standardising field formatting here - over time we can phase out variants.
       // all paths using this currently unit tested
-      $field['name'] = CRM_Utils_Array::value('field_name', $field, CRM_Utils_Array::value('idCol', $field, $fieldName));
+      $field['name'] = $field['field_name'] ?? $field['idCol'] ?? $fieldName;
     }
     return $field;
   }
diff --git a/www/modules/civicrm/CRM/Contact/BAO/Relationship.php b/www/modules/civicrm/CRM/Contact/BAO/Relationship.php
index 98a29ff92..c87a090f4 100644
--- a/www/modules/civicrm/CRM/Contact/BAO/Relationship.php
+++ b/www/modules/civicrm/CRM/Contact/BAO/Relationship.php
@@ -9,6 +9,7 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\Event\AuthorizeRecordEvent;
 use Civi\Api4\MembershipType;
 use Civi\Api4\Relationship;
 
@@ -157,7 +158,7 @@ public static function createMultiple($params, $primaryContactLetter) {
    * @throws \CRM_Core_Exception
    */
   public static function add($params, $ids = []) {
-    $params['id'] = CRM_Utils_Array::value('relationship', $ids, CRM_Utils_Array::value('id', $params));
+    $params['id'] = $ids['relationship'] ?? $params['id'] ?? NULL;
 
     $hook = 'create';
     if ($params['id']) {
@@ -2266,24 +2267,24 @@ protected static function updateMembershipsByRelationship(array $params, CRM_Con
   }
 
   /**
-   * @param string $entityName
-   * @param string $action
-   * @param array $record
-   * @param int $userID
-   * @return bool
+   * Check related contact access.
    * @see \Civi\Api4\Utils\CoreUtil::checkAccessRecord
    */
-  public static function _checkAccess(string $entityName, string $action, array $record, int $userID): bool {
+  public static function self_civi_api4_authorizeRecord(AuthorizeRecordEvent $e): void {
+    $record = $e->getRecord();
+    $userID = $e->getUserID();
+    $delegateAction = $e->getActionName() === 'get' ? 'get' : 'update';
+
     // Delegate relationship permissions to contacts a & b
     foreach (['a', 'b'] as $ab) {
       if (empty($record["contact_id_$ab"]) && !empty($record['id'])) {
         $record["contact_id_$ab"] = CRM_Core_DAO::getFieldValue(__CLASS__, $record['id'], "contact_id_$ab");
       }
-      if (!empty($record["contact_id_$ab"]) && !\Civi\Api4\Utils\CoreUtil::checkAccessDelegated('Contact', 'update', ['id' => $record["contact_id_$ab"]], $userID)) {
-        return FALSE;
+      if (!empty($record["contact_id_$ab"]) && !\Civi\Api4\Utils\CoreUtil::checkAccessDelegated('Contact', $delegateAction, ['id' => $record["contact_id_$ab"]], $userID)) {
+        $e->setAuthorized(FALSE);
+        break;
       }
     }
-    return TRUE;
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Contact/BAO/SavedSearch.php b/www/modules/civicrm/CRM/Contact/BAO/SavedSearch.php
index bb7b939a4..36b6016f2 100644
--- a/www/modules/civicrm/CRM/Contact/BAO/SavedSearch.php
+++ b/www/modules/civicrm/CRM/Contact/BAO/SavedSearch.php
@@ -378,4 +378,40 @@ public static function getApiEntityOptions() {
       ->column('title_plural');
   }
 
+  /**
+   * Gets all smart groups that filter based on groupID.
+   *
+   * @param int $groupID
+   *     Group Id to search for.
+   * @return array
+   */
+  public static function getSmartGroupsUsingGroup(int $groupID) {
+    $groups = \Civi\Api4\Group::get(FALSE)
+      ->addSelect('id', 'title', 'saved_search_id', 'saved_search_id.form_values')
+      ->addWhere('saved_search_id', 'IS NOT NULL')
+      ->addWhere('saved_search_id.form_values', 'CONTAINS', 'group')
+      ->setLimit(0)
+      ->execute();
+    $smartGroups = [];
+    foreach ($groups as $group) {
+      // Filter out arrays in Form Values which are group searchs.
+      $groupSearches = array_filter(
+        $group['saved_search_id.form_values'],
+        function($v) {
+          return ($v[0] == 'group');
+        }
+      );
+      // Check each group search for valid groups.
+      foreach ($groupSearches as $groupSearch) {
+        if (!empty($groupSearch[2]) && in_array($groupID, $groupSearch[2])) {
+          $smartGroups[$group['id']] = [
+            'title' => $group['title'],
+            'editSearchURL' => self::getEditSearchUrl($group['saved_search_id']),
+          ];
+        }
+      }
+    }
+    return $smartGroups;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Contact/DAO/ACLContactCache.php b/www/modules/civicrm/CRM/Contact/DAO/ACLContactCache.php
index 457d6542a..5bae77597 100644
--- a/www/modules/civicrm/CRM/Contact/DAO/ACLContactCache.php
+++ b/www/modules/civicrm/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:4c2e841e02a874dc937ee986f0346baa)
+ * (GenCodeChecksum:241b4822d3e48b4affef792d19ff6530)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contact/DAO/Contact.php b/www/modules/civicrm/CRM/Contact/DAO/Contact.php
index 5dcd38587..0da7d1fb6 100644
--- a/www/modules/civicrm/CRM/Contact/DAO/Contact.php
+++ b/www/modules/civicrm/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:f799748a5b7e54fafad9dea3cafbb444)
+ * (GenCodeChecksum:c2c4d9156d6646a4751d96b14b0b2ab8)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contact/DAO/ContactType.php b/www/modules/civicrm/CRM/Contact/DAO/ContactType.php
index 26bc5c406..ee538e987 100644
--- a/www/modules/civicrm/CRM/Contact/DAO/ContactType.php
+++ b/www/modules/civicrm/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:e6867c8178161a74d2aa6c0cd2f55b7a)
+ * (GenCodeChecksum:5c103aac8df396df5b3977b1ee2c8bc2)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contact/DAO/DashboardContact.php b/www/modules/civicrm/CRM/Contact/DAO/DashboardContact.php
index 2b56d1455..d845f93a8 100644
--- a/www/modules/civicrm/CRM/Contact/DAO/DashboardContact.php
+++ b/www/modules/civicrm/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:bdf36ed6404765eac4648f18ddd25e0c)
+ * (GenCodeChecksum:df244cd704a493c8a78aeebb30b8e0df)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contact/DAO/Group.php b/www/modules/civicrm/CRM/Contact/DAO/Group.php
index b606f1849..9e773755d 100644
--- a/www/modules/civicrm/CRM/Contact/DAO/Group.php
+++ b/www/modules/civicrm/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:d673dfbe94fef69bf9598fdf3020dda4)
+ * (GenCodeChecksum:921454d1f48dbba0feec6e1dcfd0fd76)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contact/DAO/GroupContact.php b/www/modules/civicrm/CRM/Contact/DAO/GroupContact.php
index 42c2c1514..5c4fcd0ad 100644
--- a/www/modules/civicrm/CRM/Contact/DAO/GroupContact.php
+++ b/www/modules/civicrm/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:b823eecee947f4102bccd38a2fa10d04)
+ * (GenCodeChecksum:84014664926735717c246755326674e3)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contact/DAO/GroupContactCache.php b/www/modules/civicrm/CRM/Contact/DAO/GroupContactCache.php
index 0ec9b07a6..4c615a759 100644
--- a/www/modules/civicrm/CRM/Contact/DAO/GroupContactCache.php
+++ b/www/modules/civicrm/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:a700f89a58ee1b7e63ca867bcbc1de86)
+ * (GenCodeChecksum:0b52e53d1cf34f8d1934380d0c397ad5)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contact/DAO/GroupNesting.php b/www/modules/civicrm/CRM/Contact/DAO/GroupNesting.php
index edd3429fd..9aa9c6e6b 100644
--- a/www/modules/civicrm/CRM/Contact/DAO/GroupNesting.php
+++ b/www/modules/civicrm/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:31b039d439208a08efb24155443a9241)
+ * (GenCodeChecksum:659840b7a7904852b3e352131af7d380)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contact/DAO/GroupOrganization.php b/www/modules/civicrm/CRM/Contact/DAO/GroupOrganization.php
index 2651a4008..b6bc25d0a 100644
--- a/www/modules/civicrm/CRM/Contact/DAO/GroupOrganization.php
+++ b/www/modules/civicrm/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:0154a5b5ddbc324b25eb18b18cee70b5)
+ * (GenCodeChecksum:f58ad0d8da6013e738677cd44c3b090f)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contact/DAO/Relationship.php b/www/modules/civicrm/CRM/Contact/DAO/Relationship.php
index 0527cf724..6560945d7 100644
--- a/www/modules/civicrm/CRM/Contact/DAO/Relationship.php
+++ b/www/modules/civicrm/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:cb178a4634f48ebf1240e74240100693)
+ * (GenCodeChecksum:31c1f7ff9fa679875c85b7bf5718a5ee)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contact/DAO/RelationshipCache.php b/www/modules/civicrm/CRM/Contact/DAO/RelationshipCache.php
index 3351c6a2d..38df8f90c 100644
--- a/www/modules/civicrm/CRM/Contact/DAO/RelationshipCache.php
+++ b/www/modules/civicrm/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:6d5a3561e59414ced7321ba51416886d)
+ * (GenCodeChecksum:1cdf537d7807c8b5fd801507f527dfcf)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contact/DAO/RelationshipType.php b/www/modules/civicrm/CRM/Contact/DAO/RelationshipType.php
index 3b5083db5..52cca0c71 100644
--- a/www/modules/civicrm/CRM/Contact/DAO/RelationshipType.php
+++ b/www/modules/civicrm/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:e729e1ecffeb6861f8dd1c7523612621)
+ * (GenCodeChecksum:4eb82c548def98f3a77769be7e391475)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contact/DAO/SavedSearch.php b/www/modules/civicrm/CRM/Contact/DAO/SavedSearch.php
index 81a8ef381..a2e356dc5 100644
--- a/www/modules/civicrm/CRM/Contact/DAO/SavedSearch.php
+++ b/www/modules/civicrm/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:6a4e86b2c7c5ad71a68b90c40cd5313f)
+ * (GenCodeChecksum:66051ccf8c8ea86bc43f759ca75c2106)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contact/DAO/SubscriptionHistory.php b/www/modules/civicrm/CRM/Contact/DAO/SubscriptionHistory.php
index d3dae0265..d841bb884 100644
--- a/www/modules/civicrm/CRM/Contact/DAO/SubscriptionHistory.php
+++ b/www/modules/civicrm/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:c2c9def531bf0ef05e40200f82a280e4)
+ * (GenCodeChecksum:8d80c4935192d6e7ac016fc43933da0f)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contact/Form/Contact.php b/www/modules/civicrm/CRM/Contact/Form/Contact.php
index a7d93bc07..4153f6ee8 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Contact.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Contact.php
@@ -26,6 +26,7 @@
 class CRM_Contact_Form_Contact extends CRM_Core_Form {
 
   use CRM_Contact_Form_ContactFormTrait;
+  use CRM_Custom_Form_CustomDataTrait;
 
   /**
    * The contact type of the form.
@@ -279,7 +280,7 @@ public function preProcess() {
     }
 
     // build demographics only for Individual contact type
-    if ($this->_contactType != 'Individual' &&
+    if ($this->_contactType !== 'Individual' &&
       array_key_exists('Demographics', $this->_editOptions)
     ) {
       unset($this->_editOptions['Demographics']);
@@ -313,62 +314,32 @@ public function preProcess() {
 
     $this->preProcessLocation();
 
-    // retain the multiple count custom fields value
-    if (!empty($_POST['hidden_custom'])) {
-      $customGroupCount = $_POST['hidden_custom_group_count'] ?? NULL;
-
-      $contactSubType = $_POST['contact_sub_type'] ?? NULL;
-      if ($contactSubType) {
-        $paramSubType = implode(',', $contactSubType);
-      }
-
-      unset($customGroupCount[0]);
-      foreach ($customGroupCount as $groupID => $groupCount) {
-        if ($groupCount > 1) {
-          $this->set('groupID', $groupID);
-          //loop the group
-          for ($i = 1; $i <= $groupCount; $i++) {
-            CRM_Custom_Form_CustomData::preProcess($this, NULL, $contactSubType,
-              $i, $this->_contactType, $this->_contactId, NULL, FALSE
-            );
-            CRM_Contact_Form_Edit_CustomData::buildQuickForm($this);
-          }
-        }
-      }
-
-      //reset all the ajax stuff, for normal processing
-      if (isset($this->_groupTree)) {
-        $this->_groupTree = NULL;
-      }
-      $this->set('groupID', NULL);
-      $this->_getCachedTree = TRUE;
+    if ($this->isSubmitted()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('Contact', array_filter([
+        'id' => $this->getContactID(),
+        'contact_type' => $this->_contactType,
+        'contact_sub_type' => $this->getSubmittedValue('contact_sub_type'),
+      ]));
     }
 
     // execute preProcess dynamically by js else execute normal preProcess
     if (array_key_exists('CustomData', $this->_editOptions)) {
       //assign a parameter to pass for sub type multivalue
       //custom field to load
+      if ($this->isSubmitted()) {
+        $contactSubType = $_POST['contact_sub_type'] ?? NULL;
+        if ($contactSubType) {
+          $paramSubType = implode(',', $contactSubType);
+        }
+      }
       if ($this->_contactSubType || isset($paramSubType)) {
         $paramSubType = (isset($paramSubType)) ? $paramSubType :
           str_replace(CRM_Core_DAO::VALUE_SEPARATOR, ',', trim($this->_contactSubType, CRM_Core_DAO::VALUE_SEPARATOR));
       }
-
-      if (CRM_Utils_Request::retrieve('type', 'String')) {
-        CRM_Contact_Form_Edit_CustomData::preProcess($this);
-      }
-      else {
-        // The reason we call this here is that it sets the _groupTree property which is later used
-        // in setDefaultValues and buildForm. (Ideally instead we would have a trait with getCustomGroup & getCustomFields
-        // that can be called at appropriate times). In order for buildForm to add the right fields it needs
-        // to know any contact sub types that are being added in the submission. Since this runs before
-        // the buildForm adds the contact_sub_type to the form we need to look in _submitValues for it - submitValues
-        // is a un-sanitised version of what is in the form submission (_POST) whereas `getSubmittedValues()` retrieves
-        // 'allowed' POSTED values - ie values which match available fields, with some localization handling.
-        CRM_Custom_Form_CustomData::preProcess($this, NULL, $this->isSubmitted() ? ($this->_submitValues['contact_sub_type'] ?? []) : $this->getContactValue('contact_sub_type') ?? $this->_contactSubType,
-          1, $this->_contactType, $this->getContactID()
-        );
-        $this->assign('customValueCount', $this->_customValueCount);
-      }
     }
     $this->assign('paramSubType', $paramSubType ?? '');
   }
@@ -434,8 +405,7 @@ public function setDefaultValues() {
     // set defaults for blocks ( custom data, address, communication preference, notes, tags and groups )
     foreach ($this->_editOptions as $name => $label) {
       if (!in_array($name, ['Address', 'Notes'])) {
-        $className = 'CRM_Contact_Form_Edit_' . $name;
-        $className::setDefaultValues($this, $defaults);
+        $this->setBlockDefaults($defaults, $name);
       }
     }
 
@@ -767,8 +737,8 @@ public static function formRule($fields, &$errors, $contactId, $contactType) {
   public function buildQuickForm() {
     //load form for child blocks
     if ($this->isAjaxMode()) {
-      $className = 'CRM_Contact_Form_Edit_' . $this->getAjaxBlockName();
-      return $className::buildQuickForm($this);
+      $this->buildLocationBlock($this->getAjaxBlockName());
+      return;
     }
 
     if ($this->_action == CRM_Core_Action::UPDATE) {
@@ -797,15 +767,32 @@ public function buildQuickForm() {
     }
 
     //build contact type specific fields
-    $className = 'CRM_Contact_Form_Edit_' . $this->_contactType;
-    $className::buildQuickForm($this);
+    $this->buildContactTypeSpecificFields();
 
     // Ajax duplicate checking
     $checkSimilar = Civi::settings()->get('contact_ajax_check_similar');
     $this->assign('checkSimilar', $checkSimilar);
     if ($checkSimilar == 1) {
       $ruleParams = ['used' => 'Supervised', 'contact_type' => $this->_contactType];
-      $this->assign('ruleFields', CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($ruleParams));
+      // These are the fields tht are passed to apiv3 Contact.getduplicates.
+      // Most likely it is enough to pass only the fields returned from the function but
+      // this code has been a bit flip-floppy with the ruleFields removed in favour of
+      // the hard-coded list below here
+      // https://github.com/civicrm/civicrm-core/commit/01ee39a0165a6f3fdc8b105626abaa9cb951bb3f#diff-eee833728c23038f8ac3e2bbb37bef5fa1f718d327896178ae9526c31ee80672L265-R273
+      // at that point the api was switched here https://github.com/civicrm/civicrm-core/commit/01ee39a0165a6f3fdc8b105626abaa9cb951bb3f#diff-eee833728c23038f8ac3e2bbb37bef5fa1f718d327896178ae9526c31ee80672R311
+      // However, it was at least partially switched back here https://github.com/civicrm/civicrm-core/commit/a7ba493ce752fee7b05daa103bc1c956b7d05b0f#diff-eee833728c23038f8ac3e2bbb37bef5fa1f718d327896178ae9526c31ee80672R334
+      // so deliberately erring on the side of passing too much information in hopes of breaking
+      // the wheel.
+      $ruleFields = array_unique(CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($ruleParams)
+        + [
+          'first_name',
+          'last_name',
+          'nick_name',
+          'household_name',
+          'organization_name',
+          'email',
+        ]);
+      $this->assign('ruleFields', json_encode($ruleFields));
     }
 
     // build Custom data if Custom data present in edit option
@@ -828,15 +815,14 @@ public function buildQuickForm() {
 
     // build edit blocks ( custom data, demographics, communication preference, notes, tags and groups )
     foreach ($this->_editOptions as $name => $label) {
-      if ($name == 'Address') {
+      if ($name === 'Address') {
         $this->_blocks['Address'] = $this->_editOptions['Address'];
         continue;
       }
-      if ($name == 'TagsAndGroups') {
+      if ($name === 'TagsAndGroups') {
         continue;
       }
-      $className = 'CRM_Contact_Form_Edit_' . $name;
-      $className::buildQuickForm($this);
+      $this->buildBlock($name);
     }
 
     // build tags and groups
@@ -956,11 +942,8 @@ private function buildLocationForm(): void {
             break;
 
           default:
-            // @todo This pattern actually adds complexity compared to filling out a switch statement
-            // for the limited number of blocks - as we also have to receive the block count
             $this->set($blockName . '_Block_Count', $instance);
-            $formName = 'CRM_Contact_Form_Edit_' . $blockName;
-            $formName::buildQuickForm($this);
+            $this->buildLocationBlock($blockName);
         }
       }
     }
@@ -1192,12 +1175,13 @@ public function postProcess() {
    * @return bool
    *   true if data exists, false otherwise
    */
-  public static function blockDataExists(&$fields) {
+  public static function blockDataExists($fields): bool {
     if (!is_array($fields)) {
+      CRM_Core_Error::deprecatedWarning('support for invalid values will be dropped');
       return FALSE;
     }
 
-    static $skipFields = [
+    $dataFields = array_filter(array_diff_key($fields, array_fill_keys([
       'location_type_id',
       'is_primary',
       'phone_type_id',
@@ -1205,34 +1189,8 @@ public static function blockDataExists(&$fields) {
       'country_id',
       'website_type_id',
       'master_id',
-    ];
-    foreach ($fields as $name => $value) {
-      $skipField = FALSE;
-      foreach ($skipFields as $skip) {
-        if (strpos("[$skip]", $name) !== FALSE) {
-          if ($name == 'phone') {
-            continue;
-          }
-          $skipField = TRUE;
-          break;
-        }
-      }
-      if ($skipField) {
-        continue;
-      }
-      if (is_array($value)) {
-        if (self::blockDataExists($value)) {
-          return TRUE;
-        }
-      }
-      else {
-        if (!empty($value)) {
-          return TRUE;
-        }
-      }
-    }
-
-    return FALSE;
+    ], TRUE)));
+    return !empty($dataFields);
   }
 
   /**
@@ -1321,7 +1279,7 @@ public function getTemplateFileName() {
     if ($this->_contactSubType) {
       $templateFile = "CRM/Contact/Form/Edit/SubType/{$this->_contactSubType}.tpl";
       $template = CRM_Core_Form::getTemplate();
-      if ($template->template_exists($templateFile)) {
+      if ($template->templateExists($templateFile)) {
         return $templateFile;
       }
     }
@@ -1513,4 +1471,191 @@ public function getContactID(): ?int {
     return $this->_contactId ? (int) $this->_contactId : NULL;
   }
 
+  private function buildLocationBlock(string $name): void {
+    if ($name === 'Address') {
+      CRM_Contact_Form_Edit_Address::buildQuickForm($this);
+      return;
+    }
+    if ($name === 'Phone') {
+      CRM_Contact_Form_Edit_Phone::buildQuickForm($this);
+      return;
+    }
+    if ($name === 'IM') {
+      CRM_Contact_Form_Edit_IM::buildQuickForm($this);
+      return;
+    }
+    if ($name === 'Website') {
+      CRM_Contact_Form_Edit_Website::buildQuickForm($this);
+      return;
+    }
+    if ($name === 'IM') {
+      CRM_Contact_Form_Edit_IM::buildQuickForm($this);
+      return;
+    }
+    if ($name === 'OpenID') {
+      CRM_Contact_Form_Edit_OpenID::buildQuickForm($this);
+      return;
+    }
+    CRM_Core_Error::deprecatedWarning('unused?');
+    $this->buildBlock($name);
+  }
+
+  /**
+   * @param $name
+   *
+   * @return void
+   */
+  private function buildBlock(string $name): void {
+    if ($name === 'TagsAndGroups') {
+      CRM_Core_Error::deprecatedWarning('unused?');
+      CRM_Contact_Form_Edit_TagsAndGroups::buildQuickForm($this);
+      return;
+    }
+    if ($name === 'CustomData') {
+      $this->buildCustomData();
+      return;
+    }
+    if ($name === 'CommunicationPreferences') {
+      CRM_Contact_Form_Edit_CommunicationPreferences::buildQuickForm($this);
+      return;
+    }
+    if ($name === 'Demographics') {
+      CRM_Contact_Form_Edit_Demographics::buildQuickForm($this);
+      return;
+    }
+    if ($name === 'Notes') {
+      CRM_Contact_Form_Edit_Notes::buildQuickForm($this);
+      return;
+    }
+    CRM_Core_Error::deprecatedWarning('unused?');
+    // Ideally nothing here would be called but it's possible it could be injected from
+    // outside of core. For core purposed we can be sure no core forms are called here
+    // and any extensions doing magic are buyer-beware.
+    $className = 'CRM_Contact_Form_Edit_' . $name;
+    $className::buildQuickForm($this);
+  }
+
+  /**
+   * Build the form object elements for CustomData object.
+   *
+   * @throws \CRM_Core_Exception
+   */
+  private function buildCustomData(): void {
+    $customDataType = CRM_Utils_Request::retrieve('type', 'String');
+    // if customDataType is present it implies it is a new contact - ie
+    // the person has selected 'New Individual' and the type 'Individual' is in the url.
+    if ($customDataType) {
+      $this->assign('addBlock', TRUE);
+      $this->assign('blockName', 'CustomData');
+    }
+    $isAddContact = $this->getAction() === CRM_Core_Action::ADD;
+    $this->assign('cgCount', 1);
+    $type = CRM_Utils_Request::retrieve('type', 'String') ?: $this->_contactType;
+    $subType = $this->isSubmitted() ? ($this->_submitValues['contact_sub_type'] ?? []) : $this->getContactValue('contact_sub_type') ?? $this->_contactSubType;
+    $groupTree = CRM_Core_BAO_CustomGroup::getTree($type,
+      NULL,
+      $this->getContactID(),
+      NULL,
+      $subType
+    );
+
+    if (!empty($groupTree)) {
+      $this->_customValueCount = CRM_Core_BAO_CustomGroup::buildCustomDataView($this, $groupTree, TRUE, NULL, NULL, NULL, $this->getContactID());
+    }
+    foreach ($groupTree as $customGroup) {
+      foreach ($customGroup['fields'] ?? [] as $customField) {
+        if ($customField['data_type'] === 'File') {
+          $this->registerFileField(["custom_{$customField['id']}_-" . ($isAddContact ? '' : 1)]);
+        }
+      }
+    }
+
+    // we should use simplified formatted groupTree
+    $groupTree = CRM_Core_BAO_CustomGroup::formatGroupTree($groupTree, 1);
+
+    if (!$customDataType) {
+      // Probably this does not need to be wrapped in an IF.
+      $this->assign('customValueCount', $this->_customValueCount);
+    }
+    if ($customDataType) {
+      // Not too sure why this makes sense for new contacts only.
+      $this->assign('groupTree', $groupTree);
+    }
+    $customValueCount = $this->_submitValues['hidden_custom_group_count'] ?? NULL;
+    if (is_array($customValueCount)) {
+      if (array_key_exists(0, $customValueCount)) {
+        unset($customValueCount[0]);
+      }
+      $this->_customValueCount = $customValueCount;
+      $this->assign('customValueCount', $customValueCount);
+    }
+
+    $this->addElement('hidden', 'hidden_custom', 1);
+    $this->addElement('hidden', "hidden_custom_group_count[]", ($this->getAction() !== CRM_Core_Action::ADD));
+    CRM_Core_BAO_CustomGroup::buildQuickForm($this, $groupTree);
+    CRM_Core_BAO_CustomGroup::setDefaults($groupTree, $this->_values, FALSE, FALSE, $this->getAction());
+
+    //build custom data.
+    if (!empty($_POST["hidden_custom"]) && !empty($_POST['contact_sub_type'])) {
+      $contactSubType = $_POST['contact_sub_type'];
+    }
+    else {
+      $contactSubType = $this->_values['contact_sub_type'] ?? NULL;
+    }
+    $this->assign('contactType', $this->_contactType);
+    $this->assign('contactSubType', $contactSubType);
+  }
+
+  /**
+   * @return void
+   */
+  private function buildContactTypeSpecificFields(): void {
+    switch ($this->_contactType) {
+      case 'Individual':
+        CRM_Contact_Form_Edit_Individual::buildQuickForm($this);
+        return;
+
+      case 'Organization':
+        CRM_Contact_Form_Edit_Organization::buildQuickForm($this);
+        return;
+
+      case 'Household':
+        CRM_Contact_Form_Edit_Household::buildQuickForm($this);
+        return;
+
+      default:
+        CRM_Core_Error::deprecatedWarning('unreachable?');
+        $className = 'CRM_Contact_Form_Edit_' . $this->_contactType;
+        $className::buildQuickForm($this);
+    }
+  }
+
+  /**
+   * @param array $defaults
+   *
+   * @param string $name
+   *
+   * @return void
+   */
+  private function setBlockDefaults(array &$defaults, string $name): void {
+    if ($name === 'TagsAndGroups') {
+      CRM_Contact_Form_Edit_TagsAndGroups::setDefaultValues($this, $defaults);
+      return;
+    }
+    if ($name === 'CustomData') {
+      return;
+    }
+    if ($name === 'CommunicationPreferences') {
+      CRM_Contact_Form_Edit_CommunicationPreferences::setDefaultValues($this, $defaults);
+      return;
+    }
+    if ($name === 'Demographics') {
+      CRM_Contact_Form_Edit_Demographics::setDefaultValues($this, $defaults);
+      return;
+    }
+    CRM_Core_Error::deprecatedWarning('unused?');
+    $className = 'CRM_Contact_Form_Edit_' . $name;
+    $className::setDefaultValues($this, $defaults);
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Contact/Form/CustomData.php b/www/modules/civicrm/CRM/Contact/Form/CustomData.php
index 9769ab9fa..330a04332 100644
--- a/www/modules/civicrm/CRM/Contact/Form/CustomData.php
+++ b/www/modules/civicrm/CRM/Contact/Form/CustomData.php
@@ -84,23 +84,18 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
    */
   public function preProcess() {
     $this->_cdType = $_GET['type'] ?? NULL;
-    $this->assign('cdType', FALSE);
     $this->_multiRecordDisplay = CRM_Utils_Request::retrieve('multiRecordDisplay', 'String', $this);
-    if ($this->_cdType || $this->_multiRecordDisplay == 'single') {
-      if ($this->_cdType) {
-        $this->assign('cdType', TRUE);
-      }
+    $isBuildForm = $this->_cdType && $this->_multiRecordDisplay;
+    $this->assign('cdType', (bool) $this->_cdType);
+    if ($isBuildForm) {
       // NOTE : group id is not stored in session from within CRM_Custom_Form_CustomData::preProcess func
       // this is due to some condition inside it which restricts it from saving in session
       // so doing this for multi record edit action
       $entityId = CRM_Utils_Request::retrieve('entityID', 'Positive', $this);
-      if (!empty($entityId)) {
-        $subType = CRM_Contact_BAO_Contact::getContactSubType($entityId, ',');
-      }
-      CRM_Custom_Form_CustomData::preProcess($this, NULL, $subType, NULL, CRM_Utils_Request::retrieve('type', 'String', $this), $entityId);
+      $this->preProcessCustomData(NULL, CRM_Utils_Request::retrieve('type', 'String', $this), $entityId);
       if ($this->_multiRecordDisplay) {
         $this->_groupID = CRM_Utils_Request::retrieve('groupID', 'Positive', $this);
-        $this->_tableID = $this->_entityId;
+        $this->_tableID = $entityId;
         $this->_contactType = CRM_Contact_BAO_Contact::getContactType($this->_tableID);
         $mode = CRM_Utils_Request::retrieve('mode', 'String', $this);
         $hasReachedMax = CRM_Core_BAO_CustomGroup::hasReachedMaxLimit($this->_groupID, $this->_tableID);
@@ -126,10 +121,14 @@ public function preProcess() {
 
         if (!empty($_POST['hidden_custom'])) {
           $this->assign('postedInfo', TRUE);
+          CRM_Core_Error::deprecatedWarning("I'm kinda confused - how did we get here?");
         }
       }
       return;
     }
+    else {
+      CRM_Core_Error::deprecatedWarning("I'm so confused - how did we get here?");
+    }
     $this->_groupID = CRM_Utils_Request::retrieve('groupID', 'Positive', $this, TRUE);
     $this->_tableID = CRM_Utils_Request::retrieve('tableId', 'Positive', $this, TRUE);
 
@@ -143,11 +142,111 @@ public function preProcess() {
     // when custom data is included in this page
     if (!empty($_POST['hidden_custom'])) {
       for ($i = 1; $i <= $_POST['hidden_custom_group_count'][$this->_groupID]; $i++) {
-        CRM_Custom_Form_CustomData::preProcess($this, NULL, $this->_contactSubType, $i, $this->_contactType, $this->_tableID);
-        CRM_Custom_Form_CustomData::buildQuickForm($this);
-        CRM_Custom_Form_CustomData::setDefaultValues($this);
+        $this->preProcessCustomData($i, $this->_contactType, $this->_tableID);
+        $this->addElement('hidden', 'hidden_custom', 1);
+        $this->addElement('hidden', "hidden_custom_group_count[{$this->_groupID}]", $this->_groupCount);
+        CRM_Core_BAO_CustomGroup::buildQuickForm($this, $this->_groupTree);
+      }
+    }
+  }
+
+  /**
+   * Previously shared function
+   *
+   * @param null|int $groupCount
+   * @param null $type
+   * @param null|int $entityID
+   *
+   * @throws \CRM_Core_Exception
+   * @deprecated see https://github.com/civicrm/civicrm-core/pull/29241 for preferred approach - basically
+   * 1) at the tpl layer use CRM/common/customDataBlock.tpl
+   * 2) to make the fields available for postProcess
+   * if ($this->isSubmitted()) {
+   *   $this->addCustomDataFieldsToForm('FinancialAccount');
+   * }
+   * 3) pass getSubmittedValues() to CRM_Core_BAO_CustomField::postProcess($this->getSubmittedValues(), $this->_id, 'FinancialAccount');
+   *  to ensure any money or number fields are handled for localisation
+   */
+  private function preProcessCustomData($groupCount = NULL, $type = NULL, $entityID = NULL) {
+    $form = $this;
+
+    $extendsEntityColumn = CRM_Utils_Request::retrieve('subName', 'String', $form);
+    if ($extendsEntityColumn === 'null') {
+      // Is this reachable?
+      $extendsEntityColumn = NULL;
+    }
+
+    if ($groupCount) {
+      $form->_groupCount = $groupCount;
+    }
+    else {
+      $form->_groupCount = CRM_Utils_Request::retrieve('cgcount', 'Positive', $form);
+    }
+
+    $form->assign('cgCount', $form->_groupCount);
+
+    //carry qf key, since this form is not inhereting core form.
+    if ($qfKey = CRM_Utils_Request::retrieve('qfKey', 'String')) {
+      $form->assign('qfKey', $qfKey);
+    }
+
+    if ($entityID) {
+      $form->_entityId = $entityID;
+    }
+    else {
+      $form->_entityId = CRM_Utils_Request::retrieve('entityID', 'Positive', $form);
+    }
+
+    $typeCheck = CRM_Utils_Request::retrieve('type', 'String');
+    $urlGroupId = CRM_Utils_Request::retrieve('groupID', 'Positive');
+    if (isset($typeCheck) && $urlGroupId) {
+      $form->_groupID = $urlGroupId;
+    }
+    else {
+      $form->_groupID = CRM_Utils_Request::retrieve('groupID', 'Positive', $form);
+    }
+
+    $gid = (isset($form->_groupID)) ? $form->_groupID : NULL;
+
+    $singleRecord = NULL;
+    if (!empty($form->_groupCount) && !empty($form->_multiRecordDisplay) && $form->_multiRecordDisplay == 'single') {
+      $singleRecord = $form->_groupCount;
+    }
+    $mode = CRM_Utils_Request::retrieve('mode', 'String', $form);
+    // when a new record is being added for multivalued custom fields.
+    if (isset($form->_groupCount) && $form->_groupCount == 0 && $mode == 'add' &&
+      !empty($form->_multiRecordDisplay) && $form->_multiRecordDisplay == 'single') {
+      $singleRecord = 'new';
+    }
+
+    $groupTree = CRM_Core_BAO_CustomGroup::getTree($type,
+      NULL,
+      $form->_entityId,
+      $gid,
+      CRM_Contact_BAO_Contact::getContactSubType($entityID),
+      $extendsEntityColumn,
+      TRUE,
+      NULL,
+      FALSE,
+      CRM_Core_Permission::EDIT,
+      $singleRecord
+    );
+
+    if (property_exists($form, '_customValueCount') && !empty($groupTree)) {
+      $form->_customValueCount = CRM_Core_BAO_CustomGroup::buildCustomDataView($form, $groupTree, TRUE, NULL, NULL, NULL, $form->_entityId);
+    }
+    // we should use simplified formatted groupTree
+    $groupTree = CRM_Core_BAO_CustomGroup::formatGroupTree($groupTree, $form->_groupCount, $form);
+
+    if (isset($form->_groupTree) && is_array($form->_groupTree)) {
+      $keys = array_keys($groupTree);
+      foreach ($keys as $key) {
+        $form->_groupTree[$key] = $groupTree[$key];
       }
     }
+    else {
+      $form->_groupTree = $groupTree;
+    }
   }
 
   /**
@@ -182,7 +281,10 @@ public function buildQuickForm() {
           ]);
         }
       }
-      return CRM_Custom_Form_CustomData::buildQuickForm($this);
+      $this->addElement('hidden', 'hidden_custom', 1);
+      $this->addElement('hidden', "hidden_custom_group_count[{$this->_groupID}]", $this->_groupCount);
+      CRM_Core_BAO_CustomGroup::buildQuickForm($this, $this->_groupTree);
+      return;
     }
 
     //need to assign custom data type and subtype to the template
@@ -239,7 +341,8 @@ public function setDefaultValues() {
         }
       }
       else {
-        $customDefaultValue = CRM_Custom_Form_CustomData::setDefaultValues($this);
+        $customDefaultValue = [];
+        CRM_Core_BAO_CustomGroup::setDefaults($this->_groupTree, $customDefaultValue, FALSE, FALSE, $this->get('action'));
       }
       return $customDefaultValue;
     }
@@ -274,7 +377,7 @@ public function postProcess() {
       $this->_tableID,
       $this->_entityType
     );
-    $table = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->_groupID, 'table_name');
+    $table = CRM_Core_BAO_CustomGroup::getGroup(['id' => $this->_groupID])['table_name'];
     $cgcount = CRM_Core_BAO_CustomGroup::customGroupDataExistsForEntity($this->_tableID, $table, TRUE);
     $cgcount += 1;
     $buttonName = $this->controller->getButtonName();
diff --git a/www/modules/civicrm/CRM/Contact/Form/Domain.php b/www/modules/civicrm/CRM/Contact/Form/Domain.php
index 964705eb8..f2fc2580a 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Domain.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Domain.php
@@ -120,7 +120,14 @@ public function buildQuickForm(): void {
     //build location blocks.
     $this->assign('addressSequence', CRM_Core_BAO_Address::addressSequence());
     CRM_Contact_Form_Edit_Address::buildQuickForm($this, 1);
-    CRM_Contact_Form_Edit_Email::buildQuickForm($this, 1);
+
+    //Email box
+    $this->addField("email[1][email]", [
+      'entity' => 'email',
+      'aria-label' => ts('Email 1'),
+      'label' => ts('Email 1'),
+    ]);
+    $this->addRule("email[1][email]", ts('Email is not valid.'), 'email');
     CRM_Contact_Form_Edit_Phone::buildQuickForm($this, 1);
 
     $this->addButtons([
diff --git a/www/modules/civicrm/CRM/Contact/Form/Edit/Address.php b/www/modules/civicrm/CRM/Contact/Form/Edit/Address.php
index f7cbe1688..8411c7d70 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Edit/Address.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Edit/Address.php
@@ -176,42 +176,8 @@ public static function buildQuickForm(&$form, $addressBlockCount = NULL, $sharin
   public static function formRule($fields, $files = [], $self = NULL) {
     $errors = [];
 
-    $customDataRequiredFields = [];
-    if ($self && property_exists($self, '_addressRequireOmission')) {
-      $customDataRequiredFields = explode(',', $self->_addressRequireOmission);
-    }
-
     if (!empty($fields['address']) && is_array($fields['address'])) {
       foreach ($fields['address'] as $instance => $addressValues) {
-
-        if (CRM_Utils_System::isNull($addressValues)) {
-          // DETACH 'required' form rule error to
-          // custom data only if address data not exists upon submission
-          if (!empty($customDataRequiredFields)) {
-            foreach ($customDataRequiredFields as $customElementName) {
-              $elementName = "address[$instance][$customElementName]";
-              if ($self->getElementError($elementName)) {
-                // set element error to none
-                $self->setElementError($elementName, NULL);
-              }
-            }
-          }
-          continue;
-        }
-
-        // DETACH 'required' form rule error to
-        // custom data if address data not exists upon submission
-        // or if master address is selected
-        if (!empty($customDataRequiredFields) && (!CRM_Core_BAO_Address::dataExists($addressValues) || !empty($addressValues['master_id']))) {
-          foreach ($customDataRequiredFields as $customElementName) {
-            $elementName = "address[$instance][$customElementName]";
-            if ($self->getElementError($elementName)) {
-              // set element error to none
-              $self->setElementError($elementName, NULL);
-            }
-          }
-        }
-
         if (!empty($addressValues['use_shared_address']) && empty($addressValues['master_id'])) {
           $errors["address[$instance][use_shared_address]"] = ts('Please select valid shared contact or a contact with valid address.');
         }
@@ -226,7 +192,7 @@ public static function formRule($fields, $files = [], $self = NULL) {
    *
    * @param array $defaults
    *   Defaults associated array.
-   * @param CRM_Core_Form $form
+   * @param \CRM_Contact_Form_Contact|\CRM_Contact_Form_Edit_Address $form
    *   Form object.
    */
   public static function setDefaultValues(&$defaults, &$form) {
@@ -344,36 +310,6 @@ public static function setDefaultValues(&$defaults, &$form) {
     }
   }
 
-  /**
-   * Store required custom data info.
-   *
-   * @param CRM_Core_Form $form
-   * @param array $groupTree
-   */
-  public static function storeRequiredCustomDataInfo(&$form, $groupTree) {
-    if (in_array(CRM_Utils_System::getClassName($form), ['CRM_Contact_Form_Contact', 'CRM_Contact_Form_Inline_Address'])) {
-      $requireOmission = '';
-      foreach ($groupTree as $csId => $csVal) {
-        // only process Address entity fields
-        if ($csVal['extends'] !== 'Address') {
-          continue;
-        }
-
-        foreach ($csVal['fields'] as $cdId => $cdVal) {
-          if (!empty($cdVal['is_required'])) {
-            $elementName = $cdVal['element_name'];
-            if (in_array($elementName, $form->_required)) {
-              // store the omitted rule for a element, to be used later on
-              $requireOmission .= $cdVal['element_custom_name'] . ',';
-            }
-          }
-        }
-      }
-
-      $form->_addressRequireOmission = rtrim($requireOmission, ',');
-    }
-  }
-
   /**
    * Add custom data to the form.
    *
@@ -385,19 +321,20 @@ public static function storeRequiredCustomDataInfo(&$form, $groupTree) {
    */
   protected static function addCustomDataToForm(&$form, $entityId, $blockId) {
     $groupTree = CRM_Core_BAO_CustomGroup::getTree('Address', NULL, $entityId);
-
     if (isset($groupTree) && is_array($groupTree)) {
       // use simplified formatted groupTree
       $groupTree = CRM_Core_BAO_CustomGroup::formatGroupTree($groupTree, 1, $form);
-
+      $enforceRequiredFields = self::enforceRequired($form);
       // make sure custom fields are added /w element-name in the format - 'address[$blockId][custom-X]'
       foreach ($groupTree as $id => $group) {
-        foreach ($group['fields'] as $fldId => $field) {
-          $groupTree[$id]['fields'][$fldId]['element_custom_name'] = $field['element_name'];
-          $groupTree[$id]['fields'][$fldId]['element_name'] = "address[$blockId][{$field['element_name']}]";
+        foreach ($group['fields'] as $fieldID => $field) {
+          $groupTree[$id]['fields'][$fieldID]['element_custom_name'] = $field['element_name'];
+          $groupTree[$id]['fields'][$fieldID]['element_name'] = "address[$blockId][{$field['element_name']}]";
+          if (!$enforceRequiredFields) {
+            $groupTree[$id]['fields'][$fieldID]['is_required'] = 0;
+          }
         }
       }
-
       $defaults = [];
       CRM_Core_BAO_CustomGroup::setDefaults($groupTree, $defaults);
 
@@ -420,11 +357,6 @@ protected static function addCustomDataToForm(&$form, $entityId, $blockId) {
       // And we can't set it to 'address_' because we want to set it in a slightly different format.
       CRM_Core_BAO_CustomGroup::buildQuickForm($form, $groupTree, FALSE, 'dnc_');
 
-      // during contact editing : if no address is filled
-      // required custom data must not produce 'required' form rule error
-      // more handling done in formRule func
-      CRM_Contact_Form_Edit_Address::storeRequiredCustomDataInfo($form, $groupTree);
-
       $tplGroupTree = CRM_Core_Smarty::singleton()
         ->getTemplateVars('address_groupTree');
       $tplGroupTree = empty($tplGroupTree) ? [] : $tplGroupTree;
@@ -436,4 +368,26 @@ protected static function addCustomDataToForm(&$form, $entityId, $blockId) {
     // address custom data processing ends ..
   }
 
+  /**
+   * Should required fields be enforced.
+   *
+   * This would be FALSE if there were no other address fields present.
+   *
+   * @param \CRM_Core_Form $form
+   *
+   * @return bool
+   */
+  private static function enforceRequired(CRM_Core_Form $form): bool {
+    if ($form->isSubmitted()) {
+      $addresses = (array) $form->getSubmittedValue('address');
+      foreach ($addresses as $address) {
+        if (!empty($address['master_id']) || CRM_Core_BAO_Address::dataExists($address)) {
+          return TRUE;
+        }
+      }
+      return FALSE;
+    }
+    return TRUE;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Contact/Form/Edit/CommunicationPreferences.php b/www/modules/civicrm/CRM/Contact/Form/Edit/CommunicationPreferences.php
index 2a6b1e2c7..d3655df2f 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Edit/CommunicationPreferences.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Edit/CommunicationPreferences.php
@@ -186,7 +186,7 @@ public static function setDefaultValues(&$form, &$defaults) {
     else {
       foreach (CRM_Contact_BAO_Contact::$_greetingTypes as $greeting) {
         $name = "{$greeting}_display";
-        $form->assign($name, CRM_Utils_Array::value($name, $defaults));
+        $form->assign($name, $defaults[$name] ?? NULL);
       }
     }
   }
diff --git a/www/modules/civicrm/CRM/Contact/Form/Edit/CustomData.php b/www/modules/civicrm/CRM/Contact/Form/Edit/CustomData.php
index 9593b3927..66d6922f8 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Edit/CustomData.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Edit/CustomData.php
@@ -16,18 +16,23 @@
  */
 
 /**
- * Form helper class for an Demographics object.
+ * Form helper class for an Demographics object (ahem).
+ *
+ * @deprecated since 5.73 will be removed around 5.85
  */
 class CRM_Contact_Form_Edit_CustomData {
 
   /**
    * Build all the data structures needed to build the form.
    *
+   * @deprecated since 5.73 will be removed around 5.85
+   *
    * @param CRM_Core_Form $form
    *
    * @throws \CRM_Core_Exception
    */
   public static function preProcess(&$form) {
+    CRM_Core_Error::deprecatedFunctionWarning('maybe take a copy?');
     $customDataType = CRM_Utils_Request::retrieve('type', 'String');
 
     if ($customDataType) {
@@ -46,10 +51,13 @@ public static function preProcess(&$form) {
   /**
    * Build the form object elements for CustomData object.
    *
+   * @deprecated since 5.73 will be removed around 5.85
+   *
    * @param CRM_Core_Form $form
    *   Reference to the form object.
    */
   public static function buildQuickForm(&$form) {
+    CRM_Core_Error::deprecatedFunctionWarning('take a copy?');
     $customValueCount = $form->_submitValues['hidden_custom_group_count'] ?? NULL;
     if (is_array($customValueCount)) {
       if (array_key_exists(0, $customValueCount)) {
@@ -58,7 +66,9 @@ public static function buildQuickForm(&$form) {
       $form->_customValueCount = $customValueCount;
       $form->assign('customValueCount', $customValueCount);
     }
-    CRM_Custom_Form_CustomData::buildQuickForm($form);
+    $form->addElement('hidden', 'hidden_custom', 1);
+    $form->addElement('hidden', "hidden_custom_group_count[{$form->_groupID}]", $form->_groupCount);
+    CRM_Core_BAO_CustomGroup::buildQuickForm($form, $form->_groupTree);
 
     //build custom data.
     $contactSubType = NULL;
@@ -76,12 +86,15 @@ public static function buildQuickForm(&$form) {
    * Set default values for the form. Note that in edit/view mode
    * the default values are retrieved from the database
    *
+   * @deprecated since 5.73 will be removed around 5.85
    *
    * @param CRM_Core_Form $form
    * @param array $defaults
    */
   public static function setDefaultValues(&$form, &$defaults) {
-    $defaults += CRM_Custom_Form_CustomData::setDefaultValues($form);
+    CRM_Core_Error::deprecatedFunctionWarning('take a copy?');
+    CRM_Core_BAO_CustomGroup::setDefaults($form->_groupTree, $defaults, FALSE, FALSE, $form->get('action'));
+    return $defaults;
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Contact/Form/Inline.php b/www/modules/civicrm/CRM/Contact/Form/Inline.php
index 253f66731..b55bfe787 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Inline.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Inline.php
@@ -23,6 +23,8 @@ abstract class CRM_Contact_Form_Inline extends CRM_Core_Form {
   /**
    * Id of the contact that is being edited
    * @var int
+   *
+   * @internal - use getContactID()
    */
   public $_contactId;
 
@@ -56,12 +58,11 @@ public function getDefaultEntity() {
    * Common preprocess: fetch contact ID and contact type
    */
   public function preProcess() {
-    $this->_contactId = CRM_Utils_Request::retrieve('cid', 'Positive', $this, TRUE);
-    $this->assign('contactId', $this->_contactId);
+    $this->assign('contactId', $this->getContactID());
 
     // get contact type and subtype
     if (empty($this->_contactType)) {
-      $contactTypeInfo = CRM_Contact_BAO_Contact::getContactTypes($this->_contactId);
+      $contactTypeInfo = CRM_Contact_BAO_Contact::getContactTypes($this->getContactID());
       $this->_contactType = $contactTypeInfo[0];
 
       // check if subtype is set
@@ -77,11 +78,28 @@ public function preProcess() {
     $this->setAction(CRM_Core_Action::UPDATE);
   }
 
+  /**
+   * Get the contact ID.
+   *
+   * Override this for more complex retrieval as required by the form.
+   *
+   * @return int|null
+   *
+   * @noinspection PhpUnhandledExceptionInspection
+   * @noinspection PhpDocMissingThrowsInspection
+   */
+  public function getContactID(): int {
+    if (!isset($this->_contactId)) {
+      $this->_contactId = (int) CRM_Utils_Request::retrieve('cid', 'Positive', $this, TRUE);
+    }
+    return $this->_contactId;
+  }
+
   /**
    * Common form elements.
    */
   public function buildQuickForm() {
-    CRM_Contact_Form_Inline_Lock::buildQuickForm($this, $this->_contactId);
+    CRM_Contact_Form_Inline_Lock::buildQuickForm($this, $this->getContactID());
 
     $buttons = [
       [
@@ -111,10 +129,8 @@ public function cancelAction() {
    * @return array
    */
   public function setDefaultValues() {
-    $defaults = $params = [];
-    $params['id'] = $this->_contactId;
-
-    CRM_Contact_BAO_Contact::getValues($params, $defaults);
+    $defaults = [];
+    CRM_Contact_BAO_Contact::getValues(['id' => $this->getContactID()], $defaults);
 
     return $defaults;
   }
@@ -123,9 +139,9 @@ public function setDefaultValues() {
    * Add entry to log table.
    */
   protected function log() {
-    CRM_Core_BAO_Log::register($this->_contactId,
+    CRM_Core_BAO_Log::register($this->getContactID(),
       'civicrm_contact',
-      $this->_contactId
+      $this->getContactID()
     );
   }
 
@@ -136,9 +152,9 @@ protected function log() {
    */
   protected function response() {
     $this->ajaxResponse = array_merge(
-      self::renderFooter($this->_contactId),
+      self::renderFooter($this->getContactID()),
       $this->ajaxResponse,
-      CRM_Contact_Form_Inline_Lock::getResponse($this->_contactId)
+      CRM_Contact_Form_Inline_Lock::getResponse($this->getContactID())
     );
     // Note: Post hooks will be called by CRM_Core_Form::mainProcess
   }
diff --git a/www/modules/civicrm/CRM/Contact/Form/Inline/CommunicationPreferences.php b/www/modules/civicrm/CRM/Contact/Form/Inline/CommunicationPreferences.php
index ec2b48dae..2b3785721 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Inline/CommunicationPreferences.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Inline/CommunicationPreferences.php
@@ -51,7 +51,7 @@ public function setDefaultValues() {
 
     foreach (CRM_Contact_BAO_Contact::$_greetingTypes as $greeting) {
       $name = "{$greeting}_display";
-      $this->assign($name, CRM_Utils_Array::value($name, $defaults));
+      $this->assign($name, $defaults[$name] ?? NULL);
     }
     return $defaults;
   }
diff --git a/www/modules/civicrm/CRM/Contact/Form/Inline/CustomData.php b/www/modules/civicrm/CRM/Contact/Form/Inline/CustomData.php
index 96247fa48..ce3f6ef2e 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Inline/CustomData.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Inline/CustomData.php
@@ -35,26 +35,66 @@ class CRM_Contact_Form_Inline_CustomData extends CRM_Contact_Form_Inline {
   protected $_entityType;
 
   /**
-   * Call preprocess.
+   * Build the form object elements for custom data.
+   *
+   * @throws \CRM_Core_Exception
    */
-  public function preProcess() {
-    parent::preProcess();
-
+  public function buildQuickForm(): void {
+    parent::buildQuickForm();
     $this->_groupID = CRM_Utils_Request::retrieve('groupID', 'Positive', $this, TRUE, NULL);
     $this->assign('customGroupId', $this->_groupID);
-    $customRecId = CRM_Utils_Request::retrieve('customRecId', 'Positive', $this, FALSE, 1);
-    $cgcount = CRM_Utils_Request::retrieve('cgcount', 'Positive', $this, FALSE, 1);
-    $subType = CRM_Contact_BAO_Contact::getContactSubType($this->_contactId, ',');
-    CRM_Custom_Form_CustomData::preProcess($this, NULL, $subType, $cgcount,
-      $this->_contactType, $this->_contactId);
-  }
+    $type = $this->_contactType;
+    $groupCount = CRM_Utils_Request::retrieve('cgcount', 'Positive', $this, FALSE, 1);
+    $this->assign('cgCount', $groupCount);
 
-  /**
-   * Build the form object elements for custom data.
-   */
-  public function buildQuickForm() {
-    parent::buildQuickForm();
-    CRM_Custom_Form_CustomData::buildQuickForm($this);
+    $extendsEntityColumn = CRM_Utils_Request::retrieve('subName', 'String', $this);
+    if ($extendsEntityColumn === 'null') {
+      // Is this reachable?
+      $extendsEntityColumn = NULL;
+    }
+
+    //carry qf key, since this form is not inheriting core form.
+    if ($qfKey = CRM_Utils_Request::retrieve('qfKey', 'String')) {
+      $this->assign('qfKey', $qfKey);
+    }
+
+    $typeCheck = CRM_Utils_Request::retrieve('type', 'String');
+    $urlGroupId = CRM_Utils_Request::retrieve('groupID', 'Positive');
+    if (isset($typeCheck) && $urlGroupId) {
+      $this->_groupID = $urlGroupId;
+    }
+    else {
+      $this->_groupID = CRM_Utils_Request::retrieve('groupID', 'Positive', $this);
+    }
+
+    $gid = (isset($this->_groupID)) ? $this->_groupID : NULL;
+
+    $groupTree = CRM_Core_BAO_CustomGroup::getTree($type,
+      NULL,
+      $this->getContactID(),
+      $gid,
+      CRM_Contact_BAO_Contact::getContactSubType($this->getContactID()),
+      $extendsEntityColumn
+    );
+
+    if (property_exists($this, '_customValueCount') && !empty($groupTree)) {
+      $this->_customValueCount = CRM_Core_BAO_CustomGroup::buildCustomDataView($this, $groupTree, TRUE, NULL, NULL, NULL, $this->getContactID());
+    }
+    // we should use simplified formatted groupTree
+    $groupTree = CRM_Core_BAO_CustomGroup::formatGroupTree($groupTree, $groupCount, $this);
+
+    if (isset($this->_groupTree) && is_array($this->_groupTree)) {
+      $keys = array_keys($groupTree);
+      foreach ($keys as $key) {
+        $this->_groupTree[$key] = $groupTree[$key];
+      }
+    }
+    else {
+      $this->_groupTree = $groupTree;
+    }
+    $this->addElement('hidden', 'hidden_custom', 1);
+    $this->addElement('hidden', "hidden_custom_group_count[{$this->_groupID}]", CRM_Utils_Request::retrieve('cgcount', 'Positive', $this, FALSE, 1));
+    CRM_Core_BAO_CustomGroup::buildQuickForm($this, $this->_groupTree);
   }
 
   /**
@@ -62,20 +102,22 @@ public function buildQuickForm() {
    *
    * @return array
    */
-  public function setDefaultValues() {
-    return CRM_Custom_Form_CustomData::setDefaultValues($this);
+  public function setDefaultValues(): array {
+    $defaults = [];
+    CRM_Core_BAO_CustomGroup::setDefaults($this->_groupTree, $defaults, FALSE, FALSE, $this->get('action'));
+    return $defaults;
   }
 
   /**
    * Process the form.
    */
-  public function postProcess() {
+  public function postProcess(): void {
     // Process / save custom data
     // Get the form values and groupTree
     $params = $this->getSubmittedValues();
     CRM_Core_BAO_CustomValueTable::postProcess($params,
       'civicrm_contact',
-      $this->_contactId,
+      $this->getContactID(),
       $this->_entityType
     );
 
diff --git a/www/modules/civicrm/CRM/Contact/Form/Merge.php b/www/modules/civicrm/CRM/Contact/Form/Merge.php
index 95c12ffaf..79a2d66b8 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Merge.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Merge.php
@@ -104,11 +104,7 @@ public function preProcess() {
       }
 
       $cacheKey = CRM_Dedupe_Merger::getMergeCacheKeyString($this->_rgid, $gid, json_decode($this->criteria, TRUE), TRUE, $this->limit);
-
-      $join = CRM_Dedupe_Merger::getJoinOnDedupeTable();
-      $where = "de.id IS NULL";
-
-      $pos = CRM_Core_BAO_PrevNextCache::getPositions($cacheKey, $this->_cid, $this->_oid, $this->_mergeId, $join, $where, $flip);
+      $pos = CRM_Core_BAO_PrevNextCache::getPositions($cacheKey, $flip ? $this->_oid : $this->_cid, $flip ? $this->_cid : $this->_oid, $this->_mergeId);
 
       // get user info of main contact.
       $config = CRM_Core_Config::singleton();
@@ -177,11 +173,11 @@ public function preProcess() {
 
       $this->assign('mainLocBlock', json_encode($rowsElementsAndInfo['main_details']['location_blocks']));
       $this->assign('locationBlockInfo', json_encode(CRM_Dedupe_Merger::getLocationBlockInfo()));
-      $this->assign('mainContactTypeIcon', CRM_Contact_BAO_Contact_Utils::getImage($contacts[$this->_cid]['contact_sub_type'] ? $contacts[$this->_cid]['contact_sub_type'] : $contacts[$this->_cid]['contact_type'],
+      $this->assign('mainContactTypeIcon', CRM_Contact_BAO_Contact_Utils::getImage($contacts[$this->_cid]['contact_sub_type'] ?: $contacts[$this->_cid]['contact_type'],
         FALSE,
         $this->_cid
       ));
-      $this->assign('otherContactTypeIcon', CRM_Contact_BAO_Contact_Utils::getImage($contacts[$this->_oid]['contact_sub_type'] ? $contacts[$this->_oid]['contact_sub_type'] : $contacts[$this->_oid]['contact_type'],
+      $this->assign('otherContactTypeIcon', CRM_Contact_BAO_Contact_Utils::getImage($contacts[$this->_oid]['contact_sub_type'] ?: $contacts[$this->_oid]['contact_type'],
         FALSE,
         $this->_oid
       ));
@@ -339,10 +335,7 @@ public function postProcess() {
     elseif ($this->next && $this->_mergeId && empty($formValues['_qf_Merge_done'])) {
       $cacheKey = CRM_Dedupe_Merger::getMergeCacheKeyString($this->_rgid, $this->_gid, json_decode($this->criteria, TRUE), TRUE, $this->limit);
 
-      $join = CRM_Dedupe_Merger::getJoinOnDedupeTable();
-      $where = "de.id IS NULL";
-
-      $pos = CRM_Core_BAO_PrevNextCache::getPositions($cacheKey, NULL, NULL, $this->_mergeId, $join, $where);
+      $pos = CRM_Core_BAO_PrevNextCache::getPositions($cacheKey, NULL, NULL, $this->_mergeId);
 
       if (!empty($pos) &&
         $pos['next']['id1'] &&
diff --git a/www/modules/civicrm/CRM/Contact/Form/Relationship.php b/www/modules/civicrm/CRM/Contact/Form/Relationship.php
index 7001592c6..d1cd0942b 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Relationship.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Relationship.php
@@ -14,6 +14,8 @@
  */
 class CRM_Contact_Form_Relationship extends CRM_Core_Form {
 
+  use CRM_Custom_Form_CustomDataTrait;
+
   /**
    * The relationship id, used when editing the relationship
    *
@@ -175,8 +177,7 @@ public function preProcess() {
       $this->_rtype = str_replace($this->_relationshipTypeId . '_', '', $this->_rtypeId);
     }
 
-    //need to assign custom data type and subtype to the template - FIXME: explain why
-    $this->assign('customDataType', 'Relationship');
+    //need to assign custom data subtype to the template for the initial load of custom fields.
     $this->assign('customDataSubType', $this->_relationshipTypeId);
     $this->assign('entityID', $this->_relationshipId);
 
@@ -190,14 +191,27 @@ public function preProcess() {
       }
     }
 
-    // when custom data is included in this page
-    if (!empty($_POST['hidden_custom'])) {
-      CRM_Custom_Form_CustomData::preProcess($this, NULL, $this->_relationshipTypeId, 1, 'Relationship', $this->_relationshipId);
-      CRM_Custom_Form_CustomData::buildQuickForm($this);
-      CRM_Custom_Form_CustomData::setDefaultValues($this);
+    if ($this->isSubmitted()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('Relationship', array_filter([
+        'id' => $this->getRelationshipID(),
+        'relationship_type_id' => $this->_relationshipTypeId,
+      ]));
     }
   }
 
+  /**
+   * @api supported for use from outside core.
+   *
+   * @return int|null
+   */
+  public function getRelationshipID(): ?int {
+    return $this->_relationshipId;
+  }
+
   /**
    * Set default values for the form.
    */
@@ -381,13 +395,13 @@ public function submit($params) {
    */
   public function postProcess() {
     // Store the submitted values in an array.
-    $params = $this->controller->exportValues($this->_name);
+    $params = $this->getSubmittedValues();
 
     $values = $this->submit($params);
     if (empty($values)) {
       return;
     }
-    list ($params, $relationshipIds) = $values;
+    [$params, $relationshipIds] = $values;
 
     // if this is called from case view,
     //create an activity for case role removal.CRM-4480
diff --git a/www/modules/civicrm/CRM/Contact/Form/Search.php b/www/modules/civicrm/CRM/Contact/Form/Search.php
index 26ea1f2cb..1bdfcbac9 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Search.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Search.php
@@ -430,7 +430,7 @@ public function buildQuickForm() {
 
         // set the group title
         $groupValues = ['id' => $this->_groupID, 'title' => $this->_group[$this->_groupID]];
-        $this->assign_by_ref('group', $groupValues);
+        $this->assign('group', $groupValues);
 
         // also set ssID if this is a saved search
         $ssID = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Group', $this->_groupID, 'saved_search_id');
@@ -471,7 +471,7 @@ public function buildQuickForm() {
       $this->setTitle(ts('Add to Group: %1', [1 => $this->_group[$this->_amtgID]]));
       // 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->assign('group', $groupValues);
       $this->add('xbutton', $this->_actionButtonName, ts('Add Contacts to %1', [1 => $this->_group[$this->_amtgID]]),
         [
           'type' => 'submit',
@@ -495,7 +495,7 @@ public function buildQuickForm() {
       $selectedContactIds = array_keys($selectedContactIdsArr[$qfKeyParam]);
     }
 
-    $this->assign_by_ref('selectedContactIds', $selectedContactIds);
+    $this->assign('selectedContactIds', $selectedContactIds);
 
     $rows = $this->get('rows');
 
diff --git a/www/modules/civicrm/CRM/Contact/Form/Search/Builder.php b/www/modules/civicrm/CRM/Contact/Form/Search/Builder.php
index 44108ea0d..2cdf2d64a 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Search/Builder.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Search/Builder.php
@@ -568,9 +568,11 @@ private function buildMappingForm(&$form, $mappingId, $columnNo, $blockCount) {
 
       foreach ($value as $key1 => $value1) {
         //CRM-2676, replacing the conflict for same custom field name from different custom group.
-        $customGroupName = CRM_Core_BAO_Mapping::getCustomGroupName($key1);
+        $customFieldId = CRM_Core_BAO_CustomField::getKeyID($key1);
 
-        if ($customGroupName) {
+        if ($customFieldId) {
+          $customGroupName = CRM_Core_BAO_CustomField::getField($customFieldId)['custom_group']['title'];
+          $customGroupName = CRM_Utils_String::ellipsify($customGroupName, 13);
           $relatedMapperFields[$key][$key1] = $mapperFields[$key][$key1] = $customGroupName . ': ' . $value1['title'];
         }
         else {
diff --git a/www/modules/civicrm/CRM/Contact/Form/Task/AddToGroup.php b/www/modules/civicrm/CRM/Contact/Form/Task/AddToGroup.php
index 4d11df34b..fc8f74610 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Task/AddToGroup.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Task/AddToGroup.php
@@ -22,6 +22,7 @@
  * addition of contacts to groups.
  */
 class CRM_Contact_Form_Task_AddToGroup extends CRM_Contact_Form_Task {
+  use CRM_Custom_Form_CustomDataTrait;
 
   /**
    * The context that we are working on
@@ -52,9 +53,13 @@ public function preProcess() {
     parent::preProcess();
 
     $this->_context = $this->get('context');
-    $this->_id = $this->get('amtgID');
 
-    CRM_Custom_Form_CustomData::preProcess($this, NULL, NULL, 1, 'Group', $this->_id);
+    $this->assign('entityID', $this->getGroupID());
+  }
+
+  public function getGroupID(): ?int {
+    $this->_id = $this->get('amtgID');
+    return $this->_id ? (int) $this->_id : NULL;
   }
 
   /**
@@ -117,8 +122,9 @@ public function buildQuickForm() {
     }
     else {
       $this->setTitle(ts('Add Contacts to A Group'));
-      //build custom data
-      CRM_Custom_Form_CustomData::buildQuickForm($this);
+    }
+    if ($this->isSubmitted()) {
+      $this->addCustomDataFieldsToForm('Group');
     }
 
     $this->addDefaultButtons(ts('Add to Group'));
@@ -139,7 +145,6 @@ public function setDefaultValues() {
     }
 
     $defaults['group_option'] = 0;
-    $defaults += CRM_Custom_Form_CustomData::setDefaultValues($this);
     return $defaults;
   }
 
@@ -155,7 +160,7 @@ public function addRules() {
    *
    * @param array $params
    *
-   * @return array
+   * @return array|true
    *   list of errors to be posted back to the form
    */
   public static function formRule($params) {
@@ -174,7 +179,7 @@ public static function formRule($params) {
   /**
    * Process the form after the input has been submitted and validated.
    */
-  public function postProcess() {
+  public function postProcess(): void {
     $params = $this->controller->exportValues();
     $groupOption = $params['group_option'] ?? NULL;
     if ($groupOption) {
@@ -184,7 +189,7 @@ public function postProcess() {
       $groupParams['visibility'] = 'User and User Admin Only';
       $groupParams['group_type'] = array_keys($params['group_type'] ?? []);
       $groupParams['is_active'] = 1;
-      $groupParams['custom'] = CRM_Core_BAO_CustomField::postProcess($params, $this->_id, 'Group');
+      $groupParams['custom'] = CRM_Core_BAO_CustomField::postProcess($this->getSubmittedValues(), $this->_id, 'Group');
 
       $createdGroup = CRM_Contact_BAO_Group::create($groupParams);
       $groupID = $createdGroup->id;
@@ -196,7 +201,7 @@ public function postProcess() {
       $groupName = $group[$groupID];
     }
 
-    list($total, $added, $notAdded) = CRM_Contact_BAO_GroupContact::addContactsToGroup($this->_contactIds, $groupID);
+    [$total, $added, $notAdded] = CRM_Contact_BAO_GroupContact::addContactsToGroup($this->_contactIds, $groupID);
 
     $status = [
       ts('%count contact added to group', [
diff --git a/www/modules/civicrm/CRM/Contact/Form/Task/AddToParentClass.php b/www/modules/civicrm/CRM/Contact/Form/Task/AddToParentClass.php
index 20300204c..0e169db59 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Task/AddToParentClass.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Task/AddToParentClass.php
@@ -242,7 +242,7 @@ public function search(&$form, &$params) {
 
         $contact_type = '<img src="' . $config->resourceBase . 'i/contact_';
 
-        $searchRows[$contactID]['type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? $result->contact_sub_type : $result->contact_type
+        $searchRows[$contactID]['type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ?: $result->contact_type
         );
       }
 
diff --git a/www/modules/civicrm/CRM/Contact/Form/Task/Delete.php b/www/modules/civicrm/CRM/Contact/Form/Task/Delete.php
index 0f9d4518e..8a3914822 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Task/Delete.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Task/Delete.php
@@ -89,7 +89,8 @@ public function preProcess() {
       elseif (CRM_Contact_BAO_Contact::checkDomainContact($cid)) {
         CRM_Core_Error::statusBounce(ts('This contact is a special one for the contact information associated with the CiviCRM installation for this domain. No one is allowed to delete it because the information is used for special system purposes.'));
       }
-
+      // Indicates it is not called from search context so 'view selected contacts' link is suppressed.
+      $this->assign('isSelectedContacts', FALSE);
       $this->_contactIds = [$cid];
       $this->_single = TRUE;
       $this->assign('totalSelectedContacts', 1);
@@ -246,11 +247,21 @@ public function postProcess() {
     }
     // Alert user of any failures
     if ($not_deleted) {
-      $status = ts('The contact might be the Membership Organization of a Membership Type. You will need to edit the Membership Type and change the Membership Organization before you can delete this contact.');
       $title = ts('Unable to Delete');
+      // If the contact has a CMS account, you can't delete them. The deletion
+      // call just returns TRUE or FALSE, so we check if they have a CMS account
+      // Note: we're not using CRM_Core_BAO_UFMatch::getUFId() because that's cached.
+      $ufmatch = new CRM_Core_DAO_UFMatch();
+      $ufmatch->contact_id = $cid;
+      $ufmatch->domain_id = CRM_Core_Config::domainID();
+      if ($ufmatch->find(TRUE)) {
+        $status = ts('The contact has a CMS account. You will need to delete it before you can delete this contact.');
+      }
+      else {
+        $status = ts('The contact might be the Membership Organization of a Membership Type. You will need to edit the Membership Type and change the Membership Organization before you can delete this contact.');
+      }
       $session->setStatus('<ul><li>' . implode('</li><li>', $not_deleted) . '</li></ul>' . $status, $title, 'error');
     }
-
     if (isset($this->_sharedAddressMessage) && $this->_sharedAddressMessage['count'] > 0) {
       if (count($this->_sharedAddressMessage['contactList']) == 1) {
         $message = ts('The following contact had been sharing an address with a contact you just deleted. Their address will no longer be shared, but has not been removed or altered.');
diff --git a/www/modules/civicrm/CRM/Contact/Form/Task/EmailCommon.php b/www/modules/civicrm/CRM/Contact/Form/Task/EmailCommon.php
index 11dd937fa..2b9599a8c 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Task/EmailCommon.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Task/EmailCommon.php
@@ -25,9 +25,14 @@ class CRM_Contact_Form_Task_EmailCommon {
   /**
    * Pre Process Form Addresses to be used in Quickform
    *
-   * @param CRM_Core_Form $form
+   * This doesn't really do much - use part should be transferred back to caller
+   * and noisy deprecation added.
+   *
+   * @param \CRM_Contribute_Form_Task_Invoice $form
    * @param bool $bounce determine if we want to throw a status bounce.
    *
+   * @deprecated
+   *
    * @throws \CRM_Core_Exception
    */
   public static function preProcessFromAddress(&$form, $bounce = TRUE) {
diff --git a/www/modules/civicrm/CRM/Contact/Form/Task/Map.php b/www/modules/civicrm/CRM/Contact/Form/Task/Map.php
index 31c04508f..e989e0b40 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Task/Map.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Task/Map.php
@@ -175,7 +175,7 @@ public static function createMapXML($ids, $locationId, &$page, $addBreadCrumb, $
       CRM_Utils_System::appendBreadCrumb($breadcrumbs);
     }
 
-    $page->assign_by_ref('locations', $locations);
+    $page->assign('locations', $locations);
 
     // only issue a javascript warning if we know we will not
     // mess the poor user with too many warnings
@@ -216,8 +216,8 @@ public static function createMapXML($ids, $locationId, &$page, $addBreadCrumb, $
       'lat' => (float) ($maxLat - $minLat),
       'lng' => (float) ($maxLng - $minLng),
     ];
-    $page->assign_by_ref('center', $center);
-    $page->assign_by_ref('span', $span);
+    $page->assign('center', $center);
+    $page->assign('span', $span);
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Contact/Form/Task/PDF.php b/www/modules/civicrm/CRM/Contact/Form/Task/PDF.php
index b21905b3e..8b349f7d4 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Task/PDF.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Task/PDF.php
@@ -143,7 +143,7 @@ public function listTokens() {
   protected function getRows(): array {
     $rows = [];
     foreach ($this->_contactIds as $index => $contactID) {
-      $caseID = $this->getVar('_caseId');
+      $caseID = $this->_caseId;
       if (empty($caseID) && !empty($this->_caseIds[$index])) {
         $caseID = $this->_caseIds[$index];
       }
diff --git a/www/modules/civicrm/CRM/Contact/Form/Task/SMS.php b/www/modules/civicrm/CRM/Contact/Form/Task/SMS.php
index 274aab656..aba14ba91 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Task/SMS.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Task/SMS.php
@@ -19,6 +19,7 @@
  * This class provides the functionality to sms a group of contacts.
  */
 class CRM_Contact_Form_Task_SMS extends CRM_Contact_Form_Task {
+  use CRM_Contact_Form_Task_SMSTrait;
 
   /**
    * Are we operating in "single mode", i.e. sending sms to one
@@ -35,15 +36,20 @@ class CRM_Contact_Form_Task_SMS extends CRM_Contact_Form_Task {
    */
   public $_templates = NULL;
 
-  public function preProcess() {
+  /**
+   * @var float|int|mixed|string|null
+   */
+  public $_context;
+
+  public function preProcess(): void {
 
     $this->_context = CRM_Utils_Request::retrieve('context', 'Alphanumeric', $this);
 
     $cid = CRM_Utils_Request::retrieve('cid', 'Positive', $this, FALSE);
 
-    CRM_Contact_Form_Task_SMSCommon::preProcessProvider($this);
-
-    if (!$cid && $this->_context != 'standalone') {
+    $this->_single = $this->_context !== 'search';
+    $this->bounceOnNoActiveProviders();
+    if (!$cid && $this->_context !== 'standalone') {
       parent::preProcess();
     }
 
@@ -57,25 +63,7 @@ public function preProcess() {
   public function buildQuickForm() {
     //enable form element
     $this->assign('suppressForm', FALSE);
-    $this->assign('SMSTask', TRUE);
-    CRM_Contact_Form_Task_SMSCommon::buildQuickForm($this);
-  }
-
-  /**
-   * Process the form after the input has been submitted and validated.
-   */
-  public function postProcess() {
-    CRM_Contact_Form_Task_SMSCommon::postProcess($this);
-  }
-
-  /**
-   * List available tokens for this form.
-   *
-   * @return array
-   */
-  public function listTokens() {
-    $tokens = CRM_Core_SelectValues::contactTokens();
-    return $tokens;
+    $this->buildSmsForm();
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Contact/Form/Task/SMSCommon.php b/www/modules/civicrm/CRM/Contact/Form/Task/SMSCommon.php
index a86c49022..6a2af585b 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Task/SMSCommon.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Task/SMSCommon.php
@@ -17,6 +17,8 @@
 
 /**
  * This class provides the common functionality for sending sms to one or a group of contact ids.
+ *
+ * @deprecated since 5.71 will be removed around 5.77.
  */
 class CRM_Contact_Form_Task_SMSCommon {
   const RECIEVED_SMS_ACTIVITY_SUBJECT = "SMS Received";
@@ -30,9 +32,12 @@ class CRM_Contact_Form_Task_SMSCommon {
   /**
    * Pre process the provider.
    *
+   * @deprecated since 5.71 will be removed around 5.77.
+   *
    * @param CRM_Core_Form $form
    */
   public static function preProcessProvider(&$form) {
+    CRM_Core_Error::deprecatedFunctionWarning('no alternative');
     $form->_single = FALSE;
     $className = CRM_Utils_System::getClassName($form);
 
@@ -43,7 +48,7 @@ public static function preProcessProvider(&$form) {
       $form->_single = TRUE;
     }
 
-    $providersCount = CRM_SMS_BAO_Provider::activeProviderCount();
+    $providersCount = CRM_SMS_BAO_SmsProvider::activeProviderCount();
 
     if (!$providersCount) {
       CRM_Core_Error::statusBounce(ts('There are no SMS providers configured, or no SMS providers are set active'));
@@ -68,12 +73,15 @@ public static function preProcessProvider(&$form) {
    * Build the form object.
    *
    * @param CRM_Core_Form $form
+   *
+   * @deprecated since 5.71 will be removed around 5.77.
    */
   public static function buildQuickForm(&$form) {
+    CRM_Core_Error::deprecatedFunctionWarning('no alternative supported for non-core use');
 
     $toArray = [];
 
-    $providers = CRM_SMS_BAO_Provider::getProviders(NULL, NULL, TRUE, 'is_default desc');
+    $providers = CRM_SMS_BAO_SmsProvider::getProviders(NULL, NULL, TRUE, 'is_default desc');
 
     $providerSelect = [];
     foreach ($providers as $provider) {
@@ -102,7 +110,7 @@ public static function buildQuickForm(&$form) {
 
       $form->_contactIds = [];
       foreach ($allToPhone as $value) {
-        list($contactId, $phone) = explode('::', $value);
+        [$contactId, $phone] = explode('::', $value);
         if ($contactId) {
           $form->_contactIds[] = $contactId;
           $form->_toContactPhone[] = $phone;
@@ -283,7 +291,7 @@ public static function buildQuickForm(&$form) {
    */
   public static function formRule($fields, $dontCare, $self) {
     $errors = [];
-
+    CRM_Core_Error::deprecatedFunctionWarning('no alternative supported for non-core use');
     $template = CRM_Core_Smarty::singleton();
 
     if (empty($fields['sms_text_message'])) {
@@ -311,9 +319,11 @@ public static function formRule($fields, $dontCare, $self) {
    * Process the form after the input has been submitted and validated.
    *
    * @param CRM_Core_Form $form
+   *
+   * @deprecated since 5.71 will be removed around 5.77.
    */
   public static function postProcess(&$form) {
-
+    CRM_Core_Error::deprecatedFunctionWarning('no alternative supported for non-core use');
     $thisValues = $form->controller->exportValues($form->getName());
 
     $fromSmsProviderId = $thisValues['sms_provider_id'];
@@ -364,7 +374,7 @@ public static function postProcess(&$form) {
     $contactIds = array_keys($form->_contactDetails);
     $allContactIds = array_keys($form->_allContactDetails);
 
-    list($sent, $activityId, $countSuccess) = CRM_Activity_BAO_Activity::sendSMS($formattedContactDetails,
+    [$sent, $activityId, $countSuccess] = CRM_Activity_BAO_Activity::sendSMS($formattedContactDetails,
       $thisValues,
       $smsParams,
       $contactIds
diff --git a/www/modules/civicrm/CRM/Contact/Form/Task/SMSTrait.php b/www/modules/civicrm/CRM/Contact/Form/Task/SMSTrait.php
new file mode 100644
index 000000000..eb6e92e2a
--- /dev/null
+++ b/www/modules/civicrm/CRM/Contact/Form/Task/SMSTrait.php
@@ -0,0 +1,421 @@
+<?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
+ */
+use Civi\Api4\Activity;
+use Civi\API\EntityLookupTrait;
+use Civi\Api4\MessageTemplate;
+use Civi\Api4\Phone;
+use Civi\Token\TokenProcessor;
+
+/**
+ * This trait provides the common functionality for tasks that send sms.
+ */
+trait CRM_Contact_Form_Task_SMSTrait {
+  use EntityLookupTrait;
+
+  /**
+   * The phones to be messaged.
+   * @var array
+   */
+  private array $phones;
+
+  /**
+   * Process the form after the input has been submitted and validated.
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function postProcess(): void {
+    $this->postProcessSms();
+  }
+
+  /**
+   */
+  protected function filterContactIDs(): void {
+    // Activity sub class does this.
+  }
+
+  /**
+   * Get SMS provider parameters.
+   *
+   * @return array
+   */
+  protected function getSmsProviderParams(): array {
+    // $smsParams carries all the arguments provided on form (or via hooks), to the provider->send() method
+    // this gives flexibility to the users / implementors to add their own args via hooks specific to their sms providers
+    $smsProviderParams = $this->getSubmittedValues();
+    unset($smsProviderParams['sms_text_message']);
+    $smsProviderParams['provider_id'] = $this->getSubmittedValue('sms_provider_id');
+    return $smsProviderParams;
+  }
+
+  /**
+   * Get phones to SMS.
+   *
+   * @internal
+   *
+   * @return array
+   * @throws \CRM_Core_Exception
+   * @throws \Civi\API\Exception\UnauthorizedException
+   */
+  protected function getPhones(): array {
+    if (!isset($this->phones)) {
+      $contacts = [];
+      $phoneGet = Phone::get()
+        ->addWhere('contact_id.do_not_sms', '=', FALSE)
+        ->addWhere('contact_id.is_deceased', '=', FALSE)
+        ->addWhere('phone_numeric', '>', 0)
+        ->addWhere('phone_type_id:name', '=', 'Mobile')
+        ->addOrderBy('is_primary')
+        ->addSelect('id', 'contact_id', 'phone', 'phone_type_id:name', 'phone_numeric', 'contact_id.sort_name', 'phone_type_id', 'contact_id.display_name');
+      if ($this->getSubmittedValue('to')) {
+        $phoneGet->addWhere('id', 'IN', explode(',', $this->getSubmittedValue('to')));
+      }
+      else {
+        $phoneGet->addWhere('contact_id', 'IN', $this->getContactIDs());
+      }
+      $this->phones = (array) $phoneGet->execute()->indexBy('id');
+      foreach ($this->phones as $index => $phone) {
+        if ($this->isInvalidRecipient($phone['contact_id'])) {
+          unset($this->phones[$index]);
+        }
+        if (!$this->getSubmittedValue('to')) {
+          // In this pre-submit case we want to make the contact Ids unique.
+          if (isset($contacts[$phone['contact_id']])) {
+            unset($this->phones[$index]);
+          }
+          $contacts[$phone['contact_id']] = TRUE;
+        }
+      }
+    }
+    return $this->phones;
+  }
+
+  protected function bounceOnNoActiveProviders(): void {
+    $providersCount = CRM_SMS_BAO_Provider::activeProviderCount();
+    if (!$providersCount) {
+      CRM_Core_Error::statusBounce(ts('There are no SMS providers configured, or no SMS providers are set active'));
+    }
+  }
+
+  /**
+   * Build the SMS Form
+   *
+   * @throws \CRM_Core_Exception
+   * @internal - highly likely to change!
+   */
+  protected function buildSmsForm(): void {
+    if (!CRM_Core_Permission::check('send SMS')) {
+      throw new CRM_Core_Exception("You do not have the 'send SMS' permission");
+    }
+    $form = $this;
+
+    $providers = CRM_SMS_BAO_Provider::getProviders(NULL, NULL, TRUE, 'is_default desc');
+
+    $providerSelect = [];
+    foreach ($providers as $provider) {
+      $providerSelect[$provider['id']] = $provider['title'];
+    }
+    $suppressedSms = 0;
+    //here we are getting logged in user id as array but we need target contact id. CRM-5988
+    $cid = $form->get('cid');
+
+    if ($cid) {
+      $form->_contactIds = [$cid];
+    }
+
+    $this->addAutocomplete('to', ts('Send to'), [
+      'entity' => 'Phone',
+      'api' => [
+        'fieldName' => 'Phone.id',
+      ],
+      'select' => ['multiple' => TRUE],
+      'class' => 'select2',
+    ], TRUE);
+
+    $form->add('text', 'activity_subject', ts('Name The SMS'), ['class' => 'huge'], TRUE);
+
+    $toSetDefault = TRUE;
+    if (property_exists($form, '_context') && $form->_context === 'standalone') {
+      $toSetDefault = FALSE;
+    }
+
+    // when form is submitted recompute contactIds
+    if ($this->isSubmitted()) {
+      $form->_contactIds = [];
+      foreach ($this->getPhones() as $phone) {
+        $form->_contactIds[] = $phone['contact_id'];
+      }
+    }
+
+    //get the group of contacts as per selected by user in case of Find Activities
+    $this->filterContactIDs();
+
+    if (!empty($form->getContactIDs())) {
+      $phoneNumbers = $this->getPhones();
+      $suppressedSms = count($this->getContactIDs()) - count($phoneNumbers);
+    }
+    if (!$this->getSubmittedValue('to') && !$this->getPhones()) {
+      CRM_Core_Error::statusBounce(ts('Selected contact(s) do not have a valid Phone, or communication preferences specify DO NOT SMS, or they are deceased'));
+    }
+
+    //activity related variables
+    $form->addExpectedSmartyVariable('invalidActivity');
+    $form->addExpectedSmartyVariable('extendTargetContacts');
+
+    $form->assign('suppressedSms', $suppressedSms);
+    $form->assign('totalSelectedContacts', count($this->getContactIDs()));
+
+    $form->add('select', 'sms_provider_id', ts('From'), $providerSelect, TRUE);
+
+    CRM_Mailing_BAO_Mailing::commonCompose($form);
+
+    if ($form->_single) {
+      // also fix the user context stack
+      if ($form->_context) {
+        $url = CRM_Utils_System::url('civicrm/dashboard', 'reset=1');
+      }
+      else {
+        $url = CRM_Utils_System::url('civicrm/contact/view',
+          "&show=1&action=browse&cid={$form->_contactIds[0]}&selectedChild=activity"
+        );
+      }
+
+      $session = CRM_Core_Session::singleton();
+      $session->replaceUserContext($url);
+      $form->addDefaultButtons(ts('Send SMS'), 'upload', 'cancel');
+    }
+    else {
+      $form->addDefaultButtons(ts('Send SMS'), 'upload');
+    }
+
+    $form->addFormRule([__CLASS__, 'formRuleSms'], $form);
+  }
+
+  /**
+   * Set the default form values.
+   *
+   *
+   * @return array
+   *   the default array reference
+   */
+  public function setDefaultValues() {
+    $phones = $this->getPhones();
+    return ['to' => implode(',', array_keys($phones))];
+  }
+
+  /**
+   * Process the sms form after the input has been submitted and validated.
+   *
+   * @internal likely to change.
+   *
+   * @throws \CRM_Core_Exception
+   */
+  protected function postProcessSms(): void {
+    $form = $this;
+    $thisValues = $form->controller->exportValues($form->getName());
+
+    // process message template
+    if (!empty($thisValues['SMSsaveTemplate']) || !empty($thisValues['SMSupdateTemplate'])) {
+      $messageTemplate = [
+        'msg_text' => $this->getSubmittedValue('sms_text_message'),
+        'is_active' => TRUE,
+        'is_sms' => TRUE,
+      ];
+
+      if (!empty($thisValues['SMSsaveTemplate'])) {
+        $messageTemplate['msg_title'] = $this->getSubmittedValue('SMSsaveTemplateName');
+      }
+
+      if ($this->getSubmittedValue('SMStemplate') && $this->getSubmittedValue('SMSupdateTemplate')) {
+        $messageTemplate['id'] = $this->getSubmittedValue('SMStemplate');
+        unset($messageTemplate['msg_title']);
+      }
+      MessageTemplate::save()->addRecord($messageTemplate)->execute();
+    }
+
+    $phonesToSendTo = explode(',', $this->getSubmittedValue('to'));
+    $unexpectedErrors = $phonesToSMS = [];
+    foreach ($phonesToSendTo as $phoneID) {
+      $phoneValues = $this->getPhones()[$phoneID] ?? NULL;
+      if (!$phoneValues) {
+        $unexpectedErrors[] = ts('Contact Does not accept SMS');
+        continue;
+      }
+      $phonesToSMS[] = $phoneValues;
+    }
+    // These errors are unexpected because the ajax should filter them out.
+    foreach ($unexpectedErrors as $unexpectedError) {
+      CRM_Core_Session::setStatus($unexpectedError, ts('Invalid phone submitted'));
+    }
+
+    [$errors, $countSuccess] = $this->sendSMS($phonesToSMS);
+    if ($countSuccess > 0) {
+      CRM_Core_Session::setStatus(ts('One message was sent successfully.', [
+        'plural' => '%count messages were sent successfully.',
+        'count' => $countSuccess,
+      ]), ts('Message Sent', ['plural' => 'Messages Sent', 'count' => $countSuccess]), 'success');
+    }
+
+    if (!empty($errors)) {
+      // At least one PEAR_Error object was generated.
+      // Display the error messages to the user.
+      $status = '<ul>';
+      foreach ($errors as $errMsg) {
+        $status .= '<li>' . $errMsg . '</li>';
+      }
+      $status .= '</ul>';
+      CRM_Core_Session::setStatus($status, ts('One Message Not Sent', [
+        'count' => count($errors),
+        'plural' => '%count Messages Not Sent',
+      ]), 'info');
+    }
+    else {
+      $contactIds = array_values($this->getContactIDs());
+      //Display the name and number of contacts for those sms is not sent.
+      $smsNotSent = array_diff_assoc($this->getContactIDs(), $contactIds);
+
+      if (!empty($smsNotSent)) {
+        $not_sent = [];
+        foreach ($smsNotSent as $contactId) {
+          $displayName = CRM_Utils_String::purifyHTML($this->getValueForContact($contactId, 'display_name'));
+          $contactViewUrl = CRM_Utils_System::url('civicrm/contact/view', "reset=1&cid=$contactId");
+          $not_sent[] = "<a href='$contactViewUrl' title='$displayName'>$displayName</a>";
+        }
+        $status = '(' . ts('because no phone number on file or communication preferences specify DO NOT SMS or Contact is deceased');
+        if (CRM_Utils_System::getClassName($form) === 'CRM_Activity_Form_Task_SMS') {
+          $status .= ' ' . ts("or the contact is not part of the activity '%1'", [1 => $this->getActivityName()]);
+        }
+        $status .= ')<ul><li>' . implode('</li><li>', $not_sent) . '</li></ul>';
+        CRM_Core_Session::setStatus($status, ts('One Message Not Sent', [
+          'count' => count($smsNotSent),
+          'plural' => '%count Messages Not Sent',
+        ]), 'info');
+      }
+    }
+  }
+
+  /**
+   * Send SMS.
+   *
+   * @param array $phones
+   *
+   * @return array(array $errors, int $numberSent)
+   * @throws CRM_Core_Exception
+   */
+  protected function sendSMS(array $phones): array {
+
+    // Create the meta level record first ( sms activity )
+    $activityID = Activity::create()->setValues([
+      'source_contact_id' => CRM_Core_Session::getLoggedInContactID(),
+      'activity_type_id:name' => 'SMS',
+      'activity_date_time' => 'now',
+      'subject' => $this->getSubmittedValue('activity_subject'),
+      'details' => $this->getSubmittedValue('sms_text_message'),
+      'status_id:name' => 'Completed',
+    ])->execute()->first()['id'];
+
+    $numberSent = 0;
+    $errors = [];
+    foreach ($phones as $phone) {
+      $contactId = $phone['contact_id'];
+      $tokenText = CRM_Core_BAO_MessageTemplate::renderTemplate(['messageTemplate' => ['msg_text' => $this->getSubmittedValue('sms_text_message')], 'contactId' => $contactId, 'disableSmarty' => TRUE])['text'];
+      $smsProviderParams = $this->getSmsProviderParams();
+      $smsProviderParams['To'] = $phone['phone_numeric'];
+      try {
+        CRM_Activity_BAO_Activity::sendSMSMessage(
+          $contactId,
+          $tokenText,
+          $smsProviderParams,
+          $activityID,
+          CRM_Core_Session::getLoggedInContactID()
+        );
+        $numberSent++;
+      }
+      catch (CRM_Core_Exception $e) {
+        $errors[] = $e->getMessage();
+      }
+    }
+    return [$errors, $numberSent];
+  }
+
+  /**
+   * Form rule.
+   *
+   * @param array $fields
+   *   The input form values.
+   *
+   * @return bool|array
+   *   true if no errors, else array of errors
+   */
+  public static function formRuleSms($fields) {
+    $errors = [];
+
+    if (empty($fields['sms_text_message'])) {
+      $errors['sms_text_message'] = ts('Please provide Text message.');
+    }
+    else {
+      if (!empty($fields['sms_text_message'])) {
+        $messageCheck = $fields['sms_text_message'] ?? NULL;
+        $messageCheck = str_replace("\r\n", "\n", $messageCheck);
+        if ($messageCheck && (strlen($messageCheck) > CRM_SMS_Provider::MAX_SMS_CHAR)) {
+          $errors['sms_text_message'] = ts("You can configure the SMS message body up to %1 characters", [1 => CRM_SMS_Provider::MAX_SMS_CHAR]);
+        }
+      }
+    }
+
+    //Added for CRM-1393
+    if (!empty($fields['SMSsaveTemplate']) && empty($fields['SMSsaveTemplateName'])) {
+      $errors['SMSsaveTemplateName'] = ts("Enter name to save message template");
+    }
+
+    return empty($errors) ? TRUE : $errors;
+  }
+
+  protected function isInvalidRecipient($contactID): bool {
+    //Overridden by the activity child class.
+    return FALSE;
+  }
+
+  /**
+   * Get the specified value for the contact.
+   *
+   * Note do not rename to `getContactValue()` - that function
+   * is used on many forms and does not take $id as a parameter.
+   *
+   * @param int $contactID
+   * @param string $value
+   *
+   * @return mixed|null
+   * @throws \CRM_Core_Exception
+   */
+  protected function getValueForContact(int $contactID, $value) {
+    if (!$this->isDefined('Contact' . $contactID)) {
+      $this->define('Contact', 'Contact' . $contactID, ['id' => $contactID]);
+    }
+    return $this->lookup('Contact' . $contactID, $value);
+  }
+
+  /**
+   * List available tokens for this form.
+   *
+   * @return array
+   */
+  public function listTokens(): array {
+    $tokenProcessor = new TokenProcessor(Civi::dispatcher(), ['schema' => ['contactId']]);
+    return $tokenProcessor->listTokens();
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Contact/Form/Task/SaveSearch.php b/www/modules/civicrm/CRM/Contact/Form/Task/SaveSearch.php
index 0014e0347..a80d63916 100644
--- a/www/modules/civicrm/CRM/Contact/Form/Task/SaveSearch.php
+++ b/www/modules/civicrm/CRM/Contact/Form/Task/SaveSearch.php
@@ -21,6 +21,7 @@
  * Saved Searches are used for saving frequently used queries
  */
 class CRM_Contact_Form_Task_SaveSearch extends CRM_Contact_Form_Task {
+  use CRM_Custom_Form_CustomDataTrait;
 
   /**
    * Saved search id if any.
@@ -51,12 +52,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'];
     $this->_task = $values['task'] ?? NULL;
-
-    // Add group custom data
-    CRM_Custom_Form_CustomData::preProcess($this, NULL, NULL, 1, 'Group');
   }
 
   /**
@@ -65,12 +61,17 @@ public function preProcess() {
    * It consists of
    *    - displaying the QILL (query in local language)
    *    - displaying elements for saving the search
+   *
+   * @throws \CRM_Core_Exception
    */
-  public function buildQuickForm() {
+  public function buildQuickForm(): void {
     // @todo sync this more with CRM_Group_Form_Edit.
     $query = new CRM_Contact_BAO_Query($this->get('queryParams'));
     $this->assign('qill', $query->qill());
 
+    if ($this->isSubmitted()) {
+      $this->addCustomDataFieldsToForm('Group');
+    }
     // Values from the search form
     $formValues = $this->controller->exportValues();
 
@@ -108,9 +109,6 @@ public function buildQuickForm() {
     CRM_Group_Form_Edit::buildParentGroups($this);
     CRM_Group_Form_Edit::buildGroupOrganizations($this);
 
-    // Build custom data
-    CRM_Custom_Form_CustomData::buildQuickForm($this);
-
     // get the group id for the saved search
     $groupID = NULL;
     if (isset($this->_id)) {
@@ -216,7 +214,7 @@ public function postProcess() {
       $params['id'] = CRM_Contact_BAO_SavedSearch::getName($this->_id, 'id');
     }
 
-    $params['custom'] = CRM_Core_BAO_CustomField::postProcess($formValues, $this->_id, 'Group');
+    $params['custom'] = CRM_Core_BAO_CustomField::postProcess($this->getSubmittedValues(), $this->_id, 'Group');
 
     $group = CRM_Contact_BAO_Group::create($params);
 
@@ -250,7 +248,6 @@ public function setDefaultValues() {
     if (empty($defaults['parents'])) {
       $defaults['parents'] = CRM_Core_BAO_Domain::getGroupId();
     }
-    $defaults += CRM_Custom_Form_CustomData::setDefaultValues($this);
     return $defaults;
   }
 
diff --git a/www/modules/civicrm/CRM/Contact/Import/Controller.php b/www/modules/civicrm/CRM/Contact/Import/Controller.php
deleted file mode 100644
index 7aa08c4ae..000000000
--- a/www/modules/civicrm/CRM/Contact/Import/Controller.php
+++ /dev/null
@@ -1,41 +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
- */
-class CRM_Contact_Import_Controller extends CRM_Core_Controller {
-
-  /**
-   * Class constructor.
-   *
-   * @param string $title
-   * @param bool|int $action
-   * @param bool $modal
-   */
-  public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $modal = TRUE) {
-    parent::__construct($title, $modal);
-
-    set_time_limit(0);
-
-    $this->_stateMachine = new CRM_Import_StateMachine($this, $action);
-
-    // create and instantiate the pages
-    $this->addPages($this->_stateMachine, $action);
-
-    // add all the actions
-    $config = CRM_Core_Config::singleton();
-    $this->addActions($config->uploadDir, ['uploadFile']);
-  }
-
-}
diff --git a/www/modules/civicrm/CRM/Contact/Import/Form/MapField.php b/www/modules/civicrm/CRM/Contact/Import/Form/MapField.php
index b5be8d05b..c0424febb 100644
--- a/www/modules/civicrm/CRM/Contact/Import/Form/MapField.php
+++ b/www/modules/civicrm/CRM/Contact/Import/Form/MapField.php
@@ -185,7 +185,7 @@ public function buildQuickForm(): void {
             $highlightedRelFields[$key][] = $k;
           }
         }
-        $this->assign('highlightedRelFields', $highlightedRelFields);
+        $this->assign('highlightedRelFields', json_encode($highlightedRelFields));
         $sel2[$key] = $this->_formattedFieldNames[$relatedContactType];
 
         if (!empty($relatedContactSubType)) {
diff --git a/www/modules/civicrm/CRM/Contact/Import/Parser/Contact.php b/www/modules/civicrm/CRM/Contact/Import/Parser/Contact.php
index 8fda4d76a..47167bc42 100644
--- a/www/modules/civicrm/CRM/Contact/Import/Parser/Contact.php
+++ b/www/modules/civicrm/CRM/Contact/Import/Parser/Contact.php
@@ -388,7 +388,7 @@ private function formatCommonData($params, &$formatted) {
           foreach ($customOption as $customValue) {
             $val = $customValue['value'] ?? NULL;
             $label = strtolower($customValue['label'] ?? '');
-            $value = strtolower(trim($formatted[$key]));
+            $value = strtolower(trim($formatted[$key] ?? ''));
             if (($value == $label) || ($value == strtolower($val))) {
               $params[$key] = $formatted[$key] = $val;
             }
diff --git a/www/modules/civicrm/CRM/Contact/Page/AJAX.php b/www/modules/civicrm/CRM/Contact/Page/AJAX.php
index 9cacb3677..b1b6602d7 100644
--- a/www/modules/civicrm/CRM/Contact/Page/AJAX.php
+++ b/www/modules/civicrm/CRM/Contact/Page/AJAX.php
@@ -265,19 +265,6 @@ public static function relationship() {
     CRM_Utils_JSON::output($ret);
   }
 
-  /**
-   * Fetch the custom field help.
-   */
-  public static function customField() {
-    $fieldId = CRM_Utils_Type::escape($_REQUEST['id'], 'Integer');
-    $params = ['id' => $fieldId];
-    $returnProperties = ['help_pre', 'help_post'];
-    $values = [];
-
-    CRM_Core_DAO::commonRetrieve('CRM_Core_DAO_CustomField', $params, $values, $returnProperties);
-    CRM_Utils_JSON::output($values);
-  }
-
   public static function groupTree() {
     CRM_Utils_System::setHttpHeader('Content-Type', 'application/json');
     $gids = CRM_Utils_Type::escape($_GET['gids'], 'String');
@@ -399,67 +386,6 @@ public static function getContactEmail() {
     CRM_Utils_System::civiExit();
   }
 
-  public static function getContactPhone() {
-
-    $queryString = NULL;
-    $sqlParmas = [];
-    //check for mobile type
-    $phoneTypes = CRM_Core_OptionGroup::values('phone_type', TRUE, FALSE, FALSE, NULL, 'name');
-    $mobileType = $phoneTypes['Mobile'] ?? NULL;
-
-    $name = CRM_Utils_Request::retrieveValue('name', 'String', NULL, FALSE, 'GET');
-    if ($name) {
-      $key = (int) count(array_keys($sqlParmas)) + 1;
-      $queryString = " ( cc.sort_name LIKE %{$key} OR cp.phone LIKE %{$key} ) ";
-      $sqlParams[$key] = ['%' . $name . '%', 'String'];
-    }
-    else {
-      $cid = CRM_Utils_Request::retrieveValue('cid', 'CommaSeparatedIntegers', NULL, FALSE, 'GET');
-      if ($cid) {
-        $queryString = " cc.id IN ( $cid )";
-      }
-    }
-
-    if ($queryString) {
-      $result = [];
-      $offset = (int) CRM_Utils_Request::retrieveValue('offset', 'Integer', 0, FALSE, 'GET');
-      $rowCount = (int) CRM_Utils_Request::retrieveValue('rowcount', 'Integer', 20, FALSE, 'GET');
-
-      // add acl clause here
-      [$aclFrom, $aclWhere] = CRM_Contact_BAO_Contact_Permission::cacheClause('cc');
-      if ($aclWhere) {
-        $aclWhere = " AND $aclWhere";
-      }
-
-      $query = "
-SELECT sort_name name, cp.phone, cc.id
-FROM   civicrm_phone cp INNER JOIN civicrm_contact cc ON cc.id = cp.contact_id
-       {$aclFrom}
-WHERE  cc.is_deceased = 0 AND cc.do_not_sms = 0 AND cp.phone_type_id = {$mobileType} AND {$queryString}
-       {$aclWhere}
-LIMIT {$offset}, {$rowCount}
-";
-
-      // send query to hook to be modified if needed
-      CRM_Utils_Hook::contactListQuery($query,
-        $name,
-        CRM_Utils_Request::retrieve('context', 'Alphanumeric'),
-        CRM_Utils_Request::retrieve('cid', 'Positive')
-      );
-
-      $dao = CRM_Core_DAO::executeQuery($query, $sqlParams);
-
-      while ($dao->fetch()) {
-        $result[] = [
-          'text' => '"' . $dao->name . '" (' . $dao->phone . ')',
-          'id' => (CRM_Utils_Array::value('id', $_GET)) ? "{$dao->id}::{$dao->phone}" : '"' . $dao->name . '" <' . $dao->phone . '>',
-        ];
-      }
-      CRM_Utils_JSON::output($result);
-    }
-    CRM_Utils_System::civiExit();
-  }
-
   public static function buildSubTypes() {
     $parent = CRM_Utils_Request::retrieve('parentId', 'Positive');
 
diff --git a/www/modules/civicrm/CRM/Contact/Page/DashBoard.php b/www/modules/civicrm/CRM/Contact/Page/DashBoard.php
index 4d6a935a8..ca9bf7974 100644
--- a/www/modules/civicrm/CRM/Contact/Page/DashBoard.php
+++ b/www/modules/civicrm/CRM/Contact/Page/DashBoard.php
@@ -32,7 +32,7 @@ public function run() {
     $contentPlacement = CRM_Utils_Hook::DASHBOARD_BELOW;
     $html = CRM_Utils_Hook::dashboard($contactID, $contentPlacement);
     if (is_array($html)) {
-      $this->assign_by_ref('hookContent', $html);
+      $this->assign('hookContent', $html);
       $this->assign('hookContentPlacement', $contentPlacement);
     }
 
diff --git a/www/modules/civicrm/CRM/Contact/Page/DedupeException.php b/www/modules/civicrm/CRM/Contact/Page/DedupeException.php
index 091f0550d..db7fb4632 100644
--- a/www/modules/civicrm/CRM/Contact/Page/DedupeException.php
+++ b/www/modules/civicrm/CRM/Contact/Page/DedupeException.php
@@ -65,7 +65,7 @@ protected function initializePager() {
       'pageID' => $this->get(CRM_Utils_Pager::PAGE_ID),
     ];
     $this->_pager = new CRM_Utils_Pager($params);
-    $this->assign_by_ref('pager', $this->_pager);
+    $this->assign('pager', $this->_pager);
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Contact/Page/Inline/CustomData.php b/www/modules/civicrm/CRM/Contact/Page/Inline/CustomData.php
index fc00e5d07..9644331c5 100644
--- a/www/modules/civicrm/CRM/Contact/Page/Inline/CustomData.php
+++ b/www/modules/civicrm/CRM/Contact/Page/Inline/CustomData.php
@@ -59,7 +59,7 @@ public function run() {
     $this->assign('customRecId', $customRecId);
     $this->assign('contactId', $contactId);
     $this->assign('customGroupId', $cgId);
-    $this->assign_by_ref('cd_edit', $fields);
+    $this->assign('cd_edit', $fields);
 
     // check logged in user permission
     CRM_Contact_Page_View::checkUserPermission($this, $contactId);
diff --git a/www/modules/civicrm/CRM/Contact/Page/View/ContactSmartGroup.php b/www/modules/civicrm/CRM/Contact/Page/View/ContactSmartGroup.php
index a24811662..cfb61c842 100644
--- a/www/modules/civicrm/CRM/Contact/Page/View/ContactSmartGroup.php
+++ b/www/modules/civicrm/CRM/Contact/Page/View/ContactSmartGroup.php
@@ -58,10 +58,10 @@ public function browse() {
       }
 
       if (!empty($smart)) {
-        $this->assign_by_ref('groupSmart', $smart);
+        $this->assign('groupSmart', $smart);
       }
       if (!empty($parent)) {
-        $this->assign_by_ref('groupParent', $parent);
+        $this->assign('groupParent', $parent);
       }
     }
   }
diff --git a/www/modules/civicrm/CRM/Contact/Page/View/CustomData.php b/www/modules/civicrm/CRM/Contact/Page/View/CustomData.php
index dd82e852a..be665b3af 100644
--- a/www/modules/civicrm/CRM/Contact/Page/View/CustomData.php
+++ b/www/modules/civicrm/CRM/Contact/Page/View/CustomData.php
@@ -42,7 +42,7 @@ public function run() {
 
     // If no cid supplied, look it up
     if (!$this->_contactId && $this->_recId) {
-      $tableName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->_groupId, 'table_name');
+      $tableName = CRM_Core_BAO_CustomGroup::getGroup(['id' => $this->_groupId])['table_name'] ?? NULL;
       if ($tableName) {
         $this->_contactId = CRM_Core_DAO::singleValueQuery("SELECT entity_id FROM `$tableName` WHERE id = %1", [1 => [$this->_recId, 'Integer']]);
       }
@@ -91,16 +91,16 @@ public function run() {
 
         $this->assign('displayStyle', 'tableOriented');
         // here the multi custom data listing code will go
-        $multiRecordFieldListing = TRUE;
         $page = new CRM_Profile_Page_MultipleRecordFieldsListing();
-        $page->set('contactId', $this->_contactId);
-        $page->set('customGroupId', $this->_groupId);
+        $page->_contactId = $this->_contactId;
+        $page->_customGroupId = $this->_groupId;
         $page->set('action', CRM_Core_Action::BROWSE);
-        $page->set('multiRecordFieldListing', $multiRecordFieldListing);
-        $page->set('pageViewType', 'customDataView');
-        $page->set('contactType', $ctype);
+        $page->_pageViewType = 'customDataView';
+        $page->_contactType = $ctype;
         $page->_headersOnly = TRUE;
-        $page->run();
+        // assign vars to templates
+        $this->assign('action', CRM_Core_Action::BROWSE);
+        $page->browse();
       }
       else {
         //Custom Groups Inline
diff --git a/www/modules/civicrm/CRM/Contact/Page/View/GroupContact.php b/www/modules/civicrm/CRM/Contact/Page/View/GroupContact.php
index 94d0b96f5..e71f68f45 100644
--- a/www/modules/civicrm/CRM/Contact/Page/View/GroupContact.php
+++ b/www/modules/civicrm/CRM/Contact/Page/View/GroupContact.php
@@ -37,9 +37,9 @@ public function browse() {
     }
 
     $this->assign('groupCount', $count);
-    $this->assign_by_ref('groupIn', $in);
-    $this->assign_by_ref('groupPending', $pending);
-    $this->assign_by_ref('groupOut', $out);
+    $this->assign('groupIn', $in);
+    $this->assign('groupPending', $pending);
+    $this->assign('groupOut', $out);
 
     // get the info on contact smart groups
     $contactSmartGroupSettings = Civi::settings()->get('contact_smart_group_display');
diff --git a/www/modules/civicrm/CRM/Contact/Page/View/Log.php b/www/modules/civicrm/CRM/Contact/Page/View/Log.php
index 8133f9edd..fd0632131 100644
--- a/www/modules/civicrm/CRM/Contact/Page/View/Log.php
+++ b/www/modules/civicrm/CRM/Contact/Page/View/Log.php
@@ -53,7 +53,7 @@ public function browse() {
     $this->assign('logCount', count($logEntries));
     $this->ajaxResponse['tabCount'] = count($logEntries);
     $this->ajaxResponse += CRM_Contact_Form_Inline::renderFooter($this->_contactId, FALSE);
-    $this->assign_by_ref('log', $logEntries);
+    $this->assign('log', $logEntries);
   }
 
   public function preProcess() {
diff --git a/www/modules/civicrm/CRM/Contact/Page/View/Summary.php b/www/modules/civicrm/CRM/Contact/Page/View/Summary.php
index 8b9c7f08b..01a5851f6 100644
--- a/www/modules/civicrm/CRM/Contact/Page/View/Summary.php
+++ b/www/modules/civicrm/CRM/Contact/Page/View/Summary.php
@@ -276,7 +276,7 @@ public function view() {
     // FIXME: when we sort out TZ isssues with DATETIME/TIMESTAMP, we can skip next query
     // also assign the last modifed details
     $lastModified = CRM_Core_BAO_Log::lastModified($this->_contactId, 'civicrm_contact');
-    $this->assign_by_ref('lastModified', $lastModified);
+    $this->assign('lastModified', $lastModified);
 
     $this->_viewOptions = CRM_Core_BAO_Setting::valueOptions(
       CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
@@ -285,7 +285,7 @@ public function view() {
     );
 
     $changeLog = $this->_viewOptions['log'];
-    $this->assign_by_ref('changeLog', $changeLog);
+    $this->assign('changeLog', $changeLog);
 
     $this->assign('allTabs', $this->getTabs($defaults));
 
@@ -294,7 +294,7 @@ public function view() {
     $contentPlacement = CRM_Utils_Hook::SUMMARY_BELOW;
     CRM_Utils_Hook::summary($this->_contactId, $content, $contentPlacement);
     if ($content) {
-      $this->assign_by_ref('hookContent', $content);
+      $this->assign('hookContent', $content);
       $this->assign('hookContentPlacement', $contentPlacement);
     }
   }
@@ -417,18 +417,18 @@ public function getTabs(array $contact) {
     }
 
     // now add all the custom tabs
-    $entityType = $this->get('contactType');
-    $activeGroups = CRM_Core_BAO_CustomGroup::getActiveGroups(
-      $entityType,
-      'civicrm/contact/view/cd',
-      $this->_contactId
-    );
+    $filters = [
+      'is_active' => TRUE,
+      'extends' => $this->get('contactType'),
+      'style' => ['Tab', 'Tab with table'],
+    ];
+    $activeGroups = CRM_Core_BAO_CustomGroup::getAll($filters, CRM_Core_Permission::VIEW);
 
     foreach ($activeGroups as $group) {
       $id = "custom_{$group['id']}";
       $allTabs[] = [
         'id' => $id,
-        'url' => CRM_Utils_System::url($group['path'], $group['query'] . "&selectedChild=$id"),
+        'url' => CRM_Utils_System::url('civicrm/contact/view/cd', "reset=1&gid={$group['id']}&cid={$this->_contactId}&selectedChild=$id"),
         'title' => $group['title'],
         'weight' => $weight,
         'count' => NULL,
diff --git a/www/modules/civicrm/CRM/Contact/Page/View/UserDashBoard.php b/www/modules/civicrm/CRM/Contact/Page/View/UserDashBoard.php
index 5eee298b7..fc3d03c24 100644
--- a/www/modules/civicrm/CRM/Contact/Page/View/UserDashBoard.php
+++ b/www/modules/civicrm/CRM/Contact/Page/View/UserDashBoard.php
@@ -240,7 +240,7 @@ public static function &links() {
     // call the hook so we can modify it
     CRM_Utils_Hook::links('view.contact.userDashBoard',
       'Contact',
-      CRM_Core_DAO::$_nullObject,
+      NULL,
       self::$_links
     );
     return self::$_links;
diff --git a/www/modules/civicrm/CRM/Contact/Page/View/UserDashBoard/GroupContact.php b/www/modules/civicrm/CRM/Contact/Page/View/UserDashBoard/GroupContact.php
index 41a9fdac3..6d010d267 100644
--- a/www/modules/civicrm/CRM/Contact/Page/View/UserDashBoard/GroupContact.php
+++ b/www/modules/civicrm/CRM/Contact/Page/View/UserDashBoard/GroupContact.php
@@ -53,9 +53,9 @@ public function browse() {
     );
 
     $this->assign('groupCount', $count);
-    $this->assign_by_ref('groupIn', $in);
-    $this->assign_by_ref('groupPending', $pending);
-    $this->assign_by_ref('groupOut', $out);
+    $this->assign('groupIn', $in);
+    $this->assign('groupPending', $pending);
+    $this->assign('groupOut', $out);
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Contact/Selector.php b/www/modules/civicrm/CRM/Contact/Selector.php
index f039446dc..509759be0 100644
--- a/www/modules/civicrm/CRM/Contact/Selector.php
+++ b/www/modules/civicrm/CRM/Contact/Selector.php
@@ -847,14 +847,14 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
         $contactUrl = CRM_Utils_System::url('civicrm/contact/view',
           "reset=1&cid={$result->contact_id}&key={$this->_key}&context={$this->_context}"
         );
-        $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? $result->contact_sub_type : $result->contact_type,
+        $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ?: $result->contact_type,
           FALSE,
           $result->contact_id,
           TRUE,
           $contactUrl
         );
 
-        $row['contact_type_orig'] = $result->contact_sub_type ? $result->contact_sub_type : $result->contact_type;
+        $row['contact_type_orig'] = $result->contact_sub_type ?: $result->contact_type;
         $row['contact_id'] = $result->contact_id;
         $row['sort_name'] = $result->sort_name;
         // Surely this if should be if NOT - otherwise it's just wierd.
diff --git a/www/modules/civicrm/CRM/Contact/Task.php b/www/modules/civicrm/CRM/Contact/Task.php
index a99254815..83bbe220d 100644
--- a/www/modules/civicrm/CRM/Contact/Task.php
+++ b/www/modules/civicrm/CRM/Contact/Task.php
@@ -163,7 +163,7 @@ public static function tasks() {
       ];
 
       //CRM-16329, if SMS provider is configured show sms action.
-      $providersCount = CRM_SMS_BAO_Provider::activeProviderCount();
+      $providersCount = CRM_SMS_BAO_SmsProvider::activeProviderCount();
       if ($providersCount && CRM_Core_Permission::check('send SMS')) {
         self::$_tasks[self::TASK_SMS] = [
           'title' => ts('SMS - schedule/send'),
diff --git a/www/modules/civicrm/CRM/Contact/Tokens.php b/www/modules/civicrm/CRM/Contact/Tokens.php
index 232f8661a..ec7da87cb 100644
--- a/www/modules/civicrm/CRM/Contact/Tokens.php
+++ b/www/modules/civicrm/CRM/Contact/Tokens.php
@@ -407,7 +407,7 @@ protected function getTokenMetadata(): array {
           // Set audience to sysadmin in case adding them to UI annoys people. If people ask to see this
           // in the UI we could set to 'user'.
           $field['audience'] = 'sysadmin';
-          $field['name'] = $entity . '_billing.' . $field['name'];
+          $field['name'] = str_replace('_primary.', '_billing.', $field['name']);
           $this->addFieldToTokenMetadata($tokensMetadata, $field, $exposedFields, $entity . '_billing');
         }
       }
@@ -417,6 +417,9 @@ protected function getTokenMetadata(): array {
     $tokensMetadata['address_primary.state_province_id:abbr'] = $tokensMetadata['address_primary.state_province_id:label'];
     $tokensMetadata['address_primary.state_province_id:abbr']['name'] = 'address_primary.state_province_id:abbr';
     $tokensMetadata['address_primary.state_province_id:abbr']['audience'] = 'user';
+    $tokensMetadata['address_billing.state_province_id:abbr'] = $tokensMetadata['address_billing.state_province_id:label'];;
+    $tokensMetadata['address_billing.state_province_id:abbr']['name'] = 'address_billing.state_province_id:abbr';
+
     // Hide the label for now because we are not sure if there are paths
     // where legacy token resolution is in play where this could not be resolved.
     $tokensMetadata['address_primary.state_province_id:label']['audience'] = 'sysadmin';
@@ -449,6 +452,20 @@ protected function getContact(int $contactId, array $requiredFields, bool $getAl
     }
     $joins = [];
     $customFields = [];
+    $billingFields = [];
+    foreach ($requiredFields as $field) {
+      if (str_contains($field, '_billing.')) {
+        // Make sure we have enough data to fall back to primary.
+        $billingEntity = explode('.', $field)[0];
+        $billingFields[$field] = $billingEntity;
+        $extraFields = [$billingEntity . '.id', str_replace('_billing.', '_primary.', $field)];
+        foreach ($extraFields as $extraField) {
+          if (!in_array($extraField, $requiredFields, TRUE)) {
+            $requiredFields[] = $extraField;
+          }
+        }
+      }
+    }
     foreach ($requiredFields as $field) {
       $fieldSpec = $this->getMetadataForField($field);
       $prefix = '';
@@ -488,6 +505,11 @@ protected function getContact(int $contactId, array $requiredFields, bool $getAl
       // fake contact id - check `testReplaceGreetingTokens`
       return [];
     }
+    foreach ($this->getEmptyBillingEntities($billingFields, $contact) as $billingEntityFields) {
+      foreach ($billingEntityFields as $billingField) {
+        $contact[$billingField] = $contact[str_replace('_billing.', '_primary.', $billingField)];
+      }
+    }
 
     foreach ($this->getDeprecatedTokens() as $apiv3Name => $fieldName) {
       // it would be set already with the right value for a greeting token
@@ -687,6 +709,39 @@ protected function getBespokeTokens(): array {
     ];
   }
 
+  /**
+   * Get the array of related billing entities that are empty.
+   *
+   * The billing tokens fall back to the primary address tokens as we cannot rely
+   * on all contacts having an address with is_billing set and the code historically has
+   * treated billing addresses as 'get the best billing address', despite the failure
+   * to set the fields.
+   *
+   * Here we figure out the entities where swapping in the primary fields makes sense.
+   * This is the case when there is no billing address at all, but we don't want to 'supplement'
+   * a partial billing address with data from a possibly-completely-different primary address.
+   *
+   * @param array $billingFields
+   * @param array $contact
+   *
+   * @return array
+   */
+  private function getEmptyBillingEntities(array $billingFields, array $contact): array {
+    $billingEntitiesToReplaceWithPrimary = [];
+    foreach ($billingFields as $billingField => $billingEntity) {
+      // In most cases it is enough to check the 'id' is not present but it is possible
+      // that a partial address is passed in in preview mode - in which case
+      // we need to treat the entire address as 'usable'.
+      if (empty($contact[$billingField]) && empty($contact[$billingEntity . '.id'])) {
+        $billingEntitiesToReplaceWithPrimary[$billingEntity][] = $billingField;
+      }
+      else {
+        unset($billingEntitiesToReplaceWithPrimary[$billingEntity]);
+      }
+    }
+    return $billingEntitiesToReplaceWithPrimary;
+  }
+
   /**
    * Get the tokens defined by the legacy hook.
    *
diff --git a/www/modules/civicrm/CRM/Contribute/ActionMapping.php b/www/modules/civicrm/CRM/Contribute/ActionMapping.php
index 625fc1af5..f4f667632 100644
--- a/www/modules/civicrm/CRM/Contribute/ActionMapping.php
+++ b/www/modules/civicrm/CRM/Contribute/ActionMapping.php
@@ -24,7 +24,7 @@ public function getEntityName(): string {
     return 'Contribution';
   }
 
-  public function modifySpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
+  public function modifyApiSpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
     $spec->getFieldByName('entity_status')
       ->setLabel(ts('Contribution Status'));
   }
diff --git a/www/modules/civicrm/CRM/Contribute/ActionMapping/ByPage.php b/www/modules/civicrm/CRM/Contribute/ActionMapping/ByPage.php
index 7254291b8..e5b670d29 100644
--- a/www/modules/civicrm/CRM/Contribute/ActionMapping/ByPage.php
+++ b/www/modules/civicrm/CRM/Contribute/ActionMapping/ByPage.php
@@ -36,8 +36,8 @@ public function getLabel(): string {
     return ts('Contribution Page');
   }
 
-  public function modifySpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
-    parent::modifySpec($spec);
+  public function modifyApiSpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
+    parent::modifyApiSpec($spec);
     $spec->getFieldByName('entity_value')
       ->setLabel(ts('Contribution Page'));
   }
diff --git a/www/modules/civicrm/CRM/Contribute/ActionMapping/ByType.php b/www/modules/civicrm/CRM/Contribute/ActionMapping/ByType.php
index 0434b8f25..3a78a6a49 100644
--- a/www/modules/civicrm/CRM/Contribute/ActionMapping/ByType.php
+++ b/www/modules/civicrm/CRM/Contribute/ActionMapping/ByType.php
@@ -36,8 +36,8 @@ public function getLabel(): string {
     return ts('Contribution Type');
   }
 
-  public function modifySpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
-    parent::modifySpec($spec);
+  public function modifyApiSpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
+    parent::modifyApiSpec($spec);
     $spec->getFieldByName('entity_value')
       ->setLabel(ts('Financial Type'));
     $spec->getFieldByName('recipient_listing')
diff --git a/www/modules/civicrm/CRM/Contribute/BAO/Contribution.php b/www/modules/civicrm/CRM/Contribute/BAO/Contribution.php
index 71a69631a..613e76048 100644
--- a/www/modules/civicrm/CRM/Contribute/BAO/Contribution.php
+++ b/www/modules/civicrm/CRM/Contribute/BAO/Contribution.php
@@ -14,8 +14,10 @@
 use Civi\Api4\Address;
 use Civi\Api4\Contribution;
 use Civi\Api4\ContributionRecur;
+use Civi\Api4\EntityFinancialTrxn;
 use Civi\Api4\LineItem;
 use Civi\Api4\ContributionSoft;
+use Civi\Api4\MembershipLog;
 use Civi\Api4\PaymentProcessor;
 use Civi\Core\Event\PostEvent;
 
@@ -24,7 +26,7 @@
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
-class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution implements Civi\Test\HookInterface {
+class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution implements Civi\Core\HookInterface {
 
   /**
    * Static field for all the contribution information that we can potentially import
@@ -119,10 +121,11 @@ public static function add(&$params) {
     if (!$contributionStatusID) {
       // Since the fee amount is expecting this (later on) ensure it is always set.
       // It would only not be set for an update where it is unchanged.
-      $params['contribution_status_id'] = civicrm_api3('Contribution', 'getvalue', [
-        'id' => $contributionID,
-        'return' => 'contribution_status_id',
-      ]);
+      $params['contribution_status_id'] = Contribution::get(FALSE)
+        ->addSelect('contribution_status_id')
+        ->addWhere('id', '=', $contributionID)
+        ->execute()
+        ->first()['contribution_status_id'] ?? NULL;
     }
     $contributionStatus = CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', (int) $params['contribution_status_id']);
 
@@ -260,8 +263,7 @@ public static function isUpdateToRecurringContribution($params) {
     if (empty($params['contribution_recur_id']) && empty($params['prevContribution']->contribution_recur_id)) {
       return FALSE;
     }
-    $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
-    if ($params['prevContribution']->contribution_status_id == array_search('Pending', $contributionStatus)) {
+    if ($params['prevContribution']->contribution_status_id == CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Pending')) {
       return TRUE;
     }
     return FALSE;
@@ -373,10 +375,11 @@ public static function calculateMissingAmountParams(&$params, $contributionID) {
         if (isset($params['fee_amount']) || isset($params['total_amount'])) {
           // We have an existing contribution and fee_amount or total_amount has been passed in but not net_amount.
           // net_amount may need adjusting.
-          $contribution = civicrm_api3('Contribution', 'getsingle', [
-            'id' => $contributionID,
-            'return' => ['total_amount', 'net_amount', 'fee_amount'],
-          ]);
+          $contribution = Contribution::get(FALSE)
+            ->addSelect('total_amount', 'net_amount', 'fee_amount')
+            ->addWhere('id', '=', $contributionID)
+            ->execute()
+            ->first();
           $totalAmount = (isset($params['total_amount']) ? (float) $params['total_amount'] : (float) CRM_Utils_Array::value('total_amount', $contribution));
           $feeAmount = (isset($params['fee_amount']) ? (float) $params['fee_amount'] : (float) CRM_Utils_Array::value('fee_amount', $contribution));
           $params['net_amount'] = $totalAmount - $feeAmount;
@@ -452,10 +455,11 @@ public static function getPaymentProcessorReadyAddressParams($params) {
    * @param int $membershipTypeID
    *
    * @param int $contributionID
-   *
+   * @deprecated
    * @return int
    */
   public static function getNumTermsByContributionAndMembershipType($membershipTypeID, $contributionID) {
+    CRM_Core_Error::deprecatedFunctionWarning('Use API4 LineItem::get');
     $numTerms = CRM_Core_DAO::singleValueQuery("
       SELECT v.membership_num_terms FROM civicrm_line_item li
       LEFT JOIN civicrm_price_field_value v ON li.price_field_value_id = v.id
@@ -1271,7 +1275,7 @@ public static function failPayment($contributionID, $contactID, $message) {
       'details' => $message,
       'subject' => ts('Payment failed at payment processor'),
       'source_record_id' => $contributionID,
-      'source_contact_id' => CRM_Core_Session::getLoggedInContactID() ? CRM_Core_Session::getLoggedInContactID() : $contactID,
+      'source_contact_id' => CRM_Core_Session::getLoggedInContactID() ?: $contactID,
     ]);
 
     // CRM-20336 Make sure that the contribution status is Failed, not Pending.
@@ -1596,10 +1600,13 @@ public static function checkDuplicateIds($params) {
    * @param array $componentIds
    *   Component ids.
    *
+   * @deprecated since 5.72 will be removed around 5.90
+   *
    * @return array
    *   associated array
    */
   public static function getContributionDetails($exportMode, $componentIds) {
+    CRM_Core_Error::deprecatedFunctionWarning('no alternative');
     $paymentDetails = [];
     $componentClause = ' IN ( ' . implode(',', $componentIds) . ' ) ';
 
@@ -1833,10 +1840,7 @@ public static function transitionComponents($params) {
       }
     }
 
-    $paymentProcessorID = CRM_Utils_Array::value('payment_processor_id', $input, CRM_Utils_Array::value(
-      'paymentProcessor',
-      $ids
-    ));
+    $paymentProcessorID = $input['payment_processor_id'] ?? $ids['paymentProcessor'] ?? NULL;
 
     if (!isset($input['payment_processor_id']) && !$paymentProcessorID && $contribution->contribution_page_id) {
       $paymentProcessorID = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_ContributionPage',
@@ -2964,29 +2968,27 @@ public function _assignMessageVariablesToTemplate(&$values, $input, $returnMessa
         'label' => $this->_relatedObjects['participant']->fee_level . ' - ' . $primaryEmail,
         'amount' => $this->_relatedObjects['participant']->fee_amount,
       ];
+      $primaryParticipantID = $this->_relatedObjects['participant']->id;
+      $additionalIDs = CRM_Event_BAO_Participant::getAdditionalParticipantIds($primaryParticipantID);
       //build an array of cId/pId of participants
-      $additionalIDs = CRM_Event_BAO_Event::buildCustomProfile($this->_relatedObjects['participant']->id, NULL, $this->_relatedObjects['contact']->id, $isTest, TRUE);
-      unset($additionalIDs[$this->_relatedObjects['participant']->id]);
       //send receipt to additional participant if exists
       if (count($additionalIDs)) {
         $template->assign('isPrimary', 0);
         $template->assign('customProfile', NULL);
         //set additionalParticipant true
         $values['params']['additionalParticipant'] = TRUE;
-        foreach ($additionalIDs as $pId => $cId) {
+        foreach ($additionalIDs as $participantID) {
           $amount = [];
           //to change the status pending to completed
           $additional = new CRM_Event_DAO_Participant();
-          $additional->id = $pId;
-          $additional->contact_id = $cId;
+          $additional->id = $participantID;
           $additional->find(TRUE);
-          $additional->register_date = $this->_relatedObjects['participant']->register_date;
-          $additional->status_id = 1;
+          $contactID = (int) $additional->contact_id;
           $additionalParticipantInfo = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Email', $additional->contact_id, 'email', 'contact_id');
           //if additional participant dont have email
           //use display name.
           if (!$additionalParticipantInfo) {
-            $additionalParticipantInfo = CRM_Contact_BAO_Contact::displayName($additional->contact_id);
+            $additionalParticipantInfo = CRM_Contact_BAO_Contact::displayName($contactID);
           }
           $amount[0] = [
             'label' => $additional->fee_level,
@@ -2996,9 +2998,8 @@ public function _assignMessageVariablesToTemplate(&$values, $input, $returnMessa
             'label' => $additional->fee_level . ' - ' . $additionalParticipantInfo,
             'amount' => $additional->fee_amount,
           ];
-          $additional->save();
           $template->assign('amount', $amount);
-          CRM_Event_BAO_Event::sendMail($cId, $values, $pId, $isTest, $returnMessageText);
+          CRM_Event_BAO_Event::sendMail($contactID, $values, $participantID, $isTest, $returnMessageText);
         }
       }
 
@@ -3075,8 +3076,8 @@ public static function isSubscriptionCancelled($contributionId) {
         WHERE con.id = %1 LIMIT 1";
     $params = [1 => [$contributionId, 'Integer']];
     $statusId = CRM_Core_DAO::singleValueQuery($sql, $params);
-    $status = CRM_Contribute_PseudoConstant::contributionStatus($statusId, 'name');
-    if ($status == 'Cancelled') {
+    $status = CRM_Core_Pseudoconstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $statusId);
+    if ($status === 'Cancelled') {
       return TRUE;
     }
     return FALSE;
@@ -3182,14 +3183,14 @@ public static function recordFinancialAccounts(&$params, CRM_Contribute_DAO_Cont
         'trxn_date' => $params['receive_date'] ?? date('YmdHis'),
         'total_amount' => $totalAmount,
         'fee_amount' => $params['fee_amount'] ?? NULL,
-        'net_amount' => CRM_Utils_Array::value('net_amount', $params, $totalAmount),
+        'net_amount' => $params['net_amount'] ?? $totalAmount,
         'currency' => $contribution->currency,
         'trxn_id' => $contribution->trxn_id,
         // @todo - this is getting the status id from the contribution - that is BAD - ie the contribution could be partially
         // paid but each payment is completed. The work around is to pass in the status_id in the trxn_params but
         // this should really default to completed (after discussion).
         'status_id' => $statusId,
-        'payment_instrument_id' => CRM_Utils_Array::value('payment_instrument_id', $params, $params['contribution']->payment_instrument_id),
+        'payment_instrument_id' => $params['payment_instrument_id'] ?? $params['contribution']->payment_instrument_id,
         'check_number' => $params['check_number'] ?? NULL,
         'pan_truncation' => $params['pan_truncation'] ?? NULL,
         'card_type_id' => $params['card_type_id'] ?? NULL,
@@ -3269,7 +3270,7 @@ public static function recordFinancialAccounts(&$params, CRM_Contribute_DAO_Cont
                 $line['financial_type_id'] = $params['financial_type_id'];
               }
             }
-            CRM_Core_BAO_FinancialTrxn::createDeferredTrxn(CRM_Utils_Array::value('line_item', $params), $params['contribution'], TRUE, 'changeFinancialType');
+            CRM_Core_BAO_FinancialTrxn::createDeferredTrxn($params['line_item'] ?? NULL, $params['contribution'], TRUE, 'changeFinancialType');
             /* $params['trxnParams']['to_financial_account_id'] = $trxnParams['to_financial_account_id']; */
             $params['financial_account_id'] = $newFinancialAccount;
             $params['total_amount'] = $params['trxnParams']['total_amount'] = $params['trxnParams']['net_amount'] = $trxnParams['total_amount'];
@@ -3278,7 +3279,7 @@ public static function recordFinancialAccounts(&$params, CRM_Contribute_DAO_Cont
               $params['trxnParams']['fee_amount'] = $params['fee_amount'];
             }
             CRM_Contribute_BAO_FinancialProcessor::updateFinancialAccounts($params);
-            CRM_Core_BAO_FinancialTrxn::createDeferredTrxn(CRM_Utils_Array::value('line_item', $params), $params['contribution'], TRUE);
+            CRM_Core_BAO_FinancialTrxn::createDeferredTrxn($params['line_item'] ?? NULL, $params['contribution'], TRUE);
             $params['trxnParams']['to_financial_account_id'] = $trxnParams['to_financial_account_id'];
             $updated = TRUE;
             $params['deferred_financial_account_id'] = $newFinancialAccount;
@@ -3300,7 +3301,7 @@ public static function recordFinancialAccounts(&$params, CRM_Contribute_DAO_Cont
           $callUpdateFinancialAccounts = CRM_Contribute_BAO_FinancialProcessor::updateFinancialAccountsOnContributionStatusChange($params);
           if ($callUpdateFinancialAccounts) {
             CRM_Contribute_BAO_FinancialProcessor::updateFinancialAccounts($params, 'changedStatus');
-            CRM_Core_BAO_FinancialTrxn::createDeferredTrxn(CRM_Utils_Array::value('line_item', $params), $params['contribution'], TRUE, 'changedStatus');
+            CRM_Core_BAO_FinancialTrxn::createDeferredTrxn($params['line_item'] ?? NULL, $params['contribution'], TRUE, 'changedStatus');
           }
           $updated = TRUE;
         }
@@ -3329,7 +3330,7 @@ public static function recordFinancialAccounts(&$params, CRM_Contribute_DAO_Cont
           //Update Financial Records
           $params['trxnParams']['from_financial_account_id'] = NULL;
           CRM_Contribute_BAO_FinancialProcessor::updateFinancialAccounts($params, 'changedAmount');
-          CRM_Core_BAO_FinancialTrxn::createDeferredTrxn(CRM_Utils_Array::value('line_item', $params), $params['contribution'], TRUE, 'changedAmount');
+          CRM_Core_BAO_FinancialTrxn::createDeferredTrxn($params['line_item'] ?? NULL, $params['contribution'], TRUE, 'changedAmount');
           $updated = TRUE;
         }
 
@@ -3390,7 +3391,7 @@ public static function recordFinancialAccounts(&$params, CRM_Contribute_DAO_Cont
       && $params['prevContribution']->contribution_status_id != $params['contribution']->contribution_status_id
     ) {
       $eventID = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Participant', $entityId, 'event_id');
-      $feeLevel[] = str_replace('
', '', $params['prevContribution']->amount_level);
+      $feeLevel = str_replace('�', '', $params['prevContribution']->amount_level);
       CRM_Event_BAO_Participant::createDiscountTrxn($eventID, $params, $feeLevel);
     }
     unset($params['line_item']);
@@ -3623,18 +3624,14 @@ public static function getPaymentInfo($id, $component = 'contribution', $getTrxn
 
     $paymentBalance = CRM_Contribute_BAO_Contribution::getContributionBalance($contributionId, $total);
 
-    $contribution = civicrm_api3('Contribution', 'getsingle', [
-      'id' => $contributionId,
-      'return' => [
-        'currency',
-        'is_pay_later',
-        'contribution_status_id',
-        'financial_type_id',
-      ],
-    ]);
+    $contribution = Contribution::get(FALSE)
+      ->addSelect('currency', 'is_pay_later', 'contribution_status_id:name', 'financial_type_id')
+      ->addWhere('id', '=', $contributionId)
+      ->execute()
+      ->first();
 
     $info['payLater'] = $contribution['is_pay_later'];
-    $info['contribution_status'] = $contribution['contribution_status'];
+    $info['contribution_status'] = $contribution['contribution_status_id:name'];
     $info['currency'] = $contribution['currency'];
 
     $info['total'] = $total;
@@ -4173,7 +4170,9 @@ private static function getOriginalContribution($contributionID) {
    * load them in this function. Code clean up would compensate for any minor performance implication.
    *
    * @param int $contributionID
+   *   The Contribution ID that was Completed
    * @param string $changeDate
+   *   If provided, specify an alternative date to use as "today" calculation of membership dates
    *
    * @throws \CRM_Core_Exception
    */
@@ -4196,30 +4195,29 @@ public static function updateMembershipBasedOnCompletionOfContribution($contribu
 
       // CRM-8141 update the membership type with the value recorded in log when membership created/renewed
       // this picks up membership type changes during renewals
-      // @todo this is almost certainly an obsolete sql call, the pre-change
-      // membership is accessible via $this->_relatedObjects
-      $sql = "
-SELECT    membership_type_id
-FROM      civicrm_membership_log
-WHERE     membership_id={$membershipParams['id']}
-ORDER BY  id DESC
-LIMIT 1;";
-      $dao = CRM_Core_DAO::executeQuery($sql);
-      if ($dao->fetch()) {
-        if (!empty($dao->membership_type_id)) {
-          $membershipParams['membership_type_id'] = $dao->membership_type_id;
-        }
+      $preChangeMembership = MembershipLog::get(FALSE)
+        ->addSelect('membership_type_id')
+        ->addWhere('membership_id', '=', $membershipParams['id'])
+        ->addOrderBy('id', 'DESC')
+        ->execute()
+        ->first();
+      if (!empty($preChangeMembership) && !empty($preChangeMembership['membership_type_id'])) {
+        $membershipParams['membership_type_id'] = $preChangeMembership['membership_type_id'];
       }
       if (empty($membership['end_date']) || (int) $membership['status_id'] !== CRM_Core_PseudoConstant::getKey('CRM_Member_BAO_Membership', 'status_id', 'Pending')) {
         // Passing num_terms to the api triggers date calculations, but for pending memberships these may be already calculated.
         // sigh - they should  be  consistent but removing the end date check causes test failures & maybe UI too?
         // 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'] = self::getNumTermsByContributionAndMembershipType(
-          $membershipParams['membership_type_id'],
-          $contributionID
-        );
+        $lineItem = LineItem::get(FALSE)
+          ->addSelect('membership_num_terms')
+          ->addJoin('PriceFieldValue AS price_field_value', 'LEFT')
+          ->addWhere('contribution_id', '=', $contributionID)
+          ->addWhere('price_field_value.membership_type_id', '=', $membershipParams['membership_type_id'])
+          ->execute()
+          ->first();
+        // default of 1 is precautionary
+        $membershipParams['num_terms'] = empty($lineItem['membership_num_terms']) ? 1 : $lineItem['membership_num_terms'];
       }
       // @todo remove all this stuff in favour of letting the api call further down handle in
       // (it is a duplication of what the api does).
@@ -4256,7 +4254,7 @@ public static function updateMembershipBasedOnCompletionOfContribution($contribu
         );
 
         unset($dates['end_date']);
-        $membershipParams['status_id'] = CRM_Utils_Array::value('id', $calcStatus, 'New');
+        $membershipParams['status_id'] = $calcStatus['id'] ?? 'New';
       }
       //we might be renewing membership,
       //so make status override false.
@@ -4523,14 +4521,13 @@ public static function getSalesTaxFinancialAccounts() {
    *
    * @throws \CRM_Core_Exception
    */
-  public static function createProportionalEntry($entityParams, $eftParams) {
-    $paid = 0;
+  public static function createProportionalEntry(array $entityParams, array $eftParams): void {
+    $eftParams['amount'] = 0;
     if ($entityParams['contribution_total_amount'] != 0) {
-      $paid = $entityParams['line_item_amount'] * ($entityParams['trxn_total_amount'] / $entityParams['contribution_total_amount']);
+      $eftParams['amount'] = $entityParams['line_item_amount'] * ($entityParams['trxn_total_amount'] / $entityParams['contribution_total_amount']);
     }
     // Record Entity Financial Trxn; CRM-20145
-    $eftParams['amount'] = $paid;
-    civicrm_api3('EntityFinancialTrxn', 'create', $eftParams);
+    EntityFinancialTrxn::create(FALSE)->setValues($eftParams)->execute();
   }
 
   /**
@@ -4624,53 +4621,6 @@ protected function loadRelatedEntitiesByID($ids) {
     }
   }
 
-  /**
-   * Do not use - unused in core.
-   *
-   * Function to replace contribution tokens.
-   *
-   * @param array $contributionIds
-   *
-   * @param string $subject
-   *
-   * @param array $subjectToken
-   *
-   * @param string $text
-   *
-   * @param string $html
-   *
-   * @param array $messageToken
-   *
-   * @param bool $escapeSmarty
-   *
-   * @deprecated
-   *
-   * @return array
-   * @throws \CRM_Core_Exception
-   */
-  public static function replaceContributionTokens(
-    $contributionIds,
-    $subject,
-    $subjectToken,
-    $text,
-    $html,
-    $messageToken,
-    $escapeSmarty
-  ) {
-    CRM_Core_Error::deprecatedFunctionWarning('use the TokenProcessor');
-    if (empty($contributionIds)) {
-      return [];
-    }
-    $contributionDetails = [];
-    foreach ($contributionIds as $id) {
-      $result = self::getContributionTokenValues($id, $messageToken);
-      $contributionDetails[$result['values'][$result['id']]['contact_id']]['subject'] = CRM_Utils_Token::replaceContributionTokens($subject, $result, FALSE, $subjectToken, FALSE, $escapeSmarty);
-      $contributionDetails[$result['values'][$result['id']]['contact_id']]['text'] = CRM_Utils_Token::replaceContributionTokens($text, $result, FALSE, $messageToken, FALSE, $escapeSmarty);
-      $contributionDetails[$result['values'][$result['id']]['contact_id']]['html'] = CRM_Utils_Token::replaceContributionTokens($html, $result, FALSE, $messageToken, FALSE, $escapeSmarty);
-    }
-    return $contributionDetails;
-  }
-
   /**
    * Do not use - still called from CRM_Contribute_Form_Task_PDFLetter
    *
diff --git a/www/modules/civicrm/CRM/Contribute/BAO/ContributionPage.php b/www/modules/civicrm/CRM/Contribute/BAO/ContributionPage.php
index 59dcd31af..b1e8278fd 100644
--- a/www/modules/civicrm/CRM/Contribute/BAO/ContributionPage.php
+++ b/www/modules/civicrm/CRM/Contribute/BAO/ContributionPage.php
@@ -313,18 +313,14 @@ public static function sendMail($contactID, $values, $isTest = FALSE, $returnMes
         }
         [$values['customPost_grouptitle'], $values['customPost']] = self::getProfileNameAndFields($postID, $userID, $params['custom_post_id']);
       }
-      // Assign honoree values for the receipt. But first, stop any leaks from
-      // previously assigned values.
-      $template->assign('honoreeProfile', []);
-      $template->assign('honorName', NULL);
-      if (isset($values['honor'])) {
-        $honorValues = $values['honor'];
-        $template->_values = ['honoree_profile_id' => $values['honoree_profile_id']];
-        CRM_Contribute_BAO_ContributionSoft::formatHonoreeProfileFields(
-          $template,
-          $honorValues['honor_profile_values'],
-          $honorValues['honor_id']
-        );
+      // Assign honoree values for the receipt.
+      $honorValues = $values['honor'] ?? ['honor_profile_id' => NULL, 'honor_id' => NULL, 'honor_profile_values' => []];
+      foreach (CRM_Contribute_BAO_ContributionSoft::getHonorTemplateVariables(
+        $honorValues['honor_profile_id'] ? (int) $honorValues['honor_profile_id'] : NULL,
+        $honorValues['honor_id'] ? (int) $honorValues['honor_id'] : NULL,
+        $honorValues['honor_profile_values'] ?? [],
+      ) as $honorFieldName => $honorFieldValue) {
+        $template->assign($honorFieldName, $honorFieldValue);
       }
 
       $title = $values['title'] ?? CRM_Contribute_BAO_Contribution_Utils::getContributionPageTitle($values['contribution_page_id']);
diff --git a/www/modules/civicrm/CRM/Contribute/BAO/ContributionRecur.php b/www/modules/civicrm/CRM/Contribute/BAO/ContributionRecur.php
index df1dea918..3d139f7d5 100644
--- a/www/modules/civicrm/CRM/Contribute/BAO/ContributionRecur.php
+++ b/www/modules/civicrm/CRM/Contribute/BAO/ContributionRecur.php
@@ -19,7 +19,7 @@
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
-class CRM_Contribute_BAO_ContributionRecur extends CRM_Contribute_DAO_ContributionRecur implements Civi\Test\HookInterface {
+class CRM_Contribute_BAO_ContributionRecur extends CRM_Contribute_DAO_ContributionRecur implements Civi\Core\HookInterface {
 
   /**
    * Create recurring contribution.
@@ -333,12 +333,11 @@ public static function cancelRecurContribution(array $params): bool {
   }
 
   /**
-   * @param int $entityID
-   * @param string $entity
+   * @param int $recurringContributionID
    *
    * @return null|Object
    */
-  public static function getSubscriptionDetails($entityID, $entity = 'recur') {
+  public static function getSubscriptionDetails($recurringContributionID) {
     // Note: processor_id used to be aliased as subscription_id so we include it here
     // both as processor_id and subscription_id for legacy compatibility.
     $sql = "
@@ -360,35 +359,13 @@ public static function getSubscriptionDetails($entityID, $entity = 'recur') {
        con.id as contribution_id,
        con.contribution_page_id,
        rec.contact_id,
-       mp.membership_id";
-
-    if ($entity == 'recur') {
-      // This should be always true now.
-      $sql .= "
+       mp.membership_id
       FROM civicrm_contribution_recur rec
 LEFT JOIN civicrm_contribution       con ON ( con.contribution_recur_id = rec.id )
 LEFT  JOIN civicrm_membership_payment mp  ON ( mp.contribution_id = con.id )
      WHERE rec.id = %1";
-    }
-    elseif ($entity == 'contribution') {
-      CRM_Core_Error::deprecatedWarning('no longer used');
-      $sql .= "
-      FROM civicrm_contribution       con
-INNER JOIN civicrm_contribution_recur rec ON ( con.contribution_recur_id = rec.id )
-LEFT  JOIN civicrm_membership_payment mp  ON ( mp.contribution_id = con.id )
-     WHERE con.id = %1";
-    }
-    elseif ($entity == 'membership') {
-      CRM_Core_Error::deprecatedWarning('no longer used');
-      $sql .= "
-      FROM civicrm_membership_payment mp
-INNER JOIN civicrm_membership         mem ON ( mp.membership_id = mem.id )
-INNER JOIN civicrm_contribution_recur rec ON ( mem.contribution_recur_id = rec.id )
-INNER JOIN civicrm_contribution       con ON ( con.id = mp.contribution_id )
-     WHERE mp.membership_id = %1";
-    }
 
-    $dao = CRM_Core_DAO::executeQuery($sql, [1 => [$entityID, 'Integer']]);
+    $dao = CRM_Core_DAO::executeQuery($sql, [1 => [$recurringContributionID, 'Integer']]);
     if ($dao->fetch()) {
       return $dao;
     }
@@ -919,38 +896,33 @@ public static function getRecurringFields() {
    *
    * @throws \CRM_Core_Exception
    */
-  public static function updateOnNewPayment($recurringContributionID, $paymentStatus, string $effectiveDate = 'now') {
-
+  public static function updateOnNewPayment($recurringContributionID, string $paymentStatus, string $effectiveDate = 'now') {
     if (!in_array($paymentStatus, ['Completed', 'Failed'])) {
       return;
     }
-    $params = [
-      'id' => $recurringContributionID,
-      'return' => [
-        'contribution_status_id',
-        'next_sched_contribution_date',
-        'frequency_unit',
-        'frequency_interval',
-        'installments',
-        'failure_count',
-      ],
-    ];
 
-    $existing = civicrm_api3('ContributionRecur', 'getsingle', $params);
+    $existingRecur = \Civi\Api4\ContributionRecur::get(FALSE)
+      ->addSelect('contribution_status_id:name', 'next_sched_contribution_date', 'frequency_unit', 'frequency_interval', 'installments', 'failure_count')
+      ->addWhere('id', '=', $recurringContributionID)
+      ->execute()
+      ->first();
 
-    if ($paymentStatus == 'Completed'
-      && CRM_Contribute_PseudoConstant::contributionStatus($existing['contribution_status_id'], 'name') == 'Pending') {
-      $params['contribution_status_id'] = 'In Progress';
+    $updatedRecurParams['id'] = $recurringContributionID;
+    if (($paymentStatus === 'Completed')
+      && ($existingRecur['contribution_status_id:name'] === 'Pending')) {
+      // Update Recur to "In Progress"
+      $updatedRecurParams['contribution_status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_ContributionRecur', 'contribution_status_id', 'In Progress');
     }
     if ($paymentStatus == 'Failed') {
-      $params['failure_count'] = $existing['failure_count'];
+      $updatedRecurParams['failure_count'] = $existingRecur['failure_count'];
     }
-    $params['modified_date'] = date('Y-m-d H:i:s');
+    $updatedRecurParams['modified_date'] = date('Y-m-d H:i:s');
 
-    if (!empty($existing['installments']) && self::isComplete($recurringContributionID, $existing['installments'])) {
-      $params['contribution_status_id'] = 'Completed';
-      $params['next_sched_contribution_date'] = 'null';
-      $params['end_date'] = 'now';
+    if (!empty($existingRecur['installments']) && self::isComplete($recurringContributionID, $existingRecur['installments'])) {
+      // Update Recur to "Completed"
+      $updatedRecurParams['contribution_status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_ContributionRecur', 'contribution_status_id', 'Completed');
+      $updatedRecurParams['next_sched_contribution_date'] = 'null';
+      $updatedRecurParams['end_date'] = 'now';
     }
     else {
       // Only update next sched date if it's empty or up to 48 hours away because payment processors may be managing
@@ -960,12 +932,12 @@ public static function updateOnNewPayment($recurringContributionID, $paymentStat
       // Note 48 hours is a bit aribtrary but means that we can hopefully ignore the time being potentially
       // rounded down to midnight.
       $upperDateToConsiderProcessed = strtotime('+ 48 hours', ($effectiveDate ? strtotime($effectiveDate) : time()));
-      if (empty($existing['next_sched_contribution_date']) || strtotime($existing['next_sched_contribution_date']) <=
+      if (empty($existingRecur['next_sched_contribution_date']) || strtotime($existingRecur['next_sched_contribution_date']) <=
         $upperDateToConsiderProcessed) {
-        $params['next_sched_contribution_date'] = date('Y-m-d', strtotime('+' . $existing['frequency_interval'] . ' ' . $existing['frequency_unit'], strtotime($effectiveDate)));
+        $updatedRecurParams['next_sched_contribution_date'] = date('Y-m-d', strtotime('+' . $existingRecur['frequency_interval'] . ' ' . $existingRecur['frequency_unit'], strtotime($effectiveDate)));
       }
     }
-    civicrm_api3('ContributionRecur', 'create', $params);
+    civicrm_api3('ContributionRecur', 'create', $updatedRecurParams);
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Contribute/BAO/ContributionSoft.php b/www/modules/civicrm/CRM/Contribute/BAO/ContributionSoft.php
index 4fbad1a2f..7fb574b34 100644
--- a/www/modules/civicrm/CRM/Contribute/BAO/ContributionSoft.php
+++ b/www/modules/civicrm/CRM/Contribute/BAO/ContributionSoft.php
@@ -484,67 +484,15 @@ public static function formatHonoreeProfileFields($form, $params, $honorId = NUL
     if (empty($form->_values['honoree_profile_id'])) {
       return;
     }
-    $profileContactType = CRM_Core_BAO_UFGroup::getContactType($form->_values['honoree_profile_id']);
-    $profileFields = CRM_Core_BAO_UFGroup::getFields($form->_values['honoree_profile_id']);
-    $honoreeProfileFields = $values = [];
-    $honorName = NULL;
-
-    if ($honorId) {
-      CRM_Core_BAO_UFGroup::getValues($honorId, $profileFields, $values, FALSE, $params);
-      if (empty($params)) {
-        foreach ($profileFields as $name => $field) {
-          $title = $field['title'];
-          $params[$field['name']] = $values[$title];
-        }
-      }
-    }
+    $profileID = $form->_values['honoree_profile_id'];
     if (!is_array($params)) {
       CRM_Core_Error::deprecatedWarning('this could indicate a bug - see https://lab.civicrm.org/dev/core/-/issues/4881');
       $params = [];
     }
+    $honoreeVariables = self::getHonorTemplateVariables($profileID, $honorId, $params);
 
-    //remove name related fields and construct name string with prefix/suffix
-    //which will be later assigned to template
-    switch ($profileContactType) {
-      case 'Individual':
-        if (array_key_exists('prefix_id', $params)) {
-          $honorName = CRM_Utils_Array::value($params['prefix_id'],
-            CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id')
-          );
-          unset($profileFields['prefix_id']);
-        }
-        $honorName .= ' ' . $params['first_name'] . ' ' . $params['last_name'];
-        unset($profileFields['first_name']);
-        unset($profileFields['last_name']);
-        if (array_key_exists('suffix_id', $params)) {
-          $honorName .= ' ' . CRM_Utils_Array::value($params['suffix_id'],
-              CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id')
-            );
-          unset($profileFields['suffix_id']);
-        }
-        break;
-
-      case 'Organization':
-        $honorName = $params['organization_name'];
-        unset($profileFields['organization_name']);
-        break;
-
-      case 'Household':
-        $honorName = $params['household_name'];
-        unset($profileFields['household_name']);
-        break;
-    }
-
-    if ($honorId) {
-      $honoreeProfileFields['Name'] = $honorName;
-      foreach ($profileFields as $name => $field) {
-        $title = $field['title'];
-        $honoreeProfileFields[$title] = $values[$title];
-      }
-      $form->assign('honoreeProfile', $honoreeProfileFields);
-    }
-    else {
-      $form->assign('honorName', $honorName);
+    foreach ($honoreeVariables as $honorField => $honorValue) {
+      $form->assign($honorField, $honorValue);
     }
   }
 
@@ -649,6 +597,83 @@ public static function pcpNotifyOwner(int $contributionID, array $contributionSo
     }
   }
 
+  /**
+   * @param int|null $profileID
+   * @param int|null $honorId
+   * @param array $params
+   *
+   * @return array
+   * @throws \CRM_Core_Exception
+   * @internal temporary function to retrieve template variables for honor profile.
+   *
+   */
+  public static function getHonorTemplateVariables(?int $profileID, ?int $honorId, array $params): array {
+    $honoreeVariables = ['honoreeProfile' => NULL, 'honorName' => NULL];
+    if (!$profileID) {
+      return $honoreeVariables;
+    }
+    $profileContactType = CRM_Core_BAO_UFGroup::getContactType($profileID);
+    $profileFields = CRM_Core_BAO_UFGroup::getFields($profileID);
+    $honoreeProfileFields = $values = [];
+    $honorName = NULL;
+
+    if ($honorId) {
+      CRM_Core_BAO_UFGroup::getValues($honorId, $profileFields, $values, FALSE, $params);
+      if (empty($params)) {
+        foreach ($profileFields as $name => $field) {
+          $title = $field['title'];
+          $params[$field['name']] = $values[$title];
+        }
+      }
+    }
+
+    //remove name related fields and construct name string with prefix/suffix
+    //which will be later assigned to template
+    // This looks like a really drawn out way to get the display name...
+    switch ($profileContactType) {
+      case 'Individual':
+        if (array_key_exists('prefix_id', $params)) {
+          $honorName = CRM_Utils_Array::value($params['prefix_id'],
+            CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id')
+          );
+          unset($profileFields['prefix_id']);
+        }
+        $honorName .= ' ' . $params['first_name'] . ' ' . $params['last_name'];
+        unset($profileFields['first_name']);
+        unset($profileFields['last_name']);
+        if (array_key_exists('suffix_id', $params)) {
+          $honorName .= ' ' . CRM_Utils_Array::value($params['suffix_id'],
+              CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id')
+            );
+          unset($profileFields['suffix_id']);
+        }
+        break;
+
+      case 'Organization':
+        $honorName = $params['organization_name'];
+        unset($profileFields['organization_name']);
+        break;
+
+      case 'Household':
+        $honorName = $params['household_name'];
+        unset($profileFields['household_name']);
+        break;
+    }
+
+    if ($honorId) {
+      $honoreeProfileFields['Name'] = $honorName;
+      foreach ($profileFields as $name => $field) {
+        $title = $field['title'];
+        $honoreeProfileFields[$title] = $values[$title];
+      }
+      $honoreeVariables['honoreeProfile'] = $honoreeProfileFields;
+    }
+    else {
+      $honoreeVariables['honorName'] = $honorName;
+    }
+    return $honoreeVariables;
+  }
+
   /**
    * @param string|null $entityName
    * @param int|null $userId
diff --git a/www/modules/civicrm/CRM/Contribute/BAO/Premium.php b/www/modules/civicrm/CRM/Contribute/BAO/Premium.php
index 349545ca5..d9218a030 100644
--- a/www/modules/civicrm/CRM/Contribute/BAO/Premium.php
+++ b/www/modules/civicrm/CRM/Contribute/BAO/Premium.php
@@ -130,12 +130,8 @@ public static function buildPremiumBlock(&$form, $pageID, $formItems = FALSE, $s
             CRM_Core_DAO::storeValues($productDAO, $products[$productDAO->id]);
           }
         }
-        $options = $temp = [];
-        $temp = explode(',', $productDAO->options);
-        foreach ($temp as $value) {
-          $options[trim($value)] = trim($value);
-        }
-        if ($temp[0] != '') {
+        $options = self::parseProductOptions($productDAO->options);
+        if (!empty($options)) {
           $form->addElement('select', 'options_' . $productDAO->id, NULL, $options);
         }
       }
@@ -246,4 +242,25 @@ public static function getPremiumProductInfo() {
     return self::$productInfo;
   }
 
+  /**
+   * Convert key=val options into an array while keeping
+   * compatibility for values only.
+   */
+  public static function parseProductOptions($string) : array {
+    $options = [];
+    $temp = explode(',', $string);
+
+    foreach ($temp as $value) {
+      $parts = explode('=', $value, 2);
+      if (count($parts) == 2) {
+        $options[trim($parts[0])] = trim($parts[1]);
+      }
+      else {
+        $options[trim($value)] = trim($value);
+      }
+    }
+
+    return $options;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Contribute/DAO/Contribution.php b/www/modules/civicrm/CRM/Contribute/DAO/Contribution.php
index af1c99d6d..e49d4127e 100644
--- a/www/modules/civicrm/CRM/Contribute/DAO/Contribution.php
+++ b/www/modules/civicrm/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:ac06e44eef3c31fd91b5a2e722cce4e2)
+ * (GenCodeChecksum:8f56c256f38dc287fee1374252c97e1f)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contribute/DAO/ContributionPage.php b/www/modules/civicrm/CRM/Contribute/DAO/ContributionPage.php
index da7d64498..f43b307e7 100644
--- a/www/modules/civicrm/CRM/Contribute/DAO/ContributionPage.php
+++ b/www/modules/civicrm/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:0878c44e4ecbf95e1c3c18731633e8a1)
+ * (GenCodeChecksum:5bc752f7ab209ff0dcebdf3ff1f8af12)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contribute/DAO/ContributionProduct.php b/www/modules/civicrm/CRM/Contribute/DAO/ContributionProduct.php
index 66a2b4e4c..1c8340c28 100644
--- a/www/modules/civicrm/CRM/Contribute/DAO/ContributionProduct.php
+++ b/www/modules/civicrm/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:bdaea7c43da84af6dc29826b644505a0)
+ * (GenCodeChecksum:fbc39de2439ae647c6418d00d602e5eb)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contribute/DAO/ContributionRecur.php b/www/modules/civicrm/CRM/Contribute/DAO/ContributionRecur.php
index 2efe3a32c..364a06f1b 100644
--- a/www/modules/civicrm/CRM/Contribute/DAO/ContributionRecur.php
+++ b/www/modules/civicrm/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:5a9eadcb838cebf85ce424f126822690)
+ * (GenCodeChecksum:21e7fea5e149343a8b8f170d6d4c8bee)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contribute/DAO/ContributionSoft.php b/www/modules/civicrm/CRM/Contribute/DAO/ContributionSoft.php
index c13707cb7..6e2f77655 100644
--- a/www/modules/civicrm/CRM/Contribute/DAO/ContributionSoft.php
+++ b/www/modules/civicrm/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:3ecf6fc6d7483e6dea0d1fb222797cd7)
+ * (GenCodeChecksum:2fcf711173127e3422c59c96b21d639e)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contribute/DAO/Premium.php b/www/modules/civicrm/CRM/Contribute/DAO/Premium.php
index 543c803b6..57ecf2221 100644
--- a/www/modules/civicrm/CRM/Contribute/DAO/Premium.php
+++ b/www/modules/civicrm/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:7b586940572f3109ff5917254103dd4e)
+ * (GenCodeChecksum:4624fdb600c07353a4b769547d0ee99f)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contribute/DAO/PremiumsProduct.php b/www/modules/civicrm/CRM/Contribute/DAO/PremiumsProduct.php
index 59bc02a59..557619b94 100644
--- a/www/modules/civicrm/CRM/Contribute/DAO/PremiumsProduct.php
+++ b/www/modules/civicrm/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:6e4ab04c238e7960a2134aeda0df31f0)
+ * (GenCodeChecksum:e0fd905bafc0c4946615101587f696a8)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contribute/DAO/Product.php b/www/modules/civicrm/CRM/Contribute/DAO/Product.php
index ea23b12cb..368b77c51 100644
--- a/www/modules/civicrm/CRM/Contribute/DAO/Product.php
+++ b/www/modules/civicrm/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:f21f30ca57294d554e0b4446ef4d20c4)
+ * (GenCodeChecksum:25d230f83535ed383bf72377471e6d98)
  */
 
 /**
@@ -167,8 +167,7 @@ class CRM_Contribute_DAO_Product extends CRM_Core_DAO {
   public $is_active;
 
   /**
-   * Rolling means we set start/end based on current day, fixed means we set start/end for current year or month
-   * (e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006)
+   * Rolling means we set start/end based on current day, fixed means we set start/end for current year or month (e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006)
    *
    * @var string|null
    *   (SQL type: varchar(8))
@@ -344,6 +343,7 @@ public static function &fields() {
           'entity' => 'Product',
           'bao' => 'CRM_Contribute_BAO_Product',
           'localizable' => 1,
+          'serialize' => self::SERIALIZE_COMMA,
           'add' => '1.4',
         ],
         'image' => [
@@ -541,8 +541,7 @@ public static function &fields() {
           'name' => 'period_type',
           'type' => CRM_Utils_Type::T_STRING,
           'title' => ts('Period Type'),
-          'description' => ts('Rolling means we set start/end based on current day, fixed means we set start/end for current year or month
-      (e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006) '),
+          'description' => ts('Rolling means we set start/end based on current day, fixed means we set start/end for current year or month (e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006)'),
           'maxlength' => 8,
           'size' => CRM_Utils_Type::EIGHT,
           'usage' => [
diff --git a/www/modules/civicrm/CRM/Contribute/DAO/Widget.php b/www/modules/civicrm/CRM/Contribute/DAO/Widget.php
index f762f597b..7ccacac5e 100644
--- a/www/modules/civicrm/CRM/Contribute/DAO/Widget.php
+++ b/www/modules/civicrm/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:14b5198c0eb470500fe1c33d2a6526e4)
+ * (GenCodeChecksum:4d25bbc05ba61b22a8226f5173af4f90)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Contribute/Form/AbstractEditPayment.php b/www/modules/civicrm/CRM/Contribute/Form/AbstractEditPayment.php
index abe92ba10..045483de2 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/AbstractEditPayment.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/AbstractEditPayment.php
@@ -170,13 +170,15 @@ class CRM_Contribute_Form_AbstractEditPayment extends CRM_Contact_Form_Task {
   protected $contributionID;
 
   /**
-   * Get the contribution id that has been created or is being edited.
+   * Get the contribution ID.
    *
-   * @internal - not supported for outside core.
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
    *
    * @return int|null
    */
-  protected function getContributionID(): ?int {
+  public function getContributionID(): ?int {
     return $this->contributionID;
   }
 
@@ -254,6 +256,10 @@ public function __get($name) {
       CRM_Core_Error::deprecatedWarning('attempt to access undefined property _params - use externally supported function getSubmittedValues()');
       return $this->getSubmittedValues();
     }
+    if ($name === '_lineItem') {
+      CRM_Core_Error::deprecatedWarning('attempt to access undefined property _params - use externally supported function getSubmittedValues()');
+      return [0 => $this->getLineItems()];
+    }
     CRM_Core_Error::deprecatedWarning('attempt to access invalid property :' . $name);
   }
 
@@ -351,22 +357,6 @@ public function buildValuesAndAssignOnline_Note_Type($id, &$values) {
     }
   }
 
-  /**
-   * @param string $type
-   *   Eg 'Contribution'.
-   * @param string $subType
-   * @param int $entityId
-   */
-  public function applyCustomData($type, $subType, $entityId) {
-    $this->set('type', $type);
-    $this->set('subType', $subType);
-    $this->set('entityId', $entityId);
-
-    CRM_Custom_Form_CustomData::preProcess($this, NULL, $subType, 1, $type, $entityId);
-    CRM_Custom_Form_CustomData::buildQuickForm($this);
-    CRM_Custom_Form_CustomData::setDefaultValues($this);
-  }
-
   /**
    * @return array
    *   Array of valid processors. The array resembles the DB table but also has 'object' as a key
@@ -424,7 +414,7 @@ public function assignProcessors() {
 
     // this required to show billing block
     // @todo remove this assignment the billing block is now designed to be always included but will not show fieldsets unless those sets of fields are assigned
-    $this->assign_by_ref('paymentProcessor', $this->_paymentProcessor);
+    $this->assign('paymentProcessor', $this->_paymentProcessor);
   }
 
   /**
@@ -666,21 +656,12 @@ protected function addPaymentProcessorSelect($isRequired, $isBuildRecurBlock = F
 
   /**
    * Assign the values to build the payment info block.
-   *
-   * @return string
-   *   Block title.
    */
   protected function assignPaymentInfoBlock() {
     $paymentInfo = CRM_Contribute_BAO_Contribution::getPaymentInfo($this->_id, $this->_component, TRUE);
-    $title = ts('View Payment');
-    if (!empty($this->_component) && $this->_component == 'event') {
-      $info = CRM_Event_BAO_Participant::participantDetails($this->_id);
-      $title .= " - {$info['title']}";
-    }
     $this->assign('transaction', TRUE);
     $this->assign('payments', $paymentInfo['transaction'] ?? NULL);
     $this->assign('paymentLinks', $paymentInfo['payment_links']);
-    return $title;
   }
 
   protected function assignContactEmailDetails(): void {
diff --git a/www/modules/civicrm/CRM/Contribute/Form/AdditionalInfo.php b/www/modules/civicrm/CRM/Contribute/Form/AdditionalInfo.php
index 6e418805d..bcd70b3ab 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/AdditionalInfo.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/AdditionalInfo.php
@@ -40,11 +40,9 @@ public static function buildPremium($form) {
     while ($dao->fetch()) {
       $sel1[$dao->id] = $dao->name . " ( " . $dao->sku . " )";
       $min_amount[$dao->id] = $dao->min_contribution;
-      $options = explode(',', $dao->options);
-      foreach ($options as $k => $v) {
-        $options[$k] = trim($v);
-      }
-      if ($options[0] != '') {
+      $options = CRM_Contribute_BAO_Premium::parseProductOptions($dao->options);
+      if (!empty($options)) {
+        $options = ['' => ts('- select -')] + $options;
         $sel2[$dao->id] = $options;
       }
       $form->assign('premiums', TRUE);
@@ -189,7 +187,7 @@ public static function processPremium($params, $contributionID, $premiumID = NUL
     CRM_Contribute_BAO_Product::retrieve($premiumParams, $productDetails);
     $dao->financial_type_id = $productDetails['financial_type_id'] ?? NULL;
     if (!empty($options[$selectedProductID])) {
-      $dao->product_option = $options[$selectedProductID][$selectedProductOptionID];
+      $dao->product_option = $selectedProductOptionID;
     }
 
     // This IF condition codeblock does the following:
@@ -239,6 +237,8 @@ public static function processPremium($params, $contributionID, $premiumID = NUL
    * @param int $contactID
    * @param int $contributionID
    * @param int $contributionNoteID
+   *
+   * @throws \CRM_Core_Exception
    */
   public static function processNote($params, $contactID, $contributionID, $contributionNoteID = NULL) {
     if (CRM_Utils_System::isNull($params['note']) && $contributionNoteID) {
@@ -322,7 +322,7 @@ public static function emailReceipt(&$form, &$params, $ccContribution = FALSE) {
     if (!empty($params['payment_instrument_id'])) {
       $paymentInstrument = CRM_Contribute_PseudoConstant::paymentInstrument();
       $params['paidBy'] = $paymentInstrument[$params['payment_instrument_id']];
-      if ($params['paidBy'] != 'Check' && isset($params['check_number'])) {
+      if ($params['paidBy'] !== 'Check' && isset($params['check_number'])) {
         unset($params['check_number']);
       }
     }
@@ -421,7 +421,7 @@ public static function emailReceipt(&$form, &$params, $ccContribution = FALSE) {
       $form->assign('customGroup', $customGroup);
     }
 
-    $form->assign_by_ref('formValues', $params);
+    $form->assign('formValues', $params);
     list($contributorDisplayName,
       $contributorEmail
       ) = CRM_Contact_BAO_Contact_Location::getEmailDetails($params['contact_id']);
diff --git a/www/modules/civicrm/CRM/Contribute/Form/AdditionalPayment.php b/www/modules/civicrm/CRM/Contribute/Form/AdditionalPayment.php
index a846482e8..0fb4fc03b 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/AdditionalPayment.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/AdditionalPayment.php
@@ -24,6 +24,7 @@
 class CRM_Contribute_Form_AdditionalPayment extends CRM_Contribute_Form_AbstractEditPayment {
   use CRM_Contact_Form_ContactFormTrait;
   use CRM_Contribute_Form_ContributeFormTrait;
+  use CRM_Event_Form_EventFormTrait;
 
   /**
    * Id of the component entity
@@ -83,9 +84,17 @@ public function preProcess() {
     $this->assign('component', $this->_component);
     $this->assign('id', $this->_id);
     $this->assign('suppressPaymentFormButtons', $this->isBeingCalledFromSelectorContext());
-
-    if ($this->_view === 'transaction' && ($this->_action & CRM_Core_Action::BROWSE)) {
-      $title = $this->assignPaymentInfoBlock();
+    $isShowPayments = $this->isViewMode();
+    $this->assign('transaction', $isShowPayments);
+    if ($isShowPayments) {
+      $paymentInfo = CRM_Contribute_BAO_Contribution::getPaymentInfo($this->getContributionID(), 'contribution', TRUE);
+      $this->assign('payments', $paymentInfo['transaction'] ?? NULL);
+      $this->assign('paymentLinks', $paymentInfo['payment_links']);
+      $title = ts('View Payment');
+      if (!empty($this->_component) && $this->_component === 'event') {
+        $info = CRM_Event_BAO_Participant::participantDetails($this->_id);
+        $title .= " - {$info['title']}";
+      }
       $this->setTitle($title);
       return;
     }
@@ -139,8 +148,8 @@ protected function isBeingCalledFromSelectorContext() {
    * @return array
    * @throws \CRM_Core_Exception
    */
-  public function setDefaultValues() {
-    if ($this->_view === 'transaction' && ($this->_action & CRM_Core_Action::BROWSE)) {
+  public function setDefaultValues(): ?array {
+    if ($this->isViewMode()) {
       return NULL;
     }
     $defaults = [];
@@ -215,16 +224,9 @@ public function buildQuickForm() {
     $this->add('textarea', 'receipt_text', ts('Confirmation Message'));
 
     $this->addField('trxn_date', ['entity' => 'FinancialTrxn', 'label' => $this->isARefund() ? ts('Refund Date') : ts('Contribution Date'), 'context' => 'Contribution'], FALSE, FALSE);
+    $this->assign('eventName', $this->getEventValue('title'));
 
-    if ($this->_contactId && $this->_id) {
-      if ($this->_component === 'event') {
-        $eventId = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Participant', $this->_id, 'event_id', 'id');
-        $event = CRM_Event_BAO_Event::getEvents(0, $eventId);
-        $this->assign('eventName', $event[$eventId]);
-      }
-    }
-
-    $this->assign('displayName', $this->_contributorDisplayName);
+    $this->assign('displayName', $this->getContactValue('display_name'));
     $this->assign('component', $this->_component);
     $this->assign('email', $this->_contributorEmail);
 
@@ -295,13 +297,9 @@ public static function formRule($fields, $files, $self) {
   public function postProcess() {
     $submittedValues = $this->controller->exportValues($this->_name);
     $this->submit($submittedValues);
-    $childTab = 'contribute';
-    if ($this->_component === 'event') {
-      $childTab = 'participant';
-    }
     $session = CRM_Core_Session::singleton();
     $session->replaceUserContext(CRM_Utils_System::url('civicrm/contact/view',
-      "reset=1&cid={$this->_contactId}&selectedChild={$childTab}"
+      "reset=1&cid={$this->_contactId}&selectedChild=" . $this->getParticipantID() ? 'participant' : 'contribute'
     ));
   }
 
@@ -319,7 +317,6 @@ public function submit($submittedValues) {
         ($this->_mode === 'test')
       );
     }
-    $this->assign('displayName', $this->getContactValue('display_name'));
 
     $paymentResult = [];
     if ($this->_mode) {
@@ -335,10 +332,10 @@ public function submit($submittedValues) {
       'contribution_id' => $this->getContributionID(),
       'payment_processor_id' => $this->getPaymentProcessorID(),
       'card_type_id' => CRM_Core_PseudoConstant::getKey('CRM_Core_BAO_FinancialTrxn', 'card_type_id', $this->getSubmittedValue('credit_card_type')),
-      'pan_truncation' => substr((string) $this->getSubmittedValue('credit_card_number'), -4),
+      'pan_truncation' => $this->getSubmittedValue('pan_truncation') ?: substr((string) $this->getSubmittedValue('credit_card_number'), -4),
       'trxn_result_code' => $paymentResult['trxn_result_code'] ?? NULL,
       'payment_instrument_id' => $this->getSubmittedValue('payment_instrument_id'),
-      'trxn_id' => $paymentResult['trxn_id'] ?? NULL,
+      'trxn_id' => $paymentResult['trxn_id'] ?? ($this->getSubmittedValue('trxn_id') ?? NULL),
       'trxn_date' => $this->getSubmittedValue('trxn_date'),
       // This form sends payment notification only, for historical reasons.
       'is_send_contribution_notification' => FALSE,
@@ -381,7 +378,6 @@ public function processCreditCard(): ?array {
     // we need to retrieve email address
     if ($this->_context === 'standalone' && $this->getSubmittedValue('is_email_receipt')) {
       [$displayName] = CRM_Contact_BAO_Contact_Location::getEmailDetails($this->_contactId);
-      $this->assign('displayName', $displayName);
     }
 
     // at this point we've created a contact and stored its address etc
@@ -539,6 +535,23 @@ public function getContactID(): int {
     return (int) $this->_contactID;
   }
 
+  /**
+   * Get the relevant participant ID, if any, in use.
+   *
+   * @return int
+   *
+   * @api supported for external use.
+   *
+   * @noinspection PhpDocMissingThrowsInspection
+   * @noinspection PhpUnhandledExceptionInspection
+   */
+  public function getParticipantID(): ?int {
+    if (CRM_Utils_Request::retrieve('component', 'String', $this, FALSE, 'contribution') !== 'event') {
+      return NULL;
+    }
+    return (int) CRM_Utils_Request::retrieve('id', 'Positive', $this, TRUE);
+  }
+
   /**
    * Get the payment processor ID.
    *
@@ -548,4 +561,12 @@ public function getPaymentProcessorID(): int {
     return (int) ($this->getSubmittedValue('payment_processor_id') ?: $this->_paymentProcessor['id']);
   }
 
+  /**
+   * @return bool
+   */
+  public function isViewMode(): bool {
+    $isShowPayments = $this->_view === 'transaction' && ($this->_action & CRM_Core_Action::BROWSE);
+    return $isShowPayments;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Contribute/Form/CancelSubscription.php b/www/modules/civicrm/CRM/Contribute/Form/CancelSubscription.php
index 450132d24..4653532fb 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/CancelSubscription.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/CancelSubscription.php
@@ -66,20 +66,13 @@ public function preProcess() {
       'selfService' => $this->isSelfService(),
     ];
 
-    if ($this->_crid) {
-      // Are we cancelling a recurring contribution that is linked to an auto-renew membership?
-      if ($this->getSubscriptionDetails()->membership_id) {
-        $this->_mid = $this->getSubscriptionDetails()->membership_id;
-      }
-    }
-
-    if ($this->_mid) {
+    if ($this->getMembershipID()) {
       $this->_mode = 'auto_renew';
       // CRM-18468: crid is more accurate than mid for getting
       // subscriptionDetails, so don't get them again.
 
       $membershipTypes = CRM_Member_PseudoConstant::membershipType();
-      $membershipTypeId = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_Membership', $this->_mid, 'membership_type_id');
+      $membershipTypeId = $this->getMembershipValue('membership_type_id');
       $membershipType = $membershipTypes[$membershipTypeId] ?? '';
       $this->assign('membershipType', $membershipType);
       $cancelRecurTextParams['membershipType'] = $membershipType;
@@ -92,10 +85,7 @@ public function preProcess() {
       $this->_paymentProcessorObj = CRM_Financial_BAO_PaymentProcessor::getProcessorForEntity($this->_coid, 'contribute', 'obj');
     }
 
-    if (
-      (!$this->_crid && !$this->_coid && !$this->_mid) ||
-      (!$this->getSubscriptionDetails())
-    ) {
+    if (!$this->getSubscriptionDetails()) {
       CRM_Core_Error::statusBounce(ts('Required information missing.'));
     }
 
@@ -104,7 +94,7 @@ public function preProcess() {
     // handle context redirection
     CRM_Contribute_BAO_ContributionRecur::setSubscriptionContext();
 
-    $this->setTitle($this->_mid ? ts('Cancel Auto-renewal') : ts('Cancel Recurring Contribution'));
+    $this->setTitle($this->getMembershipID() ? ts('Cancel Auto-renewal') : ts('Cancel Recurring Contribution'));
     $this->assign('mode', $this->_mode);
 
     if ($this->isSelfService() || !$this->_paymentProcessorObj->supports('cancelRecurring')) {
@@ -160,7 +150,7 @@ public function buildQuickForm() {
     if (!empty($this->_donorEmail)) {
       $this->add('checkbox', 'is_notify', ts('Notify Contributor?') . " ({$this->_donorEmail})");
     }
-    if ($this->_mid) {
+    if ($this->getMembershipID()) {
       $cancelButton = ts('Cancel Automatic Membership Renewal');
     }
     else {
@@ -234,16 +224,16 @@ public function postProcess() {
     try {
       civicrm_api3('ContributionRecur', 'cancel', [
         'id' => $this->getSubscriptionDetails()->recur_id,
-        'membership_id' => $this->_mid,
+        'membership_id' => $this->getMembershipID(),
         'processor_message' => $message,
         'cancel_reason' => $this->getSubmittedValue('cancel_reason'),
       ]);
 
       $tplParams = [];
-      if ($this->_mid) {
-        $inputParams = ['id' => $this->_mid];
+      if ($this->getMembershipID()) {
+        $inputParams = ['id' => $this->getMembershipID()];
         CRM_Member_BAO_Membership::getValues($inputParams, $tplParams);
-        $tplParams = $tplParams[$this->_mid];
+        $tplParams = $tplParams[$this->getMembershipID()];
         $tplParams['membership_status']
           = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipStatus', $tplParams['status_id']);
         $tplParams['membershipType']
diff --git a/www/modules/civicrm/CRM/Contribute/Form/ContributeFormTrait.php b/www/modules/civicrm/CRM/Contribute/Form/ContributeFormTrait.php
index 56ff4b2ef..e7e574756 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/ContributeFormTrait.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/ContributeFormTrait.php
@@ -115,7 +115,7 @@ public function getContributionRecurValue(string $fieldName) {
   }
 
   /**
-   * Get the selected Contribution ID.
+   * Get the selected Contribution Recur ID.
    *
    * @api This function will not change in a minor release and is supported for
    * use outside of core. This annotation / external support for properties
@@ -124,7 +124,7 @@ public function getContributionRecurValue(string $fieldName) {
    * @noinspection PhpUnhandledExceptionInspection
    */
   public function getContributionRecurID(): ?int {
-    throw new CRM_Core_Exception('`getContributionID` must be implemented');
+    throw new CRM_Core_Exception('`getContributionRecurID` must be implemented');
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Contribute/Form/Contribution.php b/www/modules/civicrm/CRM/Contribute/Form/Contribution.php
index 2815e7933..1062fc3a1 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/Contribution.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/Contribution.php
@@ -20,6 +20,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
   use CRM_Contact_Form_ContactFormTrait;
   use CRM_Contribute_Form_ContributeFormTrait;
   use CRM_Financial_Form_PaymentProcessorFormTrait;
+  use CRM_Custom_Form_CustomDataTrait;
 
   /**
    * The id of the contribution that we are processing.
@@ -159,6 +160,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
 
   /**
    * Price set as an array
+   *
    * @var array
    */
   public $_priceSet;
@@ -213,6 +215,8 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
    */
   private $_payNow;
 
+  private $order;
+
   /**
    * Explicitly declare the form context.
    */
@@ -302,9 +306,15 @@ public function preProcess(): void {
     }
     $this->assign('is_template', $this->_values['is_template']);
 
-    // when custom data is included in this page
-    if (!empty($_POST['hidden_custom'])) {
-      $this->applyCustomData('Contribution', $this->getFinancialTypeID(), $this->_id);
+    if ($this->isSubmitted()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('Contribution', array_filter([
+        'id' => $this->getContributionID(),
+        'financial_type_id' => $this->getFinancialTypeID(),
+      ]));
     }
 
     $this->_lineItems = [];
@@ -490,9 +500,13 @@ public function setDefaultValues() {
     if (empty($defaults['payment_instrument_id'])) {
       $defaults['payment_instrument_id'] = $this->getDefaultPaymentInstrumentId();
     }
-    $this->assign('is_test', !empty($defaults['is_test']));
 
+    $this->assign('is_test', !empty($defaults['is_test']));
+    $this->assign('email', $this->getContactValue('email_primary.email'));
+    $this->assign('is_pay_later', !empty($defaults['is_pay_later']));
+    $this->assign('contribution_status_id', $defaults['contribution_status_id'] ?? NULL);
     $this->assign('showOption', TRUE);
+
     // For Premium section.
     if ($this->_premiumID) {
       $this->assign('showOption', FALSE);
@@ -500,9 +514,8 @@ public function setDefaultValues() {
       if (!$options) {
         $this->assign('showOption', TRUE);
       }
-      $options_key = CRM_Utils_Array::key($this->_productDAO->product_option, $options);
-      if ($options_key) {
-        $defaults['product_name'] = [$this->_productDAO->product_id, trim($options_key)];
+      if ($this->_productDAO->product_option) {
+        $defaults['product_name'] = [$this->_productDAO->product_id, $this->_productDAO->product_option];
       }
       else {
         $defaults['product_name'] = [$this->_productDAO->product_id];
@@ -512,9 +525,6 @@ public function setDefaultValues() {
       }
     }
 
-    $this->assign('is_pay_later', !empty($defaults['is_pay_later']));
-
-    $this->assign('contribution_status_id', CRM_Utils_Array::value('contribution_status_id', $defaults));
     if (!empty($defaults['contribution_status_id']) && in_array(
         CRM_Contribute_PseudoConstant::contributionStatus($defaults['contribution_status_id'], 'name'),
         // Historically not 'Cancelled' hence not using CRM_Contribute_BAO_Contribution::isContributionStatusNegative.
@@ -542,8 +552,8 @@ public function setDefaultValues() {
     $this->assign('currency', $currency);
     // Hack to get currency info to the js layer. CRM-11440.
     CRM_Utils_Money::format(1);
-    $this->assign('currencySymbol', CRM_Utils_Array::value($currency, CRM_Utils_Money::$_currencySymbols));
-    $this->assign('totalAmount', CRM_Utils_Array::value('total_amount', $defaults));
+    $this->assign('currencySymbol', CRM_Utils_Money::$_currencySymbols[$currency] ?? NULL);
+    $this->assign('totalAmount', $defaults['total_amount'] ?? NULL);
 
     // Inherit campaign from pledge.
     if ($this->_ppID && !empty($this->_pledgeValues['campaign_id'])) {
@@ -687,8 +697,7 @@ public function buildQuickForm() {
 
     $this->applyFilter('__ALL__', 'trim');
 
-    //need to assign custom data type and subtype to the template
-    $this->assign('customDataType', 'Contribution');
+    //need to assign custom data subtype to the template for initial custom data load
     $this->assign('customDataSubType', $this->getFinancialTypeID());
     $this->assign('entityID', $this->getContributionID());
     $this->assign('email', $this->getContactValue('email_primary.email'));
@@ -924,32 +933,45 @@ public function buildQuickForm() {
   }
 
   /**
-   * Build the price set form.
+   * @throws \CRM_Core_Exception
    */
-  private function buildPriceSet(): void {
-    $priceSetId = $this->getPriceSetID();
-    $form = $this;
-    $component = 'contribution';
-    $priceSet = CRM_Price_BAO_PriceSet::getSetDetail($priceSetId, TRUE, FALSE);
-    $form->_priceSet = $priceSet[$priceSetId] ?? NULL;
-    $validPriceFieldIds = array_keys($form->_priceSet['fields']);
-
-    $form->_priceSet['id'] ??= $priceSetId;
-    $form->assign('priceSet', $form->_priceSet);
+  protected function getOrder(): CRM_Financial_BAO_Order {
+    if (!$this->order) {
+      $this->initializeOrder();
+    }
+    return $this->order;
+  }
 
-    $feeBlock = &$form->_priceSet['fields'];
+  /**
+   * @throws \CRM_Core_Exception
+   */
+  protected function initializeOrder(): void {
+    $this->order = new CRM_Financial_BAO_Order();
+    $this->order->setPriceSetID($this->getPriceSetID());
+    $this->order->setForm($this);
+    $this->order->setPriceSelectionFromUnfilteredInput($this->getSubmittedValues());
+  }
 
-    // Call the buildAmount hook.
-    CRM_Utils_Hook::buildAmount($component ?? 'contribution', $form, $feeBlock);
+  /**
+   * Get the form context.
+   *
+   * This is important for passing to the buildAmount hook as CiviDiscount checks it.
+   *
+   * @return string
+   */
+  public function getFormContext(): string {
+    return 'contribution';
+  }
 
-    $hideAdminValues = !CRM_Core_Permission::check('edit contributions');
-    // CRM-14492 Admin price fields should show up on event registration if user has 'administer CiviCRM' permissions
-    $adminFieldVisible = CRM_Core_Permission::check('administer CiviCRM');
-    $checklifetime = FALSE;
-    foreach ($feeBlock as $id => $field) {
+  /**
+   * Build the price set form.
+   */
+  private function buildPriceSet(): void {
+    $form = $this;
+    $this->_priceSet = $this->getOrder()->getPriceSetMetadata();
+    foreach ($this->getPriceFieldMetaData() as $id => $field) {
       $options = $field['options'] ?? NULL;
-
-      if (!is_array($options) || !in_array($id, $validPriceFieldIds)) {
+      if (!is_array($options)) {
         continue;
       }
 
@@ -964,6 +986,29 @@ private function buildPriceSet(): void {
         );
       }
     }
+    $form->assign('priceSet', $form->_priceSet);
+  }
+
+  /**
+   * Get price field metadata.
+   *
+   * The returned value is an array of arrays where each array
+   * is an id-keyed price field and an 'options' key has been added to that
+   * array for any options.
+   *
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
+   *
+   * @return array
+   */
+  public function getPriceFieldMetaData(): array {
+    if (!empty($this->_priceSet['fields'])) {
+      return $this->_priceSet['fields'];
+    }
+
+    $this->_priceSet['fields'] = $this->getOrder()->getPriceFieldsMetadata();
+    return $this->_priceSet['fields'];
   }
 
   /**
@@ -1194,7 +1239,7 @@ protected function processCreditCard($submittedValues, $lineItem, $contactID) {
     // so we copy stuff over to first_name etc.
     $paymentParams = $this->_params;
     $paymentParams['contactID'] = $contactID;
-    CRM_Core_Payment_Form::mapParams($this->_bltID, $this->_params, $paymentParams, TRUE);
+    CRM_Core_Payment_Form::mapParams(NULL, $this->_params, $paymentParams, TRUE);
 
     $financialType = new CRM_Financial_DAO_FinancialType();
     $financialType->id = $params['financial_type_id'];
@@ -1239,7 +1284,7 @@ protected function processCreditCard($submittedValues, $lineItem, $contactID) {
       'is_test' => $isTest,
       'campaign_id' => $this->_params['campaign_id'] ?? NULL,
       'contribution_page_id' => $this->_params['contribution_page_id'] ?? NULL,
-      'source' => CRM_Utils_Array::value('source', $paymentParams, CRM_Utils_Array::value('description', $paymentParams)),
+      'source' => $paymentParams['source'] ?? $paymentParams['description'] ?? NULL,
       'thankyou_date' => $this->_params['thankyou_date'] ?? NULL,
     ];
     $contributionParams['payment_instrument_id'] = $this->_paymentProcessor['payment_instrument_id'];
@@ -1973,20 +2018,23 @@ protected function submit($submittedValues, $action, $pledgePaymentID) {
         $params[$f] = $formValues[$f] ?? NULL;
       }
       if ($this->_id && $action & CRM_Core_Action::UPDATE) {
+        // @todo - should we remove all this - if it's going from Pending to Completed then
+        // add payment handles that - what statuses CAN be changed here?
+        // Also - the changing of is_pay_later to 0 here has been debated at times
+        // as it could be argued it still showed the intent.
         // Can only be updated to contribution which is handled via Payment.create
         $params['contribution_status_id'] = $this->getSubmittedValue('contribution_status_id');
-
-        // Set is_pay_later flag for back-office offline Pending status contributions CRM-8996
-        // else if contribution_status is changed to Completed is_pay_later flag is changed to 0, CRM-15041
-        if ($params['contribution_status_id'] == CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Pending')) {
-          $params['is_pay_later'] = 1;
-        }
-        elseif ($params['contribution_status_id'] == CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed')) {
+        if ($params['contribution_status_id'] == CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed')) {
           // @todo - if the contribution is new then it should be Pending status & then we use
           // Payment.create to update to Completed.
+          // If contribution_status is changed to Completed is_pay_later flag is changed to 0, CRM-15041
           $params['is_pay_later'] = 0;
         }
       }
+      // Set is_pay_later flag for new back-office offline Pending status contributions CRM-8996
+      if (!$this->getContributionID() && $params['contribution_status_id'] == CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Pending')) {
+        $params['is_pay_later'] = 1;
+      }
 
       $params['revenue_recognition_date'] = NULL;
       if (!empty($formValues['revenue_recognition_date'])) {
@@ -2016,7 +2064,7 @@ protected function submit($submittedValues, $action, $pledgePaymentID) {
       }
       $params['line_item'] = $lineItem;
       $params['payment_processor_id'] = $params['payment_processor'] = $this->_paymentProcessor['id'] ?? NULL;
-      $params['tax_amount'] = CRM_Utils_Array::value('tax_amount', $submittedValues, CRM_Utils_Array::value('tax_amount', $this->_values));
+      $params['tax_amount'] = $submittedValues['tax_amount'] ?? $this->_values['tax_amount'] ?? NULL;
       //create contribution.
       if ($isQuickConfig) {
         $params['is_quick_config'] = 1;
@@ -2144,7 +2192,7 @@ protected function invoicingPostProcessHook($submittedValues, $action, $lineItem
         $this->assign('getTaxDetails', $getTaxDetails);
       }
       else {
-        $this->assign('totalTaxAmount', CRM_Utils_Array::value('tax_amount', $submittedValues));
+        $this->assign('totalTaxAmount', $submittedValues['tax_amount'] ?? NULL);
       }
     }
   }
diff --git a/www/modules/civicrm/CRM/Contribute/Form/Contribution/Confirm.php b/www/modules/civicrm/CRM/Contribute/Form/Contribution/Confirm.php
index 1f60ac83b..bf123d2a4 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/Contribution/Confirm.php
@@ -287,7 +287,7 @@ public function preProcess() {
 
       // We may have fetched some billing details from the getPreApprovalDetails function so we
       // want to ensure we set this after that function has been called.
-      CRM_Core_Payment_Form::mapParams($this->_bltID, $preApprovalParams, $this->_params, FALSE);
+      CRM_Core_Payment_Form::mapParams(NULL, $preApprovalParams, $this->_params, FALSE);
     }
 
     $this->_params['is_pay_later'] = $this->get('is_pay_later');
@@ -970,8 +970,6 @@ protected function postProcessPremium($premiumParams, $contribution) {
    *   - thankyou_date (not all forms will set this)
    *
    * @param CRM_Financial_DAO_FinancialType $financialType
-   * @param int $billingLocationID
-   *   ID of billing location type.
    * @param bool $isRecur
    *   Is this recurring?
    *
@@ -987,7 +985,6 @@ protected function processFormContribution(
     $result,
     $contributionParams,
     $financialType,
-    $billingLocationID,
     $isRecur
   ) {
     $form = $this;
@@ -1556,7 +1553,7 @@ protected function postProcessMembership(
       $paymentParams = array_merge($this->_params, ['contributionID' => $this->_values['contribution_other_id']]);
 
       // CRM-19792 : set necessary fields for payment processor
-      CRM_Core_Payment_Form::mapParams($this->_bltID, $paymentParams, $paymentParams, TRUE);
+      CRM_Core_Payment_Form::mapParams(NULL, $paymentParams, $paymentParams, TRUE);
 
       // If this is a single membership-related contribution, it won't have
       // be performed yet, so do it now.
@@ -1713,14 +1710,13 @@ private function processSecondaryFinancialTransaction($contactID, $tempParams, $
     }
 
     // CRM-19792 : set necessary fields for payment processor
-    CRM_Core_Payment_Form::mapParams($this->_bltID, $this->_params, $tempParams, TRUE);
+    CRM_Core_Payment_Form::mapParams(NULL, $this->_params, $tempParams, TRUE);
 
     $membershipContribution = $this->processFormContribution(
       $tempParams,
       $tempParams,
       $contributionParams,
       $financialType,
-      $this->_bltID,
       $isRecur
     );
 
@@ -2327,7 +2323,7 @@ protected function doMembershipProcessing($contactID, $membershipParams, $premiu
       $membershipParams['campaign_id'] = $this->_values['campaign_id'] ?? NULL;
     }
 
-    $this->_params = CRM_Core_Payment_Form::mapParams($this->_bltID, $this->_params, $membershipParams, TRUE);
+    $this->_params = CRM_Core_Payment_Form::mapParams(NULL, $this->_params, $membershipParams, TRUE);
 
     // This could be set by a hook.
     if (!empty($this->_params['installments'])) {
@@ -2384,7 +2380,7 @@ protected function doMembershipProcessing($contactID, $membershipParams, $premiu
       }
       catch (CRM_Core_Exception $e) {
         CRM_Core_Session::singleton()->setStatus($e->getMessage());
-        CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/contribute/transact', "_qf_Main_display=true&qfKey={$this->_params['qfKey']}"));
+        CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/contribute/transact', "_qf_Main_display=true&qfKey=" . ($this->_params['qfKey'] ?? '')));
       }
       if (!$this->_amount > 0.0 || !$membershipParams['amount']) {
         // we need to explicitly create a CMS user in case of free memberships
@@ -2441,12 +2437,12 @@ protected function completeTransaction($result, $contributionID) {
    *
    * @param string $message
    */
-  protected function bounceOnError($message) {
+  protected function bounceOnError($message): void {
     CRM_Core_Session::singleton()
-      ->setStatus(ts("Payment Processor Error message :") .
+      ->setStatus(ts('Payment Processor Error message :') .
         $message);
     CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/contribute/transact',
-      "_qf_Main_display=true&qfKey={$this->_params['qfKey']}"
+      '_qf_Main_display=true&qfKey=' . ($this->_params['qfKey'] ?? NULL)
     ));
   }
 
@@ -2489,7 +2485,7 @@ public function processConfirm(
     $isRecur
   ): array {
     $form = $this;
-    CRM_Core_Payment_Form::mapParams($this->_bltID, $form->_params, $paymentParams, TRUE);
+    CRM_Core_Payment_Form::mapParams(NULL, $form->_params, $paymentParams, TRUE);
     $isPaymentTransaction = self::isPaymentTransaction($this);
 
     $financialType = new CRM_Financial_DAO_FinancialType();
@@ -2526,13 +2522,13 @@ public function processConfirm(
         'id' => $paymentParams['contribution_id'] ?? NULL,
         'contact_id' => $contactID,
         'is_test' => $isTest,
-        'source' => CRM_Utils_Array::value('source', $paymentParams, CRM_Utils_Array::value('description', $paymentParams)),
+        'source' => $paymentParams['source'] ?? $paymentParams['description'] ?? NULL,
       ];
 
       // CRM-21200: Don't overwrite contribution details during 'Pay now' payment
       if (empty($form->_params['contribution_id'])) {
         $contributionParams['contribution_page_id'] = $form->_id;
-        $contributionParams['campaign_id'] = CRM_Utils_Array::value('campaign_id', $paymentParams, CRM_Utils_Array::value('campaign_id', $form->_values));
+        $contributionParams['campaign_id'] = $paymentParams['campaign_id'] ?? $form->_values['campaign_id'] ?? NULL;
       }
       // In case of 'Pay now' payment, append the contribution source with new text 'Paid later via page ID: N.'
       else {
@@ -2559,7 +2555,6 @@ public function processConfirm(
         NULL,
         $contributionParams,
         $financialType,
-        $form->_bltID,
         $isRecur
       );
       // CRM-13074 - create the CMSUser after the transaction is completed as it
@@ -2929,7 +2924,7 @@ protected function getLineItemsForMembershipCreate(int $membershipTypeID, int $d
       if (empty($lineItem['membership_type_id']) && $this->isSeparateMembershipPayment()) {
         continue;
       }
-      $lineItemSplit[$lineItem['membership_type_id'] ?: $defaultMembershipTypeID][$lineItem['price_field_id']] = $lineItem;
+      $lineItemSplit[$lineItem['membership_type_id'] ?: $defaultMembershipTypeID]['price_field_value_' . $lineItem['price_field_value_id']] = $lineItem;
     }
     return $lineItemSplit[$membershipTypeID];
   }
diff --git a/www/modules/civicrm/CRM/Contribute/Form/Contribution/Main.php b/www/modules/civicrm/CRM/Contribute/Form/Contribution/Main.php
index bbdb41256..de67551a2 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/Contribution/Main.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/Contribution/Main.php
@@ -125,8 +125,8 @@ public function preProcess() {
     // Make the contributionPageID available to the template
     $this->assign('contributionPageID', $this->_id);
     $this->assign('ccid', $this->_ccid);
-    $this->assign('isShare', CRM_Utils_Array::value('is_share', $this->_values));
-    $this->assign('isConfirmEnabled', CRM_Utils_Array::value('is_confirm_enabled', $this->_values));
+    $this->assign('isShare', $this->_values['is_share'] ?? NULL);
+    $this->assign('isConfirmEnabled', $this->_values['is_confirm_enabled'] ?? NULL);
 
     // Required for currency formatting in the JS layer
     // this is a temporary fix intended to resolve a regression quickly
@@ -243,13 +243,14 @@ public function setDefaultValues() {
     $memtypeID = NULL;
     if ($this->_priceSetId) {
       if ($this->getFormContext() === 'membership') {
+        $existingMembershipTypeID = $this->getRenewableMembershipValue('membership_type_id');
         $selectedCurrentMemTypes = [];
         foreach ($this->_priceSet['fields'] as $key => $val) {
-          foreach ($val['options'] as $keys => $values) {
-            $opMemTypeId = $values['membership_type_id'] ?? NULL;
-            $priceFieldName = 'price_' . $values['price_field_id'];
+          foreach ($val['options'] as $keys => $priceFieldOption) {
+            $opMemTypeId = $priceFieldOption['membership_type_id'] ?? NULL;
+            $priceFieldName = 'price_' . $priceFieldOption['price_field_id'];
             $priceFieldValue = CRM_Price_BAO_PriceSet::getPriceFieldValueFromURL($this, $priceFieldName);
-            if (!empty($priceFieldValue) && !$this->isDefined('RenewableMembership')) {
+            if (!empty($priceFieldValue)) {
               CRM_Price_BAO_PriceSet::setDefaultPriceSetField($priceFieldName, $priceFieldValue, $val['html_type'], $this->_defaults);
               // break here to prevent overwriting of default due to 'is_default'
               // option configuration or setting of current membership or
@@ -257,23 +258,20 @@ public function setDefaultValues() {
               // The value sent via URL get's higher priority.
               break;
             }
-            if ($opMemTypeId &&
-              // @todo - maybe use the defined renewable membership to avoid lifetime memberships.
-              !empty($this->getExistingMembership($opMemTypeId)) &&
-              !in_array($opMemTypeId, $selectedCurrentMemTypes)
+            if ($existingMembershipTypeID && $existingMembershipTypeID === $priceFieldOption['membership_type_id']
+              && !in_array($opMemTypeId, $selectedCurrentMemTypes)
             ) {
               CRM_Price_BAO_PriceSet::setDefaultPriceSetField($priceFieldName, $keys, $val['html_type'], $this->_defaults);
-              $memtypeID = $selectedCurrentMemTypes[] = $values['membership_type_id'];
+              $memtypeID = $selectedCurrentMemTypes[] = $priceFieldOption['membership_type_id'];
             }
-            elseif (!empty($values['is_default']) && !$opMemTypeId && (!isset($this->_defaults[$priceFieldName]) ||
+            elseif (!empty($priceFieldOption['is_default']) && (!isset($this->_defaults[$priceFieldName]) ||
               ($val['html_type'] === 'CheckBox' && !isset($this->_defaults[$priceFieldName][$keys])))) {
               CRM_Price_BAO_PriceSet::setDefaultPriceSetField($priceFieldName, $keys, $val['html_type'], $this->_defaults);
-              $memtypeID = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceFieldValue', $this->_defaults[$priceFieldName], 'membership_type_id');
             }
           }
         }
-        $membershipID = CRM_Utils_Array::value('id', CRM_Member_BAO_Membership::getContactMembership($contactID, $memtypeID, NULL));
-        if ($contactID) {
+
+        if ($contactID && $existingMembershipTypeID) {
           // Set the default values for any membership custom fields on the page via a profile.
           // Note that this will have been done further up if the contact ID was not determined.
           foreach ($this->_fields as $name => $field) {
@@ -283,7 +281,7 @@ public function setDefaultValues() {
               if (!CRM_Core_BAO_CustomGroup::checkCustomField($customFieldID, ['Membership'])
               ) {
                 CRM_Core_BAO_CustomField::setProfileDefaults($customFieldID, $name, $this->_defaults,
-                  $membershipID, CRM_Profile_Form::MODE_REGISTER
+                  $existingMembershipTypeID, CRM_Profile_Form::MODE_REGISTER
                 );
               }
             }
@@ -342,7 +340,7 @@ public function buildQuickForm() {
     }
 
     $this->applyFilter('__ALL__', 'trim');
-    $this->assign('showMainEmail', empty($this->_ccid));
+    $this->assign('showMainEmail', (empty($this->_ccid) && $this->_emailExists === FALSE));
     if (empty($this->_ccid)) {
       if ($this->_emailExists == FALSE) {
         $this->add('text', "email-{$this->_bltID}",
@@ -816,13 +814,16 @@ private function buildRecur(): void {
    *   true if no errors, else array of errors
    */
   public static function formRule($fields, $files, $self) {
+    foreach ($fields as $key => $field) {
+      $fields[$key] = $self->getUnLocalizedSubmittedValue($key, $field);
+    }
     $self->resetOrder($fields);
     $errors = array_filter(['auto_renew' => $self->getAutoRenewError($fields)]);
     // @todo - should just be $this->getOrder()->getTotalAmount()
     $amount = $self->computeAmount($fields, $self->_values);
 
     if ((!empty($fields['selectMembership']) &&
-        $fields['selectMembership'] != 'no_thanks'
+        $fields['selectMembership'] !== 'no_thanks'
       ) ||
       (!empty($fields['priceSetId']) &&
         $self->_useForMember
@@ -864,7 +865,7 @@ public static function formRule($fields, $files, $self) {
             $otherAmount = $priceField->id;
           }
           elseif (!empty($fields["price_{$priceField->id}"])) {
-            $otherAmountVal = CRM_Utils_Rule::cleanMoney($fields["price_{$priceField->id}"]);
+            $otherAmountVal = $fields["price_{$priceField->id}"];
             $min = $self->_values['min_amount'] ?? NULL;
             $max = $self->_values['max_amount'] ?? NULL;
             if ($min && $otherAmountVal < $min) {
@@ -1133,21 +1134,20 @@ public static function formRule($fields, $files, $self) {
    */
   private function computeAmount($params, $formValues) {
     $amount = 0;
-    // First clean up the other amount field if present.
-    if (isset($params['amount_other'])) {
-      $params['amount_other'] = CRM_Utils_Rule::cleanMoney($params['amount_other']);
-    }
 
     if (($params['amount'] ?? NULL) == 'amount_other_radio' || !empty($params['amount_other'])) {
+      // @todo - probably unreachable - field would be (e.) price_12 now....
       $amount = $params['amount_other'];
     }
     elseif (!empty($params['pledge_amount'])) {
       foreach ($params['pledge_amount'] as $paymentId => $dontCare) {
+        // @todo - why would this be a good thing? Is it reachable.
         $amount += CRM_Core_DAO::getFieldValue('CRM_Pledge_DAO_PledgePayment', $paymentId, 'scheduled_amount');
       }
     }
     else {
       if (!empty($formValues['amount'])) {
+        // @todo - probably unreachable.
         $amountID = $params['amount'] ?? NULL;
 
         if ($amountID) {
@@ -1317,8 +1317,7 @@ protected function skipToThankYouPage() {
 
     // build the confirm page
     $confirmForm = &$this->controller->_pages['Confirm'];
-    $confirmForm->preProcess();
-    $confirmForm->buildQuickForm();
+    $confirmForm->buildForm();
 
     // the confirmation page is valid
     $data = &$this->controller->container();
@@ -1667,21 +1666,21 @@ private function buildPledgeBlock() {
       if (!empty($overduePayments)) {
         foreach ($overduePayments as $id => $payment) {
           $label = ts("%1 - due on %2 (overdue)", [
-            1 => CRM_Utils_Money::format(CRM_Utils_Array::value('scheduled_amount', $payment), CRM_Utils_Array::value('scheduled_amount_currency', $payment)),
+            1 => CRM_Utils_Money::format($payment['scheduled_amount'] ?? NULL, $payment['scheduled_amount_currency'] ?? NULL),
             2 => $payment['scheduled_date'] ?? NULL,
           ]);
           $paymentID = $payment['id'] ?? NULL;
-          $payments[] = $this->createElement('checkbox', $paymentID, NULL, $label, ['amount' => CRM_Utils_Array::value('scheduled_amount', $payment)]);
+          $payments[] = $this->createElement('checkbox', $paymentID, NULL, $label, ['amount' => $payment['scheduled_amount'] ?? NULL]);
         }
       }
 
       if (!empty($nextPayment)) {
         $label = ts("%1 - due on %2", [
-          1 => CRM_Utils_Money::format(CRM_Utils_Array::value('scheduled_amount', $nextPayment), CRM_Utils_Array::value('scheduled_amount_currency', $nextPayment)),
+          1 => CRM_Utils_Money::format($nextPayment['scheduled_amount'] ?? NULL, $nextPayment['scheduled_amount_currency'] ?? NULL),
           2 => $nextPayment['scheduled_date'] ?? NULL,
         ]);
         $paymentID = $nextPayment['id'] ?? NULL;
-        $payments[] = $this->createElement('checkbox', $paymentID, NULL, $label, ['amount' => CRM_Utils_Array::value('scheduled_amount', $nextPayment)]);
+        $payments[] = $this->createElement('checkbox', $paymentID, NULL, $label, ['amount' => $nextPayment['scheduled_amount'] ?? NULL]);
       }
       // give error if empty or build form for payment.
       if (empty($payments)) {
@@ -1983,4 +1982,17 @@ protected function resetOrder(array $fields, bool $sanitized = TRUE): void {
     $this->order->recalculateLineItems();
   }
 
+  /**
+   * @param string $value
+   *
+   * @return mixed
+   * @throws \CRM_Core_Exception
+   */
+  public function getRenewableMembershipValue(string $value) {
+    if (!$this->isDefined('RenewableMembership')) {
+      return NULL;
+    }
+    return $this->lookup('RenewableMembership', $value);
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php b/www/modules/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php
index 2a146f154..f499158a9 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/Contribution/ThankYou.php
@@ -44,11 +44,11 @@ public function preProcess(): void {
 
     $this->_params = $this->get('params');
     $this->_useForMember = $this->get('useForMember');
-    $this->assign('thankyou_title', CRM_Utils_Array::value('thankyou_title', $this->_values));
-    $this->assign('thankyou_text', CRM_Utils_Array::value('thankyou_text', $this->_values));
-    $this->assign('thankyou_footer', CRM_Utils_Array::value('thankyou_footer', $this->_values));
-    $this->assign('max_reminders', CRM_Utils_Array::value('max_reminders', $this->_values));
-    $this->assign('initial_reminder_day', CRM_Utils_Array::value('initial_reminder_day', $this->_values));
+    $this->assign('thankyou_title', $this->_values['thankyou_title'] ?? NULL);
+    $this->assign('thankyou_text', $this->_values['thankyou_text'] ?? NULL);
+    $this->assign('thankyou_footer', $this->_values['thankyou_footer'] ?? NULL);
+    $this->assign('max_reminders', $this->_values['max_reminders'] ?? NULL);
+    $this->assign('initial_reminder_day', $this->_values['initial_reminder_day'] ?? NULL);
     $this->assignTotalAmounts();
     // Link (button) for users to create their own Personal Campaign page
     if ($linkText = CRM_PCP_BAO_PCP::getPcpBlockStatus($this->getContributionPageID(), 'contribute')) {
@@ -98,7 +98,7 @@ public function buildQuickForm() {
     $this->_ccid = $this->get('ccid');
     $option = $this->get('option');
     $membershipTypeID = $this->get('membershipTypeID');
-    $this->assign('receiptFromEmail', CRM_Utils_Array::value('receipt_from_email', $this->_values));
+    $this->assign('receiptFromEmail', $this->_values['receipt_from_email'] ?? NULL);
 
     if ($this->getProductID()) {
       $this->buildPremiumsBlock(FALSE, $option);
diff --git a/www/modules/civicrm/CRM/Contribute/Form/ContributionBase.php b/www/modules/civicrm/CRM/Contribute/Form/ContributionBase.php
index fbdda96ec..526140bb2 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/ContributionBase.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/ContributionBase.php
@@ -354,7 +354,7 @@ public function preProcess() {
     // current contribution page id
     $this->getContributionPageID();
     $this->_ccid = CRM_Utils_Request::retrieve('ccid', 'Positive', $this);
-    $this->_emailExists = $this->get('emailExists');
+    $this->_emailExists = $this->get('emailExists') ?? FALSE;
 
     $this->_contactID = $this->_membershipContactID = $this->getContactID();
 
@@ -764,7 +764,7 @@ public function assignEmailField() {
       }
     }
     else {
-      $this->assign('email', CRM_Utils_Array::value("email-{$this->_bltID}", $this->_params));
+      $this->assign('email', $this->_params["email-{$this->_bltID}"] ?? NULL);
     }
   }
 
@@ -925,7 +925,6 @@ protected function buildPremiumsBlock(bool $formItems = FALSE, $selectedOption =
     $this->add('hidden', 'selectProduct', $selectedProductID, ['id' => 'selectProduct']);
     $premiumProducts = PremiumsProduct::get()
       ->addSelect('product_id.*')
-      ->addSelect('product_id')
       ->addSelect('premiums_id.*')
       ->addWhere('product_id.is_active', '=', TRUE)
       ->addWhere('premiums_id.premiums_active', '=', TRUE)
@@ -936,23 +935,14 @@ protected function buildPremiumsBlock(bool $formItems = FALSE, $selectedOption =
     $products = [];
     $premium = [];
     foreach ($premiumProducts as $premiumProduct) {
-      $product = ['options' => NULL];
-      foreach ($premiumProduct as $key => $value) {
-        if (str_starts_with($key, 'product_id.')) {
-          if ($key === 'product_id.options' && $selectedProductID === $product['id'] && $selectedOption) {
-            // In this case we are on the thank you or confirm page so assign
-            // the selected option to the page for display.
-            $product['options'] = ts('Selected Option') . ': ' . $selectedOption;
-          }
-          else {
-            $product[str_replace('product_id.', '', $key)] = $value;
-          }
-        }
-        if (str_starts_with($key, 'premiums_id.')) {
-          $premium[str_replace('premiums_id.', '', $key)] = $value;
-        }
+      $product = CRM_Utils_Array::filterByPrefix($premiumProduct, 'product_id.');
+      $premium = CRM_Utils_Array::filterByPrefix($premiumProduct, 'premiums_id.');
+      if ($selectedProductID === $product['id'] && $selectedOption) {
+        // In this case we are on the thank you or confirm page so assign
+        // the selected option to the page for display.
+        $product['options'] = [ts('Selected Option') . ': ' . $selectedOption];
       }
-      $options = array_filter(explode(',', $product['options']));
+      $options = array_filter((array) $product['options']);
       $productOptions = [];
       foreach ($options as $option) {
         $optionValue = trim($option);
@@ -963,10 +953,10 @@ protected function buildPremiumsBlock(bool $formItems = FALSE, $selectedOption =
       if (!empty($options)) {
         $this->addElement('select', 'options_' . $product['id'], NULL, $productOptions);
       }
-      $products[$premiumProduct['product_id']] = $product;
+      $products[$product['id']] = $product;
     }
     $this->assign('premiumBlock', $premium);
-    $this->assign('products', $products ?? NULL);
+    $this->assign('products', $products);
   }
 
   /**
@@ -1117,7 +1107,7 @@ private function authenticatePledgeUser(): void {
 
     //check for valid pledge status.
     if (!in_array($pledgeValues['status_id'], $validStatus)) {
-      CRM_Core_Error::statusBounce(ts('Oops. You cannot make a payment for this pledge - pledge status is %1.', [1 => CRM_Utils_Array::value($pledgeValues['status_id'], $allStatus)]));
+      CRM_Core_Error::statusBounce(ts('Oops. You cannot make a payment for this pledge - pledge status is %1.', [1 => $allStatus[$pledgeValues['status_id']] ?? '']));
     }
   }
 
diff --git a/www/modules/civicrm/CRM/Contribute/Form/ContributionPage.php b/www/modules/civicrm/CRM/Contribute/Form/ContributionPage.php
index ed25b5a6f..735719f45 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/ContributionPage.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/ContributionPage.php
@@ -347,7 +347,7 @@ public function endPostProcess() {
       }
 
       CRM_Core_Session::setStatus(ts("'%1' information has been saved.",
-        [1 => CRM_Utils_Array::value('title', CRM_Utils_Array::value($subPage, $this->get('tabHeader')), $className)]
+        [1 => $this->get('tabHeader')[$subPage]['title'] ?? $className]
       ), $this->getTitle(), 'success');
 
       $this->postProcessHook();
diff --git a/www/modules/civicrm/CRM/Contribute/Form/ContributionPage/TabHeader.php b/www/modules/civicrm/CRM/Contribute/Form/ContributionPage/TabHeader.php
index 1344cbb44..f567494b8 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/ContributionPage/TabHeader.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/ContributionPage/TabHeader.php
@@ -31,7 +31,7 @@ public static function build(&$form) {
       $tabs = self::process($form);
       $form->set('tabHeader', $tabs);
     }
-    $form->assign_by_ref('tabHeader', $tabs);
+    $form->assign('tabHeader', $tabs);
     CRM_Core_Resources::singleton()
       ->addScriptFile('civicrm', 'templates/CRM/common/TabHeader.js', 1, 'html-header')
       ->addSetting([
diff --git a/www/modules/civicrm/CRM/Contribute/Form/ContributionPage/Widget.php b/www/modules/civicrm/CRM/Contribute/Form/ContributionPage/Widget.php
index 2f60fd96d..fb510995c 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/ContributionPage/Widget.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/ContributionPage/Widget.php
@@ -210,8 +210,8 @@ public function buildQuickForm() {
       );
     }
 
-    $this->assign_by_ref('fields', $this->_fields);
-    $this->assign_by_ref('colorFields', $this->_colorFields);
+    $this->assign('fields', $this->_fields);
+    $this->assign('colorFields', $this->_colorFields);
 
     $this->_refreshButtonName = $this->getButtonName('refresh');
     $this->addElement('xbutton',
diff --git a/www/modules/civicrm/CRM/Contribute/Form/ContributionRecur.php b/www/modules/civicrm/CRM/Contribute/Form/ContributionRecur.php
index d02af5e59..8adf529a5 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/ContributionRecur.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/ContributionRecur.php
@@ -14,6 +14,7 @@
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
+use Civi\Api4\Membership;
 
 /**
  * Shared parent class for recurring contribution forms.
@@ -29,6 +30,8 @@ class CRM_Contribute_Form_ContributionRecur extends CRM_Core_Form {
    * Contribution ID.
    *
    * @var int
+   *
+   * @internal
    */
   protected $_coid = NULL;
 
@@ -37,7 +40,7 @@ class CRM_Contribute_Form_ContributionRecur extends CRM_Core_Form {
    *
    * @var int
    *
-   * @internal
+   * @deprecated
    */
   protected $_crid = NULL;
 
@@ -51,16 +54,16 @@ class CRM_Contribute_Form_ContributionRecur extends CRM_Core_Form {
    *
    * @internal
    */
-  protected $contributionRecurID = NULL;
+  protected int $contributionRecurID;
 
   /**
    * Membership ID.
    *
-   * @var int
+   * @var int|null
    *
    * @internal
    */
-  protected $_mid;
+  protected ?int $_mid;
 
   /**
    * Payment processor object.
@@ -92,14 +95,6 @@ class CRM_Contribute_Form_ContributionRecur extends CRM_Core_Form {
    */
   protected $selfService;
 
-  /**
-   * Used by `CRM_Contribute_Form_UpdateSubscription`
-   *
-   * @var CRM_Core_DAO
-   * @deprecated This is being set temporarily - we should eventually just use the getter fn.
-   */
-  protected $_subscriptionDetails = NULL;
-
   /**
    * Explicitly declare the entity api name.
    */
@@ -162,7 +157,7 @@ protected function setPaymentProcessor() {
    * Set the subscription details on the form.
    */
   protected function setSubscriptionDetails() {
-    $this->subscriptionDetails = $this->_subscriptionDetails = CRM_Contribute_BAO_ContributionRecur::getSubscriptionDetails($this->getContributionRecurID());
+    $this->subscriptionDetails = CRM_Contribute_BAO_ContributionRecur::getSubscriptionDetails($this->getContributionRecurID());
   }
 
   /**
@@ -194,15 +189,17 @@ protected function getSubscriptionContactID() {
    * @return int
    */
   public function getContributionRecurID(): int {
-    $id = CRM_Utils_Request::retrieve('crid', 'Integer', $this, FALSE);
-    if (!$id && $this->getContributionID()) {
-      $id = $this->getContributionValue('contribution_recur_id');
-    }
-    if (!$id) {
-      $id = $this->getMembershipValue('contribution_recur_id');
+    if (!isset($this->contributionRecurID)) {
+      $id = CRM_Utils_Request::retrieve('crid', 'Integer', $this, FALSE);
+      if (!$id && $this->getContributionID()) {
+        $id = $this->getContributionValue('contribution_recur_id');
+      }
+      if (!$id) {
+        $id = $this->getMembershipValue('contribution_recur_id');
+      }
+      $this->contributionRecurID = $this->_crid = $id;
     }
-    $this->contributionRecurID = $this->_crid = $id;
-    return (int) $id;
+    return (int) $this->contributionRecurID;
   }
 
   /**
@@ -222,15 +219,41 @@ public function getContributionID(): ?int {
   /**
    * Get the membership ID.
    *
+   * @return int
+   * @throws \CRM_Core_Exception
+   *
    * @api This function will not change in a minor release and is supported for
    * use outside of core. This annotation / external support for properties
    * is only given where there is specific test cover.
    *
-   * @return int
    */
   protected function getMembershipID(): ?int {
-    $this->_mid = CRM_Utils_Request::retrieve('mid', 'Integer', $this, FALSE);
-    return $this->_mid ? (int) $this->_mid : NULL;
+    if (!CRM_Core_Component::isEnabled('CiviMember')) {
+      return NULL;
+    }
+    $membershipID = CRM_Utils_Request::retrieve('mid', 'Integer', $this);
+    if (!isset($this->contributionRecurID)) {
+      // This is being called before the contribution recur ID is set - return quickly to avoid a loop.
+      return $membershipID ? (int) $membershipID : NULL;
+    }
+    if (!isset($this->_mid)) {
+      $this->_mid = NULL;
+      if (!$this->isDefined('Membership')) {
+        $membership = Membership::get(FALSE)
+          ->addWhere('contribution_recur_id', '=', $this->getContributionRecurID())
+          ->addSelect('*', 'membership_type_id.name')
+          ->execute()->first();
+        if ($membershipID && (!$membership || ($membership['id'] !== $membershipID))) {
+          // this feels unreachable
+          throw new CRM_Core_Exception(ts('invalid membership ID'));
+        }
+        if ($membership) {
+          $this->define('Membership', 'Membership', $membership);
+          $this->_mid = $membership['id'];
+        }
+      }
+    }
+    return $this->_mid;
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Contribute/Form/ContributionView.php b/www/modules/civicrm/CRM/Contribute/Form/ContributionView.php
index 489bea9eb..4754de3b7 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/ContributionView.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/ContributionView.php
@@ -160,8 +160,16 @@ public function preProcess() {
       $productDAO->id = $productID;
       $productDAO->find(TRUE);
 
+      // If the option has a key/val that are not identical, display as "label (key)"
+      // where the "key" is somewhat assumed to be the SKU of the option
+      $options = CRM_Contribute_BAO_Premium::parseProductOptions($productDAO->options);
+      $option_key = $option_label = $dao->product_option;
+      if ($option_key && !empty($options[$option_key]) && $options[$option_key] != $option_key) {
+        $option_label = $options[$option_key] . ' (' . $option_key . ')';
+      }
+
       $this->assign('premium', $productDAO->name);
-      $this->assign('option', $dao->product_option);
+      $this->assign('option', $option_label);
       $this->assign('fulfilled', $dao->fulfilled_date);
     }
 
diff --git a/www/modules/civicrm/CRM/Contribute/Form/Task/Invoice.php b/www/modules/civicrm/CRM/Contribute/Form/Task/Invoice.php
index a11365a26..18b3c58e3 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/Task/Invoice.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/Task/Invoice.php
@@ -134,12 +134,12 @@ public function preProcess() {
   /**
    * Build the form object.
    */
-  public function buildQuickForm() {
+  public function buildQuickForm(): void {
     $this->preventAjaxSubmit();
     $this->assign('isAdmin', CRM_Core_Permission::check('administer CiviCRM'));
 
     $this->add('select', 'from_email_address', ts('From'), $this->_fromEmails, TRUE, ['class' => 'crm-select2 huge']);
-    if ($this->_selectedOutput != 'email') {
+    if ($this->_selectedOutput !== 'email') {
       $this->addElement('radio', 'output', NULL, ts('Email Invoice'), 'email_invoice');
       $this->addElement('radio', 'output', NULL, ts('PDF Invoice'), 'pdf_invoice');
       $this->addRule('output', ts('Selection required'), 'required');
@@ -162,7 +162,7 @@ public function buildQuickForm() {
     $this->addButtons([
       [
         'type' => 'upload',
-        'name' => $this->_selectedOutput == 'email' ? ts('Send Email') : ts('Process Invoice(s)'),
+        'name' => $this->_selectedOutput === 'email' ? ts('Send Email') : ts('Process Invoice(s)'),
         'isDefault' => TRUE,
       ],
       [
@@ -342,13 +342,13 @@ public static function printPDF($contribIDs, &$params, $contactIds) {
         ];
         CRM_Core_DAO::commonRetrieveAll($daoName, 'id', $pageId, $mailDetails, $mailElements);
 
-        $values['title'] = CRM_Utils_Array::value('title', CRM_Utils_Array::value($contribution->contribution_page_id, $mailDetails));
-        $values['receipt_from_name'] = CRM_Utils_Array::value('receipt_from_name', CRM_Utils_Array::value($contribution->contribution_page_id, $mailDetails));
-        $values['receipt_from_email'] = CRM_Utils_Array::value('receipt_from_email', CRM_Utils_Array::value($contribution->contribution_page_id, $mailDetails));
-        $values['cc_receipt'] = CRM_Utils_Array::value('cc_receipt', CRM_Utils_Array::value($contribution->contribution_page_id, $mailDetails));
-        $values['bcc_receipt'] = CRM_Utils_Array::value('bcc_receipt', CRM_Utils_Array::value($contribution->contribution_page_id, $mailDetails));
+        $values['title'] = $mailDetails[$contribution->contribution_page_id]['title'] ?? NULL;
+        $values['receipt_from_name'] = $mailDetails[$contribution->contribution_page_id]['receipt_from_name'] ?? NULL;
+        $values['receipt_from_email'] = $mailDetails[$contribution->contribution_page_id]['receipt_from_email'] ?? NULL;
+        $values['cc_receipt'] = $mailDetails[$contribution->contribution_page_id]['cc_receipt'] ?? NULL;
+        $values['bcc_receipt'] = $mailDetails[$contribution->contribution_page_id]['bcc_receipt'] ?? NULL;
 
-        $title = CRM_Utils_Array::value('title', CRM_Utils_Array::value($contribution->contribution_page_id, $mailDetails));
+        $title = $mailDetails[$contribution->contribution_page_id]['title'] ?? NULL;
       }
       // @todo - use token in template, stop assigning.
       $source = $contribution->source;
@@ -376,7 +376,7 @@ public static function printPDF($contribIDs, &$params, $contactIds) {
         $countryDomain = '';
       }
 
-      $invoiceNotes = Civi::settings()->get('invoice_notes') ?? NULL;
+      $invoiceNotes = Civi::settings()->get('invoice_notes');
 
       // parameters to be assign for template
       $tplParams = [
@@ -443,16 +443,16 @@ public static function printPDF($contribIDs, &$params, $contactIds) {
         'is_pay_later' => $contribution->is_pay_later,
         'organization_name' => Contact::get(FALSE)->addSelect('organization_name')->addWhere('id', '=', (int) $contribution->contact_id)->execute()->first()['organization_name'],
         'domain_organization' => $domain->name,
-        'domain_street_address' => CRM_Utils_Array::value('street_address', CRM_Utils_Array::value('1', $locationDefaults['address'])),
-        'domain_supplemental_address_1' => CRM_Utils_Array::value('supplemental_address_1', CRM_Utils_Array::value('1', $locationDefaults['address'])),
-        'domain_supplemental_address_2' => CRM_Utils_Array::value('supplemental_address_2', CRM_Utils_Array::value('1', $locationDefaults['address'])),
-        'domain_supplemental_address_3' => CRM_Utils_Array::value('supplemental_address_3', CRM_Utils_Array::value('1', $locationDefaults['address'])),
-        'domain_city' => CRM_Utils_Array::value('city', CRM_Utils_Array::value('1', $locationDefaults['address'])),
-        'domain_postal_code' => CRM_Utils_Array::value('postal_code', CRM_Utils_Array::value('1', $locationDefaults['address'])),
+        'domain_street_address' => $locationDefaults['address']['1']['street_address'] ?? NULL,
+        'domain_supplemental_address_1' => $locationDefaults['address']['1']['supplemental_address_1'] ?? NULL,
+        'domain_supplemental_address_2' => $locationDefaults['address']['1']['supplemental_address_2'] ?? NULL,
+        'domain_supplemental_address_3' => $locationDefaults['address']['1']['supplemental_address_3'] ?? NULL,
+        'domain_city' => $locationDefaults['address']['1']['city'] ?? NULL,
+        'domain_postal_code' => $locationDefaults['address']['1']['postal_code'] ?? NULL,
         'domain_state' => $stateProvinceAbbreviationDomain,
         'domain_country' => $countryDomain,
-        'domain_email' => CRM_Utils_Array::value('email', CRM_Utils_Array::value('1', $locationDefaults['email'])),
-        'domain_phone' => CRM_Utils_Array::value('phone', CRM_Utils_Array::value('1', $locationDefaults['phone'])),
+        'domain_email' => $locationDefaults['email']['1']['email'] ?? NULL,
+        'domain_phone' => $locationDefaults['phone']['1']['phone'] ?? NULL,
       ];
 
       if (isset($creditNoteId)) {
diff --git a/www/modules/civicrm/CRM/Contribute/Form/Task/PDF.php b/www/modules/civicrm/CRM/Contribute/Form/Task/PDF.php
index b48c98da1..04b263ccd 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/Task/PDF.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/Task/PDF.php
@@ -61,7 +61,8 @@ public function preProcess() {
         'title' => ts('Search Results'),
       ],
     ];
-    CRM_Contact_Form_Task_EmailCommon ::preProcessFromAddress($this, FALSE);
+    $this->_contactIds = $this->_contactIds ?: [CRM_Core_Session::getLoggedInContactID()];
+    $this->preProcessFromAddress();
     // we have all the contribution ids, so now we get the contact ids
     parent::setContactIDs();
     CRM_Utils_System::appendBreadCrumb($breadCrumb);
@@ -70,6 +71,29 @@ public function preProcess() {
     $this->preventAjaxSubmit();
   }
 
+  /**
+   * Pre Process Form Addresses to be used in Quickform
+   *
+   * @throws \CRM_Core_Exception
+   */
+  private function preProcessFromAddress() {
+    $fromEmailValues = CRM_Core_BAO_Email::getFromEmail();
+
+    if (empty($fromEmailValues)) {
+      CRM_Core_Error::statusBounce(ts('Your user record does not have a valid email address and no from addresses have been configured.'));
+    }
+
+    $defaults = [];
+    if (is_numeric(key($fromEmailValues))) {
+      $emailID = (int) key($fromEmailValues);
+      $defaults = CRM_Core_BAO_Email::getEmailSignatureDefaults($emailID);
+    }
+    if (!Civi::settings()->get('allow_mail_from_logged_in_contact')) {
+      $defaults['from_email_address'] = CRM_Core_BAO_Domain::getFromEmail();
+    }
+    $this->setDefaults($defaults);
+  }
+
   /**
    * Build the form object.
    */
diff --git a/www/modules/civicrm/CRM/Contribute/Form/Task/Status.php b/www/modules/civicrm/CRM/Contribute/Form/Task/Status.php
index 6a71ef6bf..d45a37a43 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/Task/Status.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/Task/Status.php
@@ -127,7 +127,7 @@ public function buildQuickForm() {
       $this->_rows[] = $row;
     }
 
-    $this->assign_by_ref('rows', $this->_rows);
+    $this->assign('rows', $this->_rows);
     $this->setDefaults($defaults);
     $this->addButtons([
       [
diff --git a/www/modules/civicrm/CRM/Contribute/Form/UpdateBilling.php b/www/modules/civicrm/CRM/Contribute/Form/UpdateBilling.php
index 176fda771..849df1c4d 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/UpdateBilling.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/UpdateBilling.php
@@ -40,20 +40,20 @@ public function preProcess() {
       $this->_paymentProcessor['object'] = CRM_Financial_BAO_PaymentProcessor::getProcessorForEntity($this->_coid, 'contribute', 'obj');
     }
 
-    if ($this->_mid) {
-      $this->_paymentProcessor = CRM_Financial_BAO_PaymentProcessor::getProcessorForEntity($this->_mid, 'membership', 'info');
-      $this->_paymentProcessor['object'] = CRM_Financial_BAO_PaymentProcessor::getProcessorForEntity($this->_mid, 'membership', 'obj');
+    if ($this->getMembershipID()) {
+      $this->_paymentProcessor = CRM_Financial_BAO_PaymentProcessor::getProcessorForEntity($this->getMembershipID(), 'membership', 'info');
+      $this->_paymentProcessor['object'] = CRM_Financial_BAO_PaymentProcessor::getProcessorForEntity($this->getMembershipID(), 'membership', 'obj');
       $membershipTypes = CRM_Member_PseudoConstant::membershipType();
-      $membershipTypeId = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_Membership', $this->_mid, 'membership_type_id');
-      $this->assign('membershipType', CRM_Utils_Array::value($membershipTypeId, $membershipTypes));
+      $membershipTypeId = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_Membership', $this->getMembershipID(), 'membership_type_id');
+      $this->assign('membershipType', $membershipTypes[$membershipTypeId] ?? NULL);
       $this->_mode = 'auto_renew';
     }
 
-    if ((!$this->_crid && !$this->_coid && !$this->_mid) || (!$this->getSubscriptionDetails())) {
+    if ((!$this->_crid && !$this->_coid && !$this->getMembershipID()) || (!$this->getSubscriptionDetails())) {
       throw new CRM_Core_Exception('Required information missing.');
     }
 
-    if (!$this->_paymentProcessor['object']->supports('updateSubscriptionBillingInfo')) {
+    if (!$this->getPaymentProcessorObject()->supports('updateSubscriptionBillingInfo')) {
       throw new CRM_Core_Exception(ts("%1 processor doesn't support updating subscription billing details.",
         [1 => $this->_paymentProcessor['title']]
       ));
@@ -201,7 +201,7 @@ public function postProcess() {
     $processorParams['amount'] = $this->getSubscriptionDetails()->amount;
     $processorParams['contributionRecurID'] = $this->getContributionRecurID();
     $message = '';
-    $updateSubscription = $this->_paymentProcessor['object']->updateSubscriptionBillingInfo($message, $processorParams);
+    $updateSubscription = $this->getPaymentProcessorObject()->updateSubscriptionBillingInfo($message, $processorParams);
     if (is_a($updateSubscription, 'CRM_Core_Error')) {
       CRM_Core_Error::displaySessionError($updateSubscription);
     }
diff --git a/www/modules/civicrm/CRM/Contribute/Form/UpdateSubscription.php b/www/modules/civicrm/CRM/Contribute/Form/UpdateSubscription.php
index e68c61818..488d4a392 100644
--- a/www/modules/civicrm/CRM/Contribute/Form/UpdateSubscription.php
+++ b/www/modules/civicrm/CRM/Contribute/Form/UpdateSubscription.php
@@ -24,11 +24,10 @@
  * made here could potentially affect the API etc. Be careful, be aware, use unit tests.
  */
 class CRM_Contribute_Form_UpdateSubscription extends CRM_Contribute_Form_ContributionRecur {
+  use CRM_Custom_Form_CustomDataTrait;
 
   public $_paymentProcessor = NULL;
 
-  public $_paymentProcessorObj = NULL;
-
   /**
    * Fields that affect the schedule and are defined as editable by the processor.
    *
@@ -60,41 +59,21 @@ public function preProcess() {
     parent::preProcess();
     $this->setAction(CRM_Core_Action::UPDATE);
 
-    if ($this->_coid) {
-      $this->_paymentProcessor = CRM_Financial_BAO_PaymentProcessor::getProcessorForEntity($this->_coid, 'contribute', 'info');
-      // @todo test & replace with $this->_paymentProcessorObj =  Civi\Payment\System::singleton()->getById($this->_paymentProcessor['id']);
-      $this->_paymentProcessorObj = CRM_Financial_BAO_PaymentProcessor::getProcessorForEntity($this->_coid, 'contribute', 'obj');
-      $this->contributionRecurID = $this->_subscriptionDetails->recur_id;
-    }
-    elseif ($this->contributionRecurID) {
-      $this->_coid = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_Contribution', $this->contributionRecurID, 'id', 'contribution_recur_id');
-    }
-
-    if (!$this->contributionRecurID || !$this->_subscriptionDetails) {
+    if (!$this->getSubscriptionDetails()) {
       CRM_Core_Error::statusBounce(ts('Required information missing.'));
     }
 
-    if ($this->_subscriptionDetails->membership_id && $this->_subscriptionDetails->auto_renew) {
-      // Add Membership details to form
-      $membership = civicrm_api3('Membership', 'get', [
-        'contribution_recur_id' => $this->contributionRecurID,
-      ]);
-      if (!empty($membership['count'])) {
-        $membershipDetails = reset($membership['values']);
-        $values['membership_id'] = $membershipDetails['id'];
-        $values['membership_name'] = $membershipDetails['membership_name'];
-      }
-      $this->assign('recurMembership', $values);
-      $this->assign('contactId', $this->_subscriptionDetails->contact_id);
-    }
+    $this->assign('contactId', $this->getSubscriptionContactID());
+    $this->assign('membershipID', $this->getMembershipID());
+    $this->assign('membershipName', $this->getMembershipValue('membership_type_id.name'));
 
     $this->assign('self_service', $this->isSelfService());
-    $this->assign('recur_frequency_interval', $this->_subscriptionDetails->frequency_interval);
-    $this->assign('recur_frequency_unit', $this->_subscriptionDetails->frequency_unit);
+    $this->assign('recur_frequency_interval', $this->getContributionRecurValue('frequency_interval'));
+    $this->assign('recur_frequency_unit', $this->getContributionRecurValue('frequency_unit'));
 
-    $this->editableScheduleFields = $this->_paymentProcessorObj->getEditableRecurringScheduleFields();
+    $this->editableScheduleFields = $this->getPaymentProcessorObject()->getEditableRecurringScheduleFields();
 
-    $changeHelpText = $this->_paymentProcessorObj->getRecurringScheduleUpdateHelpText();
+    $changeHelpText = $this->getPaymentProcessorObject()->getRecurringScheduleUpdateHelpText();
     if (!in_array('amount', $this->editableScheduleFields)) {
       // Not sure if this is good behaviour - maintaining this existing behaviour for now.
       CRM_Core_Session::setStatus($changeHelpText, ts('Warning'), 'alert');
@@ -109,17 +88,20 @@ public function preProcess() {
       }
     }
 
-    // when custom data is included in this page
-    if (!empty($_POST['hidden_custom']) && !$this->isSelfService()) {
-      CRM_Custom_Form_CustomData::preProcess($this, NULL, NULL, 1, 'ContributionRecur', $this->contributionRecurID);
-      CRM_Custom_Form_CustomData::buildQuickForm($this);
-      CRM_Custom_Form_CustomData::setDefaultValues($this);
+    if ($this->isSubmitted() && !$this->isSelfService()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('ContributionRecur', array_filter([
+        'id' => $this->getContributionRecurID(),
+      ]));
     }
 
     $this->assign('editableScheduleFields', array_diff($this->editableScheduleFields, $alreadyHardCodedFields));
 
-    if ($this->_subscriptionDetails->contact_id) {
-      $contactDetails = CRM_Contact_BAO_Contact::getContactDetails($this->_subscriptionDetails->contact_id);
+    if ($this->getSubscriptionContactID()) {
+      $contactDetails = CRM_Contact_BAO_Contact::getContactDetails($this->getSubscriptionContactID());
       $this->_donorEmail = $contactDetails[1];
     }
 
@@ -136,12 +118,12 @@ public function preProcess() {
    */
   public function setDefaultValues() {
     $this->_defaults = [];
-    $this->_defaults['amount'] = $this->_subscriptionDetails->amount;
-    $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['amount'] = $this->getSubscriptionDetails()->amount;
+    $this->_defaults['installments'] = $this->getSubscriptionDetails()->installments;
+    $this->_defaults['campaign_id'] = $this->getSubscriptionDetails()->campaign_id;
+    $this->_defaults['financial_type_id'] = $this->getSubscriptionDetails()->financial_type_id;
     foreach ($this->editableScheduleFields as $field) {
-      $this->_defaults[$field] = $this->_subscriptionDetails->$field ?? NULL;
+      $this->_defaults[$field] = $this->getSubscriptionDetails()->$field ?? NULL;
     }
 
     return $this->_defaults;
@@ -153,12 +135,12 @@ public function setDefaultValues() {
   public function buildQuickForm() {
     // CRM-16398: If current recurring contribution got > 1 lineitems then make amount field readonly
     $amtAttr = ['size' => 20];
-    $lineItems = CRM_Price_BAO_LineItem::getLineItemsByContributionID($this->_coid);
+    $lineItems = CRM_Price_BAO_LineItem::getLineItemsByContributionID($this->getContributionID());
     if (count($lineItems) > 1) {
       $amtAttr += ['readonly' => TRUE];
     }
     $amountField = $this->addMoney('amount', ts('Recurring Contribution Amount'), TRUE, $amtAttr,
-      TRUE, 'currency', $this->_subscriptionDetails->currency, TRUE
+      TRUE, 'currency', $this->getSubscriptionDetails()->currency, TRUE
     );
 
     // https://lab.civicrm.org/dev/financial/-/issues/197 https://github.com/civicrm/civicrm-core/pull/23796
@@ -180,16 +162,14 @@ public function buildQuickForm() {
     }
 
     if (CRM_Core_Permission::check('edit contributions')) {
-      CRM_Campaign_BAO_Campaign::addCampaign($this, $this->_subscriptionDetails->campaign_id);
+      CRM_Campaign_BAO_Campaign::addCampaign($this, $this->getSubscriptionDetails()->campaign_id);
     }
 
-    if (CRM_Contribute_BAO_ContributionRecur::supportsFinancialTypeChange($this->contributionRecurID)) {
+    if (CRM_Contribute_BAO_ContributionRecur::supportsFinancialTypeChange($this->getContributionRecurID())) {
       $this->addEntityRef('financial_type_id', ts('Financial Type'), ['entity' => 'FinancialType'], !$this->isSelfService());
     }
 
-    // Add custom data
-    $this->assign('customDataType', 'ContributionRecur');
-    $this->assign('entityID', $this->contributionRecurID);
+    $this->assign('contributionRecurID', $this->getContributionRecurID());
 
     $type = 'next';
     if ($this->isSelfService()) {
@@ -226,14 +206,14 @@ public function postProcess() {
 
     // if this is an update of an existing recurring contribution, pass the ID
     $params['contributionRecurID'] = $params['id'] = $this->getContributionRecurID();
-    $message = '';
+    $activityDetails = '';
 
     $params['recurProcessorID'] = $params['subscriptionId'] = $this->getSubscriptionDetails()->processor_id;
 
     $updateSubscription = TRUE;
-    if ($this->_paymentProcessorObj->supports('changeSubscriptionAmount')) {
+    if ($this->getPaymentProcessorObject()->supports('changeSubscriptionAmount')) {
       try {
-        $updateSubscription = $this->_paymentProcessorObj->changeSubscriptionAmount($message, $params);
+        $updateSubscription = $this->getPaymentProcessorObject()->changeSubscriptionAmount($activityDetails, $params);
         if ($updateSubscription instanceof CRM_Core_Error) {
           CRM_Core_Error::deprecatedWarning('An exception should be thrown');
           throw new PaymentProcessorException(ts('Could not update the Recurring contribution details'));
@@ -245,49 +225,30 @@ public function postProcess() {
     }
     if ($updateSubscription) {
       // Handle custom data
-      $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params, $this->contributionRecurID, 'ContributionRecur');
+      $params['custom'] = CRM_Core_BAO_CustomField::postProcess($this->getSubmittedValues(), $this->getContributionRecurID(), 'ContributionRecur');
       // save the changes
       CRM_Contribute_BAO_ContributionRecur::add($params);
       $status = ts('Recurring contribution has been updated to: %1, every %2 %3(s) for %4 installments.',
         [
-          1 => CRM_Utils_Money::format($params['amount'], $this->_subscriptionDetails->currency),
-          2 => $this->_subscriptionDetails->frequency_interval,
-          3 => $this->_subscriptionDetails->frequency_unit,
+          1 => CRM_Utils_Money::format($params['amount'], $this->getSubscriptionDetails()->currency),
+          2 => $this->getSubscriptionDetails()->frequency_interval,
+          3 => $this->getSubscriptionDetails()->frequency_unit,
           4 => $params['installments'],
         ]
       );
 
       $msgTitle = ts('Update Success');
       $msgType = 'success';
-      $msg = ts('Recurring Contribution Updated');
-      $contactID = $this->_subscriptionDetails->contact_id;
-
-      if ($this->_subscriptionDetails->amount != $params['amount']) {
-        $message .= "<br /> " . ts("Recurring contribution amount has been updated from %1 to %2 for this subscription.",
-            [
-              1 => CRM_Utils_Money::format($this->_subscriptionDetails->amount, $this->_subscriptionDetails->currency),
-              2 => CRM_Utils_Money::format($params['amount'], $this->_subscriptionDetails->currency),
-            ]) . ' ';
-        if ($this->_subscriptionDetails->amount < $params['amount']) {
-          $msg = ts('Recurring Contribution Updated - increased installment amount');
-        }
-        else {
-          $msg = ts('Recurring Contribution Updated - decreased installment amount');
-        }
-      }
+      $activitySubject = ts('Recurring Contribution Updated');
+      $contactID = $this->getSubscriptionContactID();
 
-      if ($this->_subscriptionDetails->installments != $params['installments']) {
-        $message .= "<br /> " . ts("Recurring contribution installments have been updated from %1 to %2 for this subscription.", [
-          1 => $this->_subscriptionDetails->installments,
-          2 => $params['installments'],
-        ]) . ' ';
-      }
+      $this->updateActivitySubjectAndDetails($params, $activitySubject, $activityDetails);
 
       $activityParams = [
         'source_contact_id' => $contactID,
         'activity_type_id' => CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Update Recurring Contribution'),
-        'subject' => $msg,
-        'details' => $message,
+        'subject' => $activitySubject,
+        'details' => $activityDetails,
         'activity_date_time' => date('YmdHis'),
         'status_id' => CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_status_id', 'Completed'),
       ];
@@ -311,7 +272,7 @@ public function postProcess() {
           'workflow' => 'contribution_recurring_edit',
           'contactId' => $contactID,
           'tplParams' => ['receipt_from_email' => $receiptFrom],
-          'isTest' => $this->_subscriptionDetails->is_test,
+          'isTest' => $this->getSubscriptionDetails()->is_test,
           'PDFFilename' => 'receipt.pdf',
           'from' => $receiptFrom,
           'toName' => $donorDisplayName,
@@ -337,4 +298,44 @@ public function postProcess() {
     }
   }
 
+  private function updateActivitySubjectAndDetails(array $params, string &$activitySubject, string &$activityDetails): void {
+    if ($this->getSubscriptionDetails()->amount != $params['amount']) {
+      $activityDetails .= "<br /> " . ts("Recurring contribution amount has been updated from %1 to %2 for this subscription.",
+          [
+            1 => CRM_Utils_Money::format($this->getSubscriptionDetails()->amount, $this->getSubscriptionDetails()->currency),
+            2 => CRM_Utils_Money::format($params['amount'], $this->getSubscriptionDetails()->currency),
+          ]) . ' ';
+      if ($this->getSubscriptionDetails()->amount < $params['amount']) {
+        $activitySubject = ts('Recurring Contribution Updated - increased installment amount');
+      }
+      else {
+        $activitySubject = ts('Recurring Contribution Updated - decreased installment amount');
+      }
+    }
+
+    if ($this->getSubscriptionDetails()->installments != $params['installments']) {
+      $activityDetails .= "<br /> " . ts("Recurring contribution installments have been updated from %1 to %2 for this subscription.", [
+        1 => $this->getSubscriptionDetails()->installments,
+        2 => $params['installments'],
+      ]) . ' ';
+    }
+
+    if (!empty($params['cycle_day']) && $this->getSubscriptionDetails()->cycle_day != $params['cycle_day']) {
+      $activityDetails .= "<br /> " . ts("Cycle day has been updated from %1 to %2 for this subscription.", [
+        1 => $this->getSubscriptionDetails()->cycle_day,
+        2 => $params['cycle_day'],
+      ]) . ' ';
+    }
+
+    if (
+      !empty($params['next_sched_contribution_date']) &&
+      $this->getSubscriptionDetails()->next_sched_contribution_date != $params['next_sched_contribution_date']
+    ) {
+      $activityDetails .= "<br /> " . ts("Next scheduled contribution date has been updated from %1 to %2 for this subscription.", [
+        1 => $this->getSubscriptionDetails()->next_sched_contribution_date,
+        2 => $params['next_sched_contribution_date'],
+      ]) . ' ';
+    }
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Contribute/Import/Controller.php b/www/modules/civicrm/CRM/Contribute/Import/Controller.php
deleted file mode 100644
index 8ec9f32d1..000000000
--- a/www/modules/civicrm/CRM/Contribute/Import/Controller.php
+++ /dev/null
@@ -1,41 +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
- */
-class CRM_Contribute_Import_Controller extends CRM_Core_Controller {
-
-  /**
-   * Class constructor.
-   *
-   * @param string $title
-   * @param bool|int $action
-   * @param bool $modal
-   */
-  public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $modal = TRUE) {
-    parent::__construct($title, $modal);
-
-    set_time_limit(0);
-
-    $this->_stateMachine = new CRM_Import_StateMachine($this, $action);
-
-    // create and instantiate the pages
-    $this->addPages($this->_stateMachine, $action);
-
-    // add all the actions
-    $config = CRM_Core_Config::singleton();
-    $this->addActions($config->uploadDir, ['uploadFile']);
-  }
-
-}
diff --git a/www/modules/civicrm/CRM/Contribute/Import/Parser/Contribution.php b/www/modules/civicrm/CRM/Contribute/Import/Parser/Contribution.php
index f5bb954fc..cba6f73f7 100644
--- a/www/modules/civicrm/CRM/Contribute/Import/Parser/Contribution.php
+++ b/www/modules/civicrm/CRM/Contribute/Import/Parser/Contribution.php
@@ -26,13 +26,6 @@
  */
 class CRM_Contribute_Import_Parser_Contribution extends CRM_Import_Parser {
 
-  /**
-   * Array of successfully imported contribution id's
-   *
-   * @var array
-   */
-  protected $_newContributions;
-
   protected $baseEntity = 'Contribution';
 
   /**
@@ -63,18 +56,6 @@ public static function getUserJobInfo(): array {
    */
   const SOFT_CREDIT = 512, SOFT_CREDIT_ERROR = 1024, PLEDGE_PAYMENT = 2048, PLEDGE_PAYMENT_ERROR = 4096;
 
-  /**
-   * Separator being used
-   * @var string
-   */
-  protected $_separator;
-
-  /**
-   * Array of pledge payment error lines, bounded by MAX_ERROR
-   * @var array
-   */
-  protected $_pledgePaymentErrors;
-
   /**
    * Get the field mappings for the import.
    *
@@ -452,7 +433,7 @@ public function import(array $values): void {
         }
       }
 
-      $this->deprecatedFormatParams($contributionParams, $contributionParams);
+      $this->deprecatedFormatParams($contributionParams);
 
       // From this point on we are changing stuff - the prior rows were doing lookups and exiting
       // if the lookups failed.
@@ -583,14 +564,10 @@ private function processPledgePayments(int $contributionID, array $formatted): b
    * convert it into the same format that we use in QF and BAO object
    *
    * @param array $params
-   *   Associative array of property name/value
-   *   pairs to insert in new contact.
-   * @param array $values
-   *   The reformatted properties that we can use internally.
    *
    * @throws \CRM_Core_Exception
    */
-  private function deprecatedFormatParams($params, &$values): void {
+  private function deprecatedFormatParams(&$params): void {
     // copy all the contribution fields as is
     if (empty($params['pledge_id'])) {
       return;
@@ -622,14 +599,13 @@ private function deprecatedFormatParams($params, &$values): void {
       if (CRM_Core_DAO::getFieldValue('CRM_Pledge_DAO_Pledge', $params['pledge_id'], 'contact_id') != $contributionContactID) {
         throw new CRM_Core_Exception('Invalid Pledge ID provided. Contribution row was skipped.', CRM_Import_Parser::ERROR);
       }
-      $values['pledge_id'] = $params['pledge_id'];
     }
 
     // we need to check if oldest payment amount equal to contribution amount
-    $pledgePaymentDetails = CRM_Pledge_BAO_PledgePayment::getOldestPledgePayment($values['pledge_id']);
+    $pledgePaymentDetails = CRM_Pledge_BAO_PledgePayment::getOldestPledgePayment($params['pledge_id']);
 
     if ($pledgePaymentDetails['amount'] == $totalAmount) {
-      $values['pledge_payment_id'] = $pledgePaymentDetails['id'];
+      $params['pledge_payment_id'] = $pledgePaymentDetails['id'];
     }
     else {
       throw new CRM_Core_Exception('Contribution and Pledge Payment amount mismatch for this record. Contribution row was skipped.', CRM_Import_Parser::ERROR);
diff --git a/www/modules/civicrm/CRM/Contribute/Info.php b/www/modules/civicrm/CRM/Contribute/Info.php
index 43a70a08c..8002daa32 100644
--- a/www/modules/civicrm/CRM/Contribute/Info.php
+++ b/www/modules/civicrm/CRM/Contribute/Info.php
@@ -51,45 +51,25 @@ public function getInfo() {
 
   /**
    * @inheritDoc
-   * Provides permissions that are used by component.
-   * Needs to be implemented in component's information
-   * class.
-   *
-   * NOTE: if using conditionally permission return,
-   * implementation of $getAllUnconditionally is required.
-   *
-   * @param bool $getAllUnconditionally
-   * @param bool $descriptions
-   *   Whether to return permission descriptions
-   *
-   * @return array|null
-   *   collection of permissions, null if none
    */
-  public function getPermissions($getAllUnconditionally = FALSE, $descriptions = FALSE) {
+  public function getPermissions(): array {
     $permissions = [
       'access CiviContribute' => [
-        ts('access CiviContribute'),
-        ts('Record backend contributions (with edit contributions) and view all contributions (for visible contacts)'),
+        'label' => ts('access CiviContribute'),
+        'description' => ts('Record backend contributions (with edit contributions) and view all contributions (for visible contacts)'),
       ],
       'edit contributions' => [
-        ts('edit contributions'),
-        ts('Record and update contributions'),
+        'label' => ts('edit contributions'),
+        'description' => ts('Record and update contributions'),
       ],
       'make online contributions' => [
-        ts('make online contributions'),
+        'label' => ts('make online contributions'),
       ],
       'delete in CiviContribute' => [
-        ts('delete in CiviContribute'),
-        ts('Delete contributions'),
+        'label' => ts('delete in CiviContribute'),
+        'description' => ts('Delete contributions'),
       ],
     ];
-
-    if (!$descriptions) {
-      foreach ($permissions as $name => $attr) {
-        $permissions[$name] = array_shift($attr);
-      }
-    }
-
     return $permissions;
   }
 
diff --git a/www/modules/civicrm/CRM/Contribute/Page/ContributionPage.php b/www/modules/civicrm/CRM/Contribute/Page/ContributionPage.php
index 89de37866..f90b1259c 100644
--- a/www/modules/civicrm/CRM/Contribute/Page/ContributionPage.php
+++ b/www/modules/civicrm/CRM/Contribute/Page/ContributionPage.php
@@ -674,7 +674,7 @@ public function pager($whereClause, $whereParams) {
     $params['total'] = CRM_Core_DAO::singleValueQuery($query, $whereParams);
 
     $this->_pager = new CRM_Utils_Pager($params);
-    $this->assign_by_ref('pager', $this->_pager);
+    $this->assign('pager', $this->_pager);
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Contribute/Page/Tab.php b/www/modules/civicrm/CRM/Contribute/Page/Tab.php
index b9ed69a9b..f2f845d72 100644
--- a/www/modules/civicrm/CRM/Contribute/Page/Tab.php
+++ b/www/modules/civicrm/CRM/Contribute/Page/Tab.php
@@ -269,15 +269,12 @@ public function browse() {
   private function addRecurringContributionsBlock() {
     [$activeContributions, $activeContributionsCount] = $this->getActiveRecurringContributions();
     [$inactiveRecurringContributions, $inactiveContributionsCount] = $this->getInactiveRecurringContributions();
-
-    if (!empty($activeContributions) || !empty($inactiveRecurringContributions)) {
-      // assign vars to templates
-      $this->assign('action', $this->_action);
-      $this->assign('activeRecurRows', $activeContributions);
-      $this->assign('contributionRecurCount', $activeContributionsCount + $inactiveContributionsCount);
-      $this->assign('inactiveRecurRows', $inactiveRecurringContributions);
-      $this->assign('recur', TRUE);
-    }
+    // assign vars to templates
+    $this->assign('action', $this->_action);
+    $this->assign('activeRecurRows', $activeContributions);
+    $this->assign('contributionRecurCount', $activeContributionsCount + $inactiveContributionsCount);
+    $this->assign('inactiveRecurRows', $inactiveRecurringContributions);
+    $this->assign('recur', !empty($activeContributions) || !empty($inactiveRecurringContributions));
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Contribute/Page/UserDashboard.php b/www/modules/civicrm/CRM/Contribute/Page/UserDashboard.php
index 5da9f38cc..0f8ff15fd 100644
--- a/www/modules/civicrm/CRM/Contribute/Page/UserDashboard.php
+++ b/www/modules/civicrm/CRM/Contribute/Page/UserDashboard.php
@@ -80,7 +80,7 @@ public function listContribution(): void {
 
       $action = array_sum(array_keys(CRM_Contribute_Page_Tab::dashboardRecurLinks((int) $recur['id'], (int) $recur['contact_id'])));
 
-      $details = CRM_Contribute_BAO_ContributionRecur::getSubscriptionDetails($recur['id'], 'recur');
+      $details = CRM_Contribute_BAO_ContributionRecur::getSubscriptionDetails($recur['id']);
       $hideUpdate = $details->membership_id & $details->auto_renew;
 
       if ($hideUpdate) {
diff --git a/www/modules/civicrm/CRM/Contribute/Selector/Search.php b/www/modules/civicrm/CRM/Contribute/Selector/Search.php
index 180fbbbeb..8f2570a19 100644
--- a/www/modules/civicrm/CRM/Contribute/Selector/Search.php
+++ b/www/modules/civicrm/CRM/Contribute/Selector/Search.php
@@ -373,9 +373,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
       $row['campaign_id'] = $result->contribution_campaign_id;
 
       // add contribution status name
-      $row['contribution_status_name'] = CRM_Utils_Array::value($row['contribution_status_id'],
-        $contributionStatuses
-      );
+      $row['contribution_status_name'] = $contributionStatuses[$row['contribution_status_id']] ?? NULL;
 
       $isPayLater = FALSE;
       if ($result->is_pay_later && ($row['contribution_status_name'] ?? NULL) === 'Pending') {
@@ -440,7 +438,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
         (int) $result->contribution_id
       );
 
-      $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? $result->contact_sub_type : $result->contact_type, FALSE, $result->contact_id
+      $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ?: $result->contact_type, FALSE, $result->contact_id
       );
 
       if (!empty($row['amount_level'])) {
diff --git a/www/modules/civicrm/CRM/Contribute/WorkflowMessage/RecurringEdit/AlexCancelled.php b/www/modules/civicrm/CRM/Contribute/WorkflowMessage/RecurringEdit/AlexCancelled.php
index 846f99b1b..247674879 100644
--- a/www/modules/civicrm/CRM/Contribute/WorkflowMessage/RecurringEdit/AlexCancelled.php
+++ b/www/modules/civicrm/CRM/Contribute/WorkflowMessage/RecurringEdit/AlexCancelled.php
@@ -20,7 +20,7 @@ public function build(array &$example): void {
     $example['asserts'] = [
       'default' => [
         ['for' => 'subject', 'regex' => '/Recurring Contribution Update.*Alex/'],
-        ['for' => 'text', 'regex' => '/Recurring contribution is for €5,990.99, every 2 year.s. for 24 installments/'],
+        ['for' => 'html', 'regex' => '/Recurring contribution is for €5,990.99, every 2 year.s. for 24 installments/'],
       ],
     ];
   }
diff --git a/www/modules/civicrm/CRM/Core/Action.php b/www/modules/civicrm/CRM/Core/Action.php
index 7188b40ed..3bf7891f8 100644
--- a/www/modules/civicrm/CRM/Core/Action.php
+++ b/www/modules/civicrm/CRM/Core/Action.php
@@ -309,7 +309,11 @@ public static function formLink(
     }
 
     if ($op && $objectName && $objectId) {
+      $oldLinks = $seqLinks;
       CRM_Utils_Hook::links($op, $objectName, $objectId, $seqLinks, $mask, $values);
+      if ($oldLinks !== $seqLinks) {
+        Civi::log()->warning('Tabular screens that call hook_civicrm_links are being replaced by SearchKit. See https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_links/#notes', ['civi.tag' => 'deprecated']);
+      }
     }
 
     $url = [];
diff --git a/www/modules/civicrm/CRM/Core/BAO/ActionSchedule.php b/www/modules/civicrm/CRM/Core/BAO/ActionSchedule.php
index d6e876fc1..25234d618 100644
--- a/www/modules/civicrm/CRM/Core/BAO/ActionSchedule.php
+++ b/www/modules/civicrm/CRM/Core/BAO/ActionSchedule.php
@@ -543,7 +543,7 @@ protected static function createMailingActivity($tokenRow, $mapping, $contactID,
     $activityParams = [
       'subject' => $tokenRow->render('subject'),
       'details' => $tokenRow->render('body_html'),
-      'source_contact_id' => $session->get('userID') ? $session->get('userID') : $contactID,
+      'source_contact_id' => $session->get('userID') ?: $contactID,
       'target_contact_id' => $contactID,
       // @todo - not required with api
       'activity_date_time' => CRM_Utils_Time::getTime('YmdHis'),
@@ -615,7 +615,7 @@ protected static function sendReminderSms($tokenRow, $schedule, $toContactID) {
     $sms_body_text = $tokenRow->render('sms_body_text');
 
     $session = CRM_Core_Session::singleton();
-    $userID = $session->get('userID') ? $session->get('userID') : $tokenRow->context['contactId'];
+    $userID = $session->get('userID') ?: $tokenRow->context['contactId'];
     $smsParams = [
       'To' => $toPhoneNumber,
       'provider_id' => $schedule->sms_provider_id,
diff --git a/www/modules/civicrm/CRM/Core/BAO/Address.php b/www/modules/civicrm/CRM/Core/BAO/Address.php
index e9d10dbb1..70d4ce8a6 100644
--- a/www/modules/civicrm/CRM/Core/BAO/Address.php
+++ b/www/modules/civicrm/CRM/Core/BAO/Address.php
@@ -294,6 +294,11 @@ public static function dataExists(&$params) {
 
     $config = CRM_Core_Config::singleton();
     foreach ($params as $name => $value) {
+      if (is_array($value) && str_starts_with($name, 'custom_')) {
+        // This could be a custom field of type file. We want to unset these as they could
+        // give false positives.
+        unset($value['error'], $value['size']);
+      }
       if (in_array($name, [
         'is_primary',
         'location_type_id',
diff --git a/www/modules/civicrm/CRM/Core/BAO/Block.php b/www/modules/civicrm/CRM/Core/BAO/Block.php
index fe5df456d..736910df5 100644
--- a/www/modules/civicrm/CRM/Core/BAO/Block.php
+++ b/www/modules/civicrm/CRM/Core/BAO/Block.php
@@ -236,7 +236,7 @@ public static function create($blockName, $params) {
           $valueId = FALSE;
           if ($blockName == 'phone') {
             $phoneTypeBlockValue = $blockValue['phoneTypeId'] ?? NULL;
-            if ($phoneTypeBlockValue == CRM_Utils_Array::value('phone_type_id', $value)) {
+            if ($phoneTypeBlockValue == ($value['phone_type_id'] ?? NULL)) {
               $valueId = TRUE;
             }
           }
@@ -385,7 +385,7 @@ public static function handlePrimary(&$params, $class) {
        * is_primary to 1
        * @see https://issues.civicrm.org/jira/browse/CRM-10451
        */
-      if ($existingEntities->N == 1 && $existingEntities->id == CRM_Utils_Array::value('id', $params)) {
+      if ($existingEntities->N == 1 && $existingEntities->id == ($params['id'] ?? NULL)) {
         $params['is_primary'] = 1;
         return;
       }
diff --git a/www/modules/civicrm/CRM/Core/BAO/Cache.php b/www/modules/civicrm/CRM/Core/BAO/Cache.php
index 77c530f61..b71cb95c0 100644
--- a/www/modules/civicrm/CRM/Core/BAO/Cache.php
+++ b/www/modules/civicrm/CRM/Core/BAO/Cache.php
@@ -59,6 +59,9 @@ public static function resetCaches() {
    *   Should session state be reset on completion of DB store?.
    */
   public static function storeSessionToCache($names, $resetSession = TRUE) {
+    \Civi::dispatcher()->dispatch('civi.session.storeObjects', \Civi\Core\Event\GenericHookEvent::create([
+      'names' => &$names,
+    ]));
     foreach ($names as $key => $sessionName) {
       if (is_array($sessionName)) {
         $value = NULL;
@@ -102,6 +105,9 @@ public static function storeSessionToCache($names, $resetSession = TRUE) {
    * @param array $names
    */
   public static function restoreSessionFromCache($names) {
+    \Civi::dispatcher()->dispatch('civi.session.restoreObjects', \Civi\Core\Event\GenericHookEvent::create([
+      'names' => &$names,
+    ]));
     foreach ($names as $key => $sessionName) {
       if (is_array($sessionName)) {
         $value = Civi::cache('session')->get("{$sessionName[0]}_{$sessionName[1]}");
diff --git a/www/modules/civicrm/CRM/Core/BAO/Country.php b/www/modules/civicrm/CRM/Core/BAO/Country.php
index 8d53a8bf8..02b21ac1d 100644
--- a/www/modules/civicrm/CRM/Core/BAO/Country.php
+++ b/www/modules/civicrm/CRM/Core/BAO/Country.php
@@ -180,7 +180,7 @@ public static function defaultCurrencySymbol($defaultCurrency = NULL) {
           'labelColumn' => 'symbol',
           'orderColumn' => TRUE,
         ]);
-        $cachedSymbol = CRM_Utils_Array::value($currency, $currencySymbols, '');
+        $cachedSymbol = $currencySymbols[$currency] ?? '';
       }
       else {
         $cachedSymbol = '$';
diff --git a/www/modules/civicrm/CRM/Core/BAO/CustomField.php b/www/modules/civicrm/CRM/Core/BAO/CustomField.php
index 6e81545bf..7f021beb1 100644
--- a/www/modules/civicrm/CRM/Core/BAO/CustomField.php
+++ b/www/modules/civicrm/CRM/Core/BAO/CustomField.php
@@ -15,7 +15,6 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
-use Civi\Api4\CustomField;
 use Civi\Api4\Utils\CoreUtil;
 
 /**
@@ -23,13 +22,6 @@
  */
 class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField {
 
-  /**
-   * Array to hold (formatted) fields for import
-   *
-   * @var array
-   */
-  public static $_importFields = NULL;
-
   /**
    * Build and retrieve the list of data types and descriptions.
    *
@@ -240,7 +232,7 @@ public static function writeRecords(array $records): array {
       $op = empty($records[$index]['id']) ? 'create' : 'edit';
       // Theoretically a custom field could have custom fields! Trippy...
       if (!empty($records[$index]['custom']) && is_array($records[$index]['custom'])) {
-        CRM_Core_BAO_CustomValueTable::store($records[$index]['custom'], static::$_tableName, $customField->id, $op);
+        CRM_Core_BAO_CustomValueTable::store($records[$index]['custom'], static::getTableName(), $customField->id, $op);
       }
       CRM_Utils_Hook::post($op, 'CustomField', $customField->id, $customField);
     }
@@ -322,10 +314,13 @@ public static function buildOptions($fieldName, $context = NULL, $props = []) {
   }
 
   /**
-   * Store and return an array of all active custom fields.
+   * Crufty function makes getting custom fields unnecessarily difficult.
+   * @deprecated since 5.71
+   * @see CRM_Core_BAO_CustomGroup::getAll
+   * for a better alternative.
    *
    * @param string $customDataType
-   *   Type of Custom Data; 'ANY' is a synonym for "all contact data types".
+   *   Type of Custom Data; 'ANY' is a synonym for "all entity types".
    * @param bool $showAll
    *   If true returns all fields (includes disabled fields).
    * @param bool $inline
@@ -360,7 +355,7 @@ public static function &getFields(
       $checkPermission = CRM_Core_Permission::EDIT;
     }
     if (empty($customDataType)) {
-      $customDataType = array_merge(['Contact'], CRM_Contact_BAO_ContactType::basicTypes());
+      $customDataType = CRM_Contact_BAO_ContactType::basicTypes();
     }
     if ($customDataType === 'ANY') {
       // NULL should have been respected but the line above broke that.
@@ -368,7 +363,6 @@ public static function &getFields(
       $customDataType = NULL;
     }
     if ($customDataType && !is_array($customDataType)) {
-
       if (in_array($customDataType, CRM_Contact_BAO_ContactType::subTypes(), TRUE)) {
         // This is the case when getFieldsForImport() requires fields
         // limited strictly to a subtype.
@@ -376,290 +370,90 @@ public static function &getFields(
         $customDataType = CRM_Contact_BAO_ContactType::getBasicType($customDataType);
         $onlySubType = TRUE;
       }
-
-      if (array_key_exists($customDataType, CRM_Core_SelectValues::customGroupExtends())) {
-        // this makes the method flexible to support retrieving fields
-        // for multiple extends value.
-        $customDataType = [$customDataType];
-      }
+      $customDataType = (array) $customDataType;
     }
 
-    $customDataSubType = CRM_Utils_Array::explodePadded($customDataSubType);
+    $filters = [];
 
-    if (is_array($customDataType)) {
-      $cacheKey = implode('_', $customDataType);
+    if ($customDataType) {
+      // Contact type should also include "Contact"
+      if (array_intersect($customDataType, CRM_Contact_BAO_ContactType::basicTypes(TRUE))) {
+        $customDataType[] = 'Contact';
+      }
+      $filters['extends'] = $customDataType;
     }
-    else {
-      $cacheKey = $customDataType;
+    if (!$showAll) {
+      $filters['is_active'] = TRUE;
     }
-
-    $cacheKey .= !empty($customDataSubType) ? ('_' . implode('_', $customDataSubType)) : '_0';
-    $cacheKey .= $customDataSubName ? "{$customDataSubName}_" : '_0';
-    $cacheKey .= $showAll ? '_1' : '_0';
-    $cacheKey .= $inline ? '_1_' : '_0_';
-    $cacheKey .= $onlyParent ? '_1_' : '_0_';
-    $cacheKey .= $onlySubType ? '_1_' : '_0_';
-    $cacheKey .= $checkPermission ? $checkPermission . CRM_Core_Session::getLoggedInContactID() . '_' : '_0_0_';
-    $cacheKey .= '_' . CRM_Core_Config::domainID() . '_';
-
-    $cgTable = CRM_Core_DAO_CustomGroup::getTableName();
-
-    // also get the permission stuff here
-    if ($checkPermission) {
-      $permissionClause = CRM_Core_Permission::customGroupClause($checkPermission,
-        "{$cgTable}."
-      );
+    if ($onlyParent) {
+      $filters['extends_entity_column_value'] = NULL;
+      $filters['extends_entity_column_id'] = NULL;
     }
-    else {
-      $permissionClause = '(1)';
+    if ($customDataSubName) {
+      $filters['extends_entity_column_id'] = $customDataSubName;
     }
-
-    // lets md5 permission clause and take first 8 characters
-    $cacheKey .= substr(md5($permissionClause), 0, 8);
-
-    if (strlen($cacheKey) > 40) {
-      $cacheKey = md5($cacheKey);
+    if ($inline) {
+      $filters['style'] = 'Inline';
     }
-
-    if (!isset(self::$_importFields[$cacheKey])) {
-      if (!self::$_importFields) {
-        self::$_importFields = [];
-      }
-
-      // check if we can retrieve from database cache
-      $fields = Civi::Cache('fields')->get("custom importableFields $cacheKey");
-
-      if ($fields === NULL) {
-
-        $extends = '';
-        if (is_array($customDataType)) {
-          $value = NULL;
-          foreach ($customDataType as $dataType) {
-            if (array_key_exists($dataType, CRM_Core_SelectValues::customGroupExtends())) {
-              if (in_array($dataType, CRM_Contact_BAO_ContactType::basicTypes(TRUE), TRUE)) {
-                $val = "'" . CRM_Utils_Type::escape($dataType, 'String') . "', 'Contact' ";
-              }
-              else {
-                $val = "'" . CRM_Utils_Type::escape($dataType, 'String') . "'";
-              }
-              $value = $value ? $value . ", {$val}" : $val;
-            }
-          }
-          if ($value) {
-            $extends = "AND   $cgTable.extends IN ( $value ) ";
-          }
-        }
-
-        if (!empty($customDataType) && empty($extends)) {
-          // $customDataType specified a filter, but there is no corresponding SQL ($extends)
-          self::$_importFields[$cacheKey] = [];
-          return self::$_importFields[$cacheKey];
-        }
-
-        if ($onlyParent) {
-          $extends .= " AND $cgTable.extends_entity_column_value IS NULL AND $cgTable.extends_entity_column_id IS NULL ";
-        }
-        // Temporary hack - in 5.27 a new field is added to civicrm_custom_field. There is a high
-        // risk this function is called before the upgrade page can be reached and if
-        // so it will potentially result in fatal error.
-        $serializeField = CRM_Core_BAO_Domain::isDBVersionAtLeast('5.27.alpha1') ? "custom_field.serialize," : '';
-
-        $query = "SELECT custom_field.id, custom_field.label,
-                            $cgTable.title,
-                            custom_field.data_type,
-                            custom_field.html_type,
-                            custom_field.default_value,
-                            custom_field.options_per_line, custom_field.text_length,
-                            custom_field.custom_group_id,
-                            custom_field.is_required,
-                            custom_field.column_name,
-                            $cgTable.extends, custom_field.is_search_range,
-                            $cgTable.extends_entity_column_value,
-                            $cgTable.extends_entity_column_id,
-                            custom_field.is_view,
-                            custom_field.option_group_id,
-                            custom_field.date_format,
-                            custom_field.time_format,
-                            $cgTable.is_multiple,
-                            $serializeField
-                            $cgTable.table_name,
-                            og.name as option_group_name
-                     FROM civicrm_custom_field custom_field
-                     INNER JOIN $cgTable
-                       ON custom_field.custom_group_id = $cgTable.id
-                     LEFT JOIN civicrm_option_group og
-                       ON custom_field.option_group_id = og.id
-                     WHERE ( 1 ) ";
-
-        if (!$showAll) {
-          $query .= " AND custom_field.is_active = 1 AND $cgTable.is_active = 1 ";
-        }
-
-        if ($inline) {
-          $query .= " AND $cgTable.style = 'Inline' ";
-        }
-
-        //get the custom fields for specific type in
-        //combination with fields those support any type.
-        if (!empty($customDataSubType)) {
-          $subtypeClause = [];
-          foreach ($customDataSubType as $subtype) {
-            $subtype = CRM_Core_DAO::VALUE_SEPARATOR . CRM_Utils_Type::escape($subtype, 'String') . CRM_Core_DAO::VALUE_SEPARATOR;
-            $subtypeClause[] = "$cgTable.extends_entity_column_value LIKE '%{$subtype}%'";
-          }
-          if (!$onlySubType) {
-            $subtypeClause[] = "$cgTable.extends_entity_column_value IS NULL";
-          }
-          $query .= " AND ( " . implode(' OR ', $subtypeClause) . " )";
-        }
-
-        if ($customDataSubName) {
-          $query .= " AND ( $cgTable.extends_entity_column_id = $customDataSubName ) ";
-        }
-
-        // also get the permission stuff here
-        if ($checkPermission) {
-          $permissionClause = CRM_Core_Permission::customGroupClause($checkPermission,
-            "{$cgTable}.", TRUE
-          );
-        }
-        else {
-          $permissionClause = '(1)';
-        }
-
-        $query .= " $extends AND $permissionClause
-                        ORDER BY $cgTable.weight, $cgTable.title,
-                                 custom_field.weight, custom_field.label";
-
-        $dao = CRM_Core_DAO::executeQuery($query);
-
-        $fields = [];
-        while (($dao->fetch()) != NULL) {
-          $regexp = preg_replace('/[.,;:!?]/', '', '');
-          $fields[$dao->id]['id'] = $dao->id;
-          $fields[$dao->id]['label'] = $dao->label;
-          // This seems broken, but not in a new way.
-          $fields[$dao->id]['headerPattern'] = '/' . preg_quote($regexp, '/') . '/';
-          // To support the consolidation of various functions & their expectations.
-          $fields[$dao->id]['title'] = $dao->label;
-          $fields[$dao->id]['custom_field_id']  = $dao->id;
-          $fields[$dao->id]['groupTitle'] = $dao->title;
-          $fields[$dao->id]['data_type'] = $dao->data_type;
-          $fields[$dao->id]['name'] = 'custom_' . $dao->id;
-          $fields[$dao->id]['type'] = self::dataToType()[$dao->data_type] ?? NULL;
-          $fields[$dao->id]['html_type'] = $dao->html_type;
-          $fields[$dao->id]['default_value'] = $dao->default_value;
-          $fields[$dao->id]['text_length'] = $dao->text_length;
-          $fields[$dao->id]['options_per_line'] = $dao->options_per_line;
-          $fields[$dao->id]['custom_group_id'] = $dao->custom_group_id;
-          $fields[$dao->id]['extends'] = $dao->extends;
-          $fields[$dao->id]['is_search_range'] = $dao->is_search_range;
-          $fields[$dao->id]['extends_entity_column_value'] = $dao->extends_entity_column_value;
-          $fields[$dao->id]['extends_entity_column_id'] = $dao->extends_entity_column_id;
-          $fields[$dao->id]['is_view'] = $dao->is_view;
-          $fields[$dao->id]['is_multiple'] = $dao->is_multiple;
-          $fields[$dao->id]['option_group_id'] = $dao->option_group_id;
-          $fields[$dao->id]['date_format'] = $dao->date_format;
-          $fields[$dao->id]['time_format'] = $dao->time_format;
-          $fields[$dao->id]['is_required'] = $dao->is_required;
-          $fields[$dao->id]['table_name'] = $dao->table_name;
-          $fields[$dao->id]['column_name'] = $dao->column_name;
-          $fields[$dao->id]['serialize'] = $serializeField ? $dao->serialize : (int) self::isSerialized($dao);
-          $fields[$dao->id]['where'] = $dao->table_name . '.' . $dao->column_name;
-          // Probably we should use a different fn to get the extends tables but this is a refactor so not changing that now.
-          $fields[$dao->id]['extends_table'] = array_key_exists($dao->extends, CRM_Core_BAO_CustomQuery::$extendsMap) ? CRM_Core_BAO_CustomQuery::$extendsMap[$dao->extends] : '';
-          if (in_array($dao->extends, CRM_Contact_BAO_ContactType::subTypes())) {
-            // if $extends is a subtype, refer contact table
-            $fields[$dao->id]['extends_table'] = 'civicrm_contact';
-          }
-          // Search table is used by query object searches..
-          $fields[$dao->id]['search_table'] = ($fields[$dao->id]['extends_table'] == 'civicrm_contact') ? 'contact_a' : $fields[$dao->id]['extends_table'];
-          self::getOptionsForField($fields[$dao->id], $dao->option_group_name);
-        }
-
-        Civi::cache('fields')->set("custom importableFields $cacheKey", $fields);
+    if (!empty($customDataSubType)) {
+      $filters['extends_entity_column_value'] = CRM_Utils_Array::explodePadded($customDataSubType);
+      if (!$onlySubType) {
+        $filters['extends_entity_column_value'][] = NULL;
       }
-      self::$_importFields[$cacheKey] = $fields;
     }
-
-    return self::$_importFields[$cacheKey];
-  }
-
-  /**
-   * Get all active custom fields (cached wrapper).
-   *
-   * @param false|int $permissionType
-   *   - Either FALSE (do not check) or CRM_Core_Permission::VIEW or CRM_Core_Permission::EDIT
-   *
-   * @return array
-   *   List of customField details keyed by customFieldID
-   * @throws \CRM_Core_Exception
-   */
-  public static function getAllCustomFields($permissionType): array {
-    if ($permissionType !== FALSE && !is_int($permissionType)) {
-      throw new CRM_Core_Exception('permissionCheck must be FALSE or CRM_Core_Permission::VIEW or CRM_Core_Permission::EDIT');
-    }
-    $cacheString = __CLASS__ . __FUNCTION__ . CRM_Core_Config::domainID() . '_' . CRM_Core_I18n::getLocale();
-    if ($permissionType) {
-      $cacheString .= 'check_' . $permissionType . '_user_' . CRM_Core_Session::getLoggedInContactID();
-    }
-    if (!Civi::cache('metadata')->has($cacheString)) {
-      $apiCall = CustomField::get(FALSE)
-        ->addOrderBy('custom_group_id.title')
-        ->addOrderBy('custom_group_id.weight')
-        ->addOrderBy('weight')
-        ->addOrderBy('label')
-        ->addSelect('*')
-        ->addSelect('custom_group_id.extends')
-        ->addSelect('custom_group_id.extends_entity_column_id')
-        ->addSelect('custom_group_id.extends_entity_column_value')
-        ->addSelect('custom_group_id.is_active')
-        ->addSelect('custom_group_id.name')
-        ->addSelect('custom_group_id.title')
-        ->addSelect('custom_group_id.table_name')
-        ->addSelect('custom_group_id.is_public');
-      if ($permissionType && !CRM_Core_Permission::customGroupAdmin()) {
-        $availableGroups = CRM_Core_Permission::customGroup($permissionType);
-        $apiCall->addWhere('custom_group_id', 'IN', empty($availableGroups) ? [0] : $availableGroups);
-      }
-
-      $types = (array) $apiCall->execute()->indexBy('id');
-
-      Civi::cache('metadata')->set($cacheString, $types);
-    }
-    return Civi::cache('metadata')->get($cacheString);
-  }
-
-  /**
-   * Get all active custom fields for the given contact type.
-   *
-   * This is formatted as an apiv4 Style array.
-   *
-   * @param string $contactType
-   * @param bool|int $permissionType
-   *  - Either FALSE (do not check) or CRM_Core_Permission::VIEW or CRM_Core_Permission::EDIT
-   * @param array $contactSubTypes
-   *
-   * @return array $fields
-   *
-   * @throws \CRM_Core_Exception
-   */
-  public static function getCustomFieldsForContactType(string $contactType, $permissionType, array $contactSubTypes = []): array {
+    $customGroups = CRM_Core_BAO_CustomGroup::getAll($filters, $checkPermission ?: NULL);
     $fields = [];
-    foreach (self::getAllCustomFields($permissionType) as $field) {
-      if ($field['custom_group_id.extends'] === $contactType || $field['custom_group_id.extends'] === 'Contact') {
-        if (empty($contactSubTypes) || empty($field['custom_group_id.extends_entity_column_value'])) {
-          $fields[$field['id']] = $field;
-        }
-        else {
-          foreach ($contactSubTypes as $contactSubType) {
-            if (in_array($contactSubType, $field['custom_group_id.extends_entity_column_value'], TRUE)) {
-              $fields[$field['id']] = $field;
-            }
-          }
-        }
+
+    // This function has been refactored to use `CRM_Core_BAO_CustomGroup::getAll` instead
+    // of a database query. They old query results were badly formatted, but since this function is
+    // deprecated, the following loop recreates the bad formatting instead of fixing it, for
+    // maximum backward-compatibility.
+    // (for forward-compatibility... don't use this function)
+    foreach ($customGroups as $customGroup) {
+      foreach ($customGroup['fields'] as $customField) {
+        $id = (string) $customField['id'];
+        $fields[$id]['id'] = $id;
+        $fields[$id]['label'] = $customField['label'];
+        // This seems broken, but not in a new way.
+        $fields[$id]['headerPattern'] = '//';
+        // To support the consolidation of various functions & their expectations.
+        $fields[$id]['title'] = $customField['label'];
+        $fields[$id]['custom_field_id'] = $id;
+        $fields[$id]['groupTitle'] = $customGroup['title'];
+        $fields[$id]['data_type'] = $customField['data_type'];
+        $fields[$id]['name'] = 'custom_' . $id;
+        $fields[$id]['type'] = self::dataToType()[$customField['data_type']] ?? NULL;
+        $fields[$id]['html_type'] = $customField['html_type'];
+        $fields[$id]['default_value'] = $customField['default_value'];
+        $fields[$id]['text_length'] = $customField['text_length'];
+        $fields[$id]['options_per_line'] = $customField['options_per_line'];
+        $fields[$id]['custom_group_id'] = (string) $customGroup['id'];
+        $fields[$id]['extends'] = $customGroup['extends'];
+        $fields[$id]['is_search_range'] = (string) (int) $customField['is_search_range'];
+        $fields[$id]['extends_entity_column_value'] = CRM_Utils_Array::implodePadded($customGroup['extends_entity_column_value']);
+        $fields[$id]['extends_entity_column_id'] = (string) $customGroup['extends_entity_column_id'];
+        $fields[$id]['is_view'] = (string) (int) $customField['is_view'];
+        $fields[$id]['is_multiple'] = (string) (int) $customGroup['is_multiple'];
+        $fields[$id]['option_group_id'] = ((string) $customField['option_group_id']) ?: NULL;
+        $fields[$id]['date_format'] = $customField['date_format'];
+        $fields[$id]['time_format'] = $customField['time_format'];
+        $fields[$id]['is_required'] = (string) (int) $customField['is_required'];
+        $fields[$id]['table_name'] = $customGroup['table_name'];
+        $fields[$id]['column_name'] = $customField['column_name'];
+        $fields[$id]['serialize'] = $customField['serialize'];
+        $fields[$id]['where'] = $customGroup['table_name'] . '.' . $customField['column_name'];
+        // Probably we should use a different fn to get the extends tables but this is a refactor so not changing that now.
+        $fields[$id]['extends_table'] = array_key_exists($customGroup['extends'], CRM_Core_BAO_CustomQuery::$extendsMap) ? CRM_Core_BAO_CustomQuery::$extendsMap[$customGroup['extends']] : '';
+        if (in_array($customGroup['extends'], CRM_Contact_BAO_ContactType::subTypes())) {
+          // if $extends is a subtype, refer contact table
+          $fields[$id]['extends_table'] = 'civicrm_contact';
+        }
+        // Search table is used by query object searches..
+        $fields[$id]['search_table'] = ($fields[$id]['extends_table'] == 'civicrm_contact') ? 'contact_a' : $fields[$id]['extends_table'];
+        self::getOptionsForField($fields[$id]);
       }
     }
+
     return $fields;
   }
 
@@ -697,7 +491,7 @@ public static function getFieldsForImport(
     }
     // Note: there are situations when we want getFieldsForImport() return fields related
     // ONLY to basic contact types, but NOT subtypes. And thats where $onlyParent is helpful
-    $fields = &self::getFields($contactType,
+    $fields = self::getFields($contactType,
       $showAll,
       FALSE,
       NULL,
@@ -756,119 +550,41 @@ public static function getKeyID($key, $all = FALSE) {
   }
 
   /**
-   * Use the cache to get all values of a specific custom field.
+   * Get specific custom field as an object.
+   * @deprecated
+   * @see CRM_Core_BAO_CustomField::getField()
+   * which does the same thing but returns an array instead of an object.
    *
    * @param int $fieldID
    *   The custom field ID.
    *
    * @return CRM_Core_BAO_CustomField
-   *   The field object.
    * @throws CRM_Core_Exception
    */
   public static function getFieldObject($fieldID) {
     $field = new CRM_Core_BAO_CustomField();
-
-    // check if we can get the field values from the system cache
-    $cacheKey = "CRM_Core_DAO_CustomField_{$fieldID}";
-    $cache = CRM_Utils_Cache::singleton();
-    $fieldValues = $cache->get($cacheKey);
-    if (empty($fieldValues)) {
-      $field->id = $fieldID;
-      if (!$field->find(TRUE)) {
-        throw new CRM_Core_Exception('Cannot find Custom Field ' . $fieldID);
-      }
-      $fieldValues = [];
-      CRM_Core_DAO::storeValues($field, $fieldValues);
-
-      $cache->set($cacheKey, $fieldValues);
-    }
-    else {
-      $field->copyValues($fieldValues);
-    }
-
+    $field->copyValues(self::getField($fieldID));
     return $field;
   }
 
   /**
-   * Use the cache to get all values of a specific custom field.
+   * Get all values of a specific custom field + its custom group.
    *
    * @param int $id
    *   The custom field ID.
-   * @param int|false $permissionType
    *
-   * @return array
+   * @return array|null
    *   The field object.
    * @throws CRM_Core_Exception
    */
-  public static function getField(int $id, $permissionType = FALSE): array {
-    $field = self::getAllCustomFields($permissionType)[$id];
-    // @todo - on the fence about caching these in the cache for all custom fields. The down side is the
-    // cache array could get really big & serializing & un-serializing big arrays is expensive.
-    $entity = in_array($field['custom_group_id.extends'], CRM_Contact_BAO_ContactType::basicTypes(TRUE), TRUE) ? 'Contact' : $field['custom_group_id.extends'];
-    $field['options'] = self::getFieldOptions($field['id'], $field['option_group_id'], $field['data_type'], $entity);
-    return $field;
-  }
-
-  /**
-   * Gets an array of custom fields that are public.
-   *
-   * @internal do not use from untested or external code - signature may change.
-   *
-   * This takes into account
-   *  - the is_public setting on the Custom Group
-   *  - the is_view permission on the field (these are generally suppressed).
-   *
-   * @param string $extends
-   * @param array $extendsEntity
-   *   Keyed by name values from CRM_Core_BAO_CustomGroup::getExtendsEntityColumnIdOptions()
-   *   Values can be an int or an array.
-   *   eg ['ParticipantRole' = [1], 'ParticipantEventType' => 2], ['ParticipantEventName' => 3]
-   * @param int $permissionType
-   *
-   * @return array
-   * @throws \CRM_Core_Exception
-   */
-  public static function getViewableCustomFields(string $extends, array $extendsEntity = [], $permissionType = CRM_Core_Permission::VIEW): array {
-    $entityFilters = [];
-    // Convert from ['ParticipantRole' = [1], 'ParticipantEventType' => 2], ['ParticipantEventName' => 3]
-    // to [1 => [1], 2 => [2], 3 = [3]
-    if (!empty($extendsEntity)) {
-      $entityColumns = CRM_Core_BAO_CustomGroup::getExtendsEntityColumnIdOptions();
-      foreach ($entityColumns as $entityColumn) {
-        if (isset($extendsEntity[$entityColumn['name']])) {
-          $entityFilters[(int) $entityColumn['id']] = (array) $extendsEntity[$entityColumn['name']];
-          foreach ($entityFilters[$entityColumn['id']] as &$value) {
-            // Cast to string because we don't want the calling function to have to worry
-            // but also the array intersect fails otherwise.
-            $value = (string) $value;
-          }
-        }
+  public static function getField(int $id): ?array {
+    foreach (CRM_Core_BAO_CustomGroup::getAll() as $customGroup) {
+      if (isset($customGroup['fields'][$id])) {
+        $customGroup['fields'][$id]['custom_group'] = array_diff_key($customGroup, ['fields' => 1]);
+        return $customGroup['fields'][$id];
       }
     }
-    $cacheKey = $extends . $permissionType . CRM_Core_Config::domainID() . '_' . CRM_Core_I18n::getLocale() . substr(md5(json_encode($extendsEntity)), 0, 30);
-    if (!isset(\Civi::$statics[__CLASS__][__FUNCTION__][$cacheKey])) {
-      \Civi::$statics[__CLASS__][__FUNCTION__][$cacheKey] = [];
-      $allFields = CRM_Core_BAO_CustomField::getAllCustomFields($permissionType);
-      foreach ($allFields as $field) {
-        $entityValueMatches = array_intersect((array) $field['custom_group_id.extends_entity_column_value'], ($entityFilters[$field['custom_group_id.extends_entity_column_id']] ?? []));
-        if (
-          !$field['is_view']
-          && $field['custom_group_id.is_public']
-          && (
-            !empty($entityValueMatches)
-            || empty($entityFilters)
-            || empty($field['custom_group_id.extends_entity_column_id'])
-          )
-          && (
-            $field['custom_group_id.extends'] === $extends
-            || ($field['custom_group_id.extends'] === 'Contact' && in_array($extends, ['Individual', 'Organization', 'Household']))
-          )
-        ) {
-          \Civi::$statics[__CLASS__][__FUNCTION__][$cacheKey][(int) $field['id']] = $field;
-        }
-      }
-    }
-    return \Civi::$statics[__CLASS__][__FUNCTION__][$cacheKey];
+    return NULL;
   }
 
   /**
@@ -1251,6 +967,7 @@ public static function displayValue($value, $fieldID, $entityID = NULL) {
       $fieldID = is_object($fieldID) ? $fieldID->id : (int) str_replace('custom_', '', $fieldID);
     }
     $fieldInfo = self::getField($fieldID);
+    $fieldInfo['options'] = self::getFieldOptions($fieldID, $fieldInfo['option_group_id'], $fieldInfo['data_type'], $fieldInfo['custom_group']['extends']);
     $displayValue = self::formatDisplayValue($value, $fieldInfo, $entityID);
     // Call hook to alter display value.
     CRM_Utils_Hook::alterCustomFieldDisplayValue($displayValue, $value, $entityID, $fieldInfo);
@@ -1466,9 +1183,7 @@ public static function setProfileDefaults(
     $value = NULL
   ) {
     //get the type of custom field
-    $customField = new CRM_Core_BAO_CustomField();
-    $customField->id = $customFieldId;
-    $customField->find(TRUE);
+    $customField = self::getFieldObject($customFieldId);
 
     if (!$contactId) {
       if ($mode == CRM_Profile_Form::MODE_CREATE) {
@@ -2596,7 +2311,8 @@ public static function postProcess(
     $customData = [];
 
     foreach ($params as $key => $value) {
-      if ($customFieldInfo = CRM_Core_BAO_CustomField::getKeyID($key, TRUE)) {
+      $customFieldInfo = CRM_Core_BAO_CustomField::getKeyID($key, TRUE);
+      if ($customFieldInfo[0]) {
 
         // for autocomplete transfer hidden value instead of label
         if ($params[$key] && isset($params[$key . '_id'])) {
@@ -2623,7 +2339,8 @@ public static function postProcess(
   }
 
   /**
-   * Get custom field ID from field/group name/title.
+   * @deprecated Old function with weirdly ambiguous logic.
+   * Only used by APIv3. Use at your peril.
    *
    * @param string $fieldName Field name or label
    * @param string|null $groupName (Optional) Group name or label
@@ -2666,7 +2383,7 @@ public static function getCustomFieldID($fieldName, $groupName = NULL, $fullStri
   }
 
   /**
-   * Given ID of a custom field, return its name as well as the name of the custom group it belongs to.
+   * @deprecated Old function only used by APIv3.
    *
    * @param array $ids
    *
@@ -2724,24 +2441,14 @@ public static function validateCustomData($params) {
     //lets start w/ params.
     foreach ($params as $key => $value) {
       $customFieldID = self::getKeyID($key);
-      if (!$customFieldID) {
+      $field = $customFieldID ? CRM_Core_BAO_CustomField::getField($customFieldID) : NULL;
+      if (!$field) {
         continue;
       }
-
-      //load the structural info for given field.
-      $field = new CRM_Core_DAO_CustomField();
-      $field->id = $customFieldID;
-      if (!$field->find(TRUE)) {
-        continue;
-      }
-      $dataType = $field->data_type;
-
       $profileField = $profileFields[$key] ?? [];
       $fieldTitle = $profileField['title'] ?? NULL;
       $isRequired = $profileField['is_required'] ?? NULL;
-      if (!$fieldTitle) {
-        $fieldTitle = $field->label;
-      }
+      $fieldTitle = CRM_Utils_String::purifyHTML($fieldTitle ?: $field['label']);
 
       //no need to validate.
       if (CRM_Utils_System::isNull($value) && !$isRequired) {
@@ -2756,7 +2463,7 @@ public static function validateCustomData($params) {
 
       //now time to take care of custom field form rules.
       $ruleName = $errorMsg = NULL;
-      switch ($dataType) {
+      switch ($field['data_type']) {
         case 'Int':
           $ruleName = 'integer';
           $errorMsg = ts('%1 must be an integer (whole number).', [1 => $fieldTitle]);
@@ -2794,33 +2501,19 @@ public static function validateCustomData($params) {
   }
 
   /**
-   * Is this field a multi record field.
+   * If custom field belongs to a multi-record group, return the group id.
    *
-   * @param int $customId
+   * @param string|int $customId
+   *   Either the numeric id or a string like "custom_xx"
    *
-   * @return bool
+   * @return int|false
    */
   public static function isMultiRecordField($customId) {
-    $isMultipleWithGid = FALSE;
     if (!is_numeric($customId)) {
       $customId = self::getKeyID($customId);
     }
-    if (is_numeric($customId)) {
-      $sql = "SELECT cg.id cgId
- FROM civicrm_custom_group cg
- INNER JOIN civicrm_custom_field cf
- ON cg.id = cf.custom_group_id
-WHERE cf.id = %1 AND cg.is_multiple = 1";
-      $params[1] = [$customId, 'Integer'];
-      $dao = CRM_Core_DAO::executeQuery($sql, $params);
-      if ($dao->fetch()) {
-        if ($dao->cgId) {
-          $isMultipleWithGid = $dao->cgId;
-        }
-      }
-    }
-
-    return $isMultipleWithGid;
+    $customGroup = self::getField((int) $customId)['custom_group'] ?? NULL;
+    return empty($customGroup['is_multiple']) ? FALSE : $customGroup['id'];
   }
 
   /**
@@ -2867,13 +2560,20 @@ public static function isSerialized($field) {
     return is_object($field) ? !empty($field->serialize) : !empty($field['serialize']);
   }
 
+  public static function getFkEntityOnDeleteOptions(): array {
+    return [
+      'set_null' => ts('Delete reference'),
+      'cascade' => ts('Delete entity'),
+    ];
+  }
+
   /**
    * Get api3 entity name for this field
    * @deprecated
    * @return string
    */
   public function getEntity() {
-    $entity = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->custom_group_id, 'extends');
+    $entity = self::getField($this->id)['custom_group']['extends'];
     return in_array($entity, CRM_Contact_BAO_ContactType::basicTypes(TRUE), TRUE) ? 'Contact' : $entity;
   }
 
@@ -2882,22 +2582,21 @@ public function getEntity() {
    * @return string
    */
   public function getEntityName(): string {
-    $isMultiple = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->custom_group_id, 'is_multiple');
-    if ($isMultiple) {
-      $groupName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->custom_group_id, 'name');
-      return "Custom_$groupName";
+    $customGroup = self::getField($this->id)['custom_group'];
+    if ($customGroup['is_multiple']) {
+      return "Custom_{$customGroup['name']}";
     }
-    return CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->custom_group_id, 'extends');
+    return $customGroup['extends'];
   }
 
   /**
    * Set pseudoconstant properties for field metadata.
    *
    * @param array $field
-   * @param string|null $optionGroupName
    */
-  private static function getOptionsForField(&$field, $optionGroupName) {
-    if ($optionGroupName) {
+  private static function getOptionsForField(&$field) {
+    if (!empty($field['option_group_id'])) {
+      $optionGroupName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionGroup', $field['option_group_id']);
       $field['pseudoconstant'] = [
         'optionGroupName' => $optionGroupName,
         'optionEditPath' => 'civicrm/admin/options/' . $optionGroupName,
@@ -2999,6 +2698,7 @@ private static function getFieldOptions(int $id, ?int $optionGroupID, string $da
     $cache = CRM_Utils_Cache::singleton();
     $options = $cache->get($cacheKey);
     if (!isset($options)) {
+      $entity = in_array($entity, CRM_Contact_BAO_ContactType::basicTypes(TRUE)) ? 'Contact' : $entity;
       // This will hold the list of options in format key => label
       $options = [];
 
diff --git a/www/modules/civicrm/CRM/Core/BAO/CustomGroup.php b/www/modules/civicrm/CRM/Core/BAO/CustomGroup.php
index a4bf0c909..5058863fa 100644
--- a/www/modules/civicrm/CRM/Core/BAO/CustomGroup.php
+++ b/www/modules/civicrm/CRM/Core/BAO/CustomGroup.php
@@ -28,6 +28,146 @@ public static function self_hook_civicrm_post(\Civi\Core\Event\PostEvent $e): vo
     Civi::cache('metadata')->flush();
   }
 
+  /**
+   * Retrieve a group by id, name, etc.
+   *
+   * @param array $filter
+   *   Simplified version of $filters in self::getAll; returns first group that matches every filter.
+   *   e.g. `['id' => 23]` or `['name' => 'MyGroup']`
+   * @param int|null $permissionType
+   *    Check permission: (CRM_Core_Permission::VIEW | CRM_Core_Permission::EDIT)
+   * @param int|null $userId
+   *    User contact id for permission check (defaults to current user)
+   * @return array|null
+   *   Result includes all custom fields in addition to group info.
+   */
+  public static function getGroup(array $filter, int $permissionType = NULL, int $userId = NULL): ?array {
+    $allGroups = self::getAll([], $permissionType, $userId);
+    if (isset($filter['id']) && count($filter) === 1) {
+      return $allGroups[$filter['id']] ?? NULL;
+    }
+    foreach ($allGroups as $group) {
+      if (array_intersect_assoc($filter, $group) === $filter) {
+        return $group;
+      }
+    }
+    return NULL;
+  }
+
+  /**
+   * Return custom groups and fields in a nested array, with optional filters and permissions applied.
+   *
+   * With no params, this returns every custom group and field, including disabled.
+   *
+   * @param array $filters
+   *   [key => value] pairs to filter each custom group.
+   *   - $filters[extends] will auto-expand Contact types (if passed as a string)
+   *   - $filters[is_active] will also filter the fields
+   * @param int|null $permissionType
+   *   Check permission: (CRM_Core_Permission::VIEW | CRM_Core_Permission::EDIT)
+   * @param int|null $userId
+   *   User contact id for permission check (defaults to current user)
+   * @return array[]
+   */
+  public static function getAll(array $filters = [], int $permissionType = NULL, int $userId = NULL): array {
+    $allGroups = self::loadAll();
+    if (isset($permissionType)) {
+      if (!in_array($permissionType, [CRM_Core_Permission::EDIT, CRM_Core_Permission::VIEW], TRUE)) {
+        throw new CRM_Core_Exception('permissionType must be CRM_Core_Permission::VIEW or CRM_Core_Permission::EDIT');
+      }
+      $permittedIds = CRM_Core_Permission::customGroup($permissionType, FALSE, $userId);
+      $allGroups = array_intersect_key($allGroups, array_flip($permittedIds));
+    }
+    if (!$filters) {
+      return $allGroups;
+    }
+    if (!empty($filters['extends']) && is_string($filters['extends'])) {
+      $contactTypes = CRM_Contact_BAO_ContactType::basicTypes(TRUE);
+      // "Contact" should include all contact types (Individual, Organization, Household)
+      if ($filters['extends'] === 'Contact') {
+        $filters['extends'] = array_merge(['Contact'], $contactTypes);
+      }
+      // A contact type (e.g. "Individual") should include "Contact"
+      elseif (in_array($filters['extends'], $contactTypes, TRUE)) {
+        $filters['extends'] = ['Contact', $filters['extends']];
+      }
+    }
+    $allGroups = array_filter($allGroups, function($group) use ($filters) {
+      foreach ($filters as $filterKey => $filterValue) {
+        $groupValue = $group[$filterKey] ?? NULL;
+        // Compare arrays using array_intersect
+        if (is_array($filterValue) && is_array($groupValue)) {
+          if (!array_intersect($groupValue, $filterValue)) {
+            return FALSE;
+          }
+        }
+        // Compare arrays with scalar using in_array
+        elseif (is_array($filterValue)) {
+          if (!in_array($groupValue, $filterValue)) {
+            return FALSE;
+          }
+        }
+        elseif (is_array($groupValue)) {
+          if (!in_array($filterValue, $groupValue)) {
+            return FALSE;
+          }
+        }
+        // Compare scalar values with ==
+        elseif ($groupValue != $filterValue) {
+          return FALSE;
+        }
+      }
+      return TRUE;
+    });
+    // The `is_active` filter applies to fields as well as groups.
+    if (!empty($filters['is_active'])) {
+      foreach ($allGroups as $groupIndex => $group) {
+        $allGroups[$groupIndex]['fields'] = array_filter($group['fields'], fn($field) => $field['is_active']);
+      }
+    }
+    return $allGroups;
+  }
+
+  /**
+   * Fetch all custom groups and fields in a nested array.
+   *
+   * Output includes all custom group data + fields.
+   *
+   * @return array[]
+   */
+  private static function loadAll(): array {
+    $cacheString = __CLASS__ . __FUNCTION__ . '_' . CRM_Core_I18n::getLocale();
+    $custom = Civi::cache('metadata')->get($cacheString);
+    if (!isset($custom)) {
+      $custom = [];
+      $select = ['g.*'];
+      foreach (array_keys(CRM_Core_BAO_CustomField::getSupportedFields()) as $fieldKey) {
+        $select[] = "f.`$fieldKey` AS `field__$fieldKey`";
+      }
+      // Avoid calling the API to prevent recursion or early-bootstrap issues.
+      $data = \CRM_Utils_SQL_Select::from('civicrm_custom_group g')
+        ->join('f', 'LEFT JOIN civicrm_custom_field f ON g.id = f.custom_group_id')
+        ->select($select)
+        ->orderBy(['g.weight', 'g.name', 'f.weight', 'f.name'])
+        ->execute()->fetchAll();
+      foreach ($data as $groupData) {
+        $groupId = (int) $groupData['id'];
+        $fieldData = CRM_Utils_Array::filterByPrefix($groupData, 'field__');
+        if (!isset($custom[$groupId])) {
+          self::formatFieldValues($groupData);
+          $groupData['fields'] = [];
+          $custom[$groupId] = $groupData;
+        }
+        if ($fieldData['id']) {
+          CRM_Core_BAO_CustomField::formatFieldValues($fieldData);
+          $custom[$groupId]['fields'][$fieldData['id']] = $fieldData;
+        }
+      }
+      Civi::cache('metadata')->set($cacheString, $custom);
+    }
+    return $custom;
+  }
+
   /**
    * FIXME: This function is too complex because it's trying to handle both api-style inputs and
    * quickform inputs. Needs to be deprecated and broken up.
@@ -45,9 +185,6 @@ public static function create(&$params) {
     }
     // create custom group dao, populate fields and then save.
     $group = new CRM_Core_DAO_CustomGroup();
-    if (isset($params['title'])) {
-      $group->title = $params['title'];
-    }
 
     $extendsChildType = NULL;
     // lets allow user to pass direct child type value, CRM-6893
@@ -86,19 +223,22 @@ public static function create(&$params) {
           CRM_Core_DAO::VALUE_SEPARATOR;
       }
     }
-    else {
+    elseif (empty($params['id'])) {
       $extendsChildType = 'null';
     }
     $group->extends_entity_column_value = $extendsChildType;
 
-    if (isset($params['id'])) {
-      $oldWeight = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $params['id'], 'weight', 'id');
+    // Assign new weight
+    if (empty($params['id'])) {
+      $group->weight = CRM_Utils_Weight::updateOtherWeights('CRM_Core_DAO_CustomGroup', 0, $params['weight'] ?? CRM_Utils_Weight::getMax('CRM_Core_DAO_CustomGroup'));
     }
-    else {
-      $oldWeight = 0;
+    // Update weight
+    if (isset($params['weight']) && !empty($params['id'])) {
+      $oldWeight = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $params['id'], 'weight', 'id');
+      $group->weight = CRM_Utils_Weight::updateOtherWeights('CRM_Core_DAO_CustomGroup', $oldWeight, $params['weight']);
     }
-    $group->weight = CRM_Utils_Weight::updateOtherWeights('CRM_Core_DAO_CustomGroup', $oldWeight, CRM_Utils_Array::value('weight', $params, FALSE));
     $fields = [
+      'title',
       'style',
       'collapse_display',
       'collapse_adv_display',
@@ -207,12 +347,7 @@ public static function create(&$params) {
     // reset the cache
     CRM_Utils_System::flushCache();
 
-    if ($tableName) {
-      CRM_Utils_Hook::post('create', 'CustomGroup', $group->id, $group);
-    }
-    else {
-      CRM_Utils_Hook::post('edit', 'CustomGroup', $group->id, $group);
-    }
+    CRM_Utils_Hook::post($op, 'CustomGroup', $group->id, $group);
 
     return $group;
   }
@@ -234,7 +369,7 @@ public static function retrieve($params, &$defaults) {
    */
   public static function validateCustomGroupName(CRM_Core_DAO_CustomGroup $group) {
     $extends = in_array($group->extends, CRM_Contact_BAO_ContactType::basicTypes(TRUE)) ? 'Contact' : $group->extends;
-    $extendsDAO = CRM_Core_DAO_AllCoreTables::getFullName($extends);
+    $extendsDAO = CRM_Core_DAO_AllCoreTables::getDAONameForEntity($extends);
     if ($extendsDAO) {
       $fields = array_column($extendsDAO::fields(), 'name');
       if (in_array($group->name, $fields)) {
@@ -264,7 +399,7 @@ public static function setIsActive($id, $is_active) {
   }
 
   /**
-   * Determine if given entity (sub)type has any custom groups
+   * @deprecated since 5.71 will be removed around 5.85.
    *
    * @param string $extends
    *   E.g. "Individual", "Activity".
@@ -276,48 +411,36 @@ public static function setIsActive($id, $is_active) {
    * @return bool
    */
   public static function hasCustomGroup($extends, $columnId, $columnValue) {
+    CRM_Core_Error::deprecatedFunctionWarning('CRM_Core_BAO_CustomGroup::getAll');
     $dao = new CRM_Core_DAO_CustomGroup();
     $dao->extends = $extends;
     $dao->extends_entity_column_id = $columnId;
     $escapedValue = CRM_Core_DAO::VALUE_SEPARATOR . CRM_Core_DAO::escapeString($columnValue) . CRM_Core_DAO::VALUE_SEPARATOR;
     $dao->whereAdd("extends_entity_column_value LIKE \"%$escapedValue%\"");
-    //$dao->extends_entity_column_value = $columnValue;
     return (bool) $dao->find();
   }
 
   /**
-   * Determine if there are any CustomGroups for the given $activityTypeId.
-   * If none found, create one.
+   * @deprecated Function moved
    *
    * @param int $activityTypeId
-   *
-   * @return bool
-   *   TRUE if a group is found or created; FALSE on error
    */
   public static function autoCreateByActivityType($activityTypeId) {
-    if (self::hasCustomGroup('Activity', NULL, $activityTypeId)) {
-      return TRUE;
-    }
-    // everything
-    $activityTypes = CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'label', TRUE, FALSE);
-    $params = [
-      'version' => 3,
-      'extends' => 'Activity',
-      'extends_entity_column_id' => NULL,
-      'extends_entity_column_value' => CRM_Utils_Array::implodePadded([$activityTypeId]),
-      'title' => ts('%1 Questions', [1 => $activityTypes[$activityTypeId]]),
-      'style' => 'Inline',
-      'is_active' => 1,
-    ];
-    $result = civicrm_api('CustomGroup', 'create', $params);
-    return !$result['is_error'];
+    CRM_Core_Error::deprecatedFunctionWarning('CRM_Campaign_Form_Survey_Questions::autoCreateCustomGroup');
+    return CRM_Campaign_Form_Survey_Questions::autoCreateCustomGroup($activityTypeId);
   }
 
   /**
-   * Get custom groups/fields data for type of entity in a tree structure representing group->field hierarchy
-   * This may also include entity specific data values.
+   * @deprecated Function demonstrates just how bad code can get from 20 years of entropy.
    *
-   * An array containing all custom groups and their custom fields is returned.
+   * This function takes an overcomplicated set of params and returns an overcomplicated
+   * mix of custom groups, custom fields, custom values (if passed $entityID), and other random stuff.
+   *
+   * @see CRM_Core_BAO_CustomGroup::getAll()
+   * for a better alternative to fetching a tree of custom groups and fields.
+   *
+   * @see APIv4::get()
+   * for a better alternative to fetching entity values.
    *
    * @param string $entityType
    *   Of the contact whose contact type is needed.
@@ -339,18 +462,12 @@ public static function autoCreateByActivityType($activityTypeId) {
    *   holds 'new' or id if view/edit/copy form for a single record is being loaded.
    * @param bool $showPublicOnly
    *
-   * @return array
-   *   Custom field 'tree'.
-   *
+   * @return array[]
    *   The returned array is keyed by group id and has the custom group table fields
    *   and a subkey 'fields' holding the specific custom fields.
    *   If entityId is passed in the fields keys have a subkey 'customValue' which holds custom data
    *   if set for the given entity. This is structured as an array of values with each one having the keys 'id', 'data'
    *
-   * @todo - review this  - It also returns an array called 'info' with tables, select, from, where keys
-   *   The reason for the info array in unclear and it could be determined from parsing the group tree after creation
-   *   With caching the performance impact would be small & the function would be cleaner
-   *
    * @throws \CRM_Core_Exception
    */
   public static function getTree(
@@ -367,8 +484,8 @@ public static function getTree(
     $singleRecord = NULL,
     $showPublicOnly = FALSE
   ) {
-    if ($checkPermission === TRUE) {
-      CRM_Core_Error::deprecatedWarning('Unexpected TRUE passed to CustomGroup::getTree $checkPermission param.');
+    if ($checkPermission && !in_array($checkPermission, [CRM_Core_Permission::EDIT, CRM_Core_Permission::VIEW], TRUE)) {
+      CRM_Core_Error::deprecatedWarning("Unexpected value '$checkPermission' passed to CustomGroup::getTree \$checkPermission param.");
       $checkPermission = CRM_Core_Permission::EDIT;
     }
     if ($entityID) {
@@ -388,187 +505,42 @@ public static function getTree(
       }
     }
 
-    // create a new tree
-
-    // legacy hardcoded list of data to return
-    $tableData = [
-      'custom_field' => [
-        'id',
-        'name',
-        'label',
-        'column_name',
-        'data_type',
-        'html_type',
-        'default_value',
-        'attributes',
-        'is_required',
-        'is_view',
-        'help_pre',
-        'help_post',
-        'options_per_line',
-        'start_date_years',
-        'end_date_years',
-        'date_format',
-        'time_format',
-        'option_group_id',
-        'in_selector',
-      ],
-      'custom_group' => [
-        'id',
-        'name',
-        'table_name',
-        'title',
-        'help_pre',
-        'help_post',
-        'collapse_display',
-        'style',
-        'is_multiple',
-        'extends',
-        'extends_entity_column_id',
-        'extends_entity_column_value',
-        'max_multiple',
-        'is_public',
-      ],
-    ];
-    $current_db_version = CRM_Core_BAO_Domain::version();
-    $serialize_version = version_compare($current_db_version, '5.27.alpha1', '>=');
-    if ($serialize_version) {
-      $tableData['custom_field'][] = 'serialize';
-    }
-    if (!$toReturn || !is_array($toReturn)) {
-      $toReturn = $tableData;
-    }
-    else {
-      // Supply defaults and remove unknown array keys
-      $toReturn = array_intersect_key(array_filter($toReturn) + $tableData, $tableData);
-      // Merge in required fields that we must have
-      $toReturn['custom_field'] = array_unique(array_merge($toReturn['custom_field'], ['id', 'column_name', 'data_type']));
-      $toReturn['custom_group'] = array_unique(array_merge($toReturn['custom_group'], ['id', 'is_multiple', 'table_name', 'name']));
-      // Validate return fields
-      $toReturn['custom_field'] = array_intersect($toReturn['custom_field'], array_keys(CRM_Core_DAO_CustomField::fieldKeys()));
-      $toReturn['custom_group'] = array_intersect($toReturn['custom_group'], array_keys(CRM_Core_DAO_CustomGroup::fieldKeys()));
-    }
-
-    // create select
-    $select = [];
-    foreach ($toReturn as $tableName => $tableColumn) {
-      foreach ($tableColumn as $columnName) {
-        $select[] = "civicrm_{$tableName}.{$columnName} as civicrm_{$tableName}_{$columnName}";
-      }
-    }
-    $strSelect = "SELECT " . implode(', ', $select);
-
-    // from, where, order by
-    $strFrom = "
-FROM     civicrm_custom_group
-LEFT JOIN civicrm_custom_field ON (civicrm_custom_field.custom_group_id = civicrm_custom_group.id)
-";
-
-    // if entity is either individual, organization or household pls get custom groups for 'contact' too.
-    if ($entityType == "Individual" || $entityType == 'Organization' ||
-      $entityType == 'Household'
-    ) {
-      $in = "'$entityType', 'Contact'";
-    }
-    elseif (strpos($entityType, "'") !== FALSE) {
-      // this allows the calling function to send in multiple entity types
-      $in = $entityType;
-    }
-    else {
-      // quote it
-      $in = "'$entityType'";
+    if (str_contains($entityType, "'")) {
+      // Handle really weird legacy input format
+      $entityType = explode(',', str_replace([' ', "'"], '', $entityType));
     }
 
-    $params = [];
-    $sqlParamKey = 1;
-    $subType = '';
-    if (!empty($subTypes)) {
-      foreach ($subTypes as $key => $subType) {
-        $subTypeClauses[] = self::whereListHas("civicrm_custom_group.extends_entity_column_value", self::validateSubTypeByEntity($entityType, $subType));
+    $filters = [
+      'extends' => $entityType,
+      'is_active' => TRUE,
+    ];
+    if ($subTypes) {
+      foreach ($subTypes as $subType) {
+        $filters['extends_entity_column_value'][] = self::validateSubTypeByEntity($entityType, $subType);
       }
-      $subTypeClause = '(' . implode(' OR ', $subTypeClauses) . ')';
       if (!$onlySubType) {
-        $subTypeClause = '(' . $subTypeClause . '  OR civicrm_custom_group.extends_entity_column_value IS NULL )';
+        $filters['extends_entity_column_value'][] = NULL;
       }
-
-      $strWhere = "
-WHERE civicrm_custom_group.is_active = 1
-  AND civicrm_custom_field.is_active = 1
-  AND civicrm_custom_group.extends IN ($in)
-  AND $subTypeClause
-";
       if ($subName) {
-        $strWhere .= " AND civicrm_custom_group.extends_entity_column_id = %{$sqlParamKey}";
-        $params[$sqlParamKey] = [$subName, 'String'];
-        $sqlParamKey = $sqlParamKey + 1;
+        $filters['extends_entity_column_id'] = $subName;
       }
     }
-    else {
-      $strWhere = "
-WHERE civicrm_custom_group.is_active = 1
-  AND civicrm_custom_field.is_active = 1
-  AND civicrm_custom_group.extends IN ($in)
-";
-      if (!$returnAll) {
-        $strWhere .= "AND civicrm_custom_group.extends_entity_column_value IS NULL";
-      }
+    elseif (!$returnAll) {
+      $filters['extends_entity_column_value'] = NULL;
     }
-
     if ($groupID > 0) {
-      // since we want a specific group id we add it to the where clause
-      $strWhere .= " AND civicrm_custom_group.id = %{$sqlParamKey}";
-      $params[$sqlParamKey] = [$groupID, 'Integer'];
+      $filters['id'] = $groupID;
     }
     elseif (!$groupID) {
       // since groupID is false we need to show all Inline groups
-      $strWhere .= " AND civicrm_custom_group.style = 'Inline'";
+      $filters['style'] = 'Inline';
     }
-    if ($checkPermission) {
-      // ensure that the user has access to these custom groups
-      $strWhere .= " AND " .
-        CRM_Core_Permission::customGroupClause($checkPermission,
-          'civicrm_custom_group.'
-        );
-    }
-
     if ($showPublicOnly) {
-      $strWhere .= 'AND civicrm_custom_group.is_public = 1';
-    }
-
-    $orderBy = '
-ORDER BY civicrm_custom_group.weight,
-         civicrm_custom_group.title,
-         civicrm_custom_field.weight,
-         civicrm_custom_field.label
-';
-
-    // final query string
-    $queryString = "$strSelect $strFrom $strWhere $orderBy";
-
-    // lets see if we can retrieve the groupTree from cache
-    $cacheString = $queryString;
-    if ($groupID > 0) {
-      $cacheString .= "_{$groupID}";
-    }
-    else {
-      $cacheString .= "_Inline";
+      $filters['is_public'] = TRUE;
     }
 
-    $multipleFieldGroups = [];
-    $cacheKey = "CRM_Core_DAO_CustomGroup_Query " . md5($cacheString);
-    $multipleFieldGroupCacheKey = "CRM_Core_DAO_CustomGroup_QueryMultipleFields " . md5($cacheString);
-    $cache = CRM_Utils_Cache::singleton();
-    if ($fromCache) {
-      $groupTree = $cache->get($cacheKey);
-      $multipleFieldGroups = $cache->get($multipleFieldGroupCacheKey);
-    }
+    [$multipleFieldGroups, $groupTree] = self::buildLegacyGroupTree($filters, $checkPermission, $subTypes);
 
-    if (empty($groupTree)) {
-      [$multipleFieldGroups, $groupTree] = self::buildGroupTree($entityType, $toReturn, $subTypes, $queryString, $params, $subType);
-
-      $cache->set($cacheKey, $groupTree);
-      $cache->set($multipleFieldGroupCacheKey, $multipleFieldGroups);
-    }
     // entitySelectClauses is an array of select clauses for custom value tables which are not multiple
     // and have data for the given entities. $entityMultipleSelectClauses is the same for ones with multiple
     $entitySingleSelectClauses = $entityMultipleSelectClauses = $groupTree['info']['select'] = [];
@@ -576,11 +548,7 @@ public static function getTree(
     // now that we have all the groups and fields, lets get the values
     // since we need to know the table and field names
     // add info to groupTree
-
-    if (isset($groupTree['info']) && !empty($groupTree['info']) &&
-      !empty($groupTree['info']['tables']) && $singleRecord != 'new'
-    ) {
-      $select = $from = $where = [];
+    if (!empty($groupTree['info']['tables']) && $singleRecord != 'new') {
       $groupTree['info']['where'] = NULL;
 
       foreach ($groupTree['info']['tables'] as $table => $fields) {
@@ -620,9 +588,62 @@ public static function getTree(
   }
 
   /**
-   * Clean and validate the filter before it is used in a db query.
+   * Recreates legacy formatting for getTree but uses the new cached function to retrieve data.
+   * @deprecated only used by legacy function.
+   */
+  private static function buildLegacyGroupTree($filters, $permission, $subTypes) {
+    $multipleFieldGroups = [];
+    $customValueTables = [];
+    $customGroups = self::getAll($filters, $permission ?: NULL);
+    foreach ($customGroups as &$group) {
+      self::formatLegacyDbValues($group);
+      if ($group['is_multiple']) {
+        $multipleFieldGroups[$group['id']] = $group['table_name'];
+      }
+      // CRM-5507 - Hard to know what this was supposed to do but this faithfully recreates
+      // whatever it was doing before the refactor, which was probably broken anyway.
+      if (!empty($subTypes[0])) {
+        $group['subtype'] = self::validateSubTypeByEntity(CRM_Utils_Array::first((array) $filters['extends']), $subTypes[0]);
+      }
+      foreach ($group['fields'] as &$field) {
+        self::formatLegacyDbValues($field);
+        $customValueTables[$group['table_name']][$field['column_name']] = 1;
+      }
+    }
+    $customGroups['info'] = ['tables' => $customValueTables];
+    return [$multipleFieldGroups, $customGroups];
+  }
+
+  /**
+   * Recreates the crude string-only format originally produced by self::getTree.
+   * @deprecated only used by legacy functions.
+   */
+  private static function formatLegacyDbValues(array &$values): void {
+    foreach ($values as $key => $value) {
+      if ($key === 'fields') {
+        continue;
+      }
+      if (is_null($value)) {
+        unset($values[$key]);
+        continue;
+      }
+      if (is_bool($value)) {
+        $value = (int) $value;
+      }
+      if (is_array($value)) {
+        $value = CRM_Utils_Array::implodePadded($value);
+      }
+      $values[$key] = (string) $value;
+    }
+  }
+
+  /**
+   * Validates contact subtypes and event types.
    *
-   * @internal this will be private again soon.
+   * Performs case-insensitive matching of strings and outputs the correct case.
+   * e.g. an input of "meeting" would output "Meeting".
+   *
+   * For all other entities, it doesn't validate except to check the subtype is an integer.
    *
    * @param string $entityType
    * @param string $subType
@@ -630,48 +651,39 @@ public static function getTree(
    * @return string
    * @throws \CRM_Core_Exception
    */
-  public static function validateSubTypeByEntity($entityType, $subType) {
+  private static function validateSubTypeByEntity($entityType, $subType) {
     $subType = trim($subType, CRM_Core_DAO::VALUE_SEPARATOR);
     if (is_numeric($subType)) {
       return $subType;
     }
 
     $contactTypes = CRM_Contact_BAO_ContactType::basicTypeInfo(TRUE);
-    $contactTypes = array_merge($contactTypes, ['Event' => 1]);
+    $contactTypes['Contact'] = 1;
 
-    if ($entityType != 'Contact' && !array_key_exists($entityType, $contactTypes)) {
+    if ($entityType === 'Event') {
+      $subTypes = CRM_Core_OptionGroup::values('event_type', TRUE, FALSE, FALSE, NULL, 'name');
+    }
+    elseif (!array_key_exists($entityType, $contactTypes)) {
       throw new CRM_Core_Exception('Invalid Entity Filter');
     }
-    $subTypes = CRM_Contact_BAO_ContactType::subTypeInfo($entityType, TRUE);
-    $subTypes = array_merge($subTypes, CRM_Event_PseudoConstant::eventType());
+    else {
+      $subTypes = CRM_Contact_BAO_ContactType::subTypeInfo($entityType, TRUE);
+      $subTypes = array_column($subTypes, 'name', 'name');
+    }
     // When you create a new contact type it gets saved in mixed case in the database.
     // Eg. "Service User" becomes "Service_User" in civicrm_contact_type.name
     // But that field does not differentiate case (eg. you can't add Service_User and service_user because mysql will report a duplicate error)
     // webform_civicrm and some other integrations pass in the name as lowercase to API3 Contact.duplicatecheck
     // Since we can't actually have two strings with different cases in the database perform a case-insensitive search here:
-    $subTypes = array_change_key_case($subTypes, CASE_LOWER);
-    if (!array_key_exists(mb_strtolower($subType), $subTypes)) {
+    $subTypesByName = array_combine($subTypes, $subTypes);
+    $subTypesByName = array_change_key_case($subTypesByName, CASE_LOWER);
+    $subTypesByKey = array_change_key_case($subTypes, CASE_LOWER);
+    $subTypeKey = mb_strtolower($subType);
+    if (!array_key_exists($subTypeKey, $subTypesByKey) && !in_array($subTypeKey, $subTypesByName)) {
       \Civi::log()->debug("entityType: {$entityType}; subType: {$subType}");
       throw new CRM_Core_Exception('Invalid Filter');
     }
-    return $subType;
-  }
-
-  /**
-   * Suppose you have a SQL column, $column, which includes a delimited list, and you want
-   * a WHERE condition for rows that include $value. Use whereListHas().
-   *
-   * @param string $column
-   * @param string $value
-   * @param string $delimiter
-   * @return string
-   *   SQL condition.
-   */
-  private static function whereListHas($column, $value, $delimiter = CRM_Core_DAO::VALUE_SEPARATOR) {
-    // ?
-    $bareValue = trim($value, $delimiter);
-    $escapedValue = CRM_Utils_Type::escape("%{$delimiter}{$bareValue}{$delimiter}%", 'String', FALSE);
-    return "($column LIKE \"$escapedValue\")";
+    return $subTypesByName[$subTypeKey] ?? $subTypesByKey[$subTypeKey];
   }
 
   /**
@@ -923,13 +935,14 @@ public static function buildCustomFieldData($dao, &$groupTree, $table, $groupID,
    *   title
    */
   public static function getTitle($id) {
-    return CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $id, 'title');
+    return self::getAll()[$id]['title'] ?? NULL;
   }
 
   /**
-   * Get custom group details for a group.
+   * @deprecated Legacy function
    *
-   * An array containing custom group details (including their custom field) is returned.
+   * @see CRM_Core_BAO_CustomGroup::getAll()
+   * for a better alternative.
    *
    * @param int $groupId
    *   Group id whose details are needed.
@@ -937,146 +950,48 @@ public static function getTitle($id) {
    *   Is this field searchable.
    * @param array $extends
    *   Which table does it extend if any.
-   *
    * @param bool $inSelector
    *
    * @return array
    *   array consisting of all group and field details
    */
   public static function &getGroupDetail($groupId = NULL, $searchable = NULL, &$extends = NULL, $inSelector = NULL) {
-    // create a new tree
-    $groupTree = [];
-
-    // using tableData to build the queryString
-    $tableData = [
-      'civicrm_custom_field' => [
-        'id',
-        'label',
-        'data_type',
-        'html_type',
-        'default_value',
-        'attributes',
-        'is_required',
-        'help_pre',
-        'help_post',
-        'options_per_line',
-        'is_searchable',
-        'start_date_years',
-        'end_date_years',
-        'is_search_range',
-        'date_format',
-        'time_format',
-        'note_columns',
-        'note_rows',
-        'column_name',
-        'is_view',
-        'option_group_id',
-        'in_selector',
-      ],
-      'civicrm_custom_group' => [
-        'id',
-        'name',
-        'title',
-        'help_pre',
-        'help_post',
-        'collapse_display',
-        'collapse_adv_display',
-        'extends',
-        'extends_entity_column_value',
-        'table_name',
-        'is_multiple',
-      ],
+    $groupFilters = [
+      'is_active' => TRUE,
     ];
-
-    // create select
-    $s = [];
-    foreach ($tableData as $tableName => $tableColumn) {
-      foreach ($tableColumn as $columnName) {
-        $s[] = "{$tableName}.{$columnName} as {$tableName}_{$columnName}";
-      }
-    }
-    $select = 'SELECT ' . implode(', ', $s);
-    $params = [];
-    // from, where, order by
-    $from = " FROM civicrm_custom_field, civicrm_custom_group";
-    $where = " WHERE civicrm_custom_field.custom_group_id = civicrm_custom_group.id
-                            AND civicrm_custom_group.is_active = 1
-                            AND civicrm_custom_field.is_active = 1 ";
+    $fieldFilters = [];
     if ($groupId) {
-      $params[1] = [$groupId, 'Integer'];
-      $where .= " AND civicrm_custom_group.id = %1";
+      $groupFilters['id'] = $groupId;
     }
-
     if ($searchable) {
-      $where .= " AND civicrm_custom_field.is_searchable = 1";
+      $fieldFilters['is_searchable'] = TRUE;
     }
-
     if ($inSelector) {
-      $where .= " AND civicrm_custom_field.in_selector = 1 AND civicrm_custom_group.is_multiple = 1 ";
+      $groupFilters['is_multiple'] = TRUE;
+      $fieldFilters['in_selector'] = TRUE;
     }
-
     if ($extends) {
-      $clause = [];
-      foreach ($extends as $e) {
-        $clause[] = "civicrm_custom_group.extends = '$e'";
-      }
-      $where .= " AND ( " . implode(' OR ', $clause) . " ) ";
+      $groupFilters['extends'] = $extends;
 
       //include case activities customdata if case is enabled
       if (in_array('Activity', $extends)) {
-        $extendValues = implode(',', array_keys(CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'label', TRUE)));
-        $where .= " AND ( civicrm_custom_group.extends_entity_column_value IS NULL OR REPLACE( civicrm_custom_group.extends_entity_column_value, %2, ' ') IN ($extendValues) ) ";
-        $params[2] = [CRM_Core_DAO::VALUE_SEPARATOR, 'String'];
+        $extendValues = array_keys(CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'label', TRUE));
+        $extendValues[] = NULL;
+        $groupFilters['extends_entity_column_value'] = $extendValues;
       }
     }
 
     // ensure that the user has access to these custom groups
-    $where .= " AND " .
-      CRM_Core_Permission::customGroupClause(CRM_Core_Permission::VIEW,
-        'civicrm_custom_group.'
-      );
-
-    $orderBy = " ORDER BY civicrm_custom_group.weight, civicrm_custom_field.weight";
-
-    // final query string
-    $queryString = $select . $from . $where . $orderBy;
-
-    // dummy dao needed
-    $crmDAO = CRM_Core_DAO::executeQuery($queryString, $params);
+    $groupTree = self::getAll($groupFilters, CRM_Core_Permission::VIEW);
 
     // process records
-    while ($crmDAO->fetch()) {
-      $groupId = $crmDAO->civicrm_custom_group_id;
-      $fieldId = $crmDAO->civicrm_custom_field_id;
-
-      // create an array for groups if it does not exist
-      if (!array_key_exists($groupId, $groupTree)) {
-        $groupTree[$groupId] = [];
-        $groupTree[$groupId]['id'] = $groupId;
-
-        foreach ($tableData['civicrm_custom_group'] as $v) {
-          $fullField = "civicrm_custom_group_" . $v;
-
-          if ($v == 'id' || is_null($crmDAO->$fullField)) {
-            continue;
-          }
-
-          $groupTree[$groupId][$v] = $crmDAO->$fullField;
-        }
-
-        $groupTree[$groupId]['fields'] = [];
+    foreach ($groupTree as &$group) {
+      self::formatLegacyDbValues($group);
+      foreach ($group['fields'] as &$field) {
+        self::formatLegacyDbValues($field);
       }
-
-      // add the fields now (note - the query row will always contain a field)
-      $groupTree[$groupId]['fields'][$fieldId] = [];
-      $groupTree[$groupId]['fields'][$fieldId]['id'] = $fieldId;
-
-      foreach ($tableData['civicrm_custom_field'] as $v) {
-        $fullField = "civicrm_custom_field_" . $v;
-        if ($v == 'id' || is_null($crmDAO->$fullField)) {
-          continue;
-        }
-        $groupTree[$groupId]['fields'][$fieldId][$v] = $crmDAO->$fullField;
+      if ($fieldFilters) {
+        $group['fields'] = array_column(CRM_Utils_Array::findAll($group['fields'], $fieldFilters), NULL, 'id');
       }
     }
 
@@ -1084,11 +999,7 @@ public static function &getGroupDetail($groupId = NULL, $searchable = NULL, &$ex
   }
 
   /**
-   * @param $entityType
-   * @param $path
-   * @param string $cidToken
-   *
-   * @return array
+   * @deprecated since 5.71, will be removed around 5.85
    */
   public static function &getActiveGroups($entityType, $path, $cidToken = '%%cid%%') {
     // for Group's
@@ -1098,7 +1009,7 @@ public static function &getActiveGroups($entityType, $path, $cidToken = '%%cid%%
     $customGroupDAO->whereAdd("style IN ('Tab', 'Tab with table')");
     $customGroupDAO->whereAdd("is_active = 1");
 
-    // add whereAdd for entity type
+    // Emits a noisy deprecation notice
     self::_addWhereAdd($customGroupDAO, $entityType, $cidToken);
 
     $groups = [];
@@ -1128,19 +1039,11 @@ public static function &getActiveGroups($entityType, $path, $cidToken = '%%cid%%
   }
 
   /**
-   * Get the table name for the entity type
-   * currently if entity type is 'Contact', 'Individual', 'Household', 'Organization'
-   * tableName is 'civicrm_contact'
-   *
-   * @param string $entityType
-   *   What entity are we extending here ?.
-   *
-   * @return string
-   *
-   *
-   * @see _apachesolr_civiAttachments_dereference_file_parent
+   * Unused function.
+   * @deprecated since 5.71 will be removed around 5.85
    */
   public static function getTableNameByEntityName($entityType) {
+    CRM_Core_Error::deprecatedFunctionWarning('CoreUtil::getTableName');
     switch ($entityType) {
       case 'Contact':
       case 'Individual':
@@ -1154,9 +1057,7 @@ public static function getTableNameByEntityName($entityType) {
   }
 
   /**
-   * Get a list of custom groups which extend a given entity type.
-   * If there are custom-groups which only apply to certain subtypes,
-   * those WILL be included.
+   * @deprecated since 5.71 will be removed around 5.85
    *
    * @param string $entityType
    *
@@ -1164,22 +1065,16 @@ public static function getTableNameByEntityName($entityType) {
    */
   public static function getAllCustomGroupsByBaseEntity($entityType) {
     $customGroupDAO = new CRM_Core_DAO_CustomGroup();
+    // Emits a noisy deprecation notice
     self::_addWhereAdd($customGroupDAO, $entityType, NULL, TRUE);
     return $customGroupDAO;
   }
 
   /**
-   * Add the whereAdd clause for the DAO depending on the type of entity
-   * the custom group is extending.
-   *
-   * @param object $customGroupDAO
-   * @param string $entityType
-   *   What entity are we extending here ?.
-   *
-   * @param int $entityID
-   * @param bool $allSubtypes
+   * @deprecated since 5.71 will be removed around 5.85
    */
   private static function _addWhereAdd(&$customGroupDAO, $entityType, $entityID = NULL, $allSubtypes = FALSE) {
+    CRM_Core_Error::deprecatedFunctionWarning('CRM_Core_BAO_CustomGroup::getAll');
     $addSubtypeClause = FALSE;
     // This function isn't really accessible with user data but since the string
     // is not passed as a param to the query CRM_Core_DAO::escapeString seems like a harmless
@@ -1296,8 +1191,8 @@ public static function deleteRecord(array $record) {
    * @param bool $inactiveNeeded
    * @param int $action
    */
-  public static function setDefaults(&$groupTree, &$defaults, $viewMode = FALSE, $inactiveNeeded = FALSE, $action = CRM_Core_Action::NONE) {
-    foreach ($groupTree as $id => $group) {
+  public static function setDefaults($groupTree, &$defaults, $viewMode = FALSE, $inactiveNeeded = FALSE, $action = CRM_Core_Action::NONE) {
+    foreach ($groupTree as $group) {
       if (!isset($group['fields'])) {
         continue;
       }
@@ -1364,6 +1259,11 @@ public static function setDefaults(&$groupTree, &$defaults, $viewMode = FALSE, $
                 }
               }
               else {
+                if ($field['html_type'] === 'Autocomplete-Select') {
+                  $checkedValue = array_filter((array) \CRM_Utils_Array::explodePadded($value));
+                  $defaults[$elementName] = implode(',', $checkedValue);
+                  continue;
+                }
                 // Values may be "array strings" or actual arrays. Handle both.
                 if (is_array($value) && count($value)) {
                   CRM_Utils_Array::formatArrayKeys($value);
@@ -1374,7 +1274,7 @@ public static function setDefaults(&$groupTree, &$defaults, $viewMode = FALSE, $
                 }
                 foreach ($customOption as $val) {
                   if (in_array($val['value'], $checkedValue)) {
-                    if ($field['html_type'] == 'CheckBox') {
+                    if ($field['html_type'] === 'CheckBox') {
                       $defaults[$elementName][$val['value']] = 1;
                     }
                     else {
@@ -1443,7 +1343,7 @@ public static function setDefaults(&$groupTree, &$defaults, $viewMode = FALSE, $
   }
 
   /**
-   * Old function only called from one place...
+   * @deprecated since 5.71 will be remvoed around 5.77
    * @see CRM_Dedupe_Finder::formatParams
    *
    * @param array $groupTree
@@ -1451,6 +1351,7 @@ public static function setDefaults(&$groupTree, &$defaults, $viewMode = FALSE, $
    * @param bool $skipFile
    */
   public static function postProcess(&$groupTree, &$params, $skipFile = FALSE) {
+    CRM_Core_Error::deprecatedFunctionWarning('no alternative');
     // Get the Custom form values and groupTree
     foreach ($groupTree as $groupID => $group) {
       if ($groupID === 'info') {
@@ -1554,8 +1455,8 @@ public static function postProcess(&$groupTree, &$params, $skipFile = FALSE) {
    *
    * @throws \CRM_Core_Exception
    */
-  public static function buildQuickForm(&$form, &$groupTree, $inactiveNeeded = FALSE, $prefix = '') {
-    $form->assign_by_ref("{$prefix}groupTree", $groupTree);
+  public static function buildQuickForm($form, $groupTree, $inactiveNeeded = FALSE, $prefix = '') {
+    $form->assign("{$prefix}groupTree", $groupTree);
 
     foreach ($groupTree as $id => $group) {
       foreach ($group['fields'] as $field) {
@@ -1669,32 +1570,19 @@ public static function extractGetParams(&$form, $type) {
   }
 
   /**
-   * Check the type of custom field type (eg: Used for Individual, Contribution, etc)
-   * this function is used to get the custom fields of a type (eg: Used for Individual, Contribution, etc )
+   * @deprecated Silly function that does almost nothing.
+   * @see CRM_Core_BAO_CustomField::getField()
+   * for a more useful alternative.
    *
    * @param int $customFieldId
-   *   Custom field id.
    * @param array $removeCustomFieldTypes
    *   Remove custom fields of a type eg: array("Individual") ;.
    *
    * @return bool
-   *   false if it matches else true
-   *
-   * @throws \CRM_Core_Exception
    */
   public static function checkCustomField($customFieldId, $removeCustomFieldTypes) {
-    $query = 'SELECT cg.extends as extends
-                  FROM civicrm_custom_group as cg, civicrm_custom_field as cf
-                  WHERE cg.id = cf.custom_group_id
-                    AND cf.id =' .
-      CRM_Utils_Type::escape($customFieldId, 'Integer');
-
-    $extends = CRM_Core_DAO::singleValueQuery($query);
-
-    if (in_array($extends, $removeCustomFieldTypes)) {
-      return FALSE;
-    }
-    return TRUE;
+    $extends = CRM_Core_BAO_CustomField::getField($customFieldId)['custom_group']['extends'];
+    return !in_array($extends, $removeCustomFieldTypes);
   }
 
   /**
@@ -1816,14 +1704,7 @@ public static function formatGroupTree($groupTree, $groupCount = 1, &$form = NUL
         $form->assign('qfKey', $qf);
         Civi::cache('customData')->set($qf, $formValues);
       }
-
-      // hack for field type File
-      $formUploadNames = $form->get('uploadNames');
-      if (is_array($formUploadNames)) {
-        $uploadNames = array_unique(array_merge($formUploadNames, $uploadNames));
-      }
-
-      $form->set('uploadNames', $uploadNames);
+      $form->registerFileField($uploadNames);
     }
 
     return $formattedGroupTree;
@@ -1944,39 +1825,30 @@ public static function buildCustomDataView($form, $groupTree, $returnCount = FAL
   }
 
   /**
-   * Get the custom group titles by custom field ids.
+   * @deprecated Silly function that shouldn't exist.
+   *
+   * @see CRM_Core_BAO_CustomField::getField()
+   * for a better alternative.
    *
    * @param array $fieldIds
    *   Array of custom field ids.
    *
-   * @return array|NULL
+   * @return array
    *   array consisting of groups and fields labels with ids.
    */
-  public static function getGroupTitles($fieldIds) {
-    if (!is_array($fieldIds) && empty($fieldIds)) {
-      return NULL;
-    }
-
+  public static function getGroupTitles(array $fieldIds): array {
     $groupLabels = [];
-    $fIds = "(" . implode(',', $fieldIds) . ")";
-
-    $query = "
-SELECT  civicrm_custom_group.id as groupID, civicrm_custom_group.title as groupTitle,
-        civicrm_custom_field.label as fieldLabel, civicrm_custom_field.id as fieldID
-  FROM  civicrm_custom_group, civicrm_custom_field
- WHERE  civicrm_custom_group.id = civicrm_custom_field.custom_group_id
-   AND  civicrm_custom_field.id IN {$fIds}";
-
-    $dao = CRM_Core_DAO::executeQuery($query);
-    while ($dao->fetch()) {
-      $groupLabels[$dao->fieldID] = [
-        'fieldID' => $dao->fieldID,
-        'fieldLabel' => $dao->fieldLabel,
-        'groupID' => $dao->groupID,
-        'groupTitle' => $dao->groupTitle,
-      ];
+    foreach ($fieldIds as $fieldId) {
+      $field = CRM_Core_BAO_CustomField::getField($fieldId);
+      if ($field) {
+        $groupLabels[$fieldId] = [
+          'fieldID' => (string) $fieldId,
+          'fieldLabel' => $field['label'],
+          'groupID' => (string) $field['custom_group']['id'],
+          'groupTitle' => $field['custom_group']['title'],
+        ];
+      }
     }
-
     return $groupLabels;
   }
 
@@ -2203,35 +2075,22 @@ public static function buildOptions($fieldName, $context = NULL, $props = []) {
   }
 
   /**
+   * Returns TRUE if this is a multivalued group which has reached the max for a given entity.
+   *
    * @param int $customGroupId
    * @param int $entityId
-   *
-   * @return bool
    */
-  public static function hasReachedMaxLimit($customGroupId, $entityId) {
-    // check whether the group is multiple
-    $isMultiple = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $customGroupId, 'is_multiple');
-    $isMultiple = (bool) $isMultiple;
-    $hasReachedMax = FALSE;
-    if ($isMultiple &&
-      ($maxMultiple = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $customGroupId, 'max_multiple'))
-    ) {
-      if (!$maxMultiple) {
-        $hasReachedMax = FALSE;
-      }
-      else {
-        $tableName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $customGroupId, 'table_name');
-        // count the number of entries for a entity
-        $sql = "SELECT COUNT(id) FROM {$tableName} WHERE entity_id = %1";
-        $params = [1 => [$entityId, 'Integer']];
-        $count = CRM_Core_DAO::singleValueQuery($sql, $params);
-
-        if ($count >= $maxMultiple) {
-          $hasReachedMax = TRUE;
-        }
-      }
-    }
-    return $hasReachedMax;
+  public static function hasReachedMaxLimit($customGroupId, $entityId): bool {
+    $customGroup = self::getGroup(['id' => $customGroupId]);
+    $maxMultiple = $customGroup['max_multiple'] ?? NULL;
+    if ($maxMultiple && $customGroup['is_multiple']) {
+      // count the number of entries for entity
+      $sql = "SELECT COUNT(id) FROM {$customGroup['table_name']} WHERE entity_id = %1";
+      $params = [1 => [$entityId, 'Integer']];
+      $count = CRM_Core_DAO::singleValueQuery($sql, $params);
+      return $count >= $maxMultiple;
+    }
+    return FALSE;
   }
 
   /**
@@ -2250,93 +2109,13 @@ public static function getMultipleFieldGroup() {
     return $multipleGroup;
   }
 
-  /**
-   * Build the metadata tree for the custom group.
-   *
-   * @internal - function is temporarily public but will be private again
-   * once separated function disentangled.
-   *
-   * @param string $entityType
-   * @param array $toReturn
-   * @param array $subTypes
-   * @param string $queryString
-   * @param array $params
-   * @param string $subType
-   *
-   * @return array
-   * @throws \CRM_Core_Exception
-   */
-  public static function buildGroupTree($entityType, $toReturn, $subTypes, $queryString, $params, $subType) {
-    $groupTree = $multipleFieldGroups = [];
-    $crmDAO = CRM_Core_DAO::executeQuery($queryString, $params);
-    $customValueTables = [];
-
-    // process records
-    while ($crmDAO->fetch()) {
-      // get the id's
-      $groupID = $crmDAO->civicrm_custom_group_id;
-      $fieldId = $crmDAO->civicrm_custom_field_id;
-      if ($crmDAO->civicrm_custom_group_is_multiple) {
-        $multipleFieldGroups[$groupID] = $crmDAO->civicrm_custom_group_table_name;
-      }
-      // create an array for groups if it does not exist
-      if (!array_key_exists($groupID, $groupTree)) {
-        $groupTree[$groupID] = [];
-        $groupTree[$groupID]['id'] = $groupID;
-
-        // populate the group information
-        foreach ($toReturn['custom_group'] as $fieldName) {
-          $fullFieldName = "civicrm_custom_group_$fieldName";
-          if ($fieldName == 'id' ||
-            is_null($crmDAO->$fullFieldName)
-          ) {
-            continue;
-          }
-          // CRM-5507
-          // This is an old bit of code - per the CRM number & probably does not work reliably if
-          // that one contact sub-type exists.
-          if ($fieldName == 'extends_entity_column_value' && !empty($subTypes[0])) {
-            $groupTree[$groupID]['subtype'] = self::validateSubTypeByEntity($entityType, $subType);
-          }
-          $groupTree[$groupID][$fieldName] = $crmDAO->$fullFieldName;
-        }
-        $groupTree[$groupID]['fields'] = [];
-
-        $customValueTables[$crmDAO->civicrm_custom_group_table_name] = [];
-      }
-
-      // add the fields now (note - the query row will always contain a field)
-      // we only reset this once, since multiple values come is as multiple rows
-      if (!array_key_exists($fieldId, $groupTree[$groupID]['fields'])) {
-        $groupTree[$groupID]['fields'][$fieldId] = [];
-      }
-
-      $customValueTables[$crmDAO->civicrm_custom_group_table_name][$crmDAO->civicrm_custom_field_column_name] = 1;
-      $groupTree[$groupID]['fields'][$fieldId]['id'] = $fieldId;
-      // populate information for a custom field
-      foreach ($toReturn['custom_field'] as $fieldName) {
-        $fullFieldName = "civicrm_custom_field_$fieldName";
-        if ($fieldName == 'id' ||
-          is_null($crmDAO->$fullFieldName)
-        ) {
-          continue;
-        }
-        $groupTree[$groupID]['fields'][$fieldId][$fieldName] = $crmDAO->$fullFieldName;
-      }
-    }
-
-    if (!empty($customValueTables)) {
-      $groupTree['info'] = ['tables' => $customValueTables];
-    }
-    return [$multipleFieldGroups, $groupTree];
-  }
-
   /**
    * Use APIv4 getFields (or self::getExtendsEntityColumnValueOptions) instead of this beast.
-   * @deprecated
+   * @deprecated as of 5.72 use getExtendsEntityColumnValueOptions - will be removed by 5.78
    * @return array
    */
   public static function getSubTypes(): array {
+    CRM_Core_Error::deprecatedFunctionWarning('CRM_Core_BAO_CustomGroup::getExtendsEntityColumnValueOptions');
     $sel2 = [];
     $activityType = CRM_Activity_BAO_Activity::buildOptions('activity_type_id', 'search');
 
diff --git a/www/modules/civicrm/CRM/Core/BAO/CustomValue.php b/www/modules/civicrm/CRM/Core/BAO/CustomValue.php
index 8b965803d..f9537ee37 100644
--- a/www/modules/civicrm/CRM/Core/BAO/CustomValue.php
+++ b/www/modules/civicrm/CRM/Core/BAO/CustomValue.php
@@ -15,10 +15,12 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
+use Civi\Api4\Event\AuthorizeRecordEvent;
+
 /**
  * Business objects for managing custom data values.
  */
-class CRM_Core_BAO_CustomValue extends CRM_Core_DAO {
+class CRM_Core_BAO_CustomValue extends CRM_Core_DAO implements \Civi\Core\HookInterface {
 
   /**
    * Validate a value against a CustomField type.
@@ -192,7 +194,7 @@ public static function fixCustomFieldValue(&$formValues) {
    */
   public static function deleteCustomValue($customValueID, $customGroupID) {
     // first we need to find custom value table, from custom group ID
-    $tableName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $customGroupID, 'table_name');
+    $tableName = CRM_Core_BAO_CustomGroup::getGroup(['id' => $customGroupID])['table_name'];
 
     // Retrieve the $entityId so we can pass that to the hook.
     $entityID = (int) CRM_Core_DAO::singleValueQuery("SELECT entity_id FROM {$tableName} WHERE id = %1", [
@@ -230,36 +232,28 @@ public function addSelectWhereClause(string $entityName = NULL, int $userId = NU
   }
 
   /**
-   * Special checkAccess function for multi-record custom pseudo-entities
-   *
-   * @param string $entityName
-   *   APIv4-style entity name e.g. 'Custom_Foobar'
-   * @param string $action
-   * @param array $record
-   * @param int $userID
-   *   Contact ID of the active user (whose access we must check). 0 for anonymous.
-   * @return bool
-   *   TRUE if granted. FALSE if prohibited. NULL if indeterminate.
+   * Access check for multi-record custom pseudo-entities
+   * @see \Civi\Api4\Utils\CoreUtil::checkAccessRecord
    */
-  public static function _checkAccess(string $entityName, string $action, array $record, int $userID): ?bool {
+  public static function on_civi_api4_authorizeRecord(AuthorizeRecordEvent $e): void {
+    $groupName = \Civi\Api4\Utils\CoreUtil::getCustomGroupName($e->getEntityName());
+    if (!$groupName) {
+      return;
+    }
+
     // This check implements two rules: you must have access to the specific custom-data-group - and to the underlying record (e.g. Contact).
+    $record = $e->getRecord();
+    $userID = $e->getUserID();
+    $action = $e->getActionName();
 
     // Expecting APIv4-style entity name
-    $groupName = \Civi\Api4\Utils\CoreUtil::getCustomGroupName($entityName);
     $extends = \CRM_Core_BAO_CustomGroup::getEntityForGroup($groupName);
     $id = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $groupName, 'id', 'name');
-    if (!$groupName) {
-      // $groupName is required but the function signature has to match the parent.
-      throw new CRM_Core_Exception('Missing required group-name in CustomValue::checkAccess');
-    }
-
-    if (empty($extends) || empty($id)) {
-      throw new CRM_Core_Exception('Received invalid group-name in CustomValue::checkAccess');
-    }
 
     $actionType = $action === 'get' ? CRM_Core_Permission::VIEW : CRM_Core_Permission::EDIT;
     if (!\CRM_Core_BAO_CustomGroup::checkGroupAccess($id, $actionType, $userID)) {
-      return FALSE;
+      $e->setAuthorized(FALSE);
+      return;
     }
 
     $eid = $record['entity_id'] ?? NULL;
@@ -270,7 +264,7 @@ public static function _checkAccess(string $entityName, string $action, array $r
 
     // Do we have access to the target record?
     $delegatedAction = $action === 'get' ? 'get' : 'update';
-    return \Civi\Api4\Utils\CoreUtil::checkAccessDelegated($extends, $delegatedAction, ['id' => $eid], $userID);
+    $e->setAuthorized(\Civi\Api4\Utils\CoreUtil::checkAccessDelegated($extends, $delegatedAction, ['id' => $eid], $userID));
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Core/BAO/CustomValueTable.php b/www/modules/civicrm/CRM/Core/BAO/CustomValueTable.php
index 1085eb702..97d07a345 100644
--- a/www/modules/civicrm/CRM/Core/BAO/CustomValueTable.php
+++ b/www/modules/civicrm/CRM/Core/BAO/CustomValueTable.php
@@ -371,8 +371,7 @@ public static function store($params, $entityTable, $entityID, $parentOperation
           'table_name' => $customValue['table_name'],
           'column_name' => $customValue['column_name'],
           // is_multiple refers to the custom group, serialize refers to the field.
-          // @todo is_multiple can be null - does that mean anything different from 0?
-          'is_multiple' => $customValue['is_multiple'] ?? CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $customValue['custom_group_id'], 'is_multiple'),
+          'is_multiple' => (int) ($customValue['is_multiple'] ?? CRM_Core_BAO_CustomGroup::getGroup(['id' => $customValue['custom_group_id']])['is_multiple']),
           'serialize' => $customValue['serialize'] ?? (int) CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomField', $customValue['custom_field_id'], 'serialize'),
           'file_id' => $customValue['file_id'],
         ];
@@ -580,54 +579,30 @@ public static function setValues(&$params) {
     // custom_X => value or custom_X_VALUEID => value (for multiple values), VALUEID == -1, -2 etc for new insertions
     $fieldValues = [];
     foreach ($params as $n => $v) {
-      if ($customFieldInfo = CRM_Core_BAO_CustomField::getKeyID($n, TRUE)) {
-        $fieldID = (int ) $customFieldInfo[0];
-        if (CRM_Utils_Type::escape($fieldID, 'Integer', FALSE) === NULL) {
-          throw new CRM_Core_Exception(ts('field ID needs to be of type Integer for index %1',
-            [1 => $fieldID]
-          ));
-        }
-        if (!array_key_exists($fieldID, $fieldValues)) {
-          $fieldValues[$fieldID] = [];
-        }
+      $customFieldInfo = CRM_Core_BAO_CustomField::getKeyID($n, TRUE);
+      if ($customFieldInfo[0]) {
+        $fieldId = (int) $customFieldInfo[0];
         $id = -1;
         if ($customFieldInfo[1]) {
-          $id = (int ) $customFieldInfo[1];
+          $id = (int) $customFieldInfo[1];
         }
-        $fieldValues[$fieldID][] = [
+        $fieldValues[$fieldId][] = [
           'value' => $v,
           'id' => $id,
         ];
       }
     }
 
-    $fieldIDList = implode(',', array_keys($fieldValues));
-
-    // format it so that we can just use create
-    $sql = "
-SELECT cg.table_name  as table_name ,
-       cg.id          as cg_id      ,
-       cg.is_multiple as is_multiple,
-       cg.extends     as extends,
-       cf.column_name as column_name,
-       cf.id          as cf_id      ,
-       cf.html_type   as html_type  ,
-       cf.data_type   as data_type  ,
-       cf.serialize   as serialize
-FROM   civicrm_custom_group cg,
-       civicrm_custom_field cf
-WHERE  cf.custom_group_id = cg.id
-AND    cf.id IN ( $fieldIDList )
-";
-
-    $dao = CRM_Core_DAO::executeQuery($sql);
     $cvParams = [];
-
-    while ($dao->fetch()) {
-      $dataType = $dao->data_type == 'Date' ? 'Timestamp' : $dao->data_type;
-      foreach ($fieldValues[$dao->cf_id] as $fieldValue) {
+    foreach ($fieldValues as $fieldId => $fieldVals) {
+      $fieldInfo = CRM_Core_BAO_CustomField::getField($fieldId);
+      if (!$fieldInfo) {
+        throw new CRM_Core_Exception("Custom field with id $fieldId not found.");
+      }
+      $dataType = $fieldInfo['data_type'] == 'Date' ? 'Timestamp' : $fieldInfo['data_type'];
+      foreach ($fieldVals as $fieldValue) {
         // Serialize array values
-        if (is_array($fieldValue['value']) && CRM_Core_BAO_CustomField::isSerialized($dao)) {
+        if (is_array($fieldValue['value']) && CRM_Core_BAO_CustomField::isSerialized($fieldInfo)) {
           $fieldValue['value'] = CRM_Utils_Array::implodePadded($fieldValue['value']);
         }
         // Format null values correctly
@@ -657,7 +632,7 @@ public static function setValues(&$params) {
           throw new CRM_Core_Exception(ts('value: %1 is not of the right field data type: %2',
             [
               1 => $fieldValue['value'],
-              2 => $dao->data_type,
+              2 => $fieldInfo['data_type'],
             ]
           ));
         }
@@ -666,13 +641,13 @@ public static function setValues(&$params) {
           'entity_id' => $params['entityID'],
           'value' => $fieldValue['value'],
           'type' => $dataType,
-          'custom_field_id' => $dao->cf_id,
-          'custom_group_id' => $dao->cg_id,
-          'table_name' => $dao->table_name,
-          'column_name' => $dao->column_name,
-          'is_multiple' => $dao->is_multiple,
-          'serialize' => $dao->serialize,
-          'extends' => $dao->extends,
+          'custom_field_id' => $fieldInfo['id'],
+          'custom_group_id' => $fieldInfo['custom_group']['id'],
+          'table_name' => $fieldInfo['custom_group']['table_name'],
+          'column_name' => $fieldInfo['column_name'],
+          'is_multiple' => $fieldInfo['custom_group']['is_multiple'],
+          'serialize' => $fieldInfo['serialize'],
+          'extends' => $fieldInfo['custom_group']['extends'],
         ];
 
         if (!empty($params['id'])) {
@@ -683,18 +658,18 @@ public static function setValues(&$params) {
           $cvParam['file_id'] = $fieldValue['value'];
         }
 
-        if (!array_key_exists($dao->table_name, $cvParams)) {
-          $cvParams[$dao->table_name] = [];
+        if (!array_key_exists($cvParam['table_name'], $cvParams)) {
+          $cvParams[$cvParam['table_name']] = [];
         }
 
-        if (!array_key_exists($fieldValue['id'], $cvParams[$dao->table_name])) {
-          $cvParams[$dao->table_name][$fieldValue['id']] = [];
+        if (!array_key_exists($fieldValue['id'], $cvParams[$cvParam['table_name']])) {
+          $cvParams[$cvParam['table_name']][$fieldValue['id']] = [];
         }
 
         if ($fieldValue['id'] > 0) {
           $cvParam['id'] = $fieldValue['id'];
         }
-        $cvParams[$dao->table_name][$fieldValue['id']][] = $cvParam;
+        $cvParams[$cvParam['table_name']][$fieldValue['id']][] = $cvParam;
       }
     }
 
diff --git a/www/modules/civicrm/CRM/Core/BAO/EntityTag.php b/www/modules/civicrm/CRM/Core/BAO/EntityTag.php
index 97c94866d..dcff52645 100644
--- a/www/modules/civicrm/CRM/Core/BAO/EntityTag.php
+++ b/www/modules/civicrm/CRM/Core/BAO/EntityTag.php
@@ -15,7 +15,7 @@
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
-class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag {
+class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag implements \Civi\Core\HookInterface {
   use CRM_Core_DynamicFKAccessTrait;
 
   /**
@@ -457,7 +457,7 @@ public static function buildOptions($fieldName, $context = NULL, $props = []) {
       $options = [];
       foreach (self::buildOptions($fieldName) as $tableName => $label) {
         $bao = CRM_Core_DAO_AllCoreTables::getClassForTable($tableName);
-        $apiName = CRM_Core_DAO_AllCoreTables::getBriefName($bao);
+        $apiName = CRM_Core_DAO_AllCoreTables::getEntityNameForClass($bao);
         $options[$tableName] = $apiName;
       }
     }
@@ -484,7 +484,7 @@ public static function preDeleteOtherEntity($event) {
     }
     // This is probably fairly mild in terms of helping performance - a case could be made to check if tags
     // exist before deleting (further down) as delete is a locking action.
-    $entity = CRM_Core_DAO_AllCoreTables::getBriefName(get_class($event->object));
+    $entity = CRM_Core_DAO_AllCoreTables::getEntityNameForClass(get_class($event->object));
     if ($entity && !isset(Civi::$statics[__CLASS__]['tagged_entities'][$entity])) {
       $tableName = CRM_Core_DAO_AllCoreTables::getTableForEntityName($entity);
       $used_for = CRM_Core_OptionGroup::values('tag_used_for');
diff --git a/www/modules/civicrm/CRM/Core/BAO/Job.php b/www/modules/civicrm/CRM/Core/BAO/Job.php
index 7ea513273..203839714 100644
--- a/www/modules/civicrm/CRM/Core/BAO/Job.php
+++ b/www/modules/civicrm/CRM/Core/BAO/Job.php
@@ -126,6 +126,14 @@ public static function copy($id, $params = []) {
    */
   public static function parseParameters(?string $parameters): array {
     $parameters = trim($parameters ?? '');
+    if (!empty($parameters) && $parameters[0] === '{') {
+      try {
+        return json_decode($parameters, TRUE, 512, JSON_THROW_ON_ERROR);
+      }
+      catch (JsonException $e) {
+        throw new CRM_Core_Exception('Job parameters error: ' . $e->getMessage() . '. Parameters: ' . print_r($parameters, TRUE));
+      }
+    }
     $result = ['version' => 3];
     $lines = $parameters ? explode("\n", $parameters) : [];
 
diff --git a/www/modules/civicrm/CRM/Core/BAO/LabelFormat.php b/www/modules/civicrm/CRM/Core/BAO/LabelFormat.php
index bb8fa5a92..52939f5db 100644
--- a/www/modules/civicrm/CRM/Core/BAO/LabelFormat.php
+++ b/www/modules/civicrm/CRM/Core/BAO/LabelFormat.php
@@ -391,7 +391,7 @@ public static function getValue($field, &$values, $default = NULL) {
           $f = rtrim($f, '.');
           return (float) (empty($f) ? '0' : $f);
       }
-      return CRM_Utils_Array::value($field, $values, $default);
+      return $values[$field] ?? $default;
     }
     return $default;
   }
diff --git a/www/modules/civicrm/CRM/Core/BAO/Log.php b/www/modules/civicrm/CRM/Core/BAO/Log.php
index e6e83aac4..d1868c791 100644
--- a/www/modules/civicrm/CRM/Core/BAO/Log.php
+++ b/www/modules/civicrm/CRM/Core/BAO/Log.php
@@ -158,31 +158,25 @@ public static function getContactLogCount($contactID) {
    * If logging is not enabled a return value of FALSE means to use the
    * basic change log view.
    *
-   * @return int|FALSE
+   * @return int|false
    *   report id of Contact Logging Report (Summary)
    */
   public static function useLoggingReport() {
-    if (!\Civi::settings()->get('logging')) {
+    $loggingSchema = new CRM_Logging_Schema();
+    if (!$loggingSchema->isEnabled()) {
       return FALSE;
     }
-
-    $loggingSchema = new CRM_Logging_Schema();
-
-    if ($loggingSchema->isEnabled()) {
-      $params = ['report_id' => 'logging/contact/summary'];
-      $instance = [];
-      CRM_Report_BAO_ReportInstance::retrieve($params, $instance);
-
-      if (!empty($instance) &&
-        (empty($instance['permission']) ||
-          (!empty($instance['permission']) && CRM_Core_Permission::check($instance['permission']))
-        )
-      ) {
-        return $instance['id'];
-      }
+    try {
+      // Use civicrm_api4 wrapper as it will exception rather than fatal if civi-report disabled.
+      return civicrm_api4('ReportInstance', 'get', [
+        'where' => [['report_id', '=', 'logging/contact/summary']],
+      ])->first()['id'] ?? FALSE;
+    }
+    catch (CRM_Core_Exception $e) {
+      // Either CiviReport is disabled or the contact does not have permission to
+      // view the summary report. Return FALSE to use the basic log.
+      return FALSE;
     }
-
-    return FALSE;
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Core/BAO/MailSettings.php b/www/modules/civicrm/CRM/Core/BAO/MailSettings.php
index 53a719272..7ba2ebc4d 100644
--- a/www/modules/civicrm/CRM/Core/BAO/MailSettings.php
+++ b/www/modules/civicrm/CRM/Core/BAO/MailSettings.php
@@ -48,25 +48,30 @@ public static function setupStandardAccount($setupAction) {
   }
 
   /**
-   * Return the DAO object containing to the default row of
+   * Return the BAO object containing to the default row of
    * civicrm_mail_settings and cache it for further calls
    *
-   * @param bool $reset
-   *
    * @return CRM_Core_BAO_MailSettings
    *   DAO with the default mail settings set
    */
-  public static function defaultDAO($reset = FALSE) {
-    static $mailSettings = [];
+  public static function defaultDAO(): self {
     $domainID = CRM_Core_Config::domainID();
-    if (empty($mailSettings[$domainID]) || $reset) {
+    if (!isset(\Civi::$statics[__CLASS__][__FUNCTION__][$domainID])) {
+      \Civi::$statics[__CLASS__][__FUNCTION__][$domainID] = [];
       $dao = new self();
       $dao->is_default = 1;
       $dao->domain_id = $domainID;
       $dao->find(TRUE);
-      $mailSettings[$domainID] = $dao;
+      \Civi::$statics[__CLASS__][__FUNCTION__][$domainID] = $dao;
     }
-    return $mailSettings[$domainID];
+    return \Civi::$statics[__CLASS__][__FUNCTION__][$domainID];
+  }
+
+  /**
+   * Clear cached variables.
+   */
+  public static function clearCache(): void {
+    unset(\Civi::$statics[__CLASS__]);
   }
 
   /**
@@ -75,8 +80,8 @@ public static function defaultDAO($reset = FALSE) {
    * @return string
    *   default domain
    */
-  public static function defaultDomain() {
-    return self::defaultDAO()->domain;
+  public static function defaultDomain(): string {
+    return self::defaultDAO()->domain ?? '';
   }
 
   /**
@@ -125,11 +130,12 @@ public static function retrieve($params, &$defaults) {
    *
    * @param array $params
    *   Reference array contains the values submitted by the form.
-   *
+   * @deprecated since 5.72 will be removed around 5.82
    *
    * @return CRM_Core_DAO_MailSettings
    */
-  public static function add(&$params) {
+  public static function add($params) {
+    CRM_Core_Error::deprecatedFunctionWarning('use apiv4');
     $result = NULL;
     if (empty($params)) {
       return $result;
@@ -158,22 +164,28 @@ public static function add(&$params) {
    * Takes an associative array and creates a mail settings object.
    *
    * @param array $params
-   *   (reference ) an assoc array of name/value pairs.
    *
-   * @return CRM_Core_DAO_MailSettings|CRM_Core_Error
+   * @return CRM_Core_DAO_MailSettings
+   * @throws \CRM_Core_Exception
    */
-  public static function create(&$params) {
+  public static function create(array $params): CRM_Core_DAO_MailSettings {
+    if (empty($params['id'])) {
+      $params['is_ssl'] ??= FALSE;
+      $params['is_default'] ??= FALSE;
+    }
+
     $transaction = new CRM_Core_Transaction();
 
-    $mailSettings = self::add($params);
-    if (is_a($mailSettings, 'CRM_Core_Error')) {
-      $mailSettings->rollback();
-      return $mailSettings;
+    if (!empty($params['is_default'])) {
+      $query = 'UPDATE civicrm_mail_settings SET is_default = 0 WHERE domain_id = %1';
+      $queryParams = [1 => [CRM_Core_Config::domainID(), 'Integer']];
+      CRM_Core_DAO::executeQuery($query, $queryParams);
     }
 
+    $result = self::writeRecord($params);
     $transaction->commit();
-    CRM_Core_BAO_MailSettings::defaultDAO(TRUE);
-    return $mailSettings;
+    CRM_Core_BAO_MailSettings::clearCache();
+    return $result;
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Core/BAO/Mapping.php b/www/modules/civicrm/CRM/Core/BAO/Mapping.php
index 804e3b436..51fecde7e 100644
--- a/www/modules/civicrm/CRM/Core/BAO/Mapping.php
+++ b/www/modules/civicrm/CRM/Core/BAO/Mapping.php
@@ -532,15 +532,16 @@ public function getRelationTypeCustomGroupData($relationshipTypeId) {
   }
 
   /**
-   * Function returns all  Custom group Names.
+   * Unused function.
+   * @deprecated since 5.71 will be removed around 5.85.
    *
-   * @param int $customfieldId
-   *   Related file id.
+   * @param string $customfieldId
    *
    * @return null|string
    *   $customGroupName all custom group names
    */
   public static function getCustomGroupName($customfieldId) {
+    CRM_Core_Error::deprecatedFunctionWarning('CRM_Core_BAO_CustomField::getField');
     if ($customFieldId = CRM_Core_BAO_CustomField::getKeyID($customfieldId)) {
       $customGroupId = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomField', $customFieldId, 'custom_group_id');
       $customGroupName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $customGroupId, 'title');
diff --git a/www/modules/civicrm/CRM/Core/BAO/MessageTemplate.php b/www/modules/civicrm/CRM/Core/BAO/MessageTemplate.php
index e9342273a..23b5c094d 100644
--- a/www/modules/civicrm/CRM/Core/BAO/MessageTemplate.php
+++ b/www/modules/civicrm/CRM/Core/BAO/MessageTemplate.php
@@ -193,7 +193,7 @@ public static function getMessageTemplates($all = TRUE, $isSMS = FALSE) {
       ->addWhere('is_sms', '=', $isSMS);
 
     if (!$all) {
-      $messageTemplates->addWhere('workflow_id', 'IS NULL');
+      $messageTemplates->addWhere('workflow_name', 'IS NULL');
     }
 
     $msgTpls = array_column((array) $messageTemplates->execute(), 'msg_title', 'id');
diff --git a/www/modules/civicrm/CRM/Core/BAO/Navigation.php b/www/modules/civicrm/CRM/Core/BAO/Navigation.php
index 69774eefd..1c9517dcc 100644
--- a/www/modules/civicrm/CRM/Core/BAO/Navigation.php
+++ b/www/modules/civicrm/CRM/Core/BAO/Navigation.php
@@ -77,7 +77,7 @@ public static function add(&$params) {
     if (empty($params['id'])) {
       $params['is_active'] ??= FALSE;
       $params['has_separator'] ??= FALSE;
-      $params['domain_id'] = CRM_Utils_Array::value('domain_id', $params, CRM_Core_Config::domainID());
+      $params['domain_id'] = $params['domain_id'] ?? CRM_Core_Config::domainID();
     }
 
     if (!isset($params['id']) ||
@@ -903,6 +903,16 @@ public static function buildHomeMenu(&$menu) {
             ],
           ];
         }
+        else {
+          $item['child'][] = [
+            'attributes' => [
+              'label' => ts('Change Password'),
+              'name' => 'Change Password',
+              'url' => 'civicrm/admin/user/password',
+              'weight' => 2,
+            ],
+          ];
+        }
         $item['child'][] = [
           'attributes' => [
             'label' => ts('Log out'),
diff --git a/www/modules/civicrm/CRM/Core/BAO/OptionValue.php b/www/modules/civicrm/CRM/Core/BAO/OptionValue.php
index 1fb48d51b..453cca2fc 100644
--- a/www/modules/civicrm/CRM/Core/BAO/OptionValue.php
+++ b/www/modules/civicrm/CRM/Core/BAO/OptionValue.php
@@ -179,6 +179,12 @@ public static function add(&$params) {
       $optionValue->find(TRUE);
       self::updateOptionDefaults($params['option_group_id'], $optionValue->id, $optionValue, $groupName);
     }
+    if (!empty($params['custom']) &&
+      is_array($params['custom'])
+    ) {
+      CRM_Core_BAO_CustomValueTable::store($params['custom'], 'civicrm_option_value', $optionValue->id, $op);
+    }
+
     Civi::cache('metadata')->flush();
     CRM_Core_PseudoConstant::flush();
 
diff --git a/www/modules/civicrm/CRM/Core/BAO/PaperSize.php b/www/modules/civicrm/CRM/Core/BAO/PaperSize.php
index 9af168098..ea106bc1e 100644
--- a/www/modules/civicrm/CRM/Core/BAO/PaperSize.php
+++ b/www/modules/civicrm/CRM/Core/BAO/PaperSize.php
@@ -203,7 +203,7 @@ public static function getValue($field, &$values, $default = NULL) {
           $f = rtrim($f, '.');
           return (float) (empty($f) ? '0' : $f);
       }
-      return CRM_Utils_Array::value($field, $values, $default);
+      return $values[$field] ?? $default;
     }
     return $default;
   }
diff --git a/www/modules/civicrm/CRM/Core/BAO/PdfFormat.php b/www/modules/civicrm/CRM/Core/BAO/PdfFormat.php
index 385e8f862..d4f1df7a1 100644
--- a/www/modules/civicrm/CRM/Core/BAO/PdfFormat.php
+++ b/www/modules/civicrm/CRM/Core/BAO/PdfFormat.php
@@ -256,7 +256,7 @@ public static function getValue($field, $values, $default = NULL) {
           $f = rtrim($f, '.');
           return (float) (empty($f) ? '0' : $f);
       }
-      return CRM_Utils_Array::value($field, $values, $default);
+      return $values[$field] ?? $default;
     }
     return $default;
   }
diff --git a/www/modules/civicrm/CRM/Core/BAO/Phone.php b/www/modules/civicrm/CRM/Core/BAO/Phone.php
index 1c1b00558..f34f4c80d 100644
--- a/www/modules/civicrm/CRM/Core/BAO/Phone.php
+++ b/www/modules/civicrm/CRM/Core/BAO/Phone.php
@@ -240,4 +240,37 @@ public static function del($id) {
     return (bool) self::deleteRecord(['id' => $id]);
   }
 
+  /**
+   * Customize search criteria for SMS autocompletes
+   *
+   * @param \Civi\Core\Event\GenericHookEvent $e
+   */
+  public static function on_civi_search_autocompleteDefault(\Civi\Core\Event\GenericHookEvent $e) {
+    $formName = $e->formName ?? '';
+    if (!str_contains($formName, '_Form_Task_SMS') || !is_array($e->savedSearch) || $e->savedSearch['api_entity'] !== 'Phone') {
+      return;
+    }
+    $e->savedSearch['api_params'] = [
+      'version' => 4,
+      'select' => [
+        'id',
+        'phone',
+        'phone_numeric',
+        'phone_type_id:label',
+        'location_type_id:label',
+        'contact_id.sort_name',
+      ],
+      'orderBy' => [],
+      'where' => [
+        ['phone_type_id:name', '=', 'Mobile'],
+        ['contact_id.is_deleted', '=', FALSE],
+        ['contact_id.is_deceased', '=', FALSE],
+        ['contact_id.do_not_sms', '=', FALSE],
+      ],
+      'groupBy' => [],
+      'join' => [],
+      'having' => [],
+    ];
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Core/BAO/PrevNextCache.php b/www/modules/civicrm/CRM/Core/BAO/PrevNextCache.php
index 1b5ee2f3d..4b75e8891 100644
--- a/www/modules/civicrm/CRM/Core/BAO/PrevNextCache.php
+++ b/www/modules/civicrm/CRM/Core/BAO/PrevNextCache.php
@@ -23,18 +23,26 @@ class CRM_Core_BAO_PrevNextCache extends CRM_Core_DAO_PrevNextCache {
   /**
    * Get the previous and next keys.
    *
+   * @internal as of Feb 2014 no universe usages other than defunct CiviHR
+   * code found.
+   *
    * @param string $cacheKey
    * @param int $id1
    * @param int $id2
-   * @param int $mergeId
-   * @param string $join
-   * @param string $where
+   * @param null $mergeId
+   * @param null $ignore
+   * @param null $ignore_more
    * @param bool $flip
    *
    * @return array
+   * @throws \CRM_Core_Exception
+   * @throws \Civi\Core\Exception\DBQueryException
    */
-  public static function getPositions($cacheKey, $id1, $id2, &$mergeId = NULL, $join = NULL, $where = NULL, $flip = FALSE) {
+  public static function getPositions($cacheKey, $id1, $id2, &$mergeId = NULL, $ignore = NULL, $ignore_more = NULL, $flip = FALSE) {
+    $join = CRM_Dedupe_Merger::getJoinOnDedupeTable();
+    $where = "de.id IS NULL";
     if ($flip) {
+      CRM_Core_Error::deprecatedFunctionWarning('handle this outside the function');
       [$id1, $id2] = [$id2, $id1];
     }
 
@@ -385,8 +393,68 @@ public static function refillCache($rgid, $gid, $criteria, $checkPermissions, $s
     }
 
     if (!empty($foundDupes)) {
-      CRM_Dedupe_Finder::parseAndStoreDupePairs($foundDupes, $cacheKeyString);
+      self::parseAndStoreDupePairs($foundDupes, $cacheKeyString);
+    }
+  }
+
+  /**
+   * Parse duplicate pairs into a standardised array and store in the prev_next_cache.
+   *
+   * @param array $foundDupes
+   * @param string $cacheKeyString
+   *
+   * @return array
+   *   Dupe pairs with the keys
+   *   -srcID
+   *   -srcName
+   *   -dstID
+   *   -dstName
+   *   -weight
+   *   -canMerge
+   */
+  private static function parseAndStoreDupePairs($foundDupes, $cacheKeyString) {
+    $cids = [];
+    foreach ($foundDupes as $dupe) {
+      $cids[$dupe[0]] = 1;
+      $cids[$dupe[1]] = 1;
+    }
+    $cidString = implode(', ', array_keys($cids));
+
+    $dao = CRM_Core_DAO::executeQuery("SELECT id, display_name FROM civicrm_contact WHERE id IN ($cidString) ORDER BY sort_name");
+    $displayNames = [];
+    while ($dao->fetch()) {
+      $displayNames[$dao->id] = $dao->display_name;
+    }
+
+    $userId = CRM_Core_Session::getLoggedInContactID();
+    foreach ($foundDupes as $dupes) {
+      $srcID = $dupes[1];
+      $dstID = $dupes[0];
+      // The logged in user should never be the src (ie. the contact to be removed).
+      if ($srcID == $userId) {
+        $srcID = $dstID;
+        $dstID = $userId;
+      }
+
+      $mainContacts[] = $row = [
+        'dstID' => (int) $dstID,
+        'dstName' => $displayNames[$dstID],
+        'srcID' => (int) $srcID,
+        'srcName' => $displayNames[$srcID],
+        'weight' => $dupes[2],
+        'canMerge' => TRUE,
+      ];
+
+      CRM_Core_DAO::executeQuery("INSERT INTO civicrm_prevnext_cache (entity_table, entity_id1, entity_id2, cacheKey, data) VALUES
+        ('civicrm_contact', %1, %2, %3, %4)", [
+          1 => [$dstID, 'Integer'],
+          2 => [$srcID, 'Integer'],
+          3 => [$cacheKeyString, 'String'],
+          4 => [serialize($row), 'String'],
+        ]
+      );
     }
+    return $mainContacts;
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Core/BAO/Query.php b/www/modules/civicrm/CRM/Core/BAO/Query.php
index 843820624..ae203fc1a 100644
--- a/www/modules/civicrm/CRM/Core/BAO/Query.php
+++ b/www/modules/civicrm/CRM/Core/BAO/Query.php
@@ -24,6 +24,12 @@ public static function addCustomFormFields(&$form, $extends) {
     $groupDetails = CRM_Core_BAO_CustomGroup::getGroupDetail(NULL, TRUE, $extends);
     if ($groupDetails) {
       foreach ($groupDetails as $group) {
+        if (empty($group['fields'])) {
+          // if there are no searchable fields in the custom group remove it
+          // from the details to avoid empty accordians per
+          // https://lab.civicrm.org/dev/core/-/issues/5112
+          unset($groupDetails[$group['id']]);
+        }
         foreach ($group['fields'] as $field) {
           $fieldId = $field['id'];
           $elementName = 'custom_' . $fieldId;
diff --git a/www/modules/civicrm/CRM/Core/BAO/RecurringEntity.php b/www/modules/civicrm/CRM/Core/BAO/RecurringEntity.php
index cc1d7c1f8..636d75506 100644
--- a/www/modules/civicrm/CRM/Core/BAO/RecurringEntity.php
+++ b/www/modules/civicrm/CRM/Core/BAO/RecurringEntity.php
@@ -561,7 +561,7 @@ public static function copyCreateEntity($entityTable, $fromCriteria, $newParams,
       CRM_Core_BAO_RecurringEntity::quickAdd($object->id, $newObject->id, $entityTable);
     }
 
-    CRM_Utils_Hook::copy(CRM_Core_DAO_AllCoreTables::getBriefName($daoName), $newObject);
+    CRM_Utils_Hook::copy(CRM_Core_DAO_AllCoreTables::getEntityNameForClass($daoName), $newObject);
     return $newObject;
   }
 
diff --git a/www/modules/civicrm/CRM/Core/BAO/SchemaHandler.php b/www/modules/civicrm/CRM/Core/BAO/SchemaHandler.php
index f8b3d9d54..80a2255d9 100644
--- a/www/modules/civicrm/CRM/Core/BAO/SchemaHandler.php
+++ b/www/modules/civicrm/CRM/Core/BAO/SchemaHandler.php
@@ -39,6 +39,8 @@
  */
 class CRM_Core_BAO_SchemaHandler {
 
+  const DEFAULT_COLLATION = 'utf8mb4_unicode_ci';
+
   /**
    * Create a CiviCRM-table
    *
@@ -785,7 +787,7 @@ public static function getIndexName($tableName, $columnName) {
    *
    * @return bool
    */
-  public static function migrateUtf8mb4($revert = FALSE, $patterns = ['civicrm\_%'], $databaseList = NULL) {
+  public static function migrateUtf8mb4($revert = FALSE, $patterns = [], $databaseList = NULL) {
     $newCharSet = $revert ? 'utf8' : 'utf8mb4';
     $newCollation = $revert ? 'utf8_unicode_ci' : 'utf8mb4_unicode_ci';
     $newBinaryCollation = $revert ? 'utf8_bin' : 'utf8mb4_bin';
@@ -796,6 +798,8 @@ public static function migrateUtf8mb4($revert = FALSE, $patterns = ['civicrm\_%'
     $tableNameLikePatterns = [];
     $logTableNameLikePatterns = [];
 
+    $patterns = $patterns ?: CRM_Core_DAO::getTableNames();
+
     foreach ($patterns as $pattern) {
       $pattern = CRM_Utils_Type::escape($pattern, 'String');
       $tableNameLikePatterns[] = "Name LIKE '{$pattern}'";
@@ -897,7 +901,7 @@ public static function getInUseCollation(): string {
     if (!isset(\Civi::$statics[__CLASS__][__FUNCTION__])) {
       $dao = CRM_Core_DAO::executeQuery('SHOW TABLE STATUS LIKE \'civicrm_contact\'');
       $dao->fetch();
-      \Civi::$statics[__CLASS__][__FUNCTION__] = $dao->Collation;
+      \Civi::$statics[__CLASS__][__FUNCTION__] = $dao->Collation ?? self::DEFAULT_COLLATION;
     }
     return \Civi::$statics[__CLASS__][__FUNCTION__];
   }
diff --git a/www/modules/civicrm/CRM/Core/BAO/Tag.php b/www/modules/civicrm/CRM/Core/BAO/Tag.php
index 5ea9ea897..253a6230d 100644
--- a/www/modules/civicrm/CRM/Core/BAO/Tag.php
+++ b/www/modules/civicrm/CRM/Core/BAO/Tag.php
@@ -56,7 +56,7 @@ public function getTree($usedFor = NULL, $excludeHidden = FALSE) {
    * @param bool $excludeHidden
    */
   public function buildTree($usedFor = NULL, $excludeHidden = FALSE) {
-    $sql = "SELECT id, parent_id, name, description, is_selectable FROM civicrm_tag";
+    $sql = "SELECT id, parent_id, name, label, description, is_selectable FROM civicrm_tag";
 
     $whereClause = [];
     if ($usedFor) {
@@ -81,6 +81,7 @@ public function buildTree($usedFor = NULL, $excludeHidden = FALSE) {
 
       $thisref['parent_id'] = $dao->parent_id;
       $thisref['name'] = $dao->name;
+      $thisref['label'] = $dao->label;
       $thisref['description'] = $dao->description;
       $thisref['is_selectable'] = $dao->is_selectable;
       if (!isset($thisref['children'])) {
diff --git a/www/modules/civicrm/CRM/Core/BAO/UFField.php b/www/modules/civicrm/CRM/Core/BAO/UFField.php
index 0212831e8..c802431e9 100644
--- a/www/modules/civicrm/CRM/Core/BAO/UFField.php
+++ b/www/modules/civicrm/CRM/Core/BAO/UFField.php
@@ -171,7 +171,7 @@ public static function duplicateField($params) {
     $ufField->field_type = $params['field_type'] ?? NULL;
     $ufField->field_name = $params['field_name'] ?? NULL;
     $ufField->website_type_id = $params['website_type_id'] ?? NULL;
-    if (is_null(CRM_Utils_Array::value('location_type_id', $params, ''))) {
+    if (array_key_exists('location_type_id', $params) && is_null($params['location_type_id'])) {
       // primary location type have NULL value in DB
       $ufField->whereAdd("location_type_id IS NULL");
     }
@@ -188,11 +188,11 @@ public static function duplicateField($params) {
   }
 
   /**
-   * Does profile consists of a multi-record custom field.
+   * Returns the id of the first multi-record custom group in this profile (if any).
    *
    * @param int $gId
    *
-   * @return bool
+   * @return int|false
    */
   public static function checkMultiRecordFieldExists($gId) {
     $queryString = "SELECT f.field_name
@@ -201,36 +201,18 @@ public static function checkMultiRecordFieldExists($gId) {
                           AND  g.id = %1 AND f.field_name LIKE 'custom%'";
     $p = [1 => [$gId, 'Integer']];
     $dao = CRM_Core_DAO::executeQuery($queryString, $p);
-    $customFieldIds = [];
-    $isMultiRecordFieldPresent = FALSE;
+
     while ($dao->fetch()) {
-      if ($customId = CRM_Core_BAO_CustomField::getKeyID($dao->field_name)) {
-        if (is_numeric($customId)) {
-          $customFieldIds[] = $customId;
+      $customId = CRM_Core_BAO_CustomField::getKeyID($dao->field_name);
+      if ($customId && is_numeric($customId)) {
+        $multiRecordGroupId = CRM_Core_BAO_CustomField::isMultiRecordField($customId);
+        if ($multiRecordGroupId) {
+          return $multiRecordGroupId;
         }
       }
     }
 
-    if (!empty($customFieldIds) && count($customFieldIds) == 1) {
-      $customFieldId = array_pop($customFieldIds);
-      $isMultiRecordFieldPresent = CRM_Core_BAO_CustomField::isMultiRecordField($customFieldId);
-    }
-    elseif (count($customFieldIds) > 1) {
-      $customFieldIds = implode(", ", $customFieldIds);
-      $queryString = "
-      SELECT cg.id as cgId
- FROM civicrm_custom_group cg
- INNER JOIN civicrm_custom_field cf
- ON cg.id = cf.custom_group_id
-WHERE cf.id IN (" . $customFieldIds . ") AND is_multiple = 1 LIMIT 0,1";
-
-      $dao = CRM_Core_DAO::executeQuery($queryString);
-      if ($dao->fetch()) {
-        $isMultiRecordFieldPresent = ($dao->cgId) ? $dao->cgId : FALSE;
-      }
-    }
-
-    return $isMultiRecordFieldPresent;
+    return FALSE;
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Core/BAO/UFGroup.php b/www/modules/civicrm/CRM/Core/BAO/UFGroup.php
index 6451188dc..b1e2dba7e 100644
--- a/www/modules/civicrm/CRM/Core/BAO/UFGroup.php
+++ b/www/modules/civicrm/CRM/Core/BAO/UFGroup.php
@@ -457,7 +457,7 @@ protected static function formatUFField(
     if (isset($field->phone_type_id)) {
       $name .= "-{$field->phone_type_id}";
     }
-    $fieldMetaData = CRM_Utils_Array::value($name, $importableFields, ($importableFields[$field->field_name] ?? []));
+    $fieldMetaData = $importableFields[$name] ?? $importableFields[$field->field_name] ?? [];
 
     // No lie: this is bizarre; why do we need to mix so many UFGroup properties into UFFields?
     // I guess to make field self sufficient with all the required data and avoid additional calls
@@ -469,15 +469,15 @@ protected static function formatUFField(
       'groupHelpPre' => empty($group->help_pre) ? '' : $group->help_pre,
       'groupHelpPost' => empty($group->help_post) ? '' : $group->help_post,
       'title' => $title,
-      'where' => CRM_Utils_Array::value('where', CRM_Utils_Array::value($field->field_name, $importableFields)),
-      'attributes' => CRM_Core_DAO::makeAttribute(CRM_Utils_Array::value($field->field_name, $importableFields)),
+      'where' => $importableFields[$field->field_name]['where'] ?? NULL,
+      'attributes' => CRM_Core_DAO::makeAttribute($importableFields[$field->field_name] ?? NULL),
       'is_required' => $field->is_required,
       'is_view' => $field->is_view,
       'help_pre' => $field->help_pre,
       'help_post' => $field->help_post,
       'visibility' => $field->visibility,
       'in_selector' => $field->in_selector,
-      'rule' => CRM_Utils_Array::value('rule', CRM_Utils_Array::value($field->field_name, $importableFields)),
+      'rule' => $importableFields[$field->field_name]['rule'] ?? NULL,
       'location_type_id' => $field->location_type_id ?? NULL,
       'website_type_id' => $field->website_type_id ?? NULL,
       'phone_type_id' => $field->phone_type_id ?? NULL,
@@ -486,15 +486,9 @@ protected static function formatUFField(
       'add_captcha' => $group->add_captcha ?? NULL,
       'field_type' => $field->field_type,
       'field_id' => $field->id,
-      'pseudoconstant' => CRM_Utils_Array::value(
-        'pseudoconstant',
-        CRM_Utils_Array::value($field->field_name, $importableFields)
-      ),
+      'pseudoconstant' => $importableFields[$field->field_name]['pseudoconstant'] ?? NULL,
       // obsolete this when we remove the name / dbName discrepancy with gender/suffix/prefix
-      'dbName' => CRM_Utils_Array::value(
-        'dbName',
-        CRM_Utils_Array::value($field->field_name, $importableFields)
-      ),
+      'dbName' => $importableFields[$field->field_name]['dbName'] ?? NULL,
       'skipDisplay' => 0,
       'data_type' => CRM_Utils_Type::getDataTypeFromFieldMetadata($fieldMetaData),
       'bao' => $fieldMetaData['bao'] ?? NULL,
@@ -716,30 +710,26 @@ public static function getLocationFields() {
 
   /**
    * @param $ctype
-   * @param int|bool $checkPermission
-   * @return mixed
+   * @param int|null $checkPermission
+   * @return array
    */
   protected static function getCustomFields($ctype, $checkPermission = CRM_Core_Permission::VIEW) {
     // Only Edit and View is supported in ACL for custom field.
-    if ($checkPermission == CRM_Core_Permission::CREATE) {
+    if ($checkPermission && $checkPermission != CRM_Core_Permission::VIEW) {
       $checkPermission = CRM_Core_Permission::EDIT;
     }
-    // Make the cache user specific by adding the ID to the key.
-    $contactId = CRM_Core_Session::getLoggedInContactID();
-    $cacheKey = 'uf_group_custom_fields_' . $ctype . '_' . $contactId . '_' . (int) $checkPermission;
-    if (!Civi::cache('metadata')->has($cacheKey)) {
-      $customFields = CRM_Core_BAO_CustomField::getFieldsForImport($ctype, FALSE, FALSE, FALSE, $checkPermission, TRUE);
+    $customFields = CRM_Core_BAO_CustomField::getFieldsForImport($ctype, FALSE, FALSE, FALSE, $checkPermission, TRUE);
 
-      // hack to add custom data for components
-      $components = ['Contribution', 'Participant', 'Membership', 'Activity', 'Case'];
-      foreach ($components as $value) {
-        $customFields = array_merge($customFields, CRM_Core_BAO_CustomField::getFieldsForImport($value));
-      }
-      $addressCustomFields = CRM_Core_BAO_CustomField::getFieldsForImport('Address');
-      $customFields = array_merge($customFields, $addressCustomFields);
-      Civi::cache('metadata')->set($cacheKey, [$customFields, $addressCustomFields]);
+    // Fixme: why this hardcoded list? If we truly want all fields we should use CRM_Core_BAO_CustomGroup::getAll().
+    $components = ['Contribution', 'Participant', 'Membership', 'Activity', 'Case'];
+    foreach ($components as $value) {
+      $extraFields = CRM_Core_BAO_CustomField::getFieldsForImport($value, FALSE, FALSE, FALSE, $checkPermission);
+      $customFields = array_merge($customFields, $extraFields);
     }
-    return Civi::cache('metadata')->get($cacheKey);
+    $addressCustomFields = CRM_Core_BAO_CustomField::getFieldsForImport('Address', FALSE, FALSE, FALSE, $checkPermission);
+    $customFields = array_merge($customFields, $addressCustomFields);
+    // For some reason this function returns Address custom fields as a second item.
+    return [$customFields, $addressCustomFields];
   }
 
   /**
@@ -826,9 +816,7 @@ public static function getEditHTML(
       );
       if ($reset || $doNotProcess) {
         // hack to make sure we do not process this form
-        $oldQFDefault = CRM_Utils_Array::value('_qf_default',
-          $_POST
-        );
+        $oldQFDefault = $_POST['_qf_default'] ?? NULL;
         unset($_POST['_qf_default']);
         unset($_REQUEST['_qf_default']);
         if ($reset) {
@@ -2149,9 +2137,7 @@ public static function buildProfile(
     }
     elseif (substr($fieldName, -11) == 'campaign_id') {
       if (CRM_Campaign_BAO_Campaign::isComponentEnabled()) {
-        $campaigns = CRM_Campaign_BAO_Campaign::getCampaigns(CRM_Utils_Array::value($contactId,
-          $form->_componentCampaigns
-        ), NULL, TRUE, FALSE);
+        $campaigns = CRM_Campaign_BAO_Campaign::getCampaigns($form->_componentCampaigns[$contactId] ?? NULL, NULL, TRUE, FALSE);
         $form->add('select', $name, $title,
           $campaigns, $required,
           [
@@ -2334,7 +2320,7 @@ public static function setProfileDefaults(
 
                 // fixed for CRM-665
                 if (is_numeric($locTypeId)) {
-                  if ($primaryLocationType || $locTypeId == CRM_Utils_Array::value('location_type_id', $value)) {
+                  if ($primaryLocationType || $locTypeId == ($value['location_type_id'] ?? NULL)) {
                     if (!empty($value[$fieldName])) {
                       //to handle stateprovince and country
                       if ($fieldName == 'state_province') {
@@ -2646,41 +2632,21 @@ public static function commonSendMail($contactID, &$values) {
       return;
 
     }
-    $template = CRM_Core_Smarty::singleton();
-
-    $displayName = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact',
-      $contactID,
-      'display_name'
-    );
-
-    self::profileDisplay($values['id'], $values['values'], $template);
     $emailList = explode(',', $values['email']);
 
-    $contactLink = CRM_Utils_System::url('civicrm/contact/view',
-      "reset=1&cid=$contactID",
-      TRUE, NULL, FALSE, FALSE, TRUE
-    );
-
     //get the default domain email address.
     [$domainEmailName, $domainEmailAddress] = CRM_Core_BAO_Domain::getNameAndEmail();
 
-    if (!$domainEmailAddress || $domainEmailAddress == 'info@EXAMPLE.ORG') {
+    if (!$domainEmailAddress || $domainEmailAddress === 'info@EXAMPLE.ORG') {
       $fixUrl = CRM_Utils_System::url('civicrm/admin/domain', 'action=update&reset=1');
       CRM_Core_Error::statusBounce(ts('The site administrator needs to enter a valid \'FROM Email Address\' in <a href="%1">Administer CiviCRM &raquo; Communications &raquo; FROM Email Addresses</a>. The email address used may need to be a valid mail account with your email service provider.', [1 => $fixUrl]));
     }
 
     foreach ($emailList as $emailTo) {
-      // FIXME: take the below out of the foreach loop
       CRM_Core_BAO_MessageTemplate::sendTemplate(
         [
-          'groupName' => 'msg_tpl_workflow_uf',
           'workflow' => 'uf_notify',
-          'contactId' => $contactID,
-          'tplParams' => [
-            'displayName' => $displayName,
-            'currentDate' => date('r'),
-            'contactLink' => $contactLink,
-          ],
+          'modelProps' => ['contactID' => $contactID, 'profileID' => $values['id'], 'profileFields' => $values['values']],
           'from' => "$domainEmailName <$domainEmailAddress>",
           'toEmail' => $emailTo,
         ]
@@ -2726,22 +2692,6 @@ public static function checkFieldsEmptyValues($gid, $cid, $params, $skipCheck =
     return NULL;
   }
 
-  /**
-   * Assign uf fields to template.
-   *
-   * @param int $gid
-   *   Group id.
-   * @param array $values
-   * @param CRM_Core_Smarty $template
-   */
-  public static function profileDisplay($gid, $values, $template) {
-    $groupTitle = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_UFGroup', $gid, 'title');
-    $template->assign('grouptitle', $groupTitle);
-    if (count($values)) {
-      $template->assign('values', $values);
-    }
-  }
-
   /**
    * Format fields for dupe Contact Matching.
    *
@@ -3173,7 +3123,8 @@ public static function setComponentDefaults(&$fields, $componentId, $component,
 
         //FIX ME: We need to loop defaults, but once we move to custom_1_x convention this code can be simplified.
         foreach ($defaults as $customKey => $customValue) {
-          if ($customFieldDetails = CRM_Core_BAO_CustomField::getKeyID($customKey, TRUE)) {
+          $customFieldDetails = CRM_Core_BAO_CustomField::getKeyID($customKey, TRUE);
+          if ($customFieldDetails[0]) {
             if ($name == 'custom_' . $customFieldDetails[0]) {
 
               //hack to set default for checkbox
@@ -3183,7 +3134,7 @@ public static function setComponentDefaults(&$fields, $componentId, $component,
 
               foreach ($formattedGroupTree as $tree) {
                 if (!empty($tree['fields'][$customFieldDetails[0]])) {
-                  if ('CheckBox' == CRM_Utils_Array::value('html_type', $tree['fields'][$customFieldDetails[0]])) {
+                  if ('CheckBox' == ($tree['fields'][$customFieldDetails[0]]['html_type'] ?? NULL)) {
                     $skipValue = TRUE;
                     $defaults['field'][$componentId][$name] = $customValue;
                     break;
@@ -3543,8 +3494,8 @@ public static function reformatProfileFields(&$fields) {
    * @throws \CRM_Core_Exception
    */
   public static function getFrontEndTitle(int $profileID) {
-    $profile = civicrm_api3('UFGroup', 'getsingle', ['id' => $profileID, 'return' => ['title', 'frontend_title']]);
-    return $profile['frontend_title'] ?? $profile['title'];
+    $profile = civicrm_api3('UFGroup', 'getsingle', ['id' => $profileID, 'return' => ['frontend_title']]);
+    return $profile['frontend_title'];
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Core/BAO/UFMatch.php b/www/modules/civicrm/CRM/Core/BAO/UFMatch.php
index 3d874a6d6..dca95233a 100644
--- a/www/modules/civicrm/CRM/Core/BAO/UFMatch.php
+++ b/www/modules/civicrm/CRM/Core/BAO/UFMatch.php
@@ -113,8 +113,8 @@ public static function synchronize(&$user, $update, $uf, $ctype, $isLogin = FALS
       // Are we processing logged in user.
       if ($loggedInUserUfID && $loggedInUserUfID != $ufID) {
         $userIds = self::getUFValues($loggedInUserUfID);
-        $ufID = CRM_Utils_Array::value('uf_id', $userIds, '');
-        $userID = CRM_Utils_Array::value('contact_id', $userIds, '');
+        $ufID = $userIds['uf_id'] ?? '';
+        $userID = $userIds['contact_id'] ?? '';
       }
     }
 
diff --git a/www/modules/civicrm/CRM/Core/BAO/UserJob.php b/www/modules/civicrm/CRM/Core/BAO/UserJob.php
index 3f7d3f6e0..28465f6b6 100644
--- a/www/modules/civicrm/CRM/Core/BAO/UserJob.php
+++ b/www/modules/civicrm/CRM/Core/BAO/UserJob.php
@@ -62,7 +62,7 @@ public static function hook_civicrm_queueStatus(CRM_Queue_Queue $queue, string $
     if ($userJobId && $status === 'completed') {
       UserJob::update(FALSE)
         ->addWhere('id', '=', $userJobId)
-        ->setValues(['status_id' => 1])
+        ->setValues(['status_id' => 1, 'end_date' => 'now'])
         ->execute();
     }
   }
diff --git a/www/modules/civicrm/CRM/Core/BAO/Website.php b/www/modules/civicrm/CRM/Core/BAO/Website.php
index ab53574ed..1ab9aeb7a 100644
--- a/www/modules/civicrm/CRM/Core/BAO/Website.php
+++ b/www/modules/civicrm/CRM/Core/BAO/Website.php
@@ -18,7 +18,7 @@
 /**
  * This class contain function for Website handling.
  */
-class CRM_Core_BAO_Website extends CRM_Core_DAO_Website {
+class CRM_Core_BAO_Website extends CRM_Core_DAO_Website implements Civi\Core\HookInterface {
   use CRM_Contact_AccessTrait;
 
   /**
diff --git a/www/modules/civicrm/CRM/Core/BAO/WordReplacement.php b/www/modules/civicrm/CRM/Core/BAO/WordReplacement.php
index 2de2135ca..b9ecb5ef2 100644
--- a/www/modules/civicrm/CRM/Core/BAO/WordReplacement.php
+++ b/www/modules/civicrm/CRM/Core/BAO/WordReplacement.php
@@ -263,11 +263,8 @@ public static function rebuildWordReplacementTable() {
    *   List of word replacements (enabled/disabled) for the given locale.
    */
   public static function getLocaleCustomStrings($locale, $domainId = NULL) {
-    if ($domainId === NULL) {
-      $domainId = CRM_Core_Config::domainID();
-    }
-
-    return CRM_Utils_Array::value($locale, self::_getLocaleCustomStrings($domainId));
+    $domainId ??= CRM_Core_Config::domainID();
+    return self::_getLocaleCustomStrings($domainId)[$locale] ?? [];
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Core/Block.php b/www/modules/civicrm/CRM/Core/Block.php
index e33e92893..c7ce0cb0d 100644
--- a/www/modules/civicrm/CRM/Core/Block.php
+++ b/www/modules/civicrm/CRM/Core/Block.php
@@ -392,16 +392,6 @@ private static function setTemplateShortcutValues() {
 
     $values = [];
 
-    // Deprecated hook with typo.  Please don't use this!
-    CRM_Utils_Hook::links('create.new.shorcuts',
-      NULL,
-      CRM_Core_DAO::$_nullObject,
-      $values
-    );
-    if ($values) {
-      CRM_Core_Error::deprecatedWarning('hook_civicrm_links "create.new.shorcuts" deprecated in favor of "create.new.shortcuts"');
-    }
-
     foreach ($shortCuts as $key => $short) {
       $values[$key] = self::setShortCutValues($short);
     }
@@ -409,7 +399,7 @@ private static function setTemplateShortcutValues() {
     // Hook that enables extensions to add user-defined links
     CRM_Utils_Hook::links('create.new.shortcuts',
       NULL,
-      CRM_Core_DAO::$_nullObject,
+      NULL,
       $values
     );
 
diff --git a/www/modules/civicrm/CRM/Core/ClassLoader.php b/www/modules/civicrm/CRM/Core/ClassLoader.php
index b92512ad3..acfc35c6a 100644
--- a/www/modules/civicrm/CRM/Core/ClassLoader.php
+++ b/www/modules/civicrm/CRM/Core/ClassLoader.php
@@ -138,6 +138,10 @@ public function register($prepend = FALSE) {
     set_include_path($include_paths . PATH_SEPARATOR . get_include_path());
     // @todo Why do we need to load this again?
     $this->requireComposerAutoload();
+
+    $mixinLib = dirname(__DIR__, 2) . '/mixin/lib';
+    ($GLOBALS['_PathLoad'][0] ?? require "$mixinLib/pathload-0.php");
+    require_once "$mixinLib/pathload.index.php";
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Core/CodeGen/GenerateData.php b/www/modules/civicrm/CRM/Core/CodeGen/GenerateData.php
index 4289ed1cf..0dbc5c300 100644
--- a/www/modules/civicrm/CRM/Core/CodeGen/GenerateData.php
+++ b/www/modules/civicrm/CRM/Core/CodeGen/GenerateData.php
@@ -277,6 +277,10 @@ public function initID() {
 
   private $deceasedContactIds = [];
 
+  private $time;
+
+  private $relTypes;
+
   /*********************************
    * private methods
    * *******************************
@@ -1556,6 +1560,9 @@ private function addMembership() {
    * @return string
    */
   public static function repairDate($date) {
+    if ($date === NULL) {
+      return '';
+    }
     $dropArray = ['-' => '', ':' => '', ' ' => ''];
     return strtr($date, $dropArray);
   }
diff --git a/www/modules/civicrm/CRM/Core/CodeGen/Main.php b/www/modules/civicrm/CRM/Core/CodeGen/Main.php
index fe90d38f5..b3df7e092 100644
--- a/www/modules/civicrm/CRM/Core/CodeGen/Main.php
+++ b/www/modules/civicrm/CRM/Core/CodeGen/Main.php
@@ -145,7 +145,7 @@ public function getTasks() {
     $tasks = [];
     $tasks[] = new CRM_Core_CodeGen_Config($this);
     $tasks[] = new CRM_Core_CodeGen_Reflection($this);
-    $tasks[] = new CRM_Core_CodeGen_Schema($this);
+    $tasks[] = new CRM_Core_CodeGen_PhpSchema($this);
     foreach (array_keys($this->tables) as $name) {
       $tasks[] = new CRM_Core_CodeGen_DAO($this, $name);
     }
diff --git a/www/modules/civicrm/CRM/Core/CodeGen/PhpSchema.php b/www/modules/civicrm/CRM/Core/CodeGen/PhpSchema.php
new file mode 100644
index 000000000..a36028bd3
--- /dev/null
+++ b/www/modules/civicrm/CRM/Core/CodeGen/PhpSchema.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * Drop-in replacement for CRM_Core_CodeGen_Schema which uses schema/**.entityType.php instead of xml/schema/**.xml
+ *
+ * @internal
+ */
+class CRM_Core_CodeGen_PhpSchema extends CRM_Core_CodeGen_BaseTask {
+
+  public $locales;
+
+  /**
+   * CRM_Core_CodeGen_PhpSchema constructor.
+   *
+   * @param \CRM_Core_CodeGen_Main $config
+   */
+  public function __construct($config) {
+    parent::__construct($config);
+    $this->locales = $this->findLocales();
+  }
+
+  public function run() {
+    CRM_Core_CodeGen_Util_File::createDir($this->config->sqlCodePath);
+
+    $put = function ($files) {
+      foreach ($files as $file => $content) {
+        if (substr($content, -1) !== "\n") {
+          $content .= "\n";
+        }
+        file_put_contents($this->config->sqlCodePath . $file, $content);
+      }
+    };
+
+    echo "Generating sql file\n";
+    $put($this->generateCreateSql());
+
+    echo "Generating sql drop tables file\n";
+    $put($this->generateDropSql());
+
+    foreach ($this->locales as $locale) {
+      echo "Generating data files for $locale\n";
+      $put($this->generateLocaleDataSql($locale));
+    }
+
+    // also create the archive tables
+    // $this->generateCreateSql('civicrm_archive.mysql' );
+    // $this->generateDropSql('civicrm_archive_drop.mysql');
+
+    echo "Generating navigation file\n";
+    $put($this->generateNavigation());
+
+    echo "Generating sample file\n";
+    $put($this->generateSample());
+  }
+
+  public function generateCreateSql() {
+    return ['civicrm.mysql' => \Civi::schemaHelper()->generateUninstallSql() . \Civi::schemaHelper()->generateInstallSql()];
+  }
+
+  public function generateDropSql() {
+    return ['civicrm_drop.mysql' => \Civi::schemaHelper()->generateUninstallSql()];
+  }
+
+  public function generateNavigation() {
+    $template = new CRM_Core_CodeGen_Util_Template('sql');
+    return ['civicrm_navigation.mysql' => $template->fetch('civicrm_navigation.tpl')];
+  }
+
+  /**
+   * @param string $locale
+   *   Ex: en_US, fr_FR
+   * @return array
+   */
+  public function generateLocaleDataSql($locale) {
+    $template = new CRM_Core_CodeGen_Util_Template('sql');
+    CRM_Core_CodeGen_Util_MessageTemplates::assignSmartyVariables($template->getSmarty());
+    global $tsLocale;
+    $oldTsLocale = $tsLocale;
+
+    try {
+
+      $tsLocale = $locale;
+      $template->assign('locale', $locale);
+      $template->assign('db_version', $this->config->db_version);
+
+      $sections = [
+        'civicrm_country.tpl',
+        'civicrm_state_province.tpl',
+        'civicrm_currency.tpl',
+        'civicrm_data.tpl',
+        'civicrm_navigation.tpl',
+        'civicrm_version_sql.tpl',
+      ];
+
+      $ext = ($locale !== 'en_US' ? ".$locale" : '');
+
+      return [
+        "civicrm_data$ext.mysql" => $template->fetchConcat($sections),
+        "civicrm_acl$ext.mysql" => $template->fetch('civicrm_acl.tpl'),
+      ];
+    }
+    finally {
+      $tsLocale = $oldTsLocale;
+    }
+  }
+
+  /**
+   * @return array
+   *   Array(string $fileName => string $fileContent).
+   *   List of files
+   */
+  public function generateSample() {
+    $template = new CRM_Core_CodeGen_Util_Template('sql');
+    $sections = [
+      'civicrm_sample.tpl',
+      'civicrm_acl.tpl',
+    ];
+    return [
+      'civicrm_sample.mysql' => $template->fetchConcat($sections),
+      'case_sample.mysql' => $template->fetch('case_sample.tpl'),
+    ];
+  }
+
+  /**
+   * @return array
+   */
+  public function findLocales() {
+    require_once 'CRM/Core/Config.php';
+    $config = CRM_Core_Config::singleton(FALSE);
+    $locales = [];
+    $localeDir = CRM_Core_I18n::getResourceDir();
+    if (file_exists($localeDir)) {
+      $locales = preg_grep('/^[a-z][a-z]_[A-Z][A-Z]$/', scandir($localeDir));
+    }
+
+    $localesMask = getenv('CIVICRM_LOCALES');
+    if (!empty($localesMask)) {
+      $mask = explode(',', $localesMask);
+      $locales = array_intersect($locales, $mask);
+    }
+
+    if (!in_array('en_US', $locales)) {
+      array_unshift($locales, 'en_US');
+    }
+
+    return $locales;
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Core/CodeGen/Schema.php b/www/modules/civicrm/CRM/Core/CodeGen/Schema.php
index bc3e80462..f91d5f962 100644
--- a/www/modules/civicrm/CRM/Core/CodeGen/Schema.php
+++ b/www/modules/civicrm/CRM/Core/CodeGen/Schema.php
@@ -2,6 +2,11 @@
 
 /**
  * Create SQL files to create and populate a new schema.
+ *
+ * @deprecated
+ *   Replaced by CRM_Core_CodeGen_PhpSchema.
+ *   Delete this after civicrm-core and civix drop their references.
+ *   Maybe allow grace-period of a couple months.
  */
 class CRM_Core_CodeGen_Schema extends CRM_Core_CodeGen_BaseTask {
 
@@ -59,7 +64,7 @@ public function generateCreateSql() {
     $dropOrder = array_reverse(array_keys($this->tables));
     $template->assign('dropOrder', $dropOrder);
     $template->assign('mysql', 'modern');
-
+    CRM_Core_CodeGen_Util_MessageTemplates::assignSmartyVariables($template->getSmarty());
     return ['civicrm.mysql' => $template->fetch('schema.tpl')];
   }
 
@@ -83,7 +88,7 @@ public function generateNavigation() {
    */
   public function generateLocaleDataSql($locale) {
     $template = new CRM_Core_CodeGen_Util_Template('sql');
-
+    CRM_Core_CodeGen_Util_MessageTemplates::assignSmartyVariables($template->getSmarty());
     global $tsLocale;
     $oldTsLocale = $tsLocale;
 
@@ -102,7 +107,7 @@ public function generateLocaleDataSql($locale) {
         'civicrm_version_sql.tpl',
       ];
 
-      $ext = ($locale != 'en_US' ? ".$locale" : '');
+      $ext = ($locale !== 'en_US' ? ".$locale" : '');
 
       return [
         "civicrm_data$ext.mysql" => $template->fetchConcat($sections),
diff --git a/www/modules/civicrm/CRM/Core/CodeGen/Specification.php b/www/modules/civicrm/CRM/Core/CodeGen/Specification.php
index 0d7a12ca5..303efdc39 100644
--- a/www/modules/civicrm/CRM/Core/CodeGen/Specification.php
+++ b/www/modules/civicrm/CRM/Core/CodeGen/Specification.php
@@ -314,58 +314,7 @@ public function getTable($tableXML, &$database, &$tables) {
   public function getField(&$fieldXML, &$fields) {
     $name = trim((string ) $fieldXML->name);
     $field = ['name' => $name, 'localizable' => ((bool) $fieldXML->localizable) ? 1 : 0];
-    $type = (string) $fieldXML->type;
-    switch ($type) {
-      case 'varchar':
-      case 'char':
-        $field['length'] = (int) $fieldXML->length;
-        $field['sqlType'] = "$type({$field['length']})";
-        $field['crmType'] = 'CRM_Utils_Type::T_STRING';
-        $field['size'] = $this->getSize($fieldXML);
-        break;
-
-      case 'text':
-        $field['sqlType'] = $type;
-        $field['crmType'] = 'CRM_Utils_Type::T_' . strtoupper($type);
-        // CRM-13497 see fixme below
-        $field['rows'] = isset($fieldXML->html) ? $this->value('rows', $fieldXML->html) : NULL;
-        $field['cols'] = isset($fieldXML->html) ? $this->value('cols', $fieldXML->html) : NULL;
-        break;
-
-      case 'datetime':
-        $field['sqlType'] = $type;
-        $field['crmType'] = 'CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME';
-        break;
-
-      case 'boolean':
-        // need this case since some versions of mysql do not have boolean as a valid column type and hence it
-        // is changed to tinyint. hopefully after 2 yrs this case can be removed.
-        $field['sqlType'] = 'tinyint';
-        $field['crmType'] = 'CRM_Utils_Type::T_' . strtoupper($type);
-        break;
-
-      case 'decimal':
-        $length = $fieldXML->length ? $fieldXML->length : '20,2';
-        $field['sqlType'] = 'decimal(' . $length . ')';
-        $field['crmType'] = $this->value('crmType', $fieldXML, 'CRM_Utils_Type::T_MONEY');
-        $field['precision'] = $length . ',';
-        break;
-
-      case 'float':
-        $field['sqlType'] = 'double';
-        $field['crmType'] = 'CRM_Utils_Type::T_FLOAT';
-        break;
-
-      default:
-        $field['sqlType'] = $type;
-        if ($type === 'int unsigned' || $type === 'tinyint') {
-          $field['crmType'] = 'CRM_Utils_Type::T_INT';
-        }
-        else {
-          $field['crmType'] = $this->value('crmType', $fieldXML, 'CRM_Utils_Type::T_' . strtoupper($type));
-        }
-        break;
-    }
+    $field = array_merge($field, \CRM_Utils_Schema::getTypeAttributes($fieldXML));
 
     $field['phpType'] = $this->getPhpType($fieldXML);
     $field['phpNullable'] = $this->getPhpNullable($fieldXML);
@@ -375,32 +324,12 @@ public function getField(&$fieldXML, &$fields) {
     $field['comment'] = $this->value('comment', $fieldXML);
     $field['deprecated'] = $this->value('deprecated', $fieldXML, FALSE);
     $field['default'] = $this->value('default', $fieldXML);
-    $import = $this->value('import', $fieldXML) ? strtoupper($this->value('import', $fieldXML)) : 'FALSE';
-    $export = $this->value('export', $fieldXML) ? strtoupper($this->value('export', $fieldXML)) : NULL;
-    if (!isset($fieldXML->usage)) {
-      $usage = [
-        'import' => $import,
-        'export' => $export ?? $import,
-      ];
-    }
-    else {
-      $usage = [];
-      foreach ($fieldXML->usage->children() as $usedFor => $isUsed) {
-        $usage[$usedFor] = strtoupper((string) $isUsed);
-      }
-      $import = $usage['import'] ?? $import;
-    }
-    // Ensure all keys are populated. Import is the historical de-facto default.
-    $field['usage'] = array_merge(array_fill_keys(['import', 'export', 'duplicate_matching'], $import), $usage);
-    // Usage for tokens has not historically been in the metadata so we can default to FALSE.
-    // historically hard-coded lists have been used.
-    $field['usage']['token'] ??= 'FALSE';
-    $field['import'] = $field['usage']['import'];
-    $field['export'] = $export ?? $import;
+
+    $field['usage'] = CRM_Utils_Schema::getFieldUsage($fieldXML);
     $field['rule'] = $this->value('rule', $fieldXML);
     $field['title'] = $this->value('title', $fieldXML);
     if (!$field['title']) {
-      $field['title'] = $this->composeTitle($name);
+      $field['title'] = CRM_Utils_Schema::composeTitle($name);
     }
     $field['headerPattern'] = $this->value('headerPattern', $fieldXML);
     $field['dataPattern'] = $this->value('dataPattern', $fieldXML);
@@ -409,108 +338,13 @@ public function getField(&$fieldXML, &$fields) {
     $field['uniqueTitle'] = $this->value('uniqueTitle', $fieldXML);
     $field['serialize'] = $this->value('serialize', $fieldXML);
     $field['component'] = $this->value('component', $fieldXML);
-    $field['html'] = $this->value('html', $fieldXML);
+    $field['html'] = CRM_Utils_Schema::getFieldHtml($fieldXML);
     $field['contactType'] = $this->value('contactType', $fieldXML);
-    if (isset($fieldXML->permission)) {
-      $field['permission'] = trim($this->value('permission', $fieldXML));
-      $field['permission'] = $field['permission'] ? array_filter(array_map('trim', explode(',', $field['permission']))) : [];
-      if (isset($fieldXML->permission->or)) {
-        $field['permission'][] = array_filter(array_map('trim', explode(',', $fieldXML->permission->or)));
-      }
-    }
-    if (!empty($field['html'])) {
-      $validOptions = [
-        'type',
-        'formatType',
-        'label',
-        'controlField',
-        'min',
-        'max',
-        /* Fixme: prior to CRM-13497 these were in a flat structure
-        // CRM-13497 moved them to be nested within 'html' but there's no point
-        // making that change in the DAOs right now since we are in the process of
-        // moving to docrtine anyway.
-        // So translating from nested xml back to flat structure for now.
-        'rows',
-        'cols',
-        'size', */
-      ];
-      $field['html'] = [];
-      foreach ($validOptions as $htmlOption) {
-        if (isset($fieldXML->html->$htmlOption) && $fieldXML->html->$htmlOption !== '') {
-          $field['html'][$htmlOption] = $this->value($htmlOption, $fieldXML->html);
-        }
-      }
-      if (isset($fieldXML->html->filter)) {
-        $field['html']['filter'] = (array) $fieldXML->html->filter;
-      }
-    }
-
-    // in multilingual context popup, we need extra information to create appropriate widget
-    if ($fieldXML->localizable) {
-      if (isset($fieldXML->html)) {
-        $field['widget'] = (array) $fieldXML->html;
-      }
-      else {
-        // default
-        $field['widget'] = ['type' => 'Text'];
-      }
-      if (isset($fieldXML->required)) {
-        $field['widget']['required'] = $this->value('required', $fieldXML);
-      }
-    }
-    if (isset($fieldXML->localize_context)) {
-      $field['localize_context'] = $fieldXML->localize_context;
-    }
+    $field['permission'] = CRM_Utils_Schema::getFieldPermission($fieldXML);
+    $field['widget'] = CRM_Utils_Schema::getFieldWidget($fieldXML);
+    $field['localize_context'] = $this->value('localize_context', $fieldXML);
     $field['add'] = $this->value('add', $fieldXML);
-    $field['pseudoconstant'] = $this->value('pseudoconstant', $fieldXML);
-    if (!empty($field['pseudoconstant'])) {
-      //ok this is a bit long-winded but it gets there & is consistent with above approach
-      $field['pseudoconstant'] = [];
-      $validOptions = [
-        // Fields can specify EITHER optionGroupName OR table, not both
-        // (since declaring optionGroupName means we are using the civicrm_option_value table)
-        'optionGroupName',
-        'table',
-        // If table is specified, keyColumn and labelColumn are also required
-        'keyColumn',
-        'labelColumn',
-        // Non-translated machine name for programmatic lookup. Defaults to 'name' if that column exists
-        'nameColumn',
-        // Column to fetch in "abbreviate" context
-        'abbrColumn',
-        // Supported by APIv4 suffixes
-        'colorColumn',
-        'iconColumn',
-        // Where clause snippet (will be joined to the rest of the query with AND operator)
-        'condition',
-        // callback function incase of static arrays
-        'callback',
-        // Path to options edit form
-        'optionEditPath',
-        // Should options for this field be prefetched (for presenting on forms).
-        // The default is TRUE, but adding FALSE helps when there could be many options
-        'prefetch',
-      ];
-      foreach ($validOptions as $pseudoOption) {
-        if (!empty($fieldXML->pseudoconstant->$pseudoOption)) {
-          $field['pseudoconstant'][$pseudoOption] = $this->value($pseudoOption, $fieldXML->pseudoconstant);
-        }
-      }
-      if (!isset($field['pseudoconstant']['optionEditPath']) && !empty($field['pseudoconstant']['optionGroupName'])) {
-        $field['pseudoconstant']['optionEditPath'] = 'civicrm/admin/options/' . $field['pseudoconstant']['optionGroupName'];
-      }
-      // Set suffixes if explicitly declared
-      if (!empty($fieldXML->pseudoconstant->suffixes)) {
-        $field['pseudoconstant']['suffixes'] = explode(',', $this->value('suffixes', $fieldXML->pseudoconstant));
-      }
-      // For now, fields that have option lists that are not in the db can simply
-      // declare an empty pseudoconstant tag and we'll add this placeholder.
-      // That field's BAO::buildOptions fn will need to be responsible for generating the option list
-      if (empty($field['pseudoconstant'])) {
-        $field['pseudoconstant'] = 'not in database';
-      }
-    }
+    $field['pseudoconstant'] = CRM_Utils_Schema::getFieldPseudoconstant($fieldXML);
     $fields[$name] = &$field;
   }
 
@@ -558,31 +392,6 @@ private function getPhpNullable($fieldXML) {
     return !$required;
   }
 
-  /**
-   * @param string $name
-   *
-   * @return string
-   */
-  public function composeTitle($name) {
-    $substitutions = [
-      'is_active' => 'Enabled',
-    ];
-    if (isset($substitutions[$name])) {
-      return $substitutions[$name];
-    }
-    $names = explode('_', strtolower($name));
-    $allCaps = ['im', 'id'];
-    foreach ($names as $i => $str) {
-      if (in_array($str, $allCaps, TRUE)) {
-        $names[$i] = strtoupper($str);
-      }
-      else {
-        $names[$i] = ucfirst(trim($str));
-      }
-    }
-    return trim(implode(' ', $names));
-  }
-
   /**
    * @param object $primaryXML
    * @param array $fields
@@ -808,36 +617,4 @@ protected function append(&$str, $delim, $name) {
     }
   }
 
-  /**
-   * Sets the size property of a textfield.
-   *
-   * @param string $fieldXML
-   *
-   * @return null|string
-   */
-  protected function getSize($fieldXML) {
-    // Extract from <size> tag if supplied
-    if (!empty($fieldXML->html) && $this->value('size', $fieldXML->html)) {
-      return $this->value('size', $fieldXML->html);
-    }
-    // Infer from <length> tag if <size> was not explicitly set or was invalid
-    // This map is slightly different from CRM_Core_Form_Renderer::$_sizeMapper
-    // Because we usually want fields to render as smaller than their maxlength
-    $sizes = [
-      2 => 'TWO',
-      4 => 'FOUR',
-      6 => 'SIX',
-      8 => 'EIGHT',
-      16 => 'TWELVE',
-      32 => 'MEDIUM',
-      64 => 'BIG',
-    ];
-    foreach ($sizes as $length => $name) {
-      if ($fieldXML->length <= $length) {
-        return "CRM_Utils_Type::$name";
-      }
-    }
-    return 'CRM_Utils_Type::HUGE';
-  }
-
 }
diff --git a/www/modules/civicrm/CRM/Core/CodeGen/Util/MessageTemplates.php b/www/modules/civicrm/CRM/Core/CodeGen/Util/MessageTemplates.php
index 2a2dfa46b..e47546e16 100644
--- a/www/modules/civicrm/CRM/Core/CodeGen/Util/MessageTemplates.php
+++ b/www/modules/civicrm/CRM/Core/CodeGen/Util/MessageTemplates.php
@@ -255,9 +255,18 @@ public static function assignSmartyVariables($smarty): void {
    */
   protected static function getDirectory($smarty) {
     if (method_exists($smarty, 'getTemplateDir')) {
-      return $smarty->getTemplateDir() . '/message_templates/';
+      $directories = $smarty->getTemplateDir();
     }
-    return $smarty->template_dir . '/message_templates/';
+    else {
+      $directories = (array) $smarty->template_dir;
+    }
+    foreach ($directories as $directory) {
+      if (file_exists($directory . '/message_templates/')) {
+        return $directory . '/message_templates/';
+      }
+    }
+
+    return $directory . '/message_templates/';
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Core/CodeGen/Util/Smarty.php b/www/modules/civicrm/CRM/Core/CodeGen/Util/Smarty.php
index a1eb1f29c..2f3300cfc 100644
--- a/www/modules/civicrm/CRM/Core/CodeGen/Util/Smarty.php
+++ b/www/modules/civicrm/CRM/Core/CodeGen/Util/Smarty.php
@@ -43,25 +43,43 @@ public function getCompileDir() {
    * Create a Smarty instance.
    *
    * @return \Smarty
+   * @throws \SmartyException
    */
-  public function createSmarty() {
-    $base = dirname(dirname(dirname(dirname(__DIR__))));
+  public function createSmarty(): Smarty {
+    $base = dirname(__DIR__, 4);
     $pkgs = file_exists(dirname($base) . "/civicrm-packages") ? dirname($base) . "/civicrm-packages" : "$base/packages";
 
-    require_once 'Smarty/Smarty.class.php';
+    if (!defined('CIVICRM_SMARTY_AUTOLOAD_PATH')) {
+      define('CIVICRM_SMARTY_AUTOLOAD_PATH', $pkgs . '/smarty4/vendor/autoload.php');
+    }
+    // FIXME: If it's already set, and it doesn't match, then that's a problem.
+
+    require_once $pkgs . '/smarty4/vendor/autoload.php';
     $smarty = new Smarty();
-    $smarty->template_dir = "$base/xml/templates";
-    $smarty->plugins_dir = ["$pkgs/Smarty/plugins", "$base/CRM/Core/Smarty/plugins"];
-    $smarty->compile_dir = $this->getCompileDir();
-    $smarty->clear_all_cache();
+    $smarty->setTemplateDir("$base/xml/templates");
+    $pluginsDirectory = $smarty->getPluginsDir();
+    $pluginsDirectory[] = "$base/CRM/Core/Smarty/plugins";
+    // Doesn't seem to work very well.... since I still need require_once below
+    $smarty->setPluginsDir($pluginsDirectory);
+    $smarty->setCompileDir($this->getCompileDir());
+    $smarty->clearAllCache();
 
     // CRM-5308 / CRM-3507 - we need {localize} to work in the templates
-
     require_once 'CRM/Core/Smarty/plugins/block.localize.php';
-    $smarty->register_block('localize', 'smarty_block_localize');
-    $smarty->assign('gencodeXmlDir', dirname(dirname(dirname(dirname(__DIR__)))) . '/xml');
-    require_once 'CRM/Core/CodeGen/Util/MessageTemplates.php';
-    CRM_Core_CodeGen_Util_MessageTemplates::assignSmartyVariables($smarty);
+    $smarty->registerPlugin('block', 'localize', 'smarty_block_localize');
+
+    // Use our special replace rather than Smarty's to avoid conflicts while we
+    // transition from Smarty2.
+    require_once 'CRM/Core/Smarty/plugins/modifier.crmEscapeSingleQuotes.php';
+    $smarty->registerPlugin('modifier', 'crmEscapeSingleQuotes', 'smarty_modifier_crmEscapeSingleQuotes');
+
+    require_once 'CRM/Core/Smarty/plugins/modifier.crmCountCharacters.php';
+    $smarty->registerPlugin('modifier', 'crmCountCharacters', 'smarty_modifier_crmCountCharacters');
+
+    $smarty->registerPlugin('modifier', 'json_encode', 'json_encode');
+    $smarty->registerPlugin('modifier', 'count', 'count');
+    $smarty->registerPlugin('modifier', 'implode', 'implode');
+
     return $smarty;
   }
 
diff --git a/www/modules/civicrm/CRM/Core/CodeGen/Util/Template.php b/www/modules/civicrm/CRM/Core/CodeGen/Util/Template.php
index 6b59f98ec..67d00edd1 100644
--- a/www/modules/civicrm/CRM/Core/CodeGen/Util/Template.php
+++ b/www/modules/civicrm/CRM/Core/CodeGen/Util/Template.php
@@ -7,6 +7,11 @@ class CRM_Core_CodeGen_Util_Template {
   protected $filetype;
 
   protected $smarty;
+
+  public function getSmarty(): Smarty {
+    return $this->smarty;
+  }
+
   protected $beautifier;
 
   /**
diff --git a/www/modules/civicrm/CRM/Core/Component/Info.php b/www/modules/civicrm/CRM/Core/Component/Info.php
index 328f62d28..a3a502fd8 100644
--- a/www/modules/civicrm/CRM/Core/Component/Info.php
+++ b/www/modules/civicrm/CRM/Core/Component/Info.php
@@ -140,19 +140,11 @@ public function getAnonymousPermissionWarnings() {
   }
 
   /**
-   * Provides permissions that are used by component.
-   * Needs to be implemented in component's information
-   * class.
-   *
-   * NOTE: if using conditionally permission return,
-   * implementation of $getAllUnconditionally is required.
+   * Defines permissions that are used by component.
    *
-   * @param bool $getAllUnconditionally
-   *
-   * @return array|null
-   *   collection of permissions, null if none
+   * @return array
    */
-  abstract public function getPermissions($getAllUnconditionally = FALSE);
+  abstract public function getPermissions();
 
   /**
    * Determine how many other records refer to a given record.
diff --git a/www/modules/civicrm/CRM/Core/Config.php b/www/modules/civicrm/CRM/Core/Config.php
index ce7043d2a..486820f5e 100644
--- a/www/modules/civicrm/CRM/Core/Config.php
+++ b/www/modules/civicrm/CRM/Core/Config.php
@@ -91,7 +91,14 @@ public static function &singleton($loadFromDB = TRUE, $force = FALSE) {
           // Standalone's session cannot be initialized until CiviCRM is booted,
           // since it is defined in an extension, and we need the session
           // initialized before calling applyLocale.
-          \CRM_Core_Session::singleton()->initialize();
+          $sess = \CRM_Core_Session::singleton();
+          $sess->initialize();
+          if ($sess->getLoggedInContactID()) {
+            // Apply user's timezone.
+            if (is_callable([self::$_singleton->userSystem, 'setMySQLTimeZone'])) {
+              self::$_singleton->userSystem->setMySQLTimeZone();
+            }
+          }
         }
         \CRM_Core_BAO_ConfigSetting::applyLocale(\Civi::settings($domain->id), $domain->locales);
 
@@ -274,13 +281,16 @@ public static function environment($env = NULL, $reset = FALSE) {
    *
    * @param bool $sessionReset
    */
-  public function cleanupCaches($sessionReset = TRUE) {
+  public function cleanupCaches($sessionReset = FALSE) {
     // cleanup templates_c directory
     $this->cleanup(1, FALSE);
     UserJob::delete(FALSE)->addWhere('expires_date', '<', 'now')->execute();
     // clear all caches
     self::clearDBCache();
-    Civi::cache('session')->clear();
+    // Avoid clearing QuickForm sessions unless explicitly requested
+    if ($sessionReset) {
+      Civi::cache('session')->clear();
+    }
     Civi::cache('metadata')->clear();
     CRM_Core_DAO_AllCoreTables::flush();
     CRM_Utils_System::flushCache();
@@ -342,7 +352,8 @@ public static function clearDBCache(): void {
     $queries = [
       'TRUNCATE TABLE civicrm_acl_cache',
       'TRUNCATE TABLE civicrm_acl_contact_cache',
-      'TRUNCATE TABLE civicrm_cache',
+      // Do not truncate, reduce risks of losing a quickform session
+      'DELETE FROM civicrm_cache WHERE group_name NOT LIKE "CiviCRM%Session"',
       'TRUNCATE TABLE civicrm_prevnext_cache',
       'UPDATE civicrm_group SET cache_date = NULL',
       'TRUNCATE TABLE civicrm_group_contact_cache',
diff --git a/www/modules/civicrm/CRM/Core/Config/MagicMerge.php b/www/modules/civicrm/CRM/Core/Config/MagicMerge.php
index 3e5f3b197..49b745e91 100644
--- a/www/modules/civicrm/CRM/Core/Config/MagicMerge.php
+++ b/www/modules/civicrm/CRM/Core/Config/MagicMerge.php
@@ -240,10 +240,19 @@ public function __get($k) {
           $value = CRM_Utils_File::addTrailingSlash($value);
           if (isset($this->map[$k][2]) && in_array('mkdir', $this->map[$k][2])) {
             if (!is_dir($value) && !CRM_Utils_File::createDir($value, FALSE)) {
-              CRM_Core_Session::setStatus(ts('Failed to make directory (%1) at "%2". Please update the settings or file permissions.', [
+              // we want to warn the user about this error
+              // ideally we show a browser alert
+              // but this might not be possible if the session handler isn't up yet, so fallback to just printing it (sorry)
+              $alertMessage = ts('Failed to make directory (%1) at "%2". Please update the settings or file permissions.', [
                 1 => $k,
                 2 => $value,
-              ]));
+              ]);
+              try {
+                CRM_Core_Session::setStatus($alertMessage);
+              }
+              catch (\Error $e) {
+                echo $alertMessage;
+              }
             }
           }
           if (isset($this->map[$k][2]) && in_array('restrict', $this->map[$k][2])) {
diff --git a/www/modules/civicrm/CRM/Core/Controller.php b/www/modules/civicrm/CRM/Core/Controller.php
index 03db1e999..6bde93507 100644
--- a/www/modules/civicrm/CRM/Core/Controller.php
+++ b/www/modules/civicrm/CRM/Core/Controller.php
@@ -603,9 +603,12 @@ public function assign($var, $value = NULL) {
    * @param string $var
    * @param mixed $value
    *   (reference) value of variable.
+   *
+   * @deprecated since 5.72 will be removed around 5.84
    */
   public function assign_by_ref($var, &$value) {
-    self::$_template->assign_by_ref($var, $value);
+    CRM_Core_Error::deprecatedFunctionWarning('assign');
+    self::$_template->assign($var, $value);
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Core/DAO.php b/www/modules/civicrm/CRM/Core/DAO.php
index 98ac4c4c8..7c4e8414c 100644
--- a/www/modules/civicrm/CRM/Core/DAO.php
+++ b/www/modules/civicrm/CRM/Core/DAO.php
@@ -28,8 +28,6 @@
 require_once 'PEAR.php';
 require_once 'DB/DataObject.php';
 
-require_once 'CRM/Core/I18n.php';
-
 /**
  * Class CRM_Core_DAO
  */
@@ -42,13 +40,6 @@ class CRM_Core_DAO extends DB_DataObject {
    */
   public static $_primaryKey = ['id'];
 
-  /**
-   * @return string[]
-   */
-  protected function getPrimaryKey(): array {
-    return static::$_primaryKey;
-  }
-
   /**
    * @return string
    */
@@ -58,7 +49,7 @@ protected function getFirstPrimaryKey(): string {
     // keys (which we support in codegen if not many other places) we return 'id'
     // simply because that is what we historically did & we don't want to 'just change'
     // it & break those extensions without doing the work to create an alternative.
-    return count($this->getPrimaryKey()) > 1 ? 'id' : $this->getPrimaryKey()[0];
+    return count($this->keys()) > 1 ? 'id' : $this->keys()[0];
   }
 
   /**
@@ -149,7 +140,7 @@ protected function getFirstPrimaryKey(): string {
    */
   public function __construct() {
     $this->initialize();
-    $this->__table = $this->getTableName();
+    $this->__table = $this::getLocaleTableName();
   }
 
   /**
@@ -160,7 +151,11 @@ public function __construct() {
   public static function getEntityTitle() {
     $className = static::class;
     CRM_Core_Error::deprecatedWarning("$className needs to be regenerated. Missing getEntityTitle method.");
-    return CRM_Core_DAO_AllCoreTables::getBriefName($className);
+    return CRM_Core_DAO_AllCoreTables::getEntityNameForClass($className);
+  }
+
+  public static function getLabelField(): ?string {
+    return static::$_labelField;
   }
 
   /**
@@ -191,10 +186,16 @@ public function __destruct() {
   /**
    * Returns the name of this table
    *
+   * Name is not localized, which is generally fine because localization happens when executing the query:
+   * @see \CRM_Core_I18n_Schema::rewriteQuery()
+   *
+   * To get the localized name of this table,
+   * @see self::getLocaleTableName()
+   *
    * @return string
    */
   public static function getTableName() {
-    return self::getLocaleTableName(static::$_tableName ?? NULL);
+    return static::$_tableName ?? NULL;
   }
 
   /**
@@ -206,6 +207,26 @@ public function getLog() {
     return static::$_log ?? FALSE;
   }
 
+  /**
+   * Returns the list of fields that can be imported
+   *
+   * @param bool $prefix
+   * @return array
+   */
+  public static function import($prefix = FALSE) {
+    return CRM_Core_DAO_AllCoreTables::getImports(static::class, substr(static::getTableName(), 8), $prefix);
+  }
+
+  /**
+   * Returns the list of fields that can be exported
+   *
+   * @param bool $prefix
+   * @return array
+   */
+  public static function export($prefix = FALSE) {
+    return CRM_Core_DAO_AllCoreTables::getExports(static::class, substr(static::getTableName(), 8), $prefix);
+  }
+
   /**
    * Initialize the DAO object.
    *
@@ -441,11 +462,20 @@ public function reset() {
   }
 
   /**
-   * @param string $tableName
+   * Get localized name of this table, if applicable.
+   *
+   * If this is a multi-language installation and the table has localized columns,
+   * will return table name with language string appended, which points to a sql view.
+   * Otherwise, this returns the same output as
+   * @see self::getTableName()
+   *
+   * @param string|null $tableName
+   *  Unnecessary deprecated param
    *
    * @return string
    */
-  public static function getLocaleTableName($tableName) {
+  public static function getLocaleTableName($tableName = NULL) {
+    $tableName ??= static::getTableName();
     global $dbLocale;
     if ($dbLocale) {
       $tables = CRM_Core_I18n_Schema::schemaStructureTables();
@@ -505,31 +535,24 @@ public function initialize() {
   }
 
   /**
-   * Defines the default key as 'id'.
+   * Returns primary keys (usually ['id'])
    *
-   * @return array
+   * @return string[]
    */
   public function keys() {
-    static $keys;
-    if (!isset($keys)) {
-      $keys = ['id'];
-    }
-    return $keys;
+    return static::$_primaryKey;
   }
 
   /**
    * Tells DB_DataObject which keys use autoincrement.
    * 'id' is autoincrementing by default.
    *
+   * FIXME: this should return all autoincrement keys not just the first.
    *
    * @return array
    */
   public function sequenceKey() {
-    static $sequenceKeys;
-    if (!isset($sequenceKeys)) {
-      $sequenceKeys = [$this->getFirstPrimaryKey(), TRUE];
-    }
-    return $sequenceKeys;
+    return [$this->getFirstPrimaryKey(), TRUE];
   }
 
   /**
@@ -594,7 +617,7 @@ public static function getSupportedFields($checkPermissions = FALSE) {
 
     // Exclude fields yet not added by pending upgrades
     $dbVer = \CRM_Core_BAO_Domain::version();
-    $daoExt = defined(static::class . '::EXT') ? constant(static::class . '::EXT') : NULL;
+    $daoExt = static::getExtensionName();
     if ($fields && $daoExt === 'civicrm' && version_compare($dbVer, \CRM_Utils_System::version()) < 0) {
       $fields = array_filter($fields, function($field) use ($dbVer) {
         $add = $field['add'] ?? '1.0.0';
@@ -615,6 +638,59 @@ public static function getSupportedFields($checkPermissions = FALSE) {
     return $fields;
   }
 
+  /**
+   * Get name of extension in which this DAO is defined.
+   * @return string|null
+   */
+  public static function getExtensionName(): ?string {
+    return defined(static::class . '::EXT') ? constant(static::class . '::EXT') : NULL;
+  }
+
+  /**
+   * Format field values according to fields() metadata.
+   *
+   * When fetching results from a query, every field is returned as a string.
+   * This function automatically converts them to the correct data type.
+   *
+   * @param array $fieldValues
+   * @return void
+   */
+  public static function formatFieldValues(array &$fieldValues) {
+    $fields = array_column((array) static::fields(), NULL, 'name');
+    foreach ($fieldValues as $fieldName => $fieldValue) {
+      $fieldSpec = $fields[$fieldName] ?? NULL;
+      $fieldValues[$fieldName] = self::formatFieldValue($fieldValue, $fieldSpec);
+    }
+  }
+
+  /**
+   * Format a value according to field metadata.
+   *
+   * @param string|null $value
+   * @param array|null $fieldSpec
+   * @return mixed
+   */
+  protected static function formatFieldValue($value, ?array $fieldSpec) {
+    // DAO queries return `null` db values as empty string
+    if ($value === '' && empty($fieldSpec['required'])) {
+      return NULL;
+    }
+    if (!isset($value) || !isset($fieldSpec)) {
+      return $value;
+    }
+    $dataType = $fieldSpec['type'] ?? NULL;
+    if ($dataType === CRM_Utils_Type::T_INT) {
+      return (int) $value;
+    }
+    if ($dataType === CRM_Utils_Type::T_BOOLEAN) {
+      return (bool) $value;
+    }
+    if (!empty($fieldSpec['serialize'])) {
+      return self::unSerializeField($value, $fieldSpec['serialize']);
+    }
+    return $value;
+  }
+
   /**
    * Get/set an associative array of table columns
    *
@@ -771,11 +847,11 @@ public function copyValues($params) {
     $primaryKey = $this->getFirstPrimaryKey();
     foreach ($this->fields() as $uniqueName => $field) {
       $dbName = $field['name'];
-      if (array_key_exists($dbName, $params)) {
+      if (is_array($params) && array_key_exists($dbName, $params)) {
         $value = $params[$dbName];
         $exists = TRUE;
       }
-      elseif (array_key_exists($uniqueName, $params)) {
+      elseif (is_array($params) && array_key_exists($uniqueName, $params)) {
         $value = $params[$uniqueName];
         $exists = TRUE;
       }
@@ -958,7 +1034,7 @@ public static function writeRecord(array $record): CRM_Core_DAO {
     if ($className === 'CRM_Core_DAO') {
       throw new CRM_Core_Exception('Function writeRecord must be called on a subclass of CRM_Core_DAO');
     }
-    $entityName = CRM_Core_DAO_AllCoreTables::getBriefName($className);
+    $entityName = CRM_Core_DAO_AllCoreTables::getEntityNameForClass($className);
 
     // For legacy reasons, empty values would sometimes be passed around as the string 'null'.
     // The DAO treats 'null' the same as '', and an empty string makes a lot more sense!
@@ -989,7 +1065,7 @@ public static function writeRecord(array $record): CRM_Core_DAO {
     $instance->save();
 
     if (!empty($record['custom']) && is_array($record['custom'])) {
-      CRM_Core_BAO_CustomValueTable::store($record['custom'], static::$_tableName, $instance->$idField, $op);
+      CRM_Core_BAO_CustomValueTable::store($record['custom'], static::getTableName(), $instance->$idField, $op);
     }
 
     \CRM_Utils_Hook::post($op, $entityName, $instance->$idField, $instance, $record);
@@ -1027,7 +1103,7 @@ public static function deleteRecord(array $record) {
     if ($className === 'CRM_Core_DAO') {
       throw new CRM_Core_Exception('Function deleteRecord must be called on a subclass of CRM_Core_DAO');
     }
-    $entityName = CRM_Core_DAO_AllCoreTables::getBriefName($className);
+    $entityName = CRM_Core_DAO_AllCoreTables::getEntityNameForClass($className);
     if (empty($record[$idField])) {
       throw new CRM_Core_Exception("Cannot delete {$entityName} with no $idField.");
     }
@@ -1099,26 +1175,23 @@ public static function objectExists($value, $daoName, $daoID, $fieldName = 'name
   }
 
   /**
-   * Gets the names of all the tables in the schema.
+   * Gets the names of all enabled schema tables.
+   *
+   * - Includes tables from core, components & enabled extensions.
+   * - Excludes log tables, temp tables, and missing/disabled extensions.
    *
    * @return array
    *
    * @throws \CRM_Core_Exception
    */
   public static function getTableNames(): array {
-    $dao = CRM_Core_DAO::executeQuery(
-      "SELECT TABLE_NAME
-       FROM information_schema.TABLES
-       WHERE TABLE_SCHEMA = DATABASE()
-         AND TABLE_NAME LIKE 'civicrm_%'
-         AND TABLE_NAME NOT LIKE '%_tmp%'
-      ");
+    // CRM_Core_DAO_AllCoreTables returns all tables with a dao (core + extensions)
+    $daoTables = array_column(CRM_Core_DAO_AllCoreTables::getEntities(), 'table');
 
-    $values = [];
-    while ($dao->fetch()) {
-      $values[] = $dao->TABLE_NAME;
-    }
-    return $values;
+    // Include custom value tables
+    $customTables = array_column(CRM_Core_BAO_CustomGroup::getAll(), 'table_name');
+
+    return array_merge($daoTables, $customTables);
   }
 
   /**
@@ -1179,14 +1252,10 @@ public static function checkConstraintExists($tableName, $constraint) {
   /**
    * Checks if CONSTRAINT keyword exists for a specified table.
    *
-   * @param array $tables
-   *
-   * @throws CRM_Core_Exception
-   *
-   * @return bool
-   *   true if CONSTRAINT keyword exists, false otherwise
+   * @deprecated in 5.72 will be removed in 5.85
    */
   public static function schemaRequiresRebuilding($tables = ["civicrm_contact"]) {
+    CRM_Core_Error::deprecatedFunctionWarning('No alternative');
     $show = [];
     foreach ($tables as $tableName) {
       if (!array_key_exists($tableName, $show)) {
@@ -1215,15 +1284,10 @@ public static function schemaRequiresRebuilding($tables = ["civicrm_contact"]) {
    * Checks if the FK constraint name is in the format 'FK_tableName_columnName'
    * for a specified column of a table.
    *
-   * @param string $tableName
-   * @param string $columnName
-   *
-   * @return bool
-   *   true if in format, false otherwise
-   *
-   * @throws \CRM_Core_Exception
+   * @deprecated in 5.72 will be removed in 5.85
    */
   public static function checkFKConstraintInFormat($tableName, $columnName) {
+    CRM_Core_Error::deprecatedFunctionWarning('No alternative');
     static $show = [];
 
     if (!array_key_exists($tableName, $show)) {
@@ -1244,14 +1308,10 @@ public static function checkFKConstraintInFormat($tableName, $columnName) {
   /**
    * Check whether a specific column in a specific table has always the same value.
    *
-   * @param string $tableName
-   * @param string $columnName
-   * @param string $columnValue
-   *
-   * @return bool
-   *   true if the value is always $columnValue, false otherwise
+   * @deprecated in 5.72 will be removed in 5.85
    */
   public static function checkFieldHasAlwaysValue($tableName, $columnName, $columnValue) {
+    CRM_Core_Error::deprecatedFunctionWarning('APIv4');
     $query = "SELECT * FROM $tableName WHERE $columnName != '$columnValue'";
     $dao = CRM_Core_DAO::executeQuery($query);
     $result = $dao->fetch() ? FALSE : TRUE;
@@ -1261,13 +1321,10 @@ public static function checkFieldHasAlwaysValue($tableName, $columnName, $column
   /**
    * Check whether a specific column in a specific table is always NULL.
    *
-   * @param string $tableName
-   * @param string $columnName
-   *
-   * @return bool
-   *   true if if the value is always NULL, false otherwise
+   * @deprecated in 5.72 will be removed in 5.85
    */
   public static function checkFieldIsAlwaysNull($tableName, $columnName) {
+    CRM_Core_Error::deprecatedFunctionWarning('APIv4');
     $query = "SELECT * FROM $tableName WHERE $columnName IS NOT NULL";
     $dao = CRM_Core_DAO::executeQuery($query);
     $result = $dao->fetch() ? FALSE : TRUE;
@@ -1282,13 +1339,25 @@ public static function checkFieldIsAlwaysNull($tableName, $columnName) {
    * @return bool
    * @throws CRM_Core_Exception
    */
-  public static function tableHasBeenAdded() {
+  public static function tableHasBeenAdded(): bool {
     if (CRM_Utils_System::version() === CRM_Core_BAO_Domain::version()) {
       return TRUE;
     }
-    $daoExt = defined(static::class . '::EXT') ? constant(static::class . '::EXT') : NULL;
-    $daoVersion = defined(static::class . '::TABLE_ADDED') ? constant(static::class . '::TABLE_ADDED') : '1.0';
-    return !($daoExt === 'civicrm' && version_compare(CRM_Core_BAO_Domain::version(), $daoVersion, '<'));
+    $daoExt = static::getExtensionName();
+    if ($daoExt !== 'civicrm') {
+      // FIXME: Check extension tables
+      return TRUE;
+    }
+    $daoVersion = static::getTableAddVersion();
+    return !(version_compare(CRM_Core_BAO_Domain::version(), $daoVersion, '<'));
+  }
+
+  /**
+   * @return string
+   *   Version in which table was added
+   */
+  protected static function getTableAddVersion(): string {
+    return defined(static::class . '::TABLE_ADDED') ? constant(static::class . '::TABLE_ADDED') : '1.0';
   }
 
   /**
@@ -1322,17 +1391,6 @@ public static function checkTableHasData($tableName) {
     return $c > 0;
   }
 
-  /**
-   * @param $version
-   * @deprecated
-   * @return bool
-   */
-  public function checkVersion($version) {
-    CRM_Core_Error::deprecatedFunctionWarning('CRM_Core_BAO_Domain::version');
-    $dbVersion = CRM_Core_BAO_Domain::version();
-    return trim($version) == trim($dbVersion);
-  }
-
   /**
    * Find a DAO object for the given ID and return it.
    *
@@ -1478,6 +1536,24 @@ public static function getFieldValue($daoName, $searchValue, $returnColumn = 'na
     return self::$_dbColumnValueCache[$daoName][$searchColumn][$searchValue][$returnColumn];
   }
 
+  /**
+   * Fetch a single field value from the database.
+   *
+   * Uses static caching and applies formatting.
+   *
+   * @param string $returnColumn
+   * @param string|int $searchValue
+   * @param string $searchColumn
+   * @return array|bool|int|string|null
+   *   Returned value will be formatted according to data type.
+   * @throws CRM_Core_Exception
+   */
+  public static function getDbVal(string $returnColumn, $searchValue, string $searchColumn = 'id') {
+    $fieldSpec = static::getSupportedFields()[$returnColumn] ?? NULL;
+    $value = $fieldSpec ? self::getFieldValue(static::class, $searchValue, $returnColumn, $searchColumn) : NULL;
+    return self::formatFieldValue($value, $fieldSpec);
+  }
+
   /**
    * Given a DAO name, a column name and a column value, find the record and SET the value of another column in that record
    *
@@ -1512,15 +1588,11 @@ public static function setFieldValue($daoName, $searchValue, $setColumn, $setVal
   }
 
   /**
-   * Get sort string.
-   *
-   * @param array|object $sort either array or CRM_Utils_Sort
-   * @param string $default
-   *   Default sort value.
-   *
-   * @return string
+   * Unused function.
+   * @deprecated in 5.72 will be removed in 5.85
    */
   public static function getSortString($sort, $default = NULL) {
+    CRM_Core_Error::deprecatedFunctionWarning('No alternative');
     // check if sort is of type CRM_Utils_Sort
     if (is_a($sort, 'CRM_Utils_Sort')) {
       return $sort->orderBy();
@@ -1572,14 +1644,9 @@ public static function commonRetrieve($daoName, &$params, &$defaults, $returnPro
   }
 
   /**
-   * Delete the object records that are associated with this contact.
-   *
-   * @deprecated
+   * Unused function.
    *
-   * @param string $daoName
-   *   Name of the dao object.
-   * @param int $contactId
-   *   Id of the contact to delete.
+   * @deprecated in 5.47 will be removed in 5.80
    */
   public static function deleteEntityContact($daoName, $contactId) {
     CRM_Core_Error::deprecatedFunctionWarning('APIv4');
@@ -1965,7 +2032,7 @@ public static function copyGeneric($daoName, $criteria, $newData = NULL, $fields
       if (!$blockCopyofCustomValues) {
         $newObject->copyCustomFields($object->id, $newObject->id);
       }
-      CRM_Utils_Hook::post('create', CRM_Core_DAO_AllCoreTables::getBriefName($daoName), $newObject->id, $newObject);
+      CRM_Utils_Hook::post('create', CRM_Core_DAO_AllCoreTables::getEntityNameForClass($daoName), $newObject->id, $newObject);
     }
 
     return $newObject;
@@ -2047,7 +2114,7 @@ protected function copyLocalizable($entityID, $newEntityID, $fieldsToPrefix, $fi
    * @param string $parentOperation
    */
   public function copyCustomFields($entityID, $newEntityID, $parentOperation = NULL) {
-    $entity = CRM_Core_DAO_AllCoreTables::getBriefName(get_class($this));
+    $entity = CRM_Core_DAO_AllCoreTables::getEntityNameForClass(get_class($this));
     $tableName = CRM_Core_DAO_AllCoreTables::getTableForClass(get_class($this));
     // Obtain custom values for the old entity.
     $customParams = $htmlType = [];
@@ -2233,6 +2300,9 @@ public static function escapeString($string) {
     if ($string === NULL) {
       return '';
     }
+    if (isset($GLOBALS['CIVICRM_SQL_ESCAPER'])) {
+      return call_user_func($GLOBALS['CIVICRM_SQL_ESCAPER'], $string);
+    }
     static $_dao = NULL;
     if (!$_dao) {
       // If this is an atypical case (e.g. preparing .sql file before CiviCRM
@@ -2610,13 +2680,9 @@ public function getReferenceCounts() {
   }
 
   /**
-   * List all tables which have hard foreign keys to this table.
-   *
-   * For now, this returns a description of every entity_id/entity_table
-   * reference.
-   * TODO: filter dynamic entity references on the $tableName, based on
-   * schema metadata in dynamicForeignKey which enumerates a restricted
-   * set of possible entity_table's.
+   * List all tables which have either:
+   * - hard foreign keys to this table, or
+   * - a dynamic foreign key that includes this table as a possible target.
    *
    * @param string $tableName
    *   Table referred to.
@@ -2652,9 +2718,6 @@ public static function getReferencesToTable($tableName) {
    * @throws \CRM_Core_Exception
    */
   public static function getReferencesToContactTable() {
-    if (isset(\Civi::$statics[__CLASS__]) && isset(\Civi::$statics[__CLASS__]['contact_references'])) {
-      return \Civi::$statics[__CLASS__]['contact_references'];
-    }
     $contactReferences = [];
     $coreReferences = CRM_Core_DAO::getReferencesToTable('civicrm_contact');
     foreach ($coreReferences as $coreReference) {
@@ -2669,8 +2732,7 @@ public static function getReferencesToContactTable() {
     }
     self::appendCustomTablesExtendingContacts($contactReferences);
     self::appendCustomContactReferenceFields($contactReferences);
-    \Civi::$statics[__CLASS__]['contact_references'] = $contactReferences;
-    return \Civi::$statics[__CLASS__]['contact_references'];
+    return $contactReferences;
   }
 
   /**
@@ -2696,40 +2758,38 @@ public static function getDynamicReferencesToTable($tableName) {
   /**
    * Add custom tables that extend contacts to the list of contact references.
    *
-   * CRM_Core_BAO_CustomGroup::getAllCustomGroupsByBaseEntity seems like a safe-ish
-   * function to be sure all are retrieved & we don't miss subtypes or inactive or multiples
-   * - the down side is it is not cached.
-   *
-   * Further changes should be include tests in the CRM_Core_MergerTest class
-   * to ensure that disabled, subtype, multiple etc groups are still captured.
+   * @internal
+   * Includes all contact custom groups including inactive, multiple & subtypes.
    *
    * @param array $cidRefs
    */
   public static function appendCustomTablesExtendingContacts(&$cidRefs) {
-    $customValueTables = CRM_Core_BAO_CustomGroup::getAllCustomGroupsByBaseEntity('Contact');
-    $customValueTables->find();
-    while ($customValueTables->fetch()) {
-      $cidRefs[$customValueTables->table_name][] = 'entity_id';
+    $customGroups = CRM_Core_BAO_CustomGroup::getAll(['extends' => 'Contact']);
+    foreach ($customGroups as $customGroup) {
+      $cidRefs[$customGroup['table_name']][] = 'entity_id';
     }
   }
 
   /**
-   * Add custom ContactReference fields to the list of contact references
+   * Add custom ContactReference fields to the list of contact references.
    *
-   * This includes active and inactive fields/groups
+   * @internal
+   * Includes both ContactReference and EntityReference type fields.
+   * Includes active and inactive fields/groups
    *
    * @param array $cidRefs
-   *
-   * @throws \CRM_Core_Exception
    */
   public static function appendCustomContactReferenceFields(&$cidRefs) {
-    $fields = civicrm_api3('CustomField', 'get', [
-      'return'    => ['column_name', 'custom_group_id.table_name'],
-      'data_type' => 'ContactReference',
-      'options' => ['limit' => 0],
-    ])['values'];
-    foreach ($fields as $field) {
-      $cidRefs[$field['custom_group_id.table_name']][] = $field['column_name'];
+    $contactTypes = array_merge(['Contact'], CRM_Contact_BAO_ContactType::basicTypes(TRUE));
+    foreach (CRM_Core_BAO_CustomGroup::getAll() as $customGroup) {
+      foreach ($customGroup['fields'] as $field) {
+        if (
+          $field['data_type'] === 'ContactReference' ||
+          in_array($field['fk_entity'], $contactTypes, TRUE)
+        ) {
+          $cidRefs[$customGroup['table_name']][] = $field['column_name'];
+        }
+      }
     }
   }
 
@@ -3158,9 +3218,9 @@ protected static function getDynamicFkAclClauses(string $entityTableField, strin
       $allTableNames = CRM_Core_DAO_AllCoreTables::tables();
       $relatedEntities = array_intersect_key(array_flip((array) $entityTableValues), $allTableNames);
     }
-    // No valid entity_table in WHERE clause so build an ACL case for every possible entity type
+    // No valid entity_table in WHERE clause so build an ACL case for every enabled entity type
     if (empty($relatedEntities)) {
-      $relatedEntities = static::buildOptions($entityTableField, 'get');
+      $relatedEntities = static::buildOptions($entityTableField, 'create');
     }
     // Hmm, this entity is missing entity_table pseudoconstant. We really should fix that.
     if (!$relatedEntities) {
@@ -3170,6 +3230,10 @@ protected static function getDynamicFkAclClauses(string $entityTableField, strin
     foreach ($relatedEntities as $table => $ent) {
       // Ensure $ent is the machine name of the entity not a translated title
       $ent = CRM_Core_DAO_AllCoreTables::getEntityNameForTable($table);
+      // Skip if entity doesn't exist. This shouldn't happen, but better safe than sorry.
+      if (!$ent) {
+        continue;
+      }
       // Prevent infinite recursion
       $subquery = $table === static::getTableName() ? NULL : CRM_Utils_SQL::mergeSubquery($ent);
       if ($subquery) {
@@ -3210,7 +3274,7 @@ protected static function getDynamicFkAclClauses(string $entityTableField, strin
   public static function getSelectWhereClause($tableAlias = NULL, $entityName = NULL, $conditions = []) {
     $bao = new static();
     $tableAlias ??= $bao->tableName();
-    $entityName ??= CRM_Core_DAO_AllCoreTables::getBriefName(get_class($bao));
+    $entityName ??= CRM_Core_DAO_AllCoreTables::getEntityNameForClass(get_class($bao));
     $finalClauses = [];
     $fields = static::getSupportedFields();
     $selectWhereClauses = $bao->addSelectWhereClause($entityName, NULL, $conditions);
@@ -3396,7 +3460,7 @@ public static function getEntityPaths() {
   /**
    * Overridable function to get icon for a particular entity.
    *
-   * Example: `CRM_Contact_BAO_Contact::getIcon('Contact', 123)`
+   * Example: `CRM_Contact_BAO_Contact::getEntityIcon('Contact', 123)`
    *
    * @param string $entityName
    *   Short name of the entity. This may seem redundant because the entity name can usually be inferred
@@ -3405,10 +3469,7 @@ public static function getEntityPaths() {
    *   Id of the entity.
    * @throws CRM_Core_Exception
    */
-  public static function getEntityIcon(string $entityName, int $entityId) {
-    if (static::class === 'CRM_Core_DAO' || static::class !== CRM_Core_DAO_AllCoreTables::getBAOClassName(static::class)) {
-      throw new CRM_Core_Exception('CRM_Core_DAO::getIcon must be called on a BAO class e.g. CRM_Contact_BAO_Contact::getIcon("Contact", 123).');
-    }
+  public static function getEntityIcon(string $entityName, int $entityId = NULL): ?string {
     // By default, just return the icon representing this entity. If there's more complex lookup to do,
     // the BAO for this entity should override this method.
     return static::$_icon;
@@ -3434,7 +3495,7 @@ private function makeNameFromLabel(): void {
       // No unique index on "name", do nothing
       return;
     }
-    $labelField = $this::$_labelField;
+    $labelField = $this::getLabelField();
     $label = $this->$labelField ?? NULL;
     if (!$label && $label !== '0') {
       // No label supplied, do nothing
diff --git a/www/modules/civicrm/CRM/Core/DAO/ActionLog.php b/www/modules/civicrm/CRM/Core/DAO/ActionLog.php
index b7e57e2ff..1718e9d49 100644
--- a/www/modules/civicrm/CRM/Core/DAO/ActionLog.php
+++ b/www/modules/civicrm/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:281e8a8a8378ddbbf65de5cfacc97828)
+ * (GenCodeChecksum:fb407a1919e8bb230001ccab90250e6c)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/ActionSchedule.php b/www/modules/civicrm/CRM/Core/DAO/ActionSchedule.php
index 3078d4aa9..5127e5e44 100644
--- a/www/modules/civicrm/CRM/Core/DAO/ActionSchedule.php
+++ b/www/modules/civicrm/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:155066f04857fec33b9f6b5d9d422cd9)
+ * (GenCodeChecksum:4b98974a043a37d8dcef7b8b0e786c03)
  */
 
 /**
@@ -1324,7 +1324,7 @@ public static function &fields() {
           'entity' => 'ActionSchedule',
           'bao' => 'CRM_Core_BAO_ActionSchedule',
           'localizable' => 0,
-          'FKClassName' => 'CRM_SMS_DAO_Provider',
+          'FKClassName' => 'CRM_SMS_DAO_SmsProvider',
           'FKColumnName' => 'id',
           'html' => [
             'type' => 'Select',
diff --git a/www/modules/civicrm/CRM/Core/DAO/Address.php b/www/modules/civicrm/CRM/Core/DAO/Address.php
index 2d3b5ce05..8bd3d10d9 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Address.php
+++ b/www/modules/civicrm/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:8ab653268a837a495427e04e0f874af7)
+ * (GenCodeChecksum:ca74689a56714fad7461c670a9291ee3)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/AddressFormat.php b/www/modules/civicrm/CRM/Core/DAO/AddressFormat.php
index 2ebd17a51..550e12fef 100644
--- a/www/modules/civicrm/CRM/Core/DAO/AddressFormat.php
+++ b/www/modules/civicrm/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:688ab6fa7cf9ccd7cddaab899d4abcda)
+ * (GenCodeChecksum:2a3b2f3e967533cc5edca28e50d0a8cf)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/AllCoreTables.data.php b/www/modules/civicrm/CRM/Core/DAO/AllCoreTables.data.php
index 31b51fb7a..fdbfcc18c 100644
--- a/www/modules/civicrm/CRM/Core/DAO/AllCoreTables.data.php
+++ b/www/modules/civicrm/CRM/Core/DAO/AllCoreTables.data.php
@@ -467,9 +467,9 @@
     'class' => 'CRM_Financial_DAO_PaymentToken',
     'table' => 'civicrm_payment_token',
   ],
-  'CRM_SMS_DAO_Provider' => [
-    'name' => 'Provider',
-    'class' => 'CRM_SMS_DAO_Provider',
+  'CRM_SMS_DAO_SmsProvider' => [
+    'name' => 'SmsProvider',
+    'class' => 'CRM_SMS_DAO_SmsProvider',
     'table' => 'civicrm_sms_provider',
   ],
   'CRM_Member_DAO_MembershipType' => [
diff --git a/www/modules/civicrm/CRM/Core/DAO/AllCoreTables.php b/www/modules/civicrm/CRM/Core/DAO/AllCoreTables.php
index ba28171ba..c76cede17 100644
--- a/www/modules/civicrm/CRM/Core/DAO/AllCoreTables.php
+++ b/www/modules/civicrm/CRM/Core/DAO/AllCoreTables.php
@@ -10,6 +10,8 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Schema\EntityRepository;
+
 /**
  *
  * @package CRM
@@ -17,89 +19,75 @@
  */
 class CRM_Core_DAO_AllCoreTables {
 
-  private static $tables = NULL;
-  private static $daoToClass = NULL;
-  private static $entityTypes = NULL;
-
   /**
-   * Initialise.
+   * @deprecated in 5.73 will be removed in 5.90
    *
    * @param bool $fresh Deprecated parameter, use flush() to flush.
    */
   public static function init(bool $fresh = FALSE): void {
-    if (!empty(Civi::$statics[__CLASS__]['initialised']) && !$fresh) {
-      return;
-    }
+    CRM_Core_Error::deprecatedFunctionWarning('CRM_Core_DAO_AllCoreTables::flush()');
     if ($fresh) {
-      CRM_Core_Error::deprecatedWarning('Use CRM_Core_DAO_AllCoreTables::flush()');
+      EntityRepository::flush();
     }
-
-    Civi::$statics[__CLASS__] = [];
-
-    $file = preg_replace('/\.php$/', '.data.php', __FILE__);
-    $entityTypes = require $file;
-    CRM_Utils_Hook::entityTypes($entityTypes);
-
-    self::$entityTypes = [];
-    self::$tables = [];
-    self::$daoToClass = [];
-    foreach ($entityTypes as $entityType) {
-      self::registerEntityType(
-        $entityType['name'],
-        $entityType['class'],
-        $entityType['table'],
-        $entityType['fields_callback'] ?? NULL,
-        $entityType['links_callback'] ?? NULL
-      );
-    }
-
-    Civi::$statics[__CLASS__]['initialised'] = TRUE;
   }
 
   /**
    * Flush class cache.
    */
   public static function flush(): void {
-    Civi::$statics[__CLASS__]['initialised'] = FALSE;
+    EntityRepository::flush();
   }
 
   /**
-   * (Quasi-Private) Do not call externally (except for unit-testing)
+   * @return array[]
+   *   [EntityName => [table => table_name, class => CRM_DAO_ClassName]][]
+   */
+  public static function getEntities(): array {
+    return EntityRepository::getEntities();
+  }
+
+  /**
+   * @return string[]
+   *   [table_name => EntityName][]
+   */
+  private static function getEntitiesByTable(): array {
+    return EntityRepository::getTableIndex();
+  }
+
+  /**
+   * This one is problematic because it's not strictly required to have one class
+   * per table. It's possible for multiple tables to share a class.
    *
-   * @param string $briefName
-   * @param string $className
-   * @param string $tableName
-   * @param string $fields_callback
-   * @param string $links_callback
+   * @return string[]
+   *   [CRM_DAO_ClassName => EntityName]
    */
-  public static function registerEntityType($briefName, $className, $tableName, $fields_callback = NULL, $links_callback = NULL) {
-    self::$daoToClass[$briefName] = $className;
-    self::$tables[$tableName] = $className;
-    self::$entityTypes[$briefName] = [
-      'name' => $briefName,
-      'class' => $className,
-      'table' => $tableName,
-      'fields_callback' => $fields_callback,
-      'links_callback' => $links_callback,
-    ];
+  private static function getEntitiesByClass(): array {
+    return EntityRepository::getClassIndex();
   }
 
   /**
-   * @return array
-   *   Ex: $result['Contact']['table'] == 'civicrm_contact';
+   * @deprecated in 5.72 will be removed in 5.90.
    */
   public static function get() {
-    self::init();
-    return self::$entityTypes;
+    CRM_Core_Error::deprecatedFunctionWarning('CRM_Core_DAO_AllCoreTables::getEntities');
+    $entities = [];
+    foreach (self::getEntities() as $name => $entity) {
+      $entities[$name] = $entity + [
+        'name' => $name,
+        'fields_callback' => $entity['fields_callback'] ?? NULL,
+        'links_callback' => $entity['links_callback'] ?? NULL,
+      ];
+    }
+    return $entities;
   }
 
   /**
-   * @return array
-   *   List of SQL table names.
+   * Mapping from table-names to class-names.
+   * @return string[]
+   *   [table_name => CRM_DAO_ClassName]
    */
   public static function tables() {
-    self::init();
-    return self::$tables;
+    return array_column(self::getEntities(), 'class', 'table');
   }
 
   /**
@@ -108,10 +96,9 @@ public static function tables() {
    */
   public static function indices($localize = TRUE) {
     $indices = [];
-    self::init();
-    foreach (self::$daoToClass as $class) {
-      if (is_callable([$class, 'indices'])) {
-        $indices[$class::getTableName()] = $class::indices($localize);
+    foreach (self::getEntities() as $entity) {
+      if (is_callable([$entity['class'], 'indices'])) {
+        $indices[$entity['class']::getTableName()] = $entity['class']::indices($localize);
       }
     }
     return $indices;
@@ -165,21 +152,19 @@ public static function multilingualize($class, $originalIndices) {
   }
 
   /**
-   * @return array
-   *   Mapping from brief-names to class-names.
-   *   Ex: $result['Contact'] == 'CRM_Contact_DAO_Contact'.
+   * Mapping from entity-names to class-names.
+   * @return string[]
+   *   [EntityName => CRM_DAO_ClassName]
    */
   public static function daoToClass() {
-    self::init();
-    return self::$daoToClass;
+    return array_combine(array_keys(self::getEntities()), array_column(self::getEntities(), 'class'));
   }
 
   /**
-   * @return array
-   *   Mapping from table-names to class-names.
-   *   Ex: $result['civicrm_contact'] == 'CRM_Contact_DAO_Contact'.
+   * @deprecated in 5.72 will be removed in 5.90
    */
   public static function getCoreTables() {
+    CRM_Core_Error::deprecatedFunctionWarning('CRM_Core_DAO_AllCoreTables::tables');
     return self::tables();
   }
 
@@ -190,7 +175,7 @@ public static function getCoreTables() {
    * @return bool
    */
   public static function isCoreTable($tableName) {
-    return array_key_exists($tableName, self::tables());
+    return array_key_exists($tableName, self::getEntitiesByTable());
   }
 
   /**
@@ -283,21 +268,21 @@ public static function convertEntityNameToLower(string $name): string {
    *   List of class names.
    */
   public static function getClasses() {
-    return array_values(self::daoToClass());
+    return array_keys(self::getEntitiesByClass());
   }
 
   /**
-   * Get a list of all extant BAO classes.
+   * Get a list of all extant BAO classes, keyed by entityName.
    *
-   * @return array
-   *   Ex: ['Contact' => 'CRM_Contact_BAO_Contact']
+   * @return string[]
+   *   [EntityName => CRM_BAO_ClassName]
    */
   public static function getBaoClasses() {
     $r = [];
-    foreach (\CRM_Core_DAO_AllCoreTables::daoToClass() as $entity => $daoClass) {
-      $baoClass = str_replace('_DAO_', '_BAO_', $daoClass);
+    foreach (self::getEntities() as $name => $entity) {
+      $baoClass = str_replace('_DAO_', '_BAO_', $entity['class']);
       if (class_exists($baoClass)) {
-        $r[$entity] = $baoClass;
+        $r[$name] = $baoClass;
       }
     }
     return $r;
@@ -315,33 +300,48 @@ public static function getClassForTable(string $tableName) {
       global $dbLocale;
       $tableName = str_replace($dbLocale, '', $tableName);
     }
-    return self::tables()[$tableName] ?? NULL;
+    $entityName = self::getEntitiesByTable()[$tableName] ?? '';
+    return self::getEntities()[$entityName]['class'] ?? NULL;
   }
 
   /**
-   * Given a brief-name, determine the full class-name.
+   * Given an entity name, determine the DAO class-name.
    *
-   * @param string $briefName
+   * @param string|null $entityName
    *   Ex: 'Contact'.
    * @return string|CRM_Core_DAO|NULL
    *   Ex: 'CRM_Contact_DAO_Contact'.
    */
-  public static function getFullName($briefName) {
-    self::init();
-    return self::$entityTypes[$briefName]['class'] ?? NULL;
+  public static function getDAONameForEntity(?string $entityName) {
+    return self::getEntities()[$entityName]['class'] ?? NULL;
   }
 
   /**
-   * Given a full class-name, determine the brief-name.
+   * @deprecated in 5.72 will be removed in 5.96
+   */
+  public static function getFullName($entityName) {
+    CRM_Core_Error::deprecatedFunctionWarning('CRM_Core_DAO_AllCoreTables::getDAONameForEntity');
+    return self::getDAONameForEntity((string) $entityName);
+  }
+
+  /**
+   * Given a DAO or BAO class-name, return the entity name.
    *
-   * @param string $className
+   * @param string|null $className
    *   Ex: 'CRM_Contact_DAO_Contact'.
    * @return string|NULL
    *   Ex: 'Contact'.
    */
-  public static function getBriefName($className) {
+  public static function getEntityNameForClass(?string $className): ?string {
     $className = self::getCanonicalClassName($className);
-    return array_search($className, self::daoToClass(), TRUE) ?: NULL;
+    return self::getEntitiesByClass()[$className] ?? NULL;
+  }
+
+  /**
+   * @deprecated in 5.72 will be removed in 5.102
+   */
+  public static function getBriefName($className): ?string {
+    return self::getEntityNameForClass((string) $className);
   }
 
   /**
@@ -349,127 +349,115 @@ public static function getBriefName($className) {
    * @return string|FALSE SQL table name
    */
   public static function getTableForClass($className) {
-    return array_search(self::getCanonicalClassName($className),
-      self::tables());
+    $entityName = self::getEntityNameForClass($className);
+    return self::getEntities()[$entityName]['table'] ?? FALSE;
   }
 
   /**
    * Convert the entity name into a table name.
    *
-   * @param string $briefName
+   * @param string $entityName
+   *   e.g. 'Activity'
    *
    * @return string
+   *   e.g. 'civicrm_activity'
    */
-  public static function getTableForEntityName($briefName): string {
-    self::init();
-    return self::$entityTypes[$briefName]['table'];
+  public static function getTableForEntityName($entityName): string {
+    return self::getEntities()[$entityName]['table'];
   }
 
   /**
-   * Convert table name to brief entity name.
+   * Convert table name to entity name.
    *
    * @param string $tableName
    *
    * @return FALSE|string
    */
   public static function getEntityNameForTable(string $tableName) {
-    self::init();
     // CRM-19677: on multilingual setup, trim locale from $tableName to fetch class name
     if (CRM_Core_I18n::isMultilingual()) {
       global $dbLocale;
       $tableName = str_replace($dbLocale, '', $tableName);
     }
-    $matches = CRM_Utils_Array::findAll(self::$entityTypes, ['table' => $tableName]);
-    return $matches ? $matches[0]['name'] : NULL;
+    return self::getEntitiesByTable()[$tableName] ?? NULL;
   }
 
   /**
-   * Reinitialise cache.
-   *
-   * @deprecated
+   * @deprecated in 5.54 will be removed in 5.85
    */
   public static function reinitializeCache(): void {
+    CRM_Core_Error::deprecatedFunctionWarning('CRM_Core_DAO_AllCoreTables::flush');
     self::flush();
   }
 
   /**
    * (Quasi-Private) Do not call externally. For use by DAOs.
    *
-   * @param string $dao
+   * @param string|CRM_Core_DAO $dao
    *   Ex: 'CRM_Core_DAO_Address'.
    * @param string $labelName
    *   Ex: 'address'.
    * @param bool $prefix
    * @param array $foreignDAOs
+   *   Historically used for... something? Currently never set by any core BAO.
    * @return array
+   * @internal
    */
-  public static function getExports($dao, $labelName, $prefix, $foreignDAOs) {
-    // Bug-level compatibility -- or sane behavior?
-    $cacheKey = $dao . ':export';
-    // $cacheKey = $dao . ':' . ($prefix ? 'export-prefix' : 'export');
-
-    if (!isset(Civi::$statics[__CLASS__][$cacheKey])) {
-      $exports = [];
-      $fields = $dao::fields();
-
-      foreach ($fields as $name => $field) {
-        if (!empty($field['export'])) {
-          if ($prefix) {
-            $exports[$labelName] = & $fields[$name];
-          }
-          else {
-            $exports[$name] = & $fields[$name];
-          }
-        }
-      }
+  public static function getExports($dao, $labelName, $prefix, $foreignDAOs = []) {
+    $exports = [];
 
-      foreach ($foreignDAOs as $foreignDAO) {
-        $exports = array_merge($exports, $foreignDAO::export(TRUE));
+    foreach ($dao::fields() as $name => $field) {
+      if (!empty($field['export'])) {
+        if ($prefix) {
+          $exports[$labelName] = $field;
+        }
+        else {
+          $exports[$name] = $field;
+        }
       }
+    }
 
-      Civi::$statics[__CLASS__][$cacheKey] = $exports;
+    // TODO: Remove this bit; no core DAO actually uses it
+    foreach ($foreignDAOs as $foreignDAO) {
+      $exports = array_merge($exports, $foreignDAO::export(TRUE));
     }
-    return Civi::$statics[__CLASS__][$cacheKey];
+
+    return $exports;
   }
 
   /**
    * (Quasi-Private) Do not call externally. For use by DAOs.
    *
-   * @param string $dao
+   * @param string|CRM_Core_DAO $dao
    *   Ex: 'CRM_Core_DAO_Address'.
    * @param string $labelName
    *   Ex: 'address'.
    * @param bool $prefix
    * @param array $foreignDAOs
+   *   Historically used for... something? Currently never set by any core BAO.
    * @return array
+   * @internal
    */
-  public static function getImports($dao, $labelName, $prefix, $foreignDAOs) {
-    // Bug-level compatibility -- or sane behavior?
-    $cacheKey = $dao . ':import';
-    // $cacheKey = $dao . ':' . ($prefix ? 'import-prefix' : 'import');
-
-    if (!isset(Civi::$statics[__CLASS__][$cacheKey])) {
-      $imports = [];
-      $fields = $dao::fields();
-
-      foreach ($fields as $name => $field) {
-        if (!empty($field['import'])) {
-          if ($prefix) {
-            $imports[$labelName] = & $fields[$name];
-          }
-          else {
-            $imports[$name] = & $fields[$name];
-          }
-        }
-      }
+  public static function getImports($dao, $labelName, $prefix, $foreignDAOs = []): array {
+    $imports = [];
 
-      foreach ($foreignDAOs as $foreignDAO) {
-        $imports = array_merge($imports, $foreignDAO::import(TRUE));
+    foreach ($dao::fields() as $name => $field) {
+      if (!empty($field['import'])) {
+        if ($prefix) {
+          $imports[$labelName] = $field;
+        }
+        else {
+          $imports[$name] = $field;
+        }
       }
+    }
 
-      Civi::$statics[__CLASS__][$cacheKey] = $imports;
+    // TODO: Remove this bit; no core DAO actually uses it
+    foreach ($foreignDAOs as $foreignDAO) {
+      $imports = array_merge($imports, $foreignDAO::import(TRUE));
     }
-    return Civi::$statics[__CLASS__][$cacheKey];
+
+    return $imports;
   }
 
   /**
@@ -477,18 +465,19 @@ public static function getImports($dao, $labelName, $prefix, $foreignDAOs) {
    *
    * Apply any third-party alterations to the `fields()`.
    *
-   * TODO: This function should probably take briefName as the key instead of className
+   * TODO: This function should probably take entityName as the key instead of className
    * because the latter is not always unique (e.g. virtual entities)
    *
    * @param string $className
    * @param string $event
    * @param mixed $values
+   * @internal
    */
   public static function invoke($className, $event, &$values) {
-    self::init();
-    $briefName = self::getBriefName($className);
-    if (isset(self::$entityTypes[$briefName][$event])) {
-      foreach (self::$entityTypes[$briefName][$event] as $filter) {
+    $entityName = self::getEntityNameForClass($className);
+    $entityTypes = self::getEntities();
+    if (isset($entityTypes[$entityName][$event])) {
+      foreach ($entityTypes[$entityName][$event] as $filter) {
         $args = [$className, &$values];
         \Civi\Core\Resolver::singleton()->call($filter, $args);
       }
diff --git a/www/modules/civicrm/CRM/Core/DAO/Base.php b/www/modules/civicrm/CRM/Core/DAO/Base.php
new file mode 100644
index 000000000..4982e59f4
--- /dev/null
+++ b/www/modules/civicrm/CRM/Core/DAO/Base.php
@@ -0,0 +1,267 @@
+<?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       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Base for concrete DAO/BAO classes which are defined with a schema/entityType.php file.
+ */
+abstract class CRM_Core_DAO_Base extends CRM_Core_DAO {
+
+  /**
+   * @inheritDoc
+   */
+  public function keys(): array {
+    $keys = [];
+    foreach (static::getEntityDefinition()['getFields']() as $name => $field) {
+      if (!empty($field['primary_key'])) {
+        $keys[] = $name;
+      }
+    }
+    return $keys;
+  }
+
+  public static function getEntityTitle($plural = FALSE) {
+    $info = static::getEntityInfo();
+    return ($plural && isset($info['title_plural'])) ? $info['title_plural'] : $info['title'];
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public static function getEntityPaths(): array {
+    $definition = static::getEntityDefinition();
+    if (isset($definition['getPaths'])) {
+      return $definition['getPaths']();
+    }
+    return [];
+  }
+
+  public static function getLabelField(): ?string {
+    return static::getEntityInfo()['label_field'] ?? NULL;
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public static function getEntityDescription(): ?string {
+    return static::getEntityInfo()['description'] ?? NULL;
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public static function getTableName() {
+    return static::getEntityDefinition()['table'];
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public function getLog(): bool {
+    return static::getEntityInfo()['log'] ?? FALSE;
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public static function getEntityIcon(string $entityName, int $entityId = NULL): ?string {
+    return static::getEntityInfo()['icon'] ?? NULL;
+  }
+
+  /**
+   * @inheritDoc
+   */
+  protected static function getTableAddVersion(): string {
+    return static::getEntityInfo()['add'] ?? '1.0';
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public static function getExtensionName(): ?string {
+    return static::getEntityDefinition()['module'];
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public static function &fields() {
+    $fields = [];
+    foreach (static::getSchemaFields() as $field) {
+      $key = $field['uniqueName'] ?? $field['name'];
+      unset($field['uniqueName']);
+      $fields[$key] = $field;
+    }
+    return $fields;
+  }
+
+  private static function getSchemaFields(): array {
+    return (Civi::$statics[static::class]['fields'] ??= static::loadSchemaFields());
+  }
+
+  private static function loadSchemaFields(): array {
+    $fields = [];
+    $entityDef = static::getEntityDefinition();
+    $baoName = CRM_Core_DAO_AllCoreTables::getBAOClassName(static::class);
+
+    foreach ($entityDef['getFields']() as $fieldName => $fieldSpec) {
+      $field = [
+        'name' => $fieldName,
+        'type' => !empty($fieldSpec['data_type']) ? \CRM_Utils_Type::getValidTypes()[$fieldSpec['data_type']] : constant(\CRM_Utils_Schema::getCrmTypeFromSqlType($fieldSpec['sql_type'])),
+        'title' => $fieldSpec['title'],
+        'description' => $fieldSpec['description'] ?? NULL,
+      ];
+      if (!empty($fieldSpec['required'])) {
+        $field['required'] = TRUE;
+      }
+      if (str_starts_with($fieldSpec['sql_type'], 'decimal(')) {
+        $precision = self::getFieldLength($fieldSpec['sql_type']);
+        $field['precision'] = explode(',', $precision);
+      }
+      foreach (['maxlength', 'size', 'rows', 'cols'] as $attr) {
+        if (isset($fieldSpec['input_attrs'][$attr])) {
+          $field[$attr] = $fieldSpec['input_attrs'][$attr];
+          unset($fieldSpec['input_attrs'][$attr]);
+        }
+      }
+      if (!isset($field['size']) && str_contains($fieldSpec['sql_type'], 'char')) {
+        $length = self::getFieldLength($fieldSpec['sql_type']);
+        $field['size'] = constant(CRM_Utils_Schema::getDefaultSize($length));
+      }
+      $usage = $fieldSpec['usage'] ?? [];
+      $field['usage'] = [
+        'import' => in_array('import', $usage),
+        'export' => in_array('export', $usage),
+        'duplicate_matching' => in_array('duplicate_matching', $usage),
+        'token' => in_array('token', $usage),
+      ];
+      if ($field['usage']['import']) {
+        $field['import'] = TRUE;
+      }
+      $field['where'] = $entityDef['table'] . '.' . $field['name'];
+      if ($field['usage']['export'] || (!$field['usage']['export'] && $field['usage']['import'])) {
+        $field['export'] = $field['usage']['export'];
+      }
+      if (!empty($fieldSpec['contact_type'])) {
+        $field['contactType'] = $fieldSpec['contact_type'];
+      }
+      if (!empty($fieldSpec['permission'])) {
+        $field['permission'] = $fieldSpec['permission'];
+      }
+      if (array_key_exists('default', $fieldSpec)) {
+        $field['default'] = isset($fieldSpec['default']) ? (string) $fieldSpec['default'] : NULL;
+        if (is_bool($fieldSpec['default'])) {
+          $field['default'] = $fieldSpec['default'] ? '1' : '0';
+        }
+      }
+      $field['table_name'] = $entityDef['table'];
+      $field['entity'] = $entityDef['name'];
+      $field['bao'] = $baoName;
+      $field['localizable'] = intval($fieldSpec['localizable'] ?? 0);
+      if (!empty($fieldSpec['localize_context'])) {
+        $field['localize_context'] = (string) $fieldSpec['localize_context'];
+      }
+      if (!empty($fieldSpec['entity_reference'])) {
+        if (!empty($fieldSpec['entity_reference']['entity'])) {
+          $field['FKClassName'] = CRM_Core_DAO_AllCoreTables::getDAONameForEntity($fieldSpec['entity_reference']['entity']);
+        }
+        if (!empty($fieldSpec['entity_reference']['dynamic_entity'])) {
+          $field['DFKEntityColumn'] = $fieldSpec['entity_reference']['dynamic_entity'];
+        }
+        $field['FKColumnName'] = $fieldSpec['entity_reference']['key'] ?? 'id';
+      }
+      if (!empty($fieldSpec['component'])) {
+        $field['component'] = $fieldSpec['component'];
+      }
+      if (!empty($fieldSpec['serialize'])) {
+        $field['serialize'] = $fieldSpec['serialize'];
+      }
+      if (!empty($fieldSpec['unique_name'])) {
+        $field['uniqueName'] = $fieldSpec['unique_name'];
+      }
+      if (!empty($fieldSpec['unique_title'])) {
+        $field['uniqueTitle'] = $fieldSpec['unique_title'];
+      }
+      if (!empty($fieldSpec['deprecated'])) {
+        $field['deprecated'] = TRUE;
+      }
+      if (!empty($fieldSpec['input_attrs'])) {
+        $field['html'] = CRM_Utils_Array::rekey($fieldSpec['input_attrs'], fn($str) => CRM_Utils_String::convertStringToCamel($str, FALSE));
+      }
+      if (!empty($fieldSpec['input_type'])) {
+        $field['html']['type'] = $fieldSpec['input_type'];
+      }
+      if (!empty($fieldSpec['pseudoconstant'])) {
+        $field['pseudoconstant'] = CRM_Utils_Array::rekey($fieldSpec['pseudoconstant'], fn($str) => CRM_Utils_String::convertStringToCamel($str, FALSE));
+        if (!isset($field['pseudoconstant']['optionEditPath']) && !empty($field['pseudoconstant']['optionGroupName'])) {
+          $field['pseudoconstant']['optionEditPath'] = 'civicrm/admin/options/' . $field['pseudoconstant']['optionGroupName'];
+        }
+      }
+      if (!empty($fieldSpec['primary_key']) || !empty($field['readonly'])) {
+        $field['readonly'] = TRUE;
+      }
+      $field['add'] = $fieldSpec['add'] ?? NULL;
+      $fields[$fieldName] = $field;
+    }
+    CRM_Core_DAO_AllCoreTables::invoke(static::class, 'fields_callback', $fields);
+    return $fields;
+  }
+
+  private static function getFieldLength($sqlType): ?string {
+    $open = strpos($sqlType, '(');
+    if ($open) {
+      return substr($sqlType, $open + 1, -1);
+    }
+    return NULL;
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public static function indices(bool $localize = TRUE): array {
+    $definition = static::getEntityDefinition();
+    $indices = [];
+    if (isset($definition['getIndices'])) {
+      $fields = $definition['getFields']();
+      foreach ($definition['getIndices']() as $name => $info) {
+        $index = [
+          'name' => $name,
+          'field' => [],
+          'localizable' => FALSE,
+        ];
+        foreach ($info['fields'] as $fieldName => $length) {
+          if (!empty($fields[$fieldName]['localizable'])) {
+            $index['localizable'] = TRUE;
+          }
+          if (is_int($length)) {
+            $fieldName .= "($length)";
+          }
+          $index['field'][] = $fieldName;
+        }
+        if (!empty($info['unique'])) {
+          $index['unique'] = TRUE;
+        }
+        $index['sig'] = ($definition['table']) . '::' . intval($info['unique'] ?? 0) . '::' . implode('::', $index['field']);
+        $indices[$name] = $index;
+      }
+    }
+    return ($localize && $indices) ? CRM_Core_DAO_AllCoreTables::multilingualize(static::class, $indices) : $indices;
+  }
+
+  private static function getEntityDefinition(): array {
+    $entityName = CRM_Core_DAO_AllCoreTables::getEntityNameForClass(static::class);
+    return \Civi\Schema\EntityRepository::getEntity($entityName);
+  }
+
+  private static function getEntityInfo(): array {
+    return static::getEntityDefinition()['getInfo']();
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Core/DAO/Cache.php b/www/modules/civicrm/CRM/Core/DAO/Cache.php
index dcb29e16f..26bcfea08 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Cache.php
+++ b/www/modules/civicrm/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:b61a713809b89c9f8bf1bbd6256ef986)
+ * (GenCodeChecksum:403c445d5664ce00dd56a61dc7e18bc6)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Component.php b/www/modules/civicrm/CRM/Core/DAO/Component.php
index e0dd689bd..4a857a352 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Component.php
+++ b/www/modules/civicrm/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:fdf9249dc62d2c5495f09af4695d8820)
+ * (GenCodeChecksum:b14371bb8082633c09cf59226edaa213)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Country.php b/www/modules/civicrm/CRM/Core/DAO/Country.php
index b9ff3e973..fc888e647 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Country.php
+++ b/www/modules/civicrm/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:0a6cc17a97d1804a8ef0634e097b6315)
+ * (GenCodeChecksum:3c4767c24868f7bfce24636b1c5f1d18)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/County.php b/www/modules/civicrm/CRM/Core/DAO/County.php
index bac95d750..82b0527dc 100644
--- a/www/modules/civicrm/CRM/Core/DAO/County.php
+++ b/www/modules/civicrm/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:5872e0fad72f1657c21120cb8de7f834)
+ * (GenCodeChecksum:3c3c1fed6b777fff9171e106c72678b3)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/CustomField.php b/www/modules/civicrm/CRM/Core/DAO/CustomField.php
index bdda36d55..e1dcd6f16 100644
--- a/www/modules/civicrm/CRM/Core/DAO/CustomField.php
+++ b/www/modules/civicrm/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:5272bbce1af37e0a1dd56fed8ca8ecdf)
+ * (GenCodeChecksum:c077ed8e18907eb52bece2c3b057bc8b)
  */
 
 /**
@@ -320,6 +320,15 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO {
    */
   public $fk_entity;
 
+  /**
+   * Behavior if referenced entity is deleted.
+   *
+   * @var string
+   *   (SQL type: varchar(255))
+   *   Note that values will be retrieved from the database as a string.
+   */
+  public $fk_entity_on_delete;
+
   /**
    * Class constructor.
    */
@@ -982,6 +991,34 @@ public static function &fields() {
           'localizable' => 0,
           'add' => '5.60',
         ],
+        'fk_entity_on_delete' => [
+          'name' => 'fk_entity_on_delete',
+          'type' => CRM_Utils_Type::T_STRING,
+          'title' => ts('On Referenced Entity Delete'),
+          'description' => ts('Behavior if referenced entity is deleted.'),
+          'required' => TRUE,
+          'maxlength' => 255,
+          'size' => CRM_Utils_Type::HUGE,
+          'usage' => [
+            'import' => FALSE,
+            'export' => FALSE,
+            'duplicate_matching' => FALSE,
+            'token' => FALSE,
+          ],
+          'where' => 'civicrm_custom_field.fk_entity_on_delete',
+          'default' => 'set_null',
+          'table_name' => 'civicrm_custom_field',
+          'entity' => 'CustomField',
+          'bao' => 'CRM_Core_BAO_CustomField',
+          'localizable' => 0,
+          'html' => [
+            'type' => 'Select',
+          ],
+          'pseudoconstant' => [
+            'callback' => 'CRM_Core_BAO_CustomField::getFkEntityOnDeleteOptions',
+          ],
+          'add' => '5.71',
+        ],
       ];
       CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'fields_callback', Civi::$statics[__CLASS__]['fields']);
     }
diff --git a/www/modules/civicrm/CRM/Core/DAO/CustomGroup.php b/www/modules/civicrm/CRM/Core/DAO/CustomGroup.php
index 3f25213da..19df066ff 100644
--- a/www/modules/civicrm/CRM/Core/DAO/CustomGroup.php
+++ b/www/modules/civicrm/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:d87ef7faf84bd9ec8d1ac5195054a05a)
+ * (GenCodeChecksum:29f69d8dd04f79156872f073db98630f)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Dashboard.php b/www/modules/civicrm/CRM/Core/DAO/Dashboard.php
index 40b9857ea..f76960633 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Dashboard.php
+++ b/www/modules/civicrm/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:1131a6e3957e7ce8e0a2371565562cad)
+ * (GenCodeChecksum:1794407b4bd25c2c73eb6ea55162e2b8)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Discount.php b/www/modules/civicrm/CRM/Core/DAO/Discount.php
index 826035221..66a461ad0 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Discount.php
+++ b/www/modules/civicrm/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:937a5a030125d65e7b8a064cecf919fd)
+ * (GenCodeChecksum:3859fe3804f3150b107fa7a57c89b8b9)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Domain.php b/www/modules/civicrm/CRM/Core/DAO/Domain.php
index f83c19947..ba2ca9493 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Domain.php
+++ b/www/modules/civicrm/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:4814b16c7b4c8d130e3e29d7ae309d88)
+ * (GenCodeChecksum:360ded3eb93ffebb5612b7ec6f5c2e06)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Email.php b/www/modules/civicrm/CRM/Core/DAO/Email.php
index 767c51f51..9c0eed6e1 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Email.php
+++ b/www/modules/civicrm/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:840e0540daf99f6fad7bf13389157479)
+ * (GenCodeChecksum:c0c0fa9525e9381e7a8e51229addf48a)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/EntityFile.php b/www/modules/civicrm/CRM/Core/DAO/EntityFile.php
index 889145562..b651379d5 100644
--- a/www/modules/civicrm/CRM/Core/DAO/EntityFile.php
+++ b/www/modules/civicrm/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:e2899940239f57513f7bc889b482907c)
+ * (GenCodeChecksum:936bff540e7e602f007e9ddeafff8b6c)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/EntityTag.php b/www/modules/civicrm/CRM/Core/DAO/EntityTag.php
index b8f166bd8..07205684f 100644
--- a/www/modules/civicrm/CRM/Core/DAO/EntityTag.php
+++ b/www/modules/civicrm/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:0c6284da3e376f8bcc7e75f2382eea41)
+ * (GenCodeChecksum:a738d9be15f6cfafacd3e4a14cd30fa0)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Extension.php b/www/modules/civicrm/CRM/Core/DAO/Extension.php
index 7a43a939e..54546f5f2 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Extension.php
+++ b/www/modules/civicrm/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:ed9e7b26e41992fa8f4e81e942eedf14)
+ * (GenCodeChecksum:330fdc407870ef3808daba1198b07e3b)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/File.php b/www/modules/civicrm/CRM/Core/DAO/File.php
index 5f0677e85..f9398ba68 100644
--- a/www/modules/civicrm/CRM/Core/DAO/File.php
+++ b/www/modules/civicrm/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:3da10c3077bcd95ae97573351c54c377)
+ * (GenCodeChecksum:0f54a53356092fa11da07162c141e43f)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/IM.php b/www/modules/civicrm/CRM/Core/DAO/IM.php
index b069791a6..5f696f3a0 100644
--- a/www/modules/civicrm/CRM/Core/DAO/IM.php
+++ b/www/modules/civicrm/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:55bc6457cdc907da89416f4904e1f8c4)
+ * (GenCodeChecksum:74c6cf2f3428d7727169664ebb0a719e)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Job.php b/www/modules/civicrm/CRM/Core/DAO/Job.php
index b663617f6..54c0d7322 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Job.php
+++ b/www/modules/civicrm/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:fd14e515195028086bdf96c0fd3d8288)
+ * (GenCodeChecksum:caf43437176c75bc4bde4be837f3c17b)
  */
 
 /**
@@ -78,6 +78,15 @@ class CRM_Core_DAO_Job extends CRM_Core_DAO {
    */
   public $last_run;
 
+  /**
+   * When did this cron entry last finish running
+   *
+   * @var string
+   *   (SQL type: timestamp)
+   *   Note that values will be retrieved from the database as a string.
+   */
+  public $last_run_end;
+
   /**
    * When is this cron entry scheduled to run
    *
@@ -270,6 +279,29 @@ public static function &fields() {
           ],
           'add' => '4.1',
         ],
+        'last_run_end' => [
+          'name' => 'last_run_end',
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
+          'title' => ts('Last Run End'),
+          'description' => ts('When did this cron entry last finish running'),
+          'required' => FALSE,
+          'usage' => [
+            'import' => FALSE,
+            'export' => FALSE,
+            'duplicate_matching' => FALSE,
+            'token' => FALSE,
+          ],
+          'where' => 'civicrm_job.last_run_end',
+          'default' => NULL,
+          'table_name' => 'civicrm_job',
+          'entity' => 'Job',
+          'bao' => 'CRM_Core_BAO_Job',
+          'localizable' => 0,
+          'html' => [
+            'label' => ts("Last Run End"),
+          ],
+          'add' => '5.72',
+        ],
         'scheduled_run_date' => [
           'name' => 'scheduled_run_date',
           'type' => CRM_Utils_Type::T_TIMESTAMP,
diff --git a/www/modules/civicrm/CRM/Core/DAO/JobLog.php b/www/modules/civicrm/CRM/Core/DAO/JobLog.php
index 29344ddb7..17acc072e 100644
--- a/www/modules/civicrm/CRM/Core/DAO/JobLog.php
+++ b/www/modules/civicrm/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:2cc5d57c7214571368b304d67759dc29)
+ * (GenCodeChecksum:e762a6752acaf96ffbfbbb75c69fe2ea)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/LocBlock.php b/www/modules/civicrm/CRM/Core/DAO/LocBlock.php
index c607c2f6b..aa411010b 100644
--- a/www/modules/civicrm/CRM/Core/DAO/LocBlock.php
+++ b/www/modules/civicrm/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:f5b7464778aa3355be9143c7bd44bef6)
+ * (GenCodeChecksum:d8b81ad2d5429a693c6681a08b36d2ab)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/LocationType.php b/www/modules/civicrm/CRM/Core/DAO/LocationType.php
index f4810dd99..e1c790f0f 100644
--- a/www/modules/civicrm/CRM/Core/DAO/LocationType.php
+++ b/www/modules/civicrm/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:03307d8df09b1e1e9d99234f20faefc5)
+ * (GenCodeChecksum:f8a4d0de764c73095706b53af604c891)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Log.php b/www/modules/civicrm/CRM/Core/DAO/Log.php
index b9cef25ff..a64537a7f 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Log.php
+++ b/www/modules/civicrm/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:a664e18ae03c664f20186590a3e5807c)
+ * (GenCodeChecksum:944dc25943521f310a45b3282fd55f7d)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/MailSettings.php b/www/modules/civicrm/CRM/Core/DAO/MailSettings.php
index 3751f51b6..569b20dee 100644
--- a/www/modules/civicrm/CRM/Core/DAO/MailSettings.php
+++ b/www/modules/civicrm/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:02ee7569c4d85495c6fca92b53108695)
+ * (GenCodeChecksum:a8df3219199575e13ab5a977492ff9b5)
  */
 
 /**
@@ -187,6 +187,8 @@ class CRM_Core_DAO_MailSettings extends CRM_Core_DAO {
   public $is_non_case_email_skipped;
 
   /**
+   * If this option is enabled, CiviCRM will not create new contacts when filing emails.
+   *
    * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
@@ -629,6 +631,7 @@ public static function &fields() {
           'name' => 'is_contact_creation_disabled_if_no_match',
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('Do not create new contacts when filing emails'),
+          'description' => ts('If this option is enabled, CiviCRM will not create new contacts when filing emails.'),
           'required' => TRUE,
           'usage' => [
             'import' => FALSE,
@@ -722,7 +725,7 @@ public static function &fields() {
             'table' => 'civicrm_campaign',
             'keyColumn' => 'id',
             'labelColumn' => 'title',
-            'prefetch' => 'FALSE',
+            'prefetch' => 'disabled',
           ],
           'add' => '5.66',
         ],
diff --git a/www/modules/civicrm/CRM/Core/DAO/Managed.php b/www/modules/civicrm/CRM/Core/DAO/Managed.php
index 20eedc2c1..b95b2071a 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Managed.php
+++ b/www/modules/civicrm/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:4ff1b19106d4bc7810d4aa9eb2a73f65)
+ * (GenCodeChecksum:b4a845b57085b6ac99d2b09bb21b72f8)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Mapping.php b/www/modules/civicrm/CRM/Core/DAO/Mapping.php
index 9a4ba1314..7dd6552d1 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Mapping.php
+++ b/www/modules/civicrm/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:981063692534917d20a9c12fb65bbd8e)
+ * (GenCodeChecksum:bd700a2b140ebe3a72cd122bbe04efbd)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/MappingField.php b/www/modules/civicrm/CRM/Core/DAO/MappingField.php
index a7b0f438c..8af462378 100644
--- a/www/modules/civicrm/CRM/Core/DAO/MappingField.php
+++ b/www/modules/civicrm/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:fde17b05b7e7ff25edec775c5a412f7e)
+ * (GenCodeChecksum:0eefb06ac4b267d77a8e592afb473158)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Menu.php b/www/modules/civicrm/CRM/Core/DAO/Menu.php
index 41eefa95b..e04550738 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Menu.php
+++ b/www/modules/civicrm/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:68b2bb93878a4b972546d9e3f43e1a4c)
+ * (GenCodeChecksum:ee5ecb6683399d07b80816348c122245)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/MessageTemplate.php b/www/modules/civicrm/CRM/Core/DAO/MessageTemplate.php
index a1a0143bd..06e97e586 100644
--- a/www/modules/civicrm/CRM/Core/DAO/MessageTemplate.php
+++ b/www/modules/civicrm/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:c5ea23571e85e6abb0e42fe204e97dc4)
+ * (GenCodeChecksum:4920aaedcde166a8a1d37318819c59a8)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Navigation.php b/www/modules/civicrm/CRM/Core/DAO/Navigation.php
index c2a28de8b..ee2f42cbe 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Navigation.php
+++ b/www/modules/civicrm/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:23df3f63163a45fc78d97f9d41b40c59)
+ * (GenCodeChecksum:ec6750dd040ecd891bf2dc89d7ad6c1d)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Note.php b/www/modules/civicrm/CRM/Core/DAO/Note.php
index 1e16e4805..235ab459c 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Note.php
+++ b/www/modules/civicrm/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:30875e48458bd58afb6a8098b58391d8)
+ * (GenCodeChecksum:834b6b69c06b1320b785a0735ceaf16a)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/OpenID.php b/www/modules/civicrm/CRM/Core/DAO/OpenID.php
index 80f6c3b3e..6145862f8 100644
--- a/www/modules/civicrm/CRM/Core/DAO/OpenID.php
+++ b/www/modules/civicrm/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:ba943523844376fa804ca9fbbb63be8b)
+ * (GenCodeChecksum:31cf81d3b9757e11e4c69c26b3b5372c)
  */
 
 /**
@@ -206,6 +206,9 @@ public static function &fields() {
           'entity' => 'OpenID',
           'bao' => 'CRM_Core_BAO_OpenID',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Url',
+          ],
           'add' => '2.0',
         ],
         'allowed_to_login' => [
diff --git a/www/modules/civicrm/CRM/Core/DAO/OptionGroup.php b/www/modules/civicrm/CRM/Core/DAO/OptionGroup.php
index f77ad74a5..1f9df4c2a 100644
--- a/www/modules/civicrm/CRM/Core/DAO/OptionGroup.php
+++ b/www/modules/civicrm/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:264ddf7a9c772b66c6e472d8642fc9bb)
+ * (GenCodeChecksum:f4b6fc8c5d5536073aa4a4d643031af4)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/OptionValue.php b/www/modules/civicrm/CRM/Core/DAO/OptionValue.php
index d775f9229..3a8a5a297 100644
--- a/www/modules/civicrm/CRM/Core/DAO/OptionValue.php
+++ b/www/modules/civicrm/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:631d0bd9404a447b384b44cc1b8daeff)
+ * (GenCodeChecksum:c2a476b386cc4eff6ff2e263b85b1baa)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Phone.php b/www/modules/civicrm/CRM/Core/DAO/Phone.php
index d9e2550e0..baa631c4e 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Phone.php
+++ b/www/modules/civicrm/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:170cfc165e0c7d8b1cc7e5fc1696e49f)
+ * (GenCodeChecksum:eef1c7c8ec3a6b495c408d56e3919cd7)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/PreferencesDate.php b/www/modules/civicrm/CRM/Core/DAO/PreferencesDate.php
index 02dddd0f3..5c6df7183 100644
--- a/www/modules/civicrm/CRM/Core/DAO/PreferencesDate.php
+++ b/www/modules/civicrm/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:7e0344ca89b265be75ff2995b711dc61)
+ * (GenCodeChecksum:e0f38c1447d53734a0aa77164b44f428)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/PrevNextCache.php b/www/modules/civicrm/CRM/Core/DAO/PrevNextCache.php
index 83c9551a6..8e2bdbfa8 100644
--- a/www/modules/civicrm/CRM/Core/DAO/PrevNextCache.php
+++ b/www/modules/civicrm/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:2f3c2dc512edf7aabe12fdaeba209662)
+ * (GenCodeChecksum:9dd46541ee36c3a697ac172f781d80ef)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/PrintLabel.php b/www/modules/civicrm/CRM/Core/DAO/PrintLabel.php
index 92e494674..020195cf1 100644
--- a/www/modules/civicrm/CRM/Core/DAO/PrintLabel.php
+++ b/www/modules/civicrm/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:666799f63e1b59a7fb459a736d37ebbb)
+ * (GenCodeChecksum:1124cab1af53aa83dd92863d92e2cb88)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/RecurringEntity.php b/www/modules/civicrm/CRM/Core/DAO/RecurringEntity.php
index 67f113afe..5e82c6280 100644
--- a/www/modules/civicrm/CRM/Core/DAO/RecurringEntity.php
+++ b/www/modules/civicrm/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:5788a8f2b88586d6c98107e54253abd8)
+ * (GenCodeChecksum:b72cfc29284fa9f161f7dc9c42f3fffe)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Setting.php b/www/modules/civicrm/CRM/Core/DAO/Setting.php
index 056ac7387..a9bb2e245 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Setting.php
+++ b/www/modules/civicrm/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:fd7511a97b39fb876ce599402a278428)
+ * (GenCodeChecksum:3bfd9f8a03acd2242706f1f7704d4115)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/StateProvince.php b/www/modules/civicrm/CRM/Core/DAO/StateProvince.php
index 014cbe32f..243a484dd 100644
--- a/www/modules/civicrm/CRM/Core/DAO/StateProvince.php
+++ b/www/modules/civicrm/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:77d17a177f161cc2029169c9c6e9d2fa)
+ * (GenCodeChecksum:9397716a24018e701337006e9f534488)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/StatusPreference.php b/www/modules/civicrm/CRM/Core/DAO/StatusPreference.php
index f440c79f4..998b7276f 100644
--- a/www/modules/civicrm/CRM/Core/DAO/StatusPreference.php
+++ b/www/modules/civicrm/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:f5a0658b23ddc17ca0b627791baa9b00)
+ * (GenCodeChecksum:72b79f9ff02ce8c6f2ff8db08ce4f82e)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/SystemLog.php b/www/modules/civicrm/CRM/Core/DAO/SystemLog.php
index d0aeb1806..9ef95f8b3 100644
--- a/www/modules/civicrm/CRM/Core/DAO/SystemLog.php
+++ b/www/modules/civicrm/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:9439e784389ce4eb9d4b45366948ceb8)
+ * (GenCodeChecksum:b8a7c4c85422e5d1fa7bdeb8da9d91af)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Tag.php b/www/modules/civicrm/CRM/Core/DAO/Tag.php
index 76ffee608..08b873227 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Tag.php
+++ b/www/modules/civicrm/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:3242cc59c5a6987043ff9b89fffd9812)
+ * (GenCodeChecksum:9589e91fed94b1480c7e282c7a49adab)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Timezone.php b/www/modules/civicrm/CRM/Core/DAO/Timezone.php
index 5849182f2..981bbd205 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Timezone.php
+++ b/www/modules/civicrm/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:df6cc62c608df47d2b3d166d3393f45b)
+ * (GenCodeChecksum:163a497354efdcb836c4a91d398c167d)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Translation.php b/www/modules/civicrm/CRM/Core/DAO/Translation.php
index ec150c97c..a2d437480 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Translation.php
+++ b/www/modules/civicrm/CRM/Core/DAO/Translation.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Translation.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0e4a4c57a9282c3e3ddb08422400b36e)
+ * (GenCodeChecksum:b6f886b9df1bb1ef863269a1f3791fb7)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/UFField.php b/www/modules/civicrm/CRM/Core/DAO/UFField.php
index b70e0ab1d..f0dc18bc7 100644
--- a/www/modules/civicrm/CRM/Core/DAO/UFField.php
+++ b/www/modules/civicrm/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:c5bb2d5c455892b58bd0ae998f8f8116)
+ * (GenCodeChecksum:45539bf36116ed34298bc82188fc820c)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/UFGroup.php b/www/modules/civicrm/CRM/Core/DAO/UFGroup.php
index 0f744ab9a..134b8c500 100644
--- a/www/modules/civicrm/CRM/Core/DAO/UFGroup.php
+++ b/www/modules/civicrm/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:7e7f497a6e1fed5d867407723f1d4a33)
+ * (GenCodeChecksum:ebd219bcdff5f8bb34bb4107cdeecd8e)
  */
 
 /**
@@ -60,6 +60,15 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
    */
   public $id;
 
+  /**
+   * Name of the UF group for directly addressing it in the codebase
+   *
+   * @var string
+   *   (SQL type: varchar(64))
+   *   Note that values will be retrieved from the database as a string.
+   */
+  public $name;
+
   /**
    * Is this profile currently active? If false, hide all related fields for all sharing contexts.
    *
@@ -90,7 +99,7 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
   /**
    * Profile Form Public title
    *
-   * @var string|null
+   * @var string
    *   (SQL type: varchar(64))
    *   Note that values will be retrieved from the database as a string.
    */
@@ -229,15 +238,6 @@ class CRM_Core_DAO_UFGroup extends CRM_Core_DAO {
    */
   public $is_reserved;
 
-  /**
-   * Name of the UF group for directly addressing it in the codebase
-   *
-   * @var string|null
-   *   (SQL type: varchar(64))
-   *   Note that values will be retrieved from the database as a string.
-   */
-  public $name;
-
   /**
    * FK to civicrm_contact, who created this UF group
    *
@@ -341,6 +341,30 @@ public static function &fields() {
           'readonly' => TRUE,
           'add' => '1.1',
         ],
+        'name' => [
+          'name' => 'name',
+          'type' => CRM_Utils_Type::T_STRING,
+          'title' => ts('Profile Name'),
+          'description' => ts('Name of the UF group for directly addressing it in the codebase'),
+          'required' => TRUE,
+          'maxlength' => 64,
+          'size' => CRM_Utils_Type::BIG,
+          'usage' => [
+            'import' => FALSE,
+            'export' => FALSE,
+            'duplicate_matching' => FALSE,
+            'token' => FALSE,
+          ],
+          'where' => 'civicrm_uf_group.name',
+          'table_name' => 'civicrm_uf_group',
+          'entity' => 'UFGroup',
+          'bao' => 'CRM_Core_BAO_UFGroup',
+          'localizable' => 0,
+          'html' => [
+            'type' => 'Text',
+          ],
+          'add' => '3.0',
+        ],
         'is_active' => [
           'name' => 'is_active',
           'type' => CRM_Utils_Type::T_BOOLEAN,
@@ -391,7 +415,7 @@ public static function &fields() {
         'title' => [
           'name' => 'title',
           'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('Profile Name'),
+          'title' => ts('Profile Title'),
           'description' => ts('Form title.'),
           'required' => TRUE,
           'maxlength' => 64,
@@ -417,6 +441,7 @@ public static function &fields() {
           'type' => CRM_Utils_Type::T_STRING,
           'title' => ts('Public Title'),
           'description' => ts('Profile Form Public title'),
+          'required' => TRUE,
           'maxlength' => 64,
           'size' => CRM_Utils_Type::BIG,
           'usage' => [
@@ -757,26 +782,6 @@ public static function &fields() {
           ],
           'add' => '3.0',
         ],
-        'name' => [
-          'name' => 'name',
-          'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('Profile Name'),
-          'description' => ts('Name of the UF group for directly addressing it in the codebase'),
-          'maxlength' => 64,
-          'size' => CRM_Utils_Type::BIG,
-          'usage' => [
-            'import' => FALSE,
-            'export' => FALSE,
-            'duplicate_matching' => FALSE,
-            'token' => FALSE,
-          ],
-          'where' => 'civicrm_uf_group.name',
-          'table_name' => 'civicrm_uf_group',
-          'entity' => 'UFGroup',
-          'bao' => 'CRM_Core_BAO_UFGroup',
-          'localizable' => 0,
-          'add' => '3.0',
-        ],
         'created_id' => [
           'name' => 'created_id',
           'type' => CRM_Utils_Type::T_INT,
diff --git a/www/modules/civicrm/CRM/Core/DAO/UFJoin.php b/www/modules/civicrm/CRM/Core/DAO/UFJoin.php
index b2cd2efd5..76a687d86 100644
--- a/www/modules/civicrm/CRM/Core/DAO/UFJoin.php
+++ b/www/modules/civicrm/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:aec017870809d4d38daa4767c0ade45e)
+ * (GenCodeChecksum:fce6144a9b97377afc528bc5372e48df)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/UFMatch.php b/www/modules/civicrm/CRM/Core/DAO/UFMatch.php
index df7f2ac81..2d50d7af8 100644
--- a/www/modules/civicrm/CRM/Core/DAO/UFMatch.php
+++ b/www/modules/civicrm/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:573747cc2ce1867945de4b241f7697c6)
+ * (GenCodeChecksum:25d315f3cc5d90e1400374e3b0919fa6)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/UserJob.php b/www/modules/civicrm/CRM/Core/DAO/UserJob.php
index 100a4010b..47c130b8a 100644
--- a/www/modules/civicrm/CRM/Core/DAO/UserJob.php
+++ b/www/modules/civicrm/CRM/Core/DAO/UserJob.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/UserJob.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1dd5100f469beec27435f1444c73eeb5)
+ * (GenCodeChecksum:50b937f2d2cf21085dc68b549b58566d)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Website.php b/www/modules/civicrm/CRM/Core/DAO/Website.php
index 368e0de7e..95cfbc9af 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Website.php
+++ b/www/modules/civicrm/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:0bc5336361de1d2286a64abc50719968)
+ * (GenCodeChecksum:04eef9c457f5f14e83b9eb002eacd0d5)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/WordReplacement.php b/www/modules/civicrm/CRM/Core/DAO/WordReplacement.php
index 06f45883c..eef8bc817 100644
--- a/www/modules/civicrm/CRM/Core/DAO/WordReplacement.php
+++ b/www/modules/civicrm/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:f9d6a1b7c34275dac925cde23c8a02be)
+ * (GenCodeChecksum:dac83aac0d502f1703e85f35fc1ae623)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DAO/Worldregion.php b/www/modules/civicrm/CRM/Core/DAO/Worldregion.php
index 75819d37a..e483648ae 100644
--- a/www/modules/civicrm/CRM/Core/DAO/Worldregion.php
+++ b/www/modules/civicrm/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:5a8bc073b156890e271f35afd867be85)
+ * (GenCodeChecksum:a9293175f5f503dcd9cfcec59fc967b5)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Core/DynamicFKAccessTrait.php b/www/modules/civicrm/CRM/Core/DynamicFKAccessTrait.php
index d2dbd72c6..5cd743a11 100644
--- a/www/modules/civicrm/CRM/Core/DynamicFKAccessTrait.php
+++ b/www/modules/civicrm/CRM/Core/DynamicFKAccessTrait.php
@@ -15,20 +15,21 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
+use Civi\Api4\Event\AuthorizeRecordEvent;
+use Civi\Api4\Utils\CoreUtil;
+
 /**
  * Trait for with entities with an entity_table + entity_id dynamic FK.
  */
 trait CRM_Core_DynamicFKAccessTrait {
 
   /**
-   * @param string $entityName
-   * @param string $action
-   * @param array $record
-   * @param int $userID
-   * @return bool
    * @see \Civi\Api4\Utils\CoreUtil::checkAccessRecord
    */
-  public static function _checkAccess(string $entityName, string $action, array $record, int $userID): bool {
+  public static function self_civi_api4_authorizeRecord(AuthorizeRecordEvent $e): void {
+    $record = $e->getRecord();
+    $userID = $e->getUserID();
+    $delegateAction = $e->getActionName() === 'get' ? 'get' : 'update';
     $eid = $record['entity_id'] ?? NULL;
     $table = $record['entity_table'] ?? NULL;
     if (!$eid && !empty($record['id'])) {
@@ -43,9 +44,8 @@ public static function _checkAccess(string $entityName, string $action, array $r
         throw new \CRM_Core_Exception(sprintf('Cannot resolve permissions for dynamic foreign key in "%s". Invalid table reference "%s".',
           static::getTableName(), $table));
       }
-      return \Civi\Api4\Utils\CoreUtil::checkAccessDelegated($targetEntity, 'update', ['id' => $eid], $userID);
+      $e->setAuthorized(CoreUtil::checkAccessDelegated($targetEntity, $delegateAction, ['id' => $eid], $userID));
     }
-    return TRUE;
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Core/EntityTokens.php b/www/modules/civicrm/CRM/Core/EntityTokens.php
index 88d5cc2de..74b5d6b37 100644
--- a/www/modules/civicrm/CRM/Core/EntityTokens.php
+++ b/www/modules/civicrm/CRM/Core/EntityTokens.php
@@ -17,6 +17,7 @@
 use Civi\ActionSchedule\Event\MailingQueryEvent;
 use Civi\Token\TokenProcessor;
 use Brick\Money\Money;
+use Brick\Math\RoundingMode;
 
 /**
  * Class CRM_Core_EntityTokens
@@ -126,7 +127,7 @@ public function evaluateToken(TokenRow $row, $entity, $field, $prefetch = NULL)
       }
 
       return $row->format('text/plain')->tokens($entity, $field,
-        Money::of($fieldValue, $currency));
+        Money::of($fieldValue, $currency, NULL, RoundingMode::HALF_UP));
 
     }
     if ($this->isDateField($field)) {
@@ -306,7 +307,7 @@ protected function getRelatedTokens(): array {
    * @internal function will likely be protected soon.
    */
   protected function getPseudoValue(string $realField, string $pseudoKey, $fieldValue): string {
-    $bao = CRM_Core_DAO_AllCoreTables::getFullName($this->getMetadataForField($realField)['entity']);
+    $bao = CRM_Core_DAO_AllCoreTables::getDAONameForEntity($this->getMetadataForField($realField)['entity']);
     if ($pseudoKey === 'name') {
       // There is a theoretical possibility fieldValue could be an array but
       // specifically for preferred communication type - but real world usage
diff --git a/www/modules/civicrm/CRM/Core/Error.php b/www/modules/civicrm/CRM/Core/Error.php
index 28dac3a85..ee3e62fa4 100644
--- a/www/modules/civicrm/CRM/Core/Error.php
+++ b/www/modules/civicrm/CRM/Core/Error.php
@@ -182,7 +182,7 @@ public static function handle($pearError) {
         else {
           $mysql_error = 'fixme-unknown-db-cxn';
         }
-        $template->assign_by_ref('mysql_code', $mysql_error);
+        $template->assign('mysql_code', $mysql_error);
       }
     }
 
@@ -199,9 +199,9 @@ public static function handle($pearError) {
       }
     }
 
-    $template->assign_by_ref('error', $error);
+    $template->assign('error', $error);
     $errorDetails = CRM_Core_Error::debug('', $error, FALSE);
-    $template->assign_by_ref('errorDetails', $errorDetails);
+    $template->assign('errorDetails', $errorDetails);
 
     CRM_Core_Error::debug_var('Fatal Error Details', $error, TRUE, TRUE, '', PEAR_LOG_ERR);
     CRM_Core_Error::backtrace('backTrace', TRUE);
@@ -451,6 +451,9 @@ function_exists($config->fatalErrorHandler)
       $content = self::formatHtmlException($exception) . $content;
     }
 
+    // set the response code before starting the request
+    http_response_code(500);
+
     echo CRM_Utils_System::theme($content);
     $exit = CRM_Utils_System::shouldExitAfterFatal();
 
diff --git a/www/modules/civicrm/CRM/Core/Form.php b/www/modules/civicrm/CRM/Core/Form.php
index efe2d064a..2269adb0e 100644
--- a/www/modules/civicrm/CRM/Core/Form.php
+++ b/www/modules/civicrm/CRM/Core/Form.php
@@ -201,6 +201,11 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
    */
   public $_tagsetInfo;
 
+  /**
+   * @var true
+   */
+  private bool $isValidated = FALSE;
+
   /**
    * @return string
    */
@@ -396,7 +401,7 @@ public function __construct(
     // Workaround for CRM-15153 - give each form a reasonably unique css class
     $this->addClass(CRM_Utils_System::getClassName($this));
 
-    $this->assign('snippet', CRM_Utils_Array::value('snippet', $_GET));
+    $this->assign('snippet', $_GET['snippet'] ?? NULL);
     $this->setTranslatedFields();
   }
 
@@ -664,6 +669,23 @@ public function postProcessHook() {
     CRM_Utils_Hook::postProcess(get_class($this), $this);
   }
 
+  /**
+   * Register a field with quick form as supporting a file upload.
+   *
+   * @param array $fieldNames
+   *
+   * @return void
+   */
+  public function registerFileField(array $fieldNames): void {
+    // hack for field type File
+    $formUploadNames = $this->get('uploadNames');
+    if (is_array($formUploadNames)) {
+      $fieldNames = array_unique(array_merge($formUploadNames, $fieldNames));
+    }
+
+    $this->set('uploadNames', $fieldNames);
+  }
+
   /**
    * This virtual function is used to build the form.
    *
@@ -717,7 +739,7 @@ public function validate() {
     if (!empty($hookErrors)) {
       $this->_errors += $hookErrors;
     }
-
+    $this->isValidated = TRUE;
     return (0 == count($this->_errors));
   }
 
@@ -757,7 +779,7 @@ public function buildForm() {
     }
 
     if (!empty($defaults)) {
-      $this->setDefaults($defaults);
+      $this->setPurifiedDefaults($defaults);
     }
 
     // call the form hook
@@ -788,6 +810,33 @@ public function buildForm() {
     $this->_formBuilt = TRUE;
   }
 
+  /**
+   * Override this in a subclass to prevent fields intended to contain
+   * "raw html" from getting broken. E.g. system message templates
+   * @return array
+   */
+  protected function getFieldsToExcludeFromPurification(): array {
+    return [];
+  }
+
+  public function setPurifiedDefaults($defaults) {
+    $exclude = $this->getFieldsToExcludeFromPurification();
+    foreach ($defaults as $index => $default) {
+      if (!in_array($index, $exclude, TRUE) && is_string($default) && !is_numeric($default)) {
+        $hasEncodedAmp = str_contains('&amp;', $default);
+        $hasEncodedQuote = str_contains('&quot;', $default);
+        $defaults[$index] = CRM_Utils_String::purifyHTML($default);
+        if (!$hasEncodedAmp) {
+          $defaults[$index] = str_replace('&amp;', '&', $defaults[$index]);
+        }
+        if (!$hasEncodedQuote) {
+          $defaults[$index] = str_replace('&quot;', '"', $defaults[$index]);
+        }
+      }
+    }
+    $this->setDefaults($defaults);
+  }
+
   /**
    * Add default Next / Back buttons.
    *
@@ -851,7 +900,7 @@ public function addButtons($params) {
           $attrs['accesskey'] = 'S';
         }
         $buttonContents = CRM_Core_Page::crmIcon($button['icon'] ?? $defaultIcon) . ' ' . $button['name'];
-        $buttonName = $this->getButtonName($button['type'], CRM_Utils_Array::value('subName', $button));
+        $buttonName = $this->getButtonName($button['type'], $button['subName'] ?? NULL);
         $attrs['class'] .= " crm-button crm-button-type-{$button['type']} crm-button{$buttonName}";
         $attrs['type'] = 'submit';
         $prevnext[] = $this->createElement('xbutton', $buttonName, $buttonContents, $attrs);
@@ -907,7 +956,7 @@ public function getStateType() {
    * @return string
    */
   public function getTitle() {
-    return $this->_title ? $this->_title : ts('ERROR: Title is not Set');
+    return $this->_title ?: ts('ERROR: Title is not Set');
   }
 
   /**
@@ -1374,9 +1423,12 @@ public function assign($var, $value = NULL) {
    *   Name of variable.
    * @param mixed $value
    *   Value of variable.
+   *
+   * @deprecated since 5.72 will be removed around 5.84
    */
   public function assign_by_ref($var, &$value) {
-    self::$_template->assign_by_ref($var, $value);
+    CRM_Core_Error::deprecatedFunctionWarning('assign');
+    self::$_template->assign($var, $value);
   }
 
   /**
@@ -2112,9 +2164,13 @@ public function addUploadElement($elementName) {
    */
   public function getVar($name) {
     try {
-      if (!empty(ReflectionUtils::getCodeDocs((new ReflectionProperty($this, $name)), 'Property')['deprecated'])) {
+      $property = ReflectionUtils::getCodeDocs((new ReflectionProperty($this, $name)), 'Property');
+      if (!empty($property['deprecated'])) {
         CRM_Core_Error::deprecatedWarning('deprecated property accessed :' . $name);
       }
+      if (!empty($property['internal'])) {
+        CRM_Core_Error::deprecatedWarning('internal property accessed (this property could change without warning):' . $name);
+      }
     }
     catch (\ReflectionException $e) {
       // If the variable isn't defined you can't access its properties to check if it's deprecated. Let php 8.2 deal with those warnings.
@@ -2390,7 +2446,7 @@ public function addAutocomplete(string $name, string $label = '', array $props =
    */
   public function addEntityRef($name, $label = '', $props = [], $required = FALSE) {
     // Default properties
-    $props['api'] = CRM_Utils_Array::value('api', $props, []);
+    $props['api'] = $props['api'] ?? [];
     $props['entity'] = CRM_Core_DAO_AllCoreTables::convertEntityNameToCamel($props['entity'] ?? 'Contact');
     $props['class'] = ltrim(($props['class'] ?? '') . ' crm-form-entityref');
 
@@ -2404,7 +2460,7 @@ public function addEntityRef($name, $label = '', $props = [], $required = FALSE)
     if (!empty($props['multiple'])) {
       $defaults['multiple'] = TRUE;
     }
-    $props['select'] = CRM_Utils_Array::value('select', $props, []) + $defaults;
+    $props['select'] = ($props['select'] ?? []) + $defaults;
 
     $this->formatReferenceFieldAttributes($props, get_class($this));
     return $this->add('text', $name, $label, $props, $required);
@@ -3070,8 +3126,12 @@ protected function getContactIDIfAccessingOwnRecord() {
    *
    * These values have been validated against the fields added to the form.
    * https://pear.php.net/manual/en/package.html.html-quickform.html-quickform.exportvalues.php
+   * unless the function is being called during before the submission has
+   * been validated. In which the values are not yet validated & hence
+   * taking directly from $_POST.
    *
-   * Any money processing has also been done.
+   * Fields with money or number formats are converted from localised formats
+   * before returning.
    *
    * @param string $fieldName
    *
@@ -3083,6 +3143,18 @@ protected function getContactIDIfAccessingOwnRecord() {
    */
   public function getSubmittedValue(string $fieldName) {
     if (empty($this->exportedValues)) {
+      if (!$this->isValidated) {
+        // Trying to access the submitted value before during during validate.
+        // In this case we get the submitValue which is equivalent to the value
+        // in $_POST. By contrast exportValues will filter out fields
+        // that have not been added to QuickForm.
+        $value = $this->getSubmitValue($fieldName);
+        if (is_string($value)) {
+          // Precaution since we are dealing with values directly in $_POST.
+          $value = CRM_Utils_String::purifyHTML($value);
+        }
+        return $this->getUnLocalizedSubmittedValue($fieldName, $value);
+      }
       $this->exportedValues = $this->controller->exportValues($this->_name);
     }
     $value = $this->exportedValues[$fieldName] ?? NULL;
diff --git a/www/modules/civicrm/CRM/Core/Form/EntityFormTrait.php b/www/modules/civicrm/CRM/Core/Form/EntityFormTrait.php
index 3941da88d..f1bbb7deb 100644
--- a/www/modules/civicrm/CRM/Core/Form/EntityFormTrait.php
+++ b/www/modules/civicrm/CRM/Core/Form/EntityFormTrait.php
@@ -15,6 +15,7 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 trait CRM_Core_Form_EntityFormTrait {
+  use CRM_Custom_Form_CustomDataTrait;
 
   /**
    * The id of the object being edited / created.
@@ -156,9 +157,45 @@ public function addCustomDataToForm() {
     if ($this->isSuppressCustomData()) {
       return TRUE;
     }
-    $customisableEntities = CRM_Core_SelectValues::customGroupExtends();
-    if (isset($customisableEntities[$this->getDefaultEntity()])) {
-      CRM_Custom_Form_CustomData::addToForm($this, $this->getEntitySubTypeId());
+
+    /*
+    @todo - this would be the preferred code here to better support
+    php8.2 & take advantage of code improvements
+    Note in this example an additional filter (membership_type_id)
+    is relevant although for most entities it isn't.
+    if ($this->isSubmitted()) {
+    // The custom data fields are added to the form by an ajax form.
+    // However, if they are not present in the element index they will
+    // not be available from `$this->getSubmittedValue()` in post process.
+    // We do not have to set defaults or otherwise render - just add to the element index.
+    $this->addCustomDataFieldsToForm($this->getDefaultEntity(), array_filter([
+    'id' => $this->getEntityId(),
+    'membership_type_id' => $this->getSubmittedValue('membership_type_id')
+    ]));
+    }
+     */
+    $this->assign('customDataType', $this->getDefaultEntity());
+    $this->assign('customDataSubType', $this->getEntitySubTypeId());
+    $this->assign('entityID', $this->getEntityId());
+    $this->assign('cid', NULL);
+    if ($this->isSubmitted()) {
+      $customisableEntities = CRM_Core_SelectValues::customGroupExtends();
+      if (isset($customisableEntities[$this->getDefaultEntity()])) {
+        if ($this->getEntitySubTypeId()) {
+          // Supporting entity subtypes form the EntityFormTrait is not
+          // used in core & is likely not used anywhere / was a good idea that
+          // didn't fully happen. If anyone is winding up here they should override
+          // the entire addCustomDataToForm function - e.g like the backoffice membership
+          // forms do
+          // @todo - add some noisy deprecation at some point.
+          CRM_Custom_Form_CustomData::addToForm($this, $this->getEntitySubTypeId());
+        }
+        else {
+          $this->addCustomDataFieldsToForm($this->getDefaultEntity(), array_filter([
+            'id' => $this->getEntityId(),
+          ]));
+        }
+      }
     }
   }
 
@@ -184,7 +221,7 @@ public function buildQuickEntityForm() {
     $this->assign('entityFields', $this->entityFields);
     $this->assign('entityID', $this->getEntityId());
     $this->assign('entityInClassFormat', strtolower(str_replace('_', '-', $this->getDefaultEntity())));
-    $this->assign('entityTable', CRM_Core_DAO_AllCoreTables::getTableForClass(CRM_Core_DAO_AllCoreTables::getFullName($this->getDefaultEntity())));
+    $this->assign('entityTable', CRM_Core_DAO_AllCoreTables::getTableForClass(CRM_Core_DAO_AllCoreTables::getDAONameForEntity($this->getDefaultEntity())));
     $this->addCustomDataToForm();
     $this->addFormButtons();
 
diff --git a/www/modules/civicrm/CRM/Core/Form/Renderer.php b/www/modules/civicrm/CRM/Core/Form/Renderer.php
index b1a589d30..01dc6bb0b 100644
--- a/www/modules/civicrm/CRM/Core/Form/Renderer.php
+++ b/www/modules/civicrm/CRM/Core/Form/Renderer.php
@@ -190,6 +190,9 @@ public static function updateAttributes(&$element, $required, $error) {
     elseif (strpos($class, 'crm-form-entityref') !== FALSE) {
       self::preProcessEntityRef($element);
     }
+    elseif (str_contains($class, 'crm-form-autocomplete')) {
+      self::preProcessAutocomplete($element);
+    }
     elseif (strpos($class, 'crm-form-contact-reference') !== FALSE) {
       self::preprocessContactReference($element);
     }
@@ -233,7 +236,7 @@ public static function updateAttributes(&$element, $required, $error) {
   public function _tplFetch($tplSource) {
     // Smarty3 does not have this function defined so the parent fails.
     // Adding this is preparatory to smarty 3....
-    if (!function_exists('smarty_function_eval') && !file_exists(SMARTY_DIR . '/plugins/function.eval.php')) {
+    if (!function_exists('smarty_function_eval') && (!defined('SMARTY_DIR') || !file_exists(SMARTY_DIR . '/plugins/function.eval.php'))) {
       $smarty = $this->_tpl;
       $smarty->assign('var', $tplSource);
       return $smarty->fetch("eval:$tplSource");
@@ -245,6 +248,16 @@ public function _tplFetch($tplSource) {
     return smarty_function_eval(['var' => $tplSource], $this->_tpl);
   }
 
+  /**
+   * @param HTML_QuickForm_element $field
+   */
+  private static function preProcessAutocomplete($field) {
+    $val = $field->getValue();
+    if (is_array($val)) {
+      $field->setValue(implode(',', $val));
+    }
+  }
+
   /**
    * Convert IDs to values and format for display.
    *
diff --git a/www/modules/civicrm/CRM/Core/Form/Task.php b/www/modules/civicrm/CRM/Core/Form/Task.php
index b4003bdd3..d9227c68b 100644
--- a/www/modules/civicrm/CRM/Core/Form/Task.php
+++ b/www/modules/civicrm/CRM/Core/Form/Task.php
@@ -391,7 +391,10 @@ protected function getRows(): array {
    * @return array
    */
   protected function getContactIDs(): array {
-    return $this->_contactIds ?? [];
+    if (!isset($this->_contactIds)) {
+      $this->setContactIDs();
+    }
+    return $this->_contactIds;
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Core/I18n.php b/www/modules/civicrm/CRM/Core/I18n.php
index 2c789e152..e73d659c4 100644
--- a/www/modules/civicrm/CRM/Core/I18n.php
+++ b/www/modules/civicrm/CRM/Core/I18n.php
@@ -24,16 +24,13 @@ class CRM_Core_I18n {
   const NONE = 'none', AUTO = 'auto';
 
   /**
-   * @var callable|null
-   *   A callback function which handles SQL string encoding.
-   *   Set NULL to use the default, CRM_Core_DAO::escapeString().
-   *   This is used by `ts(..., [escape=>sql])`.
-   *
-   * This option is not intended for general consumption. It is only intended
-   * for certain pre-boot/pre-install contexts.
+   * @var string
+   * @deprecated
+   *   This variable has 1-2 references in contrib, which -probably- aren't functionally
+   *   necessary. (Extensions don't load in pre-installation environments...)
+   *   But we'll keep the property stub just to prevent crashes.
    *
-   * You might ask, "Why on Earth does string-translation have an opinion on
-   * SQL escaping?" Good question!
+   *   Replaced by $GLOBALS['CIVICRM_SQL_ESCAPER'].
    */
   public static $SQL_ESCAPER = NULL;
 
@@ -47,12 +44,7 @@ class CRM_Core_I18n {
   protected static function escape($text, $mode) {
     switch ($mode) {
       case 'sql':
-        if (self::$SQL_ESCAPER == NULL) {
-          return CRM_Core_DAO::escapeString($text);
-        }
-        else {
-          return call_user_func(self::$SQL_ESCAPER, $text);
-        }
+        return CRM_Core_DAO::escapeString($text);
 
       case 'js':
         return substr(json_encode($text, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT), 1, -1);
@@ -787,7 +779,7 @@ private function getWordReplacements() {
     }
 
     // FIXME: Is there a constant we can reference instead of hardcoding en_US?
-    $replacementsLocale = $this->locale ? $this->locale : 'en_US';
+    $replacementsLocale = $this->locale ?: 'en_US';
     if ((!isset(Civi::$statics[__CLASS__]) || !array_key_exists($replacementsLocale, Civi::$statics[__CLASS__]))) {
       if (defined('CIVICRM_DSN') && !CRM_Core_Config::isUpgradeMode()) {
         Civi::$statics[__CLASS__][$replacementsLocale] = CRM_Core_BAO_WordReplacement::getLocaleCustomStrings($replacementsLocale);
@@ -800,71 +792,3 @@ private function getWordReplacements() {
   }
 
 }
-
-/**
- * Short-named function for string translation, defined in global scope so it's available everywhere.
- *
- * @param string $text
- *   String for translating.
- *   Ex: 'Hello, %1!'
- * @param array $params
- *   An array of additional parameters, as per `crm_translate()`.
- *   Ex: [1 => 'Dave']
- * @return string
- *   The translated string
- *   Ex: '¡Buenos días Dave!`
- * @see \CRM_Core_I18n::crm_translate()
- */
-function ts($text, $params = []) {
-  static $bootstrapReady = FALSE;
-  static $lastLocale = NULL;
-  static $i18n = NULL;
-  static $function = NULL;
-
-  if ($text == '') {
-    return '';
-  }
-
-  // When the settings become available, lookup customTranslateFunction.
-  if (!$bootstrapReady) {
-    $bootstrapReady = (bool) \Civi\Core\Container::isContainerBooted();
-    if ($bootstrapReady) {
-      // just got ready: determine whether there is a working custom translation function
-      $config = CRM_Core_Config::singleton();
-      if (!empty($config->customTranslateFunction) && function_exists($config->customTranslateFunction)) {
-        $function = $config->customTranslateFunction;
-      }
-    }
-  }
-
-  $civicrmLocale = CRM_Core_I18n::getLocale();
-  if (!$i18n or $lastLocale != $civicrmLocale) {
-    $i18n = CRM_Core_I18n::singleton();
-    $lastLocale = $civicrmLocale;
-  }
-
-  if ($function) {
-    return $function($text, $params);
-  }
-  else {
-    return $i18n->crm_translate($text, $params);
-  }
-}
-
-/**
- * Alternate name for `ts()`
- *
- * This is functionally equivalent to `ts()`. However, regular `ts()` is subject to extra linting
- * rules. Using `_ts()` can bypass the linting rules for the rare cases where you really want
- * special/dynamic values.
- *
- * @param array ...$args
- * @return string
- * @see ts()
- * @see \CRM_Core_I18n::crm_translate()
- * @internal
- */
-function _ts(...$args) {
-  $f = 'ts';
-  return $f(...$args);
-}
diff --git a/www/modules/civicrm/CRM/Core/I18n/SchemaStructure.php b/www/modules/civicrm/CRM/Core/I18n/SchemaStructure.php
index 672da8d72..f1a2ead7c 100644
--- a/www/modules/civicrm/CRM/Core/I18n/SchemaStructure.php
+++ b/www/modules/civicrm/CRM/Core/I18n/SchemaStructure.php
@@ -140,7 +140,7 @@ public static function &columns() {
         ],
         'civicrm_uf_group' => [
           'title' => "varchar(64) NOT NULL DEFAULT ''  COMMENT 'Form title.'",
-          'frontend_title' => "varchar(64) COMMENT 'Profile Form Public title'",
+          'frontend_title' => "varchar(64) NOT NULL DEFAULT ''  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'",
@@ -563,6 +563,7 @@ public static function &widgets() {
           ],
           'frontend_title' => [
             'type' => "Text",
+            'required' => "true",
           ],
           'help_pre' => [
             'type' => "TextArea",
@@ -691,7 +692,7 @@ public static function &widgets() {
             'cols' => "50",
           ],
           'confirm_email_text' => [
-            'type' => "TextArea",
+            'type' => "RichTextEditor",
             'rows' => "4",
             'cols' => "50",
           ],
diff --git a/www/modules/civicrm/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php b/www/modules/civicrm/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php
deleted file mode 100644
index f74273b7f..000000000
--- a/www/modules/civicrm/CRM/Core/I18n/SchemaStructure_4_2_alpha1.php
+++ /dev/null
@@ -1,219 +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
- */
-class CRM_Core_I18n_SchemaStructure_4_2_alpha1 {
-
-  /**
-   * @return array
-   */
-  public static function &columns() {
-    static $result = NULL;
-    if (!$result) {
-      $result = [
-        'civicrm_location_type' => [
-          'display_name' => "varchar(64)",
-        ],
-        'civicrm_option_group' => [
-          'title' => "varchar(255)",
-          'description' => "varchar(255)",
-        ],
-        'civicrm_contact_type' => [
-          'label' => "varchar(64)",
-          'description' => "text",
-        ],
-        'civicrm_premiums' => [
-          'premiums_intro_title' => "varchar(255)",
-          'premiums_intro_text' => "text",
-        ],
-        'civicrm_product' => [
-          'name' => "varchar(255)",
-          'description' => "text",
-          'options' => "text",
-        ],
-        'civicrm_membership_status' => [
-          'label' => "varchar(128)",
-        ],
-        'civicrm_survey' => [
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-        ],
-        'civicrm_participant_status_type' => [
-          'label' => "varchar(255)",
-        ],
-        'civicrm_tell_friend' => [
-          'title' => "varchar(255)",
-          'intro' => "text",
-          'suggested_message' => "text",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-        ],
-        'civicrm_price_set' => [
-          'title' => "varchar(255)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_batch' => [
-          'title' => "varchar(64)",
-          'description' => "text",
-        ],
-        'civicrm_custom_group' => [
-          'title' => "varchar(64)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_custom_field' => [
-          'label' => "varchar(255)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_dashboard' => [
-          'label' => "varchar(255)",
-        ],
-        'civicrm_option_value' => [
-          'label' => "varchar(255)",
-          'description' => "text",
-        ],
-        'civicrm_group' => [
-          'title' => "varchar(64)",
-        ],
-        'civicrm_contribution_page' => [
-          'title' => "varchar(255)",
-          'intro_text' => "text",
-          'pay_later_text' => "text",
-          'pay_later_receipt' => "text",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-          'thankyou_footer' => "text",
-          'for_organization' => "text",
-          'receipt_from_name' => "varchar(255)",
-          'receipt_text' => "text",
-          'footer_text' => "text",
-          'honor_block_title' => "varchar(255)",
-          'honor_block_text' => "text",
-        ],
-        'civicrm_price_field' => [
-          'label' => "varchar(255)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_uf_group' => [
-          'title' => "varchar(64)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_uf_field' => [
-          'help_post' => "text",
-          'help_pre' => "text",
-          'label' => "varchar(255)",
-        ],
-        'civicrm_membership_type' => [
-          'name' => "varchar(128)",
-          'description' => "varchar(255)",
-        ],
-        'civicrm_membership_block' => [
-          'new_title' => "varchar(255)",
-          'new_text' => "text",
-          'renewal_title' => "varchar(255)",
-          'renewal_text' => "text",
-        ],
-        'civicrm_price_field_value' => [
-          'label' => "varchar(255)",
-          'description' => "text",
-        ],
-        'civicrm_pcp_block' => [
-          'link_text' => "varchar(255)",
-        ],
-        'civicrm_event' => [
-          'title' => "varchar(255)",
-          'summary' => "text",
-          'description' => "text",
-          'registration_link_text' => "varchar(255)",
-          'event_full_text' => "text",
-          'fee_label' => "varchar(255)",
-          'intro_text' => "text",
-          'footer_text' => "text",
-          'confirm_title' => "varchar(255)",
-          'confirm_text' => "text",
-          'confirm_footer_text' => "text",
-          'confirm_email_text' => "text",
-          'confirm_from_name' => "varchar(255)",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-          'thankyou_footer_text' => "text",
-          'pay_later_text' => "text",
-          'pay_later_receipt' => "text",
-          'waitlist_text' => "text",
-          'approval_req_text' => "text",
-          'template_title' => "varchar(255)",
-        ],
-      ];
-    }
-    return $result;
-  }
-
-  /**
-   * @return array
-   */
-  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;
-  }
-
-  /**
-   * @return array
-   */
-  public static function &tables() {
-    static $result = NULL;
-    if (!$result) {
-      $result = array_keys(self::columns());
-    }
-    return $result;
-  }
-
-}
diff --git a/www/modules/civicrm/CRM/Core/I18n/SchemaStructure_4_3_1.php b/www/modules/civicrm/CRM/Core/I18n/SchemaStructure_4_3_1.php
deleted file mode 100644
index dd3d6dc12..000000000
--- a/www/modules/civicrm/CRM/Core/I18n/SchemaStructure_4_3_1.php
+++ /dev/null
@@ -1,224 +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
- */
-class CRM_Core_I18n_SchemaStructure_4_3_1 {
-
-  /**
-   * @return array
-   */
-  public static function &columns() {
-    static $result = NULL;
-    if (!$result) {
-      $result = [
-        'civicrm_location_type' => [
-          'display_name' => "varchar(64)",
-        ],
-        'civicrm_option_group' => [
-          'title' => "varchar(255)",
-          'description' => "varchar(255)",
-        ],
-        'civicrm_contact_type' => [
-          'label' => "varchar(64)",
-          'description' => "text",
-        ],
-        'civicrm_batch' => [
-          'title' => "varchar(64)",
-          'description' => "text",
-        ],
-        'civicrm_premiums' => [
-          'premiums_intro_title' => "varchar(255)",
-          'premiums_intro_text' => "text",
-          'premiums_nothankyou_label' => "varchar(255)",
-        ],
-        'civicrm_membership_status' => [
-          'label' => "varchar(128)",
-        ],
-        'civicrm_survey' => [
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-        ],
-        'civicrm_participant_status_type' => [
-          'label' => "varchar(255)",
-        ],
-        'civicrm_tell_friend' => [
-          'title' => "varchar(255)",
-          'intro' => "text",
-          'suggested_message' => "text",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-        ],
-        'civicrm_custom_group' => [
-          'title' => "varchar(64)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_custom_field' => [
-          'label' => "varchar(255)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_option_value' => [
-          'label' => "varchar(255)",
-          'description' => "text",
-        ],
-        'civicrm_group' => [
-          'title' => "varchar(64)",
-        ],
-        'civicrm_contribution_page' => [
-          'title' => "varchar(255)",
-          'intro_text' => "text",
-          'pay_later_text' => "text",
-          'pay_later_receipt' => "text",
-          'initial_amount_label' => "varchar(255)",
-          'initial_amount_help_text' => "text",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-          'thankyou_footer' => "text",
-          'for_organization' => "text",
-          'receipt_from_name' => "varchar(255)",
-          'receipt_text' => "text",
-          'footer_text' => "text",
-          'honor_block_title' => "varchar(255)",
-          'honor_block_text' => "text",
-        ],
-        'civicrm_product' => [
-          'name' => "varchar(255)",
-          'description' => "text",
-          'options' => "text",
-        ],
-        'civicrm_membership_type' => [
-          'name' => "varchar(128)",
-          'description' => "varchar(255)",
-        ],
-        'civicrm_membership_block' => [
-          'new_title' => "varchar(255)",
-          'new_text' => "text",
-          'renewal_title' => "varchar(255)",
-          'renewal_text' => "text",
-        ],
-        'civicrm_price_set' => [
-          'title' => "varchar(255)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_dashboard' => [
-          'label' => "varchar(255)",
-        ],
-        'civicrm_uf_group' => [
-          'title' => "varchar(64)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_uf_field' => [
-          'help_post' => "text",
-          'help_pre' => "text",
-          'label' => "varchar(255)",
-        ],
-        'civicrm_price_field' => [
-          'label' => "varchar(255)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_price_field_value' => [
-          'label' => "varchar(255)",
-          'description' => "text",
-        ],
-        'civicrm_pcp_block' => [
-          'link_text' => "varchar(255)",
-        ],
-        'civicrm_event' => [
-          'title' => "varchar(255)",
-          'summary' => "text",
-          'description' => "text",
-          'registration_link_text' => "varchar(255)",
-          'event_full_text' => "text",
-          'fee_label' => "varchar(255)",
-          'intro_text' => "text",
-          'footer_text' => "text",
-          'confirm_title' => "varchar(255)",
-          'confirm_text' => "text",
-          'confirm_footer_text' => "text",
-          'confirm_email_text' => "text",
-          'confirm_from_name' => "varchar(255)",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-          'thankyou_footer_text' => "text",
-          'pay_later_text' => "text",
-          'pay_later_receipt' => "text",
-          'initial_amount_label' => "varchar(255)",
-          'initial_amount_help_text' => "text",
-          'waitlist_text' => "text",
-          'approval_req_text' => "text",
-          'template_title' => "varchar(255)",
-        ],
-      ];
-    }
-    return $result;
-  }
-
-  /**
-   * @return array
-   */
-  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;
-  }
-
-  /**
-   * @return array
-   */
-  public static function &tables() {
-    static $result = NULL;
-    if (!$result) {
-      $result = array_keys(self::columns());
-    }
-    return $result;
-  }
-
-}
diff --git a/www/modules/civicrm/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php b/www/modules/civicrm/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php
deleted file mode 100644
index 7aebd50d4..000000000
--- a/www/modules/civicrm/CRM/Core/I18n/SchemaStructure_4_5_alpha1.php
+++ /dev/null
@@ -1,227 +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
- *
- * Generated from schema_structure.tpl
- * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- */
-class CRM_Core_I18n_SchemaStructure_4_5_alpha1 {
-
-  /**
-   * @return array
-   */
-  public static function &columns() {
-    static $result = NULL;
-    if (!$result) {
-      $result = [
-        'civicrm_location_type' => [
-          'display_name' => "varchar(64)",
-        ],
-        'civicrm_option_group' => [
-          'title' => "varchar(255)",
-          'description' => "varchar(255)",
-        ],
-        'civicrm_contact_type' => [
-          'label' => "varchar(64)",
-          'description' => "text",
-        ],
-        'civicrm_batch' => [
-          'title' => "varchar(64)",
-          'description' => "text",
-        ],
-        'civicrm_premiums' => [
-          'premiums_intro_title' => "varchar(255)",
-          'premiums_intro_text' => "text",
-          'premiums_nothankyou_label' => "varchar(255)",
-        ],
-        'civicrm_membership_status' => [
-          'label' => "varchar(128)",
-        ],
-        'civicrm_survey' => [
-          'title' => "varchar(255)",
-          'instructions' => "text",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-        ],
-        'civicrm_participant_status_type' => [
-          'label' => "varchar(255)",
-        ],
-        'civicrm_tell_friend' => [
-          'title' => "varchar(255)",
-          'intro' => "text",
-          'suggested_message' => "text",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-        ],
-        'civicrm_custom_group' => [
-          'title' => "varchar(64)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_custom_field' => [
-          'label' => "varchar(255)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_option_value' => [
-          'label' => "varchar(255)",
-          'description' => "text",
-        ],
-        'civicrm_group' => [
-          'title' => "varchar(64)",
-        ],
-        'civicrm_contribution_page' => [
-          'title' => "varchar(255)",
-          'intro_text' => "text",
-          'pay_later_text' => "text",
-          'pay_later_receipt' => "text",
-          'initial_amount_label' => "varchar(255)",
-          'initial_amount_help_text' => "text",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-          'thankyou_footer' => "text",
-          'for_organization' => "text",
-          'receipt_from_name' => "varchar(255)",
-          'receipt_text' => "text",
-          'footer_text' => "text",
-        ],
-        'civicrm_product' => [
-          'name' => "varchar(255)",
-          'description' => "text",
-          'options' => "text",
-        ],
-        'civicrm_membership_type' => [
-          'name' => "varchar(128)",
-          'description' => "varchar(255)",
-        ],
-        'civicrm_membership_block' => [
-          'new_title' => "varchar(255)",
-          'new_text' => "text",
-          'renewal_title' => "varchar(255)",
-          'renewal_text' => "text",
-        ],
-        'civicrm_price_set' => [
-          'title' => "varchar(255)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_dashboard' => [
-          'label' => "varchar(255)",
-        ],
-        'civicrm_uf_group' => [
-          'title' => "varchar(64)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_uf_field' => [
-          'help_post' => "text",
-          'help_pre' => "text",
-          'label' => "varchar(255)",
-        ],
-        'civicrm_price_field' => [
-          'label' => "varchar(255)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_price_field_value' => [
-          'label' => "varchar(255)",
-          'description' => "text",
-        ],
-        'civicrm_pcp_block' => [
-          'link_text' => "varchar(255)",
-        ],
-        'civicrm_event' => [
-          'title' => "varchar(255)",
-          'summary' => "text",
-          'description' => "text",
-          'registration_link_text' => "varchar(255)",
-          'event_full_text' => "text",
-          'fee_label' => "varchar(255)",
-          'intro_text' => "text",
-          'footer_text' => "text",
-          'confirm_title' => "varchar(255)",
-          'confirm_text' => "text",
-          'confirm_footer_text' => "text",
-          'confirm_email_text' => "text",
-          'confirm_from_name' => "varchar(255)",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-          'thankyou_footer_text' => "text",
-          'pay_later_text' => "text",
-          'pay_later_receipt' => "text",
-          'initial_amount_label' => "varchar(255)",
-          'initial_amount_help_text' => "text",
-          'waitlist_text' => "text",
-          'approval_req_text' => "text",
-          'template_title' => "varchar(255)",
-        ],
-      ];
-    }
-    return $result;
-  }
-
-  /**
-   * @return array
-   */
-  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;
-  }
-
-  /**
-   * @return array
-   */
-  public static function &tables() {
-    static $result = NULL;
-    if (!$result) {
-      $result = array_keys(self::columns());
-    }
-    return $result;
-  }
-
-}
diff --git a/www/modules/civicrm/CRM/Core/I18n/SchemaStructure_4_5_beta2.php b/www/modules/civicrm/CRM/Core/I18n/SchemaStructure_4_5_beta2.php
deleted file mode 100644
index 8558fddd5..000000000
--- a/www/modules/civicrm/CRM/Core/I18n/SchemaStructure_4_5_beta2.php
+++ /dev/null
@@ -1,235 +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
- *
- * Generated from schema_structure.tpl
- * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- */
-class CRM_Core_I18n_SchemaStructure_4_5_beta2 {
-
-  /**
-   * Get column definition.
-   */
-  public static function &columns() {
-    static $result = NULL;
-    if (!$result) {
-      $result = [
-        'civicrm_location_type' => [
-          'display_name' => "varchar(64)",
-        ],
-        'civicrm_option_group' => [
-          'title' => "varchar(255)",
-          'description' => "varchar(255)",
-        ],
-        'civicrm_contact_type' => [
-          'label' => "varchar(64)",
-          'description' => "text",
-        ],
-        'civicrm_batch' => [
-          'title' => "varchar(64)",
-          'description' => "text",
-        ],
-        'civicrm_premiums' => [
-          'premiums_intro_title' => "varchar(255)",
-          'premiums_intro_text' => "text",
-          'premiums_nothankyou_label' => "varchar(255)",
-        ],
-        'civicrm_membership_status' => [
-          'label' => "varchar(128)",
-        ],
-        'civicrm_survey' => [
-          'title' => "varchar(255)",
-          'instructions' => "text",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-        ],
-        'civicrm_participant_status_type' => [
-          'label' => "varchar(255)",
-        ],
-        'civicrm_case_type' => [
-          'title' => "varchar(64)",
-          'description' => "varchar(255)",
-        ],
-        'civicrm_tell_friend' => [
-          'title' => "varchar(255)",
-          'intro' => "text",
-          'suggested_message' => "text",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-        ],
-        'civicrm_custom_group' => [
-          'title' => "varchar(64)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_custom_field' => [
-          'label' => "varchar(255)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_option_value' => [
-          'label' => "varchar(255)",
-          'description' => "text",
-        ],
-        'civicrm_group' => [
-          'title' => "varchar(64)",
-        ],
-        'civicrm_contribution_page' => [
-          'title' => "varchar(255)",
-          'intro_text' => "text",
-          'pay_later_text' => "text",
-          'pay_later_receipt' => "text",
-          'initial_amount_label' => "varchar(255)",
-          'initial_amount_help_text' => "text",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-          'thankyou_footer' => "text",
-          'for_organization' => "text",
-          'receipt_from_name' => "varchar(255)",
-          'receipt_text' => "text",
-          'footer_text' => "text",
-        ],
-        'civicrm_product' => [
-          'name' => "varchar(255)",
-          'description' => "text",
-          'options' => "text",
-        ],
-        'civicrm_membership_type' => [
-          'name' => "varchar(128)",
-          'description' => "varchar(255)",
-        ],
-        'civicrm_membership_block' => [
-          'new_title' => "varchar(255)",
-          'new_text' => "text",
-          'renewal_title' => "varchar(255)",
-          'renewal_text' => "text",
-        ],
-        'civicrm_price_set' => [
-          'title' => "varchar(255)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_dashboard' => [
-          'label' => "varchar(255)",
-        ],
-        'civicrm_uf_group' => [
-          'title' => "varchar(64)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_uf_field' => [
-          'help_post' => "text",
-          'help_pre' => "text",
-          'label' => "varchar(255)",
-        ],
-        'civicrm_price_field' => [
-          'label' => "varchar(255)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_price_field_value' => [
-          'label' => "varchar(255)",
-          'description' => "text",
-        ],
-        'civicrm_pcp_block' => [
-          'link_text' => "varchar(255)",
-        ],
-        'civicrm_event' => [
-          'title' => "varchar(255)",
-          'summary' => "text",
-          'description' => "text",
-          'registration_link_text' => "varchar(255)",
-          'event_full_text' => "text",
-          'fee_label' => "varchar(255)",
-          'intro_text' => "text",
-          'footer_text' => "text",
-          'confirm_title' => "varchar(255)",
-          'confirm_text' => "text",
-          'confirm_footer_text' => "text",
-          'confirm_email_text' => "text",
-          'confirm_from_name' => "varchar(255)",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-          'thankyou_footer_text' => "text",
-          'pay_later_text' => "text",
-          'pay_later_receipt' => "text",
-          'initial_amount_label' => "varchar(255)",
-          'initial_amount_help_text' => "text",
-          'waitlist_text' => "text",
-          'approval_req_text' => "text",
-          'template_title' => "varchar(255)",
-        ],
-      ];
-    }
-    return $result;
-  }
-
-  /**
-   * Get indices.
-   *
-   * @return array
-   */
-  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.
-   *
-   * @return array
-   */
-  public static function &tables() {
-    static $result = NULL;
-    if (!$result) {
-      $result = array_keys(self::columns());
-    }
-    return $result;
-  }
-
-}
diff --git a/www/modules/civicrm/CRM/Core/I18n/SchemaStructure_4_7_alpha1.php b/www/modules/civicrm/CRM/Core/I18n/SchemaStructure_4_7_alpha1.php
deleted file mode 100644
index dba47c734..000000000
--- a/www/modules/civicrm/CRM/Core/I18n/SchemaStructure_4_7_alpha1.php
+++ /dev/null
@@ -1,239 +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
- *
- * Generated from schema_structure.tpl
- * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- */
-class CRM_Core_I18n_SchemaStructure_4_7_alpha1 {
-
-  /**
-   * Get column definition.
-   */
-  public static function &columns() {
-    static $result = NULL;
-    if (!$result) {
-      $result = [
-        'civicrm_location_type' => [
-          'display_name' => "varchar(64)",
-        ],
-        'civicrm_option_group' => [
-          'title' => "varchar(255)",
-          'description' => "varchar(255)",
-        ],
-        'civicrm_contact_type' => [
-          'label' => "varchar(64)",
-          'description' => "text",
-        ],
-        'civicrm_batch' => [
-          'title' => "varchar(64)",
-          'description' => "text",
-        ],
-        'civicrm_premiums' => [
-          'premiums_intro_title' => "varchar(255)",
-          'premiums_intro_text' => "text",
-          'premiums_nothankyou_label' => "varchar(255)",
-        ],
-        'civicrm_membership_status' => [
-          'label' => "varchar(128)",
-        ],
-        'civicrm_survey' => [
-          'title' => "varchar(255)",
-          'instructions' => "text",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-        ],
-        'civicrm_participant_status_type' => [
-          'label' => "varchar(255)",
-        ],
-        'civicrm_case_type' => [
-          'title' => "varchar(64)",
-          'description' => "varchar(255)",
-        ],
-        'civicrm_tell_friend' => [
-          'title' => "varchar(255)",
-          'intro' => "text",
-          'suggested_message' => "text",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-        ],
-        'civicrm_custom_group' => [
-          'title' => "varchar(64)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_custom_field' => [
-          'label' => "varchar(255)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_option_value' => [
-          'label' => "varchar(255)",
-          'description' => "text",
-        ],
-        'civicrm_group' => [
-          'title' => "varchar(64)",
-        ],
-        'civicrm_contribution_page' => [
-          'title' => "varchar(255)",
-          'intro_text' => "text",
-          'pay_later_text' => "text",
-          'pay_later_receipt' => "text",
-          'initial_amount_label' => "varchar(255)",
-          'initial_amount_help_text' => "text",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-          'thankyou_footer' => "text",
-          'receipt_from_name' => "varchar(255)",
-          'receipt_text' => "text",
-          'footer_text' => "text",
-        ],
-        'civicrm_product' => [
-          'name' => "varchar(255)",
-          'description' => "text",
-          'options' => "text",
-        ],
-        'civicrm_membership_type' => [
-          'name' => "varchar(128)",
-          'description' => "varchar(255)",
-        ],
-        'civicrm_membership_block' => [
-          'new_title' => "varchar(255)",
-          'new_text' => "text",
-          'renewal_title' => "varchar(255)",
-          'renewal_text' => "text",
-        ],
-        'civicrm_price_set' => [
-          'title' => "varchar(255)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_dashboard' => [
-          'label' => "varchar(255)",
-        ],
-        'civicrm_uf_group' => [
-          'title' => "varchar(64)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_uf_field' => [
-          'help_post' => "text",
-          'help_pre' => "text",
-          'label' => "varchar(255)",
-        ],
-        'civicrm_price_field' => [
-          'label' => "varchar(255)",
-          'help_pre' => "text",
-          'help_post' => "text",
-        ],
-        'civicrm_price_field_value' => [
-          'label' => "varchar(255)",
-          'description' => "text",
-        ],
-        'civicrm_pcp_block' => [
-          'link_text' => "varchar(255)",
-        ],
-        'civicrm_event' => [
-          'title' => "varchar(255)",
-          'summary' => "text",
-          'description' => "text",
-          'registration_link_text' => "varchar(255)",
-          'event_full_text' => "text",
-          'fee_label' => "varchar(255)",
-          'intro_text' => "text",
-          'footer_text' => "text",
-          'confirm_title' => "varchar(255)",
-          'confirm_text' => "text",
-          'confirm_footer_text' => "text",
-          'confirm_email_text' => "text",
-          'confirm_from_name' => "varchar(255)",
-          'thankyou_title' => "varchar(255)",
-          'thankyou_text' => "text",
-          'thankyou_footer_text' => "text",
-          'pay_later_text' => "text",
-          'pay_later_receipt' => "text",
-          'initial_amount_label' => "varchar(255)",
-          'initial_amount_help_text' => "text",
-          'waitlist_text' => "text",
-          'approval_req_text' => "text",
-          'template_title' => "varchar(255)",
-        ],
-        'civicrm_relationship_type' => [
-          'label_a_b' => "varchar(64)",
-          'label_b_a' => "varchar(64)",
-          'description' => "varchar(255)",
-        ],
-      ];
-    }
-    return $result;
-  }
-
-  /**
-   * Get indices.
-   *
-   * @return array
-   */
-  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.
-   *
-   * @return array
-   */
-  public static function &tables() {
-    static $result = NULL;
-    if (!$result) {
-      $result = array_keys(self::columns());
-    }
-    return $result;
-  }
-
-}
diff --git a/www/modules/civicrm/CRM/Core/IDS.php b/www/modules/civicrm/CRM/Core/IDS.php
index ebdcda430..8c5cbd4cf 100644
--- a/www/modules/civicrm/CRM/Core/IDS.php
+++ b/www/modules/civicrm/CRM/Core/IDS.php
@@ -237,7 +237,7 @@ private function log($result, $reaction = 0) {
 
     $data = [];
     $session = CRM_Core_Session::singleton();
-    $session_id = CRM_Core_Config::singleton()->userSystem->getSessionId() ? CRM_Core_Config::singleton()->userSystem->getSessionId() : '0';
+    $session_id = CRM_Core_Config::singleton()->userSystem->getSessionId() ?: '0';
     foreach ($result as $event) {
       $data[] = [
         'name' => $event->getName(),
diff --git a/www/modules/civicrm/CRM/Core/Invoke.php b/www/modules/civicrm/CRM/Core/Invoke.php
index b2a3e7555..2a1deac9b 100644
--- a/www/modules/civicrm/CRM/Core/Invoke.php
+++ b/www/modules/civicrm/CRM/Core/Invoke.php
@@ -120,15 +120,16 @@ public static function init($args) {
     $config = CRM_Core_Config::singleton();
 
     // also initialize the i18n framework
-    require_once 'CRM/Core/I18n.php';
     $i18n = CRM_Core_I18n::singleton();
   }
 
   /**
    * Determine which menu $item corresponds to $args
    *
-   * @param array $args
-   *   List of path parts.
+   * @param string|string[] $args
+   *   Path to lookup
+   *   Ex: 'civicrm/foo/bar'
+   *   Ex: ['civicrm', 'foo', 'bar']
    * @return array; see CRM_Core_Menu
    */
   public static function getItem($args) {
@@ -198,7 +199,9 @@ private static function registerPharHandler() {
    *
    * @param array $item
    *   See CRM_Core_Menu.
+   *
    * @return string, HTML
+   * @throws \CRM_Core_Exception
    */
   public static function runItem($item) {
     $ids = new CRM_Core_IDS();
@@ -229,6 +232,7 @@ public static function runItem($item) {
     // jsortable.tpl (datatables)
     $template->assign('sourceUrl');
     $template->assign('useAjax', 0);
+    $template->assign('defaultOrderByDirection', 'asc');
 
     if ($item) {
 
@@ -314,7 +318,14 @@ public static function runItem($item) {
             $addSequence = $addSequence ? 'true' : 'false';
             unset($pageArgs['addSequence']);
           }
-          $object = new $item['page_callback']($title, TRUE, $mode, NULL, $addSequence);
+          if ($item['page_callback'] === 'CRM_Import_Controller') {
+            // Let the generic import controller have the page arguments.... so we don't need
+            // one class per import.
+            $object = new CRM_Import_Controller($title, $pageArgs ?? []);
+          }
+          else {
+            $object = new $item['page_callback']($title, TRUE, $mode, NULL, $addSequence);
+          }
         }
         else {
           throw new CRM_Core_Exception('Execute supplied menu action');
diff --git a/www/modules/civicrm/CRM/Core/JobManager.php b/www/modules/civicrm/CRM/Core/JobManager.php
index 28049bb8e..1b430c69d 100644
--- a/www/modules/civicrm/CRM/Core/JobManager.php
+++ b/www/modules/civicrm/CRM/Core/JobManager.php
@@ -32,8 +32,18 @@ class CRM_Core_JobManager {
    */
   public $currentJob = NULL;
 
+  /**
+   * @var array
+   *
+   * @fixme How are these set? What do they do?
+   */
   public $singleRunParams = [];
 
+  /**
+   * @var string|null
+   *
+   * @fixme Looks like this is only used by "singleRun"
+   */
   public $_source = NULL;
 
   /**
@@ -124,7 +134,7 @@ public function executeJob($job) {
     try {
       $result = civicrm_api($job->api_entity, $job->api_action, $params);
     }
-    catch (Exception$e) {
+    catch (Exception $e) {
       $this->logEntry('Error while executing ' . $job->name . ': ' . $e->getMessage());
       $result = $e;
     }
@@ -132,6 +142,9 @@ public function executeJob($job) {
     $this->logEntry('Finished execution of ' . $job->name . ' with result: ' . $this->apiResultToMessage($result));
     $this->currentJob = FALSE;
 
+    // Save the job last run end date (if this doesn't get written we know the job crashed and was not caught (eg. OOM).
+    $job->saveLastRunEnd();
+
     //Disable outBound option after executing the job.
     $environment = CRM_Core_Config::environment(NULL, TRUE);
     if ($environment != 'Production' && !empty($job->apiParams['runInNonProductionEnvironment'])) {
@@ -191,7 +204,7 @@ private function getJob($id = NULL, $entity = NULL, $action = NULL) {
    * @param $entity
    * @param $job
    * @param array $params
-   * @param null $source
+   * @param string|null $source
    */
   public function setSingleRunParams($entity, $job, $params, $source = NULL) {
     $this->_source = $source;
diff --git a/www/modules/civicrm/CRM/Core/Joomla.php b/www/modules/civicrm/CRM/Core/Joomla.php
index 964cf72e8..706d8c46e 100644
--- a/www/modules/civicrm/CRM/Core/Joomla.php
+++ b/www/modules/civicrm/CRM/Core/Joomla.php
@@ -52,9 +52,9 @@ public static function sidebarLeft() {
     }
 
     $template = CRM_Core_Smarty::singleton();
-    $template->assign_by_ref('blocks', $blocks);
+    $template->assign('blocks', $blocks);
     $sidebarLeft = $template->fetch('CRM/Block/blocks.tpl');
-    $template->assign_by_ref('sidebarLeft', $sidebarLeft);
+    $template->assign('sidebarLeft', $sidebarLeft);
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Core/Page.php b/www/modules/civicrm/CRM/Core/Page.php
index a9211bb52..254beee79 100644
--- a/www/modules/civicrm/CRM/Core/Page.php
+++ b/www/modules/civicrm/CRM/Core/Page.php
@@ -323,9 +323,12 @@ public function assign($var, $value = NULL) {
    * @param string $var
    * @param mixed $value
    *   (reference) value of variable.
+   *
+   * @deprecated since 5.72 will be removed around 5.84
    */
   public function assign_by_ref($var, &$value) {
-    self::$_template->assign_by_ref($var, $value);
+    CRM_Core_Error::deprecatedFunctionWarning('assign');
+    self::$_template->assign($var, $value);
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Core/Payment.php b/www/modules/civicrm/CRM/Core/Payment.php
index bc9a08b14..e824fffdf 100644
--- a/www/modules/civicrm/CRM/Core/Payment.php
+++ b/www/modules/civicrm/CRM/Core/Payment.php
@@ -9,6 +9,7 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\Participant;
 use Civi\Payment\System;
 use Civi\Payment\Exception\PaymentProcessorException;
 use Civi\Payment\PropertyBag;
@@ -589,7 +590,13 @@ public function getText($context, $params) {
         return '';
 
       case 'contributionPageContinueText':
-        return ts('Click the <strong>Continue</strong> button to proceed with the payment.');
+        if ($params['amount'] <= 0.0 || (int) $this->_paymentProcessor['billing_mode'] === 4) {
+          return ts('Click the <strong>Continue</strong> button to proceed with the payment.');
+        }
+        if ($params['is_payment_to_existing']) {
+          return ts('Click the <strong>Make Payment</strong> button to proceed with the payment.');
+        }
+        return ts('Click the <strong>Make Contribution</strong> button to proceed with the payment.');
 
       case 'contributionPageConfirmText':
         if ($params['amount'] <= 0.0) {
@@ -1234,9 +1241,15 @@ public function getCancelUrl($qfKey, $participantID = NULL) {
     }
 
     if ($this->_component == 'event') {
+      $eventID = NULL;
+      if ($participantID) {
+        $eventID = Participant::get(FALSE)->addWhere('id', '=', $participantID)
+          ->addSelect('event_id')->execute()->single()['event_id'];
+      }
       return CRM_Utils_System::url($this->getBaseReturnUrl(), [
         'reset' => 1,
         'cc' => 'fail',
+        'id' => $eventID,
         'participantId' => $participantID,
       ],
         TRUE, NULL, FALSE
diff --git a/www/modules/civicrm/CRM/Core/Payment/Form.php b/www/modules/civicrm/CRM/Core/Payment/Form.php
index bd91dc70c..e47ba6597 100644
--- a/www/modules/civicrm/CRM/Core/Payment/Form.php
+++ b/www/modules/civicrm/CRM/Core/Payment/Form.php
@@ -209,7 +209,7 @@ public static function getPaymentTypeLabel($paymentProcessor) {
    */
   public static function buildPaymentForm(&$form, $processor, $billing_profile_id, $isBackOffice, $paymentInstrumentID = NULL) {
     //if the form has address fields assign to the template so the js can decide what billing fields to show
-    $form->assign('profileAddressFields', $form->get('profileAddressFields') ?? NULL);
+    $form->assign('profileAddressFields', $form->get('profileAddressFields'));
     $form->addExpectedSmartyVariable('suppressSubmitButton');
     if (!empty($processor['object']) && $processor['object']->buildForm($form)) {
       return;
@@ -313,7 +313,7 @@ public static function validateCreditCard($values, &$errors, $processorID = NULL
   /**
    * Map address fields.
    *
-   * @param int $id unused
+   * @param null $id unused
    * @param array $src
    * @param array $dst
    * @param bool $reverse
diff --git a/www/modules/civicrm/CRM/Core/Payment/PayPalImpl.php b/www/modules/civicrm/CRM/Core/Payment/PayPalImpl.php
index b9fb59828..f7db89690 100644
--- a/www/modules/civicrm/CRM/Core/Payment/PayPalImpl.php
+++ b/www/modules/civicrm/CRM/Core/Payment/PayPalImpl.php
@@ -1124,7 +1124,7 @@ public static function deformat($str) {
       $keyPos = strpos($str, '=');
 
       // position of value
-      $valPos = strpos($str, '&') ? strpos($str, '&') : strlen($str);
+      $valPos = strpos($str, '&') ?: strlen($str);
 
       /*getting the Key and Value values and storing in a Associative Array*/
 
diff --git a/www/modules/civicrm/CRM/Core/Payment/ProcessorForm.php b/www/modules/civicrm/CRM/Core/Payment/ProcessorForm.php
index 257125e1d..43744d169 100644
--- a/www/modules/civicrm/CRM/Core/Payment/ProcessorForm.php
+++ b/www/modules/civicrm/CRM/Core/Payment/ProcessorForm.php
@@ -88,7 +88,7 @@ public static function preProcess($form) {
       $form->paymentInstrumentID
     );
 
-    $form->assign_by_ref('paymentProcessor', $form->_paymentProcessor);
+    $form->assign('paymentProcessor', $form->_paymentProcessor);
 
     // check if this is a paypal auto return and redirect accordingly
     //@todo - determine if this is legacy and remove
@@ -122,13 +122,13 @@ public static function preProcess($form) {
   /**
    * Build the payment processor form.
    *
-   * @param CRM_Core_Form $form
+   * @param \CRM_Event_Form_Registration_Register|\CRM_Contribute_Form_Contribution_Main|CRM_Event_Form_Registration_Confirm|CRM_Financial_Form_Payment $form
    */
-  public static function buildQuickForm(&$form) {
+  public static function buildQuickForm($form): void {
     //@todo document why this addHidden is here
     //CRM-15743 - we should not set/create hidden element for pay later
     // because payment processor is not selected
-    $processorId = $form->getVar('_paymentProcessorID');
+    $processorId = $form->getPaymentProcessorID();
     $billing_profile_id = CRM_Utils_Request::retrieve('billing_profile_id', 'String');
     if (!empty($form->_values) && !empty($form->_values['is_billing_required'])) {
       $billing_profile_id = 'billing';
diff --git a/www/modules/civicrm/CRM/Core/Permission.php b/www/modules/civicrm/CRM/Core/Permission.php
index b37cf4c3e..cbc50c68b 100644
--- a/www/modules/civicrm/CRM/Core/Permission.php
+++ b/www/modules/civicrm/CRM/Core/Permission.php
@@ -128,8 +128,7 @@ public static function check($permissions, $contactId = NULL) {
       }
       else {
         // This is an individual permission
-        $impliedPermissions = self::getImpliedPermissionsFor($permission);
-        $impliedPermissions[] = $permission;
+        $impliedPermissions = self::getImpliedBy($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)
@@ -249,8 +248,9 @@ public static function customGroupAdmin($userId = NULL) {
    * @return int[]
    */
   public static function customGroup($type = CRM_Core_Permission::VIEW, $reset = FALSE, $userId = NULL) {
-    $customGroups = CRM_Core_PseudoConstant::get('CRM_Core_DAO_CustomField', 'custom_group_id',
-      ['fresh' => $reset]);
+    $customGroups = CRM_Core_BAO_CustomGroup::getAll();
+    // Hook expects a flat array of [id => name]
+    $customGroups = array_combine(array_keys($customGroups), array_column($customGroups, 'name'));
 
     // Administrators and users with 'access all custom data' can see all custom groups.
     if (self::customGroupAdmin($userId)) {
@@ -563,41 +563,68 @@ public static function checkMenuItem(&$item) {
   }
 
   /**
-   * @param bool $all
-   *   Include disabled components
-   * @param bool $descriptions
-   *   Whether to return descriptions
+   * @param bool $includeDisabled
+   *   Include permissions from disabled components/settings.
+   * @param bool $returnAssociative
+   *   If true, returns arrays with keys: [label, description, disabled, implies, implied_by].
+   *   If false, returns strings (label only).
    *
+   * @return array[]|string[]
+   * @throws RuntimeException
+   */
+  public static function basicPermissions($includeDisabled = FALSE, $returnAssociative = FALSE): array {
+    $permissions = Civi::$statics[__CLASS__][__FUNCTION__] ??= self::assembleBasicPermissions();
+    if (!$includeDisabled) {
+      $permissions = array_filter($permissions, fn($permission) => empty($permission['disabled']));
+    }
+    if ($returnAssociative) {
+      return $permissions;
+    }
+    return array_combine(array_keys($permissions), array_column($permissions, 'label'));
+  }
+
+  /**
    * @return array
+   * @throws RuntimeException
    */
-  public static function basicPermissions($all = FALSE, $descriptions = FALSE) {
-    $cacheKey = implode('-', [$all, $descriptions]);
-    if (empty(Civi::$statics[__CLASS__][__FUNCTION__][$cacheKey])) {
-      Civi::$statics[__CLASS__][__FUNCTION__][$cacheKey] = self::assembleBasicPermissions($all, $descriptions);
+  protected static function assembleBasicPermissions(): array {
+    $permissions = self::getCoreAndComponentPermissions();
+    $module_permissions = CRM_Core_Config::singleton()->userPermissionClass->getAllModulePermissions();
+    $allPermissions = array_merge($permissions, $module_permissions);
+    // Propagate implied_by permissions to their parents
+    foreach ($allPermissions as $name => $permission) {
+      foreach ($permission['implied_by'] ?? [] as $parent) {
+        if (isset($allPermissions[$parent])) {
+          $allPermissions[$parent]['implies'][] = $name;
+        }
+      }
     }
-    return Civi::$statics[__CLASS__][__FUNCTION__][$cacheKey];
+    // Propagate implied permissions to their children
+    foreach ($allPermissions as $name => $permission) {
+      if (!empty($permission['implies'])) {
+        self::setImpliedBy([$name], $permission['implies'], $allPermissions);
+      }
+    }
+    return $allPermissions;
   }
 
   /**
-   * @param bool $all
-   * @param bool $descriptions
-   *   whether to return descriptions
+   * Recursively sets the 'implied_by' value for every sub-permission,
+   * based on the 'implies' declaration in meta-permissions.
    *
-   * @return array
-   * @throws \CRM_Core_Exception
+   * @param array $metaPermissions
+   * @param array $subPermissions
+   * @param array $allPermissions
    */
-  public static function assembleBasicPermissions($all = FALSE, $descriptions = FALSE): array {
-    $permissions = self::getCoreAndComponentPermissions($all);
-
-    // Add any permissions defined in hook_civicrm_permission implementations.
-    $module_permissions = CRM_Core_Config::singleton()->userPermissionClass->getAllModulePermissions(TRUE);
-    $permissions = array_merge($permissions, $module_permissions);
-    if (!$descriptions) {
-      foreach ($permissions as $name => $attr) {
-        $permissions[$name] = array_shift($attr);
+  protected static function setImpliedBy(array $metaPermissions, array $subPermissions, array &$allPermissions): void {
+    foreach ($subPermissions as $name) {
+      if (isset($allPermissions[$name])) {
+        $allPermissions[$name]['implied_by'] = array_unique(array_merge($allPermissions[$name]['implied_by'] ?? [], $metaPermissions));
+        if (!empty($allPermissions[$name]['implies'])) {
+          self::setImpliedBy(array_merge([$name], $metaPermissions), $allPermissions[$name]['implies'], $allPermissions);
+        }
       }
     }
-    return $permissions;
   }
 
   /**
@@ -638,256 +665,306 @@ public static function getCorePermissions() {
     $prefix = ts('CiviCRM') . ': ';
     $permissions = [
       'add contacts' => [
-        $prefix . ts('add contacts'),
-        ts('Create a new contact record in CiviCRM'),
+        'label' => $prefix . ts('add contacts'),
+        'description' => ts('Create a new contact record in CiviCRM'),
       ],
       'view all contacts' => [
-        $prefix . ts('view all contacts'),
-        ts('View ANY CONTACT in the CiviCRM database, export contact info and perform activities such as Send Email, Phone Call, etc.'),
+        'label' => $prefix . ts('view all contacts'),
+        'description' => ts('View ANY CONTACT in the CiviCRM database, export contact info and perform activities such as Send Email, Phone Call, etc.'),
+        'implies' => [
+          'view my contact',
+        ],
       ],
       'edit all contacts' => [
-        $prefix . ts('edit all contacts'),
-        ts('View, Edit and Delete ANY CONTACT in the CiviCRM database; Create and edit relationships, tags and other info about the contacts'),
+        'label' => $prefix . ts('edit all contacts'),
+        'description' => ts('View, Edit and Delete ANY CONTACT in the CiviCRM database; Create and edit relationships, tags and other info about the contacts'),
+        'implies' => [
+          'view all contacts',
+          'edit my contact',
+        ],
       ],
       'view my contact' => [
-        $prefix . ts('view my contact'),
+        'label' => $prefix . ts('view my contact'),
       ],
       'edit my contact' => [
-        $prefix . ts('edit my contact'),
+        'label' => $prefix . ts('edit my contact'),
       ],
       'delete contacts' => [
-        $prefix . ts('delete contacts'),
+        'label' => $prefix . ts('delete contacts'),
       ],
       'access deleted contacts' => [
-        $prefix . ts('access deleted contacts'),
-        ts('Access contacts in the trash'),
+        'label' => $prefix . ts('access deleted contacts'),
+        'description' => ts('Access contacts in the trash'),
       ],
       'import contacts' => [
-        $prefix . ts('import contacts'),
-        ts('Import contacts and activities'),
+        'label' => $prefix . ts('import contacts'),
+        'description' => ts('Import contacts and activities'),
       ],
       'import SQL datasource' => [
-        $prefix . ts('import SQL datasource'),
-        ts('When importing, consume data directly from a SQL datasource'),
+        'label' => $prefix . ts('import SQL datasource'),
+        'description' => ts('When importing, consume data directly from a SQL datasource'),
       ],
       'edit groups' => [
-        $prefix . ts('edit groups'),
-        ts('Create new groups, edit group settings (e.g. group name, visibility...), delete groups'),
+        'label' => $prefix . ts('edit groups'),
+        'description' => ts('Create new groups, edit group settings (e.g. group name, visibility...), delete groups'),
       ],
       'administer CiviCRM' => [
-        $prefix . ts('administer CiviCRM'),
-        ts('Perform all tasks in the Administer CiviCRM control panel and Import Contacts'),
+        'label' => $prefix . ts('administer CiviCRM'),
+        'description' => ts('Perform all tasks in the Administer CiviCRM control panel and Import Contacts'),
+        'implies' => [
+          'administer CiviCRM system',
+          'administer CiviCRM data',
+          'access CiviCRM',
+        ],
       ],
       'skip IDS check' => [
-        $prefix . ts('skip IDS check'),
-        ts('Warning: Give to trusted roles only; this permission has security implications. IDS system is bypassed for users with this permission. Prevents false errors for admin users.'),
+        'label' => $prefix . ts('skip IDS check'),
+        'description' => ts('Warning: Give to trusted roles only; this permission has security implications. IDS system is bypassed for users with this permission. Prevents false errors for admin users.'),
       ],
       'access uploaded files' => [
-        $prefix . ts('access uploaded files'),
-        ts('View / download files including images and photos'),
+        'label' => $prefix . ts('access uploaded files'),
+        'description' => ts('View / download files including images and photos'),
       ],
       'profile listings and forms' => [
-        $prefix . ts('profile listings and forms'),
-        ts('Warning: Give to trusted roles only; this permission has privacy implications. Add/edit data in online forms and access public searchable directories.'),
+        'label' => $prefix . ts('profile listings and forms'),
+        'description' => ts('Warning: Give to trusted roles only; this permission has privacy implications. Add/edit data in online forms and access public searchable directories.'),
+        'implies' => [
+          'profile listings',
+        ],
       ],
       'profile listings' => [
-        $prefix . ts('profile listings'),
-        ts('Warning: Give to trusted roles only; this permission has privacy implications. Access public searchable directories.'),
+        'label' => $prefix . ts('profile listings'),
+        'description' => ts('Warning: Give to trusted roles only; this permission has privacy implications. Access public searchable directories.'),
       ],
       'profile create' => [
-        $prefix . ts('profile create'),
-        ts('Add data in a profile form.'),
+        'label' => $prefix . ts('profile create'),
+        'description' => ts('Add data in a profile form.'),
       ],
       'profile edit' => [
-        $prefix . ts('profile edit'),
-        ts('Edit data in a profile form.'),
+        'label' => $prefix . ts('profile edit'),
+        'description' => ts('Edit data in a profile form.'),
       ],
       'profile view' => [
-        $prefix . ts('profile view'),
-        ts('View data in a profile.'),
+        'label' => $prefix . ts('profile view'),
+        'description' => ts('View data in a profile.'),
       ],
       'access all custom data' => [
-        $prefix . ts('access all custom data'),
-        ts('View all custom fields regardless of ACL rules'),
+        'label' => $prefix . ts('access all custom data'),
+        'description' => ts('View all custom fields regardless of ACL rules'),
       ],
       'view all activities' => [
-        $prefix . ts('view all activities'),
-        ts('View all activities (for visible contacts)'),
+        'label' => $prefix . ts('view all activities'),
+        'description' => ts('View all activities (for visible contacts)'),
       ],
       'delete activities' => [
-        $prefix . ts('Delete activities'),
+        'label' => $prefix . ts('Delete activities'),
       ],
       'edit inbound email basic information' => [
-        $prefix . ts('edit inbound email basic information'),
-        ts('Edit all inbound email activities (for visible contacts) basic information. Content editing not allowed.'),
+        'label' => $prefix . ts('edit inbound email basic information'),
+        'description' => ts('Edit all inbound email activities (for visible contacts) basic information. Content editing not allowed.'),
       ],
       'edit inbound email basic information and content' => [
-        $prefix . ts('edit inbound email basic information and content'),
-        ts('Edit all inbound email activities (for visible contacts) basic information and content.'),
+        'label' => $prefix . ts('edit inbound email basic information and content'),
+        'description' => ts('Edit all inbound email activities (for visible contacts) basic information and content.'),
       ],
       'access CiviCRM' => [
-        $prefix . ts('access CiviCRM backend and API'),
-        ts('Master control for access to the main CiviCRM backend and API. Give to trusted roles only.'),
+        'label' => $prefix . ts('access CiviCRM backend and API'),
+        'description' => ts('Master control for access to the main CiviCRM backend and API. Give to trusted roles only.'),
       ],
       'access Contact Dashboard' => [
-        $prefix . ts('access Contact Dashboard'),
-        ts('View Contact Dashboard (for themselves and visible contacts)'),
+        'label' => $prefix . ts('access Contact Dashboard'),
+        'description' => ts('View Contact Dashboard (for themselves and visible contacts)'),
       ],
       'translate CiviCRM' => [
-        $prefix . ts('translate CiviCRM'),
-        ts('Allow User to enable multilingual'),
+        'label' => $prefix . ts('translate CiviCRM'),
+        'description' => ts('Allow User to enable multilingual'),
       ],
       'manage tags' => [
-        $prefix . ts('manage tags'),
-        ts('Create and rename tags'),
+        'label' => $prefix . ts('manage tags'),
+        'description' => ts('Create and rename tags'),
       ],
       'administer reserved groups' => [
-        $prefix . ts('administer reserved groups'),
-        ts('Edit and disable Reserved Groups (Needs Edit Groups)'),
+        'label' => $prefix . ts('administer reserved groups'),
+        'description' => ts('Edit and disable Reserved Groups (Needs Edit Groups)'),
       ],
       'administer Tagsets' => [
-        $prefix . ts('administer Tagsets'),
+        'label' => $prefix . ts('administer Tagsets'),
       ],
       'administer reserved tags' => [
-        $prefix . ts('administer reserved tags'),
+        'label' => $prefix . ts('administer reserved tags'),
       ],
       'administer queues' => [
-        $prefix . ts('administer queues'),
-        ts('Initialize, browse, and cancel background processing queues'),
+        'label' => $prefix . ts('administer queues'),
+        'description' => ts('Initialize, browse, and cancel background processing queues'),
         // At time of writing, we have specifically omitted the ability to edit fine-grained
         // data about specific queue-tasks. Tasks are usually defined as PHP callables...
         // and one should hesitate before allowing open-ended edits of PHP callables.
         // However, it seems fine for web-admins to browse and cancel these things.
       ],
       'administer dedupe rules' => [
-        $prefix . ts('administer dedupe rules'),
-        ts('Create and edit rules, change the supervised and unsupervised rules'),
+        'label' => $prefix . ts('administer dedupe rules'),
+        'description' => ts('Create and edit rules, change the supervised and unsupervised rules'),
       ],
       'merge duplicate contacts' => [
-        $prefix . ts('merge duplicate contacts'),
-        ts('Delete Contacts must also be granted in order for this to work.'),
+        'label' => $prefix . ts('merge duplicate contacts'),
+        'description' => ts('Delete Contacts must also be granted in order for this to work.'),
       ],
       'force merge duplicate contacts' => [
-        $prefix . ts('force merge duplicate contacts'),
-        ts('Delete Contacts must also be granted in order for this to work.'),
+        'label' => $prefix . ts('force merge duplicate contacts'),
+        'description' => ts('Delete Contacts must also be granted in order for this to work.'),
       ],
       'view debug output' => [
-        $prefix . ts('view debug output'),
-        ts('View results of debug and backtrace'),
+        'label' => $prefix . ts('view debug output'),
+        'description' => ts('View results of debug and backtrace'),
       ],
 
       'view all notes' => [
-        $prefix . ts('view all notes'),
-        ts("View notes (for visible contacts) even if they're marked author only"),
+        'label' => $prefix . ts('view all notes'),
+        'description' => ts("View notes (for visible contacts) even if they're marked author only"),
       ],
       'add contact notes' => [
-        $prefix . ts('add contact notes'),
-        ts("Create notes for contacts"),
+        'label' => $prefix . ts('add contact notes'),
+        'description' => ts("Create notes for contacts"),
       ],
       'access AJAX API' => [
-        $prefix . ts('access AJAX API'),
-        ts('Allow API access even if Access CiviCRM is not granted'),
+        'label' => $prefix . ts('access AJAX API'),
+        'description' => ts('Allow API access even if Access CiviCRM is not granted'),
       ],
       'access contact reference fields' => [
-        $prefix . ts('access contact reference fields'),
-        ts('Allow entering data into contact reference fields'),
+        'label' => $prefix . ts('access contact reference fields'),
+        'description' => ts('Allow entering data into contact reference fields'),
       ],
       'create manual batch' => [
-        $prefix . ts('create manual batch'),
-        ts('Create an accounting batch (with Access to CiviContribute and View Own/All Manual Batches)'),
+        'label' => $prefix . ts('create manual batch'),
+        'description' => ts('Create an accounting batch (with Access to CiviContribute and View Own/All Manual Batches)'),
       ],
       'edit own manual batches' => [
-        $prefix . ts('edit own manual batches'),
-        ts('Edit accounting batches created by user'),
+        'label' => $prefix . ts('edit own manual batches'),
+        'description' => ts('Edit accounting batches created by user'),
       ],
       'edit all manual batches' => [
-        $prefix . ts('edit all manual batches'),
-        ts('Edit all accounting batches'),
+        'label' => $prefix . ts('edit all manual batches'),
+        'description' => ts('Edit all accounting batches'),
+        'implies' => [
+          'view all manual batches',
+          'edit own manual batches',
+        ],
       ],
       'close own manual batches' => [
-        $prefix . ts('close own manual batches'),
-        ts('Close accounting batches created by user (with Access to CiviContribute)'),
+        'label' => $prefix . ts('close own manual batches'),
+        'description' => ts('Close accounting batches created by user (with Access to CiviContribute)'),
       ],
       'close all manual batches' => [
-        $prefix . ts('close all manual batches'),
-        ts('Close all accounting batches (with Access to CiviContribute)'),
+        'label' => $prefix . ts('close all manual batches'),
+        'description' => ts('Close all accounting batches (with Access to CiviContribute)'),
+        'implies' => [
+          'close own manual batches',
+        ],
       ],
       'reopen own manual batches' => [
-        $prefix . ts('reopen own manual batches'),
-        ts('Reopen accounting batches created by user (with Access to CiviContribute)'),
+        'label' => $prefix . ts('reopen own manual batches'),
+        'description' => ts('Reopen accounting batches created by user (with Access to CiviContribute)'),
       ],
       'reopen all manual batches' => [
-        $prefix . ts('reopen all manual batches'),
-        ts('Reopen all accounting batches (with Access to CiviContribute)'),
+        'label' => $prefix . ts('reopen all manual batches'),
+        'description' => ts('Reopen all accounting batches (with Access to CiviContribute)'),
+        'implies' => [
+          'reopen own manual batches',
+        ],
       ],
       'view own manual batches' => [
-        $prefix . ts('view own manual batches'),
-        ts('View accounting batches created by user (with Access to CiviContribute)'),
+        'label' => $prefix . ts('view own manual batches'),
+        'description' => ts('View accounting batches created by user (with Access to CiviContribute)'),
       ],
       'view all manual batches' => [
-        $prefix . ts('view all manual batches'),
-        ts('View all accounting batches (with Access to CiviContribute)'),
+        'label' => $prefix . ts('view all manual batches'),
+        'description' => ts('View all accounting batches (with Access to CiviContribute)'),
+        'implies' => [
+          'view own manual batches',
+        ],
       ],
       'delete own manual batches' => [
-        $prefix . ts('delete own manual batches'),
-        ts('Delete accounting batches created by user'),
+        'label' => $prefix . ts('delete own manual batches'),
+        'description' => ts('Delete accounting batches created by user'),
       ],
       'delete all manual batches' => [
-        $prefix . ts('delete all manual batches'),
-        ts('Delete all accounting batches'),
+        'label' => $prefix . ts('delete all manual batches'),
+        'description' => ts('Delete all accounting batches'),
+        'implies' => [
+          'delete own manual batches',
+        ],
       ],
       'export own manual batches' => [
-        $prefix . ts('export own manual batches'),
-        ts('Export accounting batches created by user'),
+        'label' => $prefix . ts('export own manual batches'),
+        'description' => ts('Export accounting batches created by user'),
       ],
       'export all manual batches' => [
-        $prefix . ts('export all manual batches'),
-        ts('Export all accounting batches'),
+        'label' => $prefix . ts('export all manual batches'),
+        'description' => ts('Export all accounting batches'),
+        'implies' => [
+          'export own manual batches',
+        ],
       ],
       'administer payment processors' => [
-        $prefix . ts('administer payment processors'),
-        ts('Add, Update, or Disable Payment Processors'),
+        'label' => $prefix . ts('administer payment processors'),
+        'description' => ts('Add, Update, or Disable Payment Processors'),
       ],
       'render templates' => [
-        $prefix . ts('render templates'),
-        ts('Render open-ended template content. (Additional constraints may apply to autoloaded records and specific notations.)'),
+        'label' => $prefix . ts('render templates'),
+        'description' => ts('Render open-ended template content. (Additional constraints may apply to autoloaded records and specific notations.)'),
       ],
       'edit message templates' => [
-        $prefix . ts('edit message templates'),
+        'label' => $prefix . ts('edit message templates'),
       ],
       'edit system workflow message templates' => [
-        $prefix . ts('edit system workflow message templates'),
+        'label' => $prefix . ts('edit system workflow message templates'),
       ],
       'edit user-driven message templates' => [
-        $prefix . ts('edit user-driven message templates'),
+        'label' => $prefix . ts('edit user-driven message templates'),
       ],
       'view my invoices' => [
-        $prefix . ts('view my invoices'),
-        ts('Allow users to view/ download their own invoices'),
+        'label' => $prefix . ts('view my invoices'),
+        'description' => ts('Allow users to view/ download their own invoices'),
       ],
       'edit api keys' => [
-        $prefix . ts('edit api keys'),
-        ts('Edit API keys'),
+        'label' => $prefix . ts('edit api keys'),
+        'description' => ts('Edit API keys'),
+        'implies' => [
+          'edit own api keys',
+        ],
       ],
       'edit own api keys' => [
-        $prefix . ts('edit own api keys'),
-        ts('Edit user\'s own API keys'),
+        'label' => $prefix . ts('edit own api keys'),
+        'description' => ts("Edit user's own API keys"),
       ],
       'send SMS' => [
-        $prefix . ts('send SMS'),
-        ts('Send an SMS'),
+        'label' => $prefix . ts('send SMS'),
+        'description' => ts('Send an SMS'),
       ],
       'administer CiviCRM system' => [
         'label' => $prefix . ts('administer CiviCRM System'),
         'description' => ts('Perform all system administration tasks in CiviCRM'),
+        'implies' => [
+          'edit system workflow message templates',
+        ],
       ],
       'administer CiviCRM data' => [
         'label' => $prefix . ts('administer CiviCRM Data'),
         'description' => ts('Permit altering all restricted data options'),
+        'implies' => [
+          'edit message templates',
+          'administer dedupe rules',
+        ],
       ],
+      // This is a very special permission that supersedes all others;
+      // it's the equivalent of user 1 in Drupal.
       'all CiviCRM permissions and ACLs' => [
         'label' => $prefix . ts('all CiviCRM permissions and ACLs'),
         'description' => ts('Administer and use CiviCRM bypassing any other permission or ACL checks and enabling the creation of displays and forms that allow others to bypass checks. This permission should be given out with care'),
+        // This line is here more as a bit of documentation (so it will show in `Civi\Api4\Permission::get()`).
+        // The functionality that actually propagates this permission into all others
+        // is in `self::getImpliedBy`.
+        'implies' => ['*'],
       ],
     ];
     if (self::isMultisiteEnabled()) {
@@ -902,43 +979,37 @@ public static function getCorePermissions() {
   }
 
   /**
-   * Get permissions implied by 'superset' permissions.
+   * Get all permissions that would grant the given permission.
    *
-   * @return array
-   */
-  public static function getImpliedAdminPermissions(): array {
-    return [
-      'administer CiviCRM' => ['implied_permissions' => ['administer CiviCRM system', 'administer CiviCRM data']],
-      'administer CiviCRM data' => ['implied_permissions' => ['edit message templates', 'administer dedupe rules']],
-      'administer CiviCRM system' => ['implied_permissions' => ['edit system workflow message templates']],
-    ];
-  }
-
-  /**
-   * Get any super-permissions that imply the given permission.
-   *
-   * @param string $permission
+   * This always includes the permission itself and the super 'all CiviCRM permissions and ACLs'
+   * plus any meta-permissions that imply this one.
    *
+   * @param string $permissionName
    * @return array
    */
-  public static function getImpliedPermissionsFor(string $permission): array {
-    if (in_array($permission[0], ['@', '*'], TRUE)) {
+  private static function getImpliedBy(string $permissionName): array {
+    if (in_array($permissionName[0], ['@', '*'], TRUE)) {
       // Special permissions like '*always deny*' - see DynamicFKAuthorizationTest.
       // Also '@afform - see AfformUsageTest.
-      return [];
-    }
-    $implied = Civi::cache('metadata')->get('implied_permissions', []);
-    if (isset($implied[$permission])) {
-      return $implied[$permission];
+      return [$permissionName];
     }
-    $implied[$permission] = ['all CiviCRM permissions and ACLs'];
-    foreach (self::getImpliedAdminPermissions() as $key => $details) {
-      if (in_array($permission, $details['implied_permissions'] ?? [], TRUE)) {
-        $implied[$permission][] = $key;
+    try {
+      $permission = self::basicPermissions(TRUE, TRUE)[$permissionName] ?? NULL;
+      $impliedPermissions = array_merge([$permissionName], $permission['implied_by'] ?? []);
+      // Permission for a disabled component: always deny
+      if (!empty($permission['disabled'])) {
+        return [self::ALWAYS_DENY_PERMISSION];
       }
+      // If it's a CiviCRM permission, then it's also implied by the master permission
+      elseif ($permission) {
+        $impliedPermissions[] = 'all CiviCRM permissions and ACLs';
+      }
+    }
+    // This could happen early in the boot-cycle or during upgrade
+    catch (RuntimeException $e) {
+      $impliedPermissions = [$permissionName, 'all CiviCRM permissions and ACLs'];
     }
-    Civi::cache('metadata')->set('implied_permissions', $implied);
-    return $implied[$permission];
+    return $impliedPermissions;
   }
 
   /**
@@ -1752,32 +1823,20 @@ public static function checkDownloadInvoice() {
   /**
    * Get permissions for components.
    *
-   * @param bool $includeDisabled
-   *
    * @return array
-   * @throws \CRM_Core_Exception
    */
-  protected static function getComponentPermissions(bool $includeDisabled): array {
-    if (!$includeDisabled) {
-      $components = CRM_Core_Component::getEnabledComponents();
-    }
-    else {
-      $components = CRM_Core_Component::getComponents();
-    }
-
+  protected static function getComponentPermissions(): array {
     $permissions = [];
-    foreach ($components as $comp) {
-      $perm = $comp->getPermissions($includeDisabled, TRUE);
-      if ($perm) {
-        $info = $comp->getInfo();
-        foreach ($perm as $p => $attr) {
-
-          if (!is_array($attr)) {
-            $attr = [$attr];
+    foreach (CRM_Core_Component::getComponents() as $component) {
+      $perms = $component->getPermissions();
+      if ($perms) {
+        $info = $component->getInfo();
+        foreach ($perms as $name => $perm) {
+          $perm['label'] = $info['translatedName'] . ': ' . $perm['label'];
+          if (!$component->isEnabled()) {
+            $perm['disabled'] = TRUE;
           }
-
-          $attr[0] = $info['translatedName'] . ': ' . $attr[0];
-          $permissions[$p] = $attr;
+          $permissions[$name] = $perm;
         }
       }
     }
@@ -1787,15 +1846,11 @@ protected static function getComponentPermissions(bool $includeDisabled): array
   /**
    * Get permissions for core functionality and for that of core components.
    *
-   * @param bool $all
-   *
    * @return array
-   * @throws \CRM_Core_Exception
    */
-  protected static function getCoreAndComponentPermissions(bool $all): array {
+  protected static function getCoreAndComponentPermissions(): array {
     $permissions = self::getCorePermissions();
-    $permissions = array_merge($permissions, self::getComponentPermissions($all));
-    $permissions['all CiviCRM permissions and ACLs']['implied_permissions'] = array_keys($permissions);
+    $permissions = array_merge($permissions, self::getComponentPermissions());
     return $permissions;
   }
 
diff --git a/www/modules/civicrm/CRM/Core/Permission/Backdrop.php b/www/modules/civicrm/CRM/Core/Permission/Backdrop.php
index 6fc230a4a..ce8ab39c6 100644
--- a/www/modules/civicrm/CRM/Core/Permission/Backdrop.php
+++ b/www/modules/civicrm/CRM/Core/Permission/Backdrop.php
@@ -105,7 +105,7 @@ public function getAvailablePermissions() {
     // We want to list *only* Backdrop perms, so we'll *skip* Civi perms.
     $allCorePerms = \CRM_Core_Permission::basicPermissions(TRUE);
 
-    $permissions = [];
+    $permissions = parent::getAvailablePermissions();
     $modules = system_get_info('module');
     foreach ($modules as $moduleName => $module) {
       $prefix = isset($module['name']) ? ($module['name'] . ': ') : '';
diff --git a/www/modules/civicrm/CRM/Core/Permission/Base.php b/www/modules/civicrm/CRM/Core/Permission/Base.php
index ad5966288..bc5e06e92 100644
--- a/www/modules/civicrm/CRM/Core/Permission/Base.php
+++ b/www/modules/civicrm/CRM/Core/Permission/Base.php
@@ -60,14 +60,12 @@ public function translatePermission($perm, $nativePrefix, $map) {
     [$civiPrefix, $name] = CRM_Utils_String::parsePrefix(':', $perm, NULL);
     switch ($civiPrefix) {
       case $nativePrefix:
+      case NULL:
         return $name;
 
       // pass through
       case 'cms':
-        return CRM_Utils_Array::value($name, $map, CRM_Core_Permission::ALWAYS_DENY_PERMISSION);
-
-      case NULL:
-        return $name;
+        return $map[$name] ?? CRM_Core_Permission::ALWAYS_DENY_PERMISSION;
 
       default:
         return CRM_Core_Permission::ALWAYS_DENY_PERMISSION;
@@ -310,7 +308,21 @@ public function checkGroupRole($array) {
    * @see \CRM_Core_Permission_Base::translatePermission()
    */
   public function getAvailablePermissions() {
-    return [];
+    // These "synthetic" permissions are translated to the relevant CMS permissions in CRM/Core/Permission/*.php
+    // using the `translatePermission()` mechanism.
+    // EXCEPT in Standalone, where they are not needed
+    return [
+      'cms:view user account' => [
+        'title' => ts('CMS') . ': ' . ts('View user accounts'),
+        'description' => ts('View user accounts. (Synthetic permission - adapts to local CMS)'),
+        'is_synthetic' => TRUE,
+      ],
+      'cms:administer users' => [
+        'title' => ts('CMS') . ': ' . ts('Administer user accounts'),
+        'description' => ts('Administer user accounts. (Synthetic permission - adapts to local CMS)'),
+        'is_synthetic' => TRUE,
+      ],
+    ];
   }
 
   /**
@@ -392,25 +404,30 @@ public function getModulePermissions($module): array {
    * Get the permissions defined in the hook_civicrm_permission implementation
    * in all enabled CiviCRM module extensions.
    *
-   * @param bool $descriptions
-   *
    * @return array
    *   Array of permissions, in the same format as CRM_Core_Permission::getCorePermissions().
+   * @throws RuntimeException
    */
-  public function getAllModulePermissions($descriptions = FALSE): array {
+  public function getAllModulePermissions(): array {
     $permissions = [];
     CRM_Utils_Hook::permission($permissions);
 
-    if ($descriptions) {
-      foreach ($permissions as $permission => $label) {
-        $permissions[$permission] = (is_array($label)) ? $label : [$label];
-      }
-    }
-    else {
-      // Passing in false here is to be deprecated.
-      foreach ($permissions as $permission => $label) {
-        $permissions[$permission] = (is_array($label)) ? array_shift($label) : $label;
+    // Normalize permission array format.
+    // Historically, a string was acceptable (interpreted as label), as was a non-associative array.
+    // Convert them all to associative arrays.
+    foreach ($permissions as $name => $defn) {
+      $defn = (array) $defn;
+      if (!isset($defn['label'])) {
+        CRM_Core_Error::deprecatedWarning("Permission '$name' should be declared with 'label' and 'description' keys. See https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_permission/");
       }
+      $permission = [
+        'label' => $defn['label'] ?? $defn[0],
+        'description' => $defn['description'] ?? $defn[1] ?? NULL,
+        'disabled' => $defn['disabled'] ?? NULL,
+        'implies' => $defn['implies'] ?? NULL,
+        'implied_by' => $defn['implied_by'] ?? NULL,
+      ];
+      $permissions[$name] = array_filter($permission, fn($item) => isset($item));
     }
     return $permissions;
   }
diff --git a/www/modules/civicrm/CRM/Core/Permission/Drupal.php b/www/modules/civicrm/CRM/Core/Permission/Drupal.php
index 0b0abe0b0..279661d9e 100644
--- a/www/modules/civicrm/CRM/Core/Permission/Drupal.php
+++ b/www/modules/civicrm/CRM/Core/Permission/Drupal.php
@@ -104,7 +104,7 @@ public function getAvailablePermissions() {
     // We want to list *only* Drupal perms, so we'll *skip* Civi perms.
     $allCorePerms = \CRM_Core_Permission::basicPermissions(TRUE);
 
-    $permissions = [];
+    $permissions = parent::getAvailablePermissions();
     $modules = system_get_info('module');
     foreach ($modules as $moduleName => $module) {
       $prefix = isset($module['name']) ? ($module['name'] . ': ') : '';
diff --git a/www/modules/civicrm/CRM/Core/Permission/Drupal8.php b/www/modules/civicrm/CRM/Core/Permission/Drupal8.php
index eb1d570c3..f07f8cb6b 100644
--- a/www/modules/civicrm/CRM/Core/Permission/Drupal8.php
+++ b/www/modules/civicrm/CRM/Core/Permission/Drupal8.php
@@ -33,6 +33,7 @@ class CRM_Core_Permission_Drupal8 extends CRM_Core_Permission_DrupalBase {
   public function check($str, $userId = NULL) {
     $str = $this->translatePermission($str, 'Drupal', [
       'view user account' => 'access user profiles',
+      'administer users' => 'administer users',
     ]);
 
     if ($str == CRM_Core_Permission::ALWAYS_DENY_PERMISSION) {
@@ -60,7 +61,7 @@ public function getAvailablePermissions() {
     $dperms = \Drupal::service('user.permissions')->getPermissions();
     $modules = \Drupal::service('extension.list.module')->getAllInstalledInfo();
 
-    $permissions = [];
+    $permissions = parent::getAvailablePermissions();
     foreach ($dperms as $permName => $dperm) {
       if (isset($allCorePerms[$permName])) {
         continue;
diff --git a/www/modules/civicrm/CRM/Core/Permission/List.php b/www/modules/civicrm/CRM/Core/Permission/List.php
index 513828630..bb300ebfa 100644
--- a/www/modules/civicrm/CRM/Core/Permission/List.php
+++ b/www/modules/civicrm/CRM/Core/Permission/List.php
@@ -31,14 +31,14 @@ class CRM_Core_Permission_List {
    * @see \CRM_Utils_Hook::permissionList
    */
   public static function findCiviPermissions(GenericHookEvent $e) {
-    $activeCorePerms = \CRM_Core_Permission::basicPermissions(FALSE);
     $allCorePerms = \CRM_Core_Permission::basicPermissions(TRUE, TRUE);
     foreach ($allCorePerms as $permName => $corePerm) {
       $e->permissions[$permName] = [
         'group' => 'civicrm',
-        'title' => $corePerm['label'] ?? $corePerm[0] ?? $permName,
-        'description' => $corePerm['description'] ?? $corePerm[1] ?? NULL,
-        'is_active' => isset($activeCorePerms[$permName]),
+        'title' => $corePerm['label'],
+        'description' => $corePerm['description'] ?? NULL,
+        'is_active' => empty($corePerm['disabled']),
+        'implies' => $corePerm['implies'] ?? NULL,
       ];
     }
   }
@@ -54,28 +54,15 @@ public static function findCmsPermissions(GenericHookEvent $e) {
     $config = \CRM_Core_Config::singleton();
 
     $ufPerms = $config->userPermissionClass->getAvailablePermissions();
+
     foreach ($ufPerms as $permName => $cmsPerm) {
       $e->permissions[$permName] = [
         'group' => 'cms',
         'title' => $cmsPerm['title'] ?? $permName,
         'description' => $cmsPerm['description'] ?? NULL,
+        'is_synthetic' => $cmsPerm['is_synthetic'] ?? FALSE,
       ];
     }
-
-    // There are a handful of special permissions defined in CRM/Core/Permission/*.php
-    // using the `translatePermission()` mechanism.
-    $e->permissions['cms:view user account'] = [
-      'group' => 'cms',
-      'title' => ts('CMS') . ': ' . ts('View user accounts'),
-      'description' => ts('View user accounts. (Synthetic permission - adapts to local CMS)'),
-      'is_synthetic' => TRUE,
-    ];
-    $e->permissions['cms:administer users'] = [
-      'group' => 'cms',
-      'title' => ts('CMS') . ': ' . ts('Administer user accounts'),
-      'description' => ts('Administer user accounts. (Synthetic permission - adapts to local CMS)'),
-      'is_synthetic' => TRUE,
-    ];
   }
 
   /**
@@ -84,6 +71,7 @@ public static function findCmsPermissions(GenericHookEvent $e) {
    */
   public static function findConstPermissions(GenericHookEvent $e) {
     // There are a handful of special permissions defined in CRM/Core/Permission.
+    // Enforcement of them is handled in `CRM_Core_Permission_*::check()`
     $e->permissions[\CRM_Core_Permission::ALWAYS_DENY_PERMISSION] = [
       'group' => 'const',
       'title' => ts('Generic: Deny all users'),
@@ -93,6 +81,9 @@ public static function findConstPermissions(GenericHookEvent $e) {
       'group' => 'const',
       'title' => ts('Generic: Allow all users (including anonymous)'),
       'is_synthetic' => TRUE,
+      // This line is here more as a bit of documentation (so it will show in `Civi\Api4\Permission::get()`).
+      // The functionality that actually handles this pseudo-permission is in `CRM_Core_Permission_*::check()`
+      'implies' => ['*'],
     ];
   }
 
diff --git a/www/modules/civicrm/CRM/Core/Permission/Standalone.php b/www/modules/civicrm/CRM/Core/Permission/Standalone.php
index deca76aba..9c638a17f 100644
--- a/www/modules/civicrm/CRM/Core/Permission/Standalone.php
+++ b/www/modules/civicrm/CRM/Core/Permission/Standalone.php
@@ -33,6 +33,17 @@ class CRM_Core_Permission_Standalone extends CRM_Core_Permission_Base {
    */
   public $permissions = NULL;
 
+  /**
+   * @inheritdoc
+   * on Standalone we don't want to add any "synthetic" cms permissions
+   * because we have concrete equivalents, provided by e.g. standaloneusers extension
+   * so we override the base class to suppress the synthetic ones
+   *
+   */
+  public function getAvailablePermissions() {
+    return [];
+  }
+
   /**
    * Given a permission string, check for access requirements.
    *
@@ -48,14 +59,6 @@ class CRM_Core_Permission_Standalone extends CRM_Core_Permission_Base {
    *   true if yes, else false
    */
   public function check($str, $userId = NULL) {
-    // These core-defined synthetic permissions (which cannot be applied by our Role UI):
-    // cms:administer users
-    // cms:view user account
-    // need mapping to our concrete permissions (which can be applied to Roles) with the same names:
-    $str = $this->translatePermission($str, 'Standalone', [
-      'view user account' => 'view user account',
-      'administer users' => 'administer users',
-    ]);
     return \Civi\Standalone\Security::singleton()->checkPermission($str, $userId);
   }
 
diff --git a/www/modules/civicrm/CRM/Core/Permission/WordPress.php b/www/modules/civicrm/CRM/Core/Permission/WordPress.php
index dfcc6c34a..8fec3f57d 100644
--- a/www/modules/civicrm/CRM/Core/Permission/WordPress.php
+++ b/www/modules/civicrm/CRM/Core/Permission/WordPress.php
@@ -103,7 +103,7 @@ function($str) {
       $wpCaps = array_unique(array_merge(array_keys($wpRole['capabilities']), $wpCaps));
     }
 
-    $permissions = [];
+    $permissions = parent::getAvailablePermissions();
     foreach ($wpCaps as $wpCap) {
       if (!in_array($wpCap, $mungedCorePerms)) {
         $permissions["WordPress:$wpCap"] = [
diff --git a/www/modules/civicrm/CRM/Core/PseudoConstant.php b/www/modules/civicrm/CRM/Core/PseudoConstant.php
index 73275f3eb..725da239a 100644
--- a/www/modules/civicrm/CRM/Core/PseudoConstant.php
+++ b/www/modules/civicrm/CRM/Core/PseudoConstant.php
@@ -152,7 +152,7 @@ public static function get($daoName, $fieldName, $params = [], $context = NULL)
       'condition' => [],
       'values' => [],
     ];
-    $entity = CRM_Core_DAO_AllCoreTables::getBriefName($daoName);
+    $entity = CRM_Core_DAO_AllCoreTables::getEntityNameForClass($daoName);
 
     // Custom fields are not in the schema
     if (strpos($fieldName, 'custom_') === 0 && is_numeric($fieldName[7])) {
diff --git a/www/modules/civicrm/CRM/Core/Reference/Basic.php b/www/modules/civicrm/CRM/Core/Reference/Basic.php
index ab2c30984..1b15ea9e2 100644
--- a/www/modules/civicrm/CRM/Core/Reference/Basic.php
+++ b/www/modules/civicrm/CRM/Core/Reference/Basic.php
@@ -42,6 +42,9 @@ public function getReferenceKey() {
   }
 
   /**
+   * CRM_Core_Reference_Basic returns NULL.
+   * CRM_Core_Reference_Dynamic returns the name of the dynamic column e.g. "entity_table".
+   *
    * @return string|null
    */
   public function getTypeColumn() {
diff --git a/www/modules/civicrm/CRM/Core/Reference/Dynamic.php b/www/modules/civicrm/CRM/Core/Reference/Dynamic.php
index dd192d58c..771081243 100644
--- a/www/modules/civicrm/CRM/Core/Reference/Dynamic.php
+++ b/www/modules/civicrm/CRM/Core/Reference/Dynamic.php
@@ -13,20 +13,37 @@ class CRM_Core_Reference_Dynamic extends CRM_Core_Reference_Basic {
    * @return bool
    */
   public function matchesTargetTable($tableName) {
-    // FIXME: Shouldn't this check against keys returned by getTargetEntities?
-    return TRUE;
+    $targetEntities = $this->getTargetEntities();
+    if (!$targetEntities) {
+      // Missing whitelist! That's not good, but we'll grandfather it in by accepting all entities.
+      return TRUE;
+    }
+    return in_array(CRM_Core_DAO_AllCoreTables::getEntityNameForTable($tableName), $targetEntities, TRUE);
   }
 
   /**
+   * Returns a list of all allowed values for $this->refTypeColumn
+   *
    * @return array
-   *   [table_name => EntityName]
+   *   [ref_column_value => EntityName]
+   *   Keys are the value stored in $this->refTypeColumn,
+   *   Values are the name of the corresponding entity.
    */
   public function getTargetEntities(): array {
     $targetEntities = [];
     $bao = CRM_Core_DAO_AllCoreTables::getClassForTable($this->refTable);
-    $targetTables = $bao::buildOptions($this->refTypeColumn) ?: [];
-    foreach ($targetTables as $table => $label) {
-      $targetEntities[$table] = CRM_Core_DAO_AllCoreTables::getEntityNameForTable($table);
+    $targetTables = $bao::buildOptions($this->refTypeColumn, 'validate') ?: [];
+    foreach ($targetTables as $value => $name) {
+      // Old-style: Flat arrays of ['table_name' => 'Entity Label']
+      // will be formatted like ['table_name' => 'table_name'] in 'validate' mode.
+      if (strtolower($value) === $name) {
+        $targetEntities[$value] = CRM_Core_DAO_AllCoreTables::getEntityNameForTable($value);
+      }
+      // New-style: ['id' => 'value', 'name' => 'EntityName', 'label' => 'Entity Label'][]
+      // will be formatted like ['value' => 'EntityName'] in 'validate' mode.
+      else {
+        $targetEntities[$value] = $name;
+      }
     }
     return $targetEntities;
   }
@@ -40,23 +57,14 @@ public function getTargetEntities(): array {
    *   a query-handle (like the result of CRM_Core_DAO::executeQuery)
    */
   public function findReferences($targetDao) {
-    $refColumn = $this->getReferenceKey();
-    $targetColumn = $this->getTargetKey();
-
-    $params = [
-      1 => [$targetDao->$targetColumn, 'String'],
-      // If anyone complains about $targetDao::getTableName(), then could use
-      // "{get_class($targetDao)}::getTableName();"
-      2 => [$targetDao::getTableName(), 'String'],
-    ];
-
     $sql = <<<EOS
 SELECT id
 FROM {$this->getReferenceTable()}
-WHERE {$refColumn} = %1
+WHERE {$this->getReferenceKey()} = %1
 AND {$this->getTypeColumn()} = %2
 EOS;
 
+    $params = $this->getQueryParams($targetDao);
     $daoName = CRM_Core_DAO_AllCoreTables::getClassForTable($this->getReferenceTable());
     $result = CRM_Core_DAO::executeQuery($sql, $params, TRUE, $daoName);
     return $result;
@@ -68,14 +76,6 @@ public function findReferences($targetDao) {
    * @return array
    */
   public function getReferenceCount($targetDao) {
-    $targetColumn = $this->getTargetKey();
-    $params = [
-      1 => [$targetDao->$targetColumn, 'String'],
-      // If anyone complains about $targetDao::getTableName(), then could use
-      // "{get_class($targetDao)}::getTableName();"
-      2 => [$targetDao::getTableName(), 'String'],
-    ];
-
     $sql = <<<EOS
 SELECT count(id)
 FROM {$this->getReferenceTable()}
@@ -88,7 +88,28 @@ public function getReferenceCount($targetDao) {
       'type' => get_class($this),
       'table' => $this->getReferenceTable(),
       'key' => $this->getReferenceKey(),
-      'count' => CRM_Core_DAO::singleValueQuery($sql, $params),
+      'count' => CRM_Core_DAO::singleValueQuery($sql, $this->getQueryParams($targetDao)),
+    ];
+  }
+
+  /**
+   * Gets query params needed by the find reference query
+   * @param CRM_Core_DAO $targetDao
+   * @return array[]
+   */
+  private function getQueryParams($targetDao): array {
+    $targetColumn = $this->getTargetKey();
+
+    // Look up option value for this entity. It's usually the table name, but not always.
+    // If the lookup fails (some entities are missing the option list for the ref column),
+    // then fall back on the table name.
+    $targetEntity = CRM_Core_DAO_AllCoreTables::getEntityNameForClass(get_class($targetDao));
+    $targetEntities = $this->getTargetEntities();
+    $targetValue = array_search($targetEntity, $targetEntities) ?: $targetDao::getTableName();
+
+    return [
+      1 => [$targetDao->$targetColumn, 'String'],
+      2 => [$targetValue, 'String'],
     ];
   }
 
diff --git a/www/modules/civicrm/CRM/Core/Region.php b/www/modules/civicrm/CRM/Core/Region.php
index 1f12c8105..be78e450f 100644
--- a/www/modules/civicrm/CRM/Core/Region.php
+++ b/www/modules/civicrm/CRM/Core/Region.php
@@ -61,6 +61,10 @@ public function render($default, $allowCmsOverride = TRUE) {
       $this->snippets['default']['markup'] = $default;
     }
 
+    if (defined('CIVICRM_IFRAME')) {
+      $allowCmsOverride = FALSE;
+    }
+
     Civi::dispatcher()->dispatch('civi.region.render', \Civi\Core\Event\GenericHookEvent::create(['region' => $this]));
 
     $this->sort();
@@ -139,7 +143,7 @@ public function render($default, $allowCmsOverride = TRUE) {
           break;
 
         case 'settings':
-          $settingsData = json_encode($this->getSettings(), JSON_UNESCAPED_SLASHES);
+          $settingsData = json_encode($this->getSettings());
           $js = "(function(vars) {
             if (window.CRM) CRM.$.extend(true, CRM, vars); else window.CRM = vars;
             })($settingsData)";
diff --git a/www/modules/civicrm/CRM/Core/Resources.php b/www/modules/civicrm/CRM/Core/Resources.php
index 3d3db50d7..97609ecdc 100644
--- a/www/modules/civicrm/CRM/Core/Resources.php
+++ b/www/modules/civicrm/CRM/Core/Resources.php
@@ -381,9 +381,11 @@ public function addCoreResources($region = 'html-header') {
     if (!self::isAjaxMode()) {
       $this->addBundle('coreResources');
       $this->addCoreStyles($region);
-      // This ensures that if a popup link requires AngularJS, it will always be available.
-      // Additional Ang modules required by popups will be loaded on-the-fly by Civi\Angular\AngularLoader
-      Civi::service('angularjs.loader')->addModules(['crmResource']);
+      if (!CRM_Core_Config::isUpgradeMode()) {
+        // This ensures that if a popup link requires AngularJS, it will always be available.
+        // Additional Ang modules required by popups will be loaded on-the-fly by Civi\Angular\AngularLoader
+        Civi::service('angularjs.loader')->addModules(['crmResource']);
+      }
     }
     return $this;
   }
diff --git a/www/modules/civicrm/CRM/Core/ScheduledJob.php b/www/modules/civicrm/CRM/Core/ScheduledJob.php
index 02e518479..5a257ef68 100644
--- a/www/modules/civicrm/CRM/Core/ScheduledJob.php
+++ b/www/modules/civicrm/CRM/Core/ScheduledJob.php
@@ -153,6 +153,17 @@ public function saveLastRun() {
     $dao = new CRM_Core_DAO_Job();
     $dao->id = $this->id;
     $dao->last_run = CRM_Utils_Date::currentDBDate();
+    $dao->last_run_end = NULL;
+    $dao->save();
+  }
+
+  /**
+   * Update the last_run date of this job
+   */
+  public function saveLastRunEnd() {
+    $dao = new CRM_Core_DAO_Job();
+    $dao->id = $this->id;
+    $dao->last_run_end = CRM_Utils_Date::currentDBDate();
     $dao->save();
   }
 
diff --git a/www/modules/civicrm/CRM/Core/SelectValues.php b/www/modules/civicrm/CRM/Core/SelectValues.php
index 1384b0375..07bae3f65 100644
--- a/www/modules/civicrm/CRM/Core/SelectValues.php
+++ b/www/modules/civicrm/CRM/Core/SelectValues.php
@@ -369,8 +369,8 @@ public static function date($type = NULL, $format = NULL, $minOffset = NULL, $ma
   public static function ufVisibility() {
     return [
       'User and User Admin Only' => ts('User and User Admin Only'),
-      'Public Pages' => ts('Expose Publicly'),
-      'Public Pages and Listings' => ts('Expose Publicly and for Listings'),
+      'Public Pages' => ts('Public Pages'),
+      'Public Pages and Listings' => ts('Public Pages and Listings'),
     ];
   }
 
@@ -494,7 +494,7 @@ public static function addressProvider() {
   }
 
   public static function smsProvider(): array {
-    $providers = CRM_SMS_BAO_Provider::getProviders(NULL, NULL, TRUE, 'is_default desc, title');
+    $providers = CRM_SMS_BAO_SmsProvider::getProviders(NULL, NULL, TRUE, 'is_default desc, title');
     $result = [];
     foreach ($providers as $provider) {
       $result[] = [
@@ -1118,7 +1118,7 @@ public static function getDashboardEntriesCount() {
   }
 
   public static function getQuicksearchOptions(): array {
-    $includeEmail = civicrm_api3('setting', 'getvalue', ['name' => 'includeEmailInName', 'group' => 'Search Preferences']);
+    $includeEmail = Civi::settings()->get('includeEmailInName');
     $options = [
       [
         'key' => 'sort_name',
@@ -1174,27 +1174,18 @@ public static function getQuicksearchOptions(): array {
         'label' => ts('Job Title'),
       ],
     ];
-    $custom = civicrm_api4('CustomField', 'get', [
-      'checkPermissions' => FALSE,
-      'select' => ['id', 'name', 'label', 'custom_group_id.name', 'custom_group_id.title', 'option_group_id'],
-      'where' => [
-        ['custom_group_id.extends', 'IN', array_merge(['Contact'], CRM_Contact_BAO_ContactType::basicTypes())],
-        ['data_type', 'NOT IN', ['ContactReference', 'Date', 'File']],
-        ['custom_group_id.is_active', '=', TRUE],
-        ['is_active', '=', TRUE],
-        ['is_searchable', '=', TRUE],
-      ],
-      'orderBy' => [
-        'custom_group_id.weight' => 'ASC',
-        'weight' => 'ASC',
-      ],
-    ]);
-    foreach ($custom as $field) {
-      $options[] = [
-        'key' => $field['custom_group_id.name'] . '.' . $field['name'] . ($field['option_group_id'] ? ':label' : ''),
-        'label' => $field['custom_group_id.title'] . ': ' . $field['label'],
-        'adv_search_legacy' => 'custom_' . $field['id'],
-      ];
+    $customGroups = CRM_Core_BAO_CustomGroup::getAll(['extends' => 'Contact', 'is_active' => TRUE], CRM_Core_Permission::VIEW);
+    foreach ($customGroups as $group) {
+      foreach ($group['fields'] as $field) {
+        if (in_array($field['data_type'], ['Date', 'File', 'ContactReference', 'EntityReference'])) {
+          continue;
+        }
+        $options[] = [
+          'key' => $group['name'] . '.' . $field['name'] . ($field['option_group_id'] ? ':label' : ''),
+          'label' => $group['title'] . ': ' . $field['label'],
+          'adv_search_legacy' => 'custom_' . $field['id'],
+        ];
+      }
     }
     return $options;
   }
diff --git a/www/modules/civicrm/CRM/Core/Selector/Controller.php b/www/modules/civicrm/CRM/Core/Selector/Controller.php
index b2d899a30..a4518b3fc 100644
--- a/www/modules/civicrm/CRM/Core/Selector/Controller.php
+++ b/www/modules/civicrm/CRM/Core/Selector/Controller.php
@@ -319,8 +319,8 @@ public function run() {
       }
       else {
         // assign to template and display them.
-        self::$_template->assign_by_ref('rows', $rows);
-        self::$_template->assign_by_ref('columnHeaders', $columnHeaders);
+        self::$_template->assign('rows', $rows);
+        self::$_template->assign('columnHeaders', $columnHeaders);
       }
     }
     else {
@@ -359,11 +359,11 @@ public function run() {
         $this->_store->set("{$this->_prefix}summary", $summary);
       }
       else {
-        self::$_template->assign_by_ref("{$this->_prefix}pager", $this->_pager);
-        self::$_template->assign_by_ref("{$this->_prefix}sort", $this->_sort);
+        self::$_template->assign("{$this->_prefix}pager", $this->_pager);
+        self::$_template->assign("{$this->_prefix}sort", $this->_sort);
 
-        self::$_template->assign_by_ref("{$this->_prefix}columnHeaders", $finalColumnHeaders);
-        self::$_template->assign_by_ref("{$this->_prefix}rows", $rows);
+        self::$_template->assign("{$this->_prefix}columnHeaders", $finalColumnHeaders);
+        self::$_template->assign("{$this->_prefix}rows", $rows);
         self::$_template->assign("{$this->_prefix}rowsEmpty", !$rows);
         self::$_template->assign("{$this->_prefix}qill", $qill);
         self::$_template->assign("{$this->_prefix}summary", $summary);
@@ -450,7 +450,7 @@ public function getSort() {
    * @return void
    */
   public function moveFromSessionToTemplate() {
-    self::$_template->assign_by_ref("{$this->_prefix}pager", $this->_pager);
+    self::$_template->assign("{$this->_prefix}pager", $this->_pager);
 
     $rows = $this->_store->get("{$this->_prefix}rows");
 
@@ -464,7 +464,7 @@ public function moveFromSessionToTemplate() {
       );
     }
 
-    self::$_template->assign_by_ref("{$this->_prefix}sort", $this->_sort);
+    self::$_template->assign("{$this->_prefix}sort", $this->_sort);
     $columnHeaders = (array) $this->_store->get("{$this->_prefix}columnHeaders");
     foreach ($columnHeaders as $index => $columnHeader) {
       // Fill out the keys to avoid e-notices.
diff --git a/www/modules/civicrm/CRM/Core/Session.php b/www/modules/civicrm/CRM/Core/Session.php
index 5f5f46589..a84566d84 100644
--- a/www/modules/civicrm/CRM/Core/Session.php
+++ b/www/modules/civicrm/CRM/Core/Session.php
@@ -550,12 +550,9 @@ public static function storeSessionObjects($reset = TRUE) {
    * @return int|null
    *   contact ID of logged in user
    */
-  public static function getLoggedInContactID() {
-    $session = CRM_Core_Session::singleton();
-    if (!is_numeric($session->get('userID'))) {
-      return NULL;
-    }
-    return (int) $session->get('userID');
+  public static function getLoggedInContactID(): ?int {
+    $userId = CRM_Core_Session::singleton()->get('userID');
+    return is_numeric($userId) ? (int) $userId : NULL;
   }
 
   /**
@@ -565,12 +562,12 @@ public static function getLoggedInContactID() {
    *
    * @throws CRM_Core_Exception
    */
-  public function getLoggedInContactDisplayName() {
+  public function getLoggedInContactDisplayName(): string {
     $userContactID = CRM_Core_Session::getLoggedInContactID();
     if (!$userContactID) {
       return '';
     }
-    return civicrm_api3('Contact', 'getvalue', ['id' => $userContactID, 'return' => 'display_name']);
+    return CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $userContactID, 'display_name') ?? '';
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Core/ShowHideBlocks.php b/www/modules/civicrm/CRM/Core/ShowHideBlocks.php
index 8c490ac43..4c5f4f90a 100644
--- a/www/modules/civicrm/CRM/Core/ShowHideBlocks.php
+++ b/www/modules/civicrm/CRM/Core/ShowHideBlocks.php
@@ -82,8 +82,8 @@ public function addToTemplate() {
 
     $template = CRM_Core_Smarty::singleton();
     $template->ensureVariablesAreAssigned(['elemType']);
-    $template->assign_by_ref('hideBlocks', $hide);
-    $template->assign_by_ref('showBlocks', $show);
+    $template->assign('hideBlocks', $hide);
+    $template->assign('showBlocks', $show);
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Core/Smarty.php b/www/modules/civicrm/CRM/Core/Smarty.php
index 3c0ad83dc..e2edcef04 100644
--- a/www/modules/civicrm/CRM/Core/Smarty.php
+++ b/www/modules/civicrm/CRM/Core/Smarty.php
@@ -72,26 +72,43 @@ class CRM_Core_Smarty extends CRM_Core_SmartyCompatibility {
    */
   private static $UNDEFINED_VALUE;
 
+  /**
+   * @throws \CRM_Core_Exception
+   * @throws \SmartyException
+   */
   private function initialize() {
     $config = CRM_Core_Config::singleton();
 
     if (isset($config->customTemplateDir) && $config->customTemplateDir) {
-      $this->template_dir = array_merge([$config->customTemplateDir],
+      $template_dir = array_merge([$config->customTemplateDir],
         $config->templateDir
       );
     }
     else {
-      $this->template_dir = $config->templateDir;
+      $template_dir = $config->templateDir;
+    }
+    $compile_dir = CRM_Utils_File::addTrailingSlash(CRM_Utils_File::addTrailingSlash($config->templateCompileDir) . $this->getLocale());
+
+    if (!defined('SMARTY_DIR')) {
+      // The absence of the global indicates Smarty5 - which is not a fan of bypassing the functions.
+      // In theory this would work on all & it does run fun with Smarty2 but our tests
+      // do something weird with loading Smarty so we have to head tests running Smarty2 off
+      // at the pass.
+      $this->setTemplateDir($template_dir);
+      $this->setCompileDir($compile_dir);
     }
-    $this->compile_dir = CRM_Utils_File::addTrailingSlash(CRM_Utils_File::addTrailingSlash($config->templateCompileDir) . $this->getLocale());
-    CRM_Utils_File::createDir($this->compile_dir);
-    CRM_Utils_File::restrictAccess($this->compile_dir);
+    else {
+      $this->template_dir = $template_dir;
+      $this->compile_dir = $compile_dir;
+    }
+    CRM_Utils_File::createDir($compile_dir);
+    CRM_Utils_File::restrictAccess($compile_dir);
 
     // check and ensure it is writable
     // else we sometime suppress errors quietly and this results
     // in blank emails etc
-    if (!is_writable($this->compile_dir)) {
-      echo "CiviCRM does not have permission to write temp files in {$this->compile_dir}, Exiting";
+    if (!is_writable($compile_dir)) {
+      echo "CiviCRM does not have permission to write temp files in {$compile_dir}, Exiting";
       exit();
     }
 
@@ -108,18 +125,16 @@ private function initialize() {
       if (!file_exists($customPluginsDir)) {
         $customPluginsDir = NULL;
       }
+      if ($customPluginsDir) {
+        $this->addPluginsDir($customPluginsDir);
+      }
     }
 
     $pkgsDir = Civi::paths()->getVariable('civicrm.packages', 'path');
-    $smartyDir = $pkgsDir . DIRECTORY_SEPARATOR . 'Smarty' . DIRECTORY_SEPARATOR;
-    $pluginsDir = __DIR__ . DIRECTORY_SEPARATOR . 'Smarty' . DIRECTORY_SEPARATOR . 'plugins' . DIRECTORY_SEPARATOR;
-
-    if ($customPluginsDir) {
-      $this->plugins_dir = [$customPluginsDir, $smartyDir . 'plugins', $pluginsDir];
-    }
-    else {
-      $this->plugins_dir = [$smartyDir . 'plugins', $pluginsDir];
-    }
+    // smarty3/4 have the define, fall back to smarty2. smarty5 deprecates plugins_dir - TBD.
+    $smartyPluginsDir = defined('SMARTY_PLUGINS_DIR') ? SMARTY_PLUGINS_DIR : ($pkgsDir . DIRECTORY_SEPARATOR . 'Smarty' . DIRECTORY_SEPARATOR . 'plugins');
+    $corePluginsDir = __DIR__ . DIRECTORY_SEPARATOR . 'Smarty' . DIRECTORY_SEPARATOR . 'plugins' . DIRECTORY_SEPARATOR;
+    $this->addPluginsDir($corePluginsDir);
 
     $this->compile_check = $this->isCheckSmartyIsCompiled();
 
@@ -147,7 +162,9 @@ private function initialize() {
     }
 
     if (CRM_Utils_Constant::value('CIVICRM_SMARTY_DEFAULT_ESCAPE')
-      && !CRM_Utils_Constant::value('CIVICRM_SMARTY3_AUTOLOAD_PATH')) {
+      && !CRM_Utils_Constant::value('CIVICRM_SMARTY3_AUTOLOAD_PATH')
+      && !CRM_Utils_Constant::value('CIVICRM_SMARTY_AUTOLOAD_PATH')
+    ) {
       // Currently DEFAULT escape does not work with Smarty3
       // dunno why - thought it would be the default with Smarty3 - but
       // getting onto Smarty 3 is higher priority.
@@ -158,20 +175,75 @@ private function initialize() {
       // contribution dashboard from RecentlyViewed.tpl
       require_once 'Smarty/plugins/modifier.escape.php';
       if (!isset($this->_plugins['modifier']['escape'])) {
-        $this->register_modifier('escape', ['CRM_Core_Smarty', 'escape']);
+        $this->registerPlugin('modifier', 'escape', ['CRM_Core_Smarty', 'escape']);
       }
       $this->default_modifiers[] = 'escape:"htmlall"';
     }
-    $this->load_filter('pre', 'resetExtScope');
-    $this->load_filter('pre', 'htxtFilter');
+    $this->loadFilter('pre', 'resetExtScope');
+    $this->loadFilter('pre', 'htxtFilter');
+
+    // Smarty5 can't use php functions unless they are registered.... Smarty4 gets noisy about it.
+    $functionsForSmarty = [
+      // In theory json_encode, count & implode no longer need to
+      // be added as they are now more natively supported in smarty4, smarty5
+      'json_encode',
+      'count',
+      'implode',
+      // We use str_starts_with to check if a field is (e.g 'phone_' in profile presentation.
+      'str_starts_with',
+      // Trim is used on the extensions page.
+      'trim',
+      'is_numeric',
+      'array_key_exists',
+      'strstr',
+      'strpos',
+    ];
+    foreach ($functionsForSmarty as $function) {
+      $this->registerPlugin('modifier', $function, $function);
+    }
 
+    $this->registerPlugin('modifier', 'call_user_func', [self::class, 'callUserFuncArray']);
+    // This does not appear to be used & feels like the sort of approach that would be phased out.
     $this->assign('crmPermissions', new CRM_Core_Smarty_Permissions());
 
-    if ($config->debug || str_contains(CIVICRM_UF_BASEURL, 'localhost')) {
+    if ($config->debug || str_contains(CIVICRM_UF_BASEURL, 'localhost') || CRM_Utils_Constant::value('CIVICRM_UF') === 'UnitTests') {
       $this->error_reporting = E_ALL;
     }
   }
 
+  /**
+   * Call a permitted function from the Smarty layer.
+   *
+   * In general calling functions from the Smarty layer is being made stricter in
+   * Smarty - they need to be registered.
+   *
+   * We can't quite kill off call_user_func from the smarty layer yet but we
+   * can deprecate using it to call anything other than the 3 known patterns.
+   * In Smarty5 this will hard-fail, which is OK as Smarty5 is being phased in
+   * and can err on the side of strictness, at least for now.
+   *
+   * @param callable $callable
+   * @param mixed $args
+   *
+   * @return mixed
+   * @throws \CRM_Core_Exception
+   */
+  public static function callUserFuncArray(callable $callable, ...$args) {
+    $permitted = [
+      ['CRM_Campaign_BAO_Campaign', 'isComponentEnabled'],
+      ['CRM_Case_BAO_Case', 'checkPermission'],
+      ['CRM_Core_Permission', 'check'],
+      ['CRM_Core_Permission', 'access'],
+    ];
+    if (!in_array($callable, $permitted)) {
+      if (CRM_Core_Smarty::singleton()->getVersion() === 5) {
+        throw new CRM_Core_Exception('unsupported function');
+      }
+      CRM_Core_Error::deprecatedWarning('unsupported function. call_user_func array is not generally supported in Smarty5 but we have transitional support for 2 functions that are in common use');
+    }
+    return call_user_func_array($callable, $args ?: []);
+  }
+
   /**
    * Static instance provider.
    *
@@ -280,48 +352,29 @@ public function appendValue($name, $value) {
     }
   }
 
+  /**
+   * Clear template variables, except session or config.
+   *
+   * Also the debugging variable because during test runs initialize() is only
+   * called once at the start but the var gets indirectly accessed by a couple
+   * tests that test forms.
+   *
+   * @return void
+   */
   public function clearTemplateVars(): void {
     foreach (array_keys($this->getTemplateVars()) as $key) {
-      if ($key === 'config' || $key === 'session') {
+      if ($key === 'config' || $key === 'session' || $key === 'debugging') {
         continue;
       }
-      if (method_exists($this, 'clearAssign')) {
-        $this->clearAssign($key);
-      }
-      else {
-        $this->clear_assign($key);
-      }
+      $this->clearAssign($key);
     }
   }
 
   public static function registerStringResource() {
-    require_once 'CRM/Core/Smarty/resources/String.php';
-    civicrm_smarty_register_string_resource();
-  }
-
-  /**
-   * Add template directory(s).
-   *
-   * @param string|array $template_dir directory(s) of template sources
-   * @param string $key (Smarty3+) of the array element to assign the template dir to
-   * @param bool $isConfig (Smarty3+) true for config_dir
-   *
-   * @return Smarty          current Smarty instance for chaining
-   */
-  public function addTemplateDir($template_dir, $key = NULL, $isConfig = FALSE) {
-    if (method_exists('parent', 'addTemplateDir')) {
-      // More recent versions of Smarty have this method.
-      return parent::addTemplateDir($template_dir, $key, $isConfig);
+    if (method_exists('Smarty', 'register_resource')) {
+      require_once 'CRM/Core/Smarty/resources/String.php';
+      civicrm_smarty_register_string_resource();
     }
-    if (is_array($this->template_dir)) {
-      if (!in_array($template_dir, $this->template_dir)) {
-        array_unshift($this->template_dir, $template_dir);
-      }
-    }
-    else {
-      $this->template_dir = [$template_dir, $this->template_dir];
-    }
-    return $this;
   }
 
   /**
@@ -376,7 +429,7 @@ public function assignAll($vars) {
         $this->assign($key, $value);
       }
       else {
-        $this->clear_assign($key);
+        $this->clearAssign($key);
       }
     }
     return $this;
@@ -499,4 +552,28 @@ public static function escape($string, $esc_type = 'html', $char_set = 'UTF-8')
     return $value;
   }
 
+  public function getVersion (): int {
+    static $version;
+    if ($version === NULL) {
+      if (class_exists('Smarty\Smarty')) {
+        $version = 5;
+      }
+      else {
+        $class = new ReflectionClass('Smarty');
+        $path = $class->getFileName();
+        if (str_contains($path, 'smarty3')) {
+          $version = 3;
+        }
+        elseif (str_contains($path, 'smarty4')) {
+          $version = 4;
+        }
+        else {
+          $version = 2;
+        }
+      }
+    }
+    return $version;
+
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Core/Smarty/UserContentPolicy.php b/www/modules/civicrm/CRM/Core/Smarty/UserContentPolicy.php
new file mode 100644
index 000000000..f3a7bb702
--- /dev/null
+++ b/www/modules/civicrm/CRM/Core/Smarty/UserContentPolicy.php
@@ -0,0 +1,207 @@
+<?php
+
+/**
+ * Define the security-constraints to apply to user-supplied Smarty content.
+ *
+ * At time of writing, we have a complication -- parallel support for Smarty 2/3/4/5. Each
+ * version has slightly different functionality.
+ *
+ * To bridge the gap, we define a general policy -- and then map it into each Smarty implementation.
+ */
+class CRM_Core_Smarty_UserContentPolicy extends \Civi\Core\Service\AutoService {
+
+  /**
+   * This is an array of trusted PHP functions.
+   * If empty all functions are allowed.
+   * To disable all PHP functions set $php_functions = null.
+   *
+   * @var array
+   */
+  public $php_functions = [
+    'array',
+    'list',
+    'isset',
+    'empty',
+    'count',
+    'sizeof',
+    'in_array',
+    'is_array',
+    'true',
+    'false',
+    'null',
+  ];
+
+  /**
+   * This is an array of trusted PHP modifiers.
+   * If empty all modifiers are allowed.
+   * To disable all modifier set $php_modifiers = null.
+   *
+   * @var array
+   */
+  public $php_modifiers = [
+    'escape',
+    'count',
+    'sizeof',
+    'nl2br',
+  ];
+
+  /**
+   * This is an array of disabled tags.
+   * If empty no restriction by disabled_tags.
+   *
+   * @var array
+   */
+  public $disabled_tags = ['crmAPI'];
+
+  public $allow_constants = FALSE;
+
+  public $allow_super_globals = FALSE;
+
+  private $old_settings = NULL;
+
+  /**
+   * @service civi.smarty.userContent
+   */
+  public static function create(): CRM_Core_Smarty_UserContentPolicy {
+    $instance = new CRM_Core_Smarty_UserContentPolicy();
+
+    $event = \Civi\Core\Event\GenericHookEvent::create(['policy' => $instance]);
+    Civi::dispatcher()->dispatch('hook_civicrm_userContentPolicy', $event);
+
+    return $instance;
+  }
+
+  public function enable(): void {
+    $smarty = CRM_Core_Smarty::singleton();
+    switch ($smarty->getVersion()) {
+      case 2:
+        $this->old_settings = $smarty->security_settings;
+        $smarty->security_settings = $this->createSmartyPolicy2($smarty);
+        $smarty->security = TRUE;
+        return;
+
+      case 3:
+      case 4:
+        $smarty->enableSecurity($this->createSmartyPolicy34());
+        return;
+
+      case 5:
+        $smarty->enableSecurity($this->createSmartyPolicy5());
+        return;
+    }
+  }
+
+  public function disable(): void {
+    $smarty = CRM_Core_Smarty::singleton();
+    switch ($smarty->getVersion()) {
+      case 2:
+        $smarty->security_settings = $this->old_settings;
+        $smarty->security = FALSE;
+        return;
+
+      case 3:
+      case 4:
+        $smarty->disableSecurity();
+        return;
+
+      case 5:
+        $smarty->disableSecurity();
+        return;
+    }
+  }
+
+  protected function createSmartyPolicy2($smarty): array {
+    $result = $smarty->security_settings;
+    $result['IF_FUNCS'] = $this->php_functions;
+    $result['MODIFIER_FUNCS'] = $this->php_modifiers;
+    $result['ALLOW_CONSTANTS'] = $this->allow_constants;
+    $result['ALLOW_SUPER_GLOBALS'] = $this->allow_super_globals;
+    return $result;
+  }
+
+  protected function createSmartyPolicy34(): string {
+    $obj = new class(NULL) extends Smarty_Security {
+
+      public function __construct($smarty) {
+        parent::__construct($smarty);
+
+        /** @var \CRM_Core_Smarty_UserContentPolicy $policy */
+        $policy = Civi::service('civi.smarty.userContent');
+
+        $this->php_functions = $policy->php_functions;
+        $this->php_modifiers = $policy->php_modifiers;
+        $this->disabled_tags = $policy->disabled_tags;
+
+        $this->static_classes = NULL;
+        $this->allow_constants = $policy->allow_constants;
+        $this->allow_super_globals = $policy->allow_super_globals;
+      }
+
+    };
+    return get_class($obj);
+  }
+
+  protected function createSmartyPolicy5(): string {
+
+    $obj = new class(NULL) extends \Smarty\Security {
+
+      public function __construct($smarty) {
+        if ($smarty !== NULL) {
+          parent::__construct($smarty);
+        }
+
+        /** @var \CRM_Core_Smarty_UserContentPolicy $policy */
+        $policy = Civi::service('civi.smarty.userContent');
+
+        // This feels counterintuitive. Eileen thinks it may be a miscommunication.
+        // Functionally, consider that (a) security is enabled/disabled/enabled/disabled
+        // but (b) the registered plugins don't actually change.
+
+        // foreach ($policy->php_functions as $phpFunction) {
+        //   $smarty->registerPlugin('modifier', $phpFunction, $phpFunction);
+        // }
+        // foreach ($policy->php_modifiers as $modifier) {
+        //   $smarty->registerPlugin('modifier', $modifier, $modifier);
+        // }
+
+        $this->static_classes = NULL;
+        $this->allow_constants = $policy->allow_constants;
+        $this->allow_super_globals = $policy->allow_super_globals;
+      }
+
+    };
+    return get_class($obj);
+  }
+
+  /**
+   * Smarty 3+4 have option to disable tags in secure mode, but Smarty 2 doesn't.
+   * So for any potentially-sensitive tags, we support an alternate mechanism to check access.
+   *
+   * @param string $tag
+   * @return void
+   * @throws \Exception
+   */
+  public static function assertTagAllowed(string $tag): void {
+    if (!\Civi\Core\Container::isContainerBooted()) {
+      // We don't run user content before the system has booted.
+      // So the details here are kind of academic.
+      // Main thing: don't force a premature bootstrap.
+      $disabledTags = ['crmAPI'];
+    }
+    else {
+      $smarty = CRM_Core_Smarty::singleton();
+      $hasSecurity = ($smarty->getVersion() > 2) ? (bool) $smarty->security_policy : $smarty->security;
+      if (!$hasSecurity) {
+        return;
+      }
+
+      $policy = Civi::service('civi.smarty.userContent');
+      $disabledTags = $policy->disabled_tags;
+    }
+
+    if (in_array($tag, $disabledTags)) {
+      throw new \Exception("Tag '{$tag}' is not allowed in secure mode.");
+    }
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Core/Smarty/plugins/block.crmScope.php b/www/modules/civicrm/CRM/Core/Smarty/plugins/block.crmScope.php
index 3e0e02800..76662a47a 100644
--- a/www/modules/civicrm/CRM/Core/Smarty/plugins/block.crmScope.php
+++ b/www/modules/civicrm/CRM/Core/Smarty/plugins/block.crmScope.php
@@ -19,7 +19,7 @@
  *   Must define 'name'.
  * @param string $content
  *   Default content.
- * @param CRM_Core_Smarty $smarty
+ * @param \Smarty_Internal_Template $smarty
  *   The Smarty object.
  *
  * @param $repeat
@@ -29,13 +29,29 @@
 function smarty_block_crmScope($params, $content, &$smarty, &$repeat) {
   /** @var CRM_Core_Smarty $smarty */
 
+  if (!array_key_exists(__FUNCTION__, \Civi::$statics)) {
+    \Civi::$statics[__FUNCTION__] = [];
+  }
+  $backupFrames = &\Civi::$statics[__FUNCTION__];
   if ($repeat) {
-    // open crmScope
-    $smarty->pushScope($params);
+    $templateVars = $smarty->getTemplateVars();
+    $backupFrame = [];
+    foreach ($params as $name => $value) {
+      $backupFrame[$name] = array_key_exists($name, $templateVars) ? $templateVars[$name] : NULL;
+      $smarty->assign($name, $value);
+    }
+    $backupFrames[] = $backupFrame;
   }
   else {
-    // close crmScope
-    $smarty->popScope();
+    $backedUpVariables = array_pop($backupFrames);
+    foreach ($backedUpVariables as $key => $value) {
+      if (array_key_exists($key, $params)) {
+        $smarty->assign($key, $value);
+      }
+      else {
+        $smarty->clearAssign($key);
+      }
+    }
   }
 
   return $content;
diff --git a/www/modules/civicrm/CRM/Core/Smarty/plugins/block.crmUpgradeSnapshot.php b/www/modules/civicrm/CRM/Core/Smarty/plugins/block.crmUpgradeSnapshot.php
index 44571c14e..cd21377dc 100644
--- a/www/modules/civicrm/CRM/Core/Smarty/plugins/block.crmUpgradeSnapshot.php
+++ b/www/modules/civicrm/CRM/Core/Smarty/plugins/block.crmUpgradeSnapshot.php
@@ -45,7 +45,7 @@ function smarty_block_crmUpgradeSnapshot($params, $text, &$smarty, &$repeat) {
   if (empty($params['name'])) {
     throw new \CRM_Core_Exception('Failed to process {crmUpgradeSnapshot}: Missing name');
   }
-  if (empty($smarty->get_template_vars('upgradeRev'))) {
+  if (empty($smarty->getTemplateVars('upgradeRev'))) {
     throw new \CRM_Core_Exception('Failed to process {crmUpgradeSnapshot}: Upgrade context required. $upgradeRev missing.');
   }
   if (!preg_match(';^\s*select\s;i', $text)) {
@@ -53,7 +53,7 @@ function smarty_block_crmUpgradeSnapshot($params, $text, &$smarty, &$repeat) {
   }
 
   $owner = $params['owner'] ?? 'civicrm';
-  $revParts = explode('.', $smarty->get_template_vars('upgradeRev'));
+  $revParts = explode('.', $smarty->getTemplateVars('upgradeRev'));
   $queries = CRM_Upgrade_Snapshot::createSingleTask($owner, $revParts[0] . '.' . $revParts[1], $params['name'], $text);
   return $queries ? (implode(";\n", $queries) . ";\n") : "";
 }
diff --git a/www/modules/civicrm/CRM/Core/Smarty/plugins/block.localize.php b/www/modules/civicrm/CRM/Core/Smarty/plugins/block.localize.php
index 6b7f357d8..7d748271b 100644
--- a/www/modules/civicrm/CRM/Core/Smarty/plugins/block.localize.php
+++ b/www/modules/civicrm/CRM/Core/Smarty/plugins/block.localize.php
@@ -38,13 +38,13 @@ function smarty_block_localize($params, $text, $smarty, &$repeat) {
     // For opening tag text is always null
     return '';
   }
-  $multiLingual = method_exists($smarty, 'get_template_vars') ? $smarty->get_template_vars('multilingual') : $smarty->getTemplateVars('multilingual');
+  $multiLingual = $smarty->getTemplateVars('multilingual');
   if (!$multiLingual) {
     return $text;
   }
 
   $lines = [];
-  $locales = (array) (method_exists($smarty, 'get_template_vars') ? $smarty->get_template_vars('locales') : $smarty->getTemplateVars('locales'));
+  $locales = (array) $smarty->getTemplateVars('locales');
   foreach ($locales as $locale) {
     $line = $text;
     if (isset($params['field'])) {
diff --git a/www/modules/civicrm/CRM/Core/Smarty/plugins/block.ts.php b/www/modules/civicrm/CRM/Core/Smarty/plugins/block.ts.php
index 3c0016c6d..14b7ddd72 100644
--- a/www/modules/civicrm/CRM/Core/Smarty/plugins/block.ts.php
+++ b/www/modules/civicrm/CRM/Core/Smarty/plugins/block.ts.php
@@ -37,14 +37,7 @@
  */
 function smarty_block_ts($params, $text, &$smarty, &$repeat) {
   if (!$repeat) {
-    $extensionKey = '';
-    if (method_exists($smarty, 'getTemplateVars')) {
-      $extensionKey = $smarty->getTemplateVars('extensionKey');
-    }
-    else {
-      // Transitional support for Smarty2 still being used in GenCode.
-      $extensionKey = $smarty->get_template_vars('extensionKey');
-    }
+    $extensionKey = $smarty->getTemplateVars('extensionKey');
     if (!isset($params['domain']) && $extensionKey) {
       $params['domain'] = is_array($extensionKey) ? $extensionKey : [$extensionKey, NULL];
     }
diff --git a/www/modules/civicrm/CRM/Core/Smarty/plugins/function.crmAPI.php b/www/modules/civicrm/CRM/Core/Smarty/plugins/function.crmAPI.php
index 26fe83405..95c925e3e 100644
--- a/www/modules/civicrm/CRM/Core/Smarty/plugins/function.crmAPI.php
+++ b/www/modules/civicrm/CRM/Core/Smarty/plugins/function.crmAPI.php
@@ -22,6 +22,8 @@
  * @return string|void
  */
 function smarty_function_crmAPI($params, &$smarty) {
+  CRM_Core_Smarty_UserContentPolicy::assertTagAllowed('crmAPI');
+
   if (!array_key_exists('entity', $params)) {
     $smarty->trigger_error("assign: missing 'entity' parameter");
     return "crmAPI: missing 'entity' parameter";
diff --git a/www/modules/civicrm/CRM/Core/Smarty/plugins/function.crmSqlData.php b/www/modules/civicrm/CRM/Core/Smarty/plugins/function.crmSqlData.php
index 3336fdd03..1842eede4 100644
--- a/www/modules/civicrm/CRM/Core/Smarty/plugins/function.crmSqlData.php
+++ b/www/modules/civicrm/CRM/Core/Smarty/plugins/function.crmSqlData.php
@@ -27,11 +27,9 @@
  * @internal
  */
 function smarty_function_crmSqlData($params, &$smarty) {
-  if ($smarty->security) {
-    throw new \CRM_Core_Exception("crmSqlData not allowed in secure mode");
-    // In theory, there's nothing actually wrong with running in secure more. We just don't need it.
-    // If that changes, then be sure to double-check that the file-name sanitization is good.
-  }
+  CRM_Core_Smarty_UserContentPolicy::assertTagAllowed('crmSqlData');
+  // In theory, there's nothing actually wrong with running in secure more. We just don't need it.
+  // If that changes, then be sure to double-check that the file-name sanitization is good.
 
   $civicrmDir = dirname(__DIR__, 4);
   $files = glob($civicrmDir . DIRECTORY_SEPARATOR . $params['file']);
diff --git a/www/modules/civicrm/CRM/Core/Smarty/plugins/function.help.php b/www/modules/civicrm/CRM/Core/Smarty/plugins/function.help.php
index 4bf211be6..360e6c82e 100644
--- a/www/modules/civicrm/CRM/Core/Smarty/plugins/function.help.php
+++ b/www/modules/civicrm/CRM/Core/Smarty/plugins/function.help.php
@@ -16,17 +16,24 @@
  */
 
 /**
- * Adds inline help
+ * Adds inline help.
+ *
+ * This function adds a call to the js function which loads the help text in a pop-up.
+ *
+ * It does a lot of work to get the title which it passes into the crmHelp function
+ * but the main reason it gets that title is because it adds that to the css as
+ * title & aria-label. Since it's loaded it somewhat makes sense to pass it into
+ * CRM.help but .. it's confusing.
  *
  * @param array $params
  *   The function params.
- * @param CRM_Core_Smarty $smarty
- *   Reference to the smarty object.
+ * @param Smarty $smarty
+ *   Smarty object.
  *
  * @return string
  *   the help html to be inserted
  */
-function smarty_function_help($params, &$smarty) {
+function smarty_function_help($params, $smarty) {
   if (!isset($params['id']) || !isset($smarty->getTemplateVars()['config'])) {
     return NULL;
   }
@@ -41,7 +48,11 @@ function smarty_function_help($params, &$smarty) {
   $params['file'] = str_replace(['.tpl', '.hlp'], '', $params['file']);
   $fieldID = str_replace('-', '_', preg_replace('/^id-/', '', $params['id']));
 
-  if (empty($params['title'])) {
+  if (!empty($params['title'])) {
+    // Passing in title is preferable..... ideally we would always pass in title & remove from the .hlp files....
+    $helpTextTitle = trim(strip_tags($params['title'])) ?: $vars['form'][$fieldID]['textLabel'] ?? '';
+  }
+  else {
     $vars = $smarty->getTemplateVars();
 
     // The way this works is a bit bonkers. All the .hlp files are expecting an
@@ -62,28 +73,36 @@ function smarty_function_help($params, &$smarty) {
       // overwrite it, so only do this if not already set.
       $temporary_vars += ['params' => []];
     }
-    // Note fetchWith adds the temporary ones to the existing scope but then
-    // will reset, unsetting them if not already present before, which is what
-    // we want here.
-    $name = trim($smarty->fetchWith($params['file'] . '.hlp', $temporary_vars)) ?: $vars['form'][$fieldID]['textLabel'] ?? '';
-    $additionalTPLFile = $params['file'] . '.extra.hlp';
-    if ($smarty->template_exists($additionalTPLFile)) {
-      $extraoutput = trim($smarty->fetch($additionalTPLFile));
-      if ($extraoutput) {
-        // Allow override param to replace default text e.g. {hlp id='foo' override=1}
-        $name = ($smarty->getTemplateVars('override_help_text') || empty($name)) ? $extraoutput : $name . ' ' . $extraoutput;
+
+    $helpFile = $params['file'] . '.hlp';
+    $additionalFile = $params['file'] . '.extra.hlp';
+    $coreSmarty = CRM_Core_Smarty::singleton();
+    $directories = $coreSmarty->getTemplateDir();
+    $helpText = '';
+    foreach ($directories as $directory) {
+      if (CRM_Utils_File::isIncludable($directory . $helpFile)) {
+        $helpText = file_get_contents($directory . $helpFile);
+        break;
       }
     }
-
-    // Ensure we didn't change any existing vars CRM-11900
-    foreach ($vars as $key => $value) {
-      if ($smarty->getTemplateVars($key) !== $value) {
-        $smarty->assign($key, $value);
+    $additionalTexts = [];
+    foreach ($directories as $directory) {
+      if (CRM_Utils_File::isIncludable($directory . $additionalFile)) {
+        $additionalTexts[] = file_get_contents($directory . $additionalFile);
+        break;
       }
     }
-  }
-  else {
-    $name = trim(strip_tags($params['title'])) ?: $vars['form'][$fieldID]['textLabel'] ?? '';
+    try {
+      $coreSmarty->pushScope($temporary_vars);
+      $helpTextTitle = trim(CRM_Utils_String::parseOneOffStringThroughSmarty($helpText) ?: $vars['form'][$fieldID]['textLabel'] ?? '');
+      foreach ($additionalTexts as $additionalText) {
+        $additionalTextTitle = trim(CRM_Utils_String::parseOneOffStringThroughSmarty($additionalText));
+        $helpTextTitle = ($smarty->getTemplateVars('override_help_text') || empty($helpTextTitle)) ? $additionalTextTitle : $helpTextTitle . ' ' . $additionalTextTitle;
+      }
+    }
+    finally {
+      $coreSmarty->popScope();
+    }
   }
 
   $class = "helpicon";
@@ -92,14 +111,14 @@ function smarty_function_help($params, &$smarty) {
   }
 
   // Escape for html
-  $title = htmlspecialchars(ts('%1 Help', [1 => $name]));
+  $title = htmlspecialchars(ts('%1 Help', [1 => $helpTextTitle]));
   // Escape for html and js
-  $name = htmlspecialchars(json_encode($name), ENT_QUOTES);
+  $helpTextTitle = htmlspecialchars(json_encode($helpTextTitle), ENT_QUOTES);
 
   // Format params to survive being passed through json & the url
   unset($params['text'], $params['title']);
   foreach ($params as &$param) {
     $param = is_bool($param) || is_numeric($param) ? (int) $param : (string) $param;
   }
-  return '<a class="' . $class . '" title="' . $title . '" aria-label="' . $title . '" href="#" onclick=\'CRM.help(' . $name . ', ' . json_encode($params) . '); return false;\'>&nbsp;</a>';
+  return '<a class="' . $class . '" title="' . $title . '" aria-label="' . $title . '" href="#" onclick=\'CRM.help(' . $helpTextTitle . ', ' . json_encode($params) . '); return false;\'>&nbsp;</a>';
 }
diff --git a/www/modules/civicrm/CRM/Core/Smarty/plugins/modifier.crmEscapeSingleQuotes.php b/www/modules/civicrm/CRM/Core/Smarty/plugins/modifier.crmEscapeSingleQuotes.php
new file mode 100644
index 000000000..90a90e3c9
--- /dev/null
+++ b/www/modules/civicrm/CRM/Core/Smarty/plugins/modifier.crmEscapeSingleQuotes.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+/**
+ * Smarty escape single quotes.
+ *
+ * This is hopefully a transitional plugin to get us past conflicts while
+ * we migrate from Smarty2 to Smarty 3. Potentially after that we can use
+ * {$field.comment|replace:"'":"\'"} again...
+ *
+ * @internal - may disappear again!!!
+ * @param string $string
+ *
+ * @return string
+ */
+function smarty_modifier_crmEscapeSingleQuotes($string) {
+  return str_replace("'", "\'", $string);
+}
diff --git a/www/modules/civicrm/CRM/Core/SmartyCompatibility.php b/www/modules/civicrm/CRM/Core/SmartyCompatibility.php
index d12f40105..7d27b873f 100644
--- a/www/modules/civicrm/CRM/Core/SmartyCompatibility.php
+++ b/www/modules/civicrm/CRM/Core/SmartyCompatibility.php
@@ -18,32 +18,37 @@
 /**
  * Smarty Compatibility class.
  *
- * This class implements but Smarty v2 & Smarty v3 functions so that
+ * This class implements both Smarty v2 & Smarty v3+ functions so that
  *
  * 1) we can start to transition functions like `$smarty->assign_var` to
  * `$smarty->assignVar()`
- * 2) if someone adds the Smarty3 package onto their site and
- * defines CIVICRM_SMARTY3_AUTOLOAD_PATH then Smarty3 will load from that
+ * 2) if someone defines CIVICRM_SMARTY_AUTOLOAD_PATH then Smarty will load from that
  * location.
  *
- * Note that experimenting with `CIVICRM_SMARTY3_AUTOLOAD_PATH` will not
+ * Note that experimenting with `CIVICRM_SMARTY_AUTOLOAD_PATH` will not
  * go well if extensions are installed that have not run civix upgrade
  * somewhat recently (ie have the old version of the hook_civicrm_config
  * with reference to `$template =& CRM_Core_Smarty::singleton();`
  */
 
+/**
+ * Get the path to load Smarty.
+ *
+ * @return string|null
+ */
+function crm_smarty_compatibility_get_path() {
+  return CRM_Utils_Constant::value('CIVICRM_SMARTY_AUTOLOAD_PATH') ?: CRM_Utils_Constant::value('CIVICRM_SMARTY3_AUTOLOAD_PATH');
+}
+
 /**
  * Fix for bug CRM-392. Not sure if this is the best fix or it will impact
  * other similar PEAR packages. doubt it
  */
 if (!class_exists('Smarty')) {
-  if (defined('CIVICRM_SMARTY3_AUTOLOAD_PATH')) {
-    // @todo - this is experimental but it allows someone to
-    // get Smarty3 to load instead of Smarty2 if set.
-    // It is likely the final Smarty3 solution will look
-    // different but this makes testing possible without re-inventing
-    // it each time we try...
-    require_once CIVICRM_SMARTY3_AUTOLOAD_PATH;
+  $path = crm_smarty_compatibility_get_path();
+  if ($path) {
+    // Specify the smarty version to load.
+    require_once $path;
   }
   else {
     require_once 'Smarty/Smarty.class.php';
@@ -55,14 +60,6 @@
  */
 class CRM_Core_SmartyCompatibility extends Smarty {
 
-  public function loadFilter($type, $name) {
-    if (method_exists(parent::class, 'load_filter')) {
-      parent::load_filter($type, $name);
-      return;
-    }
-    parent::loadFilter($type, $name);
-  }
-
   /**
    * @deprecated
    *
@@ -76,6 +73,7 @@ public function load_filter($type, $name) {
       parent::load_filter($type, $name);
       return;
     }
+    CRM_Core_Error::deprecatedWarning('loadFilter');
     parent::loadFilter($type, $name);
   }
 
@@ -92,22 +90,15 @@ public function register_modifier($modifier, $modifier_impl) {
       parent::register_modifier($modifier, $modifier_impl);
       return;
     }
+    CRM_Core_Error::deprecatedWarning('registerPlugin');
     parent::registerPlugin('modifier', $modifier, $modifier_impl);
   }
 
-  public function registerPlugin($type, $name, $callback, $cacheable = TRUE, $cache_attr = NULL) {
-    if (method_exists(parent::class, 'registerPlugin')) {
-      parent::registerPlugin($type, $name, $callback, $cacheable = TRUE, $cache_attr = NULL);
-      return;
-    }
-    if ($type === 'modifier') {
-      parent::register_modifier($name, $callback);
-    }
-  }
-
   /**
    * Registers a resource to fetch a template
    *
+   * @deprecated
+   *
    * @param string $type name of resource
    * @param array $functions array of functions to handle resource
    */
@@ -116,12 +107,19 @@ public function register_resource($type, $functions) {
       parent::register_resource($type, $functions);
       return;
     }
+    if ($type === 'string') {
+      // Not valid / required for Smarty3+
+      return;
+    }
+    CRM_Core_Error::deprecatedWarning('registerResource');
     parent::registerResource($type, $functions);
   }
 
   /**
    * Registers custom function to be used in templates
    *
+   * @deprecated
+   *
    * @param string $function the name of the template function
    * @param string $function_impl the name of the PHP function to register
    * @param bool $cacheable
@@ -134,12 +132,15 @@ public function register_function($function, $function_impl, $cacheable = TRUE,
       parent::register_function($function, $function_impl, $cacheable = TRUE, $cache_attrs = NULL);
       return;
     }
+    CRM_Core_Error::deprecatedWarning('registerPlugin');
     parent::registerPlugin('function', $function, $function, $cacheable, $cache_attrs);
   }
 
   /**
    * Returns an array containing template variables
    *
+   * @deprecated since 5.69 will be removed around 5.79
+   *
    * @param string $name
    *
    * @return array
@@ -152,40 +153,19 @@ public function &get_template_vars($name = NULL) {
     return $var;
   }
 
-  /**
-   * Returns a single or all template variables
-   *
-   * @api  Smarty::getTemplateVars()
-   * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
-   *
-   * @param string $varName variable name or NULL
-   * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr optional pointer to data object
-   * @param bool $searchParents include parent templates?
-   *
-   * @return mixed variable value or or array of variables
-   */
-  public function getTemplateVars($varName = NULL, Smarty_Internal_Data $_ptr = NULL, $searchParents = TRUE) {
-    if (method_exists(parent::class, 'getTemplateVars')) {
-      return parent::getTemplateVars($varName, $_ptr, $searchParents);
-    }
-    return parent::get_template_vars($varName);
-  }
-
   /**
    * Generally Civi mis-uses this for perceived php4 conformance, avoid.
    *
    * @deprecated
    * @param string $tpl_var
    * @param mixed $value
-   *
-   * @return mixed|null|void
    */
   public function assign_by_ref($tpl_var, &$value) {
     if (method_exists(parent::class, 'assign_by_ref')) {
       parent::assign_by_ref($tpl_var, $value);
       return;
     }
-    return parent::assignByRef($tpl_var, $value);
+    $this->assign($tpl_var, $value);
   }
 
   /**
@@ -219,19 +199,4 @@ public function template_exists($tpl_file) {
     return parent::templateExists($tpl_file);
   }
 
-  /**
-   * Check if a template resource exists
-   *
-   * @param string $resource_name template name
-   *
-   * @return bool status
-   * @throws \SmartyException
-   */
-  public function templateExists($resource_name) {
-    if (method_exists(parent::class, 'templateExists')) {
-      return parent::templateExists($resource_name);
-    }
-    return parent::template_exists($resource_name);
-  }
-
 }
diff --git a/www/modules/civicrm/CRM/Core/WorkflowMessage/Profile/Profile.php b/www/modules/civicrm/CRM/Core/WorkflowMessage/Profile/Profile.php
new file mode 100644
index 000000000..bd5427278
--- /dev/null
+++ b/www/modules/civicrm/CRM/Core/WorkflowMessage/Profile/Profile.php
@@ -0,0 +1,74 @@
+<?php
+
+use Civi\Api4\UFField;
+use Civi\Api4\UFGroup;
+use Civi\Api4\WorkflowMessage;
+use Civi\Test;
+use Civi\WorkflowMessage\WorkflowMessageExample;
+
+/**
+ * Basic profile example.
+ *
+ * @noinspection PhpUnused
+ * @noinspection UnknownInspectionInspection
+ */
+class CRM_Core_WorkflowMessage_Profile_Profile extends WorkflowMessageExample {
+
+  /**
+   * Get the examples this class is able to deliver.
+   */
+  public function getExamples(): iterable {
+    $workflows = ['uf_notify'];
+    foreach ($workflows as $workflow) {
+      yield [
+        'name' => 'workflow/' . $workflow . '/general',
+        'title' => ts('Profile Notification'),
+        'tags' => ['preview'],
+        'workflow' => $workflow,
+      ];
+    }
+  }
+
+  /**
+   * Build an example to use when rendering the workflow.
+   *
+   * @param array $example
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function build(array &$example): void {
+    $workFlow = WorkflowMessage::get(TRUE)->addWhere('name', '=', $example['workflow'])->execute()->first();
+    $this->setWorkflowName($workFlow['name']);
+    $messageTemplate = new $workFlow['class']();
+    $this->addExampleData($messageTemplate, $example);
+    $example['data'] = $this->toArray($messageTemplate);
+  }
+
+  /**
+   * Add relevant example data.
+   *
+   * @param \CRM_Core_WorkflowMessage_UFNotify $messageTemplate
+   * @param array $example
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \Civi\API\Exception\UnauthorizedException
+   */
+  private function addExampleData(\CRM_Core_WorkflowMessage_UFNotify $messageTemplate, $example): void {
+    $contact = Test::example('entity/Contact/Barb');
+    $messageTemplate->setContact($contact);
+    $profile = UFGroup::get(FALSE)->setLimit(1)->execute()->first();
+    $fields = UFField::get(FALSE)->addWhere('id', '=', $profile['id'])->execute();
+    $values = [];
+    foreach ($fields as $field) {
+      if (isset($contact[$field['field_name']])) {
+        $values[$field['label']] = $contact[$field['field_name']];
+      }
+      else {
+        $values[$field['label']] = ts('User entered field');
+      }
+    }
+    $messageTemplate->setProfileID($profile['id']);
+    $messageTemplate->setProfileFields($values);
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Core/WorkflowMessage/UFNotify.php b/www/modules/civicrm/CRM/Core/WorkflowMessage/UFNotify.php
new file mode 100644
index 000000000..7ae0fb13a
--- /dev/null
+++ b/www/modules/civicrm/CRM/Core/WorkflowMessage/UFNotify.php
@@ -0,0 +1,86 @@
+<?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       |
+ +--------------------------------------------------------------------+
+ */
+
+use Civi\WorkflowMessage\GenericWorkflowMessage;
+
+/**
+ * Receipt sent when someone receives a copy of profile that has been filled out.
+ *
+ * @method int getProfileID()
+ * @method $this setProfileID(int $profileID)
+ * @method array getProfileFields()
+ * @method $this setProfileFields(array $profileFields)
+ *
+ * @support template-only
+ *
+ * @see CRM_Core_BAO_UFGroup::commonSendMail
+ */
+class CRM_Core_WorkflowMessage_UFNotify extends GenericWorkflowMessage {
+  public const WORKFLOW = 'uf_notify';
+
+  /**
+   * @var int
+   *
+   * @scope tplParams
+   */
+  protected $profileID;
+
+  /**
+   * @var array
+   *
+   * @scope tplParams as values
+   */
+  protected $profileFields;
+
+  /**
+   * @var string
+   *
+   * @scope tplParams
+   */
+  protected $contactLink;
+
+  public function getContactLink(): string {
+    return CRM_Utils_System::url('civicrm/contact/view',
+      "reset=1&cid=" . $this->getContactID(),
+      TRUE, NULL, FALSE, FALSE, TRUE
+    );
+  }
+
+  /**
+   * @var string
+   *
+   * @scope tplParams as grouptitle
+   */
+  protected $groupTitle;
+
+  public function getGroupTitle(): string {
+    return CRM_Core_DAO::getFieldValue('CRM_Core_DAO_UFGroup', $this->getProfileID(), 'frontend_title');
+  }
+
+  /**
+   * @var string
+   *
+   * @scope tplParams
+   */
+  protected $userDisplayName;
+
+  public function getUserDisplayName(): string {
+    $loggedInUser = CRM_Core_Session::getLoggedInContactID();
+    if (!$loggedInUser) {
+      return '';
+    }
+    return CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact',
+      $loggedInUser,
+      'display_name'
+    );
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Core/xml/Menu/Admin.xml b/www/modules/civicrm/CRM/Core/xml/Menu/Admin.xml
index 7a8f4e009..e6db4eb28 100644
--- a/www/modules/civicrm/CRM/Core/xml/Menu/Admin.xml
+++ b/www/modules/civicrm/CRM/Core/xml/Menu/Admin.xml
@@ -234,8 +234,6 @@
      <path>civicrm/admin/setting/preferences/date/edit</path>
      <title>Date Preferences</title>
      <page_callback>CRM_Admin_Form_PreferencesDate</page_callback>
-     <adminGroup>Customize Data and Screens</adminGroup>
-     <weight>97</weight>
   </item>
   <item>
      <path>civicrm/admin/menu</path>
@@ -599,8 +597,10 @@
   </item>
   <item>
      <path>civicrm/admin/setting/preferences/date</path>
-     <title>View Date Preferences</title>
+     <title>Date Preferences</title>
      <page_callback>CRM_Admin_Page_PreferencesDate</page_callback>
+     <adminGroup>Customize Data and Screens</adminGroup>
+     <weight>97</weight>
   </item>
 
   <item>
diff --git a/www/modules/civicrm/CRM/Core/xml/Menu/Contact.xml b/www/modules/civicrm/CRM/Core/xml/Menu/Contact.xml
index 5de7c2814..d1117bbdc 100644
--- a/www/modules/civicrm/CRM/Core/xml/Menu/Contact.xml
+++ b/www/modules/civicrm/CRM/Core/xml/Menu/Contact.xml
@@ -238,11 +238,6 @@
      <page_callback>CRM_Contact_Page_AJAX::groupTree</page_callback>
      <access_arguments>access CiviCRM</access_arguments>
 </item>
-<item>
-     <path>civicrm/ajax/custom</path>
-     <page_callback>CRM_Contact_Page_AJAX::customField</page_callback>
-     <access_arguments>access CiviCRM</access_arguments>
-</item>
 <item>
      <path>civicrm/ajax/customvalue</path>
      <page_callback>CRM_Contact_Page_AJAX::deleteCustomValue</page_callback>
@@ -259,11 +254,6 @@
      <page_callback>CRM_Contact_Page_AJAX::getContactEmail</page_callback>
      <access_callback>1</access_callback>
 </item>
-<item>
-     <path>civicrm/ajax/checkphone</path>
-     <page_callback>CRM_Contact_Page_AJAX::getContactPhone</page_callback>
-     <access_callback>1</access_callback>
-</item>
 <item>
      <path>civicrm/ajax/subtype</path>
      <page_callback>CRM_Contact_Page_AJAX::buildSubTypes</page_callback>
diff --git a/www/modules/civicrm/CRM/Core/xml/Menu/Import.xml b/www/modules/civicrm/CRM/Core/xml/Menu/Import.xml
index da0202ec7..03b15699b 100644
--- a/www/modules/civicrm/CRM/Core/xml/Menu/Import.xml
+++ b/www/modules/civicrm/CRM/Core/xml/Menu/Import.xml
@@ -6,7 +6,7 @@
      <title>Import</title>
      <access_arguments>import contacts,access CiviCRM</access_arguments>
      <page_type>1</page_type>
-     <page_callback>CRM_Contact_Import_Controller</page_callback>
+     <page_callback>CRM_Import_Controller</page_callback>
      <weight>400</weight>
   </item>
   <item>
@@ -14,7 +14,7 @@
      <title>Import Contacts</title>
      <access_arguments>import contacts,access CiviCRM</access_arguments>
      <page_type>1</page_type>
-     <page_callback>CRM_Contact_Import_Controller</page_callback>
+     <page_callback>CRM_Import_Controller</page_callback>
      <weight>410</weight>
   </item>
   <item>
@@ -36,13 +36,13 @@
      <title>Import Activities</title>
      <access_arguments>import contacts,access CiviCRM</access_arguments>
      <page_type>1</page_type>
-     <page_callback>CRM_Activity_Import_Controller</page_callback>
+     <page_callback>CRM_Import_Controller</page_callback>
      <weight>420</weight>
   </item>
   <item>
     <path>civicrm/import/contribution</path>
     <title>Import Contributions</title>
-    <page_callback>CRM_Contribute_Import_Controller</page_callback>
+    <page_callback>CRM_Import_Controller</page_callback>
     <access_arguments>access CiviContribute,edit contributions</access_arguments>
     <page_type>1</page_type>
     <weight>520</weight>
@@ -53,7 +53,8 @@
      <title>Import Multi-value Custom Data</title>
      <access_arguments>access CiviCRM</access_arguments>
      <page_type>1</page_type>
-     <page_callback>CRM_Custom_Import_Controller</page_callback>
+     <page_callback>CRM_Import_Controller</page_callback>
+     <page_arguments>class_prefix=CRM_Custom_Import</page_arguments>
      <weight>420</weight>
   </item>
   <item>
diff --git a/www/modules/civicrm/CRM/Custom/Form/CustomData.php b/www/modules/civicrm/CRM/Custom/Form/CustomData.php
index 94b9fb418..98c1781a6 100644
--- a/www/modules/civicrm/CRM/Custom/Form/CustomData.php
+++ b/www/modules/civicrm/CRM/Custom/Form/CustomData.php
@@ -16,18 +16,15 @@
  */
 
 /**
- * this class builds custom data
+ * Deprecated class no longer used in core.
+ *
+ * @deprecated since 5.72 will be removed around 5.92
  */
 class CRM_Custom_Form_CustomData {
 
   /**
    * Generic wrapper to add custom data to a form via a single line in preProcess.
    *
-   * $this->getDefaultEntity() must be defined for the form class for this to work.
-   *
-   * If the postProcess form cannot use the api & instead uses a BAO function it will need.
-   *   $params['custom'] = CRM_Core_BAO_CustomField::postProcess($submitted, $this->_id, $this->getDefaultEntity());
-   *
    * @param CRM_Core_Form $form
    * @param null|string $entitySubType values stored in civicrm_custom_group.extends_entity_column_value
    *   e.g Student for contact type
@@ -36,6 +33,23 @@ class CRM_Custom_Form_CustomData {
    * @param null|int $contact_id contact ID associated with the custom data.
    *
    * @throws \CRM_Core_Exception
+   * @deprecated - preferred code now is to add to ensure the tpl loads custom
+   * data using the ajax template & add code to `buildForm()` like this
+   *
+   * ```
+   * if ($this->isSubmitted()) {
+   *   $this->addCustomDataFieldsToForm('Membership', array_filter([
+   *   'id' => $this->getMembershipID(),
+   *   'membership_type_id' => $this->getSubmittedValue('membership_type_id')
+   * ]));
+   * }
+   * ```
+   *
+   * $this->getDefaultEntity() must be defined for the form class for this to work.
+   *
+   * If the postProcess form cannot use the api & instead uses a BAO function it will need.
+   *   $params['custom'] = CRM_Core_BAO_CustomField::postProcess($submitted, $this->_id, $this->getDefaultEntity());
+   *
    */
   public static function addToForm(&$form, $entitySubType = NULL, $subName = NULL, $groupCount = 1, $contact_id = NULL) {
     $entityName = $form->getDefaultEntity();
@@ -58,11 +72,6 @@ public static function addToForm(&$form, $entitySubType = NULL, $subName = NULL,
         self::setDefaultValues($form);
       }
     }
-    // need to assign custom data type and subtype to the template
-    $form->assign('customDataType', $entityName);
-    $form->assign('customDataSubType', $entitySubType);
-    $form->assign('entityID', $entityID);
-    $form->assign('cid', $contact_id);
   }
 
   /**
@@ -78,6 +87,15 @@ public static function addToForm(&$form, $entitySubType = NULL, $subName = NULL,
    * @param bool $isLoadFromCache
    *
    * @throws \CRM_Core_Exception
+   *
+   * @deprecated see https://github.com/civicrm/civicrm-core/pull/29241 for preferred approach - basically
+   * 1) at the tpl layer use CRM/common/customDataBlock.tpl
+   * 2) to make the fields available for postProcess
+   * if ($this->isSubmitted()) {
+   *   $this->addCustomDataFieldsToForm('FinancialAccount');
+   * }
+   * 3) pass getSubmittedValues() to CRM_Core_BAO_CustomField::postProcess($this->getSubmittedValues(), $this->_id, 'FinancialAccount');
+   *  to ensure any money or number fields are handled for localisation
    */
   public static function preProcess(
     &$form, $extendsEntityColumn = NULL, $subType = NULL,
diff --git a/www/modules/civicrm/CRM/Custom/Form/CustomDataTrait.php b/www/modules/civicrm/CRM/Custom/Form/CustomDataTrait.php
index b3d9bbc7f..f17fb922f 100644
--- a/www/modules/civicrm/CRM/Custom/Form/CustomDataTrait.php
+++ b/www/modules/civicrm/CRM/Custom/Form/CustomDataTrait.php
@@ -1 +1,151 @@
 <?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 trait supports adding custom data to forms.
+ *
+ * @internal
+ */
+trait CRM_Custom_Form_CustomDataTrait {
+
+  /**
+   * Add custom data fields to the form.
+   *
+   * This function takes responsibility for registering the appropriate fields with QuickForm.
+   *
+   * It does not assign variables to the smarty layer to assist with rendering or setDefaults.
+   * Those additional steps are not required on the 'main form' when the CustomDataForm is
+   * being rendered by ajax as that process takes care of the presentation.
+   *
+   * However, the fields need to be registered with QuickForm to ensure that on submit
+   * they are 'accepted' by quick form. Quick form validates the contents of $_POST
+   * and only fields that have been registered make it through to the values
+   * available in `$form->getSubmittedValues()`.
+   *
+   * @internal this is not supported for use outside of core and there is no guarantee the
+   * function signature or behaviour won't change. It you use if from outside core
+   * be sure to use unit tests in your non-core use.
+   *
+   * @param string $entity
+   * @param array $filters
+   *   Filters is only needed for entities where CustomDataGroups may be filtered.
+   *   e.g Activity custom data groups might be available for only some entity types.
+   *   In that case the filters would hold the id (if any) of the entity and the
+   *   activity_type_id if known.
+   *
+   * @throws \CRM_Core_Exception
+   */
+  protected function addCustomDataFieldsToForm(string $entity, array $filters = []): void {
+    $fields = (array) civicrm_api4($entity, 'getFields', [
+      'action' => 'create',
+      'values' => $filters,
+      'where' => [
+        ['type', '=', 'Custom'],
+        ['readonly', '=', FALSE],
+      ],
+      'checkPermissions' => TRUE,
+    ])->indexBy('custom_field_id');
+    $fieldFilters = ['style' => 'Inline'];
+    if ($entity === 'Contact') {
+      // Ideally this would not be contact specific but the function being
+      // called here does not handle the filters as received.
+      $fieldFilters += [
+        'extends' => [$entity, $filters['contact_type']],
+        'is_multiple' => TRUE,
+      ];
+      if (!empty($filters['contact_sub_type'])) {
+        $fieldFilters['extends_entity_column_value'] = [NULL, $filters['contact_sub_type']];
+      }
+
+      $multipleCustomGroups = CRM_Core_BAO_CustomGroup::getAll($fieldFilters);
+      foreach ($multipleCustomGroups as $multipleCustomGroup) {
+        foreach ($multipleCustomGroup['fields'] as $groupField) {
+          $groupField['custom_group_id.is_multiple'] = TRUE;
+          $groupField['table_name'] = $multipleCustomGroup['table_name'];
+          $groupField['custom_field_id'] = $groupField['id'];
+          $groupField['required'] = $groupField['is_required'];
+          $groupField['input_type'] = $groupField['html_type'];
+          $fields[$groupField['id']] = $groupField;
+        }
+      }
+    }
+
+    $formValues = [];
+    foreach ($fields as $field) {
+      // Here we add the custom fields to the form
+      // based on whether they have been 'POSTed'
+      foreach ($this->getInstancesOfField($field['custom_field_id']) as $elementName) {
+        $formValues[$elementName] = $this->addCustomField($elementName, $field);
+      }
+    }
+    $qf = $this->get('qfKey');
+    $this->assign('qfKey', $qf);
+    // We cached the POSTed values so that they can be reloaded
+    // if the form fails to submit. Note that we may be combining the
+    // values with those stored by other custom field entities on the
+    // form.
+    $defaultValues = (array) Civi::cache('customData')->get($qf);
+    Civi::cache('customData')->set($qf, $formValues + $defaultValues);
+  }
+
+  /**
+   * Get the instances of the given field in $_POST to determine how many to add to the form.
+   *
+   * @param int $id
+   *
+   * @return array
+   */
+  private function getInstancesOfField($id): array {
+    $instances = [];
+    foreach (array_merge($_POST, ($_FILES ?? [])) as $key => $value) {
+      if (preg_match('/^custom_' . $id . '_?(-?\d+)?$/', $key)) {
+        $instances[] = $key;
+      }
+    }
+    return $instances;
+  }
+
+  /**
+   * Add the given field to the form.
+   *
+   * @param string $elementName
+   * @param array $field
+   *
+   * @return mixed
+   *
+   * @throws \CRM_Core_Exception
+   *
+   * @internal this is not supported for use outside of core and there is no guarantee the
+   *  function signature or behaviour won't change. It you use if from outside core
+   *  be sure to use unit tests in your non-core use.
+   */
+  protected function addCustomField(string $elementName, array $field) {
+    // Note that passing required = TRUE here does not seem to actually do anything. As long
+    // as the form opens in pop up mode jquery validation from the ajax form ensures required fields are
+    // submitted. In non-popup mode however the required is not enforced. This appears to be
+    // a bug that has been around for a while.
+    CRM_Core_BAO_CustomField::addQuickFormElement($this, $elementName, $field['custom_field_id'], $field['required']);
+    if ($field['input_type'] === 'File') {
+      $this->registerFileField([$elementName]);
+    }
+    // Get any values from the POST & cache them so that they can be retrieved from the
+    // CustomDataByType form in it's setDefaultValues() function - otherwise it cannot reload the
+    // values that were just entered if validation fails.
+    return is_string($this->getSubmitValue($elementName)) ? CRM_Utils_String::purifyHTML($this->getSubmitValue($elementName)) : $this->getSubmitValue($elementName);
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Custom/Form/Field.php b/www/modules/civicrm/CRM/Custom/Form/Field.php
index ece46e555..10351a9bb 100644
--- a/www/modules/civicrm/CRM/Custom/Form/Field.php
+++ b/www/modules/civicrm/CRM/Custom/Form/Field.php
@@ -170,6 +170,7 @@ public function setDefaultValues() {
       $defaults['note_columns'] = 60;
       $defaults['note_rows'] = 4;
       $defaults['is_view'] = 0;
+      $defaults['fk_entity_on_delete'] = CRM_Core_DAO_CustomField::fields()['fk_entity_on_delete']['default'];
 
       if (CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->_gid, 'is_multiple')) {
         $defaults['in_selector'] = 1;
@@ -193,7 +194,7 @@ public function setDefaultValues() {
    */
   public function buildQuickForm() {
     if ($this->_gid) {
-      $this->_title = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->_gid, 'title');
+      $this->_title = CRM_Core_BAO_CustomGroup::getGroup(['id' => $this->_gid])['title'];
       $this->setTitle($this->_title . ' - ' . ($this->_id ? ts('Edit Field') : ts('New Field')));
     }
     $this->assign('gid', $this->_gid);
@@ -238,6 +239,8 @@ public function buildQuickForm() {
       'select' => ['minimumInputLength' => 0],
     ]);
 
+    $this->addField('fk_entity_on_delete');
+
     $isUpdateAction = $this->_action == CRM_Core_Action::UPDATE;
     if ($isUpdateAction) {
       $this->freeze('data_type');
@@ -826,7 +829,7 @@ public static function formRule($fields, $files, $self) {
           $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');
+        $table = CRM_Core_BAO_CustomGroup::getGroup(['id' => $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) {
@@ -944,7 +947,7 @@ public static function clearEmptyOptions(&$fields) {
    * @throws CRM_Core_Exception
    */
   public function getMultiValueCount() {
-    $table = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->_gid, 'table_name');
+    $table = CRM_Core_BAO_CustomGroup::getGroup(['id' => $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}'";
diff --git a/www/modules/civicrm/CRM/Custom/Import/Controller.php b/www/modules/civicrm/CRM/Custom/Import/Controller.php
deleted file mode 100644
index 0f740f59a..000000000
--- a/www/modules/civicrm/CRM/Custom/Import/Controller.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * Class CRM_Custom_Import_Controller
- */
-class CRM_Custom_Import_Controller extends CRM_Core_Controller {
-
-  /**
-   * Class constructor.
-   *
-   * @param string $title
-   * @param bool|int $action
-   * @param bool $modal
-   */
-  public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $modal = TRUE) {
-    parent::__construct($title, $modal);
-
-    set_time_limit(0);
-
-    $this->_stateMachine = new CRM_Import_StateMachine($this, $action);
-
-    // create and instantiate the pages
-    $this->addPages($this->_stateMachine, $action);
-
-    // add all the actions
-    $config = CRM_Core_Config::singleton();
-    $this->addActions($config->uploadDir, ['uploadFile']);
-  }
-
-}
diff --git a/www/modules/civicrm/CRM/Custom/Import/Parser/Api.php b/www/modules/civicrm/CRM/Custom/Import/Parser/Api.php
index 8ccef384a..da5083db0 100644
--- a/www/modules/civicrm/CRM/Custom/Import/Parser/Api.php
+++ b/www/modules/civicrm/CRM/Custom/Import/Parser/Api.php
@@ -1,15 +1,10 @@
 <?php
 
-use Civi\Api4\CustomField;
-
 /**
  * Class CRM_Custom_Import_Parser_Api
  */
 class CRM_Custom_Import_Parser_Api extends CRM_Import_Parser {
 
-  protected $_fields = [];
-  protected $_multipleCustomData = '';
-
   /**
    * Get information about the provided job.
    *
@@ -37,39 +32,18 @@ public static function getUserJobInfo(): array {
    * @param array $values
    *   The array of values belonging to this line.
    */
-  public function import($values) {
+  public function import(array $values): void {
     $rowNumber = (int) $values[array_key_last($values)];
     try {
       $params = $this->getMappedRow($values);
-      $formatted = [];
-      foreach ($params as $key => $value) {
-        if ($value !== '') {
-          $formatted[$key] = $value;
-        }
-      }
-
-      if (isset($params['external_identifier']) && !isset($params['contact_id'])) {
-        $checkCid = new CRM_Contact_DAO_Contact();
-        $checkCid->external_identifier = $params['external_identifier'];
-        $checkCid->find(TRUE);
-        $formatted['id'] = $checkCid->id;
-      }
-      else {
-        $formatted['id'] = $params['contact_id'];
-      }
-
-      $this->formatCommonData($params, $formatted);
-      foreach ($formatted['custom'] as $key => $val) {
-        $params['custom_' . $key] = $val[-1]['value'];
-      }
       $params['skipRecentView'] = TRUE;
       $params['check_permissions'] = TRUE;
-      $params['entity_id'] = $formatted['id'];
-      civicrm_api3('custom_value', 'create', $params);
-      $this->setImportStatus($rowNumber, 'IMPORTED', '', $formatted['id']);
+      $params['entity_id'] = $params['contact_id'];
+      civicrm_api3('CustomValue', 'create', $params);
+      $this->setImportStatus($rowNumber, 'IMPORTED', '', $params['contact_id']);
     }
     catch (CRM_Core_Exception $e) {
-      $this->setImportStatus($rowNumber, 'ERROR', $e->getMessage(), $formatted['id']);
+      $this->setImportStatus($rowNumber, 'ERROR', $e->getMessage(), $params['contact_id'] ?? NULL);
     }
   }
 
@@ -78,7 +52,7 @@ public function import($values) {
    */
   public function setFieldMetadata(): void {
     if (!$this->importableFieldsMetadata) {
-      $customGroupID = $this->getSubmittedValue('multipleCustomData');
+      $customGroupID = $this->getCustomGroupID();
       $importableFields = $this->getGroupFieldsForImport($customGroupID);
       $this->importableFieldsMetadata = array_merge([
         'do_not_import' => ['title' => ts('- do not import -')],
@@ -97,77 +71,6 @@ public function getRequiredFields(): array {
     return [['contact_id'], ['external_identifier']];
   }
 
-  /**
-   * Adapted from CRM_Contact_Import_Parser_Contact::formatCommonData
-   *
-   * TODO: Is this function even necessary? All values get passed to the api anyway.
-   *
-   * @param array $params
-   *   Contain record values.
-   * @param array $formatted
-   *   Array of formatted data.
-   */
-  private function formatCommonData($params, &$formatted) {
-
-    $customFields = CRM_Core_BAO_CustomField::getFields(NULL);
-
-    //now format custom data.
-    foreach ($params as $key => $field) {
-
-      if ($key == 'id' && isset($field)) {
-        $formatted[$key] = $field;
-      }
-
-      //Handling Custom Data
-      if (($customFieldID = CRM_Core_BAO_CustomField::getKeyID($key)) &&
-        array_key_exists($customFieldID, $customFields)
-      ) {
-
-        $extends = $customFields[$customFieldID]['extends'] ?? NULL;
-        $htmlType = $customFields[$customFieldID]['html_type'] ?? NULL;
-        $dataType = $customFields[$customFieldID]['data_type'] ?? NULL;
-        $serialized = CRM_Core_BAO_CustomField::isSerialized($customFields[$customFieldID]);
-
-        if (!$serialized && in_array($htmlType, ['Select', 'Radio', 'Autocomplete-Select']) && in_array($dataType, ['String', 'Int'])) {
-          $customOption = CRM_Core_BAO_CustomOption::getCustomOption($customFieldID, TRUE);
-          foreach ($customOption as $customValue) {
-            $val = $customValue['value'] ?? NULL;
-            $label = strtolower($customValue['label'] ?? '');
-            $value = strtolower(trim($formatted[$key]));
-            if (($value == $label) || ($value == strtolower($val))) {
-              $params[$key] = $formatted[$key] = $val;
-            }
-          }
-        }
-        elseif ($serialized && !empty($formatted[$key]) && !empty($params[$key])) {
-          $mulValues = explode(',', $formatted[$key]);
-          $customOption = CRM_Core_BAO_CustomOption::getCustomOption($customFieldID, TRUE);
-          $formatted[$key] = [];
-          $params[$key] = [];
-          foreach ($mulValues as $v1) {
-            foreach ($customOption as $v2) {
-              if ((strtolower($v2['label']) == strtolower(trim($v1))) ||
-                (strtolower($v2['value']) == strtolower(trim($v1)))
-              ) {
-                if ($htmlType === 'CheckBox') {
-                  $params[$key][$v2['value']] = $formatted[$key][$v2['value']] = 1;
-                }
-                else {
-                  $params[$key][] = $formatted[$key][] = $v2['value'];
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    if (!empty($key) && ($customFieldID = CRM_Core_BAO_CustomField::getKeyID($key)) && array_key_exists($customFieldID, $customFields)) {
-      // @todo calling api functions directly is not supported
-      _civicrm_api3_custom_format_params($params, $formatted, $extends);
-    }
-  }
-
   /**
    * Return the field ids and names (with groups) for import purpose.
    *
@@ -175,44 +78,38 @@ private function formatCommonData($params, &$formatted) {
    *   Custom group ID.
    *
    * @return array
-   *
-   * @noinspection PhpDocMissingThrowsInspection
-   * @noinspection PhpUnhandledExceptionInspection
    */
   private function getGroupFieldsForImport(int $customGroupID): array {
     $importableFields = [];
-    $fields = (array) CustomField::get(FALSE)
-      ->addSelect('*', 'custom_group_id.is_multiple', 'custom_group_id.name', 'custom_group_id.extends')
-      ->addWhere('custom_group_id', '=', $customGroupID)->execute();
+    $customGroup = CRM_Core_BAO_CustomGroup::getGroup(['id' => $customGroupID]);
 
-    foreach ($fields as $values) {
-      $datatype = $values['data_type'] ?? NULL;
-      if ($datatype === 'File') {
+    foreach ($customGroup['fields'] as $values) {
+      if ($values['data_type'] === 'File') {
         continue;
       }
       /* generate the key for the fields array */
       $key = 'custom_' . $values['id'];
       $regexp = preg_replace('/[.,;:!?]/', '', $values['label']);
-      $importableFields[$key] = [
+      $importableFields[$key] = array_merge($values, [
         'name' => $key,
         'title' => $values['label'] ?? NULL,
         'headerPattern' => '/' . preg_quote($regexp, '/') . '/i',
         'import' => 1,
         'custom_field_id' => $values['id'],
-        'options_per_line' => $values['options_per_line'],
-        'data_type' => $values['data_type'],
-        'html_type' => $values['html_type'],
         'type' => CRM_Core_BAO_CustomField::dataToType()[$values['data_type']],
-        'is_search_range' => $values['is_search_range'],
-        'date_format' => $values['date_format'],
-        'time_format' => $values['time_format'],
-        'extends' => $values['custom_group_id.extends'],
-        'custom_group_id' => $customGroupID,
-        'custom_group_id.name' => $values['custom_group_id.name'],
-        'is_multiple' => $values['custom_group_id.is_multiple'],
-      ];
+        'extends' => $customGroup['extends'],
+        'custom_group_id.name' => $customGroup['name'],
+        'is_multiple' => $customGroup['is_multiple'],
+      ]);
     }
     return $importableFields;
   }
 
+  /**
+   * @return int
+   */
+  private function getCustomGroupID(): int {
+    return (int) $this->getSubmittedValue('multipleCustomData');
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Cxn/DAO/Cxn.php b/www/modules/civicrm/CRM/Cxn/DAO/Cxn.php
index fda0b6350..4bdcfc531 100644
--- a/www/modules/civicrm/CRM/Cxn/DAO/Cxn.php
+++ b/www/modules/civicrm/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:8bca70c8807aff7f6421ddc9502e4c34)
+ * (GenCodeChecksum:6d34eafc9c6144dd8d0a262cb6831f40)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Dedupe/BAO/DedupeRule.php b/www/modules/civicrm/CRM/Dedupe/BAO/DedupeRule.php
index 368a35b50..8cf25614e 100644
--- a/www/modules/civicrm/CRM/Dedupe/BAO/DedupeRule.php
+++ b/www/modules/civicrm/CRM/Dedupe/BAO/DedupeRule.php
@@ -21,32 +21,30 @@
  */
 class CRM_Dedupe_BAO_DedupeRule extends CRM_Dedupe_DAO_DedupeRule {
 
-  /**
-   * Ids of the contacts to limit the SQL queries (whole-database queries otherwise)
-   * @var array
-   */
-  public $contactIds = [];
-
-  /**
-   * Params to dedupe against (queries against the whole contact set otherwise)
-   * @var array
-   */
-  public $params = [];
-
   /**
    * Return the SQL query for the given rule - either for finding matching
    * pairs of contacts, or for matching against the $params variable (if set).
    *
+   * @param array|null $params
+   *   Params to dedupe against (queries against the whole contact set otherwise)
+   * @param array $contactIDs
+   *   Ids of the contacts to limit the SQL queries (whole-database queries otherwise)
+   * @param array $rule
+   *
    * @return string
    *   SQL query performing the search
    *   or NULL if params is present and doesn't have and for a field.
    *
    * @throws \CRM_Core_Exception
+   *
+   * @deprecated since 5.73 will be removed around 5.80
+   * @internal do not call from outside tested core code. No universe uses Feb 2024.
    */
-  public function sql() {
-    if ($this->params &&
-      (!array_key_exists($this->rule_table, $this->params) ||
-        !array_key_exists($this->rule_field, $this->params[$this->rule_table])
+  public static function sql($params, $contactIDs, array $rule): ?string {
+    CRM_Core_Error::deprecatedFunctionWarning('unsed, no alternative');
+    if ($params &&
+      (!array_key_exists($rule['rule_table'], $params) ||
+        !array_key_exists($rule['rule_field'], $params[$rule['rule_table']])
       )
     ) {
       // if params is present and doesn't have an entry for a field, don't construct the clause.
@@ -58,29 +56,29 @@ public function sql() {
     // $using are arrays of required field matchings (for substring and
     // full matches, respectively)
     $where = [];
-    $on = ["SUBSTR(t1.{$this->rule_field}, 1, {$this->rule_length}) = SUBSTR(t2.{$this->rule_field}, 1, {$this->rule_length})"];
+    $on = ["SUBSTR(t1.{$rule['rule_field']}, 1, {$rule['rule_length']}) = SUBSTR(t2.{$rule['rule_field']}, 1, {$rule['rule_length']})"];
 
     $innerJoinClauses = [
-      "t1.{$this->rule_field} IS NOT NULL",
-      "t2.{$this->rule_field} IS NOT NULL",
-      "t1.{$this->rule_field} = t2.{$this->rule_field}",
+      "t1.{$rule['rule_field']} IS NOT NULL",
+      "t2.{$rule['rule_field']} IS NOT NULL",
+      "t1.{$rule['rule_field']} = t2.{$rule['rule_field']}",
     ];
 
-    if (in_array($this->getFieldType($this->rule_field), CRM_Utils_Type::getTextTypes(), TRUE)) {
-      $innerJoinClauses[] = "t1.{$this->rule_field} <> ''";
-      $innerJoinClauses[] = "t2.{$this->rule_field} <> ''";
+    if (in_array(CRM_Dedupe_BAO_DedupeRule::getFieldType($rule['rule_field'], $rule['rule_table']), CRM_Utils_Type::getTextTypes(), TRUE)) {
+      $innerJoinClauses[] = "t1.{$rule['rule_field']} <> ''";
+      $innerJoinClauses[] = "t2.{$rule['rule_field']} <> ''";
     }
 
     $cidRefs = CRM_Core_DAO::getReferencesToContactTable();
     $eidRefs = CRM_Core_DAO::getDynamicReferencesToTable('civicrm_contact');
 
-    switch ($this->rule_table) {
+    switch ($rule['rule_table']) {
       case 'civicrm_contact':
         $id = 'id';
         //we should restrict by contact type in the first step
-        $sql = "SELECT contact_type FROM civicrm_dedupe_rule_group WHERE id = {$this->dedupe_rule_group_id};";
+        $sql = "SELECT contact_type FROM civicrm_dedupe_rule_group WHERE id = {$rule['dedupe_rule_group_id']};";
         $ct = CRM_Core_DAO::singleValueQuery($sql);
-        if ($this->params) {
+        if ($params) {
           $where[] = "t1.contact_type = '{$ct}'";
         }
         else {
@@ -90,10 +88,10 @@ public function sql() {
         break;
 
       default:
-        if (array_key_exists($this->rule_table, $eidRefs)) {
-          $id = $eidRefs[$this->rule_table][0];
-          $entity_table = $eidRefs[$this->rule_table][1];
-          if ($this->params) {
+        if (array_key_exists($rule['rule_table'], $eidRefs)) {
+          $id = $eidRefs[$rule['rule_table']][0];
+          $entity_table = $eidRefs[$rule['rule_table']][1];
+          if ($params) {
             $where[] = "t1.$entity_table = 'civicrm_contact'";
           }
           else {
@@ -101,59 +99,59 @@ public function sql() {
             $where[] = "t2.$entity_table = 'civicrm_contact'";
           }
         }
-        elseif (array_key_exists($this->rule_table, $cidRefs)) {
-          $id = $cidRefs[$this->rule_table][0];
+        elseif (array_key_exists($rule['rule_table'], $cidRefs)) {
+          $id = $cidRefs[$rule['rule_table']][0];
         }
         else {
-          throw new CRM_Core_Exception("Unsupported rule_table for civicrm_dedupe_rule.id of {$this->id}");
+          throw new CRM_Core_Exception("Unsupported rule_table for civicrm_dedupe_rule.id of {$rule['id']}");
         }
         break;
     }
 
     // build SELECT based on the field names containing contact ids
     // if there are params provided, id1 should be 0
-    if ($this->params) {
-      $select = "t1.$id id1, {$this->rule_weight} weight";
+    if ($params) {
+      $select = "t1.$id id1, {$rule['rule_weight']} weight";
       $subSelect = 'id1, weight';
     }
     else {
-      $select = "t1.$id id1, t2.$id id2, {$this->rule_weight} weight";
+      $select = "t1.$id id1, t2.$id id2, {$rule['rule_weight']} weight";
       $subSelect = 'id1, id2, weight';
     }
 
     // build FROM (and WHERE, if it's a parametrised search)
     // based on whether the rule is about substrings or not
-    if ($this->params) {
-      $from = "{$this->rule_table} t1";
+    if ($params) {
+      $from = "{$rule['rule_table']} t1";
       $str = 'NULL';
-      if (isset($this->params[$this->rule_table][$this->rule_field])) {
-        $str = trim(CRM_Utils_Type::escape($this->params[$this->rule_table][$this->rule_field], 'String'));
+      if (isset($params[$rule['rule_table']][$rule['rule_field']])) {
+        $str = trim(CRM_Utils_Type::escape($params[$rule['rule_table']][$rule['rule_field']], 'String'));
       }
-      if ($this->rule_length) {
-        $where[] = "SUBSTR(t1.{$this->rule_field}, 1, {$this->rule_length}) = SUBSTR('$str', 1, {$this->rule_length})";
-        $where[] = "t1.{$this->rule_field} IS NOT NULL";
+      if ($rule['rule_length']) {
+        $where[] = "SUBSTR(t1.{$rule['rule_field']}, 1, {$rule['rule_length']}) = SUBSTR('$str', 1, {$rule['rule_length']})";
+        $where[] = "t1.{$rule['rule_field']} IS NOT NULL";
       }
       else {
-        $where[] = "t1.{$this->rule_field} = '$str'";
+        $where[] = "t1.{$rule['rule_field']} = '$str'";
       }
     }
     else {
-      if ($this->rule_length) {
-        $from = "{$this->rule_table} t1 JOIN {$this->rule_table} t2 ON (" . implode(' AND ', $on) . ")";
+      if ($rule['rule_length']) {
+        $from = "{$rule['rule_table']} t1 INNER JOIN {$rule['rule_table']} t2 ON (" . implode(' AND ', $on) . ")";
       }
       else {
-        $from = "{$this->rule_table} t1 INNER JOIN {$this->rule_table} t2 ON (" . implode(' AND ', $innerJoinClauses) . ")";
+        $from = "{$rule['rule_table']} t1 INNER JOIN {$rule['rule_table']} t2 ON (" . implode(' AND ', $innerJoinClauses) . ")";
       }
     }
 
     // finish building WHERE, also limit the results if requested
-    if (!$this->params) {
+    if (!$params) {
       $where[] = "t1.$id < t2.$id";
     }
     $query = "SELECT $select FROM $from WHERE " . implode(' AND ', $where);
-    if ($this->contactIds) {
+    if ($contactIDs) {
       $cids = [];
-      foreach ($this->contactIds as $cid) {
+      foreach ($contactIDs as $cid) {
         $cids[] = CRM_Utils_Type::escape($cid, 'Integer');
       }
       if (count($cids) == 1) {
@@ -178,8 +176,10 @@ public function sql() {
    *
    * @return array
    *   rule fields array associated to rule group
+   *
+   * @internal do not call from outside tested core code. No universe uses Feb 2024.
    */
-  public static function dedupeRuleFields($params) {
+  public static function dedupeRuleFields(array $params) {
     $rgBao = new CRM_Dedupe_BAO_DedupeRuleGroup();
     $rgBao->used = $params['used'];
     $rgBao->contact_type = $params['contact_type'];
@@ -191,7 +191,7 @@ public static function dedupeRuleFields($params) {
     $ruleFields = [];
     while ($ruleBao->fetch()) {
       $field_name = $ruleBao->rule_field;
-      if ($field_name == 'phone_numeric') {
+      if ($field_name === 'phone_numeric') {
         $field_name = 'phone';
       }
       $ruleFields[] = $field_name;
@@ -204,6 +204,8 @@ public static function dedupeRuleFields($params) {
    * @param int $oid
    *
    * @return bool
+   *
+   * @internal do not call from outside tested core code. No universe uses Feb 2024.
    */
   public static function validateContacts($cid, $oid) {
     if (!$cid || !$oid) {
@@ -225,19 +227,26 @@ public static function validateContacts($cid, $oid) {
    * Get the specification for the given field.
    *
    * @param string $fieldName
+   * @param string $ruleTable
    *
    * @return array
    * @throws \CRM_Core_Exception
+   * @internal function has only ever been available from the class & will be moved.
    */
-  public function getFieldType($fieldName) {
-    $entity = CRM_Core_DAO_AllCoreTables::getEntityNameForTable($this->rule_table);
+  public static function getFieldType(string $fieldName, string $ruleTable) {
+    $entity = CRM_Core_DAO_AllCoreTables::getEntityNameForTable($ruleTable);
     if (!$entity) {
       // This means we have stored a custom field rather than an entity name in rule_table, figure out the entity.
-      $entity = civicrm_api3('CustomGroup', 'getvalue', ['table_name' => $this->rule_table, 'return' => 'extends']);
+      $customGroup = CRM_Core_BAO_CustomGroup::getGroup(['table_name' => $ruleTable]);
+      if (!$customGroup) {
+        throw new CRM_Core_Exception('Unknown dedupeRule field');
+      }
+      $entity = $customGroup['extends'];
       if (in_array($entity, CRM_Contact_BAO_ContactType::basicTypes(TRUE), TRUE)) {
         $entity = 'Contact';
       }
-      $fieldName = 'custom_' . civicrm_api3('CustomField', 'getvalue', ['column_name' => $fieldName, 'return' => 'id']);
+      $fieldIds = array_column($customGroup['fields'], 'id', 'column_name');
+      $fieldName = 'custom_' . $fieldIds[$fieldName];
     }
     $fields = civicrm_api3($entity, 'getfields', ['action' => 'create'])['values'];
     return $fields[$fieldName]['type'];
diff --git a/www/modules/civicrm/CRM/Dedupe/BAO/DedupeRuleGroup.php b/www/modules/civicrm/CRM/Dedupe/BAO/DedupeRuleGroup.php
index c45e90560..f4d698ccc 100644
--- a/www/modules/civicrm/CRM/Dedupe/BAO/DedupeRuleGroup.php
+++ b/www/modules/civicrm/CRM/Dedupe/BAO/DedupeRuleGroup.php
@@ -66,12 +66,6 @@ public static function supportedFields($requestedType): array {
         'civicrm_country.name' => 'civicrm_address.country_id',
         'civicrm_county.name' => 'civicrm_address.county_id',
         'civicrm_state_province.name' => 'civicrm_address.state_province_id',
-        'gender.label' => 'civicrm_contact.gender_id',
-        'individual_prefix.label' => 'civicrm_contact.prefix_id',
-        'individual_suffix.label' => 'civicrm_contact.suffix_id',
-        'addressee.label' => 'civicrm_contact.addressee_id',
-        'email_greeting.label' => 'civicrm_contact.email_greeting_id',
-        'postal_greeting.label' => 'civicrm_contact.postal_greeting_id',
         'civicrm_phone.phone' => 'civicrm_phone.phone_numeric',
       ];
       // the table names we support in dedupe rules - a filter for importableFields()
@@ -109,18 +103,19 @@ public static function supportedFields($requestedType): array {
         // exension is installed (https://github.com/eileenmcnaughton/org.wikimedia.thethe)
         $fields[$ctype]['civicrm_contact']['sort_name'] = ts('Sort Name');
 
+        $customGroups = CRM_Core_BAO_CustomGroup::getAll([
+          'extends' => $ctype,
+          'is_active' => TRUE,
+        ], CRM_Core_Permission::EDIT);
         // add all custom data fields including those only for sub_types.
-        foreach (CRM_Core_BAO_CustomGroup::getTree($ctype, NULL, NULL, -1, [], NULL, TRUE, NULL, TRUE) as $key => $cg) {
-          if (!is_int($key)) {
-            continue;
-          }
+        foreach ($customGroups as $cg) {
           foreach ($cg['fields'] as $cf) {
             $fields[$ctype][$cg['table_name']][$cf['column_name']] = $cg['title'] . ' : ' . $cf['label'];
           }
         }
       }
       //Does this have to run outside of cache?
-      CRM_Utils_Hook::dupeQuery(CRM_Core_DAO::$_nullObject, 'supportedFields', $fields);
+      CRM_Utils_Hook::dupeQuery(NULL, 'supportedFields', $fields);
       Civi::$statics[__CLASS__]['supportedFields'] = $fields;
     }
 
@@ -145,16 +140,6 @@ private static function importableFields($contactType): array {
 
     $fields = CRM_Contact_DAO_Contact::import();
 
-    // get the fields thar are meant for contact types
-    if (in_array($contactType, [
-      'Individual',
-      'Household',
-      'Organization',
-      'All',
-    ])) {
-      $fields = array_merge($fields, CRM_Core_OptionValue::getFields('', $contactType));
-    }
-
     $locationFields = array_merge(CRM_Core_DAO_Address::import(),
       CRM_Core_DAO_Phone::import(),
       CRM_Core_DAO_Email::import(),
@@ -220,12 +205,11 @@ private function tableQuery() {
     if (!$this->name == NULL || $this->is_reserved == NULL) {
       $this->find(TRUE);
     }
+    $contactType = $this->contact_type;
 
     // Reserved Rule Groups can optionally get special treatment by
     // implementing an optimization class and returning a query array.
-    if ($this->is_reserved &&
-      CRM_Utils_File::isIncludable("CRM/Dedupe/BAO/QueryBuilder/{$this->name}.php")
-    ) {
+    if ($this->isUseReservedQuery()) {
       $command = empty($this->params) ? 'internal' : 'record';
       $queries = call_user_func(["CRM_Dedupe_BAO_QueryBuilder_{$this->name}", $command], $this);
     }
@@ -244,11 +228,15 @@ private function tableQuery() {
       // tailored to respect the param and contactId options provided.
       $queries = [];
       while ($bao->fetch()) {
-        $bao->contactIds = $this->contactIds;
-        $bao->params = $this->params;
-
         // Skipping empty rules? Empty rules shouldn't exist; why check?
-        if ($query = $bao->sql()) {
+        if ($query = self::sql($this->params, $this->contactIds, [
+          'id' => (int) $bao->id,
+          'rule_table' => $bao->rule_table,
+          'rule_length' => $bao->rule_length,
+          'rule_field' => $bao->rule_field,
+          'rule_weight' => $bao->rule_weight,
+          'dedupe_rule_group_id' => $bao->dedupe_rule_group_id,
+        ], $contactType)) {
           $queries["{$bao->rule_table}.{$bao->rule_field}.{$bao->rule_weight}"] = $query;
         }
       }
@@ -264,7 +252,168 @@ private function tableQuery() {
     return $queries;
   }
 
-  public function fillTable() {
+  /**
+   * Return the SQL query for the given rule - either for finding matching
+   * pairs of contacts, or for matching against the $params variable (if set).
+   *
+   * @param array|null $params
+   *   Params to dedupe against (queries against the whole contact set otherwise)
+   * @param array $contactIDs
+   *   Ids of the contacts to limit the SQL queries (whole-database queries otherwise)
+   * @param array $rule
+   * @param string $contactType
+   *
+   * @return string
+   *   SQL query performing the search
+   *   or NULL if params is present and doesn't have and for a field.
+   *
+   * @throws \CRM_Core_Exception
+   * @internal do not call from outside tested core code. No universe uses Feb 2024.
+   *
+   */
+  private static function sql($params, $contactIDs, array $rule, string $contactType): ?string {
+    if ($params &&
+      (!array_key_exists($rule['rule_table'], $params) ||
+        !array_key_exists($rule['rule_field'], $params[$rule['rule_table']])
+      )
+    ) {
+      // if params is present and doesn't have an entry for a field, don't construct the clause.
+      return NULL;
+    }
+
+    $filter = self::getRuleTableFilter($rule['rule_table'], $contactType);
+    $contactIDFieldName = self::getContactIDFieldName($rule['rule_table']);
+
+    // build FROM (and WHERE, if it's a parametrised search)
+    // based on whether the rule is about substrings or not
+    if ($params) {
+      $select = "t1.$contactIDFieldName id1, {$rule['rule_weight']} weight";
+      $subSelect = 'id1, weight';
+      $where = $filter ? ['t1.' . $filter] : [];
+      $from = "{$rule['rule_table']} t1";
+      $str = 'NULL';
+      if (isset($params[$rule['rule_table']][$rule['rule_field']])) {
+        $str = trim(CRM_Utils_Type::escape($params[$rule['rule_table']][$rule['rule_field']], 'String'));
+      }
+      if ($rule['rule_length']) {
+        $where[] = "SUBSTR(t1.{$rule['rule_field']}, 1, {$rule['rule_length']}) = SUBSTR('$str', 1, {$rule['rule_length']})";
+        $where[] = "t1.{$rule['rule_field']} IS NOT NULL";
+      }
+      else {
+        $where[] = "t1.{$rule['rule_field']} = '$str'";
+      }
+    }
+    else {
+      $select = "t1.$contactIDFieldName id1, t2.$contactIDFieldName id2, {$rule['rule_weight']} weight";
+      $subSelect = 'id1, id2, weight';
+      $where = $filter ? [
+        't1.' . $filter,
+        't2.' . $filter,
+      ] : [];
+      $where[] = "t1.$contactIDFieldName < t2.$contactIDFieldName";
+      $from = "{$rule['rule_table']} t1 INNER JOIN {$rule['rule_table']} t2 ON (" . self::getRuleFieldFilter($rule) . ")";
+    }
+
+    $query = "SELECT $select FROM $from WHERE " . implode(' AND ', $where);
+    if ($contactIDs) {
+      $cids = [];
+      foreach ($contactIDs as $cid) {
+        $cids[] = CRM_Utils_Type::escape($cid, 'Integer');
+      }
+      if (count($cids) == 1) {
+        $query .= " AND (t1.$contactIDFieldName = {$cids[0]}) UNION $query AND t2.$contactIDFieldName = {$cids[0]}";
+      }
+      else {
+        $query .= " AND t1.$contactIDFieldName IN (" . implode(',', $cids) . ")
+        UNION $query AND  t2.$contactIDFieldName IN (" . implode(',', $cids) . ")";
+      }
+      // The `weight` is ambiguous in the context of the union; put the whole
+      // thing in a subquery.
+      $query = "SELECT $subSelect FROM ($query) subunion";
+    }
+
+    return $query;
+  }
+
+  /**
+   * Get the name of the field in the table that refers to the Contact ID.
+   *
+   * e.g in civicrm_contact this is 'id' whereas in civicrm_address this is
+   * contact_id and in a custom field table it might be entity_id.
+   *
+   * @param string $tableName
+   *
+   * @return string
+   *   Usually id, contact_id or entity_id.
+   * @throws \CRM_Core_Exception
+   */
+  private static function getContactIDFieldName(string $tableName): string {
+    if ($tableName === 'civicrm_contact') {
+      return 'id';
+    }
+    if (isset(CRM_Core_DAO::getDynamicReferencesToTable('civicrm_contact')[$tableName][0])) {
+      return CRM_Core_DAO::getDynamicReferencesToTable('civicrm_contact')[$tableName][0];
+    }
+    if (isset(\CRM_Core_DAO::getReferencesToContactTable()[$tableName][0])) {
+      return \CRM_Core_DAO::getReferencesToContactTable()[$tableName][0];
+    }
+    throw new CRM_Core_Exception('invalid field');
+  }
+
+  /**
+   * Get any where filter that restricts the specific table.
+   *
+   * Generally this is along the lines of entity_table = civicrm_contact
+   * although for the contact table it could be the id restriction.
+   *
+   * @param string $tableName
+   * @param string $contactType
+   *
+   * @return string
+   */
+  private static function getRuleTableFilter(string $tableName, string $contactType): string {
+    if ($tableName === 'civicrm_contact') {
+      return "contact_type = '{$contactType}'";
+    }
+    $dynamicReferences = CRM_Core_DAO::getDynamicReferencesToTable('civicrm_contact')[$tableName] ?? NULL;
+    if (!$dynamicReferences) {
+      return '';
+    }
+    if (!empty(CRM_Core_DAO::getDynamicReferencesToTable('civicrm_contact')[$tableName])) {
+      return $dynamicReferences[1] . "= 'civicrm_contact'";
+    }
+    return '';
+  }
+
+  /**
+   * @param array $rule
+   *
+   * @return string
+   * @throws \CRM_Core_Exception
+   */
+  private static function getRuleFieldFilter(array $rule): string {
+    if ($rule['rule_length']) {
+      $on = ["SUBSTR(t1.{$rule['rule_field']}, 1, {$rule['rule_length']}) = SUBSTR(t2.{$rule['rule_field']}, 1, {$rule['rule_length']})"];
+      return "(" . implode(' AND ', $on) . ")";
+    }
+    $innerJoinClauses = [
+      "t1.{$rule['rule_field']} IS NOT NULL",
+      "t2.{$rule['rule_field']} IS NOT NULL",
+      "t1.{$rule['rule_field']} = t2.{$rule['rule_field']}",
+    ];
+
+    if (in_array(CRM_Dedupe_BAO_DedupeRule::getFieldType($rule['rule_field'], $rule['rule_table']), CRM_Utils_Type::getTextTypes(), TRUE)) {
+      $innerJoinClauses[] = "t1.{$rule['rule_field']} <> ''";
+      $innerJoinClauses[] = "t2.{$rule['rule_field']} <> ''";
+    }
+    return "(" . implode(' AND ', $innerJoinClauses) . ")";
+  }
+
+  /**
+   * @return void
+   * @throws \Civi\Core\Exception\DBQueryException
+   */
+  public function fillTable(): void {
     // get the list of queries handy
     $tableQueries = $this->tableQuery();
 
@@ -598,4 +747,26 @@ public static function getContactTypeForRuleGroup($rule_group_id) {
     return \Civi::$statics[__CLASS__]['rule_groups'][$rule_group_id]['contact_type'];
   }
 
+  /**
+   * Is a file based reserved query configured.
+   *
+   * File based reserved queries were an early idea about how to optimise the dedupe queries.
+   *
+   * In theory extensions could implement them although there is no evidence any of them have.
+   * However, if these are implemented by core or by extensions we should not attempt to optimise
+   * the query by (e.g.) combining queries.
+   *
+   * In practice the queries implemented only return one query anyway
+   *
+   * @see \CRM_Dedupe_BAO_QueryBuilder_IndividualGeneral
+   * @see \CRM_Dedupe_BAO_QueryBuilder_IndividualSupervised
+   * @see \CRM_Dedupe_BAO_QueryBuilder_IndividualUnsupervised
+   *
+   * @return bool
+   */
+  private function isUseReservedQuery(): bool {
+    return $this->is_reserved &&
+      CRM_Utils_File::isIncludable("CRM/Dedupe/BAO/QueryBuilder/{$this->name}.php");
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Dedupe/DAO/DedupeException.php b/www/modules/civicrm/CRM/Dedupe/DAO/DedupeException.php
index dbf9debde..8a66eb9fe 100644
--- a/www/modules/civicrm/CRM/Dedupe/DAO/DedupeException.php
+++ b/www/modules/civicrm/CRM/Dedupe/DAO/DedupeException.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Dedupe/DedupeException.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4165d0a98662caa2de6fcefbde15c2e2)
+ * (GenCodeChecksum:4859256449b52a810c2a8d8b5bfcbae6)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Dedupe/DAO/DedupeRule.php b/www/modules/civicrm/CRM/Dedupe/DAO/DedupeRule.php
index 058a89571..36b9459f4 100644
--- a/www/modules/civicrm/CRM/Dedupe/DAO/DedupeRule.php
+++ b/www/modules/civicrm/CRM/Dedupe/DAO/DedupeRule.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Dedupe/DedupeRule.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:bf2a66e6cf05d4aba90d5de0732674f0)
+ * (GenCodeChecksum:303154da214602fe1fc2d69525e6c57b)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Dedupe/DAO/DedupeRuleGroup.php b/www/modules/civicrm/CRM/Dedupe/DAO/DedupeRuleGroup.php
index e6ff7ce20..01786410f 100644
--- a/www/modules/civicrm/CRM/Dedupe/DAO/DedupeRuleGroup.php
+++ b/www/modules/civicrm/CRM/Dedupe/DAO/DedupeRuleGroup.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Dedupe/DedupeRuleGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3df551f805f32bd24ae567e40237cac4)
+ * (GenCodeChecksum:2771f81720658fcb04fdeafde9a04451)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Dedupe/Finder.php b/www/modules/civicrm/CRM/Dedupe/Finder.php
index e6082c455..c801c6bed 100644
--- a/www/modules/civicrm/CRM/Dedupe/Finder.php
+++ b/www/modules/civicrm/CRM/Dedupe/Finder.php
@@ -160,6 +160,23 @@ public static function dupesInGroup($rgid, $gid, $searchLimit = 0) {
     return [];
   }
 
+  /**
+   * @param array $fields
+   * @param array $flat
+   * @param string $ctype
+   *
+   * @throws \CRM_Core_Exception
+   */
+  private static function appendCustomDataFields(array &$fields, array &$flat, string $ctype): void {
+    $subTypes = $fields['contact_sub_type'] ?? [];
+    // Only return custom for subType + unrestricted or return all custom
+    // fields.
+    $customFields = self::getTree($ctype, $subTypes, $fields);
+    foreach ($customFields as $customField) {
+      $flat[$customField['column_name']] = $customField['customValue']['data'] ?? NULL;
+    }
+  }
+
   /**
    * A hackish function needed to massage CRM_Contact_Form_$ctype::formRule()
    * object into a valid $params array for dedupe
@@ -185,6 +202,7 @@ public static function formatParams($fields, $ctype) {
     ];
     foreach (['individual_suffix', 'individual_prefix', 'gender'] as $name) {
       if (!empty($fields[$name])) {
+        CRM_Core_Error::deprecatedWarning('code thought to be unreachable - slated for removal');
         $flat[$replace_these[$name]] = $flat[$name];
         unset($flat[$name]);
       }
@@ -217,20 +235,7 @@ public static function formatParams($fields, $ctype) {
     }
 
     // handle custom data
-
-    $subTypes = $fields['contact_sub_type'] ?? [];
-    // Only return custom for subType + unrestricted or return all custom
-    // fields.
-    $tree = CRM_Core_BAO_CustomGroup::getTree($ctype, NULL, NULL, -1, $subTypes, NULL, TRUE, NULL, TRUE);
-    CRM_Core_BAO_CustomGroup::postProcess($tree, $fields, TRUE);
-    foreach ($tree as $key => $cg) {
-      if (!is_int($key)) {
-        continue;
-      }
-      foreach ($cg['fields'] as $cf) {
-        $flat[$cf['column_name']] = $cf['customValue']['data'] ?? NULL;
-      }
-    }
+    self::appendCustomDataFields($fields, $flat, $ctype);
 
     // if the key is dotted, keep just the last part of it
     foreach ($flat as $key => $value) {
@@ -297,63 +302,178 @@ public static function formatParams($fields, $ctype) {
   }
 
   /**
-   * Parse duplicate pairs into a standardised array and store in the prev_next_cache.
+   * @param string $entityType
+   *   Of the contact whose contact type is needed.
+   * @param array $subTypes
+   * @param array $params
    *
-   * @param array $foundDupes
-   * @param string $cacheKeyString
+   * @return array[]
+   *   The returned array is keyed by group id and has the custom group table fields
+   *   and a subkey 'fields' holding the specific custom fields.
+   *   If entityId is passed in the fields keys have a subkey 'customValue' which holds custom data
+   *   if set for the given entity. This is structured as an array of values with each one having the keys 'id', 'data'
+   *
+   * @throws \CRM_Core_Exception
+   * @deprecated Function demonstrates just how bad code can get from 20 years of entropy.
+   *
+   * This function takes an overcomplicated set of params and returns an overcomplicated
+   * mix of custom groups, custom fields, custom values (if passed $entityID), and other random stuff.
+   *
+   * @see CRM_Core_BAO_CustomGroup::getAll()
+   * for a better alternative to fetching a tree of custom groups and fields.
+   *
+   * @see APIv4::get()
+   * for a better alternative to fetching entity values.
    *
-   * @return array
-   *   Dupe pairs with the keys
-   *   -srcID
-   *   -srcName
-   *   -dstID
-   *   -dstName
-   *   -weight
-   *   -canMerge
    */
-  public static function parseAndStoreDupePairs($foundDupes, $cacheKeyString) {
-    $cids = [];
-    foreach ($foundDupes as $dupe) {
-      $cids[$dupe[0]] = 1;
-      $cids[$dupe[1]] = 1;
+  private static function getTree($entityType, $subTypes, $params) {
+    if (!is_array($subTypes)) {
+      if (empty($subTypes)) {
+        $subTypes = [];
+      }
+      else {
+        if (strpos($subTypes, ',') !== FALSE) {
+          CRM_Core_Error::deprecatedWarning('subtype should be an array, if multiple');
+          $subTypes = explode(',', $subTypes);
+        }
+        elseif (strpos($subTypes, CRM_Core_DAO::VALUE_SEPARATOR) !== FALSE) {
+          CRM_Core_Error::deprecatedWarning('subtype should be an array, if multiple');
+          $subTypes = explode(CRM_Core_DAO::VALUE_SEPARATOR, trim($subTypes, CRM_Core_DAO::VALUE_SEPARATOR));
+        }
+        else {
+          $subTypes = (array) $subTypes;
+        }
+      }
+    }
+    foreach ($subTypes as $index => $subType) {
+      if (trim($subType, CRM_Core_DAO::VALUE_SEPARATOR) !== $subType) {
+        CRM_Core_Error::deprecatedWarning('subtype should not require extra cleanup');
+        $subTypes[$index] = trim($subType, CRM_Core_DAO::VALUE_SEPARATOR);
+      }
+      $validatedSubType = self::validateSubTypeByEntity($entityType, $subType);
+      if ($subType !== $validatedSubType) {
+        if (strtolower($subType) === strtolower($validatedSubType)) {
+          CRM_Core_Error::deprecatedWarning('passing in contact subtype with incorrect capitalization is deprecated');
+          $subTypes[$index] = $validatedSubType;
+        }
+        else {
+          // This is a security check rather than a deprecation.
+          \Civi::log()->warning('invalid subtype passed to duplicate check {type}', ['type' => $subType]);
+          unset($subTypes[$index]);
+        }
+      }
     }
-    $cidString = implode(', ', array_keys($cids));
 
-    $dao = CRM_Core_DAO::executeQuery("SELECT id, display_name FROM civicrm_contact WHERE id IN ($cidString) ORDER BY sort_name");
-    $displayNames = [];
-    while ($dao->fetch()) {
-      $displayNames[$dao->id] = $dao->display_name;
+    $filters = [
+      'extends' => $entityType,
+      'is_active' => TRUE,
+    ];
+    if ($subTypes) {
+      foreach ($subTypes as $subType) {
+        $filters['extends_entity_column_value'][] = $subType;
+      }
+      $filters['extends_entity_column_value'][] = NULL;
     }
 
-    $userId = CRM_Core_Session::getLoggedInContactID();
-    foreach ($foundDupes as $dupes) {
-      $srcID = $dupes[1];
-      $dstID = $dupes[0];
-      // The logged in user should never be the src (ie. the contact to be removed).
-      if ($srcID == $userId) {
-        $srcID = $dstID;
-        $dstID = $userId;
+    $customGroups = CRM_Core_BAO_CustomGroup::getAll($filters, CRM_Core_Permission::EDIT);
+    $customFields = [];
+    foreach ($customGroups as $group) {
+      foreach ($group['fields'] as $field) {
+        $customFields[$field['id']] = $field;
+      }
+    }
+
+    foreach ($customFields as $field) {
+      $fieldId = $field['id'];
+      $serialize = CRM_Core_BAO_CustomField::isSerialized($field);
+
+      // Reset all checkbox, radio and multiselect data
+      if ($field['html_type'] === 'Radio' || $serialize) {
+        $customFields[$fieldId]['customValue']['data'] = 'NULL';
+      }
+
+      $v = NULL;
+      foreach ($params as $key => $val) {
+        if (preg_match('/^custom_(\d+)_?(-?\d+)?$/', $key, $match) &&
+          $match[1] == $field['id']
+        ) {
+          $v = $val;
+        }
+      }
+
+      if (!isset($customFields[$fieldId]['customValue'])) {
+        // field exists in db so populate value from "form".
+        $customFields[$fieldId]['customValue'] = [];
+      }
+
+      // Serialize checkbox and multi-select data (using array keys for checkbox)
+      if ($serialize) {
+        $v = ($v && $field['html_type'] === 'Checkbox') ? array_keys($v) : $v;
+        $v = $v ? CRM_Utils_Array::implodePadded($v) : NULL;
       }
 
-      $mainContacts[] = $row = [
-        'dstID' => (int) $dstID,
-        'dstName' => $displayNames[$dstID],
-        'srcID' => (int) $srcID,
-        'srcName' => $displayNames[$srcID],
-        'weight' => $dupes[2],
-        'canMerge' => TRUE,
-      ];
-
-      CRM_Core_DAO::executeQuery("INSERT INTO civicrm_prevnext_cache (entity_table, entity_id1, entity_id2, cacheKey, data) VALUES
-        ('civicrm_contact', %1, %2, %3, %4)", [
-          1 => [$dstID, 'Integer'],
-          2 => [$srcID, 'Integer'],
-          3 => [$cacheKeyString, 'String'],
-          4 => [serialize($row), 'String'],
-        ]
-      );
+      switch ($field['html_type']) {
+
+        case 'Select Date':
+          $date = CRM_Utils_Date::processDate($v);
+          $customFields[$fieldId]['customValue']['data'] = $date;
+          break;
+
+        case 'File':
+          break;
+
+        default:
+          $customFields[$fieldId]['customValue']['data'] = $v;
+          break;
+      }
+    }
+
+    return $customFields;
+  }
+
+  /**
+   * Validates contact subtypes and event types.
+   *
+   * Performs case-insensitive matching of strings and outputs the correct case.
+   * e.g. an input of "meeting" would output "Meeting".
+   *
+   * For all other entities, it doesn't validate except to check the subtype is an integer.
+   *
+   * @param string $entityType
+   * @param string $subType
+   *
+   * @return string
+   * @throws \CRM_Core_Exception
+   */
+  private static function validateSubTypeByEntity($entityType, $subType) {
+
+    if (is_numeric($subType)) {
+      return $subType;
+    }
+
+    $contactTypes = CRM_Contact_BAO_ContactType::basicTypeInfo(TRUE);
+    $contactTypes['Contact'] = 1;
+
+    if (!array_key_exists($entityType, $contactTypes)) {
+      throw new CRM_Core_Exception('Invalid Entity Filter');
+    }
+
+    $subTypes = CRM_Contact_BAO_ContactType::subTypeInfo($entityType, TRUE);
+    $subTypes = array_column($subTypes, 'name', 'name');
+    // When you create a new contact type it gets saved in mixed case in the database.
+    // Eg. "Service User" becomes "Service_User" in civicrm_contact_type.name
+    // But that field does not differentiate case (eg. you can't add Service_User and service_user because mysql will report a duplicate error)
+    // webform_civicrm and some other integrations pass in the name as lowercase to API3 Contact.duplicatecheck
+    // Since we can't actually have two strings with different cases in the database perform a case-insensitive search here:
+    $subTypesByName = array_combine($subTypes, $subTypes);
+    $subTypesByName = array_change_key_case($subTypesByName, CASE_LOWER);
+    $subTypesByKey = array_change_key_case($subTypes, CASE_LOWER);
+    $subTypeKey = mb_strtolower($subType);
+    if (!array_key_exists($subTypeKey, $subTypesByKey) && !in_array($subTypeKey, $subTypesByName)) {
+      \Civi::log()->debug("entityType: {$entityType}; subType: {$subType}");
+      throw new CRM_Core_Exception('Invalid Filter');
     }
-    return $mainContacts;
+    return $subTypesByName[$subTypeKey] ?? $subTypesByKey[$subTypeKey];
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Dedupe/MergeHandler.php b/www/modules/civicrm/CRM/Dedupe/MergeHandler.php
index cf64201bc..62c6071a4 100644
--- a/www/modules/civicrm/CRM/Dedupe/MergeHandler.php
+++ b/www/modules/civicrm/CRM/Dedupe/MergeHandler.php
@@ -448,7 +448,7 @@ public function mergeLocations(): void {
     foreach ($blocksDAO as $blockDAOs) {
       if (!empty($blockDAOs['update'])) {
         foreach ($blockDAOs['update'] as $blockDAO) {
-          $entity = CRM_Core_DAO_AllCoreTables::getBriefName(get_class($blockDAO));
+          $entity = CRM_Core_DAO_AllCoreTables::getEntityNameForClass(get_class($blockDAO));
           $values = ['checkPermissions' => FALSE];
           foreach ($blockDAO->fields() as $field) {
             if (isset($blockDAO->{$field['name']})) {
@@ -460,7 +460,7 @@ public function mergeLocations(): void {
       }
       if (!empty($blockDAOs['delete'])) {
         foreach ($blockDAOs['delete'] as $blockDAO) {
-          $entity = CRM_Core_DAO_AllCoreTables::getBriefName(get_class($blockDAO));
+          $entity = CRM_Core_DAO_AllCoreTables::getEntityNameForClass(get_class($blockDAO));
           civicrm_api4($entity, 'delete', ['where' => [['id', '=', $blockDAO->id]], 'checkPermissions' => FALSE]);
         }
       }
diff --git a/www/modules/civicrm/CRM/Dedupe/Merger.php b/www/modules/civicrm/CRM/Dedupe/Merger.php
index 6406e058e..f2f8cbea5 100644
--- a/www/modules/civicrm/CRM/Dedupe/Merger.php
+++ b/www/modules/civicrm/CRM/Dedupe/Merger.php
@@ -10,7 +10,6 @@
  */
 
 use Civi\Api4\Contact;
-use Civi\Api4\CustomGroup;
 
 /**
  *
@@ -624,15 +623,14 @@ public static function moveContactBelongings($mergeHandler, $tables, $tableOpera
    * @param array $cidRefs
    *
    * @throws \CRM_Core_Exception
-   * @throws \Civi\API\Exception\UnauthorizedException
    */
   protected static function filterRowBasedCustomDataFromCustomTables(array &$cidRefs) {
-    $customTables = (array) CustomGroup::get(FALSE)
-      ->setSelect(['table_name'])
-      ->addWhere('is_multiple', '=', 0)
-      ->addWhere('extends', 'IN', array_merge(['Contact'], CRM_Contact_BAO_ContactType::contactTypes()))
-      ->execute()
-      ->indexBy('table_name');
+    $filters = [
+      'is_multiple' => FALSE,
+      'extends' => 'Contact',
+    ];
+    $customGroups = CRM_Core_BAO_CustomGroup::getAll($filters);
+    $customTables = array_column($customGroups, NULL, 'table_name');
     foreach (array_intersect_key($cidRefs, $customTables) as $tableName => $cidSpec) {
       if (in_array('entity_id', $cidSpec, TRUE)) {
         unset($cidRefs[$tableName][array_search('entity_id', $cidSpec, TRUE)]);
@@ -731,25 +729,6 @@ private static function formatProfileContactParams(
     ) {
       $data['contact_sub_type'] = CRM_Utils_Array::implodePadded($params['contact_sub_type']);
     }
-    elseif (array_key_exists('contact_sub_type_hidden', $params) &&
-      !empty($params['contact_sub_type_hidden'])
-    ) {
-      CRM_Core_Error::deprecatedWarning('code should be unreachable, slated for removal');
-      // if profile was used, and had any subtype, we obtain it from there
-      //CRM-13596 - add to existing contact types, rather than overwriting
-      if (empty($data['contact_sub_type'])) {
-        // If we don't have a contact ID the $data['contact_sub_type'] will not be defined...
-        $data['contact_sub_type'] = CRM_Utils_Array::implodePadded($params['contact_sub_type_hidden']);
-      }
-      else {
-        $data_contact_sub_type_arr = CRM_Utils_Array::explodePadded($data['contact_sub_type']);
-        if (!in_array($params['contact_sub_type_hidden'], $data_contact_sub_type_arr)) {
-          //CRM-20517 - make sure contact_sub_type gets the correct delimiters
-          $data['contact_sub_type'] = trim($data['contact_sub_type'], CRM_Core_DAO::VALUE_SEPARATOR);
-          $data['contact_sub_type'] = CRM_Core_DAO::VALUE_SEPARATOR . $data['contact_sub_type'] . CRM_Utils_Array::implodePadded($params['contact_sub_type_hidden']);
-        }
-      }
-    }
 
     $locationType = [];
     $count = 1;
@@ -953,15 +932,9 @@ private static function formatProfileContactParams(
           }
 
           //CRM-13596 - check for contact_sub_type_hidden first
-          if (array_key_exists('contact_sub_type_hidden', $params)) {
-            CRM_Core_Error::deprecatedWarning('code should be unreachable, slated for removal');
-            $type = $params['contact_sub_type_hidden'];
-          }
-          else {
-            $type = $data['contact_type'];
-            if (!empty($data['contact_sub_type'])) {
-              $type = CRM_Utils_Array::explodePadded($data['contact_sub_type']);
-            }
+          $type = $data['contact_type'];
+          if (!empty($data['contact_sub_type'])) {
+            $type = CRM_Utils_Array::explodePadded($data['contact_sub_type']);
           }
 
           CRM_Core_BAO_CustomField::formatCustomField($customFieldId,
@@ -1633,41 +1606,48 @@ public static function getRowsElementsAndInfo(int $mainID, int $otherID, bool $c
     }
 
     // handle custom fields
-    $mainTree = self::getTree($main['contact_type'], $mainID,
-      $main['contact_sub_type'] ?? NULL,
-      $checkPermissions ? CRM_Core_Permission::EDIT : FALSE
-    );
-    $otherTree = self::getTree($main['contact_type'], $otherID,
-      $other['contact_sub_type'] ?? NULL,
-      $checkPermissions ? CRM_Core_Permission::EDIT : FALSE
-    );
-
-    foreach ($otherTree as $gid => $group) {
-      if (!isset($group['fields'])) {
-        continue;
-      }
-
-      foreach ($group['fields'] as $fid => $field) {
-        $mainContactValue = $mainTree[$gid]['fields'][$fid]['customValue'] ?? NULL;
-        $otherContactValue = $otherTree[$gid]['fields'][$fid]['customValue'] ?? NULL;
+    $filters = [
+      'extends' => $main['contact_type'],
+      'is_active' => TRUE,
+      'is_multiple' => FALSE,
+      'extends_entity_column_value' => NULL,
+    ];
+    if (!empty($other['contact_sub_type'])) {
+      $filters['extends_entity_column_value'] = array_merge([NULL], $other['contact_sub_type']);
+    }
+    $otherTree = CRM_Core_BAO_CustomGroup::getAll($filters, $checkPermissions ? CRM_Core_Permission::EDIT : NULL);
+
+    foreach ($otherTree as $group) {
+      $mainCustomValues = Contact::get(FALSE)
+        ->addWhere('id', '=', $mainID)
+        ->addSelect($group['name'] . '.*')
+        ->execute();
+      $otherCustomValues = Contact::get(FALSE)
+        ->addWhere('id', '=', $otherID)
+        ->addSelect($group['name'] . '.*')
+        ->execute();
+      foreach ($group['fields'] as $field) {
+        $fid = $field['id'];
+        $apiFieldName = "{$group['name']}.{$field['name']}";
         if (in_array($fid, $compareFields['custom'])) {
-          $rows["custom_group_$gid"]['title'] ??= $group['title'];
+          $rows["custom_group_{$group['id']}"]['title'] ??= $group['title'];
 
-          if ($mainContactValue) {
-            foreach ($mainContactValue as $valueId => $values) {
-              $rows["move_custom_$fid"]['main'] = CRM_Core_BAO_CustomField::displayValue($values['data'], $fid);
-            }
+          foreach ($mainCustomValues as $values) {
+            $customValue = $values[$apiFieldName] ?? NULL;
+            $rows["move_custom_$fid"]['main'] = CRM_Core_BAO_CustomField::displayValue($customValue, $fid);
           }
           $value = 'null';
-          if ($otherContactValue) {
-            foreach ($otherContactValue as $valueId => $values) {
-              $rows["move_custom_$fid"]['other'] = CRM_Core_BAO_CustomField::displayValue($values['data'], $fid);
-              if ($values['data'] === 0 || $values['data'] === '0') {
-                $values['data'] = $qfZeroBug;
-              }
-              $value = ($values['data']) ? $values['data'] : $value;
+          foreach ($otherCustomValues as $values) {
+            $customValue = $values[$apiFieldName] ?? NULL;
+            $rows["move_custom_$fid"]['other'] = CRM_Core_BAO_CustomField::displayValue($customValue, $fid);
+            if ($customValue === 0 || $customValue === '0' || $customValue === FALSE) {
+              $customValue = $qfZeroBug;
             }
+            // FIXME: Not changed during refactor but this looks wrong: should be `??` not `?:`
+            $value = $customValue ?: $value;
           }
+          // FIXME: Underlying code relies on $value to be a string.
+          $value = is_array($value) ? CRM_Utils_Array::implodePadded($value) : (string) $value;
           $rows["move_custom_$fid"]['title'] = $field['label'];
 
           $elements[] = [
@@ -1699,258 +1679,6 @@ public static function getRowsElementsAndInfo(int $mainID, int $otherID, bool $c
     return $result;
   }
 
-  /**
-   * Function is separated from shared function & can likely be distilled to an api call.
-   *
-   * @todo clean up post split.
-   *
-   * Get custom groups/fields data for type of entity in a tree structure representing group->field hierarchy
-   * This may also include entity specific data values.
-   *
-   * An array containing all custom groups and their custom fields is returned.
-   *
-   * @param string $entityType
-   *   Of the contact whose contact type is needed.
-   * @param int $entityID
-   * @param array $subTypes
-   * @param bool|int $checkPermission
-   *   Either a CRM_Core_Permission constant or FALSE to disable checks
-   *
-   * @return array
-   *   Custom field 'tree'.
-   *
-   *   The returned array is keyed by group id and has the custom group table fields
-   *   and a sub-key 'fields' holding the specific custom fields.
-   *   If entityId is passed in the fields keys have a subkey 'customValue' which holds custom data
-   *   if set for the given entity. This is structured as an array of values with each one having the keys 'id', 'data'
-   *
-   * @todo - review this  - It also returns an array called 'info' with tables, select, from, where keys
-   *   The reason for the info array in unclear and it could be determined from parsing the group tree after creation
-   *   With caching the performance impact would be small & the function would be cleaner
-   *
-   * @throws \CRM_Core_Exception
-   */
-  private static function getTree(
-    $entityType,
-    int $entityID,
-    $subTypes,
-    $checkPermission
-  ) {
-
-    if (!is_array($subTypes)) {
-      if (empty($subTypes)) {
-        $subTypes = [];
-      }
-      else {
-        if (stristr($subTypes, ',')) {
-          $subTypes = explode(',', $subTypes);
-        }
-        else {
-          $subTypes = explode(CRM_Core_DAO::VALUE_SEPARATOR, trim($subTypes, CRM_Core_DAO::VALUE_SEPARATOR));
-        }
-      }
-    }
-
-    // create a new tree
-
-    // legacy hardcoded list of data to return
-    $toReturn = [
-      'custom_field' => [
-        'id',
-        'name',
-        'label',
-        'column_name',
-        'data_type',
-        'html_type',
-        'default_value',
-        'attributes',
-        'is_required',
-        'is_view',
-        'help_pre',
-        'help_post',
-        'options_per_line',
-        'start_date_years',
-        'end_date_years',
-        'date_format',
-        'time_format',
-        'option_group_id',
-        'in_selector',
-        'serialize',
-      ],
-      'custom_group' => [
-        'id',
-        'name',
-        'table_name',
-        'title',
-        'help_pre',
-        'help_post',
-        'collapse_display',
-        'style',
-        'is_multiple',
-        'extends',
-        'extends_entity_column_id',
-        'extends_entity_column_value',
-        'max_multiple',
-        'is_public',
-      ],
-    ];
-
-    // create select
-    $select = [];
-    foreach ($toReturn as $tableName => $tableColumn) {
-      foreach ($tableColumn as $columnName) {
-        $select[] = "civicrm_{$tableName}.{$columnName} as civicrm_{$tableName}_{$columnName}";
-      }
-    }
-    $strSelect = 'SELECT ' . implode(', ', $select);
-
-    // from, where, order by
-    $strFrom = '
-FROM     civicrm_custom_group
-LEFT JOIN civicrm_custom_field ON (civicrm_custom_field.custom_group_id = civicrm_custom_group.id)
-';
-
-    // if entity is either individual, organization or household pls get custom groups for 'contact' too.
-    if ($entityType === 'Individual' || $entityType === 'Organization' ||
-      $entityType === 'Household'
-    ) {
-      $in = "'$entityType', 'Contact'";
-    }
-    elseif (strpos($entityType, "'") !== FALSE) {
-      // this allows the calling function to send in multiple entity types
-      $in = $entityType;
-    }
-    else {
-      // quote it
-      $in = "'$entityType'";
-    }
-
-    $params = [];
-    $sqlParamKey = 1;
-    $subType = '';
-    if (!empty($subTypes)) {
-      foreach ($subTypes as $key => $subType) {
-        $subTypeClauses[] = self::whereListHas("civicrm_custom_group.extends_entity_column_value", CRM_Core_BAO_CustomGroup::validateSubTypeByEntity($entityType, $subType));
-      }
-      $subTypeClause = '(' . implode(' OR ', $subTypeClauses) . ')';
-      $subTypeClause = '(' . $subTypeClause . '  OR civicrm_custom_group.extends_entity_column_value IS NULL )';
-
-      $strWhere = "
-WHERE civicrm_custom_group.is_active = 1
-  AND civicrm_custom_field.is_active = 1
-  AND civicrm_custom_group.extends IN ($in)
-  AND $subTypeClause
-";
-    }
-    else {
-      $strWhere = "
-WHERE civicrm_custom_group.is_active = 1
-  AND civicrm_custom_field.is_active = 1
-  AND civicrm_custom_group.extends IN ($in)
-";
-    }
-
-    if ($checkPermission) {
-      // ensure that the user has access to these custom groups
-      $strWhere .= " AND " .
-        CRM_Core_Permission::customGroupClause($checkPermission,
-          'civicrm_custom_group.'
-        );
-    }
-
-    $orderBy = "
-ORDER BY civicrm_custom_group.weight,
-         civicrm_custom_group.title,
-         civicrm_custom_field.weight,
-         civicrm_custom_field.label
-";
-
-    // final query string
-    $queryString = "$strSelect $strFrom $strWhere $orderBy";
-
-    // lets see if we can retrieve the groupTree from cache
-    $cacheString = $queryString . '_Inline';
-
-    $cacheKey = 'CRM_Core_DAO_CustomGroup_Query ' . md5($cacheString);
-    $multipleFieldGroupCacheKey = 'CRM_Core_DAO_CustomGroup_QueryMultipleFields ' . md5($cacheString);
-    $cache = CRM_Utils_Cache::singleton();
-    $groupTree = $cache->get($cacheKey);
-    $multipleFieldGroups = $cache->get($multipleFieldGroupCacheKey);
-
-    if (empty($groupTree)) {
-      [$multipleFieldGroups, $groupTree] = CRM_Core_BAO_CustomGroup::buildGroupTree($entityType, $toReturn, $subTypes, $queryString, $params, $subType);
-
-      $cache->set($cacheKey, $groupTree);
-      $cache->set($multipleFieldGroupCacheKey, $multipleFieldGroups);
-    }
-    // entitySelectClauses is an array of select clauses for custom value tables which are not multiple
-    // and have data for the given entities. $entityMultipleSelectClauses is the same for ones with multiple
-    $entitySingleSelectClauses = $entityMultipleSelectClauses = $groupTree['info']['select'] = [];
-    $singleFieldTables = [];
-    // now that we have all the groups and fields, lets get the values
-    // since we need to know the table and field names
-    // add info to groupTree
-
-    if (isset($groupTree['info']) && !empty($groupTree['info']) &&
-      !empty($groupTree['info']['tables'])
-    ) {
-      $groupTree['info']['where'] = NULL;
-
-      foreach ($groupTree['info']['tables'] as $table => $fields) {
-        $groupTree['info']['from'][] = $table;
-        $select = [
-          "{$table}.id as {$table}_id",
-          "{$table}.entity_id as {$table}_entity_id",
-        ];
-        foreach ($fields as $column => $dontCare) {
-          $select[] = "{$table}.{$column} as {$table}_{$column}";
-        }
-        $groupTree['info']['select'] = array_merge($groupTree['info']['select'], $select);
-        if ($entityID) {
-          $groupTree['info']['where'][] = "{$table}.entity_id = $entityID";
-          if (in_array($table, $multipleFieldGroups) &&
-            CRM_Core_BAO_CustomGroup::customGroupDataExistsForEntity($entityID, $table)
-          ) {
-            $entityMultipleSelectClauses[$table] = $select;
-          }
-          else {
-            $singleFieldTables[] = $table;
-            $entitySingleSelectClauses = array_merge($entitySingleSelectClauses, $select);
-          }
-
-        }
-      }
-      if ($entityID && !empty($singleFieldTables)) {
-        CRM_Core_BAO_CustomGroup::buildEntityTreeSingleFields($groupTree, $entityID, $entitySingleSelectClauses, $singleFieldTables);
-      }
-      $multipleFieldTablesWithEntityData = array_keys($entityMultipleSelectClauses);
-      if (!empty($multipleFieldTablesWithEntityData)) {
-        CRM_Core_BAO_CustomGroup::buildEntityTreeMultipleFields($groupTree, $entityID, $entityMultipleSelectClauses, $multipleFieldTablesWithEntityData);
-      }
-
-    }
-    return $groupTree;
-  }
-
-  /**
-   * Suppose you have a SQL column, $column, which includes a delimited list, and you want
-   * a WHERE condition for rows that include $value. Use whereListHas().
-   *
-   * @param string $column
-   * @param string $value
-   * @param string $delimiter
-   *
-   * @return string
-   *   SQL condition.
-   * @throws \CRM_Core_Exception
-   */
-  private static function whereListHas($column, $value, $delimiter = CRM_Core_DAO::VALUE_SEPARATOR) {
-    // ?
-    $bareValue = trim($value, $delimiter);
-    $escapedValue = CRM_Utils_Type::escape("%{$delimiter}{$bareValue}{$delimiter}%", 'String', FALSE);
-    return "($column LIKE \"$escapedValue\")";
-  }
-
   /**
    * Based on the provided two contact_ids and a set of tables, move the belongings of the
    * other contact to the main one - be it Location / CustomFields or Contact .. related info.
@@ -2036,11 +1764,11 @@ public static function moveAllBelongings($mainId, $otherId, $migrationInfo, $che
     foreach ($submitted as $key => $value) {
       if (strpos($key, 'custom_') === 0) {
         $fieldID = (int) substr($key, 7);
-        $fieldMetadata = CRM_Core_BAO_CustomField::getCustomFieldsForContactType($contactType, FALSE)[$fieldID] ?? NULL;
+        $fieldMetadata = CRM_Core_BAO_CustomField::getField($fieldID);
         if ($fieldMetadata) {
           $htmlType = (string) $fieldMetadata['html_type'];
-          $isSerialized = CRM_Core_BAO_CustomField::isSerialized($fieldMetadata);
-          $isView = (bool) $fieldMetadata['is_view'];
+          $isSerialized = $fieldMetadata['serialize'];
+          $isView = $fieldMetadata['is_view'];
           $submitted = self::processCustomFields($mainId, $key, $submitted, $value, $fieldID, $isView, $htmlType, $isSerialized);
           if ($isView) {
             $viewOnlyCustomFields[$key] = $submitted[$key];
@@ -2233,8 +1961,8 @@ public static function getDuplicatePairs($rule_group_id, $group_id, $reloadCache
   /**
    * Get the cache key string for the merge action.
    *
-   * @param int $rule_group_id
-   * @param int $group_id
+   * @param int|null $rule_group_id
+   * @param int|null $group_id
    * @param array $criteria
    *   Additional criteria to narrow down the merge group.
    *   Currently we are only supporting the key 'contact' within it.
@@ -2250,8 +1978,8 @@ public static function getDuplicatePairs($rule_group_id, $group_id, $reloadCache
   public static function getMergeCacheKeyString($rule_group_id, $group_id, $criteria, $checkPermissions, $searchLimit) {
     $contactType = CRM_Dedupe_BAO_DedupeRuleGroup::getContactTypeForRuleGroup($rule_group_id);
     $cacheKeyString = "merge_{$contactType}";
-    $cacheKeyString .= $rule_group_id ? "_{$rule_group_id}" : '_0';
-    $cacheKeyString .= $group_id ? "_{$group_id}" : '_0';
+    $cacheKeyString .= '_' . (int) $rule_group_id;
+    $cacheKeyString .= '_' . (int) $group_id;
     $cacheKeyString .= '_' . (int) $searchLimit;
     $cacheKeyString .= !empty($criteria) ? md5(serialize($criteria)) : '_0';
     if ($checkPermissions) {
@@ -2310,11 +2038,6 @@ public static function getMergeFieldsMetadata(bool $checkPermissions = TRUE): ar
    * @throws CRM_Core_Exception
    */
   public static function getMergeContactDetails($contactID): array {
-    $params = [
-      'contact_id' => $contactID,
-      'version' => 3,
-      'return' => array_merge(['display_name'], self::getContactFields()),
-    ];
     $result = Contact::get(FALSE)->addWhere('id', '=', $contactID)->execute()->first();
 
     // CRM-18480: Cancel the process if the contact is already deleted
diff --git a/www/modules/civicrm/CRM/Event/ActionMapping.php b/www/modules/civicrm/CRM/Event/ActionMapping.php
index 945079443..8bcc38c29 100644
--- a/www/modules/civicrm/CRM/Event/ActionMapping.php
+++ b/www/modules/civicrm/CRM/Event/ActionMapping.php
@@ -28,7 +28,7 @@ public function getEntityName(): string {
     return 'Participant';
   }
 
-  public function modifySpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
+  public function modifyApiSpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
     $spec->getFieldByName('entity_value')
       ->setLabel($this->getLabel());
     $spec->getFieldByName('entity_status')
diff --git a/www/modules/civicrm/CRM/Event/BAO/Event.php b/www/modules/civicrm/CRM/Event/BAO/Event.php
index 56c10ee6d..714cf1644 100644
--- a/www/modules/civicrm/CRM/Event/BAO/Event.php
+++ b/www/modules/civicrm/CRM/Event/BAO/Event.php
@@ -9,6 +9,8 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\Event\AuthorizeRecordEvent;
+
 /**
  *
  * @package CRM
@@ -121,10 +123,6 @@ public static function create(&$params) {
 
     $event = self::add($params);
     CRM_Price_BAO_PriceSet::setPriceSets($params, $event, 'event');
-    if (is_a($event, 'CRM_Core_Error')) {
-      CRM_Core_DAO::transaction('ROLLBACK');
-      return $event;
-    }
 
     $contactId = CRM_Core_Session::getLoggedInContactID();
     if (!$contactId) {
@@ -178,8 +176,10 @@ public static function del($id) {
   public static function self_hook_civicrm_pre(\Civi\Core\Event\PreEvent $event) {
     if ($event->action === 'delete' && $event->id) {
 
-      $extends = ['event'];
+      $extends = ['Event'];
       $groupTree = CRM_Core_BAO_CustomGroup::getGroupDetail(NULL, NULL, $extends);
+      // @todo is this custom field loop necessary? The cascade delete on the
+      // db foreign key should do it already.
       foreach ($groupTree as $values) {
         $query = "DELETE FROM %1 WHERE entity_id = %2";
         CRM_Core_DAO::executeQuery($query, [
@@ -277,11 +277,15 @@ public static function getEvents(
     }
     elseif ($all == 0) {
       // find only events ending in the future
+      // The STR_TO_DATE is because in mariadb with strict mode off you can
+      // have dates like '0000-00-00' and we want to include those here, but a
+      // comparison to '' or '0000-00-00' directly will error in mysql8 with
+      // strict mode on. So this works for both.
       $endDate = date('YmdHis');
       $query .= "
         AND ( `end_date` >= {$endDate} OR
           (
-            ( end_date IS NULL OR end_date = '' ) AND start_date >= {$endDate}
+            ( end_date IS NULL OR end_date = STR_TO_DATE('', '%Y%m%d%H%i%s') ) AND start_date >= {$endDate}
           )
         )";
     }
@@ -1187,13 +1191,13 @@ public static function sendMail($contactID, $values, $participantId, $isTest = F
 
         $sendTemplateParams = [
           'workflow' => 'event_online_receipt',
-          'contactId' => $contactID,
           'isTest' => $isTest,
           'tplParams' => $tplParams,
           'PDFFilename' => ts('confirmation') . '.pdf',
           'modelProps' => [
             'participantID' => (int) $participantId,
             'eventID' => (int) $values['event']['id'],
+            'contactID' => (int) $contactID,
           ],
         ];
 
@@ -1597,10 +1601,11 @@ public static function displayProfile(&$params, $gid, &$groupTitle, &$values, &$
             $idx = $detailName . '_id';
             $values[$index] = $params[$idx];
           }
-          elseif ($fieldName == 'im') {
+          elseif ($fieldName === 'im') {
             $providerName = NULL;
             if ($providerId = $detailName . '-provider_id') {
-              $providerName = $imProviders[$params[$providerId]] ?? NULL;
+              $inputProvider = $params[$providerId] ?? '';
+              $providerName = $imProviders[$inputProvider] ?? NULL;
             }
             if ($providerName) {
               $values[$index] = $params[$detailName] . " (" . $providerName . ")";
@@ -1609,7 +1614,7 @@ public static function displayProfile(&$params, $gid, &$groupTitle, &$values, &$
               $values[$index] = $params[$detailName];
             }
           }
-          elseif ($fieldName == 'phone') {
+          elseif ($fieldName === 'phone') {
             $phoneExtField = str_replace('phone', 'phone_ext', $detailName);
             if (isset($params[$phoneExtField])) {
               $values[$index] = $params[$detailName] . " (" . $params[$phoneExtField] . ")";
@@ -1678,8 +1683,6 @@ public static function displayProfile(&$params, $gid, &$groupTitle, &$values, &$
                   $customVal = $params[$name];
                 }
                 //take the custom field options
-                $returnProperties = [$name => 1];
-                $query = new CRM_Contact_BAO_Query($params, $returnProperties, $fields);
                 if (!$skip) {
                   $displayValue = CRM_Core_BAO_CustomField::displayValue($customVal, $cfID);
                 }
@@ -2189,17 +2192,17 @@ public static function getAllPermissions() {
   }
 
   /**
-   * @param string $entityName
-   * @param string $action
-   * @param array $record
-   * @param int $userID
-   * @return bool
+   * Check event access.
    * @see \Civi\Api4\Utils\CoreUtil::checkAccessRecord
    */
-  public static function _checkAccess(string $entityName, string $action, array $record, $userID): bool {
-    switch ($action) {
+  public static function self_civi_api4_authorizeRecord(AuthorizeRecordEvent $e): void {
+    $record = $e->getRecord();
+    $userID = $e->getUserID();
+
+    switch ($e->getActionName()) {
       case 'create':
-        return CRM_Core_Permission::check('access CiviEvent', $userID);
+        $e->setAuthorized(CRM_Core_Permission::check('access CiviEvent', $userID));
+        return;
 
       case 'get':
         $actionType = CRM_Core_Permission::VIEW;
@@ -2214,7 +2217,7 @@ public static function _checkAccess(string $entityName, string $action, array $r
         break;
     }
 
-    return self::checkPermission($record['id'], $actionType, $userID);
+    $e->setAuthorized(self::checkPermission($record['id'], $actionType, $userID));
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Event/BAO/Participant.php b/www/modules/civicrm/CRM/Event/BAO/Participant.php
index f9f0c1c95..bbcaad1f1 100644
--- a/www/modules/civicrm/CRM/Event/BAO/Participant.php
+++ b/www/modules/civicrm/CRM/Event/BAO/Participant.php
@@ -170,11 +170,6 @@ public static function create(&$params) {
 
     $participant = self::add($params);
 
-    if (is_a($participant, 'CRM_Core_Error')) {
-      $transaction->rollback();
-      return $participant;
-    }
-
     // Log activity when creating new participant or changing status
     if (empty($params['id']) ||
       (isset($params['status_id']) && $params['status_id'] != $status)
@@ -315,8 +310,7 @@ public static function create(&$params) {
    *                 calculation or not. (it is for cron job  purpose)
    *
    * @param bool $returnWaitingCount
-   * @param bool $considerTestParticipant
-   *   When TRUE, include participant records where is_test = 1.
+   * @param bool $considerTestParticipant deprecated, unused
    * @param bool $onlyPositiveStatuses
    *   When FALSE, count all participant statuses where is_counted = 1.  This includes
    *   both "Positive" participants (Registered, Attended, etc.) and waitlisted
@@ -325,6 +319,7 @@ public static function create(&$params) {
    *
    * @return bool|int|null|string
    *   1. false                 => If event having some empty spaces.
+   * @throws \CRM_Core_Exception
    */
   public static function eventFull(
     $eventId,
@@ -345,28 +340,16 @@ public static function eventFull(
     // It might be case there are some empty spaces and still event
     // is full, as waitlist might represent group require spaces > empty.
 
-    $participantRoles = CRM_Event_PseudoConstant::participantRole(NULL, 'filter = 1');
-    $countedStatuses = CRM_Event_PseudoConstant::participantStatus(NULL, 'is_counted = 1');
+    $countedStatuses = \CRM_Event_BAO_Participant::buildOptions('status_id', NULL, ['is_counted' => 1]);;
     $positiveStatuses = CRM_Event_PseudoConstant::participantStatus(NULL, "class = 'Positive'");
     $waitingStatuses = CRM_Event_PseudoConstant::participantStatus(NULL, "class = 'Waiting'");
     $onWaitlistStatusId = array_search('On waitlist', $waitingStatuses);
 
-    $where = [' event.id = %1 '];
-    if (!$considerTestParticipant) {
-      $where[] = ' participant.is_test = 0 ';
+    $where = [' event.id = %1 ', ' participant.is_test = 0 '];
+    $participantRoleClause = self::getParticipantRoleClause();
+    if ($participantRoleClause) {
+      $where[] = " participant.role_id " . $participantRoleClause;
     }
-
-    // Only count Participant Roles with the "Counted?" flag.
-    if (!empty($participantRoles)) {
-      $escapedRoles = [];
-      foreach (array_keys($participantRoles) as $participantRole) {
-        $escapedRoles[] = CRM_Utils_Type::escape($participantRole, 'String');
-      }
-
-      $regexp = "([[:cntrl:]]|^)" . implode('([[:cntrl:]]|$)|([[:cntrl:]]|^)', $escapedRoles) . "([[:cntrl:]]|$)";
-      $where[] = " participant.role_id REGEXP '{$regexp}'";
-    }
-
     $eventParams = [1 => [$eventId, 'Positive']];
 
     //in case any waiting, straight forward event is full.
@@ -378,22 +361,18 @@ public static function eventFull(
       $eventSeatsWhere = implode(' AND ', $where) . " AND ( participant.status_id = $onWaitlistStatusId )";
 
       $query = "
-    SELECT  participant.id id,
-            event.event_full_text as event_full_text
+    SELECT  participant.id id
       FROM  civicrm_participant participant
 INNER JOIN  civicrm_event event ON ( event.id = participant.event_id )
             {$whereClause}";
 
-      $eventFullText = ts('This event is full.');
-      $participants = CRM_Core_DAO::executeQuery($query, $eventParams);
-      while ($participants->fetch()) {
+      $hasWaitlistedParticipants = CRM_Core_DAO::singleValueQuery($query, $eventParams);
+      if ($hasWaitlistedParticipants) {
         //oops here event is full and we don't want waiting count.
         if ($returnWaitingCount) {
           return CRM_Event_BAO_Event::eventTotalSeats($eventId, $eventSeatsWhere);
         }
-        else {
-          return ($participants->event_full_text) ? $participants->event_full_text : $eventFullText;
-        }
+        return CRM_Core_DAO::singleValueQuery('SELECT event_full_text FROM civicrm_event WHERE id = ' . (int) $eventId) ?: ts('This event is full.');
       }
     }
 
@@ -520,7 +499,7 @@ public static function priceSetOptionsCount(
     SELECT  line.id as lineId,
             line.entity_id as entity_id,
             line.qty,
-            value.id as valueId,
+            value.id as price_field_value_id,
             value.count,
             field.html_type
       FROM  civicrm_line_item line
@@ -536,14 +515,13 @@ public static function priceSetOptionsCount(
 
     $lineItem = CRM_Core_DAO::executeQuery($sql, [1 => [$eventId, 'Positive']]);
     while ($lineItem->fetch()) {
-      $count = $lineItem->count;
-      if (!$count) {
-        $count = 1;
-      }
-      if ($lineItem->html_type == 'Text') {
+      $id = (int) $lineItem->price_field_value_id;
+      $optionsCount[$id] ??= 0;
+      $count = $lineItem->count ?: 1;
+      if ($lineItem->html_type === 'Text') {
         $count *= $lineItem->qty;
       }
-      $optionsCount[$lineItem->valueId] = $count + ($optionsCount[$lineItem->valueId] ?? 0);
+      $optionsCount[$id] += $count;
     }
 
     return $optionsCount;
@@ -1017,7 +995,6 @@ public static function getUnDiscountedAmountForEventPriceSetFieldValue($eventID,
       $params[2] = [$discountedPriceFieldOptionID, 'Integer'];
     }
     else {
-      $feeLevel = current($feeLevel);
       $query = "SELECT cpfv.amount FROM `civicrm_price_field_value` cpfv
 LEFT JOIN civicrm_price_field cpf ON cpfv.price_field_id = cpf.id
 WHERE cpf.price_set_id = %1 AND cpfv.label LIKE %2";
@@ -1408,7 +1385,6 @@ public static function sendTransitionParticipantMail(
         [
           'workflow' => 'participant_' . strtolower($mailType),
           'contactId' => $contactId,
-          'tokenContext' => ['participantId' => $participantId],
           'tplParams' => [
             'participant' => $participantValues,
             'event' => $eventDetails,
@@ -1419,6 +1395,11 @@ public static function sendTransitionParticipantMail(
             'isConfirm' => $mailType === 'Confirm',
             'checksumValue' => $checksumValue,
           ],
+          'modelProps' => [
+            'participantID' => (int) $participantId,
+            'eventID' => (int) $eventDetails['id'],
+            'contactID' => (int) $contactId,
+          ],
           'from' => $receiptFrom,
           'toName' => $participantName,
           'toEmail' => $toEmail,
@@ -1441,10 +1422,7 @@ public static function sendTransitionParticipantMail(
           'is_test' => $participantValues['is_test'],
           'status_id' => 2,
         ];
-
-        if (is_a(CRM_Activity_BAO_Activity::create($activityParams), 'CRM_Core_Error')) {
-          throw new CRM_Core_Exception('Failed creating Activity for expiration mail');
-        }
+        CRM_Activity_BAO_Activity::create($activityParams);
       }
     }
 
@@ -1693,6 +1671,10 @@ public static function getAdditionalParticipantUrl($participantIds) {
   public static function createDiscountTrxn($eventID, $contributionParams, $feeLevel, $discountedPriceFieldOptionID = NULL) {
     $financialTypeID = $contributionParams['contribution']->financial_type_id;
     $total_amount = $contributionParams['total_amount'];
+    if (is_array($feeLevel)) {
+      CRM_Core_Error::deprecatedFunctionWarning('array passed for string value');
+      $feeLevel = (string) current($feeLevel);
+    }
 
     $checkDiscount = CRM_Core_BAO_Discount::findSet($eventID, 'civicrm_event');
     if (!empty($checkDiscount)) {
@@ -1780,13 +1762,19 @@ public static function addActivityForSelection($participantId, $activityType) {
   public static function buildOptions($fieldName, $context = NULL, $props = []) {
     $params = ['condition' => []];
 
-    if ($fieldName == 'status_id' && $context != 'validate') {
+    if ($fieldName === 'status_id' && $context !== 'validate') {
       // Get rid of cart-related option if disabled
       // FIXME: Why does this option even exist if cart is disabled?
       if (!Civi::settings()->get('enable_cart')) {
         $params['condition'][] = "name <> 'Pending in cart'";
       }
     }
+    if ($fieldName === 'status_id' && isset($props['is_counted'])) {
+      $params['condition'][] = 'is_counted = ' . $props['is_counted'];
+    }
+    if ($fieldName === 'role_id' && isset($props['filter'])) {
+      $params['condition'][] = 'filter = ' . $props['filter'];
+    }
 
     return CRM_Core_PseudoConstant::get(__CLASS__, $fieldName, $params, $context);
   }
@@ -1930,4 +1918,32 @@ public static function self_hook_civicrm_pre(\Civi\Core\Event\PreEvent $event) {
     }
   }
 
+  /**
+   * Get the clause to exclude uncounted participant roles.
+   *
+   * @internal do not call from outside core code.
+   *
+   * @return string
+   * @throws \CRM_Core_Exception
+   */
+  public static function getParticipantRoleClause(): string {
+    // Only count Participant Roles with the "Counted?" flag.
+    $participantRoles = self::buildOptions('role_id', NULL, ['filter' => TRUE]);
+    $allRoles = self::buildOptions('role_id');
+    if ($participantRoles === $allRoles) {
+      // Don't complicate the query if no roles are excluded.
+      return '';
+    }
+    if (!empty($participantRoles)) {
+      $escapedRoles = [];
+      foreach (array_keys($participantRoles) as $participantRole) {
+        $escapedRoles[] = CRM_Utils_Type::escape($participantRole, 'String');
+      }
+
+      $regexp = "([[:cntrl:]]|^)" . implode('([[:cntrl:]]|$)|([[:cntrl:]]|^)', $escapedRoles) . "([[:cntrl:]]|$)";
+      $participantRoleClause = "REGEXP '{$regexp}'";
+    }
+    return $participantRoleClause ?? '';
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Event/Cart/DAO/Cart.php b/www/modules/civicrm/CRM/Event/Cart/DAO/Cart.php
index edbf11df8..07d259a2e 100644
--- a/www/modules/civicrm/CRM/Event/Cart/DAO/Cart.php
+++ b/www/modules/civicrm/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:8e893fbe5da167afb44ab4d4d108239c)
+ * (GenCodeChecksum:6c337a4c740d4d8aeeb55e5a5f51f5c5)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Event/Cart/DAO/EventInCart.php b/www/modules/civicrm/CRM/Event/Cart/DAO/EventInCart.php
index f7ffdc041..dc0722ca7 100644
--- a/www/modules/civicrm/CRM/Event/Cart/DAO/EventInCart.php
+++ b/www/modules/civicrm/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:53e6a1294997529a3b2babce613e214c)
+ * (GenCodeChecksum:dbcfa0b715a597296517664991988807)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Event/DAO/Event.php b/www/modules/civicrm/CRM/Event/DAO/Event.php
index 32de78e33..16ede636d 100644
--- a/www/modules/civicrm/CRM/Event/DAO/Event.php
+++ b/www/modules/civicrm/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:d63c53d10f2e09895a19061ea9d51093)
+ * (GenCodeChecksum:95fce61846fa118c62a6638222b147ef)
  */
 
 /**
@@ -542,7 +542,7 @@ class CRM_Event_DAO_Event extends CRM_Core_DAO {
   /**
    * Number of hours prior to event start date to allow self-service cancellation or transfer.
    *
-   * @var int|string|null
+   * @var int|string
    *   (SQL type: int)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -1471,7 +1471,7 @@ public static function &fields() {
           'bao' => 'CRM_Event_BAO_Event',
           'localizable' => 1,
           'html' => [
-            'type' => 'TextArea',
+            'type' => 'RichTextEditor',
           ],
           'add' => '1.7',
         ],
@@ -1994,6 +1994,7 @@ public static function &fields() {
           'type' => CRM_Utils_Type::T_INT,
           'title' => ts('Self-service Cancellation or Transfer Time'),
           'description' => ts('Number of hours prior to event start date to allow self-service cancellation or transfer.'),
+          'required' => TRUE,
           'usage' => [
             'import' => FALSE,
             'export' => FALSE,
diff --git a/www/modules/civicrm/CRM/Event/DAO/Participant.php b/www/modules/civicrm/CRM/Event/DAO/Participant.php
index 5821da041..f8b518b60 100644
--- a/www/modules/civicrm/CRM/Event/DAO/Participant.php
+++ b/www/modules/civicrm/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:9467fd6b3257cf173c367e78d7875b82)
+ * (GenCodeChecksum:020be0037929bdfd423d5bfcc6141601)
  */
 
 /**
@@ -47,6 +47,7 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO {
     'add' => 'civicrm/participant/add?action=add&context=standalone&reset=1',
     'view' => 'civicrm/contact/view/participant?id=[id]&cid=[contact_id]&action=view&reset=1',
     'update' => 'civicrm/contact/view/participant?id=[id]&cid=[contact_id]&action=update&reset=1',
+    'detach' => 'civicrm/event/selfsvcupdate?reset=1&pid=[id]&is_backoffice=1',
     'delete' => 'civicrm/participant/delete?id=[id]&reset=1',
   ];
 
@@ -504,6 +505,9 @@ public static function &fields() {
           'entity' => 'Participant',
           'bao' => 'CRM_Event_BAO_Participant',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Radio',
+          ],
           'add' => '1.7',
         ],
         'participant_is_pay_later' => [
@@ -526,6 +530,9 @@ public static function &fields() {
           'entity' => 'Participant',
           'bao' => 'CRM_Event_BAO_Participant',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Radio',
+          ],
           'add' => '2.1',
         ],
         'participant_fee_amount' => [
@@ -552,6 +559,9 @@ public static function &fields() {
           'entity' => 'Participant',
           'bao' => 'CRM_Event_BAO_Participant',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Text',
+          ],
           'add' => '2.1',
         ],
         'participant_registered_by_id' => [
diff --git a/www/modules/civicrm/CRM/Event/DAO/ParticipantPayment.php b/www/modules/civicrm/CRM/Event/DAO/ParticipantPayment.php
index 68e9a12ec..3792184fc 100644
--- a/www/modules/civicrm/CRM/Event/DAO/ParticipantPayment.php
+++ b/www/modules/civicrm/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:54606fa6b25d1f6db3229594b6e3eef0)
+ * (GenCodeChecksum:3809a144294ce19cbe0c2277bfbd6ef4)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Event/DAO/ParticipantStatusType.php b/www/modules/civicrm/CRM/Event/DAO/ParticipantStatusType.php
index f052e419e..d08afa5ef 100644
--- a/www/modules/civicrm/CRM/Event/DAO/ParticipantStatusType.php
+++ b/www/modules/civicrm/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:826624f3fa543f7c7a93439ddb53b150)
+ * (GenCodeChecksum:347f317d7b8a3cb912c7274b62f7f555)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Event/Form/EventFees.php b/www/modules/civicrm/CRM/Event/Form/EventFees.php
index 8da6bdeaa..6999f151d 100644
--- a/www/modules/civicrm/CRM/Event/Form/EventFees.php
+++ b/www/modules/civicrm/CRM/Event/Form/EventFees.php
@@ -57,6 +57,7 @@ public static function preProcess(&$form) {
    */
   public static function setDefaultValues(&$form) {
     $defaults = [];
+    $billingLocationTypeID = CRM_Core_BAO_LocationType::getBilling();
 
     if ($form->_pId) {
       $ids = [];
@@ -78,20 +79,20 @@ public static function setDefaultValues(&$form) {
           $form->assign('discount', $discounts[$defaults['discount_id']]);
         }
 
-        $form->assign('fee_amount', CRM_Utils_Array::value('fee_amount', $defaults));
-        $form->assign('fee_level', CRM_Utils_Array::value('fee_level', $defaults));
+        $form->assign('fee_amount', $defaults['fee_amount'] ?? NULL);
+        $form->assign('fee_level', $defaults['fee_level'] ?? NULL);
       }
     }
 
     if ($form->_mode) {
       $config = CRM_Core_Config::singleton();
       // set default country from config if no country set
-      if (empty($defaults["billing_country_id-{$form->_bltID}"])) {
-        $defaults["billing_country_id-{$form->_bltID}"] = $config->defaultContactCountry;
+      if (empty($defaults["billing_country_id-{$billingLocationTypeID}"])) {
+        $defaults["billing_country_id-{$billingLocationTypeID}"] = $config->defaultContactCountry;
       }
 
-      if (empty($defaults["billing_state_province_id-{$form->_bltID}"])) {
-        $defaults["billing_state_province_id-{$form->_bltID}"] = $config->defaultContactStateProvince;
+      if (empty($defaults["billing_state_province_id-{$billingLocationTypeID}"])) {
+        $defaults["billing_state_province_id-{$billingLocationTypeID}"] = $config->defaultContactStateProvince;
       }
 
       $billingDefaults = $form->getProfileDefaults('Billing', $form->_contactId);
@@ -162,18 +163,19 @@ public static function setDefaultValues(&$form) {
         }
       }
 
-      $form->assign('totalAmount', CRM_Utils_Array::value('fee_amount', $defaults));
+      $form->assign('totalAmount', $defaults['fee_amount'] ?? NULL);
       if ($form->_action == CRM_Core_Action::UPDATE) {
         $fee_level = $defaults['fee_level'];
         CRM_Event_BAO_Participant::fixEventLevel($fee_level);
         $form->assign('fee_level', $fee_level);
-        $form->assign('fee_amount', CRM_Utils_Array::value('fee_amount', $defaults));
+        $form->assign('fee_amount', $defaults['fee_amount'] ?? NULL);
       }
     }
 
     //CRM-4453
     if (!empty($defaults['participant_fee_currency'])) {
       $form->assign('fee_currency', $defaults['participant_fee_currency']);
+      $form->assign('currency', $defaults['participant_fee_currency']);
     }
 
     // CRM-4395
diff --git a/www/modules/civicrm/CRM/Event/Form/EventFormTrait.php b/www/modules/civicrm/CRM/Event/Form/EventFormTrait.php
index 442cf5619..823537d57 100644
--- a/www/modules/civicrm/CRM/Event/Form/EventFormTrait.php
+++ b/www/modules/civicrm/CRM/Event/Form/EventFormTrait.php
@@ -30,6 +30,14 @@ trait CRM_Event_Form_EventFormTrait {
    */
   public function getEventValue(string $fieldName) {
     if ($this->isDefined('Event')) {
+      if ($fieldName === 'available_spaces') {
+        // This is temporary. Apiv4 returns available_spaces as a calculated field.
+        // However, there is not total parity between it and the old function.
+        // That needs to be worked through - per https://lab.civicrm.org/dev/core/-/issues/4907
+        // In order to allow the forms to switch over to the 'final' signature we
+        // re-direct to the old function for now.
+        return $this->getAvailableSpaces();
+      }
       return $this->lookup('Event', $fieldName);
     }
     $id = $this->getEventID();
@@ -48,10 +56,14 @@ public function getEventValue(string $fieldName) {
    * is only given where there is specific test cover.
    *
    * @noinspection PhpUnhandledExceptionInspection
-   * @noinspection PhpDocMissingThrowsInspection
    */
   public function getEventID(): ?int {
-    throw new CRM_Core_Exception('`getEventID` must be implemented');
+    try {
+      return $this->getParticipantValue('event_id');
+    }
+    catch (CRM_Core_Exception $e) {
+      throw new CRM_Core_Exception('`getEventID` must be implemented');
+    }
   }
 
   /**
@@ -92,4 +104,65 @@ public function getParticipantValue(string $fieldName) {
     return NULL;
   }
 
+  /**
+   * Get the number of available spaces in the given event.
+   *
+   * @internal this is a transitional function - eventually it will be removed
+   * and the api will handle it.
+   *
+   * @return int
+   *
+   * @throws \CRM_Core_Exception
+   */
+  protected function getAvailableSpaces(): int {
+    $availableSpaces = CRM_Event_BAO_Participant::eventFull($this->getEventID(),
+      TRUE,
+      $this->getEventValue('has_waitlist')
+    );
+    return is_numeric($availableSpaces) ? (int) $availableSpaces : 0;
+  }
+
+  /**
+   * Is the event full already.
+   *
+   * This function may be calculated by v4 api in time, in which case the function
+   * will call that instead but will remain available.
+   *
+   * @return bool
+   *
+   * @throws \CRM_Core_Exception
+   * @api This function will not change in a minor release and is supported for
+   *  use outside of core. This annotation / external support for properties
+   *  is only given where there is specific test cover.
+   */
+  public function isEventFull(): bool {
+    $maximum = $this->getEventValue('max_participants');
+    return !($maximum === NULL) && $this->getEventValue('available_spaces') < 1;
+  }
+
+  /**
+   * Is the event ready for online registrations.
+   *
+   * @internal - the handling of waitlist in this function may change.
+   *
+   * @return bool
+   * @throws \CRM_Core_Exception
+   */
+  protected function isAvailableForOnlineRegistration(): bool {
+    if (!$this->getEventValue('is_online_registration')) {
+      return FALSE;
+    }
+    if ($this->isEventFull() && !$this->getEventValue('has_waitlist')) {
+      return FALSE;
+    }
+    if (!CRM_Event_BAO_Event::validRegistrationRequest([
+      'registration_start_date' => $this->getEventValue('registration_start_date'),
+      'registration_end_date' => $this->getEventValue('registration_end_date'),
+      'end_date' => $this->getEventValue('end_date'),
+    ], $this->getEventID())) {
+      return FALSE;
+    }
+    return TRUE;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Event/Form/ManageEvent.php b/www/modules/civicrm/CRM/Event/Form/ManageEvent.php
index f6d13994d..66c9cc85c 100644
--- a/www/modules/civicrm/CRM/Event/Form/ManageEvent.php
+++ b/www/modules/civicrm/CRM/Event/Form/ManageEvent.php
@@ -18,6 +18,7 @@
  * This class generates form components for processing Event.
  */
 class CRM_Event_Form_ManageEvent extends CRM_Core_Form {
+  use CRM_Event_Form_EventFormTrait;
 
   /**
    * The id of the event we are processing.
@@ -98,17 +99,12 @@ public function preProcess() {
       $this->assign('eventId', $this->_id);
       $this->_single = TRUE;
 
-      $eventInfo = \Civi\Api4\Event::get(FALSE)
-        ->addWhere('id', '=', $this->_id)
-        ->execute()
-        ->first();
-
       // its an update mode, do a permission check
       if (!CRM_Event_BAO_Event::checkPermission($this->_id, CRM_Core_Permission::EDIT)) {
         CRM_Core_Error::statusBounce(ts('You do not have permission to access this page.'));
       }
 
-      $participantListingID = $eventInfo['participant_listing_id'] ?? NULL;
+      $participantListingID = $this->getEventValue('participant_listing_id');
       if ($participantListingID) {
         $participantListingURL = CRM_Utils_System::url('civicrm/event/participant',
           "reset=1&id={$this->_id}",
@@ -117,14 +113,14 @@ public function preProcess() {
       }
       $this->assign('participantListingURL', $participantListingURL ?? NULL);
       $this->assign('participantListingID', $participantListingID);
-      $this->assign('isOnlineRegistration', CRM_Utils_Array::value('is_online_registration', $eventInfo));
+      $this->assign('isOnlineRegistration', $this->getEventValue('is_online_registration'));
 
       $this->assign('id', $this->_id);
     }
 
     // figure out whether we’re handling an event or an event template
     if ($this->_id) {
-      $this->_isTemplate = $eventInfo['is_template'] ?? NULL;
+      $this->_isTemplate = $this->getEventValue('is_template');
     }
     elseif ($this->_action & CRM_Core_Action::ADD) {
       $this->_isTemplate = CRM_Utils_Request::retrieve('is_template', 'Boolean', $this);
@@ -136,11 +132,11 @@ public function preProcess() {
     $title = NULL;
     if ($this->_id) {
       if ($this->_isTemplate) {
-        $title = ts('Edit Event Template') . ' - ' . ($eventInfo['template_title'] ?? '');
+        $title = ts('Edit Event Template') . ' - ' . ($this->getEventValue('template_title'));
       }
       else {
         $configureText = $this->_isRepeatingEvent ? ts('Configure Repeating Event') : ts('Configure Event');
-        $title = $configureText . ' - ' . ($eventInfo['title'] ?? '');
+        $title = $configureText . ' - ' . $this->getEventValue('title');
       }
     }
     elseif ($this->_action & CRM_Core_Action::ADD) {
@@ -180,18 +176,19 @@ public function preProcess() {
     }
 
     // also set up tabs
-    CRM_Event_Form_ManageEvent_TabHeader::build($this);
+    $this->build();
 
     // Set Done button URL and breadcrumb. Templates go back to Manage Templates,
     // otherwise go to Manage Event for new event or ManageEventEdit if event if exists.
     if (!$this->_isTemplate) {
-      $breadCrumb = ['title' => ts('Manage Events')];
       if ($this->_id) {
+        $breadCrumb = ['title' => ts('Configure Event')];
         $breadCrumb['url'] = CRM_Utils_System::url(CRM_Utils_System::currentPath(),
           "action=update&reset=1&id={$this->_id}"
         );
       }
       else {
+        $breadCrumb = ['title' => ts('Manage Events')];
         $breadCrumb['url'] = CRM_Utils_System::url('civicrm/event/manage',
           'reset=1'
         );
@@ -311,7 +308,7 @@ public function endPostProcess() {
       // hack for special cases.
       switch ($className) {
         case 'Event':
-          $attributes = $this->getVar('_attributes');
+          $attributes = $this->_attributes;
           $subPage = CRM_Utils_Request::retrieveComponent($attributes);
           break;
 
@@ -329,7 +326,7 @@ public function endPostProcess() {
       }
 
       CRM_Core_Session::setStatus(ts("'%1' information has been saved.",
-        [1 => CRM_Utils_Array::value('title', CRM_Utils_Array::value($subPage, $this->get('tabHeader')), $className)]
+        [1 => $this->get('tabHeader')[$subPage]['title'] ?? $className]
       ), $this->getTitle(), 'success');
 
       if (CRM_Core_Component::isEnabled('CiviCampaign')) {
@@ -341,7 +338,7 @@ public function endPostProcess() {
         }
       }
       $this->postProcessHook();
-      if ($this->controller->getButtonName('submit') == "_qf_{$className}_upload_done") {
+      if ($this->controller->getButtonName('submit') === "_qf_{$className}_upload_done") {
         if ($this->_isTemplate) {
           CRM_Core_Session::singleton()
             ->pushUserContext(CRM_Utils_System::url('civicrm/admin/eventTemplate', 'reset=1'));
@@ -362,7 +359,7 @@ public function endPostProcess() {
    * @return string
    */
   public function getTemplateFileName() {
-    if ($this->controller->getPrint() || $this->getVar('_id') <= 0 || $this->_action & CRM_Core_Action::DELETE) {
+    if ($this->controller->getPrint() || $this->_id <= 0 || $this->_action & CRM_Core_Action::DELETE) {
       return parent::getTemplateFileName();
     }
     else {
@@ -391,4 +388,198 @@ public function getEventID() {
     return $this->_id ? (int) $this->_id : NULL;
   }
 
+  /**
+   *
+   * @return array
+   * @throws \CRM_Core_Exception
+   */
+  private function build() {
+    $tabs = $this->get('tabHeader');
+    if (!$tabs || empty($_GET['reset'])) {
+      $tabs = $this->processTab();
+      $this->set('tabHeader', $tabs);
+    }
+    $this->assign('tabHeader', $tabs);
+    CRM_Core_Resources::singleton()
+      ->addScriptFile('civicrm', 'templates/CRM/common/TabHeader.js', 1, 'html-header')
+      ->addSetting([
+        'tabSettings' => [
+          'active' => $this->getCurrentTab($tabs),
+        ],
+      ]);
+    CRM_Event_Form_ManageEvent::addProfileEditScripts();
+    return $tabs;
+  }
+
+  /**
+   * @return array
+   * @throws Exception
+   */
+  private function processTab() {
+    if ($this->getEventID() <= 0) {
+      return NULL;
+    }
+
+    $default = [
+      'link' => NULL,
+      'valid' => TRUE,
+      'active' => TRUE,
+      'current' => FALSE,
+      'class' => 'ajaxForm',
+    ];
+
+    $tabs = [];
+    $tabs['settings'] = ['title' => ts('Info and Settings'), 'class' => 'ajaxForm livePage'] + $default;
+    $tabs['location'] = ['title' => ts('Event Location')] + $default;
+    // If CiviContribute is active, create the Fees tab.
+    if (CRM_Core_Component::isEnabled('CiviContribute')) {
+      $tabs['fee'] = ['title' => ts('Fees')] + $default;
+    }
+    $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 data') || !empty($permissions[CRM_Core_Permission::EDIT])) {
+      $tabs['reminder'] = ['title' => ts('Schedule Reminders'), 'class' => 'livePage'] + $default;
+    }
+
+    $tabs['friend'] = ['title' => ts('Tell a Friend')] + $default;
+    $tabs['pcp'] = ['title' => ts('Personal Campaigns')] + $default;
+    $tabs['repeat'] = ['title' => ts('Repeat')] + $default;
+
+    // Repeat tab must refresh page when switching repeat mode so js & vars will get set-up
+    if (!$this->_isRepeatingEvent) {
+      unset($tabs['repeat']['class']);
+    }
+
+    $eventID = $this->getEventID();
+    if ($eventID) {
+      // disable tabs based on their configuration status
+      $sql = "
+SELECT     e.loc_block_id as is_location, e.is_online_registration, e.is_monetary, taf.is_active, pcp.is_active as is_pcp, sch.id as is_reminder, re.id as is_repeating_event
+FROM       civicrm_event e
+LEFT JOIN  civicrm_tell_friend taf ON ( taf.entity_table = 'civicrm_event' AND taf.entity_id = e.id )
+LEFT JOIN  civicrm_pcp_block pcp   ON ( pcp.entity_table = 'civicrm_event' AND pcp.entity_id = e.id )
+LEFT JOIN  civicrm_action_schedule sch ON ( sch.mapping_id = %2 AND sch.entity_value = %1 )
+LEFT JOIN  civicrm_recurring_entity re ON ( e.id = re.entity_id AND re.entity_table = 'civicrm_event' )
+WHERE      e.id = %1
+";
+      //Check if repeat is configured
+      CRM_Core_BAO_RecurringEntity::getParentFor($eventID, 'civicrm_event');
+      $params = [
+        1 => [$eventID, 'Integer'],
+        2 => [CRM_Event_ActionMapping::EVENT_NAME_MAPPING_ID, 'Integer'],
+      ];
+      $dao = CRM_Core_DAO::executeQuery($sql, $params);
+      if (!$dao->fetch()) {
+        throw new CRM_Core_Exception('Unable to determine Event information');
+      }
+      if (!$dao->is_location) {
+        $tabs['location']['valid'] = FALSE;
+      }
+      if (!$dao->is_online_registration) {
+        $tabs['registration']['valid'] = FALSE;
+      }
+      if (!$dao->is_monetary) {
+        $tabs['fee']['valid'] = FALSE;
+      }
+      if (!$dao->is_active) {
+        $tabs['friend']['valid'] = FALSE;
+      }
+      if (!$dao->is_pcp) {
+        $tabs['pcp']['valid'] = FALSE;
+      }
+      if (!$dao->is_reminder) {
+        $tabs['reminder']['valid'] = FALSE;
+      }
+      if (!$dao->is_repeating_event) {
+        $tabs['repeat']['valid'] = FALSE;
+      }
+    }
+
+    // see if any other modules want to add any tabs
+    // note: status of 'valid' flag of any injected tab, needs to be taken care in the hook implementation.
+    CRM_Utils_Hook::tabset('civicrm/event/manage', $tabs,
+      ['event_id' => $eventID]);
+
+    $fullName = $this->_name;
+    $className = CRM_Utils_String::getClassName($fullName);
+    $new = '';
+
+    // hack for special cases.
+    switch ($className) {
+      case 'Event':
+        $attributes = $this->_attributes;
+        $class = CRM_Utils_Request::retrieveComponent($attributes);
+        break;
+
+      case 'EventInfo':
+        $class = 'settings';
+        break;
+
+      case 'ScheduleReminders':
+        $class = 'reminder';
+        break;
+
+      default:
+        $class = strtolower($className);
+        break;
+    }
+
+    if (array_key_exists($class, $tabs)) {
+      $tabs[$class]['current'] = TRUE;
+      $qfKey = $this->get('qfKey');
+      if ($qfKey) {
+        $tabs[$class]['qfKey'] = "&qfKey={$qfKey}";
+      }
+    }
+
+    if ($eventID) {
+      $reset = !empty($_GET['reset']) ? 'reset=1&' : '';
+
+      foreach ($tabs as $key => $value) {
+        if (!isset($tabs[$key]['qfKey'])) {
+          $tabs[$key]['qfKey'] = NULL;
+        }
+
+        $action = 'update';
+        if ($key === 'reminder') {
+          $action = 'browse';
+        }
+
+        $link = "civicrm/event/manage/{$key}";
+        $query = "{$reset}action={$action}&id={$eventID}&component=event{$tabs[$key]['qfKey']}";
+
+        $tabs[$key]['link'] = (isset($value['link']) ? $value['link'] :
+          CRM_Utils_System::url($link, $query));
+      }
+    }
+
+    return $tabs;
+  }
+
+  /**
+   * @param $tabs
+   *
+   * @return int|string
+   */
+  private function getCurrentTab($tabs) {
+    static $current = FALSE;
+
+    if ($current) {
+      return $current;
+    }
+
+    if (is_array($tabs)) {
+      foreach ($tabs as $subPage => $pageVal) {
+        if (($pageVal['current'] ?? NULL) === TRUE) {
+          $current = $subPage;
+          break;
+        }
+      }
+    }
+
+    $current = $current ?: 'settings';
+    return $current;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Event/Form/ManageEvent/EventInfo.php b/www/modules/civicrm/CRM/Event/Form/ManageEvent/EventInfo.php
index c4149c3d4..dcbb2baec 100644
--- a/www/modules/civicrm/CRM/Event/Form/ManageEvent/EventInfo.php
+++ b/www/modules/civicrm/CRM/Event/Form/ManageEvent/EventInfo.php
@@ -20,10 +20,14 @@
  * This class generates form components for processing Event.
  */
 class CRM_Event_Form_ManageEvent_EventInfo extends CRM_Event_Form_ManageEvent {
+  use CRM_Custom_Form_CustomDataTrait;
 
   /**
    * Event type.
+   *
    * @var int
+   *
+   * @deprecated - never set.
    */
   protected $_eventType;
 
@@ -44,10 +48,6 @@ public function preProcess(): void {
       $this->set('subType', $_POST['event_type_id'] ?? '');
       $this->assign('customDataSubType', $_POST['event_type_id'] ?? '');
       $this->set('entityId', $entityID);
-
-      CRM_Custom_Form_CustomData::preProcess($this, NULL, $this->_eventType, 1, 'Event', $entityID);
-      CRM_Custom_Form_CustomData::buildQuickForm($this);
-      CRM_Custom_Form_CustomData::setDefaultValues($this);
     }
   }
 
@@ -185,6 +185,16 @@ public function buildQuickForm(): void {
     $this->addElement('checkbox', 'is_active', ts('Is this Event Active?'));
 
     $this->addFormRule(['CRM_Event_Form_ManageEvent_EventInfo', 'formRule']);
+    if ($this->isSubmitted()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('Event', array_filter([
+        'id' => $this->getEventID(),
+        'event_type_id' => $_POST['event_type_id'],
+      ]));
+    }
 
     parent::buildQuickForm();
   }
@@ -225,14 +235,14 @@ public function postProcess() {
     $params['is_share'] ??= FALSE;
     $params['is_show_calendar_links'] ??= FALSE;
     $params['default_role_id'] ??= FALSE;
-    $params['id'] = $this->_id;
+    $params['id'] = $this->getEventID();
     //merge params with defaults from templates
     if (!empty($params['template_id'])) {
       $params = array_merge(CRM_Event_BAO_Event::getTemplateDefaultValues($params['template_id']), $params);
     }
 
-    $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params,
-      $this->_id,
+    $params['custom'] = CRM_Core_BAO_CustomField::postProcess($this->getSubmittedValues(),
+      $this->getEventID(),
       'Event'
     );
 
diff --git a/www/modules/civicrm/CRM/Event/Form/ManageEvent/Fee.php b/www/modules/civicrm/CRM/Event/Form/ManageEvent/Fee.php
index 68e7bc02e..0c2ca1766 100644
--- a/www/modules/civicrm/CRM/Event/Form/ManageEvent/Fee.php
+++ b/www/modules/civicrm/CRM/Event/Form/ManageEvent/Fee.php
@@ -782,7 +782,7 @@ public function postProcess() {
     $params['id'] = $this->_id;
     // skip update of financial type in price set
     $params['skipFinancialType'] = TRUE;
-    CRM_Event_BAO_Event::add($params);
+    \Civi\Api4\Event::save(FALSE)->addRecord($params)->execute();
 
     // Update tab "disabled" css class
     $this->ajaxResponse['tabValid'] = !empty($params['is_monetary']);
diff --git a/www/modules/civicrm/CRM/Event/Form/ManageEvent/Location.php b/www/modules/civicrm/CRM/Event/Form/ManageEvent/Location.php
index 90faa0cc9..53eaeb0b7 100644
--- a/www/modules/civicrm/CRM/Event/Form/ManageEvent/Location.php
+++ b/www/modules/civicrm/CRM/Event/Form/ManageEvent/Location.php
@@ -354,7 +354,7 @@ public function postProcess() {
 
     // Finally update Event params.
     $params['id'] = $this->_id;
-    CRM_Event_BAO_Event::add($params);
+    Event::save(FALSE)->addRecord($params)->execute();
 
     // Update tab "disabled" CSS class.
     $this->ajaxResponse['tabValid'] = TRUE;
diff --git a/www/modules/civicrm/CRM/Event/Form/ManageEvent/Registration.php b/www/modules/civicrm/CRM/Event/Form/ManageEvent/Registration.php
index 9ee3ec93e..ff482f3a1 100644
--- a/www/modules/civicrm/CRM/Event/Form/ManageEvent/Registration.php
+++ b/www/modules/civicrm/CRM/Event/Form/ManageEvent/Registration.php
@@ -13,6 +13,7 @@
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
+use Civi\Api4\Event;
 
 /**
  * This class generates form components for processing Event.
@@ -92,9 +93,7 @@ public function setDefaultValues() {
         'entity_id' => $eventId,
       ];
 
-      list($defaults['custom_pre_id'],
-        $defaults['custom_post']
-        ) = CRM_Core_BAO_UFJoin::getUFGroupIds($ufJoinParams);
+      [$defaults['custom_pre_id'], $defaults['custom_post']] = CRM_Core_BAO_UFJoin::getUFGroupIds($ufJoinParams);
 
       // Get the id for the event registration profile
       $eventRegistrationIdParams = $eventRegistrationIdDefaults = [
@@ -133,9 +132,7 @@ public function setDefaultValues() {
           'entity_id' => $eventId,
         ];
 
-        list($defaults['additional_custom_pre_id'],
-          $defaults['additional_custom_post']
-          ) = CRM_Core_BAO_UFJoin::getUFGroupIds($ufJoinAddParams);
+        [$defaults['additional_custom_pre_id'], $defaults['additional_custom_post']] = CRM_Core_BAO_UFJoin::getUFGroupIds($ufJoinAddParams);
 
         if (isset($defaults['additional_custom_post']) && is_numeric($defaults['additional_custom_post'])) {
           $defaults['additional_custom_post_id'] = $defaults['additional_custom_post'];
@@ -398,7 +395,7 @@ public function buildMailBlock(&$form) {
     $form->registerRule('emailList', 'callback', 'emailList', 'CRM_Utils_Rule');
     $attributes = CRM_Core_DAO::getAttribute('CRM_Event_DAO_Event');
     $form->addYesNo('is_email_confirm', ts('Send Confirmation Email?'), NULL, NULL, ['onclick' => "return showHideByValue('is_email_confirm','','confirmEmail','block','radio',false);"]);
-    $form->add('textarea', 'confirm_email_text', ts('Text'), $attributes['confirm_email_text']);
+    $form->add('wysiwyg', 'confirm_email_text', ts('Text'), $attributes['confirm_email_text']);
     $form->add('text', 'cc_confirm', ts('CC Confirmation To'), CRM_Core_DAO::getAttribute('CRM_Event_DAO_Event', 'cc_confirm'));
     $form->addRule('cc_confirm', ts('Please enter a valid list of comma delimited email addresses'), 'emailList');
     $form->add('text', 'bcc_confirm', ts('BCC Confirmation To'), CRM_Core_DAO::getAttribute('CRM_Event_DAO_Event', 'bcc_confirm'));
@@ -794,11 +791,9 @@ public function postProcess() {
     if (!$params['is_online_registration']) {
       $params['is_email_confirm'] = FALSE;
     }
-    if (!empty($params['allow_selfcancelxfer'])) {
-      $params['selfcancelxfer_time'] = !empty($params['selfcancelxfer_time']) ? $params['selfcancelxfer_time'] : 0;
-    }
+    $params['selfcancelxfer_time'] = !empty($params['selfcancelxfer_time']) ? $params['selfcancelxfer_time'] : 0;
 
-    CRM_Event_BAO_Event::add($params);
+    Event::save(FALSE)->addRecord($params)->execute();
 
     // also update the ProfileModule tables
     $ufJoinParams = [
diff --git a/www/modules/civicrm/CRM/Event/Form/ManageEvent/TabHeader.php b/www/modules/civicrm/CRM/Event/Form/ManageEvent/TabHeader.php
index 27eba8a84..974d9f0ff 100644
--- a/www/modules/civicrm/CRM/Event/Form/ManageEvent/TabHeader.php
+++ b/www/modules/civicrm/CRM/Event/Form/ManageEvent/TabHeader.php
@@ -17,6 +17,8 @@
 
 /**
  * Helper class to build navigation links
+ *
+ * @deprecated since 5.72 will be removed around 5.78.
  */
 class CRM_Event_Form_ManageEvent_TabHeader {
 
@@ -25,14 +27,17 @@ class CRM_Event_Form_ManageEvent_TabHeader {
    *
    * @return array
    * @throws \CRM_Core_Exception
+   *
+   * @deprecated since 5.72 will be removed around 5.78.
    */
   public static function build(&$form) {
+    CRM_Core_Error::deprecatedWarning('no alternative');
     $tabs = $form->get('tabHeader');
     if (!$tabs || empty($_GET['reset'])) {
       $tabs = self::process($form);
       $form->set('tabHeader', $tabs);
     }
-    $form->assign_by_ref('tabHeader', $tabs);
+    $form->assign('tabHeader', $tabs);
     CRM_Core_Resources::singleton()
       ->addScriptFile('civicrm', 'templates/CRM/common/TabHeader.js', 1, 'html-header')
       ->addSetting([
@@ -49,8 +54,11 @@ public static function build(&$form) {
    *
    * @return array
    * @throws Exception
+   *
+   * @deprecated since 5.72 will be removed around 5.78.
    */
   public static function process(&$form) {
+    CRM_Core_Error::deprecatedWarning('no alternative');
     if ($form->getVar('_id') <= 0) {
       return NULL;
     }
@@ -194,8 +202,11 @@ public static function process(&$form) {
 
   /**
    * @param CRM_Event_Form_ManageEvent $form
+   *
+   * @deprecated since 5.72 will be removed around 5.78.
    */
   public static function reset(&$form) {
+    CRM_Core_Error::deprecatedWarning('no alternative');
     $tabs = self::process($form);
     $form->set('tabHeader', $tabs);
   }
@@ -204,8 +215,11 @@ public static function reset(&$form) {
    * @param $tabs
    *
    * @return int|string
+   *
+   * @deprecated since 5.72 will be removed around 5.78.
    */
   public static function getCurrentTab($tabs) {
+    CRM_Core_Error::deprecatedWarning('no alternative');
     static $current = FALSE;
 
     if ($current) {
diff --git a/www/modules/civicrm/CRM/Event/Form/Participant.php b/www/modules/civicrm/CRM/Event/Form/Participant.php
index 77bc50ef7..ff19875a6 100644
--- a/www/modules/civicrm/CRM/Event/Form/Participant.php
+++ b/www/modules/civicrm/CRM/Event/Form/Participant.php
@@ -18,6 +18,7 @@
 
 use Civi\API\EntityLookupTrait;
 use Civi\Api4\Contribution;
+use Civi\Api4\LineItem;
 
 /**
  * Back office participant form.
@@ -27,6 +28,7 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
   use EntityLookupTrait;
   use CRM_Contact_Form_ContactFormTrait;
   use CRM_Event_Form_EventFormTrait;
+  use CRM_Custom_Form_CustomDataTrait;
 
   /**
    * Participant ID - use getParticipantID.
@@ -50,6 +52,8 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
    * The values for the contribution db object.
    *
    * @var array
+   *
+   * @deprecated use $this->getPriceFieldMetadata()
    */
   public $_values;
 
@@ -149,15 +153,6 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
    */
   public $_eID = NULL;
 
-  /**
-   * Line Item for Price Set.
-   *
-   * @var array
-   *
-   * @deprecated
-   */
-  public $_lineItem;
-
   public $_online;
 
   /**
@@ -180,6 +175,8 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
    * Id of payment, if any
    *
    * @var int
+   *
+   * @internal
    */
   public $_paymentId;
 
@@ -211,7 +208,15 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
    * @return int|null
    */
   public function getEventID(): ?int {
-    return $this->_eventId ?: ($this->getSubmittedValue('event_id') ? (int) $this->getSubmittedValue('event_id') : NULL);
+    if (!$this->_eventId) {
+      if ($this->isFormBuilt()) {
+        $this->_eventId = $this->getSubmittedValue('event_id');
+      }
+      else {
+        $this->_eventId = $this->getSubmitValue('event_id');
+      }
+    }
+    return $this->_eventId ? (int) $this->_eventId : NULL;
   }
 
   /**
@@ -339,42 +344,6 @@ public function preProcess() {
       CRM_Event_Form_EventFees::setDefaultValues($this);
     }
 
-    // when custom data is included in this page
-    if (!empty($_POST['hidden_custom'])) {
-      $eventId = (int) ($_POST['event_id'] ?? 0);
-      // Custom data of type participant role
-      // Note: Some earlier commits imply $_POST['role_id'] could be a comma separated string,
-      //       not sure if that ever really happens
-      if (!empty($_POST['role_id'])) {
-        foreach ($_POST['role_id'] as $roleID) {
-          CRM_Custom_Form_CustomData::preProcess($this, $this->getExtendsEntityColumnID('ParticipantRole'), $roleID, 1, 'Participant', $this->_id);
-          CRM_Custom_Form_CustomData::buildQuickForm($this);
-          CRM_Custom_Form_CustomData::setDefaultValues($this);
-        }
-      }
-
-      //custom data of type participant event
-      CRM_Custom_Form_CustomData::preProcess($this, $this->getExtendsEntityColumnID('ParticipantEventType'), $eventId, 1, 'Participant', $this->_id);
-      CRM_Custom_Form_CustomData::buildQuickForm($this);
-      CRM_Custom_Form_CustomData::setDefaultValues($this);
-
-      // custom data of type participant event type
-      $eventTypeId = NULL;
-      if ($eventId) {
-        $eventTypeId = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event', $eventId, 'event_type_id', 'id');
-      }
-      CRM_Custom_Form_CustomData::preProcess($this, $this->getExtendsEntityColumnID('ParticipantEventType'), $eventTypeId,
-        1, 'Participant', $this->_id
-      );
-      CRM_Custom_Form_CustomData::buildQuickForm($this);
-      CRM_Custom_Form_CustomData::setDefaultValues($this);
-
-      //custom data of type participant, ( we 'null' to reset subType and subName)
-      CRM_Custom_Form_CustomData::preProcess($this, 'null', 'null', 1, 'Participant', $this->_id);
-      CRM_Custom_Form_CustomData::buildQuickForm($this);
-      CRM_Custom_Form_CustomData::setDefaultValues($this);
-    }
-
     // CRM-4395, get the online pending contribution id.
     $this->_onlinePendingContributionId = NULL;
     if (!$this->_mode && $this->_id && ($this->_action & CRM_Core_Action::UPDATE)) {
@@ -492,10 +461,6 @@ public function setDefaultValues(): array {
         }
       }
 
-      $submittedRole = $this->getElementValue('role_id');
-      if (!empty($submittedRole[0])) {
-        $roleID = $submittedRole[0];
-      }
       $submittedEvent = $this->getElementValue('event_id');
       if (!empty($submittedEvent[0])) {
         $eventID = $submittedEvent[0];
@@ -577,7 +542,20 @@ public function buildQuickForm() {
     $this->assign('partiallyPaidStatusId', $partiallyPaidStatusId);
 
     if ($this->isOverloadFeesMode()) {
-      return $this->buildEventFeeForm($this);
+      $this->buildEventFeeForm($this);
+      return;
+    }
+
+    if ($this->isSubmitted()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('Participant', array_filter([
+        'event_id' => $this->getEventID(),
+        'role_id' => $_POST['role_id'] ?? NULL,
+        'id' => $this->getParticipantID(),
+      ]));
     }
 
     //need to assign custom data type to the template
@@ -820,6 +798,9 @@ public static function formRule($values, $files, $self) {
    * Process the form submission.
    */
   public function postProcess() {
+    if ($this->getPriceSetID()) {
+      $this->getOrder()->setPriceSelectionFromUnfilteredInput($this->getSubmittedValues());
+    }
     $statusMsg = $this->submit($this->getSubmittedValues());
     CRM_Core_Session::setStatus($statusMsg, ts('Saved'), 'success');
     $session = CRM_Core_Session::singleton();
@@ -846,6 +827,15 @@ public function postProcess() {
         "reset=1&action=add&context={$this->_context}&cid={$this->_contactId}"
       ));
     }
+    elseif ($this->_contactId) {
+      // Refresh other tabs with related data
+      $this->ajaxResponse['updateTabs'] = [
+        '#tab_activity' => TRUE,
+      ];
+      if (CRM_Core_Permission::access('CiviContribute')) {
+        $this->ajaxResponse['updateTabs']['#tab_contribute'] = CRM_Contact_BAO_Contact::getCountComponent('contribution', $this->_contactId);
+      }
+    }
   }
 
   /**
@@ -874,8 +864,9 @@ public function submit(array $params) {
     }
 
     if ($this->_isPaidEvent) {
-      [$lineItem, $params] = $this->preparePaidEventProcessing($params);
+      $params = $this->preparePaidEventProcessing($params);
     }
+    $lineItem = [$this->getPriceSetID() => $this->getLineItems()];
     // @todo - stop assigning these - pass financial_trxnId in token context
     // and swap template to use tokens.
     $this->assign('credit_card_type', $this->getSubmittedValue('credit_card_type'));
@@ -1097,7 +1088,7 @@ public function submit(array $params) {
           CRM_Event_BAO_Participant::createDiscountTrxn(
             $this->_eventId,
             $contributionParams,
-            NULL,
+            '',
             CRM_Price_BAO_PriceSet::parseFirstPriceSetValueIDFromParams($this->getSubmittedValues())
           );
         }
@@ -1105,28 +1096,12 @@ public function submit(array $params) {
     }
 
     // also store lineitem stuff here
-    if ((($this->_lineItem && $this->_action & CRM_Core_Action::ADD) ||
-      ($this->_lineItem && CRM_Core_Action::UPDATE && !$this->_paymentId))
+    if ((($this->getLineItems() && $this->_action & CRM_Core_Action::ADD) ||
+      ($this->getLineItems() && CRM_Core_Action::UPDATE && !$this->_paymentId))
     ) {
       foreach ($this->_contactIds as $num => $contactID) {
-        foreach ($this->_lineItem as $key => $value) {
-          if (is_array($value) && $value !== 'skip') {
-            foreach ($value as $lineKey => $line) {
-              //10117 update the line items for participants if contribution amount is recorded
-              if ($this->isQuickConfig() && !empty($params['total_amount']) &&
-                ($params['status_id'] != array_search('Partially paid', $participantStatus))
-              ) {
-                $line['unit_price'] = $line['line_total'] = $params['total_amount'];
-                if (!empty($params['tax_amount'])) {
-                  $line['unit_price'] = $line['unit_price'] - $params['tax_amount'];
-                  $line['line_total'] = $line['line_total'] - $params['tax_amount'];
-                }
-              }
-              $lineItem[$this->_priceSetId][$lineKey] = $line;
-            }
-            CRM_Price_BAO_LineItem::processPriceSet($participants[$num]->id, $lineItem, $contributions[$num] ?? NULL, 'civicrm_participant');
-          }
-        }
+        $lineItem = [$this->getPriceSetID() => $this->getLineItems()];
+        CRM_Price_BAO_LineItem::processPriceSet($participants[$num]->id, $lineItem, $contributions[$num] ?? NULL, 'civicrm_participant');
       }
       foreach ($contributions as $contribution) {
         if (!empty($this->getCreatePaymentParams())) {
@@ -1239,9 +1214,10 @@ public function buildEventFeeForm($form) {
       if ($form->_isPaidEvent) {
         $form->addElement('hidden', 'hidden_feeblock', 1);
       }
-
-      $eventfullMsg = CRM_Event_BAO_Participant::eventFullMessage($form->_eventId, $this->getParticipantID());
-      $form->addElement('hidden', 'hidden_eventFullMsg', $eventfullMsg, ['id' => 'hidden_eventFullMsg']);
+      if ($this->getEventValue('max_participants') !== NULL) {
+        $eventfullMsg = CRM_Event_BAO_Participant::eventFullMessage($form->_eventId, $this->getParticipantID());
+      }
+      $form->addElement('hidden', 'hidden_eventFullMsg', $eventfullMsg ?? NULL, ['id' => 'hidden_eventFullMsg']);
     }
 
     if ($form->_isPaidEvent) {
@@ -1251,7 +1227,7 @@ public function buildEventFeeForm($form) {
       //retrieve custom information
       $this->_values = [];
       $this->_values['line_items'] = CRM_Price_BAO_LineItem::getLineItems($this->_id, 'participant');
-      self::initEventFee($form, $this->getPriceSetID());
+      $this->initEventFee($this->getPriceSetID());
       if ($form->_context === 'standalone' || $form->_context === 'participant') {
         $discountedEvent = CRM_Core_BAO_Discount::getOptionGroup($event['id'], 'civicrm_event');
         if (is_array($discountedEvent)) {
@@ -1275,14 +1251,7 @@ public function buildEventFeeForm($form) {
         $form->assign('priceSet', $form->_priceSet ?? NULL);
       }
       else {
-        $this->buildAmount($form, $form->getDiscountID(), $this->getPriceSetID());
-      }
-      $lineItem = [];
-      $totalTaxAmount = 0;
-      if (!CRM_Utils_System::isNull($form->_values['line_items'] ?? NULL)) {
-        foreach ($form->_values['line_items'] as $key => $value) {
-          $totalTaxAmount = $value['tax_amount'] + $totalTaxAmount;
-        }
+        $this->buildAmount();
       }
       $discounts = [];
       if (!empty($form->_values['discount'])) {
@@ -1300,26 +1269,13 @@ public function buildEventFeeForm($form) {
           ['class' => "crm-select2"]
         );
       }
-      if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()
-        && empty($form->_values['fee'])
-        && ($_REQUEST['snippet'] ?? NULL) == CRM_Core_Smarty::PRINT_NOFORM
-      ) {
-        CRM_Core_Session::setStatus(ts('You do not have all the permissions needed for this page.'), 'Permission Denied', 'error');
-        return FALSE;
-      }
 
       CRM_Core_Payment_Form::buildPaymentForm($form, $form->_paymentProcessor, FALSE, TRUE, self::getDefaultPaymentInstrumentId());
       if (!$form->_mode) {
         $form->addElement('checkbox', 'record_contribution', ts('Record Payment?'), NULL,
           ['onclick' => "return showHideByValue('record_contribution','','payment_information','table-row','radio',false);"]
         );
-        // Check permissions for financial type first
-        if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) {
-          CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($financialTypes, $form->_action);
-        }
-        else {
-          $financialTypes = CRM_Contribute_BAO_Contribution::buildOptions('financial_type_id', 'create');
-        }
+        $financialTypes = CRM_Contribute_BAO_Contribution::buildOptions('financial_type_id', 'create');
 
         $form->add('select', 'financial_type_id',
           ts('Financial Type'),
@@ -1372,7 +1328,7 @@ public function buildEventFeeForm($form) {
 
     $form->add('select', 'from_email_address', ts('Receipt From'), $form->getAvailableFromEmails()['from_email_id']);
 
-    $form->add('textarea', 'receipt_text', ts('Confirmation Message'));
+    $form->add('wysiwyg', 'receipt_text', ts('Confirmation Message'));
 
     // Retrieve the name and email of the contact - form will be the TO for receipt email ( only if context is not standalone)
     if ($form->_context !== 'standalone') {
@@ -1394,27 +1350,37 @@ public function buildEventFeeForm($form) {
   /**
    * Initiate event fee.
    *
-   * @param self $form
    * @param int|null $priceSetId
    *   ID of the price set in use.
    *
    * @internal function has had several recent signature changes & is expected to be eventually removed.
    */
-  private static function initEventFee($form, $priceSetId): void {
+  private function initEventFee($priceSetId): void {
     if (!$priceSetId) {
       CRM_Core_Error::deprecatedWarning('this should not be reachable');
       return;
     }
+    $this->_priceSet = $this->getOrder()->getPriceSetMetadata();
+    $this->_priceSet['fields'] = $this->order->getPriceFieldsMetadata();
+    $this->_values['fee'] = $this->getPriceFieldMetaData();
+    $this->set('priceSet', $this->_priceSet);
+  }
 
-    $priceSet = CRM_Price_BAO_PriceSet::getSetDetail($priceSetId, NULL, FALSE);
-    $form->_priceSet = $priceSet[$priceSetId] ?? NULL;
-    $form->_values['fee'] = $form->_priceSet['fields'] ?? NULL;
-    $form->set('priceSet', $form->_priceSet);
-
-    $eventFee = $form->_values['fee'] ?? NULL;
-    if (!is_array($eventFee) || empty($eventFee)) {
-      $form->_values['fee'] = [];
-    }
+  /**
+   * Get price field metadata.
+   *
+   * The returned value is an array of arrays where each array
+   * is an id-keyed price field and an 'options' key has been added to that
+   * arry for any options.
+   *
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
+   *
+   * @return array
+   */
+  public function getPriceFieldMetaData(): array {
+    return $this->order->getPriceFieldsMetadata();
   }
 
   /**
@@ -1450,9 +1416,6 @@ protected function preparePaidEventProcessing($params): array {
       if (!isset($lineItem[0])) {
         $lineItem[0] = [];
       }
-      CRM_Price_BAO_PriceSet::processAmount($this->_values['fee'],
-        $params, $lineItem[0]
-      );
       //CRM-11529 for quick config backoffice transactions
       //when financial_type_id is passed in form, update the
       //lineitems with the financial type selected in form
@@ -1464,26 +1427,12 @@ protected function preparePaidEventProcessing($params): array {
         }
       }
 
-      $params['fee_level'] = $params['amount_level'];
-      if ($this->isQuickConfig() && !empty($params['total_amount']) &&
-        $params['status_id'] != array_search('Partially paid', $participantStatus)
-      ) {
-        $params['fee_amount'] = $params['total_amount'];
-      }
-      else {
-        //fix for CRM-3086
-        $params['fee_amount'] = $params['amount'];
-      }
+      $params['fee_level'] = $this->getOrder()->getAmountLevel();
+      $params['fee_amount'] = $this->getOrder()->getTotalAmount();
+      $params['amount'] = $this->getOrder()->getTotalAmount();
     }
 
-    if (isset($params['priceSetId'])) {
-      if (!empty($lineItem[0])) {
-        $this->set('lineItem', $lineItem);
-        $this->_lineItem = $lineItem;
-      }
-    }
-
-    return [$lineItem, $params];
+    return $params;
   }
 
   /**
@@ -1579,7 +1528,7 @@ protected function processContribution($result, $contactID,
     // create contribution record
     $contribution = CRM_Contribute_BAO_Contribution::add($contribParams);
     // CRM-11124
-    CRM_Event_BAO_Participant::createDiscountTrxn($this->getEventID(), $contribParams, NULL, CRM_Price_BAO_PriceSet::parseFirstPriceSetValueIDFromParams($this->getSubmittedValues()));
+    CRM_Event_BAO_Participant::createDiscountTrxn($this->getEventID(), $contribParams, '', CRM_Price_BAO_PriceSet::parseFirstPriceSetValueIDFromParams($this->getSubmittedValues()));
 
     $transaction->commit();
 
@@ -1610,10 +1559,16 @@ protected function addParticipant($contactID) {
       'note' => $this->getSubmittedValue('note'),
       'is_test' => $this->isTest(),
     ];
-    $order = $this->getOrder();
-    if ($order) {
-      $participantParams['fee_level'] = $order->getAmountLevel();
-      $participantParams['fee_amount'] = $order->getTotalAmount();
+    if (!$this->getParticipantID() || !$this->getContributionID()) {
+      // For new registrations, or existing ones with no contribution,
+      // fill in fee detail. For existing
+      // registrations with a contribution the user will have the option to
+      // change the fees via a different form.
+      $order = $this->getOrder();
+      if ($order) {
+        $participantParams['fee_level'] = $order->getAmountLevel();
+        $participantParams['fee_amount'] = $order->getTotalAmount();
+      }
     }
     $participantParams['discount_id'] = $this->getSubmittedValue('discount_id');
     $participant = CRM_Event_BAO_Participant::create($participantParams);
@@ -1638,19 +1593,35 @@ protected function addParticipant($contactID) {
    * 2) _paymentID is the contribution id.
    *
    * @return bool
+   * @throws \CRM_Core_Exception
    */
   protected function isPaymentOnExistingContribution(): bool {
-    return ($this->getParticipantID() && $this->_action & CRM_Core_Action::UPDATE) && $this->_paymentId;
+    return (bool) $this->getExistingContributionID();
   }
 
   /**
-   * @return false|int
+   * @return null|int
+   * @throws \CRM_Core_Exception
    */
-  protected function getExistingContributionID() {
-    if ($this->isPaymentOnExistingContribution()) {
-      return (int) $this->_paymentId;
-    }
-    return FALSE;
+  protected function getExistingContributionID(): ?int {
+    if (!$this->getParticipantID()) {
+      return NULL;
+    }
+    if ($this->isDefined('ExistingContribution')) {
+      return $this->lookup('ExistingContribution', 'id');
+    }
+    // CRM-12615 - Get payment information from the primary registration if relevant.
+    $participantID = $this->getParticipantValue('registered_by_id') ?: $this->getParticipantID();
+    $lineItem = LineItem::get(FALSE)
+      ->addWhere('entity_table', '=', 'civicrm_participant')
+      ->addWhere('entity_id', '=', $participantID)
+      ->addWhere('contribution_id', 'IS NOT NULL')
+      ->execute()->first();
+    if (empty($lineItem)) {
+      return NULL;
+    }
+    $this->define('Contribution', 'ExistingContribution', ['id' => $lineItem['contribution_id']]);
+    return $lineItem['contribution_id'];
   }
 
   /**
@@ -1703,7 +1674,7 @@ protected function storePaymentCreateParams(array $params): void {
         'total_amount' => $params['total_amount'],
         'is_send_contribution_notification' => FALSE,
         'payment_instrument_id' => $params['payment_instrument_id'],
-        'trxn_date' => $params['receive_date'] ?? date('Y-m-d'),
+        'trxn_date' => $params['receive_date'] ?: date('Y-m-d'),
         'trxn_id' => $params['trxn_id'],
         'pan_truncation' => $params['pan_truncation'] ?? '',
         'card_type_id' => $params['card_type_id'] ?? '',
@@ -1860,7 +1831,7 @@ protected function sendReceipts($params, array $participants): array {
         'PDFFilename' => ts('confirmation') . '.pdf',
         'modelProps' => [
           'participantID' => $participantID,
-          'userEnteredText' => $this->getSubmittedValue('receipt_text'),
+          'userEnteredHTML' => $this->getSubmittedValue('receipt_text'),
           'eventID' => $params['event_id'],
           'contributionID' => $contributionID,
         ],
@@ -2069,7 +2040,6 @@ protected function initializeOrder(): void {
         $this->submittableMoneyFields[] = 'price_' . $priceField['id'];
       }
     }
-    $this->order->setPriceSelectionFromUnfilteredInput($this->getSubmittedValues());
   }
 
   /**
@@ -2100,37 +2070,13 @@ public function getInvoiceID(): string {
    * @internal function is not currently called by any extentions in our civi
    * 'universe' and is not supported for such use. Signature has changed & will
    * change again.
-   *
-   * @param self $form
-   *   Form object.
-   * @param int|null $discountId
-   *   Discount id for the event.
-   * @param int|null $priceSetID
-   *
-   * @throws \CRM_Core_Exception
    */
-  private function buildAmount($form, $discountId, $priceSetID): void {
-    $feeFields = $form->_values['fee'] ?? NULL;
-
-    //check for discount.
-    $discountedFee = $form->_values['discount'] ?? NULL;
-    if (is_array($discountedFee) && !empty($discountedFee)) {
-      if (!$discountId) {
-        $form->_discountId = $discountId = CRM_Core_BAO_Discount::findSet($form->_eventId, 'civicrm_event');
-      }
-      if ($discountId) {
-        $feeFields = &$form->_values['discount'][$discountId];
-      }
-    }
-
-    //its time to call the hook.
-    CRM_Utils_Hook::buildAmount('event', $form, $feeFields);
-
+  private function buildAmount(): void {
     //build the priceset fields.
     // This is probably not required now - normally loaded from event ....
-    $form->add('hidden', 'priceSetId', $priceSetID);
+    $this->add('hidden', 'priceSetId', $this->getPriceSetID());
 
-    foreach ($feeFields as $field) {
+    foreach ($this->getPriceFieldMetaData() as $field) {
       // public AND admin visibility fields are included for back-office registration and back-office change selections
       $fieldId = $field['id'];
       $elementName = 'price_' . $fieldId;
@@ -2147,7 +2093,7 @@ private function buildAmount($form, $discountId, $priceSetID): void {
       //soft suppress required rule when option is full.
       if (!empty($options)) {
         //build the element.
-        CRM_Price_BAO_PriceField::addQuickFormElement($form,
+        CRM_Price_BAO_PriceField::addQuickFormElement($this,
           $elementName,
           $fieldId,
           FALSE,
@@ -2157,8 +2103,7 @@ private function buildAmount($form, $discountId, $priceSetID): void {
         );
       }
     }
-    $form->_priceSet['id'] ??= $priceSetID;
-    $form->assign('priceSet', $form->_priceSet);
+    $this->assign('priceSet', $this->_priceSet);
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Event/Form/ParticipantFeeSelection.php b/www/modules/civicrm/CRM/Event/Form/ParticipantFeeSelection.php
index 9a9ca9527..9654da90e 100644
--- a/www/modules/civicrm/CRM/Event/Form/ParticipantFeeSelection.php
+++ b/www/modules/civicrm/CRM/Event/Form/ParticipantFeeSelection.php
@@ -62,6 +62,8 @@ class CRM_Event_Form_ParticipantFeeSelection extends CRM_Core_Form {
 
   protected $contributionAmt = NULL;
 
+  private CRM_Financial_BAO_Order $order;
+
   public function preProcess() {
     $this->_fromEmails = CRM_Event_BAO_Event::getFromEmailIds($this->getEventID());
 
@@ -120,17 +122,70 @@ public function getContributionID(): ?int {
     return $this->contributionID ?: NULL;
   }
 
+  protected function getOrder(): CRM_Financial_BAO_Order {
+    if (!isset($this->order)) {
+      $this->initializeOrder();
+    }
+    return $this->order;
+  }
+
+  protected function initializeOrder(): void {
+    $this->order = new CRM_Financial_BAO_Order();
+    $this->order->setPriceSetID($this->getPriceSetID());
+    $this->order->setIsExcludeExpiredFields($this->_action !== CRM_Core_Action::UPDATE);
+    $this->order->setForm($this);
+    foreach ($this->getPriceFieldMetaData() as $priceField) {
+      if ($priceField['html_type'] === 'Text') {
+        $this->submittableMoneyFields[] = 'price_' . $priceField['id'];
+      }
+    }
+  }
+
+  /**
+   * Get the form context.
+   *
+   * This is important for passing to the buildAmount hook as CiviDiscount checks it.
+   *
+   * @return string
+   */
+  public function getFormContext(): string {
+    return 'event';
+  }
+
+  /**
+   * Get price field metadata.
+   *
+   * The returned value is an array of arrays where each array
+   * is an id-keyed price field and an 'options' key has been added to that
+   * arry for any options.
+   *
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
+   *
+   * @return array
+   */
+  public function getPriceFieldMetaData(): array {
+    if (!empty($this->_values['fee'])) {
+      return $this->_values['fee'];
+    }
+    if (!empty($this->_priceSet['fields'])) {
+      return $this->_priceSet['fields'];
+    }
+    return $this->order->getPriceFieldsMetadata();
+  }
+
   /**
    * Set default values for the form.
    *
    * @return array
    */
   public function setDefaultValues() {
-    $params = ['id' => $this->_participantId];
+    $params = ['id' => $this->getParticipantID()];
 
     CRM_Event_BAO_Participant::getValues($params, $defaults, $ids);
 
-    $priceSetValues = CRM_Event_Form_EventFees::setDefaultPriceSet($this->_participantId, $this->_eventId, FALSE);
+    $priceSetValues = $this->getPriceSetDefaults();
     $priceFieldId = (array_keys($this->_values['fee']));
     if (!empty($priceSetValues)) {
       $defaults[$this->_participantId] = array_merge($defaults[$this->_participantId], $priceSetValues);
@@ -143,17 +198,88 @@ public function setDefaultValues() {
         }
       }
     }
-    $this->assign('totalAmount', CRM_Utils_Array::value('fee_amount', $defaults[$this->_participantId]));
+    $this->assign('totalAmount', $defaults[$this->_participantId]['fee_amount'] ?? NULL);
     if ($this->_action == CRM_Core_Action::UPDATE) {
       $fee_level = $defaults[$this->_participantId]['fee_level'];
       CRM_Event_BAO_Participant::fixEventLevel($fee_level);
       $this->assign('fee_level', $fee_level);
-      $this->assign('fee_amount', CRM_Utils_Array::value('fee_amount', $defaults[$this->_participantId]));
+      $this->assign('fee_amount', $defaults[$this->_participantId]['fee_amount'] ?? NULL);
     }
     $defaults = $defaults[$this->_participantId];
     return $defaults;
   }
 
+  /**
+   * This function sets the default values for price set.
+   *
+   * @return array
+   */
+  private function getPriceSetDefaults() {
+    $defaults = [];
+    $participantID = $this->getParticipantID();
+
+    // use line items for setdefault price set fields, CRM-4090
+    $lineItems[$participantID] = CRM_Price_BAO_LineItem::getLineItems($participantID, 'participant', FALSE, FALSE);
+
+    if (is_array($lineItems[$participantID]) &&
+      !CRM_Utils_System::isNull($lineItems[$participantID])
+    ) {
+
+      $priceFields = $htmlTypes = $optionValues = [];
+      foreach ($lineItems[$participantID] as $lineId => $items) {
+        $priceFieldId = $items['price_field_id'] ?? NULL;
+        $priceOptionId = $items['price_field_value_id'] ?? NULL;
+        if ($priceFieldId && $priceOptionId) {
+          $priceFields[$priceFieldId][] = $priceOptionId;
+        }
+      }
+
+      if (empty($priceFields)) {
+        return $defaults;
+      }
+
+      // get all price set field html types.
+      $sql = '
+SELECT  id, html_type
+  FROM  civicrm_price_field
+ WHERE  id IN (' . implode(',', array_keys($priceFields)) . ')';
+      $fieldDAO = CRM_Core_DAO::executeQuery($sql);
+      while ($fieldDAO->fetch()) {
+        $htmlTypes[$fieldDAO->id] = $fieldDAO->html_type;
+      }
+
+      foreach ($lineItems[$participantID] as $lineId => $items) {
+        $fieldId = $items['price_field_id'];
+        $htmlType = $htmlTypes[$fieldId] ?? NULL;
+        if (!$htmlType) {
+          continue;
+        }
+
+        if ($htmlType === 'Text') {
+          $defaults["price_{$fieldId}"] = $items['qty'];
+        }
+        else {
+          $fieldOptValues = $priceFields[$fieldId] ?? NULL;
+          if (!is_array($fieldOptValues)) {
+            continue;
+          }
+
+          foreach ($fieldOptValues as $optionId) {
+            if ($htmlType === 'CheckBox') {
+              $defaults["price_{$fieldId}"][$optionId] = TRUE;
+            }
+            else {
+              $defaults["price_{$fieldId}"] = $optionId;
+              break;
+            }
+          }
+        }
+      }
+    }
+
+    return $defaults;
+  }
+
   /**
    * Build form.
    *
@@ -177,8 +303,10 @@ public function buildQuickForm() {
     $this->_values = [];
 
     $this->_values['line_items'] = CRM_Price_BAO_LineItem::getLineItems($this->_participantId, 'participant');
-    CRM_Event_Form_Registration::initEventFee($this, $this->_action !== CRM_Core_Action::UPDATE, $this->getPriceSetID());
-    CRM_Event_Form_Registration_Register::buildAmount($this, TRUE, NULL, $this->getPriceSetID());
+    $this->_priceSet = $this->getOrder()->getPriceSetMetadata();
+    $this->setPriceFieldMetaData($this->order->getPriceFieldsMetadata());
+    self::initializeEventFee($this, $this->_action !== CRM_Core_Action::UPDATE, $this->getPriceSetID());
+    $this->buildAmount(TRUE, NULL, $this->getPriceSetID());
 
     if (!CRM_Utils_System::isNull($this->_values['line_items'] ?? NULL)) {
       $lineItem[] = $this->_values['line_items'];
@@ -230,6 +358,159 @@ public function buildQuickForm() {
     $this->addFormRule(['CRM_Event_Form_ParticipantFeeSelection', 'formRule'], $this);
   }
 
+  /**
+   * Set price field metadata.
+   *
+   * @param array $metadata
+   */
+  protected function setPriceFieldMetaData(array $metadata): void {
+    $this->_values['fee'] = $this->_priceSet['fields'] = $metadata;
+  }
+
+  /**
+   * Build the radio/text form elements for the amount field
+   *
+   * @internal function is not currently called by any extentions in our civi
+   * 'universe' and is not supported for such use. Signature has changed & will
+   * change again.
+   *
+   * @param int|null $discountId
+   *   Discount id for the event.
+   * @param int|null $priceSetID
+   *
+   * @throws \CRM_Core_Exception
+   */
+  protected function buildAmount($discountId, $priceSetID) {
+    $form = $this;
+    $feeFields = $form->_values['fee'] ?? NULL;
+
+    if (is_array($feeFields)) {
+      $form->_feeBlock = &$form->_values['fee'];
+    }
+
+    //check for discount.
+    $discountedFee = $form->_values['discount'] ?? NULL;
+    if (is_array($discountedFee) && !empty($discountedFee)) {
+      if (!$discountId) {
+        $form->_discountId = $discountId = CRM_Core_BAO_Discount::findSet($form->_eventId, 'civicrm_event');
+      }
+      if ($discountId) {
+        $form->_feeBlock = &$form->_values['discount'][$discountId];
+      }
+    }
+    if (!is_array($form->_feeBlock)) {
+      $form->_feeBlock = [];
+    }
+
+    //its time to call the hook.
+    CRM_Utils_Hook::buildAmount('event', $form, $form->_feeBlock);
+
+    //format price set fields across option full.
+    $form->formatFieldsForOptionFull();
+    // This is probably not required now - normally loaded from event ....
+    $form->add('hidden', 'priceSetId', $priceSetID);
+
+    foreach ($form->_feeBlock as $field) {
+      $fieldId = $field['id'];
+      $elementName = 'price_' . $fieldId;
+
+      $isRequire = $field['is_required'] ?? NULL;
+
+      //user might modified w/ hook.
+      $options = $field['options'] ?? NULL;
+
+      if (!is_array($options)) {
+        continue;
+      }
+
+      $optionFullIds = CRM_Utils_Array::value('option_full_ids', $field, []);
+
+      //soft suppress required rule when option is full.
+      if (!empty($optionFullIds) && (count($options) == count($optionFullIds))) {
+        $isRequire = FALSE;
+      }
+      if (!empty($options)) {
+        //build the element.
+        CRM_Price_BAO_PriceField::addQuickFormElement($form,
+          $elementName,
+          $fieldId,
+          FALSE,
+          $isRequire,
+          NULL,
+          $options,
+          $optionFullIds
+        );
+      }
+    }
+    $form->_priceSet['id'] ??= $priceSetID;
+    $form->assign('priceSet', $form->_priceSet);
+  }
+
+  /**
+   *
+   */
+  private function formatFieldsForOptionFull(): void {
+    $form = $this;
+    $priceSet = $form->get('priceSet');
+    $priceSetId = $form->get('priceSetId');
+    $defaultPricefieldIds = [];
+    if (!empty($form->_values['line_items'])) {
+      foreach ($form->_values['line_items'] as $lineItem) {
+        $defaultPricefieldIds[] = $lineItem['price_field_value_id'];
+      }
+    }
+    if (!$priceSetId ||
+      !is_array($priceSet) ||
+      empty($priceSet) || empty($priceSet['optionsMaxValueTotal'])
+    ) {
+      return;
+    }
+
+    //get the current price event price set options count.
+    $currentOptionsCount = $this->getPriceOptionCount();
+    $recordedOptionsCount = CRM_Event_BAO_Participant::priceSetOptionsCount($form->_eventId, []);
+    $optionFullTotalAmount = 0;
+    $currentParticipantNo = (int) substr($form->_name, 12);
+    foreach ($form->_feeBlock as & $field) {
+      $optionFullIds = [];
+      if (!is_array($field['options'])) {
+        continue;
+      }
+      foreach ($field['options'] as & $option) {
+        $optId = $option['id'];
+        $maxValue = $option['max_value'] ?? 0;
+        $dbTotalCount = $recordedOptionsCount[$optId] ?? 0;
+        $currentTotalCount = $currentOptionsCount[$optId] ?? 0;
+
+        $totalCount = $currentTotalCount + $dbTotalCount;
+        $isFull = FALSE;
+        if ($maxValue &&
+          (($totalCount >= $maxValue) &&
+            (empty($form->_lineItem[$currentParticipantNo][$optId]['price_field_id']) || $dbTotalCount >= $maxValue))
+        ) {
+          $isFull = TRUE;
+          $optionFullIds[$optId] = $optId;
+          if ($field['html_type'] !== 'Select') {
+            if (in_array($optId, $defaultPricefieldIds)) {
+              $optionFullTotalAmount += $option['amount'] ?? 0;
+            }
+          }
+          else {
+            if (!empty($defaultPricefieldIds) && in_array($optId, $defaultPricefieldIds)) {
+              unset($optionFullIds[$optId]);
+            }
+          }
+        }
+        $option['is_full'] = $isFull;
+        $option['total_option_count'] = $dbTotalCount + $currentTotalCount;
+      }
+
+      //finally get option ids in.
+      $field['option_full_ids'] = $optionFullIds;
+    }
+    $form->assign('optionFullTotalAmount', $optionFullTotalAmount);
+  }
+
   /**
    * Get the discount ID.
    *
@@ -369,7 +650,7 @@ private function emailReceipt(array $params): void {
       }
 
       $this->assign('totalAmount', $this->contributionAmt);
-      $this->assign('checkNumber', CRM_Utils_Array::value('check_number', $params));
+      $this->assign('checkNumber', $params['check_number'] ?? NULL);
     }
 
     $this->assign('register_date', $params['register_date']);
@@ -490,4 +771,113 @@ public function getContactID(): ?int {
     return $this->_contactId;
   }
 
+  /**
+   * Initiate event fee.
+   *
+   * Formerly shared function.
+   *
+   * @internal function has had several recent signature changes & is expected to be eventually removed.
+   */
+  private function initializeEventFee(): void {
+    $priceSetId = $this->getPriceSetID();
+    $form = $this;
+    //get the price set fields participant count.
+    //get option max value info.
+    $optionsMaxValueTotal = 0;
+
+    if (!empty($form->_priceSet['fields'])) {
+      foreach ($form->_priceSet['fields'] as $field) {
+        foreach ($field['options'] as $option) {
+          $maxVal = $option['max_value'] ?? 0;
+          $optionsMaxValueTotal += $maxVal;
+        }
+      }
+    }
+
+    $form->_priceSet['optionsMaxValueTotal'] = $optionsMaxValueTotal;
+
+    $form->set('priceSet', $form->_priceSet);
+
+    $eventFee = $form->_values['fee'] ?? NULL;
+    if (!is_array($eventFee) || empty($eventFee)) {
+      $form->_values['fee'] = [];
+    }
+  }
+
+  /**
+   * Calculate total count for each price set options.
+   *
+   * - currently selected by user.
+   *
+   * @return array
+   *   array of each option w/ count total.
+   */
+  private function getPriceOptionCount() {
+    $form = $this;
+    $params = $form->get('params');
+    $priceSet = $form->get('priceSet');
+    $priceSetId = $form->get('priceSetId');
+
+    $optionsCount = [];
+    if (!$priceSetId ||
+      !is_array($priceSet) ||
+      empty($priceSet) ||
+      !is_array($params) ||
+      empty($params)
+    ) {
+      return $optionsCount;
+    }
+
+    $priceSetFields = $priceMaxFieldDetails = [];
+    // @todo - replace this line with if ($this->getOrder()->isUseParticipantCount()) {
+    // (pending https://github.com/civicrm/civicrm-core/pull/29249 being merged)
+    if (!empty($priceSet['optionsCountTotal'])) {
+      $priceSetFields = $priceSet['optionsCountDetails']['fields'];
+    }
+
+    if (!empty($priceSet['optionsMaxValueTotal'])) {
+      $priceMaxFieldDetails = $priceSet['optionsMaxValueDetails']['fields'];
+    }
+
+    $addParticipantNum = substr($form->_name, 12);
+    foreach ($params as $pCnt => $values) {
+      if ($values == 'skip' ||
+        $pCnt === $addParticipantNum
+      ) {
+        continue;
+      }
+
+      foreach ($values as $valKey => $value) {
+        if (strpos($valKey, 'price_') === FALSE) {
+          continue;
+        }
+
+        $priceFieldId = substr($valKey, 6);
+        if (!$priceFieldId ||
+          !is_array($value) ||
+          !(array_key_exists($priceFieldId, $priceSetFields) || array_key_exists($priceFieldId, $priceMaxFieldDetails))
+        ) {
+          continue;
+        }
+
+        foreach ($value as $optId => $optVal) {
+          if (($priceSet['fields'][$priceFieldId]['html_type'] ?? NULL) === 'Text') {
+            $currentCount = $optVal;
+          }
+          else {
+            $currentCount = 1;
+          }
+
+          if (isset($priceSetFields[$priceFieldId]) && isset($priceSetFields[$priceFieldId]['options'][$optId])) {
+            $currentCount = $priceSetFields[$priceFieldId]['options'][$optId] * $optVal;
+          }
+
+          $optionsCount[$optId] = $currentCount + ($optionsCount[$optId] ?? 0);
+        }
+      }
+    }
+
+    return $optionsCount;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Event/Form/ParticipantView.php b/www/modules/civicrm/CRM/Event/Form/ParticipantView.php
index c87906b92..7e739ac2f 100644
--- a/www/modules/civicrm/CRM/Event/Form/ParticipantView.php
+++ b/www/modules/civicrm/CRM/Event/Form/ParticipantView.php
@@ -20,6 +20,7 @@
  *
  */
 class CRM_Event_Form_ParticipantView extends CRM_Core_Form {
+  use CRM_Event_Form_EventFormTrait;
 
   public $useLivePageJS = TRUE;
 
@@ -30,7 +31,7 @@ class CRM_Event_Form_ParticipantView extends CRM_Core_Form {
    */
   public function preProcess() {
     $values = $ids = [];
-    $participantID = CRM_Utils_Request::retrieve('id', 'Positive', $this, TRUE);
+    $participantID = $this->getParticipantID();
     $contactID = CRM_Utils_Request::retrieve('cid', 'Positive', $this, TRUE);
     $params = ['id' => $participantID];
 
@@ -58,9 +59,14 @@ public function preProcess() {
     $this->assign('hasPayment', $paymentId);
     $this->assign('componentId', $participantID);
     $this->assign('component', 'event');
+    $parentParticipantID = $this->getParticipantValue('registered_by_id');
+    $this->assign('participant_registered_by_id', $parentParticipantID);
+    // Check if this is a primaryParticipant (registered for others) and retrieve additional participants if true  (CRM-4859)
+    if (CRM_Event_BAO_Participant::isPrimaryParticipant($this->getParticipantID())) {
+      $additionalParticipants = CRM_Event_BAO_Participant::getAdditionalParticipants($this->getParticipantID());
+    }
+    $this->assign('additionalParticipants', $additionalParticipants ?? NULL);
 
-    $parentParticipantID = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Participant',
-      $participantID, 'registered_by_id');
     $this->assign('parentHasPayment', !$parentParticipantID ? NULL : CRM_Core_DAO::getFieldValue('CRM_Event_DAO_ParticipantPayment',
       $parentParticipantID, 'id', 'participant_id'
     ));
@@ -93,37 +99,16 @@ public function preProcess() {
       );
     }
 
-    if ($values[$participantID]['is_test']) {
-      $values[$participantID]['status'] = CRM_Core_TestEntity::appendTestText($values[$participantID]['status']);
-    }
-
-    // Get Note
-    $noteValue = CRM_Core_BAO_Note::getNote($participantID, 'civicrm_participant');
-
-    $values[$participantID]['note'] = array_values($noteValue);
+    $this->assign('status', $this->getParticipantValue('status_id:label') . ($this->getParticipantValue('is_test') ? ' ' . ts('(test)') : ''));
+    $this->assign('note', array_values(CRM_Core_BAO_Note::getNote($participantID, 'civicrm_participant')));
 
     // Get Line Items
     $lineItem = CRM_Price_BAO_LineItem::getLineItems($participantID);
+    $this->assign('lineItem', [$lineItem]);
 
-    if (!CRM_Utils_System::isNull($lineItem)) {
-      $values[$participantID]['lineItem'][] = $lineItem;
-    }
-
-    $values[$participantID]['totalAmount'] = $values[$participantID]['fee_amount'] ?? NULL;
-
-    // Get registered_by contact ID and display_name if participant was registered by someone else (CRM-4859)
-    if (!empty($values[$participantID]['participant_registered_by_id'])) {
-      $values[$participantID]['registered_by_contact_id'] = CRM_Core_DAO::getFieldValue("CRM_Event_DAO_Participant",
-        $values[$participantID]['participant_registered_by_id'],
-        'contact_id', 'id'
-      );
-      $values[$participantID]['registered_by_display_name'] = CRM_Contact_BAO_Contact::displayName($values[$participantID]['registered_by_contact_id']);
-    }
-
-    // Check if this is a primaryParticipant (registered for others) and retrieve additional participants if true  (CRM-4859)
-    if (CRM_Event_BAO_Participant::isPrimaryParticipant($participantID)) {
-      $values[$participantID]['additionalParticipants'] = CRM_Event_BAO_Participant::getAdditionalParticipants($participantID);
-    }
+    // Assign registered_by contact ID and display_name if participant was registered by someone else (CRM-4859)
+    $this->assign('registered_by_display_name', $this->getParticipantValue('registered_by_id.contact_id.display_name'));
+    $this->assign('registered_by_contact_id', $this->getParticipantValue('registered_by_id.contact_id'));
 
     // get the option value for custom data type
     $customDataType = CRM_Core_OptionGroup::values('custom_data_type', FALSE, FALSE, FALSE, NULL, 'name');
@@ -155,17 +140,9 @@ public function preProcess() {
     CRM_Core_BAO_CustomGroup::buildCustomDataView($this, $finalTree, FALSE, NULL, NULL, NULL, $participantID);
     $eventTitle = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event', $values[$participantID]['event_id'], 'title');
     //CRM-7150, show event name on participant view even if the event is disabled
-    if (empty($values[$participantID]['event'])) {
-      $values[$participantID]['event'] = $eventTitle;
-    }
-
-    //do check for campaigns
-    $campaignId = $values[$participantID]['campaign_id'] ?? NULL;
-    if ($campaignId) {
-      $campaigns = CRM_Campaign_BAO_Campaign::getCampaigns($campaignId);
-      $values[$participantID]['campaign'] = $campaigns[$campaignId];
-    }
-
+    $this->assign('event', $eventTitle);
+    $this->assign('campaign', $this->getParticipantValue('campaign_id:label'));
+    // @todo - this assign makes it really hard to see what is being assigned - do individual assigns.
     $this->assign($values[$participantID]);
 
     // add viewed participant to recent items list
@@ -181,40 +158,36 @@ public function preProcess() {
     }
     if (CRM_Core_Permission::check('delete in CiviEvent')) {
       $recentOther['deleteUrl'] = CRM_Utils_System::url('civicrm/participant/delete',
-        "reset=1&id={$values[$participantID]['id']}}"
+        "reset=1&id={$values[$participantID]['id']}"
       );
     }
 
-    $participantRoles = CRM_Event_PseudoConstant::participantRole();
     $displayName = CRM_Contact_BAO_Contact::displayName($values[$participantID]['contact_id']);
 
     $participantCount = [];
-    $totalTaxAmount = 0;
+    $totalTaxAmount = $totalAmount = 0;
     foreach ($lineItem as $k => $v) {
       if (CRM_Utils_Array::value('participant_count', $lineItem[$k]) > 0) {
         $participantCount[] = $lineItem[$k]['participant_count'];
       }
       $totalTaxAmount = $v['tax_amount'] + $totalTaxAmount;
-    }
-    if (Civi::settings()->get('invoicing')) {
-      $this->assign('totalTaxAmount', $totalTaxAmount);
-    }
+      $totalAmount += $v['line_total'];
+    }
+    $this->assign('currency', $this->getParticipantValue('fee_currency'));
+    // It would be more  correct to assign totalTaxAmount & TotalAmount
+    // from the order object - however, that assumes a contribution exists & there is this
+    // we have this weird possibility of line items against a participant record with
+    // no contribution attached to it - maybe we have eliminated this? But I have a nasty feeling about
+    // webform.
+    $this->assign('totalTaxAmount', $totalTaxAmount ?? NULL);
+    $this->assign('totalAmount', $totalAmount);
     $this->assign('pricesetFieldsCount', $participantCount);
     $this->assign('displayName', $displayName);
     // omitting contactImage from title for now since the summary overlay css doesn't work outside of our crm-container
     $this->setTitle(ts('View Event Registration for') . ' ' . $displayName);
-
-    $roleId = $values[$participantID]['role_id'] ?? NULL;
-    $title = $displayName . ' (' . ($participantRoles[$roleId] ?? '') . ' - ' . $eventTitle . ')';
-
-    $sep = CRM_Core_DAO::VALUE_SEPARATOR;
-    $viewRoles = [];
-    foreach (explode($sep, $values[$participantID]['role_id']) as $k => $v) {
-      $viewRoles[] = $participantRoles[$v];
-    }
-    $values[$participantID]['role_id'] = implode(', ', $viewRoles);
-    $this->assign('role', $values[$participantID]['role_id']);
+    $this->assign('role', implode(',', $this->getParticipantValue('role_id:label')));
     // add Participant to Recent Items
+    $title = $displayName . ' (' . implode(',', $this->getParticipantValue('role_id:label')) . ' - ' . $eventTitle . ')';
     CRM_Utils_Recent::add($title,
       $url,
       $values[$participantID]['id'],
@@ -225,6 +198,17 @@ public function preProcess() {
     );
   }
 
+  /**
+   * Get id of participant being acted on.
+   *
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
+   */
+  public function getParticipantID(): int {
+    return (int) CRM_Utils_Request::retrieve('id', 'Positive', $this, TRUE);
+  }
+
   /**
    * Build the form object.
    *
diff --git a/www/modules/civicrm/CRM/Event/Form/Registration.php b/www/modules/civicrm/CRM/Event/Form/Registration.php
index e31f111ab..6005a1a4d 100644
--- a/www/modules/civicrm/CRM/Event/Form/Registration.php
+++ b/www/modules/civicrm/CRM/Event/Form/Registration.php
@@ -32,6 +32,17 @@ class CRM_Event_Form_Registration extends CRM_Core_Form {
    */
   public $_eventId;
 
+  private CRM_Financial_BAO_Order $order;
+
+  private array $optionsCount;
+
+  protected function getOrder(): CRM_Financial_BAO_Order {
+    if (!isset($this->order)) {
+      $this->initializeOrder();
+    }
+    return $this->order;
+  }
+
   /**
    * Get the selected Event ID.
    *
@@ -54,6 +65,38 @@ public function getEventID(): int {
     return $this->_eventId;
   }
 
+  /**
+   * Set price field metadata.
+   *
+   * @param array $metadata
+   */
+  protected function setPriceFieldMetaData(array $metadata): void {
+    $this->_values['fee'] = $this->_priceSet['fields'] = $metadata;
+  }
+
+  /**
+   * Get price field metadata.
+   *
+   * The returned value is an array of arrays where each array
+   * is an id-keyed price field and an 'options' key has been added to that
+   * arry for any options.
+   *
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
+   *
+   * @return array
+   */
+  public function getPriceFieldMetaData(): array {
+    if (!empty($this->_values['fee'])) {
+      return $this->_values['fee'];
+    }
+    if (!empty($this->_priceSet['fields'])) {
+      return $this->_priceSet['fields'];
+    }
+    return $this->order->getPriceFieldsMetadata();
+  }
+
   /**
    * The array of ids of all the participant we are processing.
    *
@@ -224,9 +267,16 @@ public function preProcess() {
     $this->_availableRegistrations = $this->get('availableRegistrations');
     $this->_participantIDS = $this->get('participantIDs');
 
+    // Required for currency formatting in the JS layer
+    // this is a temporary fix intended to resolve a regression quickly
+    // And assigning moneyFormat for js layer formatting
+    // will only work until that is done.
+    // https://github.com/civicrm/civicrm-core/pull/19151
+    $this->assign('moneyFormat', CRM_Utils_Money::format(1234.56, $this->getCurrency()));
+
     //check if participant allow to walk registration wizard.
     $this->_allowConfirmation = $this->get('allowConfirmation');
-
+    $this->assign('currency', $this->getCurrency());
     // check for Approval
     $this->_requireApproval = $this->get('requireApproval');
 
@@ -238,12 +288,24 @@ public function preProcess() {
 
     $this->showPaymentOnConfirm = (in_array($this->_eventId, \Civi::settings()->get('event_show_payment_on_confirm')) || in_array('all', \Civi::settings()->get('event_show_payment_on_confirm')));
     $this->assign('showPaymentOnConfirm', $this->showPaymentOnConfirm);
+    $priceSetID = $this->getPriceSetID();
+    if ($priceSetID) {
+      $this->_priceSet = $this->getOrder()->getPriceSetMetadata();
+      $this->setPriceFieldMetaData($this->getOrder()->getPriceFieldsMetadata());
+      $this->assign('quickConfig', $this->isQuickConfig());
+    }
 
-    if (!$this->_values) {
+    // If there is money involved the call to setPriceFieldMetaData will have set the key 'fee'.
+    // 'fee' is a duplicate of other properties but some places still refer to it
+    // $this->getPriceFieldsMetadata() is the recommended interaction.
+    if (!$this->_values || count($this->_values) === 1) {
 
       // get all the values from the dao object
       $this->_values = $this->_fields = [];
-
+      // ensure 'fee' is set since it just got wiped out
+      if ($this->getPriceSetID()) {
+        $this->setPriceFieldMetaData($this->getOrder()->getPriceFieldsMetadata());
+      }
       //retrieve event information
       $params = ['id' => $this->getEventID()];
       CRM_Event_BAO_Event::retrieve($params, $this->_values['event']);
@@ -309,7 +371,7 @@ public function preProcess() {
       $priceSetID = $this->getPriceSetID();
       if ($priceSetID) {
         $this->_values['line_items'] = CRM_Price_BAO_LineItem::getLineItems($this->_participantId, 'participant');
-        self::initEventFee($this, TRUE, $priceSetID);
+        $this->initEventFee();
 
         //fix for non-upgraded price sets.CRM-4256.
         if (isset($this->_isPaidEvent)) {
@@ -318,10 +380,9 @@ public function preProcess() {
         else {
           $isPaidEvent = $this->_values['event']['is_monetary'] ?? NULL;
         }
-        if ($isPaidEvent && empty($this->_values['fee'])) {
+        if ($isPaidEvent && empty($this->getPriceFieldMetaData())) {
           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=' . $this->_eventId)]));
         }
-        $this->assign('quickConfig', $this->isQuickConfig());
       }
 
       // get the profile ids
@@ -376,7 +437,7 @@ public function preProcess() {
       );
       $this->set('availableRegistrations', $this->_availableRegistrations);
     }
-    $this->assign_by_ref('paymentProcessor', $this->_paymentProcessor);
+    $this->assign('paymentProcessor', $this->_paymentProcessor);
 
     // check if this is a paypal auto return and redirect accordingly
     if (CRM_Core_Payment::paypalRedirect($this->_paymentProcessor)) {
@@ -597,64 +658,62 @@ public function buildCustom($id, $name) {
   /**
    * Initiate event fee.
    *
-   * @param \CRM_Event_Form_Registration|\CRM_Event_Form_ParticipantFeeSelection $form
-   * @param bool $doNotIncludeExpiredFields
-   *   See CRM-16456.
-   * @param int|null $priceSetId
-   *   ID of the price set in use.
-   *
    * @internal function has had several recent signature changes & is expected to be eventually removed.
    */
-  public static function initEventFee($form, $doNotIncludeExpiredFields, $priceSetId): void {
-    if (!$priceSetId) {
-      CRM_Core_Error::deprecatedWarning('this should not be reachable');
-      return;
-    }
-
-    $priceSet = CRM_Price_BAO_PriceSet::getSetDetail($priceSetId, NULL, $doNotIncludeExpiredFields);
-    $form->_priceSet = $priceSet[$priceSetId] ?? NULL;
-    $form->_values['fee'] = $form->_priceSet['fields'] ?? NULL;
-
+  private function initEventFee(): void {
     //get the price set fields participant count.
     //get option count info.
-    $form->_priceSet['optionsCountTotal'] = CRM_Price_BAO_PriceSet::getPricesetCount($priceSetId);
-    if ($form->_priceSet['optionsCountTotal']) {
+    if ($this->getOrder()->isUseParticipantCount()) {
       $optionsCountDetails = [];
-      if (!empty($form->_priceSet['fields'])) {
-        foreach ($form->_priceSet['fields'] as $field) {
+      if (!empty($this->_priceSet['fields'])) {
+        foreach ($this->_priceSet['fields'] as $field) {
           foreach ($field['options'] as $option) {
             $count = $option['count'] ?? 0;
             $optionsCountDetails['fields'][$field['id']]['options'][$option['id']] = $count;
           }
         }
       }
-      $form->_priceSet['optionsCountDetails'] = $optionsCountDetails;
+      $this->_priceSet['optionsCountDetails'] = $optionsCountDetails;
     }
 
     //get option max value info.
     $optionsMaxValueTotal = 0;
     $optionsMaxValueDetails = [];
 
-    if (!empty($form->_priceSet['fields'])) {
-      foreach ($form->_priceSet['fields'] as $field) {
+    if ($this->isMaxValueValidationRequired()) {
+      foreach ($this->getPriceFieldMetaData() as $field) {
         foreach ($field['options'] as $option) {
           $maxVal = $option['max_value'] ?? 0;
           $optionsMaxValueDetails['fields'][$field['id']]['options'][$option['id']] = $maxVal;
           $optionsMaxValueTotal += $maxVal;
         }
       }
+      $this->_priceSet['optionsMaxValueDetails'] = $optionsMaxValueDetails;
     }
+    $this->set('priceSet', $this->_priceSet);
+  }
 
-    $form->_priceSet['optionsMaxValueTotal'] = $optionsMaxValueTotal;
-    if ($optionsMaxValueTotal) {
-      $form->_priceSet['optionsMaxValueDetails'] = $optionsMaxValueDetails;
+  protected function initializeOrder(): void {
+    $this->order = new CRM_Financial_BAO_Order();
+    $this->order->setPriceSetID($this->getPriceSetID());
+    $this->order->setIsExcludeExpiredFields(TRUE);
+    $this->order->setForm($this);
+    foreach ($this->getPriceFieldMetaData() as $priceField) {
+      if ($priceField['html_type'] === 'Text') {
+        $this->submittableMoneyFields[] = 'price_' . $priceField['id'];
+      }
     }
-    $form->set('priceSet', $form->_priceSet);
+  }
 
-    $eventFee = $form->_values['fee'] ?? NULL;
-    if (!is_array($eventFee) || empty($eventFee)) {
-      $form->_values['fee'] = [];
-    }
+  /**
+   * Get the form context.
+   *
+   * This is important for passing to the buildAmount hook as CiviDiscount checks it.
+   *
+   * @return string
+   */
+  public function getFormContext(): string {
+    return 'event';
   }
 
   /**
@@ -779,7 +838,7 @@ protected function addParticipant(&$form, $contactID) {
     $participantParams = [
       'id' => $params['participant_id'] ?? NULL,
       'contact_id' => $contactID,
-      'event_id' => $form->_eventId ? $form->_eventId : $params['event_id'],
+      'event_id' => $form->_eventId ?: $params['event_id'],
       'status_id' => $params['participant_status'] ?? 1,
       'role_id' => $params['participant_role_id'] ?? CRM_Event_BAO_Participant::getDefaultRoleID(),
       'register_date' => ($registerDate) ? $registerDate : date('YmdHis'),
@@ -841,31 +900,188 @@ protected function addParticipant(&$form, $contactID) {
     return $participant;
   }
 
+  /**
+   * Get the array of price field value IDs on the form that 'count' as
+   * full.
+   *
+   * The criteria for full is slightly confusing as it has an exclusion around
+   * select fields if they are the default - or something...
+   *
+   * @param array $field
+   *
+   * @return array
+   * @throws \CRM_Core_Exception
+   */
+  protected function getOptionFullPriceFieldValues(array $field): array {
+    $optionFullIds = [];
+    foreach ($field['options'] ?? [] as &$option) {
+      if ($this->isOptionFullID($option, $field)) {
+        $optionFullIds[$option['id']] = $option['id'];
+      }
+    }
+    return $optionFullIds;
+  }
+
+  /**
+   * Is the option a 'full ID'.
+   *
+   * It is not clear why this is different to the is_full calculation
+   * but it is used in a less narrow context, around validation.
+   *
+   * Ideally figure it out & update this doc block.
+   *
+   * @param array $option
+   * @param array $field
+   *
+   * @return bool
+   * @throws \CRM_Core_Exception
+   */
+  private function isOptionFullID(array $option, array $field) : bool {
+    $fieldId = $option['price_field_id'];
+    $currentParticipantNo = (int) substr($this->_name, 12);
+    $defaultPricefieldIds = [];
+    if (!empty($this->_values['line_items'])) {
+      foreach ($this->_values['line_items'] as $lineItem) {
+        $defaultPricefieldIds[] = $lineItem['price_field_value_id'];
+      }
+    }
+    $formattedPriceSetDefaults = [];
+    if (!empty($this->_allowConfirmation) && (isset($this->_pId) || isset($this->_additionalParticipantId))) {
+      $participantId = $this->_pId ?? $this->_additionalParticipantId;
+      $pricesetDefaults = CRM_Event_Form_EventFees::setDefaultPriceSet($participantId,
+        $this->getEventID()
+      );
+      // modify options full to respect the selected fields
+      // options on confirmation.
+      $formattedPriceSetDefaults = self::formatPriceSetParams($this, $pricesetDefaults);
+    }
+
+    //get the current price event price set options count.
+    $currentOptionsCount = $this->getPriceSetOptionCount();
+    $optId = $option['id'];
+    $count = $option['count'] ?? 0;
+    $currentTotalCount = $currentOptionsCount[$optId] ?? 0;
+    $isOptionFull = FALSE;
+    $totalCount = $currentTotalCount + $this->getUsedSeatsCount($optId);
+    if ($option['max_value'] &&
+      (($totalCount >= $option['max_value']) &&
+        (empty($this->_lineItem[$currentParticipantNo][$optId]['price_field_id']) || $this->getUsedSeatsCount($optId) >= $option['max_value']))
+    ) {
+      $isOptionFull = TRUE;
+      if ($field['html_type'] === 'Select') {
+        if (!empty($defaultPricefieldIds) && in_array($optId, $defaultPricefieldIds)) {
+          $isOptionFull = FALSE;
+        }
+      }
+    }
+    //here option is not full,
+    //but we don't want to allow participant to increase
+    //seats at the time of re-walking registration.
+    if ($count &&
+      !empty($this->_allowConfirmation) &&
+      !empty($formattedPriceSetDefaults)
+    ) {
+      if (empty($formattedPriceSetDefaults["price_{$fieldId}"]) || empty($formattedPriceSetDefaults["price_{$fieldId}"][$optId])) {
+        $isOptionFull = TRUE;
+      }
+    }
+    return $isOptionFull;
+  }
+
+  /**
+   * Should this option be disabled on the basis of being full.
+   *
+   * Note there is another full calculation that is slightly different for
+   * ... reasons? When we figure out what those are we can update this.
+   *
+   * @param array $option
+   *
+   * @return bool
+   * @throws \CRM_Core_Exception
+   */
+  protected function getIsOptionFull(array $option): bool {
+    $isFull = FALSE;
+    $currentParticipantNo = (int) substr($this->_name, 12);
+    $formattedPriceSetDefaults = [];
+    $maxValue = $option['max_value'] ?? 0;
+    $priceFieldValueID = $option['id'];
+    //get the current price event price set options count.
+    $currentOptionsCount = $this->getPriceSetOptionCount();
+    $currentTotalCount = $currentOptionsCount[$priceFieldValueID] ?? 0;
+
+    $totalCount = $currentTotalCount + $this->getUsedSeatsCount($priceFieldValueID);
+    if (!empty($form->_allowConfirmation) && (isset($form->_pId) || isset($form->_additionalParticipantId))) {
+      $participantId = $form->_pId ?? $form->_additionalParticipantId;
+      $pricesetDefaults = CRM_Event_Form_EventFees::setDefaultPriceSet($participantId,
+        $this->getEventID()
+      );
+      // modify options full to respect the selected fields
+      // options on confirmation.
+      $formattedPriceSetDefaults = self::formatPriceSetParams($form, $pricesetDefaults);
+    }
+    $count = $option['count'] ?? 0;
+    if ($maxValue &&
+      (($totalCount >= $maxValue) &&
+        (empty($this->_lineItem[$currentParticipantNo][$priceFieldValueID]['price_field_id']) || $this->getUsedSeatsCount($priceFieldValueID) >= $maxValue))
+    ) {
+      $isFull = TRUE;
+    }
+    //here option is not full,
+    //but we don't want to allow participant to increase
+    //seats at the time of re-walking registration.
+    if ($count &&
+      !empty($this->_allowConfirmation) &&
+      !empty($formattedPriceSetDefaults)
+    ) {
+      if (empty($formattedPriceSetDefaults["price_{$option['price_field_id']}"]) || empty($formattedPriceSetDefaults["price_{$option['price_field_id']}"][$priceFieldValueID])) {
+        $isFull = TRUE;
+      }
+    }
+    return $isFull;
+  }
+
+  /**
+   * Get the used seat count for the price value option
+   *
+   * @return int
+   * @throws \CRM_Core_Exception
+   */
+  protected function getUsedSeatsCount(int $priceFieldValueID) : int {
+    $skipParticipants = [];
+    if (!empty($this->_allowConfirmation) && (isset($this->_pId) || isset($this->_additionalParticipantId))) {
+      // to skip current registered participants fields option count on confirmation.
+      $skipParticipants[] = $this->_participantId;
+      if (!empty($this->_additionalParticipantIds)) {
+        $skipParticipants = array_merge($skipParticipants, $this->_additionalParticipantIds);
+      }
+    }
+    $this->optionsCount = CRM_Event_BAO_Participant::priceSetOptionsCount($this->getEventID(), $skipParticipants);
+    return $this->optionsCount[$priceFieldValueID] ?? 0;
+  }
+
   /**
    * Calculate the total participant count as per params.
    *
-   * @param CRM_Core_Form $form
    * @param array $params
    *   User params.
    * @param bool $skipCurrent
    *
    * @return int
    */
-  public static function getParticipantCount(&$form, $params, $skipCurrent = FALSE) {
+  protected function getParticipantCount($params, $skipCurrent = FALSE) {
     $totalCount = 0;
+    $form = $this;
     if (!is_array($params) || empty($params)) {
       return $totalCount;
     }
 
     $priceSetId = $form->get('priceSetId');
     $addParticipantNum = substr($form->_name, 12);
-    $priceSetFields = $priceSetDetails = [];
+    $priceSetFields = [];
     $hasPriceFieldsCount = FALSE;
     if ($priceSetId) {
       $priceSetDetails = $form->get('priceSet');
-      if (isset($priceSetDetails['optionsCountTotal'])
-        && $priceSetDetails['optionsCountTotal']
-      ) {
+      if ($form->getOrder()->isUseParticipantCount()) {
         $hasPriceFieldsCount = TRUE;
         $priceSetFields = $priceSetDetails['optionsCountDetails']['fields'];
       }
@@ -950,7 +1166,7 @@ public function getParticipantID(): ?int {
    *
    * Convert price set each param as an array.
    *
-   * @param CRM_Core_Form $form
+   * @param self $form
    * @param array $params
    *   An array of user submitted params.
    *
@@ -997,13 +1213,11 @@ public static function formatPriceSetParams(&$form, $params) {
    *
    * - currently selected by user.
    *
-   * @param CRM_Core_Form $form
-   *   Form object.
-   *
    * @return array
    *   array of each option w/ count total.
    */
-  public static function getPriceSetOptionCount(&$form) {
+  protected function getPriceSetOptionCount() {
+    $form = $this;
     $params = $form->get('params');
     $priceSet = $form->get('priceSet');
     $priceSetId = $form->get('priceSetId');
@@ -1019,11 +1233,11 @@ public static function getPriceSetOptionCount(&$form) {
     }
 
     $priceSetFields = $priceMaxFieldDetails = [];
-    if (!empty($priceSet['optionsCountTotal'])) {
+    if ($form->getOrder()->isUseParticipantCount()) {
       $priceSetFields = $priceSet['optionsCountDetails']['fields'];
     }
 
-    if (!empty($priceSet['optionsMaxValueTotal'])) {
+    if ($this->isMaxValueValidationRequired()) {
       $priceMaxFieldDetails = $priceSet['optionsMaxValueDetails']['fields'];
     }
 
@@ -1227,30 +1441,39 @@ public static function resetSubmittedValue($elementName, $optionIds, &$form) {
     }
   }
 
+  /**
+   * Get the number of available spaces in the given event.
+   *
+   * @internal this is a transitional function to handle this form's
+   * odd behaviour whereby sometimes the fetched value is text. We need to wean
+   * the places that access it off this...
+   *
+   * @return int
+   *
+   * @throws \CRM_Core_Exception
+   */
+  protected function getAvailableSpaces(): int {
+    // non numeric would be 'event full text'....
+    return is_numeric($this->_availableRegistrations) ? (int) $this->_availableRegistrations : 0;
+  }
+
   /**
    * Validate price set submitted params for price option limit.
    *
    * User should select at least one price field option.
    *
-   * @param CRM_Core_Form $form
    * @param array $params
+   * @param int $priceSetId
+   * @param array $priceSetDetails
    *
    * @return array
    */
-  public static function validatePriceSet(&$form, $params) {
+  protected function validatePriceSet(array $params, $priceSetId, $priceSetDetails) {
     $errors = [];
     $hasOptMaxValue = FALSE;
     if (!is_array($params) || empty($params)) {
       return $errors;
     }
-
-    $currentParticipantNum = substr($form->_name, 12);
-    if (!$currentParticipantNum) {
-      $currentParticipantNum = 0;
-    }
-
-    $priceSetId = $form->get('priceSetId');
-    $priceSetDetails = $form->get('priceSet');
     if (
       !$priceSetId ||
       !is_array($priceSetDetails) ||
@@ -1261,24 +1484,16 @@ public static function validatePriceSet(&$form, $params) {
 
     $optionsCountDetails = $optionsMaxValueDetails = [];
     if (
-      isset($priceSetDetails['optionsMaxValueTotal'])
-      && $priceSetDetails['optionsMaxValueTotal']
+      $this->isMaxValueValidationRequired()
     ) {
       $hasOptMaxValue = TRUE;
       $optionsMaxValueDetails = $priceSetDetails['optionsMaxValueDetails']['fields'];
     }
-    if (
-      isset($priceSetDetails['optionsCountTotal'])
-      && $priceSetDetails['optionsCountTotal']
-    ) {
+
+    if ($this->getOrder()->isUseParticipantCount()) {
       $hasOptCount = TRUE;
       $optionsCountDetails = $priceSetDetails['optionsCountDetails']['fields'];
     }
-    $feeBlock = $form->_feeBlock;
-
-    if (empty($feeBlock)) {
-      $feeBlock = $priceSetDetails['fields'];
-    }
 
     $optionMaxValues = $fieldSelected = [];
     foreach ($params as $pNum => $values) {
@@ -1292,7 +1507,7 @@ public static function validatePriceSet(&$form, $params) {
         }
         $priceFieldId = substr($valKey, 6);
         $noneOptionValueSelected = FALSE;
-        if (!$feeBlock[$priceFieldId]['is_required'] && $value == 0) {
+        if (!$this->getPriceFieldMetaData()[$priceFieldId]['is_required'] && $value == 0) {
           $noneOptionValueSelected = TRUE;
         }
 
@@ -1310,7 +1525,7 @@ public static function validatePriceSet(&$form, $params) {
         }
 
         foreach ($value as $optId => $optVal) {
-          if (($feeBlock[$priceFieldId]['html_type'] ?? NULL) === 'Text') {
+          if (($this->getPriceFieldMetaData()[$priceFieldId]['html_type'] ?? NULL) === 'Text') {
             $currentMaxValue = $optVal;
           }
           else {
@@ -1338,10 +1553,9 @@ public static function validatePriceSet(&$form, $params) {
 
     //validate for option max value.
     foreach ($optionMaxValues as $fieldId => $values) {
-      $options = $feeBlock[$fieldId]['options'] ?? [];
       foreach ($values as $optId => $total) {
         $optMax = $optionsMaxValueDetails[$fieldId]['options'][$optId];
-        $opDbCount = $options[$optId]['db_total_count'] ?? 0;
+        $opDbCount = $this->getUsedSeatsCount($optId);
         $total += $opDbCount;
         if ($optMax && ($total > $optMax)) {
           if ($opDbCount && ($opDbCount >= $optMax)) {
@@ -1636,6 +1850,8 @@ private function sendMails($params, $registerByID, array $participantCount) {
     $primaryContactId = $this->get('primaryContactId');
 
     //build an array of custom profile and assigning it to template.
+    // @todo - don't call buildCustomProfile to get additionalParticipants.
+    // CRM_Event_BAO_Participant::getAdditionalParticipantIds is a better fit.
     $additionalIDs = CRM_Event_BAO_Event::buildCustomProfile($registerByID, NULL,
       $primaryContactId, $isTest, TRUE
     );
@@ -1750,14 +1966,12 @@ public function isQuickConfig(): bool {
    * Rather historic - might have unneeded stuff
    *
    * @return string
+   * @throws \CRM_Core_Exception
    */
   public function getCurrency() {
-    $currency = $this->_values['currency'] ?? NULL;
-    // For event forms, currency is in a different spot
-    if (empty($currency)) {
-      $currency = CRM_Utils_Array::value('currency', CRM_Utils_Array::value('event', $this->_values));
-    }
+    $currency = $this->getEventValue('currency');
     if (empty($currency)) {
+      // Is this valid? It comes from previously shared code.
       $currency = CRM_Utils_Request::retrieveValue('currency', 'String');
     }
     // @todo If empty there is a problem - we should probably put in a deprecation notice
@@ -1765,4 +1979,150 @@ public function getCurrency() {
     return $currency;
   }
 
+  /**
+   * Build the radio/text form elements for the amount field
+   *
+   * @internal function is not currently called by any extentions in our civi
+   * 'universe' and is not supported for such use. Signature has changed & will
+   * change again.
+   *
+   * @throws \CRM_Core_Exception
+   */
+  protected function buildAmount() {
+    $form = $this;
+    $priceSetID = $this->_priceSetId;
+    $required = TRUE;
+    $discountId = NULL;
+    $feeFields = $this->getPriceFieldMetaData();
+
+    //check for discount.
+    $discountedFee = $form->_values['discount'] ?? NULL;
+    if (is_array($discountedFee) && !empty($discountedFee)) {
+      CRM_Core_Error::deprecatedWarning('code believed to be unreachable.');
+      if (!$discountId) {
+        $form->_discountId = $discountId = CRM_Core_BAO_Discount::findSet($form->_eventId, 'civicrm_event');
+      }
+      if ($discountId) {
+        $feeFields = &$form->_values['discount'][$discountId];
+      }
+    }
+
+    //reset required if participant is skipped.
+    $button = substr($form->controller->getButtonName(), -4);
+    if ($required && $button === 'skip') {
+      $required = FALSE;
+    }
+
+    //build the priceset fields.
+    if ($priceSetID) {
+
+      // This is probably not required now - normally loaded from event ....
+      $form->add('hidden', 'priceSetId', $priceSetID);
+
+      // CRM-14492 Admin price fields should show up on event registration if user has 'administer CiviCRM' permissions
+      $adminFieldVisible = CRM_Core_Permission::check('administer CiviCRM data');
+      $hideAdminValues = !CRM_Core_Permission::check('edit event participants');
+
+      foreach ($feeFields as $field) {
+        // public AND admin visibility fields are included for back-office registration and back-office change selections
+        if (($field['visibility'] ?? NULL) === 'public' ||
+          (($field['visibility'] ?? NULL) === 'admin' && $adminFieldVisible == TRUE)
+        ) {
+          $fieldId = $field['id'];
+          $elementName = 'price_' . $fieldId;
+
+          $isRequire = $field['is_required'] ?? NULL;
+          if ($button === 'skip') {
+            $isRequire = FALSE;
+          }
+
+          //user might modified w/ hook.
+          $options = $field['options'] ?? NULL;
+
+          if (!is_array($options)) {
+            continue;
+          }
+          if ($hideAdminValues) {
+            $publicVisibilityID = CRM_Price_BAO_PriceField::getVisibilityOptionID('public');
+            $adminVisibilityID = CRM_Price_BAO_PriceField::getVisibilityOptionID('admin');
+
+            foreach ($options as $key => $currentOption) {
+              $optionVisibility = CRM_Utils_Array::value('visibility_id', $currentOption, $publicVisibilityID);
+              if ($optionVisibility == $adminVisibilityID) {
+                unset($options[$key]);
+              }
+            }
+          }
+
+          $optionFullIds = $this->getOptionFullPriceFieldValues($field);
+
+          //soft suppress required rule when option is full.
+          if (!empty($optionFullIds) && (count($options) == count($optionFullIds))) {
+            $isRequire = FALSE;
+          }
+          foreach ($options as $option) {
+            $options[$option['id']]['is_full'] = $this->getIsOptionFull($option);
+          }
+          if (!empty($options)) {
+            //build the element.
+            CRM_Price_BAO_PriceField::addQuickFormElement($form,
+              $elementName,
+              $fieldId,
+              FALSE,
+              $isRequire,
+              NULL,
+              $options,
+              $optionFullIds
+            );
+          }
+        }
+      }
+    }
+    else {
+      // Is this reachable?
+      // Noisy deprecation notice added in Sep 2023 (in previous code location).
+      CRM_Core_Error::deprecatedWarning('code believed to be unreachable');
+      $eventFeeBlockValues = $elements = $elementJS = [];
+      foreach ($feeFields as $fee) {
+        if (is_array($fee)) {
+
+          //CRM-7632, CRM-6201
+          $totalAmountJs = NULL;
+          $eventFeeBlockValues['amount_id_' . $fee['amount_id']] = $fee['value'];
+          $elements[$fee['amount_id']] = CRM_Utils_Money::format($fee['value']) . ' ' . $fee['label'];
+          $elementJS[$fee['amount_id']] = $totalAmountJs;
+        }
+      }
+      $form->assign('eventFeeBlockValues', json_encode($eventFeeBlockValues));
+
+      $form->_defaults['amount'] = $form->_values['event']['default_fee_id'] ?? NULL;
+      $element = &$form->addRadio('amount', ts('Event Fee(s)'), $elements, [], '<br />', FALSE, $elementJS);
+      if (isset($form->_online) && $form->_online) {
+        $element->freeze();
+      }
+      if ($required) {
+        $form->addRule('amount', ts('Fee Level is a required field.'), 'required');
+      }
+    }
+  }
+
+  /**
+   * Is there a price field value configured with a maximum value.
+   *
+   * If so there will need to be a check to ensure the number used does not
+   * exceed it.
+   *
+   * @return bool
+   */
+  protected function isMaxValueValidationRequired(): bool {
+    foreach ($this->getPriceFieldMetaData() as $field) {
+      foreach ($field['options'] as $priceValueOption) {
+        if ($priceValueOption['max_value']) {
+          return TRUE;
+        }
+      }
+    }
+    return FALSE;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Event/Form/Registration/AdditionalParticipant.php b/www/modules/civicrm/CRM/Event/Form/Registration/AdditionalParticipant.php
index bfe53c695..806e39200 100644
--- a/www/modules/civicrm/CRM/Event/Form/Registration/AdditionalParticipant.php
+++ b/www/modules/civicrm/CRM/Event/Form/Registration/AdditionalParticipant.php
@@ -94,7 +94,7 @@ public function getUFGroupIDs() {
    */
   public function preProcess() {
     parent::preProcess();
-
+    $this->addExpectedSmartyVariable('additionalCustomPost');
     $participantNo = substr($this->_name, 12);
 
     //lets process in-queue participants.
@@ -104,14 +104,11 @@ public function preProcess() {
 
     $participantCnt = $participantNo + 1;
     $this->assign('formId', $participantNo);
-    $this->_params = [];
     $this->_params = $this->get('params');
 
     $participantTot = $this->_params[0]['additional_participants'] + 1;
     $skipCount = count(array_keys($this->_params, "skip"));
-    if ($skipCount) {
-      $this->assign('skipCount', $skipCount);
-    }
+    $this->assign('skipCount', $skipCount);
     $this->setTitle(ts('Register Participant %1 of %2', [1 => $participantCnt, 2 => $participantTot]));
 
     //CRM-4320, hack to check last participant.
@@ -142,12 +139,12 @@ public function setDefaultValues() {
       }
     }
     if ($this->_priceSetId) {
-      foreach ($this->_feeBlock as $key => $val) {
+      foreach ($this->getPriceFieldMetaData() as $key => $val) {
         if (empty($val['options'])) {
           continue;
         }
 
-        $optionsFull = CRM_Utils_Array::value('option_full_ids', $val, []);
+        $optionsFull = $this->getOptionFullPriceFieldValues($val);
         foreach ($val['options'] as $keys => $values) {
           if ($values['is_default'] && !in_array($keys, $optionsFull)) {
             if ($val['html_type'] === 'CheckBox') {
@@ -219,8 +216,9 @@ public function buildQuickForm() {
     $button = substr($this->controller->getButtonName(), -4);
 
     if ($this->_values['event']['is_monetary']) {
-      CRM_Event_Form_Registration_Register::buildAmount($this, TRUE, NULL, $this->_priceSetId);
+      $this->buildAmount(TRUE, NULL, $this->_priceSetId);
     }
+    $this->assign('priceSet', $this->_priceSet);
 
     //Add pre and post profiles on the form.
     foreach (['pre', 'post'] as $keys) {
@@ -247,7 +245,7 @@ public function buildQuickForm() {
 
     if ($this->_lastParticipant || $pricesetFieldsCount) {
       //get the participant total.
-      $processedCnt = self::getParticipantCount($this, $this->_params, TRUE);
+      $processedCnt = $this->getParticipantCount($this->_params, TRUE);
     }
 
     if (!$this->_allowConfirmation && !empty($this->_params[0]['bypass_payment']) &&
@@ -325,8 +323,10 @@ public function buildQuickForm() {
       }
     }
 
+    // Assign false & maybe overwrite with TRUE below.
+    $this->assign('allowGroupOnWaitlist', FALSE);
     // for priceset with count
-    if ($pricesetFieldsCount && !empty($this->_values['event']['has_waitlist']) &&
+    if ($pricesetFieldsCount && $this->getEventValue('has_waitlist') &&
       !$this->_allowConfirmation
     ) {
 
@@ -498,10 +498,10 @@ public static function formRule($fields, $files, $self) {
 
         //format current participant params.
         $allParticipantParams[$addParticipantNum] = self::formatPriceSetParams($self, $fields);
-        $totalParticipants = self::getParticipantCount($self, $allParticipantParams);
+        $totalParticipants = $self->getParticipantCount($allParticipantParams);
 
         //validate price field params.
-        $priceSetErrors = self::validatePriceSet($self, $allParticipantParams);
+        $priceSetErrors = $self->validatePriceSet($allParticipantParams, $self->get('priceSetId'), $self->get('priceSet'));
         $errors = array_merge($errors, CRM_Utils_Array::value($addParticipantNum, $priceSetErrors, []));
 
         if (!$self->_allowConfirmation &&
@@ -658,13 +658,13 @@ public function postProcess() {
     ) {
       $this->_allowWaitlist = FALSE;
       //get the current page count.
-      $currentCount = self::getParticipantCount($this, $params);
-      if ($button == 'skip') {
+      $currentCount = $this->getParticipantCount($params);
+      if ($button === 'skip') {
         $currentCount = 'skip';
       }
 
       //get the total count.
-      $previousCount = self::getParticipantCount($this, $this->_params, TRUE);
+      $previousCount = $this->getParticipantCount($this->_params, TRUE);
       $totalParticipants = $previousCount;
       if (is_numeric($currentCount)) {
         $totalParticipants += $currentCount;
diff --git a/www/modules/civicrm/CRM/Event/Form/Registration/Confirm.php b/www/modules/civicrm/CRM/Event/Form/Registration/Confirm.php
index 2714de2e4..18247b128 100644
--- a/www/modules/civicrm/CRM/Event/Form/Registration/Confirm.php
+++ b/www/modules/civicrm/CRM/Event/Form/Registration/Confirm.php
@@ -81,14 +81,13 @@ public function preProcess() {
     $this->_params[0]['is_pay_later'] = $this->get('is_pay_later');
     $this->assign('is_pay_later', $this->_params[0]['is_pay_later']);
     $this->assign('pay_later_receipt', $this->_params[0]['is_pay_later'] ? $this->_values['event']['pay_later_receipt'] : NULL);
-
+    $this->assign('confirm_text', $this->getEventValue('confirm_text'));
     CRM_Utils_Hook::eventDiscount($this, $this->_params);
 
     if (!empty($this->_params[0]['discount']) && !empty($this->_params[0]['discount']['applied'])) {
       $this->set('hookDiscount', $this->_params[0]['discount']);
-      $this->assign('hookDiscount', $this->_params[0]['discount']);
     }
-
+    $this->assign('hookDiscount', $this->_params[0]['discount'] ?? '');
     $this->preProcessExpress();
 
     if ($this->_values['event']['is_monetary']) {
@@ -109,7 +108,9 @@ public function preProcess() {
       $this->setTitle($this->_values['event']['confirm_title']);
     }
 
-    // Personal campaign page
+    // Personal campaign page.
+    // Unclear if this really is possible on event pages or copy & paste.
+    $this->assign('pcpBlock', FALSE);
     if ($this->_pcpId) {
       $params = CRM_Contribute_Form_Contribution_Confirm::processPcp($this, $this->_params[0]);
       $this->_params[0] = $params;
@@ -219,19 +220,20 @@ public function getAction() {
    */
   public function buildQuickForm() {
     $this->assignToTemplate();
+    // This use of the ts function uses the legacy interpolation of the button name to avoid translations having to be re-done.
+    $this->assign('verifyText', !$this->_totalAmount ? ts('Click <strong>%1</strong> to complete your registration.', [1 => ts('Register')]) : $this->getPaymentProcessorObject()->getText('eventContinueText', []));
 
     if ($this->_values['event']['is_monetary'] &&
-      ($this->_params[0]['amount'] || $this->_params[0]['amount'] == 0) &&
+      (isset($this->_params[0]['amount']) && is_numeric($this->_params[0]['amount'])) &&
       !$this->_requireApproval
     ) {
 
       [$taxAmount, $participantDetails, $individual, $amountArray] = $this->calculateAmounts();
-
+      $this->assign('totalTaxAmount', $taxAmount);
       $this->_amount = $amountArray;
-
+      $this->assign('taxTerm', \Civi::settings()->get('tax_term'));
       if (\Civi::settings()->get('invoicing')) {
-        $this->assign('totalTaxAmount', $taxAmount);
-        $this->assign('taxTerm', \Civi::settings()->get('tax_term'));
+        // @todo - remove this - used to be for online event template but no longer used.
         $this->assign('individual', $individual);
         $this->set('individual', $individual);
       }
@@ -241,9 +243,6 @@ public function buildQuickForm() {
       $this->assign('amounts', $amountArray);
       $this->assign('totalAmount', $this->_totalAmount);
       $this->set('totalAmount', $this->_totalAmount);
-      // This use of the ts function uses the legacy interpolation of the button name to avoid translations having to be re-done.
-      $this->assign('verifyText', !$this->_totalAmount ? ts('Click <strong>%1</strong> to complete your registration.', [1 => ts('Register')]) : $this->getPaymentProcessorObject()->getText('eventContinueText', []));
-
       $showPaymentOnConfirm = (in_array($this->_eventId, \Civi::settings()->get('event_show_payment_on_confirm')) || in_array('all', \Civi::settings()->get('event_show_payment_on_confirm')));
       $this->assign('showPaymentOnConfirm', $showPaymentOnConfirm);
       if ($showPaymentOnConfirm) {
@@ -348,17 +347,17 @@ public static function formRule($fields, $files, $form) {
         CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/event/register', "reset=1&id={$form->getEventID()}", FALSE, NULL, FALSE, TRUE));
       }
     }
-    $form->_feeBlock = $form->_values['fee'];
-    CRM_Event_Form_Registration_Register::formatFieldsForOptionFull($form);
+    if ($form->getEventValue('is_monetary')) {
 
-    if (!empty($form->_priceSetId) &&
-      !$form->_requireApproval && !$form->_allowWaitlist
+      if (!empty($form->_priceSetId) &&
+        !$form->_requireApproval && !$form->_allowWaitlist
       ) {
-      $errors = self::validatePriceSet($form, $form->_params);
-      if (!empty($errors)) {
-        CRM_Core_Session::setStatus(ts('You have been returned to the start of the registration process and any sold out events have been removed from your selections. You will not be able to continue until you review your booking and select different events if you wish.'), ts('Unfortunately some of your options have now sold out for one or more participants.'), 'error');
-        CRM_Core_Session::setStatus(ts('Please note that the options which are marked or selected are sold out for participant being viewed.'), ts('Sold out:'), 'error');
-        CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/event/register', "_qf_Register_display=true&qfKey={$fields['qfKey']}"));
+        $errors = $form->validatePriceSet($form->_params, $form->_priceSetId, $form->get('priceSet'));
+        if (!empty($errors)) {
+          CRM_Core_Session::setStatus(ts('You have been returned to the start of the registration process and any sold out events have been removed from your selections. You will not be able to continue until you review your booking and select different events if you wish.'), ts('Unfortunately some of your options have now sold out for one or more participants.'), 'error');
+          CRM_Core_Session::setStatus(ts('Please note that the options which are marked or selected are sold out for participant being viewed.'), ts('Sold out:'), 'error');
+          CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/event/register', "_qf_Register_display=true&qfKey={$fields['qfKey']}"));
+        }
       }
     }
 
@@ -779,6 +778,8 @@ public function postProcess() {
     else {
 
       //build an array of cId/pId of participants
+      // @todo - don't call buildCustomProfile to get additionalParticipants.
+      // CRM_Event_BAO_Participant::getAdditionalParticipantIds is a better fit.
       $additionalIDs = CRM_Event_BAO_Event::buildCustomProfile($registerByID,
         NULL, $primaryContactId, $isTest,
         TRUE
@@ -960,7 +961,7 @@ private function processContribution(
     // create contribution record
     $contribution = CRM_Contribute_BAO_Contribution::add($contribParams);
     // CRM-11124
-    CRM_Event_BAO_Participant::createDiscountTrxn($form->getEventID(), $contribParams, NULL, CRM_Price_BAO_PriceSet::parseFirstPriceSetValueIDFromParams($params));
+    CRM_Event_BAO_Participant::createDiscountTrxn($form->getEventID(), $contribParams, '', CRM_Price_BAO_PriceSet::parseFirstPriceSetValueIDFromParams($params));
 
     $transaction->commit();
 
@@ -1139,7 +1140,7 @@ public static function updateContactFields($contactID, $params, $fields, &$form)
   /**
    * Assign Profiles to the template.
    *
-   * @param CRM_Event_Form_Registration_Confirm $form
+   * @param CRM_Event_Form_Registration_Confirm|\CRM_Event_Form_Registration_ThankYou $form
    *
    * @throws \CRM_Core_Exception
    */
@@ -1203,6 +1204,7 @@ public static function assignProfiles($form) {
       }
       $form->_fields = $profileFields;
     }
+    $form->assign('addParticipantProfile', []);
     if (!empty($formattedValues)) {
       $form->assign('primaryParticipantProfile', $formattedValues[1]);
       $form->set('primaryParticipantProfile', $formattedValues[1]);
diff --git a/www/modules/civicrm/CRM/Event/Form/Registration/Register.php b/www/modules/civicrm/CRM/Event/Form/Registration/Register.php
index c44572091..46db61b50 100644
--- a/www/modules/civicrm/CRM/Event/Form/Registration/Register.php
+++ b/www/modules/civicrm/CRM/Event/Form/Registration/Register.php
@@ -50,6 +50,8 @@ class CRM_Event_Form_Registration_Register extends CRM_Event_Form_Registration {
    * Show fee block or not.
    *
    * @var bool
+   *
+   * @deprecated
    */
   public $_noFees;
 
@@ -116,7 +118,7 @@ public static function getRegistrationContactID($fields, $form, $isAdditional) {
       $contactID = $form->getContactID();
     }
     if (!$contactID && is_array($fields) && $fields) {
-      $contactID = CRM_Contact_BAO_Contact::getFirstDuplicateContact($fields, 'Individual', 'Unsupervised', [], FALSE, CRM_Utils_Array::value('dedupe_rule_group_id', $form->_values['event']), ['event_id' => CRM_Utils_Array::value('id', $form->_values['event'])]);
+      $contactID = CRM_Contact_BAO_Contact::getFirstDuplicateContact($fields, 'Individual', 'Unsupervised', [], FALSE, $form->_values['event']['dedupe_rule_group_id'] ?? NULL, ['event_id' => $form->_values['event']['id'] ?? NULL]);
     }
     return $contactID;
   }
@@ -164,10 +166,9 @@ public function preProcess() {
     $eventFull = CRM_Event_BAO_Participant::eventFull($this->_eventId, FALSE, CRM_Utils_Array::value('has_waitlist', $this->_values['event']));
 
     // Get payment processors if appropriate for this event
-    // We hide the payment fields if the event is full or requires approval,
-    // and the current user has not yet been approved CRM-12279
-    $this->_noFees = (($eventFull || $this->_requireApproval) && !$this->_allowConfirmation);
-    $this->_paymentProcessors = $this->_noFees ? [] : $this->get('paymentProcessors');
+    $this->_noFees = $suppressPayment = $this->isSuppressPayment();
+    $this->_paymentProcessors = $suppressPayment ? [] : $this->get('paymentProcessors');
+    $this->assign('suppressPaymentBlock', $suppressPayment);
     $this->preProcessPaymentOptions();
 
     $this->_allowWaitlist = FALSE;
@@ -189,24 +190,22 @@ public function preProcess() {
 
     // get the participant values from EventFees.php, CRM-4320
     if ($this->_allowConfirmation) {
-      $this->eventFeeWrangling($this);
+      $this->eventFeeWrangling();
     }
   }
 
   /**
    * This is previously shared code which is probably of little value.
    *
-   * @param CRM_Core_Form $form
-   *
    * @throws \CRM_Core_Exception
    */
-  private function eventFeeWrangling($form) {
-    $form->_pId = CRM_Utils_Request::retrieve('participantId', 'Positive', $form);
-    $form->_discountId = CRM_Utils_Request::retrieve('discountId', 'Positive', $form);
+  private function eventFeeWrangling() {
+    $this->_pId = CRM_Utils_Request::retrieve('participantId', 'Positive', $this);
+    $this->_discountId = CRM_Utils_Request::retrieve('discountId', 'Positive', $this);
 
     //CRM-6907 set event specific currency.
     if ($this->getEventID() &&
-      ($currency = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event', $form->_eventId, 'currency'))
+      ($currency = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event', $this->getEventID(), 'currency'))
     ) {
       CRM_Core_Config::singleton()->defaultCurrency = $currency;
     }
@@ -221,7 +220,7 @@ private function eventFeeWrangling($form) {
    */
   public function setDefaultValues() {
     $this->_defaults = [];
-    if (!$this->_allowConfirmation && $this->_requireApproval) {
+    if ($this->isSuppressPayment()) {
       $this->_defaults['bypass_payment'] = 1;
     }
     $contactID = $this->getContactID();
@@ -292,12 +291,12 @@ public function setDefaultValues() {
       $this->_defaults['participant_role']
         = $this->_defaults['participant_role_id'] = $this->_values['event']['default_role_id'];
     }
-    if ($this->_priceSetId && !empty($this->_feeBlock)) {
-      foreach ($this->_feeBlock as $key => $val) {
+    if ($this->_priceSetId) {
+      foreach ($this->getPriceFieldMetaData() as $key => $val) {
         if (empty($val['options'])) {
           continue;
         }
-        $optionFullIds = CRM_Utils_Array::value('option_full_ids', $val, []);
+        $optionFullIds = $this->getOptionFullPriceFieldValues($val);
         foreach ($val['options'] as $keys => $values) {
           $priceFieldName = 'price_' . $values['price_field_id'];
           $priceFieldValue = CRM_Price_BAO_PriceSet::getPriceFieldValueFromURL($this, $priceFieldName);
@@ -308,8 +307,8 @@ public function setDefaultValues() {
             break;
           }
           else {
-            if ($values['is_default'] && empty($values['is_full'])) {
-              if ($val['html_type'] == 'CheckBox') {
+            if ($values['is_default'] && !$this->getIsOptionFull($values)) {
+              if ($val['html_type'] === 'CheckBox') {
                 $this->_defaults["price_{$key}"][$keys] = 1;
               }
               else {
@@ -433,16 +432,10 @@ public function buildQuickForm() {
     $this->assign('isAdditionalParticipants', $isAdditionalParticipants);
 
     if ($this->_values['event']['is_monetary']) {
-      // Required for currency formatting in the JS layer
-      // this is a temporary fix intended to resolve a regression quickly
-      // And assigning moneyFormat for js layer formatting
-      // will only work until that is done.
-      // https://github.com/civicrm/civicrm-core/pull/19151
-      $this->assign('moneyFormat', CRM_Utils_Money::format(1234.56));
       // build amount only when needed, skip incase of event full and waitlisting is enabled
       // and few other conditions check preProcess()
-      if (!$this->_noFees) {
-        self::buildAmount($this, TRUE, NULL, $this->_priceSetId);
+      if (!$this->isSuppressPayment()) {
+        $this->buildAmount();
       }
       if (!$this->showPaymentOnConfirm) {
         CRM_Core_Payment_ProcessorForm::buildQuickForm($this);
@@ -455,7 +448,7 @@ public function buildQuickForm() {
       //@todo we are blocking for multiple registrations because we haven't tested
       $this->addCIDZeroOptions();
     }
-
+    $this->assign('priceSet', $this->_priceSet);
     $this->addElement('hidden', 'bypass_payment', NULL, ['id' => 'bypass_payment']);
     $this->assign('bypassPayment', $bypassPayment);
 
@@ -553,248 +546,6 @@ public function buildQuickForm() {
     }
   }
 
-  /**
-   * Build the radio/text form elements for the amount field
-   *
-   * @internal function is not currently called by any extentions in our civi
-   * 'universe' and is not supported for such use. Signature has changed & will
-   * change again.
-   *
-   * @param CRM_Event_Form_Registration_Register $form
-   *   Form object.
-   * @param bool $required
-   *   True if you want to add formRule.
-   * @param int|null $discountId
-   *   Discount id for the event.
-   * @param int|null $priceSetID
-   *
-   * @throws \CRM_Core_Exception
-   */
-  public static function buildAmount($form, $required, $discountId, $priceSetID) {
-    $feeFields = $form->_values['fee'] ?? NULL;
-
-    if (is_array($feeFields)) {
-      $form->_feeBlock = &$form->_values['fee'];
-    }
-
-    //check for discount.
-    $discountedFee = $form->_values['discount'] ?? NULL;
-    if (is_array($discountedFee) && !empty($discountedFee)) {
-      if (!$discountId) {
-        $form->_discountId = $discountId = CRM_Core_BAO_Discount::findSet($form->_eventId, 'civicrm_event');
-      }
-      if ($discountId) {
-        $form->_feeBlock = &$form->_values['discount'][$discountId];
-      }
-    }
-    if (!is_array($form->_feeBlock)) {
-      $form->_feeBlock = [];
-    }
-
-    //its time to call the hook.
-    CRM_Utils_Hook::buildAmount('event', $form, $form->_feeBlock);
-
-    //reset required if participant is skipped.
-    $button = substr($form->controller->getButtonName(), -4);
-    if ($required && $button == 'skip') {
-      $required = FALSE;
-    }
-
-    $className = CRM_Utils_System::getClassName($form);
-
-    //build the priceset fields.
-    if ($priceSetID) {
-
-      //format price set fields across option full.
-      self::formatFieldsForOptionFull($form);
-      // This is probably not required now - normally loaded from event ....
-      $form->add('hidden', 'priceSetId', $priceSetID);
-
-      // CRM-14492 Admin price fields should show up on event registration if user has 'administer CiviCRM' permissions
-      $adminFieldVisible = CRM_Core_Permission::check('administer CiviCRM data');
-      $hideAdminValues = !CRM_Core_Permission::check('edit event participants');
-
-      foreach ($form->_feeBlock as $field) {
-        // public AND admin visibility fields are included for back-office registration and back-office change selections
-        if (($field['visibility'] ?? NULL) == 'public' ||
-          (($field['visibility'] ?? NULL) == 'admin' && $adminFieldVisible == TRUE) ||
-          $className == 'CRM_Event_Form_ParticipantFeeSelection'
-        ) {
-          $fieldId = $field['id'];
-          $elementName = 'price_' . $fieldId;
-
-          $isRequire = $field['is_required'] ?? NULL;
-          if ($button == 'skip') {
-            $isRequire = FALSE;
-          }
-
-          //user might modified w/ hook.
-          $options = $field['options'] ?? NULL;
-          $formClasses = ['CRM_Event_Form_ParticipantFeeSelection'];
-
-          if (!is_array($options)) {
-            continue;
-          }
-          elseif ($hideAdminValues && !in_array($className, $formClasses)) {
-            $publicVisibilityID = CRM_Price_BAO_PriceField::getVisibilityOptionID('public');
-            $adminVisibilityID = CRM_Price_BAO_PriceField::getVisibilityOptionID('admin');
-
-            foreach ($options as $key => $currentOption) {
-              $optionVisibility = CRM_Utils_Array::value('visibility_id', $currentOption, $publicVisibilityID);
-              if ($optionVisibility == $adminVisibilityID) {
-                unset($options[$key]);
-              }
-            }
-          }
-
-          $optionFullIds = CRM_Utils_Array::value('option_full_ids', $field, []);
-
-          //soft suppress required rule when option is full.
-          if (!empty($optionFullIds) && (count($options) == count($optionFullIds))) {
-            $isRequire = FALSE;
-          }
-          if (!empty($options)) {
-            //build the element.
-            CRM_Price_BAO_PriceField::addQuickFormElement($form,
-              $elementName,
-              $fieldId,
-              FALSE,
-              $isRequire,
-              NULL,
-              $options,
-              $optionFullIds
-            );
-          }
-        }
-      }
-      $form->_priceSet['id'] ??= $priceSetID;
-      $form->assign('priceSet', $form->_priceSet);
-    }
-    else {
-      // Is this reachable?
-      CRM_Core_Error::deprecatedWarning('code believed to be unreachable');
-      $eventFeeBlockValues = $elements = $elementJS = [];
-      foreach ($form->_feeBlock as $fee) {
-        if (is_array($fee)) {
-
-          //CRM-7632, CRM-6201
-          $totalAmountJs = NULL;
-          $eventFeeBlockValues['amount_id_' . $fee['amount_id']] = $fee['value'];
-          $elements[$fee['amount_id']] = CRM_Utils_Money::format($fee['value']) . ' ' . $fee['label'];
-          $elementJS[$fee['amount_id']] = $totalAmountJs;
-        }
-      }
-      $form->assign('eventFeeBlockValues', json_encode($eventFeeBlockValues));
-
-      $form->_defaults['amount'] = $form->_values['event']['default_fee_id'] ?? NULL;
-      $element = &$form->addRadio('amount', ts('Event Fee(s)'), $elements, [], '<br />', FALSE, $elementJS);
-      if (isset($form->_online) && $form->_online) {
-        $element->freeze();
-      }
-      if ($required) {
-        $form->addRule('amount', ts('Fee Level is a required field.'), 'required');
-      }
-    }
-  }
-
-  /**
-   * @param CRM_Event_Form_Registration $form
-   */
-  public static function formatFieldsForOptionFull(&$form) {
-    $priceSet = $form->get('priceSet');
-    $priceSetId = $form->get('priceSetId');
-    $defaultPricefieldIds = [];
-    if (!empty($form->_values['line_items'])) {
-      foreach ($form->_values['line_items'] as $lineItem) {
-        $defaultPricefieldIds[] = $lineItem['price_field_value_id'];
-      }
-    }
-    if (!$priceSetId ||
-      !is_array($priceSet) ||
-      empty($priceSet) || empty($priceSet['optionsMaxValueTotal'])
-    ) {
-      return;
-    }
-
-    $skipParticipants = $formattedPriceSetDefaults = [];
-    if (!empty($form->_allowConfirmation) && (isset($form->_pId) || isset($form->_additionalParticipantId))) {
-      $participantId = $form->_pId ?? $form->_additionalParticipantId;
-      $pricesetDefaults = CRM_Event_Form_EventFees::setDefaultPriceSet($participantId,
-        $form->_eventId
-      );
-      // modify options full to respect the selected fields
-      // options on confirmation.
-      $formattedPriceSetDefaults = self::formatPriceSetParams($form, $pricesetDefaults);
-
-      // to skip current registered participants fields option count on confirmation.
-      $skipParticipants[] = $form->_participantId;
-      if (!empty($form->_additionalParticipantIds)) {
-        $skipParticipants = array_merge($skipParticipants, $form->_additionalParticipantIds);
-      }
-    }
-
-    $className = CRM_Utils_System::getClassName($form);
-
-    //get the current price event price set options count.
-    $currentOptionsCount = self::getPriceSetOptionCount($form);
-    $recordedOptionsCount = CRM_Event_BAO_Participant::priceSetOptionsCount($form->_eventId, $skipParticipants);
-    $optionFullTotalAmount = 0;
-    $currentParticipantNo = (int) substr($form->_name, 12);
-    foreach ($form->_feeBlock as & $field) {
-      $optionFullIds = [];
-      $fieldId = $field['id'];
-      if (!is_array($field['options'])) {
-        continue;
-      }
-      foreach ($field['options'] as & $option) {
-        $optId = $option['id'];
-        $count = $option['count'] ?? 0;
-        $maxValue = $option['max_value'] ?? 0;
-        $dbTotalCount = $recordedOptionsCount[$optId] ?? 0;
-        $currentTotalCount = $currentOptionsCount[$optId] ?? 0;
-
-        $totalCount = $currentTotalCount + $dbTotalCount;
-        $isFull = FALSE;
-        if ($maxValue &&
-          (($totalCount >= $maxValue) &&
-          (empty($form->_lineItem[$currentParticipantNo][$optId]['price_field_id']) || $dbTotalCount >= $maxValue))
-        ) {
-          $isFull = TRUE;
-          $optionFullIds[$optId] = $optId;
-          if ($field['html_type'] != 'Select') {
-            if (in_array($optId, $defaultPricefieldIds)) {
-              $optionFullTotalAmount += $option['amount'] ?? 0;
-            }
-          }
-          else {
-            if (!empty($defaultPricefieldIds) && in_array($optId, $defaultPricefieldIds)) {
-              unset($optionFullIds[$optId]);
-            }
-          }
-        }
-        //here option is not full,
-        //but we don't want to allow participant to increase
-        //seats at the time of re-walking registration.
-        if ($count &&
-          !empty($form->_allowConfirmation) &&
-          !empty($formattedPriceSetDefaults)
-        ) {
-          if (empty($formattedPriceSetDefaults["price_{$field}"]) || empty($formattedPriceSetDefaults["price_{$fieldId}"][$optId])) {
-            $optionFullIds[$optId] = $optId;
-            $isFull = TRUE;
-          }
-        }
-        $option['is_full'] = $isFull;
-        $option['db_total_count'] = $dbTotalCount;
-        $option['total_option_count'] = $dbTotalCount + $currentTotalCount;
-      }
-
-      //finally get option ids in.
-      $field['option_full_ids'] = $optionFullIds;
-    }
-    $form->assign('optionFullTotalAmount', $optionFullTotalAmount);
-  }
-
   /**
    * Global form rule.
    *
@@ -817,12 +568,15 @@ public static function formRule($fields, $files, $form) {
     if (!$form->_skipDupeRegistrationCheck) {
       self::checkRegistration($fields, $form);
     }
+    $spacesAvailable = $form->getEventValue('available_spaces');
     //check for availability of registrations.
-    if (!$form->_allowConfirmation && empty($fields['bypass_payment']) &&
-      is_numeric($form->_availableRegistrations) &&
-      CRM_Utils_Array::value('additional_participants', $fields) >= $form->_availableRegistrations
+    if ($form->getEventValue('max_participants') !== NULL
+      && !$form->_allowConfirmation
+      && !empty($fields['additional_participants'])
+      && empty($fields['bypass_payment']) &&
+      ((int) $fields['additional_participants']) >= $spacesAvailable
     ) {
-      $errors['additional_participants'] = ts("There is only enough space left on this event for %1 participant(s).", [1 => $form->_availableRegistrations]);
+      $errors['additional_participants'] = ts("There is only enough space left on this event for %1 participant(s).", [1 => $spacesAvailable]);
     }
 
     $numberAdditionalParticipants = $fields['additional_participants'] ?? 0;
@@ -840,9 +594,13 @@ public static function formRule($fields, $files, $form) {
     }
 
     //don't allow to register w/ waiting if enough spaces available.
-    if (!empty($fields['bypass_payment']) && $form->_allowConfirmation) {
-      if (!is_numeric($form->_availableRegistrations) ||
-        (empty($fields['priceSetId']) && CRM_Utils_Array::value('additional_participants', $fields) < $form->_availableRegistrations)
+    // @todo - this might not be working too well cos bypass_payment is working over time here.
+    // it will always be true if there is no payment on the form & it's a bit hard
+    // to determine if this is and we don't want people trying to confirm registration to be blocked here
+    /// see https://lab.civicrm.org/dev/core/-/issues/5168
+    if ($form->getPriceSetID() && !empty($fields['bypass_payment']) && $form->_allowConfirmation) {
+      if ($spacesAvailable === 0 ||
+        (empty($fields['priceSetId']) && CRM_Utils_Array::value('additional_participants', $fields) < $spacesAvailable)
       ) {
         $errors['bypass_payment'] = ts("You have not been added to the waiting list because there are spaces available for this event. We recommend registering yourself for an available space instead.");
       }
@@ -855,8 +613,8 @@ public static function formRule($fields, $files, $form) {
       //format params.
       $formatted = self::formatPriceSetParams($form, $fields);
       $ppParams = [$formatted];
-      $priceSetErrors = self::validatePriceSet($form, $ppParams);
-      $primaryParticipantCount = self::getParticipantCount($form, $ppParams);
+      $priceSetErrors = $form->validatePriceSet($ppParams, $fields['priceSetId'], $form->get('priceSet'));
+      $primaryParticipantCount = $form->getParticipantCount($ppParams);
 
       //get price set fields errors in.
       $errors = array_merge($errors, CRM_Utils_Array::value(0, $priceSetErrors, []));
@@ -866,12 +624,11 @@ public static function formRule($fields, $files, $form) {
         $totalParticipants += $numberAdditionalParticipants;
       }
 
-      if (empty($fields['bypass_payment']) &&
+      if ($form->getEventValue('max_participants') !== NULL && empty($fields['bypass_payment']) &&
         !$form->_allowConfirmation &&
-        is_numeric($form->_availableRegistrations) &&
-        $form->_availableRegistrations < $totalParticipants
+        $spacesAvailable < $totalParticipants
       ) {
-        $errors['_qf_default'] = ts("Only %1 Registrations available.", [1 => $form->_availableRegistrations]);
+        $errors['_qf_default'] = ts("Only %1 Registrations available.", [1 => $spacesAvailable]);
       }
 
       $lineItem = [];
@@ -1002,7 +759,7 @@ public function postProcess() {
     }
 
     //hack to allow group to register w/ waiting
-    $primaryParticipantCount = self::getParticipantCount($this, $params);
+    $primaryParticipantCount = $this->getParticipantCount($params);
 
     $totalParticipants = $primaryParticipantCount;
     if (!empty($params['additional_participants'])) {
@@ -1050,13 +807,11 @@ public function postProcess() {
         $params['amount'] = $this->_values['discount'][$discountId][$params['amount']]['value'];
       }
       elseif (empty($params['priceSetId'])) {
-        CRM_Core_Error::deprecatedWarning('unreachable code price set is always set here - passed as a hidden field although we could just load...');
+        // We would wind up here if waitlisting - in which case there should be no amount set.
         if (!empty($params['amount'])) {
+          CRM_Core_Error::deprecatedWarning('unreachable code price set is always set here - passed as a hidden field although we could just load...');
           $params['amount'] = $this->_values['fee'][$params['amount']]['value'];
         }
-        else {
-          $params['amount'] = '';
-        }
       }
       else {
         $lineItem = [];
@@ -1076,7 +831,7 @@ public function postProcess() {
         $this->set('lineItemParticipantsCount', [$primaryParticipantCount]);
       }
 
-      $this->set('amount', $params['amount']);
+      $this->set('amount', $params['amount'] ?? 0);
       $this->set('amount_level', $params['amount_level']);
 
       // generate and set an invoiceID for this transaction
@@ -1253,4 +1008,28 @@ public static function checkRegistration($fields, $form, $isAdditional = FALSE)
     }
   }
 
+  /**
+   * Is it appropriate to suppress the payment elements on the form.
+   *
+   * We hide the price and payment fields if the event is full or requires approval,
+   * and the current user has not yet been approved CRM-12279
+   *
+   * @return bool
+   * @throws \CRM_Core_Exception
+   */
+  private function isSuppressPayment(): bool {
+    if (!$this->getPriceSetID()) {
+      return TRUE;
+    }
+    if ($this->_allowConfirmation) {
+      // They might be paying for a now-confirmed registration.
+      return FALSE;
+    }
+    if ($this->getSubmittedValue('bypass_payment')) {
+      // Value set by javascript on the form.
+      return TRUE;
+    }
+    return $this->isEventFull() || $this->_requireApproval;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Event/Form/Registration/ThankYou.php b/www/modules/civicrm/CRM/Event/Form/Registration/ThankYou.php
index eef8c1640..aed03f845 100644
--- a/www/modules/civicrm/CRM/Event/Form/Registration/ThankYou.php
+++ b/www/modules/civicrm/CRM/Event/Form/Registration/ThankYou.php
@@ -15,10 +15,10 @@
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
+use Civi\Api4\PCPBlock;
 
 /**
  * This class generates form components for processing Event
- *
  */
 class CRM_Event_Form_Registration_ThankYou extends CRM_Event_Form_Registration {
 
@@ -26,19 +26,16 @@ class CRM_Event_Form_Registration_ThankYou extends CRM_Event_Form_Registration {
    * Set variables up before form is built.
    *
    * @return void
+   * @throws \CRM_Core_Exception
    */
-  public function preProcess() {
+  public function preProcess(): void {
     parent::preProcess();
     $this->_params = $this->get('params');
     $this->_lineItem = $this->get('lineItem');
-    $this->_part = $this->get('part');
-    $this->_totalAmount = $this->get('totalAmount');
-    $this->_receiveDate = $this->get('receiveDate');
-    $this->_trxnId = $this->get('trxnId');
     $finalAmount = $this->get('finalAmount');
     $this->assign('finalAmount', $finalAmount);
     $participantInfo = $this->get('participantInfo');
-    $this->assign('part', $this->_part);
+    $this->assign('part', $this->get('part'));
     $this->assign('participantInfo', $participantInfo);
     $customGroup = $this->get('customProfile');
     $this->assign('customProfile', $customGroup);
@@ -55,19 +52,19 @@ public function preProcess() {
    *
    * @return int
    */
-  public function getAction() {
+  public function getAction(): int {
     if ($this->_action & CRM_Core_Action::PREVIEW) {
       return CRM_Core_Action::VIEW | CRM_Core_Action::PREVIEW;
     }
-    else {
-      return CRM_Core_Action::VIEW;
-    }
+
+    return CRM_Core_Action::VIEW;
   }
 
   /**
    * Build the form object.
    *
    * @return void
+   * @throws \CRM_Core_Exception
    */
   public function buildQuickForm() {
     // Assign the email address from a contact id lookup as in CRM_Event_BAO_Event->sendMail()
@@ -91,7 +88,7 @@ public function buildQuickForm() {
     $lineItemForTemplate = [];
     if (!empty($this->_lineItem) && is_array($this->_lineItem)) {
       foreach ($this->_lineItem as $key => $value) {
-        if (!empty($value) && $value != 'skip') {
+        if (!empty($value) && $value !== 'skip') {
           $lineItemForTemplate[$key] = $value;
           if ($invoicing) {
             foreach ($value as $v) {
@@ -114,18 +111,16 @@ public function buildQuickForm() {
     if ($invoicing) {
       $this->assign('totalTaxAmount', $taxAmount);
     }
-    $this->assign('totalAmount', $this->_totalAmount);
+    $this->assign('totalAmount', $this->get('totalAmount'));
 
     $hookDiscount = $this->get('hookDiscount');
     if ($hookDiscount) {
       $this->assign('hookDiscount', $hookDiscount);
     }
 
-    $this->assign('receive_date', $this->_receiveDate);
-    $this->assign('trxn_id', $this->_trxnId);
-
-    //cosider total amount.
-    $this->assign('isAmountzero', $this->_totalAmount <= 0);
+    $this->assign('receive_date', $this->get('receiveDate'));
+    $this->assign('trxn_id', $this->get('trxnId'));
+    $this->assign('isAmountzero', $this->get('totalAmount') <= 0);
 
     $this->assign('defaultRole', FALSE);
     if (($this->_params[0]['defaultRole'] ?? NULL) == 1) {
@@ -142,7 +137,7 @@ public function buildQuickForm() {
     foreach ($fields as $name => $dontCare) {
       if (isset($this->_params[0][$name])) {
         $defaults[$name] = $this->_params[0][$name];
-        if (substr($name, 0, 7) == 'custom_') {
+        if (str_starts_with($name, 'custom_')) {
           $timeField = "{$name}_time";
           if (isset($this->_params[0][$timeField])) {
             $defaults[$timeField] = $this->_params[0][$timeField];
@@ -195,18 +190,8 @@ public function buildQuickForm() {
     }
     $this->assign('isOnWaitlist', $isOnWaitlist);
     $this->assign('isRequireApproval', $isRequireApproval);
-
-    // find pcp info
-    $dao = new CRM_PCP_DAO_PCPBlock();
-    $dao->entity_table = 'civicrm_event';
-    $dao->entity_id = $this->_eventId;
-    $dao->is_active = 1;
-    $dao->find(TRUE);
-
-    if ($dao->id) {
-      $this->assign('pcpLink', CRM_Utils_System::url('civicrm/contribute/campaign', 'action=add&reset=1&pageId=' . $this->_eventId . '&component=event'));
-      $this->assign('pcpLinkText', $dao->link_text);
-    }
+    $this->assign('pcpLink', $this->getPCPBlockID() ? CRM_Utils_System::url('civicrm/contribute/campaign', 'action=add&reset=1&pageId=' . $this->getEventID() . '&component=event') : NULL);
+    $this->assign('pcpLinkText', $this->getPCPBlockID() ? $this->getPCPBlockValue('link_text') : NULL);
 
     // Assign Participant Count to Lineitem Table
     $this->assign('pricesetFieldsCount', CRM_Price_BAO_PriceSet::getPricesetCount($this->_priceSetId));
@@ -221,7 +206,7 @@ public function buildQuickForm() {
    *
    * @return void
    */
-  public function postProcess() {
+  public function postProcess(): void {
   }
 
   /**
@@ -229,8 +214,43 @@ public function postProcess() {
    *
    * @return string
    */
-  public function getTitle() {
+  public function getTitle(): string {
     return ts('Thank You Page');
   }
 
+  /**
+   * @return int|null
+   * @throws \CRM_Core_Exception
+   */
+  public function getPCPBlockID(): ?int {
+    if (!$this->isDefined('PCPBlock')) {
+      $pcpBlock = PCPBlock::get(FALSE)
+        ->addWhere('entity_table', '=', 'civicrm_event')
+        ->addWhere('entity_id', '=', $this->getEventID())
+        ->addWhere('is_active', '=', TRUE)
+        ->execute()->first();
+      if (!$pcpBlock) {
+        return NULL;
+      }
+      $this->define('PCPBlock', 'PCPBlock', $pcpBlock);
+    }
+    return $this->lookup('PCPBlock', 'id');
+  }
+
+  /**
+   * Get a PCP Block value.
+   *
+   * @param string $value
+   *
+   * @return mixed|null
+   * @throws \CRM_Core_Exception
+   * @todo - this should probably be on a trait & made public like similar getValue functions.
+   */
+  protected function getPCPBlockValue(string $value) {
+    if (!$this->getPCPBlockID()) {
+      return NULL;
+    }
+    return $this->lookup('PCPBlock', $value);
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Event/Form/Task/AddToGroup.php b/www/modules/civicrm/CRM/Event/Form/Task/AddToGroup.php
index f64f44202..114b53ff4 100644
--- a/www/modules/civicrm/CRM/Event/Form/Task/AddToGroup.php
+++ b/www/modules/civicrm/CRM/Event/Form/Task/AddToGroup.php
@@ -115,7 +115,7 @@ public function buildQuickForm() {
 
       // also set the group title
       $groupValues = ['id' => $this->_id, 'title' => $this->_title];
-      $this->assign_by_ref('group', $groupValues);
+      $this->assign('group', $groupValues);
     }
 
     // Set dynamic page title for 'Add Members Group (confirm)'
diff --git a/www/modules/civicrm/CRM/Event/Import/Controller.php b/www/modules/civicrm/CRM/Event/Import/Controller.php
deleted file mode 100644
index 8d80c0758..000000000
--- a/www/modules/civicrm/CRM/Event/Import/Controller.php
+++ /dev/null
@@ -1,41 +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
- */
-class CRM_Event_Import_Controller extends CRM_Core_Controller {
-
-  /**
-   * Class constructor.
-   *
-   * @param string $title
-   * @param bool|int $action
-   * @param bool $modal
-   */
-  public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $modal = TRUE) {
-    parent::__construct($title, $modal);
-
-    set_time_limit(0);
-
-    $this->_stateMachine = new CRM_Import_StateMachine($this, $action);
-
-    // create and instantiate the pages
-    $this->addPages($this->_stateMachine, $action);
-
-    // add all the actions
-    $config = CRM_Core_Config::singleton();
-    $this->addActions($config->uploadDir, ['uploadFile']);
-  }
-
-}
diff --git a/www/modules/civicrm/CRM/Event/Import/Form/MapField.php b/www/modules/civicrm/CRM/Event/Import/Form/MapField.php
index ecdb46445..df06bae5e 100644
--- a/www/modules/civicrm/CRM/Event/Import/Form/MapField.php
+++ b/www/modules/civicrm/CRM/Event/Import/Form/MapField.php
@@ -50,11 +50,6 @@ public function preProcess() {
         unset($this->_mapperFields[$value]);
       }
     }
-    elseif (
-      $this->getSubmittedValue('onDuplicate') == CRM_Import_Parser::DUPLICATE_SKIP
-      || $this->getSubmittedValue('onDuplicate') == CRM_Import_Parser::DUPLICATE_NOCHECK) {
-      unset($this->_mapperFields['participant_id']);
-    }
   }
 
   /**
@@ -82,9 +77,7 @@ public function buildQuickForm() {
    *   list of errors to be posted back to the form
    */
   public static function formRule($fields, $files, $self) {
-    $errors = [];
-    // define so we avoid notices below
-    $errors['_qf_default'] = '';
+    $requiredError = [];
 
     if (!array_key_exists('savedMapping', $fields)) {
       $importKeys = [];
@@ -98,24 +91,26 @@ public static function formRule($fields, $files, $self) {
       ];
 
       $contactFieldsBelowWeightMessage = self::validateRequiredContactMatchFields($self->getContactType(), $importKeys);
-
+      if (in_array('id', $importKeys)) {
+        // ID is the only field we need, if present.
+        $requiredFields = [];
+      }
       foreach ($requiredFields as $field => $title) {
         if (!in_array($field, $importKeys)) {
           if ($field === 'contact_id') {
-            if (!$contactFieldsBelowWeightMessage || in_array('external_identifier', $importKeys) ||
-              in_array('participant_id', $importKeys)
+            if (!$contactFieldsBelowWeightMessage || in_array('external_identifier', $importKeys)
             ) {
               continue;
             }
             if ($self->isUpdateExisting()) {
-              $errors['_qf_default'] .= ts('Missing required field: Provide Participant ID') . '<br />';
+              $requiredError[] = ts('Missing required field: Provide Participant ID') . '<br />';
             }
             else {
-              $errors['_qf_default'] .= ts('Missing required contact matching fields.') . " $contactFieldsBelowWeightMessage " . ' ' . ts('Or Provide Contact ID or External ID.') . '<br />';
+              $requiredError[] = ts('Missing required contact matching fields.') . " $contactFieldsBelowWeightMessage " . ' ' . ts('Or Provide Contact ID or External ID.') . '<br />';
             }
           }
           elseif (!in_array('event_title', $importKeys)) {
-            $errors['_qf_default'] .= ts('Missing required field: Provide %1 or %2',
+            $requiredError[] = ts('Missing required field: Provide %1 or %2',
                 [1 => $title, 2 => 'Event Title']
               ) . '<br />';
           }
@@ -123,11 +118,7 @@ public static function formRule($fields, $files, $self) {
       }
     }
 
-    if (empty($errors['_qf_default'])) {
-      unset($errors['_qf_default']);
-    }
-
-    return empty($errors) ? TRUE : $errors;
+    return empty($requiredError) ? TRUE : ['_qf_default' => implode('<br', $requiredError)];
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Event/Import/Parser/Participant.php b/www/modules/civicrm/CRM/Event/Import/Parser/Participant.php
index d780e858b..1bfa11557 100644
--- a/www/modules/civicrm/CRM/Event/Import/Parser/Participant.php
+++ b/www/modules/civicrm/CRM/Event/Import/Parser/Participant.php
@@ -19,39 +19,6 @@
  * class to parse membership csv files
  */
 class CRM_Event_Import_Parser_Participant extends CRM_Import_Parser {
-  protected $_mapperKeys;
-
-  protected $_fileName;
-
-  /**
-   * Imported file size.
-   *
-   * @var int
-   */
-  protected $_fileSize;
-
-  /**
-   * Separator being used.
-   *
-   * @var string
-   */
-  protected $_separator;
-
-  /**
-   * Whether the file has a column header or not
-   *
-   * @var bool
-   */
-  protected $_haveColumnHeader;
-
-  /**
-   * Class constructor.
-   *
-   * @param array $mapperKeys
-   */
-  public function __construct(&$mapperKeys = []) {
-    $this->_mapperKeys = &$mapperKeys;
-  }
 
   /**
    * Get information about the provided job.
@@ -92,10 +59,10 @@ public function import(array $values): void {
     $rowNumber = (int) ($values[array_key_last($values)]);
     try {
       $params = $this->getMappedRow($values);
-      if ($params['external_identifier']) {
+      if (!empty($params['external_identifier'])) {
         $params['contact_id'] = $this->lookupExternalIdentifier($params['external_identifier'], $this->getContactType(), $params['contact_id'] ?? NULL);
       }
-      $session = CRM_Core_Session::singleton();
+
       $formatted = $params;
       // don't add to recent items, CRM-4399
       $formatted['skipRecentView'] = TRUE;
@@ -109,41 +76,16 @@ public function import(array $values): void {
         $formatValues[$key] = $field;
       }
 
-      $formatError = $this->formatValues($formatted, $formatValues);
-
-      if ($formatError) {
-        throw new CRM_Core_Exception($formatError['error_message']);
-      }
-
-      if ($this->isUpdateExisting()) {
-        if (!empty($formatValues['participant_id'])) {
-          $dao = new CRM_Event_BAO_Participant();
-          $dao->id = $formatValues['participant_id'];
-
-          if ($dao->find(TRUE)) {
-            $ids = [
-              'participant' => $formatValues['participant_id'],
-              'userId' => $session->get('userID'),
-            ];
-            $participantValues = [];
-            //@todo calling api functions directly is not supported
-            $newParticipant = $this->deprecated_participant_check_params($formatted, $participantValues, FALSE);
-            if ($newParticipant['error_message']) {
-              throw new CRM_Core_Exception($newParticipant['error_message']);
-            }
-            $newParticipant = CRM_Event_BAO_Participant::create($formatted, $ids);
-            if (!empty($formatted['fee_level'])) {
-              $otherParams = [
-                'fee_label' => $formatted['fee_level'],
-                'event_id' => $newParticipant->event_id,
-              ];
-              CRM_Price_BAO_LineItem::syncLineItems($newParticipant->id, 'civicrm_participant', $newParticipant->fee_amount, $otherParams);
-            }
-            $this->setImportStatus($rowNumber, 'IMPORTED', '', $newParticipant->id);
-            return;
-          }
-          throw new CRM_Core_Exception('Matching Participant record not found for Participant ID ' . $formatValues['participant_id'] . '. Row was skipped.');
+      if (!empty($params['id'])) {
+        $this->checkEntityExists('Participant', $params['id']);
+        if (!$this->isUpdateExisting()) {
+          throw new CRM_Core_Exception(ts('% record found and update not selected', [1 => 'Participant']));
         }
+        //@todo calling api functions directly is not supported
+        $this->deprecated_participant_check_params($formatted);
+        $newParticipant = CRM_Event_BAO_Participant::create($formatted);
+        $this->setImportStatus($rowNumber, 'IMPORTED', '', $newParticipant->id);
+        return;
       }
 
       if (empty($params['contact_id'])) {
@@ -223,107 +165,6 @@ public function import(array $values): void {
     $this->setImportStatus($rowNumber, 'IMPORTED', '', $newParticipant['id']);
   }
 
-  /**
-   * Format values
-   *
-   * @todo lots of tidy up needed here - very old function relocated.
-   *
-   * @param array $values
-   * @param array $params
-   *
-   * @return array|null
-   */
-  protected function formatValues(&$values, $params) {
-    $fields = CRM_Event_DAO_Participant::fields();
-    _civicrm_api3_store_values($fields, $params, $values);
-
-    $customFields = CRM_Core_BAO_CustomField::getFields('Participant', FALSE, FALSE, NULL, NULL, FALSE, FALSE, FALSE);
-
-    foreach ($params as $key => $value) {
-      // ignore empty values or empty arrays etc
-      if (CRM_Utils_System::isNull($value)) {
-        continue;
-      }
-
-      switch ($key) {
-        case 'participant_contact_id':
-          if (!CRM_Utils_Rule::integer($value)) {
-            return civicrm_api3_create_error("contact_id not valid: $value");
-          }
-          if (!CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_contact WHERE id = $value")) {
-            return civicrm_api3_create_error("Invalid Contact ID: There is no contact record with contact_id = $value.");
-          }
-          $values['contact_id'] = $values['participant_contact_id'];
-          unset($values['participant_contact_id']);
-          break;
-
-        case 'participant_register_date':
-          if (!CRM_Utils_Rule::dateTime($value)) {
-            return civicrm_api3_create_error("$key not a valid date: $value");
-          }
-          break;
-
-        case 'participant_status_id':
-          if (!CRM_Utils_Rule::integer($value)) {
-            return civicrm_api3_create_error("Event Status ID is not valid: $value");
-          }
-          break;
-
-        case 'participant_status':
-          $status = CRM_Event_PseudoConstant::participantStatus();
-          $values['participant_status_id'] = CRM_Utils_Array::key($value, $status);
-          break;
-
-        case 'participant_role_id':
-        case 'participant_role':
-          $role = CRM_Event_PseudoConstant::participantRole();
-          $participantRoles = explode(",", $value);
-          foreach ($participantRoles as $k => $v) {
-            $v = trim($v);
-            if ($key == 'participant_role') {
-              $participantRoles[$k] = CRM_Utils_Array::key($v, $role);
-            }
-            else {
-              $participantRoles[$k] = $v;
-            }
-          }
-          $values['role_id'] = implode(CRM_Core_DAO::VALUE_SEPARATOR, $participantRoles);
-          unset($values[$key]);
-          break;
-
-        default:
-          break;
-      }
-    }
-
-    if (array_key_exists('participant_note', $params)) {
-      $values['participant_note'] = $params['participant_note'];
-    }
-
-    // CRM_Event_BAO_Participant::create() handles register_date,
-    // status_id and source. So, if $values contains
-    // participant_register_date, participant_status_id or participant_source,
-    // convert it to register_date, status_id or source
-    $changes = [
-      'participant_register_date' => 'register_date',
-      'participant_source' => 'source',
-      'participant_status_id' => 'status_id',
-      'participant_role_id' => 'role_id',
-      'participant_fee_level' => 'fee_level',
-      'participant_fee_amount' => 'fee_amount',
-      'participant_id' => 'id',
-    ];
-
-    foreach ($changes as $orgVal => $changeVal) {
-      if (isset($values[$orgVal])) {
-        $values[$changeVal] = $values[$orgVal];
-        unset($values[$orgVal]);
-      }
-    }
-
-    return NULL;
-  }
-
   /**
    * @param array $params
    *
@@ -356,21 +197,12 @@ protected function deprecated_create_participant_formatted($params) {
    */
   protected function deprecated_participant_check_params($params, $checkDuplicate = FALSE) {
 
-    // check if participant id is valid or not
-    if (!empty($params['id'])) {
-      $participant = new CRM_Event_BAO_Participant();
-      $participant->id = $params['id'];
-      if (!$participant->find(TRUE)) {
-        return civicrm_api3_create_error(ts('Participant  id is not valid'));
-      }
-    }
-
     // check if contact id is valid or not
     if (!empty($params['contact_id'])) {
       $contact = new CRM_Contact_BAO_Contact();
       $contact->id = $params['contact_id'];
       if (!$contact->find(TRUE)) {
-        return civicrm_api3_create_error(ts('Contact id is not valid'));
+        throw new CRM_Core_Exception(ts('Contact id is not valid'));
       }
     }
 
@@ -378,7 +210,7 @@ protected function deprecated_participant_check_params($params, $checkDuplicate
     if (!empty($params['event_id'])) {
       $isTemplate = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event', $params['event_id'], 'is_template');
       if (!empty($isTemplate)) {
-        return civicrm_api3_create_error(ts('Event templates are not meant to be registered.'));
+        throw new CRM_Core_Exception(ts('Event templates are not meant to be registered.'));
       }
     }
 
@@ -400,13 +232,13 @@ protected function deprecated_participant_check_params($params, $checkDuplicate
         );
       }
     }
-    return TRUE;
   }
 
   /**
    * Set up field metadata.
    *
    * @return void
+   * @throws \CRM_Core_Exception
    */
   protected function setFieldMetadata(): void {
     if (empty($this->importableFieldsMetadata)) {
@@ -421,22 +253,13 @@ protected function setFieldMetadata(): void {
             'options' => FALSE,
           ],
         ],
-        CRM_Event_DAO_Participant::import(),
+        $this->getImportFieldsForEntity('Participant'),
         CRM_Core_BAO_CustomField::getFieldsForImport('Participant'),
         $this->getContactMatchingFields()
       );
 
-      $fields['participant_contact_id']['title'] .= ' (match to contact)';
-      $fields['participant_contact_id']['html']['label'] = $fields['participant_contact_id']['title'];
-      foreach ($fields as $index => $field) {
-        if (isset($field['name']) && $field['name'] !== $index) {
-          // undo unique names - participant is the primary
-          // entity and no others have conflicting unique names
-          // if we ever added them the should have unique names - v4api style
-          $fields[$field['name']] = $field;
-          unset($fields[$index]);
-        }
-      }
+      $fields['contact_id']['title'] .= ' (match to contact)';
+      $fields['contact_id']['html']['label'] = $fields['contact_id']['title'];
       $this->importableFieldsMetadata = $fields;
     }
   }
diff --git a/www/modules/civicrm/CRM/Event/Info.php b/www/modules/civicrm/CRM/Event/Info.php
index a468dc516..1298f162b 100644
--- a/www/modules/civicrm/CRM/Event/Info.php
+++ b/www/modules/civicrm/CRM/Event/Info.php
@@ -41,53 +41,41 @@ public function getInfo() {
 
   /**
    * @inheritDoc
-   * @param bool $getAllUnconditionally
-   * @param bool $descriptions
-   *   Whether to return permission descriptions
-   *
-   * @return array
    */
-  public function getPermissions($getAllUnconditionally = FALSE, $descriptions = FALSE) {
+  public function getPermissions(): array {
     $permissions = [
       'access CiviEvent' => [
-        ts('access CiviEvent'),
-        ts('Create events, view all events, and view participant records (for visible contacts)'),
+        'label' => ts('access CiviEvent'),
+        'description' => ts('Create events, view all events, and view participant records (for visible contacts)'),
       ],
       'edit event participants' => [
-        ts('edit event participants'),
-        ts('Record and update backend event registrations'),
+        'label' => ts('edit event participants'),
+        'description' => ts('Record and update backend event registrations'),
       ],
       'edit all events' => [
-        ts('edit all events'),
-        ts('Edit events even without specific ACL granted'),
+        'label' => ts('edit all events'),
+        'description' => ts('Edit events even without specific ACL granted'),
       ],
       'register for events' => [
-        ts('register for events'),
-        ts('Register for events online'),
+        'label' => ts('register for events'),
+        'description' => ts('Register for events online'),
       ],
       'view event info' => [
-        ts('view event info'),
-        ts('View online event information pages'),
+        'label' => ts('view event info'),
+        'description' => ts('View online event information pages'),
       ],
       'view event participants' => [
-        ts('view event participants'),
+        'label' => ts('view event participants'),
       ],
       'delete in CiviEvent' => [
-        ts('delete in CiviEvent'),
-        ts('Delete participants and events that you can edit'),
+        'label' => ts('delete in CiviEvent'),
+        'description' => ts('Delete participants and events that you can edit'),
       ],
       'manage event profiles' => [
-        ts('manage event profiles'),
-        ts('Allow users to create, edit and copy event-related profile forms used for online event registration.'),
+        'label' => ts('manage event profiles'),
+        'description' => ts('Allow users to create, edit and copy event-related profile forms used for online event registration.'),
       ],
     ];
-
-    if (!$descriptions) {
-      foreach ($permissions as $name => $attr) {
-        $permissions[$name] = array_shift($attr);
-      }
-    }
-
     return $permissions;
   }
 
diff --git a/www/modules/civicrm/CRM/Event/Page/EventInfo.php b/www/modules/civicrm/CRM/Event/Page/EventInfo.php
index 8f9d9d2e4..6073eee19 100644
--- a/www/modules/civicrm/CRM/Event/Page/EventInfo.php
+++ b/www/modules/civicrm/CRM/Event/Page/EventInfo.php
@@ -20,6 +20,8 @@
  */
 class CRM_Event_Page_EventInfo extends CRM_Core_Page {
 
+  use CRM_Event_Form_EventFormTrait;
+
   /**
    * Run the page.
    *
@@ -72,22 +74,14 @@ public function run() {
     // Add Event Type to $values in case folks want to display it
     $values['event']['event_type'] = CRM_Utils_Array::value($values['event']['event_type_id'], CRM_Event_PseudoConstant::eventType());
 
-    $this->assign('isShowLocation', CRM_Utils_Array::value('is_show_location', $values['event']));
+    $this->assign('isShowLocation', $values['event']['is_show_location'] ?? NULL);
 
     $eventCurrency = CRM_Utils_Array::value('currency', $values['event'], $config->defaultCurrency);
     $this->assign('eventCurrency', $eventCurrency);
 
     // show event fees.
     if ($this->_id && !empty($values['event']['is_monetary'])) {
-
-      //CRM-10434
-      $discountId = CRM_Core_BAO_Discount::findSet($this->_id, 'civicrm_event');
-      if ($discountId) {
-        $priceSetId = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Discount', $discountId, 'price_set_id');
-      }
-      else {
-        $priceSetId = CRM_Price_BAO_PriceSet::getFor('civicrm_event', $this->_id);
-      }
+      $priceSetId = $this->getPriceSetID();
 
       // get price set options, - CRM-5209
       if ($priceSetId) {
@@ -207,8 +201,8 @@ public function run() {
         'lat' => (float ) ($maxLat - $minLat),
         'lng' => (float ) ($maxLng - $minLng),
       ];
-      $this->assign_by_ref('center', $center);
-      $this->assign_by_ref('span', $span);
+      $this->assign('center', $center);
+      $this->assign('span', $span);
       if ($action == CRM_Core_Action::PREVIEW) {
         $mapURL = CRM_Utils_System::url('civicrm/contact/map/event',
           "eid={$this->_id}&reset=1&action=preview",
@@ -246,35 +240,32 @@ public function run() {
     }
 
     $hasWaitingList = $values['event']['has_waitlist'] ?? NULL;
-    $eventFullMessage = CRM_Event_BAO_Participant::eventFull($this->_id,
-      FALSE,
-      $hasWaitingList
-    );
+    $isEventOpenForRegistration = CRM_Event_BAO_Event::validRegistrationRequest($values['event'], $this->_id);
 
     $allowRegistration = FALSE;
-    $isEventOpenForRegistration = CRM_Event_BAO_Event::validRegistrationRequest($values['event'], $this->_id);
-    if (!empty($values['event']['is_online_registration'])) {
-      if ($isEventOpenForRegistration == 1) {
-        // we always generate urls for the front end in joomla
-        $action_query = $action === CRM_Core_Action::PREVIEW ? "&action=$action" : '';
-        $url = CRM_Utils_System::url('civicrm/event/register',
-          "id={$this->_id}&reset=1{$action_query}",
-          FALSE, NULL, TRUE,
-          TRUE
-        );
-        if (!$eventFullMessage || $hasWaitingList) {
-          $registerText = ts('Register Now');
-          if (!empty($values['event']['registration_link_text'])) {
-            $registerText = $values['event']['registration_link_text'];
-          }
+    // check that the user has permission to register for this event
+    // Looks like the form shows either way - just not the register option.
+    $hasPermission = CRM_Core_Permission::event(CRM_Core_Permission::EDIT,
+      $this->getEventID(), 'register for events'
+    );
+    if ($hasPermission && $this->isAvailableForOnlineRegistration()) {
+      // we always generate urls for the front end in joomla
+      $action_query = $action === CRM_Core_Action::PREVIEW ? "&action=$action" : '';
+      $url = CRM_Utils_System::url('civicrm/event/register',
+        "id={$this->_id}&reset=1{$action_query}",
+        FALSE, NULL, TRUE,
+        TRUE
+      );
+      $registerText = ts('Register Now');
+      if (!empty($values['event']['registration_link_text'])) {
+        $registerText = $values['event']['registration_link_text'];
+      }
 
-          //Fixed for CRM-4855
-          $allowRegistration = CRM_Event_BAO_Event::showHideRegistrationLink($values);
+      //Fixed for CRM-4855
+      $allowRegistration = CRM_Event_BAO_Event::showHideRegistrationLink($values);
 
-          $this->assign('registerText', $registerText);
-          $this->assign('registerURL', $url);
-        }
-      }
+      $this->assign('registerText', $registerText);
+      $this->assign('registerURL', $url);
     }
 
     $this->assign('registerClosed', !empty($values['event']['is_online_registration']) && !$isEventOpenForRegistration && CRM_Core_Permission::check('register for events'));
@@ -287,8 +278,8 @@ public function run() {
       'role_id' => $values['event']['default_role_id'] ?? NULL,
     ];
 
-    if ($eventFullMessage && ($noFullMsg == 'false') || CRM_Event_BAO_Event::checkRegistration($params)) {
-      $statusMessage = $eventFullMessage;
+    if (($this->isEventFull() && $noFullMsg === 'false') || CRM_Event_BAO_Event::checkRegistration($params)) {
+      $statusMessage = $this->getEventValue('event_full_text');
       if (CRM_Event_BAO_Event::checkRegistration($params)) {
         if ($noFullMsg == 'false') {
           if ($values['event']['allow_same_participant_emails']) {
@@ -361,4 +352,29 @@ public function getTemplateFileName() {
     return parent::getTemplateFileName();
   }
 
+  /**
+   * Get the price set ID for the event.
+   *
+   * @return int|null
+   *
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
+   *
+   * @noinspection PhpUnhandledExceptionInspection
+   * @noinspection PhpDocMissingThrowsInspection
+   */
+  public function getPriceSetID(): ?int {
+    if ($this->getEventValue('is_monetary')) {
+      //CRM-10434
+      $discountID = CRM_Core_BAO_Discount::findSet($this->getEventID(), 'civicrm_event');
+      if ($discountID) {
+        return (int) CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Discount', $discountID, 'price_set_id');
+      }
+
+      return (int) CRM_Price_BAO_PriceSet::getFor('civicrm_event', $this->getEventID());
+    }
+    return NULL;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Event/Page/ManageEvent.php b/www/modules/civicrm/CRM/Event/Page/ManageEvent.php
index aaf51395c..c3d7efdad 100644
--- a/www/modules/civicrm/CRM/Event/Page/ManageEvent.php
+++ b/www/modules/civicrm/CRM/Event/Page/ManageEvent.php
@@ -588,7 +588,7 @@ public function pager($whereClause, $whereParams) {
     $params['total'] = CRM_Core_DAO::singleValueQuery($query, $whereParams);
 
     $this->_pager = new CRM_Utils_Pager($params);
-    $this->assign_by_ref('pager', $this->_pager);
+    $this->assign('pager', $this->_pager);
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php b/www/modules/civicrm/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php
index 2d53edfb3..e3adcda30 100644
--- a/www/modules/civicrm/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php
+++ b/www/modules/civicrm/CRM/Event/Page/ParticipantListing/NameStatusAndDate.php
@@ -94,7 +94,7 @@ public function run() {
       ];
       $rows[] = $row;
     }
-    $this->assign_by_ref('rows', $rows);
+    $this->assign('rows', $rows);
 
     return parent::run();
   }
@@ -124,7 +124,7 @@ public function pager($fromClause, $whereClause, $whereParams) {
 
     $params['total'] = CRM_Core_DAO::singleValueQuery($query, $whereParams);
     $this->_pager = new CRM_Utils_Pager($params);
-    $this->assign_by_ref('pager', $this->_pager);
+    $this->assign('pager', $this->_pager);
   }
 
   /**
@@ -157,8 +157,8 @@ public function orderBy() {
       );
     }
     $sort = new CRM_Utils_Sort($headers, $sortID);
-    $this->assign_by_ref('headers', $headers);
-    $this->assign_by_ref('sort', $sort);
+    $this->assign('headers', $headers);
+    $this->assign('sort', $sort);
     $this->set(CRM_Utils_Sort::SORT_ID,
       $sort->getCurrentSortID()
     );
diff --git a/www/modules/civicrm/CRM/Event/Page/ParticipantListing/Simple.php b/www/modules/civicrm/CRM/Event/Page/ParticipantListing/Simple.php
index 10d1f69e5..0b3f6812d 100644
--- a/www/modules/civicrm/CRM/Event/Page/ParticipantListing/Simple.php
+++ b/www/modules/civicrm/CRM/Event/Page/ParticipantListing/Simple.php
@@ -87,7 +87,7 @@ public function run() {
       ];
       $rows[] = $row;
     }
-    $this->assign_by_ref('rows', $rows);
+    $this->assign('rows', $rows);
 
     return parent::run();
   }
@@ -118,7 +118,7 @@ public function pager($fromClause, $whereClause, $whereParams) {
 
     $params['total'] = CRM_Core_DAO::singleValueQuery($query, $whereParams);
     $this->_pager = new CRM_Utils_Pager($params);
-    $this->assign_by_ref('pager', $this->_pager);
+    $this->assign('pager', $this->_pager);
   }
 
   /**
@@ -148,8 +148,8 @@ public function orderBy() {
       );
     }
     $sort = new CRM_Utils_Sort($headers, $sortID);
-    $this->assign_by_ref('headers', $headers);
-    $this->assign_by_ref('sort', $sort);
+    $this->assign('headers', $headers);
+    $this->assign('sort', $sort);
     $this->set(CRM_Utils_Sort::SORT_ID,
       $sort->getCurrentSortID()
     );
diff --git a/www/modules/civicrm/CRM/Event/Page/Tab.php b/www/modules/civicrm/CRM/Event/Page/Tab.php
index 295953a30..ba4734e4a 100644
--- a/www/modules/civicrm/CRM/Event/Page/Tab.php
+++ b/www/modules/civicrm/CRM/Event/Page/Tab.php
@@ -39,13 +39,6 @@ public function browse() {
       $displayName = CRM_Contact_BAO_Contact::displayName($this->_contactId);
       $this->assign('displayName', $displayName);
       $this->ajaxResponse['tabCount'] = CRM_Contact_BAO_Contact::getCountComponent('participant', $this->_contactId);
-      // Refresh other tabs with related data
-      $this->ajaxResponse['updateTabs'] = [
-        '#tab_activity' => CRM_Contact_BAO_Contact::getCountComponent('activity', $this->_contactId),
-      ];
-      if (CRM_Core_Permission::access('CiviContribute')) {
-        $this->ajaxResponse['updateTabs']['#tab_contribute'] = CRM_Contact_BAO_Contact::getCountComponent('contribution', $this->_contactId);
-      }
     }
   }
 
diff --git a/www/modules/civicrm/CRM/Event/Selector/Search.php b/www/modules/civicrm/CRM/Event/Selector/Search.php
index 0b7c92736..ae83870d6 100644
--- a/www/modules/civicrm/CRM/Event/Selector/Search.php
+++ b/www/modules/civicrm/CRM/Event/Selector/Search.php
@@ -329,7 +329,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
 
       // Skip registration if event_id is NULL
       if (empty($row['event_id'])) {
-        Civi::log()->warning('Participant record without event ID. You have invalid data in your database!');
+        Civi::log()->warning('Participant record (' . $row['participant_id'] . ') without event ID. You have invalid data in your database!');
         continue;
       }
 
@@ -402,7 +402,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
         $result->participant_id
       );
 
-      $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? $result->contact_sub_type : $result->contact_type, FALSE, $result->contact_id
+      $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ?: $result->contact_type, FALSE, $result->contact_id
       );
 
       $row['paid'] = CRM_Event_BAO_Event::isMonetary($row['event_id']);
@@ -425,7 +425,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
       }
       $rows[] = $row;
     }
-    CRM_Core_Selector_Controller::$_template->assign_by_ref('lineItems', $lineItems);
+    CRM_Core_Smarty::singleton()->assign('lineItems', $lineItems ?? []);
 
     return $rows;
   }
diff --git a/www/modules/civicrm/CRM/Event/WorkflowMessage/ParticipantConfirm.php b/www/modules/civicrm/CRM/Event/WorkflowMessage/ParticipantConfirm.php
new file mode 100644
index 000000000..3b5f28c72
--- /dev/null
+++ b/www/modules/civicrm/CRM/Event/WorkflowMessage/ParticipantConfirm.php
@@ -0,0 +1,26 @@
+<?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       |
+ +--------------------------------------------------------------------+
+ */
+
+use Civi\WorkflowMessage\GenericWorkflowMessage;
+
+/**
+ * Notification that a registration has been cancelled.
+ *
+ * @support template-only
+ *
+ * @see CRM_Event_BAO_Participant::sendTransitionParticipantMail
+ */
+class CRM_Event_WorkflowMessage_ParticipantConfirm extends GenericWorkflowMessage {
+  use CRM_Event_WorkflowMessage_ParticipantTrait;
+
+  public const WORKFLOW = 'participant_confirm';
+
+}
diff --git a/www/modules/civicrm/CRM/Event/WorkflowMessage/ParticipantExpired.php b/www/modules/civicrm/CRM/Event/WorkflowMessage/ParticipantExpired.php
new file mode 100644
index 000000000..3e4f92133
--- /dev/null
+++ b/www/modules/civicrm/CRM/Event/WorkflowMessage/ParticipantExpired.php
@@ -0,0 +1,26 @@
+<?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       |
+ +--------------------------------------------------------------------+
+ */
+
+use Civi\WorkflowMessage\GenericWorkflowMessage;
+
+/**
+ * Notification that a registration has been cancelled.
+ *
+ * @support template-only
+ *
+ * @see CRM_Event_BAO_Participant::sendTransitionParticipantMail
+ */
+class CRM_Event_WorkflowMessage_ParticipantExpired extends GenericWorkflowMessage {
+  use CRM_Event_WorkflowMessage_ParticipantTrait;
+
+  public const WORKFLOW = 'participant_expired';
+
+}
diff --git a/www/modules/civicrm/CRM/Event/xml/Menu/Event.xml b/www/modules/civicrm/CRM/Event/xml/Menu/Event.xml
index 032212ffd..cafa3b3bb 100644
--- a/www/modules/civicrm/CRM/Event/xml/Menu/Event.xml
+++ b/www/modules/civicrm/CRM/Event/xml/Menu/Event.xml
@@ -224,12 +224,12 @@
      <weight>830</weight>
   </item>
   <item>
-     <path>civicrm/event/import</path>
-     <title>Import Participants</title>
-     <page_callback>CRM_Event_Import_Controller</page_callback>
-     <access_arguments>access CiviEvent,edit event participants</access_arguments>
-     <page_type>1</page_type>
-     <weight>840</weight>
+    <path>civicrm/import/participant</path>
+    <title>Import Participants</title>
+    <page_callback>CRM_Import_Controller</page_callback>
+    <access_arguments>access CiviEvent,edit event participants</access_arguments>
+    <page_type>1</page_type>
+    <weight>840</weight>
   </item>
   <item>
      <path>civicrm/event/price</path>
diff --git a/www/modules/civicrm/CRM/Export/BAO/Export.php b/www/modules/civicrm/CRM/Export/BAO/Export.php
index 3442efe22..4fcd7a733 100644
--- a/www/modules/civicrm/CRM/Export/BAO/Export.php
+++ b/www/modules/civicrm/CRM/Export/BAO/Export.php
@@ -146,7 +146,7 @@ public static function exportComponents(
     $paymentDetails = [];
     if ($processor->isExportPaymentFields()) {
       // get payment related in for event and members
-      $paymentDetails = CRM_Contribute_BAO_Contribution::getContributionDetails($exportMode, $ids);
+      $paymentDetails = $processor->getContributionDetails();
       //get all payment headers.
       // If we haven't selected specific payment fields, load in all the
       // payment headers.
diff --git a/www/modules/civicrm/CRM/Export/BAO/ExportProcessor.php b/www/modules/civicrm/CRM/Export/BAO/ExportProcessor.php
index 2b26fd102..1e935d9ce 100644
--- a/www/modules/civicrm/CRM/Export/BAO/ExportProcessor.php
+++ b/www/modules/civicrm/CRM/Export/BAO/ExportProcessor.php
@@ -394,7 +394,7 @@ public function setAddresseeGreetingTemplate($addresseeGreetingTemplate) {
    *   - addressee_other
    */
   public function __construct($exportMode, $requestedFields, $queryOperator, $isMergeSameHousehold = FALSE, $isPostalableOnly = FALSE, $isMergeSameAddress = FALSE, $formValues = []) {
-    $this->setExportMode($exportMode);
+    $this->setExportMode((int) $exportMode);
     $this->setQueryMode();
     $this->setQueryOperator($queryOperator);
     $this->setRequestedFields($requestedFields);
@@ -697,14 +697,14 @@ public function setQueryMode() {
   /**
    * @return int
    */
-  public function getExportMode() {
+  public function getExportMode(): int {
     return $this->exportMode;
   }
 
   /**
    * @param int $exportMode
    */
-  public function setExportMode($exportMode) {
+  public function setExportMode(int $exportMode) {
     $this->exportMode = $exportMode;
   }
 
@@ -2367,4 +2367,65 @@ protected function getContactPortionOfGreeting(int $contactID, int $greetingID,
     return $copyPostalGreeting;
   }
 
+  /**
+   * Get the contribution details for component export.
+   *
+   * @internal do not call from outside core.
+   *
+   * @return array
+   *   associated array
+   */
+  public function getContributionDetails() {
+    $paymentDetails = [];
+    $componentClause = ' IN ( ' . implode(',', $this->ids) . ' ) ';
+
+    if ($this->getExportMode() === CRM_Export_Form_Select::EVENT_EXPORT) {
+      $componentSelect = " civicrm_participant_payment.participant_id id";
+      $additionalClause = "
+INNER JOIN civicrm_participant_payment ON (civicrm_contribution.id = civicrm_participant_payment.contribution_id
+AND civicrm_participant_payment.participant_id {$componentClause} )
+";
+    }
+    elseif ($this->getExportMode() === CRM_Export_Form_Select::MEMBER_EXPORT) {
+      $componentSelect = " civicrm_membership_payment.membership_id id";
+      $additionalClause = "
+INNER JOIN civicrm_membership_payment ON (civicrm_contribution.id = civicrm_membership_payment.contribution_id
+AND civicrm_membership_payment.membership_id {$componentClause} )
+";
+    }
+    elseif ($this->getExportMode() === CRM_Export_Form_Select::PLEDGE_EXPORT) {
+      $componentSelect = " civicrm_pledge_payment.id id";
+      $additionalClause = "
+INNER JOIN civicrm_pledge_payment ON (civicrm_contribution.id = civicrm_pledge_payment.contribution_id
+AND civicrm_pledge_payment.pledge_id {$componentClause} )
+";
+    }
+
+    $query = " SELECT total_amount, contribution_status.name as status_id, contribution_status.label as status, payment_instrument.name as payment_instrument, receive_date,
+                          trxn_id, {$componentSelect}
+FROM civicrm_contribution
+LEFT JOIN civicrm_option_group option_group_payment_instrument ON ( option_group_payment_instrument.name = 'payment_instrument')
+LEFT JOIN civicrm_option_value payment_instrument ON (civicrm_contribution.payment_instrument_id = payment_instrument.value
+     AND option_group_payment_instrument.id = payment_instrument.option_group_id )
+LEFT JOIN civicrm_option_group option_group_contribution_status ON (option_group_contribution_status.name = 'contribution_status')
+LEFT JOIN civicrm_option_value contribution_status ON (civicrm_contribution.contribution_status_id = contribution_status.value
+                               AND option_group_contribution_status.id = contribution_status.option_group_id )
+{$additionalClause}
+";
+
+    $dao = CRM_Core_DAO::executeQuery($query);
+
+    while ($dao->fetch()) {
+      $paymentDetails[$dao->id] = [
+        'total_amount' => $dao->total_amount,
+        'contribution_status' => $dao->status,
+        'receive_date' => $dao->receive_date,
+        'pay_instru' => $dao->payment_instrument,
+        'trxn_id' => $dao->trxn_id,
+      ];
+    }
+
+    return $paymentDetails;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Export/Controller/Standalone.php b/www/modules/civicrm/CRM/Export/Controller/Standalone.php
index 4e38d4a9d..8a0504a2b 100644
--- a/www/modules/civicrm/CRM/Export/Controller/Standalone.php
+++ b/www/modules/civicrm/CRM/Export/Controller/Standalone.php
@@ -49,7 +49,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);
+    $dao = CRM_Core_DAO_AllCoreTables::getDAONameForEntity($entity);
     CRM_Utils_System::setTitle(ts('Export %1', [1 => $dao::getEntityTitle(TRUE)]));
   }
 
diff --git a/www/modules/civicrm/CRM/Export/Form/Select.php b/www/modules/civicrm/CRM/Export/Form/Select.php
index 42601a11e..20c830104 100644
--- a/www/modules/civicrm/CRM/Export/Form/Select.php
+++ b/www/modules/civicrm/CRM/Export/Form/Select.php
@@ -74,7 +74,7 @@ public function preProcess() {
     $this->_componentClause = NULL;
 
     // 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
+    // FIXME: Or better still, use CRM_Core_DAO_AllCoreTables::getEntityNameForClass($daoName) to get the $entityShortName
     $entityShortname = $this->getEntityShortName();
 
     if (!in_array($entityShortname, ['Contact', 'Contribute', 'Member', 'Event', 'Pledge', 'Case', 'Grant', 'Activity'], TRUE)) {
diff --git a/www/modules/civicrm/CRM/Extension/Manager.php b/www/modules/civicrm/CRM/Extension/Manager.php
index 921983dd1..178f6e858 100644
--- a/www/modules/civicrm/CRM/Extension/Manager.php
+++ b/www/modules/civicrm/CRM/Extension/Manager.php
@@ -524,6 +524,17 @@ public function getStatus($key) {
     }
   }
 
+  /**
+   * Check if a given extension is installed and enabled
+   *
+   * @param $key
+   *
+   * @return bool
+   */
+  public function isEnabled($key) {
+    return ($this->getStatus($key) === self::STATUS_INSTALLED);
+  }
+
   /**
    * Check if a given extension is incompatible with this version of CiviCRM
    *
diff --git a/www/modules/civicrm/CRM/Extension/Mapper.php b/www/modules/civicrm/CRM/Extension/Mapper.php
index 62fdd94ed..29664d857 100644
--- a/www/modules/civicrm/CRM/Extension/Mapper.php
+++ b/www/modules/civicrm/CRM/Extension/Mapper.php
@@ -553,7 +553,7 @@ public function refresh() {
    * @return string
    */
   public function getUpgradeLink($remoteExtensionInfo, $localExtensionInfo) {
-    if (!empty($remoteExtensionInfo) && version_compare($localExtensionInfo['version'], $remoteExtensionInfo->version, '<')) {
+    if (!empty($remoteExtensionInfo) && version_compare($localExtensionInfo['version'] ?? '', $remoteExtensionInfo->version, '<')) {
       return ts('Version %1 is installed. <a %2>Upgrade to version %3</a>.', [
         1 => $localExtensionInfo['version'],
         2 => 'href="' . CRM_Utils_System::url('civicrm/admin/extensions', "action=update&id={$localExtensionInfo['key']}&key={$localExtensionInfo['key']}") . '"',
diff --git a/www/modules/civicrm/CRM/Financial/BAO/FinancialItem.php b/www/modules/civicrm/CRM/Financial/BAO/FinancialItem.php
index ef7fd5b35..d46e6be7f 100644
--- a/www/modules/civicrm/CRM/Financial/BAO/FinancialItem.php
+++ b/www/modules/civicrm/CRM/Financial/BAO/FinancialItem.php
@@ -9,6 +9,9 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\FinancialAccount;
+use Civi\Api4\FinancialItem;
+
 /**
  *
  * @package CRM
@@ -260,16 +263,19 @@ public static function checkContactPresent($contactIds, &$error) {
    * @return array
    */
   public static function getPreviousFinancialItem($entityId) {
-    $params = [
-      'entity_id' => $entityId,
-      'entity_table' => 'civicrm_line_item',
-      'options' => ['limit' => 1, 'sort' => 'id DESC'],
-    ];
-    $salesTaxFinancialAccounts = civicrm_api3('FinancialAccount', 'get', ['is_tax' => 1]);
-    if ($salesTaxFinancialAccounts['count']) {
-      $params['financial_account_id'] = ['NOT IN' => array_keys($salesTaxFinancialAccounts['values'])];
+    $financialItemAPI = FinancialItem::get(FALSE)
+      ->addWhere('entity_id', '=', $entityId)
+      ->addWhere('entity_table', '=', 'civicrm_line_item')
+      ->addOrderBy('id', 'DESC');
+
+    $salesTaxFinancialAccounts = FinancialAccount::get(FALSE)
+      ->addSelect('id')
+      ->addWhere('is_tax', '=', 1)
+      ->execute();
+    if ($salesTaxFinancialAccounts->count() > 0) {
+      $financialItemAPI->addWhere('financial_account_id', 'NOT IN', $salesTaxFinancialAccounts->column('id'));
     }
-    return civicrm_api3('FinancialItem', 'getsingle', $params);
+    return $financialItemAPI->execute()->first();
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Financial/BAO/FinancialType.php b/www/modules/civicrm/CRM/Financial/BAO/FinancialType.php
index 1e1f35cf4..167c2f76d 100644
--- a/www/modules/civicrm/CRM/Financial/BAO/FinancialType.php
+++ b/www/modules/civicrm/CRM/Financial/BAO/FinancialType.php
@@ -19,18 +19,6 @@
  */
 class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType implements \Civi\Core\HookInterface {
 
-  /**
-   * Static cache holder of available financial types for this session
-   * @var array
-   */
-  public static $_availableFinancialTypes = [];
-
-  /**
-   * Static cache holder of status of ACL-FT enabled/disabled for this session
-   * @var array
-   */
-  public static $_statusACLFt = [];
-
   /**
    * @deprecated
    * @param array $params
diff --git a/www/modules/civicrm/CRM/Financial/BAO/Order.php b/www/modules/civicrm/CRM/Financial/BAO/Order.php
index 49763a905..89c3994b1 100644
--- a/www/modules/civicrm/CRM/Financial/BAO/Order.php
+++ b/www/modules/civicrm/CRM/Financial/BAO/Order.php
@@ -675,12 +675,15 @@ protected function setPriceFieldMetadata(array $metadata): void {
       $metadata[$index]['supports_auto_renew'] = FALSE;
       if ($this->isExcludeExpiredFields && !$priceField['is_active']) {
         unset($metadata[$index]);
+        continue;
       }
       if ($this->isExcludeExpiredFields && !empty($priceField['active_on']) && time() < strtotime($priceField['active_on'])) {
         unset($metadata[$index]);
+        continue;
       }
       elseif ($this->isExcludeExpiredFields && !empty($priceField['expire_on']) && strtotime($priceField['expire_on']) < time()) {
         unset($metadata[$index]);
+        continue;
       }
       elseif (!empty($priceField['options'])) {
         foreach ($priceField['options'] as $optionID => $option) {
@@ -821,6 +824,27 @@ public function getLineItems():array {
     return $this->lineItems;
   }
 
+  /**
+   * Is participant count being used.
+   *
+   * This would be true if at least one price field value
+   * has a count value that is not 0 or NULL. In this case
+   * the row value will be used for the participant.
+   *
+   * @return bool
+   * @throws \CRM_Core_Exception
+   */
+  public function isUseParticipantCount(): bool {
+    foreach ($this->getPriceFieldsMetadata() as $fieldMetadata) {
+      foreach ($fieldMetadata['options'] as $option) {
+        if (($option['count'] ?? 0) > 0) {
+          return TRUE;
+        }
+      }
+    }
+    return FALSE;
+  }
+
   /**
    * Recalculate the line items.
    *
@@ -977,11 +1001,12 @@ protected function calculateLineItems(): array {
       elseif ($this->getPriceFieldMetadata($lineItem['price_field_id'])['name'] === 'other_amount') {
         // Other amount is a front end user entered form. It is reasonable to think it would be tax inclusive.
         $lineItem['line_total_inclusive'] = $lineItem['line_total'];
-        $lineItem['line_total'] = $lineItem['line_total_inclusive'] / (1 + ($lineItem['tax_rate'] / 100));
+        $lineItem['line_total'] = $lineItem['line_total_inclusive'] ? $lineItem['line_total_inclusive'] / (1 + ($lineItem['tax_rate'] / 100)) : 0;
         $lineItem['tax_amount'] = round($lineItem['line_total_inclusive'] - $lineItem['line_total'], 2);
         // Make sure they still add up to each other afer the rounding.
         $lineItem['line_total'] = $lineItem['line_total_inclusive'] - $lineItem['tax_amount'];
-        $lineItem['unit_price'] = $lineItem['line_total'] / $lineItem['qty'];
+        $lineItem['qty'] = 1;
+        $lineItem['unit_price'] = $lineItem['line_total'];
 
       }
       elseif ($taxRate) {
diff --git a/www/modules/civicrm/CRM/Financial/BAO/Payment.php b/www/modules/civicrm/CRM/Financial/BAO/Payment.php
index d5ab9090e..eb075cc23 100644
--- a/www/modules/civicrm/CRM/Financial/BAO/Payment.php
+++ b/www/modules/civicrm/CRM/Financial/BAO/Payment.php
@@ -15,8 +15,10 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
+use Civi\Api4\Contribution;
 use Civi\Api4\FinancialItem;
 use Civi\Api4\LineItem;
+use Civi\Api4\EntityFinancialTrxn;
 
 /**
  * This class contains payment related functions.
@@ -40,10 +42,13 @@ class CRM_Financial_BAO_Payment {
    * @throws \CRM_Core_Exception
    */
   public static function create(array $params): CRM_Financial_DAO_FinancialTrxn {
-    $contribution = civicrm_api3('Contribution', 'getsingle', ['id' => $params['contribution_id']]);
-    $contributionStatus = CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $contribution['contribution_status_id']);
+    $contribution = Contribution::get(FALSE)
+      ->addWhere('id', '=', $params['contribution_id'])
+      ->addSelect('*', 'contribution_status_id:name', 'balance_amount', 'paid_amount')
+      ->execute()->first();
+    $contributionStatus = $contribution['contribution_status_id:name'];
     $isPaymentCompletesContribution = self::isPaymentCompletesContribution($params['contribution_id'], $params['total_amount'], $contributionStatus);
-    $lineItems = self::getPayableLineItems($params);
+    $payableItems = self::getPayableItems($params, $contribution);
 
     $whiteList = ['check_number', 'payment_processor_id', 'fee_amount', 'total_amount', 'contribution_id', 'net_amount', 'card_type_id', 'pan_truncation', 'trxn_result_code', 'payment_instrument_id', 'trxn_id', 'trxn_date', 'order_reference'];
     $paymentTrxnParams = array_intersect_key($params, array_fill_keys($whiteList, 1));
@@ -100,91 +105,33 @@ public static function create(array $params): CRM_Financial_DAO_FinancialTrxn {
       self::reverseAllocationsFromPreviousPayment($params, $trxn->id);
     }
     else {
-      // Record new "payment" (financial_trxn, financial_item, entity_financial_trxn etc).
-      $salesTaxFinancialAccount = CRM_Contribute_BAO_Contribution::getSalesTaxFinancialAccounts();
-      // Get all the lineitems and add financial_item information to them for the contribution on which we are recording a payment.
-      $financialItems = LineItem::get(FALSE)
-        ->addSelect('tax_amount', 'price_field_value_id', 'financial_item.id', 'financial_item.status_id:name', 'financial_item.financial_account_id', 'financial_item.entity_id')
-        ->addJoin(
-          'FinancialItem AS financial_item',
-          'INNER',
-          NULL,
-          ['financial_item.entity_table', '=', '"civicrm_line_item"'],
-          ['financial_item.entity_id', '=', 'id']
-        )
-        ->addOrderBy('financial_item.id', 'DESC')
-        ->addWhere('contribution_id', '=', (int) $params['contribution_id'])->execute();
-
-      // Loop through our list of payable lineitems
-      foreach ($lineItems as $lineItem) {
-        if ($lineItem['allocation'] === (float) 0) {
+      // Link the payment with the relevant financial items, by creating EntityFinancialItems.
+      // We also ensure the status of the Item is set to Paid or Partially Paid as appropriate.
+      foreach ($payableItems as $payableItem) {
+        if ($payableItem['allocation'] === 0.0) {
           continue;
         }
-        $financialItemID = NULL;
-        $currentFinancialItemStatus = NULL;
-        foreach ($financialItems as $financialItem) {
-          // $financialItems is a list of all lineitems for the contribution
-          // Loop through all of them and match on the first one which is not of type "Sales Tax".
-          if ($financialItem['financial_item.entity_id'] === (int) $lineItem['id']
-            && !in_array($financialItem['financial_item.financial_account_id'], $salesTaxFinancialAccount, TRUE)
-          ) {
-            $financialItemID = $financialItem['financial_item.id'];
-            $currentFinancialItemStatus = $financialItem['financial_item.status_id:name'];
-            // We can break out of the loop because there will only be one lineitem=financial_item.entity_id.
-            break;
-          }
-        }
-        if (!$financialItemID) {
-          // If we didn't find a lineitem that is NOT of type "Sales Tax" then create a new one.
-          $financialItemID = self::getNewFinancialItemID($lineItem, $params['trxn_date'], $contribution['contact_id'], $paymentTrxnParams['currency']);
-        }
 
-        // Now create an EntityFinancialTrxn record to link the new financial_trxn to the lineitem and mark it as paid.
-        $eftParams = [
+        EntityFinancialTrxn::create(FALSE)->setValues([
           'entity_table' => 'civicrm_financial_item',
           'financial_trxn_id' => $trxn->id,
-          'entity_id' => $financialItemID,
-          'amount' => $lineItem['allocation'],
-        ];
-        civicrm_api3('EntityFinancialTrxn', 'create', $eftParams);
+          'entity_id' => $payableItem['financial_item.id'],
+          'amount' => $payableItem['allocation'],
+        ])->execute();
 
-        if ($currentFinancialItemStatus && ('Paid' !== $currentFinancialItemStatus)) {
-          // Did the lineitem get fully paid?
-          $newStatus = $lineItem['allocation'] < $lineItem['balance'] ? 'Partially paid' : 'Paid';
+        if ('Paid' !== $payableItem['financial_item.status_id:name']) {
+          // Did the item get fully paid?
+          $newStatus = $payableItem['allocation'] < $payableItem['balance'] ? 'Partially paid' : 'Paid';
           FinancialItem::update(FALSE)
             ->addValue('status_id:name', $newStatus)
-            ->addWhere('id', '=', $financialItemID)
+            ->addWhere('id', '=', $payableItem['financial_item.id'])
             ->execute();
         }
-
-        foreach ($financialItems as $financialItem) {
-          // $financialItems is a list of all lineitems for the contribution
-          // Now we loop through all of them and match on the first one which IS of type "Sales Tax".
-          if ($financialItem['financial_item.entity_id'] === (int) $lineItem['id']
-            && in_array($financialItem['financial_item.financial_account_id'], $salesTaxFinancialAccount, TRUE)
-          ) {
-            // If we find a "Sales Tax" lineitem we record a tax entry in entityFiancncialTrxn
-            // @todo - this is expected to be broken - it should be fixed to
-            // a) have the getPayableLineItems add the amount to allocate for tax
-            // b) call EntityFinancialTrxn directly - per above.
-            // - see https://github.com/civicrm/civicrm-core/pull/14763
-            $entityParams = [
-              'contribution_total_amount' => $contribution['total_amount'],
-              'trxn_total_amount' => $params['total_amount'],
-              'trxn_id' => $trxn->id,
-              'line_item_amount' => $financialItem['tax_amount'],
-            ];
-            $eftParams['entity_id'] = $financialItem['financial_item.id'];
-            CRM_Contribute_BAO_Contribution::createProportionalEntry($entityParams, $eftParams);
-          }
-        }
       }
     }
     self::updateRelatedContribution($params, $params['contribution_id']);
     if ($isPaymentCompletesContribution) {
       if ($contributionStatus === 'Pending refund') {
-        // Ideally we could still call completetransaction as non-payment related actions should
-        // be outside this class. However, for now we just update the contribution here.
         // Unit test cover in CRM_Event_BAO_AdditionalPaymentTest::testTransactionInfo.
         civicrm_api3('Contribution', 'create',
           [
@@ -218,9 +165,11 @@ public static function create(array $params): CRM_Financial_DAO_FinancialTrxn {
         civicrm_api3('Participant', 'create', ['id' => $participantPayment['participant_id'], 'status_id' => 'Partially paid']);
       }
     }
+    // Note that we reload the payments rather than use $contribution['paid_amount']
+    // here as we are interested in the paid_amount AFTER this payment has been made.
     elseif ($contributionStatus === 'Completed' && ((float) CRM_Core_BAO_FinancialTrxn::getTotalPayments($contribution['id'], TRUE) === 0.0)) {
       // If the contribution has previously been completed (fully paid) and now has total payments adding up to 0
-      //  change status to refunded.
+      //  change status to 'refunded'.
       self::updateContributionStatus($contribution['id'], 'Refunded');
     }
     CRM_Contribute_BAO_Contribution::recordPaymentActivity($params['contribution_id'], $params['participant_id'] ?? NULL, $params['total_amount'], $trxn->currency, $trxn->trxn_date);
@@ -528,7 +477,10 @@ private static function updateContributionStatus(int $contributionID, string $st
   /**
    * Get the line items for the contribution.
    *
-   * Retrieve the line items and wrangle the following
+   * Retrieve the financial items that need to be linked to the payment.
+   *
+   * EntityFinancialItems will be added to the sum of the Payment total
+   * linking it to these items.
    *
    * - get the outstanding balance on a line item basis.
    * - determine what amount is being paid on this line item - we get the total being paid
@@ -536,80 +488,86 @@ private static function updateContributionStatus(int $contributionID, string $st
    *   and then assign apply that ratio to each line item.
    * - if overrides have been passed in we use those amounts instead.
    *
-   * @param $params
+   * @param array $params
+   * @param array $contribution
    *
    * @return array
    * @throws \CRM_Core_Exception
    */
-  protected static function getPayableLineItems($params): array {
-    $lineItems = CRM_Price_BAO_LineItem::getLineItemsByContributionID($params['contribution_id']);
-    $lineItemOverrides = [];
-    if (!empty($params['line_item'])) {
-      // The format is a bit weird here - $params['line_item'] => [[1 => 10], [2 => 40]]
-      // Squash to [1 => 10, 2 => 40]
-      foreach ($params['line_item'] as $lineItem) {
-        $lineItemOverrides += $lineItem;
-      }
-    }
-    $outstandingBalance = CRM_Contribute_BAO_Contribution::getContributionBalance($params['contribution_id']);
+  protected static function getPayableItems(array $params, array $contribution): array {
+    $outstandingBalance = $contribution['balance_amount'];
     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);
+      $ratio = $params['total_amount'] / $contribution['paid_amount'];
     }
     else {
       // Help we are making a payment but no money is owed. We won't allocate the overpayment to any line item.
       $ratio = 0;
     }
-    foreach ($lineItems as $lineItemID => $lineItem) {
-      // Ideally id would be set deeper but for now just add in here.
-      $lineItems[$lineItemID]['id'] = $lineItemID;
-      $lineItems[$lineItemID]['paid'] = self::getAmountOfLineItemPaid($lineItemID);
-      $lineItems[$lineItemID]['balance'] = $lineItem['subTotal'] - $lineItems[$lineItemID]['paid'];
+    $lineItemOverrides = [];
+    if (!empty($params['line_item'])) {
+      // The format is a bit weird here - $params['line_item'] => [[1 => 10], [2 => 40]]
+      // Squash to [1 => 10, 2 => 40]
+      foreach ($params['line_item'] as $lineItem) {
+        $lineItemOverrides += $lineItem;
+      }
+    }
+
+    $items = LineItem::get(FALSE)
+      ->addSelect('*', 'financial_item.status_id:name', 'financial_item.id', 'financial_item.financial_account_id', 'financial_item_id.currency', 'financial_item.financial_account_id.is_tax', 'financial_item.entity_id', 'financial_item.amount', 'allocated.amount')
+      ->addJoin(
+        'FinancialItem AS financial_item',
+        'LEFT',
+        ['financial_item.entity_table', '=', '"civicrm_line_item"'],
+        ['financial_item.entity_id', '=', 'id']
+      )
+      ->addJoin('EntityFinancialTrxn AS allocated',
+        'LEFT',
+        ['allocated.entity_id', '=', 'financial_item.id'],
+        ['allocated.entity_table', '=', '"civicrm_financial_item"'],
+        ['allocated.financial_trxn_id.is_payment', '=', TRUE]
+      )
+      // Ideally we would group by financial_item.id & get the sum of
+      // amount, but we hit full group by issues.
+      ->addOrderBy('financial_item.id')
+      ->addWhere('contribution_id', '=', (int) $params['contribution_id'])
+      ->execute();
+
+    $payableItems = [];
+
+    foreach ($items as $item) {
+      $lineItemID = $item['id'];
+      if (!$item['financial_item.id']) {
+        // If we didn't find a financial item that is NOT of type "Sales Tax" then create a new one.
+        // This covers a situation that would not normally exist where the site has a data issue.
+        $item = self::createFinancialItem($item, $params['trxn_date'], $contribution['contact_id'], $contribution['currency']);
+      }
+      // Add up the amount paid by line item, separated into tax & non-tax.
+      // Up to 2 items per line item are added to payable items (tax + no tax).
+      // The item added from the last row 'wins' - it will have the totals based on the total
+      // of the amount paid across all of the rows.
+      // @todo perhaps this should be done by financial item, not line item.
+      $payableItemIndex = $item['financial_item.financial_account_id.is_tax'] ? ($item['id'] . '-tax') : $item['id'];
+      $item['paid'] = ($item['allocated.amount'] ?: 0) + ($payableItems[$payableItemIndex]['paid'] ?? 0);
+      $item['item_total'] = $item['financial_item.financial_account_id.is_tax'] ? $item['tax_amount'] : $item['line_total'];
+      $item['balance'] = $item['item_total'] - $item['paid'];
       if (!empty($lineItemOverrides)) {
-        $lineItems[$lineItemID]['allocation'] = $lineItemOverrides[$lineItemID] ?? NULL;
+        $item['allocation'] = $lineItemOverrides[$lineItemID] ?? NULL;
       }
       else {
-        if (empty($lineItems[$lineItemID]['balance']) && !empty($ratio) && $params['total_amount'] < 0) {
-          $lineItems[$lineItemID]['allocation'] = $lineItem['subTotal'] * $ratio;
+        if (empty($item['balance']) && !empty($ratio) && $params['total_amount'] < 0) {
+          $item['allocation'] = $item['item_total'] * $ratio;
         }
         else {
-          $lineItems[$lineItemID]['allocation'] = $lineItems[$lineItemID]['balance'] * $ratio;
+          $item['allocation'] = $item['balance'] * $ratio;
         }
       }
+      $payableItems[$payableItemIndex] = $item;
     }
-    return $lineItems;
-  }
 
-  /**
-   * Get the amount paid so far against this line item.
-   *
-   * @param int $lineItemID
-   *
-   * @return float
-   *
-   * @throws \CRM_Core_Exception
-   */
-  protected static function getAmountOfLineItemPaid($lineItemID) {
-    $paid = 0;
-    $financialItems = civicrm_api3('FinancialItem', 'get', [
-      'entity_id' => $lineItemID,
-      'entity_table' => 'civicrm_line_item',
-      'options' => ['sort' => 'id DESC', 'limit' => 0],
-    ])['values'];
-    if (!empty($financialItems)) {
-      $entityFinancialTrxns = civicrm_api3('EntityFinancialTrxn', 'get', [
-        'entity_table' => 'civicrm_financial_item',
-        'entity_id' => ['IN' => array_keys($financialItems)],
-        'options' => ['limit' => 0],
-        'financial_trxn_id.is_payment' => 1,
-      ])['values'];
-      foreach ($entityFinancialTrxns as $entityFinancialTrxn) {
-        $paid += $entityFinancialTrxn['amount'];
-      }
-    }
-    return (float) $paid;
+    return $payableItems;
   }
 
   /**
@@ -661,27 +619,47 @@ protected static function reverseAllocationsFromPreviousPayment($params, $trxnID
    * @param int $contactID
    * @param string $currency
    *
-   * @return int
+   * @return array
    *
    * @throws \CRM_Core_Exception
    */
-  protected static function getNewFinancialItemID($lineItem, $trxn_date, $contactID, $currency): int {
+  protected static function createFinancialItem(array $lineItem, string $trxn_date, int $contactID, string $currency): array {
     $financialAccount = CRM_Financial_BAO_FinancialAccount::getFinancialAccountForFinancialTypeByRelationship(
       $lineItem['financial_type_id'],
       'Income Account Is'
     );
-    $itemParams = [
-      'transaction_date' => $trxn_date,
-      'contact_id' => $contactID,
-      'currency' => $currency,
-      'amount' => $lineItem['line_total'],
-      'description' => $lineItem['label'],
-      'status_id' => 'Unpaid',
-      'financial_account_id' => $financialAccount,
-      'entity_table' => 'civicrm_line_item',
-      'entity_id' => $lineItem['id'],
-    ];
-    return (int) civicrm_api3('FinancialItem', 'create', $itemParams)['id'];
+
+    FinancialItem::create(FALSE)
+      ->setValues([
+        'transaction_date' => $trxn_date,
+        'contact_id' => $contactID,
+        'currency' => $currency,
+        'amount' => $lineItem['line_total'],
+        'description' => $lineItem['label'],
+        'status_id:name' => 'Unpaid',
+        'financial_account_id' => $financialAccount,
+        'entity_table' => 'civicrm_line_item',
+        'entity_id' => $lineItem['id'],
+      ])
+      ->execute();
+
+    return LineItem::get(FALSE)
+      ->addSelect('*', 'financial_item.status_id:name', 'financial_item.id', 'financial_item.financial_account_id', 'financial_item_id.currency', 'financial_item.financial_account_id.is_tax', 'financial_item.entity_id', 'financial_item.amount', 'allocated.amount')
+      ->addJoin(
+        'FinancialItem AS financial_item',
+        'LEFT',
+        ['financial_item.entity_table', '=', '"civicrm_line_item"'],
+        ['financial_item.entity_id', '=', 'id']
+      )
+      ->addJoin('EntityFinancialTrxn AS allocated',
+        'LEFT',
+        ['allocated.entity_id', '=', 'financial_item.id'],
+        ['allocated.entity_table', '=', '"civicrm_financial_item"'],
+        ['allocated.financial_trxn_id.is_payment', '=', TRUE]
+      )
+      ->addOrderBy('financial_item.id', 'DESC')
+      ->addWhere('id', '=', (int) $lineItem['id'])
+      ->execute()->first();
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Financial/DAO/Currency.php b/www/modules/civicrm/CRM/Financial/DAO/Currency.php
index 0d41a2eb6..f43ee794d 100644
--- a/www/modules/civicrm/CRM/Financial/DAO/Currency.php
+++ b/www/modules/civicrm/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:89ee3480af0f7086aa26de7937953b86)
+ * (GenCodeChecksum:f5d1798a453da2d166f143f5579b58cb)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Financial/DAO/EntityFinancialAccount.php b/www/modules/civicrm/CRM/Financial/DAO/EntityFinancialAccount.php
index 30a7a459f..c8d1400f3 100644
--- a/www/modules/civicrm/CRM/Financial/DAO/EntityFinancialAccount.php
+++ b/www/modules/civicrm/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:dc2ac86086d6245161241084f0bfdd45)
+ * (GenCodeChecksum:e70f42c50c6b264f47371a93183e7010)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Financial/DAO/EntityFinancialTrxn.php b/www/modules/civicrm/CRM/Financial/DAO/EntityFinancialTrxn.php
index 06862ba84..50fee5235 100644
--- a/www/modules/civicrm/CRM/Financial/DAO/EntityFinancialTrxn.php
+++ b/www/modules/civicrm/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:9e34bfe525333d841625c6f0c43cc62e)
+ * (GenCodeChecksum:4f50b4dc4237d1713da5f0e2616dc88c)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Financial/DAO/FinancialAccount.php b/www/modules/civicrm/CRM/Financial/DAO/FinancialAccount.php
index 77259c4b9..5f230c362 100644
--- a/www/modules/civicrm/CRM/Financial/DAO/FinancialAccount.php
+++ b/www/modules/civicrm/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:c1a56dd20c19e96296f4f70a4a690893)
+ * (GenCodeChecksum:b395b6212a005ebce453ce9938d77c7b)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Financial/DAO/FinancialItem.php b/www/modules/civicrm/CRM/Financial/DAO/FinancialItem.php
index 1b37347fc..02930a285 100644
--- a/www/modules/civicrm/CRM/Financial/DAO/FinancialItem.php
+++ b/www/modules/civicrm/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:a8a10fc175856157ba11e9cdc5420e0f)
+ * (GenCodeChecksum:89bf1fec762e66b5b561b4b2683a10c2)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Financial/DAO/FinancialTrxn.php b/www/modules/civicrm/CRM/Financial/DAO/FinancialTrxn.php
index e104eb35c..63fedf78e 100644
--- a/www/modules/civicrm/CRM/Financial/DAO/FinancialTrxn.php
+++ b/www/modules/civicrm/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:56b888e49da4fb4fd30e68316b16f8a7)
+ * (GenCodeChecksum:1c6e2bcd4812e16fcf3634adea81602d)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Financial/DAO/FinancialType.php b/www/modules/civicrm/CRM/Financial/DAO/FinancialType.php
index 5b4eb62bf..962107e25 100644
--- a/www/modules/civicrm/CRM/Financial/DAO/FinancialType.php
+++ b/www/modules/civicrm/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:f34814d42721174a2f55bc744f497b6f)
+ * (GenCodeChecksum:e501792be30fab09a33951030b21232e)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Financial/DAO/PaymentProcessor.php b/www/modules/civicrm/CRM/Financial/DAO/PaymentProcessor.php
index bc3917435..9016b9dae 100644
--- a/www/modules/civicrm/CRM/Financial/DAO/PaymentProcessor.php
+++ b/www/modules/civicrm/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:4f2a2d7198a66ebeb31aa0f8ae8640f7)
+ * (GenCodeChecksum:404aed364d3a1c0a8969748f0771c755)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Financial/DAO/PaymentProcessorType.php b/www/modules/civicrm/CRM/Financial/DAO/PaymentProcessorType.php
index 64bae4436..fb5e4b1e1 100644
--- a/www/modules/civicrm/CRM/Financial/DAO/PaymentProcessorType.php
+++ b/www/modules/civicrm/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:c0f54fc4f1f69c631c0c2e89537c6194)
+ * (GenCodeChecksum:f283d3921734802806597d973fc07345)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Financial/DAO/PaymentToken.php b/www/modules/civicrm/CRM/Financial/DAO/PaymentToken.php
index 46e956849..2a7cd1917 100644
--- a/www/modules/civicrm/CRM/Financial/DAO/PaymentToken.php
+++ b/www/modules/civicrm/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:e2af4137d7b9b510bbc239e5b829e5ba)
+ * (GenCodeChecksum:57629c7015cfc98ac29b5380a25636cb)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Financial/Form/FinancialAccount.php b/www/modules/civicrm/CRM/Financial/Form/FinancialAccount.php
index c0c2b03a1..9af95e9c4 100644
--- a/www/modules/civicrm/CRM/Financial/Form/FinancialAccount.php
+++ b/www/modules/civicrm/CRM/Financial/Form/FinancialAccount.php
@@ -20,6 +20,7 @@
  */
 class CRM_Financial_Form_FinancialAccount extends CRM_Contribute_Form {
   use CRM_Core_Form_EntityFormTrait;
+  use CRM_Custom_Form_CustomDataTrait;
 
   /**
    * Flag if its a AR account type.
@@ -43,10 +44,6 @@ public function getDefaultEntity() {
   public function preProcess() {
     parent::preProcess();
 
-    // Add custom data to form
-    CRM_Custom_Form_CustomData::preProcess($this, NULL, NULL, 1, 'FinancialAccount', $this->_id);
-    CRM_Custom_Form_CustomData::buildQuickForm($this);
-
     if ($this->_id) {
       $params = [
         'id' => $this->_id,
@@ -54,7 +51,7 @@ public function preProcess() {
       $financialAccount = CRM_Financial_BAO_FinancialAccount::retrieve($params);
       $financialAccountTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('financial_account_type', NULL, " AND v.name LIKE 'Asset' "));
       if ($financialAccount->financial_account_type_id == $financialAccountTypeId
-        && strtolower($financialAccount->account_type_code) == 'ar'
+        && strtolower($financialAccount->account_type_code) === 'ar'
         && !CRM_Financial_BAO_FinancialAccount::getARAccounts($this->_id, $financialAccountTypeId)
       ) {
         $this->_isARFlag = TRUE;
@@ -64,6 +61,8 @@ public function preProcess() {
         }
       }
     }
+    // Assigned for the ajax call to get custom data.
+    $this->assign('entityID', $this->_id);
   }
 
   /**
@@ -75,6 +74,9 @@ public function buildQuickForm() {
     if ($this->_action & CRM_Core_Action::DELETE) {
       return;
     }
+    if ($this->isSubmitted()) {
+      $this->addCustomDataFieldsToForm('FinancialAccount');
+    }
 
     $this->applyFilter('__ALL__', 'trim');
     $attributes = CRM_Core_DAO::getAttribute('CRM_Financial_DAO_FinancialAccount');
@@ -114,7 +116,6 @@ public function buildQuickForm() {
       }
     }
 
-    $this->addCustomDataToForm();
     if ($this->_action == CRM_Core_Action::UPDATE &&
       CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialAccount', $this->_id, 'is_reserved')
     ) {
@@ -173,7 +174,6 @@ public static function formRule($values, $files, $self) {
    */
   public function setDefaultValues() {
     $defaults = parent::setDefaultValues();
-    $defaults = array_merge($defaults, CRM_Custom_Form_CustomData::setDefaultValues($this));
     if ($this->_action & CRM_Core_Action::ADD) {
       $defaults['contact_id'] = CRM_Core_BAO_Domain::getDomain()->contact_id;
     }
@@ -195,7 +195,7 @@ public function postProcess() {
     else {
       // store the submitted values in an array
       $params = $this->exportValues();
-      $params['custom'] = CRM_Core_BAO_CustomField::postProcess($this->_submitValues, $this->_id, 'FinancialAccount');
+      $params['custom'] = CRM_Core_BAO_CustomField::postProcess($this->getSubmittedValues(), $this->_id, 'FinancialAccount');
 
       if ($this->_action & CRM_Core_Action::UPDATE) {
         $params['id'] = $this->_id;
diff --git a/www/modules/civicrm/CRM/Financial/Form/Payment.php b/www/modules/civicrm/CRM/Financial/Form/Payment.php
index f52d2cad7..a5cffbacd 100644
--- a/www/modules/civicrm/CRM/Financial/Form/Payment.php
+++ b/www/modules/civicrm/CRM/Financial/Form/Payment.php
@@ -38,22 +38,29 @@ class CRM_Financial_Form_Payment extends CRM_Core_Form {
    */
   public $_formName = '';
 
+  /**
+   * @var int|null
+   */
+  public ?int $paymentInstrumentID;
+
   /**
    * Set variables up before form is built.
+   *
+   * @throws \Exception
    */
-  public function preProcess() {
+  public function preProcess(): void {
     parent::preProcess();
 
     $this->_formName = CRM_Utils_Request::retrieve('formName', 'String', $this);
 
     $this->_values['custom_pre_id'] = CRM_Utils_Request::retrieve('pre_profile_id', 'Integer', $this);
-
+    // These properties are set because it is how CRM_Core_Payment_ProcessorForm::preProcess
+    // accesses them. Passing them in as properties might be more transparent.
     $this->_paymentProcessorID = CRM_Utils_Request::retrieve('processor_id', 'Integer', CRM_Core_DAO::$_nullObject,
       TRUE);
     $this->currency = CRM_Utils_Request::retrieve('currency', 'String', CRM_Core_DAO::$_nullObject,
       TRUE);
-
-    $this->paymentInstrumentID = CRM_Utils_Request::retrieve('payment_instrument_id', 'Integer');
+    $this->paymentInstrumentID = CRM_Utils_Request::retrieve('payment_instrument_id', 'Integer') ? (int) CRM_Utils_Request::retrieve('payment_instrument_id', 'Integer') : NULL;
     $this->isBackOffice = CRM_Utils_Request::retrieve('is_back_office', 'Integer');
 
     $this->assignBillingType();
@@ -85,7 +92,7 @@ public function buildQuickForm() {
   /**
    * Set default values for the form.
    */
-  public function setDefaultValues() {
+  public function setDefaultValues(): array {
     $contactID = $this->getContactID();
     CRM_Core_Payment_Form::setDefaultValues($this, $contactID);
     return $this->_defaults;
@@ -97,7 +104,7 @@ public function setDefaultValues() {
    * @param int $paymentProcessorID
    * @param string $region
    */
-  public static function addCreditCardJs($paymentProcessorID = NULL, $region = 'billing-block') {
+  public static function addCreditCardJs($paymentProcessorID = NULL, $region = 'billing-block'): void {
     $creditCards = CRM_Financial_BAO_PaymentProcessor::getCreditCards($paymentProcessorID);
     if (empty($creditCards)) {
       $creditCards = CRM_Contribute_PseudoConstant::creditCard();
diff --git a/www/modules/civicrm/CRM/Financial/Form/PaymentEdit.php b/www/modules/civicrm/CRM/Financial/Form/PaymentEdit.php
index 751b830bf..56c722e17 100644
--- a/www/modules/civicrm/CRM/Financial/Form/PaymentEdit.php
+++ b/www/modules/civicrm/CRM/Financial/Form/PaymentEdit.php
@@ -168,7 +168,7 @@ public function postProcess(): void {
       'id' => $this->_id,
       'payment_instrument_id' => $this->_submitValues['payment_instrument_id'],
       'trxn_id' => $this->_submitValues['trxn_id'] ?? NULL,
-      'trxn_date' => CRM_Utils_Array::value('trxn_date', $this->_submitValues, date('YmdHis')),
+      'trxn_date' => $this->_submitValues['trxn_date'] ?? date('YmdHis'),
     ];
 
     $paymentInstrumentName = CRM_Core_PseudoConstant::getName('CRM_Financial_DAO_FinancialTrxn', 'payment_instrument_id', $params['payment_instrument_id']);
diff --git a/www/modules/civicrm/CRM/Financial/Form/SalesTaxTrait.php b/www/modules/civicrm/CRM/Financial/Form/SalesTaxTrait.php
index 01f0949e1..6c7661c80 100644
--- a/www/modules/civicrm/CRM/Financial/Form/SalesTaxTrait.php
+++ b/www/modules/civicrm/CRM/Financial/Form/SalesTaxTrait.php
@@ -68,7 +68,7 @@ public function getTaxRatesForFinancialTypes() {
    * @return string
    */
   public function getTaxRateForFinancialType($financialTypeID) {
-    return CRM_Utils_Array::value($financialTypeID, $this->getTaxRatesForFinancialTypes());
+    return $this->getTaxRatesForFinancialTypes()[$financialTypeID] ?? NULL;
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Friend/DAO/Friend.php b/www/modules/civicrm/CRM/Friend/DAO/Friend.php
index a8f1583ed..ec7661813 100644
--- a/www/modules/civicrm/CRM/Friend/DAO/Friend.php
+++ b/www/modules/civicrm/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:c9b5f756669b6fbb10e7c112d55b4c14)
+ * (GenCodeChecksum:2b203841aada2a3bf5ea271d2f5ff05f)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Friend/Form.php b/www/modules/civicrm/CRM/Friend/Form.php
index c36056d04..2697e0d0b 100644
--- a/www/modules/civicrm/CRM/Friend/Form.php
+++ b/www/modules/civicrm/CRM/Friend/Form.php
@@ -139,9 +139,9 @@ public function setDefaultValues() {
     CRM_Friend_BAO_Friend::getValues($defaults);
     $this->setTitle(CRM_Utils_Array::value('title', $defaults));
 
-    $this->assign('title', CRM_Utils_Array::value('title', $defaults));
-    $this->assign('intro', CRM_Utils_Array::value('intro', $defaults));
-    $this->assign('message', CRM_Utils_Array::value('suggested_message', $defaults));
+    $this->assign('title', $defaults['title'] ?? NULL);
+    $this->assign('intro', $defaults['intro'] ?? NULL);
+    $this->assign('message', $defaults['suggested_message'] ?? NULL);
     $this->assign('entityID', $this->_entityId);
 
     list($fromName, $fromEmail) = CRM_Contact_BAO_Contact::getContactDetails($this->_contactID);
diff --git a/www/modules/civicrm/CRM/Group/Form/Edit.php b/www/modules/civicrm/CRM/Group/Form/Edit.php
index e9064efc0..632a45fb3 100644
--- a/www/modules/civicrm/CRM/Group/Form/Edit.php
+++ b/www/modules/civicrm/CRM/Group/Form/Edit.php
@@ -21,6 +21,7 @@
 class CRM_Group_Form_Edit extends CRM_Core_Form {
 
   use CRM_Core_Form_EntityFormTrait;
+  use CRM_Custom_Form_CustomDataTrait;
 
   /**
    * The group object, if an id is present
@@ -43,13 +44,6 @@ class CRM_Group_Form_Edit extends CRM_Core_Form {
    */
   protected $_groupValues;
 
-  /**
-   * What blocks should we show and hide.
-   *
-   * @var CRM_Core_ShowHideBlocks
-   */
-  protected $_showHide;
-
   /**
    * The civicrm_group_organization table id
    *
@@ -60,7 +54,7 @@ class CRM_Group_Form_Edit extends CRM_Core_Form {
   /**
    * Set entity fields to be assigned to the form.
    */
-  protected function setEntityFields() {
+  protected function setEntityFields(): void {
     $this->entityFields = [
       'frontend_title' => ['name' => 'frontend_title', 'required' => TRUE],
       'frontend_description' => ['name' => 'frontend_description'],
@@ -131,6 +125,7 @@ public function preProcess() {
           }
         }
         $this->assign('count', $count ?? NULL);
+        $this->assign('smartGroupsUsingThisGroup', CRM_Contact_BAO_SavedSearch::getSmartGroupsUsingGroup($this->_id));
         $this->setTitle(ts('Confirm Group Delete'));
       }
       if ($this->_groupValues['is_reserved'] == 1 && !CRM_Core_Permission::check('administer reserved groups')) {
@@ -159,9 +154,6 @@ public function preProcess() {
       $session->pushUserContext(CRM_Utils_System::url('civicrm/group', 'reset=1'));
     }
     $this->addExpectedSmartyVariables(['freezeMailingList', 'hideMailingList']);
-
-    //build custom data
-    CRM_Custom_Form_CustomData::preProcess($this, NULL, NULL, 1, 'Group', $this->_id);
   }
 
   /**
@@ -201,14 +193,11 @@ public function setDefaultValues() {
       }
     }
 
-    $parentGroupIds = explode(',', $this->_groupValues['parents']);
+    $parentGroupIds = explode(',', ($this->_groupValues['parents'] ?? ''));
     $defaults['parents'] = $parentGroupIds;
     if (empty($defaults['parents'])) {
       $defaults['parents'] = CRM_Core_BAO_Domain::getGroupId();
     }
-
-    // custom data set defaults
-    $defaults += CRM_Custom_Form_CustomData::setDefaultValues($this);
     return $defaults;
   }
 
@@ -216,7 +205,7 @@ public function setDefaultValues() {
    * Build the form object.
    */
   public function buildQuickForm() {
-    self::buildQuickEntityForm();
+    $this->buildQuickEntityForm();
     if ($this->_action & CRM_Core_Action::DELETE) {
       return;
     }
@@ -253,8 +242,9 @@ public function buildQuickForm() {
     }
     $this->addElement('checkbox', 'is_active', ts('Is active?'));
 
-    //build custom data
-    CRM_Custom_Form_CustomData::buildQuickForm($this);
+    if ($this->isSubmitted()) {
+      $this->addCustomDataFieldsToForm('Group');
+    }
 
     $options = [
       'selfObj' => $this,
@@ -271,7 +261,7 @@ public function buildQuickForm() {
    * @param array $fileParams
    * @param array $options
    *
-   * @return array
+   * @return array|true
    *   list of errors to be posted back to the form
    */
   public static function formRule($fields, $fileParams, $options) {
@@ -333,7 +323,7 @@ public function postProcess() {
 
       $params['is_reserved'] ??= FALSE;
       $params['is_active'] ??= FALSE;
-      $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params,
+      $params['custom'] = CRM_Core_BAO_CustomField::postProcess($this->getSubmittedValues(),
         $this->_id,
         'Group'
       );
@@ -380,7 +370,7 @@ public static function buildParentGroups(&$form) {
         }
       }
     }
-    $form->assign_by_ref('parent_groups', $parentGroupElements);
+    $form->assign('parent_groups', $parentGroupElements);
 
     if (isset($form->_id)) {
       $potentialParentGroupIds = CRM_Contact_BAO_GroupNestingCache::getPotentialCandidates($form->_id, $groupNames);
@@ -421,7 +411,7 @@ public static function buildParentGroups(&$form) {
    *
    * @param CRM_Core_Form $form
    */
-  public static function buildGroupOrganizations(&$form) {
+  public static function buildGroupOrganizations($form) {
     if (CRM_Core_Permission::check('administer Multiple Organizations') && CRM_Core_Permission::isMultisiteEnabled()) {
       //group organization Element
       $props = ['api' => ['params' => ['contact_type' => 'Organization']]];
diff --git a/www/modules/civicrm/CRM/Import/Controller.php b/www/modules/civicrm/CRM/Import/Controller.php
new file mode 100644
index 000000000..b8db4446d
--- /dev/null
+++ b/www/modules/civicrm/CRM/Import/Controller.php
@@ -0,0 +1,55 @@
+<?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_Import_Controller extends CRM_Core_Controller {
+
+  /**
+   * @var string
+   */
+  private string $entity;
+
+  public function getEntity(): string {
+    return $this->entity;
+  }
+
+  /**
+   * Class constructor.
+   *
+   * @param string $title
+   * @param array $arguments
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function __construct(string $title, array $arguments) {
+    parent::__construct($title, TRUE);
+    set_time_limit(0);
+
+    if (!empty($arguments['entity'])) {
+      $this->entity = $arguments['entity'];
+    }
+    else {
+      $pathArguments = explode('/', (CRM_Utils_System::currentPath() ?: ''));
+      unset($pathArguments[0], $pathArguments[1]);
+      $this->entity = CRM_Utils_String::convertStringToCamel(implode('_', $pathArguments));
+    }
+    $this->_stateMachine = new CRM_Import_StateMachine($this, TRUE, $this->entity, $arguments['class_prefix'] ?? NULL);
+    // 1 (or TRUE)  has been the action passed historically - but it is probably meaningless.
+    $this->addPages($this->_stateMachine, CRM_Core_Action::ADD);
+    $config = CRM_Core_Config::singleton();
+    $this->addActions($config->uploadDir, ['uploadFile']);
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Import/DataSource.php b/www/modules/civicrm/CRM/Import/DataSource.php
index f6ddab89f..e60bf3021 100644
--- a/www/modules/civicrm/CRM/Import/DataSource.php
+++ b/www/modules/civicrm/CRM/Import/DataSource.php
@@ -34,6 +34,18 @@ abstract class CRM_Import_DataSource implements DataSourceInterface {
    */
   private $limit;
 
+  public function getLimit(): int {
+    return $this->limit;
+  }
+
+  public function getOffset(): int {
+    return $this->offset;
+  }
+
+  public function getStatuses(): array {
+    return $this->statuses;
+  }
+
   /**
    * @param int $limit
    *
@@ -41,7 +53,7 @@ abstract class CRM_Import_DataSource implements DataSourceInterface {
    */
   public function setLimit(int $limit): DataSourceInterface {
     $this->limit = $limit;
-    $this->queryResultObject = NULL;
+    $this->flushQueryResults();
     return $this;
   }
 
@@ -52,7 +64,7 @@ public function setLimit(int $limit): DataSourceInterface {
    */
   public function setOffset(int $offset): CRM_Import_DataSource {
     $this->offset = $offset;
-    $this->queryResultObject = NULL;
+    $this->flushQueryResults();
     return $this;
   }
 
@@ -137,7 +149,7 @@ public function getAggregateFields(): ?array {
    */
   public function setStatuses(array $statuses): DataSourceInterface {
     $this->statuses = $statuses;
-    $this->queryResultObject = NULL;
+    $this->flushQueryResults();
     return $this;
   }
 
@@ -192,6 +204,19 @@ public function getRow(): ?array {
     return $values;
   }
 
+  /**
+   * Flush the existing query to retrieve rows.
+   *
+   * The query will be run again, potentially retrieving newly-available rows.
+   * Note the 'newly available' could mean an external process has intervened.
+   * For example the import_extensions lazy-loads into the import table.
+   *
+   * @return void
+   */
+  private function flushQueryResults() {
+    $this->queryResultObject = NULL;
+  }
+
   /**
    * Get row count.
    *
diff --git a/www/modules/civicrm/CRM/Import/Form/MapField.php b/www/modules/civicrm/CRM/Import/Form/MapField.php
index 2eda66a1c..b5f372fd5 100644
--- a/www/modules/civicrm/CRM/Import/Form/MapField.php
+++ b/www/modules/civicrm/CRM/Import/Form/MapField.php
@@ -69,7 +69,7 @@ public function preProcess() {
     $this->addExpectedSmartyVariables(['highlightedRelFields', 'initHideBoxes']);
     $this->assign('columnNames', $this->getColumnHeaders());
     $this->assign('showColumnNames', $this->getSubmittedValue('skipColumnHeader') || $this->getSubmittedValue('dataSource') !== 'CRM_Import_DataSource');
-    $this->assign('highlightedFields', $this->getHighlightedFields());
+    $this->assign('highlightedFields', json_encode($this->getHighlightedFields()));
     $this->assign('dataValues', array_values($this->getDataRows([], 2)));
     $this->_mapperFields = $this->getAvailableFields();
     $fieldMappings = $this->getFieldMappings();
diff --git a/www/modules/civicrm/CRM/Import/Forms.php b/www/modules/civicrm/CRM/Import/Forms.php
index 81989b595..784cb7889 100644
--- a/www/modules/civicrm/CRM/Import/Forms.php
+++ b/www/modules/civicrm/CRM/Import/Forms.php
@@ -82,6 +82,10 @@ public function getUserJobType(): string {
     return '';
   }
 
+  public function getEntity() {
+    return $this->controller->getEntity();
+  }
+
   /**
    * @return int|null
    */
@@ -850,17 +854,28 @@ protected function getHighlightedFields(): array {
   public function getHeaderPatterns(): array {
     $headerPatterns = [];
     foreach ($this->getFields() as $name => $field) {
-      if (empty($field['headerPattern']) || $field['headerPattern'] === '//') {
-        continue;
+      if (!empty($field['usage']['import']) && !empty($field['title'])) {
+        $patterns = [
+          $this->strToPattern($field['name']),
+          $this->strToPattern($field['title']),
+        ];
+        if (!empty($field['html']['label'])) {
+          $patterns[] = $this->strToPattern($field['html']['label']);
+        }
+        // Swap out dots for double underscores so as not to break the quick form js.
+        // We swap this back on postProcess.
+        $name = str_replace('.', '__', $name);
+        $headerPatterns[$name] = '/^' . implode('|', array_unique($patterns)) . '$/i';
       }
-      // Swap out dots for double underscores so as not to break the quick form js.
-      // We swap this back on postProcess.
-      $name = str_replace('.', '__', $name);
-      $headerPatterns[$name] = $field['headerPattern'];
     }
     return $headerPatterns;
   }
 
+  private function strToPattern(string $str) {
+    $str = str_replace(['_', '-'], ' ', $str);
+    return strtolower(str_replace(' ', '[-_ ]?', preg_quote($str, '/')));
+  }
+
   /**
    * Has the user chosen to update existing records.
    * @return bool
diff --git a/www/modules/civicrm/CRM/Import/ImportProcessor.php b/www/modules/civicrm/CRM/Import/ImportProcessor.php
index 4938dff9b..daf10f230 100644
--- a/www/modules/civicrm/CRM/Import/ImportProcessor.php
+++ b/www/modules/civicrm/CRM/Import/ImportProcessor.php
@@ -165,15 +165,12 @@ public function getMetadata(): array {
    * @throws \CRM_Core_Exception
    */
   public function setMetadata(array $metadata) {
-    $fieldDetails = civicrm_api3('CustomField', 'get', [
-      'return' => ['custom_group_id.title'],
-      'options' => ['limit' => 0],
-    ])['values'];
     foreach ($metadata as $index => $field) {
       if (!empty($field['custom_field_id'])) {
+        $fieldDetails = CRM_Core_BAO_CustomField::getField($field['custom_field_id']);
         // The 'label' format for import is custom group title :: custom name title
         $metadata[$index]['name'] = $index;
-        $metadata[$index]['title'] .= ' :: ' . $fieldDetails[$field['custom_field_id']]['custom_group_id.title'];
+        $metadata[$index]['title'] .= ' :: ' . $fieldDetails['custom_group']['title'];
       }
     }
     $this->metadata = $metadata;
diff --git a/www/modules/civicrm/CRM/Import/Parser.php b/www/modules/civicrm/CRM/Import/Parser.php
index 84fb79804..dd410fd6d 100644
--- a/www/modules/civicrm/CRM/Import/Parser.php
+++ b/www/modules/civicrm/CRM/Import/Parser.php
@@ -30,33 +30,17 @@
  * supported.
  */
 abstract class CRM_Import_Parser implements UserJobInterface {
-  /**
-   * Settings
-   */
-  const MAX_WARNINGS = 25, DEFAULT_TIMEOUT = 30;
 
   /**
    * Return codes
    */
   const VALID = 1, WARNING = 2, ERROR = 4, CONFLICT = 8, STOP = 16, DUPLICATE = 32, MULTIPLE_DUPE = 64, NO_MATCH = 128, UNPARSED_ADDRESS_WARNING = 256;
 
-  /**
-   * Parser modes
-   */
-  const MODE_MAPFIELD = 1, MODE_PREVIEW = 2, MODE_SUMMARY = 4, MODE_IMPORT = 8;
-
   /**
    * Codes for duplicate record handling
    */
   const DUPLICATE_SKIP = 1, DUPLICATE_UPDATE = 4, DUPLICATE_FILL = 8, DUPLICATE_NOCHECK = 16;
 
-  /**
-   * Contact types
-   *
-   * @deprecated
-   */
-  const CONTACT_INDIVIDUAL = 'Individual', CONTACT_HOUSEHOLD = 'Household', CONTACT_ORGANIZATION = 'Organization';
-
   /**
    * User job id.
    *
@@ -223,63 +207,12 @@ public function getContactSubType(): ?string {
     return $this->_contactSubType;
   }
 
-  /**
-   * Total number of non empty lines
-   * @var int
-   */
-  protected $_totalCount;
-
-  /**
-   * Running total number of valid lines
-   * @var int
-   */
-  protected $_validCount;
-
-  /**
-   * Running total number of invalid rows
-   * @var int
-   */
-  protected $_invalidRowCount;
-
   /**
    * Array of error lines, bounded by MAX_ERROR
    * @var array
    */
   protected $_errors;
 
-  /**
-   * Total number of duplicate (from database) lines
-   * @var int
-   */
-  protected $_duplicateCount;
-
-  /**
-   * Array of duplicate lines
-   * @var array
-   */
-  protected $_duplicates;
-
-  /**
-   * Maximum number of warnings to store
-   * @var int
-   */
-  protected $_maxWarningCount = self::MAX_WARNINGS;
-
-  /**
-   * Array of warning lines, bounded by MAX_WARNING
-   * @var array
-   */
-  protected $_warnings;
-
-  /**
-   * TO BE REMOVED.
-   *
-   * Array of all the fields that could potentially be part
-   * of this import process
-   * @var array
-   */
-  private $_fields;
-
   private $dedupeRules = [];
 
   /**
@@ -332,6 +265,18 @@ protected function getContactFields(string $contactType): array {
     return $contactFields;
   }
 
+  /**
+   * @param string $entity
+   *
+   * @return array
+   * @throws \CRM_Core_Exception
+   */
+  protected function getImportFieldsForEntity(string $entity): array {
+    return (array) civicrm_api4($entity, 'getFields', [
+      'where' => [['usage', 'CONTAINS', 'import']],
+    ])->indexBy('name');
+  }
+
   /**
    * Gets the fields available for importing in a key-name, title format.
    *
@@ -406,13 +351,6 @@ protected function isFillDuplicates(): bool {
     return ((int) $this->getSubmittedValue('onDuplicate')) === CRM_Import_Parser::DUPLICATE_FILL;
   }
 
-  /**
-   * Cache of preview rows
-   *
-   * @var array
-   */
-  protected $_rows;
-
   /**
    * Contact type
    *
@@ -522,11 +460,12 @@ public function getFieldsWhichSupportLocationTypes(): array {
   /**
    * Do this work on the form layer.
    *
-   * @deprecated
+   * @deprecated in 5.54 will be removed around 5.80
    *
    * @return array
    */
   public function getHeaderPatterns(): array {
+    CRM_Core_Error::deprecatedFunctionWarning('CRM_Import_Forms::getHeaderPatterns');
     $values = [];
     foreach ($this->importableFieldsMetadata as $name => $field) {
       if (isset($field['headerPattern'])) {
@@ -675,7 +614,11 @@ public function queue(): void {
     // The retry limit for the queue is set to 5 - allowing for a few deadlocks but we might consider
     // making this configurable at some point.
     $queue = Civi::queue('user_job_' . $this->getUserJobID(), ['type' => 'Sql', 'error' => 'abort', 'runner' => 'task', 'user_job_id' => $this->getUserJobID(), 'retry_limit' => 5]);
-    UserJob::update(FALSE)->setValues(['queue_id.name' => 'user_job_' . $this->getUserJobID()])->addWhere('id', '=', $this->getUserJobID())->execute();
+    UserJob::update(FALSE)
+      ->setValues([
+        'queue_id.name' => 'user_job_' . $this->getUserJobID(),
+        'status_id:name' => 'scheduled',
+      ])->addWhere('id', '=', $this->getUserJobID())->execute();
     $offset = 0;
     $batchSize = Civi::settings()->get('import_batch_size');
     while ($totalRows > 0) {
@@ -1073,6 +1016,7 @@ private function _civicrm_api3_deprecated_add_formatted_param(&$values, &$params
     }
 
     if (isset($values['individual_prefix'])) {
+      CRM_Core_Error::deprecatedWarning('code should be unreachable, slated for removal');
       if (!empty($params['prefix_id'])) {
         $prefixes = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'prefix_id');
         $params['prefix'] = $prefixes[$params['prefix_id']];
@@ -1084,6 +1028,7 @@ private function _civicrm_api3_deprecated_add_formatted_param(&$values, &$params
     }
 
     if (isset($values['individual_suffix'])) {
+      CRM_Core_Error::deprecatedWarning('code should be unreachable, slated for removal');
       if (!empty($params['suffix_id'])) {
         $suffixes = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id');
         $params['suffix'] = $suffixes[$params['suffix_id']];
@@ -1095,6 +1040,7 @@ private function _civicrm_api3_deprecated_add_formatted_param(&$values, &$params
     }
 
     if (isset($values['gender'])) {
+      CRM_Core_Error::deprecatedWarning('code should be unreachable, slated for removal');
       if (!empty($params['gender_id'])) {
         $genders = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'gender_id');
         $params['gender'] = $genders[$params['gender_id']];
@@ -1636,27 +1582,25 @@ protected function getTransformedFieldValue(string $fieldName, $importedValue) {
       $comparisonValue = $this->getComparisonValue($importedValue);
       return $options[$comparisonValue] ?? 'invalid_import_value';
     }
-    if (!empty($fieldMetadata['FKClassName']) || ($fieldMetadata['pseudoconstant']['prefetch'] ?? NULL) === 'disabled') {
-      // @todo - make this generic - for fields where getOptions doesn't fetch
-      // getOptions does not retrieve these fields with high potential results
-      if ($fieldName === 'event_id') {
-        if (!isset(Civi::$statics[__CLASS__][$fieldName][$importedValue])) {
-          $event = Event::get()->addClause('OR', ['title', '=', $importedValue], ['id', '=', $importedValue])->addSelect('id')->execute()->first();
-          Civi::$statics[__CLASS__][$fieldName][$importedValue] = $event['id'] ?? FALSE;
-        }
-        return Civi::$statics[__CLASS__][$fieldName][$importedValue] ?? 'invalid_import_value';
+    // @todo - make this generic - for fields where getOptions doesn't fetch
+    // getOptions does not retrieve these fields with high potential results
+    if ($fieldName === 'event_id') {
+      if (!isset(Civi::$statics[__CLASS__][$fieldName][$importedValue])) {
+        $event = Event::get()->addClause('OR', ['title', '=', $importedValue], ['id', '=', $importedValue])->addSelect('id')->execute()->first();
+        Civi::$statics[__CLASS__][$fieldName][$importedValue] = $event['id'] ?? FALSE;
       }
-      if ($fieldMetadata['name'] === 'campaign_id') {
-        if (!isset(Civi::$statics[__CLASS__][$fieldName][$importedValue])) {
-          $campaign = Campaign::get()->addClause('OR', ['title', '=', $importedValue], ['name', '=', $importedValue], ['id', '=', $importedValue])->addSelect('id')->execute()->first();
-          Civi::$statics[__CLASS__][$fieldName][$importedValue] = $campaign['id'] ?? FALSE;
-        }
-        return Civi::$statics[__CLASS__][$fieldName][$importedValue] ?: 'invalid_import_value';
+      return Civi::$statics[__CLASS__][$fieldName][$importedValue] ?? 'invalid_import_value';
+    }
+    if ($fieldMetadata['name'] === 'campaign_id') {
+      if (!isset(Civi::$statics[__CLASS__][$fieldName][$importedValue])) {
+        $campaign = Campaign::get()->addClause('OR', ['title', '=', $importedValue], ['name', '=', $importedValue], ['id', '=', $importedValue])->addSelect('id')->execute()->first();
+        Civi::$statics[__CLASS__][$fieldName][$importedValue] = $campaign['id'] ?? FALSE;
       }
+      return Civi::$statics[__CLASS__][$fieldName][$importedValue] ?: 'invalid_import_value';
     }
     if ($dataType === 'Integer') {
       // We have resolved the options now so any remaining ones should be integers.
-      return CRM_Utils_Rule::numeric($importedValue) ? $importedValue : 'invalid_import_value';
+      return CRM_Utils_Rule::numeric($importedValue) ? (int) $importedValue : 'invalid_import_value';
     }
     return $importedValue;
   }
@@ -1726,12 +1670,8 @@ protected function getFieldMetadata(string $fieldName, bool $loadOptions = FALSE
       }
       else {
         if (!empty($fieldMetadata['custom_group_id'])) {
-          $customField = CustomField::get(FALSE)
-            ->addWhere('id', '=', $fieldMetadata['custom_field_id'])
-            ->addSelect('name', 'custom_group_id.name')
-            ->execute()
-            ->first();
-          $optionFieldName = $customField['custom_group_id.name'] . '.' . $customField['name'];
+          $customField = CRM_Core_BAO_CustomField::getField($fieldMetadata['custom_field_id']);
+          $optionFieldName = $customField['custom_group']['name'] . '.' . $customField['name'];
         }
         $options = civicrm_api4($this->getFieldEntity($fieldName), 'getFields', [
           'loadOptions' => ['id', 'name', 'label', 'abbr'],
@@ -2107,7 +2047,17 @@ protected function getFieldMappings(): array {
    * @throws \CRM_Core_Exception
    */
   public static function runJob(\CRM_Queue_TaskContext $taskContext, int $userJobID, int $limit, int $offset): bool {
-    $userJob = UserJob::get()->addWhere('id', '=', $userJobID)->addSelect('job_type')->execute()->first();
+    $userJob = UserJob::get()->addWhere('id', '=', $userJobID)
+      ->addSelect('job_type', 'start_date')->execute()->first();
+    if (!$userJob['start_date']) {
+      UserJob::update(FALSE)
+        ->setValues([
+          'status_id:name' => 'in_progress',
+          'start_date' => 'now',
+        ])
+        ->addWhere('id', '=', $userJob['id'])
+        ->execute();
+    }
     $parserClass = NULL;
     foreach (CRM_Core_BAO_UserJob::getTypes() as $userJobType) {
       if ($userJob['job_type'] === $userJobType['id']) {
@@ -2278,6 +2228,21 @@ protected function getPossibleMatchesByDedupeRule(array $params, $dedupeRuleID =
     return $matchIDs;
   }
 
+  /**
+   * @throws \CRM_Core_Exception
+   */
+  protected function checkEntityExists(string $entity, int $id) {
+    try {
+      civicrm_api4($entity, 'get', ['where' => [['id', '=', $id]], 'select' => ['id']])->single();
+    }
+    catch (CRM_Core_Exception $e) {
+      throw new CRM_Core_Exception(ts('%1 record not found for id %2', [
+        1 => $entity,
+        2 => $id,
+      ]));
+    }
+  }
+
   /**
    * Get the Api4 name of a custom field.
    *
diff --git a/www/modules/civicrm/CRM/Import/StateMachine.php b/www/modules/civicrm/CRM/Import/StateMachine.php
index ddc69485b..f70588986 100644
--- a/www/modules/civicrm/CRM/Import/StateMachine.php
+++ b/www/modules/civicrm/CRM/Import/StateMachine.php
@@ -17,23 +17,53 @@
 
 /**
  * State machine for managing different states of the Import process.
+ *
+ * @internal
  */
 class CRM_Import_StateMachine extends CRM_Core_StateMachine {
 
+  /**
+   * Get the entity name.
+   *
+   * @var string
+   */
+  protected string $entity;
+
+  private string $classPrefix;
+
+  public function getEntity(): string {
+    return $this->entity;
+  }
+
   /**
    * Class constructor.
    *
-   * @param object $controller
-   * @param \const|int $action
+   * @param CRM_Import_Controller $controller
+   * @param int $action
+   * @param ?string $entity
+   * @param string|null $classPrefix
+   *   When the class name does not easily map to the prefix - ie the Custom import class.
+   *
+   * @internal only supported for core use.
    */
-  public function __construct($controller, $action = CRM_Core_Action::NONE) {
+  public function __construct($controller, $action = CRM_Core_Action::NONE, ?string $entity = NULL, ?string $classPrefix = NULL) {
     parent::__construct($controller, $action);
-
-    $classType = str_replace('_Controller', '', get_class($controller));
+    $this->entity = ucfirst((string) $entity);
+    if ($classPrefix) {
+      $this->classPrefix = $classPrefix;
+    }
+    elseif ($this->entity) {
+      $entityPath = explode('_', CRM_Core_DAO_AllCoreTables::getDAONameForEntity($this->entity));
+      $this->classPrefix = $entityPath[0] . '_' . $entityPath[1] . '_Import';
+    }
+    else {
+      CRM_Core_Error::deprecatedWarning('entity parameter expected, always passed in core & few outside core uses so this will go');
+      $this->classPrefix = str_replace('_Controller', '', get_class($controller));
+    }
     $this->_pages = [
-      $classType . '_Form_DataSource' => NULL,
-      $classType . '_Form_MapField' => NULL,
-      $classType . '_Form_Preview' => NULL,
+      $this->classPrefix . '_Form_DataSource' => NULL,
+      $this->classPrefix . '_Form_MapField' => NULL,
+      $this->classPrefix . '_Form_Preview' => NULL,
     ];
 
     $this->addSequentialPages($this->_pages);
diff --git a/www/modules/civicrm/CRM/Logging/Differ.php b/www/modules/civicrm/CRM/Logging/Differ.php
index 083a6266f..f7c587b1b 100644
--- a/www/modules/civicrm/CRM/Logging/Differ.php
+++ b/www/modules/civicrm/CRM/Logging/Differ.php
@@ -219,7 +219,7 @@ private function diffsInTableForId($table, $id) {
           continue;
         }
 
-        if (($original[$diff] ?? NULL) === CRM_Utils_Array::value($diff, $changed)) {
+        if (($original[$diff] ?? NULL) === ($changed[$diff] ?? NULL)) {
           continue;
         }
 
diff --git a/www/modules/civicrm/CRM/Logging/ReportDetail.php b/www/modules/civicrm/CRM/Logging/ReportDetail.php
index 8df6ec89e..2599ea715 100644
--- a/www/modules/civicrm/CRM/Logging/ReportDetail.php
+++ b/www/modules/civicrm/CRM/Logging/ReportDetail.php
@@ -175,6 +175,9 @@ protected function convertDiffsToRows() {
       return [];
     }
 
+    // $cfDataTypesToBeFormatted corresponds to values in the db column civicrm_custom_field.data_type
+    $cfDataTypesToBeFormatted = array("Int", "ContactReference", "EntityReference");
+
     // populate $rows with only the differences between $changed and $original (skipping certain columns and NULL ↔ empty changes unless raw requested)
     $skipped = ['id'];
     $nRows = $rows = [];
@@ -183,7 +186,7 @@ protected function convertDiffsToRows() {
       if (empty($metadata[$table])) {
         list($metadata[$table]['titles'], $metadata[$table]['values']) = $this->differ->titlesAndValuesForTable($table, $diff['log_date']);
       }
-      $values = CRM_Utils_Array::value('values', $metadata[$diff['table']], []);
+      $values = $metadata[$diff['table']]['values'] ?? [];
       $titles = $metadata[$diff['table']]['titles'];
       $field = $diff['field'];
       $from = $diff['from'];
@@ -218,25 +221,67 @@ protected function convertDiffsToRows() {
           $to = implode(', ', array_filter($tos));
         }
 
+        $cfArray = [];
         $tableDAOClass = CRM_Core_DAO_AllCoreTables::getClassForTable($table);
+        $fkClassName = NULL;
         if (!empty($tableDAOClass)) {
           $tableDAOFields = (new $tableDAOClass())->fields();
           // If this field is a foreign key, then we can later use the foreign
           // class to translate the id into something more useful for display.
           $fkClassName = $tableDAOFields[$field]['FKClassName'] ?? NULL;
         }
+        else {
+          // Since this table didn't match a core table, check if it's a custom field.
+          $customGroup = CRM_Core_BAO_CustomGroup::getGroup(['table_name' => $table]);
+          foreach ($customGroup['fields'] ?? [] as $customField) {
+            if ($customField['column_name'] === $field) {
+              $cfArray = $customField;
+              break;
+            }
+          }
+        }
         if (isset($values[$field][$from])) {
           $from = $values[$field][$from];
         }
         elseif (!empty($from) && !empty($fkClassName)) {
           $from = $this->convertForeignKeyValuesToLabels($fkClassName, $field, $from);
         }
+        elseif (!empty($from) && is_numeric($from) && array_key_exists("id", $cfArray) && is_int($cfArray["id"])) {
+          // Translate the id into something more useful for display, namely for id's that refer to option values and contacts.
+          $fromAsArray = civicrm_api3('CustomValue', 'getdisplayvalue', [
+            'entity_id' => $this->cid,
+            'custom_field_id' => $cfArray["id"],
+            'custom_field_value' => $from,
+          ]);
+          if (array_key_exists("data_type", $cfArray) && in_array($cfArray["data_type"], $cfDataTypesToBeFormatted)) {
+            $from = $this->formatLabelAndIdForDisplay($fromAsArray['values'][$cfArray["id"]]['display'], $from);
+          }
+          elseif (!empty($fromAsArray['values'][$cfArray["id"]]['display'])) {
+            $from = $fromAsArray['values'][$cfArray["id"]]['display'];
+          }
+        }
+
         if (isset($values[$field][$to])) {
           $to = $values[$field][$to];
         }
         elseif (!empty($to) && !empty($fkClassName)) {
           $to = $this->convertForeignKeyValuesToLabels($fkClassName, $field, $to);
         }
+        elseif (!empty($to) && is_numeric($to) && array_key_exists("id", $cfArray) && is_int($cfArray["id"])) {
+          // Translate the id into something more useful for display, namely for id's that refer to option values and contacts.
+          $toAsArray = civicrm_api3('CustomValue', 'getdisplayvalue', [
+            'entity_id' => $this->cid,
+            'custom_field_id' => $cfArray["id"],
+            'custom_field_value' => $to,
+          ]);
+          if (array_key_exists("data_type", $cfArray) && in_array($cfArray["data_type"], $cfDataTypesToBeFormatted)) {
+            $to = $this->formatLabelAndIdForDisplay($toAsArray['values'][$cfArray["id"]]['display'], $to);
+          }
+          elseif (!empty($toAsArray['values'][$cfArray["id"]]['display'])) {
+            $to = $toAsArray['values'][$cfArray["id"]]['display'];
+          }
+        }
+
         if (isset($titles[$field])) {
           $field = $titles[$field];
         }
@@ -480,12 +525,23 @@ public function getLimit($rowCount = self::ROW_COUNT_LIMIT) {
    * @return string
    */
   private function convertForeignKeyValuesToLabels(string $fkClassName, string $field, int $keyval): string {
-    if ($fkClassName::$_labelField) {
-      $labelValue = CRM_Core_DAO::getFieldValue($fkClassName, $keyval, $fkClassName::$_labelField);
+    if ($fkClassName::getLabelField()) {
+      $labelValue = CRM_Core_DAO::getFieldValue($fkClassName, $keyval, $fkClassName::getLabelField());
       // Not sure if this should use ts - there's not a lot of context (`%1 (id: %2)`) - and also the similar field labels above don't use ts.
       return "{$labelValue} (id: {$keyval})";
     }
     return (string) $keyval;
   }
 
+  /**
+   * Return a string with the label and value combined.
+   *
+   * @param string $labelValue
+   * @param int $keyval
+   * @return string
+   */
+  private function formatLabelAndIdForDisplay(string $labelValue, int $keyval): string {
+    return empty($labelValue) ? (string) $keyval : "{$labelValue} (id: {$keyval})";
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Logging/Schema.php b/www/modules/civicrm/CRM/Logging/Schema.php
index 1baedd577..f7bffb4e2 100644
--- a/www/modules/civicrm/CRM/Logging/Schema.php
+++ b/www/modules/civicrm/CRM/Logging/Schema.php
@@ -50,7 +50,7 @@ class CRM_Logging_Schema {
    * @var array
    */
   private $exceptions = [
-    'civicrm_job' => ['last_run'],
+    'civicrm_job' => ['last_run', 'last_run_end'],
     'civicrm_group' => ['cache_date', 'refresh_date'],
   ];
 
@@ -203,13 +203,11 @@ public function customDataLogTables() {
    */
   public function entityCustomDataLogTables($extends) {
     $customGroupTables = [];
-    $customGroupDAO = CRM_Core_BAO_CustomGroup::getAllCustomGroupsByBaseEntity($extends);
-    $customGroupDAO->find();
-    while ($customGroupDAO->fetch()) {
-      // logging is disabled for the table (e.g by hook) then $this->logs[$customGroupDAO->table_name]
+    foreach (CRM_Core_BAO_CustomGroup::getAll(['extends' => $extends]) as $customGroup) {
+      // logging is disabled for the table (e.g by hook) then $this->logs[$customGroup['table_name']]
       // will be empty.
-      if (!empty($this->logs[$customGroupDAO->table_name])) {
-        $customGroupTables[$customGroupDAO->table_name] = $this->logs[$customGroupDAO->table_name];
+      if (!empty($this->logs[$customGroup['table_name']])) {
+        $customGroupTables[$customGroup['table_name']] = $this->logs[$customGroup['table_name']];
       }
     }
     return $customGroupTables;
diff --git a/www/modules/civicrm/CRM/Mailing/ActionTokens.php b/www/modules/civicrm/CRM/Mailing/ActionTokens.php
index ecb3be4dd..88fcf287e 100644
--- a/www/modules/civicrm/CRM/Mailing/ActionTokens.php
+++ b/www/modules/civicrm/CRM/Mailing/ActionTokens.php
@@ -83,9 +83,7 @@ public function evaluateToken(
     list($verp, $urls) = CRM_Mailing_BAO_Mailing::getVerpAndUrls(
       $row->context['mailingJobId'],
       $row->context['mailingActionTarget']['id'] ?? NULL,
-      $row->context['mailingActionTarget']['hash'] ?? NULL,
-      // Note: Behavior is already undefined for SMS/'phone' mailings...
-      $row->context['mailingActionTarget']['email'] ?? NULL
+      $row->context['mailingActionTarget']['hash'] ?? NULL
     );
 
     $row->format('text/plain')->tokens($entity, $field,
diff --git a/www/modules/civicrm/CRM/Mailing/BAO/Mailing.php b/www/modules/civicrm/CRM/Mailing/BAO/Mailing.php
index 7288d0199..d76a63516 100644
--- a/www/modules/civicrm/CRM/Mailing/BAO/Mailing.php
+++ b/www/modules/civicrm/CRM/Mailing/BAO/Mailing.php
@@ -16,6 +16,7 @@
  */
 
 use Civi\API\Exception\UnauthorizedException;
+use Civi\Api4\MailingGroup;
 
 require_once 'Mail/mime.php';
 
@@ -64,18 +65,6 @@ class CRM_Mailing_BAO_Mailing extends CRM_Mailing_DAO_Mailing implements \Civi\C
    */
   private $footer = NULL;
 
-  /**
-   * The HTML content of the message.
-   * @var string
-   */
-  private $html = NULL;
-
-  /**
-   * The text content of the message.
-   * @var string
-   */
-  private $text = NULL;
-
   /**
    * Cached BAO for the domain.
    * @var int
@@ -95,7 +84,6 @@ public static function getRecipients($mailingID) {
     $mailingObj->id = $mailingID;
     $mailingObj->find(TRUE);
 
-    $mailing = CRM_Mailing_BAO_Mailing::getTableName();
     $contact = CRM_Contact_DAO_Contact::getTableName();
     $isSMSmode = (!CRM_Utils_System::isNull($mailingObj->sms_provider_id));
 
@@ -109,7 +97,7 @@ public static function getRecipients($mailingID) {
       ->param('#mailing_id', $mailingID)
       ->execute();
     while ($dao->fetch()) {
-      if ($dao->entity_table == 'civicrm_mailing') {
+      if ($dao->entity_table === 'civicrm_mailing') {
         $priorMailingIDs[$dao->group_type] = explode(',', $dao->group_ids);
       }
       else {
@@ -145,10 +133,10 @@ public static function getRecipients($mailingID) {
         if ($groupDAO->cache_date == NULL || $groupDAO->is_hidden) {
           CRM_Contact_BAO_GroupContactCache::load($groupDAO);
         }
-        if ($groupType == 'Include') {
+        if ($groupType === 'Include') {
           $includeSmartGroupIDs[] = $groupDAO->id;
         }
-        elseif ($groupType == 'Exclude') {
+        elseif ($groupType === 'Exclude') {
           $excludeSmartGroupIDs[] = $groupDAO->id;
         }
         //NOTE: Do nothing for base
@@ -452,31 +440,11 @@ protected static function processWorkflowPermissions(array $params): array {
    *
    * @param array $params
    * @param \CRM_Mailing_DAO_Mailing $mailing
-   *
-   * @return array
    */
-  protected static function doSubmitActions(array $params, CRM_Mailing_DAO_Mailing $mailing): array {
+  protected static function doSubmitActions(array $params, CRM_Mailing_DAO_Mailing $mailing): void {
     // Create parent job if not yet created.
     // Condition on the existence of a scheduled date.
-    if (!empty($params['scheduled_date']) && $params['scheduled_date'] != 'null' && empty($params['_skip_evil_bao_auto_schedule_'])) {
-
-      if (!isset($params['is_completed']) || $params['is_completed'] !== 1) {
-        $mailingGroups = \Civi\Api4\MailingGroup::get()
-          ->addSelect('group.id')
-          ->addJoin('Group AS group', 'LEFT', ['entity_id', '=', 'group.id'])
-          ->addWhere('mailing_id', '=', $mailing->id)
-          ->addWhere('entity_table', '=', 'civicrm_group')
-          ->addWhere('group_type', 'IN', ['Include', 'Exclude'])
-          ->addClause('OR', ['group.saved_search_id', 'IS NOT NULL'], ['group.children', 'IS NOT NULL'])
-          ->execute();
-        foreach ($mailingGroups as $mailingGroup) {
-          CRM_Contact_BAO_GroupContactCache::invalidateGroupContactCache($mailingGroup['group.id']);
-          $group = new CRM_Contact_DAO_Group();
-          $group->find(TRUE);
-          $group->id = $mailingGroup['group.id'];
-          CRM_Contact_BAO_GroupContactCache::load($group);
-        }
-      }
+    if (!empty($params['scheduled_date']) && $params['scheduled_date'] !== 'null' && empty($params['_skip_evil_bao_auto_schedule_'])) {
 
       $job = new CRM_Mailing_BAO_MailingJob();
       $job->mailing_id = $mailing->id;
@@ -497,9 +465,44 @@ protected static function doSubmitActions(array $params, CRM_Mailing_DAO_Mailing
 
     // Populate the recipients.
     if (empty($params['_skip_evil_bao_auto_recipients_'])) {
+      if ((!isset($params['is_completed']) || $params['is_completed'] !== 1)
+        && !empty($params['scheduled_date']) && $params['scheduled_date'] !== 'null'
+        && empty($params['_skip_evil_bao_auto_schedule_'])
+      ) {
+        self::refreshMailingGroupCache($mailing->id);
+      }
       self::getRecipients($mailing->id);
     }
-    return $params;
+  }
+
+  /**
+   * Refresh the group cache for groups relevant to the mailing.
+   *
+   * @param int $mailingID
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \Civi\API\Exception\UnauthorizedException
+   *
+   * @internal not supported for use from outside of core. Function has always
+   * been internal so may be moved / removed / alters at any time without
+   * regard for external users.
+   */
+  public static function refreshMailingGroupCache(int $mailingID): void {
+    $mailingGroups = MailingGroup::get()
+      ->addSelect('group.id')
+      ->addJoin('Group AS group', 'LEFT', ['entity_id', '=', 'group.id'])
+      ->addWhere('mailing_id', '=', $mailingID)
+      ->addWhere('entity_table', '=', 'civicrm_group')
+      ->addWhere('group_type', 'IN', ['Include', 'Exclude'])
+      ->addClause('OR', ['group.saved_search_id', 'IS NOT NULL'], ['group.children', 'IS NOT NULL'])
+      ->execute();
+    foreach ($mailingGroups as $mailingGroup) {
+      CRM_Contact_BAO_GroupContactCache::invalidateGroupContactCache($mailingGroup['group.id']);
+      $group = new CRM_Contact_DAO_Group();
+      $group->find(TRUE);
+      $group->id = $mailingGroup['group.id'];
+      CRM_Contact_BAO_GroupContactCache::load($group);
+    }
   }
 
   /**
@@ -933,21 +936,18 @@ public static function addMessageIdHeader(&$headers, $prefix, $job_id, $event_qu
    *   ID of the EventQueue.
    * @param string $hash
    *   Hash of the EventQueue.
-   * @param string $email
-   *   Destination address.
    *
    * @return array
    *   (reference) array    array ref that hold array refs to the verp info and urls
    */
-  public static function getVerpAndUrls($job_id, $event_queue_id, $hash, $email) {
+  public static function getVerpAndUrls($job_id, $event_queue_id, $hash) {
     // create a skeleton object and set its properties that are required by getVerpAndUrlsAndHeaders()
-    $config = CRM_Core_Config::singleton();
     $bao = new CRM_Mailing_BAO_Mailing();
     $bao->_domain = CRM_Core_BAO_Domain::getDomain();
     $bao->from_name = $bao->from_email = $bao->subject = '';
 
     // use $bao's instance method to get verp and urls
-    [$verp, $urls, $_] = $bao->getVerpAndUrlsAndHeaders($job_id, $event_queue_id, $hash, $email);
+    [$verp, $urls, $_] = $bao->getVerpAndUrlsAndHeaders($job_id, $event_queue_id, $hash);
     return [$verp, $urls];
   }
 
@@ -960,15 +960,11 @@ public static function getVerpAndUrls($job_id, $event_queue_id, $hash, $email) {
    *   ID of the EventQueue.
    * @param string $hash
    *   Hash of the EventQueue.
-   * @param string $email
-   *   Destination address.
-   *
-   * @param bool $isForward
    *
    * @return array
    *   array ref that hold array refs to the verp info, urls, and headers
    */
-  public function getVerpAndUrlsAndHeaders($job_id, $event_queue_id, $hash, $email, $isForward = FALSE) {
+  public function getVerpAndUrlsAndHeaders($job_id, $event_queue_id, $hash) {
     $config = CRM_Core_Config::singleton();
 
     /**
@@ -1033,401 +1029,20 @@ public function getVerpAndUrlsAndHeaders($job_id, $event_queue_id, $hash, $email
       'List-Unsubscribe' => "<mailto:{$verp['unsubscribe']}>",
     ];
     self::addMessageIdHeader($headers, 'm', $job_id, $event_queue_id, $hash);
-    if ($isForward) {
-      $headers['Subject'] = "[Fwd:{$this->subject}]";
-    }
     return [&$verp, &$urls, &$headers];
   }
 
-  /**
-   * Compose a message.
-   *
-   * @deprecated
-   *   This is used by CiviMail but will be made redundant by FlexMailer/TokenProcessor.
-   * @param int $job_id
-   *   ID of the Job associated with this message.
-   * @param int $event_queue_id
-   *   ID of the EventQueue.
-   * @param string $hash
-   *   Hash of the EventQueue.
-   * @param string $contactId
-   *   ID of the Contact.
-   * @param string $email
-   *   Destination address.
-   * @param string $recipient
-   *   To: of the recipient.
-   * @param bool $test
-   *   Is this mailing a test?.
-   * @param $contactDetails
-   * @param $attachments
-   * @param bool $isForward
-   *   Is this mailing compose for forward?.
-   * @param string $fromEmail
-   *   Email address of who is forwarding it.
-   *
-   * @param null $replyToEmail
-   *
-   * @return Mail_mime               The mail object
-   */
-  public function compose(
-    $job_id, $event_queue_id, $hash, $contactId,
-    $email, &$recipient, $test,
-    $contactDetails, &$attachments, $isForward = FALSE,
-    $fromEmail = NULL, $replyToEmail = NULL
-  ) {
-    $config = CRM_Core_Config::singleton();
-    $this->getTokens();
-
-    if ($this->_domain == NULL) {
-      $this->_domain = CRM_Core_BAO_Domain::getDomain();
-    }
-
-    [$verp, $urls, $headers] = $this->getVerpAndUrlsAndHeaders(
-      $job_id,
-      $event_queue_id,
-      $hash,
-      $email,
-      $isForward
-    );
-
-    //set from email who is forwarding it and not original one.
-    if ($fromEmail) {
-      unset($headers['From']);
-      $headers['From'] = "<{$fromEmail}>";
-    }
-
-    if ($replyToEmail && ($fromEmail != $replyToEmail)) {
-      $headers['Reply-To'] = "{$replyToEmail}";
-    }
-
-    if ($contactDetails) {
-      $contact = $contactDetails;
-    }
-    elseif ($contactId === 0) {
-      //anonymous user
-      $contact = [];
-      CRM_Utils_Hook::tokenValues($contact, [$contactId], $job_id);
-    }
-    else {
-      $params = [['contact_id', '=', $contactId, 0, 0]];
-      [$contact] = CRM_Contact_BAO_Query::apiQuery($params);
-      // $contact is an array of [ contactID => contactDetails ]
-
-      // also call the hook to get contact details
-      CRM_Utils_Hook::tokenValues($contact, [$contactId], $job_id);
-
-      // Don't send if contact doesn't exist
-      $contact = reset($contact);
-      if (!$contact || is_a($contact, 'CRM_Core_Error')) {
-        CRM_Core_Error::debug_log_message(ts('CiviMail will not send email to a non-existent contact: %1',
-          [1 => $contactId]
-        ));
-        // setting this because function is called by reference
-        //@todo test not calling function by reference
-        $res = NULL;
-        return $res;
-      }
-    }
-
-    $pTemplates = $this->getPreparedTemplates();
-    $pEmails = [];
-
-    foreach ($pTemplates as $type => $pTemplate) {
-      $html = $type == 'html';
-      $pEmails[$type] = [];
-      $pEmail = &$pEmails[$type];
-      $template = &$pTemplates[$type]['template'];
-      $tokens = &$pTemplates[$type]['tokens'];
-      $idx = 0;
-      if (!empty($tokens)) {
-        foreach ($tokens as $idx => $token) {
-          $token_data = $this->getTokenData($token, $html, $contact, $verp, $urls, $event_queue_id);
-          array_push($pEmail, $template[$idx]);
-          array_push($pEmail, $token_data);
-        }
-      }
-      else {
-        array_push($pEmail, $template[$idx]);
-      }
-
-      if (isset($template[($idx + 1)])) {
-        array_push($pEmail, $template[($idx + 1)]);
-      }
-    }
-
-    $html = NULL;
-    if (isset($pEmails['html']) && is_array($pEmails['html']) && count($pEmails['html'])) {
-      $html = &$pEmails['html'];
-    }
-
-    $text = NULL;
-    if (isset($pEmails['text']) && is_array($pEmails['text']) && count($pEmails['text'])) {
-      $text = &$pEmails['text'];
-    }
-
-    // push the tracking url on to the html email if necessary
-    if ($this->open_tracking && $html) {
-      array_push($html, "\n" . '<img src="' . CRM_Utils_System::externUrl('extern/open', "q=$event_queue_id")
-        . '" width="1" height="1" alt="" border="0">'
-      );
-    }
-
-    $message = new Mail_mime("\n");
-
-    $useSmarty = defined('CIVICRM_MAIL_SMARTY') && CIVICRM_MAIL_SMARTY;
-    if ($useSmarty) {
-      $smarty = CRM_Core_Smarty::singleton();
-      // also add the contact tokens to the template
-      $smarty->assign_by_ref('contact', $contact);
-    }
-
-    $mailParams = $headers;
-    if ($text) {
-      $textBody = implode('', $text);
-      if ($useSmarty) {
-        $textBody = $smarty->fetch("string:$textBody");
-      }
-      $mailParams['text'] = $textBody;
-    }
-
-    if ($html) {
-      $htmlBody = implode('', $html);
-      if ($useSmarty) {
-        $htmlBody = $smarty->fetch("string:$htmlBody");
-      }
-      $mailParams['html'] = $htmlBody;
-    }
-
-    if (empty($mailParams['text']) && empty($mailParams['html'])) {
-      // CRM-9833
-      // something went wrong, lets log it and return null (by reference)
-      CRM_Core_Error::debug_log_message(ts('CiviMail will not send an empty mail body, Skipping: %1',
-        [1 => $email]
-      ));
-      $res = NULL;
-      return $res;
-    }
-
-    $mailParams['attachments'] = $attachments;
-
-    $mailParams['Subject'] = $pEmails['subject'] ?? NULL;
-    if (is_array($mailParams['Subject'])) {
-      $mailParams['Subject'] = implode('', $mailParams['Subject']);
-    }
-
-    $mailParams['toName'] = CRM_Utils_Array::value('display_name',
-      $contact
-    );
-    $mailParams['toEmail'] = $email;
-
-    // Add job ID to mailParams for external email delivery service to utilise
-    $mailParams['job_id'] = $job_id;
-
-    CRM_Utils_Hook::alterMailParams($mailParams, 'civimail');
-
-    // CRM-10699 support custom email headers
-    if (!empty($mailParams['headers'])) {
-      $headers = array_merge($headers, $mailParams['headers']);
-    }
-    //cycle through mailParams and set headers array
-    foreach ($mailParams as $paramKey => $paramValue) {
-      //exclude values not intended for the header
-      if (!in_array($paramKey, [
-        'text',
-        'html',
-        'attachments',
-        'toName',
-        'toEmail',
-      ])
-      ) {
-        $headers[$paramKey] = $paramValue;
-      }
-    }
-
-    if (!empty($mailParams['text'])) {
-      $message->setTxtBody($mailParams['text']);
-    }
-
-    if (!empty($mailParams['html'])) {
-      $message->setHTMLBody($mailParams['html']);
-    }
-
-    if (!empty($mailParams['attachments'])) {
-      foreach ($mailParams['attachments'] as $fileID => $attach) {
-        $message->addAttachment($attach['fullPath'],
-          $attach['mime_type'],
-          $attach['cleanName']
-        );
-      }
-    }
-
-    //pickup both params from mail params.
-    $toName = trim($mailParams['toName']);
-    $toEmail = trim($mailParams['toEmail']);
-    if ($toName == $toEmail ||
-      strpos($toName, '@') !== FALSE
-    ) {
-      $toName = NULL;
-    }
-    else {
-      $toName = CRM_Utils_Mail::formatRFC2822Name($toName);
-    }
-
-    $headers['To'] = "$toName <$toEmail>";
-
-    $headers['Precedence'] = 'bulk';
-    // Will test in the mail processor if the X-VERP is set in the bounced email.
-    // (As an option to replace real VERP for those that can't set it up)
-    $headers['X-CiviMail-Bounce'] = $verp['bounce'];
-
-    //CRM-5058
-    //token replacement of subject
-    $headers['Subject'] = $mailParams['Subject'];
-
-    CRM_Utils_Mail::setMimeParams($message);
-    $headers = $message->headers($headers);
-
-    //get formatted recipient
-    $recipient = $headers['To'];
-
-    // make sure we unset a lot of stuff
-    unset($verp);
-    unset($urls);
-    unset($params);
-    unset($contact);
-    unset($ids);
-
-    return $message;
-  }
-
-  /**
-   * Replace tokens.
-   *
-   * Get mailing object and replaces subscribeInvite, domain and mailing tokens.
-   *
-   * @deprecated
-   *   This is used by CiviMail but will be made redundant by FlexMailer/TokenProcessor.
-   * @param CRM_Mailing_BAO_Mailing $mailing
-   */
-  public static function tokenReplace(&$mailing) {
-    $domain = CRM_Core_BAO_Domain::getDomain();
-
-    foreach (['text', 'html'] as $type) {
-      $tokens = $mailing->getTokens();
-      if (isset($mailing->templates[$type])) {
-        $mailing->templates[$type] = CRM_Utils_Token::replaceSubscribeInviteTokens($mailing->templates[$type]);
-        $mailing->templates[$type] = CRM_Utils_Token::replaceDomainTokens(
-          $mailing->templates[$type],
-          $domain,
-          $type == 'html',
-          $tokens[$type]
-        );
-        $mailing->templates[$type] = CRM_Utils_Token::replaceMailingTokens($mailing->templates[$type], $mailing, NULL, $tokens[$type]);
-      }
-    }
-  }
-
-  /**
-   * Get data to resolve tokens.
-   *
-   * @deprecated
-   *   This is used by CiviMail but will be made redundant by FlexMailer/TokenProcessor.
-   *
-   * @param array $token_a
-   * @param bool $html
-   *   Whether to encode the token result for use in HTML email
-   * @param array $contact
-   * @param string $verp
-   * @param array $urls
-   * @param int $event_queue_id
-   *
-   * @return bool|mixed|null|string
-   */
-  private function getTokenData(&$token_a, $html, &$contact, &$verp, &$urls, $event_queue_id) {
-    $type = $token_a['type'];
-    $token = $token_a['token'];
-    $data = $token;
-
-    $useSmarty = defined('CIVICRM_MAIL_SMARTY') && CIVICRM_MAIL_SMARTY;
-
-    if ($type == 'embedded_url') {
-      $embed_data = [];
-      foreach ($token as $t) {
-        $embed_data[] = $this->getTokenData($t, $html, $contact, $verp, $urls, $event_queue_id);
-      }
-      $numSlices = count($embed_data);
-      $url = '';
-      for ($i = 0; $i < $numSlices; $i++) {
-        $embed_url_data = parse_url($embed_data[$i]);
-        if (!empty($embed_url_data['scheme'])) {
-          $token_a['embed_parts'][$i] = preg_replace("/href=\"(https*:\/\/)/", "href=\"", $token_a['embed_parts'][$i]);
-        }
-        $url .= "{$token_a['embed_parts'][$i]}{$embed_data[$i]}";
-      }
-      if (isset($token_a['embed_parts'][$numSlices])) {
-        $url .= $token_a['embed_parts'][$numSlices];
-      }
-      // add trailing quote since we've gobbled it up in a previous regex
-      // function getPatterns, line 431
-      if (preg_match("/^href[ ]*=[ ]*'.*[^']$/", $url)) {
-        $url .= "'";
-      }
-      elseif (preg_match('/^href[ ]*=[ ]*".*[^"]$/', $url)) {
-        $url .= '"';
-      }
-      $data = $url;
-      // CRM-20206 Fix ampersand encoding in plain text emails
-      if (empty($html)) {
-        $data = CRM_Utils_String::unstupifyUrl($data);
-      }
-    }
-    elseif ($type == 'url') {
-      if ($this->url_tracking && !empty($this->id)) {
-        // ensure that Google CSS and any .css files are not tracked.
-        if (!(strpos($token, 'css?family') || strpos($token, '.css'))) {
-          $data = CRM_Mailing_BAO_MailingTrackableURL::getTrackerURL($token, $this->id, $event_queue_id);
-          if (!empty($html)) {
-            $data = htmlentities($data, ENT_NOQUOTES);
-          }
-        }
-      }
-      else {
-        $data = $token;
-      }
-    }
-    elseif ($type == 'contact') {
-      $data = CRM_Utils_Token::getContactTokenReplacement($token, $contact, FALSE, FALSE, $useSmarty);
-    }
-    elseif ($type == 'action') {
-      $data = CRM_Utils_Token::getActionTokenReplacement($token, $verp, $urls, $html);
-    }
-    elseif ($type == 'domain') {
-      $domain = CRM_Core_BAO_Domain::getDomain();
-      $data = CRM_Utils_Token::getDomainTokenReplacement($token, $domain, $html);
-    }
-    elseif ($type == 'mailing') {
-      if ($token == 'name') {
-        $data = $this->name;
-      }
-      elseif ($token == 'group') {
-        $groups = $this->getGroupNames();
-        $data = implode(', ', $groups);
-      }
-    }
-    else {
-      $data = $contact["{$type}.{$token}"] ?? NULL;
-    }
-    return $data;
-  }
-
   /**
    * Return a list of group names for this mailing.  Does not work with
    * prior-mailing targets.
    *
+   * @deprecated since 5.71 will be removed around 5.77
+   *
    * @return array
    *   Names of groups receiving this mailing
    */
   public function &getGroupNames() {
+    CRM_Core_Error::deprecatedWarning('unused function');
     if (!isset($this->id)) {
       return [];
     }
@@ -1437,7 +1052,7 @@ public function &getGroupNames() {
     permissions in the future, but it's called by some extensions during mail processing, when cron isn't necessarily
     called with a logged-in user.
      */
-    $mailingGroups = \Civi\Api4\MailingGroup::get(FALSE)
+    $mailingGroups = MailingGroup::get(FALSE)
       ->addSelect('group.title', 'group.frontend_title')
       ->addJoin('Group AS group', 'LEFT', ['entity_id', '=', 'group.id'])
       ->addWhere('mailing_id', '=', $this->id)
@@ -1599,10 +1214,6 @@ public static function create(array $params) {
 
     $mailing = self::add($params);
 
-    if (is_a($mailing, 'CRM_Core_Error')) {
-      $transaction->rollback();
-      return $mailing;
-    }
     // update mailings with hash values
     CRM_Contact_BAO_Contact_Utils::generateChecksum($mailing->id, NULL, NULL, NULL, 'mailing', 16);
 
@@ -1643,8 +1254,8 @@ public static function create(array $params) {
     // In v4 of the api they are not available via CRUD. At some
     // point we will create a 'submit' function which will do the crud+submit
     // but for now only CRUD is available via v4 api.
-    if (($params['version'] ?? '') !== 4) {
-      $params = self::doSubmitActions($params, $mailing);
+    if (empty($params['skip_legacy_scheduling'])) {
+      self::doSubmitActions($params, $mailing);
     }
 
     return $mailing;
@@ -1668,38 +1279,43 @@ public static function checkSendable($mailing) {
       }
       $mailing->copyValues($params);
     }
-
     $errors = [];
-    foreach (['subject', 'name', 'from_name', 'from_email'] as $field) {
-      if (empty($mailing->{$field})) {
-        $errors[$field] = ts('Field "%1" is required.', [
-          1 => $field,
-        ]);
+    if ($mailing->sms_provider_id) {
+      if (empty($mailing->body_text)) {
+        $errors['body'] = ts('Field "body_text" is required.');
       }
     }
-    if (empty($mailing->body_html) && empty($mailing->body_text)) {
-      $errors['body'] = ts('Field "body_html" or "body_text" is required.');
-    }
-
-    if (!Civi::settings()->get('disable_mandatory_tokens_check')) {
-      $header = $mailing->header_id && $mailing->header_id != 'null' ? CRM_Mailing_BAO_MailingComponent::findById($mailing->header_id) : NULL;
-      $footer = $mailing->footer_id && $mailing->footer_id != 'null' ? CRM_Mailing_BAO_MailingComponent::findById($mailing->footer_id) : NULL;
-      foreach (['body_html', 'body_text'] as $field) {
+    else {
+      foreach (['subject', 'name', 'from_name', 'from_email'] as $field) {
         if (empty($mailing->{$field})) {
-          continue;
+          $errors[$field] = ts('Field "%1" is required.', [
+            1 => $field,
+          ]);
         }
-        $str = ($header ? $header->{$field} : '') . $mailing->{$field} . ($footer ? $footer->{$field} : '');
-        $err = CRM_Utils_Token::requiredTokens($str);
-        if ($err !== TRUE) {
-          foreach ($err as $token => $desc) {
-            $errors["{$field}:{$token}"] = ts('This message is missing a required token - {%1}: %2',
-              [1 => $token, 2 => $desc]
-            );
+      }
+      if (empty($mailing->body_html) && empty($mailing->body_text)) {
+        $errors['body'] = ts('Field "body_html" or "body_text" is required.');
+      }
+
+      if (!Civi::settings()->get('disable_mandatory_tokens_check')) {
+        $header = $mailing->header_id && $mailing->header_id !== 'null' ? CRM_Mailing_BAO_MailingComponent::findById($mailing->header_id) : NULL;
+        $footer = $mailing->footer_id && $mailing->footer_id !== 'null' ? CRM_Mailing_BAO_MailingComponent::findById($mailing->footer_id) : NULL;
+        foreach (['body_html', 'body_text'] as $field) {
+          if (empty($mailing->{$field})) {
+            continue;
+          }
+          $str = ($header ? $header->{$field} : '') . $mailing->{$field} . ($footer ? $footer->{$field} : '');
+          $err = CRM_Utils_Token::requiredTokens($str);
+          if ($err !== TRUE) {
+            foreach ($err as $token => $desc) {
+              $errors["{$field}:{$token}"] = ts('This message is missing a required token - {%1}: %2',
+                [1 => $token, 2 => $desc]
+              );
+            }
           }
         }
       }
     }
-
     return $errors;
   }
 
@@ -1722,7 +1338,7 @@ public static function replaceGroups($mailingId, $type, $entity, $entityIds) {
     civicrm_api3('mailing_group', 'replace', [
       'mailing_id' => $mailingId,
       'group_type' => $type,
-      'entity_table' => ($entity == 'groups') ? CRM_Contact_BAO_Group::getTableName() : CRM_Mailing_BAO_Mailing::getTableName(),
+      'entity_table' => ($entity === 'groups') ? CRM_Contact_BAO_Group::getTableName() : CRM_Mailing_BAO_Mailing::getTableName(),
       'values' => $values,
     ]);
   }
@@ -1898,10 +1514,10 @@ public static function &report($id, $skipDetails = FALSE, $isSMS = FALSE) {
         $row['name'] = "Search Results";
       }
 
-      if ($mailing->group_type == 'Include') {
+      if ($mailing->group_type === 'Include') {
         $report['group']['include'][] = $row;
       }
-      elseif ($mailing->group_type == 'Base') {
+      elseif ($mailing->group_type === 'Base') {
         $report['group']['base'][] = $row;
       }
       else {
@@ -2181,8 +1797,6 @@ public static function &report($id, $skipDetails = FALSE, $isSMS = FALSE) {
   public function getCount() {
     $this->selectAdd();
     $this->selectAdd('COUNT(id) as count');
-
-    $session = CRM_Core_Session::singleton();
     $this->find(TRUE);
 
     return $this->count;
@@ -2317,9 +1931,6 @@ public static function mailingACLIDs() {
   public function &getRows($offset, $rowCount, $sort, $additionalClause = NULL, $additionalParams = NULL) {
     $mailing = self::getTableName();
     $job = CRM_Mailing_BAO_MailingJob::getTableName();
-    $group = CRM_Mailing_DAO_MailingGroup::getTableName();
-    $session = CRM_Core_Session::singleton();
-
     $mailingACL = self::mailingACL();
 
     //get all campaigns.
@@ -2384,7 +1995,7 @@ public function &getRows($offset, $rowCount, $sort, $additionalClause = NULL, $a
       $rows[] = [
         'id' => $dao->id,
         'name' => $dao->name,
-        'status' => $dao->status ? $dao->status : 'Not scheduled',
+        'status' => $dao->status ?: 'Not scheduled',
         'created_date' => CRM_Utils_Date::customFormat($dao->created_date),
         'scheduled' => CRM_Utils_Date::customFormat($dao->scheduled_date),
         'scheduled_iso' => $dao->scheduled_date,
@@ -2459,25 +2070,6 @@ public static function self_hook_civicrm_pre(\Civi\Core\Event\PreEvent $event) {
     }
   }
 
-  /**
-   * @deprecated
-   *  Use CRM_Mailing_BAO_MailingJob::del($id)
-   *
-   * @param int $id
-   *   Id of the Job to delete.
-   *
-   * @return void
-   */
-  public static function delJob($id) {
-    if (empty($id)) {
-      throw new CRM_Core_Exception(ts('No id passed to mailing delJob function'));
-    }
-
-    CRM_Core_Error::deprecatedWarning('This function is deprecated, use CRM_Mailing_BAO_MailingJob::del instead');
-
-    CRM_Mailing_BAO_MailingJob::deleteRecord(['id' => $id]);
-  }
-
   /**
    * @deprecated
    *   This is used by CiviMail but will be made redundant by FlexMailer/TokenProcessor.
@@ -2485,7 +2077,7 @@ public static function delJob($id) {
    */
   public function getReturnProperties() {
     $tokens = &$this->getTokens();
-
+    CRM_Core_Error::deprecatedWarning('function no longer called - use flexmailer');
     $properties = [];
     if (isset($tokens['html']) &&
       isset($tokens['html']['contact'])
@@ -2595,9 +2187,11 @@ public static function commonCompose(&$form) {
           ['onChange' => "selectValue( this.value, '{$prefix}');", 'class' => 'crm-select2 huge']
         );
       }
-      $form->add('checkbox', "{$prefix}updateTemplate", ts('Update Template'), NULL);
-      $form->add('checkbox', "{$prefix}saveTemplate", ts('Save As New Template'), ['onclick' => "showSaveDetails(this, '{$prefix}');"]);
-      $form->add('text', "{$prefix}saveTemplateName", ts('Template Title'));
+      if (\CRM_Core_Permission::check('edit message templates')) {
+        $form->add('checkbox', "{$prefix}updateTemplate", ts('Update Template'), NULL);
+        $form->add('checkbox', "{$prefix}saveTemplate", ts('Save As New Template'), ['onclick' => "showSaveDetails(this, '{$prefix}');"]);
+        $form->add('text', "{$prefix}saveTemplateName", ts('Template Title'));
+      }
     }
 
     // I'm not sure this is ever called.
@@ -2649,27 +2243,6 @@ public function searchMailingIDs() {
    *   array content/component.
    */
   public static function getMailingContent(&$report, &$form, $isSMS = FALSE) {
-    $htmlHeader = $textHeader = NULL;
-    $htmlFooter = $textFooter = NULL;
-
-    if (!$isSMS) {
-      if ($report['mailing']['header_id']) {
-        $header = new CRM_Mailing_BAO_MailingComponent();
-        $header->id = $report['mailing']['header_id'];
-        $header->find(TRUE);
-        $htmlHeader = $header->body_html;
-        $textHeader = $header->body_text;
-      }
-
-      if ($report['mailing']['footer_id']) {
-        $footer = new CRM_Mailing_BAO_MailingComponent();
-        $footer->id = $report['mailing']['footer_id'];
-        $footer->find(TRUE);
-        $htmlFooter = $footer->body_html;
-        $textFooter = $footer->body_text;
-      }
-    }
-
     $mailingKey = $form->_mailing_id;
     if (!$isSMS) {
       if ($hash = CRM_Mailing_BAO_Mailing::getMailingHash($mailingKey)) {
@@ -2872,10 +2445,10 @@ public static function getContactMailingSelector(&$params) {
         "mid={$values['mailing_id']}&reset=1&cid={$params['contact_id']}&event=queue&context=mailing");
       $mailing['start_date'] = CRM_Utils_Date::customFormat($values['start_date']);
       //CRM-12814
-      $mailing['openstats'] = "Opens: " .
-        CRM_Utils_Array::value($values['mailing_id'], $openCounts, 0) .
-        "<br />Clicks: " .
-        $clickCounts[$values['mailing_id']] ?? 0;
+      $clicks = $clickCounts[$values['mailing_id']] ?? 0;
+      $opens = $openCounts[$values['mailing_id']] ?? 0;
+      $mailing['openstats'] = ts('Opens: %1', [1 => $opens]) . '<br />' .
+        ts('Clicks: %1', [1 => $clicks]);
 
       $actionLinks = [
         CRM_Core_Action::VIEW => [
diff --git a/www/modules/civicrm/CRM/Mailing/BAO/MailingJob.php b/www/modules/civicrm/CRM/Mailing/BAO/MailingJob.php
index 326da1cb8..07ba6ea50 100644
--- a/www/modules/civicrm/CRM/Mailing/BAO/MailingJob.php
+++ b/www/modules/civicrm/CRM/Mailing/BAO/MailingJob.php
@@ -9,6 +9,7 @@
  +--------------------------------------------------------------------+
  */
 use Civi\Api4\ActivityContact;
+use Civi\Api4\MailingJob;
 
 /**
  *
@@ -37,23 +38,18 @@ class CRM_Mailing_BAO_MailingJob extends CRM_Mailing_DAO_MailingJob {
    *
    * @param array $params
    *
+   * @deprecated since 5.71 will be removed around 5.85
+   *
    * @return \CRM_Mailing_BAO_MailingJob
    * @throws \CRM_Core_Exception
    */
-  public static function create($params) {
-    if (empty($params['id']) && empty($params['mailing_id'])) {
-      throw new CRM_Core_Exception("Failed to create job: Unknown mailing ID");
-    }
-    $op = empty($params['id']) ? 'create' : 'edit';
-    CRM_Utils_Hook::pre($op, 'MailingJob', $params['id'] ?? NULL, $params);
-
-    $jobDAO = new CRM_Mailing_BAO_MailingJob();
-    $jobDAO->copyValues($params);
-    $jobDAO->save();
+  public static function create(array $params): self {
+    CRM_Core_Error::deprecatedWarning('use the api');
+    $jobDAO = self::writeRecord($params);
     if (!empty($params['mailing_id']) && empty('is_calling_function_updated_to_reflect_deprecation')) {
+      CRM_Core_Error::deprecatedWarning('mail recipients should not be generated during MailingJob::create');
       CRM_Mailing_BAO_Mailing::getRecipients($params['mailing_id']);
     }
-    CRM_Utils_Hook::post($op, 'MailingJob', $jobDAO->id, $jobDAO);
     return $jobDAO;
   }
 
@@ -69,14 +65,12 @@ public static function create($params) {
   public static function runJobs($testParams = NULL, $mode = NULL) {
     $job = $mode === 'sms' ? new CRM_Mailing_BAO_SMSJob() : new CRM_Mailing_BAO_MailingJob();
 
-    $jobTable = CRM_Mailing_DAO_MailingJob::getTableName();
-    $mailingTable = CRM_Mailing_DAO_Mailing::getTableName();
     $mailerBatchLimit = Civi::settings()->get('mailerBatchLimit');
 
     if (!empty($testParams)) {
       $query = "
       SELECT *
-        FROM $jobTable
+        FROM civicrm_mailing_job
        WHERE id = {$testParams['job_id']}";
       $job->query($query);
     }
@@ -85,17 +79,14 @@ public static function runJobs($testParams = NULL, $mode = NULL) {
       $mailingACL = CRM_Mailing_BAO_Mailing::mailingACL('m');
       $domainID = CRM_Core_Config::domainID();
 
-      $modeClause = 'AND m.sms_provider_id IS NULL';
-      if ($mode == 'sms') {
-        $modeClause = 'AND m.sms_provider_id IS NOT NULL';
-      }
+      $modeClause = 'AND m.sms_provider_id ' . ($mode === 'sms' ? 'IS NOT NULL' : 'IS NULL');
 
       // Select the first child job that is scheduled
       // CRM-6835
       $query = "
       SELECT   j.*
-        FROM   $jobTable     j,
-           $mailingTable m
+        FROM   civicrm_mailing_job     j,
+           civicrm_mailing m
        WHERE   m.id = j.mailing_id AND m.domain_id = {$domainID}
                      {$modeClause}
          AND   j.is_test = 0
@@ -114,6 +105,7 @@ public static function runJobs($testParams = NULL, $mode = NULL) {
     }
 
     while ($job->fetch()) {
+      $mailingID = $job->mailing_id;
       // still use job level lock for each child job
       $lock = Civi::lockManager()->acquire("data.mailing.job.{$job->id}");
       if (!$lock->isAcquired()) {
@@ -134,8 +126,8 @@ public static function runJobs($testParams = NULL, $mode = NULL) {
         );
 
         if (
-          $job->status != 'Running' &&
-          $job->status != 'Scheduled'
+          $job->status !== 'Running' &&
+          $job->status !== 'Scheduled'
         ) {
           // this includes Cancelled and other statuses, CRM-4246
           $lock->release();
@@ -145,37 +137,35 @@ public static function runJobs($testParams = NULL, $mode = NULL) {
 
       /* Queue up recipients for the child job being launched */
 
-      if ($job->status != 'Running') {
+      if ($job->status !== 'Running') {
         $transaction = new CRM_Core_Transaction();
 
         // have to queue it up based on the offset and limits
         // get the parent ID, and limit and offset
-        $job->queue($testParams);
+        if (!empty($testParams)) {
+          CRM_Mailing_BAO_Mailing::getTestRecipients($testParams, (int) $mailingID);
+        }
+        else {
+          self::queue((int) $job->mailing_id, (int) $job->job_offset, (int) $job->job_limit, (int) $job->id);
+        }
 
         // Update to show job has started.
-        self::create([
+        MailingJob::update(FALSE)->setValues([
           'id' => $job->id,
           'start_date' => date('YmdHis'),
           'status' => 'Running',
-        ]);
+        ])->execute();
 
         $transaction->commit();
       }
 
-      // Get the mailer
+      // Compose and deliver each child job
       if ($mode === NULL) {
         $mailer = \Civi::service('pear_mail');
-      }
-      elseif ($mode == 'sms') {
-        $mailer = CRM_SMS_Provider::singleton(['mailing_id' => $job->mailing_id]);
-      }
-
-      // Compose and deliver each child job
-      if (\CRM_Utils_Constant::value('CIVICRM_FLEXMAILER_HACK_DELIVER')) {
         $isComplete = Civi\Core\Resolver::singleton()->call(CIVICRM_FLEXMAILER_HACK_DELIVER, [$job, $mailer, $testParams]);
       }
-      else {
-        $isComplete = $job->deliver($mailer, $testParams);
+      elseif ($mode === 'sms') {
+        $isComplete = $job->deliver(NULL, !empty($testParams));
       }
 
       CRM_Utils_Hook::post('create', 'CRM_Mailing_DAO_Spool', $job->id, $isComplete);
@@ -184,9 +174,11 @@ public static function runJobs($testParams = NULL, $mode = NULL) {
       if ($isComplete) {
         // Finish the job.
 
-        $transaction = new CRM_Core_Transaction();
-        self::create(['id' => $job->id, 'end_date' => date('YmdHis'), 'status' => 'Complete']);
-        $transaction->commit();
+        MailingJob::update(FALSE)->setValues([
+          'id' => $job->id,
+          'end_date' => 'now',
+          'status' => 'Complete',
+        ])->execute();
 
         // don't mark the mailing as complete
       }
@@ -350,7 +342,11 @@ public static function runJobs_pre(int $offset = 200, $mode = NULL): void {
       self::split_job((int) $offset, (int) $job->id, (int) $job->mailing_id, $job->scheduled_date);
 
       // Update the status of the parent job
-      self::create(['id' => $job->id, 'start_date' => date('YmdHis'), 'status' => 'Running']);
+      MailingJob::update(FALSE)->setValues([
+        'id' => $job->id,
+        'start_date' => 'now',
+        'status' => 'Running',
+      ])->execute();
       $transaction->commit();
 
       // Release the job lock
@@ -407,347 +403,63 @@ private static function split_job(int $offset, int $jobID, int $mailingID, strin
   }
 
   /**
-   * @param ?array $testParams
-   */
-  public function queue(?array $testParams = NULL) {
-    if (!empty($testParams)) {
-      CRM_Mailing_BAO_Mailing::getTestRecipients($testParams, (int) $this->mailing_id);
-    }
-    else {
-      // We are still getting all the recipients from the parent job
-      // so we don't mess with the include/exclude logic.
-      $recipients = CRM_Mailing_BAO_MailingRecipients::mailingQuery($this->mailing_id, $this->job_offset, $this->job_limit);
-
-      $params = [];
-      $count = 0;
-      // dev/core#1768 Get the mail sync interval.
-      $mail_sync_interval = Civi::settings()->get('civimail_sync_interval');
-      while ($recipients->fetch()) {
-        // CRM-18543: there are situations when both the email and phone are null.
-        // Skip the recipient in this case.
-        if (empty($recipients->email_id) && empty($recipients->phone_id)) {
-          continue;
-        }
-        $params[] = [
-          'job_id' => $this->id,
-          'email_id' => $recipients->email_id ? (int) $recipients->email_id : NULL,
-          'phone_id' => $recipients->phone_id ? (int) $recipients->phone_id : NULL,
-          'contact_id' => $recipients->contact_id ? (int) $recipients->contact_id : NULL,
-          'mailing_id' => (int) $this->mailing_id,
-          'is_test' => !empty($testParams),
-        ];
-        $count++;
-        /*
-        The mail sync interval is used here to determine how
-        many rows to insert in each insert statement.
-        The discussion & name of the setting implies that the intent of the
-        setting is the frequency with which the mailing tables are updated
-        with information about actions taken on the mailings (ie if you send
-        an email & quickly update the delivered table that impacts information
-        availability.
-
-        However, here it is used to manage the size of each individual
-        insert statement. It is unclear why as the trade offs are out of sync
-        ie. you want you insert statements here to be 'big, but not so big they
-        stall out' but in the delivery context it's a trade off between
-        information availability & performance.
-        https://github.com/civicrm/civicrm-core/pull/17367 */
-
-        if ($count % $mail_sync_interval === 0) {
-          CRM_Mailing_Event_BAO_MailingEventQueue::writeRecords($params);
-          $count = 0;
-          $params = [];
-        }
-      }
-
-      if (!empty($params)) {
-        CRM_Mailing_Event_BAO_MailingEventQueue::writeRecords($params);
-      }
-    }
-  }
-
-  /**
-   * Send the mailing.
-   *
-   * @deprecated
-   *   This is used by CiviMail but will be made redundant by FlexMailer.
-   * @param object $mailer
-   *   A Mail object to send the messages.
-   *
-   * @param array $testParams
-   * @return bool
-   */
-  public function deliver(&$mailer, $testParams = NULL) {
-    if (\Civi::settings()->get('experimentalFlexMailerEngine')) {
-      throw new \RuntimeException("Cannot use legacy deliver() when experimentalFlexMailerEngine is enabled");
-    }
-
-    $mailing = new CRM_Mailing_BAO_Mailing();
-    $mailing->id = $this->mailing_id;
-    $mailing->find(TRUE);
-
-    $config = NULL;
-
-    if ($config == NULL) {
-      $config = CRM_Core_Config::singleton();
-    }
-
-    if (property_exists($mailing, 'language') && $mailing->language && $mailing->language != CRM_Core_I18n::getLocale()) {
-      $swapLang = CRM_Utils_AutoClean::swap('global://dbLocale?getter', 'call://i18n/setLocale', $mailing->language);
-    }
-
-    $job_date = $this->scheduled_date;
-    $fields = [];
-
-    if (!empty($testParams)) {
-      $mailing->subject = ts('[CiviMail Draft]') . ' ' . $mailing->subject;
-    }
-
-    CRM_Mailing_BAO_Mailing::tokenReplace($mailing);
-
-    // get and format attachments
-    $attachments = CRM_Core_BAO_File::getEntityFile('civicrm_mailing', $mailing->id);
-
-    if (defined('CIVICRM_MAIL_SMARTY') && CIVICRM_MAIL_SMARTY) {
-      CRM_Core_Smarty::registerStringResource();
-    }
-
-    // CRM-12376
-    // This handles the edge case scenario where all the mails
-    // have been delivered in prior jobs.
-    $isDelivered = TRUE;
-
-    // make sure that there's no more than $mailerBatchLimit mails processed in a run
-    $mailerBatchLimit = Civi::settings()->get('mailerBatchLimit');
-    $eq = self::findPendingTasks($this->id, $mailing->sms_provider_id ? 'sms' : 'email');
-    while ($eq->fetch()) {
-      if ($mailerBatchLimit > 0 && self::$mailsProcessed >= $mailerBatchLimit) {
-        if (!empty($fields)) {
-          $this->deliverGroup($fields, $mailing, $mailer, $job_date, $attachments);
-        }
-        return FALSE;
-      }
-      self::$mailsProcessed++;
-
-      $fields[] = [
-        'id' => $eq->id,
-        'hash' => $eq->hash,
-        'contact_id' => $eq->contact_id,
-        'email' => $eq->email,
-        'phone' => $eq->phone,
-      ];
-      if (count($fields) == self::MAX_CONTACTS_TO_PROCESS) {
-        $isDelivered = $this->deliverGroup($fields, $mailing, $mailer, $job_date, $attachments);
-        if (!$isDelivered) {
-          return $isDelivered;
-        }
-        $fields = [];
-      }
-    }
-
-    if (!empty($fields)) {
-      $isDelivered = $this->deliverGroup($fields, $mailing, $mailer, $job_date, $attachments);
-    }
-    return $isDelivered;
-  }
-
-  /**
-   * @deprecated
-   *   This is used by CiviMail but will be made redundant by FlexMailer.
-   * @param array $fields
-   *   List of intended recipients.
-   *   Each recipient is an array with keys 'hash', 'contact_id', 'email', etc.
-   * @param $mailing
-   * @param $mailer
-   * @param $job_date
-   * @param $attachments
+   * @param int $mailingID
+   * @param int $jobOffset
+   * @param int $limit
+   * @param int $jobID
    *
-   * @return bool|null
-   * @throws Exception
+   * @return void
    */
-  public function deliverGroup(&$fields, &$mailing, &$mailer, &$job_date, &$attachments) {
-    static $smtpConnectionErrors = 0;
-
-    if (!is_object($mailer) || empty($fields)) {
-      throw new CRM_Core_Exception('Either mailer is not an object or we don\'t have recipients to send to in this group');
-    }
+  private static function queue(int $mailingID, int $jobOffset, int $limit, int $jobID): void {
+    // We are still getting all the recipients from the parent job
+    // so we don't mess with the include/exclude logic.
+    $recipients = CRM_Mailing_BAO_MailingRecipients::mailingQuery($mailingID, $jobOffset, $limit);
 
-    // get the return properties
-    $returnProperties = $mailing->getReturnProperties();
-    $params = $targetParams = $deliveredParams = [];
+    $params = [];
     $count = 0;
     // dev/core#1768 Get the mail sync interval.
     $mail_sync_interval = Civi::settings()->get('civimail_sync_interval');
-    $retryGroup = FALSE;
-
-    foreach ($fields as $key => $field) {
-      $params[] = $field['contact_id'];
-    }
-
-    [$details] = CRM_Utils_Token::getTokenDetails(
-      $params,
-      $returnProperties,
-      TRUE, TRUE, NULL,
-      $mailing->getFlattenedTokens(),
-      get_class($this),
-      $this->id
-    );
-
-    foreach ($fields as $key => $field) {
-      $contactID = $field['contact_id'];
-      if (!array_key_exists($contactID, $details)) {
-        $details[$contactID] = [];
-      }
-
-      // Compose the mailing.
-      $recipient = $replyToEmail = NULL;
-      $replyValue = strcmp($mailing->replyto_email, $mailing->from_email);
-      if ($replyValue) {
-        $replyToEmail = $mailing->replyto_email;
-      }
-
-      $message = $mailing->compose(
-        $this->id, $field['id'], $field['hash'],
-        $field['contact_id'], $field['email'],
-        $recipient, FALSE, $details[$contactID], $attachments,
-        FALSE, NULL, $replyToEmail
-      );
-      if (empty($message)) {
-        // lets keep the message in the queue
-        // most likely a permissions related issue with smarty templates
-        // or a bad contact id? CRM-9833
+    while ($recipients->fetch()) {
+      // CRM-18543: there are situations when both the email and phone are null.
+      // Skip the recipient in this case.
+      if (empty($recipients->email_id) && empty($recipients->phone_id)) {
         continue;
       }
-
-      // Send the mailing.
-
-      $body = $message->get();
-      $headers = $message->headers();
-
-      // make $recipient actually be the *encoded* header, so as not to baffle Mail_RFC822, CRM-5743
-      $recipient = $headers['To'];
-      $result = NULL;
-
-      // disable error reporting on real mailings (but leave error reporting for tests), CRM-5744
-      if ($job_date) {
-        $errorScope = CRM_Core_TemporaryErrorScope::ignoreException();
-      }
-
-      $result = $mailer->send($recipient, $headers, $body, $this->id);
-
-      if ($job_date) {
-        unset($errorScope);
-      }
-
-      if (is_a($result, 'PEAR_Error') && !$mailing->sms_provider_id) {
-        // CRM-9191
-        $message = $result->getMessage();
-        if ($this->isTemporaryError($message)) {
-          // lets log this message and code
-          $code = $result->getCode();
-          CRM_Core_Error::debug_log_message("SMTP Socket Error or failed to set sender error. Message: $message, Code: $code");
-
-          // these are socket write errors which most likely means smtp connection errors
-          // lets skip them and reconnect.
-          $smtpConnectionErrors++;
-          if ($smtpConnectionErrors <= 5) {
-            $mailer->disconnect();
-            $retryGroup = TRUE;
-            continue;
-          }
-
-          // seems like we have too many of them in a row, we should
-          // write stuff to disk and abort the cron job
-          $this->writeToDB(
-            $deliveredParams,
-            $targetParams,
-            $mailing,
-            $job_date
-          );
-
-          CRM_Core_Error::debug_log_message("Too many SMTP Socket Errors. Exiting");
-          CRM_Utils_System::civiExit();
-        }
-
-        // Register the bounce event.
-
-        $params = [
-          'event_queue_id' => $field['id'],
-          'job_id' => $this->id,
-          'hash' => $field['hash'],
-        ];
-        $params = array_merge($params,
-          CRM_Mailing_BAO_BouncePattern::match($result->getMessage())
-        );
-        CRM_Mailing_Event_BAO_MailingEventBounce::recordBounce($params);
-      }
-      elseif (is_a($result, 'PEAR_Error') && $mailing->sms_provider_id) {
-        // Handle SMS errors: CRM-15426
-        $job_id = intval($this->id);
-        $mailing_id = intval($mailing->id);
-        CRM_Core_Error::debug_log_message("Failed to send SMS message. Vars: mailing_id: {$mailing_id}, job_id: {$job_id}. Error message follows.");
-        CRM_Core_Error::debug_log_message($result->getMessage());
-      }
-      else {
-        // Register the delivery event.
-        $deliveredParams[] = $field['id'];
-        $targetParams[] = $field['contact_id'];
-
-        $count++;
-        // dev/core#1768 Mail sync interval is now configurable.
-        if ($count % $mail_sync_interval == 0) {
-          $this->writeToDB(
-            $deliveredParams,
-            $targetParams,
-            $mailing,
-            $job_date
-          );
-          $count = 0;
-
-          // hack to stop mailing job at run time, CRM-4246.
-          // to avoid making too many DB calls for this rare case
-          // lets do it when we snapshot
-          $status = CRM_Core_DAO::getFieldValue(
-            'CRM_Mailing_DAO_MailingJob',
-            $this->id,
-            'status',
-            'id',
-            TRUE
-          );
-
-          if ($status != 'Running') {
-            return FALSE;
-          }
-        }
-      }
-
-      unset($result);
-
-      // seems like a successful delivery or bounce, lets decrement error count
-      // only if we have smtp connection errors
-      if ($smtpConnectionErrors > 0) {
-        $smtpConnectionErrors--;
-      }
-
-      // If we have enabled the Throttle option, this is the time to enforce it.
-      $mailThrottleTime = Civi::settings()->get('mailThrottleTime');
-      if (!empty($mailThrottleTime)) {
-        usleep((int ) $mailThrottleTime);
+      $params[] = [
+        'job_id' => $jobID,
+        'email_id' => $recipients->email_id ? (int) $recipients->email_id : NULL,
+        'phone_id' => $recipients->phone_id ? (int) $recipients->phone_id : NULL,
+        'contact_id' => $recipients->contact_id ? (int) $recipients->contact_id : NULL,
+        'mailing_id' => (int) $mailingID,
+        'is_test' => FALSE,
+      ];
+      $count++;
+      /*
+      The mail sync interval is used here to determine how
+      many rows to insert in each insert statement.
+      The discussion & name of the setting implies that the intent of the
+      setting is the frequency with which the mailing tables are updated
+      with information about actions taken on the mailings (ie if you send
+      an email & quickly update the delivered table that impacts information
+      availability.
+
+      However, here it is used to manage the size of each individual
+      insert statement. It is unclear why as the trade offs are out of sync
+      ie. you want you insert statements here to be 'big, but not so big they
+      stall out' but in the delivery context it's a trade off between
+      information availability & performance.
+      https://github.com/civicrm/civicrm-core/pull/17367 */
+
+      if ($count % $mail_sync_interval === 0) {
+        CRM_Mailing_Event_BAO_MailingEventQueue::writeRecords($params);
+        $count = 0;
+        $params = [];
       }
     }
 
-    $result = $this->writeToDB(
-      $deliveredParams,
-      $targetParams,
-      $mailing,
-      $job_date
-    );
-
-    if ($retryGroup) {
-      return FALSE;
+    if (!empty($params)) {
+      CRM_Mailing_Event_BAO_MailingEventQueue::writeRecords($params);
     }
-
-    return $result;
   }
 
   /**
@@ -894,7 +606,7 @@ public static function status($status) {
         'Canceled' => ts('Canceled'),
       ];
     }
-    return CRM_Utils_Array::value($status, $translation, ts('Not scheduled'));
+    return $translation[$status] ?? ts('Not scheduled');
   }
 
   /**
@@ -1030,70 +742,6 @@ public function writeToDB(
     return $result;
   }
 
-  /**
-   * Search the mailing-event queue for a list of pending delivery tasks.
-   *
-   * @param int $jobId
-   * @param string $medium
-   *   Ex: 'email' or 'sms'.
-   *
-   * @return \CRM_Mailing_Event_BAO_MailingEventQueue
-   *   A query object whose rows provide ('id', 'contact_id', 'hash') and ('email' or 'phone').
-   */
-  public static function findPendingTasks($jobId, $medium) {
-    $eq = new CRM_Mailing_Event_BAO_MailingEventQueue();
-    $queueTable = CRM_Mailing_Event_BAO_MailingEventQueue::getTableName();
-    $emailTable = CRM_Core_BAO_Email::getTableName();
-    $phoneTable = CRM_Core_BAO_Phone::getTableName();
-    $contactTable = CRM_Contact_BAO_Contact::getTableName();
-    $deliveredTable = CRM_Mailing_Event_BAO_MailingEventDelivered::getTableName();
-    $bounceTable = CRM_Mailing_Event_BAO_MailingEventBounce::getTableName();
-
-    $query = "  SELECT      $queueTable.id,
-                                $emailTable.email as email,
-                                $queueTable.contact_id,
-                                $queueTable.hash,
-                                NULL as phone
-                    FROM        $queueTable
-                    INNER JOIN  $emailTable
-                            ON  $queueTable.email_id = $emailTable.id
-                    INNER JOIN  $contactTable
-                            ON  $contactTable.id = $emailTable.contact_id
-                    LEFT JOIN   $deliveredTable
-                            ON  $queueTable.id = $deliveredTable.event_queue_id
-                    LEFT JOIN   $bounceTable
-                            ON  $queueTable.id = $bounceTable.event_queue_id
-                    WHERE       $queueTable.job_id = " . $jobId . "
-                        AND     $deliveredTable.id IS null
-                        AND     $bounceTable.id IS null
-                        AND    $contactTable.is_opt_out = 0";
-
-    if ($medium === 'sms') {
-      $query = "
-                    SELECT      $queueTable.id,
-                                $phoneTable.phone as phone,
-                                $queueTable.contact_id,
-                                $queueTable.hash,
-                                NULL as email
-                    FROM        $queueTable
-                    INNER JOIN  $phoneTable
-                            ON  $queueTable.phone_id = $phoneTable.id
-                    INNER JOIN  $contactTable
-                            ON  $contactTable.id = $phoneTable.contact_id
-                    LEFT JOIN   $deliveredTable
-                            ON  $queueTable.id = $deliveredTable.event_queue_id
-                    LEFT JOIN   $bounceTable
-                            ON  $queueTable.id = $bounceTable.event_queue_id
-                    WHERE       $queueTable.job_id = " . $jobId . "
-                        AND     $deliveredTable.id IS null
-                        AND     $bounceTable.id IS null
-                        AND    ( $contactTable.is_opt_out = 0
-                        OR       $contactTable.do_not_sms = 0 )";
-    }
-    $eq->query($query);
-    return $eq;
-  }
-
   /**
    * Delete the mailing job.
    *
diff --git a/www/modules/civicrm/CRM/Mailing/BAO/MailingTrackableURL.php b/www/modules/civicrm/CRM/Mailing/BAO/MailingTrackableURL.php
index 2ebf1faa8..d2b24902e 100644
--- a/www/modules/civicrm/CRM/Mailing/BAO/MailingTrackableURL.php
+++ b/www/modules/civicrm/CRM/Mailing/BAO/MailingTrackableURL.php
@@ -141,7 +141,7 @@ private static function getTrackerURLForUrlWithTokens($url, $mailing_id, $queue_
     // Append the tokenised bits and the fragment.
     if ($tokenised_params) {
       // We know the URL will already have the '?'
-      $data .= '&' . implode('&', $tokenised_params);
+      $data .= (str_contains($data, '?') ? '&' : '?') . implode('&', $tokenised_params);
     }
     if (!empty($parsed[3])) {
       $data .= $parsed[3];
diff --git a/www/modules/civicrm/CRM/Mailing/BAO/SMSJob.php b/www/modules/civicrm/CRM/Mailing/BAO/SMSJob.php
index 1f25c1193..cf2733c99 100644
--- a/www/modules/civicrm/CRM/Mailing/BAO/SMSJob.php
+++ b/www/modules/civicrm/CRM/Mailing/BAO/SMSJob.php
@@ -6,19 +6,139 @@
 class CRM_Mailing_BAO_SMSJob extends CRM_Mailing_BAO_MailingJob {
 
   /**
-   * This is used by CiviMail but will be made redundant by FlexMailer.
+   * Send the mailing.
+   *
+   * @param null $unused
+   * @param bool $isTest
+   *
+   * @return bool
+   * @throws \CRM_Core_Exception
+   * @internal
+   *
+   */
+  public function deliver($unused, $isTest) {
+    // Just in case flexmailer is passing something odd.
+    $isTest = !empty($isTest);
+    $mailingID = $this->mailing_id;
+    $mailer = CRM_SMS_Provider::singleton(['mailing_id' => $mailingID]);
+
+    $mailing = new CRM_Mailing_BAO_Mailing();
+    $mailing->id = $this->mailing_id;
+    $mailing->find(TRUE);
+
+    $config = NULL;
+
+    if ($config == NULL) {
+      $config = CRM_Core_Config::singleton();
+    }
+
+    if (property_exists($mailing, 'language') && $mailing->language && $mailing->language != CRM_Core_I18n::getLocale()) {
+      $swapLang = CRM_Utils_AutoClean::swap('global://dbLocale?getter', 'call://i18n/setLocale', $mailing->language);
+    }
+
+    $job_date = $this->scheduled_date;
+    $fields = [];
+
+    if ($isTest) {
+      $mailing->subject = ts('[CiviMail Draft]') . ' ' . $mailing->subject;
+    }
+
+    if (defined('CIVICRM_MAIL_SMARTY') && CIVICRM_MAIL_SMARTY) {
+      // This is probably a hang over from when Civi was not probably initialised.
+      // It is not relevant once we are off Smarty 2.
+      CRM_Core_Smarty::registerStringResource();
+    }
+
+    // CRM-12376
+    // This handles the edge case scenario where all the mails
+    // have been delivered in prior jobs.
+    $isDelivered = TRUE;
+
+    // make sure that there's no more than $mailerBatchLimit mails processed in a run
+    $mailerBatchLimit = Civi::settings()->get('mailerBatchLimit');
+    $eq = self::findPendingSMSTasks((int) $this->id);
+    while ($eq->fetch()) {
+      if ($mailerBatchLimit > 0 && self::$mailsProcessed >= $mailerBatchLimit) {
+        if (!empty($fields)) {
+          $this->deliverGroup($fields, $mailing, $mailer, $job_date);
+        }
+        return FALSE;
+      }
+      self::$mailsProcessed++;
+
+      $fields[] = [
+        'id' => $eq->id,
+        'hash' => $eq->hash,
+        'contact_id' => $eq->contact_id,
+        'email' => $eq->email,
+        'phone' => $eq->phone,
+      ];
+      if (count($fields) == self::MAX_CONTACTS_TO_PROCESS) {
+        $isDelivered = $this->deliverGroup($fields, $mailing, $mailer, $job_date);
+        if (!$isDelivered) {
+          return $isDelivered;
+        }
+        $fields = [];
+      }
+    }
+
+    if (!empty($fields)) {
+      $isDelivered = $this->deliverGroup($fields, $mailing, $mailer, $job_date);
+    }
+    return $isDelivered;
+  }
+
+  /**
+   * Search the mailing-event queue for a list of pending delivery tasks.
+   *
+   * @param int $jobId
+   *
+   * @return \CRM_Mailing_Event_BAO_MailingEventQueue
+   *   A query object whose rows provide ('id', 'contact_id', 'hash') and ('email' or 'phone').
+   */
+  private static function findPendingSMSTasks(int $jobId): CRM_Mailing_Event_BAO_MailingEventQueue {
+    $eq = new CRM_Mailing_Event_BAO_MailingEventQueue();
+    $query = "
+                  SELECT      queue.id,
+                              phone,
+                              queue.contact_id,
+                              queue.hash,
+                              NULL as email
+                  FROM        civicrm_mailing_event_queue queue
+                  INNER JOIN  civicrm_phone phone
+                          ON  queue.phone_id = phone.id
+                  INNER JOIN  civicrm_contact contact
+                          ON  contact.id = phone.contact_id
+                  LEFT JOIN   civicrm_mailing_event_delivered delivered
+                          ON  queue.id = delivered.event_queue_id
+                  LEFT JOIN   civicrm_mailing_event_bounce bounce
+                          ON  queue.id = bounce.event_queue_id
+                  WHERE       queue.job_id = " . $jobId . "
+                      AND     delivered.id IS null
+                      AND     bounce.id IS null
+                      AND    ( contact.is_opt_out = 0
+                      OR       contact.do_not_sms = 0 )";
+    // note this `query` function leaks memory more than CRM_Core_DAO::ExecuteQuery()
+    $eq->query($query);
+    return $eq;
+  }
+
+  /**
+   * This is used by to deliver SMS.
+   *
+   * @internal only to be used by core CiviCRM code.
+   *
    * @param array $fields
    *   List of intended recipients.
    *   Each recipient is an array with keys 'hash', 'contact_id', 'email', etc.
    * @param $mailing
    * @param $mailer
    * @param $job_date
-   * @param $attachments
    *
    * @return bool|null
    * @throws Exception
    */
-  public function deliverGroup(&$fields, &$mailing, &$mailer, &$job_date, &$attachments) {
+  private function deliverGroup($fields, &$mailing, $mailer, $job_date) {
     $count = 0;
     // dev/core#1768 Get the mail sync interval.
     $mail_sync_interval = Civi::settings()->get('civimail_sync_interval');
@@ -38,7 +158,7 @@ public function deliverGroup(&$fields, &$mailing, &$mailer, &$job_date, &$attach
       ];
       CRM_Utils_Hook::alterMailParams($mailParams, 'civimail');
       $body = $mailParams['text'];
-      $headers = ['To' => $field['phone']];
+      $headers = ['To' => $field['phone'], 'contact_id' => $contact['id']];
 
       try {
         $result = $mailer->send($headers['To'], $headers, $body, $this->id);
diff --git a/www/modules/civicrm/CRM/Mailing/DAO/BouncePattern.php b/www/modules/civicrm/CRM/Mailing/DAO/BouncePattern.php
index ed56a5d5d..56c0f0d35 100644
--- a/www/modules/civicrm/CRM/Mailing/DAO/BouncePattern.php
+++ b/www/modules/civicrm/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:cb74ea782c1326413de34b89cab91124)
+ * (GenCodeChecksum:08e977099cd44998287a6ad5e90de6c8)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/DAO/BounceType.php b/www/modules/civicrm/CRM/Mailing/DAO/BounceType.php
index 89ef58bd0..4885313fd 100644
--- a/www/modules/civicrm/CRM/Mailing/DAO/BounceType.php
+++ b/www/modules/civicrm/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:54fc337778d1208a78ef9eac006ce1b5)
+ * (GenCodeChecksum:c43d2f642e0fa4858c874fbd1f8e04c4)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/DAO/Mailing.php b/www/modules/civicrm/CRM/Mailing/DAO/Mailing.php
index 1ec69fe84..a28591a28 100644
--- a/www/modules/civicrm/CRM/Mailing/DAO/Mailing.php
+++ b/www/modules/civicrm/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:919b743c8a46a78f155d417cc1bd0631)
+ * (GenCodeChecksum:38a986a63d53ba6681bfa9f6be7181b5)
  */
 
 /**
@@ -1398,7 +1398,7 @@ public static function &fields() {
           'entity' => 'Mailing',
           'bao' => 'CRM_Mailing_BAO_Mailing',
           'localizable' => 0,
-          'FKClassName' => 'CRM_SMS_DAO_Provider',
+          'FKClassName' => 'CRM_SMS_DAO_SmsProvider',
           'FKColumnName' => 'id',
           'html' => [
             'type' => 'Select',
diff --git a/www/modules/civicrm/CRM/Mailing/DAO/MailingAB.php b/www/modules/civicrm/CRM/Mailing/DAO/MailingAB.php
index 46e575e70..090e223cf 100644
--- a/www/modules/civicrm/CRM/Mailing/DAO/MailingAB.php
+++ b/www/modules/civicrm/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:bd7f5528773566cb04becedf849c5e1f)
+ * (GenCodeChecksum:b533666589df033383322752aae451ed)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/DAO/MailingComponent.php b/www/modules/civicrm/CRM/Mailing/DAO/MailingComponent.php
index 3b396d36f..aacd172cf 100644
--- a/www/modules/civicrm/CRM/Mailing/DAO/MailingComponent.php
+++ b/www/modules/civicrm/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:7e8514edf9fb7b55783cc813df572660)
+ * (GenCodeChecksum:4acc5bcb4973b8f5879c7a78cdd9ff7e)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/DAO/MailingGroup.php b/www/modules/civicrm/CRM/Mailing/DAO/MailingGroup.php
index a65cca122..0c95cc5d9 100644
--- a/www/modules/civicrm/CRM/Mailing/DAO/MailingGroup.php
+++ b/www/modules/civicrm/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:65ad1f210e2b4be6f4608e72694619a3)
+ * (GenCodeChecksum:b0c639058b4099bf4ce28edf8c1aa73b)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/DAO/MailingJob.php b/www/modules/civicrm/CRM/Mailing/DAO/MailingJob.php
index da849dd5e..8a6b14384 100644
--- a/www/modules/civicrm/CRM/Mailing/DAO/MailingJob.php
+++ b/www/modules/civicrm/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:61340ad6fba42d576e6289778b494bcc)
+ * (GenCodeChecksum:aea716406932dbefe1d93e1ddefa67ef)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/DAO/MailingRecipients.php b/www/modules/civicrm/CRM/Mailing/DAO/MailingRecipients.php
index f74938af6..7daa8b82d 100644
--- a/www/modules/civicrm/CRM/Mailing/DAO/MailingRecipients.php
+++ b/www/modules/civicrm/CRM/Mailing/DAO/MailingRecipients.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingRecipients.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:bf17f03f0d47a6eda3deab64a581aec8)
+ * (GenCodeChecksum:525e0d06e1197eb1265f0dc16dc27f90)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/DAO/MailingTrackableURL.php b/www/modules/civicrm/CRM/Mailing/DAO/MailingTrackableURL.php
index 76ad4f4c1..7a7e3b76a 100644
--- a/www/modules/civicrm/CRM/Mailing/DAO/MailingTrackableURL.php
+++ b/www/modules/civicrm/CRM/Mailing/DAO/MailingTrackableURL.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingTrackableURL.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ce6c77dd702379d639959d67e7980a78)
+ * (GenCodeChecksum:d67afb11bc3fcc7f504a6e1c1b224c97)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/DAO/Spool.php b/www/modules/civicrm/CRM/Mailing/DAO/Spool.php
index ba0cf1470..9129b3387 100644
--- a/www/modules/civicrm/CRM/Mailing/DAO/Spool.php
+++ b/www/modules/civicrm/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:7c22f5a9de4a49ac64bf394c58b8cd4c)
+ * (GenCodeChecksum:3428809b9b08d641d615c79f93caafb3)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventForward.php b/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventForward.php
index 0b29b6a08..2b3ed3549 100644
--- a/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventForward.php
+++ b/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventForward.php
@@ -16,353 +16,6 @@
  */
 class CRM_Mailing_Event_BAO_MailingEventForward extends CRM_Mailing_Event_DAO_MailingEventForward {
 
-  /**
-   * Create a new forward event, create a new contact if necessary
-   *
-   * @param $job_id
-   * @param $queue_id
-   * @param $hash
-   * @param $forward_email
-   * @param string|null $fromEmail
-   * @param array|null $comment
-   *
-   * @return bool
-   */
-  public static function &forward($job_id, $queue_id, $hash, $forward_email, $fromEmail = NULL, $comment = NULL) {
-    $q = CRM_Mailing_Event_BAO_MailingEventQueue::verify(NULL, $queue_id, $hash);
-
-    $successfulForward = FALSE;
-    $contact_id = NULL;
-    if (!$q) {
-      return $successfulForward;
-    }
-
-    // Find the email address/contact, if it exists.
-
-    $contact = CRM_Contact_BAO_Contact::getTableName();
-    $email = CRM_Core_BAO_Email::getTableName();
-    $queueTable = CRM_Mailing_Event_BAO_MailingEventQueue::getTableName();
-    $job = CRM_Mailing_BAO_MailingJob::getTableName();
-
-    $dao = new CRM_Core_DAO();
-    $dao->query("
-                SELECT      $contact.id as contact_id,
-                            $email.id as email_id,
-                            $contact.do_not_email as do_not_email,
-                            $queueTable.id as queue_id
-                FROM        ($email, $job as temp_job)
-                INNER JOIN  $contact
-                        ON  $email.contact_id = $contact.id
-                LEFT JOIN   $queueTable
-                        ON  $email.id = $queueTable.email_id
-                LEFT JOIN   $job
-                        ON  $queueTable.job_id = $job.id
-                        AND temp_job.mailing_id = $job.mailing_id
-                WHERE       $queueTable.job_id = $job_id
-                    AND     $email.email = '" .
-      CRM_Utils_Type::escape($forward_email, 'String') . "'"
-    );
-
-    $dao->fetch();
-
-    $transaction = new CRM_Core_Transaction();
-
-    if (isset($dao->queue_id) ||
-      (isset($dao->do_not_email) && $dao->do_not_email == 1)
-    ) {
-      // We already sent this mailing to $forward_email, or we should
-      // never email this contact.  Give up.
-
-      return $successfulForward;
-    }
-
-    require_once 'api/api.php';
-    $contactParams = [
-      'email' => $forward_email,
-      'version' => 3,
-    ];
-    $contactValues = civicrm_api('contact', 'get', $contactParams);
-    $count = $contactValues['count'];
-
-    if ($count == 0) {
-      // If the contact does not exist, create one.
-
-      $formatted = [
-        'contact_type' => 'Individual',
-        'version' => 3,
-      ];
-      $locationType = CRM_Core_BAO_LocationType::getDefault();
-      $value = [
-        'email' => $forward_email,
-        'location_type_id' => $locationType->id,
-      ];
-      self::_civicrm_api3_deprecated_add_formatted_param($value, $formatted);
-      $formatted['onDuplicate'] = CRM_Import_Parser::DUPLICATE_SKIP;
-      $formatted['fixAddress'] = TRUE;
-      $contact = civicrm_api('contact', 'create', $formatted);
-      if (civicrm_error($contact)) {
-        return $successfulForward;
-      }
-      $contact_id = $contact['id'];
-    }
-    $email = new CRM_Core_DAO_Email();
-    $email->email = $forward_email;
-    $email->find(TRUE);
-    $email_id = $email->id;
-    if (!$contact_id) {
-      $contact_id = $email->contact_id;
-    }
-
-    // Create a new queue event.
-
-    $queue_params = [
-      'email_id' => $email_id,
-      'contact_id' => $contact_id,
-      'job_id' => $job_id,
-    ];
-
-    $queue = CRM_Mailing_Event_BAO_MailingEventQueue::create($queue_params);
-
-    $forward = new CRM_Mailing_Event_BAO_MailingEventForward();
-    $forward->time_stamp = date('YmdHis');
-    $forward->event_queue_id = $queue_id;
-    $forward->dest_queue_id = $queue->id;
-    $forward->save();
-
-    $dao->reset();
-    $dao->query("   SELECT  $job.mailing_id as mailing_id
-                        FROM    $job
-                        WHERE   $job.id = " .
-      CRM_Utils_Type::escape($job_id, 'Integer')
-    );
-    $dao->fetch();
-    $mailing_obj = new CRM_Mailing_BAO_Mailing();
-    $mailing_obj->id = $dao->mailing_id;
-    $mailing_obj->find(TRUE);
-
-    $config = CRM_Core_Config::singleton();
-    $mailer = \Civi::service('pear_mail');
-
-    $recipient = NULL;
-    $attachments = NULL;
-    $message = $mailing_obj->compose($job_id, $queue->id, $queue->hash,
-      $queue->contact_id, $forward_email, $recipient, FALSE, NULL, $attachments, TRUE, $fromEmail
-    );
-    //append comment if added while forwarding.
-    if (count($comment)) {
-      $message->_txtbody = ($comment['body_text'] ?? '') . $message->_txtbody;
-      if (!empty($comment['body_html'])) {
-        $message->_htmlbody = $comment['body_html'] . '<br />---------------Original message---------------------<br />' . $message->_htmlbody;
-      }
-    }
-
-    $body = $message->get();
-    $headers = $message->headers();
-
-    $result = NULL;
-    if (is_object($mailer)) {
-      $errorScope = CRM_Core_TemporaryErrorScope::ignoreException();
-      $result = $mailer->send($recipient, $headers, $body);
-      unset($errorScope);
-    }
-
-    $params = [
-      'event_queue_id' => $queue->id,
-      'job_id' => $job_id,
-      'hash' => $queue->hash,
-    ];
-    if (is_a($result, 'PEAR_Error')) {
-      // Register the bounce event.
-
-      $params = array_merge($params,
-        CRM_Mailing_BAO_BouncePattern::match($result->getMessage())
-      );
-      CRM_Mailing_Event_BAO_MailingEventBounce::recordBounce($params);
-    }
-    else {
-      $successfulForward = TRUE;
-      // Register the delivery event.
-
-      CRM_Mailing_Event_BAO_MailingEventDelivered::recordDelivery($params);
-    }
-
-    $transaction->commit();
-
-    return $successfulForward;
-  }
-
-  /**
-   * This function adds the contact variable in $values to the
-   * parameter list $params.  For most cases, $values should have length 1.  If
-   * the variable being added is a child of Location, a location_type_id must
-   * also be included.  If it is a child of phone, a phone_type must be included.
-   *
-   * @param array $values
-   *   The variable(s) to be added.
-   * @param array $params
-   *   The structured parameter list.
-   *
-   * @return bool|CRM_Utils_Error
-   */
-  protected static function _civicrm_api3_deprecated_add_formatted_param(&$values, &$params) {
-    // @todo - most of this code is UNREACHABLE.
-    // Crawl through the possible classes:
-    // Contact
-    //      Individual
-    //      Household
-    //      Organization
-    //          Location
-    //              Address
-    //              Email
-    //              Phone
-    //              IM
-    //      Note
-    //      Custom
-
-    // Cache the various object fields
-    static $fields = NULL;
-
-    if ($fields == NULL) {
-      $fields = [];
-    }
-
-    // first add core contact values since for other Civi modules they are not added
-    require_once 'CRM/Contact/BAO/Contact.php';
-    $contactFields = CRM_Contact_DAO_Contact::fields();
-    _civicrm_api3_store_values($contactFields, $values, $params);
-
-    // get the formatted location blocks into params - w/ 3.0 format, CRM-4605
-    if (!empty($values['location_type_id'])) {
-      foreach (['Phone', 'Email', 'IM', 'OpenID', 'Phone_Ext'] as $block) {
-        $name = strtolower($block);
-        if (!array_key_exists($name, $values)) {
-          continue;
-        }
-
-        if ($name === 'phone_ext') {
-          $block = 'Phone';
-        }
-
-        // block present in value array.
-        if (!array_key_exists($name, $params) || !is_array($params[$name])) {
-          $params[$name] = [];
-        }
-
-        if (!array_key_exists($block, $fields)) {
-          $className = "CRM_Core_DAO_$block";
-          $fields[$block] =& $className::fields();
-        }
-
-        $blockCnt = count($params[$name]);
-
-        // copy value to dao field name.
-        if ($name == 'im') {
-          $values['name'] = $values[$name];
-        }
-
-        _civicrm_api3_store_values($fields[$block], $values,
-          $params[$name][++$blockCnt]
-        );
-
-        if (empty($params['id']) && ($blockCnt == 1)) {
-          $params[$name][$blockCnt]['is_primary'] = TRUE;
-        }
-
-        // we only process single block at a time.
-        return TRUE;
-      }
-
-      // handle address fields.
-      if (!array_key_exists('address', $params) || !is_array($params['address'])) {
-        $params['address'] = [];
-      }
-
-      $addressCnt = 1;
-      foreach ($params['address'] as $cnt => $addressBlock) {
-        if (($values['location_type_id'] ?? NULL) ==
-          CRM_Utils_Array::value('location_type_id', $addressBlock)
-        ) {
-          $addressCnt = $cnt;
-          break;
-        }
-        $addressCnt++;
-      }
-
-      if (!array_key_exists('Address', $fields)) {
-        $fields['Address'] = CRM_Core_DAO_Address::fields();
-      }
-
-      // Note: we doing multiple value formatting here for address custom fields, plus putting into right format.
-      // The actual formatting (like date, country ..etc) for address custom fields is taken care of while saving
-      // the address in CRM_Core_BAO_Address::create method
-      if (!empty($values['location_type_id'])) {
-        static $customFields = [];
-        if (empty($customFields)) {
-          $customFields = CRM_Core_BAO_CustomField::getFields('Address');
-        }
-        // make a copy of values, as we going to make changes
-        $newValues = $values;
-        foreach ($values as $key => $val) {
-          $customFieldID = CRM_Core_BAO_CustomField::getKeyID($key);
-          if ($customFieldID && array_key_exists($customFieldID, $customFields)) {
-            // mark an entry in fields array since we want the value of custom field to be copied
-            $fields['Address'][$key] = NULL;
-
-            $htmlType = $customFields[$customFieldID]['html_type'] ?? NULL;
-            if (CRM_Core_BAO_CustomField::isSerialized($customFields[$customFieldID]) && $val) {
-              $mulValues = explode(',', $val);
-              $customOption = CRM_Core_BAO_CustomOption::getCustomOption($customFieldID, TRUE);
-              $newValues[$key] = [];
-              foreach ($mulValues as $v1) {
-                foreach ($customOption as $v2) {
-                  if ((strtolower($v2['label']) == strtolower(trim($v1))) ||
-                    (strtolower($v2['value']) == strtolower(trim($v1)))
-                  ) {
-                    if ($htmlType == 'CheckBox') {
-                      $newValues[$key][$v2['value']] = 1;
-                    }
-                    else {
-                      $newValues[$key][] = $v2['value'];
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-        // consider new values
-        $values = $newValues;
-      }
-
-      _civicrm_api3_store_values($fields['Address'], $values, $params['address'][$addressCnt]);
-
-      $addressFields = [
-        'county',
-        'country',
-        'state_province',
-        'supplemental_address_1',
-        'supplemental_address_2',
-        'supplemental_address_3',
-        'StateProvince.name',
-      ];
-
-      foreach ($addressFields as $field) {
-        if (array_key_exists($field, $values)) {
-          if (!array_key_exists('address', $params)) {
-            $params['address'] = [];
-          }
-          $params['address'][$addressCnt][$field] = $values[$field];
-        }
-      }
-
-      if ($addressCnt == 1) {
-
-        $params['address'][$addressCnt]['is_primary'] = TRUE;
-      }
-      return TRUE;
-    }
-  }
-
   /**
    * Get row count for the event selector.
    *
diff --git a/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventOpened.php b/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventOpened.php
index 52693a221..1c4470746 100644
--- a/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventOpened.php
+++ b/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventOpened.php
@@ -26,20 +26,17 @@ class CRM_Mailing_Event_BAO_MailingEventOpened extends CRM_Mailing_Event_DAO_Mai
    */
   public static function open($queue_id) {
     // First make sure there's a matching queue event.
-
-    $success = FALSE;
-
     $q = new CRM_Mailing_Event_BAO_MailingEventQueue();
     $q->id = $queue_id;
     if ($q->find(TRUE)) {
-      $oe = new CRM_Mailing_Event_BAO_MailingEventOpened();
-      $oe->event_queue_id = $queue_id;
-      $oe->time_stamp = date('YmdHis');
-      $oe->save();
-      $success = TRUE;
+      self::writeRecord([
+        'event_queue_id' => $queue_id,
+        'time_stamp' => date('YmdHis'),
+      ]);
+      return TRUE;
     }
 
-    return $success;
+    return FALSE;
   }
 
   /**
@@ -100,7 +97,7 @@ public static function getTotalCount(
       return $dao->N;
     }
     else {
-      return $dao->opened ? $dao->opened : 0;
+      return $dao->opened ?: 0;
     }
   }
 
diff --git a/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventResubscribe.php b/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventResubscribe.php
index 2c1192a71..159d5e79a 100644
--- a/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventResubscribe.php
+++ b/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventResubscribe.php
@@ -180,9 +180,6 @@ public static function &resub_to_mailing($job_id, $queue_id, $hash) {
   public static function send_resub_response($queue_id, $groups, $job) {
     // param is_domain is not supported as of now.
 
-    $config = CRM_Core_Config::singleton();
-    $domain = CRM_Core_BAO_Domain::getDomain();
-
     $jobTable = CRM_Mailing_BAO_MailingJob::getTableName();
     $mailingTable = CRM_Mailing_DAO_Mailing::getTableName();
     $contacts = CRM_Contact_DAO_Contact::getTableName();
@@ -229,18 +226,18 @@ public static function send_resub_response($queue_id, $groups, $job) {
       }
     }
 
-    list($addresses, $urls) = CRM_Mailing_BAO_Mailing::getVerpAndUrls($job, $queue_id, $eq->hash, $eq->email);
+    list($addresses, $urls) = CRM_Mailing_BAO_Mailing::getVerpAndUrls($job, $queue_id, $eq->hash);
     $bao = new CRM_Mailing_BAO_Mailing();
     $bao->body_text = $text;
     $bao->body_html = $html;
     $tokens = $bao->getTokens();
     $templates = $bao->getTemplates();
 
-    $html = CRM_Utils_Token::replaceResubscribeTokens($templates['html'], $domain, $groups, TRUE, $eq->contact_id, $eq->hash);
+    $html = CRM_Utils_Token::replaceResubscribeTokens($templates['html'], NULL, $groups);
     $html = CRM_Utils_Token::replaceActionTokens($html, $addresses, $urls, TRUE, $tokens['html']);
     $html = CRM_Utils_Token::replaceMailingTokens($html, $dao, NULL, $tokens['html']);
 
-    $text = CRM_Utils_Token::replaceResubscribeTokens($templates['text'], $domain, $groups, FALSE, $eq->contact_id, $eq->hash);
+    $text = CRM_Utils_Token::replaceResubscribeTokens($templates['text'], NULL, $groups);
     $text = CRM_Utils_Token::replaceActionTokens($text, $addresses, $urls, FALSE, $tokens['text']);
     $text = CRM_Utils_Token::replaceMailingTokens($text, $dao, NULL, $tokens['text']);
 
diff --git a/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventUnsubscribe.php b/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventUnsubscribe.php
index e831a5e17..3216734b7 100644
--- a/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventUnsubscribe.php
+++ b/www/modules/civicrm/CRM/Mailing/Event/BAO/MailingEventUnsubscribe.php
@@ -392,7 +392,7 @@ public static function send_unsub_response($queue_id, $groups, $is_domain, $job)
       }
     }
 
-    [$addresses, $urls] = CRM_Mailing_BAO_Mailing::getVerpAndUrls($job, $queue_id, $eq->hash, $eq->email);
+    [$addresses, $urls] = CRM_Mailing_BAO_Mailing::getVerpAndUrls($job, $queue_id, $eq->hash);
     $bao = new CRM_Mailing_BAO_Mailing();
     $bao->body_text = $text;
     $bao->body_html = $html;
@@ -501,7 +501,7 @@ public static function getTotalCount(
       return $dao->N;
     }
     else {
-      return $dao->unsubs ? $dao->unsubs : 0;
+      return $dao->unsubs ?: 0;
     }
   }
 
diff --git a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventBounce.php b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventBounce.php
index 563173f24..9f516a947 100644
--- a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventBounce.php
+++ b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventBounce.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventBounce.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:393a94b1b88af6753a4d32e77344eef3)
+ * (GenCodeChecksum:1b94272a41cbe10d181eea827015f7b2)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventConfirm.php b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventConfirm.php
index a5e7305d2..2392145aa 100644
--- a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventConfirm.php
+++ b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventConfirm.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventConfirm.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:16533bf0c855436ec5a131998f481dcc)
+ * (GenCodeChecksum:6034240899b98a7372d88220354b56dd)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventDelivered.php b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventDelivered.php
index 1d3df4223..2163a74a9 100644
--- a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventDelivered.php
+++ b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventDelivered.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventDelivered.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8cbbe3fbdde3f1093237bf19ac9bd9e9)
+ * (GenCodeChecksum:9a4292365965a8ed87d2306d3e0ca8a3)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventForward.php b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventForward.php
index 873ff1c24..fdc7f1cd3 100644
--- a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventForward.php
+++ b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventForward.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventForward.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:610d9e35e6dee904928285f3a6d23f3d)
+ * (GenCodeChecksum:4fc7f97b199347f2a40350082ece94db)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventOpened.php b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventOpened.php
index b7d609f48..bd9babf8e 100644
--- a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventOpened.php
+++ b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventOpened.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventOpened.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0da200b083ab097f3efdafa091b209a0)
+ * (GenCodeChecksum:efe3bc021c4b1063acb8ebc6a088538f)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventQueue.php b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventQueue.php
index b66c42b14..bc184b68c 100644
--- a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventQueue.php
+++ b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventQueue.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventQueue.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2b49f3437ecc6f6d2bf0c45370cb1089)
+ * (GenCodeChecksum:953dd56586ae02b7dde48a338f0827ba)
  */
 
 /**
@@ -248,6 +248,7 @@ public static function &fields() {
           'FKClassName' => 'CRM_Core_DAO_Email',
           'FKColumnName' => 'id',
           'html' => [
+            'type' => 'EntityRef',
             'label' => ts("Email"),
           ],
           'add' => NULL,
diff --git a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventReply.php b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventReply.php
index 7869d367d..1eaf63c7b 100644
--- a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventReply.php
+++ b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventReply.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventReply.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9a804e1c42467f857e7146bcce53d89b)
+ * (GenCodeChecksum:1559e02bfead0214ea84393304ca77ea)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventSubscribe.php b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventSubscribe.php
index 85fb1a63b..26a4d147a 100644
--- a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventSubscribe.php
+++ b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventSubscribe.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventSubscribe.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4a66301754363df0906c1c83eaaf7962)
+ * (GenCodeChecksum:20a178fffc26093c9019d39d72eef535)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventTrackableURLOpen.php b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventTrackableURLOpen.php
index b983fd0a4..c868e7a86 100644
--- a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventTrackableURLOpen.php
+++ b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventTrackableURLOpen.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventTrackableURLOpen.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c1fa35951b41c5f3e8c12652214fd591)
+ * (GenCodeChecksum:e16a7e0eb8534eac016ca1780a123e85)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventUnsubscribe.php b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventUnsubscribe.php
index a5d00022f..57a4c9f97 100644
--- a/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventUnsubscribe.php
+++ b/www/modules/civicrm/CRM/Mailing/Event/DAO/MailingEventUnsubscribe.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/MailingEventUnsubscribe.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:896e4dab857ee0a19da7d4ee899c1084)
+ * (GenCodeChecksum:41ff3d2af16124ad3682a8b056b0a99f)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Mailing/Form/Approve.php b/www/modules/civicrm/CRM/Mailing/Form/Approve.php
index a777d4f5b..78203d467 100644
--- a/www/modules/civicrm/CRM/Mailing/Form/Approve.php
+++ b/www/modules/civicrm/CRM/Mailing/Form/Approve.php
@@ -119,7 +119,7 @@ public function buildQuickform() {
     $preview['type'] = $this->_mailing->body_html ? 'html' : 'text';
     $preview['attachment'] = CRM_Core_BAO_File::attachmentInfo('civicrm_mailing', $this->_mailingID);
 
-    $this->assign_by_ref('preview', $preview);
+    $this->assign('preview', $preview);
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Mailing/Form/Component.php b/www/modules/civicrm/CRM/Mailing/Form/Component.php
index 603317c7b..d35758184 100644
--- a/www/modules/civicrm/CRM/Mailing/Form/Component.php
+++ b/www/modules/civicrm/CRM/Mailing/Form/Component.php
@@ -14,6 +14,7 @@
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
+use Civi\Api4\MailingComponent;
 
 /**
  * This class generates form components for Location Type.
@@ -88,12 +89,11 @@ public function buildQuickForm() {
    * Set default values for the form.
    */
   public function setDefaultValues() {
-    $defaults = [];
-    $params = [];
 
     if (isset($this->_id)) {
-      $params = ['id' => $this->_id];
-      CRM_Mailing_BAO_MailingComponent::retrieve($params, $defaults);
+      $defaults = MailingComponent::get(FALSE)
+        ->addWhere('id', '=', $this->_id)
+        ->execute()->single();
     }
     else {
       $defaults['is_active'] = 1;
@@ -185,4 +185,11 @@ public static function formRule($params, $files, $options) {
     return empty($errors) ? TRUE : $errors;
   }
 
+  /**
+   * @return array
+   */
+  protected function getFieldsToExcludeFromPurification(): array {
+    return ['body_html'];
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Mailing/Info.php b/www/modules/civicrm/CRM/Mailing/Info.php
index b3f0c3371..b36d0027a 100644
--- a/www/modules/civicrm/CRM/Mailing/Info.php
+++ b/www/modules/civicrm/CRM/Mailing/Info.php
@@ -139,48 +139,37 @@ public static function workflowEnabled() {
 
   /**
    * @inheritDoc
-   * @param bool $getAllUnconditionally
-   * @param bool $descriptions
-   *   Whether to return permission descriptions
-   *
-   * @return array
    */
-  public function getPermissions($getAllUnconditionally = FALSE, $descriptions = FALSE) {
+  public function getPermissions(): array {
     $permissions = [
       'access CiviMail' => [
-        ts('access CiviMail'),
+        'label' => ts('access CiviMail'),
       ],
       'access CiviMail subscribe/unsubscribe pages' => [
-        ts('access CiviMail subscribe/unsubscribe pages'),
-        ts('Subscribe/unsubscribe from mailing list group'),
+        'label' => ts('access CiviMail subscribe/unsubscribe pages'),
+        'description' => ts('Subscribe/unsubscribe from mailing list group'),
       ],
       'delete in CiviMail' => [
-        ts('delete in CiviMail'),
-        ts('Delete Mailing'),
+        'label' => ts('delete in CiviMail'),
+        'description' => ts('Delete Mailing'),
       ],
       'view public CiviMail content' => [
-        ts('view public CiviMail content'),
+        'label' => ts('view public CiviMail content'),
       ],
     ];
-
-    if (self::workflowEnabled() || $getAllUnconditionally) {
-      $permissions['create mailings'] = [
-        ts('create mailings'),
-      ];
-      $permissions['schedule mailings'] = [
-        ts('schedule mailings'),
-      ];
-      $permissions['approve mailings'] = [
-        ts('approve mailings'),
-      ];
-    }
-
-    if (!$descriptions) {
-      foreach ($permissions as $name => $attr) {
-        $permissions[$name] = array_shift($attr);
-      }
-    }
-
+    // Workflow permissions
+    $permissions['create mailings'] = [
+      'label' => ts('create mailings'),
+      'disabled' => !self::workflowEnabled(),
+    ];
+    $permissions['schedule mailings'] = [
+      'label' => ts('schedule mailings'),
+      'disabled' => !self::workflowEnabled(),
+    ];
+    $permissions['approve mailings'] = [
+      'label' => ts('approve mailings'),
+      'disabled' => !self::workflowEnabled(),
+    ];
     return $permissions;
   }
 
diff --git a/www/modules/civicrm/CRM/Mailing/Selector/Search.php b/www/modules/civicrm/CRM/Mailing/Selector/Search.php
index 8f54d1e88..09b4f7490 100644
--- a/www/modules/civicrm/CRM/Mailing/Selector/Search.php
+++ b/www/modules/civicrm/CRM/Mailing/Selector/Search.php
@@ -297,7 +297,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
         'Contact',
         $result->contact_id
       );
-      $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? $result->contact_sub_type : $result->contact_type, FALSE, $result->contact_id
+      $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ?: $result->contact_type, FALSE, $result->contact_id
       );
 
       $rows[] = $row;
diff --git a/www/modules/civicrm/CRM/Mailing/Service/ListUnsubscribe.php b/www/modules/civicrm/CRM/Mailing/Service/ListUnsubscribe.php
index 77a786e1a..17f51d200 100644
--- a/www/modules/civicrm/CRM/Mailing/Service/ListUnsubscribe.php
+++ b/www/modules/civicrm/CRM/Mailing/Service/ListUnsubscribe.php
@@ -34,6 +34,10 @@ public function alterMailParams(&$params, $context = NULL): void {
     // This code is a little ugly because it anticipates serving both code-paths.
     // But the BAO path should be properly killed. Doing so will allow you cleanup this code more.
 
+    // SMS messages don't have List-Unsubscribe, so bail early.
+    if (!array_key_exists('List-Unsubscribe', $params)) {
+      return;
+    }
     if (!in_array($context, ['civimail', 'flexmailer'])) {
       return;
     }
diff --git a/www/modules/civicrm/CRM/Member/ActionMapping.php b/www/modules/civicrm/CRM/Member/ActionMapping.php
index ff62e653d..4a992e51e 100644
--- a/www/modules/civicrm/CRM/Member/ActionMapping.php
+++ b/www/modules/civicrm/CRM/Member/ActionMapping.php
@@ -35,7 +35,7 @@ public function getEntityName(): string {
     return 'Membership';
   }
 
-  public function modifySpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
+  public function modifyApiSpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
     $spec->getFieldByName('entity_value')
       ->setLabel(ts('Membership Type'));
     $spec->getFieldByName('entity_status')
@@ -47,7 +47,7 @@ public function getValueLabels(): array {
   }
 
   public function getStatusLabels(?array $entityValue): array {
-    foreach ($entityValue ?? [] as $membershipType) {
+    foreach (array_filter($entityValue ?? []) as $membershipType) {
       if (\CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipType', $membershipType, 'auto_renew')) {
         return \CRM_Core_OptionGroup::values('auto_renew_options');
       }
@@ -95,13 +95,29 @@ public function createQuery($schedule, $phase, $defaultParams): CRM_Utils_SQL_Se
       $query['casDateField'] = 'e.' . $query['casDateField'];
     }
 
+    $recurStatuses = \Civi\Api4\ContributionRecur::getFields(FALSE)
+      ->setLoadOptions(TRUE)
+      ->addWhere('name', '=', 'contribution_status_id')
+      ->addSelect('options')
+      ->execute()
+      ->first()['options'];
+    // Exclude the renewals that are cancelled or failed.
+    $nonRenewStatusIds = array_keys(array_intersect($recurStatuses, ['Cancelled', 'Failed']));
     // FIXME: Numbers should be constants.
     if (in_array(2, $selectedStatuses)) {
       //auto-renew memberships
-      $query->where("e.contribution_recur_id IS NOT NULL");
+      $query->join('cr', 'INNER JOIN civicrm_contribution_recur cr on e.contribution_recur_id = cr.id');
+      $query->where("cr.contribution_status_id NOT IN (#nonRenewStatusIds)")
+        ->param('nonRenewStatusIds', $nonRenewStatusIds);
     }
     elseif (in_array(1, $selectedStatuses)) {
-      $query->where("e.contribution_recur_id IS NULL");
+      // non-auto-renew memberships
+      // Include the renewals that were cancelled or Failed.
+      $query->join('cr', 'LEFT JOIN civicrm_contribution_recur cr on e.contribution_recur_id = cr.id');
+      $query->where("e.contribution_recur_id IS NULL OR (
+        e.contribution_recur_id IS NOT NULL AND cr.contribution_status_id IN (#nonRenewStatusIds)
+        )")
+        ->param('nonRenewStatusIds', $nonRenewStatusIds);
     }
 
     if (!empty($selectedValues)) {
diff --git a/www/modules/civicrm/CRM/Member/BAO/Membership.php b/www/modules/civicrm/CRM/Member/BAO/Membership.php
index e22245436..79015e14a 100644
--- a/www/modules/civicrm/CRM/Member/BAO/Membership.php
+++ b/www/modules/civicrm/CRM/Member/BAO/Membership.php
@@ -1655,12 +1655,18 @@ public static function isCancelSubscriptionSupported($mid, $isNotCancelled = TRU
    * @throws \CRM_Core_Exception
    */
   public static function isSubscriptionCancelled(int $membershipID): bool {
-    // Check permissions set to false 'in case' - ideally would check permissions are
-    // correct & remove.
-    return (bool) Membership::get(FALSE)
-      ->addWhere('id', '=', $membershipID)
-      ->addWhere('contribution_recur_id.contribution_status_id:name', '=', 'Cancelled')
-      ->selectRowCount()->execute()->count();
+    $isCiviContributeEnabled = CRM_Extension_System::singleton()
+      ->getManager()
+      ->isEnabled('civi_contribute');
+    if ($isCiviContributeEnabled) {
+      // Check permissions set to false 'in case' - ideally would check permissions are
+      // correct & remove.
+      return (bool) Membership::get(FALSE)
+        ->addWhere('id', '=', $membershipID)
+        ->addWhere('contribution_recur_id.contribution_status_id:name', '=', 'Cancelled')
+        ->selectRowCount()->execute()->count();
+    }
+    return FALSE;
   }
 
   /**
@@ -1768,229 +1774,6 @@ public static function getMembershipRenewals($membershipTypeId, $startDate, $end
     return (int) $memberCount;
   }
 
-  /**
-   * @deprecated in CiviCRM 5.39, will be removed around CiviCRM 5.66.
-   *
-   * Deprecation issue in https://lab.civicrm.org/extensions/civimobileapi/-/issues/86
-   *
-   * @param int $contactID
-   * @param int $membershipTypeID
-   * @param bool $is_test
-   * @param string $changeToday
-   * @param int $modifiedID
-   * @param $customFieldsFormatted
-   * @param $numRenewTerms
-   * @param int $membershipID
-   * @param $pending
-   * @param int $contributionRecurID
-   * @param $membershipSource
-   * @param $isPayLater
-   * @param array $memParams
-   * @param null|CRM_Contribute_BAO_Contribution $contribution
-   * @param array $lineItems
-   *
-   * @return array
-   * @throws \CRM_Core_Exception
-   */
-  public static function processMembership($contactID, $membershipTypeID, $is_test, $changeToday, $modifiedID, $customFieldsFormatted, $numRenewTerms, $membershipID, $pending, $contributionRecurID, $membershipSource, $isPayLater, $memParams = [], $contribution = NULL, $lineItems = []) {
-    CRM_Core_Error::deprecatedFunctionWarning('use the order api, BAO functions should only be called from unit tested core code.');
-    $renewalMode = $updateStatusId = FALSE;
-    $allStatus = CRM_Member_PseudoConstant::membershipStatus();
-    $format = '%Y%m%d';
-    $statusFormat = '%Y-%m-%d';
-    $membershipTypeDetails = CRM_Member_BAO_MembershipType::getMembershipType($membershipTypeID);
-    $dates = [];
-    $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
-    );
-    if ($currentMembership) {
-      $renewalMode = TRUE;
-
-      // Do NOT do anything.
-      //1. membership with status : PENDING/CANCELLED (CRM-2395)
-      //2. Paylater/IPN renew. CRM-4556.
-      if ($pending || in_array($currentMembership['status_id'], [
-        array_search('Pending', $allStatus),
-        // CRM-15475
-        array_search('Cancelled', CRM_Member_PseudoConstant::membershipStatus(NULL, " name = 'Cancelled' ", 'name', FALSE, TRUE)),
-      ])) {
-
-        $memParams = array_merge([
-          'id' => $currentMembership['id'],
-          'contribution' => $contribution,
-          'status_id' => $currentMembership['status_id'],
-          'start_date' => $currentMembership['start_date'],
-          'end_date' => $currentMembership['end_date'],
-          'line_item' => $lineItems,
-          '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',
-        ], $memParams);
-        if ($contributionRecurID) {
-          $memParams['contribution_recur_id'] = $contributionRecurID;
-        }
-
-        $membership = self::create($memParams);
-        return [$membership, $renewalMode, $dates];
-      }
-
-      // Check and fix the membership if it is STALE
-      self::fixMembershipStatusBeforeRenew($currentMembership, $changeToday);
-
-      // Now Renew the membership
-      if (!$currentMembership['is_current_member']) {
-        // membership is not CURRENT
-
-        // CRM-7297 Membership Upsell - calculate dates based on new membership type
-        $dates = CRM_Member_BAO_MembershipType::getRenewalDatesForMembershipType($currentMembership['id'],
-          $changeToday,
-          $membershipTypeID,
-          $numRenewTerms
-        );
-
-        $currentMembership['join_date'] = CRM_Utils_Date::customFormat($currentMembership['join_date'], $format);
-        foreach (['start_date', 'end_date'] as $dateType) {
-          $currentMembership[$dateType] = $dates[$dateType] ?? NULL;
-        }
-        $currentMembership['is_test'] = $is_test;
-
-        if (!empty($membershipSource)) {
-          $currentMembership['source'] = $membershipSource;
-        }
-
-        if (!empty($currentMembership['id'])) {
-          $ids['membership'] = $currentMembership['id'];
-        }
-        $memParams = array_merge($currentMembership, $memParams);
-        $memParams['membership_type_id'] = $membershipTypeID;
-
-        //set the log start date.
-        $memParams['log_start_date'] = CRM_Utils_Date::customFormat($dates['log_start_date'], $format);
-      }
-      else {
-
-        // CURRENT Membership
-        $membership = new CRM_Member_DAO_Membership();
-        $membership->id = $currentMembership['id'];
-        $membership->find(TRUE);
-        // CRM-7297 Membership Upsell - calculate dates based on new membership type
-        $dates = CRM_Member_BAO_MembershipType::getRenewalDatesForMembershipType($membership->id,
-          $changeToday,
-          $membershipTypeID,
-          $numRenewTerms
-        );
-
-        // Insert renewed dates for CURRENT membership
-        $memParams['join_date'] = CRM_Utils_Date::isoToMysql($membership->join_date);
-        $memParams['start_date'] = CRM_Utils_Date::isoToMysql($membership->start_date);
-        $memParams['end_date'] = $dates['end_date'] ?? NULL;
-        $memParams['membership_type_id'] = $membershipTypeID;
-
-        //set the log start date.
-        $memParams['log_start_date'] = CRM_Utils_Date::customFormat($dates['log_start_date'], $format);
-
-        //CRM-18067
-        if (!empty($membershipSource)) {
-          $memParams['source'] = $membershipSource;
-        }
-        elseif (empty($membership->source)) {
-          $memParams['source'] = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_Membership',
-            $currentMembership['id'],
-            'source'
-          );
-        }
-
-        if (!empty($currentMembership['id'])) {
-          $ids['membership'] = $currentMembership['id'];
-        }
-        $memParams['membership_activity_status'] = ($pending || $isPayLater) ? 'Scheduled' : 'Completed';
-      }
-    }
-    else {
-      // NEW Membership
-      $memParams = array_merge([
-        'contact_id' => $contactID,
-        'membership_type_id' => $membershipTypeID,
-      ], $memParams);
-
-      if (!$pending) {
-        $dates = CRM_Member_BAO_MembershipType::getDatesForMembershipType($membershipTypeID, NULL, NULL, NULL, $numRenewTerms);
-
-        foreach (['join_date', 'start_date', 'end_date'] as $dateType) {
-          $memParams[$dateType] = $dates[$dateType] ?? NULL;
-        }
-
-        $status = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate(CRM_Utils_Date::customFormat($dates['start_date'],
-          $statusFormat
-        ),
-          CRM_Utils_Date::customFormat($dates['end_date'],
-            $statusFormat
-          ),
-          CRM_Utils_Date::customFormat($dates['join_date'],
-            $statusFormat
-          ),
-          'now',
-          TRUE,
-          $membershipTypeID,
-          $memParams
-        );
-        $updateStatusId = $status['id'] ?? NULL;
-      }
-      else {
-        // if IPN/Pay-Later set status to: PENDING
-        $updateStatusId = array_search('Pending', $allStatus);
-      }
-
-      if (!empty($membershipSource)) {
-        $memParams['source'] = $membershipSource;
-      }
-      $memParams['is_test'] = $is_test;
-      $memParams['is_pay_later'] = $isPayLater;
-    }
-    // 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;
-    }
-    //CRM-4555
-    //if we decided status here and want to skip status
-    //calculation in create( ); then need to pass 'skipStatusCal'.
-    if ($updateStatusId) {
-      $memParams['status_id'] = $updateStatusId;
-      $memParams['skipStatusCal'] = TRUE;
-    }
-
-    //since we are renewing,
-    //make status override false.
-    $memParams['is_override'] = FALSE;
-
-    //CRM-4027, create log w/ individual contact.
-    if ($modifiedID) {
-      // @todo this param is likely unused now.
-      $memParams['is_for_organization'] = TRUE;
-    }
-    $params['modified_id'] = $modifiedID ?? $contactID;
-
-    $memParams['contribution'] = $contribution;
-    $memParams['custom'] = $customFieldsFormatted;
-    // Load all line items & process all in membership. Don't do in contribution.
-    // Relevant tests in api_v3_ContributionPageTest.
-    $memParams['line_item'] = $lineItems;
-    // @todo stop passing $ids (membership and userId may be set by this point)
-    $membership = self::create($memParams, $ids);
-
-    // not sure why this statement is here, seems quite odd :( - Lobo: 12/26/2010
-    // related to: http://forum.civicrm.org/index.php/topic,11416.msg49072.html#msg49072
-    $membership->find(TRUE);
-
-    return [$membership, $renewalMode, $dates];
-  }
-
   /**
    * Get line items representing the default price set.
    *
diff --git a/www/modules/civicrm/CRM/Member/DAO/Membership.php b/www/modules/civicrm/CRM/Member/DAO/Membership.php
index 030554f3a..588cb81be 100644
--- a/www/modules/civicrm/CRM/Member/DAO/Membership.php
+++ b/www/modules/civicrm/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:663eaa9d986f476eb6721540840a643d)
+ * (GenCodeChecksum:cdedf93fcfc840a82de58b5e9defb24e)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Member/DAO/MembershipBlock.php b/www/modules/civicrm/CRM/Member/DAO/MembershipBlock.php
index 39a97a6c8..a6db1f169 100644
--- a/www/modules/civicrm/CRM/Member/DAO/MembershipBlock.php
+++ b/www/modules/civicrm/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:8570f61c5c934d765c3d8d47edcfdc36)
+ * (GenCodeChecksum:8b008760c202b35267e3bb8490afa031)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Member/DAO/MembershipLog.php b/www/modules/civicrm/CRM/Member/DAO/MembershipLog.php
index 2525d76ab..88bb10708 100644
--- a/www/modules/civicrm/CRM/Member/DAO/MembershipLog.php
+++ b/www/modules/civicrm/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:ef568df305bf840b719c242e610d6519)
+ * (GenCodeChecksum:1dc919ae29f4b80d0faf1797c0b201a4)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Member/DAO/MembershipPayment.php b/www/modules/civicrm/CRM/Member/DAO/MembershipPayment.php
index 21edc4d3b..b62551cff 100644
--- a/www/modules/civicrm/CRM/Member/DAO/MembershipPayment.php
+++ b/www/modules/civicrm/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:44c05454d437ff852f4cf0a9b4b005f0)
+ * (GenCodeChecksum:ec1e8245da2d2a907076d9a608c30e16)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Member/DAO/MembershipStatus.php b/www/modules/civicrm/CRM/Member/DAO/MembershipStatus.php
index 051e5bf87..f5a3b395d 100644
--- a/www/modules/civicrm/CRM/Member/DAO/MembershipStatus.php
+++ b/www/modules/civicrm/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:667f8df9ffcdc08d37863ce19cb1b0ef)
+ * (GenCodeChecksum:4321ae17aa4f714583d4b73dfb894641)
  */
 
 /**
@@ -445,6 +445,9 @@ public static function &fields() {
           'entity' => 'MembershipStatus',
           'bao' => 'CRM_Member_BAO_MembershipStatus',
           'localizable' => 0,
+          'html' => [
+            'type' => 'CheckBox',
+          ],
           'add' => '1.5',
         ],
         'is_admin' => [
diff --git a/www/modules/civicrm/CRM/Member/DAO/MembershipType.php b/www/modules/civicrm/CRM/Member/DAO/MembershipType.php
index 4d1bce9cd..44bf39250 100644
--- a/www/modules/civicrm/CRM/Member/DAO/MembershipType.php
+++ b/www/modules/civicrm/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:bf10593b5e20b28573e422fadfe689a7)
+ * (GenCodeChecksum:4d6009daa56ccbccff414917fd6aeb1b)
  */
 
 /**
@@ -38,6 +38,17 @@ class CRM_Member_DAO_MembershipType extends CRM_Core_DAO {
    */
   public static $_log = TRUE;
 
+  /**
+   * Paths for accessing this entity in the UI.
+   *
+   * @var string[]
+   */
+  protected static $_paths = [
+    'add' => 'civicrm/admin/member/membershipType/add?action=add&reset=1',
+    'update' => 'civicrm/admin/member/membershipType/add?action=update&id=[id]&reset=1',
+    'delete' => 'civicrm/admin/member/membershipType/add?action=delete&id=[id]&reset=1',
+  ];
+
   /**
    * Membership ID
    *
diff --git a/www/modules/civicrm/CRM/Member/Form.php b/www/modules/civicrm/CRM/Member/Form.php
index 03c1d9e17..fc8509094 100644
--- a/www/modules/civicrm/CRM/Member/Form.php
+++ b/www/modules/civicrm/CRM/Member/Form.php
@@ -20,7 +20,7 @@
  *
  */
 class CRM_Member_Form extends CRM_Contribute_Form_AbstractEditPayment {
-
+  use CRM_Custom_Form_CustomDataTrait;
   use CRM_Core_Form_EntityFormTrait;
 
   /**
@@ -72,6 +72,8 @@ class CRM_Member_Form extends CRM_Contribute_Form_AbstractEditPayment {
    * Price set ID configured for the form.
    *
    * @var int
+   *
+   * @deprecated use getPriceSetID()
    */
   public $_priceSetId;
 
@@ -254,9 +256,9 @@ public function setDefaultValues() {
 
       if (!empty($defaults['is_override'])) {
         $defaults['is_override'] = CRM_Member_StatusOverrideTypes::PERMANENT;
-      }
-      if (!empty($defaults['status_override_end_date'])) {
-        $defaults['is_override'] = CRM_Member_StatusOverrideTypes::UNTIL_DATE;
+        if (!empty($defaults['status_override_end_date'])) {
+          $defaults['is_override'] = CRM_Member_StatusOverrideTypes::UNTIL_DATE;
+        }
       }
     }
 
@@ -551,20 +553,37 @@ protected function getPriceSetDetails(array $params): ?array {
   }
 
   /**
-   * Get the selected price set id.
+   * Get the price set ID.
    *
-   * @param array $params
-   *   Parameters submitted to the form.
+   * @api Supported for external use.
    *
    * @return int
    */
-  protected function getPriceSetID(array $params): int {
-    $priceSetID = $params['price_set_id'] ?? NULL;
-    if (!$priceSetID) {
-      $priceSetDetails = $this->getPriceSetDetails($params);
-      return (int) key($priceSetDetails);
+  public function getPriceSetID(): int {
+    $this->_priceSetId = $this->isAjaxOverLoadMode() ? CRM_Utils_Request::retrieve('priceSetId', 'Integer') : ($this->getSubmittedValue('price_set_id') ?? NULL);
+    if (!$this->_priceSetId) {
+      $priceSet = CRM_Price_BAO_PriceSet::getDefaultPriceSet('membership');
+      $priceSet = reset($priceSet);
+      $this->_priceSetId = (int) $priceSet['setID'];
     }
-    return (int) $priceSetID;
+    return (int) $this->_priceSetId;
+  }
+
+  /**
+   * Is the form being called in ajax overload mode.
+   *
+   * Ajax overload mode is what the form is called via ajax to render the price
+   * form, without the rest of the processing. This is a legacy of a time when
+   * we didn't have better ways to do this. We only render the price set form
+   * on overload mode, but we need to ensure the fields are added to the
+   * form when the form is submitted so QuickForm sees the fields. Over time
+   * we have broken this approach for the payment form and custom data form
+   * and may do so here one day....
+   *
+   * @return bool
+   */
+  protected function isAjaxOverLoadMode(): bool {
+    return !empty($_GET['priceSetId']);
   }
 
   /**
@@ -577,7 +596,7 @@ protected function getPriceSetID(array $params): int {
    */
   protected function setPriceSetParameters(array $formValues): array {
     // process price set and get total amount and line items.
-    $this->_priceSetId = $this->getPriceSetID($formValues);
+    $this->getPriceSetID();
     $this->ensurePriceParamsAreSet($formValues);
     $priceSetDetails = $this->getPriceSetDetails($formValues);
     $this->_priceSet = $priceSetDetails[$this->_priceSetId];
@@ -585,12 +604,12 @@ protected function setPriceSetParameters(array $formValues): array {
     $this->order->setForm($this);
     $this->order->setPriceSelectionFromUnfilteredInput($formValues);
 
-    if (isset($formValues['total_amount'])) {
-      $this->order->setOverrideTotalAmount((float) $formValues['total_amount']);
+    if ($this->getSubmittedValue('total_amount')) {
+      $this->order->setOverrideTotalAmount((float) $this->getSubmittedValue('total_amount'));
     }
 
-    if ($this->isQuickConfig()) {
-      $this->order->setOverrideFinancialTypeID((int) $formValues['financial_type_id']);
+    if ($this->isQuickConfig() && $this->getSubmittedValue('financial_type_id')) {
+      $this->order->setOverrideFinancialTypeID((int) $this->getSubmittedValue('financial_type_id'));
     }
 
     return $formValues;
@@ -601,8 +620,25 @@ protected function setPriceSetParameters(array $formValues): array {
    *
    * @return bool
    */
-  private function isQuickConfig(): bool {
-    return $this->_priceSetId && CRM_Price_BAO_PriceSet::isQuickConfig($this->_priceSetId);
+  protected function isQuickConfig(): bool {
+    return $this->getPriceSetID() && CRM_Price_BAO_PriceSet::isQuickConfig($this->getPriceSetID());
+  }
+
+  /**
+   * Overriding this entity trait function as the function does not
+   * at this stage use the CustomDataTrait which works better with php8.2.
+   */
+  public function addCustomDataToForm() {
+    if ($this->isSubmitted()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('Membership', array_filter([
+        'id' => $this->getMembershipID(),
+        'membership_type_id' => $this->getSubmittedValue('membership_type_id'),
+      ]));
+    }
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Member/Form/Membership.php b/www/modules/civicrm/CRM/Member/Form/Membership.php
index 42262451c..978ca4e5c 100644
--- a/www/modules/civicrm/CRM/Member/Form/Membership.php
+++ b/www/modules/civicrm/CRM/Member/Form/Membership.php
@@ -74,13 +74,6 @@ public function setDeleteMessage() {
       . ts("Click 'Delete' if you want to continue.") . '</p>';
   }
 
-  /**
-   * Overriding this entity trait function as not yet tested.
-   *
-   * We continue to rely on legacy handling.
-   */
-  public function addCustomDataToForm() {}
-
   /**
    * Overriding this entity trait function as not yet tested.
    *
@@ -154,8 +147,14 @@ public function preProcess() {
 
     // get price set id.
     $this->_priceSetId = $_GET['priceSetId'] ?? NULL;
-    $this->set('priceSetId', $this->_priceSetId);
-    $this->assign('priceSetId', $this->_priceSetId);
+    // This is assigned only for the purposes of displaying the price block
+    // INSTEAD of the edit form. ie when the form is being overloaded
+    // via ajax (which is a long-standing anti-pattern - in
+    // some cases we have moved that overload behaviour
+    // to a separate form but note that it is necessary to
+    // add the fields to QuickForm when the form
+    // has been submitted so they appear in submittedValues().
+    $this->assign('priceSetId', $_GET['priceSetId'] ?? NULL);
 
     if ($this->_action & CRM_Core_Action::DELETE) {
       $contributionID = CRM_Member_BAO_Membership::getMembershipContributionId($this->_id);
@@ -224,8 +223,9 @@ public function preProcess() {
       }
     }
 
-    // Add custom data to form
-    CRM_Custom_Form_CustomData::addToForm($this, $this->_memType);
+    $this->assign('customDataType', 'Membership');
+    $this->assign('customDataSubType', $this->_memType);
+
     $this->setPageTitle(ts('Membership'));
   }
 
@@ -323,7 +323,7 @@ public function buildQuickForm() {
     $isUpdateToExistingRecurringMembership = $this->isUpdateToExistingRecurringMembership();
     // build price set form.
     $buildPriceSet = FALSE;
-    if ($this->_priceSetId || !empty($_POST['price_set_id'])) {
+    if ($this->isAjaxOverLoadMode() || !empty($_POST['price_set_id'])) {
       if (!empty($_POST['price_set_id'])) {
         $buildPriceSet = TRUE;
       }
@@ -333,11 +333,10 @@ public function buildQuickForm() {
         $getOnlyPriceSetElements = FALSE;
       }
 
-      $this->set('priceSetId', $this->_priceSetId);
-      CRM_Price_BAO_PriceSet::buildPriceSet($this, 'membership', FALSE);
+      $this->buildMembershipPriceSet();
 
       $optionsMembershipTypes = [];
-      foreach ($this->_priceSet['fields'] as $pField) {
+      foreach ($this->getPriceFieldMetaData() as $pField) {
         if (empty($pField['options'])) {
           continue;
         }
@@ -349,7 +348,7 @@ public function buildQuickForm() {
       $this->assign('autoRenewOption', CRM_Price_BAO_PriceSet::checkAutoRenewForPriceSet($this->_priceSetId));
 
       $this->assign('optionsMembershipTypes', $optionsMembershipTypes);
-      $this->assign('contributionType', CRM_Utils_Array::value('financial_type_id', $this->_priceSet));
+      $this->assign('contributionType', $this->_priceSet['financial_type_id'] ?? NULL);
 
       // get only price set form elements.
       if ($getOnlyPriceSetElements) {
@@ -576,6 +575,64 @@ public function buildQuickForm() {
     parent::buildQuickForm();
   }
 
+  /**
+   * Build the price set form.
+   *
+   * @return void
+   *
+   * @deprecated this should be updated to align with the other forms that use getOrder()
+   */
+  private function buildMembershipPriceSet() {
+    $form = $this;
+
+    $this->_priceSet = $this->getOrder()->getPriceSetMetadata();
+    $validPriceFieldIds = array_keys($this->getPriceFieldMetaData());
+
+    // Mark which field should have the auto-renew checkbox, if any. CRM-18305
+    // This is probably never set & relates to another form from previously shared code.
+    if (!empty($form->_membershipTypeValues) && is_array($form->_membershipTypeValues)) {
+      $autoRenewMembershipTypes = [];
+      foreach ($form->_membershipTypeValues as $membershipTypeValue) {
+        if ($membershipTypeValue['auto_renew']) {
+          $autoRenewMembershipTypes[] = $membershipTypeValue['id'];
+        }
+      }
+      foreach ($form->getPriceFieldMetaData() as $field) {
+        if (array_key_exists('options', $field) && is_array($field['options'])) {
+          foreach ($field['options'] as $option) {
+            if (!empty($option['membership_type_id'])) {
+              if (in_array($option['membership_type_id'], $autoRenewMembershipTypes)) {
+                $form->_priceSet['auto_renew_membership_field'] = $field['id'];
+                // Only one field can offer auto_renew memberships, so break here.
+                // May not relate to this form? From previously shared code.
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+    $form->assign('priceSet', $form->_priceSet);
+
+    $checklifetime = FALSE;
+    foreach ($this->getPriceFieldMetaData() as $id => $field) {
+      $options = $field['options'] ?? NULL;
+      if (!is_array($options) || !in_array($id, $validPriceFieldIds)) {
+        continue;
+      }
+      if (!empty($options)) {
+        CRM_Price_BAO_PriceField::addQuickFormElement($form,
+          'price_' . $field['id'],
+          $field['id'],
+          FALSE,
+          $field['is_required'] ?? FALSE,
+          NULL,
+          $options
+        );
+      }
+    }
+  }
+
   /**
    * Validation.
    *
@@ -594,7 +651,7 @@ public function buildQuickForm() {
   public static function formRule($params, $files, $self) {
     $errors = [];
 
-    $priceSetId = $self->getPriceSetID($params);
+    $priceSetId = $self->getPriceSetID();
     $priceSetDetails = $self->getPriceSetDetails($params);
 
     $selectedMemberships = self::getSelectedMemberships($priceSetDetails[$priceSetId], $params);
@@ -788,6 +845,44 @@ public static function formRule($params, $files, $self) {
     return empty($errors) ? TRUE : $errors;
   }
 
+  /**
+   * Get price field metadata.
+   *
+   * The returned value is an array of arrays where each array
+   * is an id-keyed price field and an 'options' key has been added to that
+   * array for any options.
+   *
+   * @api  - this is not yet being used by the form - only by a test but
+   * follows standard methodology so should stay the same.
+   *
+   * @return array
+   */
+  public function getPriceFieldMetaData(): array {
+    $this->_priceSet['fields'] = $this->getOrder()->getPriceFieldsMetadata();
+    return $this->_priceSet['fields'];
+  }
+
+  /**
+   * @return \CRM_Financial_BAO_Order
+   * @throws \CRM_Core_Exception
+   */
+  protected function getOrder(): CRM_Financial_BAO_Order {
+    if (!$this->order) {
+      $this->initializeOrder();
+    }
+    return $this->order;
+  }
+
+  /**
+   * @throws \CRM_Core_Exception
+   */
+  protected function initializeOrder(): void {
+    $this->order = new CRM_Financial_BAO_Order();
+    $this->order->setPriceSetID($this->getPriceSetID());
+    $this->order->setForm($this);
+    $this->order->setPriceSelectionFromUnfilteredInput($this->getSubmittedValues());
+  }
+
   /**
    * Process the form submission.
    *
@@ -877,7 +972,7 @@ protected function emailReceipt($formValues) {
     else {
       $this->assign('receiptType', 'membership signup');
     }
-    $this->assign('receive_date', CRM_Utils_Array::value('receive_date', $formValues));
+    $this->assign('receive_date', $formValues['receive_date'] ?? NULL);
     $this->assign('formValues', $formValues);
 
     $this->assign('mem_start_date', CRM_Utils_Date::formatDateOnlyLong($membership['start_date']));
@@ -1063,7 +1158,7 @@ public function submit(): void {
           'line_items' => $this->getLineItemForOrderApi(),
           'is_test' => $this->isTest(),
           'campaign_id' => $this->getSubmittedValue('campaign_id'),
-          'source' => CRM_Utils_Array::value('source', $paymentParams, CRM_Utils_Array::value('description', $paymentParams)),
+          'source' => $paymentParams['source'] ?? $paymentParams['description'] ?? NULL,
           'payment_instrument_id' => $this->getPaymentInstrumentID(),
           'financial_type_id' => $this->getFinancialTypeID(),
           'receive_date' => $this->getReceiveDate(),
@@ -1158,7 +1253,7 @@ public function submit(): void {
       }
 
       $this->set('params', $formValues);
-      $this->assign('trxn_id', CRM_Utils_Array::value('trxn_id', $result));
+      $this->assign('trxn_id', $result['trxn_id'] ?? NULL);
       $this->assign('receive_date',
         CRM_Utils_Date::mysqlToIso($params['receive_date'])
       );
@@ -1207,10 +1302,23 @@ public function submit(): void {
         // If we are recording a contribution we *do* want to trigger a recalculation of membership status so it can go from Pending->New/Current
         // So here we check if status_id is empty, default (ie. status in database) is pending and that we are not recording a contribution -
         //   If all those are true then we skip the status calculation and explicitly set the pending status (to avoid a DB constraint status_id=0).
+        // Test cover in `CRM_Member_Form_MembershipTest::testOverrideSubmit()`.
+        $isPaymentPending = FALSE;
+        if ($this->getMembershipID()) {
+          $contributionId = CRM_Member_BAO_Membership::getMembershipContributionId($this->getMembershipID());
+          if ($contributionId) {
+            $isPaymentPending = \Civi\Api4\Contribution::get(FALSE)
+              ->addSelect('contribution_status_id:name')
+              ->addWhere('id', '=', $contributionId)
+              ->execute()
+              ->first()['contribution_status_id:name'] === 'Pending';
+          }
+        }
         if (empty($membershipParams['status_id'])
           && !empty($this->_defaultValues['status_id'])
           && !$this->getSubmittedValue('record_contribution')
           && (int) $this->_defaultValues['status_id'] === $pendingMembershipStatusId
+          && $isPaymentPending
         ) {
           $membershipParams['status_id'] = $this->_defaultValues['status_id'];
         }
@@ -1259,8 +1367,12 @@ public function submit(): void {
     $contributionId = $this->ids['Contribution'] ?? CRM_Member_BAO_Membership::getMembershipContributionId($this->getMembershipID());
     $membershipIds = $this->_membershipIDs;
     if ($this->getSubmittedValue('send_receipt') && $contributionId && !empty($membershipIds)) {
-      $contributionDetails = CRM_Contribute_BAO_Contribution::getContributionDetails(CRM_Export_Form_Select::MEMBER_EXPORT, $this->_membershipIDs);
-      if ($contributionDetails[$this->getMembershipID()]['contribution_status'] === 'Completed') {
+      $contributionStatus = \Civi\Api4\Contribution::get(FALSE)
+        ->addSelect('contribution_status_id:name')
+        ->addWhere('id', '=', $contributionId)
+        ->execute()
+        ->first();
+      if ($contributionStatus['contribution_status_id:name'] === 'Completed') {
         $formValues['contact_id'] = $this->_contactID;
         $formValues['contribution_id'] = $contributionId;
         // receipt_text_signup is no longer used in receipts from 5.47
@@ -1385,6 +1497,13 @@ protected function setUserContext() {
       $url = CRM_Utils_System::url('civicrm/contact/view',
         "reset=1&cid={$this->_contactID}&selectedChild=member"
       );
+      // Refresh other tabs with related data
+      $this->ajaxResponse['updateTabs'] = [
+        '#tab_activity' => TRUE,
+      ];
+      if (CRM_Core_Permission::access('CiviContribute')) {
+        $this->ajaxResponse['updateTabs']['#tab_contribute'] = CRM_Contact_BAO_Contact::getCountComponent('contribution', $this->_contactID);
+      }
     }
     $session->replaceUserContext($url);
   }
@@ -1399,7 +1518,7 @@ protected function getStatusMessageForUpdate(): string {
     foreach ($this->getCreatedMemberships() as $membership) {
       $endDate = $membership['end_date'] ?? NULL;
     }
-    $statusMsg = ts('Membership for %1 has been updated.', [1 => $this->_memberDisplayName]);
+    $statusMsg = ts('Membership for %1 has been updated.', [1 => htmlentities($this->_memberDisplayName)]);
     if ($endDate) {
       $endDate = CRM_Utils_Date::customFormat($endDate);
       $statusMsg .= ' ' . ts('The Membership Expiration Date is %1.', [1 => $endDate]);
@@ -1417,7 +1536,7 @@ protected function getStatusMessageForCreate(): string {
     foreach ($this->getCreatedMemberships() as $membership) {
       $statusMsg[$membership['membership_type_id']] = ts('%1 membership for %2 has been added.', [
         1 => $this->allMembershipTypeDetails[$membership['membership_type_id']]['name'],
-        2 => $this->_memberDisplayName,
+        2 => htmlentities($this->_memberDisplayName),
       ]);
 
       $memEndDate = $membership['end_date'] ?? NULL;
@@ -1485,7 +1604,7 @@ protected function isUpdateToExistingRecurringMembership() {
    * @throws \CRM_Core_Exception
    */
   protected function emailMembershipReceipt($formValues) {
-    $customValues = $this->getCustomValuesForReceipt($formValues);
+    $customValues = $this->getCustomValuesForReceipt();
     $this->assign('customValues', $customValues);
     $this->assign('total_amount', $this->order->getTotalAmount());
     $this->assign('totalTaxAmount', $this->order->getTotalTaxAmount());
@@ -1511,35 +1630,46 @@ protected function emailMembershipReceipt($formValues) {
   /**
    * Filter the custom values from the input parameters (for display in the email).
    *
-   * @todo figure out why the scary code this calls does & document.
+   * @todo move this to the WorkFlowMessageTrait.
    *
-   * @param array $formValues
    * @return array
    */
-  protected function getCustomValuesForReceipt($formValues): array {
-    $customFields = $customValues = [];
-    if (property_exists($this, '_groupTree')
-      && !empty($this->_groupTree)
-    ) {
-      foreach ($this->_groupTree as $groupID => $group) {
-        if ($groupID === 'info') {
-          continue;
-        }
-        foreach ($group['fields'] as $k => $field) {
-          $field['title'] = $field['label'];
-          $customFields["custom_{$k}"] = $field;
-        }
+  protected function getCustomValuesForReceipt(): array {
+    $customFieldValues = $this->getCustomFieldValues();
+    $customValues = [];
+    foreach ($customFieldValues as $customFieldString => $submittedValue) {
+      if ($submittedValue === NULL) {
+        // This would occur when the field is no longer appropriate - ie changing
+        // from a membership type with the field to one without it.
+        continue;
       }
+      $customFieldID = (int) CRM_Core_BAO_CustomField::getKeyID($customFieldString);
+      $value = CRM_Core_BAO_CustomField::displayValue($this->getSubmittedValue($customFieldString), $customFieldID);
+      $customValues[CRM_Core_BAO_CustomField::getField($customFieldID)['label']] = $value;
     }
+    return $customValues;
+  }
 
-    $members = [['member_id', '=', $this->getMembershipID(), 0, 0]];
-    // check whether its a test drive
-    if ($this->_mode === 'test') {
-      $members[] = ['member_test', '=', 1, 0, 0];
+  /**
+   * Get the custom fields tat are on the form with the submitted values.
+   *
+   * @internal I think it would be good to make this field
+   * available as an api supported method - maybe on the form custom data trait
+   * but I feel like we might want to talk about the format of the returned results
+   * (key-value vs array, custom field ID keys vs custom_, filters/ multiple functions
+   * with different formatting) so keeping private for now.
+   *
+   * @return array
+   */
+  private function getCustomFieldValues(): array {
+    $customFields = [];
+    foreach ($this->_elements as $element) {
+      $customFieldID = CRM_Core_BAO_CustomField::getKeyID($element->getName());
+      if ($customFieldID) {
+        $customFields[$element->getName()] = $this->getSubmittedValue($element->getName());
+      }
     }
-
-    CRM_Core_BAO_UFGroup::getValues($formValues['contact_id'], $customFields, $customValues, FALSE, $members);
-    return $customValues;
+    return $customFields;
   }
 
   /**
@@ -1678,7 +1808,6 @@ protected function getFrequencyUnit(): ?string {
    * @throws \CRM_Core_Exception
    */
   protected function getFormMembershipParams(): array {
-    $submittedValues = $this->controller->exportValues($this->_name);
     return [
       'status_id' => $this->getSubmittedValue('status_id'),
       'source' => $this->getSubmittedValue('source') ?? $this->getContributionSource(),
@@ -1686,7 +1815,7 @@ protected function getFormMembershipParams(): array {
       'is_override' => $this->getSubmittedValue('is_override'),
       'status_override_end_date' => $this->getSubmittedValue('status_override_end_date'),
       'campaign_id' => $this->getSubmittedValue('campaign_id'),
-      'custom' => CRM_Core_BAO_CustomField::postProcess($submittedValues,
+      'custom' => CRM_Core_BAO_CustomField::postProcess($this->getSubmittedValues(),
         $this->_id,
         'Membership'
       ),
@@ -1742,9 +1871,20 @@ protected function getMembershipParameters(): array {
         $membershipTypeValues[$memType]['max_related'] = $this->getSubmittedValue('max_related');
       }
     }
-
+    // Really we don't need to do all this unless one of the join dates
+    // has been left empty by the submitter - ie in an ADD scenario but not really
+    // valid when editing & it would possibly not get the number of terms right
+    // so ideally the fields would be required on edit & the below would only
+    // be called on ADD
     foreach ($this->order->getMembershipLineItems() as $membershipLineItem) {
-      $memTypeNumTerms = $this->getSubmittedValue('num_terms') ?: $membershipLineItem['membership_num_terms'];
+      if ($this->getAction() === CRM_Core_Action::ADD && $this->isQuickConfig()) {
+        $memTypeNumTerms = $this->getSubmittedValue('num_terms');
+      }
+      else {
+        // The submitted value is hidden when a price set is selected so
+        // although it is present it should be ignored.
+        $memTypeNumTerms = $membershipLineItem['membership_num_terms'];
+      }
       $calcDates = CRM_Member_BAO_MembershipType::getDatesForMembershipType(
         $membershipLineItem['membership_type_id'],
         $this->getSubmittedValue('join_date'),
diff --git a/www/modules/civicrm/CRM/Member/Form/MembershipRenewal.php b/www/modules/civicrm/CRM/Member/Form/MembershipRenewal.php
index ea9c8a110..982838f7f 100644
--- a/www/modules/civicrm/CRM/Member/Form/MembershipRenewal.php
+++ b/www/modules/civicrm/CRM/Member/Form/MembershipRenewal.php
@@ -165,13 +165,6 @@ public function preProcess() {
       }
     }
 
-    // when custom data is included in this page
-    if (!empty($_POST['hidden_custom'])) {
-      CRM_Custom_Form_CustomData::preProcess($this, NULL, $this->_memType, 1, 'Membership', $this->_id);
-      CRM_Custom_Form_CustomData::buildQuickForm($this);
-      CRM_Custom_Form_CustomData::setDefaultValues($this);
-    }
-
     $this->setTitle(ts('Renew Membership'));
 
     parent::preProcess();
@@ -224,7 +217,7 @@ public function setDefaultValues() {
 
     $renewalDate = $defaults['renewal_date'] ?? NULL;
     $this->assign('renewalDate', $renewalDate);
-    $this->assign('member_is_test', CRM_Utils_Array::value('member_is_test', $defaults));
+    $this->assign('member_is_test', $defaults['member_is_test'] ?? NULL);
 
     if ($this->_mode) {
       $defaults = $this->getBillingDefaults($defaults);
@@ -240,6 +233,7 @@ public function setDefaultValues() {
   public function buildQuickForm() {
 
     parent::buildQuickForm();
+    $this->addCustomDataToForm();
 
     $defaults = parent::setDefaultValues();
     $this->assign('customDataType', 'Membership');
@@ -493,13 +487,13 @@ protected function submit() {
     $this->storeContactFields($this->_params);
     $this->beginPostProcess();
     $now = CRM_Utils_Date::getToday(NULL, 'YmdHis');
-    $this->assign('receive_date', CRM_Utils_Array::value('receive_date', $this->_params, CRM_Utils_Time::date('Y-m-d H:i:s')));
+    $this->assign('receive_date', $this->_params['receive_date'] ?? CRM_Utils_Time::date('Y-m-d H:i:s'));
     $this->processBillingAddress($this->getContributionContactID(), (string) $this->_contributorEmail);
 
     $this->_params['total_amount'] = CRM_Utils_Array::value('total_amount', $this->_params,
       CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipType', $this->_memType, 'minimum_fee')
     );
-    $customFieldsFormatted = CRM_Core_BAO_CustomField::postProcess($this->_params,
+    $customFieldsFormatted = CRM_Core_BAO_CustomField::postProcess($this->getSubmittedValues(),
       $this->getMembershipID(),
       'Membership'
     );
@@ -676,7 +670,7 @@ protected function sendReceipt($membership) {
     }
     CRM_Core_BAO_UFGroup::getValues($this->_contactID, $customFields, $customValues, FALSE, $members);
 
-    $this->assign_by_ref('formValues', $this->_params);
+    $this->assign('formValues', $this->_params);
 
     $this->assign('membership_name', CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipType',
       $membership->membership_type_id
diff --git a/www/modules/civicrm/CRM/Member/Form/MembershipView.php b/www/modules/civicrm/CRM/Member/Form/MembershipView.php
index 703f6f5e5..82fe0ef1f 100644
--- a/www/modules/civicrm/CRM/Member/Form/MembershipView.php
+++ b/www/modules/civicrm/CRM/Member/Form/MembershipView.php
@@ -247,7 +247,7 @@ public function preProcess() {
       if (!empty($membershipType['relationship_type_id']) && empty($values['owner_membership_id'])) {
         // display related contacts/membership block
         $this->assign('has_related', TRUE);
-        $this->assign('max_related', CRM_Utils_Array::value('max_related', $values, ts('Unlimited')));
+        $this->assign('max_related', $values['max_related'] ?? ts('Unlimited'));
         // split the relations in 2 arrays based on direction
         $relTypeId = explode(CRM_Core_DAO::VALUE_SEPARATOR, $membershipType['relationship_type_id']);
         $relDirection = explode(CRM_Core_DAO::VALUE_SEPARATOR, $membershipType['relationship_direction']);
diff --git a/www/modules/civicrm/CRM/Member/Import/Controller.php b/www/modules/civicrm/CRM/Member/Import/Controller.php
deleted file mode 100644
index b647e940e..000000000
--- a/www/modules/civicrm/CRM/Member/Import/Controller.php
+++ /dev/null
@@ -1,41 +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
- */
-class CRM_Member_Import_Controller extends CRM_Core_Controller {
-
-  /**
-   * Class constructor.
-   *
-   * @param string $title
-   * @param bool|int $action
-   * @param bool $modal
-   */
-  public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $modal = TRUE) {
-    parent::__construct($title, $modal);
-
-    set_time_limit(0);
-
-    $this->_stateMachine = new CRM_Import_StateMachine($this, $action);
-
-    // create and instantiate the pages
-    $this->addPages($this->_stateMachine, $action);
-
-    // add all the actions
-    $config = CRM_Core_Config::singleton();
-    $this->addActions($config->uploadDir, ['uploadFile']);
-  }
-
-}
diff --git a/www/modules/civicrm/CRM/Member/Info.php b/www/modules/civicrm/CRM/Member/Info.php
index 653bff34c..d25b7a300 100644
--- a/www/modules/civicrm/CRM/Member/Info.php
+++ b/www/modules/civicrm/CRM/Member/Info.php
@@ -50,42 +50,22 @@ public function getInfo() {
 
   /**
    * @inheritDoc
-   * Provides permissions that are used by component.
-   * Needs to be implemented in component's information
-   * class.
-   *
-   * NOTE: if using conditionally permission return,
-   * implementation of $getAllUnconditionally is required.
-   *
-   * @param bool $getAllUnconditionally
-   * @param bool $descriptions
-   *   Whether to return permission descriptions
-   *
-   * @return array|null
-   *   collection of permissions, null if none
    */
-  public function getPermissions($getAllUnconditionally = FALSE, $descriptions = FALSE) {
+  public function getPermissions(): array {
     $permissions = [
       'access CiviMember' => [
-        ts('access CiviMember'),
-        ts('View memberships'),
+        'label' => ts('access CiviMember'),
+        'description' => ts('View memberships'),
       ],
       'edit memberships' => [
-        ts('edit memberships'),
-        ts('Create and update memberships'),
+        'label' => ts('edit memberships'),
+        'description' => ts('Create and update memberships'),
       ],
       'delete in CiviMember' => [
-        ts('delete in CiviMember'),
-        ts('Delete memberships'),
+        'label' => ts('delete in CiviMember'),
+        'description' => ts('Delete memberships'),
       ],
     ];
-
-    if (!$descriptions) {
-      foreach ($permissions as $name => $attr) {
-        $permissions[$name] = array_shift($attr);
-      }
-    }
-
     return $permissions;
   }
 
diff --git a/www/modules/civicrm/CRM/Member/Page/RecurringContributions.php b/www/modules/civicrm/CRM/Member/Page/RecurringContributions.php
index 5bd340fd9..1f12d0542 100644
--- a/www/modules/civicrm/CRM/Member/Page/RecurringContributions.php
+++ b/www/modules/civicrm/CRM/Member/Page/RecurringContributions.php
@@ -116,7 +116,7 @@ private function setActionsForRecurringContribution(int $recurID, &$recurringCon
     $recurringContribution['is_active'] = ($recurringContribution['contribution_status_id'] != 3);
 
     if ($recurringContribution['is_active']) {
-      $details = CRM_Contribute_BAO_ContributionRecur::getSubscriptionDetails($recurringContribution['id'], 'recur');
+      $details = CRM_Contribute_BAO_ContributionRecur::getSubscriptionDetails($recurringContribution['id']);
       $hideUpdate = $details->membership_id & $details->auto_renew;
 
       if ($hideUpdate) {
diff --git a/www/modules/civicrm/CRM/Member/Page/Tab.php b/www/modules/civicrm/CRM/Member/Page/Tab.php
index 7b1eb4de5..977d6b1b9 100644
--- a/www/modules/civicrm/CRM/Member/Page/Tab.php
+++ b/www/modules/civicrm/CRM/Member/Page/Tab.php
@@ -245,13 +245,6 @@ public function browse() {
       $displayName = CRM_Contact_BAO_Contact::displayName($this->_contactId);
       $this->assign('displayName', $displayName);
       $this->ajaxResponse['tabCount'] = CRM_Contact_BAO_Contact::getCountComponent('membership', $this->_contactId);
-      // Refresh other tabs with related data
-      $this->ajaxResponse['updateTabs'] = [
-        '#tab_activity' => CRM_Contact_BAO_Contact::getCountComponent('activity', $this->_contactId),
-      ];
-      if (CRM_Core_Permission::access('CiviContribute')) {
-        $this->ajaxResponse['updateTabs']['#tab_contribute'] = CRM_Contact_BAO_Contact::getCountComponent('contribution', $this->_contactId);
-      }
     }
   }
 
@@ -523,6 +516,8 @@ public static function &links(
           'url' => 'civicrm/contact/view/membership',
           'qs' => 'action=view&reset=1&cid=%%cid%%&id=%%id%%&context=membership&selectedChild=member',
           'title' => ts('View Membership'),
+          // The constants are a bit backward - VIEW comes after UPDATE
+          'weight' => 2,
         ],
       ];
     }
@@ -534,24 +529,29 @@ public static function &links(
           'url' => 'civicrm/contact/view/membership',
           'qs' => 'action=update&reset=1&cid=%%cid%%&id=%%id%%&context=membership&selectedChild=member',
           'title' => ts('Edit Membership'),
+          // The constants are a bit backward - VIEW comes after UPDATE
+          'weight' => 4,
         ],
         CRM_Core_Action::RENEW => [
           'name' => ts('Renew'),
           'url' => 'civicrm/contact/view/membership',
           'qs' => 'action=renew&reset=1&cid=%%cid%%&id=%%id%%&context=membership&selectedChild=member',
           'title' => ts('Renew Membership'),
+          'weight' => CRM_Core_Action::RENEW,
         ],
         CRM_Core_Action::FOLLOWUP => [
           'name' => ts('Renew-Credit Card'),
           'url' => 'civicrm/contact/view/membership',
           'qs' => 'action=renew&reset=1&cid=%%cid%%&id=%%id%%&context=membership&selectedChild=member&mode=live',
           'title' => ts('Renew Membership Using Credit Card'),
+          'weight' => CRM_Core_Action::FOLLOWUP,
         ],
         CRM_Core_Action::DELETE => [
           'name' => ts('Delete'),
           'url' => 'civicrm/contact/view/membership',
           'qs' => 'action=delete&reset=1&cid=%%cid%%&id=%%id%%&context=membership&selectedChild=member',
           'title' => ts('Delete Membership'),
+          'weight' => CRM_Core_Action::DELETE,
         ],
       ];
       if (!$isPaymentProcessor || !$accessContribution) {
@@ -570,6 +570,7 @@ public static function &links(
         'qs' => 'reset=1&cid=%%cid%%&mid=%%id%%&context=membership&selectedChild=member',
         'title' => ts('Cancel Auto Renew Subscription'),
         'extra' => 'onclick = "if (confirm(\'' . $cancelMessage . '\') ) {  return true; else return false;}"',
+        'weight' => CRM_Core_Action::DISABLE,
       ];
     }
     elseif (isset(self::$_links['all'][CRM_Core_Action::DISABLE])) {
@@ -582,6 +583,7 @@ public static function &links(
         'url' => 'civicrm/contribute/updatebilling',
         'qs' => 'reset=1&cid=%%cid%%&mid=%%id%%&context=membership&selectedChild=member',
         'title' => ts('Change Billing Details'),
+        'weight' => CRM_Core_Action::MAP,
       ];
     }
     elseif (isset(self::$_links['all'][CRM_Core_Action::MAP])) {
diff --git a/www/modules/civicrm/CRM/Member/Selector/Search.php b/www/modules/civicrm/CRM/Member/Selector/Search.php
index 6de5c53de..1aff108f0 100644
--- a/www/modules/civicrm/CRM/Member/Selector/Search.php
+++ b/www/modules/civicrm/CRM/Member/Selector/Search.php
@@ -440,7 +440,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
         $row['auto_renew'] = 0;
       }
 
-      $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? $result->contact_sub_type : $result->contact_type, FALSE, $result->contact_id
+      $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ?: $result->contact_type, FALSE, $result->contact_id
       );
 
       $rows[] = $row;
diff --git a/www/modules/civicrm/CRM/Member/xml/Menu/Member.xml b/www/modules/civicrm/CRM/Member/xml/Menu/Member.xml
index c8b0dae7f..614a74ab1 100644
--- a/www/modules/civicrm/CRM/Member/xml/Menu/Member.xml
+++ b/www/modules/civicrm/CRM/Member/xml/Menu/Member.xml
@@ -66,10 +66,11 @@
      <weight>710</weight>
   </item>
   <item>
-     <path>civicrm/member/import</path>
+     <path>civicrm/import/membership</path>
      <title>Import Memberships</title>
-     <page_callback>CRM_Member_Import_Controller</page_callback>
+     <page_callback>CRM_Import_Controller</page_callback>
      <access_arguments>access CiviMember,edit memberships</access_arguments>
+     <page_arguments>entity_prefix=Member</page_arguments>
      <page_type>1</page_type>
      <weight>720</weight>
   </item>
diff --git a/www/modules/civicrm/CRM/PCP/BAO/PCP.php b/www/modules/civicrm/CRM/PCP/BAO/PCP.php
index 82a1da40a..6bc8112a6 100644
--- a/www/modules/civicrm/CRM/PCP/BAO/PCP.php
+++ b/www/modules/civicrm/CRM/PCP/BAO/PCP.php
@@ -968,4 +968,28 @@ protected static function getPcpTitle(string $component, int $id) {
     return CRM_Core_PseudoConstant::getLabel('CRM_Event_BAO_Participant', 'event_id', $id);
   }
 
+  /**
+   * Possible values for the page_type field, used for dynamic foreign key lookups
+   *
+   * This is a non-standard dfk. Normally the columns would be named "entity_table" & "entity_id",
+   * and normally the `entity_table` field would contain a table name like "civicrm_contribution"
+   * instead of an arbitrary string like 'contribute'.
+   *
+   * @return array
+   */
+  public static function pageTypeOptions(): array {
+    return [
+      [
+        'id' => 'contribute',
+        'name' => 'ContributionPage',
+        'label' => ts('Contributions'),
+      ],
+      [
+        'id' => 'event',
+        'name' => 'Event',
+        'label' => ts('Events'),
+      ],
+    ];
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/PCP/DAO/PCP.php b/www/modules/civicrm/CRM/PCP/DAO/PCP.php
index eee6a7bc0..3bf87d01f 100644
--- a/www/modules/civicrm/CRM/PCP/DAO/PCP.php
+++ b/www/modules/civicrm/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:be838855e518a084a4da2a98fe52480d)
+ * (GenCodeChecksum:c6e35776a99657306b28b5f8477d5690)
  */
 
 /**
@@ -374,6 +374,8 @@ public static function &fields() {
           'entity' => 'PCP',
           'bao' => 'CRM_PCP_BAO_PCP',
           'localizable' => 0,
+          'DFKEntityColumn' => 'page_type',
+          'FKColumnName' => 'id',
           'add' => '4.1',
         ],
         'page_type' => [
@@ -398,6 +400,9 @@ public static function &fields() {
           'html' => [
             'type' => 'Select',
           ],
+          'pseudoconstant' => [
+            'callback' => 'CRM_PCP_BAO_PCP::pageTypeOptions',
+          ],
           'add' => '2.2',
         ],
         'pcp_block_id' => [
diff --git a/www/modules/civicrm/CRM/PCP/DAO/PCPBlock.php b/www/modules/civicrm/CRM/PCP/DAO/PCPBlock.php
index ebf84f67a..47b433935 100644
--- a/www/modules/civicrm/CRM/PCP/DAO/PCPBlock.php
+++ b/www/modules/civicrm/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:aa66cc545cf04e5ea640df960af2ddea)
+ * (GenCodeChecksum:458fa1443a7d669b553818b1770eba1d)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/PCP/Form/Campaign.php b/www/modules/civicrm/CRM/PCP/Form/Campaign.php
index 59fc07b62..cad46a7b6 100644
--- a/www/modules/civicrm/CRM/PCP/Form/Campaign.php
+++ b/www/modules/civicrm/CRM/PCP/Form/Campaign.php
@@ -122,7 +122,7 @@ public function buildQuickForm() {
       $owner_notification_option = CRM_Core_DAO::getFieldValue('CRM_PCP_BAO_PCPBlock', $pcpInfo['pcp_block_id'], 'owner_notify_id');
     }
     else {
-      $owner_notification_option = CRM_PCP_BAO_PCP::getOwnerNotificationId($this->controller->get('component_page_id'), $this->_component ? $this->_component : 'contribute');
+      $owner_notification_option = CRM_PCP_BAO_PCP::getOwnerNotificationId($this->controller->get('component_page_id'), $this->_component ?: 'contribute');
     }
     if ($owner_notification_option == CRM_Core_PseudoConstant::getKey('CRM_PCP_BAO_PCPBlock', 'owner_notify_id', 'owner_chooses')) {
       $this->assign('owner_notification_option', TRUE);
@@ -194,7 +194,7 @@ public function postProcess() {
     $params['title'] = $params['pcp_title'];
     $params['intro_text'] = $params['pcp_intro_text'];
     $params['contact_id'] = $contactID;
-    $params['page_id'] = $this->get('component_page_id') ? $this->get('component_page_id') : $this->_contriPageId;
+    $params['page_id'] = $this->get('component_page_id') ?: $this->_contriPageId;
     $params['page_type'] = $this->_component;
 
     // since we are allowing html input from the user
diff --git a/www/modules/civicrm/CRM/PCP/Page/PCP.php b/www/modules/civicrm/CRM/PCP/Page/PCP.php
index e4523a346..ef0c58781 100644
--- a/www/modules/civicrm/CRM/PCP/Page/PCP.php
+++ b/www/modules/civicrm/CRM/PCP/Page/PCP.php
@@ -238,7 +238,7 @@ public function browse($action = NULL) {
       $pages['event'][$epages->id]['end_date'] = $epages->registration_end_date;
     }
 
-    $params = $this->get('params') ? $this->get('params') : [];
+    $params = $this->get('params') ?: [];
 
     $title = '1';
     if ($this->_sortByCharacter !== NULL) {
diff --git a/www/modules/civicrm/CRM/PCP/StateMachine/PCP.php b/www/modules/civicrm/CRM/PCP/StateMachine/PCP.php
index 1949f9228..07975f07f 100644
--- a/www/modules/civicrm/CRM/PCP/StateMachine/PCP.php
+++ b/www/modules/civicrm/CRM/PCP/StateMachine/PCP.php
@@ -16,25 +16,19 @@
  */
 
 /**
- * State machine for managing different states of the Import process.
- *
+ * State machine for managing different pages while setting up PCP flow.
  */
 class CRM_PCP_StateMachine_PCP extends CRM_Core_StateMachine {
 
   /**
    * Class constructor.
    *
-   * @param object $controller
-   * @param \const|int $action
-   *
-   * @internal param \CRM_Contact_Import_Controller $object
-   * @return \CRM_PCP_StateMachine_PCP CRM_Contact_Import_StateMachine
+   * @param CRM_PCP_Controller_PCP $controller
+   * @param int $action
    */
   public function __construct($controller, $action = CRM_Core_Action::NONE) {
     parent::__construct($controller, $action);
-
-    $session = CRM_Core_Session::singleton();
-    $session->set('singleForm', FALSE);
+    CRM_Core_Session::singleton()->set('singleForm', FALSE);
 
     $this->_pages = [
       'CRM_PCP_Form_PCPAccount' => NULL,
diff --git a/www/modules/civicrm/CRM/Pledge/DAO/Pledge.php b/www/modules/civicrm/CRM/Pledge/DAO/Pledge.php
index d658126d7..1d4d2d6c4 100644
--- a/www/modules/civicrm/CRM/Pledge/DAO/Pledge.php
+++ b/www/modules/civicrm/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:0e5accbafc151eeed6b7a5de6d194e84)
+ * (GenCodeChecksum:95834e2210d6808f89b9afd8e3a3f601)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Pledge/DAO/PledgeBlock.php b/www/modules/civicrm/CRM/Pledge/DAO/PledgeBlock.php
index bf17861d1..a472c5dd2 100644
--- a/www/modules/civicrm/CRM/Pledge/DAO/PledgeBlock.php
+++ b/www/modules/civicrm/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:f085d7cb178f9fcb0441c9229e317ec5)
+ * (GenCodeChecksum:91fae667e945aaf73143425e96c0b132)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Pledge/DAO/PledgePayment.php b/www/modules/civicrm/CRM/Pledge/DAO/PledgePayment.php
index a290fac0e..d3b7d214a 100644
--- a/www/modules/civicrm/CRM/Pledge/DAO/PledgePayment.php
+++ b/www/modules/civicrm/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:dd7ee360635e8fd3f8cfc484378f67b2)
+ * (GenCodeChecksum:7170b6632cf8cc041f87119f41b3b010)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Pledge/Form/Pledge.php b/www/modules/civicrm/CRM/Pledge/Form/Pledge.php
index ab873baa7..e39aa8672 100644
--- a/www/modules/civicrm/CRM/Pledge/Form/Pledge.php
+++ b/www/modules/civicrm/CRM/Pledge/Form/Pledge.php
@@ -22,6 +22,8 @@
  */
 class CRM_Pledge_Form_Pledge extends CRM_Core_Form {
   use CRM_Contact_Form_ContactFormTrait;
+  use CRM_Custom_Form_CustomDataTrait;
+  use CRM_Pledge_Form_PledgeFormTrait;
 
   public $_action;
 
@@ -29,6 +31,8 @@ class CRM_Pledge_Form_Pledge extends CRM_Core_Form {
    * The id of the pledge that we are processing.
    *
    * @var int
+   *
+   * @internal
    */
   public $_id;
 
@@ -67,7 +71,6 @@ public function preProcess(): void {
     $this->_action = CRM_Utils_Request::retrieve('action', 'String',
       $this, FALSE, 'add'
     );
-    $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this);
     $this->setContext();
     // check for action permissions.
     if (!CRM_Core_Permission::checkActionPermission('CiviPledge', $this->_action)) {
@@ -82,15 +85,12 @@ public function preProcess(): void {
 
     $this->setPageTitle(ts('Pledge'));
 
-    // build custom data
-    CRM_Custom_Form_CustomData::preProcess($this, NULL, NULL, 1, 'Pledge', $this->_id);
     $this->_values = [];
     // current pledge id
-    if ($this->_id) {
-      $params = ['id' => $this->_id];
+    if ($this->getPledgeID()) {
+      $params = ['id' => $this->getPledgeID()];
       CRM_Pledge_BAO_Pledge::getValues($params, $this->_values);
-
-      $this->_isPending = !CRM_Pledge_BAO_Pledge::pledgeHasFinancialTransactions($this->_id, CRM_Utils_Array::value('status_id', $this->_values));
+      $this->_isPending = !CRM_Pledge_BAO_Pledge::pledgeHasFinancialTransactions($this->getPledgeID(), $this->getPledgeValue('status_id'));
     }
 
     // get the pledge frequency units.
@@ -114,7 +114,7 @@ public function setDefaultValues(): array {
       $this->assign('is_test', TRUE);
     }
 
-    if ($this->_id) {
+    if ($this->getPledgeID()) {
       // check is this pledge pending.
       // fix the display of the monetary value, CRM-4038.
       if ($this->_isPending) {
@@ -162,9 +162,6 @@ public function setDefaultValues(): array {
     ));
 
     $this->assign('email', $this->getContactValue('email_primary.email'));
-    // custom data set defaults
-    $defaults += CRM_Custom_Form_CustomData::setDefaultValues($this);
-
     return $defaults;
   }
 
@@ -194,7 +191,7 @@ public function buildQuickForm(): void {
     if ($this->getContext() !== 'standalone') {
       $contactField->freeze();
     }
-
+    $this->assign('pledgeID', $this->getPledgeID());
     $formType = CRM_Utils_Request::retrieveValue('formType', 'String');
 
     $allPanes[ts('Payment Reminders')] = [
@@ -336,7 +333,15 @@ public function buildQuickForm(): void {
     $this->assign('outBound_option', $mailingInfo['outBound_option']);
 
     // build custom data
-    CRM_Custom_Form_CustomData::buildQuickForm($this);
+    if ($this->isSubmitted()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('Pledge', array_filter([
+        'id' => $this->getPledgeID(),
+      ]));
+    }
 
     // make this form an upload since we dont know if the custom data injected dynamically
     // is of type file etc $uploadNames = $this->get( 'uploadNames' );
@@ -412,7 +417,7 @@ public static function formRule($fields, $files, $self) {
    */
   public function postProcess(): void {
     if ($this->_action & CRM_Core_Action::DELETE) {
-      CRM_Pledge_BAO_Pledge::deletePledge($this->_id);
+      CRM_Pledge_BAO_Pledge::deletePledge($this->getPledgeID());
       return;
     }
 
@@ -443,13 +448,13 @@ public function postProcess(): void {
     }
 
     // format amount
-    $params['amount'] = CRM_Utils_Rule::cleanMoney(CRM_Utils_Array::value('amount', $formValues));
+    $params['amount'] = $this->getSubmittedValue('amount');
     $params['currency'] = $formValues['currency'] ?? NULL;
     $params['original_installment_amount'] = ($params['amount'] / $params['installments']);
 
     $dates = ['create_date', 'start_date', 'acknowledge_date', 'cancel_date'];
     foreach ($dates as $d) {
-      if ($this->_id && (!$this->_isPending) && !empty($this->_values[$d])) {
+      if ($this->getPledgeID() && (!$this->_isPending) && !empty($this->_values[$d])) {
         if ($d === 'start_date') {
           $params['scheduled_date'] = CRM_Utils_Date::processDate($this->_values[$d]);
         }
@@ -472,20 +477,16 @@ public function postProcess(): void {
 
     // assign id only in update mode
     if ($this->_action & CRM_Core_Action::UPDATE) {
-      $params['id'] = $this->_id;
+      $params['id'] = $this->getPledgeID();
     }
 
     $params['contact_id'] = $this->_contactID;
 
     // format custom data
-    if (!empty($formValues['hidden_custom'])) {
-      $params['hidden_custom'] = 1;
-
-      $params['custom'] = CRM_Core_BAO_CustomField::postProcess($formValues,
-        $this->_id,
-        'Pledge'
-      );
-    }
+    $params['custom'] = CRM_Core_BAO_CustomField::postProcess($this->getSubmittedValues(),
+      $this->getPledgeID(),
+      'Pledge'
+    );
 
     // handle pending pledge.
     $params['is_pledge_pending'] = $this->_isPending;
@@ -564,6 +565,13 @@ public function postProcess(): void {
         $session->replaceUserContext(CRM_Utils_System::url('civicrm/contact/view',
           "reset=1&cid={$this->_contactID}&selectedChild=pledge"
         ));
+        // Refresh other tabs with related data
+        $this->ajaxResponse['updateTabs'] = [
+          '#tab_activity' => TRUE,
+        ];
+        if (CRM_Core_Permission::access('CiviContribute')) {
+          $this->ajaxResponse['updateTabs']['#tab_contribute'] = CRM_Contact_BAO_Contact::getCountComponent('contribution', $this->_contactID);
+        }
       }
     }
     elseif ($buttonName === $this->getButtonName('upload', 'new')) {
@@ -573,4 +581,19 @@ public function postProcess(): void {
     }
   }
 
+  /**
+   * Get the pledge ID.
+   *
+   * @api supported for external use.
+   *
+   * @return int|null
+   * @throws \CRM_Core_Exception
+   */
+  public function getPledgeID(): ?int {
+    if (!isset($this->_id)) {
+      $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this);
+    }
+    return $this->_id ? (int) $this->_id : NULL;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Pledge/Form/PledgeFormTrait.php b/www/modules/civicrm/CRM/Pledge/Form/PledgeFormTrait.php
new file mode 100644
index 000000000..8f25befc1
--- /dev/null
+++ b/www/modules/civicrm/CRM/Pledge/Form/PledgeFormTrait.php
@@ -0,0 +1,55 @@
+<?php
+
+use Civi\API\EntityLookupTrait;
+
+/**
+ * Trait implements getContactValue + overridable getContactID functions.
+ *
+ * These are commonly used on forms - although getContactID() would often
+ * be overridden. By using these functions it is not necessary to know
+ * if the Contact ID has already been defined as `getContactID()` will retrieve
+ * them form the values available (unless it is yet to be created).
+ */
+trait CRM_Pledge_Form_PledgeFormTrait {
+
+  use EntityLookupTrait;
+
+  /**
+   * Get id of Pledge being acted on.
+   *
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
+   */
+  public function getPledgeID(): ?int {
+    throw new CRM_Core_Exception('`getPledgeID` must be implemented');
+  }
+
+  /**
+   * Get a value from the Pledge being acted on.
+   *
+   * All values returned in apiv4 format. Escaping may be required.
+   *
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
+   *
+   * @param string $fieldName
+   *
+   * @return mixed
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function getPledgeValue(string $fieldName) {
+    if ($this->isDefined('Pledge')) {
+      return $this->lookup('Pledge', $fieldName);
+    }
+    $id = $this->getPledgeID();
+    if ($id) {
+      $this->define('Pledge', 'Pledge', ['id' => $id]);
+      return $this->lookup('Pledge', $fieldName);
+    }
+    return NULL;
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Pledge/Form/PledgeView.php b/www/modules/civicrm/CRM/Pledge/Form/PledgeView.php
index ed1e74e4b..2ab8cbf66 100644
--- a/www/modules/civicrm/CRM/Pledge/Form/PledgeView.php
+++ b/www/modules/civicrm/CRM/Pledge/Form/PledgeView.php
@@ -19,102 +19,93 @@
  * This class generates form components for Pledge
  */
 class CRM_Pledge_Form_PledgeView extends CRM_Core_Form {
+  use CRM_Pledge_Form_PledgeFormTrait;
 
   /**
    * Set variables up before form is built.
+   *
+   * @throws \CRM_Core_Exception
    */
-  public function preProcess() {
-
-    $values = $ids = [];
-    $params = ['id' => $this->get('id')];
-    CRM_Pledge_BAO_Pledge::getValues($params,
-      $values,
-      $ids
-    );
-
-    $values['frequencyUnit'] = ts('%1(s)', [1 => $values['frequency_unit']]);
-
-    if (isset($values["honor_contact_id"]) && $values["honor_contact_id"]) {
-      $sql = "SELECT display_name FROM civicrm_contact WHERE id = " . $values["honor_contact_id"];
-      $dao = new CRM_Core_DAO();
-      $dao->query($sql);
-      if ($dao->fetch()) {
-        $url = CRM_Utils_System::url('civicrm/contact/view', "reset=1&cid=$values[honor_contact_id]");
-        $values["honor_display"] = "<A href = $url>" . $dao->display_name . "</A>";
-      }
-      $honor = CRM_Core_PseudoConstant::get('CRM_Pledge_DAO_Pledge', 'honor_type_id');
-      $values['honor_type'] = $honor[$values['honor_type_id']];
-    }
+  public function preProcess(): void {
 
+    $id = $this->getPledgeID();
+    $contactID = $this->getPledgeValue('contact_id');
+    $params = ['id' => $this->getPledgeID()];
     // handle custom data.
     $groupTree = CRM_Core_BAO_CustomGroup::getTree('Pledge', NULL, $params['id'], NULL, [], NULL,
       TRUE, NULL, FALSE, CRM_Core_Permission::VIEW);
     CRM_Core_BAO_CustomGroup::buildCustomDataView($this, $groupTree, FALSE, NULL, NULL, NULL, $params['id']);
 
-    if (!empty($values['contribution_page_id'])) {
-      $values['contribution_page'] = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_ContributionPage', $values['contribution_page_id'], 'title');
-    }
-
-    $values['financial_type'] = CRM_Utils_Array::value($values['financial_type_id'], CRM_Contribute_PseudoConstant::financialType());
+    $displayName = $this->getPledgeValue('contact_id.display_name');
 
-    if ($values['status_id']) {
-      $values['pledge_status'] = CRM_Core_PseudoConstant::getLabel('CRM_Pledge_BAO_Pledge', 'status_id', $values['status_id']);
+    // Check if this is default domain contact CRM-10482
+    if (CRM_Contact_BAO_Contact::checkDomainContact($contactID)) {
+      $displayName .= ' (' . ts('default organization') . ')';
     }
+    // omitting contactImage from title for now since the summary overlay css doesn't work outside of our crm-container
+    $this->setTitle(ts('View Pledge by') . ' ' . $displayName);
+    $this->assign('displayName', $displayName);
+
+    $title = $displayName .
+      ' - (' . ts('Pledged') . ' ' . CRM_Utils_Money::format($this->getPledgeValue('pledge_amount')) .
+      ' - ' . $this->getPledgeValue('financial_type_id:label') . ')';
 
     $url = CRM_Utils_System::url('civicrm/contact/view/pledge',
-      "action=view&reset=1&id={$values['id']}&cid={$values['contact_id']}&context=home"
+      "action=view&reset=1&id={$id}&cid={$contactID}&context=home"
     );
 
     $recentOther = [];
     if (CRM_Core_Permission::checkActionPermission('CiviPledge', CRM_Core_Action::UPDATE)) {
       $recentOther['editUrl'] = CRM_Utils_System::url('civicrm/contact/view/pledge',
-        "action=update&reset=1&id={$values['id']}&cid={$values['contact_id']}&context=home"
+        "action=update&reset=1&id={$id}&cid={$contactID}&context=home"
       );
     }
     if (CRM_Core_Permission::checkActionPermission('CiviPledge', CRM_Core_Action::DELETE)) {
       $recentOther['deleteUrl'] = CRM_Utils_System::url('civicrm/contact/view/pledge',
-        "action=delete&reset=1&id={$values['id']}&cid={$values['contact_id']}&context=home"
+        "action=delete&reset=1&id={$id}&cid={$contactID}&context=home"
       );
     }
-
-    $displayName = CRM_Contact_BAO_Contact::displayName($values['contact_id']);
-    $this->assign('displayName', $displayName);
-
-    $title = $displayName .
-      ' - (' . ts('Pledged') . ' ' . CRM_Utils_Money::format($values['pledge_amount']) .
-      ' - ' . $values['financial_type'] . ')';
-
     // add Pledge to Recent Items
     CRM_Utils_Recent::add($title,
       $url,
-      $values['id'],
+      $this->getPledgeID(),
       'Pledge',
-      $values['contact_id'],
+      $this->getPledgeValue('contact_id'),
       NULL,
       $recentOther
     );
 
-    // Check if this is default domain contact CRM-10482
-    if (CRM_Contact_BAO_Contact::checkDomainContact($values['contact_id'])) {
-      $displayName .= ' (' . ts('default organization') . ')';
-    }
-    // omitting contactImage from title for now since the summary overlay css doesn't work outside of our crm-container
-    $this->setTitle(ts('View Pledge by') . ' ' . $displayName);
-
-    // do check for campaigns
-    $campaignId = $values['campaign_id'] ?? NULL;
-    if ($campaignId) {
-      $campaigns = CRM_Campaign_BAO_Campaign::getCampaigns($campaignId);
-      $values['campaign'] = $campaigns[$campaignId];
-    }
-
-    $this->assign($values);
+    $this->assign('campaign', $this->getPledgeValue('campaign_id:label'));
+    $currentInstallment = $this->getPledgeValue('amount') / $this->getPledgeValue('installments');
+    $this->assign('currentInstallment', $currentInstallment);
+    $this->assign('originalPledgeAmount', $currentInstallment === $this->getPledgeValue('original_installment_amount') ? NULL : $this->getPledgeValue('installments') * $this->getPledgeValue('original_installment_amount'));
+    $this->assign('start_date', $this->getPledgeValue('start_date'));
+    $this->assign('create_date', $this->getPledgeValue('create_date'));
+    $this->assign('end_date', $this->getPledgeValue('end_date'));
+    $this->assign('cancel_date', $this->getPledgeValue('cancel_date'));
+    $this->assign('is_test', $this->getPledgeValue('is_test'));
+    $this->assign('acknowledge_date', $this->getPledgeValue('acknowledge_date'));
+    $this->assign('pledge_status', $this->getPledgeValue('status_id:label'));
+    $this->assign('pledge_status_name', $this->getPledgeValue('status_id:name'));
+    $this->assign('amount', $this->getPledgeValue('amount'));
+    $this->assign('currency', $this->getPledgeValue('currency'));
+    $this->assign('initial_reminder_day', $this->getPledgeValue('initial_reminder_day'));
+    $this->assign('additional_reminder_day', $this->getPledgeValue('additional_reminder_day'));
+    $this->assign('max_reminders', $this->getPledgeValue('max_reminders'));
+    $this->assign('installments', $this->getPledgeValue('installments'));
+    $this->assign('original_installment_amount', $this->getPledgeValue('original_installment_amount'));
+    $this->assign('frequency_interval', $this->getPledgeValue('frequency_interval'));
+    $this->assign('frequency_day', $this->getPledgeValue('frequency_day'));
+    $this->assign('contribution_page', $this->getPledgeValue('contribution_page_id.title'));
+    $this->assign('contact_id', $this->getPledgeValue('contact_id'));
+    $this->assign('financial_type', $this->getPledgeValue('financial_type_id:label'));
+    $this->assign('frequencyUnit', ts('%1(s)', [1 => $this->getPledgeValue('frequency_unit')]));
   }
 
   /**
    * Build the form object.
    */
-  public function buildQuickForm() {
+  public function buildQuickForm(): void {
     $this->addButtons([
         [
           'type' => 'next',
@@ -125,4 +116,15 @@ public function buildQuickForm() {
     ]);
   }
 
+  /**
+   * Get id of Pledge being acted on.
+   *
+   * @api This function will not change in a minor release and is supported for
+   * use outside of core. This annotation / external support for properties
+   * is only given where there is specific test cover.
+   */
+  public function getPledgeID(): int {
+    return (int) $this->get('id');
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Pledge/Info.php b/www/modules/civicrm/CRM/Pledge/Info.php
index 5b3c113e5..395a3d988 100644
--- a/www/modules/civicrm/CRM/Pledge/Info.php
+++ b/www/modules/civicrm/CRM/Pledge/Info.php
@@ -45,42 +45,22 @@ public function getInfo() {
 
   /**
    * @inheritDoc
-   * Provides permissions that are used by component.
-   * Needs to be implemented in component's information
-   * class.
-   *
-   * NOTE: if using conditionally permission return,
-   * implementation of $getAllUnconditionally is required.
-   *
-   * @param bool $getAllUnconditionally
-   * @param bool $descriptions
-   *   Whether to return permission descriptions
-   *
-   * @return array|null
-   *   collection of permissions, null if none
    */
-  public function getPermissions($getAllUnconditionally = FALSE, $descriptions = FALSE) {
+  public function getPermissions(): array {
     $permissions = [
       'access CiviPledge' => [
-        ts('access CiviPledge'),
-        ts('View pledges'),
+        'label' => ts('access CiviPledge'),
+        'description' => ts('View pledges'),
       ],
       'edit pledges' => [
-        ts('edit pledges'),
-        ts('Create and update pledges'),
+        'label' => ts('edit pledges'),
+        'description' => ts('Create and update pledges'),
       ],
       'delete in CiviPledge' => [
-        ts('delete in CiviPledge'),
-        ts('Delete pledges'),
+        'label' => ts('delete in CiviPledge'),
+        'description' => ts('Delete pledges'),
       ],
     ];
-
-    if (!$descriptions) {
-      foreach ($permissions as $name => $attr) {
-        $permissions[$name] = array_shift($attr);
-      }
-    }
-
     return $permissions;
   }
 
diff --git a/www/modules/civicrm/CRM/Pledge/Page/Tab.php b/www/modules/civicrm/CRM/Pledge/Page/Tab.php
index 49d050e3b..653b056bd 100644
--- a/www/modules/civicrm/CRM/Pledge/Page/Tab.php
+++ b/www/modules/civicrm/CRM/Pledge/Page/Tab.php
@@ -35,11 +35,6 @@ public function browse() {
       $displayName = CRM_Contact_BAO_Contact::displayName($this->_contactId);
       $this->assign('displayName', $displayName);
       $this->ajaxResponse['tabCount'] = CRM_Contact_BAO_Contact::getCountComponent('pledge', $this->_contactId);
-      // Refresh other tabs with related data
-      $this->ajaxResponse['updateTabs'] = [
-        '#tab_contribute' => CRM_Contact_BAO_Contact::getCountComponent('contribution', $this->_contactId),
-        '#tab_activity' => CRM_Contact_BAO_Contact::getCountComponent('activity', $this->_contactId),
-      ];
     }
   }
 
diff --git a/www/modules/civicrm/CRM/Pledge/Selector/Search.php b/www/modules/civicrm/CRM/Pledge/Selector/Search.php
index 8dba0e803..ec2d71959 100644
--- a/www/modules/civicrm/CRM/Pledge/Selector/Search.php
+++ b/www/modules/civicrm/CRM/Pledge/Selector/Search.php
@@ -342,7 +342,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
         $result->pledge_id
       );
 
-      $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? $result->contact_sub_type : $result->contact_type, FALSE, $result->contact_id
+      $row['contact_type'] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ?: $result->contact_type, FALSE, $result->contact_id
       );
       $rows[] = $row;
     }
diff --git a/www/modules/civicrm/CRM/Price/BAO/LineItem.php b/www/modules/civicrm/CRM/Price/BAO/LineItem.php
index 8338cd637..e281a4aa2 100644
--- a/www/modules/civicrm/CRM/Price/BAO/LineItem.php
+++ b/www/modules/civicrm/CRM/Price/BAO/LineItem.php
@@ -128,9 +128,11 @@ public static function getLineTotal($contributionId) {
   }
 
   /**
-   * Wrapper for line item retrieval when contribution ID is known.
+   * (quasi-deprecated) Wrapper for line item retrieval when contribution ID is known.
    * @param int $contributionID
    *
+   * @internal - apiv4 is recommended.
+   *
    * @return array
    */
   public static function getLineItemsByContributionID($contributionID) {
@@ -425,61 +427,6 @@ public static function processPriceSet($entityId, $lineItems, $contributionDetai
     }
   }
 
-  /**
-   * @param int $entityId
-   * @param string $entityTable
-   * @param $amount
-   * @param array $otherParams
-   */
-  public static function syncLineItems($entityId, $entityTable, $amount, $otherParams = NULL) {
-    if (!$entityId || CRM_Utils_System::isNull($amount)) {
-      return;
-    }
-
-    $from = " civicrm_line_item li
-      LEFT JOIN   civicrm_price_field pf ON pf.id = li.price_field_id
-      LEFT JOIN   civicrm_price_set ps ON ps.id = pf.price_set_id ";
-
-    $set = " li.unit_price = %3,
-      li.line_total = %3 ";
-
-    $where = " li.entity_id = %1 AND
-      li.entity_table = %2 ";
-
-    $params = [
-      1 => [$entityId, 'Integer'],
-      2 => [$entityTable, 'String'],
-      3 => [$amount, 'Float'],
-    ];
-
-    if ($entityTable == 'civicrm_contribution') {
-      $entityName = 'default_contribution_amount';
-      $where .= " AND ps.name = %4 ";
-      $params[4] = [$entityName, 'String'];
-    }
-    elseif ($entityTable == 'civicrm_participant') {
-      $from .= "
-        LEFT JOIN civicrm_price_set_entity cpse ON cpse.price_set_id = ps.id
-        LEFT JOIN civicrm_price_field_value cpfv ON cpfv.price_field_id = pf.id and cpfv.label = %4 ";
-      $set .= " ,li.label = %4,
-        li.price_field_value_id = cpfv.id ";
-      $where .= " AND cpse.entity_table = 'civicrm_event' AND cpse.entity_id = %5 ";
-      $amount = empty($amount) ? 0 : $amount;
-      $params += [
-        4 => [$otherParams['fee_label'], 'String'],
-        5 => [$otherParams['event_id'], 'String'],
-      ];
-    }
-
-    $query = "
-      UPDATE $from
-      SET    $set
-      WHERE  $where
-      ";
-
-    CRM_Core_DAO::executeQuery($query, $params);
-  }
-
   /**
    * Build line items array.
    *
@@ -677,7 +624,7 @@ public static function changeFeeSelections(
       $updatedAmount = CRM_Price_BAO_LineItem::getLineTotal($contributionId);
     }
     else {
-      $updatedAmount = CRM_Utils_Array::value('amount', $params, CRM_Utils_Array::value('total_amount', $params));
+      $updatedAmount = $params['amount'] ?? $params['total_amount'] ?? NULL;
     }
     if (strlen($params['tax_amount']) != 0) {
       $taxAmount = $params['tax_amount'];
diff --git a/www/modules/civicrm/CRM/Price/BAO/PriceField.php b/www/modules/civicrm/CRM/Price/BAO/PriceField.php
index 38629f0f0..8680b5261 100644
--- a/www/modules/civicrm/CRM/Price/BAO/PriceField.php
+++ b/www/modules/civicrm/CRM/Price/BAO/PriceField.php
@@ -111,20 +111,20 @@ public static function create(&$params) {
           'label' => trim($params['option_label'][$index]),
           'name' => CRM_Utils_String::munge($params['option_label'][$index], '_', 64),
           'amount' => trim($params['option_amount'][$index]),
-          'count' => CRM_Utils_Array::value($index, CRM_Utils_Array::value('option_count', $params), NULL),
-          'max_value' => CRM_Utils_Array::value($index, CRM_Utils_Array::value('option_max_value', $params), NULL),
-          'description' => CRM_Utils_Array::value($index, CRM_Utils_Array::value('option_description', $params), NULL),
-          'membership_type_id' => CRM_Utils_Array::value($index, CRM_Utils_Array::value('membership_type_id', $params), NULL),
+          'count' => $params['option_count'][$index] ?? NULL,
+          'max_value' => $params['option_max_value'][$index] ?? NULL,
+          'description' => $params['option_description'][$index] ?? NULL,
+          'membership_type_id' => $params['membership_type_id'][$index] ?? NULL,
           'weight' => $params['option_weight'][$index],
           'is_active' => 1,
           'is_default' => !empty($defaultArray[$params['option_weight'][$index]]) ? $defaultArray[$params['option_weight'][$index]] : 0,
           'membership_num_terms' => NULL,
           'non_deductible_amount' => $params['non_deductible_amount'] ?? NULL,
-          'visibility_id' => CRM_Utils_Array::value($index, CRM_Utils_Array::value('option_visibility_id', $params), self::getVisibilityOptionID('public')),
+          'visibility_id' => $params['option_visibility_id'][$index] ?? self::getVisibilityOptionID('public'),
         ];
 
         if ($options['membership_type_id']) {
-          $options['membership_num_terms'] = CRM_Utils_Array::value($index, CRM_Utils_Array::value('membership_num_terms', $params), 1);
+          $options['membership_num_terms'] = $params['membership_num_terms'][$index] ?? 1;
           $options['is_default'] = !empty($defaultArray[$params['membership_type_id'][$index]]) ? $defaultArray[$params['membership_type_id'][$index]] : 0;
         }
 
@@ -783,7 +783,7 @@ public static function buildPriceOptionText($opt, $isDisplayAmounts, $valueField
     $taxAmount = $opt['tax_amount'] ?? NULL;
     if ($isDisplayAmounts) {
       $optionLabel = !empty($optionLabel) ? $optionLabel . '<span class="crm-price-amount-label-separator">&nbsp;-&nbsp;</span>' : '';
-      if (isset($taxAmount) && $invoicing) {
+      if ($opt['tax_amount'] && $invoicing) {
         $optionLabel = $optionLabel . self::getTaxLabel($opt, $valueFieldName);
       }
       else {
diff --git a/www/modules/civicrm/CRM/Price/BAO/PriceFieldValue.php b/www/modules/civicrm/CRM/Price/BAO/PriceFieldValue.php
index e267621e0..b683619a5 100644
--- a/www/modules/civicrm/CRM/Price/BAO/PriceFieldValue.php
+++ b/www/modules/civicrm/CRM/Price/BAO/PriceFieldValue.php
@@ -73,7 +73,7 @@ public static function create(&$params, $ids = []) {
       if ($id) {
         $oldWeight = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceFieldValue', $id, 'weight', 'id');
       }
-      $fieldValues = ['price_field_id' => CRM_Utils_Array::value('price_field_id', $params, 0)];
+      $fieldValues = ['price_field_id' => $params['price_field_id'] ?? 0];
       $params['weight'] = CRM_Utils_Weight::updateOtherWeights('CRM_Price_DAO_PriceFieldValue', $oldWeight, $params['weight'], $fieldValues);
     }
     elseif (!$id) {
diff --git a/www/modules/civicrm/CRM/Price/BAO/PriceSet.php b/www/modules/civicrm/CRM/Price/BAO/PriceSet.php
index 662eca698..b870325ca 100644
--- a/www/modules/civicrm/CRM/Price/BAO/PriceSet.php
+++ b/www/modules/civicrm/CRM/Price/BAO/PriceSet.php
@@ -667,6 +667,7 @@ public static function getCachedPriceSetDetail(int $priceSetID): array {
         ->execute()->first();
       $data['fields'] = (array) PriceField::get(FALSE)
         ->addWhere('price_set_id', '=', $priceSetID)
+        ->addWhere('is_active', '=', TRUE)
         ->addSelect('*', 'visibility_id:name')
         ->addOrderBy('weight', 'ASC')
         ->execute()->indexBy('id');
@@ -681,6 +682,7 @@ public static function getCachedPriceSetDetail(int $priceSetID): array {
       }
       $options = PriceFieldValue::get(FALSE)
         ->addWhere('price_field_id', 'IN', array_keys($data['fields']))
+        ->addWhere('is_active', '=', TRUE)
         ->setSelect($select)
         ->addOrderBy('weight', 'ASC')
         ->execute();
@@ -709,6 +711,7 @@ public static function getCachedPriceSetDetail(int $priceSetID): array {
    * @deprecated since 5.68. Will be removed around 5.80.
    */
   public static function buildPriceSet(&$form, $component = NULL, $validFieldsOnly = TRUE) {
+    CRM_Core_Error::deprecatedWarning('internal function');
     $priceSetId = $form->get('priceSetId');
     if (!$priceSetId) {
       return;
diff --git a/www/modules/civicrm/CRM/Price/DAO/LineItem.php b/www/modules/civicrm/CRM/Price/DAO/LineItem.php
index 68847eddd..f0bdbc237 100644
--- a/www/modules/civicrm/CRM/Price/DAO/LineItem.php
+++ b/www/modules/civicrm/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:4ed8cb9b05a2f47927b4fcfdefc6acc4)
+ * (GenCodeChecksum:3680ce678d999b96b3d6533393a8aa5a)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Price/DAO/PriceField.php b/www/modules/civicrm/CRM/Price/DAO/PriceField.php
index 4027b35e8..d18440688 100644
--- a/www/modules/civicrm/CRM/Price/DAO/PriceField.php
+++ b/www/modules/civicrm/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:3c89e8cae44de908cbe9946b74e8dead)
+ * (GenCodeChecksum:a025293005d5f886c5371e539ceaa75d)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Price/DAO/PriceFieldValue.php b/www/modules/civicrm/CRM/Price/DAO/PriceFieldValue.php
index 1fbe09752..9c92180c8 100644
--- a/www/modules/civicrm/CRM/Price/DAO/PriceFieldValue.php
+++ b/www/modules/civicrm/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:9fe8e00e503d24fc46fd8f0d94cf4b55)
+ * (GenCodeChecksum:2a91ab82b91ce2a5398dc3def85cc4cc)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Price/DAO/PriceSet.php b/www/modules/civicrm/CRM/Price/DAO/PriceSet.php
index ee3735f73..630cdcb7c 100644
--- a/www/modules/civicrm/CRM/Price/DAO/PriceSet.php
+++ b/www/modules/civicrm/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:92854c16878bd3b29650b6e2230255a9)
+ * (GenCodeChecksum:05175f4af5a44203932d2db0c7ee06cc)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Price/DAO/PriceSetEntity.php b/www/modules/civicrm/CRM/Price/DAO/PriceSetEntity.php
index d5c11dbbb..84bc2f900 100644
--- a/www/modules/civicrm/CRM/Price/DAO/PriceSetEntity.php
+++ b/www/modules/civicrm/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:f1affb16f087370afd28e790a9113d60)
+ * (GenCodeChecksum:3c70a3fe4a64b314aaed6a5cca01de82)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Price/Form/Field.php b/www/modules/civicrm/CRM/Price/Form/Field.php
index 844d49fa9..2fcdb1b17 100644
--- a/www/modules/civicrm/CRM/Price/Form/Field.php
+++ b/www/modules/civicrm/CRM/Price/Form/Field.php
@@ -122,7 +122,7 @@ public function setDefaultValues() {
       $this->_sid = $defaults['price_set_id'];
 
       // if text, retrieve price
-      if ($defaults['html_type'] == 'Text') {
+      if ($defaults['html_type'] === 'Text') {
         $isActive = $defaults['is_active'];
         $valueParams = ['price_field_id' => $this->getEntityId()];
 
@@ -188,18 +188,8 @@ public function buildQuickForm() {
     // Text box for Participant Count for a field
 
     // Financial Type
-    $financialType = CRM_Financial_BAO_FinancialType::getIncomeFinancialType();
-    foreach ($financialType as $finTypeId => $type) {
-      if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()
-        && !CRM_Core_Permission::check('add contributions of type ' . $type)
-      ) {
-        unset($financialType[$finTypeId]);
-      }
-    }
-    if (count($financialType)) {
-      $this->assign('financialType', $financialType);
-    }
-
+    $financialTypes = CRM_Financial_BAO_FinancialType::getIncomeFinancialType();
+    $this->assign('financialType', $financialTypes);
     //Visibility Type Options
     $visibilityType = CRM_Core_PseudoConstant::visibility();
     $this->assign('visibilityType', $visibilityType);
@@ -217,7 +207,7 @@ public function buildQuickForm() {
 
     $this->add('select', 'financial_type_id',
       ts('Financial Type'),
-      [' ' => ts('- select -')] + $financialType
+      [' ' => ts('- select -')] + $financialTypes
     );
 
     $this->assign('useForMember', FALSE);
@@ -285,7 +275,7 @@ public function buildQuickForm() {
         'select',
         'option_financial_type_id[' . $i . ']',
         ts('Financial Type'),
-        ['' => ts('- select -')] + $financialType
+        ['' => ts('- select -')] + $financialTypes
       );
       if (in_array($eventComponentId, $this->_extendComponentId)) {
         // count
@@ -403,7 +393,7 @@ public function buildQuickForm() {
    * @param array $files
    * @param self $form
    *
-   * @return array
+   * @return array|bool
    *   if errors then list of errors to be posted back to the form,
    *                  true otherwise
    */
@@ -430,7 +420,7 @@ public static function formRule($fields, $files, $form) {
     if ((is_numeric($fields['count'] ?? '') &&
         empty($fields['count'])
       ) &&
-      (($fields['html_type'] ?? NULL) == 'Text')
+      (($fields['html_type'] ?? NULL) === 'Text')
     ) {
       $errors['count'] = ts('Participant Count must be greater than zero.');
     }
@@ -442,7 +432,7 @@ public static function formRule($fields, $files, $form) {
     }
 
     if ($form->_action & CRM_Core_Action::ADD) {
-      if ($fields['html_type'] != 'Text') {
+      if ($fields['html_type'] !== 'Text') {
         $countemptyrows = 0;
         $publicOptionCount = $_flagOption = $_rowError = 0;
 
@@ -491,7 +481,7 @@ public static function formRule($fields, $files, $form) {
               $_flagOption = 1;
             }
           }
-          if (!$noLabel && !$noAmount && !empty($fields['option_financial_type_id']) && $fields['option_financial_type_id'][$index] == '' && $fields['html_type'] != 'Text') {
+          if (!$noLabel && !$noAmount && !empty($fields['option_financial_type_id']) && $fields['option_financial_type_id'][$index] == '' && $fields['html_type'] !== 'Text') {
             $errors["option_financial_type_id[{$index}]"] = ts('Financial Type is a Required field.');
           }
           if ($noLabel && !$noAmount) {
@@ -534,7 +524,7 @@ public static function formRule($fields, $files, $form) {
           }
 
           if (!empty($fields['option_visibility_id'][$index]) && (!$noLabel || !$noAmount)) {
-            if ($visibilityOptions[$fields['option_visibility_id'][$index]] == 'public') {
+            if ($visibilityOptions[$fields['option_visibility_id'][$index]] === 'public') {
               $publicOptionCount++;
             }
           }
@@ -544,7 +534,7 @@ public static function formRule($fields, $files, $form) {
 
         if (!empty($memTypesIDS)) {
           // check for checkboxes allowing user to select multiple memberships from same membership organization
-          if ($fields['html_type'] == 'CheckBox') {
+          if ($fields['html_type'] === 'CheckBox') {
             $foundDuplicate = FALSE;
             $orgIds = [];
             foreach ($memTypesIDS as $key => $val) {
@@ -587,7 +577,7 @@ public static function formRule($fields, $files, $form) {
           $_flagOption = 1;
         }
 
-        if ($visibilityOptions[$fields['visibility_id']] == 'public' && $publicOptionCount == 0) {
+        if ($visibilityOptions[$fields['visibility_id']] === 'public' && $publicOptionCount == 0) {
           $errors['visibility_id'] = ts('You have selected to make this field public but have not enabled any public price options. Please update your selections to include a public price option, or make this field admin visibility only.');
           for ($index = 1; $index <= self::NUM_OPTION; $index++) {
             if (!empty($fields['option_label'][$index]) || !empty($fields['option_amount'][$index])) {
@@ -596,7 +586,7 @@ public static function formRule($fields, $files, $form) {
           }
         }
 
-        if ($visibilityOptions[$fields['visibility_id']] == 'admin' && $publicOptionCount > 0) {
+        if ($visibilityOptions[$fields['visibility_id']] === 'admin' && $publicOptionCount > 0) {
           $errors['visibility_id'] = ts('Field with \'Admin\' visibility should only contain \'Admin\' options.');
 
           for ($index = 1; $index <= self::NUM_OPTION; $index++) {
@@ -604,7 +594,7 @@ public static function formRule($fields, $files, $form) {
             $isOptionSet = !empty($fields['option_label'][$index]) || !empty($fields['option_amount'][$index]);
             $currentOptionVisibility = $visibilityOptions[$fields['option_visibility_id'][$index]] ?? NULL;
 
-            if ($isOptionSet && $currentOptionVisibility == 'public') {
+            if ($isOptionSet && $currentOptionVisibility === 'public') {
               $errors["option_visibility_id[{$index}]"] = ts('\'Admin\' field should only have \'Admin\' visibility options.');
             }
           }
@@ -643,12 +633,7 @@ 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');
-    }
+    $this->submit($params);
     $buttonName = $this->controller->getButtonName();
     $session = CRM_Core_Session::singleton();
     if ($buttonName == $this->getButtonName('next', 'new')) {
@@ -699,17 +684,16 @@ public function submit($params) {
       $params['option_amount'] = [1 => $params['price']];
       $params['option_label'] = [1 => $params['label']];
       $params['option_count'] = [1 => $params['count']];
-      $params['option_max_value'] = [1 => CRM_Utils_Array::value('max_value', $params)];
+      $params['option_max_value'] = [1 => $params['max_value'] ?? NULL];
       //$params['option_description']  = array( 1 => $params['description'] );
       $params['option_weight'] = [1 => $params['weight']];
       $params['option_financial_type_id'] = [1 => $params['financial_type_id']];
-      $params['option_visibility_id'] = [1 => CRM_Utils_Array::value('visibility_id', $params)];
+      $params['option_visibility_id'] = [1 => $params['visibility_id'] ?? NULL];
     }
 
     $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);
-    return $priceField;
+    return CRM_Price_BAO_PriceField::create($params);
   }
 
 }
diff --git a/www/modules/civicrm/CRM/Profile/Form.php b/www/modules/civicrm/CRM/Profile/Form.php
index 9fcb0ed8a..4db369812 100644
--- a/www/modules/civicrm/CRM/Profile/Form.php
+++ b/www/modules/civicrm/CRM/Profile/Form.php
@@ -808,7 +808,7 @@ public function buildQuickForm(): void {
       // if we are a admin OR the same user OR acl-user with access to the profile
       // or we have checksum access to this contact (i.e. the user without a login) - CRM-5909
       if (
-        CRM_Core_Permission::check('administer users') ||
+        CRM_Core_Permission::check('cms:administer users') ||
         $this->_id == $this->_currentUserID ||
         $this->_isPermissionedChecksum ||
         in_array(
diff --git a/www/modules/civicrm/CRM/Profile/Form/Edit.php b/www/modules/civicrm/CRM/Profile/Form/Edit.php
index 29c9adff3..97c8dce66 100644
--- a/www/modules/civicrm/CRM/Profile/Form/Edit.php
+++ b/www/modules/civicrm/CRM/Profile/Form/Edit.php
@@ -201,7 +201,7 @@ public function buildQuickForm(): void {
 
     $cancelButtonValue = !empty($this->_ufGroup['cancel_button_text']) ? $this->_ufGroup['cancel_button_text'] : ts('Cancel');
     $this->assign('cancelButtonText', $cancelButtonValue);
-    $this->assign('includeCancelButton', CRM_Utils_Array::value('add_cancel_button', $this->_ufGroup));
+    $this->assign('includeCancelButton', $this->_ufGroup['add_cancel_button'] ?? FALSE);
 
     if (($this->_multiRecord & CRM_Core_Action::DELETE) && $this->_recordExists) {
       $this->_deleteButtonName = $this->getButtonName('upload', 'delete');
diff --git a/www/modules/civicrm/CRM/Profile/Page/Dynamic.php b/www/modules/civicrm/CRM/Profile/Page/Dynamic.php
index d6009aa02..05d73ef1c 100644
--- a/www/modules/civicrm/CRM/Profile/Page/Dynamic.php
+++ b/www/modules/civicrm/CRM/Profile/Page/Dynamic.php
@@ -201,7 +201,7 @@ public function run() {
 
       $this->_isPermissionedChecksum = $allowPermission = FALSE;
       $permissionType = CRM_Core_Permission::VIEW;
-      if (CRM_Core_Permission::check('administer users') || CRM_Core_Permission::check('view all contacts') || CRM_Contact_BAO_Contact_Permission::allow($this->_id)) {
+      if (CRM_Core_Permission::check('cms:administer users') || CRM_Core_Permission::check('view all contacts') || CRM_Contact_BAO_Contact_Permission::allow($this->_id)) {
         $allowPermission = TRUE;
       }
       if ($this->_id != $userID) {
@@ -339,8 +339,8 @@ public function run() {
         ];
       }
 
-      $template->assign_by_ref('row', $values);
-      $template->assign_by_ref('profileFields', $profileFields);
+      $template->assign('row', $values);
+      $template->assign('profileFields', $profileFields);
     }
 
     $name = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_UFGroup', $this->_gid, 'name');
diff --git a/www/modules/civicrm/CRM/Profile/Page/Router.php b/www/modules/civicrm/CRM/Profile/Page/Router.php
index 3dbd8491f..685ea8dc8 100644
--- a/www/modules/civicrm/CRM/Profile/Page/Router.php
+++ b/www/modules/civicrm/CRM/Profile/Page/Router.php
@@ -33,7 +33,7 @@ public function run($args = NULL) {
       return NULL;
     }
 
-    $secondArg = CRM_Utils_Array::value(2, $args, '');
+    $secondArg = $args[2] ?? '';
 
     if ($secondArg == 'map') {
       $controller = new CRM_Core_Controller_Simple(
diff --git a/www/modules/civicrm/CRM/Profile/Selector/Listings.php b/www/modules/civicrm/CRM/Profile/Selector/Listings.php
index c2ede9521..2f9aae2ab 100644
--- a/www/modules/civicrm/CRM/Profile/Selector/Listings.php
+++ b/www/modules/civicrm/CRM/Profile/Selector/Listings.php
@@ -563,7 +563,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL, $ex
       }
       $row = [];
       $empty = TRUE;
-      $row[] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ? $result->contact_sub_type : $result->contact_type,
+      $row[] = CRM_Contact_BAO_Contact_Utils::getImage($result->contact_sub_type ?: $result->contact_type,
         FALSE,
         $result->contact_id,
         $showProfileOverlay
diff --git a/www/modules/civicrm/CRM/Queue/DAO/Queue.php b/www/modules/civicrm/CRM/Queue/DAO/Queue.php
index d86f829f7..e265c93ea 100644
--- a/www/modules/civicrm/CRM/Queue/DAO/Queue.php
+++ b/www/modules/civicrm/CRM/Queue/DAO/Queue.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Queue/Queue.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6ce8f7dd63f7ef581ed8df26d5839941)
+ * (GenCodeChecksum:2a737be504b5ea96df0dbd924aa0f6ce)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Queue/DAO/QueueItem.php b/www/modules/civicrm/CRM/Queue/DAO/QueueItem.php
index e6df67b0f..9ae9f1dfe 100644
--- a/www/modules/civicrm/CRM/Queue/DAO/QueueItem.php
+++ b/www/modules/civicrm/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:657f876ba4b87edaebee0e3eb1d346a1)
+ * (GenCodeChecksum:d2dfbdb6e314638d968e11df3bf98840)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Queue/Menu.php b/www/modules/civicrm/CRM/Queue/Menu.php
index c33e0e11e..6301c8ffc 100644
--- a/www/modules/civicrm/CRM/Queue/Menu.php
+++ b/www/modules/civicrm/CRM/Queue/Menu.php
@@ -17,8 +17,6 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
-require_once 'CRM/Core/I18n.php';
-
 /**
  * Class CRM_Queue_Menu
  */
diff --git a/www/modules/civicrm/CRM/Report/DAO/ReportInstance.php b/www/modules/civicrm/CRM/Report/DAO/ReportInstance.php
index 44b426f9e..a83b4f568 100644
--- a/www/modules/civicrm/CRM/Report/DAO/ReportInstance.php
+++ b/www/modules/civicrm/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:cec2ca039dc9ba4361ac9064b76e4a66)
+ * (GenCodeChecksum:c3cfd25abc2404853bcc64f6e488fa83)
  */
 
 /**
diff --git a/www/modules/civicrm/CRM/Report/Form.php b/www/modules/civicrm/CRM/Report/Form.php
index 6b05e1edf..4abfdc039 100644
--- a/www/modules/civicrm/CRM/Report/Form.php
+++ b/www/modules/civicrm/CRM/Report/Form.php
@@ -820,7 +820,7 @@ public function preProcess() {
 
       $expFields = [];
       // higher preference to bao object
-      $daoOrBaoName = CRM_Utils_Array::value('bao', $table, CRM_Utils_Array::value('dao', $table));
+      $daoOrBaoName = $table['bao'] ?? $table['dao'] ?? NULL;
 
       if ($daoOrBaoName) {
         if (method_exists($daoOrBaoName, 'exportableFields')) {
@@ -1083,7 +1083,7 @@ public function setDefaultValues($freeze = TRUE) {
           ) {
             $order_by = [
               'column' => $fieldName,
-              'order' => CRM_Utils_Array::value('default_order', $field, 'ASC'),
+              'order' => $field['default_order'] ?? 'ASC',
               'section' => $field['default_is_section'] ?? 0,
             ];
 
@@ -2525,7 +2525,7 @@ public function formatDisplay(&$rows, $pager = TRUE) {
     if ($chartEnabled) {
       $this->buildChart($rows);
       $this->_chartId = "{$this->_params['charts']}_" .
-        ($this->_id ? $this->_id : substr(get_class($this), 16)) . '_' .
+        ($this->_id ?: substr(get_class($this), 16)) . '_' .
         CRM_Core_Config::singleton()->userSystem->getSessionId();
       $this->assign('chartId', $this->_chartId);
     }
@@ -3366,7 +3366,7 @@ public function moveSummaryColumnsToTheRightHandSide() {
    */
   public function doTemplateAssignment(&$rows) {
     $this->assign('columnHeaders', $this->_columnHeaders);
-    $this->assign_by_ref('rows', $rows);
+    $this->assign('rows', $rows);
     $this->assign('statistics', $this->statistics($rows));
   }
 
@@ -3762,7 +3762,7 @@ public function setPager($rowCount = NULL) {
       }
 
       $pager = new CRM_Utils_Pager($params);
-      $this->assign_by_ref('pager', $pager);
+      $this->assign('pager', $pager);
       $this->ajaxResponse['totalRows'] = $this->_rowsFound;
     }
   }
@@ -4171,13 +4171,7 @@ public function customDataFrom($joinsForFiltersOnly = FALSE) {
       return;
     }
     $mapper = CRM_Core_BAO_CustomQuery::$extendsMap;
-    //CRM-18276 GROUP_CONCAT could be used with singleValueQuery and then exploded,
-    //but by default that truncates to 1024 characters, which causes errors with installs with lots of custom field sets
-    $customTables = [];
-    $customTablesDAO = CRM_Core_DAO::executeQuery("SELECT table_name FROM civicrm_custom_group");
-    while ($customTablesDAO->fetch()) {
-      $customTables[] = $customTablesDAO->table_name;
-    }
+    $customTables = array_column(CRM_Core_BAO_CustomGroup::getAll(), 'table_name');
 
     foreach ($this->_columns as $table => $prop) {
       if (in_array($table, $customTables)) {
@@ -4186,7 +4180,7 @@ public function customDataFrom($joinsForFiltersOnly = FALSE) {
         if ((!$this->isFieldSelected($prop)) || ($joinsForFiltersOnly && !$this->isFieldFiltered($prop))) {
           continue;
         }
-        $baseJoin = CRM_Utils_Array::value($prop['extends'], $this->_customGroupExtendsJoin, "{$this->_aliases[$extendsTable]}.id");
+        $baseJoin = $this->_customGroupExtendsJoin[$prop['extends']] ?? "{$this->_aliases[$extendsTable]}.id";
 
         $customJoin = is_array($this->_customGroupJoin) ? $this->_customGroupJoin[$table] : $this->_customGroupJoin;
         $this->_from .= "
@@ -4194,10 +4188,8 @@ public function customDataFrom($joinsForFiltersOnly = FALSE) {
         // handle for ContactReference
         if (array_key_exists('fields', $prop)) {
           foreach ($prop['fields'] as $fieldName => $field) {
-            if (($field['dataType'] ?? NULL) ==
-              'ContactReference'
-            ) {
-              $columnName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomField', CRM_Core_BAO_CustomField::getKeyID($fieldName), 'column_name');
+            if (($field['dataType'] ?? NULL) === 'ContactReference') {
+              $columnName = CRM_Core_BAO_CustomField::getField(CRM_Core_BAO_CustomField::getKeyID($fieldName))['column_name'];
               $this->_from .= "
 LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_aliases[$table]}.{$columnName} ";
             }
diff --git a/www/modules/civicrm/CRM/Report/Form/Contact/Detail.php b/www/modules/civicrm/CRM/Report/Form/Contact/Detail.php
index b24927dba..072552bcb 100644
--- a/www/modules/civicrm/CRM/Report/Form/Contact/Detail.php
+++ b/www/modules/civicrm/CRM/Report/Form/Contact/Detail.php
@@ -843,8 +843,8 @@ public function postProcess(): void {
         unset($this->_columnHeadersComponent[$componentTitle][$id_header], $this->_columnHeadersComponent[$componentTitle][$contact_header]);
       }
 
-      $this->assign_by_ref('columnHeadersComponent', $this->_columnHeadersComponent);
-      $this->assign_by_ref('componentRows', $componentRows);
+      $this->assign('columnHeadersComponent', $this->_columnHeadersComponent);
+      $this->assign('componentRows', $componentRows);
     }
 
     $this->doTemplateAssignment($rows);
diff --git a/www/modules/civicrm/CRM/Report/Form/Event/Income.php b/www/modules/civicrm/CRM/Report/Form/Event/Income.php
index 9c21fb9f3..89f254fe0 100644
--- a/www/modules/civicrm/CRM/Report/Form/Event/Income.php
+++ b/www/modules/civicrm/CRM/Report/Form/Event/Income.php
@@ -76,7 +76,7 @@ public function buildEventReport($eventIDs) {
       $eventSummary[$eventDAO->event_id][ts('Registered Participant')] = "{$eventDAO->participant} (" . implode(', ', $this->getActiveParticipantStatuses()) . ")";
       $currency[$eventDAO->event_id] = $eventDAO->currency;
     }
-    $this->assign_by_ref('summary', $eventSummary);
+    $this->assign('summary', $eventSummary);
 
     $activeParticipantClause = " AND civicrm_participant.status_id IN ( " . implode(',', array_keys($this->getActiveParticipantStatuses())) . " ) ";
     //Total Participant Registerd for the Event
@@ -198,7 +198,7 @@ public function buildEventReport($eventIDs) {
     }
     $rows[ts('Payment Method')] = $instrumentRows;
 
-    $this->assign_by_ref('rows', $rows);
+    $this->assign('rows', $rows);
     if (!$this->_setVariable) {
       $this->_params['id_value'] = NULL;
     }
@@ -254,7 +254,7 @@ public function setPager($rowCount = NULL) {
     ];
 
     $pager = new CRM_Utils_Pager($params);
-    $this->assign_by_ref('pager', $pager);
+    $this->assign('pager', $pager);
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Report/Form/Instance.php b/www/modules/civicrm/CRM/Report/Form/Instance.php
index f51d354cd..4230e1506 100644
--- a/www/modules/civicrm/CRM/Report/Form/Instance.php
+++ b/www/modules/civicrm/CRM/Report/Form/Instance.php
@@ -134,7 +134,7 @@ public static function buildForm(&$form) {
     // navigation field
     $parentMenu = CRM_Core_BAO_Navigation::getNavigationList();
 
-    $form->add('select', 'parent_id', ts('Parent Menu'), ['' => ts('- select -')] + $parentMenu, FALSE, ['class' => 'crm-select2 huge']);
+    $form->add('select', 'parent_id', ts('Parent Menu'), ['' => ts('- select -')] + $parentMenu);
 
     // For now we only providing drilldown for one primary detail report only. In future this could be multiple reports
     foreach ($form->_drilldownReport as $reportUrl => $drillLabel) {
diff --git a/www/modules/civicrm/CRM/Report/Form/Mailing/Detail.php b/www/modules/civicrm/CRM/Report/Form/Mailing/Detail.php
index 045e18b79..ab5ba6719 100644
--- a/www/modules/civicrm/CRM/Report/Form/Mailing/Detail.php
+++ b/www/modules/civicrm/CRM/Report/Form/Mailing/Detail.php
@@ -131,6 +131,10 @@ public function __construct() {
           'title' => ts('Delivery Status'),
           'default' => TRUE,
         ],
+        'time_stamp' => [
+          'title' => ts('Delivery Date'),
+          'default' => TRUE,
+        ],
       ],
       'filters' => [
         'delivery_status' => [
@@ -144,6 +148,12 @@ public function __construct() {
             'bounced' => 'Bounced',
           ],
         ],
+        'time_stamp' => [
+          'name' => 'time_stamp',
+          'title' => ts('Delivery Date'),
+          'operatorType' => CRM_Report_Form::OP_DATE,
+          'type' => CRM_Utils_Type::T_DATE,
+        ],
       ],
       'grouping' => 'mailing-fields',
     ];
diff --git a/www/modules/civicrm/CRM/Report/Form/Membership/Summary.php b/www/modules/civicrm/CRM/Report/Form/Membership/Summary.php
index 9ce592b5d..845ad80c0 100644
--- a/www/modules/civicrm/CRM/Report/Form/Membership/Summary.php
+++ b/www/modules/civicrm/CRM/Report/Form/Membership/Summary.php
@@ -314,8 +314,8 @@ public function postProcess() {
     }
     $this->formatDisplay($rows);
 
-    $this->assign_by_ref('columnHeaders', $this->_columnHeaders);
-    $this->assign_by_ref('rows', $rows);
+    $this->assign('columnHeaders', $this->_columnHeaders);
+    $this->assign('rows', $rows);
     $this->assign('statistics', $this->statistics($rows));
 
     if (!empty($this->_params['charts'])) {
diff --git a/www/modules/civicrm/CRM/Report/Info.php b/www/modules/civicrm/CRM/Report/Info.php
index f86b06cf6..ba2705508 100644
--- a/www/modules/civicrm/CRM/Report/Info.php
+++ b/www/modules/civicrm/CRM/Report/Info.php
@@ -45,58 +45,38 @@ public function getInfo() {
 
   /**
    * @inheritDoc
-   * Provides permissions that are used by component.
-   * Needs to be implemented in component's information
-   * class.
-   *
-   * NOTE: if using conditionally permission return,
-   * implementation of $getAllUnconditionally is required.
-   *
-   * @param bool $getAllUnconditionally
-   * @param bool $descriptions
-   *   Whether to return permission descriptions
-   *
-   * @return array|null
-   *   collection of permissions, null if none
    */
-  public function getPermissions($getAllUnconditionally = FALSE, $descriptions = FALSE) {
+  public function getPermissions(): array {
     $permissions = [
       'access CiviReport' => [
-        ts('access CiviReport'),
-        ts('View reports'),
+        'label' => ts('access CiviReport'),
+        'description' => ts('View reports'),
       ],
       'access Report Criteria' => [
-        ts('access Report Criteria'),
-        ts('Change report search criteria'),
+        'label' => ts('access Report Criteria'),
+        'description' => ts('Change report search criteria'),
       ],
       'save Report Criteria' => [
-        ts('save Report Criteria'),
-        ts('Save report search criteria'),
+        'label' => ts('save Report Criteria'),
+        'description' => ts('Save report search criteria'),
       ],
       'administer private reports' => [
-        ts('administer private reports'),
-        ts('Edit all private reports'),
+        'label' => ts('administer private reports'),
+        'description' => ts('Edit all private reports'),
       ],
       'administer reserved reports' => [
-        ts('administer reserved reports'),
-        ts('Edit all reports that have been marked as reserved'),
+        'label' => ts('administer reserved reports'),
+        'description' => ts('Edit all reports that have been marked as reserved'),
       ],
       'administer Reports' => [
-        ts('administer Reports'),
-        ts('Manage report templates'),
+        'label' => ts('administer Reports'),
+        'description' => ts('Manage report templates'),
       ],
       'view report sql' => [
-        ts('view report sql'),
-        ts('View sql used in CiviReports'),
+        'label' => ts('view report sql'),
+        'description' => ts('View sql used in CiviReports'),
       ],
     ];
-
-    if (!$descriptions) {
-      foreach ($permissions as $name => $attr) {
-        $permissions[$name] = array_shift($attr);
-      }
-    }
-
     return $permissions;
   }
 
diff --git a/www/modules/civicrm/CRM/Report/Page/InstanceList.php b/www/modules/civicrm/CRM/Report/Page/InstanceList.php
index 0d012d97b..0399d8769 100644
--- a/www/modules/civicrm/CRM/Report/Page/InstanceList.php
+++ b/www/modules/civicrm/CRM/Report/Page/InstanceList.php
@@ -241,16 +241,19 @@ protected function getActionLinks($instanceID, $className) {
         'url' => CRM_Utils_System::url($urlCommon, 'reset=1&output=copy'),
         'label' => ts('Save a Copy'),
         'confirm_message' => NULL,
+        'weight' => CRM_Core_Action::getWeight(\CRM_Core_Action::COPY),
       ],
       'pdf' => [
         'url' => CRM_Utils_System::url($urlCommon, 'reset=1&force=1&output=pdf'),
         'label' => ts('View as pdf'),
         'confirm_message' => NULL,
+        'weight' => CRM_Core_Action::getWeight(\CRM_Core_Action::EXPORT),
       ],
       'print' => [
         'url' => CRM_Utils_System::url($urlCommon, 'reset=1&force=1&output=print'),
         'label' => ts('Print report'),
         'confirm_message' => NULL,
+        'weight' => CRM_Core_Action::getWeight(\CRM_Core_Action::EXPORT),
       ],
     ];
     // Hackery, Hackera, Hacker ahahahahahaha a super nasty hack.
@@ -266,6 +269,7 @@ protected function getActionLinks($instanceID, $className) {
         'url' => CRM_Utils_System::url($urlCommon, 'reset=1&force=1&output=csv'),
         'label' => ts('Export to csv'),
         'confirm_message' => NULL,
+        'weight' => CRM_Core_Action::getWeight(\CRM_Core_Action::EXPORT),
       ];
     }
     if (CRM_Core_Permission::check('administer Reports')) {
@@ -273,6 +277,7 @@ protected function getActionLinks($instanceID, $className) {
         'url' => CRM_Utils_System::url($urlCommon, 'reset=1&action=delete'),
         'label' => ts('Delete report'),
         'confirm_message' => ts('Are you sure you want delete this report? This action cannot be undone.'),
+        'weight' => CRM_Core_Action::getWeight(\CRM_Core_Action::DELETE),
       ];
     }
     CRM_Utils_Hook::links('view.report.links',
diff --git a/www/modules/civicrm/CRM/Report/Utils/Report.php b/www/modules/civicrm/CRM/Report/Utils/Report.php
index 33e5f7342..7a86860d2 100644
--- a/www/modules/civicrm/CRM/Report/Utils/Report.php
+++ b/www/modules/civicrm/CRM/Report/Utils/Report.php
@@ -236,7 +236,8 @@ public static function makeCsv(&$form, &$rows) {
     // Replace internal header names with friendly ones, where available.
     foreach ($columnHeaders as $header) {
       if (isset($form->_columnHeaders[$header])) {
-        $headers[] = '"' . html_entity_decode(strip_tags($form->_columnHeaders[$header]['title'])) . '"';
+        $title = $form->_columnHeaders[$header]['title'] ?? '';
+        $headers[] = '"' . html_entity_decode(strip_tags($title)) . '"';
       }
     }
     // Add the headers.
@@ -390,7 +391,7 @@ public static function processReport($params) {
     $_REQUEST['sendmail'] = CRM_Utils_Array::value('sendmail', $params, 1);
 
     // if cron is run from terminal --output is reserved, and therefore we would provide another name 'format'
-    $_REQUEST['output'] = CRM_Utils_Array::value('format', $params, CRM_Utils_Array::value('output', $params, 'pdf'));
+    $_REQUEST['output'] = $params['format'] ?? $params['output'] ?? 'pdf';
     $_REQUEST['reset'] = CRM_Utils_Array::value('reset', $params, 1);
 
     $optionVal = self::getValueFromUrl($instanceId);
diff --git a/www/modules/civicrm/CRM/SMS/BAO/Provider.php b/www/modules/civicrm/CRM/SMS/BAO/Provider.php
index 72158e34c..c3762ad46 100644
--- a/www/modules/civicrm/CRM/SMS/BAO/Provider.php
+++ b/www/modules/civicrm/CRM/SMS/BAO/Provider.php
@@ -1,179 +1,2 @@
 <?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_SMS_BAO_Provider extends CRM_SMS_DAO_Provider {
-
-  /**
-   * @return int
-   */
-  public static function activeProviderCount(): int {
-    return (int) CRM_Core_DAO::singleValueQuery('SELECT count(id) FROM civicrm_sms_provider WHERE is_active = 1 AND (domain_id = %1 OR domain_id IS NULL)',
-       [1 => [CRM_Core_Config::domainID(), 'Positive']]);
-  }
-
-  /**
-   * Retrieves the list of providers from the database.
-   *
-   * $selectArr array of coloumns to fetch
-   * $getActive boolean to get active providers
-   *
-   * @param null $selectArr
-   * @param null $filter
-   * @param bool $getActive
-   * @param string $orderBy
-   *
-   * @return array
-   */
-  public static function getProviders($selectArr = NULL, $filter = NULL, $getActive = TRUE, $orderBy = 'id') {
-
-    $providers = [];
-    $temp = [];
-    $dao = new CRM_SMS_DAO_Provider();
-    if ($filter && !array_key_exists('is_active', $filter) && $getActive) {
-      $dao->is_active = 1;
-    }
-    if ($filter && is_array($filter)) {
-      foreach ($filter as $key => $value) {
-        $dao->$key = $value;
-      }
-    }
-    if ($selectArr && is_array($selectArr)) {
-      $select = implode(',', $selectArr);
-      $dao->selectAdd($select);
-    }
-    $dao->whereAdd("(domain_id = " . CRM_Core_Config::domainID() . " OR domain_id IS NULL)");
-    $dao->orderBy($orderBy);
-    $dao->find();
-    while ($dao->fetch()) {
-      CRM_Core_DAO::storeValues($dao, $temp);
-      $providers[$dao->id] = $temp;
-    }
-    return $providers;
-  }
-
-  /**
-   * Create or Update an SMS provider
-   * @param array $params
-   * @return array saved values
-   */
-  public static function create(&$params) {
-    $id = $params['id'] ?? NULL;
-
-    if ($id) {
-      CRM_Utils_Hook::pre('edit', 'SmsProvider', $id, $params);
-    }
-    else {
-      CRM_Utils_Hook::pre('create', 'SmsProvider', NULL, $params);
-    }
-
-    $provider = new CRM_SMS_DAO_Provider();
-    if ($id) {
-      $provider->id = $id;
-      $provider->find(TRUE);
-    }
-    if ($id) {
-      $provider->domain_id = CRM_Utils_Array::value('domain_id', $params, $provider->domain_id);
-    }
-    else {
-      $provider->domain_id = CRM_Utils_Array::value('domain_id', $params, CRM_Core_Config::domainID());
-    }
-    $provider->copyValues($params);
-    $result = $provider->save();
-    if ($id) {
-      CRM_Utils_Hook::post('edit', 'SmsProvider', $provider->id, $provider);
-    }
-    else {
-      CRM_Utils_Hook::post('create', 'SmsProvider', NULL, $provider);
-    }
-    return $result;
-  }
-
-  /**
-   * @deprecated - this bypasses hooks.
-   * @param int $id
-   * @param bool $is_active
-   * @return bool
-   */
-  public static function setIsActive($id, $is_active) {
-    CRM_Core_Error::deprecatedFunctionWarning('writeRecord');
-    return CRM_Core_DAO::setFieldValue('CRM_SMS_DAO_Provider', $id, 'is_active', $is_active);
-  }
-
-  /**
-   * @param int $providerID
-   *
-   * @return null
-   * @throws CRM_Core_Exception
-   *
-   * @deprecated
-   */
-  public static function del($providerID) {
-    if (!$providerID) {
-      throw new CRM_Core_Exception(ts('Invalid value passed to delete function.'));
-    }
-
-    $dao = new CRM_SMS_DAO_Provider();
-    $dao->id = $providerID;
-    $dao->whereAdd = "(domain_id = " . CRM_Core_Config::domainID() . "OR domain_id IS NULL)";
-    if (!$dao->find(TRUE)) {
-      return NULL;
-    }
-    // The above just filters out attempts to delete for other domains
-    // Not sure it's needed, but preserves old behaviour and is deprecated.
-    static::deleteRecord(['id' => $providerID]);
-  }
-
-  /**
-   * @param int $providerID
-   * @param string|null $returnParam
-   * @param string|null $returnDefaultString
-   *
-   * @return mixed
-   */
-  public static function getProviderInfo($providerID, $returnParam = NULL, $returnDefaultString = NULL) {
-    static $providerInfo = [];
-
-    if (!array_key_exists($providerID, $providerInfo)) {
-      $providerInfo[$providerID] = [];
-
-      $dao = new CRM_SMS_DAO_Provider();
-      $dao->id = $providerID;
-      if ($dao->find(TRUE)) {
-        CRM_Core_DAO::storeValues($dao, $providerInfo[$providerID]);
-        $inputLines = explode("\n", $providerInfo[$providerID]['api_params']);
-        $inputVals = [];
-        foreach ($inputLines as $value) {
-          if ($value) {
-            list($key, $val) = explode("=", $value);
-            $inputVals[trim($key)] = trim($val);
-          }
-        }
-        $providerInfo[$providerID]['api_params'] = $inputVals;
-
-        // Replace the api_type ID with the string value
-        $apiTypes = CRM_Core_OptionGroup::values('sms_api_type');
-        $apiTypeId = $providerInfo[$providerID]['api_type'];
-        $providerInfo[$providerID]['api_type'] = CRM_Utils_Array::value($apiTypeId, $apiTypes, $apiTypeId);
-      }
-    }
-
-    if ($returnParam) {
-      return CRM_Utils_Array::value($returnParam, $providerInfo[$providerID], $returnDefaultString);
-    }
-    return $providerInfo[$providerID];
-  }
-
-}
+class_alias('CRM_SMS_BAO_SmsProvider', 'CRM_SMS_BAO_Provider');
diff --git a/www/modules/civicrm/CRM/SMS/BAO/SmsProvider.php b/www/modules/civicrm/CRM/SMS/BAO/SmsProvider.php
new file mode 100644
index 000000000..a17a745f6
--- /dev/null
+++ b/www/modules/civicrm/CRM/SMS/BAO/SmsProvider.php
@@ -0,0 +1,179 @@
+<?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_SMS_BAO_SmsProvider extends CRM_SMS_DAO_SmsProvider {
+
+  /**
+   * @return int
+   */
+  public static function activeProviderCount(): int {
+    return (int) CRM_Core_DAO::singleValueQuery('SELECT count(id) FROM civicrm_sms_provider WHERE is_active = 1 AND (domain_id = %1 OR domain_id IS NULL)',
+       [1 => [CRM_Core_Config::domainID(), 'Positive']]);
+  }
+
+  /**
+   * Retrieves the list of providers from the database.
+   *
+   * $selectArr array of coloumns to fetch
+   * $getActive boolean to get active providers
+   *
+   * @param null $selectArr
+   * @param null $filter
+   * @param bool $getActive
+   * @param string $orderBy
+   *
+   * @return array
+   */
+  public static function getProviders($selectArr = NULL, $filter = NULL, $getActive = TRUE, $orderBy = 'id') {
+
+    $providers = [];
+    $temp = [];
+    $dao = new CRM_SMS_DAO_SmsProvider();
+    if ($filter && !array_key_exists('is_active', $filter) && $getActive) {
+      $dao->is_active = 1;
+    }
+    if ($filter && is_array($filter)) {
+      foreach ($filter as $key => $value) {
+        $dao->$key = $value;
+      }
+    }
+    if ($selectArr && is_array($selectArr)) {
+      $select = implode(',', $selectArr);
+      $dao->selectAdd($select);
+    }
+    $dao->whereAdd("(domain_id = " . CRM_Core_Config::domainID() . " OR domain_id IS NULL)");
+    $dao->orderBy($orderBy);
+    $dao->find();
+    while ($dao->fetch()) {
+      CRM_Core_DAO::storeValues($dao, $temp);
+      $providers[$dao->id] = $temp;
+    }
+    return $providers;
+  }
+
+  /**
+   * Create or Update an SMS provider
+   * @param array $params
+   * @return array saved values
+   */
+  public static function create(&$params) {
+    $id = $params['id'] ?? NULL;
+
+    if ($id) {
+      CRM_Utils_Hook::pre('edit', 'SmsProvider', $id, $params);
+    }
+    else {
+      CRM_Utils_Hook::pre('create', 'SmsProvider', NULL, $params);
+    }
+
+    $provider = new CRM_SMS_DAO_SmsProvider();
+    if ($id) {
+      $provider->id = $id;
+      $provider->find(TRUE);
+    }
+    if ($id) {
+      $provider->domain_id = CRM_Utils_Array::value('domain_id', $params, $provider->domain_id);
+    }
+    else {
+      $provider->domain_id = CRM_Utils_Array::value('domain_id', $params, CRM_Core_Config::domainID());
+    }
+    $provider->copyValues($params);
+    $result = $provider->save();
+    if ($id) {
+      CRM_Utils_Hook::post('edit', 'SmsProvider', $provider->id, $provider);
+    }
+    else {
+      CRM_Utils_Hook::post('create', 'SmsProvider', NULL, $provider);
+    }
+    return $result;
+  }
+
+  /**
+   * @deprecated - this bypasses hooks.
+   * @param int $id
+   * @param bool $is_active
+   * @return bool
+   */
+  public static function setIsActive($id, $is_active) {
+    CRM_Core_Error::deprecatedFunctionWarning('writeRecord');
+    return CRM_Core_DAO::setFieldValue('CRM_SMS_DAO_SmsProvider', $id, 'is_active', $is_active);
+  }
+
+  /**
+   * @param int $providerID
+   *
+   * @return null
+   * @throws CRM_Core_Exception
+   *
+   * @deprecated
+   */
+  public static function del($providerID) {
+    if (!$providerID) {
+      throw new CRM_Core_Exception(ts('Invalid value passed to delete function.'));
+    }
+
+    $dao = new CRM_SMS_DAO_SmsProvider();
+    $dao->id = $providerID;
+    $dao->whereAdd = "(domain_id = " . CRM_Core_Config::domainID() . "OR domain_id IS NULL)";
+    if (!$dao->find(TRUE)) {
+      return NULL;
+    }
+    // The above just filters out attempts to delete for other domains
+    // Not sure it's needed, but preserves old behaviour and is deprecated.
+    static::deleteRecord(['id' => $providerID]);
+  }
+
+  /**
+   * @param int $providerID
+   * @param string|null $returnParam
+   * @param string|null $returnDefaultString
+   *
+   * @return mixed
+   */
+  public static function getProviderInfo($providerID, $returnParam = NULL, $returnDefaultString = NULL) {
+    static $providerInfo = [];
+
+    if (!array_key_exists($providerID, $providerInfo)) {
+      $providerInfo[$providerID] = [];
+
+      $dao = new CRM_SMS_DAO_SmsProvider();
+      $dao->id = $providerID;
+      if ($dao->find(TRUE)) {
+        CRM_Core_DAO::storeValues($dao, $providerInfo[$providerID]);
+        $inputLines = explode("\n", $providerInfo[$providerID]['api_params']);
+        $inputVals = [];
+        foreach ($inputLines as $value) {
+          if ($value) {
+            list($key, $val) = explode("=", $value);
+            $inputVals[trim($key)] = trim($val);
+          }
+        }
+        $providerInfo[$providerID]['api_params'] = $inputVals;
+
+        // Replace the api_type ID with the string value
+        $apiTypes = CRM_Core_OptionGroup::values('sms_api_type');
+        $apiTypeId = $providerInfo[$providerID]['api_type'];
+        $providerInfo[$providerID]['api_type'] = CRM_Utils_Array::value($apiTypeId, $apiTypes, $apiTypeId);
+      }
+    }
+
+    if ($returnParam) {
+      return CRM_Utils_Array::value($returnParam, $providerInfo[$providerID], $returnDefaultString);
+    }
+    return $providerInfo[$providerID];
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/SMS/DAO/Provider.php b/www/modules/civicrm/CRM/SMS/DAO/Provider.php
index 3b6c01db9..4622b6683 100644
--- a/www/modules/civicrm/CRM/SMS/DAO/Provider.php
+++ b/www/modules/civicrm/CRM/SMS/DAO/Provider.php
@@ -1,462 +1,2 @@
 <?php
-
-/**
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- *
- * Generated from xml/schema/CRM/SMS/Provider.xml
- * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d4af7847dcc050195f510ffd2c02c147)
- */
-
-/**
- * Database access object for the Provider entity.
- */
-class CRM_SMS_DAO_Provider extends CRM_Core_DAO {
-  const EXT = 'civicrm';
-  const TABLE_ADDED = '4.2';
-
-  /**
-   * Static instance to hold the table name.
-   *
-   * @var string
-   */
-  public static $_tableName = 'civicrm_sms_provider';
-
-  /**
-   * Field to show when displaying a record.
-   *
-   * @var string
-   */
-  public static $_labelField = 'title';
-
-  /**
-   * Should CiviCRM log any modifications to this table in the civicrm_log table.
-   *
-   * @var bool
-   */
-  public static $_log = FALSE;
-
-  /**
-   * Paths for accessing this entity in the UI.
-   *
-   * @var string[]
-   */
-  protected static $_paths = [
-    'add' => 'civicrm/admin/sms/provider/edit?reset=1&action=add',
-    'delete' => 'civicrm/admin/sms/provider/edit?reset=1&action=delete&id=[id]',
-    'update' => 'civicrm/admin/sms/provider/edit?reset=1&action=update&id=[id]',
-    'browse' => 'civicrm/admin/sms/provider?reset=1',
-  ];
-
-  /**
-   * SMS Provider ID
-   *
-   * @var int|string|null
-   *   (SQL type: int unsigned)
-   *   Note that values will be retrieved from the database as a string.
-   */
-  public $id;
-
-  /**
-   * Provider internal name points to option_value of option_group sms_provider_name
-   *
-   * @var string|null
-   *   (SQL type: varchar(64))
-   *   Note that values will be retrieved from the database as a string.
-   */
-  public $name;
-
-  /**
-   * Provider name visible to user
-   *
-   * @var string|null
-   *   (SQL type: varchar(64))
-   *   Note that values will be retrieved from the database as a string.
-   */
-  public $title;
-
-  /**
-   * @var string|null
-   *   (SQL type: varchar(255))
-   *   Note that values will be retrieved from the database as a string.
-   */
-  public $username;
-
-  /**
-   * @var string|null
-   *   (SQL type: varchar(255))
-   *   Note that values will be retrieved from the database as a string.
-   */
-  public $password;
-
-  /**
-   * points to value in civicrm_option_value for group sms_api_type
-   *
-   * @var int|string
-   *   (SQL type: int unsigned)
-   *   Note that values will be retrieved from the database as a string.
-   */
-  public $api_type;
-
-  /**
-   * @var string|null
-   *   (SQL type: varchar(128))
-   *   Note that values will be retrieved from the database as a string.
-   */
-  public $api_url;
-
-  /**
-   * the api params in xml, http or smtp format
-   *
-   * @var string|null
-   *   (SQL type: text)
-   *   Note that values will be retrieved from the database as a string.
-   */
-  public $api_params;
-
-  /**
-   * @var bool|string
-   *   (SQL type: tinyint)
-   *   Note that values will be retrieved from the database as a string.
-   */
-  public $is_default;
-
-  /**
-   * @var bool|string
-   *   (SQL type: tinyint)
-   *   Note that values will be retrieved from the database as a string.
-   */
-  public $is_active;
-
-  /**
-   * Which Domain is this sms provider for
-   *
-   * @var int|string|null
-   *   (SQL type: int unsigned)
-   *   Note that values will be retrieved from the database as a string.
-   */
-  public $domain_id;
-
-  /**
-   * Class constructor.
-   */
-  public function __construct() {
-    $this->__table = 'civicrm_sms_provider';
-    parent::__construct();
-  }
-
-  /**
-   * Returns localized title of this entity.
-   *
-   * @param bool $plural
-   *   Whether to return the plural version of the title.
-   */
-  public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('SMS Providers') : ts('SMS Provider');
-  }
-
-  /**
-   * Returns all the column names of this table
-   *
-   * @return array
-   */
-  public static function &fields() {
-    if (!isset(Civi::$statics[__CLASS__]['fields'])) {
-      Civi::$statics[__CLASS__]['fields'] = [
-        'id' => [
-          'name' => 'id',
-          'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('SMS Provider ID'),
-          'description' => ts('SMS Provider ID'),
-          'required' => TRUE,
-          'usage' => [
-            'import' => FALSE,
-            'export' => FALSE,
-            'duplicate_matching' => FALSE,
-            'token' => FALSE,
-          ],
-          'where' => 'civicrm_sms_provider.id',
-          'table_name' => 'civicrm_sms_provider',
-          'entity' => 'Provider',
-          'bao' => 'CRM_SMS_BAO_Provider',
-          'localizable' => 0,
-          'html' => [
-            'type' => 'Number',
-          ],
-          'readonly' => TRUE,
-          'add' => '4.2',
-        ],
-        'name' => [
-          'name' => 'name',
-          'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('SMS Provider Name'),
-          'description' => ts('Provider internal name points to option_value of option_group sms_provider_name'),
-          'maxlength' => 64,
-          'size' => CRM_Utils_Type::BIG,
-          'usage' => [
-            'import' => FALSE,
-            'export' => FALSE,
-            'duplicate_matching' => FALSE,
-            'token' => FALSE,
-          ],
-          'where' => 'civicrm_sms_provider.name',
-          'table_name' => 'civicrm_sms_provider',
-          'entity' => 'Provider',
-          'bao' => 'CRM_SMS_BAO_Provider',
-          'localizable' => 0,
-          'add' => '4.2',
-        ],
-        'title' => [
-          'name' => 'title',
-          'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('SMS Provider Title'),
-          'description' => ts('Provider name visible to user'),
-          'maxlength' => 64,
-          'size' => CRM_Utils_Type::BIG,
-          'usage' => [
-            'import' => FALSE,
-            'export' => FALSE,
-            'duplicate_matching' => FALSE,
-            'token' => FALSE,
-          ],
-          'where' => 'civicrm_sms_provider.title',
-          'table_name' => 'civicrm_sms_provider',
-          'entity' => 'Provider',
-          'bao' => 'CRM_SMS_BAO_Provider',
-          'localizable' => 0,
-          'html' => [
-            'type' => 'Text',
-          ],
-          'add' => '4.2',
-        ],
-        'username' => [
-          'name' => 'username',
-          'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('SMS Provider Username'),
-          'maxlength' => 255,
-          'size' => CRM_Utils_Type::HUGE,
-          'usage' => [
-            'import' => FALSE,
-            'export' => FALSE,
-            'duplicate_matching' => FALSE,
-            'token' => FALSE,
-          ],
-          'where' => 'civicrm_sms_provider.username',
-          'table_name' => 'civicrm_sms_provider',
-          'entity' => 'Provider',
-          'bao' => 'CRM_SMS_BAO_Provider',
-          'localizable' => 0,
-          'html' => [
-            'type' => 'Text',
-          ],
-          'add' => '4.2',
-        ],
-        'password' => [
-          'name' => 'password',
-          'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('SMS Provider Password'),
-          'maxlength' => 255,
-          'size' => CRM_Utils_Type::HUGE,
-          'usage' => [
-            'import' => FALSE,
-            'export' => FALSE,
-            'duplicate_matching' => FALSE,
-            'token' => FALSE,
-          ],
-          'where' => 'civicrm_sms_provider.password',
-          'table_name' => 'civicrm_sms_provider',
-          'entity' => 'Provider',
-          'bao' => 'CRM_SMS_BAO_Provider',
-          'localizable' => 0,
-          'html' => [
-            'type' => 'Text',
-          ],
-          'add' => '4.2',
-        ],
-        'api_type' => [
-          'name' => 'api_type',
-          'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('SMS Provider API'),
-          'description' => ts('points to value in civicrm_option_value for group sms_api_type'),
-          'required' => TRUE,
-          'usage' => [
-            'import' => FALSE,
-            'export' => FALSE,
-            'duplicate_matching' => FALSE,
-            'token' => FALSE,
-          ],
-          'where' => 'civicrm_sms_provider.api_type',
-          'table_name' => 'civicrm_sms_provider',
-          'entity' => 'Provider',
-          'bao' => 'CRM_SMS_BAO_Provider',
-          'localizable' => 0,
-          'html' => [
-            'type' => 'Select',
-          ],
-          'pseudoconstant' => [
-            'optionGroupName' => 'sms_api_type',
-            'optionEditPath' => 'civicrm/admin/options/sms_api_type',
-          ],
-          'add' => '4.2',
-        ],
-        'api_url' => [
-          'name' => 'api_url',
-          'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('SMS Provider API URL'),
-          'maxlength' => 128,
-          'size' => CRM_Utils_Type::HUGE,
-          'usage' => [
-            'import' => FALSE,
-            'export' => FALSE,
-            'duplicate_matching' => FALSE,
-            'token' => FALSE,
-          ],
-          'where' => 'civicrm_sms_provider.api_url',
-          'table_name' => 'civicrm_sms_provider',
-          'entity' => 'Provider',
-          'bao' => 'CRM_SMS_BAO_Provider',
-          'localizable' => 0,
-          'html' => [
-            'type' => 'Text',
-          ],
-          'add' => '4.2',
-        ],
-        'api_params' => [
-          'name' => 'api_params',
-          'type' => CRM_Utils_Type::T_TEXT,
-          'title' => ts('SMS Provider API Params'),
-          'description' => ts('the api params in xml, http or smtp format'),
-          'usage' => [
-            'import' => FALSE,
-            'export' => FALSE,
-            'duplicate_matching' => FALSE,
-            'token' => FALSE,
-          ],
-          'where' => 'civicrm_sms_provider.api_params',
-          'table_name' => 'civicrm_sms_provider',
-          'entity' => 'Provider',
-          'bao' => 'CRM_SMS_BAO_Provider',
-          'localizable' => 0,
-          'html' => [
-            'type' => 'Text',
-          ],
-          'add' => '4.2',
-        ],
-        'is_default' => [
-          'name' => 'is_default',
-          'type' => CRM_Utils_Type::T_BOOLEAN,
-          'title' => ts('SMS Provider is Default?'),
-          'required' => TRUE,
-          'usage' => [
-            'import' => FALSE,
-            'export' => FALSE,
-            'duplicate_matching' => FALSE,
-            'token' => FALSE,
-          ],
-          'where' => 'civicrm_sms_provider.is_default',
-          'default' => '0',
-          'table_name' => 'civicrm_sms_provider',
-          'entity' => 'Provider',
-          'bao' => 'CRM_SMS_BAO_Provider',
-          'localizable' => 0,
-          'html' => [
-            'type' => 'CheckBox',
-            'label' => ts("Default"),
-          ],
-          'add' => '4.2',
-        ],
-        'is_active' => [
-          'name' => 'is_active',
-          'type' => CRM_Utils_Type::T_BOOLEAN,
-          'title' => ts('SMS Provider is Active?'),
-          'required' => TRUE,
-          'usage' => [
-            'import' => FALSE,
-            'export' => FALSE,
-            'duplicate_matching' => FALSE,
-            'token' => FALSE,
-          ],
-          'where' => 'civicrm_sms_provider.is_active',
-          'default' => '1',
-          'table_name' => 'civicrm_sms_provider',
-          'entity' => 'Provider',
-          'bao' => 'CRM_SMS_BAO_Provider',
-          'localizable' => 0,
-          'html' => [
-            'type' => 'CheckBox',
-            'label' => ts("Enabled"),
-          ],
-          'add' => '4.2',
-        ],
-        'domain_id' => [
-          'name' => 'domain_id',
-          'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Domain ID'),
-          'description' => ts('Which Domain is this sms provider for'),
-          'usage' => [
-            'import' => FALSE,
-            'export' => FALSE,
-            'duplicate_matching' => FALSE,
-            'token' => FALSE,
-          ],
-          'where' => 'civicrm_sms_provider.domain_id',
-          'table_name' => 'civicrm_sms_provider',
-          'entity' => 'Provider',
-          'bao' => 'CRM_SMS_BAO_Provider',
-          'localizable' => 0,
-          'FKClassName' => 'CRM_Core_DAO_Domain',
-          'FKColumnName' => 'id',
-          'html' => [
-            'label' => ts("Domain"),
-          ],
-          'pseudoconstant' => [
-            'table' => 'civicrm_domain',
-            'keyColumn' => 'id',
-            'labelColumn' => 'name',
-          ],
-          'add' => '4.7',
-        ],
-      ];
-      CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'fields_callback', Civi::$statics[__CLASS__]['fields']);
-    }
-    return Civi::$statics[__CLASS__]['fields'];
-  }
-
-  /**
-   * Returns the list of fields that can be imported
-   *
-   * @param bool $prefix
-   *
-   * @return array
-   */
-  public static function &import($prefix = FALSE) {
-    $r = CRM_Core_DAO_AllCoreTables::getImports(__CLASS__, 'sms_provider', $prefix, []);
-    return $r;
-  }
-
-  /**
-   * Returns the list of fields that can be exported
-   *
-   * @param bool $prefix
-   *
-   * @return array
-   */
-  public static function &export($prefix = FALSE) {
-    $r = CRM_Core_DAO_AllCoreTables::getExports(__CLASS__, 'sms_provider', $prefix, []);
-    return $r;
-  }
-
-  /**
-   * Returns the list of indices
-   *
-   * @param bool $localize
-   *
-   * @return array
-   */
-  public static function indices($localize = TRUE) {
-    $indices = [];
-    return ($localize && !empty($indices)) ? CRM_Core_DAO_AllCoreTables::multilingualize(__CLASS__, $indices) : $indices;
-  }
-
-}
+class_alias('CRM_SMS_DAO_SmsProvider', 'CRM_SMS_DAO_Provider');
diff --git a/www/modules/civicrm/CRM/SMS/DAO/SmsProvider.php b/www/modules/civicrm/CRM/SMS/DAO/SmsProvider.php
new file mode 100644
index 000000000..da3a9d2b7
--- /dev/null
+++ b/www/modules/civicrm/CRM/SMS/DAO/SmsProvider.php
@@ -0,0 +1,462 @@
+<?php
+
+/**
+ * @package CRM
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
+ *
+ * Generated from xml/schema/CRM/SMS/SmsProvider.xml
+ * DO NOT EDIT.  Generated by CRM_Core_CodeGen
+ * (GenCodeChecksum:95e2fa679e0046767bc0a914af96298e)
+ */
+
+/**
+ * Database access object for the SmsProvider entity.
+ */
+class CRM_SMS_DAO_SmsProvider extends CRM_Core_DAO {
+  const EXT = 'civicrm';
+  const TABLE_ADDED = '4.2';
+
+  /**
+   * Static instance to hold the table name.
+   *
+   * @var string
+   */
+  public static $_tableName = 'civicrm_sms_provider';
+
+  /**
+   * Field to show when displaying a record.
+   *
+   * @var string
+   */
+  public static $_labelField = 'title';
+
+  /**
+   * Should CiviCRM log any modifications to this table in the civicrm_log table.
+   *
+   * @var bool
+   */
+  public static $_log = FALSE;
+
+  /**
+   * Paths for accessing this entity in the UI.
+   *
+   * @var string[]
+   */
+  protected static $_paths = [
+    'add' => 'civicrm/admin/sms/provider/edit?reset=1&action=add',
+    'delete' => 'civicrm/admin/sms/provider/edit?reset=1&action=delete&id=[id]',
+    'update' => 'civicrm/admin/sms/provider/edit?reset=1&action=update&id=[id]',
+    'browse' => 'civicrm/admin/sms/provider?reset=1',
+  ];
+
+  /**
+   * SMS Provider ID
+   *
+   * @var int|string|null
+   *   (SQL type: int unsigned)
+   *   Note that values will be retrieved from the database as a string.
+   */
+  public $id;
+
+  /**
+   * Provider internal name points to option_value of option_group sms_provider_name
+   *
+   * @var string|null
+   *   (SQL type: varchar(64))
+   *   Note that values will be retrieved from the database as a string.
+   */
+  public $name;
+
+  /**
+   * Provider name visible to user
+   *
+   * @var string|null
+   *   (SQL type: varchar(64))
+   *   Note that values will be retrieved from the database as a string.
+   */
+  public $title;
+
+  /**
+   * @var string|null
+   *   (SQL type: varchar(255))
+   *   Note that values will be retrieved from the database as a string.
+   */
+  public $username;
+
+  /**
+   * @var string|null
+   *   (SQL type: varchar(255))
+   *   Note that values will be retrieved from the database as a string.
+   */
+  public $password;
+
+  /**
+   * points to value in civicrm_option_value for group sms_api_type
+   *
+   * @var int|string
+   *   (SQL type: int unsigned)
+   *   Note that values will be retrieved from the database as a string.
+   */
+  public $api_type;
+
+  /**
+   * @var string|null
+   *   (SQL type: varchar(128))
+   *   Note that values will be retrieved from the database as a string.
+   */
+  public $api_url;
+
+  /**
+   * the api params in xml, http or smtp format
+   *
+   * @var string|null
+   *   (SQL type: text)
+   *   Note that values will be retrieved from the database as a string.
+   */
+  public $api_params;
+
+  /**
+   * @var bool|string
+   *   (SQL type: tinyint)
+   *   Note that values will be retrieved from the database as a string.
+   */
+  public $is_default;
+
+  /**
+   * @var bool|string
+   *   (SQL type: tinyint)
+   *   Note that values will be retrieved from the database as a string.
+   */
+  public $is_active;
+
+  /**
+   * Which Domain is this sms provider for
+   *
+   * @var int|string|null
+   *   (SQL type: int unsigned)
+   *   Note that values will be retrieved from the database as a string.
+   */
+  public $domain_id;
+
+  /**
+   * Class constructor.
+   */
+  public function __construct() {
+    $this->__table = 'civicrm_sms_provider';
+    parent::__construct();
+  }
+
+  /**
+   * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
+   */
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('SMS Providers') : ts('SMS Provider');
+  }
+
+  /**
+   * Returns all the column names of this table
+   *
+   * @return array
+   */
+  public static function &fields() {
+    if (!isset(Civi::$statics[__CLASS__]['fields'])) {
+      Civi::$statics[__CLASS__]['fields'] = [
+        'id' => [
+          'name' => 'id',
+          'type' => CRM_Utils_Type::T_INT,
+          'title' => ts('SMS Provider ID'),
+          'description' => ts('SMS Provider ID'),
+          'required' => TRUE,
+          'usage' => [
+            'import' => FALSE,
+            'export' => FALSE,
+            'duplicate_matching' => FALSE,
+            'token' => FALSE,
+          ],
+          'where' => 'civicrm_sms_provider.id',
+          'table_name' => 'civicrm_sms_provider',
+          'entity' => 'SmsProvider',
+          'bao' => 'CRM_SMS_BAO_SmsProvider',
+          'localizable' => 0,
+          'html' => [
+            'type' => 'Number',
+          ],
+          'readonly' => TRUE,
+          'add' => '4.2',
+        ],
+        'name' => [
+          'name' => 'name',
+          'type' => CRM_Utils_Type::T_STRING,
+          'title' => ts('SMS Provider Name'),
+          'description' => ts('Provider internal name points to option_value of option_group sms_provider_name'),
+          'maxlength' => 64,
+          'size' => CRM_Utils_Type::BIG,
+          'usage' => [
+            'import' => FALSE,
+            'export' => FALSE,
+            'duplicate_matching' => FALSE,
+            'token' => FALSE,
+          ],
+          'where' => 'civicrm_sms_provider.name',
+          'table_name' => 'civicrm_sms_provider',
+          'entity' => 'SmsProvider',
+          'bao' => 'CRM_SMS_BAO_SmsProvider',
+          'localizable' => 0,
+          'add' => '4.2',
+        ],
+        'title' => [
+          'name' => 'title',
+          'type' => CRM_Utils_Type::T_STRING,
+          'title' => ts('SMS Provider Title'),
+          'description' => ts('Provider name visible to user'),
+          'maxlength' => 64,
+          'size' => CRM_Utils_Type::BIG,
+          'usage' => [
+            'import' => FALSE,
+            'export' => FALSE,
+            'duplicate_matching' => FALSE,
+            'token' => FALSE,
+          ],
+          'where' => 'civicrm_sms_provider.title',
+          'table_name' => 'civicrm_sms_provider',
+          'entity' => 'SmsProvider',
+          'bao' => 'CRM_SMS_BAO_SmsProvider',
+          'localizable' => 0,
+          'html' => [
+            'type' => 'Text',
+          ],
+          'add' => '4.2',
+        ],
+        'username' => [
+          'name' => 'username',
+          'type' => CRM_Utils_Type::T_STRING,
+          'title' => ts('SMS Provider Username'),
+          'maxlength' => 255,
+          'size' => CRM_Utils_Type::HUGE,
+          'usage' => [
+            'import' => FALSE,
+            'export' => FALSE,
+            'duplicate_matching' => FALSE,
+            'token' => FALSE,
+          ],
+          'where' => 'civicrm_sms_provider.username',
+          'table_name' => 'civicrm_sms_provider',
+          'entity' => 'SmsProvider',
+          'bao' => 'CRM_SMS_BAO_SmsProvider',
+          'localizable' => 0,
+          'html' => [
+            'type' => 'Text',
+          ],
+          'add' => '4.2',
+        ],
+        'password' => [
+          'name' => 'password',
+          'type' => CRM_Utils_Type::T_STRING,
+          'title' => ts('SMS Provider Password'),
+          'maxlength' => 255,
+          'size' => CRM_Utils_Type::HUGE,
+          'usage' => [
+            'import' => FALSE,
+            'export' => FALSE,
+            'duplicate_matching' => FALSE,
+            'token' => FALSE,
+          ],
+          'where' => 'civicrm_sms_provider.password',
+          'table_name' => 'civicrm_sms_provider',
+          'entity' => 'SmsProvider',
+          'bao' => 'CRM_SMS_BAO_SmsProvider',
+          'localizable' => 0,
+          'html' => [
+            'type' => 'Text',
+          ],
+          'add' => '4.2',
+        ],
+        'api_type' => [
+          'name' => 'api_type',
+          'type' => CRM_Utils_Type::T_INT,
+          'title' => ts('SMS Provider API'),
+          'description' => ts('points to value in civicrm_option_value for group sms_api_type'),
+          'required' => TRUE,
+          'usage' => [
+            'import' => FALSE,
+            'export' => FALSE,
+            'duplicate_matching' => FALSE,
+            'token' => FALSE,
+          ],
+          'where' => 'civicrm_sms_provider.api_type',
+          'table_name' => 'civicrm_sms_provider',
+          'entity' => 'SmsProvider',
+          'bao' => 'CRM_SMS_BAO_SmsProvider',
+          'localizable' => 0,
+          'html' => [
+            'type' => 'Select',
+          ],
+          'pseudoconstant' => [
+            'optionGroupName' => 'sms_api_type',
+            'optionEditPath' => 'civicrm/admin/options/sms_api_type',
+          ],
+          'add' => '4.2',
+        ],
+        'api_url' => [
+          'name' => 'api_url',
+          'type' => CRM_Utils_Type::T_STRING,
+          'title' => ts('SMS Provider API URL'),
+          'maxlength' => 128,
+          'size' => CRM_Utils_Type::HUGE,
+          'usage' => [
+            'import' => FALSE,
+            'export' => FALSE,
+            'duplicate_matching' => FALSE,
+            'token' => FALSE,
+          ],
+          'where' => 'civicrm_sms_provider.api_url',
+          'table_name' => 'civicrm_sms_provider',
+          'entity' => 'SmsProvider',
+          'bao' => 'CRM_SMS_BAO_SmsProvider',
+          'localizable' => 0,
+          'html' => [
+            'type' => 'Text',
+          ],
+          'add' => '4.2',
+        ],
+        'api_params' => [
+          'name' => 'api_params',
+          'type' => CRM_Utils_Type::T_TEXT,
+          'title' => ts('SMS Provider API Params'),
+          'description' => ts('the api params in xml, http or smtp format'),
+          'usage' => [
+            'import' => FALSE,
+            'export' => FALSE,
+            'duplicate_matching' => FALSE,
+            'token' => FALSE,
+          ],
+          'where' => 'civicrm_sms_provider.api_params',
+          'table_name' => 'civicrm_sms_provider',
+          'entity' => 'SmsProvider',
+          'bao' => 'CRM_SMS_BAO_SmsProvider',
+          'localizable' => 0,
+          'html' => [
+            'type' => 'Text',
+          ],
+          'add' => '4.2',
+        ],
+        'is_default' => [
+          'name' => 'is_default',
+          'type' => CRM_Utils_Type::T_BOOLEAN,
+          'title' => ts('SMS Provider is Default?'),
+          'required' => TRUE,
+          'usage' => [
+            'import' => FALSE,
+            'export' => FALSE,
+            'duplicate_matching' => FALSE,
+            'token' => FALSE,
+          ],
+          'where' => 'civicrm_sms_provider.is_default',
+          'default' => '0',
+          'table_name' => 'civicrm_sms_provider',
+          'entity' => 'SmsProvider',
+          'bao' => 'CRM_SMS_BAO_SmsProvider',
+          'localizable' => 0,
+          'html' => [
+            'type' => 'CheckBox',
+            'label' => ts("Default"),
+          ],
+          'add' => '4.2',
+        ],
+        'is_active' => [
+          'name' => 'is_active',
+          'type' => CRM_Utils_Type::T_BOOLEAN,
+          'title' => ts('SMS Provider is Active?'),
+          'required' => TRUE,
+          'usage' => [
+            'import' => FALSE,
+            'export' => FALSE,
+            'duplicate_matching' => FALSE,
+            'token' => FALSE,
+          ],
+          'where' => 'civicrm_sms_provider.is_active',
+          'default' => '1',
+          'table_name' => 'civicrm_sms_provider',
+          'entity' => 'SmsProvider',
+          'bao' => 'CRM_SMS_BAO_SmsProvider',
+          'localizable' => 0,
+          'html' => [
+            'type' => 'CheckBox',
+            'label' => ts("Enabled"),
+          ],
+          'add' => '4.2',
+        ],
+        'domain_id' => [
+          'name' => 'domain_id',
+          'type' => CRM_Utils_Type::T_INT,
+          'title' => ts('Domain ID'),
+          'description' => ts('Which Domain is this sms provider for'),
+          'usage' => [
+            'import' => FALSE,
+            'export' => FALSE,
+            'duplicate_matching' => FALSE,
+            'token' => FALSE,
+          ],
+          'where' => 'civicrm_sms_provider.domain_id',
+          'table_name' => 'civicrm_sms_provider',
+          'entity' => 'SmsProvider',
+          'bao' => 'CRM_SMS_BAO_SmsProvider',
+          'localizable' => 0,
+          'FKClassName' => 'CRM_Core_DAO_Domain',
+          'FKColumnName' => 'id',
+          'html' => [
+            'label' => ts("Domain"),
+          ],
+          'pseudoconstant' => [
+            'table' => 'civicrm_domain',
+            'keyColumn' => 'id',
+            'labelColumn' => 'name',
+          ],
+          'add' => '4.7',
+        ],
+      ];
+      CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'fields_callback', Civi::$statics[__CLASS__]['fields']);
+    }
+    return Civi::$statics[__CLASS__]['fields'];
+  }
+
+  /**
+   * Returns the list of fields that can be imported
+   *
+   * @param bool $prefix
+   *
+   * @return array
+   */
+  public static function &import($prefix = FALSE) {
+    $r = CRM_Core_DAO_AllCoreTables::getImports(__CLASS__, 'sms_provider', $prefix, []);
+    return $r;
+  }
+
+  /**
+   * Returns the list of fields that can be exported
+   *
+   * @param bool $prefix
+   *
+   * @return array
+   */
+  public static function &export($prefix = FALSE) {
+    $r = CRM_Core_DAO_AllCoreTables::getExports(__CLASS__, 'sms_provider', $prefix, []);
+    return $r;
+  }
+
+  /**
+   * Returns the list of indices
+   *
+   * @param bool $localize
+   *
+   * @return array
+   */
+  public static function indices($localize = TRUE) {
+    $indices = [];
+    return ($localize && !empty($indices)) ? CRM_Core_DAO_AllCoreTables::multilingualize(__CLASS__, $indices) : $indices;
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/SMS/Form/Group.php b/www/modules/civicrm/CRM/SMS/Form/Group.php
index 897ea179c..afc86af18 100644
--- a/www/modules/civicrm/CRM/SMS/Form/Group.php
+++ b/www/modules/civicrm/CRM/SMS/Form/Group.php
@@ -24,7 +24,7 @@ class CRM_SMS_Form_Group extends CRM_Contact_Form_Task {
    * Set variables up before form is built.
    */
   public function preProcess() {
-    if (!CRM_SMS_BAO_Provider::activeProviderCount()) {
+    if (!CRM_SMS_BAO_SmsProvider::activeProviderCount()) {
       CRM_Core_Error::statusBounce(ts('The <a href="%1">SMS Provider</a> has not been configured or is not active.', [1 => CRM_Utils_System::url('civicrm/admin/sms/provider', 'reset=1')]));
     }
 
@@ -70,8 +70,8 @@ public function setDefaultValues() {
       $defaults['includeGroups'] = $mailingGroups['civicrm_group']['Include'];
       $defaults['excludeGroups'] = $mailingGroups['civicrm_group']['Exclude'] ?? NULL;
 
-      $defaults['includeMailings'] = CRM_Utils_Array::value('Include', CRM_Utils_Array::value('civicrm_mailing', $mailingGroups));
-      $defaults['excludeMailings'] = CRM_Utils_Array::value('Exclude', CRM_Utils_Array::value('civicrm_mailing', $mailingGroups));
+      $defaults['includeMailings'] = $mailingGroups['civicrm_mailing']['Include'] ?? NULL;
+      $defaults['excludeMailings'] = $mailingGroups['civicrm_mailing']['Exclude'] ?? NULL;
     }
 
     return $defaults;
@@ -94,7 +94,7 @@ public function buildQuickForm() {
 
     $this->add('select', 'sms_provider_id',
       ts('Select SMS Provider'),
-      CRM_Utils_Array::collect('title', CRM_SMS_BAO_Provider::getProviders(NULL, ['is_active' => 1])),
+      CRM_Utils_Array::collect('title', CRM_SMS_BAO_SmsProvider::getProviders(NULL, ['is_active' => 1])),
       TRUE
     );
 
@@ -175,7 +175,7 @@ public function postProcess() {
         $params[$n] = $values[$n];
         if ($n == 'sms_provider_id') {
           // Get the from Name.
-          $params['from_name'] = CRM_Core_DAO::getFieldValue('CRM_SMS_DAO_Provider', $params['sms_provider_id'], 'username');
+          $params['from_name'] = CRM_Core_DAO::getFieldValue('CRM_SMS_DAO_SmsProvider', $params['sms_provider_id'], 'username');
         }
       }
     }
diff --git a/www/modules/civicrm/CRM/SMS/Form/Provider.php b/www/modules/civicrm/CRM/SMS/Form/Provider.php
index ed52c8450..f39062ab8 100644
--- a/www/modules/civicrm/CRM/SMS/Form/Provider.php
+++ b/www/modules/civicrm/CRM/SMS/Form/Provider.php
@@ -33,13 +33,13 @@ public function preProcess() {
     $this->setPageTitle(ts('SMS Provider'));
 
     if ($this->_id) {
-      $refreshURL = CRM_Utils_System::url('civicrm/admin/sms/provider',
+      $refreshURL = CRM_Utils_System::url('civicrm/admin/sms/provider/edit',
         "reset=1&action=update&id={$this->_id}",
         FALSE, NULL, FALSE
       );
     }
     else {
-      $refreshURL = CRM_Utils_System::url('civicrm/admin/sms/provider',
+      $refreshURL = CRM_Utils_System::url('civicrm/admin/sms/provider/edit',
         "reset=1&action=add",
         FALSE, NULL, FALSE
       );
@@ -70,7 +70,7 @@ public function buildQuickForm() {
       return;
     }
 
-    $attributes = CRM_Core_DAO::getAttribute('CRM_SMS_DAO_Provider');
+    $attributes = CRM_Core_DAO::getAttribute('CRM_SMS_DAO_SmsProvider');
 
     $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');
@@ -82,7 +82,7 @@ public function buildQuickForm() {
     );
 
     $this->addRule('title', ts('This Title already exists in Database.'), 'objectExists', [
-      'CRM_SMS_DAO_Provider',
+      'CRM_SMS_DAO_SmsProvider',
       $this->_id,
     ]);
 
@@ -127,7 +127,7 @@ public function setDefaultValues() {
       return $defaults;
     }
 
-    $dao = new CRM_SMS_DAO_Provider();
+    $dao = new CRM_SMS_DAO_SmsProvider();
     $dao->id = $this->_id;
 
     if ($name) {
@@ -151,7 +151,7 @@ public function postProcess() {
     CRM_Utils_System::flushCache();
 
     if ($this->_action & CRM_Core_Action::DELETE) {
-      CRM_SMS_BAO_Provider::del($this->_id);
+      CRM_SMS_BAO_SmsProvider::del($this->_id);
       CRM_Core_Session::setStatus(ts('Selected Provider has been deleted.'), ts('Deleted'), 'success');
       return;
     }
diff --git a/www/modules/civicrm/CRM/SMS/Form/Schedule.php b/www/modules/civicrm/CRM/SMS/Form/Schedule.php
index d702d4f7b..b698b79e1 100644
--- a/www/modules/civicrm/CRM/SMS/Form/Schedule.php
+++ b/www/modules/civicrm/CRM/SMS/Form/Schedule.php
@@ -86,7 +86,7 @@ public function buildQuickform() {
     $preview = [];
     $preview['type'] = CRM_Core_DAO::getFieldValue('CRM_Mailing_DAO_Mailing', $this->_mailingID, 'body_html') ? 'html' : 'text';
     $preview['viewURL'] = CRM_Utils_System::url('civicrm/mailing/view', "reset=1&id={$this->_mailingID}");
-    $this->assign_by_ref('preview', $preview);
+    $this->assign('preview', $preview);
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/SMS/Page/Provider.php b/www/modules/civicrm/CRM/SMS/Page/Provider.php
index 0024d45e2..0838f21d0 100644
--- a/www/modules/civicrm/CRM/SMS/Page/Provider.php
+++ b/www/modules/civicrm/CRM/SMS/Page/Provider.php
@@ -29,7 +29,7 @@ class CRM_SMS_Page_Provider extends CRM_Core_Page_Basic {
    *   Classname of BAO.
    */
   public function getBAOName() {
-    return 'CRM_SMS_BAO_Provider';
+    return 'CRM_SMS_BAO_SmsProvider';
   }
 
   /**
@@ -61,7 +61,7 @@ public function run() {
    * @param array $action
    */
   public function browse($action = NULL) {
-    $providers = CRM_SMS_BAO_Provider::getProviders();
+    $providers = CRM_SMS_BAO_SmsProvider::getProviders();
     $rows = [];
     foreach ($providers as $provider) {
       $action = array_sum(array_keys($this->links()));
diff --git a/www/modules/civicrm/CRM/SMS/Provider.php b/www/modules/civicrm/CRM/SMS/Provider.php
index b711f2afb..8828f5a6a 100644
--- a/www/modules/civicrm/CRM/SMS/Provider.php
+++ b/www/modules/civicrm/CRM/SMS/Provider.php
@@ -44,7 +44,7 @@ public static function &singleton($providerParams = [], $force = FALSE) {
       $providerParams['provider_id'] = $providerID;
     }
     if ($providerID) {
-      $providerName = CRM_SMS_BAO_Provider::getProviderInfo($providerID, 'name');
+      $providerName = CRM_SMS_BAO_SmsProvider::getProviderInfo($providerID, 'name');
     }
 
     if (!$providerName) {
@@ -169,8 +169,8 @@ public function processInbound($from, $body, $to = NULL, $trackID = NULL) {
 
     if (!$message->fromContactID) {
       // find sender by phone number if $fromContactID not set by hook
-      $formatFrom = '%' . $this->formatPhone($this->stripPhone($message->from), $like, "like");
-      $message->fromContactID = CRM_Core_DAO::singleValueQuery("SELECT contact_id FROM civicrm_phone JOIN civicrm_contact ON civicrm_contact.id = civicrm_phone.contact_id WHERE !civicrm_contact.is_deleted AND phone LIKE %1", [
+      $formatFrom = '%' . $this->formatPhoneNumber($this->stripPhone($message->from));
+      $message->fromContactID = CRM_Core_DAO::singleValueQuery("SELECT contact_id FROM civicrm_phone JOIN civicrm_contact ON civicrm_contact.id = civicrm_phone.contact_id WHERE !civicrm_contact.is_deleted AND phone_numeric LIKE %1", [
         1 => [$formatFrom, 'String'],
       ]);
     }
@@ -242,7 +242,7 @@ public function processInbound($from, $body, $to = NULL, $trackID = NULL) {
    *
    * @return mixed|string
    */
-  public function stripPhone($phone) {
+  public function stripPhone($phone): string {
     $newphone = preg_replace('/[^0-9x]/', '', $phone);
     while (substr($newphone, 0, 1) == "1") {
       $newphone = substr($newphone, 1);
@@ -253,7 +253,49 @@ public function stripPhone($phone) {
     while (substr($newphone, -1) == "x") {
       $newphone = substr($newphone, 0, -1);
     }
-    return $newphone;
+    return (string) $newphone;
+  }
+
+  /**
+   * Format phone number with % - this may no longer make sense as we
+   * now compare with phone_numeric.
+   *
+   * @param string $phone
+   *
+   * @return string
+   */
+  private function formatPhoneNumber(string $phone): string {
+    $phoneA = explode("x", $phone);
+    switch (strlen($phoneA[0])) {
+      case 0:
+        $area = "";
+        $exch = "";
+        $uniq = "";
+        $ext = $phoneA[1];
+        break;
+
+      case 7:
+        $area = "";
+        $exch = substr($phone, 0, 3);
+        $uniq = substr($phone, 3, 4);
+        $ext = $phoneA[1];
+        break;
+
+      case 10:
+        $area = substr($phone, 0, 3);
+        $exch = substr($phone, 3, 3);
+        $uniq = substr($phone, 6, 4);
+        $ext = $phoneA[1];
+        break;
+
+      default:
+        return $phone;
+    }
+
+    $newphone = '%' . $area . '%' . $exch . '%' . $uniq . '%' . $ext . '%';
+    $newphone = str_replace('%%', '%', $newphone);
+    $newphone = str_replace('%%', '%', $newphone);
+    return (string) $newphone;
   }
 
   /**
@@ -261,9 +303,12 @@ public function stripPhone($phone) {
    * @param $kind
    * @param string $format
    *
+   * @deprecated since 5.73 will be removed around 5.95
+   *
    * @return mixed|string
    */
   public function formatPhone($phone, &$kind, $format = "dash") {
+    CRM_Core_Error::deprecatedFunctionWarning('unused');
     $phoneA = explode("x", $phone);
     switch (strlen($phoneA[0])) {
       case 0:
diff --git a/www/modules/civicrm/CRM/UF/Form/Field.php b/www/modules/civicrm/CRM/UF/Form/Field.php
index 3c278e186..0d7b7cb18 100644
--- a/www/modules/civicrm/CRM/UF/Form/Field.php
+++ b/www/modules/civicrm/CRM/UF/Form/Field.php
@@ -240,8 +240,7 @@ public function buildQuickForm() {
       foreach ($value as $key1 => $value1) {
         //CRM-2676, replacing the conflict for same custom field name from different custom group.
         if ($customFieldId = CRM_Core_BAO_CustomField::getKeyID($key1)) {
-          $customGroupId = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomField', $customFieldId, 'custom_group_id');
-          $customGroupName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $customGroupId, 'title');
+          $customGroupName = CRM_Core_BAO_CustomField::getField($customFieldId)['custom_group']['title'];
           $this->_mapperFields[$key][$key1] = $value1['title'] . ' :: ' . $customGroupName;
           if (in_array($key1, $addressCustomFields)) {
             $noSearchable[] = $value1['title'] . ' :: ' . $customGroupName;
@@ -750,9 +749,7 @@ public static function formRule($fields, $files, $self) {
       //get custom field id
       $customFieldId = explode('_', $profileFieldName);
       if ($customFieldId[0] == 'custom') {
-        $customField = new CRM_Core_DAO_CustomField();
-        $customField->id = $customFieldId[1];
-        $customField->find(TRUE);
+        $customField = CRM_Core_BAO_CustomField::getFieldObject($customFieldId[1]);
         $isCustomField = TRUE;
         if (!empty($fields['field_id']) && !$customField->is_active && $is_active) {
           $errors['field_name'] = ts('Cannot set this field "Active" since the selected custom field is disabled.');
diff --git a/www/modules/civicrm/CRM/UF/Form/Group.php b/www/modules/civicrm/CRM/UF/Form/Group.php
index 37d340ebf..078a709c1 100644
--- a/www/modules/civicrm/CRM/UF/Form/Group.php
+++ b/www/modules/civicrm/CRM/UF/Form/Group.php
@@ -30,10 +30,10 @@ class CRM_UF_Form_Group extends CRM_Core_Form {
   /**
    * Set entity fields to be assigned to the form.
    */
-  protected function setEntityFields() {
+  protected function setEntityFields(): void {
     $this->entityFields = [
-      'title' => ['name' => 'title'],
-      'frontend_title' => ['name' => 'frontend_title'],
+      'title' => ['name' => 'title', 'required' => TRUE],
+      'frontend_title' => ['name' => 'frontend_title', 'required' => TRUE],
       'description' => [
         'name' => 'description',
         'help' => ['id' => 'id-description', 'file' => 'CRM/UF/Form/Group.hlp'],
diff --git a/www/modules/civicrm/CRM/UF/Page/ProfileEditor.php b/www/modules/civicrm/CRM/UF/Page/ProfileEditor.php
index 8222086dd..e68edee16 100644
--- a/www/modules/civicrm/CRM/UF/Page/ProfileEditor.php
+++ b/www/modules/civicrm/CRM/UF/Page/ProfileEditor.php
@@ -300,33 +300,28 @@ public static function convertCiviModelToBackboneModel($extends, $title, $availa
       'is_addable' => FALSE,
     ];
 
-    $customGroup = CRM_Core_BAO_CustomGroup::getAllCustomGroupsByBaseEntity($extends);
-    $customGroup->orderBy('weight');
-    $customGroup->is_active = 1;
-    $customGroup->find();
-    while ($customGroup->fetch()) {
-      $sectionName = 'cg_' . $customGroup->id;
+    $customGroups = \CRM_Core_BAO_CustomGroup::getAll(['extends' => $extends, 'is_active' => TRUE]);
+    foreach ($customGroups as $customGroup) {
+      $sectionName = 'cg_' . $customGroup['id'];
       $section = [
-        'title' => ts('%1: %2', [1 => $title, 2 => $customGroup->title]),
-        'is_addable' => !$customGroup->is_reserved,
-        'custom_group_id' => $customGroup->id,
-        'extends_entity_column_id' => $customGroup->extends_entity_column_id,
-        'extends_entity_column_value' => CRM_Utils_Array::explodePadded($customGroup->extends_entity_column_value),
-        'is_reserved' => (bool) $customGroup->is_reserved,
+        'title' => ts('%1: %2', [1 => $title, 2 => $customGroup['title']]),
+        'is_addable' => !$customGroup['is_reserved'],
+        'custom_group_id' => (string) $customGroup['id'],
+        'extends_entity_column_id' => $customGroup['extends_entity_column_id'],
+        'extends_entity_column_value' => $customGroup['extends_entity_column_value'],
+        'is_reserved' => $customGroup['is_reserved'],
       ];
       $result['sections'][$sectionName] = $section;
-    }
-
-    // put fields in their sections
-    $fields = CRM_Core_BAO_CustomField::getFields($extends);
-    foreach ($fields as $fieldId => $field) {
-      $sectionName = 'cg_' . $field['custom_group_id'];
-      $fieldName = 'custom_' . $fieldId;
-      if (isset($result['schema'][$fieldName])) {
-        $result['schema'][$fieldName]['section'] = $sectionName;
-        $result['schema'][$fieldName]['civiIsMultiple'] = (bool) CRM_Core_BAO_CustomField::isMultiRecordField($fieldId);
+      // put fields in their sections
+      foreach ($customGroup['fields'] as $field) {
+        $fieldName = 'custom_' . $field['id'];
+        if (isset($result['schema'][$fieldName])) {
+          $result['schema'][$fieldName]['section'] = $sectionName;
+          $result['schema'][$fieldName]['civiIsMultiple'] = $customGroup['is_multiple'];
+        }
       }
     }
+
     return $result;
   }
 
diff --git a/www/modules/civicrm/CRM/Upgrade/Incremental/General.php b/www/modules/civicrm/CRM/Upgrade/Incremental/General.php
index d76f641cc..db5d392f5 100644
--- a/www/modules/civicrm/CRM/Upgrade/Incremental/General.php
+++ b/www/modules/civicrm/CRM/Upgrade/Incremental/General.php
@@ -15,6 +15,8 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
+use Civi\Api4\Extension;
+
 /**
  * This class contains generic upgrade logic which runs regardless of version.
  */
@@ -134,8 +136,7 @@ public static function setPreUpgradeMessage(&$preUpgradeMessage, $currentVer, $l
     }
 
     $ftAclSetting = Civi::settings()->get('acl_financial_type');
-    $financialAclExtension = civicrm_api3('extension', 'get', ['key' => 'biz.jmaconsulting.financialaclreport', 'sequential' => 1]);
-    if ($ftAclSetting && (($financialAclExtension['count'] == 1 && $financialAclExtension['values'][0]['status'] != 'Installed') || $financialAclExtension['count'] !== 1)) {
+    if ($ftAclSetting && !self::isExtensionInstalled('biz.jmaconsulting.financialaclreport')) {
       $preUpgradeMessage .= '<br />' . ts('CiviCRM will in the future require the extension %1 for CiviCRM Reports to work correctly with the Financial Type ACLs. The extension can be downloaded <a href="%2">here</a>', [
         1 => 'biz.jmaconsulting.financialaclreport',
         2 => 'https://github.com/JMAConsulting/biz.jmaconsulting.financialaclreport',
@@ -185,4 +186,14 @@ public static function updateMessageTemplate(&$message, $version) {
     $messageObj->updateTemplates();
   }
 
+  private static function isExtensionInstalled(string $key): bool {
+    $extension = Extension::get(FALSE)
+      ->addWhere('key', '=', $key)
+      ->addWhere('status', '=', 'Installed')
+      ->selectRowCount()
+      ->execute();
+
+    return $extension->countMatched() === 1;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Upgrade/Incremental/MessageTemplates.php b/www/modules/civicrm/CRM/Upgrade/Incremental/MessageTemplates.php
index 25a286982..42a1e6c52 100644
--- a/www/modules/civicrm/CRM/Upgrade/Incremental/MessageTemplates.php
+++ b/www/modules/civicrm/CRM/Upgrade/Incremental/MessageTemplates.php
@@ -377,6 +377,14 @@ protected function getTemplateUpdates() {
           ['name' => 'membership_online_receipt', 'type' => 'subject'],
         ],
       ],
+      [
+        'version' => '5.74.alpha1',
+        'upgrade_descriptor' => ts('Minor space issue in string'),
+        'templates' => [
+          ['name' => 'event_online_receipt', 'type' => 'text'],
+          ['name' => 'event_online_receipt', 'type' => 'html'],
+        ],
+      ],
     ];
   }
 
diff --git a/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveFiftyOne.php b/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveFiftyOne.php
index fd4520893..024928824 100644
--- a/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveFiftyOne.php
+++ b/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveFiftyOne.php
@@ -153,7 +153,7 @@ public static function convertMappingFieldLabelsToNames(): bool {
       ->addWhere('mapping_id.mapping_type_id:name', '=', 'Import Participant')
       ->execute();
 
-    $fields = CRM_Event_BAO_Participant::importableFields('All', FALSE);
+    $fields = self::getImportableParticipantFields('All', FALSE);
     $fields['event_id']['title'] = 'Event ID';
     $eventfields = CRM_Event_BAO_Event::fields();
     $fields['event_title'] = $eventfields['event_title'];
@@ -245,6 +245,96 @@ public static function convertMappingFieldLabelsToNames(): bool {
     return TRUE;
   }
 
+  /**
+   * Combine all the importable fields from the lower levels object.
+   *
+   * @return array
+   *   array of importable Fields
+   */
+  protected static function getImportableParticipantFields(): array {
+    $fields = ['' => ['title' => ts('- do not import -')]];
+    $tmpFields = CRM_Event_DAO_Participant::import();
+
+    $note = [
+      'participant_note' => [
+        'title' => ts('Participant Note'),
+        'name' => 'participant_note',
+        'headerPattern' => '/(participant.)?note$/i',
+        'data_type' => CRM_Utils_Type::T_TEXT,
+      ],
+    ];
+
+    // Split status and status id into 2 fields
+    // Fixme: it would be better to leave as 1 field and intelligently handle both during import
+    // note import undoes this - it is still here in case the search usage uses it.
+    $participantStatus = [
+      'participant_status' => [
+        'title' => ts('Participant Status'),
+        'name' => 'participant_status',
+        'data_type' => CRM_Utils_Type::T_STRING,
+      ],
+    ];
+    $tmpFields['participant_status_id']['title'] = ts('Participant Status Id');
+
+    // Split role and role id into 2 fields
+    // Fixme: it would be better to leave as 1 field and intelligently handle both during import
+    // note import undoes this - it is still here in case the search usage uses it.
+    $participantRole = [
+      'participant_role' => [
+        'title' => ts('Participant Role'),
+        'name' => 'participant_role',
+        'data_type' => CRM_Utils_Type::T_STRING,
+      ],
+    ];
+    $tmpFields['participant_role_id']['title'] = ts('Participant Role Id');
+
+    $eventType = [
+      'event_type' => [
+        'title' => ts('Event Type'),
+        'name' => 'event_type',
+        'data_type' => CRM_Utils_Type::T_STRING,
+      ],
+    ];
+
+    $tmpContactField = [];
+    $contactFields = CRM_Contact_BAO_Contact::importableFields('All', NULL);
+
+    // Using new Dedupe rule.
+    $ruleParams = [
+      'contact_type' => 'All',
+      'used' => 'Unsupervised',
+    ];
+    $fieldsArray = CRM_Dedupe_BAO_DedupeRule::dedupeRuleFields($ruleParams);
+
+    if (is_array($fieldsArray)) {
+      foreach ($fieldsArray as $value) {
+        $customFieldId = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomField',
+          $value,
+          'id',
+          'column_name'
+        );
+        $value = $customFieldId ? 'custom_' . $customFieldId : $value;
+        $tmpContactField[trim($value)] = $contactFields[trim($value)] ?? NULL;
+        $title = $tmpContactField[trim($value)]['title'] . ' (match to contact)';
+
+        $tmpContactField[trim($value)]['title'] = $title;
+      }
+    }
+    $extIdentifier = $contactFields['external_identifier'] ?? NULL;
+    if ($extIdentifier) {
+      $tmpContactField['external_identifier'] = $extIdentifier;
+      $tmpContactField['external_identifier']['title'] = ($extIdentifier['title'] ?? '') . ' (match to contact)';
+    }
+    $tmpFields['participant_contact_id']['title'] = $tmpFields['participant_contact_id']['title'] . ' (match to contact)';
+
+    $fields = array_merge($fields, $tmpContactField);
+    $fields = array_merge($fields, $tmpFields);
+    $fields = array_merge($fields, $note, $participantStatus, $participantRole, $eventType);
+    $fields = array_merge($fields, CRM_Core_BAO_CustomField::getFieldsForImport('Participant', FALSE, FALSE, FALSE, FALSE));
+
+    return $fields;
+  }
+
   /**
    * @param string $contactType
    *
diff --git a/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSeventyFour.php b/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSeventyFour.php
new file mode 100644
index 000000000..d9609938f
--- /dev/null
+++ b/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSeventyFour.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       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Upgrade logic for the 5.74.x series.
+ *
+ * Each minor version in the series is handled by either a `5.74.x.mysql.tpl` file,
+ * or a function in this class named `upgrade_5_74_x`.
+ * If only a .tpl file exists for a version, it will be run automatically.
+ * If the function exists, it must explicitly add the 'runSql' task if there is a corresponding .mysql.tpl.
+ *
+ * This class may also implement `setPreUpgradeMessage()` and `setPostUpgradeMessage()` functions.
+ */
+class CRM_Upgrade_Incremental_php_FiveSeventyFour extends CRM_Upgrade_Incremental_Base {
+
+  /**
+   * Upgrade step; adds tasks including 'runSql'.
+   *
+   * @param string $rev
+   *   The version number matching this function name
+   */
+  public function upgrade_5_74_alpha1($rev): void {
+    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+  }
+
+  public function upgrade_5_74_beta1($rev): void {
+    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSeventyOne.php b/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSeventyOne.php
new file mode 100644
index 000000000..212a14b29
--- /dev/null
+++ b/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSeventyOne.php
@@ -0,0 +1,60 @@
+<?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 the 5.71.x series.
+ *
+ * Each minor version in the series is handled by either a `5.71.x.mysql.tpl` file,
+ * or a function in this class named `upgrade_5_71_x`.
+ * If only a .tpl file exists for a version, it will be run automatically.
+ * If the function exists, it must explicitly add the 'runSql' task if there is a corresponding .mysql.tpl.
+ *
+ * This class may also implement `setPreUpgradeMessage()` and `setPostUpgradeMessage()` functions.
+ */
+class CRM_Upgrade_Incremental_php_FiveSeventyOne extends CRM_Upgrade_Incremental_Base {
+
+  /**
+   * Upgrade step; adds tasks including 'runSql'.
+   *
+   * @param string $rev
+   *   The version number matching this function name
+   */
+  public function upgrade_5_71_alpha1(string $rev): void {
+
+    // It is important the line above run before the sql, which will populate the fields
+    // before they are made required.
+    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+
+    $this->addTask('Add entity_delete column', 'addColumn', 'civicrm_custom_field', 'fk_entity_on_delete', "VARCHAR(255) NOT NULL DEFAULT 'set_null' COMMENT 'Behavior if referenced entity is deleted.' AFTER `fk_entity`");
+
+    $this->addTask('Make civicrm_uf_group.name required', 'alterColumn', 'civicrm_uf_group', 'name',
+      "varchar(64) NOT NULL  COMMENT 'Form name.'"
+    );
+    $this->addTask('Make civicrm_uf_group.frontend_title required', 'alterColumn', 'civicrm_uf_group', 'frontend_title',
+      "varchar(64) NOT NULL  COMMENT 'Profile Form Public title'",
+      TRUE
+    );
+  }
+
+  /**
+   * Upgrade step; adds tasks including 'runSql'.
+   *
+   * @param string $rev
+   *   The version number matching this function name
+   */
+  public function upgrade_5_71_beta1(string $rev): void {
+    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    $this->addTask('Make civicrm_event.selfcancelxfer_time', 'alterColumn', 'civicrm_event', 'selfcancelxfer_time',
+      "int(11) DEFAULT 0 NOT NULL COMMENT 'Number of hours prior to event start date to allow self-service cancellation or transfer.'"
+    );
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSeventyThree.php b/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSeventyThree.php
new file mode 100644
index 000000000..5f249ce16
--- /dev/null
+++ b/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSeventyThree.php
@@ -0,0 +1,34 @@
+<?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 the 5.73.x series.
+ *
+ * Each minor version in the series is handled by either a `5.73.x.mysql.tpl` file,
+ * or a function in this class named `upgrade_5_73_x`.
+ * If only a .tpl file exists for a version, it will be run automatically.
+ * If the function exists, it must explicitly add the 'runSql' task if there is a corresponding .mysql.tpl.
+ *
+ * This class may also implement `setPreUpgradeMessage()` and `setPostUpgradeMessage()` functions.
+ */
+class CRM_Upgrade_Incremental_php_FiveSeventyThree extends CRM_Upgrade_Incremental_Base {
+
+  /**
+   * Upgrade step; adds tasks including 'runSql'.
+   *
+   * @param string $rev
+   *   The version number matching this function name
+   */
+  public function upgrade_5_73_alpha1($rev): void {
+    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSeventyTwo.php b/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSeventyTwo.php
new file mode 100644
index 000000000..1b4f4bd76
--- /dev/null
+++ b/www/modules/civicrm/CRM/Upgrade/Incremental/php/FiveSeventyTwo.php
@@ -0,0 +1,61 @@
+<?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 the 5.72.x series.
+ *
+ * Each minor version in the series is handled by either a `5.72.x.mysql.tpl` file,
+ * or a function in this class named `upgrade_5_72_x`.
+ * If only a .tpl file exists for a version, it will be run automatically.
+ * If the function exists, it must explicitly add the 'runSql' task if there is a corresponding .mysql.tpl.
+ *
+ * This class may also implement `setPreUpgradeMessage()` and `setPostUpgradeMessage()` functions.
+ */
+class CRM_Upgrade_Incremental_php_FiveSeventyTwo extends CRM_Upgrade_Incremental_Base {
+
+  /**
+   * Upgrade step; adds tasks including 'runSql'.
+   *
+   * @param string $rev
+   *   The version number matching this function name
+   */
+  public function upgrade_5_72_alpha1($rev): void {
+    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    $this->addTask('Remove localized suffixes from civicrm_mailing_group.entity_table', 'fixMailingGroupEntityTable');
+    $this->addTask('Replace displayName smarty token in UFNotify subject',
+      'updateMessageToken', 'uf_notify', 'ts 1=$displayName', 'ts 1=$userDisplayName', $rev
+    );
+    $this->addTask('Replace displayName smarty token in UFNotify',
+      'updateMessageToken', 'uf_notify', '$displayName', 'contact.display_name', $rev
+    );
+    $this->addTask('Replace currentDate smarty token in UFNotify',
+      'updateMessageToken', 'uf_notify', '$currentDate', 'domain.now|crmDate:"Full"', $rev
+    );
+    $this->addTask('Add last_run_end column to Job table', 'addColumn', 'civicrm_job', 'last_run_end',
+      'timestamp NULL DEFAULT NULL COMMENT "When did this cron entry last finish running"');
+  }
+
+  /**
+   * Remove unwanted dbLocale suffixes from values in civicrm_mailing_group.entity_table.
+   *
+   * @see https://github.com/civicrm/civicrm-core/pull/29366
+   *
+   * @return bool
+   */
+  public static function fixMailingGroupEntityTable(): bool {
+    $updateQuery = 'UPDATE civicrm_mailing_group SET entity_table = "civicrm_mailing" WHERE entity_table LIKE "civicrm_mailing_%"';
+    CRM_Core_DAO::executeQuery($updateQuery, [], TRUE, NULL, FALSE, FALSE);
+    $updateQuery = 'UPDATE civicrm_mailing_group SET entity_table = "civicrm_group" WHERE entity_table LIKE "civicrm_group_%"';
+    CRM_Core_DAO::executeQuery($updateQuery, [], TRUE, NULL, FALSE, FALSE);
+    return TRUE;
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.71.alpha1.mysql.tpl b/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.71.alpha1.mysql.tpl
new file mode 100644
index 000000000..ec39fc1a1
--- /dev/null
+++ b/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.71.alpha1.mysql.tpl
@@ -0,0 +1,22 @@
+{* file to handle db changes in 5.71.alpha1 during upgrade *}
+
+-- Add name field, make frontend_title required (in conjunction with php function)
+{if $multilingual}
+  {foreach from=$locales item=locale}
+    UPDATE `civicrm_uf_group`
+    SET `frontend_title_{$locale}` = `title_{$locale}`
+    WHERE `frontend_title_{$locale}` IS NULL OR `frontend_title_{$locale}` = '';
+
+    UPDATE `civicrm_uf_group`
+    SET `name` = CONCAT(`title_{$locale}`, `id`)
+    WHERE `name` IS NULL OR `name` = '';
+  {/foreach}
+{else}
+  UPDATE `civicrm_uf_group`
+  SET `frontend_title` = `title`
+  WHERE `frontend_title` IS NULL OR `frontend_title` = '';
+
+  UPDATE `civicrm_uf_group`
+  SET `name` = CONCAT(`title`, `id`)
+  WHERE `name` IS NULL OR `name` = '';
+{/if}
diff --git a/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.71.beta1.mysql.tpl b/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.71.beta1.mysql.tpl
new file mode 100644
index 000000000..797abb3cc
--- /dev/null
+++ b/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.71.beta1.mysql.tpl
@@ -0,0 +1,2 @@
+{* file to handle db changes in 5.72.alpha1 during upgrade *}
+UPDATE civicrm_event SET selfcancelxfer_time = 0 WHERE selfcancelxfer_time IS NULL;
diff --git a/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.72.alpha1.mysql.tpl b/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.72.alpha1.mysql.tpl
new file mode 100644
index 000000000..4bcec6660
--- /dev/null
+++ b/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.72.alpha1.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.72.alpha1 during upgrade *}
diff --git a/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.73.alpha1.mysql.tpl b/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.73.alpha1.mysql.tpl
new file mode 100644
index 000000000..be4883b7a
--- /dev/null
+++ b/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.73.alpha1.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.73.alpha1 during upgrade *}
diff --git a/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.74.alpha1.mysql.tpl b/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.74.alpha1.mysql.tpl
new file mode 100644
index 000000000..e60293d06
--- /dev/null
+++ b/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.74.alpha1.mysql.tpl
@@ -0,0 +1,3 @@
+{* file to handle db changes in 5.74.alpha1 during upgrade *}
+UPDATE civicrm_navigation SET url = 'civicrm/import/participant?reset=1'
+WHERE url = 'civicrm/event/import?reset=1';
diff --git a/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.74.beta1.mysql.tpl b/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.74.beta1.mysql.tpl
new file mode 100644
index 000000000..455d05847
--- /dev/null
+++ b/www/modules/civicrm/CRM/Upgrade/Incremental/sql/5.74.beta1.mysql.tpl
@@ -0,0 +1,3 @@
+{* file to handle db changes in 5.74.alpha1 during upgrade *}
+UPDATE civicrm_navigation SET url = 'civicrm/import/membership?reset=1'
+WHERE url = 'civicrm/member/import?reset=1';
diff --git a/www/modules/civicrm/CRM/Utils/Array.php b/www/modules/civicrm/CRM/Utils/Array.php
index b4aad583b..89d66beb2 100644
--- a/www/modules/civicrm/CRM/Utils/Array.php
+++ b/www/modules/civicrm/CRM/Utils/Array.php
@@ -532,7 +532,9 @@ public static function crmArraySortByField($array, $field) {
     $fields = (array) $field;
     uasort($array, function ($a, $b) use ($fields) {
       foreach ($fields as $f) {
-        $v = strnatcmp($a[$f], $b[$f]);
+        $f1 = $a[$f] ?? '';
+        $f2 = $b[$f] ?? '';
+        $v = strnatcmp($f1, $f2);
         if ($v !== 0) {
           return $v;
         }
diff --git a/www/modules/civicrm/CRM/Utils/Cache/Tiered.php b/www/modules/civicrm/CRM/Utils/Cache/Tiered.php
index 538809966..b71450031 100644
--- a/www/modules/civicrm/CRM/Utils/Cache/Tiered.php
+++ b/www/modules/civicrm/CRM/Utils/Cache/Tiered.php
@@ -164,6 +164,9 @@ protected function getEffectiveTtl($tierNum, $ttl) {
       return $this->maxTimeouts[$tierNum];
     }
     else {
+      if ($ttl instanceof \DateInterval) {
+        $ttl = date_add(new DateTime(), $ttl)->getTimestamp() - time();
+      }
       return min($this->maxTimeouts[$tierNum], $ttl);
     }
   }
diff --git a/www/modules/civicrm/CRM/Utils/Check/Component/Env.php b/www/modules/civicrm/CRM/Utils/Check/Component/Env.php
index 72427d69f..4c4f896b3 100644
--- a/www/modules/civicrm/CRM/Utils/Check/Component/Env.php
+++ b/www/modules/civicrm/CRM/Utils/Check/Component/Env.php
@@ -246,16 +246,16 @@ public function checkDomainNameEmail($force = FALSE) {
    * @param bool $force
    * @return CRM_Utils_Check_Message[]
    */
-  public function checkDefaultMailbox($force = FALSE) {
+  public function checkDefaultMailbox($force = FALSE): array {
     $messages = [];
 
     // CiviMail doesn't work in non-production environments; skip.
-    if (!$force && CRM_Core_Config::environment() != 'Production') {
+    if (!$force && CRM_Core_Config::environment() !== 'Production') {
       return $messages;
     }
 
     if (CRM_Core_Component::isEnabled('CiviMail') &&
-      CRM_Core_BAO_MailSettings::defaultDomain() == "EXAMPLE.ORG"
+      CRM_Core_BAO_MailSettings::defaultDomain() === "EXAMPLE.ORG"
     ) {
       $message = new CRM_Utils_Check_Message(
         __FUNCTION__,
@@ -1120,21 +1120,60 @@ public function checkMysqlVersion() {
     return $messages;
   }
 
-  public function checkPHPIntlExists() {
+  public function checkPHPIntlExists(): array {
     $messages = [];
     if (!extension_loaded('intl')) {
       $messages[] = new CRM_Utils_Check_Message(
         __FUNCTION__,
         ts('This system currently does not have the PHP-Intl extension enabled.  Please contact your system administrator about getting the extension enabled.'),
         ts('Missing PHP Extension: INTL'),
-        \Psr\Log\LogLevel::WARNING,
+        LogLevel::WARNING,
         'fa-server'
       );
     }
     return $messages;
   }
 
-  public function checkAngularModuleSettings() {
+  /**
+   * Let people know if they could improve performance by defining the exclude directory.
+   *
+   * @return array
+   */
+  public function checkExcludeDirectories(): array {
+    $messages = [];
+    if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN' && !defined('CIVICRM_EXCLUDE_DIRS_PATTERN')) {
+      $messages[] = new CRM_Utils_Check_Message(
+        __FUNCTION__,
+        ts('You can improve performance by defining the CIVICRM_EXCLUDE_DIRS_PATTERN in your civicrm.settings.php file.') . '<br />' . CRM_Utils_System::docURL2('sysadmin/setup/optimizations/#exclude-dirs-that-do-not-need-to-be-scanned'),
+        ts('Performance can be improved by configuring the exclude directories path'),
+        LogLevel::NOTICE,
+        'fa-flag'
+      );
+    }
+    return $messages;
+  }
+
+  /**
+   * Let people know if they could improve performance by defining the template compile check.
+   *
+   * @return array
+   */
+  public function checkTemplateCompileCheck(): array {
+    $messages = [];
+    $isProbablyDevelopmentSite = str_contains(CIVICRM_UF_BASEURL, 'localhost') || str_contains(CIVICRM_UF_BASEURL, 'staging') || str_contains(CIVICRM_UF_BASEURL, 'dev');
+    if (!defined('CIVICRM_TEMPLATE_COMPILE_CHECK') && !$isProbablyDevelopmentSite && !\Civi::settings()->get('debug_enabled')) {
+      $messages[] = new CRM_Utils_Check_Message(
+        __FUNCTION__,
+        ts('You can improve performance on production sites by specifying the CIVICRM_TEMPLATE_COMPILE_CHECK in the civicrm.settings.php file.') . '<br />' . CRM_Utils_System::docURL2('sysadmin/setup/optimizations/#disable-compile-check'),
+        ts('Performance can be improved on live sites by defining the template compile check'),
+        LogLevel::NOTICE,
+        'fa-flag'
+      );
+    }
+    return $messages;
+  }
+
+  public function checkAngularModuleSettings(): array {
     $messages = [];
     $modules = Civi::container()->get('angular')->getModules();
     foreach ($modules as $name => $module) {
@@ -1147,7 +1186,7 @@ public function checkAngularModuleSettings() {
             3 => 'target="_blank" href="https://github.com/civicrm/civicrm-core/pull/19052"',
           ]),
           ts('Unsupported Angular Setting'),
-          \Psr\Log\LogLevel::WARNING,
+          LogLevel::WARNING,
           'fa-code'
         );
       }
@@ -1155,7 +1194,7 @@ public function checkAngularModuleSettings() {
     return $messages;
   }
 
-  public function checkForMultipleL10NDirs() {
+  public function checkForMultipleL10NDirs(): array {
     $messages = [];
     $dirs = [];
 
@@ -1191,7 +1230,7 @@ public function checkForMultipleL10NDirs() {
         ts('There are multiple l10n directories, listed below. The one that appears to be in use is %1. You may wish to remove the others to avoid confusion when updating translation files.', [1 => $current_l10n])
           . '<p><ul>' . $dirlist . '</ul></p>',
         ts('Multiple l10n Directories'),
-        \Psr\Log\LogLevel::WARNING,
+        LogLevel::WARNING,
         'fa-files-o'
       );
     }
@@ -1200,8 +1239,12 @@ public function checkForMultipleL10NDirs() {
 
   /**
    * Avoid issues with trailing slashes and mixed separators on windows.
+   *
+   * @param string $path
+   *
+   * @return string
    */
-  private static function normalizePath($path) {
+  private static function normalizePath($path): string {
     return rtrim(str_replace(DIRECTORY_SEPARATOR, '/', $path), '/');
   }
 
diff --git a/www/modules/civicrm/CRM/Utils/Check/Component/Smarty.php b/www/modules/civicrm/CRM/Utils/Check/Component/Smarty.php
index 8e742c97d..01c7c5a4e 100644
--- a/www/modules/civicrm/CRM/Utils/Check/Component/Smarty.php
+++ b/www/modules/civicrm/CRM/Utils/Check/Component/Smarty.php
@@ -23,25 +23,21 @@ class CRM_Utils_Check_Component_Smarty extends CRM_Utils_Check_Component {
    *
    * @return CRM_Utils_Check_Message[]
    */
-  public function checkSmarty3(): array {
-    $p = function($text) {
-      return '<p>' . $text . '</p>';
-    };
-
+  public function checkSmartyVersion(): array {
     $messages = [];
-    if (!defined('CIVICRM_SMARTY3_AUTOLOAD_PATH')) {
-      $smartyPath = \Civi::paths()->getPath('[civicrm.packages]/smarty3/vendor/autoload.php');
+    if (!defined('CIVICRM_SMARTY_AUTOLOAD_PATH') && !defined('CIVICRM_SMARTY3_AUTOLOAD_PATH')) {
+      $smartyPath = \Civi::paths()->getPath('[civicrm.packages]/smarty4/vendor/autoload.php');
       $messages[] = new CRM_Utils_Check_Message(
         __FUNCTION__,
-        $p(ts('CiviCRM is updating a major library (<em>Smarty</em>) to improve performance and security. In CiviCRM v5.69, the update is optional, but you should try it now.'))
-        . $p(ts('To apply the update, add this statement to <code>civicrm.settings.php</code>:'))
-        . sprintf("<pre>  define('CIVICRM_SMARTY3_AUTOLOAD_PATH',\n    %s);</pre>", htmlentities(var_export($smartyPath, 1)))
-        . $p('Some extensions may not work yet with Smarty v3. If you encounter problems, then simply remove the statement.')
-        . $p(ts('Upcoming versions will standardize on Smarty v3. CiviCRM <a %1>v5.69-ESR</a> will provide extended support for Smarty v2. To learn more and discuss, see the <a %2>Smarty transition page</a>.', [
+        '<p>' . (ts('CiviCRM is updating a major library (<em>Smarty</em>) to improve performance and security and php 8.3 compatibility. The update is currently optional, but you should try it now.')) . '</p>'
+        . '<p>' . (ts('To apply the update, add this statement to <code>civicrm.settings.php</code>:'))
+        . sprintf("<pre>  define('CIVICRM_SMARTY_AUTOLOAD_PATH',\n    %s);</pre>", htmlentities(var_export($smartyPath, 1))) . '</p>'
+        . '<p>' . ('Some extensions may not work yet with Smarty v4. If you encounter problems, then simply remove the statement.') . '</p>'
+        . '<p>' . (ts('Upcoming versions will standardize on Smarty v4. CiviCRM <a %1>v5.69-ESR</a> will provide extended support for Smarty v2. To learn more and discuss, see the <a %2>Smarty transition page</a>.' . '</p>', [
           1 => 'target="_blank" href="' . htmlentities('https://civicrm.org/esr') . '"',
           2 => 'target="_blank" href="' . htmlentities('https://civicrm.org/redirect/smarty-v3') . '"',
         ])),
-        ts('Smarty Update (v2 => v3)'),
+        ts('Smarty Update (v2 => v4)'),
         LogLevel::WARNING,
         'fa-lock'
       );
diff --git a/www/modules/civicrm/CRM/Utils/Check/Component/Source.php b/www/modules/civicrm/CRM/Utils/Check/Component/Source.php
index 4af45ff20..803aac50e 100644
--- a/www/modules/civicrm/CRM/Utils/Check/Component/Source.php
+++ b/www/modules/civicrm/CRM/Utils/Check/Component/Source.php
@@ -31,7 +31,10 @@ public function findOrphanedFiles() {
     $orphans = [];
     foreach ($this->getRemovedFiles() as $file) {
       $path = Civi::paths()->getPath("[civicrm.root]/$file");
-      if (file_exists(rtrim($path, '/*'))) {
+      $path = rtrim($path, '/*');
+      // On case-insensitive filesystems we need to do some more work
+      $actualPath = $this->findCorrectCaseForFile($path);
+      if ($actualPath !== NULL) {
         $orphans[] = [
           'name' => $file,
           'path' => $path,
@@ -64,4 +67,25 @@ public function checkOrphans() {
     return $messages;
   }
 
+  /**
+   * Linux is case sensitive, so this will be a no-op.
+   * Windows is case insensitive, Mac is usually insensitive but sometimes
+   * sensitive.
+   * Note that realpath() will return the real casing for a file on windows,
+   * but not on mac, so we need a different method. glob returns the real
+   * casing, but means we need to loop.
+   *
+   * @param string $path
+   * @return string|null
+   */
+  private function findCorrectCaseForFile(string $path): ?string {
+    $fileToFind = basename($path);
+    foreach (glob(dirname($path) . '/*', GLOB_NOSORT) as $theRealFile) {
+      if ($fileToFind === basename($theRealFile)) {
+        return $theRealFile;
+      }
+    }
+    return NULL;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Utils/Check/Message.php b/www/modules/civicrm/CRM/Utils/Check/Message.php
index deb4a4b6c..345737e7a 100644
--- a/www/modules/civicrm/CRM/Utils/Check/Message.php
+++ b/www/modules/civicrm/CRM/Utils/Check/Message.php
@@ -152,12 +152,12 @@ public function addHelp($help) {
    * @param string|false $confirmation
    *   Optional confirmation message before performing action
    * @param string $type
-   *   Currently supports: api3 or href
+   *   Link action type. One of: href|api3|api4
    * @param array $params
-   *   Params to be passed to CRM.api3 or CRM.url depending on type
-   *   Ex: ['MyApiEntity', 'MyApiAction', [...params...]]
-   *   Ex: ['path' => 'civicrm/admin/foo', 'query' => 'reset=1']
-   *   Ex: ['url' => 'https://example.com/more/info']
+   *   Params to be passed to the api or CRM.url (depending on $type)
+   *   Ex (api4): ['MyApiEntity', 'MyApiAction', [...apiParams...]]
+   *   Ex (href): ['path' => 'civicrm/admin/foo', 'query' => 'reset=1']
+   *   Ex (href): ['url' => 'https://example.com/more/info']
    * @param string $icon
    *   Fa-icon class for the button
    */
diff --git a/www/modules/civicrm/CRM/Utils/Date.php b/www/modules/civicrm/CRM/Utils/Date.php
index de3943818..c03cdc5b4 100644
--- a/www/modules/civicrm/CRM/Utils/Date.php
+++ b/www/modules/civicrm/CRM/Utils/Date.php
@@ -251,7 +251,7 @@ public static function getAvailableInputFormats(bool $isShowTime): array {
       CRM_Utils_Date::DATE_mm_dd_yyyy => ts('mm/dd/yyyy OR mm-dd-yyyy (12/25/1998 OR 12-25-1998) OR (9/1/2008 OR 9-1-2008)'),
       CRM_Utils_Date::DATE_Month_dd_yyyy => ts('Month dd, yyyy (December 12, 1998)'),
       CRM_Utils_Date::DATE_dd_mon_yy => ts('dd-mon-yy OR dd/mm/yy (25-Dec-98 OR 25/12/98 OR 1-09-98)'),
-      CRM_Utils_Date::DATE_dd_mm_yyyy => ts('dd/mm/yyyy (25/12/1998 OR 1/9/2008 OR 1-Sep-2008)'),
+      CRM_Utils_Date::DATE_dd_mm_yyyy => ts('dd/mm/yyyy (25/12/1998 OR 1/9/2008 OR 1-Sep-2008 or 25.12.1998 or 25-12-1998)'),
     ];
   }
 
@@ -761,10 +761,10 @@ protected static function validateDateInput(string $inputValue, int $dateType =
         return preg_match('/^\d\d\d\d-?(\d|\d\d)-?(\d|\d\d)$/', $inputValue);
 
       case self::DATE_mm_dd_yy:
-        return preg_match('/^(\d|\d\d)[-\/](\d|\d\d)[-\/]\d\d$/', $inputValue);
+        return preg_match('/^(\d|\d\d)[-\/.](\d|\d\d)[-\/.]\d\d$/', $inputValue);
 
       case self::DATE_mm_dd_yyyy:
-        return preg_match('/^(\d|\d\d)[-\/](\d|\d\d)[-\/]\d\d\d\d$/', $inputValue);
+        return preg_match('/^(\d|\d\d)[-\/.](\d|\d\d)[-\/,]\d\d\d\d$/', $inputValue);
 
       case self::DATE_Month_dd_yyyy:
         $monthRegex = self::getMonthRegex();
@@ -775,7 +775,7 @@ protected static function validateDateInput(string $inputValue, int $dateType =
         return preg_match('/^(\d|\d\d)-' . self::getMonthRegex() . '-\d\d$/i', $inputValue) || preg_match('/^(\d|\d\d)[-\/](\d|\d\d)[-\/]\d\d$/', $inputValue);
 
       case self::DATE_dd_mm_yyyy:
-        return preg_match('/^(\d|\d\d)[-\/](\d|\d\d)[-\/]\d\d\d\d/', $inputValue);
+        return preg_match('/^(\d|\d\d)[-\/.](\d|\d\d)[-\/.]\d\d\d\d/', $inputValue);
     }
     return FALSE;
   }
@@ -2215,13 +2215,13 @@ public static function formatDate($date, int $dateType = self::DATE_yyyy_mm_dd):
       // PHP interprets slashes as American and dots/dashes as European/other.
       // The only thing we support for mm_dd_yy that differs from strtotime is
       // the use of dashes - so here we replace then we can use strtotime.
-      $date = str_replace('-', '/', $date);
+      $date = str_replace(['-', '.'], '/', $date);
       $date = self::replaceShortYear($date, '/', 3);
     }
     if ($dateType === self::DATE_dd_mon_yy || $dateType === self::DATE_dd_mm_yyyy) {
       // PHP interprets slashes as American and dashes as European/other
       // We swap any slashes to dashes so strtotime will handle.
-      $date = str_replace('/', '-', $date);
+      $date = str_replace(['/', '.'], '-', $date);
       $date = self::replaceTextMonth($date, '-', 2);
       $date = self::replaceShortYear($date, '-', 3);
     }
diff --git a/www/modules/civicrm/CRM/Utils/Hook.php b/www/modules/civicrm/CRM/Utils/Hook.php
index 7a9e2aa79..33394d572 100644
--- a/www/modules/civicrm/CRM/Utils/Hook.php
+++ b/www/modules/civicrm/CRM/Utils/Hook.php
@@ -438,7 +438,7 @@ public static function postCommit($op, $objectName, $objectId, $objectRef = NULL
    * @return null
    *   the return value is ignored
    */
-  public static function links($op, $objectName, &$objectId, &$links, &$mask = NULL, &$values = []) {
+  public static function links($op, $objectName, $objectId, &$links, &$mask = NULL, &$values = []) {
     return self::singleton()->invoke(['op', 'objectName', 'objectId', 'links', 'mask', 'values'], $op, $objectName, $objectId, $links, $mask, $values, 'civicrm_links');
   }
 
@@ -649,7 +649,7 @@ public static function aclGroup($type, $contactID, $tableName, &$allGroups, &$cu
    *   Values from WHERE or ON clause
    */
   public static function selectWhereClause($entity, array &$clauses, int $userId = NULL, array $conditions = []): void {
-    $entityName = is_object($entity) ? CRM_Core_DAO_AllCoreTables::getBriefName(get_class($entity)) : $entity;
+    $entityName = is_object($entity) ? CRM_Core_DAO_AllCoreTables::getEntityNameForClass(get_class($entity)) : $entity;
     $null = NULL;
     $userId ??= (int) CRM_Core_Session::getLoggedInContactID();
     self::singleton()->invoke(['entity', 'clauses', 'userId', 'conditions'],
@@ -975,6 +975,8 @@ public static function alterAdminPanel(&$panels) {
    * @param string $className
    *   The top level className from where the hook is invoked.
    *
+   * @deprecated since 5.71 will be removed sometime after all core uses are fully removed.
+   *
    * @return null
    */
   public static function tokenValues(
@@ -1617,21 +1619,25 @@ public static function export(&$exportTempTable, &$headerRows, &$sqlColumns, $ex
   /**
    * This hook allows modification of the queries constructed from dupe rules.
    *
+   * @deprecated since 5.72
+   *
    * @param string $obj
    *   Object of rulegroup class.
    * @param string $type
    *   Type of queries e.g table / threshold.
    * @param array $query
    *   Set of queries.
-   *
-   * @return mixed
    */
   public static function dupeQuery($obj, $type, &$query) {
     $null = NULL;
-    return self::singleton()->invoke(['obj', 'type', 'query'], $obj, $type, $query,
+    $original = $query;
+    self::singleton()->invoke(['obj', 'type', 'query'], $obj, $type, $query,
       $null, $null, $null,
       'civicrm_dupeQuery'
     );
+    if ($original !== $query && $type !== 'supportedFields') {
+      CRM_Core_Error::deprecatedWarning('hook_civicrm_dupeQuery is deprecated.');
+    }
   }
 
   /**
@@ -2310,6 +2316,7 @@ public static function cron($jobManager) {
    *
    * @return null
    *   The return value is ignored
+   * @throws RuntimeException
    */
   public static function permission(&$newPermissions) {
     $null = NULL;
diff --git a/www/modules/civicrm/CRM/Utils/ICalendar.php b/www/modules/civicrm/CRM/Utils/ICalendar.php
index 6cafb774e..4564be546 100644
--- a/www/modules/civicrm/CRM/Utils/ICalendar.php
+++ b/www/modules/civicrm/CRM/Utils/ICalendar.php
@@ -174,16 +174,17 @@ public static function generate_timezones(array $timezones, $date_min, $date_max
     $tz_items = [];
 
     foreach ($timezones as $tzstr) {
-      $timezone = new DateTimeZone($tzstr);
+      $utcTimezone = new DateTimeZone('UTC');
+      $eventTimezone = new DateTimeZone($tzstr);
 
-      $transitions = $timezone->getTransitions($date_min, $date_max);
+      $transitions = $eventTimezone->getTransitions($date_min, $date_max);
 
       if (count($transitions) === 1) {
         $transitions[] = array_values($transitions)[0];
       }
 
       $item = [
-        'id' => $timezone->getName(),
+        'id' => $eventTimezone->getName(),
         'transitions' => [],
       ];
 
@@ -195,9 +196,8 @@ public static function generate_timezones(array $timezones, $date_min, $date_max
           'offset_from' => self::format_tz_offset($last_transition['offset']),
           'offset_to' => self::format_tz_offset($transition['offset']),
           'abbr' => $transition['abbr'],
-          'dtstart' => date_create($transition['time'], $timezone)->format("Ymd\THis"),
+          'dtstart' => date_create($transition['time'], $utcTimezone)->setTimezone($eventTimezone)->format("Ymd\THis"),
         ];
-
         $last_transition = $transition;
       }
 
diff --git a/www/modules/civicrm/CRM/Utils/JS.php b/www/modules/civicrm/CRM/Utils/JS.php
index 6b5c03735..2c4705c70 100644
--- a/www/modules/civicrm/CRM/Utils/JS.php
+++ b/www/modules/civicrm/CRM/Utils/JS.php
@@ -163,18 +163,15 @@ public static function decode($js, $throwException = FALSE) {
   public static function convertSingleQuoteString(string $str, $throwException) {
     // json_decode can only handle double quotes around strings, so convert single-quoted strings
     $backslash = chr(0) . 'backslash' . chr(0);
-    $str = str_replace(['\\\\', '\\"', '"', '\\&', '\\/', $backslash], [$backslash, '"', '\\"', '&', '/', '\\'], substr($str, 1, -1));
+    $str = str_replace(['\\\\', '\\"', '"', '\\&', '\\/'], [$backslash, '"', '\\"', '&', '/'], substr($str, 1, -1));
     // Ensure the string doesn't terminate early by checking that all single quotes are escaped
-    $pos = -1;
-    while (($pos = strpos($str, "'", $pos + 1)) !== FALSE) {
-      if (($pos - strlen(rtrim(substr($str, 0, $pos)))) % 2) {
-        if ($throwException) {
-          throw new CRM_Core_Exception('Invalid string passed to CRM_Utils_JS::decode');
-        }
-        return NULL;
+    if (preg_match("/[^\\\\]'/", $str)) {
+      if ($throwException) {
+        throw new CRM_Core_Exception('Invalid string passed to CRM_Utils_JS::decode');
       }
+      return NULL;
     }
-    return '"' . $str . '"';
+    return '"' . str_replace(["\\'", $backslash], ["'", '\\\\'], $str) . '"';
   }
 
   /**
@@ -310,8 +307,8 @@ public static function writeObject($obj, $encodeValues = FALSE) {
       if ($brackets[0] == '{') {
         // Enclose the key in quotes unless it is purely alphanumeric
         if (preg_match('/\W/', $key)) {
-          // Prefer single quotes
-          $key = preg_match('/^[\w "]+$/', $key) ? "'" . $key . "'" : json_encode($key, JSON_UNESCAPED_SLASHES);
+          // Prefer single quotes around keys
+          $key = self::encode($key);
         }
         $js[] = "$key: $val";
       }
diff --git a/www/modules/civicrm/CRM/Utils/Mail.php b/www/modules/civicrm/CRM/Utils/Mail.php
index e58a79af8..62ca313ff 100644
--- a/www/modules/civicrm/CRM/Utils/Mail.php
+++ b/www/modules/civicrm/CRM/Utils/Mail.php
@@ -169,14 +169,6 @@ public static function _createMailer($driver, $params) {
    *   TRUE if a mail was sent, else FALSE.
    */
   public static function send(array &$params): bool {
-    $defaultReturnPath = CRM_Core_BAO_MailSettings::defaultReturnPath();
-    $includeMessageId = CRM_Core_BAO_MailSettings::includeMessageId();
-    $emailDomain = CRM_Core_BAO_MailSettings::defaultDomain();
-    $from = $params['from'] ?? NULL;
-    if (!$defaultReturnPath) {
-      $defaultReturnPath = self::pluckEmailFromHeader($from);
-    }
-
     // first call the mail alter hook
     CRM_Utils_Hook::alterMailParams($params, 'singleEmail');
 
@@ -185,6 +177,121 @@ public static function send(array &$params): bool {
       return FALSE;
     }
 
+    list($headers, $message) = self::setEmailHeaders($params);
+
+    $to = [$params['toEmail']];
+    $mailer = \Civi::service('pear_mail');
+
+    // CRM-3795, CRM-7355, CRM-7557, CRM-9058, CRM-9887, CRM-12883, CRM-19173 and others ...
+    // The PEAR library requires different parameters based on the mailer used:
+    // * Mail_mail requires the Cc/Bcc recipients listed ONLY in the $headers variable
+    // * All other mailers require that all be recipients be listed in the $to array AND that
+    //   the Bcc must not be present in $header as otherwise it will be shown to all recipients
+    // ref: https://pear.php.net/bugs/bug.php?id=8047, full thread and answer [2011-04-19 20:48 UTC]
+    // TODO: Refactor this quirk-handler as another filter in FilteredPearMailer. But that would merit review of impact on universe.
+    $driver = ($mailer instanceof CRM_Utils_Mail_FilteredPearMailer) ? $mailer->getDriver() : NULL;
+    $isPhpMail = (get_class($mailer) === "Mail_mail" || $driver === 'mail');
+    if (!$isPhpMail) {
+      // get emails from headers, since these are
+      // combination of name and email addresses.
+      if (!empty($headers['Cc'])) {
+        $to[] = $headers['Cc'] ?? NULL;
+      }
+      if (!empty($headers['Bcc'])) {
+        $to[] = $headers['Bcc'] ?? NULL;
+        unset($headers['Bcc']);
+      }
+    }
+
+    if (is_object($mailer)) {
+      try {
+        $result = $mailer->send($to, $headers, $message);
+      }
+      catch (Exception $e) {
+        \Civi::log()->error('Mailing error: ' . $e->getMessage());
+        CRM_Core_Session::setStatus(ts('Unable to send email. Please report this message to the site administrator'), ts('Mailing Error'), 'error');
+        return FALSE;
+      }
+      if (is_a($result, 'PEAR_Error')) {
+        $message = self::errorMessage($mailer, $result);
+        // append error message in case multiple calls are being made to
+        // this method in the course of sending a batch of messages.
+        \Civi::log()->error('Mailing error: ' . $message);
+        CRM_Core_Session::setStatus(ts('Unable to send email. Please report this message to the site administrator'), ts('Mailing Error'), 'error');
+        return FALSE;
+      }
+      // CRM-10699
+      CRM_Utils_Hook::postEmailSend($params);
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * Send a test email using the selected mailer.
+   *
+   * @param Mail $mailer
+   * @param array $params
+   *   Params by reference.
+   *
+   * @return bool
+   *   TRUE if a mail was sent, else FALSE.
+   */
+  public static function sendTest($mailer, array &$params): bool {
+    CRM_Utils_Hook::alterMailParams($params, 'testEmail');
+    $message = $params['text'];
+    $to = $params['toEmail'];
+
+    list($headers, $message) = self::setEmailHeaders($params);
+
+    $from = self::pluckEmailFromHeader($headers['From']);
+
+    $testMailStatusMsg = ts('Sending test email.') . ':<br />'
+      . ts('From: %1', [1 => $from]) . '<br />'
+      . ts('To: %1', [1 => $to]) . '<br />';
+
+    $mailerName = $mailer->getDriver() ?? '';
+
+    try {
+      $mailer->send($to, $headers, $message);
+
+      if (defined('CIVICRM_MAIL_LOG') && defined('CIVICRM_MAIL_LOG_AND_SEND')) {
+        $testMailStatusMsg .= '<br />' . ts('You have defined CIVICRM_MAIL_LOG_AND_SEND - mail will be logged.') . '<br /><br />';
+      }
+      if (defined('CIVICRM_MAIL_LOG') && !defined('CIVICRM_MAIL_LOG_AND_SEND')) {
+        CRM_Core_Session::setStatus($testMailStatusMsg . ts('You have defined CIVICRM_MAIL_LOG - no mail will be sent.  Your %1 settings have not been tested.', [1 => strtoupper($mailerName)]), ts("Mail not sent"), "warning");
+      }
+      else {
+        CRM_Core_Session::setStatus($testMailStatusMsg . ts('Your %1 settings are correct. A test email has been sent to your email address.', [1 => strtoupper($mailerName)]), ts("Mail Sent"), "success");
+      }
+    }
+    catch (Exception $e) {
+      $result = $e;
+      Civi::log()->error($e->getMessage());
+      $errorMessage = CRM_Utils_Mail::errorMessage($mailer, $result);
+      CRM_Core_Session::setStatus($testMailStatusMsg . ts('Oops. Your %1 settings are incorrect. No test mail has been sent.', [1 => strtoupper($mailerName)]) . $errorMessage, ts("Mail Not Sent"), "error");
+      return FALSE;
+    }
+    return TRUE;
+  }
+
+  /**
+   * Set email headers
+   *
+   * @param array $params
+   *
+   * @return array
+   *   An array of the Headers and Message.
+   */
+  public static function setEmailHeaders($params): array {
+    $defaultReturnPath = CRM_Core_BAO_MailSettings::defaultReturnPath();
+    $includeMessageId = CRM_Core_BAO_MailSettings::includeMessageId();
+    $emailDomain = CRM_Core_BAO_MailSettings::defaultDomain();
+    $from = $params['from'] ?? NULL;
+    if (!$defaultReturnPath) {
+      $defaultReturnPath = self::pluckEmailFromHeader($from);
+    }
+
     $htmlMessage = $params['html'] ?? FALSE;
     if (trim(CRM_Utils_String::htmlToText((string) $htmlMessage)) === '') {
       $htmlMessage = FALSE;
@@ -199,6 +306,16 @@ public static function send(array &$params): bool {
       // This is copied from the Action Schedule send code.
       $textMessage = str_replace('&amp;', '&', $textMessage);
     }
+    if (str_contains($textMessage, 'Undefined array key') || str_contains($htmlMessage, 'Undefined array key') || str_contains($htmlMessage, 'Undefined index')) {
+      $logCount = \Civi::$statics[__CLASS__][__FUNCTION__]['count'] ?? 0;
+      if ($logCount < 3) {
+        // Only record the first 3 times since there might be different messages but after 3 chances are
+        // it's just bulk run of the same..
+        CRM_Core_Error::deprecatedWarning('email output affected by undefined php properties:' . (CRM_Utils_Constant::value('CIVICRM_UF') === 'UnitTests' ? CRM_Utils_String::purifyHTML($htmlMessage) : ''));
+        $logCount++;
+        \Civi::$statics[__CLASS__][__FUNCTION__]['count'] = $logCount;
+      }
+    }
 
     $headers = [];
     // CRM-10699 support custom email headers
@@ -290,52 +407,7 @@ public static function send(array &$params): bool {
     $message = self::setMimeParams($msg);
     $headers = $msg->headers($headers);
 
-    $to = [$params['toEmail']];
-    $mailer = \Civi::service('pear_mail');
-
-    // CRM-3795, CRM-7355, CRM-7557, CRM-9058, CRM-9887, CRM-12883, CRM-19173 and others ...
-    // The PEAR library requires different parameters based on the mailer used:
-    // * Mail_mail requires the Cc/Bcc recipients listed ONLY in the $headers variable
-    // * All other mailers require that all be recipients be listed in the $to array AND that
-    //   the Bcc must not be present in $header as otherwise it will be shown to all recipients
-    // ref: https://pear.php.net/bugs/bug.php?id=8047, full thread and answer [2011-04-19 20:48 UTC]
-    // TODO: Refactor this quirk-handler as another filter in FilteredPearMailer. But that would merit review of impact on universe.
-    $driver = ($mailer instanceof CRM_Utils_Mail_FilteredPearMailer) ? $mailer->getDriver() : NULL;
-    $isPhpMail = (get_class($mailer) === "Mail_mail" || $driver === 'mail');
-    if (!$isPhpMail) {
-      // get emails from headers, since these are
-      // combination of name and email addresses.
-      if (!empty($headers['Cc'])) {
-        $to[] = $headers['Cc'] ?? NULL;
-      }
-      if (!empty($headers['Bcc'])) {
-        $to[] = $headers['Bcc'] ?? NULL;
-        unset($headers['Bcc']);
-      }
-    }
-
-    if (is_object($mailer)) {
-      try {
-        $result = $mailer->send($to, $headers, $message);
-      }
-      catch (Exception $e) {
-        \Civi::log()->error('Mailing error: ' . $e->getMessage());
-        CRM_Core_Session::setStatus(ts('Unable to send email. Please report this message to the site administrator'), ts('Mailing Error'), 'error');
-        return FALSE;
-      }
-      if (is_a($result, 'PEAR_Error')) {
-        $message = self::errorMessage($mailer, $result);
-        // append error message in case multiple calls are being made to
-        // this method in the course of sending a batch of messages.
-        \Civi::log()->error('Mailing error: ' . $message);
-        CRM_Core_Session::setStatus(ts('Unable to send email. Please report this message to the site administrator'), ts('Mailing Error'), 'error');
-        return FALSE;
-      }
-      // CRM-10699
-      CRM_Utils_Hook::postEmailSend($params);
-      return TRUE;
-    }
-    return FALSE;
+    return [$headers, $message];
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Utils/Mail/EmailProcessor.php b/www/modules/civicrm/CRM/Utils/Mail/EmailProcessor.php
index edc5a3aeb..5170346e4 100644
--- a/www/modules/civicrm/CRM/Utils/Mail/EmailProcessor.php
+++ b/www/modules/civicrm/CRM/Utils/Mail/EmailProcessor.php
@@ -80,9 +80,9 @@ public static function processActivities() {
   private static function _process($civiMail, $dao, $is_create_activities) {
     // 0 = activities; 1 = bounce;
     $isBounceProcessing = $dao->is_default;
-    $targetFields = array_filter(explode(',', $dao->activity_targets));
-    $assigneeFields = array_filter(explode(",", $dao->activity_assignees));
-    $sourceFields = array_filter(explode(",", $dao->activity_source));
+    $targetFields = array_filter(explode(',', (string) $dao->activity_targets));
+    $assigneeFields = array_filter(explode(",", (string) $dao->activity_assignees));
+    $sourceFields = array_filter(explode(",", (string) $dao->activity_source));
     // create an array of all of to, from, cc, bcc that are in use for this Mail Account, so we don't create contacts for emails we aren't adding to the activity.
     $emailFields = array_merge($targetFields, $assigneeFields, $sourceFields);
     $createContact = !($dao->is_contact_creation_disabled_if_no_match) && !$isBounceProcessing;
@@ -239,7 +239,7 @@ private static function _process($civiMail, $dao, $is_create_activities) {
 
         // get $replyTo from either the Reply-To header or from From
         // FIXME: make sure it works with Reply-Tos containing non-email stuff
-        $replyTo = $mail->getHeader('Reply-To') ? $mail->getHeader('Reply-To') : ($mail->from ? $mail->from->email : "");
+        $replyTo = $mail->getHeader('Reply-To') ?: ($mail->from ? $mail->from->email : "");
 
         // handle the action by passing it to the proper API call
         if (!empty($action)) {
diff --git a/www/modules/civicrm/CRM/Utils/Money.php b/www/modules/civicrm/CRM/Utils/Money.php
index 212386cf3..63ada48a9 100644
--- a/www/modules/civicrm/CRM/Utils/Money.php
+++ b/www/modules/civicrm/CRM/Utils/Money.php
@@ -100,7 +100,7 @@ public static function format($amount, $currency = NULL, $format = NULL, $onlyNu
     $replacements = [
       '%a' => $amount,
       '%C' => $currency,
-      '%c' => CRM_Utils_Array::value($currency, self::$_currencySymbols, $currency),
+      '%c' => self::$_currencySymbols[$currency] ?? $currency,
     ];
     return strtr($format, $replacements);
   }
@@ -347,7 +347,9 @@ protected static function formatNumericByFormat($amount, $valueFormat = '%!i') {
     if (is_numeric($amount) && function_exists('money_format')) {
       $lc = setlocale(LC_MONETARY, 0);
       setlocale(LC_MONETARY, 'en_US.utf8', 'en_US', 'en_US.utf8', 'en_US', 'C');
+      // phpcs:disable
       $amount = money_format($valueFormat, $amount);
+      // phpcs:enable
       setlocale(LC_MONETARY, $lc);
     }
     return $amount;
diff --git a/www/modules/civicrm/CRM/Utils/REST.php b/www/modules/civicrm/CRM/Utils/REST.php
index 6d245cc74..9e334bab4 100644
--- a/www/modules/civicrm/CRM/Utils/REST.php
+++ b/www/modules/civicrm/CRM/Utils/REST.php
@@ -390,7 +390,7 @@ public static function loadTemplate() {
     }
     $param = array_map('htmlentities', $_GET);
     unset($param['q']);
-    $smarty->assign_by_ref("request", $param);
+    $smarty->assign("request", $param);
 
     if (!self::isWebServiceRequest()) {
 
@@ -631,6 +631,10 @@ public function loadCMSBootstrap() {
    *       <A HREF>, <IFRAME>, <IMG>, `Location:`, or similar CSRF vector.
    */
   public static function isWebServiceRequest(): bool {
+    if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
+      return TRUE;
+    }
+
     if (($_SERVER['HTTP_X_REQUESTED_WITH'] ?? NULL) === 'XMLHttpRequest') {
       return TRUE;
     }
diff --git a/www/modules/civicrm/CRM/Utils/Recent.php b/www/modules/civicrm/CRM/Utils/Recent.php
index 29faa7c8f..1680b433d 100644
--- a/www/modules/civicrm/CRM/Utils/Recent.php
+++ b/www/modules/civicrm/CRM/Utils/Recent.php
@@ -264,7 +264,7 @@ private static function getTokens($str):array {
    */
   private static function getIcon($entityType, $entityId) {
     $icon = NULL;
-    $daoClass = CRM_Core_DAO_AllCoreTables::getFullName($entityType);
+    $daoClass = CRM_Core_DAO_AllCoreTables::getDAONameForEntity($entityType);
     if ($daoClass) {
       $icon = CRM_Core_DAO_AllCoreTables::getBAOClassName($daoClass)::getEntityIcon($entityType, $entityId);
     }
diff --git a/www/modules/civicrm/CRM/Utils/SQL.php b/www/modules/civicrm/CRM/Utils/SQL.php
index 2f5e07843..25065a51c 100644
--- a/www/modules/civicrm/CRM/Utils/SQL.php
+++ b/www/modules/civicrm/CRM/Utils/SQL.php
@@ -57,7 +57,7 @@ public function __construct() {
    * @return array
    */
   public static function mergeSubquery($entityName, $joinColumn = 'id') {
-    $baoName = CRM_Core_DAO_AllCoreTables::getBAOClassName(CRM_Core_DAO_AllCoreTables::getFullName($entityName));
+    $baoName = CRM_Core_DAO_AllCoreTables::getBAOClassName(CRM_Core_DAO_AllCoreTables::getDAONameForEntity($entityName));
     $bao = new $baoName();
     $fields = $bao::getSupportedFields();
     $mergeClauses = $subClauses = [];
diff --git a/www/modules/civicrm/CRM/Utils/SQL/EscapeStringTrait.php b/www/modules/civicrm/CRM/Utils/SQL/EscapeStringTrait.php
index e73d76d1d..ccab84954 100644
--- a/www/modules/civicrm/CRM/Utils/SQL/EscapeStringTrait.php
+++ b/www/modules/civicrm/CRM/Utils/SQL/EscapeStringTrait.php
@@ -27,11 +27,11 @@ public function escapeString($value) {
       }
     }
 
-    if (CRM_Core_I18n::$SQL_ESCAPER == NULL) {
+    if (!isset($GLOBALS['CIVICRM_SQL_ESCAPER'])) {
       return '"' . CRM_Core_DAO::escapeString($value) . '"';
     }
     else {
-      return '"' . call_user_func(CRM_Core_I18n::$SQL_ESCAPER, $value) . '"';
+      return '"' . call_user_func($GLOBALS['CIVICRM_SQL_ESCAPER'], $value) . '"';
     }
 
   }
diff --git a/www/modules/civicrm/CRM/Utils/SQL/Insert.php b/www/modules/civicrm/CRM/Utils/SQL/Insert.php
index dc256fc95..34e3245a3 100644
--- a/www/modules/civicrm/CRM/Utils/SQL/Insert.php
+++ b/www/modules/civicrm/CRM/Utils/SQL/Insert.php
@@ -65,7 +65,7 @@ public static function into($table, string $verb = 'INSERT INTO') {
    * @throws \CRM_Core_Exception
    */
   public static function dao(CRM_Core_DAO $dao) {
-    $table = CRM_Core_DAO::getLocaleTableName($dao->getTableName());
+    $table = $dao::getLocaleTableName();
     $row = [];
     foreach ((array) $dao as $key => $value) {
       if ($value === 'null') {
diff --git a/www/modules/civicrm/CRM/Utils/SQL/TempTable.php b/www/modules/civicrm/CRM/Utils/SQL/TempTable.php
index 1a86f130b..f59a65453 100644
--- a/www/modules/civicrm/CRM/Utils/SQL/TempTable.php
+++ b/www/modules/civicrm/CRM/Utils/SQL/TempTable.php
@@ -116,8 +116,8 @@ public function __destruct() {
   public function getName() {
     $parts = ['civicrm', 'tmp'];
     $parts[] = ($this->durable ? 'd' : 'e');
-    $parts[] = $this->category ? $this->category : 'dflt';
-    $parts[] = $this->id ? $this->id : 'dflt';
+    $parts[] = $this->category ?: 'dflt';
+    $parts[] = $this->id ?: 'dflt';
     return implode('_', $parts);
   }
 
diff --git a/www/modules/civicrm/CRM/Utils/Schema.php b/www/modules/civicrm/CRM/Utils/Schema.php
new file mode 100644
index 000000000..19ef35d53
--- /dev/null
+++ b/www/modules/civicrm/CRM/Utils/Schema.php
@@ -0,0 +1,341 @@
+<?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       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Helper classes for parsing the xml schema files.
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
+ */
+class CRM_Utils_Schema {
+
+  public static function toString(string $key, SimpleXMLElement $xml): ?string {
+    if (isset($xml->$key)) {
+      return (string) $xml->$key;
+    }
+    return NULL;
+  }
+
+  public static function toBool(string $key, SimpleXMLElement $xml): ?bool {
+    if (isset($xml->$key)) {
+      $value = strtolower((string) $xml->$key);
+      return $value === 'true' || $value === '1';
+    }
+    return NULL;
+  }
+
+  /**
+   * Get some attributes related to html type
+   *
+   * Extracted during refactor, still a bit messy.
+   *
+   * @param SimpleXMLElement $fieldXML
+   * @return array
+   */
+  public static function getTypeAttributes(SimpleXMLElement $fieldXML) {
+    $type = (string) $fieldXML->type;
+    $field = [];
+    switch ($type) {
+      case 'varchar':
+      case 'char':
+        $field['length'] = (int) $fieldXML->length;
+        $field['sqlType'] = "$type({$field['length']})";
+        $field['crmType'] = 'CRM_Utils_Type::T_STRING';
+        $field['size'] = self::getSize($fieldXML);
+        break;
+
+      case 'text':
+        $field['sqlType'] = $type;
+        $field['crmType'] = 'CRM_Utils_Type::T_' . strtoupper($type);
+        // CRM-13497 see fixme below
+        $field['rows'] = isset($fieldXML->html) ? self::toString('rows', $fieldXML->html) : NULL;
+        $field['cols'] = isset($fieldXML->html) ? self::toString('cols', $fieldXML->html) : NULL;
+        break;
+
+      case 'datetime':
+        $field['sqlType'] = $type;
+        $field['crmType'] = 'CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME';
+        break;
+
+      case 'boolean':
+        // need this case since some versions of mysql do not have boolean as a valid column type and hence it
+        // is changed to tinyint. hopefully after 2 yrs this case can be removed.
+        $field['sqlType'] = 'tinyint';
+        $field['crmType'] = 'CRM_Utils_Type::T_' . strtoupper($type);
+        break;
+
+      case 'decimal':
+        $length = $fieldXML->length ?: '20,2';
+        $field['sqlType'] = 'decimal(' . $length . ')';
+        $field['crmType'] = self::toString('crmType', $fieldXML) ?: 'CRM_Utils_Type::T_MONEY';
+        $field['precision'] = $length;
+        break;
+
+      case 'float':
+        $field['sqlType'] = 'double';
+        $field['crmType'] = 'CRM_Utils_Type::T_FLOAT';
+        break;
+
+      default:
+        $field['sqlType'] = $type;
+        if ($type === 'int unsigned' || $type === 'tinyint') {
+          $field['crmType'] = 'CRM_Utils_Type::T_INT';
+        }
+        else {
+          $field['crmType'] = self::toString('crmType', $fieldXML) ?: 'CRM_Utils_Type::T_' . strtoupper($type);
+        }
+        break;
+    }
+    // Get value of crmType constant(s)
+    $field['crmTypeValue'] = 0;
+    $crmTypes = explode('+', $field['crmType']);
+    foreach ($crmTypes as $crmType) {
+      $field['crmTypeValue'] += constant(trim($crmType));
+    }
+    return $field;
+  }
+
+  /**
+   * Sets the size property of a textfield.
+   *
+   * @param SimpleXMLElement $fieldXML
+   *
+   * @return string
+   */
+  public static function getSize(SimpleXMLElement $fieldXML): string {
+    // Extract from <size> tag if supplied
+    if (!empty($fieldXML->html) && !empty($fieldXML->html->size)) {
+      return (string) $fieldXML->html->size;
+    }
+    return self::getDefaultSize(self::toString('length', $fieldXML));
+  }
+
+  public static function getDefaultSize($length) {
+    // Infer from <length> tag if <size> was not explicitly set or was invalid
+    // This map is slightly different from CRM_Core_Form_Renderer::$_sizeMapper
+    // Because we usually want fields to render as smaller than their maxlength
+    $sizes = [
+      2 => 'TWO',
+      4 => 'FOUR',
+      6 => 'SIX',
+      8 => 'EIGHT',
+      16 => 'TWELVE',
+      32 => 'MEDIUM',
+      64 => 'BIG',
+    ];
+    foreach ($sizes as $size => $name) {
+      if ($length <= $size) {
+        return "CRM_Utils_Type::$name";
+      }
+    }
+    return 'CRM_Utils_Type::HUGE';
+  }
+
+  public static function getCrmTypeFromSqlType(string $sqlType) {
+    [$type] = explode('(', $sqlType);
+    switch ($type) {
+      case 'varchar':
+      case 'char':
+        return 'CRM_Utils_Type::T_STRING';
+
+      case 'datetime':
+        return 'CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME';
+
+      case 'decimal':
+        return 'CRM_Utils_Type::T_MONEY';
+
+      case 'double':
+        return 'CRM_Utils_Type::T_FLOAT';
+
+      case 'int unsigned':
+      case 'tinyint':
+        return 'CRM_Utils_Type::T_INT';
+
+      default:
+        return 'CRM_Utils_Type::T_' . strtoupper($type);
+    }
+  }
+
+  /**
+   * Fallback used when field in schema xml is missing a title.
+   *
+   * TODO: Trigger a deprecation notice when this happens.
+   *
+   * @param string $name
+   *
+   * @return string
+   */
+  public static function composeTitle(string $name): string {
+    $substitutions = [
+      'is_active' => 'Enabled',
+    ];
+    if (isset($substitutions[$name])) {
+      return $substitutions[$name];
+    }
+    $names = explode('_', strtolower($name));
+    $allCaps = ['im', 'id'];
+    foreach ($names as $i => $str) {
+      if (in_array($str, $allCaps, TRUE)) {
+        $names[$i] = strtoupper($str);
+      }
+      else {
+        $names[$i] = ucfirst(trim($str));
+      }
+    }
+    return trim(implode(' ', $names));
+  }
+
+  /**
+   * Get the 'usage' property for a field.
+   *
+   * @param SimpleXMLElement $fieldXML
+   * @return array
+   */
+  public static function getFieldUsage(SimpleXMLElement $fieldXML): array {
+    $import = self::toBool('import', $fieldXML) ?? FALSE;
+    $export = self::toBool('export', $fieldXML);
+    if (!isset($fieldXML->usage)) {
+      $usage = [
+        'import' => $import,
+        'export' => $export ?? $import,
+      ];
+    }
+    else {
+      $usage = [];
+      foreach ($fieldXML->usage->children() as $usedFor => $isUsed) {
+        $usage[$usedFor] = self::toBool($usedFor, $fieldXML->usage);
+      }
+      $import = $usage['import'] ?? $import;
+    }
+    // Ensure all keys are populated. Import is the historical de-facto default.
+    $usage = array_merge(array_fill_keys(['import', 'export', 'duplicate_matching'], $import), $usage);
+    // Usage for tokens has not historically been in the metadata so we can default to FALSE.
+    // historically hard-coded lists have been used.
+    $usage['token'] ??= FALSE;
+    return $usage;
+  }
+
+  public static function getFieldHtml(SimpleXMLElement $fieldXML): ?array {
+    $html = NULL;
+    if (!empty($fieldXML->html)) {
+      $html = [];
+      $validOptions = [
+        'type',
+        'formatType',
+        'label',
+        'controlField',
+        'min',
+        'max',
+        /* Fixme: CRM-13497 these could also be moved
+        'rows',
+        'cols',
+        'size', */
+      ];
+      foreach ($validOptions as $htmlOption) {
+        if (isset($fieldXML->html->$htmlOption) && $fieldXML->html->$htmlOption !== '') {
+          $html[$htmlOption] = self::toString($htmlOption, $fieldXML->html);
+        }
+      }
+      if (isset($fieldXML->html->filter)) {
+        $html['filter'] = (array) $fieldXML->html->filter;
+      }
+    }
+    return $html;
+  }
+
+  public static function getFieldPseudoconstant(SimpleXMLElement $fieldXML): ?array {
+    $pseudoconstant = NULL;
+    if (!empty($fieldXML->pseudoconstant)) {
+      //ok this is a bit long-winded but it gets there & is consistent with above approach
+      $pseudoconstant = [];
+      $validOptions = [
+        // Fields can specify EITHER optionGroupName OR table, not both
+        // (since declaring optionGroupName means we are using the civicrm_option_value table)
+        'optionGroupName',
+        'table',
+        // If table is specified, keyColumn and labelColumn are also required
+        'keyColumn',
+        'labelColumn',
+        // Non-translated machine name for programmatic lookup. Defaults to 'name' if that column exists
+        'nameColumn',
+        // Column to fetch in "abbreviate" context
+        'abbrColumn',
+        // Supported by APIv4 suffixes
+        'colorColumn',
+        'iconColumn',
+        // Where clause snippet (will be joined to the rest of the query with AND operator)
+        'condition',
+        // callback function incase of static arrays
+        'callback',
+        // Path to options edit form
+        'optionEditPath',
+        // Should options for this field be prefetched (for presenting on forms).
+        // The default is TRUE, but adding FALSE helps when there could be many options
+        'prefetch',
+      ];
+      foreach ($validOptions as $pseudoOption) {
+        if (!empty($fieldXML->pseudoconstant->$pseudoOption)) {
+          $pseudoconstant[$pseudoOption] = self::toString($pseudoOption, $fieldXML->pseudoconstant);
+        }
+      }
+      if (!isset($pseudoconstant['optionEditPath']) && !empty($pseudoconstant['optionGroupName'])) {
+        $pseudoconstant['optionEditPath'] = 'civicrm/admin/options/' . $pseudoconstant['optionGroupName'];
+      }
+      // Set suffixes if explicitly declared
+      if (!empty($fieldXML->pseudoconstant->suffixes)) {
+        $pseudoconstant['suffixes'] = explode(',', self::toString('suffixes', $fieldXML->pseudoconstant));
+      }
+      // For now, fields that have option lists that are not in the db can simply
+      // declare an empty pseudoconstant tag and we'll add this placeholder.
+      // That field's BAO::buildOptions fn will need to be responsible for generating the option list
+      if (empty($pseudoconstant)) {
+        $pseudoconstant = 'not in database';
+      }
+    }
+    return $pseudoconstant;
+  }
+
+  public static function getFieldPermission(SimpleXMLElement $fieldXML): ?array {
+    $permission = NULL;
+    if (isset($fieldXML->permission)) {
+      $permission = trim(self::toString('permission', $fieldXML));
+      $permission = $permission ? array_filter(array_map('trim', explode(',', $permission))) : [];
+      if (isset($fieldXML->permission->or)) {
+        $permission[] = array_filter(array_map('trim', explode(',', $fieldXML->permission->or)));
+      }
+    }
+    return $permission;
+  }
+
+  /**
+   * In multilingual context popup, we need extra information to create appropriate widget
+   *
+   * @param SimpleXMLElement $fieldXML
+   * @return array|string[]|null
+   */
+  public static function getFieldWidget(SimpleXMLElement $fieldXML): ?array {
+    $widget = NULL;
+    if ($fieldXML->localizable) {
+      if (isset($fieldXML->html)) {
+        $widget = (array) $fieldXML->html;
+      }
+      else {
+        // default
+        $widget = ['type' => 'Text'];
+      }
+      if (isset($fieldXML->required)) {
+        $widget['required'] = self::toString('required', $fieldXML);
+      }
+    }
+    return $widget;
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/Utils/String.php b/www/modules/civicrm/CRM/Utils/String.php
index 2d716d457..7150efc4e 100644
--- a/www/modules/civicrm/CRM/Utils/String.php
+++ b/www/modules/civicrm/CRM/Utils/String.php
@@ -1018,6 +1018,7 @@ public static function stringContainsTokens(string $string) {
    * many times it is run. This compares to it otherwise creating one file for every parsed string.
    *
    * @param string $templateString
+   * @param array $templateVars
    *
    * @return string
    *
@@ -1025,7 +1026,7 @@ public static function stringContainsTokens(string $string) {
    *
    * @throws \CRM_Core_Exception
    */
-  public static function parseOneOffStringThroughSmarty($templateString) {
+  public static function parseOneOffStringThroughSmarty($templateString, $templateVars = []) {
     if (!CRM_Utils_String::stringContainsTokens($templateString)) {
       // Skip expensive smarty processing.
       return $templateString;
@@ -1034,13 +1035,53 @@ public static function parseOneOffStringThroughSmarty($templateString) {
     $cachingValue = $smarty->caching;
     set_error_handler([$smarty, 'handleSmartyError'], E_USER_ERROR);
     $smarty->caching = 0;
+    $useSecurityPolicy = ($smarty->getVersion() > 2) ? !$smarty->security_policy : !$smarty->security;
+    // For Smarty v2, policy is applied at lower level.
+    if ($useSecurityPolicy) {
+      // $smarty->enableSecurity('CRM_Core_Smarty_Security');
+      Civi::service('civi.smarty.userContent')->enable();
+    }
     $smarty->assign('smartySingleUseString', $templateString);
-    // Do not escape the smartySingleUseString as that is our smarty template
-    // and is likely to contain html.
-    $templateString = (string) $smarty->fetch('string:{eval var=$smartySingleUseString|smarty:nodefaults}');
-    $smarty->caching = $cachingValue;
-    $smarty->assign('smartySingleUseString');
-    restore_error_handler();
+    try {
+      // Do not escape the smartySingleUseString as that is our smarty template
+      // and is likely to contain html.
+      // The file name generated by
+      // 'string:{eval var=$smartySingleUseString|smarty:nodefaults}'
+      // is invalid in Windows, causing failure.
+      // Adding this is preparatory to smarty 3. The original PR failed some
+      // tests so we check for the function.
+      if (!function_exists('smarty_function_eval') && (!defined('SMARTY_DIR') || !file_exists(SMARTY_DIR . '/plugins/function.eval.php'))) {
+        if (!empty($templateVars)) {
+          $templateString = (string) $smarty->fetchWith('eval:' . $templateString, $templateVars);
+        }
+        else {
+          $templateString = (string) $smarty->fetch('eval:' . $templateString);
+        }
+      }
+      else {
+        if (!empty($templateVars)) {
+          $templateString = (string) $smarty->fetchWith('string:{eval var=$smartySingleUseString|smarty:nodefaults}', $templateVars);
+        }
+        else {
+          $templateString = (string) $smarty->fetch('string:{eval var=$smartySingleUseString|smarty:nodefaults}');
+        }
+      }
+    }
+    catch (Exception $e) {
+      \Civi::log('smarty')->info('parsing smarty template {template}', [
+        'template' => $templateString,
+      ]);
+      throw new \CRM_Core_Exception('Message was not parsed due to invalid smarty syntax : ' . $e->getMessage() . ((CIVICRM_UF === 'UnitTest' || CRM_Utils_Constant::value('SMARTY_DEBUG_STRINGS')) ? $templateString : ''));
+    }
+    finally {
+      $smarty->caching = $cachingValue;
+      $smarty->assign('smartySingleUseString');
+      restore_error_handler();
+      if ($useSecurityPolicy) {
+        // $smarty->disableSecurity();
+        Civi::service('civi.smarty.userContent')->disable();
+      }
+    }
     return $templateString;
   }
 
diff --git a/www/modules/civicrm/CRM/Utils/System.php b/www/modules/civicrm/CRM/Utils/System.php
index 00b8a4f67..7af9472b4 100644
--- a/www/modules/civicrm/CRM/Utils/System.php
+++ b/www/modules/civicrm/CRM/Utils/System.php
@@ -278,6 +278,17 @@ public static function url(
       $query = $extraQuery . ($query ? "&$query" : '');
     }
 
+    if ($frontend === FALSE && $forceBackend === FALSE && !empty($GLOBALS['civicrm_url_defaults'])) {
+      // Caller appears to want the "current://" scheme. For newer environments (eg web-service/iframe;
+      // not frontend/backend), we need
+      $urlObj = \Civi::url('current://' . $path)
+        ->addQuery($query)
+        ->addFragment($fragment)
+        ->setPreferFormat($absolute ? 'absolute' : 'relative')
+        ->setHtmlEscape($htmlize);
+      return (string) $urlObj;
+    }
+
     $config = CRM_Core_Config::singleton();
     $url = $config->userSystem->url($path, $query, $absolute, $fragment, $frontend, $forceBackend);
 
@@ -1509,8 +1520,7 @@ public static function flushCache() {
       = CRM_Contribute_BAO_Contribution::$_importableFields
         = CRM_Contribute_BAO_Contribution::$_exportableFields
           = CRM_Pledge_BAO_Pledge::$_exportableFields
-            = CRM_Core_BAO_CustomField::$_importFields
-              = CRM_Core_DAO::$_dbColumnValueCache = NULL;
+            = CRM_Core_DAO::$_dbColumnValueCache = NULL;
 
     CRM_Core_OptionGroup::flushAll();
     CRM_Utils_PseudoConstant::flushAll();
@@ -1881,7 +1891,7 @@ public static function createDefaultCrudLink($crudLinkSpec, $absolute = FALSE) {
       $action = strtolower($action);
     }
 
-    $daoClass = isset($crudLinkSpec['entity']) ? CRM_Core_DAO_AllCoreTables::getFullName($crudLinkSpec['entity']) : CRM_Core_DAO_AllCoreTables::getClassForTable($crudLinkSpec['entity_table']);
+    $daoClass = isset($crudLinkSpec['entity']) ? CRM_Core_DAO_AllCoreTables::getDAONameForEntity($crudLinkSpec['entity']) : CRM_Core_DAO_AllCoreTables::getClassForTable($crudLinkSpec['entity_table']);
     $paths = $daoClass ? $daoClass::getEntityPaths() : [];
     $path = $paths[$action] ?? NULL;
     if (!$path) {
diff --git a/www/modules/civicrm/CRM/Utils/System/Backdrop.php b/www/modules/civicrm/CRM/Utils/System/Backdrop.php
index 737697784..f866d26ca 100644
--- a/www/modules/civicrm/CRM/Utils/System/Backdrop.php
+++ b/www/modules/civicrm/CRM/Utils/System/Backdrop.php
@@ -916,7 +916,10 @@ public function synchronizeUsers() {
    * @inheritDoc
    */
   public function clearResourceCache() {
-    _backdrop_flush_css_js();
+    // Sometimes metadata gets cleared while the cms isn't bootstrapped.
+    if (function_exists('_backdrop_flush_css_js')) {
+      _backdrop_flush_css_js();
+    }
   }
 
   /**
@@ -1103,7 +1106,7 @@ public function getCMSPermissionsUrlParams() {
    * CMS's drupal views expectations, if any.
    */
   public function getCRMDatabasePrefix(): string {
-    return str_replace(parent::getCRMDatabasePrefix(), '`', '');
+    return str_replace('`', '', parent::getCRMDatabasePrefix());
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Utils/System/Base.php b/www/modules/civicrm/CRM/Utils/System/Base.php
index a5cbcaf78..bc590ed0f 100644
--- a/www/modules/civicrm/CRM/Utils/System/Base.php
+++ b/www/modules/civicrm/CRM/Utils/System/Base.php
@@ -113,9 +113,7 @@ public function postURL($action) {
     }
 
     $current_path = CRM_Utils_System::currentPath();
-    return $this->url($current_path,
-      NULL, TRUE, NULL, FALSE
-    );
+    return (string) Civi::url('current://' . $current_path, 'a');
   }
 
   /**
@@ -966,6 +964,27 @@ public function synchronizeUsers() {
     return [];
   }
 
+  /**
+   * Whether to allow access to CMS user sync action
+   * @return bool
+   */
+  public function allowSynchronizeUsers() {
+    return TRUE;
+  }
+
+  /**
+   * Run CMS user sync if allowed, otherwise just returns empty array
+   * @return array
+   */
+  public function synchronizeUsersIfAllowed() {
+    if ($this->allowSynchronizeUsers()) {
+      return $this->synchronizeUsers();
+    }
+    else {
+      return [];
+    }
+  }
+
   /**
    * Send an HTTP Response base on PSR HTTP RespnseInterface response.
    *
diff --git a/www/modules/civicrm/CRM/Utils/System/Drupal8.php b/www/modules/civicrm/CRM/Utils/System/Drupal8.php
index 73cd9a270..160a5e6af 100644
--- a/www/modules/civicrm/CRM/Utils/System/Drupal8.php
+++ b/www/modules/civicrm/CRM/Utils/System/Drupal8.php
@@ -188,6 +188,15 @@ public function setTitle($title, $pageTitle = NULL) {
   public function appendBreadCrumb($breadcrumbs) {
     $civicrmPageState = \Drupal::service('civicrm.page_state');
     foreach ($breadcrumbs as $breadcrumb) {
+      if (stripos($breadcrumb['url'], 'id%%')) {
+        $args = ['cid', 'mid'];
+        foreach ($args as $a) {
+          $val = CRM_Utils_Request::retrieve($a, 'Positive');
+          if ($val) {
+            $breadcrumb['url'] = str_ireplace("%%{$a}%%", $val, $breadcrumb['url']);
+          }
+        }
+      }
       $civicrmPageState->addBreadcrumb($breadcrumb['title'], $breadcrumb['url']);
     }
   }
@@ -296,6 +305,8 @@ public function url(
         'fragment' => $fragment,
         'absolute' => $absolute,
       ])->toString();
+      // Decode %% for better readability, e.g., %%cid%%.
+      $url = str_replace('%25%25', '%%', $url);
     }
     catch (Exception $e) {
       \Drupal::logger('civicrm')->error($e->getMessage());
@@ -663,8 +674,8 @@ public function postURL($action) {
     if (!empty($action)) {
       return $action;
     }
-    $current_path = \Drupal::service('path.current')->getPath();
-    return $this->url($current_path);
+    $current_path = ltrim(\Drupal::service('path.current')->getPath(), '/');
+    return (string) Civi::url('current://' . $current_path);
   }
 
   /**
@@ -964,4 +975,27 @@ public function mailingWorkflowIsEnabled():bool {
     return (bool) $enableWorkflow;
   }
 
+  /**
+   * @inheritDoc
+   */
+  public function clearResourceCache() {
+    $cleared = FALSE;
+    // @todo When only drupal 10.2+ is supported can remove the try catch
+    // and the fallback to drupal_flush_css_js. Still need the class_exists.
+    try {
+      // Sometimes metadata gets cleared while the cms isn't bootstrapped.
+      if (class_exists('\Drupal')) {
+        \Drupal::service('asset.query_string')->reset();
+        $cleared = TRUE;
+      }
+    }
+    catch (\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException $e) {
+      // probably < drupal 10.2 - fall thru
+    }
+    // Sometimes metadata gets cleared while the cms isn't bootstrapped.
+    if (!$cleared && function_exists('_drupal_flush_css_js')) {
+      _drupal_flush_css_js();
+    }
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Utils/System/DrupalBase.php b/www/modules/civicrm/CRM/Utils/System/DrupalBase.php
index b989061eb..af2095083 100644
--- a/www/modules/civicrm/CRM/Utils/System/DrupalBase.php
+++ b/www/modules/civicrm/CRM/Utils/System/DrupalBase.php
@@ -286,7 +286,10 @@ public function logger($message, $priority = NULL) {
    * @inheritDoc
    */
   public function clearResourceCache() {
-    _drupal_flush_css_js();
+    // Sometimes metadata gets cleared while the cms isn't bootstrapped.
+    if (function_exists('_drupal_flush_css_js')) {
+      _drupal_flush_css_js();
+    }
   }
 
   /**
@@ -572,7 +575,7 @@ public function postURL($action) {
     if (!empty($action)) {
       return $action;
     }
-    return $this->url($_GET['q']);
+    return (string) Civi::url('current://' . $_GET['q']);
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Utils/System/Joomla.php b/www/modules/civicrm/CRM/Utils/System/Joomla.php
index f55600227..a191e73f8 100644
--- a/www/modules/civicrm/CRM/Utils/System/Joomla.php
+++ b/www/modules/civicrm/CRM/Utils/System/Joomla.php
@@ -219,7 +219,7 @@ public function appendBreadCrumb($breadCrumbs) {
         $bc[] = $crumbs;
       }
     }
-    $template->assign_by_ref('breadcrumb', $bc);
+    $template->assign('breadcrumb', $bc);
   }
 
   /**
diff --git a/www/modules/civicrm/CRM/Utils/System/Standalone.php b/www/modules/civicrm/CRM/Utils/System/Standalone.php
index b05512cf1..7e33ed5a9 100644
--- a/www/modules/civicrm/CRM/Utils/System/Standalone.php
+++ b/www/modules/civicrm/CRM/Utils/System/Standalone.php
@@ -420,10 +420,12 @@ public function getUserIDFromUserObject($user) {
   }
 
   /**
-   * @inheritDoc
+   * CMS User Sync doesn't make sense when using standaloneusers
+   * (but leave open the door for other user extensions, which might have a sync method)
+   * @return bool
    */
-  public function synchronizeUsers() {
-    return Security::singleton()->synchronizeUsers();
+  public function allowSynchronizeUsers() {
+    return !\CRM_Extension_System::singleton()->getManager()->isEnabled('standaloneusers');
   }
 
   /**
@@ -553,8 +555,18 @@ public function permissionDenied() {
    * Start a new session.
    */
   public function sessionStart() {
-    $session_handler = new SessionHandler();
-    session_set_save_handler($session_handler);
+    if (defined('CIVI_SETUP')) {
+      // during installation we can't use the session
+      // handler from the extension yet so we just
+      // use a default php session
+      // use a different cookie name to avoid any nasty clash
+      $session_cookie_name = 'SESSCIVISOINSTALL';
+    }
+    else {
+      $session_handler = new SessionHandler();
+      session_set_save_handler($session_handler);
+      $session_cookie_name = 'SESSCIVISO';
+    }
 
     $session_max_lifetime = Civi::settings()->get('standaloneusers_session_max_lifetime') ?? 1440;
 
@@ -562,7 +574,7 @@ public function sessionStart() {
       'cookie_httponly'  => 1,
       'cookie_secure'    => !empty($_SERVER['HTTPS']),
       'gc_maxlifetime'   => $session_max_lifetime,
-      'name'             => 'SESSCIVISO',
+      'name'             => $session_cookie_name,
       'use_cookies'      => 1,
       'use_only_cookies' => 1,
       'use_strict_mode'  => 1,
diff --git a/www/modules/civicrm/CRM/Utils/System/UnitTests.php b/www/modules/civicrm/CRM/Utils/System/UnitTests.php
index adc3ca9bf..2f5afc677 100644
--- a/www/modules/civicrm/CRM/Utils/System/UnitTests.php
+++ b/www/modules/civicrm/CRM/Utils/System/UnitTests.php
@@ -45,6 +45,19 @@ public function isLoaded(): bool {
     return TRUE;
   }
 
+  /**
+   * Send an HTTP Response base on PSR HTTP RespnseInterface response.
+   *
+   * @param \Psr\Http\Message\ResponseInterface $response
+   */
+  public function sendResponse(\Psr\Http\Message\ResponseInterface $response) {
+    // We'll if the simple version passes. If not, then we might need to enable `setHttpHeader()`.
+    // foreach ($response->getHeaders() as $name => $values) {
+    //   CRM_Utils_System::setHttpHeader($name, implode(', ', (array) $values));
+    // }
+    CRM_Utils_System::civiExit(0, ['response' => $response]);
+  }
+
   /**
    * @param string $name
    * @param string $value
@@ -68,6 +81,11 @@ public function loadBootStrap($params = [], $loadUser = TRUE, $throwError = TRUE
     return TRUE;
   }
 
+  public function cmsRootPath() {
+    // There's no particularly sensible value here. We just want to avoid crashes in some tests.
+    return sys_get_temp_dir() . '/UnitTests';
+  }
+
   /**
    * @inheritdoc
    */
@@ -187,4 +205,12 @@ public function getLoginURL($destination = '') {
     throw new Exception("Method not implemented: getLoginURL");
   }
 
+  /**
+   * @inheritdoc
+   */
+  public function mailingWorkflowIsEnabled():bool {
+    $enableWorkflow = Civi::settings()->get('civimail_workflow');
+    return (bool) $enableWorkflow;
+  }
+
 }
diff --git a/www/modules/civicrm/CRM/Utils/System/WordPress.php b/www/modules/civicrm/CRM/Utils/System/WordPress.php
index 65e55e0d5..a74e338c8 100644
--- a/www/modules/civicrm/CRM/Utils/System/WordPress.php
+++ b/www/modules/civicrm/CRM/Utils/System/WordPress.php
@@ -248,8 +248,7 @@ public function appendBreadCrumb($breadCrumbs) {
       }
     }
 
-    $template = CRM_Core_Smarty::singleton();
-    $template->assign_by_ref('breadcrumb', $breadCrumb);
+    CRM_Core_Smarty::singleton()->assign('breadcrumb', $breadCrumb);
     wp_set_breadcrumb($breadCrumb);
   }
 
@@ -349,7 +348,7 @@ public function url(
     /**
      * Filter the Base URL.
      *
-     * @since 5.66
+     * @since 5.67
      *
      * @param str $base The Base URL.
      * @param bool $admin_request True if building an admin URL, false otherwise.
@@ -650,7 +649,7 @@ public function getUFLocale() {
        *
        * The CiviCRM-WordPress plugin supports Polylang and WPML via this filter.
        *
-       * @since 5.66
+       * @since 5.67
        *
        * @param str $locale The WordPress locale.
        */
@@ -860,8 +859,11 @@ public function createUser(&$params, $mailParam) {
       'role' => get_option('default_role'),
     ];
 
-    // The notify parameter was ignored on WordPress and default behaviour was to always notify.
-    // Preserve that behaviour but allow the "notify" parameter to be used.
+    /*
+     * The notify parameter was ignored on WordPress and default behaviour
+     * was to always notify. Preserve that behaviour but allow the "notify"
+     * parameter to be used.
+     */
     if (!isset($params['notify'])) {
       $params['notify'] = TRUE;
     }
@@ -898,46 +900,71 @@ public function createUser(&$params, $mailParam) {
     }
 
     /**
-     * Broadcast that CiviCRM is about to create a WordPress User.
+     * Fires when CiviCRM is about to create a WordPress User.
      *
      * @since 5.37
+     * @since 5.71 Added $params, $mailParam and $user_data.
+     *
+     * @param array $params The array of source Contact data.
+     * @param string $mailParam The name of the param which contains the email address.
+     * @param array $user_data The array of data to create the WordPress User with.
      */
-    do_action('civicrm_pre_create_user');
+    do_action('civicrm_pre_create_user', $params, $mailParam, $user_data);
 
     // Remove the CiviCRM-WordPress listeners.
     $this->hooks_core_remove();
 
+    // User is not logged in by default.
+    $logged_in = FALSE;
+
     // Now go ahead and create a WordPress User.
     $uid = wp_insert_user($user_data);
+    if (is_wp_error($uid)) {
+      Civi::log()->error("Could not create the user. WordPress returned: " . $uid->get_error_message());
+    }
+    else {
 
-    /*
-     * Call wp_signon if we aren't already logged in.
-     * For example, we might be creating a new user from the Contact record.
-     */
-    if (!current_user_can('create_users')) {
-      $creds = [];
-      $creds['user_login'] = $params['cms_name'];
-      $creds['user_password'] = $user_data['user_pass'];
-      $creds['remember'] = TRUE;
+      /*
+       * Call wp_signon if we aren't already logged in.
+       * For example, we might be creating a new user from the Contact record.
+       */
+      if (!current_user_can('create_users')) {
+        $creds = [];
+        $creds['user_login'] = $params['cms_name'];
+        $creds['user_password'] = $user_data['user_pass'];
+        $creds['remember'] = TRUE;
+
+        // Authenticate and log the user in.
+        $user = wp_signon($creds, FALSE);
+        if (is_wp_error($user)) {
+          Civi::log()->error("Could not log the user in. WordPress returned: " . $user->get_error_message());
+        }
+        else {
+          $logged_in = TRUE;
+        }
+      }
 
-      // @todo handle a wp_signon failure
-      wp_signon($creds, FALSE);
-    }
+      if ($params['notify']) {
+        // Fire the new user action. Sends notification email by default.
+        do_action('register_new_user', $uid);
+      }
 
-    if ($params['notify']) {
-      // Fire the new user action. Sends notification email by default.
-      do_action('register_new_user', $uid);
     }
 
     // Restore the CiviCRM-WordPress listeners.
     $this->hooks_core_add();
 
     /**
-     * Broadcast that CiviCRM has creates a WordPress User.
+     * Fires after CiviCRM has tried to create a WordPress User.
      *
      * @since 5.37
+     * @since 5.71 Added $uid and $params.
+     *
+     * @param int|WP_Error $uid The ID of the new WordPress User, or WP_Error on failure.
+     * @param array $params The array of source Contact data.
+     * @param bool $logged_in TRUE when the User has been auto-logged-in, FALSE otherwise.
      */
-    do_action('civicrm_post_create_user');
+    do_action('civicrm_post_create_user', $uid, $params, $logged_in);
 
     return $uid;
   }
diff --git a/www/modules/civicrm/CRM/Utils/Time.php b/www/modules/civicrm/CRM/Utils/Time.php
index dab77826d..419664fbf 100644
--- a/www/modules/civicrm/CRM/Utils/Time.php
+++ b/www/modules/civicrm/CRM/Utils/Time.php
@@ -126,7 +126,7 @@ public static function getTimeRaw() {
    * @return string
    */
   public static function setTime($newDateTime, $returnFormat = 'YmdHis') {
-    $mode = getenv('TIME_FUNC') ? getenv('TIME_FUNC') : 'natural';
+    $mode = getenv('TIME_FUNC') ?: 'natural';
 
     list ($modeName, $modeNum) = explode(":", "$mode:");
 
diff --git a/www/modules/civicrm/CRM/Utils/Token.php b/www/modules/civicrm/CRM/Utils/Token.php
index 050882216..7a47f74f2 100644
--- a/www/modules/civicrm/CRM/Utils/Token.php
+++ b/www/modules/civicrm/CRM/Utils/Token.php
@@ -713,26 +713,6 @@ public static function getTokenCategories(): array {
     return \Civi::$statics[__CLASS__]['token_categories'];
   }
 
-  /**
-   * Parse html through Smarty resolving any smarty functions.
-   * @param string $tokenHtml
-   * @param array $entity
-   * @param string $entityType
-   * @return string
-   *   html parsed through smarty
-   * @deprecated
-   */
-  public static function parseThroughSmarty($tokenHtml, $entity, $entityType = 'contact') {
-    CRM_Core_Error::deprecatedFunctionWarning('no replacement');
-    if (defined('CIVICRM_MAIL_SMARTY') && CIVICRM_MAIL_SMARTY) {
-      $smarty = CRM_Core_Smarty::singleton();
-      // also add the tokens to the template
-      $smarty->assign_by_ref($entityType, $entity);
-      $tokenHtml = $smarty->fetch("string:$tokenHtml");
-    }
-    return $tokenHtml;
-  }
-
   /**
    * Do not use, unused in core.
    *
@@ -831,23 +811,16 @@ public static function &replaceUnsubscribeTokens(
    *
    * @param string $str
    *   The string with tokens to be replaced.
-   * @param object $domain
+   * @param null $youHaveBeenRickRolled
    *   The domain BAO.
    * @param array $groups
    *   The groups (if any) being resubscribed.
-   * @param bool $html
-   *   Replace tokens with html or plain text.
-   * @param int $contact_id
-   *   The contact ID.
-   * @param string $hash The security hash of the resub event
    *
    * @return string
    *   The processed string
    */
-  public static function &replaceResubscribeTokens(
-    $str, &$domain, &$groups, $html,
-    $contact_id, $hash
-  ) {
+  public static function replaceResubscribeTokens(
+    $str, $youHaveBeenRickRolled, $groups) {
     if (self::token_match('resubscribe', 'group', $str)) {
       if (!empty($groups)) {
         $value = implode(', ', $groups);
@@ -1183,6 +1156,7 @@ public static function getAnonymousTokenDetails($contactIDs = [0],
                                            $className = NULL,
                                            $jobID = NULL) {
     $details = [0 => []];
+    CRM_Core_Error::deprecatedFunctionWarning('function no longer used - see flexmailer');
     // also call a hook and get token details
     CRM_Utils_Hook::tokenValues($details[0],
       $contactIDs,
@@ -1754,23 +1728,23 @@ public static function getTokenDeprecations(): array {
       'WorkFlowMessageTemplates' => [
         'contribution_invoice_receipt' => [
           '$display_name' => 'contact.display_name',
-          '$dataArray' => ts('found within $taxBreakDown'),
+          '$dataArray' => ts('see default template for how to show this'),
         ],
         'contribution_online_receipt' => [
           '$contributeMode' => ts('no longer available / relevant'),
           '$first_name' => 'contact.first_name',
           '$last_name' => 'contact.last_name',
           '$displayName' => 'contact.display_name',
-          '$dataArray' => ts('found within $taxBreakDown'),
+          '$dataArray' => ts('see default template for how to show this'),
         ],
         'membership_offline_receipt' => [
           // receipt_text_renewal appears to be long gone.
           'receipt_text_renewal' => 'receipt_text',
           '$isAmountZero' => ts('no longer available / relevant'),
-          '$dataArray' => ts('found within $taxBreakDown'),
+          '$dataArray' => ts('see default template for how to show this'),
         ],
         'membership_online_receipt' => [
-          '$dataArray' => ts('found within $taxBreakDown'),
+          '$dataArray' => ts('see default template for how to show this'),
           '$mem_start_date' => 'membership.start_date',
           '$mem_end_date' => 'membership.end_date',
           '$mem_join_date' => 'membership.join_date',
@@ -1778,10 +1752,10 @@ public static function getTokenDeprecations(): array {
         'event_offline_receipt' => [
           '$contributeMode' => ts('no longer available / relevant'),
           '$isAmountZero' => ts('no longer available / relevant'),
-          '$dataArray' => ts('found within $participants'),
+          '$dataArray' => ts('see default template for how to show this'),
           '$paidBy' => 'contribution.payment_instrument_id:label',
           '$totalTaxAmount' => 'contribution.tax_amount',
-          '$amount' => ts('found within $participants'),
+          '$amount' => ts('see default template for how to show this'),
           '$checkNumber' => 'contribution.check_number',
           '$module' => ts('no longer available / relevant'),
           '$register_date' => 'participant.register_date',
@@ -1791,7 +1765,7 @@ public static function getTokenDeprecations(): array {
           '$location' => 'event.location',
           '$isShowLocation' => 'event.is_show_location|boolean',
           '$event.participant_role' => 'participant.role_id:label',
-          '$amount_level' => ts('found within $participants'),
+          '$amount_level' => ts('see default template for how to show this'),
           'balanceAmount' => 'contribution.balance_amount',
           '$financialTypeName' => 'contribution.financial_type_id:label',
           '$contributionTypeName' => 'contribution.financial_type_id:label',
@@ -1801,7 +1775,8 @@ public static function getTokenDeprecations(): array {
         ],
         'event_online_receipt' => [
           '`$participant.id`' => 'participant.id',
-          '$dataArray' => ts('found within $taxBreakDown'),
+          '$dataArray' => ts('see default template for how to show this'),
+          '$individual' => ts('see default template for how to show this'),
         ],
         'pledge_acknowledgement' => [
           '$domain' => ts('no longer available / relevant'),
diff --git a/www/modules/civicrm/CRM/Utils/Url.php b/www/modules/civicrm/CRM/Utils/Url.php
index d30d3003e..6c470a3a3 100644
--- a/www/modules/civicrm/CRM/Utils/Url.php
+++ b/www/modules/civicrm/CRM/Utils/Url.php
@@ -43,6 +43,8 @@ public static function unparseUrl(UriInterface $parsed) {
    * @param string|null $currentHostPort
    *   The value of HTTP_HOST. (NULL means "lookup HTTP_HOST")
    * @return string
+   *   Either the relative version of $value (if on the same HTTP_HOST), or else
+   *   the absolute version.
    */
   public static function toRelative(string $value, ?string $currentHostPort = NULL): string {
     $currentHostPort = $currentHostPort ?: $_SERVER['HTTP_HOST'] ?? NULL;
@@ -56,4 +58,85 @@ public static function toRelative(string $value, ?string $currentHostPort = NULL
     return $value;
   }
 
+  /**
+   * Parse an internal URL. Extract the CiviCRM route.
+   *
+   * @param string $pageUrl
+   *   Ex: 'https://example.com/cms/civicrm/foo?id=1'
+   * @param string|null $cmsRootUrl
+   * @return array
+   *   Ex: ['path' => 'civicrm/foo', 'query' => 'id=1']
+   *
+   *   Similar to parse_url(), this returns a key-value array.
+   *   Keys are: 'path', 'query', 'fragment', 'user', 'pass'
+   *   Keys are only returned if they have values. Unused elements are omitted.
+   *
+   *   Currently, this does not support detecting schemes (such as frontend or backend).
+   * @throws \CRM_Core_Exception
+   */
+  public static function parseInternalRoute(string $pageUrl, ?string $cmsRootUrl = NULL): array {
+    $cmsRootUrl ??= CIVICRM_UF_BASEURL;
+    $cmsRootUrl = rtrim($cmsRootUrl, '/');
+
+    $parsedRoot = parse_url($cmsRootUrl ?: Civi::paths()->getUrl('[cms.root]/.'));
+    $parsedPage = parse_url($pageUrl);
+
+    $result = [];
+
+    // The scheme and host don't really matter for output, but the inputted values should be normal.
+    if (!in_array($parsedPage['scheme'], ['http', 'https'])) {
+      throw new \CRM_Core_Exception("Failed to parse internal URL. Invalid scheme.");
+    }
+    $hosts = [$_SERVER['HTTP_HOST'] ?? NULL, $parsedRoot['host']];
+    if (!in_array($parsedPage['host'], $hosts)) {
+      throw new \CRM_Core_Exception("Failed to parse internal URL. Unrecognized host.");
+    }
+
+    foreach (['user', 'pass', 'fragment'] as $passthru) {
+      if (isset($parsedPage[$passthru])) {
+        $result[$passthru] = $parsedPage[$passthru];
+      }
+    }
+
+    if (isset($parsedPage['query'])) {
+      $urlVar = CRM_Core_Config::singleton()->userFrameworkURLVar;
+      parse_str($parsedPage['query'] ?? '', $queryParts);
+      unset($parsedPage['query']);
+      if (isset($queryParts[$urlVar])) {
+        $result['path'] = $queryParts[$urlVar];
+        unset($queryParts[$urlVar]);
+      }
+      if (!empty($queryParts)) {
+        $result['query'] = http_build_query($queryParts);
+      }
+    }
+
+    if (!isset($result['path']) && str_starts_with($parsedPage['path'], $parsedRoot['path'] ?? '')) {
+      $result['path'] = substr($parsedPage['path'], 1 + strlen($parsedRoot['path'] ?? ''));
+    }
+
+    if (str_starts_with($result['path'] ?? '', 'civicrm/')) {
+      return $result;
+    }
+    else {
+      throw new CRM_Core_Exception('Failed to parse internal URL. Malformed path.');
+    }
+
+  }
+
+  /**
+   * Determine if $child is a descendent of $parent.
+   *
+   * Relative URLs mean that multiple strings may not
+   *
+   * @param string|\Psr\Http\Message\UriInterface|\Civi\Core\Url $child
+   * @param string|\Psr\Http\Message\UriInterface|\Civi\Core\Url $parent
+   * @return bool
+   */
+  public static function isChildOf($child, $parent): bool {
+    $childRel = static::toRelative((string) $child);
+    $parentRel = static::toRelative((string) $parent);
+    return str_starts_with($childRel, $parentRel);
+  }
+
 }
diff --git a/www/modules/civicrm/Civi.php b/www/modules/civicrm/Civi.php
index 7c8684554..b635bd8b0 100644
--- a/www/modules/civicrm/Civi.php
+++ b/www/modules/civicrm/Civi.php
@@ -303,4 +303,29 @@ public static function url(?string $logicalUri = NULL, ?string $flags = NULL): \
     return new \Civi\Core\Url($logicalUri, $flags);
   }
 
+  /**
+   * Get the canonical entityProvider for a given entity type.
+   *
+   * @param string $entityName
+   * @return \Civi\Schema\EntityProvider
+   */
+  public static function entity(string $entityName): \Civi\Schema\EntityProvider {
+    return new \Civi\Schema\EntityProvider($entityName);
+  }
+
+  /**
+   * Get the schema-helper for CiviCRM (core-core).
+   *
+   * @param string $key
+   *   Ex: 'civicrm' or 'org.example.myextension'
+   * @return \CiviMix\Schema\SchemaHelperInterface
+   */
+  public static function schemaHelper(string $key = 'civicrm'): \CiviMix\Schema\SchemaHelperInterface {
+    if (!isset(Civi::$statics['schemaHelper'])) {
+      pathload()->loadPackage('civimix-schema@5');
+      Civi::$statics['schemaHelper'] = TRUE;
+    }
+    return $GLOBALS['CiviMixSchema']->getHelper($key);
+  }
+
 }
diff --git a/www/modules/civicrm/Civi/API/Kernel.php b/www/modules/civicrm/Civi/API/Kernel.php
index 97a9f35ca..a8588c73e 100644
--- a/www/modules/civicrm/Civi/API/Kernel.php
+++ b/www/modules/civicrm/Civi/API/Kernel.php
@@ -227,7 +227,7 @@ public function authorize($apiProvider, $apiRequest) {
     /** @var \Civi\API\Event\AuthorizeEvent $event */
     $event = $this->dispatcher->dispatch('civi.api.authorize', new AuthorizeEvent($apiProvider, $apiRequest, $this, \CRM_Core_Session::getLoggedInContactID() ?: 0));
     if (!$event->isAuthorized()) {
-      throw new \Civi\API\Exception\UnauthorizedException("Authorization failed");
+      throw new \Civi\API\Exception\UnauthorizedException("Authorization failed: CiviCRM APIv{$apiRequest['version']} ({$apiRequest['entity']}::{$apiRequest['action']})");
     }
   }
 
diff --git a/www/modules/civicrm/Civi/API/SelectQuery.php b/www/modules/civicrm/Civi/API/SelectQuery.php
index b384a0e62..25031706d 100644
--- a/www/modules/civicrm/Civi/API/SelectQuery.php
+++ b/www/modules/civicrm/Civi/API/SelectQuery.php
@@ -267,7 +267,7 @@ protected function getJoinInfo(&$fkField, $stack) {
       $entityTable = $this->where[$entityTableParam] ?? NULL;
       if ($entityTable && is_string($entityTable) && \CRM_Core_DAO_AllCoreTables::getClassForTable($entityTable)) {
         $fkField['FKClassName'] = \CRM_Core_DAO_AllCoreTables::getClassForTable($entityTable);
-        $fkField['FKApiName'] = \CRM_Core_DAO_AllCoreTables::getBriefName($fkField['FKClassName']);
+        $fkField['FKApiName'] = \CRM_Core_DAO_AllCoreTables::getEntityNameForClass($fkField['FKClassName']);
       }
     }
     if (!empty($fkField['pseudoconstant']['optionGroupName'])) {
diff --git a/www/modules/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php b/www/modules/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php
index 1a6a684f5..e6848d561 100644
--- a/www/modules/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php
+++ b/www/modules/civicrm/Civi/API/Subscriber/DynamicFKAuthorization.php
@@ -14,8 +14,13 @@
 use Civi\API\Events;
 use CRM_Core_DAO_AllCoreTables as AllCoreTables;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Civi\Api4\Utils\CoreUtil;
 
 /**
+ * This is only used by the APIv3 "Attachment" entity.
+ *
+ * @deprecated APIv3 only.
+ *
  * Given an entity which dynamically attaches itself to another entity,
  * determine if one has permission to the other entity.
  *
@@ -277,7 +282,7 @@ public function getDelegatedEntityName($entityTable) {
     if ($this->allowedDelegates === NULL || in_array($entityTable, $this->allowedDelegates)) {
       $className = \CRM_Core_DAO_AllCoreTables::getClassForTable($entityTable);
       if ($className) {
-        $entityName = \CRM_Core_DAO_AllCoreTables::getBriefName($className);
+        $entityName = \CRM_Core_DAO_AllCoreTables::getEntityNameForClass($className);
         if ($entityName) {
           return $entityName;
         }
@@ -362,7 +367,7 @@ public function getCustomFields() {
         'field_name' => $query->field_name,
         'table_name' => $query->table_name,
         'extends' => $query->extends,
-        'entity_table' => \CRM_Core_BAO_CustomGroup::getTableNameByEntityName($query->extends),
+        'entity_table' => CoreUtil::getTableName($query->extends),
       ];
     }
     return $rows;
diff --git a/www/modules/civicrm/Civi/ActionSchedule/MappingBase.php b/www/modules/civicrm/Civi/ActionSchedule/MappingBase.php
index 419f5c611..566990b87 100644
--- a/www/modules/civicrm/Civi/ActionSchedule/MappingBase.php
+++ b/www/modules/civicrm/Civi/ActionSchedule/MappingBase.php
@@ -11,6 +11,7 @@
 
 namespace Civi\ActionSchedule;
 
+use Civi\Api4\Service\Spec\RequestSpec;
 use Civi\Api4\Utils\CoreUtil;
 use Civi\Core\Service\AutoSubscriber;
 
@@ -101,10 +102,17 @@ public function sendToAdditional($entityId): bool {
     return TRUE;
   }
 
-  final public function applies(string $entity, string $action, array $values = []) {
+  abstract public function modifyApiSpec(RequestSpec $spec);
+
+  final public function modifySpec(RequestSpec $spec) {
+    if ($this->getId() == $spec->getValue('mapping_id')) {
+      $this->modifyApiSpec($spec);
+    }
+  }
+
+  final public function applies(string $entity, string $action): bool {
     return $entity === 'ActionSchedule' &&
-      in_array($action, ['create', 'get', 'update', 'save'], TRUE) &&
-      $this->getId() == ($values['mapping_id'] ?? NULL);
+      in_array($action, ['create', 'get', 'update', 'save'], TRUE);
   }
 
 }
diff --git a/www/modules/civicrm/Civi/Api4/Action/CustomValue/GetFields.php b/www/modules/civicrm/Civi/Api4/Action/CustomValue/GetFields.php
deleted file mode 100644
index 63ab5c3e7..000000000
--- a/www/modules/civicrm/Civi/Api4/Action/CustomValue/GetFields.php
+++ /dev/null
@@ -1,29 +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       |
- +--------------------------------------------------------------------+
- */
-
-namespace Civi\Api4\Action\CustomValue;
-
-/**
- * Get fields for a custom group.
- */
-class GetFields extends \Civi\Api4\Generic\DAOGetFieldsAction {
-  use \Civi\Api4\Generic\Traits\CustomValueActionTrait;
-
-  protected function getRecords() {
-    $fields = $this->_itemsToGet('name');
-    /** @var \Civi\Api4\Service\Spec\SpecGatherer $gatherer */
-    $gatherer = \Civi::container()->get('spec_gatherer');
-    $spec = $gatherer->getSpec('Custom_' . $this->getCustomGroup(), $this->getAction(), TRUE, $this->values);
-    return $this->specToArray($spec->getFields($fields));
-  }
-
-}
diff --git a/www/modules/civicrm/Civi/Api4/Action/GetLinks.php b/www/modules/civicrm/Civi/Api4/Action/GetLinks.php
index 5751ddb14..48f2986f0 100644
--- a/www/modules/civicrm/Civi/Api4/Action/GetLinks.php
+++ b/www/modules/civicrm/Civi/Api4/Action/GetLinks.php
@@ -101,6 +101,7 @@ private function fetchLinks(): array {
         'icon' => \CRM_Core_Action::getIcon($actionKey),
         'weight' => (int) \CRM_Core_Action::getWeight($actionKey),
         'target' => 'crm-popup',
+        'conditions' => [],
       ];
       $links[] = $link;
     }
@@ -114,6 +115,7 @@ private function fetchLinks(): array {
         'entity' => $entityName,
         'weight' => 0,
         'target' => 'crm-popup',
+        'conditions' => [],
       ];
     }
     usort($links, ['CRM_Utils_Sort', 'cmpFunc']);
@@ -225,6 +227,11 @@ public function fields() {
         'name' => 'target',
         'description' => 'HTML target attribute',
       ],
+      [
+        'name' => 'conditions',
+        'data_type' => 'Array',
+        'description' => 'Conditions for displaying link',
+      ],
     ];
   }
 
diff --git a/www/modules/civicrm/Civi/Api4/CustomValue.php b/www/modules/civicrm/Civi/Api4/CustomValue.php
index ca00583c9..d6e901f4e 100644
--- a/www/modules/civicrm/Civi/Api4/CustomValue.php
+++ b/www/modules/civicrm/Civi/Api4/CustomValue.php
@@ -33,7 +33,7 @@ class CustomValue {
    * @throws \API_Exception
    */
   public static function autocomplete(string $customGroup, $checkPermissions = TRUE) {
-    return (new \Civi\Api4\Generic\AutocompleteAction("Custom_$customGroup", __FUNCTION__))
+    return (new Generic\AutocompleteAction("Custom_$customGroup", __FUNCTION__))
       ->setCheckPermissions($checkPermissions);
   }
 
@@ -51,11 +51,11 @@ public static function get($customGroup, $checkPermissions = TRUE) {
   /**
    * @param string $customGroup
    * @param bool $checkPermissions
-   * @return Action\CustomValue\GetFields
+   * @return \Civi\Api4\Generic\DAOGetFieldsAction
    * @throws \CRM_Core_Exception
    */
   public static function getFields($customGroup = NULL, $checkPermissions = TRUE) {
-    return (new Action\CustomValue\GetFields($customGroup, __FUNCTION__))
+    return (new Generic\DAOGetFieldsAction("Custom_$customGroup", __FUNCTION__))
       ->setCheckPermissions($checkPermissions);
   }
 
@@ -65,7 +65,7 @@ public static function getFields($customGroup = NULL, $checkPermissions = TRUE)
    * @return \Civi\Api4\Action\GetLinks
    */
   public static function getLinks($customGroup = NULL, $checkPermissions = TRUE) {
-    return (new \Civi\Api4\Action\GetLinks("Custom_$customGroup", __FUNCTION__))
+    return (new Action\GetLinks("Custom_$customGroup", __FUNCTION__))
       ->setCheckPermissions($checkPermissions);
   }
 
diff --git a/www/modules/civicrm/Civi/Api4/Event/Subscriber/ValidateFieldsSubscriber.php b/www/modules/civicrm/Civi/Api4/Event/Subscriber/ValidateFieldsSubscriber.php
index 497bd92d6..67834cb3d 100644
--- a/www/modules/civicrm/Civi/Api4/Event/Subscriber/ValidateFieldsSubscriber.php
+++ b/www/modules/civicrm/Civi/Api4/Event/Subscriber/ValidateFieldsSubscriber.php
@@ -44,7 +44,7 @@ public function onApiPrepare(PrepareEvent $event) {
         $getParam = 'get' . ucfirst($param);
         $value = $apiRequest->$getParam();
         // Required fields
-        if (!empty($info['required']) && (!$value && $value !== 0 && $value !== '0')) {
+        if (!empty($info['required']) && ($value === NULL || $value === '' || $value === [] || $value === FALSE)) {
           throw new \CRM_Core_Exception('Parameter "' . $param . '" is required.');
         }
         if (!empty($info['type']) && !self::checkType($value, $info['type'])) {
@@ -87,6 +87,12 @@ public static function checkType($value, $types) {
           }
           break;
 
+        case 'float':
+          if (\CRM_Utils_Rule::numeric($value)) {
+            return TRUE;
+          }
+          break;
+
         case 'mixed':
           return TRUE;
 
diff --git a/www/modules/civicrm/Civi/Api4/ExampleData.php b/www/modules/civicrm/Civi/Api4/ExampleData.php
index c53f430b1..436374b2c 100644
--- a/www/modules/civicrm/Civi/Api4/ExampleData.php
+++ b/www/modules/civicrm/Civi/Api4/ExampleData.php
@@ -18,7 +18,7 @@
  * @since 5.43
  * @package Civi\Api4
  */
-class ExampleData extends \Civi\Api4\Generic\AbstractEntity {
+class ExampleData extends Generic\AbstractEntity {
 
   /**
    * @param bool $checkPermissions
diff --git a/www/modules/civicrm/Civi/Api4/Extension.php b/www/modules/civicrm/Civi/Api4/Extension.php
index b09290093..14b956736 100644
--- a/www/modules/civicrm/Civi/Api4/Extension.php
+++ b/www/modules/civicrm/Civi/Api4/Extension.php
@@ -75,6 +75,40 @@ public static function getFields($checkPermissions = TRUE) {
           'data_type' => 'Array',
           'description' => "Tags which characterize the extension's purpose or functionality",
         ],
+        [
+          'name' => 'path',
+          'description' => 'Absolute file path',
+        ],
+        [
+          'name' => 'releaseDate',
+          'description' => 'Release date',
+        ],
+        [
+          'name' => 'compatibility',
+          'description' => 'CiviCRM compatibility',
+        ],
+        [
+          'name' => 'develStage',
+          'description' => 'Development stage',
+        ],
+        [
+          'name' => 'urls',
+          'data_type' => 'Array',
+          'description' => 'URLs for extension page, documentation, licensing and support',
+        ],
+        [
+          'name' => 'authors',
+          'data_type' => 'Array',
+          'description' => 'Authors',
+        ],
+        [
+          'name' => 'license',
+          'description' => 'License',
+        ],
+        [
+          'name' => 'comments',
+          'description' => 'Comments',
+        ],
         [
           'name' => 'status',
           'description' => 'Extension enabled/disabled/uninstalled status',
diff --git a/www/modules/civicrm/Civi/Api4/Generic/AbstractAction.php b/www/modules/civicrm/Civi/Api4/Generic/AbstractAction.php
index ade0f637b..40ffa0d7c 100644
--- a/www/modules/civicrm/Civi/Api4/Generic/AbstractAction.php
+++ b/www/modules/civicrm/Civi/Api4/Generic/AbstractAction.php
@@ -561,7 +561,7 @@ public static function evaluateCondition($expr, $vars) {
       throw new \CRM_Core_Exception('Illegal character in expression');
     }
     $tpl = "{if $expr}1{else}0{/if}";
-    return (bool) trim(\CRM_Core_Smarty::singleton()->fetchWith('string:' . $tpl, $vars));
+    return (bool) trim(\CRM_Utils_String::parseOneOffStringThroughSmarty($tpl, $vars));
   }
 
   /**
diff --git a/www/modules/civicrm/Civi/Api4/Generic/AbstractEntity.php b/www/modules/civicrm/Civi/Api4/Generic/AbstractEntity.php
index bdcf97551..0b5cb4332 100644
--- a/www/modules/civicrm/Civi/Api4/Generic/AbstractEntity.php
+++ b/www/modules/civicrm/Civi/Api4/Generic/AbstractEntity.php
@@ -130,7 +130,7 @@ public static function __callStatic($action, $args) {
    * @return \CRM_Core_DAO|string|null
    */
   protected static function getDaoName(): ?string {
-    return \CRM_Core_DAO_AllCoreTables::getFullName(static::getEntityName());
+    return \CRM_Core_DAO_AllCoreTables::getDAONameForEntity(static::getEntityName());
   }
 
   /**
@@ -158,10 +158,10 @@ public static function getInfo() {
     if ($dao) {
       $info['paths'] = $dao::getEntityPaths();
       $info['primary_key'] = $dao::$_primaryKey;
-      $info['icon'] = $dao::$_icon;
-      $info['label_field'] = $dao::$_labelField;
+      $info['icon'] = $dao::getEntityIcon($entityName);
+      $info['label_field'] = $dao::getLabelField();
       $info['dao'] = $dao;
-      $info['table_name'] = $dao::$_tableName;
+      $info['table_name'] = $dao::getTableName();
       $info['icon_field'] = (array) ($dao::fields()['icon']['name'] ?? NULL);
       if (method_exists($dao, 'indices')) {
         foreach (\CRM_Utils_Array::findAll($dao::indices(FALSE), ['unique' => TRUE, 'localizable' => FALSE]) as $index) {
diff --git a/www/modules/civicrm/Civi/Api4/Generic/BasicGetFieldsAction.php b/www/modules/civicrm/Civi/Api4/Generic/BasicGetFieldsAction.php
index 0c38929f2..1691ea330 100644
--- a/www/modules/civicrm/Civi/Api4/Generic/BasicGetFieldsAction.php
+++ b/www/modules/civicrm/Civi/Api4/Generic/BasicGetFieldsAction.php
@@ -378,6 +378,12 @@ public function fields() {
         'name' => 'permission',
         'data_type' => 'Array',
       ],
+      [
+        'name' => 'usage',
+        'data_type' => 'Array',
+        'description' => 'Contexts in which field is used.',
+        'default_value' => [],
+      ],
       [
         'name' => 'output_formatters',
         'data_type' => 'Array',
diff --git a/www/modules/civicrm/Civi/Api4/Generic/DAOGetAction.php b/www/modules/civicrm/Civi/Api4/Generic/DAOGetAction.php
index b2620759a..b57326922 100644
--- a/www/modules/civicrm/Civi/Api4/Generic/DAOGetAction.php
+++ b/www/modules/civicrm/Civi/Api4/Generic/DAOGetAction.php
@@ -145,9 +145,13 @@ public function addWhere(string $fieldName, string $op, $value = NULL, bool $isE
 
   /**
    * @param string $entity
+   *   Name of api entity to join with
    * @param string|bool $type
+   *   Should be 'LEFT' or 'INNER' (bool preserved for legacy support)
    * @param string $bridge
+   *   Optional name of bridge entity. This can be omitted, as a 3rd argument to the function would be interpreted as the first condition.
    * @param array ...$conditions
+   *   One or more conditions, each condition is an array like ['field', '=', 'expr']
    * @return DAOGetAction
    */
   public function addJoin(string $entity, $type = 'LEFT', $bridge = NULL, ...$conditions): DAOGetAction {
diff --git a/www/modules/civicrm/Civi/Api4/Generic/DAOGetFieldsAction.php b/www/modules/civicrm/Civi/Api4/Generic/DAOGetFieldsAction.php
index 251724dc3..aea2fac03 100644
--- a/www/modules/civicrm/Civi/Api4/Generic/DAOGetFieldsAction.php
+++ b/www/modules/civicrm/Civi/Api4/Generic/DAOGetFieldsAction.php
@@ -28,7 +28,6 @@ class DAOGetFieldsAction extends BasicGetFieldsAction {
    */
   protected function getRecords() {
     $fieldsToGet = $this->_itemsToGet('name');
-    $typesToGet = $this->_itemsToGet('type');
     // Force-set values supplied by entity definition
     // e.g. if this is a ContactType pseudo-entity, set `contact_type` value which is used by the following:
     // @see \Civi\Api4\Service\Spec\Provider\ContactGetSpecProvider
@@ -39,19 +38,13 @@ protected function getRecords() {
     }
     /** @var \Civi\Api4\Service\Spec\SpecGatherer $gatherer */
     $gatherer = \Civi::container()->get('spec_gatherer');
-    $includeCustom = TRUE;
-    if ($typesToGet) {
-      $includeCustom = in_array('Custom', $typesToGet, TRUE);
-    }
-    elseif ($fieldsToGet) {
-      // Any fields name with a dot in it is either custom or an implicit join
-      $includeCustom = strpos(implode('', $fieldsToGet), '.') !== FALSE;
-    }
     $this->formatValues();
-    $spec = $gatherer->getSpec($this->getEntityName(), $this->getAction(), $includeCustom, $this->values, $this->checkPermissions);
-    $fields = $this->specToArray($spec->getFields($fieldsToGet));
+    $fields = $gatherer->getAllFields($this->getEntityName(), $this->getAction(), $this->values, $this->checkPermissions);
+    if ($this->loadOptions) {
+      $this->loadFieldOptions($fields, $fieldsToGet ?: array_keys($fields));
+    }
     foreach ($fieldsToGet ?? [] as $fieldName) {
-      if (empty($fields[$fieldName]) && strpos($fieldName, '.') !== FALSE) {
+      if (empty($fields[$fieldName]) && str_contains($fieldName, '.')) {
         $fkField = $this->getFkFieldSpec($fieldName, $fields);
         if ($fkField) {
           $fkField['name'] = $fieldName;
@@ -62,22 +55,12 @@ protected function getRecords() {
     return $fields;
   }
 
-  /**
-   * @param \Civi\Api4\Service\Spec\FieldSpec[] $fields
-   *
-   * @return array
-   */
-  protected function specToArray($fields) {
-    $fieldArray = [];
-
-    foreach ($fields as $field) {
-      if ($this->loadOptions) {
-        $field->getOptions($this->values, $this->loadOptions, $this->checkPermissions);
+  protected function loadFieldOptions(array &$fields, array $fieldsToGet) {
+    foreach ($fieldsToGet as $fieldName) {
+      if (!empty($fields[$fieldName]['options_callback'])) {
+        $fields[$fieldName]['options'] = $fields[$fieldName]['options_callback']($fields[$fieldName], $this->values, $this->loadOptions, $this->checkPermissions, $fields[$fieldName]['options_callback_params'] ?? NULL);
       }
-      $fieldArray[$field->getName()] = $field->toArray();
     }
-
-    return $fieldArray;
   }
 
   /**
@@ -117,7 +100,7 @@ private function formatValues() {
           [$fieldName, $suffix] = explode(':', $key);
           $context = FormattingUtil::$pseudoConstantContexts[$suffix] ?? NULL;
           // This only works for basic pseudoconstants like :name :label and :abbr. Skip others.
-          if ($context) {
+          if ($context && !isset($this->values[$fieldName])) {
             $baoName = CoreUtil::getBAOFromApiName($this->getEntityName());
             $options = $baoName::buildOptions($fieldName, $context) ?: [];
             $this->values[$fieldName] = FormattingUtil::replacePseudoconstant($options, $this->values[$key], TRUE);
diff --git a/www/modules/civicrm/Civi/Api4/Generic/Result.php b/www/modules/civicrm/Civi/Api4/Generic/Result.php
index f7998df3a..328425520 100644
--- a/www/modules/civicrm/Civi/Api4/Generic/Result.php
+++ b/www/modules/civicrm/Civi/Api4/Generic/Result.php
@@ -107,6 +107,8 @@ public function itemAt($index) {
    *
    * Drops any item from the results that does not contain the specified key
    *
+   * Unlike $this->rekey, this rewrites the row keys not the column keys.
+   *
    * @param string $key
    * @return $this
    * @throws \CRM_Core_Exception
@@ -156,7 +158,7 @@ public function count(): int {
    *
    * @return int
    */
-  public function countFetched() :int {
+  public function countFetched(): int {
     return parent::count();
   }
 
@@ -165,7 +167,7 @@ public function countFetched() :int {
    *
    * @return int
    */
-  public function countMatched() :int {
+  public function countMatched(): int {
     if (!isset($this->matchedCount)) {
       throw new \CRM_Core_Exception("countMatched can only be used if there was no limit set or if row_count was included in the select fields.");
     }
@@ -190,15 +192,32 @@ public function setCountMatched(int $c) {
    * @param $name
    * @return array
    */
-  public function column($name) {
+  public function column($name): array {
     return array_column($this->getArrayCopy(), $name, $this->indexedBy);
   }
 
+  /**
+   * Rewrite keys in each result according to a map or a callback function.
+   *
+   * Unlike $this->indexBy, this rewrites the column keys not the row keys.
+   *
+   * @param array|callable $map
+   *   Map of keys to convert e.g. `[old_key => new_key]`
+   *   Or a callback function like `fn($key, $value) => $newKey`
+   * @return $this
+   */
+  public function rekey($map) {
+    $callback = is_callable($map) ? $map : fn($key) => $map[$key] ?? $key;
+    foreach ($this as &$items) {
+      $items = \CRM_Utils_Array::rekey($items, $callback);
+    }
+    return $this;
+  }
+
   /**
    * @return array
    */
-  #[\ReturnTypeWillChange]
-  public function jsonSerialize() {
+  public function jsonSerialize(): array {
     return $this->getArrayCopy();
   }
 
diff --git a/www/modules/civicrm/Civi/Api4/Generic/Traits/DAOActionTrait.php b/www/modules/civicrm/Civi/Api4/Generic/Traits/DAOActionTrait.php
index 3a7d72c4e..32a70b621 100644
--- a/www/modules/civicrm/Civi/Api4/Generic/Traits/DAOActionTrait.php
+++ b/www/modules/civicrm/Civi/Api4/Generic/Traits/DAOActionTrait.php
@@ -12,7 +12,6 @@
 
 namespace Civi\Api4\Generic\Traits;
 
-use Civi\Api4\CustomField;
 use Civi\Api4\Utils\FormattingUtil;
 use Civi\Api4\Utils\CoreUtil;
 use Civi\Api4\Utils\ReflectionUtils;
@@ -258,14 +257,14 @@ protected function formatCustomParams(&$params, $entityId) {
         $value = '';
       }
 
-      if ($field['html_type'] === 'CheckBox') {
-        // this function should be part of a class
-        formatCheckBoxField($value, 'custom_' . $field['id'], $this->getEntityName());
+      // Uglify checkbox values for the sake of CustomField::formatCustomField()
+      if ($field['html_type'] === 'CheckBox' && is_array($value)) {
+        $value = array_fill_keys($value, TRUE);
       }
 
       // Match contact id to strings like "user_contact_id"
       // FIXME handle arrays for multi-value contact reference fields, etc.
-      if ($field['data_type'] === 'ContactReference' && is_string($value) && !is_numeric($value)) {
+      if (in_array($field['data_type'], ['ContactReference', 'EntityReference']) && is_string($value) && !is_numeric($value)) {
         // FIXME decouple from v3 API
         require_once 'api/v3/utils.php';
         $value = \_civicrm_api3_resolve_contactID($value);
@@ -278,7 +277,7 @@ protected function formatCustomParams(&$params, $entityId) {
         $field['id'],
         $customParams,
         $value,
-        $field['custom_group_id.extends'],
+        $field['extends'],
         // todo check when this is needed
         NULL,
         $entityId,
@@ -296,33 +295,30 @@ protected function formatCustomParams(&$params, $entityId) {
    *
    * @param string $fieldExpr
    *   Field identifier with possible suffix, e.g. MyCustomGroup.MyField1:label
-   * @return array{id: int, name: string, entity: string, suffix: string, html_type: string, data_type: string}|NULL
+   * @return array{id: int, name: string, entity: string, suffix: string, html_type: string, data_type: string, extends: string, table_name: string}|NULL
    */
-  protected function getCustomFieldInfo(string $fieldExpr) {
-    if (strpos($fieldExpr, '.') === FALSE) {
+  protected function getCustomFieldInfo(string $fieldExpr): ?array {
+    if (!str_contains($fieldExpr, '.')) {
       return NULL;
     }
     [$groupName, $fieldName] = explode('.', $fieldExpr);
     [$fieldName, $suffix] = array_pad(explode(':', $fieldName), 2, NULL);
-    $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', 'data_type', 'custom_group_id.extends', 'column_name', 'custom_group_id.table_name')
-        ->addWhere('custom_group_id.name', '=', $groupName)
-        ->execute()->indexBy('name');
-      foreach ($fields as $name => $field) {
-        $field['custom_field_id'] = $field['id'];
-        $field['table_name'] = $field['custom_group_id.table_name'];
-        unset($field['custom_group_id.table_name']);
-        $field['name'] = $groupName . '.' . $name;
-        $field['entity'] = \CRM_Core_BAO_CustomGroup::getEntityFromExtends($field['custom_group_id.extends']);
-        $info[$name] = $field;
+    foreach (\CRM_Core_BAO_CustomGroup::getAll() as $customGroup) {
+      if ($customGroup['name'] === $groupName) {
+        foreach ($customGroup['fields'] as $field) {
+          if ($field['name'] === $fieldName) {
+            $field['custom_field_id'] = $field['id'];
+            $field['table_name'] = $customGroup['table_name'];
+            $field['extends'] = $customGroup['extends'];
+            $field['name'] = "$groupName.$fieldName";
+            $field['entity'] = \CRM_Core_BAO_CustomGroup::getEntityFromExtends($customGroup['extends']);
+            $field['suffix'] = $suffix;
+            return $field;
+          }
+        }
       }
-      \Civi::cache('metadata')->set($cacheKey, $info);
     }
-    return isset($info[$fieldName]) ? ['suffix' => $suffix] + $info[$fieldName] : NULL;
+    return NULL;
   }
 
   /**
diff --git a/www/modules/civicrm/Civi/Api4/Generic/Traits/GroupAndHavingParamTrait.php b/www/modules/civicrm/Civi/Api4/Generic/Traits/GroupAndHavingParamTrait.php
index 73233c135..21b977bdf 100644
--- a/www/modules/civicrm/Civi/Api4/Generic/Traits/GroupAndHavingParamTrait.php
+++ b/www/modules/civicrm/Civi/Api4/Generic/Traits/GroupAndHavingParamTrait.php
@@ -52,14 +52,15 @@ public function addGroupBy(string $field) {
    * @param string $expr
    * @param string $op
    * @param mixed $value
+   * @param bool $isExpression
    * @return $this
    * @throws \CRM_Core_Exception
    */
-  public function addHaving(string $expr, string $op, $value = NULL) {
+  public function addHaving(string $expr, string $op, $value = NULL, bool $isExpression = FALSE) {
     if (!in_array($op, CoreUtil::getOperators())) {
       throw new \CRM_Core_Exception('Unsupported operator');
     }
-    $this->having[] = [$expr, $op, $value];
+    $this->having[] = [$expr, $op, $value, $isExpression];
     return $this;
   }
 
diff --git a/www/modules/civicrm/Civi/Api4/Generic/Traits/SavedSearchInspectorTrait.php b/www/modules/civicrm/Civi/Api4/Generic/Traits/SavedSearchInspectorTrait.php
index 3d25cf141..e69ead2b1 100644
--- a/www/modules/civicrm/Civi/Api4/Generic/Traits/SavedSearchInspectorTrait.php
+++ b/www/modules/civicrm/Civi/Api4/Generic/Traits/SavedSearchInspectorTrait.php
@@ -163,7 +163,7 @@ private function getQuery() {
    * @return array
    */
   private function getEntityFields() {
-    if (!isset($this->_searchEntityFields)) {
+    if (!isset($this->_searchEntityFields) && !empty($this->savedSearch['api_entity'])) {
       $this->_searchEntityFields = Request::create($this->savedSearch['api_entity'], 'get', $this->savedSearch['api_params'])
         ->entityFields();
     }
@@ -372,7 +372,7 @@ protected function getTokens(string $str): array {
   protected function checkPermissionToLoadSearch() {
     if (
       (is_array($this->savedSearch) || (isset($this->display) && is_array($this->display))) && $this->checkPermissions &&
-      !\CRM_Core_Permission::check([['administer CiviCRM data', 'administer search_kit']])
+      !\CRM_Core_Permission::check('administer search_kit')
     ) {
       throw new UnauthorizedException('Access denied');
     }
diff --git a/www/modules/civicrm/Civi/Api4/Permission.php b/www/modules/civicrm/Civi/Api4/Permission.php
index a8a270c09..dd27bac72 100644
--- a/www/modules/civicrm/Civi/Api4/Permission.php
+++ b/www/modules/civicrm/Civi/Api4/Permission.php
@@ -79,6 +79,12 @@ public static function getFields($checkPermissions = TRUE) {
           'default' => TRUE,
           'data_type' => 'Boolean',
         ],
+        [
+          'name' => 'implies',
+          'title' => 'Implies',
+          'description' => 'List of sub-permissions automatically granted by this one',
+          'data_type' => 'Array',
+        ],
       ];
     }))->setCheckPermissions($checkPermissions);
   }
diff --git a/www/modules/civicrm/Civi/Api4/Provider/ActionObjectProvider.php b/www/modules/civicrm/Civi/Api4/Provider/ActionObjectProvider.php
index bee1c4a27..337292e02 100644
--- a/www/modules/civicrm/Civi/Api4/Provider/ActionObjectProvider.php
+++ b/www/modules/civicrm/Civi/Api4/Provider/ActionObjectProvider.php
@@ -63,9 +63,7 @@ public function onApiResolve(ResolveEvent $event) {
    */
   public function invoke($action) {
     // Load result class based on @return annotation in the execute() method.
-    $reflection = new \ReflectionClass($action);
-    $doc = ReflectionUtils::getCodeDocs($reflection->getMethod('execute'), 'Method');
-    $resultClass = $doc['return'][0] ?? '\\Civi\\Api4\\Generic\\Result';
+    $resultClass = $this->getResultClass($action);
     $result = new $resultClass();
     $result->action = $action->getActionName();
     $result->entity = $action->getEntityName();
@@ -74,6 +72,16 @@ public function invoke($action) {
     return $result;
   }
 
+  private function getResultClass($action): string {
+    $actionClassName = get_class($action);
+    if (!isset(\Civi::$statics[__CLASS__][__FUNCTION__][$actionClassName])) {
+      $reflection = new \ReflectionClass($action);
+      $doc = ReflectionUtils::getCodeDocs($reflection->getMethod('execute'), 'Method');
+      \Civi::$statics[__CLASS__][__FUNCTION__][$actionClassName] = $doc['return'][0] ?? '\Civi\Api4\Generic\Result';
+    }
+    return \Civi::$statics[__CLASS__][__FUNCTION__][$actionClassName];
+  }
+
   /**
    * Run each chained action once per row
    *
diff --git a/www/modules/civicrm/Civi/Api4/Provider/CustomEntityProvider.php b/www/modules/civicrm/Civi/Api4/Provider/CustomEntityProvider.php
index 41f409715..965ba3406 100644
--- a/www/modules/civicrm/Civi/Api4/Provider/CustomEntityProvider.php
+++ b/www/modules/civicrm/Civi/Api4/Provider/CustomEntityProvider.php
@@ -37,37 +37,35 @@ public static function getSubscribedEvents() {
    */
   public static function addCustomEntities(GenericHookEvent $e) {
     $baseInfo = CustomValue::getInfo();
-    $select = \CRM_Utils_SQL_Select::from('civicrm_custom_group')
-      ->where('is_multiple = 1')
-      ->where('is_active = 1')
-      ->toSQL();
-    $group = \CRM_Core_DAO::executeQuery($select);
-    while ($group->fetch()) {
-      $entityName = 'Custom_' . $group->name;
-      $baseEntity = CRM_Core_BAO_CustomGroup::getEntityFromExtends($group->extends);
+    foreach (\CRM_Core_BAO_CustomGroup::getAll() as $customGroup) {
+      if (empty($customGroup['is_multiple']) || empty($customGroup['is_active'])) {
+        continue;
+      }
+      $entityName = 'Custom_' . $customGroup['name'];
+      $baseEntity = CRM_Core_BAO_CustomGroup::getEntityFromExtends($customGroup['extends']);
       // Lookup base entity info using DAO methods not CoreUtil to avoid early-bootstrap issues
-      $baseEntityDao = \CRM_Core_DAO_AllCoreTables::getFullName($baseEntity);
+      $baseEntityDao = \CRM_Core_DAO_AllCoreTables::getDAONameForEntity($baseEntity);
       $baseEntityTitle = $baseEntityDao ? $baseEntityDao::getEntityTitle(TRUE) : $baseEntity;
       $e->entities[$entityName] = [
         'name' => $entityName,
-        'title' => $group->title,
-        'title_plural' => $group->title,
-        'table_name' => $group->table_name,
-        'class_args' => [$group->name],
+        'title' => $customGroup['title'],
+        'title_plural' => $customGroup['title'],
+        'table_name' => $customGroup['table_name'],
+        'class_args' => [$customGroup['name']],
         'description' => ts('Custom group for %1', [1 => $baseEntityTitle]),
         'paths' => [
-          'view' => "civicrm/contact/view/cd?reset=1&gid={$group->id}&recId=[id]&multiRecordDisplay=single",
+          'view' => "civicrm/contact/view/cd?reset=1&gid={$customGroup['id']}&recId=[id]&multiRecordDisplay=single",
         ],
       ] + $baseInfo;
-      if (!empty($group->icon)) {
-        $e->entities[$entityName]['icon'] = $group->icon;
+      if (!empty($customGroup['icon'])) {
+        $e->entities[$entityName]['icon'] = $customGroup['icon'];
       }
-      if (!empty($group->help_pre)) {
-        $e->entities[$entityName]['comment'] = self::plainTextify($group->help_pre);
+      if (!empty($customGroup['help_pre'])) {
+        $e->entities[$entityName]['comment'] = self::plainTextify($customGroup['help_pre']);
       }
-      if (!empty($group->help_post)) {
+      if (!empty($customGroup['help_post'])) {
         $pre = empty($e->entities[$entityName]['comment']) ? '' : $e->entities[$entityName]['comment'] . "\n\n";
-        $e->entities[$entityName]['comment'] = $pre . self::plainTextify($group->help_post);
+        $e->entities[$entityName]['comment'] = $pre . self::plainTextify($customGroup['help_post']);
       }
     }
   }
diff --git a/www/modules/civicrm/Civi/Api4/Query/Api4Query.php b/www/modules/civicrm/Civi/Api4/Query/Api4Query.php
index 73f0e9eb6..3c23c5308 100644
--- a/www/modules/civicrm/Civi/Api4/Query/Api4Query.php
+++ b/www/modules/civicrm/Civi/Api4/Query/Api4Query.php
@@ -239,6 +239,7 @@ public function composeClause(array $clause, string $type, int $depth) {
     if (!in_array($operator, CoreUtil::getOperators(), TRUE)) {
       throw new \CRM_Core_Exception('Illegal operator');
     }
+    $fieldAlias = NULL;
 
     // For WHERE clause, expr must be the name of a field.
     if ($type === 'WHERE' && !$isExpression) {
@@ -263,7 +264,7 @@ public function composeClause(array $clause, string $type, int $depth) {
       if (isset($this->selectAliases[$expr])) {
         $fieldAlias = $expr;
         // Attempt to format if this is a real field
-        if (isset($this->apiFieldSpec[$expr])) {
+        if (isset($this->apiFieldSpec[$expr]) && !$isExpression) {
           $field = $this->getField($expr);
           FormattingUtil::formatInputValue($value, $expr, $field, $this->entityValues, $operator);
         }
@@ -273,7 +274,7 @@ public function composeClause(array $clause, string $type, int $depth) {
         $fieldAlias = array_search($expr, $this->selectAliases);
       }
       // If either the having or select field contains a pseudoconstant suffix, match and perform substitution
-      else {
+      elseif (!$isExpression) {
         [$fieldName] = explode(':', $expr);
         foreach ($this->selectAliases as $selectAlias => $selectExpr) {
           [$selectField] = explode(':', $selectAlias);
@@ -294,6 +295,13 @@ public function composeClause(array $clause, string $type, int $depth) {
         }
       }
       $fieldAlias = '`' . $fieldAlias . '`';
+      if ($isExpression) {
+        $targetField = isset($this->selectAliases[$value]) ? $value : array_search($value, $this->selectAliases);
+        if (!$targetField) {
+          throw new \CRM_Core_Exception("Invalid expression in HAVING clause: '$value'. Must use a value from SELECT clause.");
+        }
+        return sprintf('%s %s `%s`', $fieldAlias, $operator, $targetField);
+      }
     }
     elseif ($type === 'ON' || ($type === 'WHERE' && $isExpression)) {
       $expr = $this->getExpression($expr);
@@ -351,6 +359,8 @@ protected function createSQLClause($fieldAlias, $operator, $value, $field, int $
       return $sql ? implode(' AND ', $sql) : NULL;
     }
 
+    $original_operator = $operator;
+
     // The CONTAINS and NOT CONTAINS operators match a substring for strings.
     // For arrays & serialized fields, they only match a complete (not partial) string within the array.
     if ($operator === 'CONTAINS' || $operator === 'NOT CONTAINS') {
@@ -403,10 +413,6 @@ protected function createSQLClause($fieldAlias, $operator, $value, $field, int $
       }
     }
 
-    if ($operator == 'REGEXP' || $operator == 'NOT REGEXP' || $operator == 'REGEXP BINARY' || $operator == 'NOT REGEXP BINARY') {
-      return sprintf('%s %s "%s"', (str_ends_with($operator, 'BINARY') ? 'CAST(' . $fieldAlias . ' AS BINARY)' : $fieldAlias), $operator, \CRM_Core_DAO::escapeString($value));
-    }
-
     if (!$value && ($operator === 'IN' || $operator === 'NOT IN')) {
       $value[] = FALSE;
     }
@@ -415,7 +421,19 @@ protected function createSQLClause($fieldAlias, $operator, $value, $field, int $
       $value = (int) $value;
     }
 
-    return \CRM_Core_DAO::createSQLFilter($fieldAlias, [$operator => $value]);
+    if ($operator == 'REGEXP' || $operator == 'NOT REGEXP' || $operator == 'REGEXP BINARY' || $operator == 'NOT REGEXP BINARY') {
+      $sqlClause = sprintf('%s %s "%s"', (str_ends_with($operator, 'BINARY') ? 'CAST(' . $fieldAlias . ' AS BINARY)' : $fieldAlias), $operator, \CRM_Core_DAO::escapeString($value));
+    }
+    else {
+      $sqlClause = \CRM_Core_DAO::createSQLFilter($fieldAlias, [$operator => $value]);
+    }
+
+    if ($original_operator === "NOT CONTAINS") {
+      // For a "NOT CONTAINS", this adds an "OR IS NULL" clause - we want to know that a particular value is not present and don't care whether it has any other value
+      return "(($sqlClause) OR $fieldAlias IS NULL)";
+    }
+
+    return $sqlClause;
   }
 
   /**
@@ -475,17 +493,24 @@ public function getOffset() {
   }
 
   /**
-   * @return \CRM_Utils_SQL_Select
+   * @return bool|string
    */
-  public function getQuery() {
-    return $this->query;
+  public function getCheckPermissions() {
+    return $this->api->getCheckPermissions();
   }
 
   /**
-   * @return bool|string
+   * @return mixed
    */
-  public function getCheckPermissions() {
-    return $this->api->getCheckPermissions();
+  public function getApiParam($param) {
+    return call_user_func([$this->api, 'get' . ucfirst($param)]);
+  }
+
+  /**
+   * @return \CRM_Utils_SQL_Select
+   */
+  public function getQuery() {
+    return $this->query;
   }
 
   /**
diff --git a/www/modules/civicrm/Civi/Api4/Query/Api4SelectQuery.php b/www/modules/civicrm/Civi/Api4/Query/Api4SelectQuery.php
index d6681de88..620269560 100644
--- a/www/modules/civicrm/Civi/Api4/Query/Api4SelectQuery.php
+++ b/www/modules/civicrm/Civi/Api4/Query/Api4SelectQuery.php
@@ -611,12 +611,19 @@ protected function addBridgeJoin($joinTree, $joinEntity, $alias) {
     // Used to dedupe acl clauses
     $aclStack = [NULL, NULL];
 
-    $linkConditions = $this->getBridgeLinkConditions($bridgeAlias, $alias, $joinTable, $joinRef);
+    $linkConditions = $this->getBridgeLinkConditions($bridgeAlias, $alias, $joinEntity, $joinRef);
 
     $bridgeConditions = $this->getBridgeJoinConditions($joinTree, $baseRef, $alias, $bridgeAlias, $bridgeEntity, $aclStack);
 
     $acls = array_values($this->getAclClause($alias, $joinEntity, $aclStack));
 
+    // Info needed to attach custom fields to the bridge entity instead of the base entity
+    // because the custom fields are joined first and the base entity might not be added yet.
+    // @see Joinable::getConditionsForJoin
+    $this->openJoin['bridgeAlias'] = $bridgeAlias;
+    $this->openJoin['bridgeKey'] = $joinRef->getReferenceKey();
+    $this->openJoin['bridgeCondition'] = array_intersect_key($linkConditions, [1 => 1]);
+
     $outerConditions = [];
     foreach (array_filter($joinTree) as $clause) {
       $outerConditions[] = $this->treeWalkClauses($clause, 'ON');
@@ -624,7 +631,7 @@ protected function addBridgeJoin($joinTree, $joinEntity, $alias) {
 
     // Info needed for joining custom fields extending the bridge entity
     $this->explicitJoins[$alias]['bridge_table_alias'] = $bridgeAlias;
-    // Invert the join
+    // Invert the join so all nested joins will link to the bridge entity
     $this->openJoin['table'] = $bridgeTable;
     $this->openJoin['alias'] = $bridgeAlias;
 
@@ -672,17 +679,18 @@ private function getBridgeRefs(string $bridgeEntity, string $joinEntity): array
    *
    * @param string $bridgeAlias
    * @param string $joinAlias
-   * @param string $joinTable
-   * @param $joinRef
+   * @param string $joinEntity
+   * @param \CRM_Core_Reference_Basic $joinRef
    * @return array
    */
-  private function getBridgeLinkConditions(string $bridgeAlias, string $joinAlias, string $joinTable, $joinRef): array {
+  private function getBridgeLinkConditions(string $bridgeAlias, string $joinAlias, string $joinEntity, \CRM_Core_Reference_Basic $joinRef): array {
     $linkConditions = [
       "`$bridgeAlias`.`{$joinRef->getReferenceKey()}` = `$joinAlias`.`{$joinRef->getTargetKey()}`",
     ];
     // For dynamic references, also add the type column (e.g. `entity_table`)
     if ($joinRef->getTypeColumn()) {
-      $linkConditions[] = "`$bridgeAlias`.`{$joinRef->getTypeColumn()}` = '$joinTable'";
+      $dfkOption = array_search($joinEntity, $joinRef->getTargetEntities());
+      $linkConditions[] = "`$bridgeAlias`.`{$joinRef->getTypeColumn()}` = '$dfkOption'";
     }
     return $linkConditions;
   }
@@ -715,7 +723,7 @@ private function registerBridgeJoinFields($bridgeEntity, $joinRef, $baseRef, str
    * Extract bridge join conditions from the joinTree if any, else supply default conditions for join to base entity
    *
    * @param array $joinTree
-   * @param $baseRef
+   * @param \CRM_Core_Reference_Basic $baseRef
    * @param string $alias
    * @param string $bridgeAlias
    * @param string $bridgeEntity
@@ -723,7 +731,7 @@ private function registerBridgeJoinFields($bridgeEntity, $joinRef, $baseRef, str
    * @return string[]
    * @throws \CRM_Core_Exception
    */
-  private function getBridgeJoinConditions(array &$joinTree, $baseRef, string $alias, string $bridgeAlias, string $bridgeEntity, array &$aclStack): array {
+  private function getBridgeJoinConditions(array &$joinTree, \CRM_Core_Reference_Basic $baseRef, string $alias, string $bridgeAlias, string $bridgeEntity, array &$aclStack): array {
     $bridgeConditions = [];
     // Find explicit bridge join conditions and move them out of the joinTree
     $joinTree = array_filter($joinTree, function ($clause) use ($baseRef, $alias, $bridgeAlias, &$bridgeConditions, &$aclStack) {
@@ -755,7 +763,8 @@ private function getBridgeJoinConditions(array &$joinTree, $baseRef, string $ali
       $bridgeConditions[] = "`$bridgeAlias`.`{$baseRef->getReferenceKey()}` = a.`{$baseRef->getTargetKey()}`";
       $aclStack = [$baseRef->getTargetKey()];
       if ($baseRef->getTypeColumn()) {
-        $bridgeConditions[] = "`$bridgeAlias`.`{$baseRef->getTypeColumn()}` = '" . $this->getFrom() . "'";
+        $dfkOption = array_search($this->getEntity(), $baseRef->getTargetEntities());
+        $bridgeConditions[] = "`$bridgeAlias`.`{$baseRef->getTypeColumn()}` = '$dfkOption'";
       }
     }
     return $bridgeConditions;
@@ -828,8 +837,8 @@ protected function autoJoinFK($key) {
         }
         if ($this->getCheckPermissions() && $isCustom) {
           // Check access to custom group
-          $groupId = \CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $link->getTargetTable(), 'id', 'table_name');
-          if (!\CRM_Core_BAO_CustomGroup::checkGroupAccess($groupId, \CRM_Core_Permission::VIEW)) {
+          $allowedGroup = \CRM_Core_BAO_CustomGroup::getGroup(['table_name' => $link->getTargetTable()], \CRM_Core_Permission::VIEW);
+          if (!$allowedGroup) {
             return;
           }
         }
@@ -845,8 +854,7 @@ protected function autoJoinFK($key) {
         }
 
         // Cache field info for retrieval by $this->getField()
-        foreach ($link->getEntityFields() as $fieldObject) {
-          $fieldArray = $fieldObject->toArray();
+        foreach ($link->getEntityFields() as $fieldArray) {
           // Set sql name of field, using column name for real joins
           if (!$virtualField) {
             $fieldArray['sql_name'] = '`' . $tableAlias . '`.`' . $fieldArray['column_name'] . '`';
@@ -865,7 +873,7 @@ protected function autoJoinFK($key) {
 
         // Serialized joins are rendered by this::renderSerializedJoin. Don't add their tables.
         if (!$virtualField) {
-          $conditions = $link->getConditionsForJoin($baseTableAlias, $tableAlias);
+          $conditions = $link->getConditionsForJoin($baseTableAlias, $tableAlias, $this->openJoin);
           if ($joinEntity) {
             $conditions = array_merge($conditions, $this->getAclClause($tableAlias, $joinEntity, $joinPath));
           }
diff --git a/www/modules/civicrm/Civi/Api4/Queue.php b/www/modules/civicrm/Civi/Api4/Queue.php
index bdfd2d0a3..e0b115150 100644
--- a/www/modules/civicrm/Civi/Api4/Queue.php
+++ b/www/modules/civicrm/Civi/Api4/Queue.php
@@ -24,7 +24,7 @@
  * @since 5.47
  * @package Civi\Api4
  */
-class Queue extends \Civi\Api4\Generic\DAOEntity {
+class Queue extends Generic\DAOEntity {
 
   use Generic\Traits\ManagedEntity;
 
diff --git a/www/modules/civicrm/Civi/Api4/Route.php b/www/modules/civicrm/Civi/Api4/Route.php
index ec735eb84..7fc509376 100644
--- a/www/modules/civicrm/Civi/Api4/Route.php
+++ b/www/modules/civicrm/Civi/Api4/Route.php
@@ -22,7 +22,7 @@
  * @since 5.19
  * @package Civi\Api4
  */
-class Route extends \Civi\Api4\Generic\AbstractEntity {
+class Route extends Generic\AbstractEntity {
 
   /**
    * @param bool $checkPermissions
diff --git a/www/modules/civicrm/Civi/Api4/Service/Autocomplete/PhoneAutocompleteProvider.php b/www/modules/civicrm/Civi/Api4/Service/Autocomplete/PhoneAutocompleteProvider.php
new file mode 100644
index 000000000..fe4f24db3
--- /dev/null
+++ b/www/modules/civicrm/Civi/Api4/Service/Autocomplete/PhoneAutocompleteProvider.php
@@ -0,0 +1,54 @@
+<?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\Service\Autocomplete;
+
+use Civi\Core\Event\GenericHookEvent;
+use Civi\Core\HookInterface;
+
+/**
+ * @service
+ * @internal
+ */
+class PhoneAutocompleteProvider extends \Civi\Core\Service\AutoService implements HookInterface {
+
+  /**
+   * Provide default SearchDisplay for Phone autocompletes
+   *
+   * @param \Civi\Core\Event\GenericHookEvent $e
+   */
+  public static function on_civi_search_defaultDisplay(GenericHookEvent $e) {
+    if ($e->display['settings'] || $e->display['type'] !== 'autocomplete' || $e->savedSearch['api_entity'] !== 'Phone') {
+      return;
+    }
+    $e->display['settings'] = [
+      'sort' => [
+        ['contact_id.sort_name', 'ASC'],
+        ['phone_numeric', 'ASC'],
+      ],
+      'columns' => [
+        [
+          'type' => 'field',
+          'key' => 'contact_id.sort_name',
+          'rewrite' => '[contact_id.sort_name]: [phone]',
+          'empty_value' => '[phone]',
+        ],
+        [
+          'type' => 'field',
+          'key' => 'location_type_id:label',
+          'rewrite' => '[location_type_id:label] ([phone_type_id:label])',
+        ],
+      ],
+    ];
+  }
+
+}
diff --git a/www/modules/civicrm/Civi/Api4/Service/Links/ActivityLinksProvider.php b/www/modules/civicrm/Civi/Api4/Service/Links/ActivityLinksProvider.php
index 22308db56..0450686e0 100644
--- a/www/modules/civicrm/Civi/Api4/Service/Links/ActivityLinksProvider.php
+++ b/www/modules/civicrm/Civi/Api4/Service/Links/ActivityLinksProvider.php
@@ -102,7 +102,7 @@ private static function getActivityTypeAddLinks($contactId, $checkPermissions):
         }
       }
       elseif ($act['name'] === 'SMS') {
-        if (!\CRM_SMS_BAO_Provider::activeProviderCount() ||
+        if (!\CRM_SMS_BAO_SmsProvider::activeProviderCount() ||
           ($checkPermissions && !\CRM_Core_Permission::check('send SMS'))
         ) {
           continue;
diff --git a/www/modules/civicrm/Civi/Api4/Service/Schema/Joinable/CustomGroupJoinable.php b/www/modules/civicrm/Civi/Api4/Service/Schema/Joinable/CustomGroupJoinable.php
index 1a10075f7..b2dd41ce7 100644
--- a/www/modules/civicrm/Civi/Api4/Service/Schema/Joinable/CustomGroupJoinable.php
+++ b/www/modules/civicrm/Civi/Api4/Service/Schema/Joinable/CustomGroupJoinable.php
@@ -12,9 +12,6 @@
 
 namespace Civi\Api4\Service\Schema\Joinable;
 
-use Civi\Api4\CustomField;
-use Civi\Api4\Utils\CoreUtil;
-
 class CustomGroupJoinable extends Joinable {
 
   /**
@@ -33,60 +30,22 @@ class CustomGroupJoinable extends Joinable {
    * @param $targetTable
    * @param $alias
    * @param bool $isMultiRecord
-   * @param string $columns
+   * @param string $entityName
    */
-  public function __construct($targetTable, $alias, $isMultiRecord, $columns) {
-    $this->columns = $columns;
+  public function __construct($targetTable, $alias, $isMultiRecord, $entityName) {
+    $this->entity = $entityName;
     parent::__construct($targetTable, 'entity_id', $alias);
     $this->joinType = $isMultiRecord ?
       self::JOIN_TYPE_ONE_TO_MANY : self::JOIN_TYPE_ONE_TO_ONE;
-    // Only multi-record groups are considered an api "entity"
-    if (!$isMultiRecord) {
-      $this->entity = NULL;
-    }
-  }
-
-  /**
-   * @inheritDoc
-   */
-  public function getEntityFields() {
-    $cacheKey = 'APIv4_CustomGroupJoinable-' . $this->getTargetTable();
-    $entityFields = (array) \Civi::cache('metadata')->get($cacheKey);
-    if (!$entityFields) {
-      $baseEntity = CoreUtil::getApiNameFromTableName($this->getBaseTable());
-      $fields = CustomField::get(FALSE)
-        ->setSelect(['custom_group_id.name', 'custom_group_id.extends', 'custom_group_id.table_name', 'custom_group_id.title', '*'])
-        ->addWhere('custom_group_id.table_name', '=', $this->getTargetTable())
-        ->execute();
-      foreach ($fields as $field) {
-        $entityFields[] = \Civi\Api4\Service\Spec\SpecFormatter::arrayToField($field, $baseEntity);
-      }
-      \Civi::cache('metadata')->set($cacheKey, $entityFields);
-    }
-    return $entityFields;
   }
 
   /**
-   * @inheritDoc
+   * @return string|null
    */
-  public function getField($fieldName) {
-    foreach ($this->getEntityFields() as $field) {
-      $name = $field->getName();
-      if ($name === $fieldName || strrpos($name, '.' . $fieldName) === strlen($name) - strlen($fieldName) - 1) {
-        return $field;
-      }
-    }
-    return NULL;
-  }
-
-  /**
-   * @return string
-   */
-  public function getSqlColumn($fieldName) {
-    if (strpos($fieldName, '.') !== FALSE) {
-      $fieldName = substr($fieldName, 1 + strrpos($fieldName, '.'));
-    }
-    return $this->columns[$fieldName];
+  public function getEntity() {
+    // Only multi-record groups are considered an api "entity"
+    $isMultiRecord = $this->joinType === self::JOIN_TYPE_ONE_TO_MANY;
+    return $isMultiRecord ? $this->entity : NULL;
   }
 
 }
diff --git a/www/modules/civicrm/Civi/Api4/Service/Schema/Joinable/ExtraJoinable.php b/www/modules/civicrm/Civi/Api4/Service/Schema/Joinable/ExtraJoinable.php
index bfd22006d..079ff55b8 100644
--- a/www/modules/civicrm/Civi/Api4/Service/Schema/Joinable/ExtraJoinable.php
+++ b/www/modules/civicrm/Civi/Api4/Service/Schema/Joinable/ExtraJoinable.php
@@ -22,10 +22,11 @@ class ExtraJoinable extends Joinable {
    *
    * @param string $baseTableAlias
    * @param string $targetTableAlias
+   * @param array|null $openJoin
    *
    * @return array
    */
-  public function getConditionsForJoin(string $baseTableAlias, string $targetTableAlias) {
+  public function getConditionsForJoin(string $baseTableAlias, string $targetTableAlias, ?array $openJoin) {
     $conditions = [];
     $this->addExtraJoinConditions($conditions, $baseTableAlias, $targetTableAlias);
     return $conditions;
diff --git a/www/modules/civicrm/Civi/Api4/Service/Schema/Joinable/Joinable.php b/www/modules/civicrm/Civi/Api4/Service/Schema/Joinable/Joinable.php
index 5005e4338..f425db039 100644
--- a/www/modules/civicrm/Civi/Api4/Service/Schema/Joinable/Joinable.php
+++ b/www/modules/civicrm/Civi/Api4/Service/Schema/Joinable/Joinable.php
@@ -99,16 +99,25 @@ public function __construct($targetTable, $targetColumn, $alias = NULL) {
    *
    * @param string $baseTableAlias
    * @param string $targetTableAlias
+   * @param array|null $openJoin
    *
    * @return array
    */
-  public function getConditionsForJoin(string $baseTableAlias, string $targetTableAlias) {
+  public function getConditionsForJoin(string $baseTableAlias, string $targetTableAlias, ?array $openJoin) {
     $conditions = [];
+    $baseColumn = $this->baseColumn;
+    // Joining within a bridge, use the bridge table key instead,
+    // because the custom fields are joined first and the base entity might not be added yet.
+    if (!empty($openJoin['bridgeKey']) && $baseTableAlias === $openJoin['alias']) {
+      $conditions = $openJoin['bridgeCondition'];
+      $baseTableAlias = $openJoin['bridgeAlias'];
+      $baseColumn = $openJoin['bridgeKey'];
+    }
     if ($this->baseColumn && $this->targetColumn) {
       $conditions[] = sprintf(
         '`%s`.`%s` =  `%s`.`%s`',
         $baseTableAlias,
-        $this->baseColumn,
+        $baseColumn,
         $targetTableAlias,
         $this->targetColumn
       );
@@ -302,40 +311,23 @@ public function toArray() {
     return get_object_vars($this);
   }
 
-  /**
-   * @return \Civi\Api4\Service\Spec\RequestSpec
-   */
-  public function getEntityFields() {
-    /** @var \Civi\Api4\Service\Spec\SpecGatherer $gatherer */
-    $gatherer = \Civi::container()->get('spec_gatherer');
-    $spec = $gatherer->getSpec($this->entity, 'get', FALSE);
-    // Serialized fields require a specialized join
-    if ($this->serialize) {
-      foreach ($spec as $field) {
-        // The callback function expects separated values as output
-        $field->setSerialize(\CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED);
-        $field->setSqlRenderer(['Civi\Api4\Query\Api4SelectQuery', 'renderSerializedJoin']);
+  public function getEntityFields(): array {
+    $entityFields = [];
+    if (!empty($this->entity)) {
+      $gatherer = \Civi::container()->get('spec_gatherer');
+      $allFields = $gatherer->getAllFields($this->entity, 'get');
+      foreach ($allFields as $field) {
+        if ($field['table_name'] === $this->targetTable) {
+          // Serialized fields require a specialized join
+          if ($this->serialize) {
+            $field['serialize'] = \CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED;
+            $field['sql_renderer'] = ['Civi\Api4\Query\Api4SelectQuery', 'renderSerializedJoin'];
+          }
+          $entityFields[] = $field;
+        }
       }
     }
-    return $spec;
-  }
-
-  /**
-   * @return array
-   */
-  public function getEntityFieldNames() {
-    $fieldNames = [];
-    foreach ($this->getEntityFields() as $fieldSpec) {
-      $fieldNames[] = $fieldSpec->getName();
-    }
-    return $fieldNames;
-  }
-
-  /**
-   * @return \Civi\Api4\Service\Spec\FieldSpec|NULL
-   */
-  public function getField($fieldName) {
-    return $this->getEntityFields()->getFieldByName($fieldName);
+    return $entityFields;
   }
 
 }
diff --git a/www/modules/civicrm/Civi/Api4/Service/Schema/SchemaMapBuilder.php b/www/modules/civicrm/Civi/Api4/Service/Schema/SchemaMapBuilder.php
index 49a1c2642..c328e61d8 100644
--- a/www/modules/civicrm/Civi/Api4/Service/Schema/SchemaMapBuilder.php
+++ b/www/modules/civicrm/Civi/Api4/Service/Schema/SchemaMapBuilder.php
@@ -64,14 +64,14 @@ public function build(): SchemaMap {
    */
   private function loadTables(SchemaMap $map) {
     /** @var \CRM_Core_DAO $daoName */
-    foreach (AllCoreTables::get() as $data) {
+    foreach (AllCoreTables::getEntities() as $name => $data) {
       $table = new Table($data['table']);
       foreach ($data['class']::fields() as $fieldData) {
         $this->addJoins($table, $fieldData['name'], $fieldData);
       }
       $map->addTable($table);
-      if (in_array($data['name'], $this->apiEntities)) {
-        $this->addCustomFields($map, $table, $data['name']);
+      if (in_array($name, $this->apiEntities)) {
+        $this->addCustomFields($map, $table, $name);
       }
     }
   }
@@ -105,63 +105,44 @@ private function addCustomFields(SchemaMap $map, Table $baseTable, string $entit
     if (!$customInfo) {
       return;
     }
-    $select = ['f.name', 'f.data_type', 'f.label', 'f.column_name', 'f.option_group_id', 'f.serialize', 'f.fk_entity'];
-    // Prevent errors during upgrade by only selecting fields supported by the current version
-    $supportedFields = \CRM_Utils_Array::prefixKeys(\CRM_Core_BAO_CustomField::getSupportedFields(), 'f.');
-    $select = array_intersect($select, array_keys($supportedFields));
-    // Also select fields from the custom_group table (these fields are so old we don't have to worry about upgrade issues)
-    $select = array_merge(['g.name as custom_group_name', 'g.table_name', 'g.is_multiple'], $select);
-    $fieldData = \CRM_Utils_SQL_Select::from('civicrm_custom_field f')
-      ->join('custom_group', 'INNER JOIN civicrm_custom_group g ON g.id = f.custom_group_id')
-      ->select($select)
-      ->where('g.extends IN (@entity)', ['@entity' => $customInfo['extends']])
-      ->where('g.is_active')
-      ->where('f.is_active')
-      ->execute();
-
-    $links = [];
-
-    while ($fieldData->fetch()) {
-      $tableName = $fieldData->table_name;
-
-      $customTable = $map->getTableByName($tableName);
-      if (!$customTable) {
-        $customTable = new Table($tableName);
-        // Add entity_id join from multi-record custom group to the
-        if (!empty($fieldData->is_multiple)) {
-          $newJoin = new Joinable($baseTable->getName(), $customInfo['column'], 'entity_id');
-          $customTable->addTableLink('entity_id', $newJoin);
-          // Deprecated "contact" join name
-          $oldJoin = new Joinable($baseTable->getName(), $customInfo['column'], AllCoreTables::convertEntityNameToLower($entityName));
-          $oldJoin->setDeprecatedBy('entity_id');
-          $customTable->addTableLink('entity_id', $oldJoin);
-        }
+    $filters = [
+      'extends' => $customInfo['extends'],
+      'is_active' => TRUE,
+      'fields' => TRUE,
+    ];
+    foreach (\CRM_Core_BAO_CustomGroup::getAll($filters) as $customGroup) {
+      $customTable = new Table($customGroup['table_name']);
+
+      // Add entity_id join from multi-record custom group to the base entity
+      if (!empty($customGroup['is_multiple'])) {
+        $newJoin = new Joinable($baseTable->getName(), $customInfo['column'], 'entity_id');
+        $customTable->addTableLink('entity_id', $newJoin);
+        // Deprecated "contact" join name
+        $oldJoin = new Joinable($baseTable->getName(), $customInfo['column'], AllCoreTables::convertEntityNameToLower($entityName));
+        $oldJoin->setDeprecatedBy('entity_id');
+        $customTable->addTableLink('entity_id', $oldJoin);
       }
 
-      $map->addTable($customTable);
-
-      $alias = $fieldData->custom_group_name;
-      $links[$alias]['tableName'] = $tableName;
-      $links[$alias]['isMultiple'] = !empty($fieldData->is_multiple);
-      $links[$alias]['columns'][$fieldData->name] = $fieldData->column_name;
-
-      if ($fieldData->data_type === 'EntityReference' && isset($fieldData->fk_entity)) {
-        $targetTable = self::getTableName($fieldData->fk_entity);
-        $joinable = new Joinable($targetTable, 'id', $fieldData->name);
-        $customTable->addTableLink($fieldData->column_name, $joinable);
-      }
+      // Add joins for entityReference fields
+      foreach ($customGroup['fields'] as $field) {
+        if ($field['data_type'] === 'EntityReference' && isset($field['fk_entity'])) {
+          $targetTable = self::getTableName($field['fk_entity']);
+          $joinable = new Joinable($targetTable, 'id', $field['name']);
+          $customTable->addTableLink($field['column_name'], $joinable);
+        }
 
-      if ($fieldData->data_type === 'ContactReference') {
-        $joinable = new Joinable('civicrm_contact', 'id', $fieldData->name);
-        if ($fieldData->serialize) {
-          $joinable->setSerialize((int) $fieldData->serialize);
+        if ($field['data_type'] === 'ContactReference') {
+          $joinable = new Joinable('civicrm_contact', 'id', $field['name']);
+          if ($field['serialize']) {
+            $joinable->setSerialize((int) $field['serialize']);
+          }
+          $customTable->addTableLink($field['column_name'], $joinable);
         }
-        $customTable->addTableLink($fieldData->column_name, $joinable);
       }
-    }
+      $map->addTable($customTable);
 
-    foreach ($links as $alias => $link) {
-      $joinable = new CustomGroupJoinable($link['tableName'], $alias, $link['isMultiple'], $link['columns']);
+      // Add custom join
+      $joinable = new CustomGroupJoinable($customGroup['table_name'], $customGroup['name'], $customGroup['is_multiple'], $entityName);
       $baseTable->addTableLink($customInfo['column'], $joinable);
     }
   }
diff --git a/www/modules/civicrm/Civi/Api4/Service/Spec/FieldSpec.php b/www/modules/civicrm/Civi/Api4/Service/Spec/FieldSpec.php
index ba7905905..580ddfc82 100644
--- a/www/modules/civicrm/Civi/Api4/Service/Spec/FieldSpec.php
+++ b/www/modules/civicrm/Civi/Api4/Service/Spec/FieldSpec.php
@@ -90,6 +90,11 @@ class FieldSpec {
    */
   public $outputFormatters;
 
+  /**
+   * @var string[]
+   */
+  public array $usage = [];
+
   /**
    * @param string $name
    * @param string $entity
@@ -124,7 +129,7 @@ public function setDefaultValue($defaultValue) {
    *
    * @return $this
    */
-  public function setEntity($entity) {
+  public function setEntity(string $entity) {
     $this->entity = $entity;
 
     return $this;
@@ -133,14 +138,14 @@ public function setEntity($entity) {
   /**
    * @return string
    */
-  public function getEntity() {
+  public function getEntity(): ?string {
     return $this->entity;
   }
 
   /**
    * @return bool
    */
-  public function getNullable() {
+  public function getNullable(): bool {
     return $this->nullable;
   }
 
@@ -158,7 +163,7 @@ public function setNullable(bool $nullable) {
   /**
    * @return bool
    */
-  public function isRequired() {
+  public function isRequired(): bool {
     return $this->required;
   }
 
@@ -167,7 +172,7 @@ public function isRequired() {
    *
    * @return $this
    */
-  public function setRequired($required) {
+  public function setRequired(bool $required) {
     $this->required = $required;
 
     return $this;
@@ -176,16 +181,16 @@ public function setRequired($required) {
   /**
    * @return string
    */
-  public function getRequiredIf() {
+  public function getRequiredIf(): ?string {
     return $this->requiredIf;
   }
 
   /**
-   * @param string $requiredIf
+   * @param string|null $requiredIf
    *
    * @return $this
    */
-  public function setRequiredIf($requiredIf) {
+  public function setRequiredIf(?string $requiredIf) {
     $this->requiredIf = $requiredIf;
 
     return $this;
@@ -244,8 +249,8 @@ public function setType(string $type) {
    * @param bool $readonly
    * @return $this
    */
-  public function setReadonly($readonly) {
-    $this->readonly = (bool) $readonly;
+  public function setReadonly(bool $readonly) {
+    $this->readonly = $readonly;
 
     return $this;
   }
@@ -254,10 +259,24 @@ public function setReadonly($readonly) {
    * @param bool $deprecated
    * @return $this
    */
-  public function setDeprecated($deprecated) {
-    $this->deprecated = (bool) $deprecated;
+  public function setDeprecated(bool $deprecated) {
+    $this->deprecated = $deprecated;
 
     return $this;
   }
 
+  /**
+   * @return string[]
+   */
+  public function getUsage(): array {
+    return $this->usage;
+  }
+
+  /**
+   * @param string[] $usage
+   */
+  public function setUsage(array $usage): void {
+    $this->usage = $usage;
+  }
+
 }
diff --git a/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/ContactGetSpecProvider.php b/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/ContactGetSpecProvider.php
index 9d630092b..12a11cf29 100644
--- a/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/ContactGetSpecProvider.php
+++ b/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/ContactGetSpecProvider.php
@@ -168,13 +168,13 @@ public static function getContactGroupSql(array $field, string $fieldAlias, stri
   /**
    * Callback function to build option lists groups pseudo-field.
    *
-   * @param \Civi\Api4\Service\Spec\FieldSpec $spec
+   * @param array $field
    * @param array $values
    * @param bool|array $returnFormat
    * @param bool $checkPermissions
    * @return array
    */
-  public static function getGroupList($spec, $values, $returnFormat, $checkPermissions) {
+  public static function getGroupList($field, $values, $returnFormat, $checkPermissions) {
     $groups = $checkPermissions ? \CRM_Core_PseudoConstant::group() : \CRM_Core_PseudoConstant::allGroup(NULL, FALSE);
     $options = \CRM_Utils_Array::makeNonAssociative($groups, 'id', 'label');
     if ($options && is_array($returnFormat) && in_array('name', $returnFormat)) {
diff --git a/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/CustomValueSpecProvider.php b/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/CustomValueSpecProvider.php
index 5ac7c1e6d..bcc538ec1 100644
--- a/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/CustomValueSpecProvider.php
+++ b/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/CustomValueSpecProvider.php
@@ -42,7 +42,7 @@ public function modifySpec(RequestSpec $spec) {
     $groupName = CoreUtil::getCustomGroupName($spec->getEntity());
     $baseEntity = \CRM_Core_BAO_CustomGroup::getEntityForGroup($groupName);
     // Lookup base entity info using DAO methods not CoreUtil to avoid early-bootstrap issues
-    $baseEntityDao = \CRM_Core_DAO_AllCoreTables::getFullName($baseEntity);
+    $baseEntityDao = \CRM_Core_DAO_AllCoreTables::getDAONameForEntity($baseEntity);
     $baseEntityTitle = $baseEntityDao ? $baseEntityDao::getEntityTitle() : $baseEntity;
 
     $entityField = new FieldSpec('entity_id', $spec->getEntity(), 'Integer');
diff --git a/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/EntityTagFilterSpecProvider.php b/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/EntityTagFilterSpecProvider.php
index 6e733d36c..1d93ed6f8 100644
--- a/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/EntityTagFilterSpecProvider.php
+++ b/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/EntityTagFilterSpecProvider.php
@@ -84,14 +84,14 @@ public static function getTagFilterSql(array $field, string $fieldAlias, string
   /**
    * Callback function to build option list for tags filters.
    *
-   * @param \Civi\Api4\Service\Spec\FieldSpec $spec
+   * @param array $field
    * @param array $values
    * @param bool|array $returnFormat
    * @param bool $checkPermissions
    * @return array
    */
-  public static function getTagList($spec, $values, $returnFormat, $checkPermissions) {
-    $table = CoreUtil::getTableName($spec->getEntity());
+  public static function getTagList($field, $values, $returnFormat, $checkPermissions) {
+    $table = CoreUtil::getTableName($field['entity']);
     $result = new Result();
     Request::create('EntityTag', 'getFields', [
       'version' => 4,
diff --git a/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/Generic/SpecProviderInterface.php b/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/Generic/SpecProviderInterface.php
index b66fb6d48..1aae5ac79 100644
--- a/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/Generic/SpecProviderInterface.php
+++ b/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/Generic/SpecProviderInterface.php
@@ -29,12 +29,9 @@ public function modifySpec(RequestSpec $spec);
   /**
    * @param string $entity
    * @param string $action
-   * Optional @param array $values
-   *   $values from the api getFields request.
-   *   This param works but has not been added to the interface for the sake of backward-compatability.
    *
    * @return bool
    */
-  public function applies(string $entity, string $action/*, array $values = []*/);
+  public function applies(string $entity, string $action);
 
 }
diff --git a/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/TitleFieldSpecProvider.php b/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/TitleFieldSpecProvider.php
index d284cd3f3..c2d0ea972 100644
--- a/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/TitleFieldSpecProvider.php
+++ b/www/modules/civicrm/Civi/Api4/Service/Spec/Provider/TitleFieldSpecProvider.php
@@ -44,7 +44,7 @@ public function modifySpec(RequestSpec $spec): void {
    * @inheritDoc
    */
   public function applies($entity, $action): bool {
-    return in_array($entity, ['PaymentProcessor', 'ContributionPage', 'Group']) && $action === 'create';
+    return in_array($entity, ['PaymentProcessor', 'ContributionPage', 'Group', 'UFGroup']) && $action === 'create';
   }
 
 }
diff --git a/www/modules/civicrm/Civi/Api4/Service/Spec/RequestSpec.php b/www/modules/civicrm/Civi/Api4/Service/Spec/RequestSpec.php
index 64c259b3c..e2ed98feb 100644
--- a/www/modules/civicrm/Civi/Api4/Service/Spec/RequestSpec.php
+++ b/www/modules/civicrm/Civi/Api4/Service/Spec/RequestSpec.php
@@ -48,6 +48,11 @@ public function getEntityTableName(): ?string {
    */
   protected $values = [];
 
+  /**
+   * @var array
+   */
+  protected $valuesUsed = [];
+
   /**
    * @param string $entity
    * @param string $action
@@ -57,25 +62,34 @@ public function __construct(string $entity, string $action, array $values = [])
     $this->entity = $entity;
     $this->action = $action;
     $this->entityTableName = CoreUtil::getTableName($entity);
+    $this->values = $values;
+  }
 
-    // If `id` given, lookup other values needed to filter custom fields
-    $customInfo = \Civi\Api4\Utils\CoreUtil::getCustomGroupExtends($entity);
-    $idCol = $customInfo['column'] ?? NULL;
-    if ($idCol && !empty($values[$idCol])) {
-      $grouping = (array) $customInfo['grouping'];
-      $lookupNeeded = array_diff($grouping, array_keys($values));
-      if ($lookupNeeded) {
-        $record = \civicrm_api4($entity, 'get', [
-          'checkPermissions' => FALSE,
-          'where' => [[$idCol, '=', $values[$idCol]]],
-          'select' => $lookupNeeded,
-        ])->first();
-        if ($record) {
-          $values += $record;
-        }
+  /**
+   * Resolve requested value based on available data in $values
+   * e.g. if `id` is available then we can use it to look up other values.
+   */
+  private function resolveValue(string $key) {
+    $this->valuesUsed[$key] = TRUE;
+    if (!$this->values || array_key_exists($key, $this->values)) {
+      return;
+    }
+    $baoName = CoreUtil::getBAOFromApiName($this->entity);
+    $idCol = CoreUtil::getIdFieldName($this->entity);
+    // If `id` given, use it to look up value
+    if (!array_key_exists($key, $this->values) && !empty($this->values[$idCol]) && array_key_exists($key, $baoName::getSupportedFields())) {
+      $this->values[$key] = $baoName::getDbVal($key, $this->values[$idCol], $idCol);
+    }
+    // If we need a value like `event_id.event_type_id` and we only have `event_id`,
+    // use the FK to look up the value from the event.
+    if (!array_key_exists($key, $this->values) && str_contains($key, '.')) {
+      [$fkFrom, $fkTo] = explode('.', $key);
+      $fkField = $baoName::getSupportedFields()[$fkFrom] ?? NULL;
+      $fkBAO = $fkField['FKClassName'] ?? NULL;
+      if (!empty($this->values[$fkFrom]) && $fkBAO) {
+        $this->values[$key] = $fkBAO::getDbVal($fkTo, $this->values[$fkFrom], $fkField['FKColumnName'] ?? 'id');
       }
     }
-    $this->values = $values;
   }
 
   /**
@@ -126,32 +140,10 @@ public function getRequiredFields() {
   }
 
   /**
-   * @return array|FieldSpec[]
-   */
-  public function getConditionalRequiredFields() {
-    return array_filter($this->fields, function (FieldSpec $field) {
-      return $field->getRequiredIf();
-    });
-  }
-
-  /**
-   * @param array $fieldNames
-   *   Optional array of fields to return
    * @return FieldSpec[]
    */
-  public function getFields($fieldNames = NULL) {
-    if (!$fieldNames) {
-      return $this->fields;
-    }
-    // Return all exact matches plus partial matches (to support retrieving fk fields)
-    return array_filter($this->fields, function($field) use($fieldNames) {
-      foreach ($fieldNames as $fieldName) {
-        if (strpos($fieldName, $field->getName()) === 0) {
-          return TRUE;
-        }
-      }
-      return FALSE;
-    });
+  public function getFields() {
+    return $this->fields;
   }
 
   /**
@@ -162,20 +154,33 @@ public function getEntity() {
   }
 
   /**
-   * @return array
+   * Private because we want everyone downstream to use getValue() and hasValue().
    */
-  public function getValues() {
+  private function getValues(): array {
     return $this->values;
   }
 
+  /**
+   * What values were requested by specProviders
+   */
+  public function getValuesUsed(): array {
+    return $this->valuesUsed;
+  }
+
   /**
    * @param string $key
    * @return mixed
    */
   public function getValue(string $key) {
+    $this->resolveValue($key);
     return $this->values[$key] ?? NULL;
   }
 
+  public function hasValue(string $key): bool {
+    $this->resolveValue($key);
+    return array_key_exists($key, $this->values);
+  }
+
   /**
    * @return string
    */
diff --git a/www/modules/civicrm/Civi/Api4/Service/Spec/SpecFormatter.php b/www/modules/civicrm/Civi/Api4/Service/Spec/SpecFormatter.php
index b13d1f4b9..c3d4cd619 100644
--- a/www/modules/civicrm/Civi/Api4/Service/Spec/SpecFormatter.php
+++ b/www/modules/civicrm/Civi/Api4/Service/Spec/SpecFormatter.php
@@ -18,35 +18,32 @@
 class SpecFormatter {
 
   /**
-   * @param array $data
-   * @param string $entityName
-   *
-   * @return FieldSpec
+   * Convert array from BAO::fields() or CustomGroup::getAll() into a FieldSpec object
    */
-  public static function arrayToField(array $data, string $entityName): FieldSpec {
+  public static function arrayToField(array $data, string $entityName, array $customGroup = NULL): FieldSpec {
     $dataTypeName = self::getDataType($data);
 
     $hasDefault = isset($data['default']) && $data['default'] !== '';
     // Custom field
-    if (!empty($data['custom_group_id'])) {
+    if ($customGroup) {
       $field = new CustomFieldSpec($data['name'], $entityName, $dataTypeName);
-      if (strpos($entityName, 'Custom_') !== 0) {
-        $field->setName($data['custom_group_id.name'] . '.' . $data['name']);
+      if (!str_starts_with($entityName, 'Custom_')) {
+        $field->setName($customGroup['name'] . '.' . $data['name']);
       }
       else {
         // Fields belonging to custom entities are treated as normal; type = Field instead of Custom
         $field->setType('Field');
-        $field->setTableName($data['custom_group_id.table_name']);
       }
+      $field->setTableName($customGroup['table_name']);
       if ($dataTypeName === 'EntityReference') {
         $field->setFkEntity($data['fk_entity']);
       }
       $field->setColumnName($data['column_name']);
       $field->setNullable(empty($data['is_required']));
       $field->setCustomFieldId($data['id'] ?? NULL);
-      $field->setCustomGroupName($data['custom_group_id.name']);
+      $field->setCustomGroupName($customGroup['name']);
       $field->setTitle($data['label']);
-      $field->setLabel($data['custom_group_id.title'] . ': ' . $data['label']);
+      $field->setLabel($customGroup['title'] . ': ' . $data['label']);
       $field->setHelpPre($data['help_pre'] ?? NULL);
       $field->setHelpPost($data['help_post'] ?? NULL);
       if (\CRM_Core_BAO_CustomField::hasOptions($data)) {
@@ -58,6 +55,11 @@ public static function arrayToField(array $data, string $entityName): FieldSpec
         $field->setSuffixes($suffixes);
       }
       $field->setReadonly($data['is_view']);
+      $usage = ['export', 'duplicate_matching', 'token'];
+      if (empty($data['is_view'])) {
+        $usage[] = 'import';
+      }
+      $field->setUsage($usage);
     }
     // Core field
     else {
@@ -71,7 +73,7 @@ public static function arrayToField(array $data, string $entityName): FieldSpec
       $field->setLabel($data['html']['label'] ?? NULL);
       $field->setLocalizable($data['localizable'] ?? FALSE);
       if (!empty($data['DFKEntities'])) {
-        $field->setDfkEntities(array_values($data['DFKEntities']));
+        $field->setDfkEntities($data['DFKEntities']);
       }
       if (!empty($data['pseudoconstant'])) {
         // Do not load options if 'prefetch' is disabled
@@ -98,6 +100,9 @@ public static function arrayToField(array $data, string $entityName): FieldSpec
         $field->setSuffixes($suffixes);
       }
       $field->setReadonly(!empty($data['readonly']));
+      if (isset($data['usage'])) {
+        $field->setUsage(array_keys(array_filter($data['usage'])));
+      }
     }
     if ($hasDefault) {
       $field->setDefaultValue(FormattingUtil::convertDataType($data['default'], $dataTypeName));
@@ -147,24 +152,24 @@ private static function getDataType(array $data) {
   /**
    * Callback function to build option lists for all DAO & custom fields.
    *
-   * @param FieldSpec $spec
+   * @param array $field
    * @param array $values
    * @param bool|array $returnFormat
    * @param bool $checkPermissions
    * @return array|false
    */
-  public static function getOptions($spec, $values, $returnFormat, $checkPermissions) {
-    $fieldName = $spec->getName();
+  public static function getOptions($field, $values, $returnFormat, $checkPermissions) {
+    $fieldName = $field['name'];
 
-    if ($spec instanceof CustomFieldSpec) {
+    if (!empty($field['custom_field_id'])) {
       // buildOptions relies on the custom_* type of field names
-      $fieldName = sprintf('custom_%d', $spec->getCustomFieldId());
+      $fieldName = sprintf('custom_%d', $field['custom_field_id']);
     }
 
     // BAO::buildOptions returns a single-dimensional list, we call that first because of the hook contract,
     // @see CRM_Utils_Hook::fieldOptions
     // We then supplement the data with additional properties if requested.
-    $bao = CoreUtil::getBAOFromApiName($spec->getEntity());
+    $bao = CoreUtil::getBAOFromApiName($field['entity']);
     $optionLabels = $bao::buildOptions($fieldName, NULL, $values);
 
     if (!is_array($optionLabels)) {
@@ -173,11 +178,11 @@ public static function getOptions($spec, $values, $returnFormat, $checkPermissio
     else {
       $options = \CRM_Utils_Array::makeNonAssociative($optionLabels, 'id', 'label');
       if (is_array($returnFormat) && $options) {
-        self::addOptionProps($options, $spec, $bao, $fieldName, $values, $returnFormat);
+        self::addOptionProps($options, $field, $bao, $fieldName, $values, $returnFormat);
       }
     }
     // Special 'current_domain' option
-    if ($spec->getFkEntity() === 'Domain') {
+    if ($field['fk_entity'] === 'Domain') {
       array_unshift($options, [
         'id' => 'current_domain',
         'name' => 'current_domain',
@@ -194,13 +199,13 @@ public static function getOptions($spec, $values, $returnFormat, $checkPermissio
    * We start with BAO::buildOptions in order to respect hooks which may be adding/removing items, then we add the extra data.
    *
    * @param array $options
-   * @param FieldSpec $spec
+   * @param array $field
    * @param \CRM_Core_DAO $baoName
    * @param string $fieldName
    * @param array $values
    * @param array $returnFormat
    */
-  private static function addOptionProps(&$options, $spec, $baoName, $fieldName, $values, $returnFormat) {
+  private static function addOptionProps(&$options, $field, $baoName, $fieldName, $values, $returnFormat) {
     // FIXME: For now, call the buildOptions function again and then combine the arrays. Not an ideal approach.
     // TODO: Teach CRM_Core_Pseudoconstant to always load multidimensional option lists so we can get more properties like 'color' and 'icon',
     // however that might require a change to the hook_civicrm_fieldOptions signature so that's a bit tricky.
@@ -211,8 +216,8 @@ private static function addOptionProps(&$options, $spec, $baoName, $fieldName, $
     // CRM_Core_Pseudoconstant doesn't know how to fetch extra stuff like icon, description, color, etc., so we have to invent that wheel here...
     if ($returnFormat) {
       $optionIndex = array_flip(array_column($options, 'id'));
-      if ($spec instanceof CustomFieldSpec) {
-        $optionGroupId = \CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomField', $spec->getCustomFieldId(), 'option_group_id');
+      if (!empty($field['custom_field_id'])) {
+        $optionGroupId = \CRM_Core_BAO_CustomField::getField($field['custom_field_id'])['option_group_id'];
       }
       else {
         $dao = new $baoName();
@@ -281,7 +286,7 @@ private static function addOptionProps(&$options, $spec, $baoName, $fieldName, $
    * @param array $data
    * @param string $dataTypeName
    */
-  public static function setInputTypeAndAttrs(FieldSpec &$fieldSpec, $data, $dataTypeName) {
+  public static function setInputTypeAndAttrs(FieldSpec $fieldSpec, $data, $dataTypeName) {
     $inputType = $data['html']['type'] ?? $data['html_type'] ?? NULL;
     $inputAttrs = $data['html'] ?? [];
     unset($inputAttrs['type']);
@@ -313,7 +318,7 @@ public static function setInputTypeAndAttrs(FieldSpec &$fieldSpec, $data, $dataT
       $inputAttrs['step'] = $dataTypeName === 'Integer' ? 1 : .01;
     }
     // Date/time settings from custom fields
-    if ($inputType == 'Date' && !empty($data['custom_group_id'])) {
+    if ($inputType == 'Date' && is_a($fieldSpec, CustomFieldSpec::class)) {
       $inputAttrs['time'] = empty($data['time_format']) ? FALSE : ($data['time_format'] == 1 ? 12 : 24);
       $inputAttrs['date'] = $data['date_format'];
       $inputAttrs['start_date_years'] = isset($data['start_date_years']) ? (int) $data['start_date_years'] : NULL;
diff --git a/www/modules/civicrm/Civi/Api4/Service/Spec/SpecGatherer.php b/www/modules/civicrm/Civi/Api4/Service/Spec/SpecGatherer.php
index d77e3a8bc..e62ed69e7 100644
--- a/www/modules/civicrm/Civi/Api4/Service/Spec/SpecGatherer.php
+++ b/www/modules/civicrm/Civi/Api4/Service/Spec/SpecGatherer.php
@@ -12,61 +12,132 @@
 
 namespace Civi\Api4\Service\Spec;
 
-use Civi\Api4\CustomField;
 use Civi\Api4\Service\Spec\Provider\Generic\SpecProviderInterface;
 use Civi\Api4\Utils\CoreUtil;
 use Civi\Core\Service\AutoService;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * Class SpecGatherer
  * @package Civi\Api4\Service\Spec
  * @service spec_gatherer
  */
-class SpecGatherer extends AutoService {
+class SpecGatherer extends AutoService implements EventSubscriberInterface {
 
   /**
    * @var \Civi\Api4\Service\Spec\Provider\Generic\SpecProviderInterface[]
    */
   protected $specProviders = [];
 
+  private $entityActionValues = [];
+
+  private $fieldCache = [];
+
+  public static function getSubscribedEvents() {
+    return [
+      'civi.cache.metadata.clear' => 'onClearMetadata',
+    ];
+  }
+
+  /**
+   * When metadata cache flush is requested, internal caches in this service
+   * should also be cleared.
+   */
+  public function onClearMetadata(): void {
+    $this->entityActionValues = [];
+    $this->fieldCache = [];
+  }
+
   /**
-   * Returns a RequestSpec with all the fields available. Uses spec providers
+   * Get all fields for entity.
+   *
+   * This uses in-memory caching to speed up cases where getFields is called hundreds of times per page.
+   *
+   * The cache is unique per entity + action + language + *relevant* values.
+   * Because the array of $values can be literally anything, we cut it down to just the
+   * relevant ones by tracking which values are actually used by the specProviders.
+   * @see RequestSpec::getValuesUsed()
+   */
+  public function getAllFields(string $entityName, string $actionName, array $values = [], bool $checkPermissions = FALSE): array {
+    $cacheValueKeys = $this->entityActionValues[$entityName][$actionName] ?? NULL;
+    if (isset($cacheValueKeys)) {
+      // If we don't have all requested values but we do have *some* values, attempt
+      // to look up the rest so that our cachekey has complete information.
+      if ($cacheValueKeys && $values && (count(array_intersect_key($cacheValueKeys, $values)) < count($cacheValueKeys))) {
+        $spec = new RequestSpec($entityName, $actionName, $values);
+        foreach (array_keys(array_diff_key($cacheValueKeys, $values)) as $key) {
+          if ($spec->hasValue($key)) {
+            $values[$key] = $spec->getValue($key);
+          }
+        }
+      }
+      $cacheKey = $this->getCacheKey($entityName, $actionName, $cacheValueKeys, $values);
+      $fields = $this->fieldCache[$cacheKey] ?? NULL;
+    }
+
+    if (!isset($fields)) {
+      $fields = [];
+      $spec = $this->getSpec($entityName, $actionName, $values);
+      if (!$cacheValueKeys) {
+        $cacheValueKeys = $this->entityActionValues[$entityName][$actionName] = $spec->getValuesUsed();
+      }
+      if (!isset($cacheKey)) {
+        $cacheKey = $this->getCacheKey($entityName, $actionName, $cacheValueKeys, $values);
+      }
+      foreach ($spec as $field) {
+        $fields[$field->getName()] = $field->toArray();
+      }
+      $this->fieldCache[$cacheKey] = $fields;
+    }
+    if ($checkPermissions) {
+      $this->filterCustomFieldsByPermission($fields, $actionName);
+    }
+    return $fields;
+  }
+
+  private function getCacheKey($entityName, $actionName, $cacheValueKeys, $values) {
+    return json_encode([
+      $entityName,
+      $actionName,
+      \Civi::settings()->get('lcMessages'),
+      array_intersect_key($values, $cacheValueKeys),
+    ]);
+  }
+
+  /**
+   * Returns a RequestSpec with all fields. Uses spec providers
    * to add or modify field specifications.
    *
-   * @param string $entity
-   * @param string $action
-   * @param bool $includeCustom
+   * @param string $entityName
+   * @param string $actionName
    * @param array $values
-   * @param bool $checkPermissions
    *
    * @return \Civi\Api4\Service\Spec\RequestSpec
    * @throws \CRM_Core_Exception
    * @see \Civi\Api4\Service\Spec\Provider\CustomFieldCreationSpecProvider
    */
-  public function getSpec(string $entity, string $action, bool $includeCustom, array $values = [], bool $checkPermissions = FALSE): RequestSpec {
-    $specification = new RequestSpec($entity, $action, $values);
+  private function getSpec(string $entityName, string $actionName, array $values = []): RequestSpec {
+    $specification = new RequestSpec($entityName, $actionName, $values);
 
     // Real entities
-    if (!str_starts_with($entity, 'Custom_')) {
-      $this->addDAOFields($entity, $action, $specification, $values);
-      if ($includeCustom) {
-        $this->addCustomFields($entity, $specification, $checkPermissions);
-      }
+    if (!str_starts_with($entityName, 'Custom_')) {
+      $this->addDAOFields($entityName, $specification);
+      $this->addCustomFields($entityName, $specification);
     }
     // Custom pseudo-entities
     else {
-      $this->getCustomGroupFields(substr($entity, 7), $specification);
+      $this->getCustomGroupFields(substr($entityName, 7), $specification);
     }
 
     // Default value only makes sense for create actions
-    if ($action !== 'create') {
+    if ($actionName !== 'create') {
       foreach ($specification->getFields() as $field) {
         $field->setDefaultValue(NULL);
       }
     }
 
     foreach ($this->specProviders as $provider) {
-      if ($provider->applies($entity, $action, $specification->getValues())) {
+      if ($provider->applies($entityName, $actionName)) {
         $provider->modifySpec($specification);
       }
     }
@@ -83,11 +154,9 @@ public function addSpecProvider(SpecProviderInterface $provider): void {
 
   /**
    * @param string $entityName
-   * @param string $action
    * @param \Civi\Api4\Service\Spec\RequestSpec $spec
-   * @param array $values
    */
-  private function addDAOFields(string $entityName, string $action, RequestSpec $spec, array $values) {
+  private function addDAOFields(string $entityName, RequestSpec $spec) {
     $DAOFields = $this->getDAOFields($entityName);
 
     foreach ($DAOFields as $DAOField) {
@@ -97,7 +166,7 @@ private function addDAOFields(string $entityName, string $action, RequestSpec $s
       if (!empty($DAOField['component']) && !\CRM_Core_Component::isEnabled($DAOField['component'])) {
         continue;
       }
-      $this->setDynamicFk($DAOField, $values);
+      $this->setDynamicFk($DAOField, $spec);
       $field = SpecFormatter::arrayToField($DAOField, $entityName);
       $spec->addFieldSpec($field);
     }
@@ -111,11 +180,8 @@ private function addDAOFields(string $entityName, string $action, RequestSpec $s
    *
    * Additionally, if $values contains a value for e.g. `entity_table`,
    * then getFields will also output the corresponding `fk_entity` for the `entity_id` field.
-   *
-   * @param array $DAOField
-   * @param array $values
    */
-  private function setDynamicFk(array &$DAOField, array $values): void {
+  private function setDynamicFk(array &$DAOField, RequestSpec $spec): void {
     if (empty($DAOField['FKClassName']) && !empty($DAOField['bao']) && $DAOField['type'] == \CRM_Utils_Type::T_INT) {
       // Check if this field is a key for a dynamic FK
       foreach ($DAOField['bao']::getReferenceColumns() ?? [] as $reference) {
@@ -124,8 +190,8 @@ private function setDynamicFk(array &$DAOField, array $values): void {
           $DAOField['DFKEntities'] = $reference->getTargetEntities();
           $DAOField['html']['controlField'] = $entityTableColumn;
           // If we have a value for entity_table then this field can pretend to be a single FK too.
-          if (array_key_exists($entityTableColumn, $values)) {
-            $DAOField['FKClassName'] = \CRM_Core_DAO_AllCoreTables::getClassForTable($values[$entityTableColumn]);
+          if ($spec->hasValue($entityTableColumn) && $DAOField['DFKEntities']) {
+            $DAOField['FKClassName'] = \CRM_Core_DAO_AllCoreTables::getDAONameForEntity($DAOField['DFKEntities'][$spec->getValue($entityTableColumn)]);
           }
           break;
         }
@@ -138,122 +204,110 @@ private function setDynamicFk(array &$DAOField, array $values): void {
    *
    * @param string $entity
    * @param \Civi\Api4\Service\Spec\RequestSpec $spec
-   * @param bool $checkPermissions
    * @throws \CRM_Core_Exception
    * @see \CRM_Core_SelectValues::customGroupExtends
    */
-  private function addCustomFields(string $entity, RequestSpec $spec, bool $checkPermissions) {
-    $values = $spec->getValues();
-
-    // Handle contact type pseudo-entities
-    $contactTypes = \CRM_Contact_BAO_ContactType::basicTypes();
-    // If contact type is given
-    if ($entity === 'Contact' && !empty($values['contact_type'])) {
-      $entity = $values['contact_type'];
+  private function addCustomFields(string $entity, RequestSpec $spec) {
+    // If contact type is given, treat it as the api entity
+    if ($entity === 'Contact' && $spec->getValue('contact_type')) {
+      $entity = $spec->getValue('contact_type');
     }
 
     $customInfo = \Civi\Api4\Utils\CoreUtil::getCustomGroupExtends($entity);
     if (!$customInfo) {
       return;
     }
-    $extends = $customInfo['extends'];
     $grouping = $customInfo['grouping'];
-    if ($entity === 'Contact' || in_array($entity, $contactTypes, TRUE)) {
+    if (CoreUtil::isContact($entity)) {
       $grouping = 'contact_sub_type';
     }
 
-    $query = CustomField::get(FALSE)
-      ->setSelect(['custom_group_id.name', 'custom_group_id.title', '*'])
-      ->addWhere('is_active', '=', TRUE)
-      ->addWhere('custom_group_id.is_active', '=', TRUE)
-      ->addWhere('custom_group_id.is_multiple', '=', FALSE);
-
-    // Enforce permissions
-    if ($checkPermissions && !\CRM_Core_Permission::customGroupAdmin()) {
-      $allowedGroups = \CRM_Core_Permission::customGroup();
-      if (!$allowedGroups) {
-        return;
-      }
-      $query->addWhere('custom_group_id', 'IN', $allowedGroups);
+    $filters = [
+      'is_active' => TRUE,
+      'extends' => $customInfo['extends'],
+      'is_multiple' => FALSE,
+    ];
+    if (is_string($grouping) && $spec->hasValue($grouping)) {
+      $filters['extends_entity_column_value'] = array_merge([NULL], (array) $spec->getValue($grouping));
     }
-
-    if (is_string($grouping) && array_key_exists($grouping, $values)) {
-      if (empty($values[$grouping])) {
-        $query->addWhere('custom_group_id.extends_entity_column_value', 'IS EMPTY');
-      }
-      else {
-        $clause = [
-          ['custom_group_id.extends_entity_column_value', 'IS EMPTY'],
-        ];
-        foreach ((array) $values[$grouping] as $value) {
-          $clause[] = ['custom_group_id.extends_entity_column_value', 'CONTAINS', $value];
+    // Gather values to filter multiple groupings (Participant entity)
+    $groupingValues = [];
+    if (is_array($grouping)) {
+      foreach ($grouping as $groupingKey) {
+        if ($spec->hasValue($groupingKey)) {
+          $groupingValues[$groupingKey] = $spec->getValue($groupingKey);
         }
-        $query->addClause('OR', $clause);
       }
     }
-    // Handle multiple groupings
-    // (In core, only Participant custom fields have multiple groupings)
-    elseif (is_array($grouping)) {
-      $clauses = [];
-      foreach ($grouping as $columnId => $group) {
-        if (array_key_exists($group, $values)) {
-          if (empty($values[$group])) {
-            $clauses[] = [
-              'AND',
-              [
-                ['custom_group_id.extends_entity_column_id', '=', $columnId],
-                ['custom_group_id.extends_entity_column_value', 'IS EMPTY'],
-              ],
-            ];
-          }
-          else {
-            $clause = [];
-            foreach ((array) $values[$group] as $value) {
-              $clause[] = ['custom_group_id.extends_entity_column_value', 'CONTAINS', $value];
-            }
-            $clauses[] = [
-              'AND',
-              [
-                ['custom_group_id.extends_entity_column_id', '=', $columnId],
-                ['OR', $clause],
-              ],
-            ];
-          }
+
+    $customGroups = \CRM_Core_BAO_CustomGroup::getAll($filters);
+    foreach ($customGroups as $customGroup) {
+      if (!$groupingValues || $this->customGroupBelongsTo($customGroup, $groupingValues, $grouping)) {
+        foreach ($customGroup['fields'] as $fieldArray) {
+          $field = SpecFormatter::arrayToField($fieldArray, $entity, $customGroup);
+          $spec->addFieldSpec($field);
         }
       }
-      if ($clauses) {
-        $clauses[] = [
-          'AND',
-          [
-            ['custom_group_id.extends_entity_column_id', 'IS EMPTY'],
-            ['custom_group_id.extends_entity_column_value', 'IS EMPTY'],
-          ],
-        ];
-        $query->addClause('OR', $clauses);
+    }
+  }
+
+  private function filterCustomFieldsByPermission(array &$fields, string $actionName) {
+    $permissionType = in_array($actionName, ['create', 'update', 'save', 'delete', 'replace']) ?
+      \CRM_Core_Permission::EDIT :
+      \CRM_Core_Permission::VIEW;
+    $allowedGroups = array_column(\CRM_Core_BAO_CustomGroup::getAll([], $permissionType), 'name');
+    foreach ($fields as $name => $field) {
+      if (!empty($field['custom_group']) && !in_array($field['custom_group'], $allowedGroups, TRUE)) {
+        unset($fields[$name]);
       }
     }
-    $query->addWhere('custom_group_id.extends', 'IN', $extends);
+  }
 
-    foreach ($query->execute() as $fieldArray) {
-      $field = SpecFormatter::arrayToField($fieldArray, $entity);
-      $spec->addFieldSpec($field);
+  /**
+   * Implements the logic needed by entities that use multiple groupings
+   * (in core, only Participant custom fields have multiple groupings)
+   */
+  private function customGroupBelongsTo(array $customGroup, array $values, $grouping): bool {
+    if (empty($customGroup['extends_entity_column_value']) && empty($customGroup['extends_entity_column_id'])) {
+      // Custom group has no filter
+      return TRUE;
+    }
+    foreach ($grouping as $columnId => $group) {
+      if (array_key_exists($group, $values)) {
+        if (empty($values[$group])) {
+          if (
+            !$customGroup['extends_entity_column_value'] &&
+            $customGroup['extends_entity_column_id'] == $columnId
+          ) {
+            return TRUE;
+          }
+        }
+        elseif (
+          array_intersect((array) $values[$group], (array) $customGroup['extends_entity_column_value']) &&
+          $customGroup['extends_entity_column_id'] == $columnId
+        ) {
+          return TRUE;
+        }
+      }
     }
+    return FALSE;
   }
 
   /**
-   * @param string $customGroup
+   * @param string $customGroupName
    * @param \Civi\Api4\Service\Spec\RequestSpec $specification
    */
-  private function getCustomGroupFields($customGroup, RequestSpec $specification) {
-    $customFields = CustomField::get(FALSE)
-      ->addWhere('custom_group_id.name', '=', $customGroup)
-      ->addWhere('is_active', '=', TRUE)
-      ->setSelect(['custom_group_id.name', 'custom_group_id.table_name', 'custom_group_id.title', '*'])
-      ->execute();
-
-    foreach ($customFields as $fieldArray) {
-      $field = SpecFormatter::arrayToField($fieldArray, 'Custom_' . $customGroup);
-      $specification->addFieldSpec($field);
+  private function getCustomGroupFields($customGroupName, RequestSpec $specification): void {
+    foreach (\CRM_Core_BAO_CustomGroup::getAll() as $customGroup) {
+      if ($customGroup['name'] === $customGroupName) {
+        foreach ($customGroup['fields'] as $fieldArray) {
+          if ($fieldArray['is_active']) {
+            $field = SpecFormatter::arrayToField($fieldArray, 'Custom_' . $customGroupName, $customGroup);
+            $specification->addFieldSpec($field);
+          }
+        }
+        return;
+      }
     }
   }
 
diff --git a/www/modules/civicrm/Civi/Api4/Provider.php b/www/modules/civicrm/Civi/Api4/SmsProvider.php
similarity index 93%
rename from www/modules/civicrm/Civi/Api4/Provider.php
rename to www/modules/civicrm/Civi/Api4/SmsProvider.php
index 37db8db64..3168ffab0 100644
--- a/www/modules/civicrm/Civi/Api4/Provider.php
+++ b/www/modules/civicrm/Civi/Api4/SmsProvider.php
@@ -19,6 +19,6 @@
  * @since 5.69
  * @package Civi\Api4
  */
-class Provider extends Generic\DAOEntity {
+class SmsProvider extends Generic\DAOEntity {
 
 }
diff --git a/www/modules/civicrm/Civi/Api4/UserJob.php b/www/modules/civicrm/Civi/Api4/UserJob.php
index 80761394e..a71ece724 100644
--- a/www/modules/civicrm/Civi/Api4/UserJob.php
+++ b/www/modules/civicrm/Civi/Api4/UserJob.php
@@ -20,5 +20,6 @@
  * @package Civi\Api4
  */
 class UserJob extends Generic\DAOEntity {
+  use Generic\Traits\ManagedEntity;
 
 }
diff --git a/www/modules/civicrm/Civi/Api4/Utils/CoreUtil.php b/www/modules/civicrm/Civi/Api4/Utils/CoreUtil.php
index 85cc9ded9..1cabbc252 100644
--- a/www/modules/civicrm/Civi/Api4/Utils/CoreUtil.php
+++ b/www/modules/civicrm/Civi/Api4/Utils/CoreUtil.php
@@ -39,7 +39,7 @@ public static function getBAOFromApiName($entityName): ?string {
       $dao = \Civi\Api4\CustomValue::getInfo()['dao'];
     }
     else {
-      $dao = AllCoreTables::getFullName($entityName);
+      $dao = AllCoreTables::getDAONameForEntity($entityName);
     }
     if (!$dao && self::isContact($entityName)) {
       $dao = 'CRM_Contact_DAO_Contact';
@@ -56,7 +56,7 @@ public static function getBAOFromApiName($entityName): ?string {
    * @return string|null
    */
   public static function getApiNameFromBAO($baoClassName): ?string {
-    $briefName = AllCoreTables::getBriefName($baoClassName);
+    $briefName = AllCoreTables::getEntityNameForClass($baoClassName);
     return $briefName && self::getApiClass($briefName) ? $briefName : NULL;
   }
 
@@ -218,13 +218,14 @@ public static function getCustomGroupExtends(string $entityName): ?array {
   }
 
   /**
-   * Checks if a custom group exists and is multivalued
+   * @deprecated since 5.71 will be removed around 5.81
    *
    * @param $customGroupName
    * @return bool
    * @throws \CRM_Core_Exception
    */
   public static function isCustomEntity($customGroupName): bool {
+    \CRM_Core_Error::deprecatedFunctionWarning('CRM_Core_BAO_CustomGroup::getAll');
     return $customGroupName && \CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $customGroupName, 'is_multiple', 'name');
   }
 
@@ -244,7 +245,7 @@ public static function checkAccessRecord(AbstractAction $apiRequest, array $reco
 
     // For get actions, just run a get and ACLs will be applied to the query.
     // It's a cheap trick and not as efficient as not running the query at all,
-    // but BAO::checkAccess doesn't consistently check permissions for the "get" action.
+    // but authorizeRecord doesn't consistently check permissions for the "get" action.
     if (is_a($apiRequest, '\Civi\Api4\Generic\AbstractGetAction')) {
       return (bool) $apiRequest->addSelect($idField)->addWhere($idField, '=', $record[$idField])->execute()->count();
     }
@@ -252,18 +253,16 @@ public static function checkAccessRecord(AbstractAction $apiRequest, array $reco
     $event = new \Civi\Api4\Event\AuthorizeRecordEvent($apiRequest, $record, $userID);
     \Civi::dispatcher()->dispatch('civi.api4.authorizeRecord', $event);
 
-    // Note: $bao::_checkAccess() is a quasi-listener. TODO: Convert to straight-up listener.
+    // $bao::_checkAccess() is deprecated in favor of `civi.api4.authorizeRecord` event.
     if ($event->isAuthorized() === NULL) {
       $baoName = self::getBAOFromApiName($apiRequest->getEntityName());
       if ($baoName && method_exists($baoName, '_checkAccess')) {
+        \CRM_Core_Error::deprecatedWarning("$baoName::_checkAccess is deprecated and should be replaced with 'civi.api4.authorizeRecord' event listener.");
         $authorized = $baoName::_checkAccess($event->getEntityName(), $event->getActionName(), $event->getRecord(), $event->getUserID());
         $event->setAuthorized($authorized);
       }
-      else {
-        $event->setAuthorized(TRUE);
-      }
     }
-    return $event->isAuthorized();
+    return $event->isAuthorized() ?? TRUE;
   }
 
   /**
diff --git a/www/modules/civicrm/Civi/Core/Container.php b/www/modules/civicrm/Civi/Core/Container.php
index ab8521b18..bbda14ea0 100644
--- a/www/modules/civicrm/Civi/Core/Container.php
+++ b/www/modules/civicrm/Civi/Core/Container.php
@@ -240,15 +240,6 @@ public function createContainer() {
     $container->setDefinition('pear_mail', new Definition('Mail'))
       ->setFactory('CRM_Utils_Mail::createMailer')->setPublic(TRUE);
 
-    $container->setDefinition('crypto.registry', new Definition('Civi\Crypto\CryptoRegistry'))
-      ->setFactory('Civi\Crypto\CryptoRegistry::createDefaultRegistry')->setPublic(TRUE);
-
-    $container->setDefinition('crypto.token', new Definition('Civi\Crypto\CryptoToken', []))
-      ->setPublic(TRUE);
-
-    $container->setDefinition('crypto.jwt', new Definition('Civi\Crypto\CryptoJwt', []))
-      ->setPublic(TRUE);
-
     $bootServiceTypes = [
       'cache.settings' => \CRM_Utils_Cache_Interface::class,
       'dispatcher.boot' => CiviEventDispatcher::class,
@@ -404,7 +395,13 @@ public function createContainer() {
     ))->addTag('kernel.event_subscriber')->setPublic(TRUE);
 
     $dispatcherDefn = $container->getDefinition('dispatcher');
-    foreach (\CRM_Core_DAO_AllCoreTables::getBaoClasses() as $baoEntity => $baoClass) {
+    // Get all declared BAO classes
+    $baoClasses = \CRM_Core_DAO_AllCoreTables::getBaoClasses();
+    // "Extra" BAO classes that don't have a DAO but still need to listen to hooks
+    $baoClasses[] = \CRM_Core_BAO_CustomValue::class;
+    foreach ($baoClasses as $key => $baoClass) {
+      // Key will be a valid entity name for all but the "extra" classes which don't have a DAO entity.
+      $baoEntity = is_numeric($key) ? NULL : $key;
       $listenerMap = EventScanner::findListeners($baoClass, $baoEntity);
       if ($listenerMap) {
         $file = (new \ReflectionClass($baoClass))->getFileName();
diff --git a/www/modules/civicrm/Civi/Core/SqlTrigger/TimestampTriggers.php b/www/modules/civicrm/Civi/Core/SqlTrigger/TimestampTriggers.php
index 3e613cf45..b0a3efa80 100644
--- a/www/modules/civicrm/Civi/Core/SqlTrigger/TimestampTriggers.php
+++ b/www/modules/civicrm/Civi/Core/SqlTrigger/TimestampTriggers.php
@@ -299,12 +299,10 @@ public function getAllRelations() {
     $relations = $this->getRelations();
 
     if ($this->getCustomDataEntity()) {
-      $customGroupDAO = \CRM_Core_BAO_CustomGroup::getAllCustomGroupsByBaseEntity($this->getCustomDataEntity());
-      $customGroupDAO->is_multiple = 0;
-      $customGroupDAO->find();
-      while ($customGroupDAO->fetch()) {
+      $customGroups = \CRM_Core_BAO_CustomGroup::getAll(['extends' => $this->getCustomDataEntity(), 'is_multiple' => FALSE]);
+      foreach ($customGroups as $customGroup) {
         $relations[] = [
-          'table' => $customGroupDAO->table_name,
+          'table' => $customGroup['table_name'],
           'column' => 'entity_id',
         ];
       }
diff --git a/www/modules/civicrm/Civi/Core/Url.php b/www/modules/civicrm/Civi/Core/Url.php
index 7d7ee73cf..42a818d71 100644
--- a/www/modules/civicrm/Civi/Core/Url.php
+++ b/www/modules/civicrm/Civi/Core/Url.php
@@ -2,6 +2,8 @@
 
 namespace Civi\Core;
 
+use Civi\Core\Event\GenericHookEvent;
+
 /**
  * Generate a URL.
  *
@@ -31,6 +33,7 @@
  * Additionally, the setters+adders accept arrays.
  *
  * This cl
+ *
  * @see \Civi::url()
  */
 final class Url implements \JsonSerializable {
@@ -41,6 +44,28 @@ final class Url implements \JsonSerializable {
    */
   private $scheme;
 
+  /**
+   * NOTE: In most schemes, this field will be ignored.
+   * It is only handled for HTTP/HTTPS. I haven't looked through
+   * the edge-cases of mixing "host"ed vs non-"host"ed URLs. If
+   * you think through those edges and want to expose
+   * more helpers, cool.
+   *
+   * @var string
+   */
+  private $host;
+
+  /**
+   * NOTE: In most schemes, this field will be ignored.
+   * It is only handled for HTTP/HTTPS. I haven't looked through
+   * the edge-cases of mixing "host"ed vs non-"host"ed URLs. If
+   * you think through those edges and want to expose
+   * more helpers, cool.
+   *
+   * @var string
+   */
+  private $port;
+
   /**
    * @var string
    *   Ex: 'civicrm/dashboard'
@@ -151,15 +176,72 @@ protected function useUri(string $logicalUri): void {
     //   - `Civi::url('civicrm/event/info', 'f')`.
 
     $parsed = parse_url($logicalUri);
-    $this->scheme = $parsed['scheme'] ?? NULL;
-    $this->path = $parsed['host'] ?? NULL;
-    if (isset($parsed['path'])) {
-      $this->path .= $parsed['path'];
+    if ($parsed === FALSE && preg_match(';^(\w+)://$;', $logicalUri, $m)) {
+      $parsed = ['scheme' => $m[1], 'path' => ''];
     }
-    $this->query = $parsed['query'] ?? NULL;
+    $this->setScheme($parsed['scheme'] ?? '');
+    if (in_array($this->scheme, ['http', 'https'])) {
+      $this->host = $parsed['host'];
+      $this->port = $parsed['port'] ?? '';
+      $this->path = $parsed['path'] ?? '';
+    }
+    else {
+      $this->path = $parsed['host'] ?? '';
+      if (isset($parsed['path'])) {
+        $this->path .= $parsed['path'];
+      }
+    }
+    $this->query = $parsed['query'] ?? '';
     $fragmentParts = isset($parsed['fragment']) ? explode('?', $parsed['fragment'], 2) : [];
-    $this->fragment = $fragmentParts[0] ?? NULL;
-    $this->fragmentQuery = $fragmentParts[1] ?? NULL;
+    $this->fragment = $fragmentParts[0] ?? '';
+    $this->fragmentQuery = $fragmentParts[1] ?? '';
+  }
+
+  /**
+   * Take another URL. Add its components into the components of this URL.
+   *
+   * @param \Civi\Core\Url $other
+   * @param string[] $parts
+   *   Ex: ['path', 'query', 'fragment', 'fragmentQuery', 'flags']
+   *
+   * @return $this
+   */
+  public function merge(Url $other, array $parts) {
+    foreach ($parts as $part) {
+      switch ($part) {
+        case 'path':
+          $this->addPath($other->getPath());
+          break;
+
+        case 'query':
+          $this->addQuery($other->getQuery());
+          break;
+
+        case 'fragment':
+          $this->addFragment($other->getFragment());
+          break;
+
+        case 'fragmentQuery':
+          $this->addFragmentQuery($other->getFragmentQuery());
+          break;
+
+        case 'flags':
+          if ($other->ssl !== NULL) {
+            $this->setSsl($other->getSsl());
+          }
+          if ($other->cacheCode !== NULL) {
+            $this->setCacheCode($other->getCacheCode());
+          }
+          if ($other->preferFormat !== NULL) {
+            $this->setPreferFormat($other->getPreferFormat());
+          }
+          break;
+
+        default:
+          throw new \CRM_Core_Exception("Unrecognized URL merge flag: $part");
+      }
+    }
+    return $this;
   }
 
   /**
@@ -171,11 +253,14 @@ public function getScheme() {
   }
 
   /**
-   * @param string $scheme
+   * @param string|null $scheme
    *   Ex: 'frontend' or 'backend'
    */
-  public function setScheme(string $scheme): Url {
+  public function setScheme(?string $scheme): Url {
     $this->scheme = $scheme;
+    if ($scheme === 'https') {
+      $this->setSsl(TRUE);
+    }
     return $this;
   }
 
@@ -566,9 +651,23 @@ public function __toString(): string {
         $result = \Civi::resources()->getUrl($parts[0], $parts[1] ?? NULL, FALSE) . $this->composeQuery();
         break;
 
+      case 'http':
+      case 'https':
+        $port = is_numeric($this->port) ? ":{$this->port}" : "";
+        $path = $this->getPath();
+        $result = $this->getScheme() . '://' . $this->host . $port . $path . $this->composeQuery();
+        break;
+
       // Handle 'frontend', 'backend', 'service', and any extras.
       default:
         $result = $userSystem->getRouteUrl($scheme, $this->getPath(), $this->getQuery());
+        if ($result === NULL) {
+          $event = GenericHookEvent::create(['url' => $this, 'result' => &$result]);
+          \Civi::dispatcher()->dispatch('civi.url.render.' . $scheme, $event);
+          if ($result instanceof Url) {
+            return $result->__toString();
+          }
+        }
         if ($result === NULL) {
           throw new \RuntimeException("Unknown URL scheme: $scheme");
         }
@@ -690,11 +789,11 @@ private static function encodePath($path): ?string {
   }
 
   private static function appendString(?string &$var, string $separator, ?string $value): void {
-    if ($value === NULL) {
+    if ($value === NULL || $value === '') {
       return;
     }
 
-    if ($var === NULL) {
+    if ($var === NULL || $var === '') {
       $var = $value;
       return;
     }
diff --git a/www/modules/civicrm/Civi/Crypto/CryptoJwt.php b/www/modules/civicrm/Civi/Crypto/CryptoJwt.php
index 823bd37b4..b9c83afcf 100644
--- a/www/modules/civicrm/Civi/Crypto/CryptoJwt.php
+++ b/www/modules/civicrm/Civi/Crypto/CryptoJwt.php
@@ -11,6 +11,7 @@
 
 namespace Civi\Crypto;
 
+use Civi\Core\Service\AutoService;
 use Civi\Crypto\Exception\CryptoException;
 use Firebase\JWT\JWT;
 use Firebase\JWT\Key;
@@ -25,8 +26,9 @@
  *
  * @package Civi\Crypto
  * @see https://jwt.io/
+ * @service crypto.jwt
  */
-class CryptoJwt {
+class CryptoJwt extends AutoService {
 
   /**
    * @var \Civi\Crypto\CryptoRegistry
diff --git a/www/modules/civicrm/Civi/Crypto/CryptoRegistry.php b/www/modules/civicrm/Civi/Crypto/CryptoRegistry.php
index b45927c8f..52b2964c9 100644
--- a/www/modules/civicrm/Civi/Crypto/CryptoRegistry.php
+++ b/www/modules/civicrm/Civi/Crypto/CryptoRegistry.php
@@ -11,6 +11,7 @@
 
 namespace Civi\Crypto;
 
+use Civi\Core\Service\AutoService;
 use Civi\Crypto\Exception\CryptoException;
 
 /**
@@ -30,7 +31,7 @@
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
-class CryptoRegistry {
+class CryptoRegistry extends AutoService {
 
   const LAST_WEIGHT = 32768;
 
@@ -60,6 +61,7 @@ class CryptoRegistry {
    * @return \Civi\Crypto\CryptoRegistry
    * @throws \CRM_Core_Exception
    * @throws \Civi\Crypto\Exception\CryptoException
+   * @service crypto.registry
    */
   public static function createDefaultRegistry(): CryptoRegistry {
     $registry = new static();
diff --git a/www/modules/civicrm/Civi/Crypto/CryptoToken.php b/www/modules/civicrm/Civi/Crypto/CryptoToken.php
index afe415d84..32b74d26b 100644
--- a/www/modules/civicrm/Civi/Crypto/CryptoToken.php
+++ b/www/modules/civicrm/Civi/Crypto/CryptoToken.php
@@ -11,6 +11,7 @@
 
 namespace Civi\Crypto;
 
+use Civi\Core\Service\AutoService;
 use Civi\Crypto\Exception\CryptoException;
 
 /**
@@ -42,8 +43,9 @@
  *           "t", the text (base64-encoded ciphertext)
  *
  * @package Civi\Crypto
+ * @service crypto.token
  */
-class CryptoToken {
+class CryptoToken extends AutoService {
 
   /**
    * Format identification code
diff --git a/www/modules/civicrm/Civi/Custom/EventSubscriber/FkEntityDeleteSubscriber.php b/www/modules/civicrm/Civi/Custom/EventSubscriber/FkEntityDeleteSubscriber.php
new file mode 100644
index 000000000..bed9e3407
--- /dev/null
+++ b/www/modules/civicrm/Civi/Custom/EventSubscriber/FkEntityDeleteSubscriber.php
@@ -0,0 +1,70 @@
+<?php
+declare(strict_types = 1);
+
+namespace Civi\Custom\EventSubscriber;
+
+use Civi\Core\Event\PreEvent;
+use Civi\Core\Service\AutoSubscriber;
+
+final class FkEntityDeleteSubscriber extends AutoSubscriber {
+
+  public static function getSubscribedEvents(): array {
+    return [
+      'hook_civicrm_pre' => 'onPre',
+    ];
+  }
+
+  public function onPre(PreEvent $event): void {
+    // Set NULL on real deletion is part of the database schema and does not
+    // need to be handled here.
+    if ('delete' === $event->action) {
+      $this->performCascadeDeletions($event->entity, (int) $event->id);
+    }
+  }
+
+  private function performCascadeDeletions(string $fkEntity, int $id): void {
+    foreach ($this->getReferenceFieldNames($fkEntity, 'cascade') as $entity => $referenceFieldName) {
+      civicrm_api4($entity, 'delete', [
+        'where' => [[$referenceFieldName, '=', $id]],
+      ]);
+    }
+  }
+
+  /**
+   * @phpstan-return iterable<string, string>
+   *   Entity name mapped to custom entity reference field name.
+   */
+  private function getReferenceFieldNames(string $fkEntity, string $onDelete): iterable {
+    $fkEntities = $this->getFkEntityTypes($fkEntity);
+
+    foreach (\CRM_Core_BAO_CustomGroup::getAll() as $group) {
+      foreach ($group['fields'] as $field) {
+        if ($field['data_type'] === 'EntityReference' && $field['fk_entity_on_delete'] === $onDelete
+          && in_array($field['fk_entity'], $fkEntities, TRUE)
+        ) {
+          yield $group['extends'] => $group['name'] . '.' . $field['name'];
+        }
+      }
+    }
+  }
+
+  /**
+   * @phpstan-return list<string>
+   */
+  private function getFkEntityTypes(string $fkEntity): array {
+    $contactTypes = \CRM_Contact_BAO_ContactType::basicTypes(TRUE);
+
+    // "Contact" should include all contact types (Individual, Organization, Household)
+    if ($fkEntity === 'Contact') {
+      return array_merge(['Contact'], $contactTypes);
+    }
+
+    // A contact type (e.g. "Individual") should include "Contact"
+    if (in_array($fkEntity, $contactTypes, TRUE)) {
+      return ['Contact', $fkEntity];
+    }
+
+    return [$fkEntity];
+  }
+
+}
diff --git a/www/modules/civicrm/Civi/Payment/PropertyBag.php b/www/modules/civicrm/Civi/Payment/PropertyBag.php
index c867d0066..d9b2c13fd 100644
--- a/www/modules/civicrm/Civi/Payment/PropertyBag.php
+++ b/www/modules/civicrm/Civi/Payment/PropertyBag.php
@@ -44,6 +44,8 @@ class PropertyBag implements \ArrayAccess {
     'billing_state_province'      => 'billingStateProvince',
     'state_province'              => 'billingStateProvince',
     'billingCountry'              => TRUE,
+    'billing_country'             => 'billingCountry',
+    'country'                     => 'billingCountry',
     'contactID'                   => TRUE,
     'contact_id'                  => 'contactID',
     'contributionID'              => TRUE,
@@ -79,6 +81,7 @@ class PropertyBag implements \ArrayAccess {
     'recurProcessorID'            => TRUE,
     'transactionID'               => TRUE,
     'transaction_id'              => 'transactionID',
+    'trxn_id'                     => 'transactionID',
     'trxnResultCode'              => TRUE,
     'isNotifyProcessorOnCancelRecur' => TRUE,
   ];
@@ -804,7 +807,7 @@ public function getCurrency($label = 'default') {
    */
   public function setCurrency($value, $label = 'default') {
     if (!preg_match('/^[A-Z]{3}$/', $value)) {
-      throw new \InvalidArgumentException("Attemted to setCurrency with a value that was not an ISO 3166-1 alpha 3 currency code");
+      throw new \InvalidArgumentException("Attempted to setCurrency with a value that was not an ISO 3166-1 alpha 3 currency code");
     }
     return $this->set('currency', $label, $value);
   }
diff --git a/www/modules/civicrm/Civi/Schema/EntityMetadataBase.php b/www/modules/civicrm/Civi/Schema/EntityMetadataBase.php
new file mode 100644
index 000000000..6c248f928
--- /dev/null
+++ b/www/modules/civicrm/Civi/Schema/EntityMetadataBase.php
@@ -0,0 +1,32 @@
+<?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\Schema;
+
+abstract class EntityMetadataBase implements EntityMetadataInterface {
+
+  /**
+   * @var string
+   */
+  protected string $entityName;
+
+  public function __construct(string $entityName) {
+    $this->entityName = $entityName;
+  }
+
+  /**
+   * @return array{name: string, table: string, class: string, module: string, getInfo: callable, getPaths: callable, getIndices: callable, getFields: callable, metaProvider: callable, storageProvider: callable}
+   */
+  protected function getEntity(): array {
+    return EntityRepository::getEntity($this->entityName);
+  }
+
+}
diff --git a/www/modules/civicrm/Civi/Schema/EntityMetadataInterface.php b/www/modules/civicrm/Civi/Schema/EntityMetadataInterface.php
new file mode 100644
index 000000000..16d96f994
--- /dev/null
+++ b/www/modules/civicrm/Civi/Schema/EntityMetadataInterface.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\Schema;
+
+interface EntityMetadataInterface {
+
+  public function getProperty(string $propertyName);
+
+  public function getFields(): array;
+
+  public function getOptions(string $fieldName, array $values = NULL): ?array;
+
+}
diff --git a/www/modules/civicrm/Civi/Schema/EntityProvider.php b/www/modules/civicrm/Civi/Schema/EntityProvider.php
new file mode 100644
index 000000000..c99abbea3
--- /dev/null
+++ b/www/modules/civicrm/Civi/Schema/EntityProvider.php
@@ -0,0 +1,90 @@
+<?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\Schema;
+
+final class EntityProvider {
+
+  /**
+   * @var string
+   */
+  private string $entityName;
+
+  /**
+   * @var EntityMetadataInterface
+   */
+  private $meta;
+
+  /**
+   * @var EntityStorageInterface
+   */
+  private $storage;
+
+  public function __construct(string $entityName) {
+    $this->entityName = $entityName;
+  }
+
+  public function getMeta(string $property) {
+    return $this->getMetaProvider()->getProperty($property);
+  }
+
+  public function getFields(): array {
+    return $this->getMetaProvider()->getFields();
+  }
+
+  public function getField(string $fieldName): ?array {
+    return $this->getFields()[$fieldName] ?? NULL;
+  }
+
+  public function getOptions(string $fieldName, array $values = NULL): ?array {
+    return $this->getMetaProvider()->getOptions($fieldName, $values);
+  }
+
+  public function writeRecords(array $records): array {
+    return $this->getStorageProvider()->writeRecords($records);
+  }
+
+  public function deleteRecords(array $records): array {
+    return $this->getStorageProvider()->deleteRecords($records);
+  }
+
+  private function getMetaProvider(): EntityMetadataInterface {
+    if (!isset($this->meta)) {
+      $entity = EntityRepository::getEntity($this->entityName);
+      if (isset($entity['metaProvider'])) {
+        return new $entity['metaProvider']($this->entityName);
+      }
+      if (isset($entity['getFields'])) {
+        return new SqlEntityMetadata($this->entityName);
+      }
+      if (isset($entity['table'])) {
+        return new LegacySqlEntityMetadata($this->entityName);
+      }
+      throw new \CRM_Core_Exception("Unknown entity $this->entityName");
+    }
+    return $this->meta;
+  }
+
+  private function getStorageProvider(): EntityStorageInterface {
+    if (!isset($this->storage)) {
+      $entity = EntityRepository::getEntity($this->entityName);
+      if (isset($entity['storageProvider'])) {
+        return new $entity['storageProvider']($this->entityName);
+      }
+      if (isset($entity['table'])) {
+        return new SqlEntityStorage($this->entityName);
+      }
+      throw new \CRM_Core_Exception("Unknown entity $this->entityName");
+    }
+    return $this->storage;
+  }
+
+}
diff --git a/www/modules/civicrm/Civi/Schema/EntityRepository.php b/www/modules/civicrm/Civi/Schema/EntityRepository.php
new file mode 100644
index 000000000..1fb849004
--- /dev/null
+++ b/www/modules/civicrm/Civi/Schema/EntityRepository.php
@@ -0,0 +1,79 @@
+<?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\Schema;
+
+/**
+ * Gathers and stores schema meatadata
+ */
+class EntityRepository {
+
+  private static $entities;
+
+  private static $tableIndex;
+
+  private static $classIndex;
+
+  /**
+   * @internal
+   * @return array
+   */
+  public static function getEntities(): array {
+    self::loadAll();
+    return self::$entities;
+  }
+
+  /**
+   * @internal
+   * @return array{name: string, table: string, class: string, module: string, getInfo: callable, getPaths: callable, getIndices: callable, getFields: callable, metaProvider: callable, storageProvider: callable}
+   */
+  public static function getEntity(string $entityName): ?array {
+    self::loadAll();
+    return self::$entities[$entityName] ?? NULL;
+  }
+
+  /**
+   * @internal
+   * @return array
+   */
+  public static function getTableIndex(): array {
+    self::loadAll();
+    return self::$tableIndex;
+  }
+
+  /**
+   * @internal
+   * @return array
+   */
+  public static function getClassIndex(): array {
+    self::loadAll();
+    return self::$classIndex;
+  }
+
+  public static function flush(): void {
+    self::$entities = NULL;
+  }
+
+  private static function loadAll(): void {
+    if (self::$entities) {
+      return;
+    }
+    // Temporary until the data file is moved
+    $allCoreTables = new \ReflectionClass('CRM_Core_DAO_AllCoreTables');
+    $dataFile = preg_replace('/\.php$/', '.data.php', $allCoreTables->getFileName());
+    $entityTypes = require $dataFile;
+    \CRM_Utils_Hook::entityTypes($entityTypes);
+    self::$entities = array_column($entityTypes, NULL, 'name');
+    self::$tableIndex = array_column($entityTypes, 'name', 'table');
+    self::$classIndex = array_column($entityTypes, 'name', 'class');
+  }
+
+}
diff --git a/www/modules/civicrm/Civi/Schema/EntityStorageInterface.php b/www/modules/civicrm/Civi/Schema/EntityStorageInterface.php
new file mode 100644
index 000000000..b449a16db
--- /dev/null
+++ b/www/modules/civicrm/Civi/Schema/EntityStorageInterface.php
@@ -0,0 +1,20 @@
+<?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\Schema;
+
+interface EntityStorageInterface {
+
+  public function writeRecords(array $records): array;
+
+  public function deleteRecords(array $records): array;
+
+}
diff --git a/www/modules/civicrm/Civi/Schema/LegacySqlEntityMetadata.php b/www/modules/civicrm/Civi/Schema/LegacySqlEntityMetadata.php
new file mode 100644
index 000000000..d4cf5d5fb
--- /dev/null
+++ b/www/modules/civicrm/Civi/Schema/LegacySqlEntityMetadata.php
@@ -0,0 +1,193 @@
+<?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\Schema;
+
+/**
+ * Supports older extensions that created dao-based entities with
+ * `civix generate:entity-boilerplate`.
+ */
+class LegacySqlEntityMetadata extends EntityMetadataBase {
+
+  /**
+   * @return string|\CRM_Core_DAO
+   */
+  public function getClassName(): string {
+    return $this->getEntity()['class'];
+  }
+
+  public function getProperty(string $propertyName) {
+    switch ($propertyName) {
+      case 'title':
+        return $this->getClassName()::getEntityTitle();
+
+      case 'title_plural':
+        return $this->getClassName()::getEntityTitle(TRUE);
+
+      case 'icon':
+        return $this->getClassName()::$_icon ?? NULL;
+
+      case 'paths':
+        return $this->getClassName()::getEntityPaths();
+
+      case 'label_field':
+        return $this->getClassName()::getLabelField();
+
+      case 'primary_keys':
+        return $this->getClassName()::$_primaryKey ?? ['id'];
+
+      case 'description':
+        return $this->getClassName()::getEntityDescription();
+
+      default:
+        return $this->getEntity()[$propertyName] ?? NULL;
+    }
+  }
+
+  public function getFields(): array {
+    $fields = [];
+    $primaryKeys = $this->getProperty('primary_keys');
+    foreach ($this->getClassName()::fields() as $uniqueName => $legacyField) {
+      $fieldName = $legacyField['name'];
+      $field = [
+        'title' => $legacyField['title'],
+        'sql_type' => $this->getSqlType($legacyField),
+        'input_type' => $legacyField['html']['type'] ?? NULL,
+        'description' => $legacyField['description'] ?? NULL,
+        'required' => $legacyField['required'] ?? FALSE,
+        'add' => $legacyField['add'] ?? NULL,
+        'usage' => $this->getUsage($legacyField),
+        'deprecated' => $legacyField['deprecated'] ?? FALSE,
+        'readonly' => $legacyField['readonly'] ?? FALSE,
+        'localizable' => !empty($legacyField['localizable']),
+        'localize_context' => $legacyField['localize_context'] ?? NULL,
+        'unique_title' => $legacyField['uniqueTitle'] ?? NULL,
+        'contact_type' => $legacyField['contactType'] ?? NULL,
+        'component' => $legacyField['component'] ?? NULL,
+        'serialize' => $legacyField['serialize'] ?? NULL,
+        'permission' => $legacyField['permission'] ?? NULL,
+      ];
+      if ($uniqueName !== $fieldName) {
+        $field['unique_name'] = $uniqueName;
+      }
+      if (array_key_exists('default', $legacyField)) {
+        $field['default'] = $legacyField['default'];
+        if ($field['default'] === 'NULL') {
+          $field['default'] = NULL;
+        }
+        elseif (is_string($field['default'])) {
+          $field['default'] = trim($field['default'], '"\'');
+          if (str_contains($field['sql_type'], 'int')) {
+            $field['default'] = (int) $field['default'];
+          }
+          if ($field['sql_type'] === 'boolean') {
+            $field['default'] = (bool) $field['default'];
+          }
+        }
+      }
+      unset($legacyField['html']['type']);
+      if (!empty($legacyField['html'])) {
+        $field['input_attrs'] = \CRM_Utils_Array::rekey($legacyField['html'], ['CRM_Utils_String', 'convertStringToSnakeCase']);
+      }
+      foreach (['rows', 'cols', 'maxlength'] as $attr) {
+        if (!empty($legacyField[$attr])) {
+          $field['input_attrs'][$attr] = $legacyField[$attr];
+        }
+      }
+      if (!empty($legacyField['pseudoconstant'])) {
+        $field['pseudoconstant'] = \CRM_Utils_Array::rekey($legacyField['pseudoconstant'], ['CRM_Utils_String', 'convertStringToSnakeCase']);
+        unset($field['pseudoconstant']['option_edit_path']);
+      }
+      if (!empty($legacyField['FKClassName'])) {
+        $field['entity_reference'] = [
+          'entity' => \CRM_Core_DAO_AllCoreTables::getEntityNameForClass($legacyField['FKClassName']),
+          // Making assumptions about key but this is a legacy filler & it doesn't really matter
+          'key' => 'id',
+        ];
+      }
+      // Making assumptions about the nature of an `entity_id` field but this is a legacy filler & it doesn't really matter
+      if ($fieldName === 'entity_id') {
+        $field['entity_reference'] = [
+          'dynamic_entity' => 'entity_table',
+          'key' => 'id',
+        ];
+      }
+      if (in_array($fieldName, $primaryKeys)) {
+        $field['primary_key'] = TRUE;
+        $field['auto_increment'] = TRUE;
+      }
+      $fields[$fieldName] = $field;
+    }
+    return $fields;
+  }
+
+  private function getSqlType(array $legacyField): string {
+    switch ($legacyField['type']) {
+      case \CRM_Utils_Type::T_INT:
+        return 'int';
+
+      case \CRM_Utils_Type::T_STRING:
+        return 'varchar' . (empty($legacyField['maxlength']) ? '' : "({$legacyField['maxlength']})");
+
+      case \CRM_Utils_Type::T_TEXT:
+        return 'text';
+
+      case \CRM_Utils_Type::T_LONGTEXT:
+        return 'longtext';
+
+      case \CRM_Utils_Type::T_BOOLEAN:
+        return 'boolean';
+
+      case \CRM_Utils_Type::T_FLOAT:
+        return 'double';
+
+      case \CRM_Utils_Type::T_MEDIUMBLOB:
+        return 'mediumblob';
+
+      case \CRM_Utils_Type::T_BLOB:
+        return 'blob';
+
+      case \CRM_Utils_Type::T_TIMESTAMP:
+        return 'timestamp';
+
+      case \CRM_Utils_Type::T_MONEY:
+        return 'decimal' . (empty($legacyField['precision']) ? '' : '(' . implode(',', $legacyField['precision']) . ')');
+
+      case \CRM_Utils_Type::T_DATE:
+        return 'date';
+
+      case \CRM_Utils_Type::T_DATE + \CRM_Utils_Type::T_TIME:
+        return 'datetime';
+
+      default:
+        throw new \CRM_Core_Exception('Unknown field type for ' . $legacyField['name']);
+    }
+  }
+
+  private function getUsage(array $legacyField): array {
+    if (isset($legacyField['usage'])) {
+      return array_keys(array_filter($legacyField['usage']));
+    }
+    $usage = [];
+    if (!empty($legacyField['import'])) {
+      $usage = ['import', 'duplicate_matching'];
+    }
+    if (!empty($legacyField['export'])) {
+      $usage[] = 'export';
+    }
+    return $usage;
+  }
+
+  public function getOptions(string $fieldName, array $values = NULL): ?array {
+    // TODO: Implement getOptions() method.
+  }
+
+}
diff --git a/www/modules/civicrm/Civi/Schema/SqlEntityMetadata.php b/www/modules/civicrm/Civi/Schema/SqlEntityMetadata.php
new file mode 100644
index 000000000..2add4837f
--- /dev/null
+++ b/www/modules/civicrm/Civi/Schema/SqlEntityMetadata.php
@@ -0,0 +1,47 @@
+<?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\Schema;
+
+class SqlEntityMetadata extends EntityMetadataBase {
+
+  public function getProperty(string $propertyName) {
+    switch ($propertyName) {
+      case 'primary_keys':
+        $keys = [];
+        foreach ($this->getFields() as $name => $field) {
+          if (!empty($field['primary_key'])) {
+            $keys[] = $name;
+          }
+        }
+        return $keys;
+
+      case 'paths':
+        if (isset($this->getEntity()['getPaths'])) {
+          return $this->getEntity()['getPaths']();
+        }
+        return [];
+
+      default:
+        return $this->getEntity()[$propertyName] ?? $this->getEntity()['getInfo']()[$propertyName] ?? NULL;
+
+    }
+  }
+
+  public function getFields(): array {
+    return $this->getEntity()['getFields']();
+  }
+
+  public function getOptions(string $fieldName, array $values = NULL): ?array {
+    // TODO: Implement getOptions() method.
+  }
+
+}
diff --git a/www/modules/civicrm/CRM/UF/Page/AJAX.php b/www/modules/civicrm/Civi/Schema/SqlEntityStorage.php
similarity index 51%
rename from www/modules/civicrm/CRM/UF/Page/AJAX.php
rename to www/modules/civicrm/Civi/Schema/SqlEntityStorage.php
index fd1526bd9..466d3fdb2 100644
--- a/www/modules/civicrm/CRM/UF/Page/AJAX.php
+++ b/www/modules/civicrm/Civi/Schema/SqlEntityStorage.php
@@ -9,27 +9,25 @@
  +--------------------------------------------------------------------+
  */
 
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
+namespace Civi\Schema;
 
-/**
- * This class contains all the function that are called using AJAX
- */
-class CRM_UF_Page_AJAX {
+class SqlEntityStorage implements EntityStorageInterface {
 
   /**
-   * Function the check whether the field belongs.
-   * to multi-record custom set
+   * @var string
    */
-  public static function checkIsMultiRecord() {
-    $customId = $_GET['customId'];
+  protected string $entityName;
+
+  public function __construct(string $entityName) {
+    $this->entityName = $entityName;
+  }
+
+  public function writeRecords(array $records): array {
+    // TODO: Implement writeRecords() method.
+  }
 
-    $isMultiple = CRM_Core_BAO_CustomField::isMultiRecordField($customId);
-    $isMultiple = ['is_multi' => $isMultiple];
-    CRM_Utils_JSON::output($isMultiple);
+  public function deleteRecords(array $records): array {
+    // TODO: Implement deleteRecords() method.
   }
 
 }
diff --git a/www/modules/civicrm/Civi/Schema/Traits/DataTypeSpecTrait.php b/www/modules/civicrm/Civi/Schema/Traits/DataTypeSpecTrait.php
index 1ffe6c388..9576ab9e1 100644
--- a/www/modules/civicrm/Civi/Schema/Traits/DataTypeSpecTrait.php
+++ b/www/modules/civicrm/Civi/Schema/Traits/DataTypeSpecTrait.php
@@ -42,7 +42,7 @@ trait DataTypeSpecTrait {
   public $fkEntity;
 
   /**
-   * @var string
+   * @var array
    */
   public $fkColumn;
 
@@ -128,18 +128,18 @@ public function setFkColumn($fkColumn) {
   }
 
   /**
-   * @return string
+   * @return array|null
    */
-  public function getDfkEntities() {
+  public function getDfkEntities(): ?array {
     return $this->dfkEntities;
   }
 
   /**
-   * @param string $dfkEntities
+   * @param array|null $dfkEntities
    *
    * @return $this
    */
-  public function setDfkEntities($dfkEntities) {
+  public function setDfkEntities(?array $dfkEntities) {
     $this->dfkEntities = $dfkEntities;
     return $this;
   }
diff --git a/www/modules/civicrm/Civi/Schema/Traits/OptionsSpecTrait.php b/www/modules/civicrm/Civi/Schema/Traits/OptionsSpecTrait.php
index 22df97adb..d7b65ba3f 100644
--- a/www/modules/civicrm/Civi/Schema/Traits/OptionsSpecTrait.php
+++ b/www/modules/civicrm/Civi/Schema/Traits/OptionsSpecTrait.php
@@ -33,31 +33,12 @@ trait OptionsSpecTrait {
   /**
    * @var callable
    */
-  private $optionsCallback;
+  public $optionsCallback;
 
   /**
    * @var array
    */
-  private $optionsCallbackParams = [];
-
-  /**
-   * @param array $values
-   * @param array|bool $return
-   * @param bool $checkPermissions
-   *
-   * @return array
-   */
-  public function getOptions($values = [], $return = TRUE, $checkPermissions = TRUE) {
-    if (!isset($this->options)) {
-      if ($this->optionsCallback) {
-        $this->options = ($this->optionsCallback)($this, $values, $return, $checkPermissions, $this->optionsCallbackParams);
-      }
-      else {
-        $this->options = FALSE;
-      }
-    }
-    return $this->options;
-  }
+  public $optionsCallbackParams = [];
 
   /**
    * @param array|bool $options
diff --git a/www/modules/civicrm/Civi/Test.php b/www/modules/civicrm/Civi/Test.php
index 5968f8603..cd7b1ff6d 100644
--- a/www/modules/civicrm/Civi/Test.php
+++ b/www/modules/civicrm/Civi/Test.php
@@ -31,15 +31,15 @@ class Test {
   public static function asPreInstall($callback) {
     $conn = \Civi\Test::pdo();
 
-    $oldEscaper = \CRM_Core_I18n::$SQL_ESCAPER;
+    $oldEscaper = $GLOBALS['CIVICRM_SQL_ESCAPER'] ?? NULL;
     \Civi\Test::$statics['testPreInstall'] = (\Civi\Test::$statics['testPreInstall'] ?? 0) + 1;
     try {
-      \CRM_Core_I18n::$SQL_ESCAPER = function ($text) use ($conn) {
+      $GLOBALS['CIVICRM_SQL_ESCAPER'] = function ($text) use ($conn) {
         return substr($conn->quote($text), 1, -1);
       };
       return $callback();
     } finally {
-      \CRM_Core_I18n::$SQL_ESCAPER = $oldEscaper;
+      $GLOBALS['CIVICRM_SQL_ESCAPER'] = $oldEscaper;
       \Civi\Test::$statics['testPreInstall']--;
       if (\Civi\Test::$statics['testPreInstall'] <= 0) {
         unset(\Civi\Test::$statics['testPreInstall']);
diff --git a/www/modules/civicrm/Civi/Test/Api3TestTrait.php b/www/modules/civicrm/Civi/Test/Api3TestTrait.php
index 5feb3689e..cd36716bd 100644
--- a/www/modules/civicrm/Civi/Test/Api3TestTrait.php
+++ b/www/modules/civicrm/Civi/Test/Api3TestTrait.php
@@ -420,7 +420,7 @@ public function runApi4Legacy($v3Entity, $v3Action, $v3Params = []) {
         unset($v3Params['option_group_id']);
       }
       if (isset($field['pseudoconstant'], $v3Params[$name]) && $field['type'] === \CRM_Utils_Type::T_INT && !is_numeric($v3Params[$name]) && is_string($v3Params[$name])) {
-        $v3Params[$name] = \CRM_Core_PseudoConstant::getKey(\CRM_Core_DAO_AllCoreTables::getFullName($v4Entity), $name, $v3Params[$name]);
+        $v3Params[$name] = \CRM_Core_PseudoConstant::getKey(\CRM_Core_DAO_AllCoreTables::getDAONameForEntity($v4Entity), $name, $v3Params[$name]);
       }
     }
 
diff --git a/www/modules/civicrm/Civi/Test/Api4TestTrait.php b/www/modules/civicrm/Civi/Test/Api4TestTrait.php
index 923ccf062..4e210b5f8 100644
--- a/www/modules/civicrm/Civi/Test/Api4TestTrait.php
+++ b/www/modules/civicrm/Civi/Test/Api4TestTrait.php
@@ -124,6 +124,7 @@ protected function getRequiredValuesToCreate(string $entity, array $values = [])
         ['readonly', 'IS EMPTY'],
       ],
       'orderBy' => ['required' => 'DESC'],
+      'checkPermissions' => FALSE,
     ], 'name');
 
     $extraValues = [];
@@ -246,7 +247,7 @@ private function getRequiredValue(array $field) {
       return $this->getFkID($field['fk_entity']);
     }
     if (!empty($field['dfk_entities'])) {
-      return $this->getFkID($field['dfk_entities'][0]);
+      return $this->getFkID(reset($field['dfk_entities']));
     }
     if (isset($field['default_value'])) {
       return $field['default_value'];
diff --git a/www/modules/civicrm/Civi/Test/CiviEnvBuilder/CoreSchemaStep.php b/www/modules/civicrm/Civi/Test/CiviEnvBuilder/CoreSchemaStep.php
index 5f8e56abf..f27c26be6 100644
--- a/www/modules/civicrm/Civi/Test/CiviEnvBuilder/CoreSchemaStep.php
+++ b/www/modules/civicrm/Civi/Test/CiviEnvBuilder/CoreSchemaStep.php
@@ -19,11 +19,10 @@ class CoreSchemaStep implements StepInterface {
    */
   public function getSql() {
     if (!isset(\Civi\Test::$statics['core_schema_sql'])) {
-      $schema = new \CRM_Core_CodeGen_Schema(\Civi\Test::codeGen());
-      $files = $schema->generateCreateSql();
+      $sql = \Civi::schemaHelper()->generateInstallSql();
       \Civi\Test::$statics['core_schema_sql'] = [
-        'digest' => md5($files['civicrm.mysql']),
-        'content' => $files['civicrm.mysql'],
+        'digest' => md5($sql),
+        'content' => $sql,
       ];
     }
     return \Civi\Test::$statics['core_schema_sql'];
diff --git a/www/modules/civicrm/Civi/Test/Data.php b/www/modules/civicrm/Civi/Test/Data.php
index 87116adfe..bcb190a25 100644
--- a/www/modules/civicrm/Civi/Test/Data.php
+++ b/www/modules/civicrm/Civi/Test/Data.php
@@ -22,7 +22,7 @@ public function populate() {
       $sqlDir = dirname(dirname(__DIR__)) . "/sql";
 
       if (!isset(\Civi\Test::$statics['locale_data'])) {
-        $schema = new \CRM_Core_CodeGen_Schema(\Civi\Test::codeGen());
+        $schema = new \CRM_Core_CodeGen_PhpSchema(\Civi\Test::codeGen());
         \Civi\Test::$statics['locale_data'] = $schema->generateLocaleDataSql('en_US');
       }
 
diff --git a/www/modules/civicrm/Civi/Test/EntityExample.php b/www/modules/civicrm/Civi/Test/EntityExample.php
index 71429867e..60cb41efb 100644
--- a/www/modules/civicrm/Civi/Test/EntityExample.php
+++ b/www/modules/civicrm/Civi/Test/EntityExample.php
@@ -42,7 +42,7 @@ public function __construct() {
   }
 
   protected function dao(): string {
-    return \CRM_Core_DAO_AllCoreTables::getFullName($this->entityName);
+    return \CRM_Core_DAO_AllCoreTables::getDAONameForEntity($this->entityName);
   }
 
   protected function bao(): string {
diff --git a/www/modules/civicrm/Civi/Test/EntityTrait.php b/www/modules/civicrm/Civi/Test/EntityTrait.php
index 6a3f0707b..8aae26e76 100644
--- a/www/modules/civicrm/Civi/Test/EntityTrait.php
+++ b/www/modules/civicrm/Civi/Test/EntityTrait.php
@@ -11,6 +11,8 @@
 
 namespace Civi\Test;
 
+use Civi\Core\Exception\DBQueryException;
+
 /**
  * Helper for tracking entities created in tests.
  */
@@ -58,6 +60,9 @@ protected function createTestEntity(string $entity, array $values, string $ident
       $result = \civicrm_api4($entity, 'create', ['values' => $values, 'checkPermissions' => FALSE])->single();
       $this->setTestEntityID($entity, $result['id'], $identifier);
     }
+    catch (DBQueryException $e) {
+      $this->fail('sql error when trying to create ' . $entity . ' : ' . "\n" . $e->getUserInfo());
+    }
     catch (\CRM_Core_Exception $e) {
       $this->fail('Failed to create ' . $entity . ' : ' . $e->getMessage());
     }
diff --git a/www/modules/civicrm/Civi/Test/EventTestTrait.php b/www/modules/civicrm/Civi/Test/EventTestTrait.php
index 61629d21d..f89915e93 100644
--- a/www/modules/civicrm/Civi/Test/EventTestTrait.php
+++ b/www/modules/civicrm/Civi/Test/EventTestTrait.php
@@ -14,7 +14,6 @@
 use Civi\Api4\Event;
 use Civi\Api4\ExampleData;
 use Civi\Api4\PriceFieldValue;
-use Civi\Api4\PriceSetEntity;
 use Civi\Api4\UFField;
 use Civi\Api4\UFGroup;
 use Civi\Api4\UFJoin;
@@ -51,22 +50,19 @@ trait EventTestTrait {
   protected function eventCreatePaid(array $eventParameters = [], array $priceSetParameters = [], string $identifier = 'PaidEvent'): array {
     $eventParameters = array_merge($this->getEventExampleData(), $eventParameters);
     $event = $this->eventCreate($eventParameters, $identifier);
-    if (empty($priceSetParameters['id'])) {
-      try {
+    try {
+      if (empty($priceSetParameters['id'])) {
         $this->eventCreatePriceSet($priceSetParameters, $identifier);
-        $this->setTestEntityID('PriceSetEntity', PriceSetEntity::create(FALSE)
-          ->setValues([
-            'entity_table' => 'civicrm_event',
-            'entity_id' => $event['id'],
-            'price_set_id' => $this->ids['PriceSet'][$identifier],
-          ])
-          ->execute()
-          ->first()['id'], $identifier);
-      }
-
-      catch (\CRM_Core_Exception $e) {
-        $this->fail('Failed to create PriceSetEntity: ' . $e->getMessage());
+        $priceSetParameters['id'] = $this->ids['PriceSet'][$identifier];
       }
+      $this->createTestEntity('PriceSetEntity', [
+        'entity_table' => 'civicrm_event',
+        'entity_id' => $event['id'],
+        'price_set_id' => $priceSetParameters['id'],
+      ], $identifier);
+    }
+    catch (\CRM_Core_Exception $e) {
+      $this->fail('Failed to create PriceSetEntity: ' . $e->getMessage());
     }
     return $event;
   }
@@ -292,7 +288,9 @@ private function createEventProfile(array $profile, string $identifier, bool $is
     try {
       $this->setTestEntity('UFJoin', UFJoin::create(FALSE)->setValues([
         'module' => $additionalSuffix ? 'CiviEvent_Additional' : 'CiviEvent',
+        'entity_table' => 'civicrm_event',
         'uf_group_id:name' => $profileName,
+        'entity_table' => 'civicrm_event',
         'entity_id' => $this->getEventID($identifier),
       ])->execute()->first(), $profileIdentifier);
     }
@@ -308,13 +306,13 @@ private function createEventProfile(array $profile, string $identifier, bool $is
    * @param string $identifier
    */
   private function eventCreatePriceSet(array $priceSetParameters, string $identifier): void {
-    $priceSetParameters = array_merge($priceSetParameters, [
+    $priceSetParameters = array_merge([
       'min_amount' => 0,
       'title' => 'Fundraising dinner',
       'name' => $identifier,
       'extends:name' => 'CiviEvent',
       'financial_type_id:name' => 'Event Fee',
-    ]);
+    ], $priceSetParameters);
 
     $this->createTestEntity('PriceSet', $priceSetParameters, $identifier);
     $this->createTestEntity('PriceField', [
diff --git a/www/modules/civicrm/Civi/Test/ExampleData/Contact/Barb.php b/www/modules/civicrm/Civi/Test/ExampleData/Contact/Barb.php
index 902bae423..6da2bf323 100644
--- a/www/modules/civicrm/Civi/Test/ExampleData/Contact/Barb.php
+++ b/www/modules/civicrm/Civi/Test/ExampleData/Contact/Barb.php
@@ -50,6 +50,13 @@ public function build(array &$example): void {
       'email_primary.email' => 'barb@testing.net',
       'email_greeting_display' => 'Dear Barb',
       'postal_greeting_display' => 'Dear Barb',
+      'address_billing.street_address' => '1407 Graymalkin Lane',
+      'address_billing.city' => 'New York',
+      'address_billing.supplemental_address_1' => 'Salem Center',
+      'address_billing.postal_code' => 10573,
+      'address_billing.name' => 'Xavier Institute for Higher Learning',
+      'address_billing.country_id' => \CRM_Core_PseudoConstant::getKey('CRM_Core_BAO_Address', 'country_id', 'United States'),
+      'address_billing.state_province_id:abbr' => 'NY',
     ];
   }
 
diff --git a/www/modules/civicrm/Civi/Test/ExampleData/Contribution/Euro5990.php b/www/modules/civicrm/Civi/Test/ExampleData/Contribution/Euro5990.php
index b3811b397..c06e546b6 100644
--- a/www/modules/civicrm/Civi/Test/ExampleData/Contribution/Euro5990.php
+++ b/www/modules/civicrm/Civi/Test/ExampleData/Contribution/Euro5990.php
@@ -28,6 +28,7 @@ public function build(array &$example): void {
       'net_amount' => 5990,
       'currency' => 'EUR',
       'source' => 'Online donation',
+      'invoice_number' => 56789,
       'amount_level' => 'premium purchased',
       'contribution_recur_id' => 50,
       'check_number' => '',
diff --git a/www/modules/civicrm/Civi/Test/ExampleData/Event/PaidEvent.php b/www/modules/civicrm/Civi/Test/ExampleData/Event/PaidEvent.php
index 39bd2c3cf..9f63c937d 100644
--- a/www/modules/civicrm/Civi/Test/ExampleData/Event/PaidEvent.php
+++ b/www/modules/civicrm/Civi/Test/ExampleData/Event/PaidEvent.php
@@ -38,6 +38,7 @@ public function build(array &$example): void {
       'pay_later_text' => 'Transfer funds',
       'pay_later_receipt' => 'Please transfer funds to our bank account.',
       'fee_label' => 'Event fees',
+      'allow_selfcancelxfer' => TRUE,
     ];
   }
 
diff --git a/www/modules/civicrm/Civi/Test/FormTrait.php b/www/modules/civicrm/Civi/Test/FormTrait.php
index 1e6bccf62..08803e442 100644
--- a/www/modules/civicrm/Civi/Test/FormTrait.php
+++ b/www/modules/civicrm/Civi/Test/FormTrait.php
@@ -45,6 +45,15 @@ public function getTestForm($formName, $submittedValues, array $urlParameters =
     return $this->form;
   }
 
+  /**
+   * Assert that the sent mail included the supplied string.
+   *
+   * @param array $errors
+   */
+  protected function assertValidationError(array $errors): void {
+    $this->assertEquals($errors, $this->form->getValidationOutput());
+  }
+
   /**
    * Assert that the sent mail included the supplied strings.
    *
@@ -63,7 +72,7 @@ protected function assertMailSentContainingStrings(array $strings, int $mailInde
    * @param array $strings
    * @param int $mailIndex
    */
-  protected function assertMailSentNotContainStrings(array $strings, int $mailIndex = 0): void {
+  protected function assertMailSentNotContainingStrings(array $strings, int $mailIndex = 0): void {
     foreach ($strings as $string) {
       $this->assertMailSentNotContainingString($string, $mailIndex);
     }
diff --git a/www/modules/civicrm/Civi/Test/FormWrapper.php b/www/modules/civicrm/Civi/Test/FormWrapper.php
index 2562f582f..a3abab03a 100644
--- a/www/modules/civicrm/Civi/Test/FormWrapper.php
+++ b/www/modules/civicrm/Civi/Test/FormWrapper.php
@@ -79,12 +79,31 @@ public function getTemplateVariables(): array {
     return $this->templateVariables;
   }
 
+  /**
+   * Get a variable assigned to the template.
+   *
+   * @return mixed
+   */
+  public function getTemplateVariable($string) {
+    return $this->templateVariables[$string];
+  }
+
   private $redirects;
 
   private $mailSpoolID;
 
+  /**
+   * @var array|bool
+   */
   private $validation;
 
+  /**
+   * @return array|bool
+   */
+  public function getValidationOutput() {
+    return $this->validation;
+  }
+
   private $originalMailSetting;
 
   public const CONSTRUCTED = 0;
@@ -94,7 +113,7 @@ public function getTemplateVariables(): array {
   public const SUBMITTED = 5;
 
   /**
-   * @var \CRM_Contribute_Import_Controller|\CRM_Core_Controller|\CRM_Event_Controller_Registration
+   * @var \CRM_Import_Controller|\CRM_Core_Controller|\CRM_Event_Controller_Registration
    */
   private $formController;
 
@@ -124,7 +143,8 @@ public function processForm(int $state = self::SUBMITTED): self {
       $this->form->buildForm();
     }
     if ($state > self::BUILT) {
-      $this->validation = $this->form->validate();
+      $this->form->validate();
+      $this->validation = $this->form->_errors;
     }
     if ($state > self::VALIDATED) {
       $this->postProcess();
@@ -143,9 +163,11 @@ public function processForm(int $state = self::SUBMITTED): self {
    * @return $this
    */
   public function addSubsequentForm(string $formName, array $formValues = []): FormWrapper {
-    /* @var \CRM_Core_Form */
+    /* @var \CRM_Core_Form $form */
     $form = new $formName();
     $form->controller = $this->form->controller;
+    $form->_submitValues = $formValues;
+    $form->controller->addPage($form);
     $_SESSION['_' . $this->form->controller->_name . '_container']['values'][$form->getName()] = $formValues;
     $this->subsequentForms[$form->getName()] = $form;
     return $this;
@@ -189,6 +211,8 @@ public function postProcess(): self {
       foreach ($this->subsequentForms as $form) {
         $form->preProcess();
         $form->buildForm();
+        $form->validate();
+        $this->validation[$form->getName()] = $form->_errors;
         $form->postProcess();
       }
     }
@@ -251,7 +275,7 @@ private function setFormObject(string $class, array $formValues = [], array $url
       case 'CRM_Contact_Import_Form_DataSource':
       case 'CRM_Contact_Import_Form_MapField':
       case 'CRM_Contact_Import_Form_Preview':
-        $this->form->controller = new \CRM_Contact_Import_Controller();
+        $this->form->controller = new \CRM_Import_Controller('Contact import', ['entity' => 'Contact']);
         $this->form->controller->setStateMachine(new \CRM_Core_StateMachine($this->form->controller));
         // The submitted values should be set on one or the other of the forms in the flow.
         // For test simplicity we set on all rather than figuring out which ones go where....
@@ -268,7 +292,7 @@ private function setFormObject(string $class, array $formValues = [], array $url
           $this->form->controller = $this->formController;
         }
         else {
-          $this->form->controller = new \CRM_Contribute_Import_Controller();
+          $this->form->controller = new \CRM_Import_Controller('Contribution import', ['entity' => 'Contribution']);
           $this->form->controller->setStateMachine(new \CRM_Core_StateMachine($this->form->controller));
           $this->formController = $this->form->controller;
         }
@@ -282,7 +306,7 @@ private function setFormObject(string $class, array $formValues = [], array $url
       case 'CRM_Member_Import_Form_DataSource':
       case 'CRM_Member_Import_Form_MapField':
       case 'CRM_Member_Import_Form_Preview':
-        $this->form->controller = new \CRM_Member_Import_Controller();
+        $this->form->controller = new \CRM_Import_Controller('Membership import', ['entity' => 'Membership']);
         $this->form->controller->setStateMachine(new \CRM_Core_StateMachine($this->form->controller));
         // The submitted values should be set on one or the other of the forms in the flow.
         // For test simplicity we set on all rather than figuring out which ones go where....
@@ -294,7 +318,7 @@ private function setFormObject(string $class, array $formValues = [], array $url
       case 'CRM_Event_Import_Form_DataSource':
       case 'CRM_Event_Import_Form_MapField':
       case 'CRM_Event_Import_Form_Preview':
-        $this->form->controller = new \CRM_Event_Import_Controller();
+        $this->form->controller = new \CRM_Import_Controller('Participant import', ['entity' => 'Participant']);
         $this->form->controller->setStateMachine(new \CRM_Core_StateMachine($this->form->controller));
         // The submitted values should be set on one or the other of the forms in the flow.
         // For test simplicity we set on all rather than figuring out which ones go where....
@@ -306,7 +330,7 @@ private function setFormObject(string $class, array $formValues = [], array $url
       case 'CRM_Activity_Import_Form_DataSource':
       case 'CRM_Activity_Import_Form_MapField':
       case 'CRM_Activity_Import_Form_Preview':
-        $this->form->controller = new \CRM_Activity_Import_Controller();
+        $this->form->controller = new \CRM_Import_Controller('Activity import', ['entity' => 'Activity']);
         $this->form->controller->setStateMachine(new \CRM_Core_StateMachine($this->form->controller));
         // The submitted values should be set on one or the other of the forms in the flow.
         // For test simplicity we set on all rather than figuring out which ones go where....
@@ -318,7 +342,7 @@ private function setFormObject(string $class, array $formValues = [], array $url
       case 'CRM_Custom_Import_Form_DataSource':
       case 'CRM_Custom_Import_Form_MapField':
       case 'CRM_Custom_Import_Form_Preview':
-        $this->form->controller = new \CRM_Custom_Import_Controller();
+        $this->form->controller = new \CRM_Import_Controller('Custom Value import', ['class_prefix' => 'CRM_Custom_Import']);
         $this->form->controller->setStateMachine(new \CRM_Core_StateMachine($this->form->controller));
         // The submitted values should be set on one or the other of the forms in the flow.
         // For test simplicity we set on all rather than figuring out which ones go where....
@@ -327,8 +351,16 @@ private function setFormObject(string $class, array $formValues = [], array $url
         $_SESSION['_' . $this->form->controller->_name . '_container']['values']['Preview'] = $formValues;
         return;
 
+      case $class === 'CRM_Contact_Form_Search_Basic':
+        $this->form->controller = new \CRM_Contact_Controller_Search('Basic', TRUE, \CRM_Core_Action::BASIC);
+        $this->form->setAction(\CRM_Core_Action::BASIC);
+        break;
+
       case strpos($class, 'Search') !== FALSE:
         $this->form->controller = new \CRM_Contact_Controller_Search();
+        if ($class === 'CRM_Contact_Form_Search_Basic') {
+          $this->form->setAction(\CRM_Core_Action::BASIC);
+        }
         break;
 
       case strpos($class, '_Form_') !== FALSE:
diff --git a/www/modules/civicrm/Civi/Token/TokenCompatSubscriber.php b/www/modules/civicrm/Civi/Token/TokenCompatSubscriber.php
index cb0506e1a..4b04ac5a8 100644
--- a/www/modules/civicrm/Civi/Token/TokenCompatSubscriber.php
+++ b/www/modules/civicrm/Civi/Token/TokenCompatSubscriber.php
@@ -71,7 +71,7 @@ public function onRender(TokenRenderEvent $e): void {
     // has an extra construct '{ }' which will resolve what is inside the {} if the
     // tokens on either side are resolved to 'something' (ie there is some sort of
     // non whitespace character after the string.
-    // Accepted variants of { } are {`} {|} {,} {`} {*} {-} {(} {)}
+    // Accepted variants of { } are {|} {,} {`} {*} {-} {(} {)}
     // In each case any amount of preceding or trailing whitespace is acceptable.
     // The accepted variants list contains known or suspected real world usages.
     // Regex is to capture  { followed by 0 or more white spaces followed by
@@ -81,6 +81,8 @@ public function onRender(TokenRenderEvent $e): void {
     // the captured string is followed by 1 or more non-white spaces.
     // If it is repeated it will be replaced by the first input -
     // ie { }{ } will be replaced by the content of the latter token.
+    // except that {(}, {)} and {`} are treated differently: repeated tokens are both removed
+    // eg {contact.first_name}{ }{ (}{contact.nick_name}{) }{contact.last_name} becomes "First Last", not "First )Last"
     // Check testGenerateDisplayNameCustomFormats for test cover.
     // and testMailingLabel
     // This first regex targets anything like {, }{ } - where the presence of the space
@@ -88,11 +90,41 @@ public function onRender(TokenRenderEvent $e): void {
     // {contact.address_primary.city}{, }{contact.address_primary.state_province_id:label}{ }{contact.address_primary.postal_code}
     // Where state_province is not present. No perfect solution here but we
     // do want to keep the comma in this case.
-    $e->string = preg_replace('/\\\\|{(\s*([,`~()\-*|])*\s*)?}}*({\s})/', '$1', $e->string);
-    $e->string = preg_replace('/\\\\|{(\s*(\s|,|`|~|\(|\)|-|\*|\|)*\s*)?\}}*(?=[^{\s])/', '$1', $e->string);
-    // Now do a another pass, removing any remaining instances (which will get rid of any that were not
-    // followed by something).
-    $e->string = preg_replace('/\\\\|' . '\{(\s*(\s|,|`|~|\(|\)|-|\*|\|)*\s?)?\}/', '', $e->string);
+
+    // Pattern to match all curlies
+    $any_curly = '\{(?:\s+|\s*[,~()`\-*|]*\s*)\}';
+
+    // Pattern to match curlies occuring in pairs - ie {(} {)} {`}
+    $paired_curly = '\{(?:\s*[`()]\s*)\}';
+
+    // Pattern to match other curlies
+    $unpaired_curly = '\{(?:\s+|\s*[,~\-*|]*\s*)\}';
+
+    // Captures the inside of a curly
+    $curly_inner = '\{(\s+|\s*[,~()`\-*|]*\s*)\}';
+
+    $regexes = [];
+
+    // Special oddball for addresses: {, }{ } -> {, }
+    $regexes[] = ["/(\{,\s+\})\s*\{\s+\}/", '$1'];
+
+    // Remove two adjacent paired curlies
+    $regexes[] = ["/$paired_curly\s*$paired_curly/", ''];
+
+    // Replace multiple adjacent curlies with the last
+    $regexes[] = ["/(?:$any_curly\s*)+($any_curly)/", '$1'];
+
+    // Remove leading unpaired curly
+    $regexes[] = ["/^\s*$unpaired_curly/", ''];
+
+    // Remove trailing unpaired curly
+    $regexes[] = ["/$unpaired_curly\s*$/", ''];
+
+    // Finally replace curlies with the inner content
+    $regexes[] = ["/$curly_inner/", '$1'];
+
+    $e->string = preg_replace(array_column($regexes, 0), array_column($regexes, 1), $e->string);
+
     if ($useSmarty) {
       $smartyVars = [];
       foreach ($e->context['smartyTokenAlias'] ?? [] as $smartyName => $tokenName) {
diff --git a/www/modules/civicrm/Civi/Token/TokenProcessor.php b/www/modules/civicrm/Civi/Token/TokenProcessor.php
index 09bcbb080..a7133eb5e 100644
--- a/www/modules/civicrm/Civi/Token/TokenProcessor.php
+++ b/www/modules/civicrm/Civi/Token/TokenProcessor.php
@@ -153,7 +153,7 @@ public function addMessage($name, $value, $format) {
     $tokens = [];
     $this->visitTokens($value ?: '', function (?string $fullToken, ?string $entity, ?string $field, ?array $modifier) use (&$tokens) {
       $tokens[$entity][] = $field;
-    });
+    }, $format);
     $this->messages[$name] = [
       'string' => $value,
       'format' => $format,
@@ -393,7 +393,7 @@ public function render($name, $row) {
     $event->message = $message;
     $event->context = $row->context;
     $event->row = $row;
-    $event->string = $this->visitTokens($message['string'] ?? '', $getToken);
+    $event->string = $this->visitTokens($message['string'] ?? '', $getToken, $message['format']);
     $this->dispatcher->dispatch('civi.token.render', $event);
     return $event->string;
   }
@@ -408,27 +408,41 @@ public function render($name, $row) {
    * @param callable $callback
    *   A function which visits (and substitutes) each token.
    *   function(?string $fullToken, ?string $entity, ?string $field, ?array $modifier)
+   * @param string|null $format
+   *
    * @return string
    */
-  public function visitTokens(string $expression, callable $callback): string {
+  public function visitTokens(string $expression, callable $callback, ?string $format = 'text/html'): string {
     // Regex examples: '{foo.bar}', '{foo.bar|whiz}', '{foo.bar|whiz:"bang"}', '{foo.bar|whiz:"bang":"bang"}'
     // Regex counter-examples: '{foobar}', '{foo bar}', '{$foo.bar}', '{$foo.bar|whiz}', '{foo.bar|whiz{bang}}'
     // Key observations: Civi tokens MUST have a `.` and MUST NOT have a `$`. Civi filters MUST NOT have `{}`s or `$`s.
 
-    static $fullRegex = NULL;
-    if ($fullRegex === NULL) {
-      // The regex is a bit complicated, we so break it down into fragments.
-      // Consider the example '{foo.bar|whiz:"bang":"bang"}'. Each fragment matches the following:
-
-      $tokenRegex = '([\w]+)\.([\w:\.]+)'; /* MATCHES: 'foo.bar' */
-      $filterArgRegex = ':[\w": %\-_()\[\]\+/#@!,\.\?]*'; /* MATCHES: ':"bang":"bang"' */
-      // Key rule of filterArgRegex is to prohibit '{}'s because they may parse ambiguously. So you *might* relax it to:
-      // $filterArgRegex = ':[^{}\n]*'; /* MATCHES: ':"bang":"bang"' */
-      $filterNameRegex = "\w+"; /* MATCHES: 'whiz' */
-      $filterRegex = "\|($filterNameRegex(?:$filterArgRegex)?)"; /* MATCHES: '|whiz:"bang":"bang"' */
-      $fullRegex = ";\{$tokenRegex(?:$filterRegex)?\};";
-    }
-    return preg_replace_callback($fullRegex, function($m) use ($callback) {
+    $quoteStrings = $format === 'text/html' ? [
+      // Note we just treat left & right quotes as quotes. Our brains are not big enough to enforce them
+      // & maybe user brains are not big enough to use them correctly anyway.
+      '"',
+      '&lquote\;',
+      '&rquote\;',
+      '&quot\;',
+      '&#8221\;',
+      '&#8220\;',
+      '&#x22\;',
+    ] : ['"'];
+
+    // The regex is a bit complicated, we so break it down into fragments.
+    // Consider the example '{foo.bar|whiz:"bang":"bang"}'. Each fragment matches the following:
+
+    $tokenRegex = '([\w]+)\.([\w:\.]+)';
+    $quoteRegex = '(?:' . implode('|', $quoteStrings) . ')';
+    /* MATCHES: 'foo.bar' */
+    $filterArgRegex = ':[\w' . $quoteRegex . ': %\-_()\[\]\+/#@!,\.\?]*'; /* MATCHES: ':"bang":"bang"' */
+    // Key rule of filterArgRegex is to prohibit '{}'s because they may parse ambiguously. So you *might* relax it to:
+    // $filterArgRegex = ':[^{}\n]*'; /* MATCHES: ':"bang":"bang"' */
+    $filterNameRegex = "\w+"; /* MATCHES: 'whiz' */
+    $filterRegex = "\|($filterNameRegex(?:$filterArgRegex)?)"; /* MATCHES: '|whiz:"bang":"bang"' */
+    $fullRegex = ";\{$tokenRegex(?:$filterRegex)?\};";
+
+    return preg_replace_callback($fullRegex, function($m) use ($callback, $quoteStrings) {
       $filterParts = NULL;
       if (isset($m[3])) {
         $filterParts = [];
@@ -436,9 +450,11 @@ public function visitTokens(string $expression, callable $callback): string {
           $filterParts[] = $m[1];
           return '';
         };
+        $quoteOptions = implode('|', $quoteStrings);
+        $quotedRegex = ':' . '(?:' . $quoteOptions . ')' . '(.+?(?=' . $quoteOptions . ')+)' . '(?:' . $quoteOptions . ')';
         $unmatched = preg_replace_callback_array([
           '/^(\w+)/' => $enqueue,
-          '/:"([^"]+)"/' => $enqueue,
+          ';' . $quotedRegex . ';' => $enqueue,
         ], $m[3]);
         if ($unmatched) {
           throw new \CRM_Core_Exception('Malformed token parameters (' . $m[0] . ')');
diff --git a/www/modules/civicrm/Civi/WorkflowMessage/Traits/CustomFieldTrait.php b/www/modules/civicrm/Civi/WorkflowMessage/Traits/CustomFieldTrait.php
index af794d492..06a5166c3 100644
--- a/www/modules/civicrm/Civi/WorkflowMessage/Traits/CustomFieldTrait.php
+++ b/www/modules/civicrm/Civi/WorkflowMessage/Traits/CustomFieldTrait.php
@@ -29,13 +29,47 @@ trait CustomFieldTrait {
    *    context so the user is an admin not the recipient).
    *
    * @param string $entity
-   * @param array $filters
+   * @param array $extendsEntity
    *
    * @return array
    * @throws \CRM_Core_Exception
    */
-  protected function getFilteredCustomFields(string $entity, array $filters = []): array {
-    return \CRM_Core_BAO_CustomField::getViewableCustomFields($entity, $filters);
+  protected function getFilteredCustomFields(string $entity, array $extendsEntity = []): array {
+    $fields = $entityFilters = [];
+    // Convert from ['ParticipantRole' = [1], 'ParticipantEventType' => 2], ['ParticipantEventName' => 3]
+    // to [1 => [1], 2 => [2], 3 = [3]
+    if (!empty($extendsEntity)) {
+      $entityColumns = \CRM_Core_BAO_CustomGroup::getExtendsEntityColumnIdOptions(NULL, ['values' => ['extends' => $entity]]);
+      foreach ($entityColumns as $entityColumn) {
+        if (isset($extendsEntity[$entityColumn['name']])) {
+          $entityFilters[(int) $entityColumn['id']] = (array) $extendsEntity[$entityColumn['name']];
+          foreach ($entityFilters[$entityColumn['id']] as &$value) {
+            // Cast to string because we don't want the calling function to have to worry
+            // but also the array intersect fails otherwise.
+            $value = (string) $value;
+          }
+        }
+      }
+    }
+    $groupFilters = [
+      'is_active' => TRUE,
+      'is_public' => TRUE,
+      'extends' => $entity,
+    ];
+    $allGroups = \CRM_Core_BAO_CustomGroup::getAll($groupFilters, \CRM_Core_Permission::VIEW);
+    foreach ($allGroups as $group) {
+      $entityValueMatches = array_intersect((array) $group['extends_entity_column_value'], ($entityFilters[$group['extends_entity_column_id']] ?? []));
+      if ($entityValueMatches || !$entityFilters || empty($group['extends_entity_column_id'])) {
+        foreach ($group['fields'] as $field) {
+          if (!$field['is_view']) {
+            $field += \CRM_Utils_Array::prefixKeys(array_diff_key($group, ['fields' => 1]), 'custom_group_id.');
+            $field['custom_group_id'] = $group['id'];
+            $fields[$field['id']] = $field;
+          }
+        }
+      }
+    }
+    return $fields;
   }
 
   /**
diff --git a/www/modules/civicrm/ang/api4Explorer/Explorer.html b/www/modules/civicrm/ang/api4Explorer/Explorer.html
index db7057d3b..bc9fc2430 100644
--- a/www/modules/civicrm/ang/api4Explorer/Explorer.html
+++ b/www/modules/civicrm/ang/api4Explorer/Explorer.html
@@ -82,15 +82,15 @@ <h1 crm-page-title>
         </fieldset>
         <div class="api4-input form-inline" ng-mouseenter="help('fields', availableParams.fields)" ng-mouseleave="help()" ng-if="::availableParams.fields">
           <label for="api4-param-fields">fields<span class="crm-marker" ng-if="::availableParams.fields.required"> *</span></label>
-          <input class="form-control" ng-list crm-ui-select="::{data: fields, multiple: true}" id="api4-param-fields" ng-model="params.fields" style="width: 85%;"/>
+          <input class="form-control" ng-list="
" crm-ui-select="::{data: fields, multiple: true, separator: '\u0001'}" id="api4-param-fields" ng-model="params.fields" style="width: 85%;"/>
         </div>
         <div class="api4-input form-inline" ng-mouseenter="help('action', availableParams.action)" ng-mouseleave="help()"ng-if="::availableParams.action">
           <label for="api4-param-action">action<span class="crm-marker" ng-if="::availableParams.action.required"> *</span></label>
           <input class="form-control" crm-ui-select="{data: actions, allowClear: true, placeholder: 'None'}" id="api4-param-action" ng-model="params.action"/>
         </div>
-        <div class="api4-input form-inline" ng-mouseenter="help(name, param)" ng-mouseleave="help()" ng-repeat="(name, param) in ::getGenericParams(['string', 'int'])">
+        <div class="api4-input form-inline" ng-mouseenter="help(name, param)" ng-mouseleave="help()" ng-repeat="(name, param) in ::getGenericParams(['string', 'int', 'float'])">
           <label for="api4-param-{{:: name }}">{{:: name }}<span class="crm-marker" ng-if="::param.required"> *</span></label>
-          <input class="form-control" ng-if="::!param.options" type="{{:: param.type[0] === 'int' && param.type.length === 1 ? 'number' : 'text' }}" id="api4-param-{{:: name }}" ng-model="params[name]"/>
+          <input class="form-control" ng-if="::!param.options" type="{{:: (param.type[0] === 'int' || param.type[0] === 'float') && param.type.length === 1 ? 'number' : 'text' }}" id="api4-param-{{:: name }}" ng-model="params[name]"/>
           <select class="form-control" ng-if="::param.options" ng-options="o for o in ::param.options" id="api4-param-{{:: name }}" ng-model="params[name]"></select>
           <a href class="crm-hover-button" title="Clear" ng-click="clearParam(name)" ng-show="!!params[name]"><i class="crm-i fa-times" aria-hidden="true"></i></a>
         </div>
diff --git a/www/modules/civicrm/ang/api4Explorer/Explorer.js b/www/modules/civicrm/ang/api4Explorer/Explorer.js
index 12c922db2..731ee070a 100644
--- a/www/modules/civicrm/ang/api4Explorer/Explorer.js
+++ b/www/modules/civicrm/ang/api4Explorer/Explorer.js
@@ -1275,16 +1275,17 @@
           } else if (_.includes(['=', '!=', '<>', 'IN', 'NOT IN'], op) && (field.fk_entity || field.options || dataType === 'Boolean')) {
            if (field.options) {
               var id = field.pseudoconstant || 'id';
-              $el.addClass('loading').attr('placeholder', ts('- select -')).crmSelect2({multiple: multi, data: [{id: '', text: ''}]});
+              $el.addClass('loading').attr('placeholder', ts('- select -')).crmSelect2({multiple: multi, separator: "\u0001", data: [{id: '', text: ''}]});
               loadFieldOptions(field.entity || entity).then(function(data) {
                 var options = _.transform(data[field.name].options, function(options, opt) {
                   options.push({id: opt[id], text: opt.label, description: opt.description, color: opt.color, icon: opt.icon});
                 }, []);
-                $el.removeClass('loading').crmSelect2({data: options, multiple: multi});
+                $el.removeClass('loading').crmSelect2({data: options, multiple: multi, separator: "\u0001"});
               });
             } else if (field.fk_entity) {
               $el.crmAutocomplete(field.fk_entity, {fieldName: field.entity + '.' + field.name, key: field.id_field || null}, {
                 multiple: multi,
+                separator: "\u0001",
                 static: field.fk_entity === 'Contact' ? ['user_contact_id'] : [],
                 minimumInputLength: field.fk_entity === 'Contact' ? 1 : 0
               });
@@ -1323,7 +1324,7 @@
           var list = [];
 
           if (viewValue) {
-            _.each(viewValue.split(','), function(value) {
+            _.each(viewValue.split("\u0001"), function(value) {
               if (value) list.push(_.trim(value));
             });
           }
diff --git a/www/modules/civicrm/ang/crmUi.js b/www/modules/civicrm/ang/crmUi.js
index 669733ca6..986f88d74 100644
--- a/www/modules/civicrm/ang/crmUi.js
+++ b/www/modules/civicrm/ang/crmUi.js
@@ -14,7 +14,7 @@
         scope: {
           crmUiAccordion: '='
         },
-        template: '<details class="crm-accordion-wrapper"><summary class="crm-accordion-header">{{crmUiAccordion.title}} <a crm-ui-help="help" ng-if="help"></a></summary><div class="crm-accordion-body" ng-transclude></div></details>',
+        template: '<details class="crm-accordion-bold"><summary>{{crmUiAccordion.title}} <a crm-ui-help="help" ng-if="help"></a></summary><div class="crm-accordion-body" ng-transclude></div></details>',
         transclude: true,
         link: function (scope, element, attrs) {
           scope.help = null;
@@ -82,17 +82,21 @@
           ngModel.$render = function () {
             element.val(ngModel.$viewValue).change();
           };
+          let settings = angular.copy(scope.crmUiDatepicker || {});
+          // Set defaults to be non-restrictive
+          settings.start_date_years = settings.start_date_years || 100;
+          settings.end_date_years = settings.end_date_years || 100;
 
           element
-            .crmDatepicker(scope.crmUiDatepicker)
+            .crmDatepicker(settings)
             .on('change', function() {
               // Because change gets triggered from the $render function we could be either inside or outside the $digest cycle
               $timeout(function() {
-                var requiredLength = 19;
-                if (scope.crmUiDatepicker && scope.crmUiDatepicker.time === false) {
+                let requiredLength = 19;
+                if (settings.time === false) {
                   requiredLength = 10;
                 }
-                if (scope.crmUiDatepicker && scope.crmUiDatepicker.date === false) {
+                if (settings.date === false) {
                   requiredLength = 8;
                 }
                 ngModel.$setValidity('incompleteDateTime', !(element.val().length && element.val().length !== requiredLength));
@@ -616,7 +620,7 @@
                 var newVal = _.cloneDeep(ngModel.$modelValue);
                 // Fix possible data-type mismatch
                 if (typeof newVal === 'string' && element.select2('container').hasClass('select2-container-multi')) {
-                  newVal = newVal.length ? newVal.split(',') : [];
+                  newVal = newVal.length ? newVal.split(scope.crmUiSelect.separator || ',') : [];
                 }
                 element.select2('val', newVal);
               });
@@ -624,6 +628,10 @@
           }
           function refreshModel() {
             var oldValue = ngModel.$viewValue, newValue = element.select2('val');
+            // Let ng-list do the splitting
+            if (Array.isArray(newValue) && attrs.ngList) {
+              newValue = newValue.join(attrs.ngList);
+            }
             if (oldValue != newValue) {
               scope.$parent.$apply(function () {
                 ngModel.$setViewValue(newValue);
diff --git a/www/modules/civicrm/api/api.php b/www/modules/civicrm/api/api.php
index 4fd54bcfd..64b9caad7 100644
--- a/www/modules/civicrm/api/api.php
+++ b/www/modules/civicrm/api/api.php
@@ -302,5 +302,5 @@ function _civicrm_api_get_entity_name_from_camel($entity) {
  * @return string
  */
 function _civicrm_api_get_entity_name_from_dao($bao) {
-  return CRM_Core_DAO_AllCoreTables::getBriefName(get_class($bao));
+  return CRM_Core_DAO_AllCoreTables::getEntityNameForClass(get_class($bao));
 }
diff --git a/www/modules/civicrm/api/v3/Contribution.php b/www/modules/civicrm/api/v3/Contribution.php
index 043405d97..650f74364 100644
--- a/www/modules/civicrm/api/v3/Contribution.php
+++ b/www/modules/civicrm/api/v3/Contribution.php
@@ -196,7 +196,7 @@ function _civicrm_api3_contribution_create_legacy_support_45(&$params) {
     $params['soft_credit'][] = [
       'contact_id'          => $params['honor_contact_id'],
       'amount'              => $params['total_amount'],
-      'soft_credit_type_id' => CRM_Utils_Array::value('honor_type_id', $params, CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_ContributionSoft', 'soft_credit_type_id', 'in_honor_of')),
+      'soft_credit_type_id' => $params['honor_type_id'] ?? CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_ContributionSoft', 'soft_credit_type_id', 'in_honor_of'),
     ];
   }
 }
diff --git a/www/modules/civicrm/api/v3/Job.php b/www/modules/civicrm/api/v3/Job.php
index 6da5a3288..b3335828f 100644
--- a/www/modules/civicrm/api/v3/Job.php
+++ b/www/modules/civicrm/api/v3/Job.php
@@ -74,6 +74,7 @@ function civicrm_api3_job_clone($params) {
   $id = $params['id'];
   unset($params['id']);
   $params['last_run'] = 'null';
+  $params['last_run_end'] = 'null';
   $params['scheduled_run_date'] = 'null';
   $newJobDAO = CRM_Core_BAO_Job::copy($id, $params);
   return civicrm_api3('Job', 'get', ['id' => $newJobDAO->id]);
diff --git a/www/modules/civicrm/api/v3/Mailing.php b/www/modules/civicrm/api/v3/Mailing.php
index 24a3b1b9f..5eddbd3ba 100644
--- a/www/modules/civicrm/api/v3/Mailing.php
+++ b/www/modules/civicrm/api/v3/Mailing.php
@@ -351,7 +351,10 @@ function civicrm_api3_mailing_event_confirm($params) {
  *   Array of deprecated actions
  */
 function _civicrm_api3_mailing_deprecation() {
-  return ['event_confirm' => 'Mailing api "event_confirm" action is deprecated. Use the mailing_event_confirm api instead.'];
+  return [
+    'event_confirm' => 'Mailing api "event_confirm" action is deprecated. Use the mailing_event_confirm api instead.',
+    'event_forward' => 'Mailing api "event_forward" action is deprecated as it is unlikely to be used & it is hard to envisage a use case for it.',
+  ];
 }
 
 /**
@@ -407,22 +410,138 @@ function _civicrm_api3_mailing_event_reply_spec(&$params) {
  * @param array $params
  *
  * @return array
+ *
+ * @deprecated it is highly unlikely this function is ever used because to
+ *  use it someone needs to forward an email by clicking on a link rather than..
+ *  forwarding the email. Even the links are probably never generated.
+ *
+ * Also - it would be poor email server reputation management. Function is nasty
+ * but can die with apiv4 whenever that is (along with surveyRespondant)
  */
 function civicrm_api3_mailing_event_forward($params) {
-  $job       = $params['job_id'];
-  $queue     = $params['event_queue_id'];
+  $job_id       = $params['job_id'];
   $hash      = $params['hash'];
-  $email     = $params['email'];
-  $fromEmail = $params['fromEmail'] ?? NULL;
-  $params    = $params['params'] ?? NULL;
+  $forward_email     = $params['email'];
+  $fromEmail = $params['fromEmail'] ?? NULL;;
+  $q = CRM_Mailing_Event_BAO_MailingEventQueue::verify(NULL, $params['event_queue_id'], $hash);
+  if (!$q) {
+    throw new CRM_Core_Exception('invalid queue');
+  }
+  // Find the email address/contact, if it exists.
+  $dao = CRM_Core_DAO::executeQuery("
+                SELECT      contact.id as contact_id,
+                            email.id as email_id,
+                            contact.do_not_email as do_not_email,
+                            queue.id as queue_id
+                FROM        (civicrm_email email, civicrm_mailing_job as temp_job)
+                INNER JOIN  civicrm_contact contact
+                        ON  email.contact_id = contact.id
+                LEFT JOIN   civicrm_mailing_event_queue queue
+                        ON  email.id = queue.email_id
+                LEFT JOIN   civicrm_mailing_job as job
+                        ON  queue.job_id = job.id
+                        AND temp_job.mailing_id = job.mailing_id
+                WHERE       queue.job_id = job_id
+                    AND     email.email = '" .
+    CRM_Utils_Type::escape($forward_email, 'String') . "'"
+  );
+
+  if (isset($dao->queue_id) ||
+    (isset($dao->do_not_email) && $dao->do_not_email == 1)
+  ) {
+    // We already sent this mailing to $forward_email, or we should
+    // never email this contact.  Give up.
+    throw new CRM_Core_Exception('failed to forward');
+  }
+
+  $dao->fetch();
+  $comment = $params['params'] ?? [];
+
+  $transaction = new CRM_Core_Transaction();
+  $contactValues = civicrm_api3('Contact', 'get', ['email' => $forward_email])['values'];
+
+  if (empty($contactValues)) {
+    // If the contact does not exist, create one.
+    $contactValues = civicrm_api3('Contact', 'create', ['contact_type' => 'Individual', 'email' => $forward_email])['values'];
+  }
+  $contact = reset($contactValues);
+  $email = new CRM_Core_DAO_Email();
+  $email->email = $forward_email;
+  $email->contact_id = $contact['id'];
+  $email->find(TRUE);
+  $email_id = $email->id;
+
+  // Create a new queue event.
+  $queue_params = [
+    'email_id' => $email_id,
+    'contact_id' => $contact['id'],
+    'job_id' => $q->job_id,
+    'mailing_id' => $q->mailing_id,
+  ];
 
-  $forward = CRM_Mailing_Event_BAO_MailingEventForward::forward($job, $queue, $hash, $email, $fromEmail, $params);
+  $queue = CRM_Mailing_Event_BAO_MailingEventQueue::create($queue_params);
 
-  if ($forward) {
-    return civicrm_api3_create_success($params);
+  $forward = new CRM_Mailing_Event_BAO_MailingEventForward();
+  $forward->time_stamp = date('YmdHis');
+  $forward->event_queue_id = $q->id;
+  $forward->dest_queue_id = $queue->id;
+  $forward->save();
+
+  $dao = CRM_Core_DAO::executeQuery("   SELECT  mailing_id
+                        FROM    civicrm_mailing_job
+                        WHERE   id = " . (int) $q->job_id,
+  );
+  $dao->fetch();
+  $mailing_obj = new CRM_Mailing_BAO_Mailing();
+  $mailing_obj->id = $dao->mailing_id;
+  $mailing_obj->find(TRUE);
+
+  // make sure we unset a lot of stuff
+  $tasks[] = new \Civi\FlexMailer\FlexMailerTask($queue->id, $queue->contact_id, $queue->hash, $forward_email);
+
+  if (property_exists($mailing_obj, 'language') && $mailing_obj->language && $mailing_obj->language !== 'en_US') {
+    $swapLang = \CRM_Utils_AutoClean::swap('call://i18n/getLocale', 'call://i18n/setLocale', $mailing_obj->language);
+  }
+  $jobObject = new CRM_Core_BAO_Job();
+  $jobObject->id = $job_id;
+  $jobObject->find(TRUE);
+  $jobObject->is_test = FALSE;
+  $dispatcher = \Civi::service('dispatcher');
+  $event = new \Civi\FlexMailer\Event\ComposeBatchEvent(['mailing' => $mailing_obj, 'attachments' => NULL, 'job' => $jobObject], $tasks);
+  $dispatcher->dispatch('civi.flexmailer.compose', $event);
+  $mailDetails = $event->getTasks()[0]->getMailParams();
+  $message = \Civi\FlexMailer\MailParams::convertMailParamsToMime($mailDetails);
+
+  //set from email who is forwarding it and not original one.
+  $headers = $fromEmail ? ['From' => "<{$fromEmail}>"] : [];
+  $headers = $message->headers($headers);
+
+  $forwarderText = empty($comment['body_html']) ? '' : $comment['body_html'] . '<br />---------------Original message---------------------<br />';
+  $body = $forwarderText . $message->get();
+  $mailer = \Civi::service('pear_mail');
+  $result = $mailer->send($headers['To'], $headers, $body);
+
+  $params = [
+    'event_queue_id' => $queue->id,
+    'job_id' => $job_id,
+    'hash' => $queue->hash,
+  ];
+  if (is_a($result, 'PEAR_Error')) {
+    // Register the bounce event.
+
+    $params = array_merge($params,
+      CRM_Mailing_BAO_BouncePattern::match($result->getMessage())
+    );
+    CRM_Mailing_Event_BAO_MailingEventBounce::recordBounce($params);
   }
+  else {
+    // Register the delivery event.
 
-  return civicrm_api3_create_error('Queue event could not be found');
+    CRM_Mailing_Event_BAO_MailingEventDelivered::recordDelivery($params);
+  }
+
+  $transaction->commit();
+  return civicrm_api3_create_success($params);
 }
 
 /**
@@ -501,60 +620,10 @@ function civicrm_api3_mailing_event_open($params) {
  * @param array $params
  *   Array per getfields metadata.
  *
- * @return array
  * @throws \CRM_Core_Exception
  */
 function civicrm_api3_mailing_preview($params) {
-  $fromEmail = NULL;
-  if (!empty($params['from_email'])) {
-    $fromEmail = $params['from_email'];
-  }
-
-  $mailing = new CRM_Mailing_BAO_Mailing();
-  $mailingID = $params['id'] ?? NULL;
-  if ($mailingID) {
-    $mailing->id = $mailingID;
-    $mailing->find(TRUE);
-  }
-  else {
-    $mailing->copyValues($params);
-  }
-
-  $session = CRM_Core_Session::singleton();
-
-  CRM_Mailing_BAO_Mailing::tokenReplace($mailing);
-
-  // get and format attachments
-  $attachments = CRM_Core_BAO_File::getEntityFile('civicrm_mailing', $mailing->id);
-
-  $returnProperties = $mailing->getReturnProperties();
-  $contactID = $params['contact_id'] ?? NULL;
-  if (!$contactID) {
-    // If we still don't have a userID in a session because we are annon then set contactID to be 0
-    $contactID = empty($session->get('userID')) ? 0 : $session->get('userID');
-  }
-  $mailingParams = ['contact_id' => $contactID];
-
-  if (!$contactID) {
-    $details = CRM_Utils_Token::getAnonymousTokenDetails($mailingParams, $returnProperties, empty($mailing->sms_provider_id), TRUE, NULL, $mailing->getFlattenedTokens());
-    $details = $details[0][0] ?? NULL;
-  }
-  else {
-    [$details] = CRM_Utils_Token::getTokenDetails($mailingParams, $returnProperties, empty($mailing->sms_provider_id), TRUE, NULL, $mailing->getFlattenedTokens());
-    $details = $details[$contactID];
-  }
-
-  $mime = $mailing->compose(NULL, NULL, NULL, $contactID, $fromEmail, $fromEmail,
-    TRUE, $details, $attachments
-  );
-
-  return civicrm_api3_create_success([
-    'id' => $mailingID,
-    'contact_id' => $contactID,
-    'subject' => CRM_Utils_Array::value('Subject', $mime->headers(), ''),
-    'body_html' => $mime->getHTMLBody(),
-    'body_text' => $mime->getTXTBody(),
-  ]);
+  throw new CRM_Core_Exception('This is never called because flexmailer intercepts it');
 }
 
 /**
@@ -602,13 +671,9 @@ function civicrm_api3_mailing_send_test($params) {
   $testEmailParams['emails'] = array_key_exists('test_email', $testEmailParams) ? explode(',', strtolower($testEmailParams['test_email'] ?? '')) : NULL;
   if (!empty($params['test_email'])) {
     $query = CRM_Utils_SQL_Select::from('civicrm_email e')
-      ->select(['e.id', 'e.contact_id', 'e.email'])
+      ->select(['e.id', 'e.contact_id', 'e.email', 'e.on_hold', 'c.is_opt_out', 'c.do_not_email', 'c.is_deceased'])
       ->join('c', 'INNER JOIN civicrm_contact c ON e.contact_id = c.id')
       ->where('e.email IN (@emails)', ['@emails' => $testEmailParams['emails']])
-      ->where('e.on_hold = 0')
-      ->where('c.is_opt_out = 0')
-      ->where('c.do_not_email = 0')
-      ->where('c.is_deceased = 0')
       ->where('c.is_deleted = 0')
       ->groupBy('e.id')
       ->orderBy(['e.is_bulkmail DESC', 'e.is_primary DESC'])
@@ -620,16 +685,22 @@ function civicrm_api3_mailing_send_test($params) {
       $emailDetail[strtolower($dao->email)] = [
         'contact_id' => $dao->contact_id,
         'email_id' => $dao->id,
+        'is_opt_out' => $dao->is_opt_out,
+        'do_not_email' => $dao->do_not_email,
+        'is_deceased' => $dao->is_deceased,
       ];
     }
-    foreach ($testEmailParams['emails'] as $key => $email) {
+    foreach ($testEmailParams['emails'] as $email) {
       $email = trim($email);
       $contactId = $emailId = NULL;
       if (array_key_exists($email, $emailDetail)) {
+        if ($emailDetail[$email]['is_opt_out'] || $emailDetail[$email]['do_not_email'] || $emailDetail[$email]['is_deceased']) {
+          continue;
+        }
         $emailId = $emailDetail[$email]['email_id'];
         $contactId = $emailDetail[$email]['contact_id'];
       }
-      if (!$contactId && CRM_Core_Permission::check('add contacts')) {
+      elseif (!$contactId && CRM_Core_Permission::check('add contacts')) {
         //create new contact.
         $contact   = civicrm_api3('Contact', 'create',
           [
diff --git a/www/modules/civicrm/api/v3/MailingJob.php b/www/modules/civicrm/api/v3/MailingJob.php
index 7634bf170..20f982624 100644
--- a/www/modules/civicrm/api/v3/MailingJob.php
+++ b/www/modules/civicrm/api/v3/MailingJob.php
@@ -25,7 +25,13 @@
  * @throws \CRM_Core_Exception
  */
 function civicrm_api3_mailing_job_create($params) {
-  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'MailingJob');
+  $result = _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'MailingJob');
+  if (!empty($params['mailing_id']) && empty('is_calling_function_updated_to_reflect_deprecation')) {
+    // This horrible behaviour used to be in the BAO but it now by-passes the BAO create
+    CRM_Core_Error::deprecatedWarning('mail recipients should not be generated during MailingJob::create');
+    CRM_Mailing_BAO_Mailing::getRecipients($params['mailing_id']);
+  }
+  return $result;
 }
 
 /**
diff --git a/www/modules/civicrm/api/v3/SmsProvider.php b/www/modules/civicrm/api/v3/SmsProvider.php
index e27bf458d..2ddef57c6 100644
--- a/www/modules/civicrm/api/v3/SmsProvider.php
+++ b/www/modules/civicrm/api/v3/SmsProvider.php
@@ -23,7 +23,7 @@
  * @return array
  */
 function civicrm_api3_sms_provider_create($params) {
-  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'Provider');
+  return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'SmsProvider');
 }
 
 /**
diff --git a/www/modules/civicrm/api/v3/utils.php b/www/modules/civicrm/api/v3/utils.php
index f5a7e89b8..0a38bbffd 100644
--- a/www/modules/civicrm/api/v3/utils.php
+++ b/www/modules/civicrm/api/v3/utils.php
@@ -314,12 +314,6 @@ function _civicrm_api3_get_DAO($name) {
   if ($name === 'AclRole' || $name === 'ACLRole') {
     return 'CRM_ACL_DAO_ACLEntityRole';
   }
-  // FIXME: DAO should be renamed CRM_SMS_DAO_SmsProvider
-  // But this would impact SMS extensions so need to coordinate
-  // Probably best approach is to migrate them to use the api and decouple them from core BAOs
-  if ($name === 'SmsProvider') {
-    return 'CRM_SMS_DAO_Provider';
-  }
   // Entity was renamed to CRM_Dedupe_DAO_DedupeRule for APIv4
   if ($name === 'Rule') {
     return 'CRM_Dedupe_DAO_DedupeRule';
@@ -337,7 +331,7 @@ function _civicrm_api3_get_DAO($name) {
     $name = strtoupper($name);
   }
 
-  $dao = CRM_Core_DAO_AllCoreTables::getFullName($name);
+  $dao = CRM_Core_DAO_AllCoreTables::getDAONameForEntity($name);
   if ($dao || !$name) {
     return $dao;
   }
@@ -1233,7 +1227,7 @@ function formatCheckBoxField(&$checkboxFieldValue, $customFieldLabel, $entity) {
  * @return array
  */
 function _civicrm_api3_basic_get($bao_name, $params, $returnAsSuccess = TRUE, $entity = "", $sql = NULL, $uniqueFields = FALSE) {
-  $entity = $entity ?: CRM_Core_DAO_AllCoreTables::getBriefName($bao_name);
+  $entity = $entity ?: CRM_Core_DAO_AllCoreTables::getEntityNameForClass($bao_name);
   $options = _civicrm_api3_get_options_from_params($params);
 
   // Skip query if table doesn't exist yet due to pending upgrade
@@ -1329,7 +1323,7 @@ function _civicrm_api3_basic_create($bao_name, &$params, $entity = NULL) {
       $alreadyHandled[] = 'Tag';
       $alreadyHandled[] = 'Website';
       if (!in_array($entity, $alreadyHandled)) {
-        CRM_Core_BAO_CustomValueTable::store($params['custom'], CRM_Core_DAO_AllCoreTables::getTableForClass(CRM_Core_DAO_AllCoreTables::getFullName($entity)), $bao->id);
+        CRM_Core_BAO_CustomValueTable::store($params['custom'], CRM_Core_DAO_AllCoreTables::getTableForClass(CRM_Core_DAO_AllCoreTables::getDAONameForEntity($entity)), $bao->id);
       }
     }
     $values = [];
@@ -1429,7 +1423,7 @@ function _civicrm_api3_custom_data_get(&$returnArray, $checkPermission, $entity,
   CRM_Core_BAO_CustomGroup::setDefaults($groupTree, $customValues);
   $fieldInfo = [];
   foreach ($groupTree as $set) {
-    $fieldInfo += $set['fields'];
+    $fieldInfo += ($set['fields'] ?? []);
   }
   if (!empty($customValues)) {
     foreach ($customValues as $key => $val) {
@@ -1945,7 +1939,7 @@ function _civicrm_api_get_fields($entity, $unique = FALSE, &$params = []) {
   // Translate FKClassName to the corresponding api
   foreach ($fields as $name => &$field) {
     if (!empty($field['FKClassName'])) {
-      $FKApi = CRM_Core_DAO_AllCoreTables::getBriefName($field['FKClassName']);
+      $FKApi = CRM_Core_DAO_AllCoreTables::getEntityNameForClass($field['FKClassName']);
       if ($FKApi) {
         $field['FKApiName'] = $FKApi;
       }
diff --git a/www/modules/civicrm/backdrop/civicrm.info b/www/modules/civicrm/backdrop/civicrm.info
index 54b110268..208477074 100644
--- a/www/modules/civicrm/backdrop/civicrm.info
+++ b/www/modules/civicrm/backdrop/civicrm.info
@@ -1,6 +1,6 @@
 name = CiviCRM
 description = Constituent relationship management system. Allows sites to manage contacts, relationships and groups, and track contact activities, contributions, memberships and events. See the <a href="https://civicrm.org/">CiviCRM website</a> for more information.
-version = 1.x-5.70.2
+version = 1.x-5.74.4
 package = CiviCRM
 backdrop = 1.x
 project = civicrm
diff --git a/www/modules/civicrm/backdrop/civicrm.module b/www/modules/civicrm/backdrop/civicrm.module
index 74c5a63a4..74798e73b 100644
--- a/www/modules/civicrm/backdrop/civicrm.module
+++ b/www/modules/civicrm/backdrop/civicrm.module
@@ -74,14 +74,12 @@ function civicrm_permission() {
   CRM_Core_Config::singleton();
 
   $permissions = CRM_Core_Permission::basicPermissions(FALSE, TRUE);
-  $perms_array = array();
+  $perms_array = [];
   foreach ($permissions as $perm => $attr) {
-    $title = array_shift($attr);
-    $description = array_shift($attr);
     //order matters here, but we deal with that later
-    $perms_array[$perm] = array('title' => $title);
-    if ($description) {
-      $perms_array[$perm]['description'] = $description;
+    $perms_array[$perm] = ['title' => $attr['label']];
+    if (!empty($attr['description'])) {
+      $perms_array[$perm]['description'] = $attr['description'];
     }
   }
   return $perms_array;
@@ -169,6 +167,32 @@ function civicrm_menu_alter(&$items) {
   }
 }
 
+/**
+ * Implements hook_telemetry_info().
+ */
+function civicrm_telemetry_info() {
+  $info['civicrm_version'] = array(
+    'label' => t('CiviCRM Version'),
+    'description' => t('The current version of CiviCRM in use.'),
+    'project' => 'civicrm',
+  );
+  return $info;
+}
+
+/**
+ * Implements hook_telemetry_data().
+ */
+function civicrm_telemetry_data($telemetry_key) {
+  if (!civicrm_initialize()) {
+    return;
+  }
+
+  switch ($telemetry_key) {
+    case 'civicrm_version':
+      return CRM_Utils_System::majorVersion();
+  }
+}
+
 /**
  * Implements hook_layout_access_info().
  *
@@ -826,27 +850,6 @@ function civicrm_translated_menu_link_alter(&$item) {
   }
 }
 
-/**
- * Implements hook_admin_bar_output_alter().
- */
-function civicrm_admin_bar_output_alter(&$content) {
-  if (!civicrm_initialize()) {
-    return;
-  }
-
-  $weight = 10;
-  $content['menu']['menu']['civicrm'] = array(
-    '#title' => t('CiviCRM'),
-    '#attributes' => array('class' => array('civicrm')),
-    '#href' => 'civicrm',
-    '#options' => array(
-      'query' => array('reset' => 1),
-    ),
-    // #weight controls the order of links in the resulting item list.
-    '#weight' => $weight,
-  );
-}
-
 /**
  * Implements hook_autoload_info().
  */
@@ -995,6 +998,46 @@ function civicrm_add_jquery(&$html) {
   return $html;
 }
 
+/**
+ * Implements hook_admin_bar_output_alter().
+ */
+function civicrm_admin_bar_output_alter(&$content) {
+  if (!civicrm_initialize()) {
+    return;
+  }
+
+  $classes = array('civicrm');
+  if (!function_exists('icon')) {
+    $classes[] = 'civicrm-icon-original';
+  }
+
+  $content['menu']['menu']['civicrm'] = array(
+    '#title' => t('CiviCRM'),
+    '#attributes' => array('class' => $classes),
+    '#href' => 'civicrm',
+    '#options' => array(
+      'query' => array('reset' => 1),
+      'icon' => 'civicrm-civicrm',
+    ),
+    '#weight' => 10,
+  );
+}
+
+/**
+ * Implements hook_icon_info().
+ */
+function civicrm_icon_info() {
+  $icons = array();
+  $module_path = backdrop_get_path('module', 'civicrm');
+
+  $icons['civicrm-civicrm'] = array(
+    'directory' => $module_path . '/icons',
+    'name' => 'civicrm',
+  );
+
+  return $icons;
+}
+
 /**
  * Implements hook_form_alter().
  */
diff --git a/www/modules/civicrm/backdrop/civicrm_backdrop.css b/www/modules/civicrm/backdrop/civicrm_backdrop.css
index 23edd83ba..f7986af7d 100644
--- a/www/modules/civicrm/backdrop/civicrm_backdrop.css
+++ b/www/modules/civicrm/backdrop/civicrm_backdrop.css
@@ -9,8 +9,23 @@
   background: #e6e6e6 url(../bower_components/jquery-ui/themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;
 }
 
-/* Backdrop main navigation icon. */
-#admin-bar #admin-bar-menu > li > .dropdown > li > a.civicrm {
+/* Display old icon */
+/* Support Backdrop < 1.28.0 without Icon API */
+#admin-bar #admin-bar-menu > li > .dropdown > li.civicrm-icon-original > a.civicrm {
   background: transparent url(../i/logo_sm.png) 5% center no-repeat;
   background-size: 16px;
 }
+#admin-bar #admin-bar-menu>li>.dropdown>li.civicrm-icon-original>a.civicrm span.admin-bar-link-icon {
+  display: none;
+}
+#admin-bar #admin-bar-menu>li>.dropdown>li.civicrm-icon-original>a.civicrm span.admin-bar-link-text {
+  margin-left: 18px;
+}
+
+/**
+ * Prevent contact name overlapping the breadcrumb.
+ * @see https: //lab.civicrm.org/dev/backdrop/-/issues/84
+ */
+#crm-container div.crm-summary-contactname-block {
+  margin-top: 0px !important;
+}
diff --git a/www/modules/civicrm/backdrop/icons/civicrm.svg b/www/modules/civicrm/backdrop/icons/civicrm.svg
new file mode 100644
index 000000000..b4708f6fb
--- /dev/null
+++ b/www/modules/civicrm/backdrop/icons/civicrm.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 32 32"><path d="M11.146 30.795c-1.864-0.036-2.575-2.19-2.65-2.436l-6.361-20.845c-0.374-1.225-0.289-2.21 0.255-2.929 0.351-0.464 1.050-1.012 2.39-0.986 0.49 0.009 0.875 0.096 0.917 0.105l21.178 4.933c1.361 0.317 2.198 0.959 2.487 1.908 0.458 1.504-0.817 2.931-0.965 3.088l-14.818 15.899c-0.795 0.853-1.614 1.278-2.433 1.262zM4.675 5.786c-0.379-0.007-0.502 0.096-0.525 0.13-0.107 0.151-0.13 0.219 0.094 0.956l6.361 20.844c0.142 0.445 0.378 0.859 0.583 0.875 0.003 0 0.256-0.002 0.777-0.561l14.818-15.897c0.274-0.301 0.525-0.79 0.468-0.941-0.041-0.107-0.211-0.247-0.878-0.403l-21.178-4.934s-0.265-0.062-0.52-0.067z"></path><path d="M8.767 29.101c-0.685 0.254-1.4 0.303-1.962 0.121-1.769-0.577-1.821-2.841-1.821-3.097l0.002-20.295 2.084 0.467 0.008 19.872c0.005 0.466 0.126 0.911 0.41 0.961 0.002 0.001 0.148 0.047 0.571-0.147zM10.035 25.869l17.135-9.915c0.348-0.207 0.755-0.516 0.721-0.763-0.005-0.037-0.086-0.26-0.457-0.517l1.437-1.633c0.812 0.619 1.223 1.34 1.223 2.151 0 1.569-1.634 2.56-1.82 2.668l-17.577 10.098zM25.441 13.549l-16.84-9.798s-0.42-0.268-0.662-0.347c-0.36-0.117-0.536 0.002-0.57 0.024-0.101 0.067-0.133 0.121-0.175 0.615l-2.169-0.404c0.118-0.902 0.471-1.571 1.051-1.993 0.47-0.341 1.297-0.66 2.569-0.246 0.465 0.152 0.807 0.346 0.844 0.368l17.518 10.105z"></path></svg>
diff --git a/www/modules/civicrm/backdrop/modules/civicrm_contact_ref/civicrm_contact_ref.info b/www/modules/civicrm/backdrop/modules/civicrm_contact_ref/civicrm_contact_ref.info
index ab23052ee..6da149321 100644
--- a/www/modules/civicrm/backdrop/modules/civicrm_contact_ref/civicrm_contact_ref.info
+++ b/www/modules/civicrm/backdrop/modules/civicrm_contact_ref/civicrm_contact_ref.info
@@ -1,6 +1,6 @@
 name = CiviCRM Contact Reference Field
 description = Makes a CiviCRM Contact Reference Field.
-version = 1.x-5.70.2
+version = 1.x-5.74.4
 backdrop = 1.x
 type = module
 package = CiviCRM
diff --git a/www/modules/civicrm/backdrop/modules/civicrm_engage/civicrm_engage.info b/www/modules/civicrm/backdrop/modules/civicrm_engage/civicrm_engage.info
index e66123a10..f54c6b4cc 100755
--- a/www/modules/civicrm/backdrop/modules/civicrm_engage/civicrm_engage.info
+++ b/www/modules/civicrm/backdrop/modules/civicrm_engage/civicrm_engage.info
@@ -1,6 +1,6 @@
 name = CiviEngage
 description = DEPRECATED Walklist and Phone-banking support for CiviCRM. This module will not be ported to Drupal 8. Please see: https://civicrm.org/blog/jamie/civicrmengage-is-dead-long-live-civicrmengage
-version = 1.x-5.70.2
+version = 1.x-5.74.4
 backdrop = 1.x
 type = module
 package = CiviCRM
diff --git a/www/modules/civicrm/backdrop/modules/civicrm_group_roles/civicrm_group_roles.info b/www/modules/civicrm/backdrop/modules/civicrm_group_roles/civicrm_group_roles.info
index 9bdd00b0e..9017dc16f 100644
--- a/www/modules/civicrm/backdrop/modules/civicrm_group_roles/civicrm_group_roles.info
+++ b/www/modules/civicrm/backdrop/modules/civicrm_group_roles/civicrm_group_roles.info
@@ -1,6 +1,6 @@
 name = CiviGroup Roles Sync
 description = Sync Backdrop Roles to CiviCRM Groups.
-version = 1.x-5.70.2
+version = 1.x-5.74.4
 backdrop = 1.x
 type = module
 package = CiviCRM
diff --git a/www/modules/civicrm/backdrop/modules/civicrm_group_roles/civicrm_group_roles.module b/www/modules/civicrm/backdrop/modules/civicrm_group_roles/civicrm_group_roles.module
index f91d59c8e..6d42bea50 100644
--- a/www/modules/civicrm/backdrop/modules/civicrm_group_roles/civicrm_group_roles.module
+++ b/www/modules/civicrm/backdrop/modules/civicrm_group_roles/civicrm_group_roles.module
@@ -100,6 +100,7 @@ function civicrm_group_roles_add_groups_oncreate($account, $roles) {
 
   $config = config('civicrm_group_roles.settings');
   $result = $config->get('rules');
+  $group_ids = [];
   foreach ($result as $rule) {
     if (in_array($rule['role_name'], array_keys($roles))) {
       $group_ids[] = $rule['group_id'];
diff --git a/www/modules/civicrm/backdrop/modules/civicrm_member_roles/civicrm_member_roles.info b/www/modules/civicrm/backdrop/modules/civicrm_member_roles/civicrm_member_roles.info
index baafe10a8..56993065f 100644
--- a/www/modules/civicrm/backdrop/modules/civicrm_member_roles/civicrm_member_roles.info
+++ b/www/modules/civicrm/backdrop/modules/civicrm_member_roles/civicrm_member_roles.info
@@ -1,6 +1,6 @@
 name = CiviMember Roles Sync
 description = Synchronize CiviCRM Contacts with Membership Status to a specified Backdrop Role both automatically and manually.
-version = 1.x-5.70.2
+version = 1.x-5.74.4
 backdrop = 1.x
 type = module
 package = CiviCRM
diff --git a/www/modules/civicrm/backdrop/modules/civicrm_rules/civicrm_rules.info b/www/modules/civicrm/backdrop/modules/civicrm_rules/civicrm_rules.info
index 53fbb12a3..4788c6c2a 100644
--- a/www/modules/civicrm/backdrop/modules/civicrm_rules/civicrm_rules.info
+++ b/www/modules/civicrm/backdrop/modules/civicrm_rules/civicrm_rules.info
@@ -1,6 +1,6 @@
 name = CiviCRM Rules Integration
 description = Integrate CiviCRM and Backdrop Rules Module. Expose Contact, Contribution and other Objects along with Form / Page Operations.
-version = 1.x-5.70.2
+version = 1.x-5.74.4
 backdrop = 1.x
 type = module
 package = CiviCRM
diff --git a/www/modules/civicrm/backdrop/modules/civicrmtheme/civicrmtheme.info b/www/modules/civicrm/backdrop/modules/civicrmtheme/civicrmtheme.info
index 963359567..e1648eb4e 100644
--- a/www/modules/civicrm/backdrop/modules/civicrmtheme/civicrmtheme.info
+++ b/www/modules/civicrm/backdrop/modules/civicrmtheme/civicrmtheme.info
@@ -1,6 +1,6 @@
 name = CiviCRM Theme
 description =  Define alternative themes and layouts for CiviCRM.
-version = 1.x-5.70.2
+version = 1.x-5.74.4
 backdrop = 1.x
 type = module
 package = CiviCRM
diff --git a/www/modules/civicrm/backdrop/modules/civicrmtheme/civicrmtheme.install b/www/modules/civicrm/backdrop/modules/civicrmtheme/civicrmtheme.install
index b14f9c035..96d607dd4 100644
--- a/www/modules/civicrm/backdrop/modules/civicrmtheme/civicrmtheme.install
+++ b/www/modules/civicrm/backdrop/modules/civicrmtheme/civicrmtheme.install
@@ -64,6 +64,101 @@ function civicrmtheme_update_1000() {
 
 }
 
+/**
+ * Enable title on civicrm admin layout.
+ */
+function civicrmtheme_update_1001() {
+  $admin_config = config('layout.layout.civicrm_admin_default');
+  if ($admin_config->get('storage') != 4) {
+    return;
+  }
+
+  $admin_layout = [
+    "_config_name" => "layout.layout.civicrm_admin_default",
+    "path" => "civicrm",
+    "name" => "civicrm_admin_default",
+    "title" => "Default CiviCRM Layout",
+    "description" => NULL,
+    "renderer_name" => "standard",
+    "module" => "civicrmtheme",
+    "weight" => 1,
+    "storage" => 4,
+    "layout_template" => "boxton",
+    "disabled" => FALSE,
+    "settings" => [
+      "title" => "",
+      "title_display" => "default",
+      "title_block" => "55f542fe-0763-453b-ba3e-62677ea559e5",
+    ],
+    "positions" => [
+      "header" => [],
+      "top" => ["55f542fe-0763-453b-ba3e-62677ea559e5"],
+      "content" => ["default"],
+      "bottom" => [],
+      "footer" => [],
+      "title" => [],
+    ],
+    "contexts" => [],
+    "relationships" => [],
+    "content" => [
+      "55f542fe-0763-453b-ba3e-62677ea559e5" => [
+        "plugin" => "system:breadcrumb",
+        "data" => [
+          "status" => 1,
+          "module" => "system",
+          "delta" => "breadcrumb",
+          "settings" => [
+            "title_display" => "default",
+            "title" => "",
+            "style" => "default",
+            "block_settings" => [],
+            "contexts" => [],
+          ],
+          "uuid" => "55f542fe-0763-453b-ba3e-62677ea559e5",
+          "style" => [
+            "plugin" => "default",
+            "data" => ["settings" => ["classes" => ""]],
+          ],
+        ],
+      ],
+      "default" => [
+        "plugin" => "system:main",
+        "data" => [
+          "status" => 1,
+          "module" => "system",
+          "delta" => "main",
+          "settings" => [
+            "title_display" => "default",
+            "title" => "",
+            "style" => "default",
+            "block_settings" => [],
+            "contexts" => [],
+          ],
+          "uuid" => "default",
+          "style" => [
+            "plugin" => "default",
+            "data" => ["settings" => ["classes" => ""]],
+          ],
+        ],
+      ],
+    ],
+    "conditions" => [
+      [
+        "plugin" => "civicrm",
+        "data" => [
+          "settings" => [
+            "civicrm" => ["admin"],
+            "load_condition_nojs" => "Load condition",
+          ],
+        ],
+      ],
+    ],
+  ];
+
+  $admin_config->setData($admin_layout);
+  $admin_config->save();
+}
+
 /**
  * @} End of "defgroup updates-7.x-to-1.x"
  * The next series of updates should start at 2000.
diff --git a/www/modules/civicrm/backdrop/modules/civicrmtheme/config/layout.layout.civicrm_admin_default.json b/www/modules/civicrm/backdrop/modules/civicrmtheme/config/layout.layout.civicrm_admin_default.json
index 84d00d4fb..a20cd4869 100644
--- a/www/modules/civicrm/backdrop/modules/civicrmtheme/config/layout.layout.civicrm_admin_default.json
+++ b/www/modules/civicrm/backdrop/modules/civicrmtheme/config/layout.layout.civicrm_admin_default.json
@@ -4,6 +4,7 @@
     "name": "civicrm_admin_default",
     "title": "Default CiviCRM Layout",
     "description": null,
+    "renderer_name": "standard",
     "module": "civicrmtheme",
     "weight": 1,
     "storage": 4,
@@ -11,24 +12,28 @@
     "disabled": false,
     "settings": {
         "title": "",
-        "title_display": "none",
-        "title_block": null
+        "title_display": "default",
+        "title_block": "55f542fe-0763-453b-ba3e-62677ea559e5"
     },
     "positions": {
-        "header": [
+        "header": [],
+        "top": [
             "55f542fe-0763-453b-ba3e-62677ea559e5"
         ],
-        "top": [],
         "content": [
             "default"
         ],
         "bottom": [],
-        "footer": []
+        "footer": [],
+        "title": []
     },
+    "contexts": [],
+    "relationships": [],
     "content": {
         "55f542fe-0763-453b-ba3e-62677ea559e5": {
             "plugin": "system:breadcrumb",
             "data": {
+                "status": 1,
                 "module": "system",
                 "delta": "breadcrumb",
                 "settings": {
@@ -52,6 +57,7 @@
         "default": {
             "plugin": "system:main",
             "data": {
+                "status": 1,
                 "module": "system",
                 "delta": "main",
                 "settings": {
diff --git a/www/modules/civicrm/civicrm-version.php b/www/modules/civicrm/civicrm-version.php
index 3f7d44e7a..0ce1a07fa 100644
--- a/www/modules/civicrm/civicrm-version.php
+++ b/www/modules/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
 <?php
 /** @deprecated */
 function civicrmVersion( ) {
-  return array( 'version'  => '5.70.2',
+  return array( 'version'  => '5.74.4',
                 'cms'      => 'Backdrop',
                 'revision' => '' );
 }
diff --git a/www/modules/civicrm/composer.json b/www/modules/civicrm/composer.json
index 5f846e68d..941516874 100644
--- a/www/modules/civicrm/composer.json
+++ b/www/modules/civicrm/composer.json
@@ -2,7 +2,7 @@
   "name": "civicrm/civicrm-core",
   "description": "Open source constituent relationship management for non-profits, NGOs and advocacy organizations.",
   "type": "library",
-  "license": "AGPL-3.0",
+  "license": "AGPL-3.0-or-later",
   "authors": [
     {
       "name": "Coleman Watts",
@@ -35,6 +35,7 @@
       "Civi\\": [".", "Civi/", "setup/src/"]
     },
     "files": [
+      "functions.php",
       "guzzle_php81_shim.php"
     ]
   },
@@ -60,12 +61,12 @@
     "symfony/dependency-injection": "~4.4 || ~6.0",
     "symfony/event-dispatcher": "~4.4 || ~6.0",
     "symfony/filesystem": "~4.4 || ~6.0",
-    "symfony/process": "~4.4 || ~6.0",
+    "symfony/process": "~4.4 || ~5.0 || ~6.0",
     "symfony/var-dumper": "~4.4 || ~5.1 || ~6.0",
     "symfony/service-contracts": "~2.2 || ~3.1",
     "psr/log": "~1.0 || ~2.0 || ~3.0",
     "symfony/finder": "~4.4 || ~6.0",
-    "tecnickcom/tcpdf" : "6.4.*",
+    "tecnickcom/tcpdf" : "6.7.*",
     "totten/ca-config": "~23.07",
     "zetacomponents/base": "1.9.*",
     "zetacomponents/mail": "~1.9.4",
@@ -73,16 +74,16 @@
     "phpoffice/phpword": "^0.18.0",
     "pear/validate_finance_creditcard": "0.7.0",
     "civicrm/civicrm-cxn-rpc": "~0.20.12.01 || ~0.19.01.10",
-    "pear/auth_sasl": "1.1.0",
-    "pear/net_smtp": "1.10.*",
-    "pear/net_socket": "1.0.*",
-    "pear/mail": "^1.5",
+    "pear/auth_sasl": "1.2.0",
+    "pear/net_smtp": "1.12.*",
+    "pear/net_socket": "1.2.1",
+    "pear/mail": "^2.0",
     "guzzlehttp/guzzle": "^6.3 || ^7.3",
     "psr/simple-cache": "~1.0.1",
     "cweagans/composer-patches": "~1.0",
     "pear/log": "1.13.3",
     "adrienrn/php-mimetyper": "0.2.2",
-    "civicrm/composer-downloads-plugin": "^3.0",
+    "civicrm/composer-downloads-plugin": "^3.0 || ^4.0",
     "league/csv": "~9.7.4",
     "league/oauth2-client": "^2.4",
     "league/oauth2-google": "^3.0 || ^4.0",
@@ -92,7 +93,7 @@
     "brick/money": "~0.5",
     "ext-intl": "*",
     "pear/mail_mime": "~1.10",
-    "pear/db": "1.11",
+    "pear/db": "~1.12.1",
     "civicrm/composer-compile-lib": "~0.6 || ~1.0",
     "ext-json": "*",
     "ezyang/htmlpurifier": "^4.13",
@@ -103,7 +104,7 @@
     "soundasleep/html2text": "^2.1",
     "psr/container": "~1.0 || ~2.0",
     "ext-fileinfo": "*",
-    "pontedilana/php-weasyprint": "^0.13.0",
+    "pontedilana/php-weasyprint": "^0.13.0 || ^1",
     "knplabs/knp-snappy": "^1.4"
   },
   "scripts": {
@@ -264,14 +265,13 @@
         "ignore": ["examples"]
       }
     },
+    "patches-comments": "For information about defining patches via composer.json, see https://docs.civicrm.org/dev/en/latest/core/dependencies/",
     "patches": {
       "adrienrn/php-mimetyper": {
         "Update gitignore to ensure that sites that manage via git don't miss out on the important db.json file": "https://patch-diff.githubusercontent.com/raw/adrienrn/php-mimetyper/pull/15.patch",
         "Apply patch to fix php8.2 deprecation notice on dynamic property $filename": "https://patch-diff.githubusercontent.com/raw/adrienrn/php-mimetyper/pull/17.patch"
       },
       "pear/db": {
-        "Apply patch to ensure that MySQLI reporting remains the same in php8.1": "https://patch-diff.githubusercontent.com/raw/pear/DB/pull/13.patch",
-        "Apply patch to fix deprecations in php8.2": "https://patch-diff.githubusercontent.com/raw/pear/DB/pull/14.patch",
         "Apply CiviCRM Customisations for the pear:db package": "https://raw.githubusercontent.com/civicrm/civicrm-core/2ad420c394/tools/scripts/composer/pear_db_civicrm_changes.patch"
       },
       "pear/log": {
diff --git a/www/modules/civicrm/composer.lock b/www/modules/civicrm/composer.lock
index dc3100a4c..bb8374b87 100644
--- a/www/modules/civicrm/composer.lock
+++ b/www/modules/civicrm/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": "4d83914e1eba4abeb1a44bcc1512aa47",
+    "content-hash": "0e9d582d833277a8f63a2996d22ea889",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
@@ -277,16 +277,16 @@
         },
         {
             "name": "civicrm/composer-compile-plugin",
-            "version": "v0.19",
+            "version": "v0.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/civicrm/composer-compile-plugin.git",
-                "reference": "496d266d42fddb3d7cdec2d7c46bad3e9495801c"
+                "reference": "0933ff53cd720ddcb24bdc5984879673ea1e0cbe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/496d266d42fddb3d7cdec2d7c46bad3e9495801c",
-                "reference": "496d266d42fddb3d7cdec2d7c46bad3e9495801c",
+                "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/0933ff53cd720ddcb24bdc5984879673ea1e0cbe",
+                "reference": "0933ff53cd720ddcb24bdc5984879673ea1e0cbe",
                 "shasum": ""
             },
             "require": {
@@ -320,33 +320,33 @@
             "description": "Define a 'compile' event for all packages in the dependency-graph",
             "support": {
                 "issues": "https://github.com/civicrm/composer-compile-plugin/issues",
-                "source": "https://github.com/civicrm/composer-compile-plugin/tree/v0.19"
+                "source": "https://github.com/civicrm/composer-compile-plugin/tree/v0.20"
             },
-            "time": "2022-07-22T09:22:20+00:00"
+            "time": "2023-03-01T06:55:29+00:00"
         },
         {
             "name": "civicrm/composer-downloads-plugin",
-            "version": "v3.0.1",
+            "version": "v4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/civicrm/composer-downloads-plugin.git",
-                "reference": "3aabb6d259a86158d01829fc2c62a2afb9618877"
+                "reference": "7af08ca4a78607ac2bad3215c05a10390da9c673"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/civicrm/composer-downloads-plugin/zipball/3aabb6d259a86158d01829fc2c62a2afb9618877",
-                "reference": "3aabb6d259a86158d01829fc2c62a2afb9618877",
+                "url": "https://api.github.com/repos/civicrm/composer-downloads-plugin/zipball/7af08ca4a78607ac2bad3215c05a10390da9c673",
+                "reference": "7af08ca4a78607ac2bad3215c05a10390da9c673",
                 "shasum": ""
             },
             "require": {
-                "composer-plugin-api": "^1.1 || ^2.0",
-                "php": ">=5.6",
-                "togos/gitignore": "~1.1.1"
+                "civicrm/gitignore": "~1.2.0",
+                "composer-plugin-api": "^2.0",
+                "php": ">=7.2"
             },
             "require-dev": {
-                "composer/composer": "~1.0 || ~2.0",
+                "composer/composer": "~2.0",
                 "friendsofphp/php-cs-fixer": "^2.3",
-                "phpunit/phpunit": "^5.7",
+                "phpunit/phpunit": "^8.5 || ^9.5",
                 "totten/process-helper": "^1.0.1"
             },
             "type": "composer-plugin",
@@ -374,9 +374,48 @@
             ],
             "description": "Composer plugin for downloading additional files within any composer package.",
             "support": {
-                "source": "https://github.com/civicrm/composer-downloads-plugin/tree/v3.0.1"
+                "source": "https://github.com/civicrm/composer-downloads-plugin/tree/v4.0.0"
             },
-            "time": "2020-11-02T05:26:23+00:00"
+            "time": "2024-04-09T20:34:36+00:00"
+        },
+        {
+            "name": "civicrm/gitignore",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/civicrm/PHPGitIgnore.git",
+                "reference": "7491782ee89c4e14bbcc9b30bebb90389054cb2e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/civicrm/PHPGitIgnore/zipball/7491782ee89c4e14bbcc9b30bebb90389054cb2e",
+                "reference": "7491782ee89c4e14bbcc9b30bebb90389054cb2e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "replace": {
+                "togos/gitignore": "1.*"
+            },
+            "require-dev": {
+                "togos/simpler-test": "1.1.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "TOGoS_GitIgnore_": "src/main/php/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Parser for .gitignore (and sparse-checkout, and anything else using the same format) files",
+            "support": {
+                "source": "https://github.com/civicrm/PHPGitIgnore/tree/1.2.0"
+            },
+            "time": "2024-04-09T07:07:33+00:00"
         },
         {
             "name": "cweagans/composer-patches",
@@ -1899,21 +1938,18 @@
         },
         {
             "name": "pear/auth_sasl",
-            "version": "v1.1.0",
+            "version": "v1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Auth_SASL.git",
-                "reference": "db1ead3dc0bf986d2bab0dbc04d114800cf91dee"
+                "reference": "ebf4c2c5ea190b283229f8443b866ccf34422471"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Auth_SASL/zipball/db1ead3dc0bf986d2bab0dbc04d114800cf91dee",
-                "reference": "db1ead3dc0bf986d2bab0dbc04d114800cf91dee",
+                "url": "https://api.github.com/repos/pear/Auth_SASL/zipball/ebf4c2c5ea190b283229f8443b866ccf34422471",
+                "reference": "ebf4c2c5ea190b283229f8443b866ccf34422471",
                 "shasum": ""
             },
-            "require": {
-                "pear/pear_exception": "@stable"
-            },
             "require-dev": {
                 "phpunit/phpunit": "@stable"
             },
@@ -1928,7 +1964,7 @@
                 "./"
             ],
             "license": [
-                "BSD"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
@@ -1948,11 +1984,12 @@
                 }
             ],
             "description": "Abstraction of various SASL mechanism responses",
+            "homepage": "http://pear.php.net/package/Auth_SASL",
             "support": {
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Auth_SASL",
                 "source": "https://github.com/pear/Auth_SASL"
             },
-            "time": "2017-03-07T14:37:05+00:00"
+            "time": "2023-12-21T21:52:08+00:00"
         },
         {
             "name": "pear/console_getopt",
@@ -2007,16 +2044,16 @@
         },
         {
             "name": "pear/db",
-            "version": "v1.11.0",
+            "version": "v1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/DB.git",
-                "reference": "7e4f33dcecd99595df982ef8f56c1d7c2bbeaa21"
+                "reference": "403775906ed8bb25505cefdee49885de181862da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/DB/zipball/7e4f33dcecd99595df982ef8f56c1d7c2bbeaa21",
-                "reference": "7e4f33dcecd99595df982ef8f56c1d7c2bbeaa21",
+                "url": "https://api.github.com/repos/pear/DB/zipball/403775906ed8bb25505cefdee49885de181862da",
+                "reference": "403775906ed8bb25505cefdee49885de181862da",
                 "shasum": ""
             },
             "require": {
@@ -2046,6 +2083,11 @@
                     "email": "aharvey@php.net",
                     "role": "Lead"
                 },
+                {
+                    "name": "Armin Graefe",
+                    "email": "schengawegga@gmail.com",
+                    "role": "Lead"
+                },
                 {
                     "name": "Stig Bakken",
                     "email": "stig@php.net",
@@ -2062,7 +2104,7 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=DB",
                 "source": "https://github.com/pear/DB"
             },
-            "time": "2021-08-11T00:24:34+00:00"
+            "time": "2024-01-17T08:06:35+00:00"
         },
         {
             "name": "pear/log",
@@ -2126,16 +2168,16 @@
         },
         {
             "name": "pear/mail",
-            "version": "v1.5.0",
+            "version": "v2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Mail.git",
-                "reference": "c31b7635899a630a8ce681e5ced18cededcc15f3"
+                "reference": "eb053f8b74f4f3178105fcf001626e63068c0dbc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Mail/zipball/c31b7635899a630a8ce681e5ced18cededcc15f3",
-                "reference": "c31b7635899a630a8ce681e5ced18cededcc15f3",
+                "url": "https://api.github.com/repos/pear/Mail/zipball/eb053f8b74f4f3178105fcf001626e63068c0dbc",
+                "reference": "eb053f8b74f4f3178105fcf001626e63068c0dbc",
                 "shasum": ""
             },
             "require": {
@@ -2189,7 +2231,7 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Mail",
                 "source": "https://github.com/pear/Mail"
             },
-            "time": "2022-11-29T22:04:18+00:00"
+            "time": "2024-01-15T21:56:23+00:00"
         },
         {
             "name": "pear/mail_mime",
@@ -2244,16 +2286,16 @@
         },
         {
             "name": "pear/net_smtp",
-            "version": "1.10.0",
+            "version": "1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Net_SMTP.git",
-                "reference": "51e5997b711fbd1e5a9a075634d4d682168537fa"
+                "reference": "5d7ba854d75a7c207d8581de1cc6fd2895ae2518"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Net_SMTP/zipball/51e5997b711fbd1e5a9a075634d4d682168537fa",
-                "reference": "51e5997b711fbd1e5a9a075634d4d682168537fa",
+                "url": "https://api.github.com/repos/pear/Net_SMTP/zipball/5d7ba854d75a7c207d8581de1cc6fd2895ae2518",
+                "reference": "5d7ba854d75a7c207d8581de1cc6fd2895ae2518",
                 "shasum": ""
             },
             "require": {
@@ -2291,6 +2333,11 @@
                     "name": "Chuck Hagenbuch",
                     "email": "chuck@horde.org",
                     "role": "Lead"
+                },
+                {
+                    "name": "Armin Graefe",
+                    "email": "schengawegga@gmail.com",
+                    "role": "Lead"
                 }
             ],
             "description": "An implementation of the SMTP protocol",
@@ -2304,27 +2351,28 @@
                 "issues": "https://github.com/pear/Net_SMTP/issues",
                 "source": "https://github.com/pear/Net_SMTP"
             },
-            "time": "2021-03-19T18:39:42+00:00"
+            "time": "2024-04-15T19:42:15+00:00"
         },
         {
             "name": "pear/net_socket",
-            "version": "1.0.14",
+            "version": "v1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Net_Socket.git",
-                "reference": "fcd33efd77e4b35ce85489141ab9145343579fe8"
+                "reference": "f31d75ac352d49908f8987bbb1496c02a409812a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Net_Socket/zipball/fcd33efd77e4b35ce85489141ab9145343579fe8",
-                "reference": "fcd33efd77e4b35ce85489141ab9145343579fe8",
+                "url": "https://api.github.com/repos/pear/Net_Socket/zipball/f31d75ac352d49908f8987bbb1496c02a409812a",
+                "reference": "f31d75ac352d49908f8987bbb1496c02a409812a",
                 "shasum": ""
             },
             "require": {
-                "pear/pear_exception": "*"
+                "pear/pear_exception": "@stable",
+                "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "*"
+                "phpunit/phpunit": "^4"
             },
             "type": "library",
             "autoload": {
@@ -2337,7 +2385,7 @@
                 "./"
             ],
             "license": [
-                "PHP License"
+                "BSD-2-Clause"
             ],
             "authors": [
                 {
@@ -2361,7 +2409,7 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Net_Socket",
                 "source": "https://github.com/pear/Net_Socket"
             },
-            "time": "2014-02-20T19:27:06+00:00"
+            "time": "2017-04-06T15:16:38+00:00"
         },
         {
             "name": "pear/pear-core-minimal",
@@ -2564,16 +2612,16 @@
         },
         {
             "name": "phenx/php-svg-lib",
-            "version": "0.5.1",
+            "version": "0.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/php-svg-lib.git",
-                "reference": "8a8a1ebcf6aea861ef30197999f096f7bd4b4456"
+                "reference": "732faa9fb4309221e2bd9b2fda5de44f947133aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/8a8a1ebcf6aea861ef30197999f096f7bd4b4456",
-                "reference": "8a8a1ebcf6aea861ef30197999f096f7bd4b4456",
+                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/732faa9fb4309221e2bd9b2fda5de44f947133aa",
+                "reference": "732faa9fb4309221e2bd9b2fda5de44f947133aa",
                 "shasum": ""
             },
             "require": {
@@ -2604,9 +2652,9 @@
             "homepage": "https://github.com/PhenX/php-svg-lib",
             "support": {
                 "issues": "https://github.com/dompdf/php-svg-lib/issues",
-                "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.1"
+                "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.2"
             },
-            "time": "2023-12-11T20:56:08+00:00"
+            "time": "2024-02-07T12:49:40+00:00"
         },
         {
             "name": "phpoffice/phpspreadsheet",
@@ -2826,16 +2874,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.31",
+            "version": "2.0.47",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "233a920cb38636a43b18d428f9a8db1f0a1a08f4"
+                "reference": "b7d7d90ee7df7f33a664b4aea32d50a305d35adb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/233a920cb38636a43b18d428f9a8db1f0a1a08f4",
-                "reference": "233a920cb38636a43b18d428f9a8db1f0a1a08f4",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/b7d7d90ee7df7f33a664b4aea32d50a305d35adb",
+                "reference": "b7d7d90ee7df7f33a664b4aea32d50a305d35adb",
                 "shasum": ""
             },
             "require": {
@@ -2850,7 +2898,8 @@
                 "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
                 "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
                 "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
+                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
+                "ext-xml": "Install the XML extension to load XML formatted public keys."
             },
             "type": "library",
             "autoload": {
@@ -2915,7 +2964,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.31"
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.47"
             },
             "funding": [
                 {
@@ -2931,26 +2980,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-04-06T13:56:45+00:00"
+            "time": "2024-02-26T04:55:38+00:00"
         },
         {
             "name": "pontedilana/php-weasyprint",
-            "version": "0.13.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pontedilana/php-weasyprint.git",
-                "reference": "3ceba9644240e775d3d44e1bcee90b930769a17f"
+                "reference": "62c8704834e7d2a3688318ec15bf0e87b3061de9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pontedilana/php-weasyprint/zipball/3ceba9644240e775d3d44e1bcee90b930769a17f",
-                "reference": "3ceba9644240e775d3d44e1bcee90b930769a17f",
+                "url": "https://api.github.com/repos/pontedilana/php-weasyprint/zipball/62c8704834e7d2a3688318ec15bf0e87b3061de9",
+                "reference": "62c8704834e7d2a3688318ec15bf0e87b3061de9",
                 "shasum": ""
             },
             "require": {
-                "php": "7.4.* || 8.0.* || 8.1.* || 8.2.*",
+                "php": "7.4.* || 8.0.* || 8.1.* || 8.2.* || 8.3.*",
                 "psr/log": "^1.1 || ^2.0 || ^3.0",
-                "symfony/process": "^4.4 || ^5.4 || ^6.0"
+                "symfony/process": "^5.4 || ^6.2  || ^7"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^3.4",
@@ -2983,9 +3032,19 @@
             ],
             "support": {
                 "issues": "https://github.com/pontedilana/php-weasyprint/issues",
-                "source": "https://github.com/pontedilana/php-weasyprint/tree/0.13.0"
+                "source": "https://github.com/pontedilana/php-weasyprint/tree/1.4.0"
             },
-            "time": "2023-01-16T09:42:22+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/endelwar",
+                    "type": "github"
+                },
+                {
+                    "url": "https://ko-fi.com/endelwar",
+                    "type": "ko_fi"
+                }
+            ],
+            "time": "2023-11-20T08:58:59+00:00"
         },
         {
             "name": "psr/container",
@@ -3202,16 +3261,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.3",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
@@ -3235,7 +3294,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for logging libraries",
@@ -3246,9 +3305,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.3"
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
             },
-            "time": "2020-03-23T09:12:05+00:00"
+            "time": "2021-05-03T11:20:27+00:00"
         },
         {
             "name": "psr/simple-cache",
@@ -3394,16 +3453,16 @@
         },
         {
             "name": "sabberworm/php-css-parser",
-            "version": "8.4.0",
+            "version": "v8.5.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sabberworm/PHP-CSS-Parser.git",
-                "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30"
+                "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
+                "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30",
-                "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30",
+                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/4a3d572b0f8b28bb6fd016ae8bbfc445facef152",
+                "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152",
                 "shasum": ""
             },
             "require": {
@@ -3411,13 +3470,17 @@
                 "php": ">=5.6.20"
             },
             "require-dev": {
-                "codacy/coverage": "^1.4",
-                "phpunit/phpunit": "^4.8.36"
+                "phpunit/phpunit": "^5.7.27"
             },
             "suggest": {
                 "ext-mbstring": "for parsing UTF-8 CSS"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "9.0.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Sabberworm\\CSS\\": "src/"
@@ -3430,6 +3493,14 @@
             "authors": [
                 {
                     "name": "Raphael Schweikert"
+                },
+                {
+                    "name": "Oliver Klee",
+                    "email": "github@oliverklee.de"
+                },
+                {
+                    "name": "Jake Hotson",
+                    "email": "jake.github@qzdesign.co.uk"
                 }
             ],
             "description": "Parser for CSS Files written in PHP",
@@ -3440,10 +3511,10 @@
                 "stylesheet"
             ],
             "support": {
-                "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues",
-                "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.4.0"
+                "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
+                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.5.1"
             },
-            "time": "2021-12-11T13:40:54+00:00"
+            "time": "2024-02-15T16:41:13+00:00"
         },
         {
             "name": "scssphp/scssphp",
@@ -4419,16 +4490,16 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.27.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
                 "shasum": ""
             },
             "require": {
@@ -4436,9 +4507,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -4482,7 +4550,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -4498,7 +4566,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
@@ -4660,20 +4728,20 @@
         },
         {
             "name": "symfony/process",
-            "version": "v4.4.41",
+            "version": "v5.4.36",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "9eedd60225506d56e42210a70c21bb80ca8456ce"
+                "reference": "4fdf34004f149cc20b2f51d7d119aa500caad975"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/9eedd60225506d56e42210a70c21bb80ca8456ce",
-                "reference": "9eedd60225506d56e42210a70c21bb80ca8456ce",
+                "url": "https://api.github.com/repos/symfony/process/zipball/4fdf34004f149cc20b2f51d7d119aa500caad975",
+                "reference": "4fdf34004f149cc20b2f51d7d119aa500caad975",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3",
+                "php": ">=7.2.5",
                 "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
@@ -4702,7 +4770,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v4.4.41"
+                "source": "https://github.com/symfony/process/tree/v5.4.36"
             },
             "funding": [
                 {
@@ -4718,7 +4786,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-04T10:19:07+00:00"
+            "time": "2024-02-12T15:49:53+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -4890,20 +4958,20 @@
         },
         {
             "name": "tecnickcom/tcpdf",
-            "version": "6.4.4",
+            "version": "6.7.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tecnickcom/TCPDF.git",
-                "reference": "42cd0f9786af7e5db4fcedaa66f717b0d0032320"
+                "reference": "951eabf0338ec2522bd0d5d9c79b08a3a3d36b36"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/42cd0f9786af7e5db4fcedaa66f717b0d0032320",
-                "reference": "42cd0f9786af7e5db4fcedaa66f717b0d0032320",
+                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/951eabf0338ec2522bd0d5d9c79b08a3a3d36b36",
+                "reference": "951eabf0338ec2522bd0d5d9c79b08a3a3d36b36",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=5.5.0"
             },
             "type": "library",
             "autoload": {
@@ -4928,7 +4996,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPL-3.0-only"
+                "LGPL-3.0-or-later"
             ],
             "authors": [
                 {
@@ -4950,7 +5018,7 @@
             ],
             "support": {
                 "issues": "https://github.com/tecnickcom/TCPDF/issues",
-                "source": "https://github.com/tecnickcom/TCPDF/tree/6.4.4"
+                "source": "https://github.com/tecnickcom/TCPDF/tree/6.7.5"
             },
             "funding": [
                 {
@@ -4958,44 +5026,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2021-12-31T08:39:24+00:00"
-        },
-        {
-            "name": "togos/gitignore",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/TOGoS/PHPGitIgnore.git",
-                "reference": "32bc0830e4123f670adcbf5ddda5bef362f4f4d4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/TOGoS/PHPGitIgnore/zipball/32bc0830e4123f670adcbf5ddda5bef362f4f4d4",
-                "reference": "32bc0830e4123f670adcbf5ddda5bef362f4f4d4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2"
-            },
-            "require-dev": {
-                "togos/simpler-test": "1.1.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "TOGoS_GitIgnore_": "src/main/php/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Parser for .gitignore (and sparse-checkout, and anything else using the same format) files",
-            "support": {
-                "issues": "https://github.com/TOGoS/PHPGitIgnore/issues",
-                "source": "https://github.com/TOGoS/PHPGitIgnore/tree/master"
-            },
-            "time": "2019-04-19T19:16:58+00:00"
+            "time": "2024-04-20T17:25:10+00:00"
         },
         {
             "name": "totten/ca-config",
diff --git a/www/modules/civicrm/css/civicrm.css b/www/modules/civicrm/css/civicrm.css
index 214b85fb9..f16d3a8ad 100644
--- a/www/modules/civicrm/css/civicrm.css
+++ b/www/modules/civicrm/css/civicrm.css
@@ -2106,7 +2106,7 @@ a.crm-i:hover {
   content: "\f059";
 }
 
-div.crm-accordion-header a.helpicon {
+details > summary a.helpicon {
   color: inherit;
 }
 div.crm-master-accordion-header a.helpicon {
@@ -2194,6 +2194,10 @@ div.crm-master-accordion-header a.helpicon {
 
 /* Specific types of headers */
 
+.crm-container details {
+  margin: 0.25rem 0;
+}
+
 .crm-container summary { /* default summary setting*/
   display: list-item;
   list-style: none;
@@ -2290,6 +2294,11 @@ div.crm-master-accordion-header a.helpicon {
   padding: 0 0.25rem; /* adds padding for nested accordions */
 }
 
+.crm-container details table.dataTable {
+  width: 100% !important; /* stops collapsed dataTables: dev/user-interface/-/issues/73 */
+  box-sizing: border-box;
+}
+
 /* Collapse icon */
 
 /* General icon settings for all collapsible things */
@@ -2321,7 +2330,7 @@ div.crm-master-accordion-header a.helpicon {
 /* Accordion bodies */
 
 .crm-container .crm-accordion-wrapper .crm-accordion-body,
-.crm-container details.crm-accordion-bold .crm-accordion-body {
+.crm-container details.crm-accordion-bold > .crm-accordion-body {
   border-radius: 0 0 4px 4px;
   border: 1px solid #70716b;
   border-top: 0;
diff --git a/www/modules/civicrm/css/joomla.css b/www/modules/civicrm/css/joomla.css
index 46eb7ab7d..d0f78cb97 100644
--- a/www/modules/civicrm/css/joomla.css
+++ b/www/modules/civicrm/css/joomla.css
@@ -1,410 +1,60 @@
-/* joomla.css: Joomla-specific css directives for CiviCRM. */
+/* Joomla-specific css directives for CiviCRM.
+   These are namespaced to Joomla so could be loaded on other CMSs. */
 
-/*
-** HTML elements
-*/
-div#toolbar-box .icon-48-generic {
-  display: none;
-}
-div#toolbar-box {
-  height: 26px;
-}
-fieldset {
-  margin-bottom: 1em;
-  padding: .5em;
-}
-form {
-  margin: 0;
-  padding: 0;
-}
-hr {
-  height: 1px;
-  border: 1px solid gray;
-}
-img {
-  border: 0;
-}
-/* Added in CiviCRM 2.0 to alleviate tiny font issues. */
-#crm-container tr,
-#crm-container tr td {
-  font-size: 1em;
-}
-/* Added in CiviCRM 2.1 to overwrite tiny font in TinyMCE editor. */
-#crm-container #content table.mceLayout td {
-  font-size: 0em;
-}
-th {
-  text-align: left;
-  padding-right: 1em;
-  border-bottom: 3px solid #ccc;
-  white-space: nowrap;
-}
-th.active img {
-  display: inline;
-}
-tr.dark,
-tr.light {
-  background-color: #eee;
-  border-bottom: 1px solid #ccc;
-  padding: 0.1em 0.6em;
-}
-td.active {
-  background-color: #ddd;
-}
-td.label {
-  background: none;
+body.admin.com_civicrm .crm-container label,
+body.admin.com_civicrm  .crm-container .description {
+  font-size: 1em; /* ems to inherit Grernwich's small size */
   color: #3e3e3e;
-  display: table-cell;
-}
-
-/*
-** Other common styles
-*/
-.breadcrumb {
-  padding-bottom: .5em;
 }
-.block ul {
-  margin: 0;
-  padding: 0 0 0.25em 1em;
+body.admin.com_civicrm .crm-container .label {
+  background: transparent;
+  font-size: inherit;
+  line-height: inherit;
 }
-br.clear {
-  clear: both;
-  height: 0px;
-}
-.container-inline div {
-  display: inline;
-}
-.container-inline .crm-form-submit {
-  margin: 0;
-}
-.item-list .icon {
-  color: #555;
-  float: right;
-  padding-left: 0.25em;
-  clear: right;
-}
-.item-list .icon a {
-  color: #000;
-  text-decoration: none;
-}
-.item-list .icon a:hover {
-  color: #000;
-  text-decoration: none;
-}
-.item-list .title {
-  font-weight: bold;
-}
-.item-list ul {
-  margin: 0 0 0.75em 0;
+body.admin.com_civicrm.layout-default #content,
+body.admin.com_civicrm.layout-default #content > .row > .col-md-12 {
   padding: 0;
 }
-.item-list ul li {
-  margin: 0 0 0.25em 1.5em;
-  padding: 0;
-  list-style: disc;
-}
-/* Override .9em field help size from civicrm.css - CiviCRM 2.0 */
-#crm-container div.description,
-#crm-container span.description,
-#crm-container dd.description {
-  font-size: 1em;
-}
-#crm-container div.description,
-#crm-container span.description {
-  margin: 2px 0 15px 0;
-  display: block;
-}
-.form-item label {
-  font-weight: bold;
-}
-.form-item label.option {
-  font-weight: normal;
-}
-.crm-form-submit {
-  margin: 0.5em 0;
-}
-.marker,
-.form-required {
-  color: #f00;
-}
-.more-link {
-  text-align: right;
-}
-#pager {
-  clear: both;
-  text-align: center;
-}
-#pager div {
-  padding: 0.5em;
-}
-.tips {
-  margin-top: 0;
-  margin-bottom: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-  font-size: 0.9em;
-}
-.more-help-link {
-  font-size: 0.85em;
-  text-align: right;
-}
-
-/*
-** Page layout blocks / IDs
-*/
-#header,
-#content {
-  width: 100%;
-}
-#logo {
-  vertical-align: middle;
-  border: 0;
-}
-#logo img {
-  float: left;
-  padding: 0em 1.0em 0em 1em;
-  border: 0;
-}
-#menu {
-  padding: 0 0 0 0;
-  vertical-align: middle;
-}
-#primary {
-  font-size: 1.0em;
-  padding: 0em 0.8em 0.5em 0;
-  color: #9cf;
-}
-#primary a {
-  font-weight: bold;
-  color: #fff;
-}
-#secondary {
-  padding: 0 1em 0.5em 0;
-  font-size: 0.8em;
-  color: #9cf;
-}
-#secondary a {
-  font-weight: bold;
-  color: #9cf;
-}
-#search .form-text,
-#search .crm-form-submit {
-  border: 1px solid #369;
-  font-size: 1.1em;
-}
-#search .form-text {
-  width: 8em;
-  height: 1.4em;
-  padding: 0 0.5em 0 0.5em;
-  margin: 0 0 0.5em 0;
-}
-#search .crm-form-submit {
-  height: 1.5em;
-}
-#main {
-  /* padding in px not ex because IE messes up 100% width tables otherwise */
-  padding: 10px;
-}
-#help {
-  font-size: 1em;
-  margin-bottom: 1em;
+body.admin.com_civicrm.layout-default #content > .row {
+  margin-inline: 0;
 }
-.breadcrumb {
-  margin-bottom: .5em;
-}
-.messages {
-  background-color: #eee;
-  border: 1px solid #ccc;
-  padding: 0.3em;
-  margin-bottom: 1em;
-}
-.error {
-  border-color: red;
-  color: red;
-}
-#crm-content {
+body.admin.com_civicrm #crm-content {
   padding: 1rem;
 }
-#footer {
-  padding: 1em;
-  font-size: 0.8em;
-}
-
-/*
-** Common declarations for child classes of node, comment, block, box, etc.
-** If you want any of them styled differently for a specific parent, add
-** additional rules /with only the differing properties!/ to .parent .class.
-** See .comment .title for an example.
-*/
-.title,
-.title a {
-  font-weight: normal;
-  font-size: 1.6em;
-  color: #666;
-  margin: 0 auto 0 auto;  /* decrease default margins for h<x>.title */
-}
-.block-civicrm #recently-viewed .crm-icon,
-.crm-icon {
-  margin-top: 0 !important;
-}
-.submitted {
-  color: #999;
-  font-size: 0.8em;
-}
-.links {
-  color: #999;
-}
-.links a {
-  font-weight: bold;
-}
-.block,
-.box {
-  padding: 0 0 1.5em 0;
-}
-.block {
-  min-height: 25px;
-  border-bottom: 1px solid #bbb;
-  padding-bottom: 0.75em;
-  margin-bottom: 1.5em;
-}
-.block .title {
-  margin-bottom: .25em;
-}
-.box .title {
-  font-size: 1.1em;
-}
-#module-status,
-.version {
-  font-size: 11px;
-}
-#module-status a {
-  font-weight: normal;
-}
-.main {
-  text-align: left;
-}
-
-/* Joomla Admin Menu alterations */
-/* Moved from civicrm.css in v3.2 */
-
-div#toolbar-box div.m {
-  padding: 0px !important;
-  min-height: 0;
-  border: 0;
-  margin-top: 8px;
-}
-div#toolbar-box,
-div#toolbar-box div.m {
-  height: auto;
-}
-.crm-tab-button,
-.ui-tabs .ui-tabs-nav li {
-  border: 1px;
-  font-size: 110%;
-}
-.ui-tabs .ui-tabs-nav {
-  padding: 0.2em 3px 1px;
-}
-#mainTabContainer li.crm-tab-button {
-  margin: 0 3px 3px 0;
-  border: 1px solid #f5f6f1 !important;
-}
-#mainTabContainer li.crm-tab-button.ui-tabs-selected {
-  padding-bottom: 0;
-  border: 1px solid #999 !important;
-}
-#crm-container .col1 {
-  margin: 0;
-}
-#crm-container .footer {
-  font-size: 1em;
-}
-.ac_results .ac_odd {
-  background-color: #444;
-}
-#crm-notification-container {
-  top: 100px;
-}
-.crm-container textarea,
-.crm-container input,
-.crm-container select {
-  font-size: 12px;
-  margin-bottom: auto;
-  margin-right: 4px;
-  width: auto;
-  padding: 2px 4px;
-}
-.crm-container .select2-search input {
-  width: 100%;
-}
-.crm-container textarea,
-.crm-container input {
-  height: auto;
-}
-.crm-container button[type=submit] {
-  height: auto;
-}
-.crm-container .disabled {
-  font-weight: normal;
-}
-#crm-container .form-layout td.label,
-.crm-container .form-layout td.label {
-  width: inherit;
-}
-#crm-container .crm-event-form-fee-block .label {
-  background-color: inherit;
-  width: inherit;
-  display: block;
-}
-/* dev/core#874 the width:auto styling above causes the menubar colour picker to be squeezed */
-.crm-container input.crm-form-color {
-  width: 3.6em;
-}
-
-/* Remove Joomla subhead toolbar & whitespace border */
-
-body.admin.com_civicrm .subhead-collapse {
+body.admin.com_civicrm #subhead-container,
+body.admin.com_civicrm .subhead-collapse,
+body.admin.com_civicrm.layout-default a[target="_blank"]::before {
   display: none;
 }
-body.admin.com_civicrm .container-fluid.container-main {
+body.admin.com_civicrm .crm-container details { /* Atum J4 reset */
+  background: inherit;
+  border: none;
+  border-radius: inherit;
+  margin: 0;
   padding: 0;
-  border-top: 1px solid #787878;
-}
-body.admin.com_civicrm.task-civicrmupgrade .container-fluid.container-main {
-  padding: 10px 25px 25px;
-}
-body.admin.com_civicrm #crm-nav-menu-container {
-  padding-bottom: 0 !important;
-}
-/* Make footer admin bar hide behind popup windows (CRM-15723) */
-body.ui-dialog-open #status {
-  z-index: 100 !important;
 }
-
-/* Joomla 4 */
-
-body.admin.com_civicrm.layout-default #subhead-container {
-  display: none;
+body.admin.com_civicrm .crm-container details + details {
+  margin: 0.25rem 0 0;
 }
-body.admin.com_civicrm.layout-default .crm-container .crm-dashlet {
-  max-width: 50vw; /* fixes over-wide news dashlet */
+body.admin.com_civicrm .crm-container details summary ~ * { /* Atum J4 reset */
+  margin-top: 0;
 }
-body.admin.com_civicrm.layout-default .crm-container .content {
-  padding: inherit; /* overrides J4 duplicated padding */
+body.admin.com_civicrm.layout-default .crm-dashlet {
+  max-width: 60vw;
 }
-
-/* J4 Modals */
-
-body.admin.com_civicrm.layout-default .crm-container.ui-dialog.ui-resizable {
-  z-index: 1021;
+body.admin.com_civicrm .crm-container.ui-dialog {
+  z-index: 100000;
 }
 body.admin.com_civicrm.layout-default .ui-widget-overlay {
-  z-index: 1;
+  z-index: 100001;
 }
-body.admin.com_civicrm.layout-default .crm-container .modal-dialog {
+body.admin.com_civicrm.layout-default .select2-drop {
+  z-index: 100002;
+}
+body.admin.com_civicrm.layout-default .modal-dialog {
   max-width: inherit;
-  padding: 0;
   margin: 0;
+  padding: 0;
   overflow: scroll;
   pointer-events: all;
 }
diff --git a/www/modules/civicrm/css/menubar-joomla.css b/www/modules/civicrm/css/menubar-joomla.css
index 407308d01..d75e5224d 100644
--- a/www/modules/civicrm/css/menubar-joomla.css
+++ b/www/modules/civicrm/css/menubar-joomla.css
@@ -59,15 +59,13 @@ body.admin.com_civicrm.layout-default #crm-qsearch label {
 
 @media (max-width: $breakMin) {
 
-  body.com_civicrm.layout-default #header {
-    margin-bottom: $menubarHeight;
-  }
-
   body.admin.com_civicrm.layout-default #civicrm-menu-nav {
-    margin-top: calc($menubarHeight + 14px);
     background: #1b1b1b;
-    z-index: 1000;
     height: $menubarHeight;
     border-top: 1px solid #aaa;
   }
+
+  body.admin.com_civicrm.layout-default .breadcrumb {
+    margin-top: 2.5rem;
+  }
 }
diff --git a/www/modules/civicrm/deleted-files-list.json b/www/modules/civicrm/deleted-files-list.json
index 9d24aef64..281d4bd8c 100644
--- a/www/modules/civicrm/deleted-files-list.json
+++ b/www/modules/civicrm/deleted-files-list.json
@@ -1,19 +1,28 @@
 [
+    ".gitlab/issue_templates/general-bug-or-issue.md",
+    ".gitlab/issue_templates/general.md",
+    "CONTRIBUTORS.txt",
+    "CRM/ACL/DAO/Cache.php",
     "CRM/ACL/Form/ACLBasic.php",
     "CRM/ACL/Page/ACLBasic.php",
     "CRM/Activity/BAO/ActivityTarget.php",
     "CRM/Activity/Form/Task/PDFLetterCommon.php",
     "CRM/Activity/Form/Task/SearchTaskHookSample.php",
+    "CRM/Activity/Import/Controller.php",
     "CRM/Activity/Import/Field.php",
     "CRM/Activity/Import/Form/Summary.php",
     "CRM/Activity/Import/Parser.php",
+    "CRM/Admin/Form/CKEditorConfig.php",
     "CRM/Admin/Form/Persistent.php",
     "CRM/Admin/Form/Preferences/Campaign.php",
     "CRM/Admin/Form/Preferences/Event.php",
     "CRM/Admin/Form/Preferences/Multisite.php",
+    "CRM/Admin/Form/Tag.php",
+    "CRM/Admin/Page/CKEditorConfig.php",
     "CRM/Admin/Page/CMSUser.php",
     "CRM/Admin/Page/Persistent.php",
     "CRM/Admin/Page/Setting.php",
+    "CRM/Admin/Page/Tag.php",
     "CRM/Api4/Permission.php",
     "CRM/Api4/Services.php",
     "CRM/Campaign/Config.php",
@@ -23,32 +32,48 @@
     "CRM/Campaign/Page/Survey.php",
     "CRM/Case/Config.php",
     "CRM/Case/Form/AddContact.php",
+    "CRM/Case/Form/Task/ExportDocument.php",
+    "CRM/Case/Form/Task/PrintMergeDoc.php",
     "CRM/Case/Form/Task/SearchTaskHookSample.php",
     "CRM/Case/FormBuilder.php",
-    "CRM/Case/WorkflowMessage/*",
+    "CRM/Case/WorkflowMessage/CaseActivity/*",
     "CRM/Contact/BAO/Contact/Optimizer.php",
+    "CRM/Contact/BAO/RelationshipVortex.php",
+    "CRM/Contact/BAO/SearchCustom.php",
     "CRM/Contact/DAO/Factory.php",
+    "CRM/Contact/DAO/RelationshipVortex.php",
     "CRM/Contact/Form/ProfileContact.php",
+    "CRM/Contact/Form/Search/Custom.php",
+    "CRM/Contact/Form/Search/Custom/*",
+    "CRM/Contact/Import/Controller.php",
     "CRM/Contact/Import/Field.php",
     "CRM/Contact/Import/ImportJob.php",
     "CRM/Contact/Import/Importer.php",
+    "CRM/Contact/Page/CustomSearch.php",
     "CRM/Contact/Page/Dashlet.php",
     "CRM/Contact/Page/View/Note.php",
     "CRM/Contact/Page/View/Sunlight.php",
+    "CRM/Contact/Selector/Custom.php",
     "CRM/Contribute/BAO/ManagePremiums.php",
     "CRM/Contribute/Config.php",
     "CRM/Contribute/Form/CloseAccPeriod.php",
     "CRM/Contribute/Form/Contribution/OnBehalfOf.php",
     "CRM/Contribute/Form/Task/PDFLetterCommon.php",
     "CRM/Contribute/Form/Task/SearchTaskHookSample.php",
+    "CRM/Contribute/Import/Controller.php",
     "CRM/Contribute/Import/Field.php",
     "CRM/Contribute/Import/Form/Summary.php",
     "CRM/Contribute/Import/Parser.php",
+    "CRM/Contribute/WorkflowMessage/Contribution/BasicContribution.ex.php",
+    "CRM/Contribute/WorkflowMessage/RecurringEdit/AlexCancelled.ex.php",
+    "CRM/Contribute/WorkflowMessage/RecurringEdit/BarbPending.ex.php",
+    "CRM/Contribute/WorkflowMessage/RecurringEdit/BasicEditExample.ex.php",
     "CRM/Core/ActionScheduleTmp.php",
     "CRM/Core/BAO/Cache/*",
     "CRM/Core/BAO/Persistent.php",
     "CRM/Core/BAO/Preferences.php",
     "CRM/Core/Base.php",
+    "CRM/Core/CRM/*",
     "CRM/Core/CodeGen/Version.php",
     "CRM/Core/Component/Config.php",
     "CRM/Core/Config/Defaults.php",
@@ -69,39 +94,65 @@
     "CRM/Core/I18n/SchemaStructure_3_4_beta3.php",
     "CRM/Core/I18n/SchemaStructure_4_1_0.php",
     "CRM/Core/I18n/SchemaStructure_4_1_alpha1.php",
+    "CRM/Core/I18n/SchemaStructure_4_2_alpha1.php",
+    "CRM/Core/I18n/SchemaStructure_4_3_1.php",
+    "CRM/Core/I18n/SchemaStructure_4_5_alpha1.php",
+    "CRM/Core/I18n/SchemaStructure_4_5_beta2.php",
+    "CRM/Core/I18n/SchemaStructure_4_7_alpha1.php",
+    "CRM/Core/InnoDBIndexer.php",
+    "CRM/Core/Payment/Elavon.php",
     "CRM/Core/Payment/Google.php",
     "CRM/Core/Payment/GoogleIPN.php",
     "CRM/Core/Payment/IATS.php",
     "CRM/Core/Payment/Moneris.php",
+    "CRM/Core/Payment/PayflowPro.php",
     "CRM/Core/Payment/PaymentExpress.php",
     "CRM/Core/Payment/PaymentExpressIPN.php",
     "CRM/Core/Payment/PaymentExpressUtils.php",
+    "CRM/Core/Payment/eWAY.php",
     "CRM/Core/Permission/Drupal6.php",
     "CRM/Core/Smarty/plugins/block.serialize.php",
     "CRM/Core/Smarty/plugins/function.crmDBTpl.php",
     "CRM/Core/Smarty/plugins/function.crmNavigationMenu.php",
     "CRM/Custom/Form/ChangeFieldType.php",
+    "CRM/Custom/Import/Controller.php",
     "CRM/Custom/Import/Field.php",
     "CRM/Custom/Import/Form/Summary.php",
     "CRM/Custom/Import/Parser.php",
+    "CRM/Event/Cart/BAO/*",
+    "CRM/Event/Cart/Controller/*",
+    "CRM/Event/Cart/Form/*",
+    "CRM/Event/Cart/Page/*",
+    "CRM/Event/Cart/StateMachine/*",
     "CRM/Event/Config.php",
+    "CRM/Event/Form/ManageEvent/Conference.php",
     "CRM/Event/Form/Task/SearchTaskHookSample.php",
+    "CRM/Event/Import/Controller.php",
     "CRM/Event/Import/Field.php",
     "CRM/Event/Import/Form/Summary.php",
     "CRM/Event/Import/Parser.php",
+    "CRM/Event/Page/ICalendar.php",
+    "CRM/Export/Form/Select/*",
+    "CRM/Financial/BAO/Payment/*",
     "CRM/Grant/*",
     "CRM/Import/DataSource/Spreadsheet.php",
     "CRM/Import/Form/Summary.php",
+    "CRM/Mailing/DAO/Component.php",
+    "CRM/Mailing/Event/BAO/MailingEventClickThrough.php",
+    "CRM/Mailing/Event/BAO/Resubscribe.php",
+    "CRM/Mailing/Event/DAO/MailingEventClickThrough.php",
     "CRM/Mailing/Form/Group.php",
     "CRM/Mailing/Form/Schedule.php",
     "CRM/Mailing/Form/Settings.php",
     "CRM/Mailing/Form/Test.php",
     "CRM/Mailing/Form/Upload.php",
+    "CRM/Mailing/Page/Optout.php",
     "CRM/Mailing/Page/Preview.php",
     "CRM/Mailing/StateMachine/*",
     "CRM/Member/Config.php",
     "CRM/Member/Form/Task/PDFLetterCommon.php",
     "CRM/Member/Form/Task/SearchTaskHookSample.php",
+    "CRM/Member/Import/Controller.php",
     "CRM/Member/Import/Field.php",
     "CRM/Member/Import/Form/Summary.php",
     "CRM/Member/Import/Parser.php",
@@ -112,7 +163,9 @@
     "CRM/Report/Form/Contribute/LoggingSummary.php",
     "CRM/Report/Form/Event.php",
     "CRM/Report/Form/Extended.php",
+    "CRM/Report/Form/Grant/*",
     "CRM/Report/Interface.php",
+    "CRM/UF/Page/AJAX.php",
     "CRM/Upgrade/3.2.1.msg_template/*",
     "CRM/Upgrade/3.2.alpha1.msg_template/*",
     "CRM/Upgrade/3.2.alpha2.msg_template/*",
@@ -149,15 +202,17 @@
     "CRM/Upgrade/4.6.alpha1.msg_template/*",
     "CRM/Upgrade/4.6.alpha4.msg_template/*",
     "CRM/Upgrade/4.7.11.msg_template/*",
+    "CRM/Upgrade/4.7.13.msg_template/*",
     "CRM/Upgrade/4.7.14.msg_template/*",
     "CRM/Upgrade/4.7.19.msg_template/*",
-    "CRM/Upgrade/4.7.23.msg_template/civicrm_msg_template.tpl",
-    "CRM/Upgrade/4.7.23.msg_template/message_templates/*",
+    "CRM/Upgrade/4.7.22.msg_template/*",
+    "CRM/Upgrade/4.7.23.msg_template/*",
     "CRM/Upgrade/4.7.4.msg_template/*",
     "CRM/Upgrade/4.7.5.msg_template/*",
     "CRM/Upgrade/4.7.alpha1.msg_template/*",
     "CRM/Upgrade/4.7.beta1.msg_template/*",
     "CRM/Upgrade/4.7.beta8.msg_template/*",
+    "CRM/Upgrade/Incremental/Legacy.php",
     "CRM/Upgrade/Incremental/php/FourFive.php",
     "CRM/Upgrade/Incremental/php/FourFour.php",
     "CRM/Upgrade/Incremental/php/FourOne.php",
@@ -412,60 +467,178 @@
     "CRM/Upgrade/Snapshot/*",
     "CRM/Utils/Api.php",
     "CRM/Utils/Cache/SerializeCache.php",
+    "CRM/Utils/Check/Case.php",
     "CRM/Utils/Check/Component/Event.php",
+    "CRM/Utils/Check/Env.php",
+    "CRM/Utils/Check/Security.php",
     "CRM/Utils/DeprecatedUtils.php",
     "CRM/Utils/Geocode.php",
     "CRM/Utils/Geocode/Yahoo.php",
     "CRM/Utils/Hook/Drupal6.php",
+    "CRM/Utils/Hook/Inspector.php",
     "CRM/Utils/Mail/LoggingMailer.php",
     "CRM/Utils/OpenFlashChart.php",
+    "CRM/Utils/QueryFormatter.php",
+    "CRM/Utils/ReCAPTCHA.php",
     "CRM/Utils/Sunlight.php",
     "CRM/Utils/System/Drupal6.php",
     "CRM/Utils/Tree.php",
     "CRM/Widget/*",
+    "Civi/API/Subscriber/XDebugSubscriber.php",
+    "Civi/Api4/Action/Campaign/*",
+    "Civi/Api4/Action/CiviCase/*",
     "Civi/Api4/Action/Contact/GetFields.php",
+    "Civi/Api4/Action/Contribution/*",
     "Civi/Api4/Action/CustomValue/GetActions.php",
+    "Civi/Api4/Action/CustomValue/GetFields.php",
     "Civi/Api4/Action/CustomValue/Replace.php",
     "Civi/Api4/Action/Entity/GetLinks.php",
     "Civi/Api4/Action/EntityTag/*",
+    "Civi/Api4/Action/Event/*",
+    "Civi/Api4/Action/MailSettings/*",
+    "Civi/Api4/Action/Queue/RunLoop.php",
+    "Civi/Api4/Action/WorkflowMessageExample/*",
+    "Civi/Api4/Campaign.php",
+    "Civi/Api4/CaseActivity.php",
+    "Civi/Api4/CaseContact.php",
+    "Civi/Api4/CaseType.php",
+    "Civi/Api4/CiviCase.php",
+    "Civi/Api4/Contribution.php",
+    "Civi/Api4/ContributionPage.php",
+    "Civi/Api4/ContributionProduct.php",
+    "Civi/Api4/ContributionRecur.php",
+    "Civi/Api4/ContributionSoft.php",
+    "Civi/Api4/EntityFinancialAccount.php",
+    "Civi/Api4/EntityFinancialTrxn.php",
+    "Civi/Api4/Event.php",
     "Civi/Api4/Event/GetSpecEvent.php",
     "Civi/Api4/Event/Subscriber/ActivityPreCreationSubscriber.php",
     "Civi/Api4/Event/Subscriber/ContactPreSaveSubscriber.php",
+    "Civi/Api4/Event/Subscriber/ContributionPreSaveSubscriber.php",
     "Civi/Api4/Event/Subscriber/CreateApi4RequestSubscriber.php",
+    "Civi/Api4/Event/Subscriber/CustomFieldPreSaveSubscriber.php",
     "Civi/Api4/Event/Subscriber/CustomGroupPreCreationSubscriber.php",
     "Civi/Api4/Event/Subscriber/OptionValuePreCreationSubscriber.php",
     "Civi/Api4/Event/Subscriber/PostSelectQuerySubscriber.php",
+    "Civi/Api4/FinancialAccount.php",
+    "Civi/Api4/FinancialItem.php",
+    "Civi/Api4/FinancialTrxn.php",
+    "Civi/Api4/FinancialType.php",
+    "Civi/Api4/Generic/BridgeEntity.php",
     "Civi/Api4/Generic/Traits/OptionList.php",
+    "Civi/Api4/Generic/Traits/ReadOnly.php",
+    "Civi/Api4/Generic/Traits/SoftDelete.php",
+    "Civi/Api4/Generic/Traits/SoftDeleteEntity.php",
+    "Civi/Api4/Grant.php",
+    "Civi/Api4/LineItem.php",
+    "Civi/Api4/MailSettings.php",
+    "Civi/Api4/Mailing.php",
+    "Civi/Api4/MailingEventBounce.php",
+    "Civi/Api4/MailingEventConfirm.php",
+    "Civi/Api4/MailingEventOpened.php",
+    "Civi/Api4/MailingEventQueue.php",
+    "Civi/Api4/MailingEventSubscribe.php",
+    "Civi/Api4/MailingEventTrackableURLOpen.php",
+    "Civi/Api4/MailingEventUnsubscribe.php",
+    "Civi/Api4/MailingGroup.php",
+    "Civi/Api4/MailingJob.php",
+    "Civi/Api4/MailingTrackableURL.php",
+    "Civi/Api4/Membership.php",
+    "Civi/Api4/MembershipBlock.php",
+    "Civi/Api4/MembershipStatus.php",
+    "Civi/Api4/MembershipType.php",
+    "Civi/Api4/PCP.php",
+    "Civi/Api4/PCPBlock.php",
+    "Civi/Api4/Participant.php",
+    "Civi/Api4/ParticipantStatusType.php",
+    "Civi/Api4/PaymentProcessor.php",
+    "Civi/Api4/PaymentProcessorType.php",
+    "Civi/Api4/PaymentToken.php",
+    "Civi/Api4/PcpBlock.php",
+    "Civi/Api4/Pledge.php",
+    "Civi/Api4/PledgePayment.php",
+    "Civi/Api4/PriceField.php",
+    "Civi/Api4/PriceFieldValue.php",
+    "Civi/Api4/PriceSet.php",
+    "Civi/Api4/PriceSetEntity.php",
+    "Civi/Api4/Product.php",
+    "Civi/Api4/Provider.php",
+    "Civi/Api4/ReportInstance.php",
     "Civi/Api4/Service/Autocomplete/ParticipantAutocompleteProvider.php",
+    "Civi/Api4/Service/Links/MembershipLinksProvider.php",
     "Civi/Api4/Service/Schema/Joinable/ActivityToActivityContactAssigneesJoinable.php",
     "Civi/Api4/Service/Schema/Joinable/BridgeJoinable.php",
     "Civi/Api4/Service/Schema/Joinable/OptionValueJoinable.php",
     "Civi/Api4/Service/Spec/Provider/ACLEntityRoleCreationSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/ActionScheduleCreationSpecProvider.php",
     "Civi/Api4/Service/Spec/Provider/ActivityCreationSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/CampaignCreationSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/CaseCreationSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/CaseTypeGetSpecProvider.php",
     "Civi/Api4/Service/Spec/Provider/ContactCreationSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/ContributionCreationSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/ContributionGetSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/ContributionRecurCreationSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/CustomGroupCreationSpecProvider.php",
     "Civi/Api4/Service/Spec/Provider/CustomGroupSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/EventCreationSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/FinancialItemCreationSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/FinancialTrxnCreationSpecProvider.php",
     "Civi/Api4/Service/Spec/Provider/MappingCreationSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/MembershipCreationSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/MembershipTypeCreationSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/PaymentProcessorCreationSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/PaymentProcessorTypeCreationSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/PriceFieldValueCreationSpecProvider.php",
+    "Civi/Api4/Service/Spec/Provider/StatusPreferenceCreationSpecProvider.php",
     "Civi/Api4/Service/Spec/Provider/UFMatchCreationSpecProvider.php",
     "Civi/Api4/Service/Spec/Provider/UserJobSpecProvider.php",
     "Civi/Api4/Survey.php",
     "Civi/Api4/Utils/ActionUtil.php",
+    "Civi/Api4/WorkflowMessageExample.php",
     "Civi/Api4/services.xml",
     "Civi/Compile/*",
+    "Civi/Core/ImportMap.php",
     "Civi/Foo/*",
     "Civi/Pipe/BasicJsonSession.php",
+    "Civi/Pipe/JsonRpcSession.php",
+    "Civi/Schema/SqlGenerator.php",
     "Civi/Test/Api3DocTrait.php",
     "Civi/Test/CiviEnvBuilder/ExtensionStep.php",
+    "Civi/Test/ExampleData/Contact/Alex.ex.php",
+    "Civi/Test/ExampleData/Contact/Barb.ex.php",
+    "Civi/Test/ExampleData/Contribution/Euro5990.ex.php",
+    "Civi/Test/ExampleData/ContributionRecur/Euro5990.ex.php",
     "Civi/WorkflowMessage/Examples.php",
+    "Civi/WorkflowMessage/GenericWorkflowMessage/Alex.ex.php",
+    "Civi/WorkflowMessage/GenericWorkflowMessage/alex.ex.php",
     "Civi/WorkflowMessage/GenericWorkflowMessage/contribution.ex.php",
     "Civi/WorkflowMessage/GenericWorkflowMessage/contribution_recur.ex.php",
+    "CoreExtensions/*",
+    "README.txt",
+    "agpl-3.0.txt",
+    "ang/afform/afsearchTabMember.aff.html",
+    "ang/afform/afsearchTabMember.aff.json",
     "ang/api4Explorer/SaveSearch.html",
+    "ang/api4Explorer/WhereClause.html",
+    "ang/crmCaseType.ang.php",
+    "ang/crmCaseType.css",
+    "ang/crmCaseType.js",
     "ang/crmCaseType/*",
     "ang/crmExample.ang.php",
     "ang/crmExample.js",
     "ang/crmExample/*",
+    "ang/crmMailing.ang.php",
+    "ang/crmMailing.css",
+    "ang/crmMailing.js",
     "ang/crmMailing/*",
+    "ang/crmMailingAB.ang.php",
+    "ang/crmMailingAB.css",
+    "ang/crmMailingAB.js",
+    "ang/crmMailingAB/*",
     "ang/crmStatusPage/crmSnoozeOption.js",
     "ang/ui.utils.ang.php",
+    "api/v3/Grant.php",
     "api/v3/examples/*",
     "bin/cleanup42.php",
     "bin/deprecated/*",
@@ -473,38 +646,77 @@
     "bin/gitify",
     "bower.json",
     "css/Audit/*",
+    "css/angular-crmAttachment.css",
+    "css/angular-crmCaseType.css",
+    "css/angular-crmMailing.css",
+    "css/angular-crmMailingAB.css",
     "css/civicrmNavigation.css",
     "css/drupal.css",
     "css/menu-leaf.png",
+    "css/navigation.css",
     "distmaker/dists/drupal6_php5.sh",
     "docs/*",
+    "ext/afform/CRM/*",
+    "ext/afform/Civi/*",
     "ext/afform/admin/CRM/AfformAdmin/Upgrader/*",
+    "ext/afform/admin/CRM/AfformAdmin/Utils.php",
     "ext/afform/admin/ang/afAdmin.aff.html",
     "ext/afform/admin/ang/afAdmin.aff.json",
     "ext/afform/admin/ang/afAdminFormSubmissionList.aff.json",
     "ext/afform/admin/ang/afAdminList.aff.html",
     "ext/afform/admin/ang/afGuiAdmin.aff.html",
+    "ext/afform/admin/ang/afGuiAdmin.aff.json",
     "ext/afform/admin/ang/afGuiEditor/afGuiEditable.directive.js",
+    "ext/afform/admin/ang/afGuiEditor/button-menu.html",
+    "ext/afform/admin/ang/afGuiEditor/button.html",
+    "ext/afform/admin/ang/afGuiEditor/canvas.html",
+    "ext/afform/admin/ang/afGuiEditor/container-menu.html",
     "ext/afform/admin/ang/afGuiEditor/container.html",
+    "ext/afform/admin/ang/afGuiEditor/editOptions.html",
+    "ext/afform/admin/ang/afGuiEditor/entity.html",
     "ext/afform/admin/ang/afGuiEditor/entityConfig/Activity.html",
     "ext/afform/admin/ang/afGuiEditor/entityConfig/Contact.html",
+    "ext/afform/admin/ang/afGuiEditor/entityConfig/Generic.html",
     "ext/afform/admin/ang/afGuiEditor/entityDefaults/*",
+    "ext/afform/admin/ang/afGuiEditor/field-menu.html",
+    "ext/afform/admin/ang/afGuiEditor/field.html",
     "ext/afform/admin/ang/afGuiEditor/inputType/Existing.html",
     "ext/afform/admin/ang/afGuiEditor/main.html",
     "ext/afform/admin/ang/afGuiEditor/markup-menu.html",
+    "ext/afform/admin/ang/afGuiEditor/markup.html",
+    "ext/afform/admin/ang/afGuiEditor/menu-item-background.html",
+    "ext/afform/admin/ang/afGuiEditor/menu-item-border.html",
+    "ext/afform/admin/ang/afGuiEditor/palette.html",
+    "ext/afform/admin/ang/afGuiEditor/text-menu.html",
+    "ext/afform/admin/ang/afGuiEditor/text.html",
+    "ext/afform/admin/ang/afGuiList.aff.html",
+    "ext/afform/afform.civix.php",
+    "ext/afform/afform.php",
+    "ext/afform/afform/*",
+    "ext/afform/ang/*",
     "ext/afform/api/*",
     "ext/afform/core/CRM/Afform/Upgrader/*",
+    "ext/afform/core/CRM/Afform/Utils.php",
     "ext/afform/core/Civi/Api4/Action/Afform/Delete.php",
     "ext/afform/core/Civi/Api4/Action/Afform/GetFields.php",
     "ext/afform/core/Civi/Api4/AfformPalette.php",
     "ext/afform/core/Civi/Api4/AfformTag.php",
     "ext/afform/core/Civi/Api4/Service/*",
+    "ext/afform/core/Civi/Api4/Subscriber/AutocompleteSubscriber.php",
     "ext/afform/core/Civi/Api4/Traits/*",
+    "ext/afform/core/afform/*",
     "ext/afform/core/ang/af.css",
     "ext/afform/core/ang/af/Block.js",
     "ext/afform/core/ang/af/Entity.js",
     "ext/afform/core/ang/af/Field.js",
+    "ext/afform/core/ang/af/Fieldset.js",
     "ext/afform/core/ang/af/Form.js",
+    "ext/afform/core/ang/af/Join.js",
+    "ext/afform/core/ang/af/Model.js",
+    "ext/afform/core/ang/af/ModelList.js",
+    "ext/afform/core/ang/af/ModelProp.js",
+    "ext/afform/core/ang/af/Repeat.js",
+    "ext/afform/core/ang/af/WillBeModel.js",
     "ext/afform/core/ang/af/afBlock.html",
     "ext/afform/core/ang/af/fields/Existing.html",
     "ext/afform/core/ang/afBlock.ang.php",
@@ -514,6 +726,7 @@
     "ext/afform/core/ang/afField.ang.php",
     "ext/afform/core/ang/afField.css",
     "ext/afform/core/ang/afField.js",
+    "ext/afform/core/ang/afField/*",
     "ext/afform/core/ang/afblockContactAddress.aff.json",
     "ext/afform/core/ang/afblockContactEmail.aff.json",
     "ext/afform/core/ang/afblockContactIM.aff.json",
@@ -523,13 +736,41 @@
     "ext/afform/core/ang/afblockNameHousehold.aff.json",
     "ext/afform/core/ang/afblockNameIndividual.aff.json",
     "ext/afform/core/ang/afblockNameOrganization.aff.json",
+    "ext/afform/core/ang/afformCore.ang.php",
+    "ext/afform/core/ang/afformCore.css",
+    "ext/afform/core/ang/afformCore.js",
+    "ext/afform/core/ang/afformCore/*",
+    "ext/afform/core/ang/afformExamplepage.aff.html",
+    "ext/afform/core/ang/afformExamplepage.aff.json",
     "ext/afform/core/ang/afformStandalone/*",
+    "ext/afform/core/ang/afjoinAddressDefault.aff.html",
     "ext/afform/core/ang/afjoinAddressDefault.aff.json",
+    "ext/afform/core/ang/afjoinEmailDefault.aff.html",
     "ext/afform/core/ang/afjoinEmailDefault.aff.json",
+    "ext/afform/core/ang/afjoinIMDefault.aff.html",
     "ext/afform/core/ang/afjoinIMDefault.aff.json",
+    "ext/afform/core/ang/afjoinPhoneDefault.aff.html",
     "ext/afform/core/ang/afjoinPhoneDefault.aff.json",
+    "ext/afform/core/ang/afjoinWebsiteDefault.aff.html",
     "ext/afform/core/ang/afjoinWebsiteDefault.aff.json",
+    "ext/afform/core/ang/blockAddressDefault.aff.html",
+    "ext/afform/core/ang/blockAddressDefault.aff.json",
+    "ext/afform/core/ang/blockEmailDefault.aff.html",
+    "ext/afform/core/ang/blockEmailDefault.aff.json",
+    "ext/afform/core/ang/blockIMDefault.aff.html",
+    "ext/afform/core/ang/blockIMDefault.aff.json",
+    "ext/afform/core/ang/blockNameHousehold.aff.html",
+    "ext/afform/core/ang/blockNameHousehold.aff.json",
+    "ext/afform/core/ang/blockNameIndividual.aff.html",
+    "ext/afform/core/ang/blockNameIndividual.aff.json",
+    "ext/afform/core/ang/blockNameOrganization.aff.html",
+    "ext/afform/core/ang/blockNameOrganization.aff.json",
+    "ext/afform/core/ang/blockPhoneDefault.aff.html",
+    "ext/afform/core/ang/blockPhoneDefault.aff.json",
+    "ext/afform/core/ang/blockWebsiteDefault.aff.html",
+    "ext/afform/core/ang/blockWebsiteDefault.aff.json",
     "ext/afform/core/tests/phpunit/Civi/Afform/AfformGetFieldsTest.php",
+    "ext/afform/core/tests/phpunit/api/*",
     "ext/afform/gui/*",
     "ext/afform/html/CRM/*",
     "ext/afform/html/ang/afHtmlAdmin.aff.json",
@@ -537,17 +778,32 @@
     "ext/afform/html/ang/afHtmlList.aff.json",
     "ext/afform/html/ang/afMonaco.ang.php",
     "ext/afform/html/ang/afMonaco.css",
+    "ext/afform/html/ang/afMonaco.js",
+    "ext/afform/html/ang/afMoncao.ang.php",
     "ext/afform/html/ang/afMoncao.css",
+    "ext/afform/html/ang/afMoncao.js",
     "ext/afform/html/ang/afformHtmlAdmin.aff.html",
+    "ext/afform/html/ang/afformHtmlAdmin.aff.json",
+    "ext/afform/html/ang/afformHtmlEditor.aff.html",
+    "ext/afform/html/ang/afformHtmlEditor.aff.json",
+    "ext/afform/html/ang/afformHtmlList.aff.html",
+    "ext/afform/html/ang/afformHtmlList.aff.json",
     "ext/afform/html/bin/setup.sh",
+    "ext/afform/html/images/*",
     "ext/afform/html/package-lock.json",
     "ext/afform/html/package.json",
     "ext/afform/html/templates/*",
     "ext/afform/html/xml/*",
     "ext/afform/images/*",
+    "ext/afform/info.xml",
     "ext/afform/mock/ang/afExamplePage.aff.html",
     "ext/afform/mock/ang/afExamplePage.aff.json",
     "ext/afform/mock/ang/afex.aff.json",
+    "ext/afform/mock/ang/afformExamplepage.aff.html",
+    "ext/afform/mock/ang/afformExamplepage.aff.json",
+    "ext/afform/mock/ang/fakelibBareFile.aff.html",
+    "ext/afform/mock/ang/fakelibFoo.aff.html",
+    "ext/afform/mock/ang/fakelibFoo.aff.json",
     "ext/afform/mock/ang/mock-weird-name.aff.json",
     "ext/afform/mock/ang/mockFoo.aff.json",
     "ext/afform/mock/ang/mockPage.aff.json",
@@ -555,11 +811,29 @@
     "ext/afform/mock/ang/testAfform.aff.json",
     "ext/afform/mock/ang/testContactEmailSearchForm.aff.json",
     "ext/afform/mock/ang/testMultipleSearchForm.aff.json",
+    "ext/afform/mock/tests/phpunit/api/v4/AfformAutocompleteUsageTest.php",
+    "ext/afform/mock/tests/phpunit/api/v4/AfformContactUsageTest.php",
+    "ext/afform/mock/tests/phpunit/api/v4/AfformCustomFieldUsageTest.php",
+    "ext/afform/mock/tests/phpunit/api/v4/AfformFileUploadTest.php",
     "ext/afform/mock/tests/phpunit/api/v4/AfformPaletteTest.php",
+    "ext/afform/mock/tests/phpunit/api/v4/AfformPrefillUsageTest.php",
+    "ext/afform/mock/tests/phpunit/api/v4/AfformRelationshipUsageTest.php",
+    "ext/afform/mock/tests/phpunit/api/v4/AfformRoutingTest.php",
+    "ext/afform/mock/tests/phpunit/api/v4/AfformTest.php",
+    "ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php",
+    "ext/afform/mock/tests/phpunit/api/v4/AfformUsageTest.php",
+    "ext/afform/mock/tests/phpunit/api/v4/AfformUsageTestCase.php",
+    "ext/afform/phpunit.xml.dist",
+    "ext/afform/templates/*",
     "ext/afform/tests/*",
     "ext/authx/CRM/Authx/Page/Id.php",
+    "ext/authx/Civi/Api4/Action/JWT/*",
+    "ext/authx/Civi/Api4/JWT.php",
+    "ext/authx/images/*",
     "ext/authx/tests/phpunit/Civi/Authx/AllFlowsTest.php",
+    "ext/authx/tests/phpunit/api/v4/JwtApiTest.php",
     "ext/civi_mail/ang/afsearchEmailBounceHistory.aff.json",
+    "ext/civicrm_admin_ui/ang/afformTabMember.aff.json",
     "ext/civicrm_admin_ui/ang/afsearchAdminContactTypes.aff.json",
     "ext/civicrm_admin_ui/ang/afsearchAdminCustomFields.aff.json",
     "ext/civicrm_admin_ui/ang/afsearchAdminCustomGroups.aff.json",
@@ -569,9 +843,15 @@
     "ext/civicrm_admin_ui/ang/afsearchAdministerPaymentProcessors.aff.json",
     "ext/civicrm_admin_ui/ang/afsearchAssignUsersToRoles.aff.json",
     "ext/civicrm_admin_ui/ang/afsearchAssignedFinancialAccounts.aff.json",
+    "ext/civicrm_admin_ui/ang/afsearchContactSearch.aff.html",
+    "ext/civicrm_admin_ui/ang/afsearchContactSearch.aff.json",
     "ext/civicrm_admin_ui/ang/afsearchFinancialAccounts.aff.json",
     "ext/civicrm_admin_ui/ang/afsearchFinancialTypes.aff.html",
+    "ext/civicrm_admin_ui/ang/afsearchFinancialTypes.aff.json",
+    "ext/civicrm_admin_ui/ang/afsearchFindContributions.aff.html",
+    "ext/civicrm_admin_ui/ang/afsearchFindContributions.aff.json",
     "ext/civicrm_admin_ui/ang/afsearchLabelFormat.aff.html",
+    "ext/civicrm_admin_ui/ang/afsearchLabelFormat.aff.php",
     "ext/civicrm_admin_ui/ang/afsearchMailAccounts.aff.json",
     "ext/civicrm_admin_ui/ang/afsearchManageACLs.aff.json",
     "ext/civicrm_admin_ui/ang/afsearchManageContributionPages.aff.json",
@@ -581,25 +861,49 @@
     "ext/civicrm_admin_ui/ang/afsearchProfiles.aff.json",
     "ext/civicrm_admin_ui/ang/afsearchRelationshipTypes.aff.json",
     "ext/civicrm_admin_ui/ang/afsearchScheduledJobsLog.aff.json",
+    "ext/civicrm_admin_ui/ang/afsearchTabMember.aff.json",
+    "ext/civicrm_admin_ui/managed/SavedSearch_Administer_Contact_Types.php",
+    "ext/civicrm_admin_ui/managed/SavedSearch_Contact_Search.mgd.php",
+    "ext/civicrm_admin_ui/managed/SavedSearch_Financial_Types.mgd.php",
+    "ext/civicrm_admin_ui/managed/SavedSearch_Find_Contributions.mgd.php",
+    "ext/civicrm_admin_ui/managed/SavedSearch_label_format.mgd.php",
     "ext/civicrm_search_ui/ang/afsearchContactSearch.aff.json",
     "ext/civicrm_search_ui/ang/afsearchFindContributions.aff.json",
+    "ext/civicrm_search_ui/ang/afsearchLabelFormat.aff.html",
+    "ext/civicrm_search_ui/ang/afsearchLabelFormat.aff.php",
+    "ext/civicrm_search_ui/managed/SavedSearch_label_format.mgd.php",
     "ext/civigrant/CRM/Grant/Info.php",
     "ext/civigrant/CRM/Grant/Page/Tab.php",
     "ext/civigrant/Civi/Api4/Service/*",
+    "ext/civigrant/ang/afsearchGrants.aff.html",
+    "ext/civigrant/ang/afsearchGrants.aff.json",
     "ext/civigrant/ang/afsearchTabGrant.aff.json",
     "ext/civigrant/managed/OptionGroup_contact_view_options_OptionValue_CiviGrant.mgd.php",
     "ext/civigrant/templates/CRM/Grant/Page/Tab.tpl",
+    "ext/civiimport/Civi/Api4/Service/*",
     "ext/civiimport/ang/afsearchAllImports.aff.json",
     "ext/civiimport/ang/afsearchMyImports.aff.json",
     "ext/civiimport/ang/afsearchTemplates.aff.json",
+    "ext/civiimport/images/*",
     "ext/ckeditor4/CRM/Ckeditor4/Upgrader/*",
+    "ext/ckeditor4/images/*",
+    "ext/contributioncancelactions/tests/phpunit/IPNCancelTest.php",
+    "ext/eventcart/images/*",
+    "ext/ewaysingle/images/*",
     "ext/ewaysingle/lib/XML/*",
+    "ext/financialacls/images/*",
     "ext/financialacls/tests/phpunit/BuildAmountHookTest.php",
+    "ext/financialacls/tests/phpunit/LineItemTest.php",
     "ext/flexmailer/settings/*",
     "ext/flexmailer/src/ClickTracker/BaseClickTracker.php",
     "ext/flexmailer/xml/*",
     "ext/greenwich/images/*",
+    "ext/iframe/api/*",
+    "ext/legacycustomsearches/images/*",
     "ext/message_admin/ang/crmDialog.ang.php",
+    "ext/message_admin/ang/crmDialog.js",
+    "ext/message_admin/ang/crmDialog.md",
+    "ext/message_admin/images/*",
     "ext/msgtplui/*",
     "ext/oauth-client/CRM/OAuth/Upgrader/*",
     "ext/oauth-client/Civi/Api4/Action/OAuthContactToken/*",
@@ -607,28 +911,57 @@
     "ext/oauth-client/ang/oauthJwtDebug.aff.json",
     "ext/oauth-client/data/*",
     "ext/oauth-client/images/*",
+    "ext/oembed/CRM/Oembed/Page/InstallPage.php",
+    "ext/oembed/CRM/Oembed/Utils.php",
+    "ext/oembed/Civi/Oembed/Cosession.php",
+    "ext/oembed/Civi/Oembed/EntryPoint/*",
+    "ext/oembed/Civi/Oembed/Router.php",
+    "ext/oembed/Civi/Oembed/ScriptManager.php",
+    "ext/oembed/api/*",
+    "ext/oembed/lib/*",
+    "ext/oembed/templates/CRM/Oembed/OembedSharing.tpl",
+    "ext/oembed/templates/CRM/Oembed/Page/InstallPage.tpl",
+    "ext/oembed/templates/oembed-basic-page.tpl",
+    "ext/payflowpro/images/*",
     "ext/recaptcha/xml/*",
     "ext/search/*",
     "ext/search_kit/CRM/Search/Upgrader/*",
+    "ext/search_kit/Civi/Api4/Action/SearchDisplay/SavedSearchInspectorTrait.php",
+    "ext/search_kit/ang/crmSearchActions.ang.php",
+    "ext/search_kit/ang/crmSearchActions.module.js",
+    "ext/search_kit/ang/crmSearchActions/*",
     "ext/search_kit/ang/crmSearchAdmin/compose.html",
     "ext/search_kit/ang/crmSearchAdmin/compose/*",
+    "ext/search_kit/ang/crmSearchAdmin/crmSearchAdminDisplay.html",
+    "ext/search_kit/ang/crmSearchAdmin/group.html",
+    "ext/search_kit/ang/crmSearchAdmin/resultsTable/debug.html",
     "ext/search_kit/ang/crmSearchAdmin/searchList.controller.js",
     "ext/search_kit/ang/crmSearchAdmin/searchList.html",
+    "ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.html",
     "ext/search_kit/ang/crmSearchDisplay/AddButton.html",
     "ext/search_kit/ang/crmSearchTasks/crmSearchTaskDelete.ctrl.js",
     "ext/search_kit/ang/crmSearchTasks/crmSearchTaskDelete.html",
+    "ext/search_kit/ang/crmSearchTasks/crmSearchTaskProcess.ctrl.js",
+    "ext/search_kit/ang/crmSearchTasks/crmSearchTaskProcess.html",
     "ext/search_kit/ang/crmSearchTasks/crmSearchTasks.component.js",
+    "ext/search_kit/ang/crmSearchTasks/crmSearchTasks.html",
+    "ext/search_kit/css/crmSearchActions.css",
     "ext/standaloneusers/CRM/Standaloneusers/BAO/RolePermission.php",
     "ext/standaloneusers/CRM/Standaloneusers/BAO/UserRole.php",
     "ext/standaloneusers/CRM/Standaloneusers/DAO/RolePermission.php",
     "ext/standaloneusers/CRM/Standaloneusers/Upgrader/*",
     "ext/standaloneusers/ang/afformEditUserAccount.aff.json",
+    "ext/standaloneusers/ang/afformX.aff.html",
     "ext/standaloneusers/ang/afformX.aff.json",
+    "ext/standaloneusers/ang/afformX.aff.php",
     "ext/standaloneusers/ang/afsearchAdministerUserAccounts.aff.json",
+    "ext/standaloneusers/ang/afsearchUserRoles.aff.html",
     "ext/standaloneusers/ang/afsearchUserRoles.aff.json",
+    "ext/standaloneusers/ang/afsearchUserRoles.aff.php",
     "ext/standaloneusers/ang/afsearchUsers.aff.html",
     "ext/standaloneusers/ang/afsearchUsers.aff.json",
     "ext/standaloneusers/managed/OptionGroup_role.mgd.php",
+    "ext/standaloneusers/managed/SavedSearch_Administer_Users.mgd.php",
     "ext/standaloneusers/mixin/*",
     "ext/standaloneusers/templates/CRM/Standaloneusers/Page/_contentFoot.tpl",
     "ext/standaloneusers/templates/CRM/Standaloneusers/Page/_contentHead.tpl",
@@ -675,14 +1008,31 @@
     "i/tel.gif",
     "i/vcard-icon.png",
     "js/Audit/*",
+    "js/angular-crm-ui.js",
+    "js/angular-crm-util.js",
+    "js/angular-crmApp.js",
+    "js/angular-crmAttachment.js",
+    "js/angular-crmAutosave.js",
+    "js/angular-crmCaseType.js",
+    "js/angular-crmD3.js",
+    "js/angular-crmExample.js",
+    "js/angular-crmMailing.js",
+    "js/angular-crmMailing/*",
     "js/angular-crmMailingAB.js",
+    "js/angular-crmMailingAB/*",
     "js/crm.admin.js",
     "js/crm.angular.js",
+    "js/crm.drupal.js",
     "js/crm.joomla.js",
     "js/jquery/jquery.crmasmselect.js",
     "js/jquery/jquery.dashboard.js",
     "js/load-bootstrap.js",
+    "js/wysiwyg/admin.ckeditor-configurator.js",
+    "js/wysiwyg/ck-options.json",
+    "js/wysiwyg/crm.ckeditor.js",
     "js/wysiwyg/crm.textarea.js",
+    "managed/contactSummary/SavedSearch_Contact_Summary_Membership_Type.mgd.php",
+    "managed/contactSummary/SavedSearch_Contact_Summary_Memberships.mgd.php",
     "mkdocs.yml",
     "packages/Archive/*",
     "packages/Auth/*",
@@ -793,12 +1143,30 @@
     "packages/pearcmd.php",
     "packages/peclcmd.php",
     "packages/recaptcha/*",
+    "packages/smarty4/vendor/smarty/smarty/.github/*",
+    "packages/smarty5/vendor/smarty/smarty/changelog/918.md",
+    "packages/smarty5/vendor/smarty/smarty/changelog/930.md",
+    "packages/smarty5/vendor/smarty/smarty/changelog/933.md",
+    "packages/smarty5/vendor/smarty/smarty/changelog/937.md",
+    "packages/smarty5/vendor/smarty/smarty/changelog/952.md",
+    "packages/smarty5/vendor/smarty/smarty/changelog/966.md",
+    "packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/InArray.php",
+    "packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/IsArray.php",
+    "packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Strlen.php",
+    "packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Time.php",
     "packages/snappy/*",
     "packages/tcpdf/*",
     "packages/tinymce/*",
+    "partials/*",
+    "schema/Event/Cart/*",
+    "schema/Mailing/Event/*",
     "setup/res/error.html",
+    "setup/res/installer.js",
     "setup/res/template.php",
+    "sql/civicrm_arms_sample_data.sql",
     "sql/civicrm_data/civicrm_action_mapping.sqldata.php",
+    "sql/civicrm_option_groups.php",
+    "sql/civicrm_option_groups/*",
     "sql/civicrm_queue_item.mysql",
     "sql/civicrm_upgradedb_v1.1_v1.2_40.mysql",
     "sql/civicrm_upgradedb_v1.1_v1.2_41.mysql",
@@ -820,7 +1188,9 @@
     "templates/CRM/ACL/Page/ACLBasic.tpl",
     "templates/CRM/Activity/Form/ActivityJs.tpl",
     "templates/CRM/Activity/Import/Form/DataSource.hlp",
+    "templates/CRM/Activity/Import/Form/MapTable.tpl",
     "templates/CRM/Activity/Import/Form/Summary.tpl",
+    "templates/CRM/Admin/Form/CKEditorConfig.tpl",
     "templates/CRM/Admin/Form/DomainDump.tpl",
     "templates/CRM/Admin/Form/Persistent.tpl",
     "templates/CRM/Admin/Form/Preferences/Campaign.tpl",
@@ -829,9 +1199,15 @@
     "templates/CRM/Admin/Form/Setting/Event.tpl",
     "templates/CRM/Admin/Form/Setting/Localization.js",
     "templates/CRM/Admin/Form/Setting/versionCheckOptions.js",
+    "templates/CRM/Admin/Form/Tag.tpl",
+    "templates/CRM/Admin/Page/CKEditorConfig.tpl",
     "templates/CRM/Admin/Page/CMSUser.tpl",
     "templates/CRM/Admin/Page/DomainDump.tpl",
+    "templates/CRM/Admin/Page/MailSettings.hlp",
     "templates/CRM/Admin/Page/Persistent.tpl",
+    "templates/CRM/Admin/Page/ScheduleReminders.hlp",
+    "templates/CRM/Admin/Page/Tag.tpl",
+    "templates/CRM/Badge/Page/Layout.hlp",
     "templates/CRM/Block/Gcc.tpl",
     "templates/CRM/Campaign/Form/Petition/Block.tpl",
     "templates/CRM/Campaign/Form/Search/Campaign.tpl",
@@ -842,10 +1218,17 @@
     "templates/CRM/Campaign/Page/Survey.tpl",
     "templates/CRM/Case/Audit/Audit.tpl",
     "templates/CRM/Case/Form/AddContact.tpl",
+    "templates/CRM/Case/Form/Task/ExportDocument.tpl",
+    "templates/CRM/Case/Form/Task/PrintMergeDoc.tpl",
     "templates/CRM/Case/Form/Task/SearchTaskHookSample.tpl",
     "templates/CRM/Contact/Form/Edit/Address/CustomField.tpl",
+    "templates/CRM/Contact/Form/ProfileContact.tpl",
     "templates/CRM/Contact/Form/Search/Criteria/Recurringcontribution.tpl",
+    "templates/CRM/Contact/Form/Search/Custom.tpl",
+    "templates/CRM/Contact/Form/Search/Custom/*",
     "templates/CRM/Contact/Import/Form/Spreadsheet.tpl",
+    "templates/CRM/Contact/Page/CustomSearch.hlp",
+    "templates/CRM/Contact/Page/CustomSearch.tpl",
     "templates/CRM/Contact/Page/Dashlet.tpl",
     "templates/CRM/Contact/Page/View/Note.tpl",
     "templates/CRM/Contact/Page/View/Sunlight.tpl",
@@ -855,15 +1238,21 @@
     "templates/CRM/Contribute/Form/Task/SearchTaskHookSample.tpl",
     "templates/CRM/Contribute/Import/Form/MapTable.tpl",
     "templates/CRM/Contribute/Import/Form/Summary.tpl",
+    "templates/CRM/Core/Form/RecurringEntity.hlp",
+    "templates/CRM/Core/paypalexpress.tpl",
     "templates/CRM/Custom/Form/ChangeFieldType.tpl",
     "templates/CRM/Custom/Form/Edit.tpl",
     "templates/CRM/Custom/Import/Form/Summary.tpl",
+    "templates/CRM/Custom/Page/Group.hlp",
+    "templates/CRM/Event/Cart/*",
+    "templates/CRM/Event/Form/ManageEvent/Conference.tpl",
     "templates/CRM/Event/Form/Task/SearchTaskHookSample.tpl",
     "templates/CRM/Event/Import/Form/MapTable.tpl",
     "templates/CRM/Event/Import/Form/Summary.tpl",
     "templates/CRM/Event/Page/ICalendar.tpl",
     "templates/CRM/Export/Form/table.tpl",
     "templates/CRM/Grant/*",
+    "templates/CRM/Group/Form/ParentGroups.tpl",
     "templates/CRM/Import/Form/MapTable.tpl",
     "templates/CRM/Mailing/Form/Group.hlp",
     "templates/CRM/Mailing/Form/Group.tpl",
@@ -901,12 +1290,14 @@
     "templates/CRM/Report/Form/Event/IncomeCountSummary.tpl",
     "templates/CRM/Report/Form/Event/ParticipantListCount.tpl",
     "templates/CRM/Report/Form/Event/Summary.tpl",
+    "templates/CRM/Report/Form/Grant/*",
     "templates/CRM/Report/Form/Mailing/*",
     "templates/CRM/Report/Form/Member/*",
     "templates/CRM/Report/Form/Membership/*",
     "templates/CRM/Report/Form/Pledge/*",
     "templates/CRM/Report/Form/Walklist/*",
     "templates/CRM/Tag/Form/Tagtree.hlp",
+    "templates/CRM/common/ReCAPTCHA.tpl",
     "templates/CRM/common/TrackingFields.tpl",
     "templates/CRM/common/civicrm_variables.tpl",
     "templates/CRM/common/crmeditable.tpl",
@@ -920,15 +1311,34 @@
     "vendor/pear/net_smtp/phpdoc.sh",
     "vendor/pear/net_smtp/tests/*",
     "vendor/phpoffice/phpword/samples/*",
+    "xml/schema/ACL/EntityRole.xml",
     "xml/schema/Activity/ActivityAssignment.xml",
     "xml/schema/Activity/ActivityTarget.xml",
     "xml/schema/Bridge/*",
     "xml/schema/Contact/Household.xml",
     "xml/schema/Contact/Individual.xml",
     "xml/schema/Contact/Organization.xml",
+    "xml/schema/Contact/RelationshipVortex.xml",
     "xml/schema/Core/Preferences.xml",
+    "xml/schema/Dedupe/Exception.xml",
+    "xml/schema/Dedupe/Rule.xml",
+    "xml/schema/Dedupe/RuleGroup.xml",
     "xml/schema/Event/EventPage.xml",
     "xml/schema/GccSchema.xml",
     "xml/schema/Grant/*",
+    "xml/schema/Mailing/Component.xml",
+    "xml/schema/Mailing/Event/Bounce.xml",
+    "xml/schema/Mailing/Event/Confirm.xml",
+    "xml/schema/Mailing/Event/Delivered.xml",
+    "xml/schema/Mailing/Event/Forward.xml",
+    "xml/schema/Mailing/Event/MailingEventClickThrough.xml",
+    "xml/schema/Mailing/Event/Opened.xml",
+    "xml/schema/Mailing/Event/Queue.xml",
+    "xml/schema/Mailing/Event/Reply.xml",
+    "xml/schema/Mailing/Event/Subscribe.xml",
+    "xml/schema/Mailing/Event/TrackableURLOpen.xml",
+    "xml/schema/Mailing/Event/Unsubscribe.xml",
+    "xml/schema/Mailing/Recipients.xml",
+    "xml/schema/Mailing/TrackableURL.xml",
     "xml/schema/Standalone/*"
 ]
diff --git a/www/modules/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminInjector.php b/www/modules/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminInjector.php
index bc1464679..23a961a4b 100644
--- a/www/modules/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminInjector.php
+++ b/www/modules/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminInjector.php
@@ -38,59 +38,62 @@ public static function preprocess($e) {
     $changeSet = \Civi\Angular\ChangeSet::create('afformAdmin')
       ->alterHtml(';\\.aff\\.html$;', function($doc, $path) {
         try {
-          // If the user has "administer CiviCRM", inject gear menu with edit links
-          if (\CRM_Core_Permission::check('administer CiviCRM')) {
-            $afform = Afform::get()
-              ->addWhere('module_name', '=', basename($path, '.aff.html'))
-              ->addSelect('name', 'search_displays', 'title')
-              ->execute()->single();
-            // Create a link to edit the form, plus all embedded SavedSearches
-            $links = [
-              [
-                'url' => \CRM_Utils_System::url('civicrm/admin/afform', NULL, FALSE, "/edit/{$afform['name']}", TRUE),
-                'text' => E::ts('Edit %1 in FormBuilder', [1 => "<em>{$afform['title']}</em>"]),
-                'icon' => 'fa-pencil',
-              ],
-            ];
-            if ($afform['search_displays']) {
-              $searchNames = [];
-              foreach ($afform['search_displays'] as $searchAndDisplayName) {
-                $searchNames[] = explode('.', $searchAndDisplayName)[0];
-              }
-              $savedSearches = SavedSearch::get()
-                ->addWhere('name', 'IN', $searchNames)
-                ->addSelect('id', 'label')
-                ->execute();
-              foreach ($savedSearches as $savedSearch) {
-                $links[] = [
-                  'url' => \CRM_Utils_System::url('civicrm/admin/search', NULL, FALSE, "/edit/{$savedSearch['id']}", TRUE),
-                  'text' => E::ts('Edit %1 in SearchKit', [1 => "<em>{$savedSearch['label']}</em>"]),
-                  'icon' => 'fa-search-plus',
-                ];
-              }
+          // Inject gear menu with edit links which will be shown if the user has permission
+          $afform = Afform::get(FALSE)
+            ->addWhere('module_name', '=', basename($path, '.aff.html'))
+            ->addSelect('name', 'search_displays', 'title')
+            ->execute()->single();
+          // Create a link to edit the form, plus all embedded SavedSearches
+          $links = [
+            [
+              'url' => \CRM_Utils_System::url('civicrm/admin/afform', NULL, FALSE, "/edit/{$afform['name']}", TRUE, FALSE, TRUE),
+              'text' => E::ts('Edit %1 in FormBuilder', [1 => "<em>{$afform['title']}</em>"]),
+              'icon' => 'fa-pencil',
+              'permission' => 'administer afform',
+            ],
+          ];
+          if ($afform['search_displays']) {
+            $searchNames = [];
+            foreach ($afform['search_displays'] as $searchAndDisplayName) {
+              $searchNames[] = explode('.', $searchAndDisplayName)[0];
             }
-            $linksMarkup = '';
-            foreach ($links as $link) {
-              $linksMarkup .= <<<HTML
-                <li>
-                  <a href="{$link['url']}" target="_blank">
-                    <i class="crm-i fa-fw {$link['icon']}"></i> {$link['text']}
-                  </a>
-                </li>
-              HTML;
+            $savedSearches = SavedSearch::get(FALSE)
+              ->addWhere('name', 'IN', $searchNames)
+              ->addSelect('id', 'label', 'COUNT(permissioned_display.id) AS is_locked')
+              ->addGroupBy('id')
+              ->addJoin('SearchDisplay AS permissioned_display', 'LEFT', ['id', '=', 'permissioned_display.saved_search_id'], ['permissioned_display.acl_bypass', '=', TRUE])
+              ->execute();
+            foreach ($savedSearches as $savedSearch) {
+              $links[] = [
+                'url' => \CRM_Utils_System::url('civicrm/admin/search', NULL, FALSE, "/edit/{$savedSearch['id']}", TRUE, FALSE, TRUE),
+                'text' => E::ts('Edit %1 in SearchKit', [1 => "<em>{$savedSearch['label']}</em>"]),
+                'icon' => 'fa-search-plus',
+                // Saved Searches with "bypass_permission" displays are locked to non-super-admins
+                'permission' => $savedSearch['is_locked'] ? 'all CiviCRM permissions and ACLs' : 'administer search_kit',
+              ];
             }
-            $editMenu = <<<HTML
-              <div class="pull-right btn-group af-admin-edit-form-link">
-                <button type="button" class="btn dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                  <i class="crm-i fa-gear"></i> <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu">$linksMarkup</ul>
-              </div>
+          }
+          $linksMarkup = '';
+          foreach ($links as $link) {
+            $linksMarkup .= <<<HTML
+              <li ng-if="checkPerm('{$link['permission']}')">
+                <a href="{$link['url']}" target="_blank">
+                  <i class="crm-i fa-fw {$link['icon']}"></i> {$link['text']}
+                </a>
+              </li>
             HTML;
-            // Append link to end of afform markup so it has the highest z-index and is clickable.
-            // afCore.css will control placement at the top of the form.
-            pq($doc)->append($editMenu);
           }
+          $editMenu = <<<HTML
+            <div class="pull-right btn-group af-admin-edit-form-link" ng-if="checkPerm('{$links[0]['permission']}')">
+              <button type="button" class="btn dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <i class="crm-i fa-gear"></i> <span class="caret"></span>
+              </button>
+              <ul class="dropdown-menu">$linksMarkup</ul>
+            </div>
+          HTML;
+          // Append link to end of afform markup so it has the highest z-index and is clickable.
+          // afCore.css will control placement at the top of the form.
+          pq($doc)->append($editMenu);
         }
         catch (\Exception $e) {
         }
diff --git a/www/modules/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php b/www/modules/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php
index 2c3fcc75c..e40d825ef 100644
--- a/www/modules/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php
+++ b/www/modules/civicrm/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php
@@ -80,7 +80,7 @@ private static function entityToAfformMeta(array $info): array {
     // Custom entities are always type 'join'
     if (in_array('CustomValue', $info['type'], TRUE)) {
       $meta['type'] = 'join';
-      $max = (int) \CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', substr($info['name'], 7), 'max_multiple', 'name');
+      $max = (int) \CRM_Core_BAO_CustomGroup::getGroup(['name' => substr($info['name'], 7)])['max_multiple'];
       $meta['repeat_max'] = $max ?: NULL;
     }
     return $meta;
@@ -131,16 +131,18 @@ public static function getFields($entityName, $params = []) {
     }
     // Index by name
     $fields = array_column($fields, NULL, 'name');
-    if ($params['action'] === 'create') {
-      // Add existing entity field
-      $idField = CoreUtil::getIdFieldName($entityName);
+    $idField = CoreUtil::getIdFieldName($entityName);
+    // Convert ID field to existing entity field
+    if (isset($fields[$idField])) {
       $fields[$idField]['readonly'] = FALSE;
       $fields[$idField]['input_type'] = 'EntityRef';
       // Afform-only (so far) metadata tells the form to update an existing entity autofilled from this value
       $fields[$idField]['input_attrs']['autofill'] = 'update';
       $fields[$idField]['fk_entity'] = $entityName;
       $fields[$idField]['label'] = E::ts('Existing %1', [1 => CoreUtil::getInfoItem($entityName, 'title')]);
-      // Mix in alterations declared by afform entities
+    }
+    // Mix in alterations declared by afform entities
+    if ($params['action'] === 'create') {
       $afEntity = self::getMetadata()['entities'][$entityName] ?? [];
       if (!empty($afEntity['alterFields'])) {
         foreach ($afEntity['alterFields'] as $fieldName => $changes) {
diff --git a/www/modules/civicrm/ext/afform/admin/ang/afAdminFormSubmissionList.aff.php b/www/modules/civicrm/ext/afform/admin/ang/afAdminFormSubmissionList.aff.php
index 8eda1f70c..932891afe 100644
--- a/www/modules/civicrm/ext/afform/admin/ang/afAdminFormSubmissionList.aff.php
+++ b/www/modules/civicrm/ext/afform/admin/ang/afAdminFormSubmissionList.aff.php
@@ -5,6 +5,5 @@
   'type' => 'system',
   'title' => E::ts('Submissions'),
   'server_route' => 'civicrm/admin/afform/submissions',
-  'permission' => ["administer CiviCRM", "administer afform"],
-  'permission_operator' => 'OR',
+  'permission' => ['administer afform'],
 ];
diff --git a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor.css b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor.css
index 82b87a66f..c5ba153f0 100644
--- a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor.css
+++ b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor.css
@@ -216,6 +216,7 @@ body.af-gui-dragging {
 #afGuiEditor af-gui-container,
 #afGuiEditor af-gui-markup,
 #afGuiEditor af-gui-field,
+#afGuiEditor .af-gui-block-label,
 #afGuiEditor af-gui-edit-options {
   display: block;
 }
diff --git a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js
index 8c2110e80..479095733 100644
--- a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js
+++ b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js
@@ -202,6 +202,10 @@
         }
       };
 
+      this.getFieldId = function(fieldName) {
+        return _.kebabCase(ctrl.entity.name + '-' + fieldName);
+      };
+
       this.$onInit = function() {
         // When a new block is saved, update the list
         this.meta = afGui.meta;
diff --git a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEntity.html b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEntity.html
index a62492cef..4174e5ec2 100644
--- a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEntity.html
+++ b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiEntity.html
@@ -1,12 +1,28 @@
-<div class="af-gui-columns crm-flex-box" ng-if="!$ctrl.entity.loading">
+<form class="af-gui-columns crm-flex-box" ng-if="!$ctrl.entity.loading">
   <fieldset class="af-gui-entity-values" ng-if="$ctrl.editor.getAfform().type !== 'block'">
     <legend>{{:: ts('Values:') }}</legend>
-    <div class="form-inline" ng-if="getMeta().fields[fieldName]" ng-repeat="(fieldName, value) in $ctrl.entity.data">
-      <label>{{ getMeta().fields[fieldName].label }}:</label><br />
-      <input class="form-control" af-gui-field-value="getField($ctrl.getEntityType(), fieldName)" ng-model="$ctrl.entity.data[fieldName]" />
-      <a href ng-click="removeValue($ctrl.entity, fieldName)">
-        <i class="crm-i fa-times"></i>
-      </a>
+    <div ng-if="getMeta().fields[fieldName]" ng-repeat="(fieldName, value) in $ctrl.entity.data">
+      <label class="af-gui-block-label" for="{{ $ctrl.getFieldId(fieldName) }}">{{:: getMeta().fields[fieldName].label }}:</label>
+      <label class="af-gui-block-label" ng-if="getField($ctrl.getEntityType(), fieldName)['input_type'] === 'Date'">
+        <input type="radio" name="{{:: fieldName + 'now' }}" ng-click="$ctrl.entity.data[fieldName] = 'now'" ng-checked="$ctrl.entity.data[fieldName] === 'now'">
+        {{:: ts('Current Date') }}
+      </label>
+      <div class="form-inline">
+        <input type="radio" ng-if="getField($ctrl.getEntityType(), fieldName)['input_type'] === 'Date'" name="{{:: fieldName + 'now' }}" ng-click="$ctrl.entity.data[fieldName] = ''" ng-checked="$ctrl.entity.data[fieldName] !== 'now'">
+        <input disabled
+               class="form-control"
+               placeholder="{{:: ts('Pick Date') }}"
+               ng-if="getField($ctrl.getEntityType(), fieldName)['input_type'] === 'Date' && $ctrl.entity.data[fieldName] === 'now'">
+        <input required
+               ng-if="getField($ctrl.getEntityType(), fieldName)['input_type'] !== 'Date' || $ctrl.entity.data[fieldName] !== 'now'"
+               id="{{ $ctrl.getFieldId(fieldName) }}"
+               class="form-control"
+               af-gui-field-value="getField($ctrl.getEntityType(), fieldName)"
+               ng-model="$ctrl.entity.data[fieldName]" />
+        <a href ng-click="removeValue($ctrl.entity, fieldName)">
+          <i class="crm-i fa-times"></i>
+        </a>
+      </div>
     </div>
     <hr />
     <div class="form-inline">
@@ -48,7 +64,7 @@
       </div>
     </div>
   </fieldset>
-</div>
+</form>
 
 <a ng-if="!$ctrl.entity.loading && $ctrl.editor.allowEntityConfig" href ng-click="$ctrl.editor.removeEntity($ctrl.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>
diff --git a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiFieldValue.directive.js b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiFieldValue.directive.js
index bf2e9b0a3..2faaa6e1d 100644
--- a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiFieldValue.directive.js
+++ b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiFieldValue.directive.js
@@ -56,6 +56,7 @@
               var params = field.entity && field.name ? {fieldName: field.entity + '.' + field.name} : {filters: filters};
               $el.crmAutocomplete(field.fk_entity, params, {
                 multiple: multi,
+                separator: '\u0001',
                 "static": options,
                 minimumInputLength: options.length ? 1 : 0
               });
@@ -63,9 +64,9 @@
               options = _.transform(field.options, function(options, val) {
                 options.push({id: val.id, text: val.label});
               }, []);
-              $el.select2({data: options, multiple: multi});
+              $el.select2({data: options, multiple: multi, separator: '\u0001'});
             } else if (dataType === 'Boolean') {
-              $el.attr('placeholder', ts('- select -')).crmSelect2({allowClear: false, multiple: multi, placeholder: ts('- select -'), data: [
+              $el.attr('placeholder', ts('- select -')).crmSelect2({allowClear: false, multiple: multi, separator: '\u0001', placeholder: ts('- select -'), data: [
                   {id: '1', text: ts('Yes')},
                   {id: '0', text: ts('No')}
                 ]});
@@ -95,7 +96,7 @@
           var list = [];
 
           if (viewValue) {
-            _.each(viewValue.split(','), function(value) {
+            _.each(viewValue.split("\u0001"), function(value) {
               if (value) list.push(_.trim(value));
             });
           }
diff --git a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiSearch.component.js b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiSearch.component.js
index d33e3441e..7cd0eb8b8 100644
--- a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiSearch.component.js
+++ b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiSearch.component.js
@@ -329,6 +329,14 @@
         }
       };
 
+      this.toggleStoreValues = function() {
+        if (this.display.fieldset['store-values']) {
+          delete this.display.fieldset['store-values'];
+        } else {
+          this.display.fieldset['store-values'] = '1';
+        }
+      };
+
       // Convert filters array to js notation & add to crm-search-display element
       function writeFilters() {
         var output = [];
diff --git a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiSearch.html b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiSearch.html
index 4f52e8b0e..e396b66bb 100644
--- a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiSearch.html
+++ b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/afGuiSearch.html
@@ -80,7 +80,7 @@
 
   <fieldset>
     <legend>{{:: ts('Options') }}</legend>
-    <label>{{:: ts('Remember Filters') }} <input type="checkbox" ng-model="$ctrl.display.fieldset['store-values']"></label>
+    <label>{{:: ts('Remember Filters') }} <input type="checkbox" ng-checked="$ctrl.display.fieldset['store-values']" ng-click="$ctrl.toggleStoreValues()"></label>
     <p class="help-block">
       {{:: ts('Filter fields will retain their value when the same user revisits the form.') }}
     </p>
diff --git a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/config-form.html b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/config-form.html
index eb7c8e8e1..dfe6f4f4b 100644
--- a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/config-form.html
+++ b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/config-form.html
@@ -23,7 +23,7 @@
       {{:: ts('Permission') }}
     </label>
     <div class="form-inline" >
-      <input ng-model="editor.afform.permission" class="form-control" id="af_config_form_permission" crm-ui-select="{data: editor.meta.permissions, multiple: true}" ng-list >
+      <input ng-model="editor.afform.permission" class="form-control" id="af_config_form_permission" crm-ui-select="{data: editor.meta.permissions, multiple: true, separator: '\u0001'}" ng-list="
" >
       <select ng-model="editor.afform.permission_operator" class="form-control" id="af_config_form_permission_operator" >
         <option value="AND">{{:: ts('And') }}</option>
         <option value="OR">{{:: ts('Or') }}</option>
diff --git a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiField-menu.html b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiField-menu.html
index 804f7f985..595fd6665 100644
--- a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiField-menu.html
+++ b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiField-menu.html
@@ -40,7 +40,7 @@
 </li>
 <li ng-if="$ctrl.fieldDefn.input_type === 'EntityRef'" title="{{:: ts('Allow a new entity to be created via quick-add popup') }}">
   <div href ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown">
-    <input crm-ui-select="{data: $ctrl.quickAddLinks, multiple: true, placeholder: ts('Quick Add')}" ng-model="getSet('input_attrs.quickAdd')" ng-model-options="{getterSetter: true}" ng-list class="form-control">
+    <input crm-ui-select="{data: $ctrl.quickAddLinks, multiple: true, separator: '\u0001', placeholder: ts('Quick Add')}" ng-model="getSet('input_attrs.quickAdd')" ng-model-options="{getterSetter: true}" ng-list="
" class="form-control">
   </div>
 </li>
 <li ng-if="$ctrl.fieldDefn.input_type === 'EntityRef'">
@@ -62,14 +62,26 @@
   </a>
 </li>
 <li ng-if="$ctrl.fieldDefn.input_type === 'Date' && $ctrl.hasDefaultValue">
-  <div ng-click="setDefaultDateType(); $event.stopPropagation(); $event.target.blur();" class="af-gui-field-select-in-dropdown form-inline">
-    <select class="form-control" ng-model="getSet('default_date_type')" ng-model-options="{getterSetter: true}">
+  <div ng-click="$event.stopPropagation();" class="af-gui-field-select-in-dropdown form-inline">
+    <select class="form-control" ng-model="$ctrl.defaultDateType" ng-model-options="{getterSetter: true}">
       <option value="fixed">{{:: ts('Pick Date') }}</option>
       <option value="now">{{:: ts('Now') }}</option>
+      <option value="relative">{{:: ts('Relative') }}</option>
     </select>
   </div>
 </li>
-<li ng-if="$ctrl.hasDefaultValue && $ctrl.defaultDateType !== 'now'">
+<li ng-if="$ctrl.hasDefaultValue && $ctrl.defaultDateType() === 'relative'">
+  <form ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown form-inline">
+    <label>{{ ts('Now') + ($ctrl.defaultDateOffset() < 0 ? '' : ' +') }}</label>
+    <input class="form-control" type="number" ng-model="$ctrl.defaultDateOffset" ng-model-options="{getterSetter: true}">
+    <select class="form-control" ng-model="$ctrl.defaultDateUnit" ng-model-options="{getterSetter: true}">
+      <option value="day">{{ $ctrl.defaultDatePlural() ? ts('Days') : ts('Day') }}</option>
+      <option value="week">{{ $ctrl.defaultDatePlural() ? ts('Weeks') : ts('Week') }}</option>
+      <option value="year">{{ $ctrl.defaultDatePlural() ? ts('Years') : ts('Year') }}</option>
+    </select>
+  </form>
+</li>
+<li ng-if="$ctrl.hasDefaultValue && $ctrl.defaultDateType() === 'fixed'">
   <form ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown form-inline">
     <input class="form-control" af-gui-field-value="$ctrl.fieldDefn" ng-model="getSet('afform_default')" ng-model-options="{getterSetter: true}" >
   </form>
diff --git a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js
index 475becbd8..76189f295 100644
--- a/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js
+++ b/www/modules/civicrm/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js
@@ -66,14 +66,6 @@
           this.searchOperators = _.pick(this.searchOperators, ctrl.fieldDefn.operators);
         }
         setDateOptions();
-
-        if (ctrl.getDefn().input_type == 'Date') {
-          if (!getSet('default_date_type')) {
-            ctrl.defaultDateType = getSet('default_date_type', 'fixed');
-          } else {
-            ctrl.defaultDateType = getSet("default_date_type");
-          }
-        }
       };
 
       this.getFkEntity = function() {
@@ -186,7 +178,7 @@
             return defn.options || defn.data_type === 'Boolean';
 
           case 'Select':
-            return defn.options || defn.data_type === 'Boolean' || defn.input_type === 'EntityRef' || (defn.input_type === 'Date' && ctrl.isSearch());
+            return defn.options || defn.data_type === 'Boolean' || (defn.input_type === 'EntityRef' && !ctrl.isSearch()) || (defn.input_type === 'Date' && ctrl.isSearch());
 
           case 'Date':
             return defn.input_type === 'Date';
@@ -288,8 +280,50 @@
         }
       };
 
-      $scope.setDefaultDateType = function() {
-        ctrl.defaultDateType = getSet('default_date_type');
+      this.defaultDateType = function(newValue) {
+        if (arguments.length) {
+          if (newValue === 'relative') {
+            getSet('afform_default', 'now +0 day');
+          }
+          if (newValue === 'now') {
+            getSet('afform_default', 'now');
+          }
+          if (newValue === 'fixed') {
+            getSet('afform_default', '');
+          }
+        }
+        if (this.fieldDefn.input_type === 'Date') {
+          const defaultVal = getSet('afform_default');
+          if (defaultVal === 'now') {
+            return 'now';
+          }
+          else if (typeof defaultVal === 'string' && defaultVal.startsWith('now')) {
+            return 'relative';
+          }
+        }
+        return 'fixed';
+      };
+
+      this.defaultDateOffset = function(newValue) {
+        let defaultVals = getSet('afform_default').split(' ');
+        if (arguments.length) {
+          defaultVals[1] = newValue < 0 ? newValue : '+' + newValue;
+          getSet('afform_default', defaultVals.join(' '));
+        }
+        return parseInt(defaultVals[1], 10);
+      };
+
+      this.defaultDateUnit = function(newValue) {
+        let defaultVals = getSet('afform_default').split(' ');
+        if (arguments.length) {
+          defaultVals[2] = newValue;
+          getSet('afform_default', defaultVals.join(' '));
+        }
+        return defaultVals[2];
+      };
+
+      this.defaultDatePlural = function() {
+        return Math.abs(this.defaultDateOffset()) !== 1;
       };
 
       $scope.defaultValueContains = function(val) {
diff --git a/www/modules/civicrm/ext/afform/admin/info.xml b/www/modules/civicrm/ext/afform/admin/info.xml
index 5dc364ef4..8c8bd2f92 100644
--- a/www/modules/civicrm/ext/afform/admin/info.xml
+++ b/www/modules/civicrm/ext/afform/admin/info.xml
@@ -12,11 +12,11 @@
     <url desc="Chat">https://chat.civicrm.org/civicrm/channels/dev-afform</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>beta</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>FormBuilder provides a UI to administer and edit forms. It is an optional admin tool and not required for the forms to function.</comments>
   <requires>
@@ -37,7 +37,7 @@
     <mixin>menu-xml@1.0.0</mixin>
     <mixin>mgd-php@1.0.0</mixin>
     <mixin>afform-entity-php@1.0.0</mixin>
-    <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>smarty@1.0.0</mixin>
   </mixins>
   <upgrader>CRM_AfformAdmin_Upgrader</upgrader>
 </extension>
diff --git a/www/modules/civicrm/ext/afform/admin/managed/FormSubmissionSavedSearch.mgd.php b/www/modules/civicrm/ext/afform/admin/managed/FormSubmissionSavedSearch.mgd.php
index 2a69737dc..88043a45c 100644
--- a/www/modules/civicrm/ext/afform/admin/managed/FormSubmissionSavedSearch.mgd.php
+++ b/www/modules/civicrm/ext/afform/admin/managed/FormSubmissionSavedSearch.mgd.php
@@ -122,7 +122,7 @@
                   'text' => E::ts('Process'),
                   'style' => 'default',
                   'condition' => [
-                    'status_id:label',
+                    'status_id:name',
                     '=',
                     'Pending',
                   ],
diff --git a/www/modules/civicrm/ext/afform/admin/managed/Navigation_afform_admin.mgd.php b/www/modules/civicrm/ext/afform/admin/managed/Navigation_afform_admin.mgd.php
index 730c3a7db..adbc0958b 100644
--- a/www/modules/civicrm/ext/afform/admin/managed/Navigation_afform_admin.mgd.php
+++ b/www/modules/civicrm/ext/afform/admin/managed/Navigation_afform_admin.mgd.php
@@ -13,10 +13,8 @@
         'name' => 'afform_admin',
         'label' => E::ts('FormBuilder'),
         'permission' => [
-          'administer CiviCRM',
           'administer afform',
         ],
-        'permission_operator' => 'OR',
         'parent_id.name' => 'Customize Data and Screens',
         'weight' => 1,
         'url' => 'civicrm/admin/afform',
diff --git a/www/modules/civicrm/ext/afform/admin/xml/Menu/afform_admin.xml b/www/modules/civicrm/ext/afform/admin/xml/Menu/afform_admin.xml
index a1f705aa1..67c14cdcf 100644
--- a/www/modules/civicrm/ext/afform/admin/xml/Menu/afform_admin.xml
+++ b/www/modules/civicrm/ext/afform/admin/xml/Menu/afform_admin.xml
@@ -3,6 +3,6 @@
   <item>
     <path>civicrm/admin/afform</path>
     <page_callback>CRM_AfformAdmin_Page_Base</page_callback>
-    <access_arguments>administer CiviCRM;administer afform</access_arguments>
+    <access_arguments>administer afform</access_arguments>
   </item>
 </menu>
diff --git a/www/modules/civicrm/ext/afform/core/CRM/Afform/Page/AfformBase.php b/www/modules/civicrm/ext/afform/core/CRM/Afform/Page/AfformBase.php
index 8f310390b..9692e174b 100644
--- a/www/modules/civicrm/ext/afform/core/CRM/Afform/Page/AfformBase.php
+++ b/www/modules/civicrm/ext/afform/core/CRM/Afform/Page/AfformBase.php
@@ -20,10 +20,6 @@ public function run() {
     Civi::service('angularjs.loader')
       ->addModules([$afform['module_name'], 'afformStandalone']);
 
-    // Title will be supplied by AfformBase.tpl.
-    // @see crmUi.directive(crmPageTitle)
-    CRM_Utils_System::setTitle('');
-
     $isFrontEndPage = !empty($afform['is_public']);
 
     // If not being shown on the front-end website, calculate breadcrumbs
@@ -37,14 +33,14 @@ public function run() {
           ->execute()->first();
         if (!empty($navParent['url'])) {
           CRM_Utils_System::resetBreadCrumb();
-          CRM_Utils_System::appendBreadCrumb([['title' => E::ts('CiviCRM'), 'url' => Civi::url('civicrm')]]);
-          CRM_Utils_System::appendBreadCrumb([['title' => $navParent['label'], 'url' => Civi::url($navParent['url'])]]);
+          CRM_Utils_System::appendBreadCrumb([['title' => E::ts('CiviCRM'), 'url' => Civi::url('current://civicrm')]]);
+          CRM_Utils_System::appendBreadCrumb([['title' => $navParent['label'], 'url' => Civi::url('current://' . $navParent['url'])]]);
         }
       }
     }
 
-    // Add current afform page to breadcrumb
     if (!empty($afform['title'])) {
+      // Add current afform page to breadcrumb
       $title = strip_tags($afform['title']);
       if (!$isFrontEndPage) {
         CRM_Utils_System::appendBreadCrumb([
@@ -54,6 +50,13 @@ public function run() {
           ],
         ]);
       }
+      // 'CiviCRM' be replaced with Afform title via AfformBase.tpl.
+      // @see crmUi.directive(crmPageTitle)
+      CRM_Utils_System::setTitle('CiviCRM');
+    }
+    else {
+      // Afform has no title
+      CRM_Utils_System::setTitle('');
     }
 
     parent::run();
diff --git a/www/modules/civicrm/ext/afform/core/Civi/Afform/Behavior/ContactAutofill.php b/www/modules/civicrm/ext/afform/core/Civi/Afform/Behavior/ContactAutofill.php
index 626f94c04..7891cde25 100644
--- a/www/modules/civicrm/ext/afform/core/Civi/Afform/Behavior/ContactAutofill.php
+++ b/www/modules/civicrm/ext/afform/core/Civi/Afform/Behavior/ContactAutofill.php
@@ -101,8 +101,8 @@ public static function onAfformPrefill(AfformPrefillEvent $event): void {
       $id = $event->getEntityId();
       $autoFillMode = $entity['autofill'] ?? '';
       $relatedContact = $entity['autofill-relationship'] ?? NULL;
-      // Autofill with current user
-      if (!$id && $autoFillMode === 'user') {
+      // Autofill with current user, but only if this is an "entire form" prefill (no entity-specific args)
+      if (!$id && $autoFillMode === 'user' && !$event->getApiRequest()->getArgs()) {
         $id = \CRM_Core_Session::getLoggedInContactID();
         if ($id) {
           $event->getApiRequest()->loadEntity($entity, [$id]);
diff --git a/www/modules/civicrm/ext/afform/core/Civi/Afform/FormDataModel.php b/www/modules/civicrm/ext/afform/core/Civi/Afform/FormDataModel.php
index 481c3ca45..a51c998c7 100644
--- a/www/modules/civicrm/ext/afform/core/Civi/Afform/FormDataModel.php
+++ b/www/modules/civicrm/ext/afform/core/Civi/Afform/FormDataModel.php
@@ -234,7 +234,7 @@ public static function getField(string $entityName, string $fieldName, string $a
       return NULL;
     }
     // Id field for selecting existing entity
-    if ($action === 'create' && $field['name'] === CoreUtil::getIdFieldName($entityName)) {
+    if ($field['name'] === CoreUtil::getIdFieldName($entityName)) {
       $entityTitle = CoreUtil::getInfoItem($entityName, 'title');
       $field['input_type'] = 'EntityRef';
       $field['fk_entity'] = $entityName;
diff --git a/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php b/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
index 78a425790..6f0ff1ffd 100644
--- a/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
+++ b/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
@@ -7,6 +7,7 @@
 use Civi\Afform\Event\AfformSubmitEvent;
 use Civi\Afform\FormDataModel;
 use Civi\API\Exception\UnauthorizedException;
+use Civi\Api4\File;
 use Civi\Api4\Generic\Result;
 use Civi\Api4\Utils\CoreUtil;
 use CRM_Afform_ExtensionUtil as E;
@@ -200,30 +201,34 @@ private function apiGet($api4, $entityName, $entityFields, $params) {
     $idField = CoreUtil::getIdFieldName($entityName);
     $params['select'] = array_unique(array_merge([$idField], array_keys($entityFields)));
     $result = (array) $api4($entityName, 'get', $params)->indexBy($idField);
-    // Check for file fields
-    $fieldInfo = civicrm_api4($entityName, 'getFields', [
-      'checkPermissions' => FALSE,
-      'action' => 'create',
-      'select' => ['name', 'fk_entity'],
-      'where' => [['name', 'IN', array_keys($entityFields)]],
-    ])->indexBy('name');
     // Fill additional info about file fields
-    foreach ($fieldInfo as $fieldName => $fieldDefn) {
-      if ($fieldDefn['fk_entity'] === 'File') {
-        foreach ($result as &$item) {
-          if (!empty($item[$fieldName])) {
-            // Fall back on APIv3 until we have an attachment API for v4.
-            $fileInfo = \CRM_Utils_Array::filterColumns(civicrm_api3('Attachment', 'get', [
-              'id' => $item[$fieldName],
-            ])['values'], ['name', 'icon']);
-            $item[$fieldName] = \CRM_Utils_Array::first($fileInfo);
-          }
+    $fileFields = $this->getFileFields($entityName, $entityFields);
+    foreach ($fileFields as $fieldName => $fieldDefn) {
+      foreach ($result as &$item) {
+        if (!empty($item[$fieldName])) {
+          $fileInfo = File::get(FALSE)
+            ->addSelect('file_name', 'icon')
+            ->addWhere('id', '=', $item[$fieldName])
+            ->execute()->first();
+          $item[$fieldName] = $fileInfo;
         }
       }
     }
     return $result;
   }
 
+  protected static function getFileFields($entityName, $entityFields): array {
+    if (!$entityFields) {
+      return [];
+    }
+    return civicrm_api4($entityName, 'getFields', [
+      'checkPermissions' => FALSE,
+      'action' => 'create',
+      'select' => ['name'],
+      'where' => [['name', 'IN', array_keys($entityFields)], ['fk_entity', '=', 'File']],
+    ])->indexBy('name')->column('name');
+  }
+
   /**
    * Validate that given id(s) are actually returned by the Autocomplete API
    *
@@ -273,15 +278,22 @@ protected static function getJoinWhereClause(FormDataModel $formDataModel, strin
     }
 
     // Figure out the FK field between the join entity and the main entity
-    if (self::getEntityField($joinEntityType, 'entity_id')) {
-      $params[] = ['entity_id', '=', $mainEntityId];
-      if (self::getEntityField($joinEntityType, 'entity_table')) {
-        $params[] = ['entity_table', '=', CoreUtil::getTableName($mainEntityType)];
+    $directFk = FALSE;
+    // First look for a direct foreign key field e.g. `contact_id`
+    foreach (self::getEntityFields($joinEntityType) as $field) {
+      if ($field['fk_entity'] === $mainEntityType) {
+        $directFk = TRUE;
+        $params[] = [$field['name'], '=', $mainEntityId];
       }
     }
-    else {
-      $mainEntityField = \CRM_Core_DAO_AllCoreTables::convertEntityNameToLower($mainEntityType) . '_id';
-      $params[] = [$mainEntityField, '=', $mainEntityId];
+    // Else look for dynamic foreign keys e.g. `entity_table` + `entity_id`
+    if (!$directFk) {
+      foreach (self::getEntityFields($joinEntityType) as $field) {
+        if (in_array($mainEntityType, $field['dfk_entities'] ?? [], TRUE)) {
+          $params[] = [$field['name'], '=', $mainEntityId];
+          $params[] = [$field['input_attrs']['control_field'], '=', array_search($mainEntityType, $field['dfk_entities'])];
+        }
+      }
     }
     return $params;
   }
@@ -289,20 +301,28 @@ protected static function getJoinWhereClause(FormDataModel $formDataModel, strin
   /**
    * Get field definition for a given entity
    *
-   * @param $entityName
-   * @param $fieldName
+   * @param string $entityName
+   * @param string $fieldName
    * @return array|null
    * @throws \CRM_Core_Exception
    */
-  public static function getEntityField($entityName, $fieldName) {
-    if (!isset(\Civi::$statics[__CLASS__][__FUNCTION__][$entityName])) {
-      $fields = civicrm_api4($entityName, 'getFields', [
-        'checkPermissions' => FALSE,
-        'action' => 'create',
-      ]);
-      \Civi::$statics[__CLASS__][__FUNCTION__][$entityName] = $fields->indexBy('name');
-    }
-    return \Civi::$statics[__CLASS__][__FUNCTION__][$entityName][$fieldName] ?? NULL;
+  public static function getEntityField(string $entityName, string $fieldName) {
+    return self::getEntityFields($entityName)[$fieldName] ?? NULL;
+  }
+
+  /**
+   * Get all fields for a given entity
+   *
+   * @param string $entityName
+   * @return array
+   * @throws \CRM_Core_Exception
+   */
+  public static function getEntityFields(string $entityName): array {
+    \Civi::$statics[__CLASS__][__FUNCTION__][$entityName] ??= (array) civicrm_api4($entityName, 'getFields', [
+      'checkPermissions' => FALSE,
+      'action' => 'create',
+    ])->indexBy('name');
+    return \Civi::$statics[__CLASS__][__FUNCTION__][$entityName];
   }
 
   /**
@@ -404,18 +424,54 @@ public function preprocessSubmittedValues(array $submittedValues) {
     $entityValues = [];
     foreach ($this->_formDataModel->getEntities() as $entityName => $entity) {
       $entityValues[$entityName] = [];
+      $fileFields = $this->getFileFields($entity['type'], $entity['fields']);
       // Gather submitted field values from $values['fields'] and sub-entities from $values['joins']
       foreach ($submittedValues[$entityName] ?? [] as $values) {
         // Only accept values from fields on the form
         $values['fields'] = array_intersect_key($values['fields'] ?? [], $entity['fields']);
+        // Unset prefilled file fields
+        foreach ($fileFields as $fileFieldName) {
+          if (isset($values['fields'][$fileFieldName]) && is_array($values['fields'][$fileFieldName])) {
+            // File was unchanged
+            if (isset($values['fields'][$fileFieldName]['file_name'])) {
+              unset($values['fields'][$fileFieldName]);
+            }
+            // File was deleted
+            elseif (array_key_exists('file_name', $values['fields'][$fileFieldName])) {
+              $values['fields'][$fileFieldName] = '';
+            }
+          }
+        }
         // Only accept joins set on the form
         $values['joins'] = array_intersect_key($values['joins'] ?? [], $entity['joins']);
         foreach ($values['joins'] as $joinEntity => &$joinValues) {
+          // Only accept values from join fields on the form
+          $idField = CoreUtil::getIdFieldName($joinEntity);
+          $allowedFields = $entity['joins'][$joinEntity]['fields'] ?? [];
+          $allowedFields[$idField] = TRUE;
+          $fileFields = $this->getFileFields($joinEntity, $allowedFields);
           // Enforce the limit set by join[max]
           $joinValues = array_slice($joinValues, 0, $entity['joins'][$joinEntity]['max'] ?? NULL);
           foreach ($joinValues as $index => $vals) {
-            // Only accept values from join fields on the form
-            $joinValues[$index] = array_intersect_key($vals, $entity['joins'][$joinEntity]['fields'] ?? []);
+            $joinValues[$index] = array_intersect_key($vals, $allowedFields);
+            // Unset prefilled file fields
+            foreach ($fileFields as $fileFieldName) {
+              if (isset($joinValues[$index][$fileFieldName]) && is_array($joinValues[$index][$fileFieldName])) {
+                // File was unchanged
+                if (isset($joinValues[$index][$fileFieldName]['file_name'])) {
+                  unset($joinValues[$index][$fileFieldName]);
+                }
+                // File was deleted
+                elseif (array_key_exists('file_name', $joinValues[$index][$fileFieldName])) {
+                  $joinValues[$index][$fileFieldName] = '';
+                }
+              }
+              // Creating new record, add placeholder value so the file upload will have an id
+              if (empty($joinValues[$index][$idField])) {
+                $joinValues[$index][$fileFieldName] = '';
+              }
+            }
+
             // Merge in pre-set data
             $joinValues[$index] = array_merge($joinValues[$index], $entity['joins'][$joinEntity]['data'] ?? []);
           }
diff --git a/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index a309fd551..120b3a8d3 100644
--- a/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -2,8 +2,6 @@
 
 namespace Civi\Api4\Action\Afform;
 
-use Civi\Api4\CustomField;
-use Civi\Api4\CustomGroup;
 use Civi\Core\Event\GenericHookEvent;
 use CRM_Afform_ExtensionUtil as E;
 
@@ -150,34 +148,26 @@ public static function getCustomGroupBlocks($event) {
     $groupNames = [];
     $afforms =& $event->afforms;
     foreach ($getNames['name'] ?? [] as $name) {
-      if (strpos($name, 'afblockCustom_') === 0 && strlen($name) > 13) {
+      if (str_starts_with($name, 'afblockCustom_') && strlen($name) > 13) {
         $groupNames[] = substr($name, 14);
       }
     }
     // Early return if this api call is fetching afforms by name and those names are not custom-related
     if ((!empty($getNames['name']) && !$groupNames)
-      || (!empty($getNames['module_name']) && !strstr(implode(' ', $getNames['module_name']), 'afblockCustom'))
-      || (!empty($getNames['directive_name']) && !strstr(implode(' ', $getNames['directive_name']), 'afblock-custom'))
+      || (!empty($getNames['module_name']) && !str_contains(implode(' ', $getNames['module_name']), 'afblockCustom'))
+      || (!empty($getNames['directive_name']) && !str_contains(implode(' ', $getNames['directive_name']), 'afblock-custom'))
     ) {
       return;
     }
-    $customApi = CustomGroup::get(FALSE)
-      ->addSelect('name', 'title', 'help_pre', 'help_post', 'extends', 'max_multiple')
-      ->addWhere('is_multiple', '=', 1)
-      ->addWhere('is_active', '=', 1);
+    $filters = [
+      'is_multiple' => TRUE,
+      'is_active' => TRUE,
+    ];
     if ($groupNames) {
-      $customApi->addWhere('name', 'IN', $groupNames);
+      $filters['name'] = $groupNames;
     }
-    if ($getLayout) {
-      $customApi->addSelect('help_pre', 'help_post');
-      $customApi->addChain('fields', CustomField::get(FALSE)
-        ->addSelect('name')
-        ->addWhere('custom_group_id', '=', '$id')
-        ->addWhere('is_active', '=', 1)
-        ->addOrderBy('weight', 'ASC')
-      );
-    }
-    foreach ($customApi->execute() as $custom) {
+    $customGroups = \CRM_Core_BAO_CustomGroup::getAll($filters);
+    foreach ($customGroups as $custom) {
       $name = 'afblockCustom_' . $custom['name'];
       $item = [
         'name' => $name,
diff --git a/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/GetOptions.php b/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/GetOptions.php
index c1498b5e3..8202df429 100644
--- a/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/GetOptions.php
+++ b/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/GetOptions.php
@@ -71,7 +71,7 @@ protected function processForm() {
         ->addSelect('api_entity', 'api_params')
         ->execute()->single();
       // If field is not prefixed with a join, it's from the main entity
-      $entity = $savedSearch['api__entity'];
+      $entity = $savedSearch['api_entity'];
       // Check to see if field belongs to a join
       foreach ($savedSearch['api_params']['join'] ?? [] as $join) {
         [$joinEntity, $joinAlias] = array_pad(explode(' AS ', $join[0]), 2, '');
diff --git a/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Submit.php b/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
index a6024dd05..e38d45fcd 100644
--- a/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
+++ b/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
@@ -299,51 +299,71 @@ public static function processRelationships(AfformSubmitEvent $event) {
     foreach ($event->records as $relationship) {
       $relationship = $relationship['fields'] ?? [];
       if (empty($relationship['contact_id_a']) || empty($relationship['contact_id_b']) || empty($relationship['relationship_type_id'])) {
-        return;
+        self::saveRelationshipById($relationship, $event->getEntity(), $api4);
       }
-      $relationshipType = RelationshipType::get(FALSE)
-        ->addWhere('id', '=', $relationship['relationship_type_id'])
-        ->execute()->single();
-      $isReciprocal = $relationshipType['label_a_b'] == $relationshipType['label_b_a'];
-      $isActive = !isset($relationship['is_active']) || !empty($relationship['is_active']);
-      // Each contact id could be multivalued (e.g. using `af-repeat`)
-      foreach ((array) $relationship['contact_id_a'] as $contact_id_a) {
-        foreach ((array) $relationship['contact_id_b'] as $contact_id_b) {
-          $params = $relationship;
-          $params['contact_id_a'] = $contact_id_a;
-          $params['contact_id_b'] = $contact_id_b;
-          // Check for existing relationships (if allowed)
-          if (!empty($event->getEntity()['actions']['update'])) {
-            $where = [
-              ['is_active', '=', $isActive],
-              ['relationship_type_id', '=', $relationship['relationship_type_id']],
+      else {
+        self::saveRelationshipByValues($relationship, $event->getEntity(), $api4);
+      }
+    }
+  }
+
+  /**
+   * @param array $relationship
+   * @param array $entity
+   * @param callable $api4
+   */
+  private static function saveRelationshipById(array $relationship, array $entity, callable $api4): void {
+    if (!empty($entity['actions']['update']) && !empty($relationship['id'])) {
+      $api4('Relationship', 'save', ['records' => [$relationship]]);
+    }
+  }
+
+  /**
+   * @param array $relationship
+   * @param array $entity
+   * @param callable $api4
+   */
+  private static function saveRelationshipByValues(array $relationship, array $entity, callable $api4): void {
+    $relationshipType = RelationshipType::get(FALSE)
+      ->addWhere('id', '=', $relationship['relationship_type_id'])
+      ->execute()->single();
+    $isReciprocal = $relationshipType['label_a_b'] == $relationshipType['label_b_a'];
+    $isActive = !isset($relationship['is_active']) || !empty($relationship['is_active']);
+    // Each contact id could be multivalued (e.g. using `af-repeat`)
+    foreach ((array) $relationship['contact_id_a'] as $contact_id_a) {
+      foreach ((array) $relationship['contact_id_b'] as $contact_id_b) {
+        $params = $relationship;
+        $params['contact_id_a'] = $contact_id_a;
+        $params['contact_id_b'] = $contact_id_b;
+        // Check for existing relationships (if allowed)
+        if (!empty($entity['actions']['update'])) {
+          $where = [
+            ['is_active', '=', $isActive],
+            ['relationship_type_id', '=', $relationship['relationship_type_id']],
+          ];
+          // Reciprocal relationship types need an extra check
+          if ($isReciprocal) {
+            $where[] = [
+              'OR', [
+                ['AND', [['contact_id_a', '=', $contact_id_a], ['contact_id_b', '=', $contact_id_b]]],
+                ['AND', [['contact_id_a', '=', $contact_id_b], ['contact_id_b', '=', $contact_id_a]]],
+              ],
             ];
-            // Reciprocal relationship types need an extra check
-            if ($isReciprocal) {
-              $where[] = [
-                'OR', [
-                  ['AND', [['contact_id_a', '=', $contact_id_a], ['contact_id_b', '=', $contact_id_b]]],
-                  ['AND', [['contact_id_a', '=', $contact_id_b], ['contact_id_b', '=', $contact_id_a]]],
-                ],
-              ];
-            }
-            else {
-              $where[] = ['contact_id_a', '=', $contact_id_a];
-              $where[] = ['contact_id_b', '=', $contact_id_b];
-            }
-            $existing = $api4('Relationship', 'get', ['where' => $where])->first();
-            if ($existing) {
-              $params['id'] = $existing['id'];
-              unset($params['contact_id_a'], $params['contact_id_b']);
-              // If this is a flipped reciprocal relationship, also flip the permissions
-              $params['is_permission_a_b'] = $relationship['is_permission_b_a'] ?? NULL;
-              $params['is_permission_b_a'] = $relationship['is_permission_a_b'] ?? NULL;
-            }
           }
-          $api4('Relationship', 'save', [
-            'records' => [$params],
-          ]);
+          else {
+            $where[] = ['contact_id_a', '=', $contact_id_a];
+            $where[] = ['contact_id_b', '=', $contact_id_b];
+          }
+          $existing = $api4('Relationship', 'get', ['where' => $where])->first();
+          if ($existing) {
+            $params['id'] = $existing['id'];
+            unset($params['contact_id_a'], $params['contact_id_b']);
+            // If this is a flipped reciprocal relationship, also flip the permissions
+            $params['is_permission_a_b'] = $relationship['is_permission_b_a'] ?? NULL;
+            $params['is_permission_b_a'] = $relationship['is_permission_a_b'] ?? NULL;
+          }
         }
+        $api4('Relationship', 'save', ['records' => [$params]]);
       }
     }
   }
@@ -358,8 +378,9 @@ public static function processRelationships(AfformSubmitEvent $event) {
    * @throws \CRM_Core_Exception
    */
   protected static function saveJoins(AfformSubmitEvent $event, $index, $entityId, $joins) {
+    $mainEntity = $event->getFormDataModel()->getEntity($event->getEntityName());
     foreach ($joins as $joinEntityName => $join) {
-      $values = self::filterEmptyJoins($joinEntityName, $join);
+      $values = self::filterEmptyJoins($mainEntity, $joinEntityName, $join);
       // TODO: REPLACE works for creating or updating contacts, but different logic would be needed if
       // the contact was being auto-updated via a dedupe rule; in that case we would not want to
       // delete any existing records.
@@ -393,28 +414,22 @@ protected static function saveJoins(AfformSubmitEvent $event, $index, $entityId,
   /**
    * Filter out join entities that have been left blank on the form
    *
-   * @param $entity
-   * @param $join
+   * @param array $mainEntity
+   * @param string $joinEntityName
+   * @param array $join
    * @return array
    */
-  private static function filterEmptyJoins($entity, $join) {
-    $idField = CoreUtil::getIdFieldName($entity);
-    $fileFields = (array) civicrm_api4($entity, 'getFields', [
-      'checkPermissions' => FALSE,
-      'where' => [['fk_entity', '=', 'File']],
-    ], ['name']);
-    // Files will be uploaded later, fill with empty values for now
+  private static function filterEmptyJoins(array $mainEntity, string $joinEntityName, $join) {
+    $idField = CoreUtil::getIdFieldName($joinEntityName);
+    // Files will be uploaded later, fill with placeholder values for now
     // TODO: Somehow check if a file has actually been selected for upload
-    foreach ($join as &$item) {
-      if (empty($item[$idField]) && $fileFields) {
-        $item += array_fill_keys($fileFields, '');
-      }
-    }
-    return array_filter($join, function($item) use($entity, $idField, $fileFields) {
-      if (!empty($item[$idField]) || $fileFields) {
+    $fileFields = self::getFileFields($joinEntityName, $mainEntity['joins'][$joinEntityName]['fields'] ?? []);
+    return array_filter($join, function($item) use($joinEntityName, $idField, $fileFields) {
+      $item = array_merge($item, $fileFields);
+      if (!empty($item[$idField])) {
         return TRUE;
       }
-      switch ($entity) {
+      switch ($joinEntityName) {
         case 'Email':
           return !empty($item['email']);
 
diff --git a/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/SubmitFile.php b/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/SubmitFile.php
index 05218b3d5..44d510b7d 100644
--- a/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/SubmitFile.php
+++ b/www/modules/civicrm/ext/afform/core/Civi/Api4/Action/Afform/SubmitFile.php
@@ -80,33 +80,23 @@ protected function processForm() {
       throw new \CRM_Core_Exception('Entity not found');
     }
 
-    $attachmentParams = [
+    $file = civicrm_api3('Attachment', 'create', [
       'entity_id' => $entityId,
+      'entity_table' => CoreUtil::getTableName($apiEntity),
       'mime_type' => $_FILES['file']['type'],
       'name' => $_FILES['file']['name'],
       'options' => [
         'move-file' => $_FILES['file']['tmp_name'],
       ],
-    ];
+    ]);
 
-    if (strpos($this->fieldName, '.')) {
-      $attachmentParams['field_name'] = $this->convertFieldNameToApi3($apiEntity, $this->fieldName);
-    }
-    else {
-      $attachmentParams['entity_table'] = CoreUtil::getTableName($apiEntity);
-    }
-
-    $file = civicrm_api3('Attachment', 'create', $attachmentParams);
-
-    // Update multi-record custom field with value
-    if (strpos($apiEntity, 'Custom_') === 0) {
-      civicrm_api4($apiEntity, 'update', [
-        'values' => [
-          $idField => $entityId,
-          $this->fieldName => $file['id'],
-        ],
-      ]);
-    }
+    civicrm_api4($apiEntity, 'update', [
+      'values' => [
+        $idField => $entityId,
+        $this->fieldName => $file['id'],
+      ],
+      'checkPermissions' => FALSE,
+    ]);
 
     return [];
   }
@@ -128,20 +118,4 @@ protected function loadEntities() {
     $this->_entityIds = $info['civiAfformSubmission']['data'];
   }
 
-  /**
-   * @param string $apiEntity
-   * @param string $fieldName
-   * @return string
-   */
-  private function convertFieldNameToApi3($apiEntity, $fieldName) {
-    if (strpos($fieldName, '.')) {
-      $fields = civicrm_api4($apiEntity, 'getFields', [
-        'checkPermissions' => FALSE,
-        'where' => [['name', '=', $fieldName]],
-      ]);
-      return 'custom_' . $fields[0]['custom_field_id'];
-    }
-    return $fieldName;
-  }
-
 }
diff --git a/www/modules/civicrm/ext/afform/core/Civi/Api4/Afform.php b/www/modules/civicrm/ext/afform/core/Civi/Api4/Afform.php
index 0484f0533..afe40ff68 100644
--- a/www/modules/civicrm/ext/afform/core/Civi/Api4/Afform.php
+++ b/www/modules/civicrm/ext/afform/core/Civi/Api4/Afform.php
@@ -350,7 +350,7 @@ public static function getFields($checkPermissions = TRUE) {
   public static function permissions() {
     return [
       'meta' => ['access CiviCRM'],
-      'default' => [['administer CiviCRM', 'administer afform']],
+      'default' => ['administer afform'],
       // These all check form-level permissions
       'get' => [],
       'getOptions' => [],
diff --git a/www/modules/civicrm/ext/afform/core/Civi/Api4/AfformBehavior.php b/www/modules/civicrm/ext/afform/core/Civi/Api4/AfformBehavior.php
index 6f1742b9f..24f733565 100644
--- a/www/modules/civicrm/ext/afform/core/Civi/Api4/AfformBehavior.php
+++ b/www/modules/civicrm/ext/afform/core/Civi/Api4/AfformBehavior.php
@@ -28,7 +28,7 @@ public static function get(bool $checkPermissions = TRUE) {
   public static function permissions() {
     return [
       'meta' => ['access CiviCRM'],
-      'get' => [['administer CiviCRM', 'administer afform']],
+      'get' => ['administer afform'],
     ];
   }
 
diff --git a/www/modules/civicrm/ext/afform/core/Civi/Api4/AfformSubmission.php b/www/modules/civicrm/ext/afform/core/Civi/Api4/AfformSubmission.php
index 59c3ba3f1..09862b361 100644
--- a/www/modules/civicrm/ext/afform/core/Civi/Api4/AfformSubmission.php
+++ b/www/modules/civicrm/ext/afform/core/Civi/Api4/AfformSubmission.php
@@ -18,7 +18,7 @@ class AfformSubmission extends Generic\DAOEntity {
   public static function permissions() {
     return [
       'meta' => ['access CiviCRM'],
-      'default' => [['administer CiviCRM', 'administer afform']],
+      'default' => ['administer afform'],
     ];
   }
 
diff --git a/www/modules/civicrm/ext/afform/core/Civi/Api4/Subscriber/AfformAutocompleteSubscriber.php b/www/modules/civicrm/ext/afform/core/Civi/Api4/Subscriber/AfformAutocompleteSubscriber.php
index 98d5a551a..02d035f79 100644
--- a/www/modules/civicrm/ext/afform/core/Civi/Api4/Subscriber/AfformAutocompleteSubscriber.php
+++ b/www/modules/civicrm/ext/afform/core/Civi/Api4/Subscriber/AfformAutocompleteSubscriber.php
@@ -132,7 +132,7 @@ private function processAfformAutocomplete(string $formName, string $entityName,
    * @param \Civi\Api4\Generic\AutocompleteAction $apiRequest
    */
   private function processAfformAdminAutocomplete(string $fieldName, AutocompleteAction $apiRequest):void {
-    if (!\CRM_Core_Permission::check([['administer CiviCRM', 'administer afform']])) {
+    if (!\CRM_Core_Permission::check('administer afform')) {
       return;
     }
     switch ($fieldName) {
diff --git a/www/modules/civicrm/ext/afform/core/afform.php b/www/modules/civicrm/ext/afform/core/afform.php
index 1c4d2120d..ecfaca898 100644
--- a/www/modules/civicrm/ext/afform/core/afform.php
+++ b/www/modules/civicrm/ext/afform/core/afform.php
@@ -169,7 +169,7 @@ function afform_civicrm_tabset($tabsetName, &$tabs, $context) {
   }
   $existingTabs = array_combine(array_keys($tabs), array_column($tabs, 'id'));
   $contactTypes = array_merge((array) ($context['contact_type'] ?? []), $context['contact_sub_type'] ?? []);
-  $afforms = Civi\Api4\Afform::get(FALSE)
+  $afforms = Civi\Api4\Afform::get()
     ->addSelect('name', 'title', 'icon', 'module_name', 'directive_name', 'summary_contact_type', 'summary_weight')
     ->addWhere('placement', 'CONTAINS', 'contact_summary_tab')
     ->addOrderBy('title')
@@ -213,7 +213,7 @@ function afform_civicrm_pageRun(&$page) {
   if (!in_array(get_class($page), ['CRM_Contact_Page_View_Summary', 'CRM_Contact_Page_View_Print'])) {
     return;
   }
-  $afforms = Civi\Api4\Afform::get(FALSE)
+  $afforms = Civi\Api4\Afform::get()
     ->addSelect('name', 'title', 'icon', 'module_name', 'directive_name', 'summary_contact_type')
     ->addWhere('placement', 'CONTAINS', 'contact_summary_block')
     ->addOrderBy('summary_weight')
@@ -257,7 +257,7 @@ function afform_civicrm_pageRun(&$page) {
  * @link https://github.com/civicrm/org.civicrm.contactlayout
  */
 function afform_civicrm_contactSummaryBlocks(&$blocks) {
-  $afforms = \Civi\Api4\Afform::get(FALSE)
+  $afforms = \Civi\Api4\Afform::get()
     ->setSelect(['name', 'title', 'directive_name', 'module_name', 'type', 'type:icon', 'type:label', 'summary_contact_type'])
     ->addWhere('placement', 'CONTAINS', 'contact_summary_block')
     ->addOrderBy('title')
@@ -334,6 +334,12 @@ function _afform_hook_civicrm_angularModules($e) {
       'exports' => [
         $afform['directive_name'] => 'E',
       ],
+      // Permissions needed for conditionally displaying edit-links
+      'permissions' => [
+        'administer afform',
+        'administer search_kit',
+        'all CiviCRM permissions and ACLs',
+      ],
     ];
   }
 
@@ -432,8 +438,9 @@ function afform_civicrm_alterMenu(&$items) {
  */
 function afform_civicrm_permission(&$permissions) {
   $permissions['administer afform'] = [
-    E::ts('FormBuilder: edit and delete forms'),
-    E::ts('Allows non-admin users to create, update and delete forms'),
+    'label' => E::ts('FormBuilder: edit and delete forms'),
+    'description' => E::ts('Allows non-admin users to create, update and delete forms'),
+    'implied_by' => ['administer CiviCRM'],
   ];
 }
 
diff --git a/www/modules/civicrm/ext/afform/core/ang/af/afField.component.js b/www/modules/civicrm/ext/afform/core/ang/af/afField.component.js
index 80d1d1ed0..eec509af7 100644
--- a/www/modules/civicrm/ext/afform/core/ang/af/afField.component.js
+++ b/www/modules/civicrm/ext/afform/core/ang/af/afField.component.js
@@ -123,10 +123,6 @@
           else if (ctrl.afFieldset.getStoredValue(ctrl.fieldName) !== undefined) {
             setValue(ctrl.afFieldset.getStoredValue(ctrl.fieldName));
           }
-          else if ('default_date_type' in ctrl.defn && ctrl.defn.default_date_type === 'now') {
-            let currentDate = new Date();
-            setValue(currentDate.toISOString().split('T')[0]);
-          }
           // Set default value based on field defn
           else if ('afform_default' in ctrl.defn) {
             setValue(ctrl.defn.afform_default);
@@ -188,6 +184,9 @@
         // correct the value type
         value = correctValueType(value, ctrl.defn.data_type);
 
+        if (ctrl.defn.input_type === 'Date' && typeof value === 'string' && value.startsWith('now')) {
+          value = getRelativeDate(value);
+        }
         if (ctrl.defn.input_type === 'Number' && ctrl.defn.search_range) {
           if (!_.isPlainObject(value)) {
             value = {
@@ -347,6 +346,24 @@
         return currentVal;
       };
 
+      function getRelativeDate(dateString) {
+        const parts = dateString.split(' ');
+        const baseDate = new Date();
+        let unit = parts[2] || 'day';
+        let offset = parseInt(parts[1] || '0', 10);
+
+        switch (unit) {
+          case 'week':
+            offset *= 7;
+            break;
+
+          case 'year':
+            offset *= 365;
+        }
+        let newDate = new Date(baseDate.getTime() + offset * 24 * 60 * 60 * 1000);
+        return newDate.toISOString().split('T')[0];
+      }
+
     }
   });
 })(angular, CRM.$, CRM._);
diff --git a/www/modules/civicrm/ext/afform/core/ang/af/fields/File.html b/www/modules/civicrm/ext/afform/core/ang/af/fields/File.html
index 4a4e4cc5d..61447da13 100644
--- a/www/modules/civicrm/ext/afform/core/ang/af/fields/File.html
+++ b/www/modules/civicrm/ext/afform/core/ang/af/fields/File.html
@@ -1,12 +1,12 @@
-<span ng-if="dataProvider.getFieldData()[$ctrl.fieldName].name">
+<span ng-if="dataProvider.getFieldData()[$ctrl.fieldName].file_name">
   <i class="crm-i {{ dataProvider.getFieldData()[$ctrl.fieldName].icon }}"></i>
-  {{ dataProvider.getFieldData()[$ctrl.fieldName].name }}
-  <a class="crm-hover-button" title="{{:: ts('Replace') }}" ng-click="dataProvider.getFieldData()[$ctrl.fieldName].name = null">
+  {{ dataProvider.getFieldData()[$ctrl.fieldName].file_name }}
+  <a class="crm-hover-button" title="{{:: ts('Replace') }}" ng-click="dataProvider.getFieldData()[$ctrl.fieldName].file_name = null">
     <i class="crm-i fa-times" aria-hidden="true"></i>
   </a>
 </span>
 <input type="file" nv-file-select
-       ng-if="!dataProvider.getFieldData()[$ctrl.fieldName].name"
+       ng-if="!dataProvider.getFieldData()[$ctrl.fieldName].file_name"
        ng-required="$ctrl.defn.required"
        uploader="$ctrl.afFieldset.afFormCtrl.fileUploader"
        options="{crmApiParams: $ctrl.getFileUploadParams}">
diff --git a/www/modules/civicrm/ext/afform/core/ang/af/fields/Select.html b/www/modules/civicrm/ext/afform/core/ang/af/fields/Select.html
index 4e000171d..2ef8a8b51 100644
--- a/www/modules/civicrm/ext/afform/core/ang/af/fields/Select.html
+++ b/www/modules/civicrm/ext/afform/core/ang/af/fields/Select.html
@@ -1,6 +1,6 @@
 <div class="{{:: $ctrl.defn.search_range ? 'form-inline' : 'form-group' }}">
   <input class="form-control" ng-required="$ctrl.defn.required" id="{{:: fieldId }}" ng-if="!$ctrl.isMultiple()" crm-ui-select="{data: select2Options, placeholder: $ctrl.defn.input_attrs.placeholder}" ng-model="getSetSelect" ng-model-options="{getterSetter: true}" >
-  <input class="form-control" ng-required="$ctrl.defn.required" id="{{:: fieldId }}" ng-if="$ctrl.isMultiple()" ng-list crm-ui-select="{data: select2Options, multiple: true, placeholder: $ctrl.defn.input_attrs.placeholder}" ng-model="getSetSelect" ng-model-options="{getterSetter: true}" >
+  <input class="form-control" ng-required="$ctrl.defn.required" id="{{:: fieldId }}" ng-if="$ctrl.isMultiple()" ng-list="
" crm-ui-select="{data: select2Options, multiple: true, separator: '\u0001', placeholder: $ctrl.defn.input_attrs.placeholder}" ng-model="getSetSelect" ng-model-options="{getterSetter: true}" >
   <input class="form-control" ng-required="$ctrl.defn.required" ng-if=":: $ctrl.defn.search_range && !$ctrl.defn.is_date" id="{{:: fieldId }}2" crm-ui-select="{data: select2Options, placeholder: $ctrl.defn.input_attrs.placeholder2 || $ctrl.defn.input_attrs.placeholder}" ng-model="dataProvider.getFieldData()[$ctrl.fieldName]['<=']" >
   <div ng-if="$ctrl.defn.search_range && $ctrl.defn.is_date && getSetSelect() === '{}'" class="form-group" ng-include="'~/af/fields/Date.html'"></div>
 </div>
diff --git a/www/modules/civicrm/ext/afform/core/ang/afCore.js b/www/modules/civicrm/ext/afform/core/ang/afCore.js
index 3eb7abf0c..447962721 100644
--- a/www/modules/civicrm/ext/afform/core/ang/afCore.js
+++ b/www/modules/civicrm/ext/afform/core/ang/afCore.js
@@ -16,6 +16,7 @@
           $scope.crmStatus = crmStatus;
           $scope.crmUiAlert = crmUiAlert;
           $scope.crmUrl = CRM.url;
+          $scope.checkPerm = CRM.checkPerm;
 
           $el.addClass('afform-directive');
 
diff --git a/www/modules/civicrm/ext/afform/core/ang/afblockParticipantNote.aff.html b/www/modules/civicrm/ext/afform/core/ang/afblockParticipantNote.aff.html
new file mode 100644
index 000000000..b987a1f4e
--- /dev/null
+++ b/www/modules/civicrm/ext/afform/core/ang/afblockParticipantNote.aff.html
@@ -0,0 +1,3 @@
+<div class="af-container af-layout-inline">
+  <af-field name="note" />
+</div>
diff --git a/www/modules/civicrm/ext/afform/core/ang/afblockParticipantNote.aff.php b/www/modules/civicrm/ext/afform/core/ang/afblockParticipantNote.aff.php
new file mode 100644
index 000000000..7e95aa29e
--- /dev/null
+++ b/www/modules/civicrm/ext/afform/core/ang/afblockParticipantNote.aff.php
@@ -0,0 +1,7 @@
+<?php
+return [
+  'title' => ts('Participant Note(s)'),
+  'type' => 'block',
+  'entity_type' => 'Participant',
+  'join_entity' => 'Note',
+];
diff --git a/www/modules/civicrm/ext/afform/core/info.xml b/www/modules/civicrm/ext/afform/core/info.xml
index 841f74534..a99cfe0fb 100644
--- a/www/modules/civicrm/ext/afform/core/info.xml
+++ b/www/modules/civicrm/ext/afform/core/info.xml
@@ -12,10 +12,10 @@
     <url desc="Chat">https://chat.civicrm.org/civicrm/channels/dev-afform</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <develStage>stable</develStage>
   <tags>
@@ -37,7 +37,7 @@
     <mixin>ang-php@1.0.0</mixin>
     <mixin>mgd-php@1.0.0</mixin>
     <mixin>scan-classes@1.0.0</mixin>
-    <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>smarty@1.0.0</mixin>
     <mixin>entity-types-php@1.0.0</mixin>
     <mixin>menu-xml@1.0.0</mixin>
   </mixins>
diff --git a/www/modules/civicrm/ext/afform/core/managed/AfformType.mgd.php b/www/modules/civicrm/ext/afform/core/managed/AfformType.mgd.php
index 5922d3b65..6ec07ec9e 100644
--- a/www/modules/civicrm/ext/afform/core/managed/AfformType.mgd.php
+++ b/www/modules/civicrm/ext/afform/core/managed/AfformType.mgd.php
@@ -14,11 +14,7 @@
       'values' => [
         'name' => 'afform_type',
         'title' => E::ts('Afform Type'),
-        'description' => NULL,
-        'data_type' => NULL,
         'is_reserved' => TRUE,
-        'is_active' => TRUE,
-        'is_locked' => FALSE,
         'option_value_fields' => [
           'name',
           'label',
@@ -41,18 +37,7 @@
         'name' => 'form',
         'value' => 'form',
         'label' => E::ts('Submission Form'),
-        'grouping' => NULL,
-        'filter' => 0,
-        'is_default' => FALSE,
-        'description' => NULL,
-        'is_optgroup' => FALSE,
-        'is_reserved' => FALSE,
-        'is_active' => TRUE,
-        'component_id' => NULL,
-        'domain_id' => NULL,
-        'visibility_id' => NULL,
         'icon' => 'fa-list-alt',
-        'color' => NULL,
       ],
       'match' => ['option_group_id', 'name'],
     ],
@@ -69,18 +54,7 @@
         'name' => 'search',
         'value' => 'search',
         'label' => E::ts('Search Form'),
-        'grouping' => NULL,
-        'filter' => 0,
-        'is_default' => FALSE,
-        'description' => NULL,
-        'is_optgroup' => FALSE,
-        'is_reserved' => FALSE,
-        'is_active' => TRUE,
-        'component_id' => NULL,
-        'domain_id' => NULL,
-        'visibility_id' => NULL,
         'icon' => 'fa-search',
-        'color' => NULL,
       ],
       'match' => ['option_group_id', 'name'],
     ],
@@ -97,18 +71,7 @@
         'name' => 'block',
         'value' => 'block',
         'label' => E::ts('Field Block'),
-        'grouping' => NULL,
-        'filter' => 0,
-        'is_default' => FALSE,
-        'description' => NULL,
-        'is_optgroup' => FALSE,
-        'is_reserved' => FALSE,
-        'is_active' => TRUE,
-        'component_id' => NULL,
-        'domain_id' => NULL,
-        'visibility_id' => NULL,
         'icon' => 'fa-th-large',
-        'color' => NULL,
       ],
       'match' => ['option_group_id', 'name'],
     ],
@@ -125,18 +88,7 @@
         'name' => 'system',
         'value' => 'system',
         'label' => E::ts('System Form'),
-        'grouping' => NULL,
-        'filter' => 0,
-        'is_default' => FALSE,
-        'description' => NULL,
-        'is_optgroup' => FALSE,
-        'is_reserved' => FALSE,
-        'is_active' => TRUE,
-        'component_id' => NULL,
-        'domain_id' => NULL,
-        'visibility_id' => NULL,
         'icon' => 'fa-lock',
-        'color' => NULL,
       ],
       'match' => ['option_group_id', 'name'],
     ],
diff --git a/www/modules/civicrm/ext/afform/core/sql/auto_install.sql b/www/modules/civicrm/ext/afform/core/sql/auto_install.sql
index 44103e839..bfaa777ea 100644
--- a/www/modules/civicrm/ext/afform/core/sql/auto_install.sql
+++ b/www/modules/civicrm/ext/afform/core/sql/auto_install.sql
@@ -43,4 +43,4 @@ CREATE TABLE `civicrm_afform_submission` (
   PRIMARY KEY (`id`),
   CONSTRAINT FK_civicrm_afform_submission_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
 )
-ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
diff --git a/www/modules/civicrm/ext/afform/core/tests/phpunit/Civi/Afform/AfformGetTest.php b/www/modules/civicrm/ext/afform/core/tests/phpunit/Civi/Afform/AfformGetTest.php
index 2478ea069..fa10cdae9 100644
--- a/www/modules/civicrm/ext/afform/core/tests/phpunit/Civi/Afform/AfformGetTest.php
+++ b/www/modules/civicrm/ext/afform/core/tests/phpunit/Civi/Afform/AfformGetTest.php
@@ -75,6 +75,39 @@ public function testGetLayoutWithEmptyNode() {
     $this->assertArrayNotHasKey('#children', $layout[0]['#children'][0]);
   }
 
+  public function testGetHtmlEncoding(): void {
+    Afform::create(FALSE)
+      ->setLayoutFormat('shallow')
+      ->addValue('name', $this->formName)
+      ->addValue('title', 'Test Form')
+      ->addValue('layout', [
+        [
+          '#tag' => 'af-form',
+          'ctrl' => 'afform',
+          '#children' => [
+            [
+              '#tag' => 'af-entity',
+              'data' => "{contact_type: 'Individual', source: 'This isn\\'t \"quotes\"'}",
+              'type' => 'Contact',
+              'name' => 'Individual1',
+            ],
+          ],
+        ],
+      ])
+      ->execute();
+
+    $html = Afform::get(FALSE)
+      ->addWhere('name', '=', $this->formName)
+      ->setLayoutFormat('html')
+      ->execute()->single()['layout'];
+
+    $expected = <<<HTML
+data="{contact_type: 'Individual', source: 'This isn\'t &quot;quotes&quot;'}"
+HTML;
+
+    $this->assertStringContainsString($expected, $html);
+  }
+
   public function testAfformAutocomplete(): void {
     // Use a numeric title to test that the "search by id" feature
     // doesn't kick in for Afforms (which don't have a numeric "id")
diff --git a/www/modules/civicrm/ext/afform/html/README.md b/www/modules/civicrm/ext/afform/html/README.md
index 25d971b7b..1c0990a19 100644
--- a/www/modules/civicrm/ext/afform/html/README.md
+++ b/www/modules/civicrm/ext/afform/html/README.md
@@ -1,44 +1,3 @@
-# org.civicrm.afform-html
+# Afform HTML Editor
 
-![Screenshot](/images/screenshot.png)
-
-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).
-
-## 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 *)
+A GUI for editing the markup of a FormBuilder form.
diff --git a/www/modules/civicrm/ext/afform/html/images/screenshot.png b/www/modules/civicrm/ext/afform/html/images/screenshot.png
deleted file mode 100644
index 6765b696f..000000000
Binary files a/www/modules/civicrm/ext/afform/html/images/screenshot.png and /dev/null differ
diff --git a/www/modules/civicrm/ext/afform/html/info.xml b/www/modules/civicrm/ext/afform/html/info.xml
index cc07527da..383a1cd56 100644
--- a/www/modules/civicrm/ext/afform/html/info.xml
+++ b/www/modules/civicrm/ext/afform/html/info.xml
@@ -12,11 +12,11 @@
     <url desc="Chat">https://chat.civicrm.org/civicrm/channels/dev-afform</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <requires>
     <ext>org.civicrm.afform</ext>
diff --git a/www/modules/civicrm/ext/afform/mock/info.xml b/www/modules/civicrm/ext/afform/mock/info.xml
index 58475dfb9..cc5f8859f 100644
--- a/www/modules/civicrm/ext/afform/mock/info.xml
+++ b/www/modules/civicrm/ext/afform/mock/info.xml
@@ -11,14 +11,14 @@
   <urls>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <requires>
     <ext>org.civicrm.afform</ext>
diff --git a/www/modules/civicrm/ext/afform/mock/tests/phpunit/api/v4/Afform/AfformFileUploadTest.php b/www/modules/civicrm/ext/afform/mock/tests/phpunit/api/v4/Afform/AfformFileUploadTest.php
index 0f7e665cf..550eae578 100644
--- a/www/modules/civicrm/ext/afform/mock/tests/phpunit/api/v4/Afform/AfformFileUploadTest.php
+++ b/www/modules/civicrm/ext/afform/mock/tests/phpunit/api/v4/Afform/AfformFileUploadTest.php
@@ -27,7 +27,7 @@ public static function setUpBeforeClass(): void {
     <afblock-name-individual></afblock-name-individual>
     <af-field name="MyInfo.single_file_field"></af-field>
     <div af-join="Custom_MyFiles" af-repeat="Add" max="3">
-      <afjoin-custom-my-files></afjoin-custom-my-files>
+      <afblock-custom-my-files></afblock-custom-my-files>
     </div>
   </fieldset>
   <button class="af-button btn-primary" crm-icon="fa-check" ng-click="afform.submit()">Submit</button>
diff --git a/www/modules/civicrm/ext/afform/mock/tests/phpunit/api/v4/Afform/AfformRoutingTest.php b/www/modules/civicrm/ext/afform/mock/tests/phpunit/api/v4/Afform/AfformRoutingTest.php
index 28f49ea12..9f84eb678 100644
--- a/www/modules/civicrm/ext/afform/mock/tests/phpunit/api/v4/Afform/AfformRoutingTest.php
+++ b/www/modules/civicrm/ext/afform/mock/tests/phpunit/api/v4/Afform/AfformRoutingTest.php
@@ -84,7 +84,7 @@ public function testChangingPath(): void {
   private function assertNotAuthorized(\Psr\Http\Message\ResponseInterface $result, string $directive) {
     $contents = $result->getBody()->getContents();
     $this->assertEquals(403, $result->getStatusCode());
-    $this->assertMatchesRegularExpression(';You are not authorized to access;', $contents);
+    $this->assertMatchesRegularExpression(';(You are not authorized to access|You do not have permission to access);', $contents);
     $this->assertDoesNotMatchRegularExpression(';' . preg_quote("<$directive>", ';') . ';', $contents);
   }
 
@@ -96,7 +96,7 @@ private function assertNotAuthorized(\Psr\Http\Message\ResponseInterface $result
   private function assertOpensPage(\Psr\Http\Message\ResponseInterface $result, string $directive) {
     $contents = $result->getBody()->getContents();
     $this->assertEquals(200, $result->getStatusCode());
-    $this->assertDoesNotMatchRegularExpression(';You are not authorized to access;', $contents);
+    $this->assertDoesNotMatchRegularExpression(';(You are not authorized to access|You do not have permission to access);', $contents);
     $this->assertMatchesRegularExpression(';' . preg_quote("<$directive>", ';') . ';', $contents);
   }
 
diff --git a/www/modules/civicrm/ext/authx/authx.php b/www/modules/civicrm/ext/authx/authx.php
index e468947ab..0a5ad8f9a 100644
--- a/www/modules/civicrm/ext/authx/authx.php
+++ b/www/modules/civicrm/ext/authx/authx.php
@@ -122,8 +122,16 @@ function authx_civicrm_enable() {
  * @see CRM_Utils_Hook::permission()
  */
 function authx_civicrm_permission(&$permissions) {
-  $permissions['authenticate with password'] = E::ts('AuthX: Authenticate to services with password');
-  $permissions['authenticate with api key'] = E::ts('AuthX: Authenticate to services with API key');
-  $permissions['generate any authx credential'] = E::ts('Authx: Generate new JWT credentials for other users via the API');
-  $permissions['validate any authx credential'] = E::ts('Authx: Validate credentials for other users via the API');
+  $permissions['authenticate with password'] = [
+    'label' => E::ts('AuthX: Authenticate to services with password'),
+  ];
+  $permissions['authenticate with api key'] = [
+    'label' => E::ts('AuthX: Authenticate to services with API key'),
+  ];
+  $permissions['generate any authx credential'] = [
+    'label' => E::ts('Authx: Generate new JWT credentials for other users via the API'),
+  ];
+  $permissions['validate any authx credential'] = [
+    'label' => E::ts('Authx: Validate credentials for other users via the API'),
+  ];
 }
diff --git a/www/modules/civicrm/ext/authx/images/screenshot.png b/www/modules/civicrm/ext/authx/images/screenshot.png
deleted file mode 100644
index 6765b696f..000000000
Binary files a/www/modules/civicrm/ext/authx/images/screenshot.png and /dev/null differ
diff --git a/www/modules/civicrm/ext/authx/info.xml b/www/modules/civicrm/ext/authx/info.xml
index 81528a352..61df19867 100644
--- a/www/modules/civicrm/ext/authx/info.xml
+++ b/www/modules/civicrm/ext/authx/info.xml
@@ -14,14 +14,14 @@
     <url desc="Issues">https://lab.civicrm.org/dev/core/-/issues</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <tags>
     <tag>mgmt:required</tag>
   </tags>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>AuthX enables remote applications to connect to CiviCRM. Use it to enable and disable different forms of authentication (such as username-password, API key, and/or JWT).</comments>
   <classloader>
diff --git a/www/modules/civicrm/ext/authx/tests/phpunit/Civi/Authx/AbstractFlowsTest.php b/www/modules/civicrm/ext/authx/tests/phpunit/Civi/Authx/AbstractFlowsTest.php
index 634825749..3c9cb3121 100644
--- a/www/modules/civicrm/ext/authx/tests/phpunit/Civi/Authx/AbstractFlowsTest.php
+++ b/www/modules/civicrm/ext/authx/tests/phpunit/Civi/Authx/AbstractFlowsTest.php
@@ -32,7 +32,7 @@ public static function setUpBeforeClass(): void {
       ->installMe(__DIR__)
       ->callback(
         function() {
-          \CRM_Utils_System::synchronizeUsers();
+          \CRM_Utils_System::synchronizeUsersIfAllowed();
         },
         'synchronizeUsers'
       )
diff --git a/www/modules/civicrm/ext/civi_campaign/ang/afsearchCampaignDashboard.aff.html b/www/modules/civicrm/ext/civi_campaign/ang/afsearchCampaignDashboard.aff.html
index b429bdd53..947f58164 100644
--- a/www/modules/civicrm/ext/civi_campaign/ang/afsearchCampaignDashboard.aff.html
+++ b/www/modules/civicrm/ext/civi_campaign/ang/afsearchCampaignDashboard.aff.html
@@ -1,24 +1,24 @@
 <div crm-ui-tab-set>
   <div af-fieldset crm-ui-tab crm-title="ts('Campaigns')" id="tab-campaigns">
     <fieldset class="af-container af-layout-inline">
-      <af-field name="title,description" defn="{label: false, data_type: 'String', input_type: 'Text', name: 'title', input_attrs: {placeholder: 'Filter by title/description'}}" />
-      <af-field name="campaign_type_id" defn="{input_attrs: {multiple: true, placeholder: 'Filter by type'}, label: false}" />
-      <af-field name="status_id" defn="{input_attrs: {multiple: true, placeholder: 'Filter by status'}, label: false}" />
+      <af-field name="title,description" defn="{label: false, data_type: 'String', input_type: 'Text', name: 'title', input_attrs: {placeholder: ts('Filter by title/description')}}" />
+      <af-field name="campaign_type_id" defn="{input_attrs: {multiple: true, placeholder: ts('Filter by type')}, label: false}" />
+      <af-field name="status_id" defn="{input_attrs: {multiple: true, placeholder: ts('Filter by status')}, label: false}" />
     </fieldset>
     <crm-search-display-table search-name="Administer_Campaigns" display-name="Campaigns_Table" total-count="$parent.count"></crm-search-display-table>
   </div>
   <div af-fieldset crm-ui-tab crm-title="ts('Surveys')" id="tab-surveys">
     <fieldset class="af-container af-layout-inline">
-      <af-field name="title" defn="{label: false, input_attrs: {placeholder: 'Filter by title'}}" />
-      <af-field name="activity_type_id" defn="{input_attrs: {multiple: true, placeholder: 'Filter by type'}, label: false}" />
-      <af-field name="campaign_id" defn="{label: false, input_attrs: {placeholder: 'Filter by campaign', autoOpen: true}}" />
+      <af-field name="title" defn="{label: false, input_attrs: {placeholder: ts('Filter by title')}}" />
+      <af-field name="activity_type_id" defn="{input_attrs: {multiple: true, placeholder: ts('Filter by type')}, label: false}" />
+      <af-field name="campaign_id" defn="{label: false, input_attrs: {placeholder: ts('Filter by campaign'), autoOpen: true}}" />
     </fieldset>
     <crm-search-display-table search-name="Administer_Surveys" display-name="Surveys_Table" total-count="$parent.count"></crm-search-display-table>
   </div>
   <div af-fieldset crm-ui-tab crm-title="ts('Petitions')" id="tab-petitions">
     <fieldset class="af-container af-layout-inline">
-      <af-field name="title" defn="{label: false, input_attrs: {placeholder: 'Filter by title'}}" />
-      <af-field name="campaign_id" defn="{label: false, input_attrs: {placeholder: 'Filter by campaign', autoOpen: true}}" />
+      <af-field name="title" defn="{label: false, input_attrs: {placeholder: ts('Filter by title')}}" />
+      <af-field name="campaign_id" defn="{label: false, input_attrs: {placeholder: ts('Filter by campaign'), autoOpen: true}}" />
     </fieldset>
     <crm-search-display-table search-name="Administer_Petitions" display-name="Petitions_Table" total-count="$parent.count"></crm-search-display-table>
   </div>
diff --git a/www/modules/civicrm/ext/civi_campaign/info.xml b/www/modules/civicrm/ext/civi_campaign/info.xml
index 641342a35..2cf65e979 100644
--- a/www/modules/civicrm/ext/civi_campaign/info.xml
+++ b/www/modules/civicrm/ext/civi_campaign/info.xml
@@ -12,14 +12,14 @@
     <url desc="Documentation">https://docs.civicrm.org/user/en/latest/campaign/what-is-civicampaign/</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <tags>
     <tag>component</tag>
   </tags>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>Core Component</comments>
   <upgrader>CRM_Extension_Upgrader_Component</upgrader>
diff --git a/www/modules/civicrm/ext/civi_campaign/managed/SavedSearch_Administer_Campaigns.mgd.php b/www/modules/civicrm/ext/civi_campaign/managed/SavedSearch_Administer_Campaigns.mgd.php
index fa6f5fbe1..812f79c29 100644
--- a/www/modules/civicrm/ext/civi_campaign/managed/SavedSearch_Administer_Campaigns.mgd.php
+++ b/www/modules/civicrm/ext/civi_campaign/managed/SavedSearch_Administer_Campaigns.mgd.php
@@ -148,7 +148,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -157,7 +157,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'Campaign',
diff --git a/www/modules/civicrm/ext/civi_campaign/managed/SavedSearch_Administer_Petitions.mgd.php b/www/modules/civicrm/ext/civi_campaign/managed/SavedSearch_Administer_Petitions.mgd.php
index fa36a617c..cb0eedd7b 100644
--- a/www/modules/civicrm/ext/civi_campaign/managed/SavedSearch_Administer_Petitions.mgd.php
+++ b/www/modules/civicrm/ext/civi_campaign/managed/SavedSearch_Administer_Petitions.mgd.php
@@ -133,7 +133,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -142,7 +142,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'Survey',
diff --git a/www/modules/civicrm/ext/civi_campaign/managed/SavedSearch_Administer_Surveys.mgd.php b/www/modules/civicrm/ext/civi_campaign/managed/SavedSearch_Administer_Surveys.mgd.php
index 98eafea94..5a136bbc0 100644
--- a/www/modules/civicrm/ext/civi_campaign/managed/SavedSearch_Administer_Surveys.mgd.php
+++ b/www/modules/civicrm/ext/civi_campaign/managed/SavedSearch_Administer_Surveys.mgd.php
@@ -200,7 +200,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -209,7 +209,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'Survey',
diff --git a/www/modules/civicrm/ext/civi_case/ang/crmCaseType.js b/www/modules/civicrm/ext/civi_case/ang/crmCaseType.js
index 5e8d49d7a..f70f49df4 100644
--- a/www/modules/civicrm/ext/civi_case/ang/crmCaseType.js
+++ b/www/modules/civicrm/ext/civi_case/ang/crmCaseType.js
@@ -244,7 +244,7 @@
 
     (function init () {
 
-      ts = $scope.ts = CRM.ts(null);
+      ts = $scope.ts = CRM.ts('civi_case');
       $scope.hs = crmUiHelp({file: 'CRM/Case/CaseType'});
       $scope.locks = { caseTypeName: true, activitySetName: true };
       $scope.workflows = { timeline: 'Timeline', sequence: 'Sequence' };
@@ -715,7 +715,7 @@
   });
 
   crmCaseType.controller('CaseTypeListCtrl', function($scope, crmApi, caseTypes) {
-    var ts = $scope.ts = CRM.ts(null);
+    var ts = $scope.ts = CRM.ts('civi_case');
 
     $scope.caseTypes = caseTypes.values;
     $scope.toggleCaseType = function (caseType) {
diff --git a/www/modules/civicrm/ext/civi_case/ang/crmCaseType/caseTypeDetails.html b/www/modules/civicrm/ext/civi_case/ang/crmCaseType/caseTypeDetails.html
index 1c4e612c0..f78aeba12 100644
--- a/www/modules/civicrm/ext/civi_case/ang/crmCaseType/caseTypeDetails.html
+++ b/www/modules/civicrm/ext/civi_case/ang/crmCaseType/caseTypeDetails.html
@@ -41,8 +41,8 @@
     <div crm-ui-field="{title: ts('Enabled?')}">
       <input name="is_active" type="checkbox" ng-model="caseType.is_active" ng-true-value="'1'" ng-false-value="'0'"/>
     </div>
-    <fieldset class="crm-collapsible">
-      <legend class="collapsible-title">{{:: ts('Activity assignment settings') }}</legend>
+    <fieldset>
+      <legend>{{:: ts('Activity assignment settings') }}</legend>
       <div>
         <div crm-ui-field="{name: 'caseTypeDetailForm.activityAsgmtGrps', title: ts('Restrict to Groups'), help: hs('activityAsgmtGrps')}">
           <input
diff --git a/www/modules/civicrm/ext/civi_case/ang/crmCaseType/rolesTable.html b/www/modules/civicrm/ext/civi_case/ang/crmCaseType/rolesTable.html
index ce8765a62..8982070b7 100644
--- a/www/modules/civicrm/ext/civi_case/ang/crmCaseType/rolesTable.html
+++ b/www/modules/civicrm/ext/civi_case/ang/crmCaseType/rolesTable.html
@@ -18,8 +18,8 @@
 	    <td>{{relType.displayLabel}}</td>
 	    <td><input type="checkbox" ng-model="relType.creator" ng-true-value="'1'" ng-false-value="'0'"></td>
 	    <td><input type="radio" ng-model="relType.manager" value="1" ng-change="onManagerChange(relType)"></td>
-	    <td><input ng-list class="big"
-				crm-entityref="{entity: 'Group', api: {id_field: 'name', params: {is_hidden: 0, is_active: 1}}, select: {allowClear: true, multiple: true, placeholder: ts('Select Group')}}"
+	    <td><input ng-list="
" class="big"
+				crm-entityref="{entity: 'Group', api: {id_field: 'name', params: {is_hidden: 0, is_active: 1}}, select: {allowClear: true, multiple: true, separator: '\u0001', placeholder: ts('Select Group')}}"
 				ng-model="relType.groups"
 			/></td>
 	    <td>
diff --git a/www/modules/civicrm/ext/civi_case/info.xml b/www/modules/civicrm/ext/civi_case/info.xml
index 1365c5d5a..08fa7e7c2 100644
--- a/www/modules/civicrm/ext/civi_case/info.xml
+++ b/www/modules/civicrm/ext/civi_case/info.xml
@@ -12,14 +12,14 @@
     <url desc="Documentation">https://docs.civicrm.org/user/en/latest/case-management/what-is-civicase/</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <tags>
     <tag>component</tag>
   </tags>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>Core Component</comments>
   <upgrader>CRM_Extension_Upgrader_Component</upgrader>
diff --git a/www/modules/civicrm/ext/civi_contribute/Civi/Api4/Service/ContributionTasksProvider.php b/www/modules/civicrm/ext/civi_contribute/Civi/Api4/Service/ContributionTasksProvider.php
new file mode 100644
index 000000000..a1f92e9cc
--- /dev/null
+++ b/www/modules/civicrm/ext/civi_contribute/Civi/Api4/Service/ContributionTasksProvider.php
@@ -0,0 +1,52 @@
+<?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\Service;
+
+use CRM_Contribute_ExtensionUtil as E;
+use Civi\Core\Event\GenericHookEvent;
+
+/**
+ * @service
+ * @internal
+ */
+class ContributionTasksProvider extends \Civi\Core\Service\AutoSubscriber {
+
+  public static function getSubscribedEvents(): array {
+    return [
+      'hook_civicrm_searchKitTasks' => 'addContributionTasks',
+    ];
+  }
+
+  /**
+   * @param \Civi\Core\Event\GenericHookEvent $event
+   */
+  public function addContributionTasks(GenericHookEvent $event): void {
+    // FIXME: CRM_Contribute_Task::tasks() should respect `$this->checkPermissions`
+    foreach (\CRM_Contribute_Task::tasks() as $id => $task) {
+      if (!empty($task['url'])) {
+        $path = explode('?', $task['url'], 2)[0];
+        $menu = \CRM_Core_Menu::get($path);
+        $key = $menu ? \CRM_Core_Key::get($menu['page_callback'], TRUE) : '';
+
+        $event->tasks['Contribution']['contribution.' . $id] = [
+          'title' => $task['title'],
+          'icon' => $task['icon'] ?? 'fa-gear',
+          'crmPopup' => [
+            'path' => "'{$task['url']}'",
+            'data' => "{id: ids.join(','), qfKey: '$key'}",
+          ],
+        ];
+      }
+    }
+  }
+
+}
diff --git a/www/modules/civicrm/ext/civi_contribute/info.xml b/www/modules/civicrm/ext/civi_contribute/info.xml
index a44a9afbf..0bbdbe2c0 100644
--- a/www/modules/civicrm/ext/civi_contribute/info.xml
+++ b/www/modules/civicrm/ext/civi_contribute/info.xml
@@ -12,14 +12,14 @@
     <url desc="Documentation">https://docs.civicrm.org/user/en/latest/contributions/what-is-civicontribute/</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <tags>
     <tag>component</tag>
   </tags>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>Core Component</comments>
   <upgrader>CRM_Extension_Upgrader_Component</upgrader>
diff --git a/www/modules/civicrm/ext/civi_event/Civi/Api4/Service/Links/ParticipantLinksProvider.php b/www/modules/civicrm/ext/civi_event/Civi/Api4/Service/Links/ParticipantLinksProvider.php
new file mode 100644
index 000000000..339b71b25
--- /dev/null
+++ b/www/modules/civicrm/ext/civi_event/Civi/Api4/Service/Links/ParticipantLinksProvider.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       |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\Api4\Service\Links;
+
+use Civi\API\Event\RespondEvent;
+
+/**
+ * @service
+ * @internal
+ */
+class ParticipantLinksProvider extends \Civi\Core\Service\AutoSubscriber {
+  use LinksProviderTrait;
+
+  public static function getSubscribedEvents(): array {
+    return [
+      'civi.api.respond' => ['alterParticipantLinksResult', -50],
+    ];
+  }
+
+  /**
+   * Customize event participant links
+   *
+   * @param \Civi\API\Event\RespondEvent $e
+   * @return void
+   * @throws \CRM_Core_Exception
+   */
+  public static function alterParticipantLinksResult(RespondEvent $e): void {
+    $request = $e->getApiRequest();
+    if ($request['version'] == 4 && $request->getEntityName() === 'Participant' && is_a($request, '\Civi\Api4\Action\GetLinks')) {
+      $links = (array) $e->getResponse();
+      $addLinkIndex = self::getActionIndex($links, 'add');
+      $transferLinkIndex = self::getActionIndex($links, 'detach');
+      if (isset($transferLinkIndex)) {
+        if ($request->getCheckPermissions() && !\CRM_Core_Permission::check('edit event participants')) {
+          unset($links[$transferLinkIndex]);
+        }
+      }
+      if (isset($addLinkIndex)) {
+        $contactId = $request->getValue('contact_id');
+        if ($request->getCheckPermissions() && !\CRM_Core_Permission::check('edit event participants')) {
+          unset($links[$addLinkIndex]);
+        }
+        elseif ($contactId) {
+          // Update add link appropriate to the context of viewing a single contact
+          $links[$addLinkIndex]['icon'] = 'fa-ticket';
+          $links[$addLinkIndex]['text'] = ts('Register for Event');
+          $links[$addLinkIndex]['path'] = "civicrm/contact/view/participant?reset=1&action=add&cid=$contactId&context=participant";
+          if ($request->getExpandMultiple() && \CRM_Core_Config::isEnabledBackOfficeCreditCardPayments()) {
+            // 2nd add link for credit card registrations
+            $ccLink = $links[$addLinkIndex];
+            $ccLink['text'] = ts('Submit Credit Card Event Registration');
+            $ccLink['icon'] = 'fa-credit-card';
+            $ccLink['path'] = "civicrm/contact/view/participant?reset=1&action=add&cid=$contactId&context=participant&mode=live";
+            $links[] = $ccLink;
+          }
+        }
+      }
+
+      $e->getResponse()->exchangeArray(array_values($links));
+    }
+  }
+
+}
diff --git a/www/modules/civicrm/ext/civi_event/Civi/Api4/Service/Spec/Provider/EventGetSpecProvider.php b/www/modules/civicrm/ext/civi_event/Civi/Api4/Service/Spec/Provider/EventGetSpecProvider.php
index 3c32afc7a..6828cf603 100644
--- a/www/modules/civicrm/ext/civi_event/Civi/Api4/Service/Spec/Provider/EventGetSpecProvider.php
+++ b/www/modules/civicrm/ext/civi_event/Civi/Api4/Service/Spec/Provider/EventGetSpecProvider.php
@@ -48,12 +48,26 @@ public function applies($entity, $action) {
    * @param array $maxField
    * @param \Civi\Api4\Query\Api4SelectQuery $query
    * return string
+   *
+   * @throws \CRM_Core_Exception
    */
   public static function getRemainingParticipants(array $maxField, Api4SelectQuery $query): string {
-    $statuses = \CRM_Event_PseudoConstant::participantStatus(NULL, 'is_counted = 1');
+    $statuses = \CRM_Event_BAO_Participant::buildOptions('status_id', NULL, ['is_counted' => 1]) ?: [0];
     $statusIds = implode(',', array_keys($statuses));
     $idField = $query->getFieldSibling($maxField, 'id');
-    return "IF($maxField[sql_name], (CAST($maxField[sql_name] AS SIGNED) - (SELECT COUNT(`p`.`id`) FROM `civicrm_participant` `p`, `civicrm_contact` `c` WHERE `p`.`event_id` = $idField[sql_name] AND `p`.`contact_id` = `c`.`id` AND `p`.`is_test` = 0 AND `c`.`is_deleted` = 0 AND `p`.status_id IN ($statusIds))), NULL)";
+    $whereClauses = [
+      '`p`.`event_id` = ' . $idField['sql_name'],
+      '`p`.`contact_id` = `c`.`id`',
+      '`p`.`is_test` = 0',
+      '`c`.`is_deleted` = 0',
+      "`p`.status_id IN ($statusIds)",
+    ];
+    $participantRoleClause = \CRM_Event_BAO_Participant::getParticipantRoleClause();
+    if ($participantRoleClause) {
+      $whereClauses[] = 'role_id ' . $participantRoleClause;
+    }
+    return "IF($maxField[sql_name], (CAST($maxField[sql_name] AS SIGNED) - (SELECT COUNT(`p`.`id`) FROM `civicrm_participant` `p`, `civicrm_contact` `c`
+      WHERE " . implode(' AND ', $whereClauses) . ")), NULL)";
   }
 
 }
diff --git a/www/modules/civicrm/ext/civi_event/info.xml b/www/modules/civicrm/ext/civi_event/info.xml
index abd7a83c3..c5116a7f7 100644
--- a/www/modules/civicrm/ext/civi_event/info.xml
+++ b/www/modules/civicrm/ext/civi_event/info.xml
@@ -12,14 +12,14 @@
     <url desc="Documentation">https://docs.civicrm.org/user/en/latest/events/what-is-civievent</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <tags>
     <tag>component</tag>
   </tags>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>Core Component</comments>
   <upgrader>CRM_Extension_Upgrader_Component</upgrader>
diff --git a/www/modules/civicrm/ext/civi_mail/Civi/Api4/Action/Mailing/CreateAction.php b/www/modules/civicrm/ext/civi_mail/Civi/Api4/Action/Mailing/CreateAction.php
new file mode 100644
index 000000000..2004f0725
--- /dev/null
+++ b/www/modules/civicrm/ext/civi_mail/Civi/Api4/Action/Mailing/CreateAction.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       |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\Api4\Action\Mailing;
+
+use Civi\Api4\Generic\DAOCreateAction;
+
+/**
+ * @inheritDoc
+ */
+class CreateAction extends DAOCreateAction {
+  use MailingSaveTrait;
+
+}
diff --git a/www/modules/civicrm/CRM/Mailing/Page/Optout.php b/www/modules/civicrm/ext/civi_mail/Civi/Api4/Action/Mailing/MailingSaveTrait.php
similarity index 59%
rename from www/modules/civicrm/CRM/Mailing/Page/Optout.php
rename to www/modules/civicrm/ext/civi_mail/Civi/Api4/Action/Mailing/MailingSaveTrait.php
index 0a6db630b..a6269e12f 100644
--- a/www/modules/civicrm/CRM/Mailing/Page/Optout.php
+++ b/www/modules/civicrm/ext/civi_mail/Civi/Api4/Action/Mailing/MailingSaveTrait.php
@@ -9,24 +9,19 @@
  +--------------------------------------------------------------------+
  */
 
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-class CRM_Mailing_Page_Optout extends CRM_Mailing_Page_Common {
+namespace Civi\Api4\Action\Mailing;
+
+trait MailingSaveTrait {
 
   /**
-   * Run page.
-   *
-   * This includes assigning smarty variables and other page processing.
-   *
-   * @return string
-   * @throws Exception
+   * @inheritDoc
    */
-  public function run() {
-    $this->_type = 'optout';
-    return parent::run();
+  protected function write(array $items) {
+    foreach ($items as &$item) {
+      // Required by Mailing & MailingJob to avoid legacy behaviour.
+      $item['skip_legacy_scheduling'] = TRUE;
+    }
+    return parent::write($items);
   }
 
 }
diff --git a/www/modules/civicrm/ext/civi_mail/Civi/Api4/Action/Mailing/SaveAction.php b/www/modules/civicrm/ext/civi_mail/Civi/Api4/Action/Mailing/SaveAction.php
new file mode 100644
index 000000000..0007ca7fa
--- /dev/null
+++ b/www/modules/civicrm/ext/civi_mail/Civi/Api4/Action/Mailing/SaveAction.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       |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\Api4\Action\Mailing;
+
+use Civi\Api4\Generic\DAOSaveAction;
+
+/**
+ * @inheritDoc
+ */
+class SaveAction extends DAOSaveAction {
+  use MailingSaveTrait;
+
+}
diff --git a/www/modules/civicrm/ext/civi_mail/Civi/Api4/Action/Mailing/UpdateAction.php b/www/modules/civicrm/ext/civi_mail/Civi/Api4/Action/Mailing/UpdateAction.php
new file mode 100644
index 000000000..8aa01bd75
--- /dev/null
+++ b/www/modules/civicrm/ext/civi_mail/Civi/Api4/Action/Mailing/UpdateAction.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       |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\Api4\Action\Mailing;
+
+use Civi\Api4\Generic\DAOUpdateAction;
+
+/**
+ * @inheritDoc
+ */
+class UpdateAction extends DAOUpdateAction {
+  use MailingSaveTrait;
+
+}
diff --git a/www/modules/civicrm/ext/civi_mail/Civi/Api4/Mailing.php b/www/modules/civicrm/ext/civi_mail/Civi/Api4/Mailing.php
index 49060f099..5babbf6b0 100644
--- a/www/modules/civicrm/ext/civi_mail/Civi/Api4/Mailing.php
+++ b/www/modules/civicrm/ext/civi_mail/Civi/Api4/Mailing.php
@@ -10,6 +10,10 @@
  */
 namespace Civi\Api4;
 
+use Civi\Api4\Action\Mailing\UpdateAction;
+use Civi\Api4\Action\Mailing\CreateAction;
+use Civi\Api4\Action\Mailing\SaveAction;
+
 /**
  * Mailing.
  *
@@ -22,4 +26,31 @@
  */
 class Mailing extends Generic\DAOEntity {
 
+  /**
+   * @param bool $checkPermissions
+   * @return \Civi\Api4\Action\Mailing\CreateAction
+   */
+  public static function create($checkPermissions = TRUE): CreateAction {
+    return (new CreateAction(static::getEntityName(), __FUNCTION__))
+      ->setCheckPermissions($checkPermissions);
+  }
+
+  /**
+   * @param bool $checkPermissions
+   * @return \Civi\Api4\Action\Mailing\UpdateAction
+   */
+  public static function update($checkPermissions = TRUE) {
+    return (new UpdateAction(static::getEntityName(), __FUNCTION__))
+      ->setCheckPermissions($checkPermissions);
+  }
+
+  /**
+   * @param bool $checkPermissions
+   * @return \Civi\Api4\Action\Mailing\SaveAction
+   */
+  public static function save($checkPermissions = TRUE): SaveAction {
+    return (new SaveAction(static::getEntityName(), __FUNCTION__))
+      ->setCheckPermissions($checkPermissions);
+  }
+
 }
diff --git a/www/modules/civicrm/ext/civi_mail/Civi/Api4/Service/MailTasksProvider.php b/www/modules/civicrm/ext/civi_mail/Civi/Api4/Service/MailTasksProvider.php
new file mode 100644
index 000000000..64abf7235
--- /dev/null
+++ b/www/modules/civicrm/ext/civi_mail/Civi/Api4/Service/MailTasksProvider.php
@@ -0,0 +1,45 @@
+<?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\Service;
+
+use CRM_Mailing_ExtensionUtil as E;
+use Civi\Core\Event\GenericHookEvent;
+
+/**
+ * @service
+ * @internal
+ */
+class MailTasksProvider extends \Civi\Core\Service\AutoSubscriber {
+
+  public static function getSubscribedEvents(): array {
+    return [
+      'hook_civicrm_searchKitTasks' => 'addMailTasks',
+    ];
+  }
+
+  /**
+   * @param \Civi\Core\Event\GenericHookEvent $event
+   */
+  public function addMailTasks(GenericHookEvent $event): void {
+    if (
+        \CRM_Core_Permission::access('CiviMail') || !$event->checkPermissions ||
+        (\CRM_Mailing_Info::workflowEnabled() && \CRM_Core_Permission::check('create mailings'))
+      ) {
+      $event->tasks['Contact']['contact.mailing'] = [
+        'title' => E::ts('Email - schedule/send via CiviMail'),
+        'uiDialog' => ['templateUrl' => '~/crmSearchTasks/crmSearchTaskMailing.html'],
+        'icon' => 'fa-paper-plane',
+      ];
+    }
+  }
+
+}
diff --git a/www/modules/civicrm/ext/civi_mail/ang/afsearchEmailBounceHistory.aff.html b/www/modules/civicrm/ext/civi_mail/ang/afsearchEmailBounceHistory.aff.html
index 003d1fc13..4f669a7ea 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/afsearchEmailBounceHistory.aff.html
+++ b/www/modules/civicrm/ext/civi_mail/ang/afsearchEmailBounceHistory.aff.html
@@ -1,4 +1,4 @@
 <div af-fieldset="">
-  <crm-search-display-table search-name="Email_Bounce_History" display-name="Email_Bounce_History_Table" filters="{'MailingEventBounce_MailingEventQueue_event_queue_id_01.id': routeParams['MailingEventBounce_MailingEventQueue_event_queue_id_01.email_id']}">
+  <crm-search-display-table search-name="Email_Bounce_History" display-name="Email_Bounce_History_Table" filters="{'MailingEventBounce_MailingEventQueue_event_queue_id_01.email_id': routeParams.email_id}">
   </crm-search-display-table>
 </div>
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/BlockPreview.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/BlockPreview.js
index 334e15d44..2ab1226b5 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/BlockPreview.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/BlockPreview.js
@@ -10,7 +10,7 @@
           scope.mailing = newValue;
         });
         scope.crmMailingConst = CRM.crmMailing;
-        scope.ts = CRM.ts(null);
+        scope.ts = CRM.ts('civi_mail');
         scope.hs = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
         scope.testContact = {email: CRM.crmMailing.defaultTestEmail};
         scope.testGroup = {gid: null};
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/BlockReview.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/BlockReview.js
index 94968e3eb..ac10d42b7 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/BlockReview.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/BlockReview.js
@@ -15,7 +15,7 @@
           scope.attachments = newValue;
         });
         scope.crmMailingConst = CRM.crmMailing;
-        scope.ts = CRM.ts(null);
+        scope.ts = CRM.ts('civi_mail');
         scope.previewMailing = function previewMailing(mailing, mode) {
           return crmMailingPreviewMgr.preview(mailing, mode);
         };
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EditMailingCtrl.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EditMailingCtrl.js
index 7e7236511..424cd46aa 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EditMailingCtrl.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EditMailingCtrl.js
@@ -9,7 +9,7 @@
     $scope.checkPerm = CRM.checkPerm;
     $scope.mailingFields = mailingFields;
 
-    var ts = $scope.ts = CRM.ts(null);
+    var ts = $scope.ts = CRM.ts('civi_mail');
     $scope.hs = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
     var block = $scope.block = crmBlocker();
     var myAutosave = null;
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EditRecipCtrl.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EditRecipCtrl.js
index cc02c4dea..70dc9a67f 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EditRecipCtrl.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EditRecipCtrl.js
@@ -11,7 +11,7 @@
     var SETTING_DEBOUNCE_MS = 5000;
     var RECIPIENTS_PREVIEW_LIMIT = 50;
 
-    var ts = $scope.ts = CRM.ts();
+    var ts = $scope.ts = CRM.ts('civi_mail');
 
     $scope.recipients = null;
     $scope.outdated = null;
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EditRecipOptionsDialogCtrl.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EditRecipOptionsDialogCtrl.js
index 43734e34b..5a6c1414d 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EditRecipOptionsDialogCtrl.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EditRecipOptionsDialogCtrl.js
@@ -5,7 +5,7 @@
   //   - "mailing" (APIv3 mailing object)
   //   - "fields" (list of fields)
   angular.module('crmMailing').controller('EditRecipOptionsDialogCtrl', function EditRecipOptionsDialogCtrl($scope, crmUiHelp) {
-    $scope.ts = CRM.ts(null);
+    $scope.ts = CRM.ts('civi_mail');
     $scope.hs = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
   });
 
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EmailAddrCtrl.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EmailAddrCtrl.js
index 942bcfe12..3e515167a 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EmailAddrCtrl.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EmailAddrCtrl.js
@@ -1,7 +1,7 @@
 (function(angular, $, _) {
 
   angular.module('crmMailing').controller('EmailAddrCtrl', function EmailAddrCtrl($scope, crmFromAddresses, crmUiAlert) {
-    var ts = CRM.ts(null);
+    var ts = CRM.ts('civi_mail');
 
     function changeAlert(winnerField, loserField) {
       crmUiAlert({
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EmailBodyCtrl.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EmailBodyCtrl.js
index 7db0b7ecc..fd67e7544 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EmailBodyCtrl.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/EmailBodyCtrl.js
@@ -2,7 +2,7 @@
 
   var lastEmailTokenAlert = null;
   angular.module('crmMailing').controller('EmailBodyCtrl', function EmailBodyCtrl($scope, crmMailingMgr, crmUiAlert, $timeout) {
-    var ts = CRM.ts(null);
+    var ts = CRM.ts('civi_mail');
 
     // ex: if (!hasAllTokens(myMailing, 'body_text)) alert('Oh noes!');
     $scope.hasAllTokens = function hasAllTokens(mailing, field) {
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/MsgTemplateCtrl.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/MsgTemplateCtrl.js
index 5d200c3ff..f91a4a14b 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/MsgTemplateCtrl.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/MsgTemplateCtrl.js
@@ -2,7 +2,7 @@
 
   // Controller for the in-place msg-template management
   angular.module('crmMailing').controller('MsgTemplateCtrl', function MsgTemplateCtrl($scope, crmMsgTemplates, dialogService) {
-    var ts = $scope.ts = CRM.ts(null);
+    var ts = $scope.ts = CRM.ts('civi_mail');
     $scope.crmMsgTemplates = crmMsgTemplates;
     $scope.checkPerm = CRM.checkPerm;
     // @return Promise MessageTemplate (per APIv3)
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewComponentCtrl.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewComponentCtrl.js
index 3fd928a18..68eb2bdde 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewComponentCtrl.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewComponentCtrl.js
@@ -3,7 +3,7 @@
   // Controller for the "Preview Mailing Component" segment
   // which displays header/footer/auto-responder
   angular.module('crmMailing').controller('PreviewComponentCtrl', function PreviewComponentCtrl($scope, dialogService) {
-    var ts = $scope.ts = CRM.ts(null);
+    var ts = $scope.ts = CRM.ts('civi_mail');
 
     $scope.previewComponent = function previewComponent(title, componentId) {
       var component = _.where(CRM.crmMailing.headerfooterList, {id: "" + componentId});
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewComponentDialogCtrl.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewComponentDialogCtrl.js
index 2b1d9f2c6..e6540421a 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewComponentDialogCtrl.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewComponentDialogCtrl.js
@@ -7,7 +7,7 @@
   //   - "body_html"
   //   - "body_text"
   angular.module('crmMailing').controller('PreviewComponentDialogCtrl', function PreviewComponentDialogCtrl($scope) {
-    $scope.ts = CRM.ts(null);
+    $scope.ts = CRM.ts('civi_mail');
   });
 
 })(angular, CRM.$, CRM._);
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewMailingDialogCtrl.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewMailingDialogCtrl.js
index 9e339b530..9b08a3908 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewMailingDialogCtrl.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewMailingDialogCtrl.js
@@ -6,7 +6,7 @@
   //   - "body_html"
   //   - "body_text"
   angular.module('crmMailing').controller('PreviewMailingDialogCtrl', function PreviewMailingDialogCtrl($scope) {
-    $scope.ts = CRM.ts(null);
+    $scope.ts = CRM.ts('civi_mail');
   });
 
 })(angular, CRM.$, CRM._);
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewRecipCtrl.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewRecipCtrl.js
index 371fb8efd..300b485a3 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewRecipCtrl.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/PreviewRecipCtrl.js
@@ -4,7 +4,7 @@
   // Note: Expects $scope.model to be an object with properties:
   //   - recipients: array of contacts
   angular.module('crmMailing').controller('PreviewRecipCtrl', function($scope) {
-    $scope.ts = CRM.ts(null);
+    $scope.ts = CRM.ts('civi_mail');
   });
 
 })(angular, CRM.$, CRM._);
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/SaveMsgTemplateDialogCtrl.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/SaveMsgTemplateDialogCtrl.js
index ea80522e9..e8dfe75bf 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/SaveMsgTemplateDialogCtrl.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/SaveMsgTemplateDialogCtrl.js
@@ -9,7 +9,7 @@
   //       - "msg_text": string
   //       - "msg_html": string
   angular.module('crmMailing').controller('SaveMsgTemplateDialogCtrl', function SaveMsgTemplateDialogCtrl($scope, crmMsgTemplates, dialogService) {
-    var ts = $scope.ts = CRM.ts(null);
+    var ts = $scope.ts = CRM.ts('civi_mail');
     $scope.saveOpt = {mode: '', newTitle: ''};
     $scope.selected = null;
 
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/services.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/services.js
index f72a12712..2fda7b7d6 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailing/services.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailing/services.js
@@ -545,7 +545,7 @@
             .then(function (deliveryInfos) {
               var count = Object.keys(deliveryInfos).length;
               if (count === 0) {
-                CRM.alert(ts('Could not identify any recipients. Perhaps your test group is empty, or you tried sending to contacts that do not exist and you have no permission to add contacts.'));
+                CRM.alert(ts('Could not identify any recipients. Perhaps your test group is empty, all contacts are set to deceased/opt out/do_not_email, or you tried sending to contacts that do not exist and you have no permission to add contacts.'));
               }
             })
           ;
@@ -639,7 +639,7 @@
             scope.mailing = newValue;
           });
           scope.crmMailingConst = CRM.crmMailing;
-          scope.ts = CRM.ts(null);
+          scope.ts = CRM.ts('civi_mail');
           scope.hs = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
           scope.checkPerm = CRM.checkPerm;
           scope[directiveName] = attr[directiveName] ? scope.$parent.$eval(attr[directiveName]) : {};
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/BlockMailing.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/BlockMailing.js
index d738ab6e6..db30e7e64 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/BlockMailing.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/BlockMailing.js
@@ -19,7 +19,7 @@
           scope.abtest = model(scope.$parent);
           scope.crmMailingConst = CRM.crmMailing;
           scope.crmMailingABCriteria = crmMailingABCriteria;
-          scope.ts = CRM.ts(null);
+          scope.ts = CRM.ts('civi_mail');
           scope.hs = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
 
           var fieldsModel = $parse(attr[directiveName]);
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/BlockSetup.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/BlockSetup.js
index 5809cdd0f..9e828bf0a 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/BlockSetup.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/BlockSetup.js
@@ -19,7 +19,7 @@
           scope.abtest = model(scope.$parent);
           scope.crmMailingConst = CRM.crmMailing;
           scope.crmMailingABCriteria = crmMailingABCriteria;
-          scope.ts = CRM.ts(null);
+          scope.ts = CRM.ts('civi_mail');
           scope.hs = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
 
           var fieldsModel = $parse(attr[directiveName]);
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/EditCtrl.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/EditCtrl.js
index 6e39b72c9..1d6302b36 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/EditCtrl.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/EditCtrl.js
@@ -2,7 +2,7 @@
 
   angular.module('crmMailingAB').controller('CrmMailingABEditCtrl', function($scope, abtest, crmMailingABCriteria, crmMailingMgr, crmMailingPreviewMgr, crmStatus, $q, $location, crmBlocker, $interval, $timeout, CrmAutosaveCtrl, dialogService, mailingFields) {
     $scope.abtest = abtest;
-    var ts = $scope.ts = CRM.ts(null);
+    var ts = $scope.ts = CRM.ts('civi_mail');
     var block = $scope.block = crmBlocker();
     $scope.crmUrl = CRM.url;
     var myAutosave = null;
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/ListCtrl.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/ListCtrl.js
index d0ced773a..58a235394 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/ListCtrl.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/ListCtrl.js
@@ -1,7 +1,7 @@
 (function(angular, $, _) {
 
   angular.module('crmMailingAB').controller('CrmMailingABListCtrl', function($scope, mailingABList, crmMailingABCriteria, crmMailingABStatus, fields) {
-    var ts = $scope.ts = CRM.ts(null);
+    var ts = $scope.ts = CRM.ts('civi_mail');
     $scope.mailingABList = _.values(mailingABList.values);
     $scope.crmMailingABCriteria = crmMailingABCriteria;
     $scope.crmMailingABStatus = crmMailingABStatus;
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/ReportCtrl.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/ReportCtrl.js
index 8755945ee..57041531a 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/ReportCtrl.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/ReportCtrl.js
@@ -1,7 +1,7 @@
 (function(angular, $, _) {
 
   angular.module('crmMailingAB').controller('CrmMailingABReportCtrl', function($scope, crmApi, crmMailingStats) {
-    var ts = $scope.ts = CRM.ts(null);
+    var ts = $scope.ts = CRM.ts('civi_mail');
 
     var CrmMailingABReportCnt = 1, activeMailings = null;
     $scope.getActiveMailings = function() {
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/Slider.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/Slider.js
index d26e35b17..99171f78f 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/Slider.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/Slider.js
@@ -12,7 +12,7 @@
         var sliderTests = $('.slider-test', element);
         var sliderWin = $('.slider-win', element);
 
-        scope.ts = CRM.ts(null);
+        scope.ts = CRM.ts('civi_mail');
         scope.testValue = 0;
         scope.winValue = 100;
 
diff --git a/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/WinnerDialogCtrl.js b/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/WinnerDialogCtrl.js
index f378f641c..8c4137d6c 100644
--- a/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/WinnerDialogCtrl.js
+++ b/www/modules/civicrm/ext/civi_mail/ang/crmMailingAB/WinnerDialogCtrl.js
@@ -1,7 +1,7 @@
 (function(angular, $, _) {
 
   angular.module('crmMailingAB').controller('CrmMailingABWinnerDialogCtrl', function($scope, $timeout, dialogService, crmMailingMgr, crmStatus) {
-    var ts = $scope.ts = CRM.ts(null);
+    var ts = $scope.ts = CRM.ts('civi_mail');
     var abtest = $scope.abtest = $scope.model.abtest;
     var mailingName = $scope.model.mailingName;
 
diff --git a/www/modules/civicrm/ext/civi_mail/info.xml b/www/modules/civicrm/ext/civi_mail/info.xml
index cebe9808f..e1b60bb58 100644
--- a/www/modules/civicrm/ext/civi_mail/info.xml
+++ b/www/modules/civicrm/ext/civi_mail/info.xml
@@ -12,14 +12,14 @@
     <url desc="Documentation">https://docs.civicrm.org/user/en/latest/email/what-is-civimail/</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <tags>
     <tag>component</tag>
   </tags>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>Core Component</comments>
   <upgrader>CRM_Extension_Upgrader_Component</upgrader>
diff --git a/www/modules/civicrm/ext/civi_member/Civi/Api4/Service/Links/MembershipLinksProvider.php b/www/modules/civicrm/ext/civi_member/Civi/Api4/Service/Links/MembershipLinksProvider.php
new file mode 100644
index 000000000..6a27c139c
--- /dev/null
+++ b/www/modules/civicrm/ext/civi_member/Civi/Api4/Service/Links/MembershipLinksProvider.php
@@ -0,0 +1,137 @@
+<?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\Service\Links;
+
+use Civi\API\Event\RespondEvent;
+use Civi\Core\Event\GenericHookEvent;
+
+/**
+ * @service
+ * @internal
+ */
+class MembershipLinksProvider extends \Civi\Core\Service\AutoSubscriber {
+  use LinksProviderTrait;
+
+  public static function getSubscribedEvents(): array {
+    return [
+      'civi.api4.getLinks' => 'alterMembershipLinks',
+      'civi.api.respond' => 'alterMembershipLinksResult',
+    ];
+  }
+
+  public static function alterMembershipLinks(GenericHookEvent $e): void {
+    if ($e->entity == 'Membership') {
+      $addTemplate = [
+        'api_action' => 'update',
+        'ui_action' => '',
+        'entity' => 'Membership',
+        'path' => '',
+        'text' => '',
+        'icon' => 'fa-external-link',
+        'target' => 'crm-popup',
+      ];
+      self::addLinks($e->links, $addTemplate);
+    }
+  }
+
+  public static function alterMembershipLinksResult(RespondEvent $e): void {
+    $request = $e->getApiRequest();
+    if ($request['version'] == 4 && $request->getEntityName() === 'Membership' && is_a($request, '\Civi\Api4\Action\GetLinks')) {
+      $links = (array) $e->getResponse();
+      $isUpdateBilling = $isCancelSupported = FALSE;
+
+      if (!\CRM_Core_Config::isEnabledBackOfficeCreditCardPayments()) {
+        self::unsetLinks($links, ['followup']);
+      }
+
+      $membershipId = $request->getValue('id');
+      $ownerMembershipId = $request->getValue('owner_membership_id');
+      if ($ownerMembershipId) {
+        self::unsetLinks($links, ['update', 'delete', 'renew', 'followup', 'cancelrecur', 'changebilling']);
+      }
+      elseif ($membershipId) {
+        $paymentObject = \CRM_Financial_BAO_PaymentProcessor::getProcessorForEntity($membershipId, 'membership', 'obj');
+        if (!empty($paymentObject)) {
+          $isUpdateBilling = $paymentObject->supports('updateSubscriptionBillingInfo');
+        }
+        if (!$isUpdateBilling) {
+          self::unsetLinks($links, ['changebilling']);
+        }
+        $isCancelSupported = \CRM_Member_BAO_Membership::isCancelSubscriptionSupported($membershipId);
+        if (!$isCancelSupported) {
+          self::unsetLinks($links, ['cancelrecur']);
+        }
+      }
+
+      // Unset renew and followup for deceased memberships.
+      $membershipStatus = $request->getValue('status_id:name');
+      if ($membershipStatus && $membershipStatus === 'Deceased') {
+        self::unsetLinks($links, ['renew', 'followup']);
+      }
+
+      $membershipTypeId = $request->getValue('membership_type_id');
+      if ($membershipTypeId && \CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) {
+        $finType = \Civi\Api4\MembershipType::get(TRUE)
+          ->addSelect('financial_type_id:name')
+          ->addWhere('id', '=', $membershipTypeId)
+          ->execute()
+          ->first()['financial_type_id:name'] ?? NULL;
+        if ($finType && !\CRM_Core_Permission::check('edit contributions of type ' . $finType)) {
+          self::unsetLinks($links, ['update', 'renew', 'followup']);
+        }
+        if ($finType && !\CRM_Core_Permission::check('delete contributions of type ' . $finType)) {
+          self::unsetLinks($links, ['delete']);
+        }
+      }
+
+      $e->getResponse()->exchangeArray(array_values($links));
+    }
+  }
+
+  private static function addLinks(array &$newLinks, array $addTemplate) {
+    $actions = [
+      'renew' => [
+        'path' => 'civicrm/contact/view/membership?action=renew&reset=1&cid=[contact_id]&id=[id]&context=membership&selectedChild=member',
+        'text' => ts('Renew Membership'),
+      ],
+      'followup' => [
+        'path' => 'civicrm/contact/view/membership?action=renew&reset=1&cid=[contact_id]&id=[id]&context=membership&selectedChild=member&mode=live',
+        'text' => ts('Renew-Credit Card Membership'),
+      ],
+      'cancelrecur' => [
+        'path' => 'civicrm/contribute/unsubscribe?reset=1&cid=[contact_id]&mid=[id]&context=membership&selectedChild=member',
+        'text' => ts('Cancel Auto-renewal'),
+      ],
+      'changebilling' => [
+        'path' => 'civicrm/contribute/updatebilling?reset=1&cid=[contact_id]&mid=[id]&context=membership&selectedChild=member',
+        'text' => ts('Change Billing Details'),
+      ],
+    ];
+    foreach ($actions as $action => $values) {
+      $addTemplate['ui_action'] = $action;
+      $addTemplate['path'] = $values['path'];
+      $addTemplate['text'] = $values['text'];
+      $newLinks[] = $addTemplate;
+    }
+  }
+
+  private static function unsetLinks(array &$links, array $actions) {
+    foreach ($actions as $action) {
+      $actionLinkIndex = self::getActionIndex($links, $action);
+      if (isset($actionLinkIndex)) {
+        unset($links[$actionLinkIndex]);
+      }
+    }
+  }
+
+}
diff --git a/www/modules/civicrm/ext/civi_member/Civi/Api4/Service/Links/MembershipStatusLinksProvider.php b/www/modules/civicrm/ext/civi_member/Civi/Api4/Service/Links/MembershipStatusLinksProvider.php
new file mode 100644
index 000000000..b8edbbe8d
--- /dev/null
+++ b/www/modules/civicrm/ext/civi_member/Civi/Api4/Service/Links/MembershipStatusLinksProvider.php
@@ -0,0 +1,58 @@
+<?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\Service\Links;
+
+use Civi\Core\Event\GenericHookEvent;
+
+/**
+ * @service
+ * @internal
+ */
+class MembershipStatusLinksProvider extends \Civi\Core\Service\AutoSubscriber {
+  use LinksProviderTrait;
+
+  public static function getSubscribedEvents(): array {
+    return [
+      'civi.api4.getLinks' => 'alterMembershipStatusLinks',
+      'hook_civicrm_searchKitTasks' => 'alterMembershipStatusTasks',
+    ];
+  }
+
+  /**
+   * @param \Civi\Core\Event\GenericHookEvent $e
+   * @return void
+   */
+  public static function alterMembershipStatusLinks(GenericHookEvent $e): void {
+    if ($e->entity === 'MembershipStatus') {
+      foreach ($e->links as $index => $link) {
+        // Reserved membership status should not be edited via UI
+        if (in_array($link['ui_action'], ['update', 'delete'], TRUE)) {
+          $e->links[$index]['conditions'][] = ['is_reserved', '=', FALSE];
+        }
+      }
+    }
+  }
+
+  /**
+   * @param \Civi\Core\Event\GenericHookEvent $event
+   */
+  public function alterMembershipStatusTasks(GenericHookEvent $event): void {
+    if (!empty($event->tasks['MembershipStatus'])) {
+      // Reserved membership status should not be edited via UI
+      $event->tasks['MembershipStatus']['update']['conditions'][] = ['is_reserved', '=', FALSE];
+      $event->tasks['MembershipStatus']['delete']['conditions'][] = ['is_reserved', '=', FALSE];
+      $event->tasks['MembershipStatus']['enable']['conditions'][] = ['is_reserved', '=', FALSE];
+      $event->tasks['MembershipStatus']['disable']['conditions'][] = ['is_reserved', '=', FALSE];
+    }
+  }
+
+}
diff --git a/www/modules/civicrm/ext/civi_member/Civi/Api4/Service/Spec/Provider/MembershipGetSpecProvider.php b/www/modules/civicrm/ext/civi_member/Civi/Api4/Service/Spec/Provider/MembershipGetSpecProvider.php
new file mode 100644
index 000000000..c3104bf07
--- /dev/null
+++ b/www/modules/civicrm/ext/civi_member/Civi/Api4/Service/Spec/Provider/MembershipGetSpecProvider.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       |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\Api4\Service\Spec\Provider;
+
+use Civi\Api4\Query\Api4SelectQuery;
+use Civi\Api4\Service\Spec\FieldSpec;
+use Civi\Api4\Service\Spec\RequestSpec;
+use Civi\Core\Service\AutoService;
+
+/**
+ * @service
+ * @internal
+ */
+class MembershipGetSpecProvider extends AutoService implements Generic\SpecProviderInterface {
+
+  /**
+   * @param \Civi\Api4\Service\Spec\RequestSpec $spec
+   */
+  public function modifySpec(RequestSpec $spec): void {
+    $spec->addFieldSpec(new FieldSpec('is_primary_member', 'Membership', 'Boolean'));
+    $field = (new FieldSpec('is_primary_member', 'Membership', 'Boolean'))
+      ->setTitle(ts('Is Primary Member?'))
+      ->setDescription(ts('Is this a primary membership?'))
+      ->setInputType('Radio')
+      ->setType('Extra')
+      ->setColumnName('owner_membership_id')
+      ->setSqlRenderer([__CLASS__, 'isPrimaryMembership']);
+    $spec->addFieldSpec($field);
+  }
+
+  /**
+   * When does this apply.
+   *
+   * @param string $entity
+   * @param string $action
+   *
+   * @return bool
+   */
+  public function applies(string $entity, string $action): bool {
+    return $entity === 'Membership' && $action === 'get';
+  }
+
+  /**
+   * Determine if the membership is a primary membership.
+   *
+   * @param array $fieldSpec
+   * @param \Civi\Api4\Query\Api4SelectQuery $query
+   * return string
+   *
+   * @return string
+   * @throws \CRM_Core_Exception
+   * @noinspection PhpUnusedParameterInspection
+   */
+  public static function isPrimaryMembership(array $fieldSpec, Api4SelectQuery $query): string {
+    return "IF({$fieldSpec['sql_name']}, 0, 1)";
+  }
+
+}
diff --git a/www/modules/civicrm/ext/civi_member/info.xml b/www/modules/civicrm/ext/civi_member/info.xml
index 37b880d66..d34e6d15d 100644
--- a/www/modules/civicrm/ext/civi_member/info.xml
+++ b/www/modules/civicrm/ext/civi_member/info.xml
@@ -12,14 +12,14 @@
     <url desc="Documentation">https://docs.civicrm.org/user/en/latest/membership/what-is-civimember/</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <tags>
     <tag>component</tag>
   </tags>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>Core Component</comments>
   <upgrader>CRM_Extension_Upgrader_Component</upgrader>
diff --git a/www/modules/civicrm/ext/civi_pledge/info.xml b/www/modules/civicrm/ext/civi_pledge/info.xml
index 43938137b..d2d1f7280 100644
--- a/www/modules/civicrm/ext/civi_pledge/info.xml
+++ b/www/modules/civicrm/ext/civi_pledge/info.xml
@@ -12,14 +12,14 @@
     <url desc="Documentation">https://docs.civicrm.org/user/en/latest/pledges/what-is-civipledge/</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <tags>
     <tag>component</tag>
   </tags>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>Core Component</comments>
   <upgrader>CRM_Extension_Upgrader_Component</upgrader>
diff --git a/www/modules/civicrm/ext/civi_report/info.xml b/www/modules/civicrm/ext/civi_report/info.xml
index b1247cdb3..f937089b0 100644
--- a/www/modules/civicrm/ext/civi_report/info.xml
+++ b/www/modules/civicrm/ext/civi_report/info.xml
@@ -12,14 +12,14 @@
     <url desc="Documentation">https://docs.civicrm.org/user/en/latest/reporting/what-is-civireport/</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <tags>
     <tag>component</tag>
   </tags>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>Core Component</comments>
   <upgrader>CRM_Extension_Upgrader_Component</upgrader>
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/ang/afformTabMember.aff.html b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afformTabMember.aff.html
new file mode 100644
index 000000000..bd0469f73
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afformTabMember.aff.html
@@ -0,0 +1,16 @@
+<div af-fieldset="">
+  <div class="af-markup">
+    <div class="alert alert-warning">Click Add Membership to record a new membership. Click Submit Credit Card Membership to process a Membership on behalf of the member using their credit card.</div>
+  </div>
+  <crm-search-display-table search-name="Contact_Summary_Memberships" display-name="Contact_Summary_Memberships_Active" filters="{contact_id: options.contact_id, 'status_id.is_current_member': true}"></crm-search-display-table>
+  <div class="af-markup">
+    <div class="alert alert-info font-red">Pending and Inactive Memberships </div>
+  </div>
+  <crm-search-display-table search-name="Contact_Summary_Memberships" display-name="Contact_Summary_Memberships_Inactive" filters="{contact_id: options.contact_id, 'status_id.is_current_member': false}"></crm-search-display-table>
+</div>
+<div class="af-markup">
+  <hr />
+</div>
+<div af-fieldset="" af-title="Membership Types">
+  <crm-search-display-table search-name="Contact_Summary_Membership_Type" display-name="Contact_Summary_Membership_Type" filters="{member_of_contact_id: options.contact_id, 'is_active': true}"></crm-search-display-table>
+</div>
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/ang/afformTabMember.aff.php b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afformTabMember.aff.php
new file mode 100644
index 000000000..7114f893d
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afformTabMember.aff.php
@@ -0,0 +1,19 @@
+<?php
+use CRM_CivicrmAdminUi_ExtensionUtil as E;
+
+return [
+  'type' => 'search',
+  'title' => E::ts('Memberships'),
+  'placement' => [
+    'contact_summary_tab',
+  ],
+  'summary_contact_type' => [
+    'Organization',
+  ],
+  'summary_weight' => 30,
+  'icon' => 'fa-id-badge',
+  'permission' => [
+    'access CiviCRM',
+    'access CiviMember',
+  ],
+];
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchLabelFormats.aff.html b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchLabelFormats.aff.html
index 31b254855..d3aec3894 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchLabelFormats.aff.html
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchLabelFormats.aff.html
@@ -1,7 +1,7 @@
 <div class="help">
 
   <div>{{:: ts('You can configure one or more Label Formats for your CiviCRM installation. Label Formats are used when creating mailing labels.')}}<br/>
-{{:: ts('You can change which fields are printed on each label in')}} <a href="/civicrm/admin/setting/preferences/address?reset=1">{{:: ts('Address Settings')}}</a>.</div>
+{{:: ts('You can change which fields are printed on each label in')}} <a ng-href="{{ crmUrl('civicrm/admin/setting/preferences/address?reset=1') }}">{{:: ts('Address Settings')}}</a>.</div>
 
 </div>
 <div crm-ui-tab-set="">
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchPrintPagePDFFormats.aff.html b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchPrintPagePDFFormats.aff.html
new file mode 100644
index 000000000..5fe731c16
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchPrintPagePDFFormats.aff.html
@@ -0,0 +1,8 @@
+<div af-fieldset="">
+  <div class="af-markup">
+    <div class="help">
+    <div>{{:: ts('You can configure one or more PDF Page Formats for your CiviCRM installation. PDF Page Formats may be assigned to Message Templates to use when creating PDF letters.')}}</div>
+    </div>
+  </div>
+  <crm-search-display-table search-name="Print_Page_PDF_Formats" display-name="Option_Values_Table_1"></crm-search-display-table>
+</div>
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchPrintPagePDFFormats.aff.php b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchPrintPagePDFFormats.aff.php
new file mode 100644
index 000000000..ba294311c
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchPrintPagePDFFormats.aff.php
@@ -0,0 +1,9 @@
+<?php
+use CRM_CivicrmAdminUi_ExtensionUtil as E;
+
+return [
+  'type' => 'search',
+  'title' => E::ts('Print Page (PDF) Formats'),
+  'icon' => 'fa-list-alt',
+  'server_route' => 'civicrm/admin/pdfFormats',
+];
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchRelationshipTypes.aff.html b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchRelationshipTypes.aff.html
index ba8433acc..2d084392a 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchRelationshipTypes.aff.html
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchRelationshipTypes.aff.html
@@ -3,11 +3,11 @@
     <div class="help">
       <p>{{:: ts('Relationship types describe relationships between people, households and organizations. Relationship types labels describe the relationship from the perspective of each of the two entities (e.g. Parent &gt;-&lt; Child, Employer &gt;-&lt; Employee). For some types of relationships, the labels may be the same in both directions (e.g. Spouse &gt;-&lt; Spouse).') }} <a class="crm-doc-link no-popup"
           href="https://docs.civicrm.org/user/en/latest/organising-your-data/relationships" target="_blank">{{:: ts('(Learn more...)') }}</a></p>
-      <p>{{:: ts('You can define as many additional relationships types as needed to cover the types of relationships you want to track. Once a relationship type is created, you may also define custom fields to extend relationship information for that type from ') }} <a href="civicrm/admin/custom/group?reset=1">{{:: ts('Administer CiviCRM &raquo; Custom Data') }}</a></p>
+      <p>{{:: ts('You can define as many additional relationships types as needed to cover the types of relationships you want to track. Once a relationship type is created, you may also define custom fields to extend relationship information for that type from ') }} <a ng-href="{{ crmUrl('civicrm/admin/custom/group?reset=1') }}">{{:: ts('Administer CiviCRM &raquo; Custom Data') }}</a></p>
     </div>
   </div>
 </div>
 <div af-fieldset="">
   <crm-search-display-table search-name="Administer_Relationship_Types"
     display-name="Administer_Relationship_Types_Table_1"></crm-search-display-table>
-</div>
\ No newline at end of file
+</div>
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchSMSProvider.aff.html b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchSMSProvider.aff.html
new file mode 100644
index 000000000..f7cd135bc
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchSMSProvider.aff.html
@@ -0,0 +1,7 @@
+<div af-fieldset="">
+  <div class="af-markup">
+    <div class="help">{{:: ts('You can configure one or more SMS Providers for your CiviCRM installation..') }} <a ng-href="https://docs.civicrm.org/user/en/latest/sms-text-messaging/set-up" target="_blank">{{:: ts('(Learn more...)') }}</a></div>
+
+  </div>
+  <crm-search-display-table search-name="SMS_Provider" display-name="SMS_Provider_Table_1"></crm-search-display-table>
+</div>
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchSMSProvider.aff.php b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchSMSProvider.aff.php
new file mode 100644
index 000000000..02530733c
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchSMSProvider.aff.php
@@ -0,0 +1,13 @@
+<?php
+use CRM_CivicrmAdminUi_ExtensionUtil as E;
+
+return [
+  'title' => E::ts('SMS Provider'),
+  'permission' => [
+    'administer CiviCRM',
+  ],
+  'type' => 'search',
+  'icon' => 'fa-list-alt',
+  'server_route' => 'civicrm/admin/sms/provider',
+  'permission_operator' => 'AND',
+];
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchTabMember.aff.html b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchTabMember.aff.html
new file mode 100644
index 000000000..aa556bb73
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchTabMember.aff.html
@@ -0,0 +1,10 @@
+<div af-fieldset="">
+  <div class="af-markup">
+    <div class="alert alert-warning">Click Add Membership to record a new membership. Click Submit Credit Card Membership to process a Membership on behalf of the member using their credit card.</div>
+  </div>
+  <crm-search-display-table search-name="Contact_Summary_Memberships" display-name="Contact_Summary_Memberships_Active" filters="{contact_id: options.contact_id, 'status_id.is_current_member': true}"></crm-search-display-table>
+  <div class="af-markup">
+    <div class="alert alert-info font-red">Pending and Inactive Memberships </div>
+  </div>
+  <crm-search-display-table search-name="Contact_Summary_Memberships" display-name="Contact_Summary_Memberships_Inactive" filters="{contact_id: options.contact_id, 'status_id.is_current_member': false}"></crm-search-display-table>
+</div>
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchTabMember.aff.php b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchTabMember.aff.php
new file mode 100644
index 000000000..ec17736af
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchTabMember.aff.php
@@ -0,0 +1,20 @@
+<?php
+use CRM_CivicrmAdminUi_ExtensionUtil as E;
+
+return [
+  'type' => 'search',
+  'title' => E::ts('Memberships'),
+  'placement' => [
+    'contact_summary_tab',
+  ],
+  'summary_contact_type' => [
+    'Individual',
+    'Household',
+  ],
+  'summary_weight' => 30,
+  'icon' => 'fa-id-badge',
+  'permission' => [
+    'access CiviCRM',
+    'access CiviMember',
+  ],
+];
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchTabParticipant.aff.html b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchTabParticipant.aff.html
new file mode 100644
index 000000000..74fccae75
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchTabParticipant.aff.html
@@ -0,0 +1,3 @@
+<div af-fieldset="">
+  <crm-search-display-table search-name="Contact_Summary_Events" display-name="Contact_Summary_Events_Tab" filters="{contact_id: options.contact_id}"></crm-search-display-table>
+</div>
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchTabParticipant.aff.php b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchTabParticipant.aff.php
new file mode 100644
index 000000000..6dea6855b
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/ang/afsearchTabParticipant.aff.php
@@ -0,0 +1,16 @@
+<?php
+use CRM_CivicrmAdminUi_ExtensionUtil as E;
+
+return [
+  'type' => 'search',
+  'title' => E::ts('Events'),
+  'placement' => [
+    'contact_summary_tab',
+  ],
+  'summary_weight' => 40,
+  'icon' => 'fa-calendar',
+  'permission' => [
+    'access CiviCRM',
+    'access CiviEvent',
+  ],
+];
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/info.xml b/www/modules/civicrm/ext/civicrm_admin_ui/info.xml
index 6d52ab114..d36553339 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/info.xml
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/info.xml
@@ -1,30 +1,24 @@
 <?xml version="1.0"?>
 <extension key="civicrm_admin_ui" type="module">
   <file>civicrm_admin_ui</file>
-  <name>AdminUI</name>
-  <description>Administration screens for managing CiviCRM settings, options, custom data, etc.</description>
+  <name>AdminUI (Preview)</name>
+  <description>Start using new versions of administration screens by installing this exension. These updates will be rolled out to all users in a future version.</description>
   <license>AGPL-3.0</license>
   <maintainer>
-    <author>Coleman Watts</author>
-    <email>coleman@civicrm.org</email>
+    <author>CiviCRM</author>
+    <email>info@civicrm.org</email>
   </maintainer>
   <urls>
-    <url desc="Main Extension Page">https://lab.civicrm.org/dev/core/-/issues/3912</url>
     <url desc="Documentation">https://lab.civicrm.org/dev/core/-/issues/3912</url>
-    <url desc="Support">https://lab.civicrm.org/dev/core/-/issues</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>beta</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
-  <requires>
-    <ext>org.civicrm.search_kit</ext>
-    <ext>org.civicrm.afform</ext>
-  </requires>
-  <comments>Replaces legacy pages with configurable Search Display Forms.</comments>
+  <comments>Key CiviCRM interfaces are being rewritten as configurable Search Display Forms. This extension lets you try these updates now, before the screens are permanently replaced in core.</comments>
   <classloader>
     <psr0 prefix="CRM_" path="."/>
     <psr4 prefix="Civi\" path="Civi"/>
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_ACL_Roles.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_ACL_Roles.mgd.php
index de475f50b..83559710f 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_ACL_Roles.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_ACL_Roles.mgd.php
@@ -127,11 +127,7 @@
                   'style' => 'default',
                   'path' => '',
                   'action' => '',
-                  'condition' => [
-                    'is_active',
-                    '=',
-                    FALSE,
-                  ],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -143,11 +139,7 @@
                   'style' => 'default',
                   'path' => '',
                   'action' => '',
-                  'condition' => [
-                    'is_active',
-                    '=',
-                    TRUE,
-                  ],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'ACLEntityRole',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Assigned_Financial_Accounts.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Assigned_Financial_Accounts.mgd.php
index a1d89053d..f9e34490d 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Assigned_Financial_Accounts.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Assigned_Financial_Accounts.mgd.php
@@ -1,6 +1,11 @@
 <?php
 use CRM_CivicrmAdminUi_ExtensionUtil as E;
 
+// Temporary check can be removed when moving this file to the civi_contribute extension.
+if (!CRM_Core_Component::isEnabled('CiviContribute')) {
+  return [];
+}
+
 return [
   [
     'name' => 'SavedSearch_Administer_Assigned_Financial_Accounts',
@@ -142,7 +147,7 @@
                   'text' => E::ts('Delete'),
                   'style' => 'danger',
                   'condition' => [
-                    'account_relationship:label',
+                    'account_relationship:name',
                     '!=',
                     'Accounts Receivable Account is',
                   ],
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Fields.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Fields.mgd.php
index 67766d00c..80fd55625 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Fields.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Fields.mgd.php
@@ -161,7 +161,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -170,7 +170,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'CustomField',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Groups.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Groups.mgd.php
index 0263e16db..58c874742 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Groups.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Custom_Groups.mgd.php
@@ -12,9 +12,6 @@
       'values' => [
         'name' => 'Administer_Custom_Groups',
         'label' => E::ts('Administer Custom Groups'),
-        'form_values' => NULL,
-        'mapping_id' => NULL,
-        'search_custom_id' => NULL,
         'api_entity' => 'CustomGroup',
         'api_params' => [
           'version' => 4,
@@ -23,14 +20,20 @@
             'title',
             'is_active',
             'extends:label',
-            'extends_entity_column_id:label',
+            'extends_entity_column_value:label',
             'style:label',
             'is_reserved',
             'COUNT(CustomGroup_CustomField_custom_group_id_01.id) AS COUNT_CustomGroup_CustomField_custom_group_id_01_id',
             'GROUP_CONCAT(DISTINCT CustomGroup_CustomField_custom_group_id_01.label) AS GROUP_CONCAT_CustomGroup_CustomField_custom_group_id_01_label',
           ],
           'orderBy' => [],
-          'where' => [['is_reserved', '=', FALSE]],
+          'where' => [
+            [
+              'is_reserved',
+              '=',
+              FALSE,
+            ],
+          ],
           'groupBy' => [
             'id',
           ],
@@ -47,8 +50,6 @@
           ],
           'having' => [],
         ],
-        'expires_date' => NULL,
-        'description' => NULL,
       ],
       'match' => [
         'name',
@@ -97,11 +98,18 @@
             ],
             [
               'type' => 'field',
-              'key' => 'extends_entity_column_id:label',
-              'dataType' => 'Integer',
-              'label' => E::ts('Used for'),
+              'key' => 'extends:label',
+              'dataType' => 'String',
+              'label' => E::ts('Used For'),
+              'sortable' => TRUE,
+              'rewrite' => '[extends:label]',
+            ],
+            [
+              'type' => 'field',
+              'key' => 'extends_entity_column_value:label',
+              'dataType' => 'String',
+              'label' => E::ts('Subtypes'),
               'sortable' => TRUE,
-              'empty_value' => '[extends:label]',
             ],
             [
               'type' => 'field',
@@ -139,6 +147,7 @@
                   'style' => 'default',
                   'path' => 'civicrm/admin/custom/group/fields#/?gid=[id]',
                   'condition' => [],
+                  'task' => '',
                 ],
                 [
                   'entity' => 'CustomGroup',
@@ -150,6 +159,7 @@
                   'style' => 'default',
                   'path' => '',
                   'condition' => [],
+                  'task' => '',
                 ],
               ],
               'type' => 'buttons',
@@ -171,6 +181,7 @@
                   'style' => 'default',
                   'path' => '',
                   'condition' => [],
+                  'task' => '',
                 ],
                 [
                   'task' => 'enable',
@@ -179,7 +190,10 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
+                  'path' => '',
+                  'action' => '',
+                  'join' => '',
                 ],
                 [
                   'task' => 'disable',
@@ -188,7 +202,10 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
+                  'path' => '',
+                  'action' => '',
+                  'join' => '',
                 ],
                 [
                   'entity' => 'CustomGroup',
@@ -200,6 +217,19 @@
                   'style' => 'danger',
                   'path' => '',
                   'condition' => [],
+                  'task' => '',
+                ],
+                [
+                  'entity' => 'CustomField',
+                  'action' => 'add',
+                  'join' => 'CustomGroup_CustomField_custom_group_id_01',
+                  'target' => 'crm-popup',
+                  'style' => 'default',
+                  'text' => E::ts('Add Custom Field'),
+                  'icon' => 'fa-plus',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
                 ],
               ],
               'type' => 'menu',
@@ -225,14 +255,17 @@
               'text' => E::ts('Add Set of Custom Fields'),
               'icon' => 'fa-plus',
               'autoOpen' => TRUE,
+              'path' => '',
+              'task' => '',
+              'join' => '',
+              'condition' => [],
             ],
           ],
         ],
-        'acl_bypass' => FALSE,
       ],
       'match' => [
-        'name',
         'saved_search_id',
+        'name',
       ],
     ],
   ],
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Accounts.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Accounts.mgd.php
index db86a63be..417004cec 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Accounts.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Accounts.mgd.php
@@ -1,6 +1,11 @@
 <?php
 use CRM_CivicrmAdminUi_ExtensionUtil as E;
 
+// Temporary check can be removed when moving this file to the civi_contribute extension.
+if (!CRM_Core_Component::isEnabled('CiviContribute')) {
+  return [];
+}
+
 return [
   [
     'name' => 'SavedSearch_Administer_Financial_Accounts',
@@ -161,7 +166,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -170,7 +175,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'FinancialAccount',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Types.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Types.mgd.php
index 55ddd2f99..5c935f9e6 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Types.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Financial_Types.mgd.php
@@ -1,6 +1,11 @@
 <?php
 use CRM_CivicrmAdminUi_ExtensionUtil as E;
 
+// Temporary check can be removed when moving this file to the civi_contribute extension.
+if (!CRM_Core_Component::isEnabled('CiviContribute')) {
+  return [];
+}
+
 return [
   [
     'name' => 'SavedSearch_Administer_Financial_Types',
@@ -175,7 +180,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -184,7 +189,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'icon' => 'fa-trash',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Location_Types.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Location_Types.mgd.php
index f0f1ebc69..6c849d752 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Location_Types.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Location_Types.mgd.php
@@ -141,7 +141,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -150,7 +150,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'LocationType',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Manage_Group.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Manage_Group.mgd.php
index a6995d89e..7fd756ac2 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Manage_Group.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Manage_Group.mgd.php
@@ -246,7 +246,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -255,7 +255,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'Group',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Payment_Processors.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Payment_Processors.mgd.php
index 3252597f0..d1a3f718e 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Payment_Processors.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Payment_Processors.mgd.php
@@ -1,6 +1,11 @@
 <?php
 use CRM_CivicrmAdminUi_ExtensionUtil as E;
 
+// Temporary check can be removed when moving this file to the civi_contribute extension.
+if (!CRM_Core_Component::isEnabled('CiviContribute')) {
+  return [];
+}
+
 return [
   [
     'name' => 'SavedSearch_Administer_Payment_Processors',
@@ -185,7 +190,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -194,7 +199,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'PaymentProcessor',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_ProfileFields.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_ProfileFields.mgd.php
index 4247f5215..ac0385ef2 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_ProfileFields.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_ProfileFields.mgd.php
@@ -162,7 +162,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -171,7 +171,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'UFField',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Profiles.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Profiles.mgd.php
index f068b1869..3a058d8a9 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Profiles.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Profiles.mgd.php
@@ -235,7 +235,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -244,7 +244,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'icon' => 'fa-copy',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Relationship_Types.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Relationship_Types.mgd.php
index 39fda6f51..79892ddc9 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Relationship_Types.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Relationship_Types.mgd.php
@@ -136,7 +136,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -145,7 +145,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'RelationshipType',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Scheduled_Reminders.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Scheduled_Reminders.mgd.php
index ae1d1bcef..8d0a5747e 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Scheduled_Reminders.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Administer_Scheduled_Reminders.mgd.php
@@ -142,11 +142,7 @@
                   'style' => 'default',
                   'path' => '',
                   'action' => '',
-                  'condition' => [
-                    'is_active',
-                    '=',
-                    TRUE,
-                  ],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'enable',
@@ -158,11 +154,7 @@
                   'style' => 'default',
                   'path' => '',
                   'action' => '',
-                  'condition' => [
-                    'is_active',
-                    '=',
-                    FALSE,
-                  ],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'ActionSchedule',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Contact_Summary_Events.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Contact_Summary_Events.mgd.php
new file mode 100644
index 000000000..9e22f84c5
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Contact_Summary_Events.mgd.php
@@ -0,0 +1,252 @@
+<?php
+use CRM_CivicrmAdminUi_ExtensionUtil as E;
+
+// Temporary check can be removed when moving this file to the civi_event extension.
+if (!CRM_Core_Component::isEnabled('CiviEvent')) {
+  return [];
+}
+
+return [
+  [
+    'name' => 'SavedSearch_Contact_Summary_Events',
+    'entity' => 'SavedSearch',
+    'cleanup' => 'unused',
+    'update' => 'unmodified',
+    'params' => [
+      'version' => 4,
+      'values' => [
+        'name' => 'Contact_Summary_Events',
+        'label' => E::ts('Contact Summary Events'),
+        'api_entity' => 'Participant',
+        'api_params' => [
+          'version' => 4,
+          'select' => [
+            'event_id.title',
+            'fee_level',
+            'fee_amount',
+            'register_date',
+            'Participant_Event_event_id_01.start_date',
+            'Participant_Event_event_id_01.end_date',
+            'status_id:label',
+            'contact_id.sort_name',
+            'role_id:label',
+          ],
+          'orderBy' => [],
+          'where' => [],
+          'groupBy' => [],
+          'join' => [
+            [
+              'Event AS Participant_Event_event_id_01',
+              'LEFT',
+              [
+                'event_id',
+                '=',
+                'Participant_Event_event_id_01.id',
+              ],
+            ],
+            [
+              'Contact AS Participant_Contact_contact_id_01',
+              'LEFT',
+              [
+                'contact_id',
+                '=',
+                'Participant_Contact_contact_id_01.id',
+              ],
+            ],
+          ],
+          'having' => [],
+        ],
+      ],
+      'match' => [
+        'name',
+      ],
+    ],
+  ],
+  [
+    'name' => 'SavedSearch_Contact_Summary_Events_SearchDisplay_Contact_Summary_Events_Tab',
+    'entity' => 'SearchDisplay',
+    'cleanup' => 'unused',
+    'update' => 'unmodified',
+    'params' => [
+      'version' => 4,
+      'values' => [
+        'name' => 'Contact_Summary_Events_Tab',
+        'label' => E::ts('Contact Summary Events Tab'),
+        'saved_search_id.name' => 'Contact_Summary_Events',
+        'type' => 'table',
+        'settings' => [
+          'description' => NULL,
+          'sort' => [
+            [
+              'register_date',
+              'DESC',
+            ],
+          ],
+          'limit' => 50,
+          'pager' => [
+            'show_count' => TRUE,
+            'expose_limit' => TRUE,
+            'hide_single' => TRUE,
+          ],
+          'placeholder' => 5,
+          'columns' => [
+            [
+              'type' => 'html',
+              'key' => 'event_id.title',
+              'dataType' => 'String',
+              'label' => E::ts('Event'),
+              'sortable' => TRUE,
+              'rewrite' => '[event_id.title]',
+            ],
+            [
+              'type' => 'field',
+              'key' => 'fee_level',
+              'dataType' => 'Text',
+              'label' => E::ts('Fee level'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'fee_amount',
+              'dataType' => 'Money',
+              'label' => E::ts('Amount'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'register_date',
+              'dataType' => 'Timestamp',
+              'label' => E::ts('Registered'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'html',
+              'key' => 'Participant_Event_event_id_01.start_date',
+              'dataType' => 'Timestamp',
+              'label' => E::ts('Event Date(s)'),
+              'sortable' => TRUE,
+              'rewrite' => '[Participant_Event_event_id_01.start_date] -<br> [Participant_Event_event_id_01.end_date]',
+            ],
+            [
+              'type' => 'field',
+              'key' => 'status_id:label',
+              'dataType' => 'Integer',
+              'label' => E::ts('Status'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'role_id:label',
+              'dataType' => 'String',
+              'label' => E::ts('Participant Role'),
+              'sortable' => TRUE,
+            ],
+            [
+              'text' => '',
+              'style' => 'default',
+              'size' => 'btn-xs',
+              'icon' => 'fa-bars',
+              'links' => [
+                [
+                  'entity' => 'Participant',
+                  'action' => 'view',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-ticket',
+                  'text' => E::ts('View'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'entity' => 'Participant',
+                  'action' => 'update',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-pencil',
+                  'text' => E::ts('Edit'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'entity' => 'Participant',
+                  'action' => 'detach',
+                  'icon' => 'fa-random',
+                  'text' => E::ts('Transfer or Cancel'),
+                  'style' => 'default',
+                  'condition' => [
+                    'status_id:name',
+                    'NOT IN',
+                    ['Cancelled', 'Transferred'],
+                  ],
+                  'task' => '',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                ],
+                [
+                  'entity' => 'Participant',
+                  'action' => 'delete',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-trash',
+                  'text' => E::ts('Delete'),
+                  'style' => 'danger',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'icon' => 'fa-calendar',
+                  'text' => E::ts('View Event Info'),
+                  'style' => 'default',
+                  'condition' => [],
+                  'task' => '',
+                  'entity' => 'Event',
+                  'action' => 'view',
+                  'join' => 'Participant_Event_event_id_01',
+                ],
+                [
+                  'path' => 'civicrm/event/search?reset=1&force=1&event=[event_id]',
+                  'icon' => 'fa-search',
+                  'text' => E::ts('View Participants'),
+                  'style' => 'default',
+                  'condition' => [],
+                  'task' => '',
+                  'entity' => '',
+                  'action' => '',
+                  'join' => '',
+                ],
+              ],
+              'type' => 'menu',
+              'alignment' => 'text-right',
+            ],
+          ],
+          'actions' => FALSE,
+          'classes' => [
+            'table',
+            'table-striped',
+          ],
+          'toolbar' => [
+            [
+              'entity' => 'Participant',
+              'text' => E::ts('Add Event Registration'),
+              'icon' => 'fa-plus',
+              'target' => 'crm-popup',
+              'action' => 'add',
+              'style' => 'default',
+              'join' => '',
+              'task' => '',
+            ],
+          ],
+        ],
+      ],
+      'match' => [
+        'saved_search_id',
+        'name',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Contact_Summary_Membership_Type.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Contact_Summary_Membership_Type.mgd.php
new file mode 100644
index 000000000..2a552ebe0
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Contact_Summary_Membership_Type.mgd.php
@@ -0,0 +1,159 @@
+<?php
+use CRM_CivicrmAdminUi_ExtensionUtil as E;
+
+// Temporary check can be removed when moving this file to the civi_member extension.
+if (!CRM_Core_Component::isEnabled('CiviMember')) {
+  return [];
+}
+
+return [
+  [
+    'name' => 'SavedSearch_Contact_Summary_Membership_Type',
+    'entity' => 'SavedSearch',
+    'cleanup' => 'unused',
+    'update' => 'unmodified',
+    'params' => [
+      'version' => 4,
+      'values' => [
+        'name' => 'Contact_Summary_Membership_Type',
+        'label' => E::ts('Contact Summary Membership Type'),
+        'api_entity' => 'MembershipType',
+        'api_params' => [
+          'version' => 4,
+          'select' => [
+            'name',
+            'period_type:label',
+            'financial_type_id:label',
+            'fixed_period_start_day',
+            'minimum_fee',
+            'duration_interval',
+            'visibility:label',
+          ],
+          'orderBy' => [],
+          'where' => [
+            [
+              'is_active',
+              '=',
+              TRUE,
+            ],
+          ],
+          'groupBy' => [],
+          'join' => [],
+          'having' => [],
+        ],
+      ],
+      'match' => [
+        'name',
+      ],
+    ],
+  ],
+  [
+    'name' => 'SavedSearch_Contact_Summary_Membership_Type_SearchDisplay_Contact_Summary_Membership_Type',
+    'entity' => 'SearchDisplay',
+    'cleanup' => 'unused',
+    'update' => 'unmodified',
+    'params' => [
+      'version' => 4,
+      'values' => [
+        'name' => 'Contact_Summary_Membership_Type',
+        'label' => E::ts('Contact Summary Membership Type'),
+        'saved_search_id.name' => 'Contact_Summary_Membership_Type',
+        'type' => 'table',
+        'settings' => [
+          'description' => E::ts('The following Membership Types are associated with this organization. Click Members for a listing of all contacts who have memberships of that type. Click Edit to modify the settings for that type.'),
+          'sort' => [],
+          'limit' => 50,
+          'pager' => [
+            'hide_single' => TRUE,
+          ],
+          'placeholder' => 5,
+          'columns' => [
+            [
+              'type' => 'field',
+              'key' => 'name',
+              'dataType' => 'String',
+              'label' => E::ts('Name'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'period_type:label',
+              'dataType' => 'String',
+              'label' => E::ts('Period'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'fixed_period_start_day',
+              'dataType' => 'Integer',
+              'label' => E::ts('Fixed Start'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'minimum_fee',
+              'dataType' => 'Money',
+              'label' => E::ts('Minimum Fee'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'duration_interval',
+              'dataType' => 'Integer',
+              'label' => E::ts('Duration'),
+              'sortable' => TRUE,
+              'rewrite' => '[duration_interval] [duration_unit:label]',
+            ],
+            [
+              'type' => 'field',
+              'key' => 'visibility:label',
+              'dataType' => 'String',
+              'label' => E::ts('Visibility'),
+              'sortable' => TRUE,
+            ],
+            [
+              'size' => 'btn-xs',
+              'links' => [
+                [
+                  'path' => 'civicrm/member/search?reset=1&force=1&type=[id]',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('Members'),
+                  'style' => 'default',
+                  'condition' => [],
+                  'task' => '',
+                  'entity' => '',
+                  'action' => '',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                ],
+                [
+                  'entity' => 'MembershipType',
+                  'action' => 'update',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-pencil',
+                  'text' => E::ts('Edit'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+              ],
+              'type' => 'buttons',
+              'alignment' => 'text-right',
+            ],
+          ],
+          'actions' => FALSE,
+          'classes' => [
+            'table',
+            'table-striped',
+          ],
+        ],
+      ],
+      'match' => [
+        'saved_search_id',
+        'name',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Contact_Summary_Memberships.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Contact_Summary_Memberships.mgd.php
new file mode 100644
index 000000000..f684b8e29
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Contact_Summary_Memberships.mgd.php
@@ -0,0 +1,533 @@
+<?php
+use CRM_CivicrmAdminUi_ExtensionUtil as E;
+
+// Temporary check can be removed when moving this file to the civi_member extension.
+if (!CRM_Core_Component::isEnabled('CiviMember')) {
+  return [];
+}
+
+return [
+  [
+    'name' => 'SavedSearch_Contact_Summary_Memberships',
+    'entity' => 'SavedSearch',
+    'cleanup' => 'unused',
+    'update' => 'unmodified',
+    'params' => [
+      'version' => 4,
+      'values' => [
+        'name' => 'Contact_Summary_Memberships',
+        'label' => E::ts('Contact Summary Memberships'),
+        'api_entity' => 'Membership',
+        'api_params' => [
+          'version' => 4,
+          'select' => [
+            'id',
+            'membership_type_id:label',
+            'join_date',
+            'start_date',
+            'end_date',
+            'status_id:label',
+            'source',
+            'Membership_ContributionRecur_contribution_recur_id_01.auto_renew',
+            'IF(owner_membership_id, "(' . E::ts('by relationship') . ')", owner_membership_id) AS IF_owner_membership_id_owner_membership_id',
+            'COUNT(DISTINCT Membership_Membership_owner_membership_id_01.id) AS COUNT_Membership_Membership_owner_membership_id_01_id',
+          ],
+          'orderBy' => [],
+          'where' => [],
+          'groupBy' => [
+            'id',
+            'Membership_ContributionRecur_contribution_recur_id_01.id',
+          ],
+          'join' => [
+            [
+              'ContributionRecur AS Membership_ContributionRecur_contribution_recur_id_01',
+              'LEFT',
+              [
+                'contribution_recur_id',
+                '=',
+                'Membership_ContributionRecur_contribution_recur_id_01.id',
+              ],
+            ],
+            [
+              'Membership AS Membership_Membership_owner_membership_id_01',
+              'LEFT',
+              [
+                'id',
+                '=',
+                'Membership_Membership_owner_membership_id_01.owner_membership_id',
+              ],
+            ],
+          ],
+          'having' => [],
+        ],
+      ],
+      'match' => [
+        'name',
+      ],
+    ],
+  ],
+  [
+    'name' => 'SavedSearch_Contact_Summary_Memberships_SearchDisplay_Contact_Summary_Memberships_Active',
+    'entity' => 'SearchDisplay',
+    'cleanup' => 'unused',
+    'update' => 'unmodified',
+    'params' => [
+      'version' => 4,
+      'values' => [
+        'name' => 'Contact_Summary_Memberships_Active',
+        'label' => E::ts('Contact Summary Memberships Active'),
+        'saved_search_id.name' => 'Contact_Summary_Memberships',
+        'type' => 'table',
+        'settings' => [
+          'description' => E::ts('Active Memberships'),
+          'sort' => [
+            [
+              'id',
+              'DESC',
+            ],
+          ],
+          'limit' => 0,
+          'pager' => FALSE,
+          'placeholder' => 5,
+          'columns' => [
+            [
+              'type' => 'field',
+              'key' => 'membership_type_id:label',
+              'dataType' => 'Integer',
+              'label' => E::ts('Membership'),
+              'sortable' => TRUE,
+              'rewrite' => '[membership_type_id:label] [IF_owner_membership_id_owner_membership_id]',
+            ],
+            [
+              'type' => 'field',
+              'key' => 'join_date',
+              'dataType' => 'Date',
+              'label' => E::ts('Member Since'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'start_date',
+              'dataType' => 'Date',
+              'label' => E::ts('Membership Start Date'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'end_date',
+              'dataType' => 'Date',
+              'label' => E::ts('Membership Expiration Date'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'status_id:label',
+              'dataType' => 'Integer',
+              'label' => E::ts('Status'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'source',
+              'dataType' => 'String',
+              'label' => E::ts('Membership Source'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'Membership_ContributionRecur_contribution_recur_id_01.auto_renew',
+              'dataType' => 'Boolean',
+              'label' => E::ts('Auto Renew'),
+              'sortable' => FALSE,
+              'rewrite' => ' ',
+              'icons' => [
+                [
+                  'icon' => 'fa-exclamation-triangle',
+                  'side' => 'left',
+                  'if' => [
+                    'Membership_ContributionRecur_contribution_recur_id_01.contribution_status_id:name',
+                    '=',
+                    'Cancelled',
+                  ],
+                ],
+                [
+                  'icon' => 'fa-check',
+                  'side' => 'left',
+                  'if' => [
+                    'Membership_ContributionRecur_contribution_recur_id_01.contribution_status_id:name',
+                    'IS NOT EMPTY',
+                  ],
+                ],
+              ],
+            ],
+            [
+              'type' => 'field',
+              'key' => 'COUNT_Membership_Membership_owner_membership_id_01_id',
+              'dataType' => 'Integer',
+              'label' => E::ts('Related'),
+              'sortable' => TRUE,
+            ],
+            [
+              'text' => '',
+              'style' => 'default',
+              'size' => 'btn-xs',
+              'icon' => 'fa-bars',
+              'links' => [
+                [
+                  'entity' => 'Membership',
+                  'action' => 'view',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('View Membership'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'path' => '',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('View Primary Member'),
+                  'style' => 'default',
+                  'condition' => [],
+                  'task' => '',
+                  'entity' => 'Membership',
+                  'action' => 'view',
+                  'join' => 'owner_membership_id',
+                  'target' => 'crm-popup',
+                ],
+                [
+                  'entity' => 'Membership',
+                  'action' => 'update',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-pencil',
+                  'text' => E::ts('Update Membership'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'path' => '',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('Renew Membership'),
+                  'style' => 'default',
+                  'condition' => [],
+                  'task' => '',
+                  'entity' => 'Membership',
+                  'action' => 'renew',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                ],
+                [
+                  'path' => '',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('Renew-Credit Card Membership'),
+                  'style' => 'default',
+                  'condition' => [],
+                  'task' => '',
+                  'entity' => 'Membership',
+                  'action' => 'followup',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                ],
+                [
+                  'entity' => 'Membership',
+                  'action' => 'delete',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-trash',
+                  'text' => E::ts('Delete Membership'),
+                  'style' => 'danger',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'path' => '',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('Cancel Auto-renewal'),
+                  'style' => 'default',
+                  'condition' => [],
+                  'task' => '',
+                  'entity' => 'Membership',
+                  'action' => 'cancelrecur',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                ],
+                [
+                  'path' => '',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('Change Billing Details'),
+                  'style' => 'default',
+                  'condition' => [],
+                  'task' => '',
+                  'entity' => 'Membership',
+                  'action' => 'changebilling',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                ],
+              ],
+              'type' => 'menu',
+              'alignment' => 'text-right',
+            ],
+          ],
+          'actions' => FALSE,
+          'classes' => [
+            'table',
+            'table-striped',
+          ],
+          'noResultsText' => 'No memberships have been recorded for this contact.',
+          'toolbar' => [
+            [
+              'action' => '',
+              'entity' => '',
+              'text' => E::ts('Add Membership'),
+              'icon' => 'fa-external-link',
+              'style' => 'default',
+              'target' => 'crm-popup',
+              'join' => '',
+              'path' => 'civicrm/contact/view/membership?reset=1&action=add&cid=[contact_id]&context=membership',
+              'task' => '',
+              'condition' => [],
+            ],
+            [
+              'path' => 'civicrm/contact/view/membership?reset=1&action=add&cid=[contact_id]&context=membership&mode=live',
+              'icon' => 'fa-credit-card',
+              'text' => E::ts('Submit Credit Card Membership'),
+              'style' => 'default',
+              'condition' => [],
+              'task' => '',
+              'entity' => '',
+              'action' => '',
+              'join' => '',
+              'target' => 'crm-popup',
+            ],
+          ],
+        ],
+      ],
+      'match' => [
+        'saved_search_id',
+        'name',
+      ],
+    ],
+  ],
+  [
+    'name' => 'SavedSearch_Contact_Summary_Memberships_SearchDisplay_Contact_Summary_Memberships_Inactive',
+    'entity' => 'SearchDisplay',
+    'cleanup' => 'unused',
+    'update' => 'unmodified',
+    'params' => [
+      'version' => 4,
+      'values' => [
+        'name' => 'Contact_Summary_Memberships_Inactive',
+        'label' => E::ts('Contact Summary Memberships Inactive'),
+        'saved_search_id.name' => 'Contact_Summary_Memberships',
+        'type' => 'table',
+        'settings' => [
+          'description' => '',
+          'sort' => [
+            [
+              'id',
+              'DESC',
+            ],
+          ],
+          'limit' => 0,
+          'pager' => FALSE,
+          'placeholder' => 5,
+          'columns' => [
+            [
+              'type' => 'field',
+              'key' => 'membership_type_id:label',
+              'dataType' => 'Integer',
+              'label' => E::ts('Membership'),
+              'sortable' => TRUE,
+              'rewrite' => '[membership_type_id:label] [IF_owner_membership_id_owner_membership_id]',
+            ],
+            [
+              'type' => 'field',
+              'key' => 'join_date',
+              'dataType' => 'Date',
+              'label' => E::ts('Member Since'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'start_date',
+              'dataType' => 'Date',
+              'label' => E::ts('Membership Start Date'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'end_date',
+              'dataType' => 'Date',
+              'label' => E::ts('Membership Expiration Date'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'status_id:label',
+              'dataType' => 'Integer',
+              'label' => E::ts('Status'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'source',
+              'dataType' => 'String',
+              'label' => E::ts('Membership Source'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'Membership_ContributionRecur_contribution_recur_id_01.auto_renew',
+              'dataType' => 'Boolean',
+              'label' => E::ts('Auto Renew'),
+              'sortable' => FALSE,
+              'rewrite' => ' ',
+              'icons' => [
+                [
+                  'icon' => 'fa-exclamation-triangle',
+                  'side' => 'left',
+                  'if' => [
+                    'Membership_ContributionRecur_contribution_recur_id_01.contribution_status_id:name',
+                    '=',
+                    'Cancelled',
+                  ],
+                ],
+                [
+                  'icon' => 'fa-check',
+                  'side' => 'left',
+                  'if' => [
+                    'Membership_ContributionRecur_contribution_recur_id_01.contribution_status_id:name',
+                    'IS NOT EMPTY',
+                  ],
+                ],
+              ],
+            ],
+            [
+              'text' => '',
+              'style' => 'default',
+              'size' => 'btn-xs',
+              'icon' => 'fa-bars',
+              'links' => [
+                [
+                  'entity' => 'Membership',
+                  'action' => 'view',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('View Membership'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'path' => '',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('View Primary Member'),
+                  'style' => 'default',
+                  'condition' => [],
+                  'task' => '',
+                  'entity' => 'Membership',
+                  'action' => 'view',
+                  'join' => 'owner_membership_id',
+                  'target' => 'crm-popup',
+                ],
+                [
+                  'entity' => 'Membership',
+                  'action' => 'update',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-pencil',
+                  'text' => E::ts('Update Membership'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'path' => '',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('Renew Membership'),
+                  'style' => 'default',
+                  'condition' => [],
+                  'task' => '',
+                  'entity' => 'Membership',
+                  'action' => 'renew',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                ],
+                [
+                  'path' => '',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('Renew-Credit Card Membership'),
+                  'style' => 'default',
+                  'condition' => [],
+                  'task' => '',
+                  'entity' => 'Membership',
+                  'action' => 'followup',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                ],
+                [
+                  'entity' => 'Membership',
+                  'action' => 'delete',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-trash',
+                  'text' => E::ts('Delete Membership'),
+                  'style' => 'danger',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'path' => '',
+                  'entity' => 'Membership',
+                  'action' => 'cancelrecur',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('Cancel Auto-renewal'),
+                  'style' => 'default',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'path' => '',
+                  'entity' => 'Membership',
+                  'action' => 'changebilling',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('Change Billing Details'),
+                  'style' => 'default',
+                  'task' => '',
+                  'condition' => [],
+                ],
+              ],
+              'type' => 'menu',
+              'alignment' => 'text-right',
+            ],
+          ],
+          'actions' => FALSE,
+          'classes' => [
+            'table',
+            'table-striped',
+            'disabled',
+          ],
+          'noResultsText' => '',
+        ],
+      ],
+      'match' => [
+        'saved_search_id',
+        'name',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Headers_Footers_and_Automated_Messages.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Headers_Footers_and_Automated_Messages.mgd.php
index efa3d7005..6ad01ad24 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Headers_Footers_and_Automated_Messages.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Headers_Footers_and_Automated_Messages.mgd.php
@@ -149,11 +149,7 @@
                   'style' => 'default',
                   'path' => '',
                   'action' => '',
-                  'condition' => [
-                    'is_active',
-                    '=',
-                    TRUE,
-                  ],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'enable',
@@ -165,11 +161,7 @@
                   'style' => 'default',
                   'path' => '',
                   'action' => '',
-                  'condition' => [
-                    'is_active',
-                    '=',
-                    FALSE,
-                  ],
+                  'condition' => [],
                 ],
               ],
               'type' => 'links',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_ACLs.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_ACLs.mgd.php
index 9bfa13c8c..c3b06fca8 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_ACLs.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_ACLs.mgd.php
@@ -149,7 +149,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -158,7 +158,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'ACL',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php
index e5e60cfd9..2d59ed121 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php
@@ -1,6 +1,11 @@
 <?php
 use CRM_CivicrmAdminUi_ExtensionUtil as E;
 
+// Temporary check can be removed when moving this file to the civi_contribute extension.
+if (!CRM_Core_Component::isEnabled('CiviContribute')) {
+  return [];
+}
+
 return [
   [
     'name' => 'SavedSearch_Manage_Contribution_Pages',
@@ -217,7 +222,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -226,7 +231,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'ContributionPage',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Mail_Accounts.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Mail_Accounts.mgd.php
index f25c8702f..63496df63 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Mail_Accounts.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Mail_Accounts.mgd.php
@@ -1,7 +1,11 @@
 <?php
-
 use CRM_CivicrmAdminUi_ExtensionUtil as E;
 
+// Temporary check can be removed when moving this file to the civi_mail extension.
+if (!CRM_Core_Component::isEnabled('CiviMail')) {
+  return [];
+}
+
 // This SearchDisplay shows an editable-in-place field for Enabled? for all rows, including the bounce processing mail account, which cannot actually be disabled (you can change it to No, but it won't actually be disabled). So this is FIXME for when we can set rows to edit-in-place conditionally.
 return [
   [
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Premiums.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Premiums.mgd.php
index 0a79a6139..74acbef6d 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Premiums.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Premiums.mgd.php
@@ -160,11 +160,7 @@
                   'style' => 'default',
                   'path' => '',
                   'action' => '',
-                  'condition' => [
-                    'is_active',
-                    '=',
-                    FALSE,
-                  ],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -176,11 +172,7 @@
                   'style' => 'default',
                   'path' => '',
                   'action' => '',
-                  'condition' => [
-                    'is_active',
-                    '=',
-                    TRUE,
-                  ],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'Product',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Scheduled_Jobs.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Scheduled_Jobs.mgd.php
index fa4c89d96..49c6850b9 100644
--- a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Scheduled_Jobs.mgd.php
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Manage_Scheduled_Jobs.mgd.php
@@ -211,7 +211,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -220,7 +220,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'Job',
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Print_Page_PDF_Formats.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Print_Page_PDF_Formats.mgd.php
new file mode 100644
index 000000000..e6d88c56b
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_Print_Page_PDF_Formats.mgd.php
@@ -0,0 +1,181 @@
+<?php
+use CRM_CivicrmAdminUi_ExtensionUtil as E;
+
+return [
+  [
+    'name' => 'SavedSearch_Print_Page_PDF_Formats',
+    'entity' => 'SavedSearch',
+    'cleanup' => 'unused',
+    'update' => 'unmodified',
+    'params' => [
+      'version' => 4,
+      'values' => [
+        'name' => 'Print_Page_PDF_Formats',
+        'label' => E::ts('Print Page (PDF) Formats'),
+        'api_entity' => 'OptionValue',
+        'api_params' => [
+          'version' => 4,
+          'select' => [
+            'id',
+            'label',
+            'description',
+            'is_active',
+            'is_default',
+          ],
+          'orderBy' => [],
+          'where' => [
+            [
+              'option_group_id:name',
+              '=',
+              'pdf_format',
+            ],
+          ],
+          'groupBy' => [],
+          'join' => [],
+          'having' => [],
+        ],
+      ],
+      'match' => [
+        'name',
+      ],
+    ],
+  ],
+  [
+    'name' => 'SavedSearch_Print_Page_PDF_Formats_SearchDisplay_Option_Values_Table_1',
+    'entity' => 'SearchDisplay',
+    'cleanup' => 'unused',
+    'update' => 'unmodified',
+    'params' => [
+      'version' => 4,
+      'values' => [
+        'name' => 'Option_Values_Table_1',
+        'label' => E::ts('Option Values'),
+        'saved_search_id.name' => 'Print_Page_PDF_Formats',
+        'type' => 'table',
+        'settings' => [
+          'description' => NULL,
+          'sort' => [],
+          'limit' => 50,
+          'pager' => [
+            'show_count' => FALSE,
+            'expose_limit' => FALSE,
+          ],
+          'placeholder' => 5,
+          'columns' => [
+            [
+              'type' => 'field',
+              'key' => 'label',
+              'dataType' => 'String',
+              'label' => E::ts('Name'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'description',
+              'dataType' => 'Text',
+              'label' => E::ts('Description'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'is_default',
+              'dataType' => 'Boolean',
+              'label' => E::ts('Default'),
+              'sortable' => TRUE,
+            ],
+            [
+              'text' => '',
+              'style' => 'default',
+              'size' => 'btn-xs',
+              'icon' => 'fa-bars',
+              'links' => [
+                [
+                  'entity' => '',
+                  'action' => '',
+                  'path' => 'civicrm/admin/pdfFormats/edit?action=update&id=[id]&reset=1',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-pencil',
+                  'text' => E::ts('Edit'),
+                  'style' => 'default',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'entity' => 'OptionValue',
+                  'action' => '',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-toggle-on',
+                  'text' => E::ts('Enable'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => 'enable',
+                  'condition' => [],
+                ],
+                [
+                  'task' => 'disable',
+                  'entity' => 'OptionValue',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-toggle-off',
+                  'text' => E::ts('Disable'),
+                  'style' => 'default',
+                  'path' => '',
+                  'action' => 'disable',
+                  'condition' => [],
+                ],
+                [
+                  'entity' => 'OptionValue',
+                  'action' => 'delete',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-trash',
+                  'text' => E::ts('Delete'),
+                  'style' => 'danger',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+              ],
+              'type' => 'menu',
+              'alignment' => 'text-right',
+            ],
+          ],
+          'actions' => FALSE,
+          'classes' => [
+            'table',
+            'table-striped',
+          ],
+          'draggable' => 'weight',
+          'toolbar' => [
+            [
+              'path' => 'civicrm/admin/pdfFormats/edit?action=add&reset=1',
+              'icon' => 'fa-plus',
+              'text' => E::ts('Add PDF Page Format'),
+              'style' => 'primary',
+              'condition' => [],
+              'task' => '',
+              'entity' => '',
+              'action' => '',
+              'join' => '',
+              'target' => 'crm-popup',
+            ],
+          ],
+          'cssRules' => [
+            [
+              'disabled',
+              'is_active',
+              '=',
+              FALSE,
+            ],
+          ],
+        ],
+      ],
+      'match' => [
+        'saved_search_id',
+        'name',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_SMS_Provider.mgd.php b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_SMS_Provider.mgd.php
new file mode 100644
index 000000000..94231165b
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_admin_ui/managed/SavedSearch_SMS_Provider.mgd.php
@@ -0,0 +1,185 @@
+<?php
+use CRM_CivicrmAdminUi_ExtensionUtil as E;
+
+return [
+  [
+    'name' => 'SavedSearch_SMS_Provider',
+    'entity' => 'SavedSearch',
+    'cleanup' => 'unused',
+    'update' => 'unmodified',
+    'params' => [
+      'version' => 4,
+      'values' => [
+        'name' => 'SMS_Provider',
+        'label' => E::ts('SMS Provider'),
+        'api_entity' => 'SmsProvider',
+        'api_params' => [
+          'version' => 4,
+          'select' => [
+            'id',
+            'title',
+            'is_active',
+            'name',
+            'api_params',
+            'username',
+            'api_url',
+            'api_type:label',
+          ],
+          'orderBy' => [],
+          'where' => [],
+          'groupBy' => [],
+          'join' => [],
+          'having' => [],
+        ],
+      ],
+      'match' => [
+        'name',
+      ],
+    ],
+  ],
+  [
+    'name' => 'SavedSearch_SMS_Provider_SearchDisplay_SMS_Provider_Table_1',
+    'entity' => 'SearchDisplay',
+    'cleanup' => 'unused',
+    'update' => 'unmodified',
+    'params' => [
+      'version' => 4,
+      'values' => [
+        'name' => 'SMS_Provider_Table_1',
+        'label' => E::ts('SMS Provider'),
+        'saved_search_id.name' => 'SMS_Provider',
+        'type' => 'table',
+        'settings' => [
+          'description' => NULL,
+          'sort' => [],
+          'limit' => 50,
+          'pager' => [],
+          'placeholder' => 5,
+          'columns' => [
+            [
+              'type' => 'field',
+              'key' => 'id',
+              'dataType' => 'Integer',
+              'label' => E::ts('ID'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'html',
+              'key' => 'name',
+              'dataType' => 'String',
+              'label' => E::ts('Provider Details'),
+              'sortable' => TRUE,
+              'rewrite' => '<strong>[name]</strong> ([title])<br>API Type: [api_type:label]<br>API Url:[api_url]',
+            ],
+            [
+              'type' => 'field',
+              'key' => 'username',
+              'dataType' => 'String',
+              'label' => E::ts('Username'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'api_params',
+              'dataType' => 'Text',
+              'label' => E::ts('API Parameters'),
+              'sortable' => TRUE,
+              'rewrite' => '',
+            ],
+            [
+              'text' => '',
+              'style' => 'default',
+              'size' => 'btn-xs',
+              'icon' => 'fa-bars',
+              'links' => [
+                [
+                  'entity' => 'SmsProvider',
+                  'action' => 'update',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-pencil',
+                  'text' => E::ts('Edit'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'task' => 'enable',
+                  'entity' => 'SmsProvider',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-toggle-on',
+                  'text' => E::ts('Enable'),
+                  'style' => 'default',
+                  'path' => '',
+                  'action' => '',
+                ],
+                [
+                  'task' => 'disable',
+                  'entity' => 'SmsProvider',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-toggle-off',
+                  'text' => E::ts('Disable'),
+                  'style' => 'default',
+                  'path' => '',
+                  'action' => '',
+                ],
+                [
+                  'entity' => 'SmsProvider',
+                  'action' => 'delete',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-trash',
+                  'text' => E::ts('Delete'),
+                  'style' => 'danger',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+              ],
+              'type' => 'menu',
+              'alignment' => 'text-right',
+            ],
+          ],
+          'actions' => [
+            'delete',
+            'disable',
+            'enable',
+          ],
+          'classes' => [
+            'table',
+            'table-striped',
+          ],
+          'toolbar' => [
+            [
+              'action' => 'add',
+              'entity' => 'SmsProvider',
+              'text' => E::ts('Add SMS Provider'),
+              'icon' => 'fa-plus',
+              'style' => 'primary',
+              'target' => 'crm-popup',
+              'join' => '',
+              'path' => '',
+              'task' => '',
+              'condition' => [],
+            ],
+          ],
+          'cssRules' => [
+            [
+              'disabled',
+              'is_active',
+              '=',
+              FALSE,
+            ],
+          ],
+        ],
+      ],
+      'match' => [
+        'name',
+        'saved_search_id',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/ext/civicrm_search_ui/ang/afsearchFindMemberships.aff.html b/www/modules/civicrm/ext/civicrm_search_ui/ang/afsearchFindMemberships.aff.html
new file mode 100644
index 000000000..8604ba98b
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_search_ui/ang/afsearchFindMemberships.aff.html
@@ -0,0 +1,25 @@
+<fieldset af-fieldset="" open="" af-title="Find Memberships">
+  <details class="af-container af-layout-inline" af-title="Contact Filters" open="">
+    <af-field name="contact_id.display_name" defn="{label: 'Member Name', input_attrs: {}}" />
+    <af-field name="Membership_Contact_contact_id_01.tags" defn="{input_attrs: {multiple: true}}" />
+    <af-field name="Membership_Contact_contact_id_01.groups" defn="{input_attrs: {multiple: true}}" />
+    <af-field name="Membership_Contact_contact_id_01.contact_type" defn="{input_attrs: {multiple: true}}" />
+    <af-field name="Membership_Contact_contact_id_01.is_deleted" defn="{label: 'Search in Trash (deleted contacts)'}" />
+  </details>
+  <details class="af-container af-layout-inline" af-title="Membership Filters" open="">
+    <af-field name="membership_type_id" defn="{input_attrs: {multiple: true}, required: false}" />
+    <af-field name="source" />
+    <af-field name="id" />
+    <af-field name="Membership_ContributionRecur_contribution_recur_id_01.contribution_status_id" defn="{input_attrs: {multiple: true}, label: 'Auto-Renew Subscription Status?'}" />
+    <af-field name="join_date" defn="{input_type: 'Select', search_range: true, default_date_type: 'fixed', input_attrs: {}}" />
+    <af-field name="start_date" defn="{input_type: 'Select', search_range: true, default_date_type: 'fixed', input_attrs: {}}" />
+    <af-field name="end_date" defn="{input_type: 'Select', search_range: true, default_date_type: 'fixed', input_attrs: {}}" />
+    <af-field name="status_id" defn="{input_attrs: {multiple: true}, required: false, label: 'Membership Status'}" />
+    <af-field name="is_override" defn="{label: 'Membership Status Is Overriden?', input_type: 'Radio'}" />
+    <af-field name="is_test" defn="{afform_default: '0', input_type: 'Radio', label: 'Membership is a Test?'}" />
+    <af-field name="is_pay_later" defn="{input_type: 'Radio', label: 'Pay Later?'}" />
+    <af-field name="is_primary_member" />
+    <af-field name="Membership_MembershipStatus_status_id_01.is_current_member" defn="{input_type: 'Radio'}" />
+  </details>
+  <crm-search-display-table search-name="Find_Memberships" display-name="Find_Memberships"></crm-search-display-table>
+</fieldset>
diff --git a/www/modules/civicrm/ext/civicrm_search_ui/ang/afsearchFindMemberships.aff.json b/www/modules/civicrm/ext/civicrm_search_ui/ang/afsearchFindMemberships.aff.json
new file mode 100644
index 000000000..69190ec4e
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_search_ui/ang/afsearchFindMemberships.aff.json
@@ -0,0 +1,31 @@
+{
+    "type": "search",
+    "requires": null,
+    "entity_type": null,
+    "join_entity": null,
+    "title": "Find Memberships",
+    "description": null,
+    "placement": [],
+    "summary_contact_type": null,
+    "summary_weight": null,
+    "icon": "fa-id-badge",
+    "server_route": "civicrm/sk/members",
+    "is_public": false,
+    "permission": [
+        "access CiviCRM",
+        "access CiviMember"
+    ],
+    "permission_operator": "AND",
+    "redirect": null,
+    "submit_enabled": true,
+    "submit_limit": null,
+    "create_submission": false,
+    "manual_processing": false,
+    "allow_verification_by_email": false,
+    "email_confirmation_template_id": null,
+    "navigation": {
+        "parent": "Experimental",
+        "label": "Find Memberships",
+        "weight": 0
+    }
+}
diff --git a/www/modules/civicrm/ext/civicrm_search_ui/info.xml b/www/modules/civicrm/ext/civicrm_search_ui/info.xml
index dcd491af4..8b79f55da 100644
--- a/www/modules/civicrm/ext/civicrm_search_ui/info.xml
+++ b/www/modules/civicrm/ext/civicrm_search_ui/info.xml
@@ -5,24 +5,18 @@
   <description>Experimental extension providing replacements for core Search pages using SearchKit</description>
   <license>AGPL-3.0</license>
   <maintainer>
-    <author>Aidan Saunders</author>
-    <email>aidan.saunders@squiffle.uk</email>
+    <author>CiviCRM</author>
+    <email>info@civicrm.org</email>
   </maintainer>
   <urls>
-    <url desc="Main Extension Page">https://github.com/civicrm/civicrm-core/tree/master/ext/civicrm_search_ui</url>
     <url desc="Documentation">https://lab.civicrm.org/dev/core/-/issues/3912</url>
-    <url desc="Support">https://lab.civicrm.org/dev/core/-/issues</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>alpha</develStage>
-  <requires>
-    <ext>org.civicrm.search_kit</ext>
-    <ext>org.civicrm.afform</ext>
-  </requires>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>Replacement SearchKit/FormBuilder pages for core Search pages.</comments>
   <classloader>
@@ -37,7 +31,7 @@
   <mixins>
     <mixin>mgd-php@1.0.0</mixin>
     <mixin>setting-php@1.0.0</mixin>
-    <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>smarty@1.0.0</mixin>
   </mixins>
   <upgrader>CRM_CivicrmSearchUi_Upgrader</upgrader>
 </extension>
diff --git a/www/modules/civicrm/ext/civicrm_search_ui/managed/SavedSearch_Find_Memberships.mgd.php b/www/modules/civicrm/ext/civicrm_search_ui/managed/SavedSearch_Find_Memberships.mgd.php
new file mode 100644
index 000000000..070dbfef8
--- /dev/null
+++ b/www/modules/civicrm/ext/civicrm_search_ui/managed/SavedSearch_Find_Memberships.mgd.php
@@ -0,0 +1,309 @@
+<?php
+
+use CRM_CivicrmSearchUi_ExtensionUtil as E;
+
+return [
+  [
+    'name' => 'SavedSearch_Find_Memberships',
+    'entity' => 'SavedSearch',
+    'cleanup' => 'unused',
+    'update' => 'unmodified',
+    'params' => [
+      'version' => 4,
+      'values' => [
+        'name' => 'Find_Memberships',
+        'label' => E::ts('Find Memberships'),
+        'api_entity' => 'Membership',
+        'api_params' => [
+          'version' => 4,
+          'select' => [
+            'contact_id.sort_name',
+            'membership_type_id:label',
+            'join_date',
+            'start_date',
+            'end_date',
+            'source',
+            'status_id:label',
+            'Membership_ContributionRecur_contribution_recur_id_01.auto_renew',
+            'Membership_ContributionRecur_contribution_recur_id_01.contribution_status_id:label',
+            'owner_membership_id',
+          ],
+          'orderBy' => [
+            [
+              'join_date',
+              'DESC',
+            ],
+          ],
+          'where' => [],
+          'groupBy' => [],
+          'join' => [
+            [
+              'ContributionRecur AS Membership_ContributionRecur_contribution_recur_id_01',
+              'LEFT',
+              [
+                'contribution_recur_id',
+                '=',
+                'Membership_ContributionRecur_contribution_recur_id_01.id',
+              ],
+            ],
+            [
+              'Contact AS Membership_Contact_contact_id_01',
+              'LEFT',
+              [
+                'contact_id',
+                '=',
+                'Membership_Contact_contact_id_01.id',
+              ],
+            ],
+            [
+              'MembershipStatus AS Membership_MembershipStatus_status_id_01',
+              'LEFT',
+              [
+                'status_id',
+                '=',
+                'Membership_MembershipStatus_status_id_01.id',
+              ],
+            ],
+          ],
+          'having' => [],
+        ],
+      ],
+      'match' => [
+        'name',
+      ],
+    ],
+  ],
+  [
+    'name' => 'SavedSearch_Find_Memberships_SearchDisplay_Find_Memberships',
+    'entity' => 'SearchDisplay',
+    'cleanup' => 'always',
+    'update' => 'unmodified',
+    'params' => [
+      'version' => 4,
+      'values' => [
+        'name' => 'Find_Memberships',
+        'label' => E::ts('Find Memberships'),
+        'saved_search_id.name' => 'Find_Memberships',
+        'type' => 'table',
+        'settings' => [
+          'description' => NULL,
+          'sort' => [],
+          'limit' => 50,
+          'pager' => [],
+          'placeholder' => 5,
+          'columns' => [
+            [
+              'type' => 'field',
+              'key' => 'contact_id.sort_name',
+              'dataType' => 'String',
+              'label' => E::ts('Name'),
+              'sortable' => TRUE,
+              'link' => [
+                'path' => '',
+                'entity' => 'Contact',
+                'action' => 'view',
+                'join' => 'contact_id',
+                'target' => '',
+              ],
+              'title' => E::ts('View Contact'),
+            ],
+            [
+              'type' => 'field',
+              'key' => 'membership_type_id:label',
+              'dataType' => 'Integer',
+              'label' => E::ts('Type'),
+              'sortable' => TRUE,
+              'rewrite' => "[membership_type_id:label] {if '[is_primary_member]' === 'No'} (by relationship) {/if}",
+            ],
+            [
+              'type' => 'field',
+              'key' => 'join_date',
+              'dataType' => 'Date',
+              'label' => E::ts('Member Since'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'start_date',
+              'dataType' => 'Date',
+              'label' => E::ts('Membership Start Date'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'end_date',
+              'dataType' => 'Date',
+              'label' => E::ts('Membership Expiration Date'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'source',
+              'dataType' => 'String',
+              'label' => E::ts('Membership Source'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'status_id:label',
+              'dataType' => 'Integer',
+              'label' => E::ts('Status'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'Membership_ContributionRecur_contribution_recur_id_01.auto_renew',
+              'dataType' => 'Boolean',
+              'label' => E::ts('Auto Renew'),
+              'sortable' => FALSE,
+              'alignment' => '',
+              'rewrite' => ' ',
+              'icons' => [
+                [
+                  'icon' => 'fa-ban',
+                  'side' => 'left',
+                  'if' => [
+                    'Membership_ContributionRecur_contribution_recur_id_01.contribution_status_id:name',
+                    '=',
+                    'Cancelled',
+                  ],
+                ],
+                [
+                  'icon' => 'fa-check',
+                  'side' => 'left',
+                  'if' => [
+                    'Membership_ContributionRecur_contribution_recur_id_01.contribution_status_id:name',
+                    'IS NOT EMPTY',
+                  ],
+                ],
+              ],
+            ],
+            [
+              'size' => 'btn-xs',
+              'links' => [
+                [
+                  'entity' => 'Membership',
+                  'action' => 'view',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('View'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'entity' => 'Membership',
+                  'action' => 'update',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-pencil',
+                  'text' => E::ts('Update'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+              ],
+              'type' => 'buttons',
+              'alignment' => 'text-right',
+            ],
+            [
+              'text' => '',
+              'style' => 'default',
+              'size' => 'btn-xs',
+              'icon' => 'fa-bars',
+              'links' => [
+                [
+                  'entity' => 'Membership',
+                  'action' => 'view',
+                  'join' => 'owner_membership_id',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('View Primary Member'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'entity' => 'Membership',
+                  'action' => 'renew',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('Renew Membership'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'entity' => 'Membership',
+                  'action' => 'followup',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('Renew-Credit Card Membership'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'entity' => 'Membership',
+                  'action' => 'cancelrecur',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('Cancel Auto-renewal'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'entity' => 'Membership',
+                  'action' => 'changebilling',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-external-link',
+                  'text' => E::ts('Change Billing Details'),
+                  'style' => 'default',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+                [
+                  'entity' => 'Membership',
+                  'action' => 'delete',
+                  'join' => '',
+                  'target' => 'crm-popup',
+                  'icon' => 'fa-trash',
+                  'text' => E::ts('Delete Membership'),
+                  'style' => 'danger',
+                  'path' => '',
+                  'task' => '',
+                  'condition' => [],
+                ],
+              ],
+              'type' => 'menu',
+              'alignment' => 'text-right',
+            ],
+          ],
+          'actions' => TRUE,
+          'classes' => [
+            'table',
+            'table-striped',
+          ],
+          'headerCount' => TRUE,
+        ],
+      ],
+      'match' => [
+        'saved_search_id',
+        'name',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/ext/civigrant/CRM/Grant/Form/Grant.php b/www/modules/civicrm/ext/civigrant/CRM/Grant/Form/Grant.php
index 28b025ed5..d418ed275 100644
--- a/www/modules/civicrm/ext/civigrant/CRM/Grant/Form/Grant.php
+++ b/www/modules/civicrm/ext/civigrant/CRM/Grant/Form/Grant.php
@@ -14,13 +14,14 @@
  *
  */
 class CRM_Grant_Form_Grant extends CRM_Core_Form {
+  use CRM_Custom_Form_CustomDataTrait;
 
   /**
    * The id of the grant when ACTION is update or delete.
    *
-   * @var int
+   * @var int|null
    */
-  protected $_id;
+  protected ?int $_id;
 
   /**
    * The id of the contact associated with this contribution.
@@ -45,9 +46,8 @@ public function getDefaultEntity() {
    */
   public function preProcess() {
 
-    $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this);
     $this->_grantType = NULL;
-    if ($this->_id) {
+    if ($this->getGrantID()) {
       $this->_grantType = CRM_Core_DAO::getFieldValue('CRM_Grant_DAO_Grant', $this->_id, 'grant_type_id');
       $this->_contactID = CRM_Core_DAO::getFieldValue('CRM_Grant_DAO_Grant', $this->_id, 'contact_id');
     }
@@ -80,16 +80,29 @@ public function preProcess() {
       }
     }
 
-    // when custom data is included in this page
-    if (!empty($_POST['hidden_custom'])) {
-      $grantTypeId = empty($_POST['grant_type_id']) ? NULL : $_POST['grant_type_id'];
-      $this->set('type', 'Grant');
-      $this->set('subType', $grantTypeId);
-      $this->set('entityId', $this->_id);
-      CRM_Custom_Form_CustomData::preProcess($this, NULL, $grantTypeId, 1, 'Grant', $this->_id);
-      CRM_Custom_Form_CustomData::buildQuickForm($this);
-      CRM_Custom_Form_CustomData::setDefaultValues($this);
+    if ($this->isSubmitted()) {
+      // The custom data fields are added to the form by an ajax form.
+      // However, if they are not present in the element index they will
+      // not be available from `$this->getSubmittedValue()` in post process.
+      // We do not have to set defaults or otherwise render - just add to the element index.
+      $this->addCustomDataFieldsToForm('Grant', array_filter([
+        'id' => $this->getGrantID(),
+        'grant_type_id' => $this->getSubmittedValue('grant_type_id'),
+      ]));
+    }
+  }
+
+  /**
+   * @api supported for external use.
+   *
+   * @return int|null
+   * @throws \CRM_Core_Exception
+   */
+  public function getGrantID(): ?int {
+    if (!isset($this->_id)) {
+      $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this);
     }
+    return $this->_id;
   }
 
   /**
@@ -156,8 +169,7 @@ public function buildQuickForm() {
     $attributes = CRM_Core_DAO::getAttribute('CRM_Grant_DAO_Grant');
     $this->addSelect('grant_type_id', ['placeholder' => ts('- select type -'), 'onChange' => "CRM.buildCustomData( 'Grant', this.value );"], TRUE);
 
-    //need to assign custom data type and subtype to the template
-    $this->assign('customDataType', 'Grant');
+    //need to assign custom data subtype to the template
     $this->assign('customDataSubType', $this->_grantType);
     $this->assign('entityID', $this->_id);
 
@@ -243,7 +255,7 @@ public function postProcess() {
     $params['contact_id'] = $this->_contactID;
 
     // build custom data array
-    $params['custom'] = CRM_Core_BAO_CustomField::postProcess($params,
+    $params['custom'] = CRM_Core_BAO_CustomField::postProcess($this->getSubmittedValues(),
       $this->_id,
       'Grant'
     );
diff --git a/www/modules/civicrm/ext/civigrant/civigrant.php b/www/modules/civicrm/ext/civigrant/civigrant.php
index 1f491b57d..f88d511c0 100644
--- a/www/modules/civicrm/ext/civigrant/civigrant.php
+++ b/www/modules/civicrm/ext/civigrant/civigrant.php
@@ -54,16 +54,16 @@ function civigrant_civicrm_summaryActions(&$menu, $cid) {
  */
 function civigrant_civicrm_permission(&$permissions) {
   $permissions['access CiviGrant'] = [
-    E::ts('CiviGrant:') . ' ' . E::ts('access CiviGrant'),
-    E::ts('View all grants'),
+    'label' => E::ts('CiviGrant:') . ' ' . E::ts('access CiviGrant'),
+    'description' => E::ts('View all grants'),
   ];
   $permissions['edit grants'] = [
-    E::ts('CiviGrant:') . ' ' . E::ts('edit grants'),
-    E::ts('Create and update grants'),
+    'label' => E::ts('CiviGrant:') . ' ' . E::ts('edit grants'),
+    'description' => E::ts('Create and update grants'),
   ];
   $permissions['delete in CiviGrant'] = [
-    E::ts('CiviGrant:') . ' ' . E::ts('delete in CiviGrant'),
-    E::ts('Delete grants'),
+    'label' => E::ts('CiviGrant:') . ' ' . E::ts('delete in CiviGrant'),
+    'description' => E::ts('Delete grants'),
   ];
 }
 
diff --git a/www/modules/civicrm/ext/civigrant/info.xml b/www/modules/civicrm/ext/civigrant/info.xml
index 5292044bf..d6edb07fc 100644
--- a/www/modules/civicrm/ext/civigrant/info.xml
+++ b/www/modules/civicrm/ext/civigrant/info.xml
@@ -12,11 +12,11 @@
     <url desc="Documentation">https://docs.civicrm.org/user/en/latest/grants/what-is-civigrant/</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>CiviGrant was originally a core component before migrating to an extension</comments>
   <requires>
@@ -32,7 +32,7 @@
     <mixin>menu-xml@1.0.0</mixin>
     <mixin>mgd-php@1.0.0</mixin>
     <mixin>afform-entity-php@1.0.0</mixin>
-    <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>smarty@1.0.0</mixin>
     <mixin>entity-types-php@1.0.0</mixin>
     <mixin>scan-classes@1.0.0</mixin>
   </mixins>
diff --git a/www/modules/civicrm/ext/civigrant/sql/auto_install.sql b/www/modules/civicrm/ext/civigrant/sql/auto_install.sql
index a8afd74d8..c3ab65d43 100644
--- a/www/modules/civicrm/ext/civigrant/sql/auto_install.sql
+++ b/www/modules/civicrm/ext/civigrant/sql/auto_install.sql
@@ -55,4 +55,4 @@ CREATE TABLE `civicrm_grant` (
   CONSTRAINT FK_civicrm_grant_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
   CONSTRAINT FK_civicrm_grant_financial_type_id FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL
 )
-ENGINE=InnoDB;
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
diff --git a/www/modules/civicrm/ext/civigrant/templates/CRM/Grant/Form/Grant.tpl b/www/modules/civicrm/ext/civigrant/templates/CRM/Grant/Form/Grant.tpl
index 22d7865e5..459d5e32b 100644
--- a/www/modules/civicrm/ext/civigrant/templates/CRM/Grant/Form/Grant.tpl
+++ b/www/modules/civicrm/ext/civigrant/templates/CRM/Grant/Form/Grant.tpl
@@ -75,7 +75,7 @@
       </tr>
   </table>
 
-  {include file="CRM/common/customDataBlock.tpl"}
+  {include file="CRM/common/customDataBlock.tpl" groupID='' customDataType='Grant' cid=false}
 
   <div class="crm-grant-form-block-attachment">
     {include file="CRM/Form/attachment.tpl"}
diff --git a/www/modules/civicrm/ext/civigrant/templates/CRM/Grant/Form/Search.tpl b/www/modules/civicrm/ext/civigrant/templates/CRM/Grant/Form/Search.tpl
index b6da5cf86..556b6857d 100644
--- a/www/modules/civicrm/ext/civigrant/templates/CRM/Grant/Form/Search.tpl
+++ b/www/modules/civicrm/ext/civigrant/templates/CRM/Grant/Form/Search.tpl
@@ -9,10 +9,10 @@
 *}
 
 <div class="crm-block crm-form-block crm-search-form-block">
-  <div class="crm-accordion-wrapper crm-member_search_form-accordion {if $rows}collapsed{/if}">
-   <div class="crm-accordion-header crm-master-accordion-header">
+  <details class="crm-accordion-light crm-member_search_form-accordion" {if $rows}{else}open{/if}>
+   <summary>
       {ts}Edit Search Criteria{/ts}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
   <div class="crm-accordion-body">
       {strip}
         <div class="help">
@@ -29,8 +29,8 @@
 
         </table>
         {/strip}
-    </div><!-- /.crm-accordion-body -->
-  </div><!-- /.crm-accordion-wrapper -->
+    </div>
+  </details>
 </div><!-- /.crm-form-block -->
 
 <div class="crm-content-block">
diff --git a/www/modules/civicrm/ext/civiimport/Civi/Api4/Import/ImportSpecProvider.php b/www/modules/civicrm/ext/civiimport/Civi/Api4/Import/ImportSpecProvider.php
index 60f4d939d..6105e6ee6 100644
--- a/www/modules/civicrm/ext/civiimport/Civi/Api4/Import/ImportSpecProvider.php
+++ b/www/modules/civicrm/ext/civiimport/Civi/Api4/Import/ImportSpecProvider.php
@@ -41,10 +41,7 @@ public function modifySpec(RequestSpec $spec): void {
       // table is deleted - & hence we get an error.
       return;
     }
-    // CheckPermissions does not reach us here - so we will have to rely on earlier permission filters.
-    $userJobID = substr($spec->getEntity(), (strpos($spec->getEntity(), '_') + 1));
-    $userJob = UserJob::get(FALSE)->addWhere('id', '=', $userJobID)->addSelect('metadata', 'job_type', 'created_id')->execute()->first();
-    $entity = CRM_Core_BAO_UserJob::getType($userJob['job_type'])['entity'];
+    $userJobType = $this->getJobType($spec);
     foreach ($columns as $column) {
       $isInternalField = strpos($column['name'], '_') === 0;
       $exists = $isInternalField && $spec->getFieldByName($column['name']);
@@ -60,14 +57,9 @@ public function modifySpec(RequestSpec $spec): void {
       $field->setDescription(ts('Data being imported into the field.'));
       $field->setColumnName($column['name']);
       if ($column['name'] === '_entity_id') {
-        $jobTypes = CRM_Core_BAO_UserJob::getTypes();
-        foreach ($jobTypes as $jobType) {
-          if ($userJob['job_type'] === $jobType['id'] && $jobType['entity']) {
-            $field->setFkEntity($jobType['entity']);
-            $field->setInputType('EntityRef');
-            $field->setInputAttrs(['label' => $entity]);
-          }
-        }
+        $field->setFkEntity($userJobType['entity']);
+        $field->setInputType('EntityRef');
+        $field->setInputAttrs(['label' => $userJobType['entity']]);
       }
       $spec->addFieldSpec($field);
     }
@@ -78,7 +70,26 @@ public function modifySpec(RequestSpec $spec): void {
    * @inheritDoc
    */
   public function applies($entity, $action): bool {
-    return strpos($entity, 'Import_') === 0;
+    return str_starts_with($entity, 'Import_');
+  }
+
+  /**
+   * Get the user job type detail.
+   *
+   * @param \Civi\Api4\Service\Spec\RequestSpec $spec
+   *
+   * @return array
+   * @throws \CRM_Core_Exception
+   */
+  public function getJobType(RequestSpec $spec): array {
+    // CheckPermissions does not reach us here - so we will have to rely on earlier permission filters.
+    [, $userJobID] = explode('_', $spec->getEntity(), 2);
+    $userJob = UserJob::get(FALSE)
+      ->addWhere('id', '=', $userJobID)
+      ->addSelect('metadata', 'job_type', 'created_id')
+      ->execute()
+      ->first();
+    return CRM_Core_BAO_UserJob::getType($userJob['job_type']);
   }
 
 }
diff --git a/www/modules/civicrm/ext/civiimport/Civi/BAO/Import.php b/www/modules/civicrm/ext/civiimport/Civi/BAO/Import.php
index b7e956afc..6c9f79d36 100644
--- a/www/modules/civicrm/ext/civiimport/Civi/BAO/Import.php
+++ b/www/modules/civicrm/ext/civiimport/Civi/BAO/Import.php
@@ -61,13 +61,6 @@ public static function getImportTables(): array {
     return _civiimport_civicrm_get_import_tables();
   }
 
-  /**
-   * @return string[]
-   */
-  protected function getPrimaryKey(): array {
-    return self::$_primaryKey;
-  }
-
   /**
    * Returns fields generic to all imports, indexed by name.
    *
@@ -285,24 +278,4 @@ private static function getAllFields(string $tableName): array {
     return array_merge(self::getFieldsForTable($tableName), self::getSupportedFields());
   }
 
-  /**
-   * Defines the default key as 'id'.
-   *
-   * @return array
-   */
-  public function keys() {
-    return ['_id'];
-  }
-
-  /**
-   * Tells DB_DataObject which keys use autoincrement.
-   * 'id' is autoincrementing by default.
-   *
-   *
-   * @return array
-   */
-  public function sequenceKey() {
-    return ['_id', TRUE];
-  }
-
 }
diff --git a/www/modules/civicrm/ext/civiimport/Managed/UserJobSearches.mgd.php b/www/modules/civicrm/ext/civiimport/Managed/UserJobSearches.mgd.php
index 22747d494..04e815738 100644
--- a/www/modules/civicrm/ext/civiimport/Managed/UserJobSearches.mgd.php
+++ b/www/modules/civicrm/ext/civiimport/Managed/UserJobSearches.mgd.php
@@ -22,6 +22,9 @@
           'select' => [
             'id',
             'created_date',
+            'expires_date',
+            'start_date',
+            'end_date',
             'status_id:label',
             'job_type:label',
           ],
@@ -55,6 +58,82 @@
       ],
     ],
   ],
+  [
+    'name' => 'SavedSearch_My_imports_display',
+    'entity' => 'SearchDisplay',
+    'cleanup' => 'always',
+    'update' => 'unmodified',
+    'params' => [
+      'version' => 4,
+      'values' => [
+        'name' => 'My_imports_display',
+        'label' => E::ts('My imports'),
+        'saved_search_id.name' => 'My_imports',
+        'type' => 'table',
+        'settings' => [
+          'description' => NULL,
+          'sort' => [],
+          'limit' => 50,
+          'pager' => [],
+          'placeholder' => 5,
+          'columns' => [
+            [
+              'type' => 'field',
+              'key' => 'id',
+              'dataType' => 'Integer',
+              'label' => E::ts('User Job ID'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'created_date',
+              'dataType' => 'Timestamp',
+              'label' => E::ts('Import Job Created Date'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'expires_date',
+              'dataType' => 'Timestamp',
+              'label' => E::ts('Import Job Expires Date'),
+              'sortable' => TRUE,
+              'editable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'end_date',
+              'dataType' => 'Timestamp',
+              'label' => E::ts('Job Ended Date'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'status_id:label',
+              'dataType' => 'Integer',
+              'label' => E::ts('Job Status'),
+              'sortable' => TRUE,
+            ],
+            [
+              'type' => 'field',
+              'key' => 'job_type:label',
+              'dataType' => 'String',
+              'label' => E::ts('Job Type'),
+              'sortable' => TRUE,
+            ],
+          ],
+          'actions' => TRUE,
+          'classes' => [
+            'table',
+            'table-striped',
+          ],
+        ],
+      ],
+      'match' => [
+        'saved_search_id',
+        'name',
+      ],
+    ],
+  ],
   [
     'name' => 'SavedSearch_Import_Templates',
     'entity' => 'SavedSearch',
@@ -197,6 +276,7 @@
             'job_type:label',
             'start_date',
             'end_date',
+            'expires_date',
             'status_id:label',
           ],
           'orderBy' => [],
@@ -278,6 +358,14 @@
               'label' => E::ts('Created Date'),
               'sortable' => TRUE,
             ],
+            [
+              'type' => 'field',
+              'key' => 'expires_date',
+              'dataType' => 'Timestamp',
+              'label' => E::ts('Expires Date'),
+              'sortable' => TRUE,
+              'editable' => TRUE,
+            ],
             [
               'type' => 'field',
               'key' => 'job_type:label',
diff --git a/www/modules/civicrm/ext/civiimport/README.md b/www/modules/civicrm/ext/civiimport/README.md
index 3a6a09651..a43ffd5a5 100644
--- a/www/modules/civicrm/ext/civiimport/README.md
+++ b/www/modules/civicrm/ext/civiimport/README.md
@@ -1,44 +1,3 @@
-# civiimport
+# CiviImport
 
-![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.2+
-* CiviCRM (*FIXME: Version number*)
-
-## Installation (Web UI)
-
-Learn more about installing CiviCRM extensions in the [CiviCRM Sysadmin Guide](https://docs.civicrm.org/sysadmin/en/latest/customize/extensions/).
-
-## 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 civiimport@https://github.com/FIXME/civiimport/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/civiimport.git
-cv en civiimport
-```
-
-## Getting Started
-
-(* FIXME: Where would a new user navigate to get started? What changes would they see? *)
-
-## Known Issues
-
-(* FIXME *)
+New Import UI for CiviCRM.
diff --git a/www/modules/civicrm/ext/civiimport/ang/afsearchMyImports.aff.html b/www/modules/civicrm/ext/civiimport/ang/afsearchMyImports.aff.html
index bc64d9fc9..104eaf9c4 100644
--- a/www/modules/civicrm/ext/civiimport/ang/afsearchMyImports.aff.html
+++ b/www/modules/civicrm/ext/civiimport/ang/afsearchMyImports.aff.html
@@ -1,3 +1,3 @@
 <div af-fieldset="">
-  <crm-search-display-table search-name="My_imports" display-name=""></crm-search-display-table>
+  <crm-search-display-table search-name="My_imports" display-name="My_imports_display"></crm-search-display-table>
 </div>
diff --git a/www/modules/civicrm/ext/civiimport/images/screenshot.png b/www/modules/civicrm/ext/civiimport/images/screenshot.png
deleted file mode 100644
index 6765b696f..000000000
Binary files a/www/modules/civicrm/ext/civiimport/images/screenshot.png and /dev/null differ
diff --git a/www/modules/civicrm/ext/civiimport/info.xml b/www/modules/civicrm/ext/civiimport/info.xml
index a5ad0a788..be4c80655 100644
--- a/www/modules/civicrm/ext/civiimport/info.xml
+++ b/www/modules/civicrm/ext/civiimport/info.xml
@@ -14,11 +14,11 @@
     <url desc="Support">http://civicrm.org</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>This extension contains import functionality which was previously in CiviCRM Core. If you use the import functionality it is recommended to enable this extension.</comments>
   <requires>
@@ -39,6 +39,6 @@
     <mixin>scan-classes@1.0.0</mixin>
     <mixin>setting-php@1.0.0</mixin>
     <mixin>ang-php@1.0.0</mixin>
-    <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>smarty@1.0.0</mixin>
   </mixins>
 </extension>
diff --git a/www/modules/civicrm/ext/ckeditor4/README.md b/www/modules/civicrm/ext/ckeditor4/README.md
index d7cb51e26..b5d163579 100644
--- a/www/modules/civicrm/ext/ckeditor4/README.md
+++ b/www/modules/civicrm/ext/ckeditor4/README.md
@@ -1,44 +1,8 @@
-# ckeditor4
+# CKEditor 4 Extension
 
-![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.2+
-* CiviCRM (*FIXME: Version number*)
-
-## Installation (Web UI)
-
-Learn more about installing CiviCRM extensions in the [CiviCRM Sysadmin Guide](https://docs.civicrm.org/sysadmin/en/latest/customize/extensions/).
-
-## 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 ckeditor4@https://github.com/FIXME/ckeditor4/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/ckeditor4.git
-cv en ckeditor4
-```
+Provides CKEditor version 4 as an available WYSIWYG editor.
 
 ## Getting Started
 
-(* FIXME: Where would a new user navigate to get started? What changes would they see? *)
-
-## Known Issues
-
-(* FIXME *)
+After installing the extension, go to **Administer -> Customize Data & Screens -> Display Preferences** and select "CKEditor 4" as the Wysiwyg Editor.
+Optionally click on the "Configure CKEditor 4" button to customize the buttons, settings and features.
diff --git a/www/modules/civicrm/ext/ckeditor4/images/screenshot.png b/www/modules/civicrm/ext/ckeditor4/images/screenshot.png
deleted file mode 100644
index 6765b696f..000000000
Binary files a/www/modules/civicrm/ext/ckeditor4/images/screenshot.png and /dev/null differ
diff --git a/www/modules/civicrm/ext/ckeditor4/info.xml b/www/modules/civicrm/ext/ckeditor4/info.xml
index 027df2e4f..f62d8c5d8 100644
--- a/www/modules/civicrm/ext/ckeditor4/info.xml
+++ b/www/modules/civicrm/ext/ckeditor4/info.xml
@@ -14,11 +14,11 @@
     <url desc="Support">https://github.com/civicrm/civicrm-core/</url>
     <url desc="Licensing">https://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>This is the version of CKEditor that originally shipped with CiviCRM core</comments>
   <classloader>
@@ -27,7 +27,7 @@
   </classloader>
   <mixins>
     <mixin>menu-xml@1.0.0</mixin>
-    <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>smarty@1.0.0</mixin>
   </mixins>
   <civix>
     <namespace>CRM/Ckeditor4</namespace>
diff --git a/www/modules/civicrm/ext/contributioncancelactions/info.xml b/www/modules/civicrm/ext/contributioncancelactions/info.xml
index e21c8e21b..a2df09849 100644
--- a/www/modules/civicrm/ext/contributioncancelactions/info.xml
+++ b/www/modules/civicrm/ext/contributioncancelactions/info.xml
@@ -14,11 +14,11 @@
     <url desc="Support">http://civicrm.org</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>This code has been moved from core to a separate extension in 5.32. Note that if you disable it failed or cancelled contributions will not cause related memberships and participant records to be updated</comments>
   <classloader>
diff --git a/www/modules/civicrm/ext/contributioncancelactions/tests/phpunit/CancelTest.php b/www/modules/civicrm/ext/contributioncancelactions/tests/phpunit/CancelTest.php
index 66a37805f..0b8ecbe30 100644
--- a/www/modules/civicrm/ext/contributioncancelactions/tests/phpunit/CancelTest.php
+++ b/www/modules/civicrm/ext/contributioncancelactions/tests/phpunit/CancelTest.php
@@ -4,6 +4,7 @@
 use Civi\Api4\Contribution;
 use Civi\Test\Api3TestTrait;
 use Civi\Test\CiviEnvBuilder;
+use Civi\Test\FormTrait;
 use Civi\Test\HeadlessInterface;
 use Civi\Test\HookInterface;
 use Civi\Test\TransactionalInterface;
@@ -35,6 +36,7 @@ class CancelTest extends TestCase implements HeadlessInterface, HookInterface, T
 
   use Api3TestTrait;
   use ContactTestTrait;
+  use FormTrait;
 
   /**
    * Created ids.
@@ -271,17 +273,13 @@ public function testCancelFromContributionForm(): void {
     $this->createLoggedInUser();
     $formValues = [
       'contact_id' => $this->ids['contact'][0],
+      'financial_type_id' => 1,
       'contribution_status_id' => CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Cancelled'),
     ];
-    $form = new CRM_Contribute_Form_Contribution();
-    $_SERVER['REQUEST_METHOD'] = 'GET';
-    $form->controller = new CRM_Core_Controller();
-    $form->controller->setStateMachine(new CRM_Core_StateMachine($form->controller));
-    $_SESSION['_' . $form->controller->_name . '_container']['values']['Contribution'] = $formValues;
-    $_REQUEST['action'] = 'update';
-    $_REQUEST['id'] = $this->ids['Contribution'][0];
-    $form->buildForm();
-    $form->postProcess();
+    $this->getTestForm('CRM_Contribute_Form_Contribution', $formValues, [
+      'action' => 'update',
+      'id' => $this->ids['Contribution'][0],
+    ])->processForm();
 
     $contribution = Contribution::get()
       ->addWhere('id', '=', $this->ids['Contribution'][0])
diff --git a/www/modules/civicrm/ext/elavon/CRM/Core/Payment/Elavon.php b/www/modules/civicrm/ext/elavon/CRM/Core/Payment/Elavon.php
index 3615ccf62..897900025 100644
--- a/www/modules/civicrm/ext/elavon/CRM/Core/Payment/Elavon.php
+++ b/www/modules/civicrm/ext/elavon/CRM/Core/Payment/Elavon.php
@@ -104,6 +104,7 @@ public function mapProcessorFieldstoParams($params) {
     // Added two lines below to allow commercial cards to go through as per page 15 of Elavon developer guide
     $requestFields['ssl_customer_code'] = '1111';
     $requestFields['ssl_salestax'] = 0.0;
+    $requestFields['ssl_cardholder_ip'] = CRM_Utils_System::ipAddress();
     return $requestFields;
   }
 
@@ -153,7 +154,6 @@ public function doPayment(&$params, $component = 'contribute') {
     if ($this->_mode === 'test') {
       $requestFields['ssl_test_mode'] = "TRUE";
     }
-
     // Allow further manipulation of the arguments via custom hooks ..
     CRM_Utils_Hook::alterPaymentProcessorParams($this, $params, $requestFields);
 
@@ -286,6 +286,7 @@ public function buildXML($requestFields) {
     $xmlFieldLength['ssl_salestax'] = 10;
     $xmlFieldLength['ssl_customer_code'] = 17;
     $xmlFieldLength['ssl_customer_number'] = 25;
+    $xmlFieldLength['ssl_cardholder_ip'] = 40;
 
     $xml = '<txn>';
     foreach ($requestFields as $key => $value) {
diff --git a/www/modules/civicrm/ext/elavon/info.xml b/www/modules/civicrm/ext/elavon/info.xml
index d4c9fed25..57c367124 100644
--- a/www/modules/civicrm/ext/elavon/info.xml
+++ b/www/modules/civicrm/ext/elavon/info.xml
@@ -14,11 +14,11 @@
     <url desc="Support">https://lab.civicrm.org</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments/>
   <classloader>
diff --git a/www/modules/civicrm/ext/elavon/tests/phpunit/CRM/Core/Payment/ElavonTest.php b/www/modules/civicrm/ext/elavon/tests/phpunit/CRM/Core/Payment/ElavonTest.php
index cdaf061ae..bcf6e93d4 100644
--- a/www/modules/civicrm/ext/elavon/tests/phpunit/CRM/Core/Payment/ElavonTest.php
+++ b/www/modules/civicrm/ext/elavon/tests/phpunit/CRM/Core/Payment/ElavonTest.php
@@ -182,7 +182,7 @@ public function getExpectedSinglePaymentResponses(): array {
    */
   public function getExpectedSinglePaymentRequests(): array {
     return [
-      'https://api.demo.convergepay.com/VirtualMerchantDemo/processxml.do?xmldata=%3Ctxn%3E%3Cssl_first_name%3EJohn%3C/ssl_first_name%3E%3Cssl_last_name%3EO%27Connor%3C/ssl_last_name%3E%3Cssl_ship_to_first_name%3EJohn%3C/ssl_ship_to_first_name%3E%3Cssl_ship_to_last_name%3EO%27Connor%3C/ssl_ship_to_last_name%3E%3Cssl_card_number%3E4444333322221111%3C/ssl_card_number%3E%3Cssl_amount%3E2%3C/ssl_amount%3E%3Cssl_exp_date%3E1022%3C/ssl_exp_date%3E%3Cssl_cvv2cvc2%3E123%3C/ssl_cvv2cvc2%3E%3Cssl_cvv2cvc2_indicator%3E1%3C/ssl_cvv2cvc2_indicator%3E%3Cssl_avs_address%3E8%20Hobbitton%20Road%3C/ssl_avs_address%3E%3Cssl_city%3EThe%20Shire%3C/ssl_city%3E%3Cssl_state%3ENSW%3C/ssl_state%3E%3Cssl_avs_zip%3E5010%3C/ssl_avs_zip%3E%3Cssl_country%3EAU%3C/ssl_country%3E%3Cssl_email%3Eunittesteway@civicrm.org%3C/ssl_email%3E%3Cssl_invoice_number%3Exyz%3C/ssl_invoice_number%3E%3Cssl_transaction_type%3ECCSALE%3C/ssl_transaction_type%3E%3Cssl_description%3ETest%20Contribution%3C/ssl_description%3E%3Cssl_customer_number%3E1111%3C/ssl_customer_number%3E%3Cssl_customer_code%3E1111%3C/ssl_customer_code%3E%3Cssl_salestax%3E0%3C/ssl_salestax%3E%3Cssl_merchant_id%3Eadfg%3C/ssl_merchant_id%3E%3Cssl_user_id%3Eabc1234%3C/ssl_user_id%3E%3Cssl_pin%3E12345%3C/ssl_pin%3E%3C/txn%3E',
+      'https://api.demo.convergepay.com/VirtualMerchantDemo/processxml.do?xmldata=%3Ctxn%3E%3Cssl_first_name%3EJohn%3C/ssl_first_name%3E%3Cssl_last_name%3EO%27Connor%3C/ssl_last_name%3E%3Cssl_ship_to_first_name%3EJohn%3C/ssl_ship_to_first_name%3E%3Cssl_ship_to_last_name%3EO%27Connor%3C/ssl_ship_to_last_name%3E%3Cssl_card_number%3E4444333322221111%3C/ssl_card_number%3E%3Cssl_amount%3E2%3C/ssl_amount%3E%3Cssl_exp_date%3E1022%3C/ssl_exp_date%3E%3Cssl_cvv2cvc2%3E123%3C/ssl_cvv2cvc2%3E%3Cssl_cvv2cvc2_indicator%3E1%3C/ssl_cvv2cvc2_indicator%3E%3Cssl_avs_address%3E8%20Hobbitton%20Road%3C/ssl_avs_address%3E%3Cssl_city%3EThe%20Shire%3C/ssl_city%3E%3Cssl_state%3ENSW%3C/ssl_state%3E%3Cssl_avs_zip%3E5010%3C/ssl_avs_zip%3E%3Cssl_country%3EAU%3C/ssl_country%3E%3Cssl_email%3Eunittesteway@civicrm.org%3C/ssl_email%3E%3Cssl_invoice_number%3Exyz%3C/ssl_invoice_number%3E%3Cssl_transaction_type%3ECCSALE%3C/ssl_transaction_type%3E%3Cssl_description%3ETest%20Contribution%3C/ssl_description%3E%3Cssl_customer_number%3E1111%3C/ssl_customer_number%3E%3Cssl_customer_code%3E1111%3C/ssl_customer_code%3E%3Cssl_salestax%3E0%3C/ssl_salestax%3E%3Cssl_cardholder_ip%3E127.0.0.1%3C/ssl_cardholder_ip%3E%3Cssl_merchant_id%3Eadfg%3C/ssl_merchant_id%3E%3Cssl_user_id%3Eabc1234%3C/ssl_user_id%3E%3Cssl_pin%3E12345%3C/ssl_pin%3E%3C/txn%3E',
     ];
   }
 
diff --git a/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/BAO/Cart.php b/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/BAO/Cart.php
index 111117115..a9187c3fc 100644
--- a/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/BAO/Cart.php
+++ b/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/BAO/Cart.php
@@ -67,12 +67,6 @@ public static function create($params) {
     $transaction = new CRM_Core_Transaction();
 
     $cart = self::add($params);
-
-    if (is_a($cart, 'CRM_Core_Error')) {
-      $transaction->rollback();
-      throw new CRM_Core_Exception(ts('There was an error creating an event cart'));
-    }
-
     $transaction->commit();
 
     return $cart;
diff --git a/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/BAO/EventInCart.php b/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/BAO/EventInCart.php
index b06844e7c..125f2383e 100644
--- a/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/BAO/EventInCart.php
+++ b/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/BAO/EventInCart.php
@@ -30,12 +30,6 @@ public static function create(&$params) {
     $event_in_cart = new CRM_Event_Cart_BAO_EventInCart();
     $event_in_cart->copyValues($params);
     $event_in_cart = $event_in_cart->save();
-
-    if (is_a($event_in_cart, 'CRM_Core_Error')) {
-      $transaction->rollback();
-      throw new CRM_Core_Exception(ts('There was an error creating an event_in_cart'));
-    }
-
     $transaction->commit();
 
     return $event_in_cart;
diff --git a/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/BAO/MerParticipant.php b/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/BAO/MerParticipant.php
index c1324e2d9..4bf12621a 100644
--- a/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/BAO/MerParticipant.php
+++ b/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/BAO/MerParticipant.php
@@ -56,11 +56,6 @@ public static function create(&$params) {
       'cart_id' => $params['cart_id'],
     ];
     $participant = CRM_Event_BAO_Participant::create($participantParams);
-
-    if (is_a($participant, 'CRM_Core_Error')) {
-      throw new CRM_Core_Exception(ts('There was an error creating a cart participant'));
-    }
-
     $mer_participant = new CRM_Event_Cart_BAO_MerParticipant($participant);
     return $mer_participant;
   }
diff --git a/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/Form/Cart.php b/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/Form/Cart.php
index 58fb238de..93acf303c 100644
--- a/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/Form/Cart.php
+++ b/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/Form/Cart.php
@@ -144,7 +144,7 @@ public static function find_or_create_contact($fields = []) {
       'email-Primary' => $fields['email'] ?? NULL,
       'first_name' => $fields['first_name'] ?? NULL,
       'last_name' => $fields['last_name'] ?? NULL,
-      'is_deleted' => CRM_Utils_Array::value('is_deleted', $fields, TRUE),
+      'is_deleted' => $fields['is_deleted'] ?? TRUE,
     ];
     $no_fields = [];
     $contact_id = CRM_Contact_BAO_Contact::createProfileContact($contact_params, $no_fields, NULL);
diff --git a/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.php b/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.php
index 5067ccf33..e829c24c1 100644
--- a/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.php
+++ b/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.php
@@ -12,12 +12,6 @@ class CRM_Event_Cart_Form_Checkout_ParticipantsAndPrices extends CRM_Event_Cart_
    */
   public function preProcess() {
     parent::preProcess();
-
-    $this->cid = CRM_Utils_Request::retrieve('cid', 'Positive', $this);
-    if (!isset($this->cid) || $this->cid > 0) {
-      //TODO users with permission can default to another contact
-      $this->cid = self::getContactID();
-    }
   }
 
   /**
@@ -47,8 +41,8 @@ public function buildQuickForm() {
       ]
     );
 
-    if ($this->cid) {
-      $params = ['id' => $this->cid];
+    if ($this->getContactID()) {
+      $params = ['id' => $this->getContactID()];
       $contact = CRM_Contact_BAO_Contact::retrieve($params, $defaults);
       $contact_values = [];
       CRM_Core_DAO::storeValues($contact, $contact_values);
@@ -95,8 +89,8 @@ public function build_price_options($event) {
       $index = -1;
       foreach ($price_set['fields'] as $field) {
         $index++;
-        if (CRM_Utils_Array::value('visibility', $field) == 'public' ||
-           (CRM_Utils_Array::value('visibility', $field) == 'admin' && $adminFieldVisible == TRUE)) {
+        if (($field['visibility'] ?? '') === 'public' ||
+           (($field['visibility'] ?? '') === 'admin' && $adminFieldVisible == TRUE)) {
           $field_name = "event_{$event->id}_price_{$field['id']}";
           if (!empty($field['options'])) {
             CRM_Price_BAO_PriceField::addQuickFormElement($this, $field_name, $field['id'], FALSE);
@@ -187,6 +181,7 @@ public function validate() {
    * Set default values.
    *
    * @return array
+   * @throws \CRM_Core_Exception
    */
   public function setDefaultValues() {
     $this->loadCart();
@@ -196,17 +191,17 @@ public function setDefaultValues() {
       $form = $participant->get_form();
       if (empty($participant->email)
         && ($participant->get_participant_index() == 1)
-        && ($this->cid != 0)
+        && ($this->getContactID() != 0)
       ) {
         $defaults = [];
-        $params = ['id' => $this->cid];
+        $params = ['id' => $this->getContactID()];
         $contact = CRM_Contact_BAO_Contact::retrieve($params, $defaults);
-        $participant->contact_id = $this->cid;
+        $participant->contact_id = $this->getContactID();
         $participant->save();
         $participant->email = self::primary_email_from_contact($contact);
       }
-      elseif ($this->cid == 0
-        && $participant->contact_id == self::getContactID()
+      elseif ($this->getContactID() == 0
+        && $participant->contact_id == $this->getContactID()
       ) {
         $participant->email = NULL;
         $participant->contact_id = self::find_or_create_contact();
@@ -227,7 +222,7 @@ public function setDefaultValues() {
             $field_name = "event_{$event_id}_price_{$field['id']}";
             foreach ($options as $value) {
               if ($value['is_default']) {
-                if ($field['html_type'] == 'Checkbox') {
+                if ($field['html_type'] === 'Checkbox') {
                   $defaults[$field_name] = 1;
                 }
                 else {
diff --git a/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/Form/Checkout/Payment.php b/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/Form/Checkout/Payment.php
index 175f7bd25..13ea1c7e9 100644
--- a/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/Form/Checkout/Payment.php
+++ b/www/modules/civicrm/ext/eventcart/CRM/Event/Cart/Form/Checkout/Payment.php
@@ -37,9 +37,9 @@ public function registerParticipant($params, &$participant, $event) {
       'id' => $participant->id,
       'event_id' => $event->id,
       'register_date' => date('YmdHis'),
-      'source' => CRM_Utils_Array::value('participant_source', $params, $this->description),
+      'source' => $params['participant_source'] ?? $this->description,
       'is_pay_later' => $this->is_pay_later,
-      'fee_amount' => CRM_Utils_Array::value('amount', $params, 0),
+      'fee_amount' => $params['amount'] ?? 0,
       'fee_currency' => $params['currencyID'] ?? NULL,
     ];
 
@@ -605,7 +605,7 @@ public function record_contribution(&$mer_participant, &$params, $event) {
       'trxn_id' => "{$params['trxn_id']}-{$this->sub_trxn_index}",
       'currency' => $params['currencyID'] ?? NULL,
       'source' => $event->title,
-      'is_pay_later' => CRM_Utils_Array::value('is_pay_later', $params, 0),
+      'is_pay_later' => $params['is_pay_later'] ?? 0,
       'contribution_status_id' => $params['contribution_status_id'],
       'payment_instrument_id' => $params['payment_instrument_id'],
       'check_number' => $params['check_number'] ?? NULL,
diff --git a/www/modules/civicrm/ext/eventcart/CRM/Event/Form/ManageEvent/Conference.php b/www/modules/civicrm/ext/eventcart/CRM/Event/Form/ManageEvent/Conference.php
index 3b751343b..e236076c6 100644
--- a/www/modules/civicrm/ext/eventcart/CRM/Event/Form/ManageEvent/Conference.php
+++ b/www/modules/civicrm/ext/eventcart/CRM/Event/Form/ManageEvent/Conference.php
@@ -14,6 +14,7 @@
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
+use Civi\Api4\Event;
 
 /**
  * This class generates form components for Conference Slots.
@@ -57,7 +58,7 @@ public function postProcess() {
     $params = $this->exportValues();
 
     $params['id'] = $this->_id;
-    CRM_Event_BAO_Event::add($params);
+    Event::save(FALSE)->addRecord($params)->execute();
 
     parent::endPostProcess();
   }
diff --git a/www/modules/civicrm/ext/eventcart/README.md b/www/modules/civicrm/ext/eventcart/README.md
index 55be91b80..28c050321 100644
--- a/www/modules/civicrm/ext/eventcart/README.md
+++ b/www/modules/civicrm/ext/eventcart/README.md
@@ -1,4 +1,4 @@
-# eventcart
+# Event Cart Extension
 
 This extracts most of the event cart functionality into an extension.
 
@@ -6,6 +6,6 @@ The extension is licensed under [AGPL-3.0](LICENSE.txt).
 
 ## Remaining work
 
-1. Move CRM_Event_Cart_DAO_Cart and CRM_Event_Cart_DAO_EventInCart from CiviCRM core (see https://github.com/civicrm/civicrm-core/pull/17339 for details).
-1. There are various places in CiviCRM which still check the setting `enable_cart`. These should be moved to this extension.
-1. The "Conference Slots" functionality is only enabled if Event Cart is enabled so that should be moved into this extension too.
+1. Migrate sql schema to the extension.
+2. Make extension un-hidden & optional.
+3. Remove the setting `enable_cart` in favor of enabling/disabling the extension.
diff --git a/www/modules/civicrm/ext/eventcart/images/screenshot.png b/www/modules/civicrm/ext/eventcart/images/screenshot.png
deleted file mode 100644
index 6765b696f..000000000
Binary files a/www/modules/civicrm/ext/eventcart/images/screenshot.png and /dev/null differ
diff --git a/www/modules/civicrm/ext/eventcart/info.xml b/www/modules/civicrm/ext/eventcart/info.xml
index bab4bd727..a6e01cd23 100644
--- a/www/modules/civicrm/ext/eventcart/info.xml
+++ b/www/modules/civicrm/ext/eventcart/info.xml
@@ -12,14 +12,14 @@
     <url desc="Main Extension Page">https://github.com/civicrm/civicrm-core/tree/master/ext/eventcart</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>
   <develStage>stable</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <classloader>
     <psr0 prefix="CRM_" path="."/>
@@ -28,7 +28,7 @@
   <mixins>
     <mixin>menu-xml@1.0.0</mixin>
     <mixin>setting-php@1.0.0</mixin>
-    <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>smarty@1.0.0</mixin>
   </mixins>
   <civix>
     <namespace>CRM/Event/Cart</namespace>
diff --git a/www/modules/civicrm/ext/ewaysingle/README.md b/www/modules/civicrm/ext/ewaysingle/README.md
index 81ddd1e7a..0a1793753 100644
--- a/www/modules/civicrm/ext/ewaysingle/README.md
+++ b/www/modules/civicrm/ext/ewaysingle/README.md
@@ -1,28 +1,7 @@
 # ewaysingle
 
-![Screenshot](/images/screenshot.png)
-
 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.1+
-* CiviCRM 5.31
-
-## Installation (Web UI)
-
-Navigate to the Extensions Page and install the extension.
-
-## Installation (CLI)
-
-To enable this extension in the CLI do the following
-
-```bash
-cv en ewaysingle
-```
-
 ## Usage
 
 The eWAY (Single Currency) Payment Processor Type will show up as one of the options when your adding in a PaymentProcessor.
diff --git a/www/modules/civicrm/ext/ewaysingle/images/screenshot.png b/www/modules/civicrm/ext/ewaysingle/images/screenshot.png
deleted file mode 100644
index 6765b696f..000000000
Binary files a/www/modules/civicrm/ext/ewaysingle/images/screenshot.png and /dev/null differ
diff --git a/www/modules/civicrm/ext/ewaysingle/info.xml b/www/modules/civicrm/ext/ewaysingle/info.xml
index 2b9ed7c9a..7e5becfb7 100644
--- a/www/modules/civicrm/ext/ewaysingle/info.xml
+++ b/www/modules/civicrm/ext/ewaysingle/info.xml
@@ -14,14 +14,14 @@
     <url desc="Support">https://github.com/civicrm/civicrm-core/blob/master/ext/ewaysingle</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>
   <develStage>stable</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>This is an extension to contain the eWAY Single Currency Payment Processor</comments>
   <classloader>
diff --git a/www/modules/civicrm/ext/financialacls/README.md b/www/modules/civicrm/ext/financialacls/README.md
index 531f9bea7..fb934d4d3 100644
--- a/www/modules/civicrm/ext/financialacls/README.md
+++ b/www/modules/civicrm/ext/financialacls/README.md
@@ -1,44 +1,3 @@
-# financialacls
+# Financial ACL Extension
 
-![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 *)
+Core extension to handle ACLs (permissions) for Financial Types.
diff --git a/www/modules/civicrm/ext/financialacls/financialacls.php b/www/modules/civicrm/ext/financialacls/financialacls.php
index db21117fe..9cd745cb9 100644
--- a/www/modules/civicrm/ext/financialacls/financialacls.php
+++ b/www/modules/civicrm/ext/financialacls/financialacls.php
@@ -1,11 +1,10 @@
 <?php
 
 require_once 'financialacls.civix.php';
-// phpcs:disable
+
 use Civi\Api4\EntityFinancialAccount;
 use Civi\Api4\MembershipType;
 use CRM_Financialacls_ExtensionUtil as E;
-// phpcs:enable
 
 /**
  * Implements hook_civicrm_config().
@@ -59,7 +58,7 @@ function financialacls_civicrm_pre($op, $objectName, $id, &$params) {
   }
   if (in_array($objectName, ['LineItem', 'Product'], TRUE) && !empty($params['check_permissions'])) {
     if (empty($params['financial_type_id']) && !empty($params['id'])) {
-      $dao = CRM_Core_DAO_AllCoreTables::getFullName($objectName);
+      $dao = CRM_Core_DAO_AllCoreTables::getDAONameForEntity($objectName);
       $params['financial_type_id'] = CRM_Core_DAO::getFieldValue($dao, $params['id'], 'financial_type_id');
     }
     $operationMap = ['delete' => CRM_Core_Action::DELETE, 'edit' => CRM_Core_Action::UPDATE, 'create' => CRM_Core_Action::ADD];
@@ -211,6 +210,14 @@ function financialacls_civicrm_buildAmount($component, $form, &$feeBlock) {
       unset($feeBlock[$key]);
     }
   }
+  if (is_a($form, 'CRM_Event_Form_Participant')
+    && empty($feeBlock)
+    && ($_REQUEST['snippet'] ?? NULL) == CRM_Core_Smarty::PRINT_NOFORM
+  ) {
+    CRM_Core_Session::setStatus(ts('You do not have all the permissions needed for this page.'), 'Permission Denied', 'error');
+    return FALSE;
+  }
+
 }
 
 /**
@@ -246,23 +253,23 @@ function financialacls_civicrm_permission(&$permissions) {
     return;
   }
   $actions = [
-    'add' => ts('add'),
-    'view' => ts('view'),
-    'edit' => ts('edit'),
-    'delete' => ts('delete'),
+    'add' => E::ts('add'),
+    'view' => E::ts('view'),
+    'edit' => E::ts('edit'),
+    'delete' => E::ts('delete'),
   ];
   $financialTypes = \CRM_Contribute_BAO_Contribution::buildOptions('financial_type_id', 'validate');
   foreach ($financialTypes as $id => $type) {
     foreach ($actions as $action => $action_ts) {
       $permissions[$action . ' contributions of type ' . $type] = [
-        ts("CiviCRM: %1 contributions of type %2", [1 => $action_ts, 2 => $type]),
-        ts('%1 contributions of type %2', [1 => $action_ts, 2 => $type]),
+        'label' => E::ts("CiviCRM: %1 contributions of type %2", [1 => $action_ts, 2 => $type]),
+        'description' => E::ts('%1 contributions of type %2', [1 => $action_ts, 2 => $type]),
       ];
     }
   }
   $permissions['administer CiviCRM Financial Types'] = [
-    ts('CiviCRM: administer CiviCRM Financial Types'),
-    ts('Administer access to Financial Types'),
+    'label' => E::ts('CiviCRM: administer CiviCRM Financial Types'),
+    'description' => E::ts('Administer access to Financial Types'),
   ];
 }
 
@@ -361,26 +368,29 @@ function financialacls_civicrm_fieldOptions($entity, $field, &$options, $params)
   if (!financialacls_is_acl_limiting_enabled()) {
     return;
   }
-  if (in_array($entity, ['Contribution', 'ContributionRecur'], TRUE) && $field === 'financial_type_id' && $params['context'] === 'search') {
-    $action = CRM_Core_Action::VIEW;
-    // At this stage we are only considering the view action. Code from
-    // CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes().
-    $actions = [
-      CRM_Core_Action::VIEW => 'view',
-      CRM_Core_Action::UPDATE => 'edit',
-      CRM_Core_Action::ADD => 'add',
-      CRM_Core_Action::DELETE => 'delete',
-    ];
-    $cacheKey = 'available_types_' . $action;
-    if (!isset(\Civi::$statics['CRM_Financial_BAO_FinancialType'][$cacheKey])) {
-      foreach ($options as $finTypeId => $type) {
-        if (!CRM_Core_Permission::check($actions[$action] . ' contributions of type ' . $type)) {
-          unset($options[$finTypeId]);
+  $context = $params['context'];
+  if (in_array($entity, ['Contribution', 'ContributionRecur'], TRUE) && $field === 'financial_type_id') {
+    if ($context === 'search' || $context === 'create') {
+      // At this stage we are only considering the view & create actions. Code from
+      // CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes().
+      $actions = [
+        CRM_Core_Action::VIEW => 'view',
+        CRM_Core_Action::UPDATE => 'edit',
+        CRM_Core_Action::ADD => 'add',
+        CRM_Core_Action::DELETE => 'delete',
+      ];
+      $action = $context === 'create' ? CRM_Core_Action::ADD : CRM_Core_Action::VIEW;
+      $cacheKey = 'available_types_' . $action;
+      if (!isset(\Civi::$statics['CRM_Financial_BAO_FinancialType'][$cacheKey])) {
+        foreach ($options as $finTypeId => $type) {
+          if (!CRM_Core_Permission::check($actions[$action] . ' contributions of type ' . $type)) {
+            unset($options[$finTypeId]);
+          }
         }
+        \Civi::$statics['CRM_Financial_BAO_FinancialType'][$cacheKey] = $options;
       }
-      \Civi::$statics['CRM_Financial_BAO_FinancialType'][$cacheKey] = $options;
+      $options = \Civi::$statics['CRM_Financial_BAO_FinancialType'][$cacheKey];
     }
-    $options = \Civi::$statics['CRM_Financial_BAO_FinancialType'][$cacheKey];
   }
 }
 
diff --git a/www/modules/civicrm/ext/financialacls/images/screenshot.png b/www/modules/civicrm/ext/financialacls/images/screenshot.png
deleted file mode 100644
index 6765b696f..000000000
Binary files a/www/modules/civicrm/ext/financialacls/images/screenshot.png and /dev/null differ
diff --git a/www/modules/civicrm/ext/financialacls/info.xml b/www/modules/civicrm/ext/financialacls/info.xml
index 9eef5b2d2..a9711c68a 100644
--- a/www/modules/civicrm/ext/financialacls/info.xml
+++ b/www/modules/civicrm/ext/financialacls/info.xml
@@ -14,11 +14,11 @@
     <url desc="Support">http://FIXME</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <tags>
     <tag>mgmt:hidden</tag>
diff --git a/www/modules/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/BuildAmountHookTest.php b/www/modules/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/BuildAmountHookTest.php
index 0c24979bc..2a6e95fff 100644
--- a/www/modules/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/BuildAmountHookTest.php
+++ b/www/modules/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/BuildAmountHookTest.php
@@ -5,6 +5,8 @@
 use Civi\Api4\PriceField;
 use Civi\Api4\PriceSet;
 use Civi\Api4\PriceFieldValue;
+use Civi\Test\FormTrait;
+use Civi\Test\FormWrapper;
 
 // I fought the Autoloader and the autoloader won.
 require_once 'BaseTestClass.php';
@@ -15,6 +17,7 @@
  * @group headless
  */
 class BuildAmountHookTest extends BaseTestClass {
+  use FormTrait;
 
   /**
    * Test api applies permissions on line item actions (delete & get).
@@ -32,11 +35,9 @@ public function testBuildAmount(): void {
       ['financial_type_id:name' => 'Member Dues', 'name' => 'b', 'label' => 'b', 'amount' => 2],
     ])->setDefaults(['price_field_id' => '$id']))->execute();
     $this->setupLoggedInUserWithLimitedFinancialTypeAccess();
-    $form = new \CRM_Member_Form_Membership();
-    $form->controller = new \CRM_Core_Controller();
-    $form->set('priceSetId', $priceSet['id']);
-    \CRM_Price_BAO_PriceSet::buildPriceSet($form);
-    $priceField = reset($form->_priceSet['fields']);
+    $form = $this->getTestForm('CRM_Member_Form_Membership', ['price_set_id' => $priceSet['id']])->processForm(FormWrapper::CONSTRUCTED);
+    $fields = $form->getPriceFieldMetadata();
+    $priceField = reset($fields);
     $this->assertCount(1, $priceField['options']);
     $this->assertEquals('a', reset($priceField['options'])['name']);
   }
diff --git a/www/modules/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/FinancialTypeTest.php b/www/modules/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/FinancialTypeTest.php
index b7f79b09b..a0a7b2aa9 100644
--- a/www/modules/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/FinancialTypeTest.php
+++ b/www/modules/civicrm/ext/financialacls/tests/phpunit/Civi/Financialacls/FinancialTypeTest.php
@@ -50,19 +50,19 @@ public function testPermissionedFinancialTypes(): void {
       foreach ($actions as $action => $action_ts) {
         $this->assertEquals(
           [
-            ts('CiviCRM: %1 contributions of type %2', [
+            'label' => ts('CiviCRM: %1 contributions of type %2', [
               1 => $action_ts,
               2 => $type,
             ]),
-            ts('%1 contributions of type %2', [1 => $action_ts, 2 => $type]),
+            'description' => ts('%1 contributions of type %2', [1 => $action_ts, 2 => $type]),
           ],
           $permissions[$action . ' contributions of type ' . $type]
         );
       }
     }
     $this->assertEquals([
-      ts('CiviCRM: administer CiviCRM Financial Types'),
-      ts('Administer access to Financial Types'),
+      'label' => ts('CiviCRM: administer CiviCRM Financial Types'),
+      'description' => ts('Administer access to Financial Types'),
     ], $permissions['administer CiviCRM Financial Types']);
   }
 
diff --git a/www/modules/civicrm/ext/flexmailer/flexmailer.php b/www/modules/civicrm/ext/flexmailer/flexmailer.php
index c4d8b490b..f5dd151b2 100644
--- a/www/modules/civicrm/ext/flexmailer/flexmailer.php
+++ b/www/modules/civicrm/ext/flexmailer/flexmailer.php
@@ -48,3 +48,17 @@ function flexmailer_civicrm_container($container) {
   $container->addResource(new \Symfony\Component\Config\Resource\FileResource(__FILE__));
   \Civi\FlexMailer\Services::registerServices($container);
 }
+
+/**
+ * @see \CRM_Utils_Hook::scanClasses()
+ */
+function flexmailer_civicrm_scanClasses(array &$classes): void {
+  $prefix = 'Civi\\FlexMailer\\';
+  $dir = __DIR__ . '/src';
+  $delim = '\\';
+
+  foreach (\CRM_Utils_File::findFiles($dir, '*.php', TRUE) as $relFile) {
+    $relFile = str_replace(DIRECTORY_SEPARATOR, '/', $relFile);
+    $classes[] = $prefix . str_replace('/', $delim, substr($relFile, 0, -4));
+  }
+}
diff --git a/www/modules/civicrm/ext/flexmailer/info.xml b/www/modules/civicrm/ext/flexmailer/info.xml
index e115f1fe8..6116f2b47 100644
--- a/www/modules/civicrm/ext/flexmailer/info.xml
+++ b/www/modules/civicrm/ext/flexmailer/info.xml
@@ -14,8 +14,8 @@
     <url desc="Support">http://civicrm.stackexchange.com/</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <comments>
     FlexMailer is an email delivery engine which replaces the internal guts
@@ -23,7 +23,7 @@
     to provide richer email features.
   </comments>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <tags>
     <tag>mgmt:required</tag>
diff --git a/www/modules/civicrm/ext/flexmailer/src/API/MailingPreview.php b/www/modules/civicrm/ext/flexmailer/src/API/MailingPreview.php
index 448f9b9c0..4d7fafbef 100644
--- a/www/modules/civicrm/ext/flexmailer/src/API/MailingPreview.php
+++ b/www/modules/civicrm/ext/flexmailer/src/API/MailingPreview.php
@@ -3,7 +3,6 @@
 
 use Civi\FlexMailer\FlexMailer;
 use Civi\FlexMailer\FlexMailerTask;
-use Civi\FlexMailer\Listener\Abdicator;
 
 class MailingPreview {
 
@@ -33,11 +32,6 @@ public static function preview($apiRequest) {
       $mailing->copyValues($params);
     }
 
-    if (!Abdicator::isFlexmailPreferred($mailing) && empty($mailing->sms_provider_id)) {
-      require_once 'api/v3/Mailing.php';
-      return civicrm_api3_mailing_preview($params);
-    }
-
     $contactID = \CRM_Utils_Array::value('contact_id', $params,
       \CRM_Core_Session::singleton()->get('userID'));
 
diff --git a/www/modules/civicrm/ext/flexmailer/src/ClickTracker/HtmlClickTracker.php b/www/modules/civicrm/ext/flexmailer/src/ClickTracker/HtmlClickTracker.php
index 822ccbd19..39fa636ad 100644
--- a/www/modules/civicrm/ext/flexmailer/src/ClickTracker/HtmlClickTracker.php
+++ b/www/modules/civicrm/ext/flexmailer/src/ClickTracker/HtmlClickTracker.php
@@ -10,7 +10,12 @@
  */
 namespace Civi\FlexMailer\ClickTracker;
 
-class HtmlClickTracker implements ClickTrackerInterface {
+use Civi\Core\Service\AutoService;
+
+/**
+ * @service civi_flexmailer_html_click_tracker
+ */
+class HtmlClickTracker extends AutoService implements ClickTrackerInterface {
 
   public function filterContent($msg, $mailing_id, $queue_id) {
     return self::replaceHrefUrls($msg,
diff --git a/www/modules/civicrm/ext/flexmailer/src/ClickTracker/TextClickTracker.php b/www/modules/civicrm/ext/flexmailer/src/ClickTracker/TextClickTracker.php
index e3c12f3d5..e83dceccd 100644
--- a/www/modules/civicrm/ext/flexmailer/src/ClickTracker/TextClickTracker.php
+++ b/www/modules/civicrm/ext/flexmailer/src/ClickTracker/TextClickTracker.php
@@ -10,7 +10,12 @@
  */
 namespace Civi\FlexMailer\ClickTracker;
 
-class TextClickTracker implements ClickTrackerInterface {
+use Civi\Core\Service\AutoService;
+
+/**
+ * @service civi_flexmailer_text_click_tracker
+ */
+class TextClickTracker extends AutoService implements ClickTrackerInterface {
 
   public function filterContent($msg, $mailing_id, $queue_id) {
     return self::replaceTextUrls($msg,
diff --git a/www/modules/civicrm/ext/flexmailer/src/Listener/Abdicator.php b/www/modules/civicrm/ext/flexmailer/src/Listener/Abdicator.php
index e5761cc12..01467fa9a 100644
--- a/www/modules/civicrm/ext/flexmailer/src/Listener/Abdicator.php
+++ b/www/modules/civicrm/ext/flexmailer/src/Listener/Abdicator.php
@@ -10,6 +10,7 @@
  */
 namespace Civi\FlexMailer\Listener;
 
+use Civi\Core\Service\AutoService;
 use Civi\FlexMailer\Event\RunEvent;
 
 /**
@@ -22,8 +23,12 @@
  *
  * During incubation, we want to mostly step-aside -- for traditional
  * mailings, simply continue using the old system.
+ *
+ * @service civi_flexmailer_abdicator
  */
-class Abdicator {
+class Abdicator extends AutoService {
+
+  use IsActiveTrait;
 
   /**
    * @param \CRM_Mailing_BAO_Mailing $mailing
diff --git a/www/modules/civicrm/ext/flexmailer/src/Listener/Attachments.php b/www/modules/civicrm/ext/flexmailer/src/Listener/Attachments.php
index 6b387a7de..a4f796747 100644
--- a/www/modules/civicrm/ext/flexmailer/src/Listener/Attachments.php
+++ b/www/modules/civicrm/ext/flexmailer/src/Listener/Attachments.php
@@ -10,9 +10,15 @@
  */
 namespace Civi\FlexMailer\Listener;
 
+use Civi\Core\Service\AutoService;
 use Civi\FlexMailer\Event\ComposeBatchEvent;
 
-class Attachments extends BaseListener {
+/**
+ * @service civi_flexmailer_attachments
+ */
+class Attachments extends AutoService {
+
+  use IsActiveTrait;
 
   /**
    * Add any attachments.
diff --git a/www/modules/civicrm/ext/flexmailer/src/Listener/BaseListener.php b/www/modules/civicrm/ext/flexmailer/src/Listener/BaseListener.php
index fb4a31b48..472262c1e 100644
--- a/www/modules/civicrm/ext/flexmailer/src/Listener/BaseListener.php
+++ b/www/modules/civicrm/ext/flexmailer/src/Listener/BaseListener.php
@@ -10,24 +10,12 @@
  */
 namespace Civi\FlexMailer\Listener;
 
+/**
+ * @deprecated
+ *   As of Feb 2024, still used by Mosaico releases. Need at least a year to phase-out.
+ */
 class BaseListener {
-  /**
-   * @var bool
-   */
-  private $active = TRUE;
-
-  /**
-   * @return bool
-   */
-  public function isActive() {
-    return $this->active;
-  }
 
-  /**
-   * @param bool $active
-   */
-  public function setActive($active) {
-    $this->active = $active;
-  }
+  use IsActiveTrait;
 
 }
diff --git a/www/modules/civicrm/ext/flexmailer/src/Listener/BasicHeaders.php b/www/modules/civicrm/ext/flexmailer/src/Listener/BasicHeaders.php
index 4a4483799..f8600a609 100644
--- a/www/modules/civicrm/ext/flexmailer/src/Listener/BasicHeaders.php
+++ b/www/modules/civicrm/ext/flexmailer/src/Listener/BasicHeaders.php
@@ -10,9 +10,15 @@
  */
 namespace Civi\FlexMailer\Listener;
 
+use Civi\Core\Service\AutoService;
 use Civi\FlexMailer\Event\ComposeBatchEvent;
 
-class BasicHeaders extends BaseListener {
+/**
+ * @service civi_flexmailer_basic_headers
+ */
+class BasicHeaders extends AutoService {
+
+  use IsActiveTrait;
 
   /**
    * Inject basic headers
@@ -34,8 +40,7 @@ public function onCompose(ComposeBatchEvent $e) {
       }
 
       list($verp) = $mailing->getVerpAndUrlsAndHeaders(
-        $e->getJob()->id, $task->getEventQueueId(), $task->getHash(),
-        $task->getAddress());
+        $e->getJob()->id, $task->getEventQueueId(), $task->getHash());
 
       $mailParams = [];
       $mailParams['List-Unsubscribe'] = "<mailto:{$verp['unsubscribe']}>";
diff --git a/www/modules/civicrm/ext/flexmailer/src/Listener/BounceTracker.php b/www/modules/civicrm/ext/flexmailer/src/Listener/BounceTracker.php
index e3c3dd112..3258010bc 100644
--- a/www/modules/civicrm/ext/flexmailer/src/Listener/BounceTracker.php
+++ b/www/modules/civicrm/ext/flexmailer/src/Listener/BounceTracker.php
@@ -10,9 +10,15 @@
  */
 namespace Civi\FlexMailer\Listener;
 
+use Civi\Core\Service\AutoService;
 use Civi\FlexMailer\Event\ComposeBatchEvent;
 
-class BounceTracker extends BaseListener {
+/**
+ * @service civi_flexmailer_bounce_tracker
+ */
+class BounceTracker extends AutoService {
+
+  use IsActiveTrait;
 
   /**
    * Inject bounce-tracking codes.
@@ -30,8 +36,7 @@ public function onCompose(ComposeBatchEvent $e) {
     foreach ($e->getTasks() as $task) {
       /** @var \Civi\FlexMailer\FlexMailerTask $task */
       list($verp) = $mailing->getVerpAndUrlsAndHeaders(
-        $e->getJob()->id, $task->getEventQueueId(), $task->getHash(),
-        $task->getAddress());
+        $e->getJob()->id, $task->getEventQueueId(), $task->getHash());
 
       if (!$task->getMailParam('Return-Path')) {
         $task->setMailParam('Return-Path', $defaultReturnPath ?? $verp['bounce']);
diff --git a/www/modules/civicrm/ext/flexmailer/src/Listener/DefaultBatcher.php b/www/modules/civicrm/ext/flexmailer/src/Listener/DefaultBatcher.php
index 56f834ebf..b18287079 100644
--- a/www/modules/civicrm/ext/flexmailer/src/Listener/DefaultBatcher.php
+++ b/www/modules/civicrm/ext/flexmailer/src/Listener/DefaultBatcher.php
@@ -10,10 +10,16 @@
  */
 namespace Civi\FlexMailer\Listener;
 
+use Civi\Core\Service\AutoService;
 use Civi\FlexMailer\Event\WalkBatchesEvent;
 use Civi\FlexMailer\FlexMailerTask;
 
-class DefaultBatcher extends BaseListener {
+/**
+ * @service civi_flexmailer_default_batcher
+ */
+class DefaultBatcher extends AutoService {
+
+  use IsActiveTrait;
 
   /**
    * Given a MailingJob (`$e->getJob()`), enumerate the recipients as
@@ -38,13 +44,16 @@ public function onWalk(WalkBatchesEvent $e) {
     // make sure that there's no more than $mailerBatchLimit mails processed in a run
     $mailerBatchLimit = \CRM_Core_Config::singleton()->mailerBatchLimit;
 
-    $eq = \CRM_Mailing_BAO_MailingJob::findPendingTasks($job->id, 'email');
+    $eq = $this->findPendingTasks((int) $job->id);
     $tasks = [];
     while ($eq->fetch()) {
       if ($mailerBatchLimit > 0 && \CRM_Mailing_BAO_MailingJob::$mailsProcessed >= $mailerBatchLimit) {
         if (!empty($tasks)) {
           $e->visit($tasks);
         }
+        // This ->free() is required because ->query() function is called not CRM_Core_ExecuteQuery
+        // (which cleans up it's own memory use)
+        // @todo - there is probably no reason not to just switch
         $eq->free();
         $e->setCompleted(FALSE);
         return;
@@ -57,6 +66,9 @@ public function onWalk(WalkBatchesEvent $e) {
       if (count($tasks) == \CRM_Mailing_BAO_MailingJob::MAX_CONTACTS_TO_PROCESS) {
         $isDelivered = $e->visit($tasks);
         if (!$isDelivered) {
+          // This ->free() is required because ->query() function is called not CRM_Core_ExecuteQuery
+          // (which cleans up it's own memory use)
+          // @todo - there is probably no reason not to just switch
           $eq->free();
           $e->setCompleted($isDelivered);
           return;
@@ -64,7 +76,9 @@ public function onWalk(WalkBatchesEvent $e) {
         $tasks = [];
       }
     }
-
+    // This ->free() is required because ->query() function is called not CRM_Core_ExecuteQuery
+    // (which cleans up it's own memory use)
+    // @todo - there is probably no reason not to just switch
     $eq->free();
 
     if (!empty($tasks)) {
@@ -73,4 +87,38 @@ public function onWalk(WalkBatchesEvent $e) {
     $e->setCompleted($isDelivered);
   }
 
+  /**
+   * Search the mailing-event queue for a list of pending delivery tasks.
+   *
+   * @param int $jobId
+   *
+   * @return \CRM_Mailing_Event_BAO_MailingEventQueue
+   *   A query object whose rows provide ('id', 'contact_id', 'hash') and ('email' or 'phone').
+   */
+  private function findPendingTasks(int $jobId): \CRM_Mailing_Event_BAO_MailingEventQueue {
+    $eq = new \CRM_Mailing_Event_BAO_MailingEventQueue();
+
+    $query = "  SELECT      queue.id,
+                                email.email as email,
+                                queue.contact_id,
+                                queue.hash,
+                                NULL as phone
+                    FROM        civicrm_mailing_event_queue queue
+                    INNER JOIN  civicrm_email email
+                            ON  queue.email_id = email.id
+                    INNER JOIN  civicrm_contact contact
+                            ON  contact.id = email.contact_id
+                    LEFT JOIN   civicrm_mailing_event_delivered delivered
+                            ON  queue.id = delivered.event_queue_id
+                    LEFT JOIN   civicrm_mailing_event_bounce bounce
+                            ON  queue.id = bounce.event_queue_id
+                    WHERE       queue.job_id = " . $jobId . "
+                        AND     delivered.id IS null
+                        AND     bounce.id IS null
+                        AND     contact.is_opt_out = 0";
+    // note this `query` function leaks memory more than CRM_Core_DAO::ExecuteQuery()
+    $eq->query($query);
+    return $eq;
+  }
+
 }
diff --git a/www/modules/civicrm/ext/flexmailer/src/Listener/DefaultComposer.php b/www/modules/civicrm/ext/flexmailer/src/Listener/DefaultComposer.php
index 25b2e69b5..0a7f1254a 100644
--- a/www/modules/civicrm/ext/flexmailer/src/Listener/DefaultComposer.php
+++ b/www/modules/civicrm/ext/flexmailer/src/Listener/DefaultComposer.php
@@ -10,6 +10,7 @@
  */
 namespace Civi\FlexMailer\Listener;
 
+use Civi\Core\Service\AutoService;
 use Civi\FlexMailer\Event\ComposeBatchEvent;
 use Civi\FlexMailer\Event\RunEvent;
 use Civi\FlexMailer\FlexMailerTask;
@@ -22,8 +23,12 @@
  *
  * The DefaultComposer uses a TokenProcessor to generate all messages as
  * a batch.
+ *
+ * @service civi_flexmailer_default_composer
  */
-class DefaultComposer extends BaseListener {
+class DefaultComposer extends AutoService {
+
+  use IsActiveTrait;
 
   public function onRun(RunEvent $e) {
     // FIXME: This probably doesn't belong here...
diff --git a/www/modules/civicrm/ext/flexmailer/src/Listener/DefaultSender.php b/www/modules/civicrm/ext/flexmailer/src/Listener/DefaultSender.php
index 0d0a9e2f0..c29050cdf 100644
--- a/www/modules/civicrm/ext/flexmailer/src/Listener/DefaultSender.php
+++ b/www/modules/civicrm/ext/flexmailer/src/Listener/DefaultSender.php
@@ -10,9 +10,16 @@
  */
 namespace Civi\FlexMailer\Listener;
 
+use Civi\Core\Service\AutoService;
 use Civi\FlexMailer\Event\SendBatchEvent;
 
-class DefaultSender extends BaseListener {
+/**
+ * @service civi_flexmailer_default_sender
+ */
+class DefaultSender extends AutoService {
+
+  use IsActiveTrait;
+
   const BULK_MAIL_INSERT_COUNT = 10;
 
   public function onSend(SendBatchEvent $e) {
diff --git a/www/modules/civicrm/ext/flexmailer/src/Listener/HookAdapter.php b/www/modules/civicrm/ext/flexmailer/src/Listener/HookAdapter.php
index 53d3aa4f8..62e4e29cf 100644
--- a/www/modules/civicrm/ext/flexmailer/src/Listener/HookAdapter.php
+++ b/www/modules/civicrm/ext/flexmailer/src/Listener/HookAdapter.php
@@ -10,9 +10,15 @@
  */
 namespace Civi\FlexMailer\Listener;
 
+use Civi\Core\Service\AutoService;
 use Civi\FlexMailer\Event\ComposeBatchEvent;
 
-class HookAdapter extends BaseListener {
+/**
+ * @service civi_flexmailer_hooks
+ */
+class HookAdapter extends AutoService {
+
+  use IsActiveTrait;
 
   /**
    * Expose to hook_civicrm_alterMailParams.
diff --git a/www/modules/civicrm/ext/flexmailer/src/Listener/IsActiveTrait.php b/www/modules/civicrm/ext/flexmailer/src/Listener/IsActiveTrait.php
new file mode 100644
index 000000000..20c38ba4f
--- /dev/null
+++ b/www/modules/civicrm/ext/flexmailer/src/Listener/IsActiveTrait.php
@@ -0,0 +1,36 @@
+<?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\FlexMailer\Listener;
+
+trait IsActiveTrait {
+
+  /**
+   * @var bool
+   */
+  private $active = TRUE;
+
+  /**
+   * @return bool
+   */
+  public function isActive() {
+    return $this->active;
+  }
+
+  /**
+   * @param bool $active
+   * @return $this
+   */
+  public function setActive($active) {
+    $this->active = $active;
+    return $this;
+  }
+
+}
diff --git a/www/modules/civicrm/ext/flexmailer/src/Listener/OpenTracker.php b/www/modules/civicrm/ext/flexmailer/src/Listener/OpenTracker.php
index 75c9c4e0e..f4787f700 100644
--- a/www/modules/civicrm/ext/flexmailer/src/Listener/OpenTracker.php
+++ b/www/modules/civicrm/ext/flexmailer/src/Listener/OpenTracker.php
@@ -10,9 +10,15 @@
  */
 namespace Civi\FlexMailer\Listener;
 
+use Civi\Core\Service\AutoService;
 use Civi\FlexMailer\Event\ComposeBatchEvent;
 
-class OpenTracker extends BaseListener {
+/**
+ * @service civi_flexmailer_open_tracker
+ */
+class OpenTracker extends AutoService {
+
+  use IsActiveTrait;
 
   /**
    * Inject open-tracking codes.
diff --git a/www/modules/civicrm/ext/flexmailer/src/Listener/RequiredFields.php b/www/modules/civicrm/ext/flexmailer/src/Listener/RequiredFields.php
index 4eaa02d75..957662265 100644
--- a/www/modules/civicrm/ext/flexmailer/src/Listener/RequiredFields.php
+++ b/www/modules/civicrm/ext/flexmailer/src/Listener/RequiredFields.php
@@ -10,6 +10,7 @@
  */
 namespace Civi\FlexMailer\Listener;
 
+use Civi\Core\Service\AutoService;
 use CRM_Flexmailer_ExtensionUtil as E;
 use Civi\FlexMailer\Event\CheckSendableEvent;
 
@@ -19,7 +20,22 @@
  *
  * The RequiredFields listener checks that all mandatory fields have a value.
  */
-class RequiredFields extends BaseListener {
+class RequiredFields extends AutoService {
+
+  use IsActiveTrait;
+
+  /**
+   * @service civi_flexmailer_required_fields
+   */
+  public static function factory(): RequiredFields {
+    return new static([
+      'subject',
+      'name',
+      'from_name',
+      'from_email',
+      '(body_html|body_text)',
+    ]);
+  }
 
   /**
    * @var array
diff --git a/www/modules/civicrm/ext/flexmailer/src/Listener/RequiredTokens.php b/www/modules/civicrm/ext/flexmailer/src/Listener/RequiredTokens.php
index 1d6a87af6..50637ebb2 100644
--- a/www/modules/civicrm/ext/flexmailer/src/Listener/RequiredTokens.php
+++ b/www/modules/civicrm/ext/flexmailer/src/Listener/RequiredTokens.php
@@ -10,6 +10,7 @@
  */
 namespace Civi\FlexMailer\Listener;
 
+use Civi\Core\Service\AutoService;
 use CRM_Flexmailer_ExtensionUtil as E;
 use Civi\FlexMailer\Event\CheckSendableEvent;
 
@@ -21,7 +22,27 @@
  * CiviMail tokens like `{action.unsubscribeUrl}`, which are often required
  * to comply with anti-spam regulations.
  */
-class RequiredTokens extends BaseListener {
+class RequiredTokens extends AutoService {
+
+  use IsActiveTrait;
+
+  /**
+   * @service civi_flexmailer_required_tokens
+   */
+  public static function factory(): RequiredTokens {
+    return new static(
+      ['traditional'],
+      [
+        'domain.address' => ts("Domain address - displays your organization's postal address."),
+        'action.optOutUrl or action.unsubscribeUrl' => [
+          'action.optOut' => ts("'Opt out via email' - displays an email address for recipients to opt out of receiving emails from your organization."),
+          'action.optOutUrl' => ts("'Opt out via web page' - creates a link for recipients to click if they want to opt out of receiving emails from your organization. Alternatively, you can include the 'Opt out via email' token."),
+          'action.unsubscribe' => ts("'Unsubscribe via email' - displays an email address for recipients to unsubscribe from the specific mailing list used to send this message."),
+          'action.unsubscribeUrl' => ts("'Unsubscribe via web page' - creates a link for recipients to unsubscribe from the specific mailing list used to send this message. Alternatively, you can include the 'Unsubscribe via email' token or one of the Opt-out tokens."),
+        ],
+      ]
+    );
+  }
 
   /**
    * @var array
diff --git a/www/modules/civicrm/ext/flexmailer/src/Listener/TestPrefix.php b/www/modules/civicrm/ext/flexmailer/src/Listener/TestPrefix.php
index b81bb0385..805cd7166 100644
--- a/www/modules/civicrm/ext/flexmailer/src/Listener/TestPrefix.php
+++ b/www/modules/civicrm/ext/flexmailer/src/Listener/TestPrefix.php
@@ -10,9 +10,15 @@
  */
 namespace Civi\FlexMailer\Listener;
 
+use Civi\Core\Service\AutoService;
 use Civi\FlexMailer\Event\ComposeBatchEvent;
 
-class TestPrefix extends BaseListener {
+/**
+ * @service civi_flexmailer_test_prefix
+ */
+class TestPrefix extends AutoService {
+
+  use IsActiveTrait;
 
   /**
    * For any test mailings, the "Subject:" should have a prefix.
diff --git a/www/modules/civicrm/ext/flexmailer/src/Listener/ToHeader.php b/www/modules/civicrm/ext/flexmailer/src/Listener/ToHeader.php
index 855cf85ca..97e4d227a 100644
--- a/www/modules/civicrm/ext/flexmailer/src/Listener/ToHeader.php
+++ b/www/modules/civicrm/ext/flexmailer/src/Listener/ToHeader.php
@@ -10,9 +10,15 @@
  */
 namespace Civi\FlexMailer\Listener;
 
+use Civi\Core\Service\AutoService;
 use Civi\FlexMailer\Event\ComposeBatchEvent;
 
-class ToHeader extends BaseListener {
+/**
+ * @service civi_flexmailer_to_header
+ */
+class ToHeader extends AutoService {
+
+  use IsActiveTrait;
 
   /**
    * Inject the "To:" header.
diff --git a/www/modules/civicrm/ext/flexmailer/src/Services.php b/www/modules/civicrm/ext/flexmailer/src/Services.php
index 899041e4c..c1a979d44 100644
--- a/www/modules/civicrm/ext/flexmailer/src/Services.php
+++ b/www/modules/civicrm/ext/flexmailer/src/Services.php
@@ -29,43 +29,6 @@ public static function registerServices(ContainerBuilder $container) {
     $apiOverrides = $container->setDefinition('civi_flexmailer_api_overrides', new Definition('Civi\API\Provider\ProviderInterface'))->setPublic(TRUE);
     self::applyStaticFactory($apiOverrides, __CLASS__, 'createApiOverrides');
 
-    $container->setDefinition('civi_flexmailer_required_fields', new Definition('Civi\FlexMailer\Listener\RequiredFields', [
-      [
-        'subject',
-        'name',
-        'from_name',
-        'from_email',
-        '(body_html|body_text)',
-      ],
-    ]))->setPublic(TRUE);
-    $container->setDefinition('civi_flexmailer_required_tokens', new Definition('Civi\FlexMailer\Listener\RequiredTokens', [
-      ['traditional'],
-      [
-        'domain.address' => ts("Domain address - displays your organization's postal address."),
-        'action.optOutUrl or action.unsubscribeUrl' => [
-          'action.optOut' => ts("'Opt out via email' - displays an email address for recipients to opt out of receiving emails from your organization."),
-          'action.optOutUrl' => ts("'Opt out via web page' - creates a link for recipients to click if they want to opt out of receiving emails from your organization. Alternatively, you can include the 'Opt out via email' token."),
-          'action.unsubscribe' => ts("'Unsubscribe via email' - displays an email address for recipients to unsubscribe from the specific mailing list used to send this message."),
-          'action.unsubscribeUrl' => ts("'Unsubscribe via web page' - creates a link for recipients to unsubscribe from the specific mailing list used to send this message. Alternatively, you can include the 'Unsubscribe via email' token or one of the Opt-out tokens."),
-        ],
-      ],
-    ]))->setPublic(TRUE);
-
-    $container->setDefinition('civi_flexmailer_abdicator', new Definition('Civi\FlexMailer\Listener\Abdicator'))->setPublic(TRUE);
-    $container->setDefinition('civi_flexmailer_default_batcher', new Definition('Civi\FlexMailer\Listener\DefaultBatcher'))->setPublic(TRUE);
-    $container->setDefinition('civi_flexmailer_default_composer', new Definition('Civi\FlexMailer\Listener\DefaultComposer'))->setPublic(TRUE);
-    $container->setDefinition('civi_flexmailer_open_tracker', new Definition('Civi\FlexMailer\Listener\OpenTracker'))->setPublic(TRUE);
-    $container->setDefinition('civi_flexmailer_basic_headers', new Definition('Civi\FlexMailer\Listener\BasicHeaders'))->setPublic(TRUE);
-    $container->setDefinition('civi_flexmailer_to_header', new Definition('Civi\FlexMailer\Listener\ToHeader'))->setPublic(TRUE);
-    $container->setDefinition('civi_flexmailer_attachments', new Definition('Civi\FlexMailer\Listener\Attachments'))->setPublic(TRUE);
-    $container->setDefinition('civi_flexmailer_bounce_tracker', new Definition('Civi\FlexMailer\Listener\BounceTracker'))->setPublic(TRUE);
-    $container->setDefinition('civi_flexmailer_default_sender', new Definition('Civi\FlexMailer\Listener\DefaultSender'))->setPublic(TRUE);
-    $container->setDefinition('civi_flexmailer_hooks', new Definition('Civi\FlexMailer\Listener\HookAdapter'))->setPublic(TRUE);
-    $container->setDefinition('civi_flexmailer_test_prefix', new Definition('Civi\FlexMailer\Listener\TestPrefix'))->setPublic(TRUE);
-
-    $container->setDefinition('civi_flexmailer_html_click_tracker', new Definition('Civi\FlexMailer\ClickTracker\HtmlClickTracker'))->setPublic(TRUE);
-    $container->setDefinition('civi_flexmailer_text_click_tracker', new Definition('Civi\FlexMailer\ClickTracker\TextClickTracker'))->setPublic(TRUE);
-
     foreach (self::getListenerSpecs() as $listenerSpec) {
       $container->findDefinition('dispatcher')->addMethodCall('addListenerService', $listenerSpec);
     }
diff --git a/www/modules/civicrm/ext/flexmailer/tests/phpunit/Civi/FlexMailer/ClickTrackerTest.php b/www/modules/civicrm/ext/flexmailer/tests/phpunit/Civi/FlexMailer/ClickTrackerTest.php
index 4bf926f3b..3348aef67 100644
--- a/www/modules/civicrm/ext/flexmailer/tests/phpunit/Civi/FlexMailer/ClickTrackerTest.php
+++ b/www/modules/civicrm/ext/flexmailer/tests/phpunit/Civi/FlexMailer/ClickTrackerTest.php
@@ -151,4 +151,15 @@ public function testHtmlLinkWithUnicode(): void {
     $this->assertEquals('<p><a href="http://example.com/extern?u=1&amp;qid=1" rel=\'nofollow\'>See This</a></p>', $result);
   }
 
+  public function testTraditionalViewMailingTokenFormat(): void {
+    $filter = new HtmlClickTracker();
+    $msg = '<p><a href="http://civicrm.org/civicrm/mailing/view?id={mailing.key}&{contact.checksum}&cid={contact.contact_id}">View online</a></p>';
+    \runkit7_method_rename('\CRM_Mailing_BAO_MailingTrackableURL', 'getBasicTrackerURL', 'new_getBasicTrackerURL');
+    \runkit7_method_rename('\CRM_Mailing_BAO_MailingTrackableURL', 'orig_getBasicTrackerURL', 'getBasicTrackerURL');
+    $result = $filter->filterContent($msg, 1, 1);
+    \runkit7_method_rename('\CRM_Mailing_BAO_MailingTrackableURL', 'getBasicTrackerURL', 'orig_getBasicTrackerURL');
+    \runkit7_method_rename('\CRM_Mailing_BAO_MailingTrackableURL', 'new_getBasicTrackerURL', 'getBasicTrackerURL');
+    $this->assertEquals('<p><a href="http://civicrm.org/civicrm/mailing/view?id={mailing.key}&amp;{contact.checksum}&amp;cid={contact.contact_id}" rel=\'nofollow\'>View online</a></p>', $result);
+  }
+
 }
diff --git a/www/modules/civicrm/ext/flexmailer/tests/phpunit/Civi/FlexMailer/FlexMailerSystemTest.php b/www/modules/civicrm/ext/flexmailer/tests/phpunit/Civi/FlexMailer/FlexMailerSystemTest.php
index 679b4b642..c6e917dfa 100644
--- a/www/modules/civicrm/ext/flexmailer/tests/phpunit/Civi/FlexMailer/FlexMailerSystemTest.php
+++ b/www/modules/civicrm/ext/flexmailer/tests/phpunit/Civi/FlexMailer/FlexMailerSystemTest.php
@@ -20,13 +20,13 @@
 use Civi\Core\Event\GenericHookEvent;
 
 // For compat w/v4.6 phpunit
-require_once 'tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php';
+require_once 'tests/phpunit/CRM/Mailing/MailingSystemTestBase.php';
 
 /**
  * Class FlexMailerSystemTest
  *
  * MailingSystemTest checks that overall composition and delivery of
- * CiviMail blasts works. It extends CRM_Mailing_BaseMailingSystemTest
+ * CiviMail blasts works. It extends CRM_Mailing_MailingSystemTestBase
  * which provides the general test scenarios -- but this variation
  * checks that certain internal events/hooks fire.
  *
@@ -35,7 +35,7 @@
  * @group civimail
  * @see CRM_Mailing_MailingSystemTest
  */
-class FlexMailerSystemTest extends \CRM_Mailing_BaseMailingSystemTest {
+class FlexMailerSystemTest extends \CRM_Mailing_MailingSystemTestBase {
 
   private $counts;
 
diff --git a/www/modules/civicrm/ext/greenwich/dist/bootstrap3.css b/www/modules/civicrm/ext/greenwich/dist/bootstrap3.css
index 2e71c62d2..4a1a073a2 100644
--- a/www/modules/civicrm/ext/greenwich/dist/bootstrap3.css
+++ b/www/modules/civicrm/ext/greenwich/dist/bootstrap3.css
@@ -3600,32 +3600,32 @@
 }
 
 #bootstrap-theme .btn-info {
-	color: white;
+	color: black;
 	background-color: #cde8fe;
 	border-color: #cde8fe;
 }
 
 #bootstrap-theme .btn-info:focus, #bootstrap-theme .btn-info.focus {
-	color: white;
+	color: black;
 	background-color: #9bd1fd;
 	border-color: #50affc;
 }
 
 #bootstrap-theme .btn-info:hover {
-	color: white;
+	color: black;
 	background-color: #9bd1fd;
 	border-color: #91ccfd;
 }
 
 #bootstrap-theme .btn-info:active, #bootstrap-theme .btn-info.active, .open > #bootstrap-theme .btn-info.dropdown-toggle {
-	color: white;
+	color: black;
 	background-color: #9bd1fd;
 	background-image: none;
 	border-color: #91ccfd;
 }
 
 #bootstrap-theme .btn-info:active:hover, #bootstrap-theme .btn-info:active:focus, #bootstrap-theme .btn-info:active.focus, #bootstrap-theme .btn-info.active:hover, #bootstrap-theme .btn-info.active:focus, #bootstrap-theme .btn-info.active.focus, .open > #bootstrap-theme .btn-info.dropdown-toggle:hover, .open > #bootstrap-theme .btn-info.dropdown-toggle:focus, .open > #bootstrap-theme .btn-info.dropdown-toggle.focus {
-	color: white;
+	color: black;
 	background-color: #78c1fc;
 	border-color: #50affc;
 }
@@ -3637,7 +3637,7 @@
 
 #bootstrap-theme .btn-info .badge {
 	color: #cde8fe;
-	background-color: white;
+	background-color: black;
 }
 
 #bootstrap-theme .btn-warning {
diff --git a/www/modules/civicrm/ext/greenwich/dist/bootstrap3.min.css b/www/modules/civicrm/ext/greenwich/dist/bootstrap3.min.css
index 3e65fa6aa..e6cab5de0 100644
--- a/www/modules/civicrm/ext/greenwich/dist/bootstrap3.min.css
+++ b/www/modules/civicrm/ext/greenwich/dist/bootstrap3.min.css
@@ -1 +1 @@
-@charset "UTF-8";#bootstrap-theme html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}#bootstrap-theme body{margin:0}#bootstrap-theme article,#bootstrap-theme aside,#bootstrap-theme details,#bootstrap-theme figcaption,#bootstrap-theme figure,#bootstrap-theme footer,#bootstrap-theme header,#bootstrap-theme hgroup,#bootstrap-theme main,#bootstrap-theme menu,#bootstrap-theme nav,#bootstrap-theme section,#bootstrap-theme summary{display:block}#bootstrap-theme audio,#bootstrap-theme canvas,#bootstrap-theme progress,#bootstrap-theme video{display:inline-block;vertical-align:baseline}#bootstrap-theme audio:not([controls]){display:none;height:0}#bootstrap-theme [hidden],#bootstrap-theme template{display:none}#bootstrap-theme a{background-color:transparent}#bootstrap-theme a:active,#bootstrap-theme a:hover{outline:0}#bootstrap-theme abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}#bootstrap-theme b,#bootstrap-theme strong{font-weight:700}#bootstrap-theme dfn{font-style:italic}#bootstrap-theme h1{font-size:2em;margin:.67em 0}#bootstrap-theme mark{background:#ff0;color:#000}#bootstrap-theme small{font-size:80%}#bootstrap-theme sub,#bootstrap-theme sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}#bootstrap-theme sup{top:-.5em}#bootstrap-theme sub{bottom:-.25em}#bootstrap-theme img{border:0}#bootstrap-theme svg:not(:root){overflow:hidden}#bootstrap-theme figure{margin:1em 40px}#bootstrap-theme hr{box-sizing:content-box;height:0}#bootstrap-theme pre{overflow:auto}#bootstrap-theme code,#bootstrap-theme kbd,#bootstrap-theme pre,#bootstrap-theme samp{font-family:monospace,monospace;font-size:1em}#bootstrap-theme button,#bootstrap-theme input,#bootstrap-theme optgroup,#bootstrap-theme select,#bootstrap-theme textarea{color:inherit;font:inherit;margin:0}#bootstrap-theme button{overflow:visible}#bootstrap-theme button,#bootstrap-theme select{text-transform:none}#bootstrap-theme button,#bootstrap-theme html input[type=button],#bootstrap-theme input[type=reset],#bootstrap-theme input[type=submit]{-webkit-appearance:button;cursor:pointer}#bootstrap-theme button[disabled],#bootstrap-theme html input[disabled]{cursor:default}#bootstrap-theme button::-moz-focus-inner,#bootstrap-theme input::-moz-focus-inner{border:0;padding:0}#bootstrap-theme input{line-height:normal}#bootstrap-theme input[type=checkbox],#bootstrap-theme input[type=radio]{box-sizing:border-box;padding:0}#bootstrap-theme input[type=number]::-webkit-inner-spin-button,#bootstrap-theme input[type=number]::-webkit-outer-spin-button{height:auto}#bootstrap-theme input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}#bootstrap-theme input[type=search]::-webkit-search-cancel-button,#bootstrap-theme input[type=search]::-webkit-search-decoration{-webkit-appearance:none}#bootstrap-theme fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}#bootstrap-theme legend{border:0;padding:0}#bootstrap-theme textarea{overflow:auto}#bootstrap-theme optgroup{font-weight:700}#bootstrap-theme table{border-collapse:collapse;border-spacing:0}#bootstrap-theme td,#bootstrap-theme th{padding:0}@media print{#bootstrap-theme *,#bootstrap-theme *:before,#bootstrap-theme *:after{color:#000 !important;text-shadow:none !important;background:0 0 !important;box-shadow:none !important}#bootstrap-theme a,#bootstrap-theme a:visited{text-decoration:underline}#bootstrap-theme a[href]:after{content:" (" attr(href) ")"}#bootstrap-theme abbr[title]:after{content:" (" attr(title) ")"}#bootstrap-theme a[href^="#"]:after,#bootstrap-theme a[href^="javascript:"]:after{content:""}#bootstrap-theme pre,#bootstrap-theme blockquote{border:1px solid #999;page-break-inside:avoid}#bootstrap-theme thead{display:table-header-group}#bootstrap-theme tr,#bootstrap-theme img{page-break-inside:avoid}#bootstrap-theme img{max-width:100% !important}#bootstrap-theme p,#bootstrap-theme h2,#bootstrap-theme h3{orphans:3;widows:3}#bootstrap-theme h2,#bootstrap-theme h3{page-break-after:avoid}#bootstrap-theme .navbar{display:none}#bootstrap-theme .btn>.caret,#bootstrap-theme .dropup>.btn>.caret{border-top-color:#000 !important}#bootstrap-theme .label{border:1px solid #000}#bootstrap-theme .table{border-collapse:collapse !important}#bootstrap-theme .table td,#bootstrap-theme .table th{background-color:#fff !important}#bootstrap-theme .table-bordered th,#bootstrap-theme .table-bordered td{border:1px solid #ddd !important}}@font-face{font-family:"Glyphicons Halflings";src:url("../extern/bootstrap3/assets/fonts/bootstrap/glyphicons-halflings-regular.eot");src:url("../extern/bootstrap3/assets/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"),url("../extern/bootstrap3/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2") format("woff2"),url("../extern/bootstrap3/assets/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"),url("../extern/bootstrap3/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"),url("../extern/bootstrap3/assets/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg")}#bootstrap-theme .glyphicon{position:relative;top:1px;display:inline-block;font-family:"Glyphicons Halflings";font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#bootstrap-theme .glyphicon-asterisk:before{content:"*"}#bootstrap-theme .glyphicon-plus:before{content:"+"}#bootstrap-theme .glyphicon-euro:before,#bootstrap-theme .glyphicon-eur:before{content:"€"}#bootstrap-theme .glyphicon-minus:before{content:"−"}#bootstrap-theme .glyphicon-cloud:before{content:"�"}#bootstrap-theme .glyphicon-envelope:before{content:"✉"}#bootstrap-theme .glyphicon-pencil:before{content:"�"}#bootstrap-theme .glyphicon-glass:before{content:"�"}#bootstrap-theme .glyphicon-music:before{content:""}#bootstrap-theme .glyphicon-search:before{content:""}#bootstrap-theme .glyphicon-heart:before{content:""}#bootstrap-theme .glyphicon-star:before{content:""}#bootstrap-theme .glyphicon-star-empty:before{content:""}#bootstrap-theme .glyphicon-user:before{content:""}#bootstrap-theme .glyphicon-film:before{content:""}#bootstrap-theme .glyphicon-th-large:before{content:"�"}#bootstrap-theme .glyphicon-th:before{content:""}#bootstrap-theme .glyphicon-th-list:before{content:""}#bootstrap-theme .glyphicon-ok:before{content:""}#bootstrap-theme .glyphicon-remove:before{content:""}#bootstrap-theme .glyphicon-zoom-in:before{content:""}#bootstrap-theme .glyphicon-zoom-out:before{content:""}#bootstrap-theme .glyphicon-off:before{content:""}#bootstrap-theme .glyphicon-signal:before{content:""}#bootstrap-theme .glyphicon-cog:before{content:""}#bootstrap-theme .glyphicon-trash:before{content:""}#bootstrap-theme .glyphicon-home:before{content:""}#bootstrap-theme .glyphicon-file:before{content:""}#bootstrap-theme .glyphicon-time:before{content:""}#bootstrap-theme .glyphicon-road:before{content:""}#bootstrap-theme .glyphicon-download-alt:before{content:""}#bootstrap-theme .glyphicon-download:before{content:""}#bootstrap-theme .glyphicon-upload:before{content:""}#bootstrap-theme .glyphicon-inbox:before{content:""}#bootstrap-theme .glyphicon-play-circle:before{content:""}#bootstrap-theme .glyphicon-repeat:before{content:""}#bootstrap-theme .glyphicon-refresh:before{content:""}#bootstrap-theme .glyphicon-list-alt:before{content:""}#bootstrap-theme .glyphicon-lock:before{content:""}#bootstrap-theme .glyphicon-flag:before{content:""}#bootstrap-theme .glyphicon-headphones:before{content:""}#bootstrap-theme .glyphicon-volume-off:before{content:""}#bootstrap-theme .glyphicon-volume-down:before{content:""}#bootstrap-theme .glyphicon-volume-up:before{content:""}#bootstrap-theme .glyphicon-qrcode:before{content:""}#bootstrap-theme .glyphicon-barcode:before{content:"�"}#bootstrap-theme .glyphicon-tag:before{content:"�"}#bootstrap-theme .glyphicon-tags:before{content:"�"}#bootstrap-theme .glyphicon-book:before{content:"�"}#bootstrap-theme .glyphicon-bookmark:before{content:"�"}#bootstrap-theme .glyphicon-print:before{content:"�"}#bootstrap-theme .glyphicon-camera:before{content:"�"}#bootstrap-theme .glyphicon-font:before{content:"�"}#bootstrap-theme .glyphicon-bold:before{content:"�"}#bootstrap-theme .glyphicon-italic:before{content:"�"}#bootstrap-theme .glyphicon-text-height:before{content:"�"}#bootstrap-theme .glyphicon-text-width:before{content:"�"}#bootstrap-theme .glyphicon-align-left:before{content:"�"}#bootstrap-theme .glyphicon-align-center:before{content:"�"}#bootstrap-theme .glyphicon-align-right:before{content:"�"}#bootstrap-theme .glyphicon-align-justify:before{content:"�"}#bootstrap-theme .glyphicon-list:before{content:"�"}#bootstrap-theme .glyphicon-indent-left:before{content:"�"}#bootstrap-theme .glyphicon-indent-right:before{content:"�"}#bootstrap-theme .glyphicon-facetime-video:before{content:"�"}#bootstrap-theme .glyphicon-picture:before{content:"�"}#bootstrap-theme .glyphicon-map-marker:before{content:"�"}#bootstrap-theme .glyphicon-adjust:before{content:"�"}#bootstrap-theme .glyphicon-tint:before{content:"�"}#bootstrap-theme .glyphicon-edit:before{content:"�"}#bootstrap-theme .glyphicon-share:before{content:"�"}#bootstrap-theme .glyphicon-check:before{content:"�"}#bootstrap-theme .glyphicon-move:before{content:"�"}#bootstrap-theme .glyphicon-step-backward:before{content:"�"}#bootstrap-theme .glyphicon-fast-backward:before{content:"�"}#bootstrap-theme .glyphicon-backward:before{content:"�"}#bootstrap-theme .glyphicon-play:before{content:"�"}#bootstrap-theme .glyphicon-pause:before{content:"�"}#bootstrap-theme .glyphicon-stop:before{content:"�"}#bootstrap-theme .glyphicon-forward:before{content:"�"}#bootstrap-theme .glyphicon-fast-forward:before{content:"�"}#bootstrap-theme .glyphicon-step-forward:before{content:"�"}#bootstrap-theme .glyphicon-eject:before{content:"�"}#bootstrap-theme .glyphicon-chevron-left:before{content:"�"}#bootstrap-theme .glyphicon-chevron-right:before{content:""}#bootstrap-theme .glyphicon-plus-sign:before{content:"�"}#bootstrap-theme .glyphicon-minus-sign:before{content:""}#bootstrap-theme .glyphicon-remove-sign:before{content:""}#bootstrap-theme .glyphicon-ok-sign:before{content:""}#bootstrap-theme .glyphicon-question-sign:before{content:""}#bootstrap-theme .glyphicon-info-sign:before{content:""}#bootstrap-theme .glyphicon-screenshot:before{content:""}#bootstrap-theme .glyphicon-remove-circle:before{content:""}#bootstrap-theme .glyphicon-ok-circle:before{content:""}#bootstrap-theme .glyphicon-ban-circle:before{content:"�"}#bootstrap-theme .glyphicon-arrow-left:before{content:""}#bootstrap-theme .glyphicon-arrow-right:before{content:""}#bootstrap-theme .glyphicon-arrow-up:before{content:""}#bootstrap-theme .glyphicon-arrow-down:before{content:""}#bootstrap-theme .glyphicon-share-alt:before{content:""}#bootstrap-theme .glyphicon-resize-full:before{content:""}#bootstrap-theme .glyphicon-resize-small:before{content:""}#bootstrap-theme .glyphicon-exclamation-sign:before{content:"�"}#bootstrap-theme .glyphicon-gift:before{content:""}#bootstrap-theme .glyphicon-leaf:before{content:""}#bootstrap-theme .glyphicon-fire:before{content:""}#bootstrap-theme .glyphicon-eye-open:before{content:""}#bootstrap-theme .glyphicon-eye-close:before{content:""}#bootstrap-theme .glyphicon-warning-sign:before{content:""}#bootstrap-theme .glyphicon-plane:before{content:""}#bootstrap-theme .glyphicon-calendar:before{content:""}#bootstrap-theme .glyphicon-random:before{content:"�"}#bootstrap-theme .glyphicon-comment:before{content:""}#bootstrap-theme .glyphicon-magnet:before{content:""}#bootstrap-theme .glyphicon-chevron-up:before{content:""}#bootstrap-theme .glyphicon-chevron-down:before{content:""}#bootstrap-theme .glyphicon-retweet:before{content:""}#bootstrap-theme .glyphicon-shopping-cart:before{content:""}#bootstrap-theme .glyphicon-folder-close:before{content:""}#bootstrap-theme .glyphicon-folder-open:before{content:""}#bootstrap-theme .glyphicon-resize-vertical:before{content:""}#bootstrap-theme .glyphicon-resize-horizontal:before{content:""}#bootstrap-theme .glyphicon-hdd:before{content:""}#bootstrap-theme .glyphicon-bullhorn:before{content:""}#bootstrap-theme .glyphicon-bell:before{content:""}#bootstrap-theme .glyphicon-certificate:before{content:""}#bootstrap-theme .glyphicon-thumbs-up:before{content:""}#bootstrap-theme .glyphicon-thumbs-down:before{content:""}#bootstrap-theme .glyphicon-hand-right:before{content:""}#bootstrap-theme .glyphicon-hand-left:before{content:""}#bootstrap-theme .glyphicon-hand-up:before{content:""}#bootstrap-theme .glyphicon-hand-down:before{content:""}#bootstrap-theme .glyphicon-circle-arrow-right:before{content:""}#bootstrap-theme .glyphicon-circle-arrow-left:before{content:""}#bootstrap-theme .glyphicon-circle-arrow-up:before{content:""}#bootstrap-theme .glyphicon-circle-arrow-down:before{content:""}#bootstrap-theme .glyphicon-globe:before{content:""}#bootstrap-theme .glyphicon-wrench:before{content:""}#bootstrap-theme .glyphicon-tasks:before{content:""}#bootstrap-theme .glyphicon-filter:before{content:""}#bootstrap-theme .glyphicon-briefcase:before{content:""}#bootstrap-theme .glyphicon-fullscreen:before{content:""}#bootstrap-theme .glyphicon-dashboard:before{content:"�"}#bootstrap-theme .glyphicon-paperclip:before{content:""}#bootstrap-theme .glyphicon-heart-empty:before{content:""}#bootstrap-theme .glyphicon-link:before{content:""}#bootstrap-theme .glyphicon-phone:before{content:""}#bootstrap-theme .glyphicon-pushpin:before{content:""}#bootstrap-theme .glyphicon-usd:before{content:""}#bootstrap-theme .glyphicon-gbp:before{content:""}#bootstrap-theme .glyphicon-sort:before{content:"�"}#bootstrap-theme .glyphicon-sort-by-alphabet:before{content:""}#bootstrap-theme .glyphicon-sort-by-alphabet-alt:before{content:""}#bootstrap-theme .glyphicon-sort-by-order:before{content:""}#bootstrap-theme .glyphicon-sort-by-order-alt:before{content:""}#bootstrap-theme .glyphicon-sort-by-attributes:before{content:""}#bootstrap-theme .glyphicon-sort-by-attributes-alt:before{content:""}#bootstrap-theme .glyphicon-unchecked:before{content:""}#bootstrap-theme .glyphicon-expand:before{content:""}#bootstrap-theme .glyphicon-collapse-down:before{content:""}#bootstrap-theme .glyphicon-collapse-up:before{content:""}#bootstrap-theme .glyphicon-log-in:before{content:""}#bootstrap-theme .glyphicon-flash:before{content:""}#bootstrap-theme .glyphicon-log-out:before{content:""}#bootstrap-theme .glyphicon-new-window:before{content:""}#bootstrap-theme .glyphicon-record:before{content:""}#bootstrap-theme .glyphicon-save:before{content:""}#bootstrap-theme .glyphicon-open:before{content:""}#bootstrap-theme .glyphicon-saved:before{content:""}#bootstrap-theme .glyphicon-import:before{content:""}#bootstrap-theme .glyphicon-export:before{content:""}#bootstrap-theme .glyphicon-send:before{content:""}#bootstrap-theme .glyphicon-floppy-disk:before{content:""}#bootstrap-theme .glyphicon-floppy-saved:before{content:""}#bootstrap-theme .glyphicon-floppy-remove:before{content:""}#bootstrap-theme .glyphicon-floppy-save:before{content:""}#bootstrap-theme .glyphicon-floppy-open:before{content:""}#bootstrap-theme .glyphicon-credit-card:before{content:""}#bootstrap-theme .glyphicon-transfer:before{content:""}#bootstrap-theme .glyphicon-cutlery:before{content:""}#bootstrap-theme .glyphicon-header:before{content:""}#bootstrap-theme .glyphicon-compressed:before{content:"�"}#bootstrap-theme .glyphicon-earphone:before{content:""}#bootstrap-theme .glyphicon-phone-alt:before{content:""}#bootstrap-theme .glyphicon-tower:before{content:""}#bootstrap-theme .glyphicon-stats:before{content:""}#bootstrap-theme .glyphicon-sd-video:before{content:""}#bootstrap-theme .glyphicon-hd-video:before{content:""}#bootstrap-theme .glyphicon-subtitles:before{content:""}#bootstrap-theme .glyphicon-sound-stereo:before{content:""}#bootstrap-theme .glyphicon-sound-dolby:before{content:"�"}#bootstrap-theme .glyphicon-sound-5-1:before{content:""}#bootstrap-theme .glyphicon-sound-6-1:before{content:""}#bootstrap-theme .glyphicon-sound-7-1:before{content:""}#bootstrap-theme .glyphicon-copyright-mark:before{content:""}#bootstrap-theme .glyphicon-registration-mark:before{content:""}#bootstrap-theme .glyphicon-cloud-download:before{content:""}#bootstrap-theme .glyphicon-cloud-upload:before{content:""}#bootstrap-theme .glyphicon-tree-conifer:before{content:""}#bootstrap-theme .glyphicon-tree-deciduous:before{content:""}#bootstrap-theme .glyphicon-cd:before{content:"�"}#bootstrap-theme .glyphicon-save-file:before{content:""}#bootstrap-theme .glyphicon-open-file:before{content:""}#bootstrap-theme .glyphicon-level-up:before{content:""}#bootstrap-theme .glyphicon-copy:before{content:""}#bootstrap-theme .glyphicon-paste:before{content:""}#bootstrap-theme .glyphicon-alert:before{content:""}#bootstrap-theme .glyphicon-equalizer:before{content:"�"}#bootstrap-theme .glyphicon-king:before{content:""}#bootstrap-theme .glyphicon-queen:before{content:""}#bootstrap-theme .glyphicon-pawn:before{content:""}#bootstrap-theme .glyphicon-bishop:before{content:""}#bootstrap-theme .glyphicon-knight:before{content:""}#bootstrap-theme .glyphicon-baby-formula:before{content:""}#bootstrap-theme .glyphicon-tent:before{content:"⛺"}#bootstrap-theme .glyphicon-blackboard:before{content:""}#bootstrap-theme .glyphicon-bed:before{content:""}#bootstrap-theme .glyphicon-apple:before{content:""}#bootstrap-theme .glyphicon-erase:before{content:""}#bootstrap-theme .glyphicon-hourglass:before{content:"⌛"}#bootstrap-theme .glyphicon-lamp:before{content:""}#bootstrap-theme .glyphicon-duplicate:before{content:""}#bootstrap-theme .glyphicon-piggy-bank:before{content:""}#bootstrap-theme .glyphicon-scissors:before{content:""}#bootstrap-theme .glyphicon-bitcoin:before{content:""}#bootstrap-theme .glyphicon-btc:before{content:""}#bootstrap-theme .glyphicon-xbt:before{content:""}#bootstrap-theme .glyphicon-yen:before{content:"¥"}#bootstrap-theme .glyphicon-jpy:before{content:"¥"}#bootstrap-theme .glyphicon-ruble:before{content:"₽"}#bootstrap-theme .glyphicon-rub:before{content:"₽"}#bootstrap-theme .glyphicon-scale:before{content:""}#bootstrap-theme .glyphicon-ice-lolly:before{content:""}#bootstrap-theme .glyphicon-ice-lolly-tasted:before{content:""}#bootstrap-theme .glyphicon-education:before{content:""}#bootstrap-theme .glyphicon-option-horizontal:before{content:""}#bootstrap-theme .glyphicon-option-vertical:before{content:""}#bootstrap-theme .glyphicon-menu-hamburger:before{content:""}#bootstrap-theme .glyphicon-modal-window:before{content:""}#bootstrap-theme .glyphicon-oil:before{content:""}#bootstrap-theme .glyphicon-grain:before{content:""}#bootstrap-theme .glyphicon-sunglasses:before{content:""}#bootstrap-theme .glyphicon-text-size:before{content:"�"}#bootstrap-theme .glyphicon-text-color:before{content:""}#bootstrap-theme .glyphicon-text-background:before{content:""}#bootstrap-theme .glyphicon-object-align-top:before{content:""}#bootstrap-theme .glyphicon-object-align-bottom:before{content:""}#bootstrap-theme .glyphicon-object-align-horizontal:before{content:""}#bootstrap-theme .glyphicon-object-align-left:before{content:""}#bootstrap-theme .glyphicon-object-align-vertical:before{content:""}#bootstrap-theme .glyphicon-object-align-right:before{content:""}#bootstrap-theme .glyphicon-triangle-right:before{content:"�"}#bootstrap-theme .glyphicon-triangle-left:before{content:""}#bootstrap-theme .glyphicon-triangle-bottom:before{content:""}#bootstrap-theme .glyphicon-triangle-top:before{content:""}#bootstrap-theme .glyphicon-console:before{content:""}#bootstrap-theme .glyphicon-superscript:before{content:""}#bootstrap-theme .glyphicon-subscript:before{content:""}#bootstrap-theme .glyphicon-menu-left:before{content:""}#bootstrap-theme .glyphicon-menu-right:before{content:""}#bootstrap-theme .glyphicon-menu-down:before{content:""}#bootstrap-theme .glyphicon-menu-up:before{content:""}#bootstrap-theme *{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#bootstrap-theme *:before,#bootstrap-theme *:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#bootstrap-theme html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}#bootstrap-theme body{font-family:"Verdana","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#555;background-color:#fff}#bootstrap-theme input,#bootstrap-theme button,#bootstrap-theme select,#bootstrap-theme textarea{font-family:inherit;font-size:inherit;line-height:inherit}#bootstrap-theme a{color:#2786c2;text-decoration:none}#bootstrap-theme a:hover,#bootstrap-theme a:focus{color:#1a5a82;text-decoration:underline}#bootstrap-theme a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#bootstrap-theme figure{margin:0}#bootstrap-theme img{vertical-align:middle}#bootstrap-theme .img-responsive{display:block;max-width:100%;height:auto}#bootstrap-theme .img-rounded{border-radius:6px}#bootstrap-theme .img-thumbnail{padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}#bootstrap-theme .img-circle{border-radius:50%}#bootstrap-theme hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}#bootstrap-theme .sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}#bootstrap-theme .sr-only-focusable:active,#bootstrap-theme .sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}#bootstrap-theme [role=button]{cursor:pointer}#bootstrap-theme h1,#bootstrap-theme h2,#bootstrap-theme h3,#bootstrap-theme h4,#bootstrap-theme h5,#bootstrap-theme h6,#bootstrap-theme .h1,#bootstrap-theme .h2,#bootstrap-theme .h3,#bootstrap-theme .h4,#bootstrap-theme .h5,#bootstrap-theme .h6{font-family:"Verdana","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.2;color:#000}#bootstrap-theme h1 small,#bootstrap-theme h1 .small,#bootstrap-theme h2 small,#bootstrap-theme h2 .small,#bootstrap-theme h3 small,#bootstrap-theme h3 .small,#bootstrap-theme h4 small,#bootstrap-theme h4 .small,#bootstrap-theme h5 small,#bootstrap-theme h5 .small,#bootstrap-theme h6 small,#bootstrap-theme h6 .small,#bootstrap-theme .h1 small,#bootstrap-theme .h1 .small,#bootstrap-theme .h2 small,#bootstrap-theme .h2 .small,#bootstrap-theme .h3 small,#bootstrap-theme .h3 .small,#bootstrap-theme .h4 small,#bootstrap-theme .h4 .small,#bootstrap-theme .h5 small,#bootstrap-theme .h5 .small,#bootstrap-theme .h6 small,#bootstrap-theme .h6 .small{font-weight:400;line-height:1;color:#999}#bootstrap-theme h1,#bootstrap-theme .h1,#bootstrap-theme h2,#bootstrap-theme .h2,#bootstrap-theme h3,#bootstrap-theme .h3{margin-top:20px;margin-bottom:10px}#bootstrap-theme h1 small,#bootstrap-theme h1 .small,#bootstrap-theme .h1 small,#bootstrap-theme .h1 .small,#bootstrap-theme h2 small,#bootstrap-theme h2 .small,#bootstrap-theme .h2 small,#bootstrap-theme .h2 .small,#bootstrap-theme h3 small,#bootstrap-theme h3 .small,#bootstrap-theme .h3 small,#bootstrap-theme .h3 .small{font-size:65%}#bootstrap-theme h4,#bootstrap-theme .h4,#bootstrap-theme h5,#bootstrap-theme .h5,#bootstrap-theme h6,#bootstrap-theme .h6{margin-top:10px;margin-bottom:10px}#bootstrap-theme h4 small,#bootstrap-theme h4 .small,#bootstrap-theme .h4 small,#bootstrap-theme .h4 .small,#bootstrap-theme h5 small,#bootstrap-theme h5 .small,#bootstrap-theme .h5 small,#bootstrap-theme .h5 .small,#bootstrap-theme h6 small,#bootstrap-theme h6 .small,#bootstrap-theme .h6 small,#bootstrap-theme .h6 .small{font-size:75%}#bootstrap-theme h1,#bootstrap-theme .h1{font-size:36px}#bootstrap-theme h2,#bootstrap-theme .h2{font-size:30px}#bootstrap-theme h3,#bootstrap-theme .h3{font-size:24px}#bootstrap-theme h4,#bootstrap-theme .h4{font-size:18px}#bootstrap-theme h5,#bootstrap-theme .h5{font-size:14px}#bootstrap-theme h6,#bootstrap-theme .h6{font-size:12px}#bootstrap-theme p{margin:0 0 10px}#bootstrap-theme .lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){#bootstrap-theme .lead{font-size:21px}}#bootstrap-theme small,#bootstrap-theme .small{font-size:85%}#bootstrap-theme mark,#bootstrap-theme .mark{padding:.2em;background-color:#fcf8e3}#bootstrap-theme .text-left{text-align:left}#bootstrap-theme .text-right{text-align:right}#bootstrap-theme .text-center{text-align:center}#bootstrap-theme .text-justify{text-align:justify}#bootstrap-theme .text-nowrap{white-space:nowrap}#bootstrap-theme .text-lowercase{text-transform:lowercase}#bootstrap-theme .text-uppercase,#bootstrap-theme .initialism{text-transform:uppercase}#bootstrap-theme .text-capitalize{text-transform:capitalize}#bootstrap-theme .text-muted{color:#999}#bootstrap-theme .text-primary{color:#000}#bootstrap-theme a.text-primary:hover,#bootstrap-theme a.text-primary:focus{color:#000}#bootstrap-theme .text-success{color:#468847}#bootstrap-theme a.text-success:hover,#bootstrap-theme a.text-success:focus{color:#356635}#bootstrap-theme .text-info{color:#3a87ad}#bootstrap-theme a.text-info:hover,#bootstrap-theme a.text-info:focus{color:#2d6987}#bootstrap-theme .text-warning{color:#c09853}#bootstrap-theme a.text-warning:hover,#bootstrap-theme a.text-warning:focus{color:#a47e3c}#bootstrap-theme .text-danger{color:#b94a48}#bootstrap-theme a.text-danger:hover,#bootstrap-theme a.text-danger:focus{color:#953b39}#bootstrap-theme .bg-primary{color:#fff}#bootstrap-theme .bg-primary{background-color:#000}#bootstrap-theme a.bg-primary:hover,#bootstrap-theme a.bg-primary:focus{background-color:#000}#bootstrap-theme .bg-success{background-color:#dff0d8}#bootstrap-theme a.bg-success:hover,#bootstrap-theme a.bg-success:focus{background-color:#c1e2b3}#bootstrap-theme .bg-info{background-color:#d9edf7}#bootstrap-theme a.bg-info:hover,#bootstrap-theme a.bg-info:focus{background-color:#afd9ee}#bootstrap-theme .bg-warning{background-color:#fcf8e3}#bootstrap-theme a.bg-warning:hover,#bootstrap-theme a.bg-warning:focus{background-color:#f7ecb5}#bootstrap-theme .bg-danger{background-color:#f2dede}#bootstrap-theme a.bg-danger:hover,#bootstrap-theme a.bg-danger:focus{background-color:#e4b9b9}#bootstrap-theme .page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}#bootstrap-theme ul,#bootstrap-theme ol{margin-top:0;margin-bottom:10px}#bootstrap-theme ul ul,#bootstrap-theme ul ol,#bootstrap-theme ol ul,#bootstrap-theme ol ol{margin-bottom:0}#bootstrap-theme .list-unstyled{padding-left:0;list-style:none}#bootstrap-theme .list-inline{padding-left:0;list-style:none;margin-left:-5px}#bootstrap-theme .list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}#bootstrap-theme dl{margin-top:0;margin-bottom:20px}#bootstrap-theme dt,#bootstrap-theme dd{line-height:1.428571429}#bootstrap-theme dt{font-weight:700}#bootstrap-theme dd{margin-left:0}#bootstrap-theme .dl-horizontal dd:before,#bootstrap-theme .dl-horizontal dd:after{display:table;content:" "}#bootstrap-theme .dl-horizontal dd:after{clear:both}@media (min-width:768px){#bootstrap-theme .dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}#bootstrap-theme .dl-horizontal dd{margin-left:180px}}#bootstrap-theme abbr[title],#bootstrap-theme abbr[data-original-title]{cursor:help}#bootstrap-theme .initialism{font-size:90%}#bootstrap-theme blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}#bootstrap-theme blockquote p:last-child,#bootstrap-theme blockquote ul:last-child,#bootstrap-theme blockquote ol:last-child{margin-bottom:0}#bootstrap-theme blockquote footer,#bootstrap-theme blockquote small,#bootstrap-theme blockquote .small{display:block;font-size:80%;line-height:1.428571429;color:#999}#bootstrap-theme blockquote footer:before,#bootstrap-theme blockquote small:before,#bootstrap-theme blockquote .small:before{content:"— "}#bootstrap-theme .blockquote-reverse,#bootstrap-theme blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}#bootstrap-theme .blockquote-reverse footer:before,#bootstrap-theme .blockquote-reverse small:before,#bootstrap-theme .blockquote-reverse .small:before,#bootstrap-theme blockquote.pull-right footer:before,#bootstrap-theme blockquote.pull-right small:before,#bootstrap-theme blockquote.pull-right .small:before{content:""}#bootstrap-theme .blockquote-reverse footer:after,#bootstrap-theme .blockquote-reverse small:after,#bootstrap-theme .blockquote-reverse .small:after,#bootstrap-theme blockquote.pull-right footer:after,#bootstrap-theme blockquote.pull-right small:after,#bootstrap-theme blockquote.pull-right .small:after{content:" —"}#bootstrap-theme address{margin-bottom:20px;font-style:normal;line-height:1.428571429}#bootstrap-theme code,#bootstrap-theme kbd,#bootstrap-theme pre,#bootstrap-theme samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}#bootstrap-theme code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}#bootstrap-theme kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}#bootstrap-theme kbd kbd{padding:0;font-size:100%;font-weight:700;box-shadow:none}#bootstrap-theme pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;color:#333;-ms-word-break:break-all;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}#bootstrap-theme pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}#bootstrap-theme .pre-scrollable{max-height:340px;overflow-y:scroll}#bootstrap-theme .container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}#bootstrap-theme .container:before,#bootstrap-theme .container:after{display:table;content:" "}#bootstrap-theme .container:after{clear:both}@media (min-width:768px){#bootstrap-theme .container{width:750px}}@media (min-width:992px){#bootstrap-theme .container{width:970px}}@media (min-width:1200px){#bootstrap-theme .container{width:1170px}}#bootstrap-theme .container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}#bootstrap-theme .container-fluid:before,#bootstrap-theme .container-fluid:after{display:table;content:" "}#bootstrap-theme .container-fluid:after{clear:both}#bootstrap-theme .row{margin-right:-15px;margin-left:-15px}#bootstrap-theme .row:before,#bootstrap-theme .row:after{display:table;content:" "}#bootstrap-theme .row:after{clear:both}#bootstrap-theme .row-no-gutters{margin-right:0;margin-left:0}#bootstrap-theme .row-no-gutters [class*=col-]{padding-right:0;padding-left:0}#bootstrap-theme .col-xs-1,#bootstrap-theme .col-sm-1,#bootstrap-theme .col-md-1,#bootstrap-theme .col-lg-1,#bootstrap-theme .col-xs-2,#bootstrap-theme .col-sm-2,#bootstrap-theme .col-md-2,#bootstrap-theme .col-lg-2,#bootstrap-theme .col-xs-3,#bootstrap-theme .col-sm-3,#bootstrap-theme .col-md-3,#bootstrap-theme .col-lg-3,#bootstrap-theme .col-xs-4,#bootstrap-theme .col-sm-4,#bootstrap-theme .col-md-4,#bootstrap-theme .col-lg-4,#bootstrap-theme .col-xs-5,#bootstrap-theme .col-sm-5,#bootstrap-theme .col-md-5,#bootstrap-theme .col-lg-5,#bootstrap-theme .col-xs-6,#bootstrap-theme .col-sm-6,#bootstrap-theme .col-md-6,#bootstrap-theme .col-lg-6,#bootstrap-theme .col-xs-7,#bootstrap-theme .col-sm-7,#bootstrap-theme .col-md-7,#bootstrap-theme .col-lg-7,#bootstrap-theme .col-xs-8,#bootstrap-theme .col-sm-8,#bootstrap-theme .col-md-8,#bootstrap-theme .col-lg-8,#bootstrap-theme .col-xs-9,#bootstrap-theme .col-sm-9,#bootstrap-theme .col-md-9,#bootstrap-theme .col-lg-9,#bootstrap-theme .col-xs-10,#bootstrap-theme .col-sm-10,#bootstrap-theme .col-md-10,#bootstrap-theme .col-lg-10,#bootstrap-theme .col-xs-11,#bootstrap-theme .col-sm-11,#bootstrap-theme .col-md-11,#bootstrap-theme .col-lg-11,#bootstrap-theme .col-xs-12,#bootstrap-theme .col-sm-12,#bootstrap-theme .col-md-12,#bootstrap-theme .col-lg-12{position:relative;min-height:1px;padding-right:15px;padding-left:15px}#bootstrap-theme .col-xs-1,#bootstrap-theme .col-xs-2,#bootstrap-theme .col-xs-3,#bootstrap-theme .col-xs-4,#bootstrap-theme .col-xs-5,#bootstrap-theme .col-xs-6,#bootstrap-theme .col-xs-7,#bootstrap-theme .col-xs-8,#bootstrap-theme .col-xs-9,#bootstrap-theme .col-xs-10,#bootstrap-theme .col-xs-11,#bootstrap-theme .col-xs-12{float:left}#bootstrap-theme .col-xs-1{width:8.3333333333%}#bootstrap-theme .col-xs-2{width:16.6666666667%}#bootstrap-theme .col-xs-3{width:25%}#bootstrap-theme .col-xs-4{width:33.3333333333%}#bootstrap-theme .col-xs-5{width:41.6666666667%}#bootstrap-theme .col-xs-6{width:50%}#bootstrap-theme .col-xs-7{width:58.3333333333%}#bootstrap-theme .col-xs-8{width:66.6666666667%}#bootstrap-theme .col-xs-9{width:75%}#bootstrap-theme .col-xs-10{width:83.3333333333%}#bootstrap-theme .col-xs-11{width:91.6666666667%}#bootstrap-theme .col-xs-12{width:100%}#bootstrap-theme .col-xs-pull-0{right:auto}#bootstrap-theme .col-xs-pull-1{right:8.3333333333%}#bootstrap-theme .col-xs-pull-2{right:16.6666666667%}#bootstrap-theme .col-xs-pull-3{right:25%}#bootstrap-theme .col-xs-pull-4{right:33.3333333333%}#bootstrap-theme .col-xs-pull-5{right:41.6666666667%}#bootstrap-theme .col-xs-pull-6{right:50%}#bootstrap-theme .col-xs-pull-7{right:58.3333333333%}#bootstrap-theme .col-xs-pull-8{right:66.6666666667%}#bootstrap-theme .col-xs-pull-9{right:75%}#bootstrap-theme .col-xs-pull-10{right:83.3333333333%}#bootstrap-theme .col-xs-pull-11{right:91.6666666667%}#bootstrap-theme .col-xs-pull-12{right:100%}#bootstrap-theme .col-xs-push-0{left:auto}#bootstrap-theme .col-xs-push-1{left:8.3333333333%}#bootstrap-theme .col-xs-push-2{left:16.6666666667%}#bootstrap-theme .col-xs-push-3{left:25%}#bootstrap-theme .col-xs-push-4{left:33.3333333333%}#bootstrap-theme .col-xs-push-5{left:41.6666666667%}#bootstrap-theme .col-xs-push-6{left:50%}#bootstrap-theme .col-xs-push-7{left:58.3333333333%}#bootstrap-theme .col-xs-push-8{left:66.6666666667%}#bootstrap-theme .col-xs-push-9{left:75%}#bootstrap-theme .col-xs-push-10{left:83.3333333333%}#bootstrap-theme .col-xs-push-11{left:91.6666666667%}#bootstrap-theme .col-xs-push-12{left:100%}#bootstrap-theme .col-xs-offset-0{margin-left:0}#bootstrap-theme .col-xs-offset-1{margin-left:8.3333333333%}#bootstrap-theme .col-xs-offset-2{margin-left:16.6666666667%}#bootstrap-theme .col-xs-offset-3{margin-left:25%}#bootstrap-theme .col-xs-offset-4{margin-left:33.3333333333%}#bootstrap-theme .col-xs-offset-5{margin-left:41.6666666667%}#bootstrap-theme .col-xs-offset-6{margin-left:50%}#bootstrap-theme .col-xs-offset-7{margin-left:58.3333333333%}#bootstrap-theme .col-xs-offset-8{margin-left:66.6666666667%}#bootstrap-theme .col-xs-offset-9{margin-left:75%}#bootstrap-theme .col-xs-offset-10{margin-left:83.3333333333%}#bootstrap-theme .col-xs-offset-11{margin-left:91.6666666667%}#bootstrap-theme .col-xs-offset-12{margin-left:100%}@media (min-width:768px){#bootstrap-theme .col-sm-1,#bootstrap-theme .col-sm-2,#bootstrap-theme .col-sm-3,#bootstrap-theme .col-sm-4,#bootstrap-theme .col-sm-5,#bootstrap-theme .col-sm-6,#bootstrap-theme .col-sm-7,#bootstrap-theme .col-sm-8,#bootstrap-theme .col-sm-9,#bootstrap-theme .col-sm-10,#bootstrap-theme .col-sm-11,#bootstrap-theme .col-sm-12{float:left}#bootstrap-theme .col-sm-1{width:8.3333333333%}#bootstrap-theme .col-sm-2{width:16.6666666667%}#bootstrap-theme .col-sm-3{width:25%}#bootstrap-theme .col-sm-4{width:33.3333333333%}#bootstrap-theme .col-sm-5{width:41.6666666667%}#bootstrap-theme .col-sm-6{width:50%}#bootstrap-theme .col-sm-7{width:58.3333333333%}#bootstrap-theme .col-sm-8{width:66.6666666667%}#bootstrap-theme .col-sm-9{width:75%}#bootstrap-theme .col-sm-10{width:83.3333333333%}#bootstrap-theme .col-sm-11{width:91.6666666667%}#bootstrap-theme .col-sm-12{width:100%}#bootstrap-theme .col-sm-pull-0{right:auto}#bootstrap-theme .col-sm-pull-1{right:8.3333333333%}#bootstrap-theme .col-sm-pull-2{right:16.6666666667%}#bootstrap-theme .col-sm-pull-3{right:25%}#bootstrap-theme .col-sm-pull-4{right:33.3333333333%}#bootstrap-theme .col-sm-pull-5{right:41.6666666667%}#bootstrap-theme .col-sm-pull-6{right:50%}#bootstrap-theme .col-sm-pull-7{right:58.3333333333%}#bootstrap-theme .col-sm-pull-8{right:66.6666666667%}#bootstrap-theme .col-sm-pull-9{right:75%}#bootstrap-theme .col-sm-pull-10{right:83.3333333333%}#bootstrap-theme .col-sm-pull-11{right:91.6666666667%}#bootstrap-theme .col-sm-pull-12{right:100%}#bootstrap-theme .col-sm-push-0{left:auto}#bootstrap-theme .col-sm-push-1{left:8.3333333333%}#bootstrap-theme .col-sm-push-2{left:16.6666666667%}#bootstrap-theme .col-sm-push-3{left:25%}#bootstrap-theme .col-sm-push-4{left:33.3333333333%}#bootstrap-theme .col-sm-push-5{left:41.6666666667%}#bootstrap-theme .col-sm-push-6{left:50%}#bootstrap-theme .col-sm-push-7{left:58.3333333333%}#bootstrap-theme .col-sm-push-8{left:66.6666666667%}#bootstrap-theme .col-sm-push-9{left:75%}#bootstrap-theme .col-sm-push-10{left:83.3333333333%}#bootstrap-theme .col-sm-push-11{left:91.6666666667%}#bootstrap-theme .col-sm-push-12{left:100%}#bootstrap-theme .col-sm-offset-0{margin-left:0}#bootstrap-theme .col-sm-offset-1{margin-left:8.3333333333%}#bootstrap-theme .col-sm-offset-2{margin-left:16.6666666667%}#bootstrap-theme .col-sm-offset-3{margin-left:25%}#bootstrap-theme .col-sm-offset-4{margin-left:33.3333333333%}#bootstrap-theme .col-sm-offset-5{margin-left:41.6666666667%}#bootstrap-theme .col-sm-offset-6{margin-left:50%}#bootstrap-theme .col-sm-offset-7{margin-left:58.3333333333%}#bootstrap-theme .col-sm-offset-8{margin-left:66.6666666667%}#bootstrap-theme .col-sm-offset-9{margin-left:75%}#bootstrap-theme .col-sm-offset-10{margin-left:83.3333333333%}#bootstrap-theme .col-sm-offset-11{margin-left:91.6666666667%}#bootstrap-theme .col-sm-offset-12{margin-left:100%}}@media (min-width:992px){#bootstrap-theme .col-md-1,#bootstrap-theme .col-md-2,#bootstrap-theme .col-md-3,#bootstrap-theme .col-md-4,#bootstrap-theme .col-md-5,#bootstrap-theme .col-md-6,#bootstrap-theme .col-md-7,#bootstrap-theme .col-md-8,#bootstrap-theme .col-md-9,#bootstrap-theme .col-md-10,#bootstrap-theme .col-md-11,#bootstrap-theme .col-md-12{float:left}#bootstrap-theme .col-md-1{width:8.3333333333%}#bootstrap-theme .col-md-2{width:16.6666666667%}#bootstrap-theme .col-md-3{width:25%}#bootstrap-theme .col-md-4{width:33.3333333333%}#bootstrap-theme .col-md-5{width:41.6666666667%}#bootstrap-theme .col-md-6{width:50%}#bootstrap-theme .col-md-7{width:58.3333333333%}#bootstrap-theme .col-md-8{width:66.6666666667%}#bootstrap-theme .col-md-9{width:75%}#bootstrap-theme .col-md-10{width:83.3333333333%}#bootstrap-theme .col-md-11{width:91.6666666667%}#bootstrap-theme .col-md-12{width:100%}#bootstrap-theme .col-md-pull-0{right:auto}#bootstrap-theme .col-md-pull-1{right:8.3333333333%}#bootstrap-theme .col-md-pull-2{right:16.6666666667%}#bootstrap-theme .col-md-pull-3{right:25%}#bootstrap-theme .col-md-pull-4{right:33.3333333333%}#bootstrap-theme .col-md-pull-5{right:41.6666666667%}#bootstrap-theme .col-md-pull-6{right:50%}#bootstrap-theme .col-md-pull-7{right:58.3333333333%}#bootstrap-theme .col-md-pull-8{right:66.6666666667%}#bootstrap-theme .col-md-pull-9{right:75%}#bootstrap-theme .col-md-pull-10{right:83.3333333333%}#bootstrap-theme .col-md-pull-11{right:91.6666666667%}#bootstrap-theme .col-md-pull-12{right:100%}#bootstrap-theme .col-md-push-0{left:auto}#bootstrap-theme .col-md-push-1{left:8.3333333333%}#bootstrap-theme .col-md-push-2{left:16.6666666667%}#bootstrap-theme .col-md-push-3{left:25%}#bootstrap-theme .col-md-push-4{left:33.3333333333%}#bootstrap-theme .col-md-push-5{left:41.6666666667%}#bootstrap-theme .col-md-push-6{left:50%}#bootstrap-theme .col-md-push-7{left:58.3333333333%}#bootstrap-theme .col-md-push-8{left:66.6666666667%}#bootstrap-theme .col-md-push-9{left:75%}#bootstrap-theme .col-md-push-10{left:83.3333333333%}#bootstrap-theme .col-md-push-11{left:91.6666666667%}#bootstrap-theme .col-md-push-12{left:100%}#bootstrap-theme .col-md-offset-0{margin-left:0}#bootstrap-theme .col-md-offset-1{margin-left:8.3333333333%}#bootstrap-theme .col-md-offset-2{margin-left:16.6666666667%}#bootstrap-theme .col-md-offset-3{margin-left:25%}#bootstrap-theme .col-md-offset-4{margin-left:33.3333333333%}#bootstrap-theme .col-md-offset-5{margin-left:41.6666666667%}#bootstrap-theme .col-md-offset-6{margin-left:50%}#bootstrap-theme .col-md-offset-7{margin-left:58.3333333333%}#bootstrap-theme .col-md-offset-8{margin-left:66.6666666667%}#bootstrap-theme .col-md-offset-9{margin-left:75%}#bootstrap-theme .col-md-offset-10{margin-left:83.3333333333%}#bootstrap-theme .col-md-offset-11{margin-left:91.6666666667%}#bootstrap-theme .col-md-offset-12{margin-left:100%}}@media (min-width:1200px){#bootstrap-theme .col-lg-1,#bootstrap-theme .col-lg-2,#bootstrap-theme .col-lg-3,#bootstrap-theme .col-lg-4,#bootstrap-theme .col-lg-5,#bootstrap-theme .col-lg-6,#bootstrap-theme .col-lg-7,#bootstrap-theme .col-lg-8,#bootstrap-theme .col-lg-9,#bootstrap-theme .col-lg-10,#bootstrap-theme .col-lg-11,#bootstrap-theme .col-lg-12{float:left}#bootstrap-theme .col-lg-1{width:8.3333333333%}#bootstrap-theme .col-lg-2{width:16.6666666667%}#bootstrap-theme .col-lg-3{width:25%}#bootstrap-theme .col-lg-4{width:33.3333333333%}#bootstrap-theme .col-lg-5{width:41.6666666667%}#bootstrap-theme .col-lg-6{width:50%}#bootstrap-theme .col-lg-7{width:58.3333333333%}#bootstrap-theme .col-lg-8{width:66.6666666667%}#bootstrap-theme .col-lg-9{width:75%}#bootstrap-theme .col-lg-10{width:83.3333333333%}#bootstrap-theme .col-lg-11{width:91.6666666667%}#bootstrap-theme .col-lg-12{width:100%}#bootstrap-theme .col-lg-pull-0{right:auto}#bootstrap-theme .col-lg-pull-1{right:8.3333333333%}#bootstrap-theme .col-lg-pull-2{right:16.6666666667%}#bootstrap-theme .col-lg-pull-3{right:25%}#bootstrap-theme .col-lg-pull-4{right:33.3333333333%}#bootstrap-theme .col-lg-pull-5{right:41.6666666667%}#bootstrap-theme .col-lg-pull-6{right:50%}#bootstrap-theme .col-lg-pull-7{right:58.3333333333%}#bootstrap-theme .col-lg-pull-8{right:66.6666666667%}#bootstrap-theme .col-lg-pull-9{right:75%}#bootstrap-theme .col-lg-pull-10{right:83.3333333333%}#bootstrap-theme .col-lg-pull-11{right:91.6666666667%}#bootstrap-theme .col-lg-pull-12{right:100%}#bootstrap-theme .col-lg-push-0{left:auto}#bootstrap-theme .col-lg-push-1{left:8.3333333333%}#bootstrap-theme .col-lg-push-2{left:16.6666666667%}#bootstrap-theme .col-lg-push-3{left:25%}#bootstrap-theme .col-lg-push-4{left:33.3333333333%}#bootstrap-theme .col-lg-push-5{left:41.6666666667%}#bootstrap-theme .col-lg-push-6{left:50%}#bootstrap-theme .col-lg-push-7{left:58.3333333333%}#bootstrap-theme .col-lg-push-8{left:66.6666666667%}#bootstrap-theme .col-lg-push-9{left:75%}#bootstrap-theme .col-lg-push-10{left:83.3333333333%}#bootstrap-theme .col-lg-push-11{left:91.6666666667%}#bootstrap-theme .col-lg-push-12{left:100%}#bootstrap-theme .col-lg-offset-0{margin-left:0}#bootstrap-theme .col-lg-offset-1{margin-left:8.3333333333%}#bootstrap-theme .col-lg-offset-2{margin-left:16.6666666667%}#bootstrap-theme .col-lg-offset-3{margin-left:25%}#bootstrap-theme .col-lg-offset-4{margin-left:33.3333333333%}#bootstrap-theme .col-lg-offset-5{margin-left:41.6666666667%}#bootstrap-theme .col-lg-offset-6{margin-left:50%}#bootstrap-theme .col-lg-offset-7{margin-left:58.3333333333%}#bootstrap-theme .col-lg-offset-8{margin-left:66.6666666667%}#bootstrap-theme .col-lg-offset-9{margin-left:75%}#bootstrap-theme .col-lg-offset-10{margin-left:83.3333333333%}#bootstrap-theme .col-lg-offset-11{margin-left:91.6666666667%}#bootstrap-theme .col-lg-offset-12{margin-left:100%}}#bootstrap-theme table{background-color:transparent}#bootstrap-theme table col[class*=col-]{position:static;display:table-column;float:none}#bootstrap-theme table td[class*=col-],#bootstrap-theme table th[class*=col-]{position:static;display:table-cell;float:none}#bootstrap-theme caption{padding-top:8px;padding-bottom:8px;color:#999;text-align:left}#bootstrap-theme th{text-align:left}#bootstrap-theme .table{width:100%;max-width:100%;margin-bottom:20px}#bootstrap-theme .table>thead>tr>th,#bootstrap-theme .table>thead>tr>td,#bootstrap-theme .table>tbody>tr>th,#bootstrap-theme .table>tbody>tr>td,#bootstrap-theme .table>tfoot>tr>th,#bootstrap-theme .table>tfoot>tr>td{padding:8px;line-height:1.428571429;vertical-align:top;border-top:1px solid #ddd}#bootstrap-theme .table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}#bootstrap-theme .table>caption+thead>tr:first-child>th,#bootstrap-theme .table>caption+thead>tr:first-child>td,#bootstrap-theme .table>colgroup+thead>tr:first-child>th,#bootstrap-theme .table>colgroup+thead>tr:first-child>td,#bootstrap-theme .table>thead:first-child>tr:first-child>th,#bootstrap-theme .table>thead:first-child>tr:first-child>td{border-top:0}#bootstrap-theme .table>tbody+tbody{border-top:2px solid #ddd}#bootstrap-theme .table .table{background-color:#fff}#bootstrap-theme .table-condensed>thead>tr>th,#bootstrap-theme .table-condensed>thead>tr>td,#bootstrap-theme .table-condensed>tbody>tr>th,#bootstrap-theme .table-condensed>tbody>tr>td,#bootstrap-theme .table-condensed>tfoot>tr>th,#bootstrap-theme .table-condensed>tfoot>tr>td{padding:5px}#bootstrap-theme .table-bordered{border:1px solid #ddd}#bootstrap-theme .table-bordered>thead>tr>th,#bootstrap-theme .table-bordered>thead>tr>td,#bootstrap-theme .table-bordered>tbody>tr>th,#bootstrap-theme .table-bordered>tbody>tr>td,#bootstrap-theme .table-bordered>tfoot>tr>th,#bootstrap-theme .table-bordered>tfoot>tr>td{border:1px solid #ddd}#bootstrap-theme .table-bordered>thead>tr>th,#bootstrap-theme .table-bordered>thead>tr>td{border-bottom-width:2px}#bootstrap-theme .table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}#bootstrap-theme .table-hover>tbody>tr:hover{background-color:#f5f5f5}#bootstrap-theme .table>thead>tr>td.active,#bootstrap-theme .table>thead>tr>th.active,#bootstrap-theme .table>thead>tr.active>td,#bootstrap-theme .table>thead>tr.active>th,#bootstrap-theme .table>tbody>tr>td.active,#bootstrap-theme .table>tbody>tr>th.active,#bootstrap-theme .table>tbody>tr.active>td,#bootstrap-theme .table>tbody>tr.active>th,#bootstrap-theme .table>tfoot>tr>td.active,#bootstrap-theme .table>tfoot>tr>th.active,#bootstrap-theme .table>tfoot>tr.active>td,#bootstrap-theme .table>tfoot>tr.active>th{background-color:#f5f5f5}#bootstrap-theme .table-hover>tbody>tr>td.active:hover,#bootstrap-theme .table-hover>tbody>tr>th.active:hover,#bootstrap-theme .table-hover>tbody>tr.active:hover>td,#bootstrap-theme .table-hover>tbody>tr:hover>.active,#bootstrap-theme .table-hover>tbody>tr.active:hover>th{background-color:#e8e8e8}#bootstrap-theme .table>thead>tr>td.success,#bootstrap-theme .table>thead>tr>th.success,#bootstrap-theme .table>thead>tr.success>td,#bootstrap-theme .table>thead>tr.success>th,#bootstrap-theme .table>tbody>tr>td.success,#bootstrap-theme .table>tbody>tr>th.success,#bootstrap-theme .table>tbody>tr.success>td,#bootstrap-theme .table>tbody>tr.success>th,#bootstrap-theme .table>tfoot>tr>td.success,#bootstrap-theme .table>tfoot>tr>th.success,#bootstrap-theme .table>tfoot>tr.success>td,#bootstrap-theme .table>tfoot>tr.success>th{background-color:#dff0d8}#bootstrap-theme .table-hover>tbody>tr>td.success:hover,#bootstrap-theme .table-hover>tbody>tr>th.success:hover,#bootstrap-theme .table-hover>tbody>tr.success:hover>td,#bootstrap-theme .table-hover>tbody>tr:hover>.success,#bootstrap-theme .table-hover>tbody>tr.success:hover>th{background-color:#d0e9c6}#bootstrap-theme .table>thead>tr>td.info,#bootstrap-theme .table>thead>tr>th.info,#bootstrap-theme .table>thead>tr.info>td,#bootstrap-theme .table>thead>tr.info>th,#bootstrap-theme .table>tbody>tr>td.info,#bootstrap-theme .table>tbody>tr>th.info,#bootstrap-theme .table>tbody>tr.info>td,#bootstrap-theme .table>tbody>tr.info>th,#bootstrap-theme .table>tfoot>tr>td.info,#bootstrap-theme .table>tfoot>tr>th.info,#bootstrap-theme .table>tfoot>tr.info>td,#bootstrap-theme .table>tfoot>tr.info>th{background-color:#d9edf7}#bootstrap-theme .table-hover>tbody>tr>td.info:hover,#bootstrap-theme .table-hover>tbody>tr>th.info:hover,#bootstrap-theme .table-hover>tbody>tr.info:hover>td,#bootstrap-theme .table-hover>tbody>tr:hover>.info,#bootstrap-theme .table-hover>tbody>tr.info:hover>th{background-color:#c4e3f3}#bootstrap-theme .table>thead>tr>td.warning,#bootstrap-theme .table>thead>tr>th.warning,#bootstrap-theme .table>thead>tr.warning>td,#bootstrap-theme .table>thead>tr.warning>th,#bootstrap-theme .table>tbody>tr>td.warning,#bootstrap-theme .table>tbody>tr>th.warning,#bootstrap-theme .table>tbody>tr.warning>td,#bootstrap-theme .table>tbody>tr.warning>th,#bootstrap-theme .table>tfoot>tr>td.warning,#bootstrap-theme .table>tfoot>tr>th.warning,#bootstrap-theme .table>tfoot>tr.warning>td,#bootstrap-theme .table>tfoot>tr.warning>th{background-color:#fcf8e3}#bootstrap-theme .table-hover>tbody>tr>td.warning:hover,#bootstrap-theme .table-hover>tbody>tr>th.warning:hover,#bootstrap-theme .table-hover>tbody>tr.warning:hover>td,#bootstrap-theme .table-hover>tbody>tr:hover>.warning,#bootstrap-theme .table-hover>tbody>tr.warning:hover>th{background-color:#faf2cc}#bootstrap-theme .table>thead>tr>td.danger,#bootstrap-theme .table>thead>tr>th.danger,#bootstrap-theme .table>thead>tr.danger>td,#bootstrap-theme .table>thead>tr.danger>th,#bootstrap-theme .table>tbody>tr>td.danger,#bootstrap-theme .table>tbody>tr>th.danger,#bootstrap-theme .table>tbody>tr.danger>td,#bootstrap-theme .table>tbody>tr.danger>th,#bootstrap-theme .table>tfoot>tr>td.danger,#bootstrap-theme .table>tfoot>tr>th.danger,#bootstrap-theme .table>tfoot>tr.danger>td,#bootstrap-theme .table>tfoot>tr.danger>th{background-color:#f2dede}#bootstrap-theme .table-hover>tbody>tr>td.danger:hover,#bootstrap-theme .table-hover>tbody>tr>th.danger:hover,#bootstrap-theme .table-hover>tbody>tr.danger:hover>td,#bootstrap-theme .table-hover>tbody>tr:hover>.danger,#bootstrap-theme .table-hover>tbody>tr.danger:hover>th{background-color:#ebcccc}#bootstrap-theme .table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){#bootstrap-theme .table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}#bootstrap-theme .table-responsive>.table{margin-bottom:0}#bootstrap-theme .table-responsive>.table>thead>tr>th,#bootstrap-theme .table-responsive>.table>thead>tr>td,#bootstrap-theme .table-responsive>.table>tbody>tr>th,#bootstrap-theme .table-responsive>.table>tbody>tr>td,#bootstrap-theme .table-responsive>.table>tfoot>tr>th,#bootstrap-theme .table-responsive>.table>tfoot>tr>td{white-space:nowrap}#bootstrap-theme .table-responsive>.table-bordered{border:0}#bootstrap-theme .table-responsive>.table-bordered>thead>tr>th:first-child,#bootstrap-theme .table-responsive>.table-bordered>thead>tr>td:first-child,#bootstrap-theme .table-responsive>.table-bordered>tbody>tr>th:first-child,#bootstrap-theme .table-responsive>.table-bordered>tbody>tr>td:first-child,#bootstrap-theme .table-responsive>.table-bordered>tfoot>tr>th:first-child,#bootstrap-theme .table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}#bootstrap-theme .table-responsive>.table-bordered>thead>tr>th:last-child,#bootstrap-theme .table-responsive>.table-bordered>thead>tr>td:last-child,#bootstrap-theme .table-responsive>.table-bordered>tbody>tr>th:last-child,#bootstrap-theme .table-responsive>.table-bordered>tbody>tr>td:last-child,#bootstrap-theme .table-responsive>.table-bordered>tfoot>tr>th:last-child,#bootstrap-theme .table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}#bootstrap-theme .table-responsive>.table-bordered>tbody>tr:last-child>th,#bootstrap-theme .table-responsive>.table-bordered>tbody>tr:last-child>td,#bootstrap-theme .table-responsive>.table-bordered>tfoot>tr:last-child>th,#bootstrap-theme .table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}#bootstrap-theme fieldset{min-width:0;padding:0;margin:0;border:0}#bootstrap-theme legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#555;border:0;border-bottom:1px solid #e5e5e5}#bootstrap-theme label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}#bootstrap-theme input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-appearance:none;-moz-appearance:none;appearance:none}#bootstrap-theme input[type=radio],#bootstrap-theme input[type=checkbox]{margin:4px 0 0;margin-top:1px \9;line-height:normal}#bootstrap-theme input[type=radio][disabled],#bootstrap-theme input[type=radio].disabled,fieldset[disabled] #bootstrap-theme input[type=radio],#bootstrap-theme input[type=checkbox][disabled],#bootstrap-theme input[type=checkbox].disabled,fieldset[disabled] #bootstrap-theme input[type=checkbox]{cursor:not-allowed}#bootstrap-theme input[type=file]{display:block}#bootstrap-theme input[type=range]{display:block;width:100%}#bootstrap-theme select[multiple],#bootstrap-theme select[size]{height:auto}#bootstrap-theme input[type=file]:focus,#bootstrap-theme input[type=radio]:focus,#bootstrap-theme input[type=checkbox]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#bootstrap-theme output{display:block;padding-top:5px;font-size:14px;line-height:1.428571429;color:#555}#bootstrap-theme .form-control{display:block;width:100%;height:30px;padding:4px 8px;font-size:14px;line-height:1.428571429;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}#bootstrap-theme .form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}#bootstrap-theme .form-control::-moz-placeholder{color:#999;opacity:1}#bootstrap-theme .form-control:-ms-input-placeholder{color:#999}#bootstrap-theme .form-control::-webkit-input-placeholder{color:#999}#bootstrap-theme .form-control::-ms-expand{background-color:transparent;border:0}#bootstrap-theme .form-control[disabled],#bootstrap-theme .form-control[readonly],fieldset[disabled] #bootstrap-theme .form-control{background-color:#eee;opacity:1}#bootstrap-theme .form-control[disabled],fieldset[disabled] #bootstrap-theme .form-control{cursor:not-allowed}#bootstrap-theme textarea.form-control{height:auto}@media screen and (-webkit-min-device-pixel-ratio:0){#bootstrap-theme input[type=date].form-control,#bootstrap-theme input[type=time].form-control,#bootstrap-theme input[type=datetime-local].form-control,#bootstrap-theme input[type=month].form-control{line-height:30px}#bootstrap-theme input[type=date].input-sm,#bootstrap-theme .input-group-sm>input.form-control[type=date],#bootstrap-theme .input-group-sm>input.input-group-addon[type=date],#bootstrap-theme .input-group-sm>.input-group-btn>input.btn[type=date],.input-group-sm #bootstrap-theme input[type=date],#bootstrap-theme input[type=time].input-sm,#bootstrap-theme .input-group-sm>input.form-control[type=time],#bootstrap-theme .input-group-sm>input.input-group-addon[type=time],#bootstrap-theme .input-group-sm>.input-group-btn>input.btn[type=time],.input-group-sm #bootstrap-theme input[type=time],#bootstrap-theme input[type=datetime-local].input-sm,#bootstrap-theme .input-group-sm>input.form-control[type=datetime-local],#bootstrap-theme .input-group-sm>input.input-group-addon[type=datetime-local],#bootstrap-theme .input-group-sm>.input-group-btn>input.btn[type=datetime-local],.input-group-sm #bootstrap-theme input[type=datetime-local],#bootstrap-theme input[type=month].input-sm,#bootstrap-theme .input-group-sm>input.form-control[type=month],#bootstrap-theme .input-group-sm>input.input-group-addon[type=month],#bootstrap-theme .input-group-sm>.input-group-btn>input.btn[type=month],.input-group-sm #bootstrap-theme input[type=month]{line-height:30px}#bootstrap-theme input[type=date].input-lg,#bootstrap-theme .input-group-lg>input.form-control[type=date],#bootstrap-theme .input-group-lg>input.input-group-addon[type=date],#bootstrap-theme .input-group-lg>.input-group-btn>input.btn[type=date],.input-group-lg #bootstrap-theme input[type=date],#bootstrap-theme input[type=time].input-lg,#bootstrap-theme .input-group-lg>input.form-control[type=time],#bootstrap-theme .input-group-lg>input.input-group-addon[type=time],#bootstrap-theme .input-group-lg>.input-group-btn>input.btn[type=time],.input-group-lg #bootstrap-theme input[type=time],#bootstrap-theme input[type=datetime-local].input-lg,#bootstrap-theme .input-group-lg>input.form-control[type=datetime-local],#bootstrap-theme .input-group-lg>input.input-group-addon[type=datetime-local],#bootstrap-theme .input-group-lg>.input-group-btn>input.btn[type=datetime-local],.input-group-lg #bootstrap-theme input[type=datetime-local],#bootstrap-theme input[type=month].input-lg,#bootstrap-theme .input-group-lg>input.form-control[type=month],#bootstrap-theme .input-group-lg>input.input-group-addon[type=month],#bootstrap-theme .input-group-lg>.input-group-btn>input.btn[type=month],.input-group-lg #bootstrap-theme input[type=month]{line-height:54px}}#bootstrap-theme .form-group{margin-bottom:15px}#bootstrap-theme .radio,#bootstrap-theme .checkbox{position:relative;display:block;margin-top:10px;margin-bottom:10px}#bootstrap-theme .radio.disabled label,fieldset[disabled] #bootstrap-theme .radio label,#bootstrap-theme .checkbox.disabled label,fieldset[disabled] #bootstrap-theme .checkbox label{cursor:not-allowed}#bootstrap-theme .radio label,#bootstrap-theme .checkbox label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}#bootstrap-theme .radio input[type=radio],#bootstrap-theme .radio-inline input[type=radio],#bootstrap-theme .checkbox input[type=checkbox],#bootstrap-theme .checkbox-inline input[type=checkbox]{position:absolute;margin-top:4px \9;margin-left:-20px}#bootstrap-theme .radio+.radio,#bootstrap-theme .checkbox+.checkbox{margin-top:-5px}#bootstrap-theme .radio-inline,#bootstrap-theme .checkbox-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}#bootstrap-theme .radio-inline.disabled,fieldset[disabled] #bootstrap-theme .radio-inline,#bootstrap-theme .checkbox-inline.disabled,fieldset[disabled] #bootstrap-theme .checkbox-inline{cursor:not-allowed}#bootstrap-theme .radio-inline+.radio-inline,#bootstrap-theme .checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}#bootstrap-theme .form-control-static{min-height:34px;padding-top:5px;padding-bottom:5px;margin-bottom:0}#bootstrap-theme .form-control-static.input-lg,#bootstrap-theme .input-group-lg>.form-control-static.form-control,#bootstrap-theme .input-group-lg>.form-control-static.input-group-addon,#bootstrap-theme .input-group-lg>.input-group-btn>.form-control-static.btn,#bootstrap-theme .form-control-static.input-sm,#bootstrap-theme .input-group-sm>.form-control-static.form-control,#bootstrap-theme .input-group-sm>.form-control-static.input-group-addon,#bootstrap-theme .input-group-sm>.input-group-btn>.form-control-static.btn{padding-right:0;padding-left:0}#bootstrap-theme .input-sm,#bootstrap-theme .input-group-sm>.form-control,#bootstrap-theme .input-group-sm>.input-group-addon,#bootstrap-theme .input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}#bootstrap-theme select.input-sm,#bootstrap-theme .input-group-sm>select.form-control,#bootstrap-theme .input-group-sm>select.input-group-addon,#bootstrap-theme .input-group-sm>.input-group-btn>select.btn{height:30px;line-height:30px}#bootstrap-theme textarea.input-sm,#bootstrap-theme .input-group-sm>textarea.form-control,#bootstrap-theme .input-group-sm>textarea.input-group-addon,#bootstrap-theme .input-group-sm>.input-group-btn>textarea.btn,#bootstrap-theme select[multiple].input-sm,#bootstrap-theme .input-group-sm>select.form-control[multiple],#bootstrap-theme .input-group-sm>select.input-group-addon[multiple],#bootstrap-theme .input-group-sm>.input-group-btn>select.btn[multiple]{height:auto}#bootstrap-theme .form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}#bootstrap-theme .form-group-sm select.form-control{height:30px;line-height:30px}#bootstrap-theme .form-group-sm textarea.form-control,#bootstrap-theme .form-group-sm select[multiple].form-control{height:auto}#bootstrap-theme .form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}#bootstrap-theme .input-lg,#bootstrap-theme .input-group-lg>.form-control,#bootstrap-theme .input-group-lg>.input-group-addon,#bootstrap-theme .input-group-lg>.input-group-btn>.btn{height:54px;padding:14px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}#bootstrap-theme select.input-lg,#bootstrap-theme .input-group-lg>select.form-control,#bootstrap-theme .input-group-lg>select.input-group-addon,#bootstrap-theme .input-group-lg>.input-group-btn>select.btn{height:54px;line-height:54px}#bootstrap-theme textarea.input-lg,#bootstrap-theme .input-group-lg>textarea.form-control,#bootstrap-theme .input-group-lg>textarea.input-group-addon,#bootstrap-theme .input-group-lg>.input-group-btn>textarea.btn,#bootstrap-theme select[multiple].input-lg,#bootstrap-theme .input-group-lg>select.form-control[multiple],#bootstrap-theme .input-group-lg>select.input-group-addon[multiple],#bootstrap-theme .input-group-lg>.input-group-btn>select.btn[multiple]{height:auto}#bootstrap-theme .form-group-lg .form-control{height:54px;padding:14px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}#bootstrap-theme .form-group-lg select.form-control{height:54px;line-height:54px}#bootstrap-theme .form-group-lg textarea.form-control,#bootstrap-theme .form-group-lg select[multiple].form-control{height:auto}#bootstrap-theme .form-group-lg .form-control-static{height:54px;min-height:38px;padding:15px 16px;font-size:18px;line-height:1.3333333}#bootstrap-theme .has-feedback{position:relative}#bootstrap-theme .has-feedback .form-control{padding-right:37.5px}#bootstrap-theme .form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:30px;height:30px;line-height:30px;text-align:center;pointer-events:none}#bootstrap-theme .input-lg+.form-control-feedback,#bootstrap-theme .input-group-lg>.form-control+.form-control-feedback,#bootstrap-theme .input-group-lg>.input-group-addon+.form-control-feedback,#bootstrap-theme .input-group-lg>.input-group-btn>.btn+.form-control-feedback,#bootstrap-theme .input-group-lg+.form-control-feedback,#bootstrap-theme .form-group-lg .form-control+.form-control-feedback{width:54px;height:54px;line-height:54px}#bootstrap-theme .input-sm+.form-control-feedback,#bootstrap-theme .input-group-sm>.form-control+.form-control-feedback,#bootstrap-theme .input-group-sm>.input-group-addon+.form-control-feedback,#bootstrap-theme .input-group-sm>.input-group-btn>.btn+.form-control-feedback,#bootstrap-theme .input-group-sm+.form-control-feedback,#bootstrap-theme .form-group-sm .form-control+.form-control-feedback{width:30px;height:30px;line-height:30px}#bootstrap-theme .has-success .help-block,#bootstrap-theme .has-success .control-label,#bootstrap-theme .has-success .radio,#bootstrap-theme .has-success .checkbox,#bootstrap-theme .has-success .radio-inline,#bootstrap-theme .has-success .checkbox-inline,#bootstrap-theme .has-success.radio label,#bootstrap-theme .has-success.checkbox label,#bootstrap-theme .has-success.radio-inline label,#bootstrap-theme .has-success.checkbox-inline label{color:#468847}#bootstrap-theme .has-success .form-control{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}#bootstrap-theme .has-success .form-control:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #7aba7b}#bootstrap-theme .has-success .input-group-addon{color:#468847;background-color:#dff0d8;border-color:#468847}#bootstrap-theme .has-success .form-control-feedback{color:#468847}#bootstrap-theme .has-warning .help-block,#bootstrap-theme .has-warning .control-label,#bootstrap-theme .has-warning .radio,#bootstrap-theme .has-warning .checkbox,#bootstrap-theme .has-warning .radio-inline,#bootstrap-theme .has-warning .checkbox-inline,#bootstrap-theme .has-warning.radio label,#bootstrap-theme .has-warning.checkbox label,#bootstrap-theme .has-warning.radio-inline label,#bootstrap-theme .has-warning.checkbox-inline label{color:#c09853}#bootstrap-theme .has-warning .form-control{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}#bootstrap-theme .has-warning .form-control:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #dbc59e}#bootstrap-theme .has-warning .input-group-addon{color:#c09853;background-color:#fcf8e3;border-color:#c09853}#bootstrap-theme .has-warning .form-control-feedback{color:#c09853}#bootstrap-theme .has-error .help-block,#bootstrap-theme .has-error .control-label,#bootstrap-theme .has-error .radio,#bootstrap-theme .has-error .checkbox,#bootstrap-theme .has-error .radio-inline,#bootstrap-theme .has-error .checkbox-inline,#bootstrap-theme .has-error.radio label,#bootstrap-theme .has-error.checkbox label,#bootstrap-theme .has-error.radio-inline label,#bootstrap-theme .has-error.checkbox-inline label{color:#b94a48}#bootstrap-theme .has-error .form-control{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}#bootstrap-theme .has-error .form-control:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #d59392}#bootstrap-theme .has-error .input-group-addon{color:#b94a48;background-color:#f2dede;border-color:#b94a48}#bootstrap-theme .has-error .form-control-feedback{color:#b94a48}#bootstrap-theme .has-feedback label~.form-control-feedback{top:25px}#bootstrap-theme .has-feedback label.sr-only~.form-control-feedback{top:0}#bootstrap-theme .help-block{display:block;margin-top:5px;margin-bottom:10px;color:#959595}@media (min-width:768px){#bootstrap-theme .form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}#bootstrap-theme .form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}#bootstrap-theme .form-inline .form-control-static{display:inline-block}#bootstrap-theme .form-inline .input-group{display:inline-table;vertical-align:middle}#bootstrap-theme .form-inline .input-group .input-group-addon,#bootstrap-theme .form-inline .input-group .input-group-btn,#bootstrap-theme .form-inline .input-group .form-control{width:auto}#bootstrap-theme .form-inline .input-group>.form-control{width:100%}#bootstrap-theme .form-inline .control-label{margin-bottom:0;vertical-align:middle}#bootstrap-theme .form-inline .radio,#bootstrap-theme .form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}#bootstrap-theme .form-inline .radio label,#bootstrap-theme .form-inline .checkbox label{padding-left:0}#bootstrap-theme .form-inline .radio input[type=radio],#bootstrap-theme .form-inline .checkbox input[type=checkbox]{position:relative;margin-left:0}#bootstrap-theme .form-inline .has-feedback .form-control-feedback{top:0}}#bootstrap-theme .form-horizontal .radio,#bootstrap-theme .form-horizontal .checkbox,#bootstrap-theme .form-horizontal .radio-inline,#bootstrap-theme .form-horizontal .checkbox-inline{padding-top:5px;margin-top:0;margin-bottom:0}#bootstrap-theme .form-horizontal .radio,#bootstrap-theme .form-horizontal .checkbox{min-height:25px}#bootstrap-theme .form-horizontal .form-group{margin-right:-15px;margin-left:-15px}#bootstrap-theme .form-horizontal .form-group:before,#bootstrap-theme .form-horizontal .form-group:after{display:table;content:" "}#bootstrap-theme .form-horizontal .form-group:after{clear:both}@media (min-width:768px){#bootstrap-theme .form-horizontal .control-label{padding-top:5px;margin-bottom:0;text-align:right}}#bootstrap-theme .form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){#bootstrap-theme .form-horizontal .form-group-lg .control-label{padding-top:15px;font-size:18px}}@media (min-width:768px){#bootstrap-theme .form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}#bootstrap-theme .btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;white-space:nowrap;vertical-align:middle;touch-action:manipulation;cursor:pointer;background-image:none;border:1px solid transparent;padding:4px 8px;font-size:14px;line-height:1.428571429;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#bootstrap-theme .btn:focus,#bootstrap-theme .btn.focus,#bootstrap-theme .btn:active:focus,#bootstrap-theme .btn:active.focus,#bootstrap-theme .btn.active:focus,#bootstrap-theme .btn.active.focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#bootstrap-theme .btn:hover,#bootstrap-theme .btn:focus,#bootstrap-theme .btn.focus{color:#fff;text-decoration:none}#bootstrap-theme .btn:active,#bootstrap-theme .btn.active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}#bootstrap-theme .btn.disabled,#bootstrap-theme .btn[disabled],fieldset[disabled] #bootstrap-theme .btn{cursor:not-allowed;-webkit-filter:alpha(opacity=65);filter:alpha(opacity=65);opacity:.65;-webkit-box-shadow:none;box-shadow:none}#bootstrap-theme a.btn.disabled,fieldset[disabled] #bootstrap-theme a.btn{pointer-events:none}#bootstrap-theme .btn-default{color:#fff;background-color:#70716b;border-color:rgba(0,0,0,.1)}#bootstrap-theme .btn-default:focus,#bootstrap-theme .btn-default.focus{color:#fff;background-color:#565752;border-color:rgba(0,0,0,.1)}#bootstrap-theme .btn-default:hover{color:#fff;background-color:#565752;border-color:rgba(0,0,0,.1)}#bootstrap-theme .btn-default:active,#bootstrap-theme .btn-default.active,.open>#bootstrap-theme .btn-default.dropdown-toggle{color:#fff;background-color:#565752;background-image:none;border-color:rgba(0,0,0,.1)}#bootstrap-theme .btn-default:active:hover,#bootstrap-theme .btn-default:active:focus,#bootstrap-theme .btn-default:active.focus,#bootstrap-theme .btn-default.active:hover,#bootstrap-theme .btn-default.active:focus,#bootstrap-theme .btn-default.active.focus,.open>#bootstrap-theme .btn-default.dropdown-toggle:hover,.open>#bootstrap-theme .btn-default.dropdown-toggle:focus,.open>#bootstrap-theme .btn-default.dropdown-toggle.focus{color:#fff;background-color:#444441;border-color:rgba(0,0,0,.1)}#bootstrap-theme .btn-default.disabled:hover,#bootstrap-theme .btn-default.disabled:focus,#bootstrap-theme .btn-default.disabled.focus,#bootstrap-theme .btn-default[disabled]:hover,#bootstrap-theme .btn-default[disabled]:focus,#bootstrap-theme .btn-default[disabled].focus,fieldset[disabled] #bootstrap-theme .btn-default:hover,fieldset[disabled] #bootstrap-theme .btn-default:focus,fieldset[disabled] #bootstrap-theme .btn-default.focus{background-color:#70716b;border-color:rgba(0,0,0,.1)}#bootstrap-theme .btn-default .badge{color:#70716b;background-color:#fff}#bootstrap-theme .btn-primary{color:#fff;background-color:#70716b;border-color:#70716b}#bootstrap-theme .btn-primary:focus,#bootstrap-theme .btn-primary.focus{color:#fff;background-color:#565752;border-color:#2f302d}#bootstrap-theme .btn-primary:hover{color:#fff;background-color:#565752;border-color:#51524d}#bootstrap-theme .btn-primary:active,#bootstrap-theme .btn-primary.active,.open>#bootstrap-theme .btn-primary.dropdown-toggle{color:#fff;background-color:#565752;background-image:none;border-color:#51524d}#bootstrap-theme .btn-primary:active:hover,#bootstrap-theme .btn-primary:active:focus,#bootstrap-theme .btn-primary:active.focus,#bootstrap-theme .btn-primary.active:hover,#bootstrap-theme .btn-primary.active:focus,#bootstrap-theme .btn-primary.active.focus,.open>#bootstrap-theme .btn-primary.dropdown-toggle:hover,.open>#bootstrap-theme .btn-primary.dropdown-toggle:focus,.open>#bootstrap-theme .btn-primary.dropdown-toggle.focus{color:#fff;background-color:#444441;border-color:#2f302d}#bootstrap-theme .btn-primary.disabled:hover,#bootstrap-theme .btn-primary.disabled:focus,#bootstrap-theme .btn-primary.disabled.focus,#bootstrap-theme .btn-primary[disabled]:hover,#bootstrap-theme .btn-primary[disabled]:focus,#bootstrap-theme .btn-primary[disabled].focus,fieldset[disabled] #bootstrap-theme .btn-primary:hover,fieldset[disabled] #bootstrap-theme .btn-primary:focus,fieldset[disabled] #bootstrap-theme .btn-primary.focus{background-color:#70716b;border-color:#70716b}#bootstrap-theme .btn-primary .badge{color:#70716b;background-color:#fff}#bootstrap-theme .btn-success{color:#fff;background-color:#73a839;border-color:#73a839}#bootstrap-theme .btn-success:focus,#bootstrap-theme .btn-success.focus{color:#fff;background-color:#59822c;border-color:#324919}#bootstrap-theme .btn-success:hover{color:#fff;background-color:#59822c;border-color:#547a29}#bootstrap-theme .btn-success:active,#bootstrap-theme .btn-success.active,.open>#bootstrap-theme .btn-success.dropdown-toggle{color:#fff;background-color:#59822c;background-image:none;border-color:#547a29}#bootstrap-theme .btn-success:active:hover,#bootstrap-theme .btn-success:active:focus,#bootstrap-theme .btn-success:active.focus,#bootstrap-theme .btn-success.active:hover,#bootstrap-theme .btn-success.active:focus,#bootstrap-theme .btn-success.active.focus,.open>#bootstrap-theme .btn-success.dropdown-toggle:hover,.open>#bootstrap-theme .btn-success.dropdown-toggle:focus,.open>#bootstrap-theme .btn-success.dropdown-toggle.focus{color:#fff;background-color:#476723;border-color:#324919}#bootstrap-theme .btn-success.disabled:hover,#bootstrap-theme .btn-success.disabled:focus,#bootstrap-theme .btn-success.disabled.focus,#bootstrap-theme .btn-success[disabled]:hover,#bootstrap-theme .btn-success[disabled]:focus,#bootstrap-theme .btn-success[disabled].focus,fieldset[disabled] #bootstrap-theme .btn-success:hover,fieldset[disabled] #bootstrap-theme .btn-success:focus,fieldset[disabled] #bootstrap-theme .btn-success.focus{background-color:#73a839;border-color:#73a839}#bootstrap-theme .btn-success .badge{color:#73a839;background-color:#fff}#bootstrap-theme .btn-info{color:#fff;background-color:#cde8fe;border-color:#cde8fe}#bootstrap-theme .btn-info:focus,#bootstrap-theme .btn-info.focus{color:#fff;background-color:#9bd1fd;border-color:#50affc}#bootstrap-theme .btn-info:hover{color:#fff;background-color:#9bd1fd;border-color:#91ccfd}#bootstrap-theme .btn-info:active,#bootstrap-theme .btn-info.active,.open>#bootstrap-theme .btn-info.dropdown-toggle{color:#fff;background-color:#9bd1fd;background-image:none;border-color:#91ccfd}#bootstrap-theme .btn-info:active:hover,#bootstrap-theme .btn-info:active:focus,#bootstrap-theme .btn-info:active.focus,#bootstrap-theme .btn-info.active:hover,#bootstrap-theme .btn-info.active:focus,#bootstrap-theme .btn-info.active.focus,.open>#bootstrap-theme .btn-info.dropdown-toggle:hover,.open>#bootstrap-theme .btn-info.dropdown-toggle:focus,.open>#bootstrap-theme .btn-info.dropdown-toggle.focus{color:#fff;background-color:#78c1fc;border-color:#50affc}#bootstrap-theme .btn-info.disabled:hover,#bootstrap-theme .btn-info.disabled:focus,#bootstrap-theme .btn-info.disabled.focus,#bootstrap-theme .btn-info[disabled]:hover,#bootstrap-theme .btn-info[disabled]:focus,#bootstrap-theme .btn-info[disabled].focus,fieldset[disabled] #bootstrap-theme .btn-info:hover,fieldset[disabled] #bootstrap-theme .btn-info:focus,fieldset[disabled] #bootstrap-theme .btn-info.focus{background-color:#cde8fe;border-color:#cde8fe}#bootstrap-theme .btn-info .badge{color:#cde8fe;background-color:#fff}#bootstrap-theme .btn-warning{color:#fff;background-color:#dd5600;border-color:#dd5600}#bootstrap-theme .btn-warning:focus,#bootstrap-theme .btn-warning.focus{color:#fff;background-color:#aa4200;border-color:#5e2400}#bootstrap-theme .btn-warning:hover{color:#fff;background-color:#aa4200;border-color:#a03e00}#bootstrap-theme .btn-warning:active,#bootstrap-theme .btn-warning.active,.open>#bootstrap-theme .btn-warning.dropdown-toggle{color:#fff;background-color:#aa4200;background-image:none;border-color:#a03e00}#bootstrap-theme .btn-warning:active:hover,#bootstrap-theme .btn-warning:active:focus,#bootstrap-theme .btn-warning:active.focus,#bootstrap-theme .btn-warning.active:hover,#bootstrap-theme .btn-warning.active:focus,#bootstrap-theme .btn-warning.active.focus,.open>#bootstrap-theme .btn-warning.dropdown-toggle:hover,.open>#bootstrap-theme .btn-warning.dropdown-toggle:focus,.open>#bootstrap-theme .btn-warning.dropdown-toggle.focus{color:#fff;background-color:#863400;border-color:#5e2400}#bootstrap-theme .btn-warning.disabled:hover,#bootstrap-theme .btn-warning.disabled:focus,#bootstrap-theme .btn-warning.disabled.focus,#bootstrap-theme .btn-warning[disabled]:hover,#bootstrap-theme .btn-warning[disabled]:focus,#bootstrap-theme .btn-warning[disabled].focus,fieldset[disabled] #bootstrap-theme .btn-warning:hover,fieldset[disabled] #bootstrap-theme .btn-warning:focus,fieldset[disabled] #bootstrap-theme .btn-warning.focus{background-color:#dd5600;border-color:#dd5600}#bootstrap-theme .btn-warning .badge{color:#dd5600;background-color:#fff}#bootstrap-theme .btn-danger{color:#fff;background-color:#c71c22;border-color:#c71c22}#bootstrap-theme .btn-danger:focus,#bootstrap-theme .btn-danger.focus{color:#fff;background-color:#9a161a;border-color:#570c0f}#bootstrap-theme .btn-danger:hover{color:#fff;background-color:#9a161a;border-color:#911419}#bootstrap-theme .btn-danger:active,#bootstrap-theme .btn-danger.active,.open>#bootstrap-theme .btn-danger.dropdown-toggle{color:#fff;background-color:#9a161a;background-image:none;border-color:#911419}#bootstrap-theme .btn-danger:active:hover,#bootstrap-theme .btn-danger:active:focus,#bootstrap-theme .btn-danger:active.focus,#bootstrap-theme .btn-danger.active:hover,#bootstrap-theme .btn-danger.active:focus,#bootstrap-theme .btn-danger.active.focus,.open>#bootstrap-theme .btn-danger.dropdown-toggle:hover,.open>#bootstrap-theme .btn-danger.dropdown-toggle:focus,.open>#bootstrap-theme .btn-danger.dropdown-toggle.focus{color:#fff;background-color:#7b1115;border-color:#570c0f}#bootstrap-theme .btn-danger.disabled:hover,#bootstrap-theme .btn-danger.disabled:focus,#bootstrap-theme .btn-danger.disabled.focus,#bootstrap-theme .btn-danger[disabled]:hover,#bootstrap-theme .btn-danger[disabled]:focus,#bootstrap-theme .btn-danger[disabled].focus,fieldset[disabled] #bootstrap-theme .btn-danger:hover,fieldset[disabled] #bootstrap-theme .btn-danger:focus,fieldset[disabled] #bootstrap-theme .btn-danger.focus{background-color:#c71c22;border-color:#c71c22}#bootstrap-theme .btn-danger .badge{color:#c71c22;background-color:#fff}#bootstrap-theme .btn-link{font-weight:400;color:#2786c2;border-radius:0}#bootstrap-theme .btn-link,#bootstrap-theme .btn-link:active,#bootstrap-theme .btn-link.active,#bootstrap-theme .btn-link[disabled],fieldset[disabled] #bootstrap-theme .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}#bootstrap-theme .btn-link,#bootstrap-theme .btn-link:hover,#bootstrap-theme .btn-link:focus,#bootstrap-theme .btn-link:active{border-color:transparent}#bootstrap-theme .btn-link:hover,#bootstrap-theme .btn-link:focus{color:#1a5a82;text-decoration:underline;background-color:transparent}#bootstrap-theme .btn-link[disabled]:hover,#bootstrap-theme .btn-link[disabled]:focus,fieldset[disabled] #bootstrap-theme .btn-link:hover,fieldset[disabled] #bootstrap-theme .btn-link:focus{color:#999;text-decoration:none}#bootstrap-theme .btn-lg,#bootstrap-theme .btn-group-lg>.btn{padding:14px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}#bootstrap-theme .btn-sm,#bootstrap-theme .btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}#bootstrap-theme .btn-xs,#bootstrap-theme .btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}#bootstrap-theme .btn-block{display:block;width:100%}#bootstrap-theme .btn-block+.btn-block{margin-top:5px}#bootstrap-theme input[type=submit].btn-block,#bootstrap-theme input[type=reset].btn-block,#bootstrap-theme input[type=button].btn-block{width:100%}#bootstrap-theme .fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}#bootstrap-theme .fade.in{opacity:1}#bootstrap-theme .collapse{display:none}#bootstrap-theme .collapse.in{display:block}#bootstrap-theme tr.collapse.in{display:table-row}#bootstrap-theme tbody.collapse.in{display:table-row-group}#bootstrap-theme .collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-property:height,visibility;transition-property:height,visibility;-webkit-transition-duration:.35s;transition-duration:.35s;-webkit-transition-timing-function:ease;transition-timing-function:ease}#bootstrap-theme .caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid \9;border-right:4px solid transparent;border-left:4px solid transparent}#bootstrap-theme .dropup,#bootstrap-theme .dropdown{position:relative}#bootstrap-theme .dropdown-toggle:focus{outline:0}#bootstrap-theme .dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}#bootstrap-theme .dropdown-menu.pull-right{right:0;left:auto}#bootstrap-theme .dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}#bootstrap-theme .dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429;color:#333;white-space:nowrap}#bootstrap-theme .dropdown-menu>li>a:hover,#bootstrap-theme .dropdown-menu>li>a:focus{color:#fff;text-decoration:none;background-color:#000}#bootstrap-theme .dropdown-menu>.active>a,#bootstrap-theme .dropdown-menu>.active>a:hover,#bootstrap-theme .dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#000;outline:0}#bootstrap-theme .dropdown-menu>.disabled>a,#bootstrap-theme .dropdown-menu>.disabled>a:hover,#bootstrap-theme .dropdown-menu>.disabled>a:focus{color:#999}#bootstrap-theme .dropdown-menu>.disabled>a:hover,#bootstrap-theme .dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;-webkit-filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}#bootstrap-theme .open>.dropdown-menu{display:block}#bootstrap-theme .open>a{outline:0}#bootstrap-theme .dropdown-menu-right{right:0;left:auto}#bootstrap-theme .dropdown-menu-left{right:auto;left:0}#bootstrap-theme .dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999;white-space:nowrap}#bootstrap-theme .dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}#bootstrap-theme .pull-right>.dropdown-menu{right:0;left:auto}#bootstrap-theme .dropup .caret,#bootstrap-theme .navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid \9}#bootstrap-theme .dropup .dropdown-menu,#bootstrap-theme .navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){#bootstrap-theme .navbar-right .dropdown-menu{right:0;left:auto}#bootstrap-theme .navbar-right .dropdown-menu-left{left:0;right:auto}}#bootstrap-theme .btn-group,#bootstrap-theme .btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}#bootstrap-theme .btn-group>.btn,#bootstrap-theme .btn-group-vertical>.btn{position:relative;float:left}#bootstrap-theme .btn-group>.btn:hover,#bootstrap-theme .btn-group>.btn:focus,#bootstrap-theme .btn-group>.btn:active,#bootstrap-theme .btn-group>.btn.active,#bootstrap-theme .btn-group-vertical>.btn:hover,#bootstrap-theme .btn-group-vertical>.btn:focus,#bootstrap-theme .btn-group-vertical>.btn:active,#bootstrap-theme .btn-group-vertical>.btn.active{z-index:2}#bootstrap-theme .btn-group .btn+.btn,#bootstrap-theme .btn-group .btn+.btn-group,#bootstrap-theme .btn-group .btn-group+.btn,#bootstrap-theme .btn-group .btn-group+.btn-group{margin-left:-1px}#bootstrap-theme .btn-toolbar{margin-left:-5px}#bootstrap-theme .btn-toolbar:before,#bootstrap-theme .btn-toolbar:after{display:table;content:" "}#bootstrap-theme .btn-toolbar:after{clear:both}#bootstrap-theme .btn-toolbar .btn,#bootstrap-theme .btn-toolbar .btn-group,#bootstrap-theme .btn-toolbar .input-group{float:left}#bootstrap-theme .btn-toolbar>.btn,#bootstrap-theme .btn-toolbar>.btn-group,#bootstrap-theme .btn-toolbar>.input-group{margin-left:5px}#bootstrap-theme .btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}#bootstrap-theme .btn-group>.btn:first-child{margin-left:0}#bootstrap-theme .btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}#bootstrap-theme .btn-group>.btn:last-child:not(:first-child),#bootstrap-theme .btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}#bootstrap-theme .btn-group>.btn-group{float:left}#bootstrap-theme .btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}#bootstrap-theme .btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,#bootstrap-theme .btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}#bootstrap-theme .btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}#bootstrap-theme .btn-group .dropdown-toggle:active,#bootstrap-theme .btn-group.open .dropdown-toggle{outline:0}#bootstrap-theme .btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}#bootstrap-theme .btn-group>.btn-lg+.dropdown-toggle,#bootstrap-theme .btn-group-lg.btn-group>.btn+.dropdown-toggle,#bootstrap-theme .btn-group-lg>.btn-group>.btn+.dropdown-toggle{padding-right:12px;padding-left:12px}#bootstrap-theme .btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}#bootstrap-theme .btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}#bootstrap-theme .btn .caret{margin-left:0}#bootstrap-theme .btn-lg .caret,#bootstrap-theme .btn-group-lg>.btn .caret{border-width:5px 5px 0;border-bottom-width:0}#bootstrap-theme .dropup .btn-lg .caret,#bootstrap-theme .dropup .btn-group-lg>.btn .caret{border-width:0 5px 5px}#bootstrap-theme .btn-group-vertical>.btn,#bootstrap-theme .btn-group-vertical>.btn-group,#bootstrap-theme .btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}#bootstrap-theme .btn-group-vertical>.btn-group:before,#bootstrap-theme .btn-group-vertical>.btn-group:after{display:table;content:" "}#bootstrap-theme .btn-group-vertical>.btn-group:after{clear:both}#bootstrap-theme .btn-group-vertical>.btn-group>.btn{float:none}#bootstrap-theme .btn-group-vertical>.btn+.btn,#bootstrap-theme .btn-group-vertical>.btn+.btn-group,#bootstrap-theme .btn-group-vertical>.btn-group+.btn,#bootstrap-theme .btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}#bootstrap-theme .btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}#bootstrap-theme .btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}#bootstrap-theme .btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}#bootstrap-theme .btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}#bootstrap-theme .btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,#bootstrap-theme .btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}#bootstrap-theme .btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}#bootstrap-theme .btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}#bootstrap-theme .btn-group-justified>.btn,#bootstrap-theme .btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}#bootstrap-theme .btn-group-justified>.btn-group .btn{width:100%}#bootstrap-theme .btn-group-justified>.btn-group .dropdown-menu{left:auto}#bootstrap-theme [data-toggle=buttons]>.btn input[type=radio],#bootstrap-theme [data-toggle=buttons]>.btn input[type=checkbox],#bootstrap-theme [data-toggle=buttons]>.btn-group>.btn input[type=radio],#bootstrap-theme [data-toggle=buttons]>.btn-group>.btn input[type=checkbox]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}#bootstrap-theme .input-group{position:relative;display:table;border-collapse:separate}#bootstrap-theme .input-group[class*=col-]{float:none;padding-right:0;padding-left:0}#bootstrap-theme .input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}#bootstrap-theme .input-group .form-control:focus{z-index:3}#bootstrap-theme .input-group-addon,#bootstrap-theme .input-group-btn,#bootstrap-theme .input-group .form-control{display:table-cell}#bootstrap-theme .input-group-addon:not(:first-child):not(:last-child),#bootstrap-theme .input-group-btn:not(:first-child):not(:last-child),#bootstrap-theme .input-group .form-control:not(:first-child):not(:last-child){border-radius:0}#bootstrap-theme .input-group-addon,#bootstrap-theme .input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}#bootstrap-theme .input-group-addon{padding:4px 8px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}#bootstrap-theme .input-group-addon.input-sm,#bootstrap-theme .input-group-sm>.input-group-addon.form-control,#bootstrap-theme .input-group-sm>.input-group-addon,#bootstrap-theme .input-group-sm>.input-group-btn>.input-group-addon.btn{padding:5px 10px;font-size:12px;border-radius:3px}#bootstrap-theme .input-group-addon.input-lg,#bootstrap-theme .input-group-lg>.input-group-addon.form-control,#bootstrap-theme .input-group-lg>.input-group-addon,#bootstrap-theme .input-group-lg>.input-group-btn>.input-group-addon.btn{padding:14px 16px;font-size:18px;border-radius:6px}#bootstrap-theme .input-group-addon input[type=radio],#bootstrap-theme .input-group-addon input[type=checkbox]{margin-top:0}#bootstrap-theme .input-group .form-control:first-child,#bootstrap-theme .input-group-addon:first-child,#bootstrap-theme .input-group-btn:first-child>.btn,#bootstrap-theme .input-group-btn:first-child>.btn-group>.btn,#bootstrap-theme .input-group-btn:first-child>.dropdown-toggle,#bootstrap-theme .input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),#bootstrap-theme .input-group-btn:last-child>.btn-group:not(:last-child)>.btn{border-top-right-radius:0;border-bottom-right-radius:0}#bootstrap-theme .input-group-addon:first-child{border-right:0}#bootstrap-theme .input-group .form-control:last-child,#bootstrap-theme .input-group-addon:last-child,#bootstrap-theme .input-group-btn:last-child>.btn,#bootstrap-theme .input-group-btn:last-child>.btn-group>.btn,#bootstrap-theme .input-group-btn:last-child>.dropdown-toggle,#bootstrap-theme .input-group-btn:first-child>.btn:not(:first-child),#bootstrap-theme .input-group-btn:first-child>.btn-group:not(:first-child)>.btn{border-top-left-radius:0;border-bottom-left-radius:0}#bootstrap-theme .input-group-addon:last-child{border-left:0}#bootstrap-theme .input-group-btn{position:relative;font-size:0;white-space:nowrap}#bootstrap-theme .input-group-btn>.btn{position:relative}#bootstrap-theme .input-group-btn>.btn+.btn{margin-left:-1px}#bootstrap-theme .input-group-btn>.btn:hover,#bootstrap-theme .input-group-btn>.btn:focus,#bootstrap-theme .input-group-btn>.btn:active{z-index:2}#bootstrap-theme .input-group-btn:first-child>.btn,#bootstrap-theme .input-group-btn:first-child>.btn-group{margin-right:-1px}#bootstrap-theme .input-group-btn:last-child>.btn,#bootstrap-theme .input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}#bootstrap-theme .nav{padding-left:0;margin-bottom:0;list-style:none}#bootstrap-theme .nav:before,#bootstrap-theme .nav:after{display:table;content:" "}#bootstrap-theme .nav:after{clear:both}#bootstrap-theme .nav>li{position:relative;display:block}#bootstrap-theme .nav>li>a{position:relative;display:block;padding:10px 15px}#bootstrap-theme .nav>li>a:hover,#bootstrap-theme .nav>li>a:focus{text-decoration:none;background-color:#eee}#bootstrap-theme .nav>li.disabled>a{color:#999}#bootstrap-theme .nav>li.disabled>a:hover,#bootstrap-theme .nav>li.disabled>a:focus{color:#999;text-decoration:none;cursor:not-allowed;background-color:transparent}#bootstrap-theme .nav .open>a,#bootstrap-theme .nav .open>a:hover,#bootstrap-theme .nav .open>a:focus{background-color:#eee;border-color:#2786c2}#bootstrap-theme .nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}#bootstrap-theme .nav>li>a>img{max-width:none}#bootstrap-theme .nav-tabs{border-bottom:1px solid #ddd}#bootstrap-theme .nav-tabs>li{float:left;margin-bottom:-1px}#bootstrap-theme .nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0}#bootstrap-theme .nav-tabs>li>a:hover{border-color:#eee #eee #ddd}#bootstrap-theme .nav-tabs>li.active>a,#bootstrap-theme .nav-tabs>li.active>a:hover,#bootstrap-theme .nav-tabs>li.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}#bootstrap-theme .nav-pills>li{float:left}#bootstrap-theme .nav-pills>li>a{border-radius:4px}#bootstrap-theme .nav-pills>li+li{margin-left:2px}#bootstrap-theme .nav-pills>li.active>a,#bootstrap-theme .nav-pills>li.active>a:hover,#bootstrap-theme .nav-pills>li.active>a:focus{color:#fff;background-color:#000}#bootstrap-theme .nav-stacked>li{float:none}#bootstrap-theme .nav-stacked>li+li{margin-top:2px;margin-left:0}#bootstrap-theme .nav-justified,#bootstrap-theme .nav-tabs.nav-justified{width:100%}#bootstrap-theme .nav-justified>li,#bootstrap-theme .nav-tabs.nav-justified>li{float:none}#bootstrap-theme .nav-justified>li>a,#bootstrap-theme .nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}#bootstrap-theme .nav-justified>.dropdown .dropdown-menu,#bootstrap-theme .nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){#bootstrap-theme .nav-justified>li,#bootstrap-theme .nav-tabs.nav-justified>li{display:table-cell;width:1%}#bootstrap-theme .nav-justified>li>a,#bootstrap-theme .nav-tabs.nav-justified>li>a{margin-bottom:0}}#bootstrap-theme .nav-tabs-justified,#bootstrap-theme .nav-tabs.nav-justified{border-bottom:0}#bootstrap-theme .nav-tabs-justified>li>a,#bootstrap-theme .nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}#bootstrap-theme .nav-tabs-justified>.active>a,#bootstrap-theme .nav-tabs.nav-justified>.active>a,#bootstrap-theme .nav-tabs-justified>.active>a:hover,#bootstrap-theme .nav-tabs.nav-justified>.active>a:hover,#bootstrap-theme .nav-tabs-justified>.active>a:focus,#bootstrap-theme .nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){#bootstrap-theme .nav-tabs-justified>li>a,#bootstrap-theme .nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}#bootstrap-theme .nav-tabs-justified>.active>a,#bootstrap-theme .nav-tabs.nav-justified>.active>a,#bootstrap-theme .nav-tabs-justified>.active>a:hover,#bootstrap-theme .nav-tabs.nav-justified>.active>a:hover,#bootstrap-theme .nav-tabs-justified>.active>a:focus,#bootstrap-theme .nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}#bootstrap-theme .tab-content>.tab-pane{display:none}#bootstrap-theme .tab-content>.active{display:block}#bootstrap-theme .nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}#bootstrap-theme .navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}#bootstrap-theme .navbar:before,#bootstrap-theme .navbar:after{display:table;content:" "}#bootstrap-theme .navbar:after{clear:both}@media (min-width:768px){#bootstrap-theme .navbar{border-radius:4px}}#bootstrap-theme .navbar-header:before,#bootstrap-theme .navbar-header:after{display:table;content:" "}#bootstrap-theme .navbar-header:after{clear:both}@media (min-width:768px){#bootstrap-theme .navbar-header{float:left}}#bootstrap-theme .navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,.1);-webkit-overflow-scrolling:touch}#bootstrap-theme .navbar-collapse:before,#bootstrap-theme .navbar-collapse:after{display:table;content:" "}#bootstrap-theme .navbar-collapse:after{clear:both}#bootstrap-theme .navbar-collapse.in{overflow-y:auto}@media (min-width:768px){#bootstrap-theme .navbar-collapse{width:auto;border-top:0;box-shadow:none}#bootstrap-theme .navbar-collapse.collapse{display:block !important;height:auto !important;padding-bottom:0;overflow:visible !important}#bootstrap-theme .navbar-collapse.in{overflow-y:visible}.navbar-fixed-top #bootstrap-theme .navbar-collapse,.navbar-static-top #bootstrap-theme .navbar-collapse,.navbar-fixed-bottom #bootstrap-theme .navbar-collapse{padding-right:0;padding-left:0}}#bootstrap-theme .navbar-fixed-top,#bootstrap-theme .navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}#bootstrap-theme .navbar-fixed-top .navbar-collapse,#bootstrap-theme .navbar-fixed-bottom .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){#bootstrap-theme .navbar-fixed-top .navbar-collapse,#bootstrap-theme .navbar-fixed-bottom .navbar-collapse{max-height:200px}}@media (min-width:768px){#bootstrap-theme .navbar-fixed-top,#bootstrap-theme .navbar-fixed-bottom{border-radius:0}}#bootstrap-theme .navbar-fixed-top{top:0;border-width:0 0 1px}#bootstrap-theme .navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}#bootstrap-theme .container>.navbar-header,#bootstrap-theme .container>.navbar-collapse,#bootstrap-theme .container-fluid>.navbar-header,#bootstrap-theme .container-fluid>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media (min-width:768px){#bootstrap-theme .container>.navbar-header,#bootstrap-theme .container>.navbar-collapse,#bootstrap-theme .container-fluid>.navbar-header,#bootstrap-theme .container-fluid>.navbar-collapse{margin-right:0;margin-left:0}}#bootstrap-theme .navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){#bootstrap-theme .navbar-static-top{border-radius:0}}#bootstrap-theme .navbar-brand{float:left;height:50px;padding:15px;font-size:18px;line-height:20px}#bootstrap-theme .navbar-brand:hover,#bootstrap-theme .navbar-brand:focus{text-decoration:none}#bootstrap-theme .navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container #bootstrap-theme .navbar-brand,.navbar>.container-fluid #bootstrap-theme .navbar-brand{margin-left:-15px}}#bootstrap-theme .navbar-toggle{position:relative;float:right;padding:9px 10px;margin-right:15px;margin-top:8px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}#bootstrap-theme .navbar-toggle:focus{outline:0}#bootstrap-theme .navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}#bootstrap-theme .navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){#bootstrap-theme .navbar-toggle{display:none}}#bootstrap-theme .navbar-nav{margin:7.5px -15px}#bootstrap-theme .navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){#bootstrap-theme .navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}#bootstrap-theme .navbar-nav .open .dropdown-menu>li>a,#bootstrap-theme .navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}#bootstrap-theme .navbar-nav .open .dropdown-menu>li>a{line-height:20px}#bootstrap-theme .navbar-nav .open .dropdown-menu>li>a:hover,#bootstrap-theme .navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media (min-width:768px){#bootstrap-theme .navbar-nav{float:left;margin:0}#bootstrap-theme .navbar-nav>li{float:left}#bootstrap-theme .navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}#bootstrap-theme .navbar-form{padding:10px 15px;margin-right:-15px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);margin-top:10px;margin-bottom:10px}@media (min-width:768px){#bootstrap-theme .navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}#bootstrap-theme .navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}#bootstrap-theme .navbar-form .form-control-static{display:inline-block}#bootstrap-theme .navbar-form .input-group{display:inline-table;vertical-align:middle}#bootstrap-theme .navbar-form .input-group .input-group-addon,#bootstrap-theme .navbar-form .input-group .input-group-btn,#bootstrap-theme .navbar-form .input-group .form-control{width:auto}#bootstrap-theme .navbar-form .input-group>.form-control{width:100%}#bootstrap-theme .navbar-form .control-label{margin-bottom:0;vertical-align:middle}#bootstrap-theme .navbar-form .radio,#bootstrap-theme .navbar-form .checkbox{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}#bootstrap-theme .navbar-form .radio label,#bootstrap-theme .navbar-form .checkbox label{padding-left:0}#bootstrap-theme .navbar-form .radio input[type=radio],#bootstrap-theme .navbar-form .checkbox input[type=checkbox]{position:relative;margin-left:0}#bootstrap-theme .navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){#bootstrap-theme .navbar-form .form-group{margin-bottom:5px}#bootstrap-theme .navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){#bootstrap-theme .navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}#bootstrap-theme .navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}#bootstrap-theme .navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}#bootstrap-theme .navbar-btn{margin-top:10px;margin-bottom:10px}#bootstrap-theme .navbar-btn.btn-sm,#bootstrap-theme .btn-group-sm>.navbar-btn.btn{margin-top:10px;margin-bottom:10px}#bootstrap-theme .navbar-btn.btn-xs,#bootstrap-theme .btn-group-xs>.navbar-btn.btn{margin-top:14px;margin-bottom:14px}#bootstrap-theme .navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){#bootstrap-theme .navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){#bootstrap-theme .navbar-left{float:left !important}#bootstrap-theme .navbar-right{float:right !important;margin-right:-15px}#bootstrap-theme .navbar-right~.navbar-right{margin-right:0}}#bootstrap-theme .navbar-default{background-color:#000;border-color:#000}#bootstrap-theme .navbar-default .navbar-brand{color:#fff}#bootstrap-theme .navbar-default .navbar-brand:hover,#bootstrap-theme .navbar-default .navbar-brand:focus{color:#fff;background-color:none}#bootstrap-theme .navbar-default .navbar-text{color:#ddd}#bootstrap-theme .navbar-default .navbar-nav>li>a{color:#fff}#bootstrap-theme .navbar-default .navbar-nav>li>a:hover,#bootstrap-theme .navbar-default .navbar-nav>li>a:focus{color:#fff;background-color:#000}#bootstrap-theme .navbar-default .navbar-nav>.active>a,#bootstrap-theme .navbar-default .navbar-nav>.active>a:hover,#bootstrap-theme .navbar-default .navbar-nav>.active>a:focus{color:#fff;background-color:#000}#bootstrap-theme .navbar-default .navbar-nav>.disabled>a,#bootstrap-theme .navbar-default .navbar-nav>.disabled>a:hover,#bootstrap-theme .navbar-default .navbar-nav>.disabled>a:focus{color:#ddd;background-color:transparent}#bootstrap-theme .navbar-default .navbar-nav>.open>a,#bootstrap-theme .navbar-default .navbar-nav>.open>a:hover,#bootstrap-theme .navbar-default .navbar-nav>.open>a:focus{color:#fff;background-color:#000}@media (max-width:767px){#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#fff}#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:#000}#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>.active>a,#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#000}#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ddd;background-color:transparent}}#bootstrap-theme .navbar-default .navbar-toggle{border-color:#000}#bootstrap-theme .navbar-default .navbar-toggle:hover,#bootstrap-theme .navbar-default .navbar-toggle:focus{background-color:#000}#bootstrap-theme .navbar-default .navbar-toggle .icon-bar{background-color:#fff}#bootstrap-theme .navbar-default .navbar-collapse,#bootstrap-theme .navbar-default .navbar-form{border-color:#000}#bootstrap-theme .navbar-default .navbar-link{color:#fff}#bootstrap-theme .navbar-default .navbar-link:hover{color:#fff}#bootstrap-theme .navbar-default .btn-link{color:#fff}#bootstrap-theme .navbar-default .btn-link:hover,#bootstrap-theme .navbar-default .btn-link:focus{color:#fff}#bootstrap-theme .navbar-default .btn-link[disabled]:hover,#bootstrap-theme .navbar-default .btn-link[disabled]:focus,fieldset[disabled] #bootstrap-theme .navbar-default .btn-link:hover,fieldset[disabled] #bootstrap-theme .navbar-default .btn-link:focus{color:#ddd}#bootstrap-theme .navbar-inverse{background-color:#cde8fe;border-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-brand{color:#fff}#bootstrap-theme .navbar-inverse .navbar-brand:hover,#bootstrap-theme .navbar-inverse .navbar-brand:focus{color:#fff;background-color:none}#bootstrap-theme .navbar-inverse .navbar-text{color:#fff}#bootstrap-theme .navbar-inverse .navbar-nav>li>a{color:#fff}#bootstrap-theme .navbar-inverse .navbar-nav>li>a:hover,#bootstrap-theme .navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-nav>.active>a,#bootstrap-theme .navbar-inverse .navbar-nav>.active>a:hover,#bootstrap-theme .navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-nav>.disabled>a,#bootstrap-theme .navbar-inverse .navbar-nav>.disabled>a:hover,#bootstrap-theme .navbar-inverse .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}#bootstrap-theme .navbar-inverse .navbar-nav>.open>a,#bootstrap-theme .navbar-inverse .navbar-nav>.open>a:hover,#bootstrap-theme .navbar-inverse .navbar-nav>.open>a:focus{color:#fff;background-color:#b4ddfe}@media (max-width:767px){#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#fff}#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}#bootstrap-theme .navbar-inverse .navbar-toggle{border-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-toggle:hover,#bootstrap-theme .navbar-inverse .navbar-toggle:focus{background-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}#bootstrap-theme .navbar-inverse .navbar-collapse,#bootstrap-theme .navbar-inverse .navbar-form{border-color:#aad8fd}#bootstrap-theme .navbar-inverse .navbar-link{color:#fff}#bootstrap-theme .navbar-inverse .navbar-link:hover{color:#fff}#bootstrap-theme .navbar-inverse .btn-link{color:#fff}#bootstrap-theme .navbar-inverse .btn-link:hover,#bootstrap-theme .navbar-inverse .btn-link:focus{color:#fff}#bootstrap-theme .navbar-inverse .btn-link[disabled]:hover,#bootstrap-theme .navbar-inverse .btn-link[disabled]:focus,fieldset[disabled] #bootstrap-theme .navbar-inverse .btn-link:hover,fieldset[disabled] #bootstrap-theme .navbar-inverse .btn-link:focus{color:#ccc}#bootstrap-theme .breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}#bootstrap-theme .breadcrumb>li{display:inline-block}#bootstrap-theme .breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/ "}#bootstrap-theme .breadcrumb>.active{color:#999}#bootstrap-theme .pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}#bootstrap-theme .pagination>li{display:inline}#bootstrap-theme .pagination>li>a,#bootstrap-theme .pagination>li>span{position:relative;float:left;padding:4px 8px;margin-left:-1px;line-height:1.428571429;color:#2786c2;text-decoration:none;background-color:#fff;border:1px solid #ddd}#bootstrap-theme .pagination>li>a:hover,#bootstrap-theme .pagination>li>a:focus,#bootstrap-theme .pagination>li>span:hover,#bootstrap-theme .pagination>li>span:focus{z-index:2;color:#1a5a82;background-color:#eee;border-color:#ddd}#bootstrap-theme .pagination>li:first-child>a,#bootstrap-theme .pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}#bootstrap-theme .pagination>li:last-child>a,#bootstrap-theme .pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}#bootstrap-theme .pagination>.active>a,#bootstrap-theme .pagination>.active>a:hover,#bootstrap-theme .pagination>.active>a:focus,#bootstrap-theme .pagination>.active>span,#bootstrap-theme .pagination>.active>span:hover,#bootstrap-theme .pagination>.active>span:focus{z-index:3;color:#999;cursor:default;background-color:#f5f5f5;border-color:#ddd}#bootstrap-theme .pagination>.disabled>span,#bootstrap-theme .pagination>.disabled>span:hover,#bootstrap-theme .pagination>.disabled>span:focus,#bootstrap-theme .pagination>.disabled>a,#bootstrap-theme .pagination>.disabled>a:hover,#bootstrap-theme .pagination>.disabled>a:focus{color:#999;cursor:not-allowed;background-color:#fff;border-color:#ddd}#bootstrap-theme .pagination-lg>li>a,#bootstrap-theme .pagination-lg>li>span{padding:14px 16px;font-size:18px;line-height:1.3333333}#bootstrap-theme .pagination-lg>li:first-child>a,#bootstrap-theme .pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}#bootstrap-theme .pagination-lg>li:last-child>a,#bootstrap-theme .pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}#bootstrap-theme .pagination-sm>li>a,#bootstrap-theme .pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}#bootstrap-theme .pagination-sm>li:first-child>a,#bootstrap-theme .pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}#bootstrap-theme .pagination-sm>li:last-child>a,#bootstrap-theme .pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}#bootstrap-theme .pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}#bootstrap-theme .pager:before,#bootstrap-theme .pager:after{display:table;content:" "}#bootstrap-theme .pager:after{clear:both}#bootstrap-theme .pager li{display:inline}#bootstrap-theme .pager li>a,#bootstrap-theme .pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}#bootstrap-theme .pager li>a:hover,#bootstrap-theme .pager li>a:focus{text-decoration:none;background-color:#eee}#bootstrap-theme .pager .next>a,#bootstrap-theme .pager .next>span{float:right}#bootstrap-theme .pager .previous>a,#bootstrap-theme .pager .previous>span{float:left}#bootstrap-theme .pager .disabled>a,#bootstrap-theme .pager .disabled>a:hover,#bootstrap-theme .pager .disabled>a:focus,#bootstrap-theme .pager .disabled>span{color:#999;cursor:not-allowed;background-color:#fff}#bootstrap-theme .label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}#bootstrap-theme .label:empty{display:none}.btn #bootstrap-theme .label{position:relative;top:-1px}#bootstrap-theme a.label:hover,#bootstrap-theme a.label:focus{color:#fff;text-decoration:none;cursor:pointer}#bootstrap-theme .label-default{background-color:#999}#bootstrap-theme .label-default[href]:hover,#bootstrap-theme .label-default[href]:focus{background-color:gray}#bootstrap-theme .label-primary{background-color:#000}#bootstrap-theme .label-primary[href]:hover,#bootstrap-theme .label-primary[href]:focus{background-color:#000}#bootstrap-theme .label-success{background-color:#73a839}#bootstrap-theme .label-success[href]:hover,#bootstrap-theme .label-success[href]:focus{background-color:#59822c}#bootstrap-theme .label-info{background-color:#cde8fe}#bootstrap-theme .label-info[href]:hover,#bootstrap-theme .label-info[href]:focus{background-color:#9bd1fd}#bootstrap-theme .label-warning{background-color:#dd5600}#bootstrap-theme .label-warning[href]:hover,#bootstrap-theme .label-warning[href]:focus{background-color:#aa4200}#bootstrap-theme .label-danger{background-color:#c71c22}#bootstrap-theme .label-danger[href]:hover,#bootstrap-theme .label-danger[href]:focus{background-color:#9a161a}#bootstrap-theme .badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#000;border-radius:10px}#bootstrap-theme .badge:empty{display:none}.btn #bootstrap-theme .badge{position:relative;top:-1px}.btn-xs #bootstrap-theme .badge,#bootstrap-theme .btn-group-xs>.btn #bootstrap-theme .badge,.btn-group-xs>.btn #bootstrap-theme .badge{top:0;padding:1px 5px}.list-group-item.active>#bootstrap-theme .badge,.nav-pills>.active>a>#bootstrap-theme .badge{color:#2786c2;background-color:#fff}.list-group-item>#bootstrap-theme .badge{float:right}.list-group-item>#bootstrap-theme .badge+#bootstrap-theme .badge{margin-right:5px}.nav-pills>li>a>#bootstrap-theme .badge{margin-left:3px}#bootstrap-theme a.badge:hover,#bootstrap-theme a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}#bootstrap-theme .jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}#bootstrap-theme .jumbotron h1,#bootstrap-theme .jumbotron .h1{color:inherit}#bootstrap-theme .jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}#bootstrap-theme .jumbotron>hr{border-top-color:#d5d5d5}.container #bootstrap-theme .jumbotron,.container-fluid #bootstrap-theme .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}#bootstrap-theme .jumbotron .container{max-width:100%}@media screen and (min-width:768px){#bootstrap-theme .jumbotron{padding-top:48px;padding-bottom:48px}.container #bootstrap-theme .jumbotron,.container-fluid #bootstrap-theme .jumbotron{padding-right:60px;padding-left:60px}#bootstrap-theme .jumbotron h1,#bootstrap-theme .jumbotron .h1{font-size:63px}}#bootstrap-theme .thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}#bootstrap-theme .thumbnail>img,#bootstrap-theme .thumbnail a>img{display:block;max-width:100%;height:auto;margin-right:auto;margin-left:auto}#bootstrap-theme .thumbnail .caption{padding:9px;color:#555}#bootstrap-theme a.thumbnail:hover,#bootstrap-theme a.thumbnail:focus,#bootstrap-theme a.thumbnail.active{border-color:#2786c2}#bootstrap-theme .alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}#bootstrap-theme .alert h4{margin-top:0;color:inherit}#bootstrap-theme .alert .alert-link{font-weight:700}#bootstrap-theme .alert>p,#bootstrap-theme .alert>ul{margin-bottom:0}#bootstrap-theme .alert>p+p{margin-top:5px}#bootstrap-theme .alert-dismissable,#bootstrap-theme .alert-dismissible{padding-right:35px}#bootstrap-theme .alert-dismissable .close,#bootstrap-theme .alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}#bootstrap-theme .alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}#bootstrap-theme .alert-success hr{border-top-color:#c9e2b3}#bootstrap-theme .alert-success .alert-link{color:#356635}#bootstrap-theme .alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}#bootstrap-theme .alert-info hr{border-top-color:#a6e1ec}#bootstrap-theme .alert-info .alert-link{color:#2d6987}#bootstrap-theme .alert-warning{color:#c09853;background-color:#fcf8e3;border-color:#fbeed5}#bootstrap-theme .alert-warning hr{border-top-color:#f8e5be}#bootstrap-theme .alert-warning .alert-link{color:#a47e3c}#bootstrap-theme .alert-danger{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}#bootstrap-theme .alert-danger hr{border-top-color:#e6c1c7}#bootstrap-theme .alert-danger .alert-link{color:#953b39}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}#bootstrap-theme .progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}#bootstrap-theme .progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#000;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}#bootstrap-theme .progress-striped .progress-bar,#bootstrap-theme .progress-bar-striped{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:40px 40px}#bootstrap-theme .progress.active .progress-bar,#bootstrap-theme .progress-bar.active{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}#bootstrap-theme .progress-bar-success{background-color:#73a839}.progress-striped #bootstrap-theme .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}#bootstrap-theme .progress-bar-info{background-color:#cde8fe}.progress-striped #bootstrap-theme .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}#bootstrap-theme .progress-bar-warning{background-color:#dd5600}.progress-striped #bootstrap-theme .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}#bootstrap-theme .progress-bar-danger{background-color:#c71c22}.progress-striped #bootstrap-theme .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}#bootstrap-theme .media{margin-top:15px}#bootstrap-theme .media:first-child{margin-top:0}#bootstrap-theme .media,#bootstrap-theme .media-body{overflow:hidden;zoom:1}#bootstrap-theme .media-body{width:10000px}#bootstrap-theme .media-object{display:block}#bootstrap-theme .media-object.img-thumbnail{max-width:none}#bootstrap-theme .media-right,#bootstrap-theme .media>.pull-right{padding-left:10px}#bootstrap-theme .media-left,#bootstrap-theme .media>.pull-left{padding-right:10px}#bootstrap-theme .media-left,#bootstrap-theme .media-right,#bootstrap-theme .media-body{display:table-cell;vertical-align:top}#bootstrap-theme .media-middle{vertical-align:middle}#bootstrap-theme .media-bottom{vertical-align:bottom}#bootstrap-theme .media-heading{margin-top:0;margin-bottom:5px}#bootstrap-theme .media-list{padding-left:0;list-style:none}#bootstrap-theme .list-group{padding-left:0;margin-bottom:20px}#bootstrap-theme .list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}#bootstrap-theme .list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}#bootstrap-theme .list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}#bootstrap-theme .list-group-item.disabled,#bootstrap-theme .list-group-item.disabled:hover,#bootstrap-theme .list-group-item.disabled:focus{color:#999;cursor:not-allowed;background-color:#eee}#bootstrap-theme .list-group-item.disabled .list-group-item-heading,#bootstrap-theme .list-group-item.disabled:hover .list-group-item-heading,#bootstrap-theme .list-group-item.disabled:focus .list-group-item-heading{color:inherit}#bootstrap-theme .list-group-item.disabled .list-group-item-text,#bootstrap-theme .list-group-item.disabled:hover .list-group-item-text,#bootstrap-theme .list-group-item.disabled:focus .list-group-item-text{color:#999}#bootstrap-theme .list-group-item.active,#bootstrap-theme .list-group-item.active:hover,#bootstrap-theme .list-group-item.active:focus{z-index:2;color:#fff;background-color:#000;border-color:#000}#bootstrap-theme .list-group-item.active .list-group-item-heading,#bootstrap-theme .list-group-item.active .list-group-item-heading>small,#bootstrap-theme .list-group-item.active .list-group-item-heading>.small,#bootstrap-theme .list-group-item.active:hover .list-group-item-heading,#bootstrap-theme .list-group-item.active:hover .list-group-item-heading>small,#bootstrap-theme .list-group-item.active:hover .list-group-item-heading>.small,#bootstrap-theme .list-group-item.active:focus .list-group-item-heading,#bootstrap-theme .list-group-item.active:focus .list-group-item-heading>small,#bootstrap-theme .list-group-item.active:focus .list-group-item-heading>.small{color:inherit}#bootstrap-theme .list-group-item.active .list-group-item-text,#bootstrap-theme .list-group-item.active:hover .list-group-item-text,#bootstrap-theme .list-group-item.active:focus .list-group-item-text{color:#666}#bootstrap-theme a.list-group-item,#bootstrap-theme button.list-group-item{color:#555}#bootstrap-theme a.list-group-item .list-group-item-heading,#bootstrap-theme button.list-group-item .list-group-item-heading{color:#333}#bootstrap-theme a.list-group-item:hover,#bootstrap-theme a.list-group-item:focus,#bootstrap-theme button.list-group-item:hover,#bootstrap-theme button.list-group-item:focus{color:#555;text-decoration:none;background-color:#f5f5f5}#bootstrap-theme button.list-group-item{width:100%;text-align:left}#bootstrap-theme .list-group-item-success{color:#468847;background-color:#dff0d8}#bootstrap-theme a.list-group-item-success,#bootstrap-theme button.list-group-item-success{color:#468847}#bootstrap-theme a.list-group-item-success .list-group-item-heading,#bootstrap-theme button.list-group-item-success .list-group-item-heading{color:inherit}#bootstrap-theme a.list-group-item-success:hover,#bootstrap-theme a.list-group-item-success:focus,#bootstrap-theme button.list-group-item-success:hover,#bootstrap-theme button.list-group-item-success:focus{color:#468847;background-color:#d0e9c6}#bootstrap-theme a.list-group-item-success.active,#bootstrap-theme a.list-group-item-success.active:hover,#bootstrap-theme a.list-group-item-success.active:focus,#bootstrap-theme button.list-group-item-success.active,#bootstrap-theme button.list-group-item-success.active:hover,#bootstrap-theme button.list-group-item-success.active:focus{color:#fff;background-color:#468847;border-color:#468847}#bootstrap-theme .list-group-item-info{color:#3a87ad;background-color:#d9edf7}#bootstrap-theme a.list-group-item-info,#bootstrap-theme button.list-group-item-info{color:#3a87ad}#bootstrap-theme a.list-group-item-info .list-group-item-heading,#bootstrap-theme button.list-group-item-info .list-group-item-heading{color:inherit}#bootstrap-theme a.list-group-item-info:hover,#bootstrap-theme a.list-group-item-info:focus,#bootstrap-theme button.list-group-item-info:hover,#bootstrap-theme button.list-group-item-info:focus{color:#3a87ad;background-color:#c4e3f3}#bootstrap-theme a.list-group-item-info.active,#bootstrap-theme a.list-group-item-info.active:hover,#bootstrap-theme a.list-group-item-info.active:focus,#bootstrap-theme button.list-group-item-info.active,#bootstrap-theme button.list-group-item-info.active:hover,#bootstrap-theme button.list-group-item-info.active:focus{color:#fff;background-color:#3a87ad;border-color:#3a87ad}#bootstrap-theme .list-group-item-warning{color:#c09853;background-color:#fcf8e3}#bootstrap-theme a.list-group-item-warning,#bootstrap-theme button.list-group-item-warning{color:#c09853}#bootstrap-theme a.list-group-item-warning .list-group-item-heading,#bootstrap-theme button.list-group-item-warning .list-group-item-heading{color:inherit}#bootstrap-theme a.list-group-item-warning:hover,#bootstrap-theme a.list-group-item-warning:focus,#bootstrap-theme button.list-group-item-warning:hover,#bootstrap-theme button.list-group-item-warning:focus{color:#c09853;background-color:#faf2cc}#bootstrap-theme a.list-group-item-warning.active,#bootstrap-theme a.list-group-item-warning.active:hover,#bootstrap-theme a.list-group-item-warning.active:focus,#bootstrap-theme button.list-group-item-warning.active,#bootstrap-theme button.list-group-item-warning.active:hover,#bootstrap-theme button.list-group-item-warning.active:focus{color:#fff;background-color:#c09853;border-color:#c09853}#bootstrap-theme .list-group-item-danger{color:#b94a48;background-color:#f2dede}#bootstrap-theme a.list-group-item-danger,#bootstrap-theme button.list-group-item-danger{color:#b94a48}#bootstrap-theme a.list-group-item-danger .list-group-item-heading,#bootstrap-theme button.list-group-item-danger .list-group-item-heading{color:inherit}#bootstrap-theme a.list-group-item-danger:hover,#bootstrap-theme a.list-group-item-danger:focus,#bootstrap-theme button.list-group-item-danger:hover,#bootstrap-theme button.list-group-item-danger:focus{color:#b94a48;background-color:#ebcccc}#bootstrap-theme a.list-group-item-danger.active,#bootstrap-theme a.list-group-item-danger.active:hover,#bootstrap-theme a.list-group-item-danger.active:focus,#bootstrap-theme button.list-group-item-danger.active,#bootstrap-theme button.list-group-item-danger.active:hover,#bootstrap-theme button.list-group-item-danger.active:focus{color:#fff;background-color:#b94a48;border-color:#b94a48}#bootstrap-theme .list-group-item-heading{margin-top:0;margin-bottom:5px}#bootstrap-theme .list-group-item-text{margin-bottom:0;line-height:1.3}#bootstrap-theme .panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}#bootstrap-theme .panel-body{padding:15px}#bootstrap-theme .panel-body:before,#bootstrap-theme .panel-body:after{display:table;content:" "}#bootstrap-theme .panel-body:after{clear:both}#bootstrap-theme .panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}#bootstrap-theme .panel-heading>.dropdown .dropdown-toggle{color:inherit}#bootstrap-theme .panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}#bootstrap-theme .panel-title>a,#bootstrap-theme .panel-title>small,#bootstrap-theme .panel-title>.small,#bootstrap-theme .panel-title>small>a,#bootstrap-theme .panel-title>.small>a{color:inherit}#bootstrap-theme .panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}#bootstrap-theme .panel>.list-group,#bootstrap-theme .panel>.panel-collapse>.list-group{margin-bottom:0}#bootstrap-theme .panel>.list-group .list-group-item,#bootstrap-theme .panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}#bootstrap-theme .panel>.list-group:first-child .list-group-item:first-child,#bootstrap-theme .panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}#bootstrap-theme .panel>.list-group:last-child .list-group-item:last-child,#bootstrap-theme .panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}#bootstrap-theme .panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}#bootstrap-theme .panel-heading+.list-group .list-group-item:first-child{border-top-width:0}#bootstrap-theme .list-group+.panel-footer{border-top-width:0}#bootstrap-theme .panel>.table,#bootstrap-theme .panel>.table-responsive>.table,#bootstrap-theme .panel>.panel-collapse>.table{margin-bottom:0}#bootstrap-theme .panel>.table caption,#bootstrap-theme .panel>.table-responsive>.table caption,#bootstrap-theme .panel>.panel-collapse>.table caption{padding-right:15px;padding-left:15px}#bootstrap-theme .panel>.table:first-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}#bootstrap-theme .panel>.table:first-child>thead:first-child>tr:first-child,#bootstrap-theme .panel>.table:first-child>tbody:first-child>tr:first-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}#bootstrap-theme .panel>.table:first-child>thead:first-child>tr:first-child td:first-child,#bootstrap-theme .panel>.table:first-child>thead:first-child>tr:first-child th:first-child,#bootstrap-theme .panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,#bootstrap-theme .panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child{border-top-left-radius:3px}#bootstrap-theme .panel>.table:first-child>thead:first-child>tr:first-child td:last-child,#bootstrap-theme .panel>.table:first-child>thead:first-child>tr:first-child th:last-child,#bootstrap-theme .panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,#bootstrap-theme .panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child{border-top-right-radius:3px}#bootstrap-theme .panel>.table:last-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}#bootstrap-theme .panel>.table:last-child>tbody:last-child>tr:last-child,#bootstrap-theme .panel>.table:last-child>tfoot:last-child>tr:last-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}#bootstrap-theme .panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,#bootstrap-theme .panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,#bootstrap-theme .panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,#bootstrap-theme .panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}#bootstrap-theme .panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,#bootstrap-theme .panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,#bootstrap-theme .panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,#bootstrap-theme .panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}#bootstrap-theme .panel>.panel-body+.table,#bootstrap-theme .panel>.panel-body+.table-responsive,#bootstrap-theme .panel>.table+.panel-body,#bootstrap-theme .panel>.table-responsive+.panel-body{border-top:1px solid #ddd}#bootstrap-theme .panel>.table>tbody:first-child>tr:first-child th,#bootstrap-theme .panel>.table>tbody:first-child>tr:first-child td{border-top:0}#bootstrap-theme .panel>.table-bordered,#bootstrap-theme .panel>.table-responsive>.table-bordered{border:0}#bootstrap-theme .panel>.table-bordered>thead>tr>th:first-child,#bootstrap-theme .panel>.table-bordered>thead>tr>td:first-child,#bootstrap-theme .panel>.table-bordered>tbody>tr>th:first-child,#bootstrap-theme .panel>.table-bordered>tbody>tr>td:first-child,#bootstrap-theme .panel>.table-bordered>tfoot>tr>th:first-child,#bootstrap-theme .panel>.table-bordered>tfoot>tr>td:first-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>thead>tr>th:first-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>thead>tr>td:first-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}#bootstrap-theme .panel>.table-bordered>thead>tr>th:last-child,#bootstrap-theme .panel>.table-bordered>thead>tr>td:last-child,#bootstrap-theme .panel>.table-bordered>tbody>tr>th:last-child,#bootstrap-theme .panel>.table-bordered>tbody>tr>td:last-child,#bootstrap-theme .panel>.table-bordered>tfoot>tr>th:last-child,#bootstrap-theme .panel>.table-bordered>tfoot>tr>td:last-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>thead>tr>th:last-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>thead>tr>td:last-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}#bootstrap-theme .panel>.table-bordered>thead>tr:first-child>td,#bootstrap-theme .panel>.table-bordered>thead>tr:first-child>th,#bootstrap-theme .panel>.table-bordered>tbody>tr:first-child>td,#bootstrap-theme .panel>.table-bordered>tbody>tr:first-child>th,#bootstrap-theme .panel>.table-responsive>.table-bordered>thead>tr:first-child>td,#bootstrap-theme .panel>.table-responsive>.table-bordered>thead>tr:first-child>th,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr:first-child>th{border-bottom:0}#bootstrap-theme .panel>.table-bordered>tbody>tr:last-child>td,#bootstrap-theme .panel>.table-bordered>tbody>tr:last-child>th,#bootstrap-theme .panel>.table-bordered>tfoot>tr:last-child>td,#bootstrap-theme .panel>.table-bordered>tfoot>tr:last-child>th,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,#bootstrap-theme .panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,#bootstrap-theme .panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}#bootstrap-theme .panel>.table-responsive{margin-bottom:0;border:0}#bootstrap-theme .panel-group{margin-bottom:20px}#bootstrap-theme .panel-group .panel{margin-bottom:0;border-radius:4px}#bootstrap-theme .panel-group .panel+.panel{margin-top:5px}#bootstrap-theme .panel-group .panel-heading{border-bottom:0}#bootstrap-theme .panel-group .panel-heading+.panel-collapse>.panel-body,#bootstrap-theme .panel-group .panel-heading+.panel-collapse>.list-group{border-top:1px solid #ddd}#bootstrap-theme .panel-group .panel-footer{border-top:0}#bootstrap-theme .panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}#bootstrap-theme .panel-default{border-color:#ddd}#bootstrap-theme .panel-default>.panel-heading{color:#555;background-color:#f5f5f5;border-color:#ddd}#bootstrap-theme .panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}#bootstrap-theme .panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#555}#bootstrap-theme .panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}#bootstrap-theme .panel-primary{border-color:#ddd}#bootstrap-theme .panel-primary>.panel-heading{color:#fff;background-color:#000;border-color:#ddd}#bootstrap-theme .panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}#bootstrap-theme .panel-primary>.panel-heading .badge{color:#000;background-color:#fff}#bootstrap-theme .panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}#bootstrap-theme .panel-success{border-color:#ddd}#bootstrap-theme .panel-success>.panel-heading{color:#468847;background-color:#73a839;border-color:#ddd}#bootstrap-theme .panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}#bootstrap-theme .panel-success>.panel-heading .badge{color:#73a839;background-color:#468847}#bootstrap-theme .panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}#bootstrap-theme .panel-info{border-color:#ddd}#bootstrap-theme .panel-info>.panel-heading{color:#3a87ad;background-color:#cde8fe;border-color:#ddd}#bootstrap-theme .panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}#bootstrap-theme .panel-info>.panel-heading .badge{color:#cde8fe;background-color:#3a87ad}#bootstrap-theme .panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}#bootstrap-theme .panel-warning{border-color:#ddd}#bootstrap-theme .panel-warning>.panel-heading{color:#c09853;background-color:#dd5600;border-color:#ddd}#bootstrap-theme .panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}#bootstrap-theme .panel-warning>.panel-heading .badge{color:#dd5600;background-color:#c09853}#bootstrap-theme .panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}#bootstrap-theme .panel-danger{border-color:#ddd}#bootstrap-theme .panel-danger>.panel-heading{color:#b94a48;background-color:#c71c22;border-color:#ddd}#bootstrap-theme .panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}#bootstrap-theme .panel-danger>.panel-heading .badge{color:#c71c22;background-color:#b94a48}#bootstrap-theme .panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}#bootstrap-theme .embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}#bootstrap-theme .embed-responsive .embed-responsive-item,#bootstrap-theme .embed-responsive iframe,#bootstrap-theme .embed-responsive embed,#bootstrap-theme .embed-responsive object,#bootstrap-theme .embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}#bootstrap-theme .embed-responsive-16by9{padding-bottom:56.25%}#bootstrap-theme .embed-responsive-4by3{padding-bottom:75%}#bootstrap-theme .well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}#bootstrap-theme .well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}#bootstrap-theme .well-lg{padding:24px;border-radius:6px}#bootstrap-theme .well-sm{padding:9px;border-radius:3px}#bootstrap-theme .close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;-webkit-filter:alpha(opacity=20);filter:alpha(opacity=20);opacity:.2}#bootstrap-theme .close:hover,#bootstrap-theme .close:focus{color:#000;text-decoration:none;cursor:pointer;-webkit-filter:alpha(opacity=50);filter:alpha(opacity=50);opacity:.5}#bootstrap-theme button.close{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance:none;-moz-appearance:none;appearance:none}#bootstrap-theme .modal-open{overflow:hidden}#bootstrap-theme .modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}#bootstrap-theme .modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:-ms-transform .3s ease-out;transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out}#bootstrap-theme .modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}#bootstrap-theme .modal-open .modal{overflow-x:hidden;overflow-y:auto}#bootstrap-theme .modal-dialog{position:relative;width:auto;margin:10px}#bootstrap-theme .modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5);outline:0}#bootstrap-theme .modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}#bootstrap-theme .modal-backdrop.fade{-webkit-filter:alpha(opacity=0);filter:alpha(opacity=0);opacity:0}#bootstrap-theme .modal-backdrop.in{-webkit-filter:alpha(opacity=50);filter:alpha(opacity=50);opacity:.5}#bootstrap-theme .modal-header{padding:15px;border-bottom:1px solid #e5e5e5}#bootstrap-theme .modal-header:before,#bootstrap-theme .modal-header:after{display:table;content:" "}#bootstrap-theme .modal-header:after{clear:both}#bootstrap-theme .modal-header .close{margin-top:-2px}#bootstrap-theme .modal-title{margin:0;line-height:1.428571429}#bootstrap-theme .modal-body{position:relative;padding:20px}#bootstrap-theme .modal-footer{padding:20px;text-align:right;border-top:1px solid #e5e5e5}#bootstrap-theme .modal-footer:before,#bootstrap-theme .modal-footer:after{display:table;content:" "}#bootstrap-theme .modal-footer:after{clear:both}#bootstrap-theme .modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}#bootstrap-theme .modal-footer .btn-group .btn+.btn{margin-left:-1px}#bootstrap-theme .modal-footer .btn-block+.btn-block{margin-left:0}#bootstrap-theme .modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){#bootstrap-theme .modal-dialog{width:600px;margin:30px auto}#bootstrap-theme .modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}#bootstrap-theme .modal-sm{width:300px}}@media (min-width:992px){#bootstrap-theme .modal-lg{width:900px}}#bootstrap-theme .tooltip{position:absolute;z-index:1070;display:block;font-family:"Verdana","Helvetica Neue",Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1.428571429;line-break:auto;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;-ms-word-break:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;font-size:12px;-webkit-filter:alpha(opacity=0);filter:alpha(opacity=0);opacity:0}#bootstrap-theme .tooltip.in{-webkit-filter:alpha(opacity=90);filter:alpha(opacity=90);opacity:.9}#bootstrap-theme .tooltip.top{padding:5px 0;margin-top:-3px}#bootstrap-theme .tooltip.right{padding:0 5px;margin-left:3px}#bootstrap-theme .tooltip.bottom{padding:5px 0;margin-top:3px}#bootstrap-theme .tooltip.left{padding:0 5px;margin-left:-3px}#bootstrap-theme .tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}#bootstrap-theme .tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}#bootstrap-theme .tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}#bootstrap-theme .tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}#bootstrap-theme .tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}#bootstrap-theme .tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}#bootstrap-theme .tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}#bootstrap-theme .tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}#bootstrap-theme .tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}#bootstrap-theme .tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}#bootstrap-theme .popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Verdana","Helvetica Neue",Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1.428571429;line-break:auto;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;-ms-word-break:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;font-size:14px;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}#bootstrap-theme .popover.top{margin-top:-10px}#bootstrap-theme .popover.right{margin-left:10px}#bootstrap-theme .popover.bottom{margin-top:10px}#bootstrap-theme .popover.left{margin-left:-10px}#bootstrap-theme .popover>.arrow{border-width:11px}#bootstrap-theme .popover>.arrow,#bootstrap-theme .popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}#bootstrap-theme .popover>.arrow:after{content:"";border-width:10px}#bootstrap-theme .popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}#bootstrap-theme .popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}#bootstrap-theme .popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}#bootstrap-theme .popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}#bootstrap-theme .popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}#bootstrap-theme .popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}#bootstrap-theme .popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}#bootstrap-theme .popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}#bootstrap-theme .popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}#bootstrap-theme .popover-content{padding:9px 14px}#bootstrap-theme .carousel{position:relative}#bootstrap-theme .carousel-inner{position:relative;width:100%;overflow:hidden}#bootstrap-theme .carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}#bootstrap-theme .carousel-inner>.item>img,#bootstrap-theme .carousel-inner>.item>a>img{display:block;max-width:100%;height:auto;line-height:1}@media (transform-3d),(-webkit-transform-3d){#bootstrap-theme .carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-moz-transition:-moz-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:-ms-transform .6s ease-in-out;transition:-webkit-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;-moz-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;-moz-perspective:1000px;perspective:1000px}#bootstrap-theme .carousel-inner>.item.next,#bootstrap-theme .carousel-inner>.item.active.right{-webkit-transform:translate3d(100%,0,0);-ms-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0);left:0}#bootstrap-theme .carousel-inner>.item.prev,#bootstrap-theme .carousel-inner>.item.active.left{-webkit-transform:translate3d(-100%,0,0);-ms-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0);left:0}#bootstrap-theme .carousel-inner>.item.next.left,#bootstrap-theme .carousel-inner>.item.prev.right,#bootstrap-theme .carousel-inner>.item.active{-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0);left:0}}#bootstrap-theme .carousel-inner>.active,#bootstrap-theme .carousel-inner>.next,#bootstrap-theme .carousel-inner>.prev{display:block}#bootstrap-theme .carousel-inner>.active{left:0}#bootstrap-theme .carousel-inner>.next,#bootstrap-theme .carousel-inner>.prev{position:absolute;top:0;width:100%}#bootstrap-theme .carousel-inner>.next{left:100%}#bootstrap-theme .carousel-inner>.prev{left:-100%}#bootstrap-theme .carousel-inner>.next.left,#bootstrap-theme .carousel-inner>.prev.right{left:0}#bootstrap-theme .carousel-inner>.active.left{left:-100%}#bootstrap-theme .carousel-inner>.active.right{left:100%}#bootstrap-theme .carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:rgba(0,0,0,0);-webkit-filter:alpha(opacity=50);filter:alpha(opacity=50);opacity:.5}#bootstrap-theme .carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0%,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0%,rgba(0,0,0,.0001) 100%);background-image:linear-gradient(to right,rgba(0,0,0,.5) 0%,rgba(0,0,0,.0001) 100%);-webkit-filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#80000000",endColorstr="#00000000",GradientType=1);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#80000000",endColorstr="#00000000",GradientType=1);background-repeat:repeat-x}#bootstrap-theme .carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0%,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0%,rgba(0,0,0,.5) 100%);background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0%,rgba(0,0,0,.5) 100%);-webkit-filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#00000000",endColorstr="#80000000",GradientType=1);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#00000000",endColorstr="#80000000",GradientType=1);background-repeat:repeat-x}#bootstrap-theme .carousel-control:hover,#bootstrap-theme .carousel-control:focus{color:#fff;text-decoration:none;outline:0;-webkit-filter:alpha(opacity=90);filter:alpha(opacity=90);opacity:.9}#bootstrap-theme .carousel-control .icon-prev,#bootstrap-theme .carousel-control .icon-next,#bootstrap-theme .carousel-control .glyphicon-chevron-left,#bootstrap-theme .carousel-control .glyphicon-chevron-right{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}#bootstrap-theme .carousel-control .icon-prev,#bootstrap-theme .carousel-control .glyphicon-chevron-left{left:50%;margin-left:-10px}#bootstrap-theme .carousel-control .icon-next,#bootstrap-theme .carousel-control .glyphicon-chevron-right{right:50%;margin-right:-10px}#bootstrap-theme .carousel-control .icon-prev,#bootstrap-theme .carousel-control .icon-next{width:20px;height:20px;font-family:serif;line-height:1}#bootstrap-theme .carousel-control .icon-prev:before{content:"‹"}#bootstrap-theme .carousel-control .icon-next:before{content:"›"}#bootstrap-theme .carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}#bootstrap-theme .carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}#bootstrap-theme .carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}#bootstrap-theme .carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}#bootstrap-theme .carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){#bootstrap-theme .carousel-control .glyphicon-chevron-left,#bootstrap-theme .carousel-control .glyphicon-chevron-right,#bootstrap-theme .carousel-control .icon-prev,#bootstrap-theme .carousel-control .icon-next{width:30px;height:30px;margin-top:-10px;font-size:30px}#bootstrap-theme .carousel-control .glyphicon-chevron-left,#bootstrap-theme .carousel-control .icon-prev{margin-left:-10px}#bootstrap-theme .carousel-control .glyphicon-chevron-right,#bootstrap-theme .carousel-control .icon-next{margin-right:-10px}#bootstrap-theme .carousel-caption{right:20%;left:20%;padding-bottom:30px}#bootstrap-theme .carousel-indicators{bottom:20px}}#bootstrap-theme .clearfix:before,#bootstrap-theme .clearfix:after{display:table;content:" "}#bootstrap-theme .clearfix:after{clear:both}#bootstrap-theme .center-block{display:block;margin-right:auto;margin-left:auto}#bootstrap-theme .pull-right{float:right !important}#bootstrap-theme .pull-left{float:left !important}#bootstrap-theme .hide{display:none !important}#bootstrap-theme .show{display:block !important}#bootstrap-theme .invisible{visibility:hidden}#bootstrap-theme .text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}#bootstrap-theme .hidden{display:none !important}#bootstrap-theme .affix{position:fixed}@-ms-viewport{width:device-width}#bootstrap-theme .visible-sm{display:none !important}#bootstrap-theme .visible-md{display:none !important}#bootstrap-theme .visible-lg{display:none !important}#bootstrap-theme .visible-xs-block,#bootstrap-theme .visible-xs-inline,#bootstrap-theme .visible-xs-inline-block,#bootstrap-theme .visible-sm-block,#bootstrap-theme .visible-sm-inline,#bootstrap-theme .visible-sm-inline-block,#bootstrap-theme .visible-md-block,#bootstrap-theme .visible-md-inline,#bootstrap-theme .visible-md-inline-block,#bootstrap-theme .visible-lg-block,#bootstrap-theme .visible-lg-inline,#bootstrap-theme .visible-lg-inline-block{display:none !important}@media (max-width:767px){#bootstrap-theme .visible-xs{display:block !important}#bootstrap-theme table.visible-xs{display:table !important}#bootstrap-theme tr.visible-xs{display:table-row !important}#bootstrap-theme th.visible-xs,#bootstrap-theme td.visible-xs{display:table-cell !important}}@media (max-width:767px){#bootstrap-theme .visible-xs-block{display:block !important}}@media (max-width:767px){#bootstrap-theme .visible-xs-inline{display:inline !important}}@media (max-width:767px){#bootstrap-theme .visible-xs-inline-block{display:inline-block !important}}@media (min-width:768px) and (max-width:991px){#bootstrap-theme .visible-sm{display:block !important}#bootstrap-theme table.visible-sm{display:table !important}#bootstrap-theme tr.visible-sm{display:table-row !important}#bootstrap-theme th.visible-sm,#bootstrap-theme td.visible-sm{display:table-cell !important}}@media (min-width:768px) and (max-width:991px){#bootstrap-theme .visible-sm-block{display:block !important}}@media (min-width:768px) and (max-width:991px){#bootstrap-theme .visible-sm-inline{display:inline !important}}@media (min-width:768px) and (max-width:991px){#bootstrap-theme .visible-sm-inline-block{display:inline-block !important}}@media (min-width:992px) and (max-width:1199px){#bootstrap-theme .visible-md{display:block !important}#bootstrap-theme table.visible-md{display:table !important}#bootstrap-theme tr.visible-md{display:table-row !important}#bootstrap-theme th.visible-md,#bootstrap-theme td.visible-md{display:table-cell !important}}@media (min-width:992px) and (max-width:1199px){#bootstrap-theme .visible-md-block{display:block !important}}@media (min-width:992px) and (max-width:1199px){#bootstrap-theme .visible-md-inline{display:inline !important}}@media (min-width:992px) and (max-width:1199px){#bootstrap-theme .visible-md-inline-block{display:inline-block !important}}@media (min-width:1200px){#bootstrap-theme .visible-lg{display:block !important}#bootstrap-theme table.visible-lg{display:table !important}#bootstrap-theme tr.visible-lg{display:table-row !important}#bootstrap-theme th.visible-lg,#bootstrap-theme td.visible-lg{display:table-cell !important}}@media (min-width:1200px){#bootstrap-theme .visible-lg-block{display:block !important}}@media (min-width:1200px){#bootstrap-theme .visible-lg-inline{display:inline !important}}@media (min-width:1200px){#bootstrap-theme .visible-lg-inline-block{display:inline-block !important}}@media (max-width:767px){#bootstrap-theme .hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){#bootstrap-theme .hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){#bootstrap-theme .hidden-md{display:none !important}}@media (min-width:1200px){#bootstrap-theme .hidden-lg{display:none !important}}#bootstrap-theme .visible-print{display:none !important}@media print{#bootstrap-theme .visible-print{display:block !important}#bootstrap-theme table.visible-print{display:table !important}#bootstrap-theme tr.visible-print{display:table-row !important}#bootstrap-theme th.visible-print,#bootstrap-theme td.visible-print{display:table-cell !important}}#bootstrap-theme .visible-print-block{display:none !important}@media print{#bootstrap-theme .visible-print-block{display:block !important}}#bootstrap-theme .visible-print-inline{display:none !important}@media print{#bootstrap-theme .visible-print-inline{display:inline !important}}#bootstrap-theme .visible-print-inline-block{display:none !important}@media print{#bootstrap-theme .visible-print-inline-block{display:inline-block !important}}@media print{#bootstrap-theme .hidden-print{display:none !important}}#bootstrap-theme ul,#bootstrap-theme ol{margin-left:0;margin-right:0}#bootstrap-theme .form-control.checkbox-inline>label{margin-left:9px}#bootstrap-theme label input[type=checkbox]:not(:checked)+*{font-weight:400}#bootstrap-theme .select2-choices{margin-bottom:0}#bootstrap-theme input[type=search]::-webkit-search-cancel-button{-webkit-appearance:searchfield-cancel-button}#bootstrap-theme .select2-container .select2-choice>.select2-chosen{font-size:inherit;font-weight:400}#bootstrap-theme summary{display:list-item}#bootstrap-theme .form-control .select2-choice{border:0;border-radius:2px}#bootstrap-theme .form-control .select2-choice .select2-arrow{border-radius:0 2px 2px 0}#bootstrap-theme .form-control.select2-container{height:auto !important;padding:0}#bootstrap-theme .form-control.select2-container.select2-dropdown-open{border-color:#5897fb;border-radius:3px 3px 0 0}#bootstrap-theme .form-control .select2-container.select2-dropdown-open .select2-choices{border-radius:3px 3px 0 0}#bootstrap-theme .form-control.select2-container .select2-choices{border:0 !important;border-radius:3px}#bootstrap-theme .control-group.warning .select2-container .select2-choice,#bootstrap-theme .control-group.warning .select2-container .select2-choices,#bootstrap-theme .control-group.warning .select2-container-active .select2-choice,#bootstrap-theme .control-group.warning .select2-container-active .select2-choices,#bootstrap-theme .control-group.warning .select2-dropdown-open.select2-drop-above .select2-choice,#bootstrap-theme .control-group.warning .select2-dropdown-open.select2-drop-above .select2-choices,#bootstrap-theme .control-group.warning .select2-container-multi.select2-container-active .select2-choices{border:1px solid #c09853 !important}#bootstrap-theme .control-group.warning .select2-container .select2-choice div{border-left:1px solid #c09853 !important;background:#fcf8e3 !important}#bootstrap-theme .control-group.error .select2-container .select2-choice,#bootstrap-theme .control-group.error .select2-container .select2-choices,#bootstrap-theme .control-group.error .select2-container-active .select2-choice,#bootstrap-theme .control-group.error .select2-container-active .select2-choices,#bootstrap-theme .control-group.error .select2-dropdown-open.select2-drop-above .select2-choice,#bootstrap-theme .control-group.error .select2-dropdown-open.select2-drop-above .select2-choices,#bootstrap-theme .control-group.error .select2-container-multi.select2-container-active .select2-choices{border:1px solid #b94a48 !important}#bootstrap-theme .control-group.error .select2-container .select2-choice div{border-left:1px solid #b94a48 !important;background:#f2dede !important}#bootstrap-theme .control-group.info .select2-container .select2-choice,#bootstrap-theme .control-group.info .select2-container .select2-choices,#bootstrap-theme .control-group.info .select2-container-active .select2-choice,#bootstrap-theme .control-group.info .select2-container-active .select2-choices,#bootstrap-theme .control-group.info .select2-dropdown-open.select2-drop-above .select2-choice,#bootstrap-theme .control-group.info .select2-dropdown-open.select2-drop-above .select2-choices,#bootstrap-theme .control-group.info .select2-container-multi.select2-container-active .select2-choices{border:1px solid #3a87ad !important}#bootstrap-theme .control-group.info .select2-container .select2-choice div{border-left:1px solid #3a87ad !important;background:#d9edf7 !important}#bootstrap-theme .control-group.success .select2-container .select2-choice,#bootstrap-theme .control-group.success .select2-container .select2-choices,#bootstrap-theme .control-group.success .select2-container-active .select2-choice,#bootstrap-theme .control-group.success .select2-container-active .select2-choices,#bootstrap-theme .control-group.success .select2-dropdown-open.select2-drop-above .select2-choice,#bootstrap-theme .control-group.success .select2-dropdown-open.select2-drop-above .select2-choices,#bootstrap-theme .control-group.success .select2-container-multi.select2-container-active .select2-choices{border:1px solid #468847 !important}#bootstrap-theme .control-group.success .select2-container .select2-choice div{border-left:1px solid #468847 !important;background:#dff0d8 !important}
\ No newline at end of file
+@charset "UTF-8";#bootstrap-theme html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}#bootstrap-theme body{margin:0}#bootstrap-theme article,#bootstrap-theme aside,#bootstrap-theme details,#bootstrap-theme figcaption,#bootstrap-theme figure,#bootstrap-theme footer,#bootstrap-theme header,#bootstrap-theme hgroup,#bootstrap-theme main,#bootstrap-theme menu,#bootstrap-theme nav,#bootstrap-theme section,#bootstrap-theme summary{display:block}#bootstrap-theme audio,#bootstrap-theme canvas,#bootstrap-theme progress,#bootstrap-theme video{display:inline-block;vertical-align:baseline}#bootstrap-theme audio:not([controls]){display:none;height:0}#bootstrap-theme [hidden],#bootstrap-theme template{display:none}#bootstrap-theme a{background-color:transparent}#bootstrap-theme a:active,#bootstrap-theme a:hover{outline:0}#bootstrap-theme abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}#bootstrap-theme b,#bootstrap-theme strong{font-weight:700}#bootstrap-theme dfn{font-style:italic}#bootstrap-theme h1{font-size:2em;margin:.67em 0}#bootstrap-theme mark{background:#ff0;color:#000}#bootstrap-theme small{font-size:80%}#bootstrap-theme sub,#bootstrap-theme sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}#bootstrap-theme sup{top:-.5em}#bootstrap-theme sub{bottom:-.25em}#bootstrap-theme img{border:0}#bootstrap-theme svg:not(:root){overflow:hidden}#bootstrap-theme figure{margin:1em 40px}#bootstrap-theme hr{box-sizing:content-box;height:0}#bootstrap-theme pre{overflow:auto}#bootstrap-theme code,#bootstrap-theme kbd,#bootstrap-theme pre,#bootstrap-theme samp{font-family:monospace,monospace;font-size:1em}#bootstrap-theme button,#bootstrap-theme input,#bootstrap-theme optgroup,#bootstrap-theme select,#bootstrap-theme textarea{color:inherit;font:inherit;margin:0}#bootstrap-theme button{overflow:visible}#bootstrap-theme button,#bootstrap-theme select{text-transform:none}#bootstrap-theme button,#bootstrap-theme html input[type=button],#bootstrap-theme input[type=reset],#bootstrap-theme input[type=submit]{-webkit-appearance:button;cursor:pointer}#bootstrap-theme button[disabled],#bootstrap-theme html input[disabled]{cursor:default}#bootstrap-theme button::-moz-focus-inner,#bootstrap-theme input::-moz-focus-inner{border:0;padding:0}#bootstrap-theme input{line-height:normal}#bootstrap-theme input[type=checkbox],#bootstrap-theme input[type=radio]{box-sizing:border-box;padding:0}#bootstrap-theme input[type=number]::-webkit-inner-spin-button,#bootstrap-theme input[type=number]::-webkit-outer-spin-button{height:auto}#bootstrap-theme input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}#bootstrap-theme input[type=search]::-webkit-search-cancel-button,#bootstrap-theme input[type=search]::-webkit-search-decoration{-webkit-appearance:none}#bootstrap-theme fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}#bootstrap-theme legend{border:0;padding:0}#bootstrap-theme textarea{overflow:auto}#bootstrap-theme optgroup{font-weight:700}#bootstrap-theme table{border-collapse:collapse;border-spacing:0}#bootstrap-theme td,#bootstrap-theme th{padding:0}@media print{#bootstrap-theme *,#bootstrap-theme *:before,#bootstrap-theme *:after{color:#000 !important;text-shadow:none !important;background:0 0 !important;box-shadow:none !important}#bootstrap-theme a,#bootstrap-theme a:visited{text-decoration:underline}#bootstrap-theme a[href]:after{content:" (" attr(href) ")"}#bootstrap-theme abbr[title]:after{content:" (" attr(title) ")"}#bootstrap-theme a[href^="#"]:after,#bootstrap-theme a[href^="javascript:"]:after{content:""}#bootstrap-theme pre,#bootstrap-theme blockquote{border:1px solid #999;page-break-inside:avoid}#bootstrap-theme thead{display:table-header-group}#bootstrap-theme tr,#bootstrap-theme img{page-break-inside:avoid}#bootstrap-theme img{max-width:100% !important}#bootstrap-theme p,#bootstrap-theme h2,#bootstrap-theme h3{orphans:3;widows:3}#bootstrap-theme h2,#bootstrap-theme h3{page-break-after:avoid}#bootstrap-theme .navbar{display:none}#bootstrap-theme .btn>.caret,#bootstrap-theme .dropup>.btn>.caret{border-top-color:#000 !important}#bootstrap-theme .label{border:1px solid #000}#bootstrap-theme .table{border-collapse:collapse !important}#bootstrap-theme .table td,#bootstrap-theme .table th{background-color:#fff !important}#bootstrap-theme .table-bordered th,#bootstrap-theme .table-bordered td{border:1px solid #ddd !important}}@font-face{font-family:"Glyphicons Halflings";src:url("../extern/bootstrap3/assets/fonts/bootstrap/glyphicons-halflings-regular.eot");src:url("../extern/bootstrap3/assets/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"),url("../extern/bootstrap3/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2") format("woff2"),url("../extern/bootstrap3/assets/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"),url("../extern/bootstrap3/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"),url("../extern/bootstrap3/assets/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg")}#bootstrap-theme .glyphicon{position:relative;top:1px;display:inline-block;font-family:"Glyphicons Halflings";font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#bootstrap-theme .glyphicon-asterisk:before{content:"*"}#bootstrap-theme .glyphicon-plus:before{content:"+"}#bootstrap-theme .glyphicon-euro:before,#bootstrap-theme .glyphicon-eur:before{content:"€"}#bootstrap-theme .glyphicon-minus:before{content:"−"}#bootstrap-theme .glyphicon-cloud:before{content:"�"}#bootstrap-theme .glyphicon-envelope:before{content:"✉"}#bootstrap-theme .glyphicon-pencil:before{content:"�"}#bootstrap-theme .glyphicon-glass:before{content:"�"}#bootstrap-theme .glyphicon-music:before{content:""}#bootstrap-theme .glyphicon-search:before{content:""}#bootstrap-theme .glyphicon-heart:before{content:""}#bootstrap-theme .glyphicon-star:before{content:""}#bootstrap-theme .glyphicon-star-empty:before{content:""}#bootstrap-theme .glyphicon-user:before{content:""}#bootstrap-theme .glyphicon-film:before{content:""}#bootstrap-theme .glyphicon-th-large:before{content:"�"}#bootstrap-theme .glyphicon-th:before{content:""}#bootstrap-theme .glyphicon-th-list:before{content:""}#bootstrap-theme .glyphicon-ok:before{content:""}#bootstrap-theme .glyphicon-remove:before{content:""}#bootstrap-theme .glyphicon-zoom-in:before{content:""}#bootstrap-theme .glyphicon-zoom-out:before{content:""}#bootstrap-theme .glyphicon-off:before{content:""}#bootstrap-theme .glyphicon-signal:before{content:""}#bootstrap-theme .glyphicon-cog:before{content:""}#bootstrap-theme .glyphicon-trash:before{content:""}#bootstrap-theme .glyphicon-home:before{content:""}#bootstrap-theme .glyphicon-file:before{content:""}#bootstrap-theme .glyphicon-time:before{content:""}#bootstrap-theme .glyphicon-road:before{content:""}#bootstrap-theme .glyphicon-download-alt:before{content:""}#bootstrap-theme .glyphicon-download:before{content:""}#bootstrap-theme .glyphicon-upload:before{content:""}#bootstrap-theme .glyphicon-inbox:before{content:""}#bootstrap-theme .glyphicon-play-circle:before{content:""}#bootstrap-theme .glyphicon-repeat:before{content:""}#bootstrap-theme .glyphicon-refresh:before{content:""}#bootstrap-theme .glyphicon-list-alt:before{content:""}#bootstrap-theme .glyphicon-lock:before{content:""}#bootstrap-theme .glyphicon-flag:before{content:""}#bootstrap-theme .glyphicon-headphones:before{content:""}#bootstrap-theme .glyphicon-volume-off:before{content:""}#bootstrap-theme .glyphicon-volume-down:before{content:""}#bootstrap-theme .glyphicon-volume-up:before{content:""}#bootstrap-theme .glyphicon-qrcode:before{content:""}#bootstrap-theme .glyphicon-barcode:before{content:"�"}#bootstrap-theme .glyphicon-tag:before{content:"�"}#bootstrap-theme .glyphicon-tags:before{content:"�"}#bootstrap-theme .glyphicon-book:before{content:"�"}#bootstrap-theme .glyphicon-bookmark:before{content:"�"}#bootstrap-theme .glyphicon-print:before{content:"�"}#bootstrap-theme .glyphicon-camera:before{content:"�"}#bootstrap-theme .glyphicon-font:before{content:"�"}#bootstrap-theme .glyphicon-bold:before{content:"�"}#bootstrap-theme .glyphicon-italic:before{content:"�"}#bootstrap-theme .glyphicon-text-height:before{content:"�"}#bootstrap-theme .glyphicon-text-width:before{content:"�"}#bootstrap-theme .glyphicon-align-left:before{content:"�"}#bootstrap-theme .glyphicon-align-center:before{content:"�"}#bootstrap-theme .glyphicon-align-right:before{content:"�"}#bootstrap-theme .glyphicon-align-justify:before{content:"�"}#bootstrap-theme .glyphicon-list:before{content:"�"}#bootstrap-theme .glyphicon-indent-left:before{content:"�"}#bootstrap-theme .glyphicon-indent-right:before{content:"�"}#bootstrap-theme .glyphicon-facetime-video:before{content:"�"}#bootstrap-theme .glyphicon-picture:before{content:"�"}#bootstrap-theme .glyphicon-map-marker:before{content:"�"}#bootstrap-theme .glyphicon-adjust:before{content:"�"}#bootstrap-theme .glyphicon-tint:before{content:"�"}#bootstrap-theme .glyphicon-edit:before{content:"�"}#bootstrap-theme .glyphicon-share:before{content:"�"}#bootstrap-theme .glyphicon-check:before{content:"�"}#bootstrap-theme .glyphicon-move:before{content:"�"}#bootstrap-theme .glyphicon-step-backward:before{content:"�"}#bootstrap-theme .glyphicon-fast-backward:before{content:"�"}#bootstrap-theme .glyphicon-backward:before{content:"�"}#bootstrap-theme .glyphicon-play:before{content:"�"}#bootstrap-theme .glyphicon-pause:before{content:"�"}#bootstrap-theme .glyphicon-stop:before{content:"�"}#bootstrap-theme .glyphicon-forward:before{content:"�"}#bootstrap-theme .glyphicon-fast-forward:before{content:"�"}#bootstrap-theme .glyphicon-step-forward:before{content:"�"}#bootstrap-theme .glyphicon-eject:before{content:"�"}#bootstrap-theme .glyphicon-chevron-left:before{content:"�"}#bootstrap-theme .glyphicon-chevron-right:before{content:""}#bootstrap-theme .glyphicon-plus-sign:before{content:"�"}#bootstrap-theme .glyphicon-minus-sign:before{content:""}#bootstrap-theme .glyphicon-remove-sign:before{content:""}#bootstrap-theme .glyphicon-ok-sign:before{content:""}#bootstrap-theme .glyphicon-question-sign:before{content:""}#bootstrap-theme .glyphicon-info-sign:before{content:""}#bootstrap-theme .glyphicon-screenshot:before{content:""}#bootstrap-theme .glyphicon-remove-circle:before{content:""}#bootstrap-theme .glyphicon-ok-circle:before{content:""}#bootstrap-theme .glyphicon-ban-circle:before{content:"�"}#bootstrap-theme .glyphicon-arrow-left:before{content:""}#bootstrap-theme .glyphicon-arrow-right:before{content:""}#bootstrap-theme .glyphicon-arrow-up:before{content:""}#bootstrap-theme .glyphicon-arrow-down:before{content:""}#bootstrap-theme .glyphicon-share-alt:before{content:""}#bootstrap-theme .glyphicon-resize-full:before{content:""}#bootstrap-theme .glyphicon-resize-small:before{content:""}#bootstrap-theme .glyphicon-exclamation-sign:before{content:"�"}#bootstrap-theme .glyphicon-gift:before{content:""}#bootstrap-theme .glyphicon-leaf:before{content:""}#bootstrap-theme .glyphicon-fire:before{content:""}#bootstrap-theme .glyphicon-eye-open:before{content:""}#bootstrap-theme .glyphicon-eye-close:before{content:""}#bootstrap-theme .glyphicon-warning-sign:before{content:""}#bootstrap-theme .glyphicon-plane:before{content:""}#bootstrap-theme .glyphicon-calendar:before{content:""}#bootstrap-theme .glyphicon-random:before{content:"�"}#bootstrap-theme .glyphicon-comment:before{content:""}#bootstrap-theme .glyphicon-magnet:before{content:""}#bootstrap-theme .glyphicon-chevron-up:before{content:""}#bootstrap-theme .glyphicon-chevron-down:before{content:""}#bootstrap-theme .glyphicon-retweet:before{content:""}#bootstrap-theme .glyphicon-shopping-cart:before{content:""}#bootstrap-theme .glyphicon-folder-close:before{content:""}#bootstrap-theme .glyphicon-folder-open:before{content:""}#bootstrap-theme .glyphicon-resize-vertical:before{content:""}#bootstrap-theme .glyphicon-resize-horizontal:before{content:""}#bootstrap-theme .glyphicon-hdd:before{content:""}#bootstrap-theme .glyphicon-bullhorn:before{content:""}#bootstrap-theme .glyphicon-bell:before{content:""}#bootstrap-theme .glyphicon-certificate:before{content:""}#bootstrap-theme .glyphicon-thumbs-up:before{content:""}#bootstrap-theme .glyphicon-thumbs-down:before{content:""}#bootstrap-theme .glyphicon-hand-right:before{content:""}#bootstrap-theme .glyphicon-hand-left:before{content:""}#bootstrap-theme .glyphicon-hand-up:before{content:""}#bootstrap-theme .glyphicon-hand-down:before{content:""}#bootstrap-theme .glyphicon-circle-arrow-right:before{content:""}#bootstrap-theme .glyphicon-circle-arrow-left:before{content:""}#bootstrap-theme .glyphicon-circle-arrow-up:before{content:""}#bootstrap-theme .glyphicon-circle-arrow-down:before{content:""}#bootstrap-theme .glyphicon-globe:before{content:""}#bootstrap-theme .glyphicon-wrench:before{content:""}#bootstrap-theme .glyphicon-tasks:before{content:""}#bootstrap-theme .glyphicon-filter:before{content:""}#bootstrap-theme .glyphicon-briefcase:before{content:""}#bootstrap-theme .glyphicon-fullscreen:before{content:""}#bootstrap-theme .glyphicon-dashboard:before{content:"�"}#bootstrap-theme .glyphicon-paperclip:before{content:""}#bootstrap-theme .glyphicon-heart-empty:before{content:""}#bootstrap-theme .glyphicon-link:before{content:""}#bootstrap-theme .glyphicon-phone:before{content:""}#bootstrap-theme .glyphicon-pushpin:before{content:""}#bootstrap-theme .glyphicon-usd:before{content:""}#bootstrap-theme .glyphicon-gbp:before{content:""}#bootstrap-theme .glyphicon-sort:before{content:"�"}#bootstrap-theme .glyphicon-sort-by-alphabet:before{content:""}#bootstrap-theme .glyphicon-sort-by-alphabet-alt:before{content:""}#bootstrap-theme .glyphicon-sort-by-order:before{content:""}#bootstrap-theme .glyphicon-sort-by-order-alt:before{content:""}#bootstrap-theme .glyphicon-sort-by-attributes:before{content:""}#bootstrap-theme .glyphicon-sort-by-attributes-alt:before{content:""}#bootstrap-theme .glyphicon-unchecked:before{content:""}#bootstrap-theme .glyphicon-expand:before{content:""}#bootstrap-theme .glyphicon-collapse-down:before{content:""}#bootstrap-theme .glyphicon-collapse-up:before{content:""}#bootstrap-theme .glyphicon-log-in:before{content:""}#bootstrap-theme .glyphicon-flash:before{content:""}#bootstrap-theme .glyphicon-log-out:before{content:""}#bootstrap-theme .glyphicon-new-window:before{content:""}#bootstrap-theme .glyphicon-record:before{content:""}#bootstrap-theme .glyphicon-save:before{content:""}#bootstrap-theme .glyphicon-open:before{content:""}#bootstrap-theme .glyphicon-saved:before{content:""}#bootstrap-theme .glyphicon-import:before{content:""}#bootstrap-theme .glyphicon-export:before{content:""}#bootstrap-theme .glyphicon-send:before{content:""}#bootstrap-theme .glyphicon-floppy-disk:before{content:""}#bootstrap-theme .glyphicon-floppy-saved:before{content:""}#bootstrap-theme .glyphicon-floppy-remove:before{content:""}#bootstrap-theme .glyphicon-floppy-save:before{content:""}#bootstrap-theme .glyphicon-floppy-open:before{content:""}#bootstrap-theme .glyphicon-credit-card:before{content:""}#bootstrap-theme .glyphicon-transfer:before{content:""}#bootstrap-theme .glyphicon-cutlery:before{content:""}#bootstrap-theme .glyphicon-header:before{content:""}#bootstrap-theme .glyphicon-compressed:before{content:"�"}#bootstrap-theme .glyphicon-earphone:before{content:""}#bootstrap-theme .glyphicon-phone-alt:before{content:""}#bootstrap-theme .glyphicon-tower:before{content:""}#bootstrap-theme .glyphicon-stats:before{content:""}#bootstrap-theme .glyphicon-sd-video:before{content:""}#bootstrap-theme .glyphicon-hd-video:before{content:""}#bootstrap-theme .glyphicon-subtitles:before{content:""}#bootstrap-theme .glyphicon-sound-stereo:before{content:""}#bootstrap-theme .glyphicon-sound-dolby:before{content:"�"}#bootstrap-theme .glyphicon-sound-5-1:before{content:""}#bootstrap-theme .glyphicon-sound-6-1:before{content:""}#bootstrap-theme .glyphicon-sound-7-1:before{content:""}#bootstrap-theme .glyphicon-copyright-mark:before{content:""}#bootstrap-theme .glyphicon-registration-mark:before{content:""}#bootstrap-theme .glyphicon-cloud-download:before{content:""}#bootstrap-theme .glyphicon-cloud-upload:before{content:""}#bootstrap-theme .glyphicon-tree-conifer:before{content:""}#bootstrap-theme .glyphicon-tree-deciduous:before{content:""}#bootstrap-theme .glyphicon-cd:before{content:"�"}#bootstrap-theme .glyphicon-save-file:before{content:""}#bootstrap-theme .glyphicon-open-file:before{content:""}#bootstrap-theme .glyphicon-level-up:before{content:""}#bootstrap-theme .glyphicon-copy:before{content:""}#bootstrap-theme .glyphicon-paste:before{content:""}#bootstrap-theme .glyphicon-alert:before{content:""}#bootstrap-theme .glyphicon-equalizer:before{content:"�"}#bootstrap-theme .glyphicon-king:before{content:""}#bootstrap-theme .glyphicon-queen:before{content:""}#bootstrap-theme .glyphicon-pawn:before{content:""}#bootstrap-theme .glyphicon-bishop:before{content:""}#bootstrap-theme .glyphicon-knight:before{content:""}#bootstrap-theme .glyphicon-baby-formula:before{content:""}#bootstrap-theme .glyphicon-tent:before{content:"⛺"}#bootstrap-theme .glyphicon-blackboard:before{content:""}#bootstrap-theme .glyphicon-bed:before{content:""}#bootstrap-theme .glyphicon-apple:before{content:""}#bootstrap-theme .glyphicon-erase:before{content:""}#bootstrap-theme .glyphicon-hourglass:before{content:"⌛"}#bootstrap-theme .glyphicon-lamp:before{content:""}#bootstrap-theme .glyphicon-duplicate:before{content:""}#bootstrap-theme .glyphicon-piggy-bank:before{content:""}#bootstrap-theme .glyphicon-scissors:before{content:""}#bootstrap-theme .glyphicon-bitcoin:before{content:""}#bootstrap-theme .glyphicon-btc:before{content:""}#bootstrap-theme .glyphicon-xbt:before{content:""}#bootstrap-theme .glyphicon-yen:before{content:"¥"}#bootstrap-theme .glyphicon-jpy:before{content:"¥"}#bootstrap-theme .glyphicon-ruble:before{content:"₽"}#bootstrap-theme .glyphicon-rub:before{content:"₽"}#bootstrap-theme .glyphicon-scale:before{content:""}#bootstrap-theme .glyphicon-ice-lolly:before{content:""}#bootstrap-theme .glyphicon-ice-lolly-tasted:before{content:""}#bootstrap-theme .glyphicon-education:before{content:""}#bootstrap-theme .glyphicon-option-horizontal:before{content:""}#bootstrap-theme .glyphicon-option-vertical:before{content:""}#bootstrap-theme .glyphicon-menu-hamburger:before{content:""}#bootstrap-theme .glyphicon-modal-window:before{content:""}#bootstrap-theme .glyphicon-oil:before{content:""}#bootstrap-theme .glyphicon-grain:before{content:""}#bootstrap-theme .glyphicon-sunglasses:before{content:""}#bootstrap-theme .glyphicon-text-size:before{content:"�"}#bootstrap-theme .glyphicon-text-color:before{content:""}#bootstrap-theme .glyphicon-text-background:before{content:""}#bootstrap-theme .glyphicon-object-align-top:before{content:""}#bootstrap-theme .glyphicon-object-align-bottom:before{content:""}#bootstrap-theme .glyphicon-object-align-horizontal:before{content:""}#bootstrap-theme .glyphicon-object-align-left:before{content:""}#bootstrap-theme .glyphicon-object-align-vertical:before{content:""}#bootstrap-theme .glyphicon-object-align-right:before{content:""}#bootstrap-theme .glyphicon-triangle-right:before{content:"�"}#bootstrap-theme .glyphicon-triangle-left:before{content:""}#bootstrap-theme .glyphicon-triangle-bottom:before{content:""}#bootstrap-theme .glyphicon-triangle-top:before{content:""}#bootstrap-theme .glyphicon-console:before{content:""}#bootstrap-theme .glyphicon-superscript:before{content:""}#bootstrap-theme .glyphicon-subscript:before{content:""}#bootstrap-theme .glyphicon-menu-left:before{content:""}#bootstrap-theme .glyphicon-menu-right:before{content:""}#bootstrap-theme .glyphicon-menu-down:before{content:""}#bootstrap-theme .glyphicon-menu-up:before{content:""}#bootstrap-theme *{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#bootstrap-theme *:before,#bootstrap-theme *:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#bootstrap-theme html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}#bootstrap-theme body{font-family:"Verdana","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#555;background-color:#fff}#bootstrap-theme input,#bootstrap-theme button,#bootstrap-theme select,#bootstrap-theme textarea{font-family:inherit;font-size:inherit;line-height:inherit}#bootstrap-theme a{color:#2786c2;text-decoration:none}#bootstrap-theme a:hover,#bootstrap-theme a:focus{color:#1a5a82;text-decoration:underline}#bootstrap-theme a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#bootstrap-theme figure{margin:0}#bootstrap-theme img{vertical-align:middle}#bootstrap-theme .img-responsive{display:block;max-width:100%;height:auto}#bootstrap-theme .img-rounded{border-radius:6px}#bootstrap-theme .img-thumbnail{padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}#bootstrap-theme .img-circle{border-radius:50%}#bootstrap-theme hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}#bootstrap-theme .sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}#bootstrap-theme .sr-only-focusable:active,#bootstrap-theme .sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}#bootstrap-theme [role=button]{cursor:pointer}#bootstrap-theme h1,#bootstrap-theme h2,#bootstrap-theme h3,#bootstrap-theme h4,#bootstrap-theme h5,#bootstrap-theme h6,#bootstrap-theme .h1,#bootstrap-theme .h2,#bootstrap-theme .h3,#bootstrap-theme .h4,#bootstrap-theme .h5,#bootstrap-theme .h6{font-family:"Verdana","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.2;color:#000}#bootstrap-theme h1 small,#bootstrap-theme h1 .small,#bootstrap-theme h2 small,#bootstrap-theme h2 .small,#bootstrap-theme h3 small,#bootstrap-theme h3 .small,#bootstrap-theme h4 small,#bootstrap-theme h4 .small,#bootstrap-theme h5 small,#bootstrap-theme h5 .small,#bootstrap-theme h6 small,#bootstrap-theme h6 .small,#bootstrap-theme .h1 small,#bootstrap-theme .h1 .small,#bootstrap-theme .h2 small,#bootstrap-theme .h2 .small,#bootstrap-theme .h3 small,#bootstrap-theme .h3 .small,#bootstrap-theme .h4 small,#bootstrap-theme .h4 .small,#bootstrap-theme .h5 small,#bootstrap-theme .h5 .small,#bootstrap-theme .h6 small,#bootstrap-theme .h6 .small{font-weight:400;line-height:1;color:#999}#bootstrap-theme h1,#bootstrap-theme .h1,#bootstrap-theme h2,#bootstrap-theme .h2,#bootstrap-theme h3,#bootstrap-theme .h3{margin-top:20px;margin-bottom:10px}#bootstrap-theme h1 small,#bootstrap-theme h1 .small,#bootstrap-theme .h1 small,#bootstrap-theme .h1 .small,#bootstrap-theme h2 small,#bootstrap-theme h2 .small,#bootstrap-theme .h2 small,#bootstrap-theme .h2 .small,#bootstrap-theme h3 small,#bootstrap-theme h3 .small,#bootstrap-theme .h3 small,#bootstrap-theme .h3 .small{font-size:65%}#bootstrap-theme h4,#bootstrap-theme .h4,#bootstrap-theme h5,#bootstrap-theme .h5,#bootstrap-theme h6,#bootstrap-theme .h6{margin-top:10px;margin-bottom:10px}#bootstrap-theme h4 small,#bootstrap-theme h4 .small,#bootstrap-theme .h4 small,#bootstrap-theme .h4 .small,#bootstrap-theme h5 small,#bootstrap-theme h5 .small,#bootstrap-theme .h5 small,#bootstrap-theme .h5 .small,#bootstrap-theme h6 small,#bootstrap-theme h6 .small,#bootstrap-theme .h6 small,#bootstrap-theme .h6 .small{font-size:75%}#bootstrap-theme h1,#bootstrap-theme .h1{font-size:36px}#bootstrap-theme h2,#bootstrap-theme .h2{font-size:30px}#bootstrap-theme h3,#bootstrap-theme .h3{font-size:24px}#bootstrap-theme h4,#bootstrap-theme .h4{font-size:18px}#bootstrap-theme h5,#bootstrap-theme .h5{font-size:14px}#bootstrap-theme h6,#bootstrap-theme .h6{font-size:12px}#bootstrap-theme p{margin:0 0 10px}#bootstrap-theme .lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){#bootstrap-theme .lead{font-size:21px}}#bootstrap-theme small,#bootstrap-theme .small{font-size:85%}#bootstrap-theme mark,#bootstrap-theme .mark{padding:.2em;background-color:#fcf8e3}#bootstrap-theme .text-left{text-align:left}#bootstrap-theme .text-right{text-align:right}#bootstrap-theme .text-center{text-align:center}#bootstrap-theme .text-justify{text-align:justify}#bootstrap-theme .text-nowrap{white-space:nowrap}#bootstrap-theme .text-lowercase{text-transform:lowercase}#bootstrap-theme .text-uppercase,#bootstrap-theme .initialism{text-transform:uppercase}#bootstrap-theme .text-capitalize{text-transform:capitalize}#bootstrap-theme .text-muted{color:#999}#bootstrap-theme .text-primary{color:#000}#bootstrap-theme a.text-primary:hover,#bootstrap-theme a.text-primary:focus{color:#000}#bootstrap-theme .text-success{color:#468847}#bootstrap-theme a.text-success:hover,#bootstrap-theme a.text-success:focus{color:#356635}#bootstrap-theme .text-info{color:#3a87ad}#bootstrap-theme a.text-info:hover,#bootstrap-theme a.text-info:focus{color:#2d6987}#bootstrap-theme .text-warning{color:#c09853}#bootstrap-theme a.text-warning:hover,#bootstrap-theme a.text-warning:focus{color:#a47e3c}#bootstrap-theme .text-danger{color:#b94a48}#bootstrap-theme a.text-danger:hover,#bootstrap-theme a.text-danger:focus{color:#953b39}#bootstrap-theme .bg-primary{color:#fff}#bootstrap-theme .bg-primary{background-color:#000}#bootstrap-theme a.bg-primary:hover,#bootstrap-theme a.bg-primary:focus{background-color:#000}#bootstrap-theme .bg-success{background-color:#dff0d8}#bootstrap-theme a.bg-success:hover,#bootstrap-theme a.bg-success:focus{background-color:#c1e2b3}#bootstrap-theme .bg-info{background-color:#d9edf7}#bootstrap-theme a.bg-info:hover,#bootstrap-theme a.bg-info:focus{background-color:#afd9ee}#bootstrap-theme .bg-warning{background-color:#fcf8e3}#bootstrap-theme a.bg-warning:hover,#bootstrap-theme a.bg-warning:focus{background-color:#f7ecb5}#bootstrap-theme .bg-danger{background-color:#f2dede}#bootstrap-theme a.bg-danger:hover,#bootstrap-theme a.bg-danger:focus{background-color:#e4b9b9}#bootstrap-theme .page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}#bootstrap-theme ul,#bootstrap-theme ol{margin-top:0;margin-bottom:10px}#bootstrap-theme ul ul,#bootstrap-theme ul ol,#bootstrap-theme ol ul,#bootstrap-theme ol ol{margin-bottom:0}#bootstrap-theme .list-unstyled{padding-left:0;list-style:none}#bootstrap-theme .list-inline{padding-left:0;list-style:none;margin-left:-5px}#bootstrap-theme .list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}#bootstrap-theme dl{margin-top:0;margin-bottom:20px}#bootstrap-theme dt,#bootstrap-theme dd{line-height:1.428571429}#bootstrap-theme dt{font-weight:700}#bootstrap-theme dd{margin-left:0}#bootstrap-theme .dl-horizontal dd:before,#bootstrap-theme .dl-horizontal dd:after{display:table;content:" "}#bootstrap-theme .dl-horizontal dd:after{clear:both}@media (min-width:768px){#bootstrap-theme .dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}#bootstrap-theme .dl-horizontal dd{margin-left:180px}}#bootstrap-theme abbr[title],#bootstrap-theme abbr[data-original-title]{cursor:help}#bootstrap-theme .initialism{font-size:90%}#bootstrap-theme blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}#bootstrap-theme blockquote p:last-child,#bootstrap-theme blockquote ul:last-child,#bootstrap-theme blockquote ol:last-child{margin-bottom:0}#bootstrap-theme blockquote footer,#bootstrap-theme blockquote small,#bootstrap-theme blockquote .small{display:block;font-size:80%;line-height:1.428571429;color:#999}#bootstrap-theme blockquote footer:before,#bootstrap-theme blockquote small:before,#bootstrap-theme blockquote .small:before{content:"— "}#bootstrap-theme .blockquote-reverse,#bootstrap-theme blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}#bootstrap-theme .blockquote-reverse footer:before,#bootstrap-theme .blockquote-reverse small:before,#bootstrap-theme .blockquote-reverse .small:before,#bootstrap-theme blockquote.pull-right footer:before,#bootstrap-theme blockquote.pull-right small:before,#bootstrap-theme blockquote.pull-right .small:before{content:""}#bootstrap-theme .blockquote-reverse footer:after,#bootstrap-theme .blockquote-reverse small:after,#bootstrap-theme .blockquote-reverse .small:after,#bootstrap-theme blockquote.pull-right footer:after,#bootstrap-theme blockquote.pull-right small:after,#bootstrap-theme blockquote.pull-right .small:after{content:" —"}#bootstrap-theme address{margin-bottom:20px;font-style:normal;line-height:1.428571429}#bootstrap-theme code,#bootstrap-theme kbd,#bootstrap-theme pre,#bootstrap-theme samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}#bootstrap-theme code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}#bootstrap-theme kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}#bootstrap-theme kbd kbd{padding:0;font-size:100%;font-weight:700;box-shadow:none}#bootstrap-theme pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;color:#333;-ms-word-break:break-all;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}#bootstrap-theme pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}#bootstrap-theme .pre-scrollable{max-height:340px;overflow-y:scroll}#bootstrap-theme .container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}#bootstrap-theme .container:before,#bootstrap-theme .container:after{display:table;content:" "}#bootstrap-theme .container:after{clear:both}@media (min-width:768px){#bootstrap-theme .container{width:750px}}@media (min-width:992px){#bootstrap-theme .container{width:970px}}@media (min-width:1200px){#bootstrap-theme .container{width:1170px}}#bootstrap-theme .container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}#bootstrap-theme .container-fluid:before,#bootstrap-theme .container-fluid:after{display:table;content:" "}#bootstrap-theme .container-fluid:after{clear:both}#bootstrap-theme .row{margin-right:-15px;margin-left:-15px}#bootstrap-theme .row:before,#bootstrap-theme .row:after{display:table;content:" "}#bootstrap-theme .row:after{clear:both}#bootstrap-theme .row-no-gutters{margin-right:0;margin-left:0}#bootstrap-theme .row-no-gutters [class*=col-]{padding-right:0;padding-left:0}#bootstrap-theme .col-xs-1,#bootstrap-theme .col-sm-1,#bootstrap-theme .col-md-1,#bootstrap-theme .col-lg-1,#bootstrap-theme .col-xs-2,#bootstrap-theme .col-sm-2,#bootstrap-theme .col-md-2,#bootstrap-theme .col-lg-2,#bootstrap-theme .col-xs-3,#bootstrap-theme .col-sm-3,#bootstrap-theme .col-md-3,#bootstrap-theme .col-lg-3,#bootstrap-theme .col-xs-4,#bootstrap-theme .col-sm-4,#bootstrap-theme .col-md-4,#bootstrap-theme .col-lg-4,#bootstrap-theme .col-xs-5,#bootstrap-theme .col-sm-5,#bootstrap-theme .col-md-5,#bootstrap-theme .col-lg-5,#bootstrap-theme .col-xs-6,#bootstrap-theme .col-sm-6,#bootstrap-theme .col-md-6,#bootstrap-theme .col-lg-6,#bootstrap-theme .col-xs-7,#bootstrap-theme .col-sm-7,#bootstrap-theme .col-md-7,#bootstrap-theme .col-lg-7,#bootstrap-theme .col-xs-8,#bootstrap-theme .col-sm-8,#bootstrap-theme .col-md-8,#bootstrap-theme .col-lg-8,#bootstrap-theme .col-xs-9,#bootstrap-theme .col-sm-9,#bootstrap-theme .col-md-9,#bootstrap-theme .col-lg-9,#bootstrap-theme .col-xs-10,#bootstrap-theme .col-sm-10,#bootstrap-theme .col-md-10,#bootstrap-theme .col-lg-10,#bootstrap-theme .col-xs-11,#bootstrap-theme .col-sm-11,#bootstrap-theme .col-md-11,#bootstrap-theme .col-lg-11,#bootstrap-theme .col-xs-12,#bootstrap-theme .col-sm-12,#bootstrap-theme .col-md-12,#bootstrap-theme .col-lg-12{position:relative;min-height:1px;padding-right:15px;padding-left:15px}#bootstrap-theme .col-xs-1,#bootstrap-theme .col-xs-2,#bootstrap-theme .col-xs-3,#bootstrap-theme .col-xs-4,#bootstrap-theme .col-xs-5,#bootstrap-theme .col-xs-6,#bootstrap-theme .col-xs-7,#bootstrap-theme .col-xs-8,#bootstrap-theme .col-xs-9,#bootstrap-theme .col-xs-10,#bootstrap-theme .col-xs-11,#bootstrap-theme .col-xs-12{float:left}#bootstrap-theme .col-xs-1{width:8.3333333333%}#bootstrap-theme .col-xs-2{width:16.6666666667%}#bootstrap-theme .col-xs-3{width:25%}#bootstrap-theme .col-xs-4{width:33.3333333333%}#bootstrap-theme .col-xs-5{width:41.6666666667%}#bootstrap-theme .col-xs-6{width:50%}#bootstrap-theme .col-xs-7{width:58.3333333333%}#bootstrap-theme .col-xs-8{width:66.6666666667%}#bootstrap-theme .col-xs-9{width:75%}#bootstrap-theme .col-xs-10{width:83.3333333333%}#bootstrap-theme .col-xs-11{width:91.6666666667%}#bootstrap-theme .col-xs-12{width:100%}#bootstrap-theme .col-xs-pull-0{right:auto}#bootstrap-theme .col-xs-pull-1{right:8.3333333333%}#bootstrap-theme .col-xs-pull-2{right:16.6666666667%}#bootstrap-theme .col-xs-pull-3{right:25%}#bootstrap-theme .col-xs-pull-4{right:33.3333333333%}#bootstrap-theme .col-xs-pull-5{right:41.6666666667%}#bootstrap-theme .col-xs-pull-6{right:50%}#bootstrap-theme .col-xs-pull-7{right:58.3333333333%}#bootstrap-theme .col-xs-pull-8{right:66.6666666667%}#bootstrap-theme .col-xs-pull-9{right:75%}#bootstrap-theme .col-xs-pull-10{right:83.3333333333%}#bootstrap-theme .col-xs-pull-11{right:91.6666666667%}#bootstrap-theme .col-xs-pull-12{right:100%}#bootstrap-theme .col-xs-push-0{left:auto}#bootstrap-theme .col-xs-push-1{left:8.3333333333%}#bootstrap-theme .col-xs-push-2{left:16.6666666667%}#bootstrap-theme .col-xs-push-3{left:25%}#bootstrap-theme .col-xs-push-4{left:33.3333333333%}#bootstrap-theme .col-xs-push-5{left:41.6666666667%}#bootstrap-theme .col-xs-push-6{left:50%}#bootstrap-theme .col-xs-push-7{left:58.3333333333%}#bootstrap-theme .col-xs-push-8{left:66.6666666667%}#bootstrap-theme .col-xs-push-9{left:75%}#bootstrap-theme .col-xs-push-10{left:83.3333333333%}#bootstrap-theme .col-xs-push-11{left:91.6666666667%}#bootstrap-theme .col-xs-push-12{left:100%}#bootstrap-theme .col-xs-offset-0{margin-left:0}#bootstrap-theme .col-xs-offset-1{margin-left:8.3333333333%}#bootstrap-theme .col-xs-offset-2{margin-left:16.6666666667%}#bootstrap-theme .col-xs-offset-3{margin-left:25%}#bootstrap-theme .col-xs-offset-4{margin-left:33.3333333333%}#bootstrap-theme .col-xs-offset-5{margin-left:41.6666666667%}#bootstrap-theme .col-xs-offset-6{margin-left:50%}#bootstrap-theme .col-xs-offset-7{margin-left:58.3333333333%}#bootstrap-theme .col-xs-offset-8{margin-left:66.6666666667%}#bootstrap-theme .col-xs-offset-9{margin-left:75%}#bootstrap-theme .col-xs-offset-10{margin-left:83.3333333333%}#bootstrap-theme .col-xs-offset-11{margin-left:91.6666666667%}#bootstrap-theme .col-xs-offset-12{margin-left:100%}@media (min-width:768px){#bootstrap-theme .col-sm-1,#bootstrap-theme .col-sm-2,#bootstrap-theme .col-sm-3,#bootstrap-theme .col-sm-4,#bootstrap-theme .col-sm-5,#bootstrap-theme .col-sm-6,#bootstrap-theme .col-sm-7,#bootstrap-theme .col-sm-8,#bootstrap-theme .col-sm-9,#bootstrap-theme .col-sm-10,#bootstrap-theme .col-sm-11,#bootstrap-theme .col-sm-12{float:left}#bootstrap-theme .col-sm-1{width:8.3333333333%}#bootstrap-theme .col-sm-2{width:16.6666666667%}#bootstrap-theme .col-sm-3{width:25%}#bootstrap-theme .col-sm-4{width:33.3333333333%}#bootstrap-theme .col-sm-5{width:41.6666666667%}#bootstrap-theme .col-sm-6{width:50%}#bootstrap-theme .col-sm-7{width:58.3333333333%}#bootstrap-theme .col-sm-8{width:66.6666666667%}#bootstrap-theme .col-sm-9{width:75%}#bootstrap-theme .col-sm-10{width:83.3333333333%}#bootstrap-theme .col-sm-11{width:91.6666666667%}#bootstrap-theme .col-sm-12{width:100%}#bootstrap-theme .col-sm-pull-0{right:auto}#bootstrap-theme .col-sm-pull-1{right:8.3333333333%}#bootstrap-theme .col-sm-pull-2{right:16.6666666667%}#bootstrap-theme .col-sm-pull-3{right:25%}#bootstrap-theme .col-sm-pull-4{right:33.3333333333%}#bootstrap-theme .col-sm-pull-5{right:41.6666666667%}#bootstrap-theme .col-sm-pull-6{right:50%}#bootstrap-theme .col-sm-pull-7{right:58.3333333333%}#bootstrap-theme .col-sm-pull-8{right:66.6666666667%}#bootstrap-theme .col-sm-pull-9{right:75%}#bootstrap-theme .col-sm-pull-10{right:83.3333333333%}#bootstrap-theme .col-sm-pull-11{right:91.6666666667%}#bootstrap-theme .col-sm-pull-12{right:100%}#bootstrap-theme .col-sm-push-0{left:auto}#bootstrap-theme .col-sm-push-1{left:8.3333333333%}#bootstrap-theme .col-sm-push-2{left:16.6666666667%}#bootstrap-theme .col-sm-push-3{left:25%}#bootstrap-theme .col-sm-push-4{left:33.3333333333%}#bootstrap-theme .col-sm-push-5{left:41.6666666667%}#bootstrap-theme .col-sm-push-6{left:50%}#bootstrap-theme .col-sm-push-7{left:58.3333333333%}#bootstrap-theme .col-sm-push-8{left:66.6666666667%}#bootstrap-theme .col-sm-push-9{left:75%}#bootstrap-theme .col-sm-push-10{left:83.3333333333%}#bootstrap-theme .col-sm-push-11{left:91.6666666667%}#bootstrap-theme .col-sm-push-12{left:100%}#bootstrap-theme .col-sm-offset-0{margin-left:0}#bootstrap-theme .col-sm-offset-1{margin-left:8.3333333333%}#bootstrap-theme .col-sm-offset-2{margin-left:16.6666666667%}#bootstrap-theme .col-sm-offset-3{margin-left:25%}#bootstrap-theme .col-sm-offset-4{margin-left:33.3333333333%}#bootstrap-theme .col-sm-offset-5{margin-left:41.6666666667%}#bootstrap-theme .col-sm-offset-6{margin-left:50%}#bootstrap-theme .col-sm-offset-7{margin-left:58.3333333333%}#bootstrap-theme .col-sm-offset-8{margin-left:66.6666666667%}#bootstrap-theme .col-sm-offset-9{margin-left:75%}#bootstrap-theme .col-sm-offset-10{margin-left:83.3333333333%}#bootstrap-theme .col-sm-offset-11{margin-left:91.6666666667%}#bootstrap-theme .col-sm-offset-12{margin-left:100%}}@media (min-width:992px){#bootstrap-theme .col-md-1,#bootstrap-theme .col-md-2,#bootstrap-theme .col-md-3,#bootstrap-theme .col-md-4,#bootstrap-theme .col-md-5,#bootstrap-theme .col-md-6,#bootstrap-theme .col-md-7,#bootstrap-theme .col-md-8,#bootstrap-theme .col-md-9,#bootstrap-theme .col-md-10,#bootstrap-theme .col-md-11,#bootstrap-theme .col-md-12{float:left}#bootstrap-theme .col-md-1{width:8.3333333333%}#bootstrap-theme .col-md-2{width:16.6666666667%}#bootstrap-theme .col-md-3{width:25%}#bootstrap-theme .col-md-4{width:33.3333333333%}#bootstrap-theme .col-md-5{width:41.6666666667%}#bootstrap-theme .col-md-6{width:50%}#bootstrap-theme .col-md-7{width:58.3333333333%}#bootstrap-theme .col-md-8{width:66.6666666667%}#bootstrap-theme .col-md-9{width:75%}#bootstrap-theme .col-md-10{width:83.3333333333%}#bootstrap-theme .col-md-11{width:91.6666666667%}#bootstrap-theme .col-md-12{width:100%}#bootstrap-theme .col-md-pull-0{right:auto}#bootstrap-theme .col-md-pull-1{right:8.3333333333%}#bootstrap-theme .col-md-pull-2{right:16.6666666667%}#bootstrap-theme .col-md-pull-3{right:25%}#bootstrap-theme .col-md-pull-4{right:33.3333333333%}#bootstrap-theme .col-md-pull-5{right:41.6666666667%}#bootstrap-theme .col-md-pull-6{right:50%}#bootstrap-theme .col-md-pull-7{right:58.3333333333%}#bootstrap-theme .col-md-pull-8{right:66.6666666667%}#bootstrap-theme .col-md-pull-9{right:75%}#bootstrap-theme .col-md-pull-10{right:83.3333333333%}#bootstrap-theme .col-md-pull-11{right:91.6666666667%}#bootstrap-theme .col-md-pull-12{right:100%}#bootstrap-theme .col-md-push-0{left:auto}#bootstrap-theme .col-md-push-1{left:8.3333333333%}#bootstrap-theme .col-md-push-2{left:16.6666666667%}#bootstrap-theme .col-md-push-3{left:25%}#bootstrap-theme .col-md-push-4{left:33.3333333333%}#bootstrap-theme .col-md-push-5{left:41.6666666667%}#bootstrap-theme .col-md-push-6{left:50%}#bootstrap-theme .col-md-push-7{left:58.3333333333%}#bootstrap-theme .col-md-push-8{left:66.6666666667%}#bootstrap-theme .col-md-push-9{left:75%}#bootstrap-theme .col-md-push-10{left:83.3333333333%}#bootstrap-theme .col-md-push-11{left:91.6666666667%}#bootstrap-theme .col-md-push-12{left:100%}#bootstrap-theme .col-md-offset-0{margin-left:0}#bootstrap-theme .col-md-offset-1{margin-left:8.3333333333%}#bootstrap-theme .col-md-offset-2{margin-left:16.6666666667%}#bootstrap-theme .col-md-offset-3{margin-left:25%}#bootstrap-theme .col-md-offset-4{margin-left:33.3333333333%}#bootstrap-theme .col-md-offset-5{margin-left:41.6666666667%}#bootstrap-theme .col-md-offset-6{margin-left:50%}#bootstrap-theme .col-md-offset-7{margin-left:58.3333333333%}#bootstrap-theme .col-md-offset-8{margin-left:66.6666666667%}#bootstrap-theme .col-md-offset-9{margin-left:75%}#bootstrap-theme .col-md-offset-10{margin-left:83.3333333333%}#bootstrap-theme .col-md-offset-11{margin-left:91.6666666667%}#bootstrap-theme .col-md-offset-12{margin-left:100%}}@media (min-width:1200px){#bootstrap-theme .col-lg-1,#bootstrap-theme .col-lg-2,#bootstrap-theme .col-lg-3,#bootstrap-theme .col-lg-4,#bootstrap-theme .col-lg-5,#bootstrap-theme .col-lg-6,#bootstrap-theme .col-lg-7,#bootstrap-theme .col-lg-8,#bootstrap-theme .col-lg-9,#bootstrap-theme .col-lg-10,#bootstrap-theme .col-lg-11,#bootstrap-theme .col-lg-12{float:left}#bootstrap-theme .col-lg-1{width:8.3333333333%}#bootstrap-theme .col-lg-2{width:16.6666666667%}#bootstrap-theme .col-lg-3{width:25%}#bootstrap-theme .col-lg-4{width:33.3333333333%}#bootstrap-theme .col-lg-5{width:41.6666666667%}#bootstrap-theme .col-lg-6{width:50%}#bootstrap-theme .col-lg-7{width:58.3333333333%}#bootstrap-theme .col-lg-8{width:66.6666666667%}#bootstrap-theme .col-lg-9{width:75%}#bootstrap-theme .col-lg-10{width:83.3333333333%}#bootstrap-theme .col-lg-11{width:91.6666666667%}#bootstrap-theme .col-lg-12{width:100%}#bootstrap-theme .col-lg-pull-0{right:auto}#bootstrap-theme .col-lg-pull-1{right:8.3333333333%}#bootstrap-theme .col-lg-pull-2{right:16.6666666667%}#bootstrap-theme .col-lg-pull-3{right:25%}#bootstrap-theme .col-lg-pull-4{right:33.3333333333%}#bootstrap-theme .col-lg-pull-5{right:41.6666666667%}#bootstrap-theme .col-lg-pull-6{right:50%}#bootstrap-theme .col-lg-pull-7{right:58.3333333333%}#bootstrap-theme .col-lg-pull-8{right:66.6666666667%}#bootstrap-theme .col-lg-pull-9{right:75%}#bootstrap-theme .col-lg-pull-10{right:83.3333333333%}#bootstrap-theme .col-lg-pull-11{right:91.6666666667%}#bootstrap-theme .col-lg-pull-12{right:100%}#bootstrap-theme .col-lg-push-0{left:auto}#bootstrap-theme .col-lg-push-1{left:8.3333333333%}#bootstrap-theme .col-lg-push-2{left:16.6666666667%}#bootstrap-theme .col-lg-push-3{left:25%}#bootstrap-theme .col-lg-push-4{left:33.3333333333%}#bootstrap-theme .col-lg-push-5{left:41.6666666667%}#bootstrap-theme .col-lg-push-6{left:50%}#bootstrap-theme .col-lg-push-7{left:58.3333333333%}#bootstrap-theme .col-lg-push-8{left:66.6666666667%}#bootstrap-theme .col-lg-push-9{left:75%}#bootstrap-theme .col-lg-push-10{left:83.3333333333%}#bootstrap-theme .col-lg-push-11{left:91.6666666667%}#bootstrap-theme .col-lg-push-12{left:100%}#bootstrap-theme .col-lg-offset-0{margin-left:0}#bootstrap-theme .col-lg-offset-1{margin-left:8.3333333333%}#bootstrap-theme .col-lg-offset-2{margin-left:16.6666666667%}#bootstrap-theme .col-lg-offset-3{margin-left:25%}#bootstrap-theme .col-lg-offset-4{margin-left:33.3333333333%}#bootstrap-theme .col-lg-offset-5{margin-left:41.6666666667%}#bootstrap-theme .col-lg-offset-6{margin-left:50%}#bootstrap-theme .col-lg-offset-7{margin-left:58.3333333333%}#bootstrap-theme .col-lg-offset-8{margin-left:66.6666666667%}#bootstrap-theme .col-lg-offset-9{margin-left:75%}#bootstrap-theme .col-lg-offset-10{margin-left:83.3333333333%}#bootstrap-theme .col-lg-offset-11{margin-left:91.6666666667%}#bootstrap-theme .col-lg-offset-12{margin-left:100%}}#bootstrap-theme table{background-color:transparent}#bootstrap-theme table col[class*=col-]{position:static;display:table-column;float:none}#bootstrap-theme table td[class*=col-],#bootstrap-theme table th[class*=col-]{position:static;display:table-cell;float:none}#bootstrap-theme caption{padding-top:8px;padding-bottom:8px;color:#999;text-align:left}#bootstrap-theme th{text-align:left}#bootstrap-theme .table{width:100%;max-width:100%;margin-bottom:20px}#bootstrap-theme .table>thead>tr>th,#bootstrap-theme .table>thead>tr>td,#bootstrap-theme .table>tbody>tr>th,#bootstrap-theme .table>tbody>tr>td,#bootstrap-theme .table>tfoot>tr>th,#bootstrap-theme .table>tfoot>tr>td{padding:8px;line-height:1.428571429;vertical-align:top;border-top:1px solid #ddd}#bootstrap-theme .table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}#bootstrap-theme .table>caption+thead>tr:first-child>th,#bootstrap-theme .table>caption+thead>tr:first-child>td,#bootstrap-theme .table>colgroup+thead>tr:first-child>th,#bootstrap-theme .table>colgroup+thead>tr:first-child>td,#bootstrap-theme .table>thead:first-child>tr:first-child>th,#bootstrap-theme .table>thead:first-child>tr:first-child>td{border-top:0}#bootstrap-theme .table>tbody+tbody{border-top:2px solid #ddd}#bootstrap-theme .table .table{background-color:#fff}#bootstrap-theme .table-condensed>thead>tr>th,#bootstrap-theme .table-condensed>thead>tr>td,#bootstrap-theme .table-condensed>tbody>tr>th,#bootstrap-theme .table-condensed>tbody>tr>td,#bootstrap-theme .table-condensed>tfoot>tr>th,#bootstrap-theme .table-condensed>tfoot>tr>td{padding:5px}#bootstrap-theme .table-bordered{border:1px solid #ddd}#bootstrap-theme .table-bordered>thead>tr>th,#bootstrap-theme .table-bordered>thead>tr>td,#bootstrap-theme .table-bordered>tbody>tr>th,#bootstrap-theme .table-bordered>tbody>tr>td,#bootstrap-theme .table-bordered>tfoot>tr>th,#bootstrap-theme .table-bordered>tfoot>tr>td{border:1px solid #ddd}#bootstrap-theme .table-bordered>thead>tr>th,#bootstrap-theme .table-bordered>thead>tr>td{border-bottom-width:2px}#bootstrap-theme .table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}#bootstrap-theme .table-hover>tbody>tr:hover{background-color:#f5f5f5}#bootstrap-theme .table>thead>tr>td.active,#bootstrap-theme .table>thead>tr>th.active,#bootstrap-theme .table>thead>tr.active>td,#bootstrap-theme .table>thead>tr.active>th,#bootstrap-theme .table>tbody>tr>td.active,#bootstrap-theme .table>tbody>tr>th.active,#bootstrap-theme .table>tbody>tr.active>td,#bootstrap-theme .table>tbody>tr.active>th,#bootstrap-theme .table>tfoot>tr>td.active,#bootstrap-theme .table>tfoot>tr>th.active,#bootstrap-theme .table>tfoot>tr.active>td,#bootstrap-theme .table>tfoot>tr.active>th{background-color:#f5f5f5}#bootstrap-theme .table-hover>tbody>tr>td.active:hover,#bootstrap-theme .table-hover>tbody>tr>th.active:hover,#bootstrap-theme .table-hover>tbody>tr.active:hover>td,#bootstrap-theme .table-hover>tbody>tr:hover>.active,#bootstrap-theme .table-hover>tbody>tr.active:hover>th{background-color:#e8e8e8}#bootstrap-theme .table>thead>tr>td.success,#bootstrap-theme .table>thead>tr>th.success,#bootstrap-theme .table>thead>tr.success>td,#bootstrap-theme .table>thead>tr.success>th,#bootstrap-theme .table>tbody>tr>td.success,#bootstrap-theme .table>tbody>tr>th.success,#bootstrap-theme .table>tbody>tr.success>td,#bootstrap-theme .table>tbody>tr.success>th,#bootstrap-theme .table>tfoot>tr>td.success,#bootstrap-theme .table>tfoot>tr>th.success,#bootstrap-theme .table>tfoot>tr.success>td,#bootstrap-theme .table>tfoot>tr.success>th{background-color:#dff0d8}#bootstrap-theme .table-hover>tbody>tr>td.success:hover,#bootstrap-theme .table-hover>tbody>tr>th.success:hover,#bootstrap-theme .table-hover>tbody>tr.success:hover>td,#bootstrap-theme .table-hover>tbody>tr:hover>.success,#bootstrap-theme .table-hover>tbody>tr.success:hover>th{background-color:#d0e9c6}#bootstrap-theme .table>thead>tr>td.info,#bootstrap-theme .table>thead>tr>th.info,#bootstrap-theme .table>thead>tr.info>td,#bootstrap-theme .table>thead>tr.info>th,#bootstrap-theme .table>tbody>tr>td.info,#bootstrap-theme .table>tbody>tr>th.info,#bootstrap-theme .table>tbody>tr.info>td,#bootstrap-theme .table>tbody>tr.info>th,#bootstrap-theme .table>tfoot>tr>td.info,#bootstrap-theme .table>tfoot>tr>th.info,#bootstrap-theme .table>tfoot>tr.info>td,#bootstrap-theme .table>tfoot>tr.info>th{background-color:#d9edf7}#bootstrap-theme .table-hover>tbody>tr>td.info:hover,#bootstrap-theme .table-hover>tbody>tr>th.info:hover,#bootstrap-theme .table-hover>tbody>tr.info:hover>td,#bootstrap-theme .table-hover>tbody>tr:hover>.info,#bootstrap-theme .table-hover>tbody>tr.info:hover>th{background-color:#c4e3f3}#bootstrap-theme .table>thead>tr>td.warning,#bootstrap-theme .table>thead>tr>th.warning,#bootstrap-theme .table>thead>tr.warning>td,#bootstrap-theme .table>thead>tr.warning>th,#bootstrap-theme .table>tbody>tr>td.warning,#bootstrap-theme .table>tbody>tr>th.warning,#bootstrap-theme .table>tbody>tr.warning>td,#bootstrap-theme .table>tbody>tr.warning>th,#bootstrap-theme .table>tfoot>tr>td.warning,#bootstrap-theme .table>tfoot>tr>th.warning,#bootstrap-theme .table>tfoot>tr.warning>td,#bootstrap-theme .table>tfoot>tr.warning>th{background-color:#fcf8e3}#bootstrap-theme .table-hover>tbody>tr>td.warning:hover,#bootstrap-theme .table-hover>tbody>tr>th.warning:hover,#bootstrap-theme .table-hover>tbody>tr.warning:hover>td,#bootstrap-theme .table-hover>tbody>tr:hover>.warning,#bootstrap-theme .table-hover>tbody>tr.warning:hover>th{background-color:#faf2cc}#bootstrap-theme .table>thead>tr>td.danger,#bootstrap-theme .table>thead>tr>th.danger,#bootstrap-theme .table>thead>tr.danger>td,#bootstrap-theme .table>thead>tr.danger>th,#bootstrap-theme .table>tbody>tr>td.danger,#bootstrap-theme .table>tbody>tr>th.danger,#bootstrap-theme .table>tbody>tr.danger>td,#bootstrap-theme .table>tbody>tr.danger>th,#bootstrap-theme .table>tfoot>tr>td.danger,#bootstrap-theme .table>tfoot>tr>th.danger,#bootstrap-theme .table>tfoot>tr.danger>td,#bootstrap-theme .table>tfoot>tr.danger>th{background-color:#f2dede}#bootstrap-theme .table-hover>tbody>tr>td.danger:hover,#bootstrap-theme .table-hover>tbody>tr>th.danger:hover,#bootstrap-theme .table-hover>tbody>tr.danger:hover>td,#bootstrap-theme .table-hover>tbody>tr:hover>.danger,#bootstrap-theme .table-hover>tbody>tr.danger:hover>th{background-color:#ebcccc}#bootstrap-theme .table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){#bootstrap-theme .table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}#bootstrap-theme .table-responsive>.table{margin-bottom:0}#bootstrap-theme .table-responsive>.table>thead>tr>th,#bootstrap-theme .table-responsive>.table>thead>tr>td,#bootstrap-theme .table-responsive>.table>tbody>tr>th,#bootstrap-theme .table-responsive>.table>tbody>tr>td,#bootstrap-theme .table-responsive>.table>tfoot>tr>th,#bootstrap-theme .table-responsive>.table>tfoot>tr>td{white-space:nowrap}#bootstrap-theme .table-responsive>.table-bordered{border:0}#bootstrap-theme .table-responsive>.table-bordered>thead>tr>th:first-child,#bootstrap-theme .table-responsive>.table-bordered>thead>tr>td:first-child,#bootstrap-theme .table-responsive>.table-bordered>tbody>tr>th:first-child,#bootstrap-theme .table-responsive>.table-bordered>tbody>tr>td:first-child,#bootstrap-theme .table-responsive>.table-bordered>tfoot>tr>th:first-child,#bootstrap-theme .table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}#bootstrap-theme .table-responsive>.table-bordered>thead>tr>th:last-child,#bootstrap-theme .table-responsive>.table-bordered>thead>tr>td:last-child,#bootstrap-theme .table-responsive>.table-bordered>tbody>tr>th:last-child,#bootstrap-theme .table-responsive>.table-bordered>tbody>tr>td:last-child,#bootstrap-theme .table-responsive>.table-bordered>tfoot>tr>th:last-child,#bootstrap-theme .table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}#bootstrap-theme .table-responsive>.table-bordered>tbody>tr:last-child>th,#bootstrap-theme .table-responsive>.table-bordered>tbody>tr:last-child>td,#bootstrap-theme .table-responsive>.table-bordered>tfoot>tr:last-child>th,#bootstrap-theme .table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}#bootstrap-theme fieldset{min-width:0;padding:0;margin:0;border:0}#bootstrap-theme legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#555;border:0;border-bottom:1px solid #e5e5e5}#bootstrap-theme label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}#bootstrap-theme input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-appearance:none;-moz-appearance:none;appearance:none}#bootstrap-theme input[type=radio],#bootstrap-theme input[type=checkbox]{margin:4px 0 0;margin-top:1px \9;line-height:normal}#bootstrap-theme input[type=radio][disabled],#bootstrap-theme input[type=radio].disabled,fieldset[disabled] #bootstrap-theme input[type=radio],#bootstrap-theme input[type=checkbox][disabled],#bootstrap-theme input[type=checkbox].disabled,fieldset[disabled] #bootstrap-theme input[type=checkbox]{cursor:not-allowed}#bootstrap-theme input[type=file]{display:block}#bootstrap-theme input[type=range]{display:block;width:100%}#bootstrap-theme select[multiple],#bootstrap-theme select[size]{height:auto}#bootstrap-theme input[type=file]:focus,#bootstrap-theme input[type=radio]:focus,#bootstrap-theme input[type=checkbox]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#bootstrap-theme output{display:block;padding-top:5px;font-size:14px;line-height:1.428571429;color:#555}#bootstrap-theme .form-control{display:block;width:100%;height:30px;padding:4px 8px;font-size:14px;line-height:1.428571429;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}#bootstrap-theme .form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}#bootstrap-theme .form-control::-moz-placeholder{color:#999;opacity:1}#bootstrap-theme .form-control:-ms-input-placeholder{color:#999}#bootstrap-theme .form-control::-webkit-input-placeholder{color:#999}#bootstrap-theme .form-control::-ms-expand{background-color:transparent;border:0}#bootstrap-theme .form-control[disabled],#bootstrap-theme .form-control[readonly],fieldset[disabled] #bootstrap-theme .form-control{background-color:#eee;opacity:1}#bootstrap-theme .form-control[disabled],fieldset[disabled] #bootstrap-theme .form-control{cursor:not-allowed}#bootstrap-theme textarea.form-control{height:auto}@media screen and (-webkit-min-device-pixel-ratio:0){#bootstrap-theme input[type=date].form-control,#bootstrap-theme input[type=time].form-control,#bootstrap-theme input[type=datetime-local].form-control,#bootstrap-theme input[type=month].form-control{line-height:30px}#bootstrap-theme input[type=date].input-sm,#bootstrap-theme .input-group-sm>input.form-control[type=date],#bootstrap-theme .input-group-sm>input.input-group-addon[type=date],#bootstrap-theme .input-group-sm>.input-group-btn>input.btn[type=date],.input-group-sm #bootstrap-theme input[type=date],#bootstrap-theme input[type=time].input-sm,#bootstrap-theme .input-group-sm>input.form-control[type=time],#bootstrap-theme .input-group-sm>input.input-group-addon[type=time],#bootstrap-theme .input-group-sm>.input-group-btn>input.btn[type=time],.input-group-sm #bootstrap-theme input[type=time],#bootstrap-theme input[type=datetime-local].input-sm,#bootstrap-theme .input-group-sm>input.form-control[type=datetime-local],#bootstrap-theme .input-group-sm>input.input-group-addon[type=datetime-local],#bootstrap-theme .input-group-sm>.input-group-btn>input.btn[type=datetime-local],.input-group-sm #bootstrap-theme input[type=datetime-local],#bootstrap-theme input[type=month].input-sm,#bootstrap-theme .input-group-sm>input.form-control[type=month],#bootstrap-theme .input-group-sm>input.input-group-addon[type=month],#bootstrap-theme .input-group-sm>.input-group-btn>input.btn[type=month],.input-group-sm #bootstrap-theme input[type=month]{line-height:30px}#bootstrap-theme input[type=date].input-lg,#bootstrap-theme .input-group-lg>input.form-control[type=date],#bootstrap-theme .input-group-lg>input.input-group-addon[type=date],#bootstrap-theme .input-group-lg>.input-group-btn>input.btn[type=date],.input-group-lg #bootstrap-theme input[type=date],#bootstrap-theme input[type=time].input-lg,#bootstrap-theme .input-group-lg>input.form-control[type=time],#bootstrap-theme .input-group-lg>input.input-group-addon[type=time],#bootstrap-theme .input-group-lg>.input-group-btn>input.btn[type=time],.input-group-lg #bootstrap-theme input[type=time],#bootstrap-theme input[type=datetime-local].input-lg,#bootstrap-theme .input-group-lg>input.form-control[type=datetime-local],#bootstrap-theme .input-group-lg>input.input-group-addon[type=datetime-local],#bootstrap-theme .input-group-lg>.input-group-btn>input.btn[type=datetime-local],.input-group-lg #bootstrap-theme input[type=datetime-local],#bootstrap-theme input[type=month].input-lg,#bootstrap-theme .input-group-lg>input.form-control[type=month],#bootstrap-theme .input-group-lg>input.input-group-addon[type=month],#bootstrap-theme .input-group-lg>.input-group-btn>input.btn[type=month],.input-group-lg #bootstrap-theme input[type=month]{line-height:54px}}#bootstrap-theme .form-group{margin-bottom:15px}#bootstrap-theme .radio,#bootstrap-theme .checkbox{position:relative;display:block;margin-top:10px;margin-bottom:10px}#bootstrap-theme .radio.disabled label,fieldset[disabled] #bootstrap-theme .radio label,#bootstrap-theme .checkbox.disabled label,fieldset[disabled] #bootstrap-theme .checkbox label{cursor:not-allowed}#bootstrap-theme .radio label,#bootstrap-theme .checkbox label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}#bootstrap-theme .radio input[type=radio],#bootstrap-theme .radio-inline input[type=radio],#bootstrap-theme .checkbox input[type=checkbox],#bootstrap-theme .checkbox-inline input[type=checkbox]{position:absolute;margin-top:4px \9;margin-left:-20px}#bootstrap-theme .radio+.radio,#bootstrap-theme .checkbox+.checkbox{margin-top:-5px}#bootstrap-theme .radio-inline,#bootstrap-theme .checkbox-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}#bootstrap-theme .radio-inline.disabled,fieldset[disabled] #bootstrap-theme .radio-inline,#bootstrap-theme .checkbox-inline.disabled,fieldset[disabled] #bootstrap-theme .checkbox-inline{cursor:not-allowed}#bootstrap-theme .radio-inline+.radio-inline,#bootstrap-theme .checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}#bootstrap-theme .form-control-static{min-height:34px;padding-top:5px;padding-bottom:5px;margin-bottom:0}#bootstrap-theme .form-control-static.input-lg,#bootstrap-theme .input-group-lg>.form-control-static.form-control,#bootstrap-theme .input-group-lg>.form-control-static.input-group-addon,#bootstrap-theme .input-group-lg>.input-group-btn>.form-control-static.btn,#bootstrap-theme .form-control-static.input-sm,#bootstrap-theme .input-group-sm>.form-control-static.form-control,#bootstrap-theme .input-group-sm>.form-control-static.input-group-addon,#bootstrap-theme .input-group-sm>.input-group-btn>.form-control-static.btn{padding-right:0;padding-left:0}#bootstrap-theme .input-sm,#bootstrap-theme .input-group-sm>.form-control,#bootstrap-theme .input-group-sm>.input-group-addon,#bootstrap-theme .input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}#bootstrap-theme select.input-sm,#bootstrap-theme .input-group-sm>select.form-control,#bootstrap-theme .input-group-sm>select.input-group-addon,#bootstrap-theme .input-group-sm>.input-group-btn>select.btn{height:30px;line-height:30px}#bootstrap-theme textarea.input-sm,#bootstrap-theme .input-group-sm>textarea.form-control,#bootstrap-theme .input-group-sm>textarea.input-group-addon,#bootstrap-theme .input-group-sm>.input-group-btn>textarea.btn,#bootstrap-theme select[multiple].input-sm,#bootstrap-theme .input-group-sm>select.form-control[multiple],#bootstrap-theme .input-group-sm>select.input-group-addon[multiple],#bootstrap-theme .input-group-sm>.input-group-btn>select.btn[multiple]{height:auto}#bootstrap-theme .form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}#bootstrap-theme .form-group-sm select.form-control{height:30px;line-height:30px}#bootstrap-theme .form-group-sm textarea.form-control,#bootstrap-theme .form-group-sm select[multiple].form-control{height:auto}#bootstrap-theme .form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}#bootstrap-theme .input-lg,#bootstrap-theme .input-group-lg>.form-control,#bootstrap-theme .input-group-lg>.input-group-addon,#bootstrap-theme .input-group-lg>.input-group-btn>.btn{height:54px;padding:14px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}#bootstrap-theme select.input-lg,#bootstrap-theme .input-group-lg>select.form-control,#bootstrap-theme .input-group-lg>select.input-group-addon,#bootstrap-theme .input-group-lg>.input-group-btn>select.btn{height:54px;line-height:54px}#bootstrap-theme textarea.input-lg,#bootstrap-theme .input-group-lg>textarea.form-control,#bootstrap-theme .input-group-lg>textarea.input-group-addon,#bootstrap-theme .input-group-lg>.input-group-btn>textarea.btn,#bootstrap-theme select[multiple].input-lg,#bootstrap-theme .input-group-lg>select.form-control[multiple],#bootstrap-theme .input-group-lg>select.input-group-addon[multiple],#bootstrap-theme .input-group-lg>.input-group-btn>select.btn[multiple]{height:auto}#bootstrap-theme .form-group-lg .form-control{height:54px;padding:14px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}#bootstrap-theme .form-group-lg select.form-control{height:54px;line-height:54px}#bootstrap-theme .form-group-lg textarea.form-control,#bootstrap-theme .form-group-lg select[multiple].form-control{height:auto}#bootstrap-theme .form-group-lg .form-control-static{height:54px;min-height:38px;padding:15px 16px;font-size:18px;line-height:1.3333333}#bootstrap-theme .has-feedback{position:relative}#bootstrap-theme .has-feedback .form-control{padding-right:37.5px}#bootstrap-theme .form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:30px;height:30px;line-height:30px;text-align:center;pointer-events:none}#bootstrap-theme .input-lg+.form-control-feedback,#bootstrap-theme .input-group-lg>.form-control+.form-control-feedback,#bootstrap-theme .input-group-lg>.input-group-addon+.form-control-feedback,#bootstrap-theme .input-group-lg>.input-group-btn>.btn+.form-control-feedback,#bootstrap-theme .input-group-lg+.form-control-feedback,#bootstrap-theme .form-group-lg .form-control+.form-control-feedback{width:54px;height:54px;line-height:54px}#bootstrap-theme .input-sm+.form-control-feedback,#bootstrap-theme .input-group-sm>.form-control+.form-control-feedback,#bootstrap-theme .input-group-sm>.input-group-addon+.form-control-feedback,#bootstrap-theme .input-group-sm>.input-group-btn>.btn+.form-control-feedback,#bootstrap-theme .input-group-sm+.form-control-feedback,#bootstrap-theme .form-group-sm .form-control+.form-control-feedback{width:30px;height:30px;line-height:30px}#bootstrap-theme .has-success .help-block,#bootstrap-theme .has-success .control-label,#bootstrap-theme .has-success .radio,#bootstrap-theme .has-success .checkbox,#bootstrap-theme .has-success .radio-inline,#bootstrap-theme .has-success .checkbox-inline,#bootstrap-theme .has-success.radio label,#bootstrap-theme .has-success.checkbox label,#bootstrap-theme .has-success.radio-inline label,#bootstrap-theme .has-success.checkbox-inline label{color:#468847}#bootstrap-theme .has-success .form-control{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}#bootstrap-theme .has-success .form-control:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #7aba7b}#bootstrap-theme .has-success .input-group-addon{color:#468847;background-color:#dff0d8;border-color:#468847}#bootstrap-theme .has-success .form-control-feedback{color:#468847}#bootstrap-theme .has-warning .help-block,#bootstrap-theme .has-warning .control-label,#bootstrap-theme .has-warning .radio,#bootstrap-theme .has-warning .checkbox,#bootstrap-theme .has-warning .radio-inline,#bootstrap-theme .has-warning .checkbox-inline,#bootstrap-theme .has-warning.radio label,#bootstrap-theme .has-warning.checkbox label,#bootstrap-theme .has-warning.radio-inline label,#bootstrap-theme .has-warning.checkbox-inline label{color:#c09853}#bootstrap-theme .has-warning .form-control{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}#bootstrap-theme .has-warning .form-control:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #dbc59e}#bootstrap-theme .has-warning .input-group-addon{color:#c09853;background-color:#fcf8e3;border-color:#c09853}#bootstrap-theme .has-warning .form-control-feedback{color:#c09853}#bootstrap-theme .has-error .help-block,#bootstrap-theme .has-error .control-label,#bootstrap-theme .has-error .radio,#bootstrap-theme .has-error .checkbox,#bootstrap-theme .has-error .radio-inline,#bootstrap-theme .has-error .checkbox-inline,#bootstrap-theme .has-error.radio label,#bootstrap-theme .has-error.checkbox label,#bootstrap-theme .has-error.radio-inline label,#bootstrap-theme .has-error.checkbox-inline label{color:#b94a48}#bootstrap-theme .has-error .form-control{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}#bootstrap-theme .has-error .form-control:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #d59392}#bootstrap-theme .has-error .input-group-addon{color:#b94a48;background-color:#f2dede;border-color:#b94a48}#bootstrap-theme .has-error .form-control-feedback{color:#b94a48}#bootstrap-theme .has-feedback label~.form-control-feedback{top:25px}#bootstrap-theme .has-feedback label.sr-only~.form-control-feedback{top:0}#bootstrap-theme .help-block{display:block;margin-top:5px;margin-bottom:10px;color:#959595}@media (min-width:768px){#bootstrap-theme .form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}#bootstrap-theme .form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}#bootstrap-theme .form-inline .form-control-static{display:inline-block}#bootstrap-theme .form-inline .input-group{display:inline-table;vertical-align:middle}#bootstrap-theme .form-inline .input-group .input-group-addon,#bootstrap-theme .form-inline .input-group .input-group-btn,#bootstrap-theme .form-inline .input-group .form-control{width:auto}#bootstrap-theme .form-inline .input-group>.form-control{width:100%}#bootstrap-theme .form-inline .control-label{margin-bottom:0;vertical-align:middle}#bootstrap-theme .form-inline .radio,#bootstrap-theme .form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}#bootstrap-theme .form-inline .radio label,#bootstrap-theme .form-inline .checkbox label{padding-left:0}#bootstrap-theme .form-inline .radio input[type=radio],#bootstrap-theme .form-inline .checkbox input[type=checkbox]{position:relative;margin-left:0}#bootstrap-theme .form-inline .has-feedback .form-control-feedback{top:0}}#bootstrap-theme .form-horizontal .radio,#bootstrap-theme .form-horizontal .checkbox,#bootstrap-theme .form-horizontal .radio-inline,#bootstrap-theme .form-horizontal .checkbox-inline{padding-top:5px;margin-top:0;margin-bottom:0}#bootstrap-theme .form-horizontal .radio,#bootstrap-theme .form-horizontal .checkbox{min-height:25px}#bootstrap-theme .form-horizontal .form-group{margin-right:-15px;margin-left:-15px}#bootstrap-theme .form-horizontal .form-group:before,#bootstrap-theme .form-horizontal .form-group:after{display:table;content:" "}#bootstrap-theme .form-horizontal .form-group:after{clear:both}@media (min-width:768px){#bootstrap-theme .form-horizontal .control-label{padding-top:5px;margin-bottom:0;text-align:right}}#bootstrap-theme .form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){#bootstrap-theme .form-horizontal .form-group-lg .control-label{padding-top:15px;font-size:18px}}@media (min-width:768px){#bootstrap-theme .form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}#bootstrap-theme .btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;white-space:nowrap;vertical-align:middle;touch-action:manipulation;cursor:pointer;background-image:none;border:1px solid transparent;padding:4px 8px;font-size:14px;line-height:1.428571429;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#bootstrap-theme .btn:focus,#bootstrap-theme .btn.focus,#bootstrap-theme .btn:active:focus,#bootstrap-theme .btn:active.focus,#bootstrap-theme .btn.active:focus,#bootstrap-theme .btn.active.focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}#bootstrap-theme .btn:hover,#bootstrap-theme .btn:focus,#bootstrap-theme .btn.focus{color:#fff;text-decoration:none}#bootstrap-theme .btn:active,#bootstrap-theme .btn.active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}#bootstrap-theme .btn.disabled,#bootstrap-theme .btn[disabled],fieldset[disabled] #bootstrap-theme .btn{cursor:not-allowed;-webkit-filter:alpha(opacity=65);filter:alpha(opacity=65);opacity:.65;-webkit-box-shadow:none;box-shadow:none}#bootstrap-theme a.btn.disabled,fieldset[disabled] #bootstrap-theme a.btn{pointer-events:none}#bootstrap-theme .btn-default{color:#fff;background-color:#70716b;border-color:rgba(0,0,0,.1)}#bootstrap-theme .btn-default:focus,#bootstrap-theme .btn-default.focus{color:#fff;background-color:#565752;border-color:rgba(0,0,0,.1)}#bootstrap-theme .btn-default:hover{color:#fff;background-color:#565752;border-color:rgba(0,0,0,.1)}#bootstrap-theme .btn-default:active,#bootstrap-theme .btn-default.active,.open>#bootstrap-theme .btn-default.dropdown-toggle{color:#fff;background-color:#565752;background-image:none;border-color:rgba(0,0,0,.1)}#bootstrap-theme .btn-default:active:hover,#bootstrap-theme .btn-default:active:focus,#bootstrap-theme .btn-default:active.focus,#bootstrap-theme .btn-default.active:hover,#bootstrap-theme .btn-default.active:focus,#bootstrap-theme .btn-default.active.focus,.open>#bootstrap-theme .btn-default.dropdown-toggle:hover,.open>#bootstrap-theme .btn-default.dropdown-toggle:focus,.open>#bootstrap-theme .btn-default.dropdown-toggle.focus{color:#fff;background-color:#444441;border-color:rgba(0,0,0,.1)}#bootstrap-theme .btn-default.disabled:hover,#bootstrap-theme .btn-default.disabled:focus,#bootstrap-theme .btn-default.disabled.focus,#bootstrap-theme .btn-default[disabled]:hover,#bootstrap-theme .btn-default[disabled]:focus,#bootstrap-theme .btn-default[disabled].focus,fieldset[disabled] #bootstrap-theme .btn-default:hover,fieldset[disabled] #bootstrap-theme .btn-default:focus,fieldset[disabled] #bootstrap-theme .btn-default.focus{background-color:#70716b;border-color:rgba(0,0,0,.1)}#bootstrap-theme .btn-default .badge{color:#70716b;background-color:#fff}#bootstrap-theme .btn-primary{color:#fff;background-color:#70716b;border-color:#70716b}#bootstrap-theme .btn-primary:focus,#bootstrap-theme .btn-primary.focus{color:#fff;background-color:#565752;border-color:#2f302d}#bootstrap-theme .btn-primary:hover{color:#fff;background-color:#565752;border-color:#51524d}#bootstrap-theme .btn-primary:active,#bootstrap-theme .btn-primary.active,.open>#bootstrap-theme .btn-primary.dropdown-toggle{color:#fff;background-color:#565752;background-image:none;border-color:#51524d}#bootstrap-theme .btn-primary:active:hover,#bootstrap-theme .btn-primary:active:focus,#bootstrap-theme .btn-primary:active.focus,#bootstrap-theme .btn-primary.active:hover,#bootstrap-theme .btn-primary.active:focus,#bootstrap-theme .btn-primary.active.focus,.open>#bootstrap-theme .btn-primary.dropdown-toggle:hover,.open>#bootstrap-theme .btn-primary.dropdown-toggle:focus,.open>#bootstrap-theme .btn-primary.dropdown-toggle.focus{color:#fff;background-color:#444441;border-color:#2f302d}#bootstrap-theme .btn-primary.disabled:hover,#bootstrap-theme .btn-primary.disabled:focus,#bootstrap-theme .btn-primary.disabled.focus,#bootstrap-theme .btn-primary[disabled]:hover,#bootstrap-theme .btn-primary[disabled]:focus,#bootstrap-theme .btn-primary[disabled].focus,fieldset[disabled] #bootstrap-theme .btn-primary:hover,fieldset[disabled] #bootstrap-theme .btn-primary:focus,fieldset[disabled] #bootstrap-theme .btn-primary.focus{background-color:#70716b;border-color:#70716b}#bootstrap-theme .btn-primary .badge{color:#70716b;background-color:#fff}#bootstrap-theme .btn-success{color:#fff;background-color:#73a839;border-color:#73a839}#bootstrap-theme .btn-success:focus,#bootstrap-theme .btn-success.focus{color:#fff;background-color:#59822c;border-color:#324919}#bootstrap-theme .btn-success:hover{color:#fff;background-color:#59822c;border-color:#547a29}#bootstrap-theme .btn-success:active,#bootstrap-theme .btn-success.active,.open>#bootstrap-theme .btn-success.dropdown-toggle{color:#fff;background-color:#59822c;background-image:none;border-color:#547a29}#bootstrap-theme .btn-success:active:hover,#bootstrap-theme .btn-success:active:focus,#bootstrap-theme .btn-success:active.focus,#bootstrap-theme .btn-success.active:hover,#bootstrap-theme .btn-success.active:focus,#bootstrap-theme .btn-success.active.focus,.open>#bootstrap-theme .btn-success.dropdown-toggle:hover,.open>#bootstrap-theme .btn-success.dropdown-toggle:focus,.open>#bootstrap-theme .btn-success.dropdown-toggle.focus{color:#fff;background-color:#476723;border-color:#324919}#bootstrap-theme .btn-success.disabled:hover,#bootstrap-theme .btn-success.disabled:focus,#bootstrap-theme .btn-success.disabled.focus,#bootstrap-theme .btn-success[disabled]:hover,#bootstrap-theme .btn-success[disabled]:focus,#bootstrap-theme .btn-success[disabled].focus,fieldset[disabled] #bootstrap-theme .btn-success:hover,fieldset[disabled] #bootstrap-theme .btn-success:focus,fieldset[disabled] #bootstrap-theme .btn-success.focus{background-color:#73a839;border-color:#73a839}#bootstrap-theme .btn-success .badge{color:#73a839;background-color:#fff}#bootstrap-theme .btn-info{color:#000;background-color:#cde8fe;border-color:#cde8fe}#bootstrap-theme .btn-info:focus,#bootstrap-theme .btn-info.focus{color:#000;background-color:#9bd1fd;border-color:#50affc}#bootstrap-theme .btn-info:hover{color:#000;background-color:#9bd1fd;border-color:#91ccfd}#bootstrap-theme .btn-info:active,#bootstrap-theme .btn-info.active,.open>#bootstrap-theme .btn-info.dropdown-toggle{color:#000;background-color:#9bd1fd;background-image:none;border-color:#91ccfd}#bootstrap-theme .btn-info:active:hover,#bootstrap-theme .btn-info:active:focus,#bootstrap-theme .btn-info:active.focus,#bootstrap-theme .btn-info.active:hover,#bootstrap-theme .btn-info.active:focus,#bootstrap-theme .btn-info.active.focus,.open>#bootstrap-theme .btn-info.dropdown-toggle:hover,.open>#bootstrap-theme .btn-info.dropdown-toggle:focus,.open>#bootstrap-theme .btn-info.dropdown-toggle.focus{color:#000;background-color:#78c1fc;border-color:#50affc}#bootstrap-theme .btn-info.disabled:hover,#bootstrap-theme .btn-info.disabled:focus,#bootstrap-theme .btn-info.disabled.focus,#bootstrap-theme .btn-info[disabled]:hover,#bootstrap-theme .btn-info[disabled]:focus,#bootstrap-theme .btn-info[disabled].focus,fieldset[disabled] #bootstrap-theme .btn-info:hover,fieldset[disabled] #bootstrap-theme .btn-info:focus,fieldset[disabled] #bootstrap-theme .btn-info.focus{background-color:#cde8fe;border-color:#cde8fe}#bootstrap-theme .btn-info .badge{color:#cde8fe;background-color:#000}#bootstrap-theme .btn-warning{color:#fff;background-color:#dd5600;border-color:#dd5600}#bootstrap-theme .btn-warning:focus,#bootstrap-theme .btn-warning.focus{color:#fff;background-color:#aa4200;border-color:#5e2400}#bootstrap-theme .btn-warning:hover{color:#fff;background-color:#aa4200;border-color:#a03e00}#bootstrap-theme .btn-warning:active,#bootstrap-theme .btn-warning.active,.open>#bootstrap-theme .btn-warning.dropdown-toggle{color:#fff;background-color:#aa4200;background-image:none;border-color:#a03e00}#bootstrap-theme .btn-warning:active:hover,#bootstrap-theme .btn-warning:active:focus,#bootstrap-theme .btn-warning:active.focus,#bootstrap-theme .btn-warning.active:hover,#bootstrap-theme .btn-warning.active:focus,#bootstrap-theme .btn-warning.active.focus,.open>#bootstrap-theme .btn-warning.dropdown-toggle:hover,.open>#bootstrap-theme .btn-warning.dropdown-toggle:focus,.open>#bootstrap-theme .btn-warning.dropdown-toggle.focus{color:#fff;background-color:#863400;border-color:#5e2400}#bootstrap-theme .btn-warning.disabled:hover,#bootstrap-theme .btn-warning.disabled:focus,#bootstrap-theme .btn-warning.disabled.focus,#bootstrap-theme .btn-warning[disabled]:hover,#bootstrap-theme .btn-warning[disabled]:focus,#bootstrap-theme .btn-warning[disabled].focus,fieldset[disabled] #bootstrap-theme .btn-warning:hover,fieldset[disabled] #bootstrap-theme .btn-warning:focus,fieldset[disabled] #bootstrap-theme .btn-warning.focus{background-color:#dd5600;border-color:#dd5600}#bootstrap-theme .btn-warning .badge{color:#dd5600;background-color:#fff}#bootstrap-theme .btn-danger{color:#fff;background-color:#c71c22;border-color:#c71c22}#bootstrap-theme .btn-danger:focus,#bootstrap-theme .btn-danger.focus{color:#fff;background-color:#9a161a;border-color:#570c0f}#bootstrap-theme .btn-danger:hover{color:#fff;background-color:#9a161a;border-color:#911419}#bootstrap-theme .btn-danger:active,#bootstrap-theme .btn-danger.active,.open>#bootstrap-theme .btn-danger.dropdown-toggle{color:#fff;background-color:#9a161a;background-image:none;border-color:#911419}#bootstrap-theme .btn-danger:active:hover,#bootstrap-theme .btn-danger:active:focus,#bootstrap-theme .btn-danger:active.focus,#bootstrap-theme .btn-danger.active:hover,#bootstrap-theme .btn-danger.active:focus,#bootstrap-theme .btn-danger.active.focus,.open>#bootstrap-theme .btn-danger.dropdown-toggle:hover,.open>#bootstrap-theme .btn-danger.dropdown-toggle:focus,.open>#bootstrap-theme .btn-danger.dropdown-toggle.focus{color:#fff;background-color:#7b1115;border-color:#570c0f}#bootstrap-theme .btn-danger.disabled:hover,#bootstrap-theme .btn-danger.disabled:focus,#bootstrap-theme .btn-danger.disabled.focus,#bootstrap-theme .btn-danger[disabled]:hover,#bootstrap-theme .btn-danger[disabled]:focus,#bootstrap-theme .btn-danger[disabled].focus,fieldset[disabled] #bootstrap-theme .btn-danger:hover,fieldset[disabled] #bootstrap-theme .btn-danger:focus,fieldset[disabled] #bootstrap-theme .btn-danger.focus{background-color:#c71c22;border-color:#c71c22}#bootstrap-theme .btn-danger .badge{color:#c71c22;background-color:#fff}#bootstrap-theme .btn-link{font-weight:400;color:#2786c2;border-radius:0}#bootstrap-theme .btn-link,#bootstrap-theme .btn-link:active,#bootstrap-theme .btn-link.active,#bootstrap-theme .btn-link[disabled],fieldset[disabled] #bootstrap-theme .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}#bootstrap-theme .btn-link,#bootstrap-theme .btn-link:hover,#bootstrap-theme .btn-link:focus,#bootstrap-theme .btn-link:active{border-color:transparent}#bootstrap-theme .btn-link:hover,#bootstrap-theme .btn-link:focus{color:#1a5a82;text-decoration:underline;background-color:transparent}#bootstrap-theme .btn-link[disabled]:hover,#bootstrap-theme .btn-link[disabled]:focus,fieldset[disabled] #bootstrap-theme .btn-link:hover,fieldset[disabled] #bootstrap-theme .btn-link:focus{color:#999;text-decoration:none}#bootstrap-theme .btn-lg,#bootstrap-theme .btn-group-lg>.btn{padding:14px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}#bootstrap-theme .btn-sm,#bootstrap-theme .btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}#bootstrap-theme .btn-xs,#bootstrap-theme .btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}#bootstrap-theme .btn-block{display:block;width:100%}#bootstrap-theme .btn-block+.btn-block{margin-top:5px}#bootstrap-theme input[type=submit].btn-block,#bootstrap-theme input[type=reset].btn-block,#bootstrap-theme input[type=button].btn-block{width:100%}#bootstrap-theme .fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}#bootstrap-theme .fade.in{opacity:1}#bootstrap-theme .collapse{display:none}#bootstrap-theme .collapse.in{display:block}#bootstrap-theme tr.collapse.in{display:table-row}#bootstrap-theme tbody.collapse.in{display:table-row-group}#bootstrap-theme .collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-property:height,visibility;transition-property:height,visibility;-webkit-transition-duration:.35s;transition-duration:.35s;-webkit-transition-timing-function:ease;transition-timing-function:ease}#bootstrap-theme .caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid \9;border-right:4px solid transparent;border-left:4px solid transparent}#bootstrap-theme .dropup,#bootstrap-theme .dropdown{position:relative}#bootstrap-theme .dropdown-toggle:focus{outline:0}#bootstrap-theme .dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}#bootstrap-theme .dropdown-menu.pull-right{right:0;left:auto}#bootstrap-theme .dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}#bootstrap-theme .dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429;color:#333;white-space:nowrap}#bootstrap-theme .dropdown-menu>li>a:hover,#bootstrap-theme .dropdown-menu>li>a:focus{color:#fff;text-decoration:none;background-color:#000}#bootstrap-theme .dropdown-menu>.active>a,#bootstrap-theme .dropdown-menu>.active>a:hover,#bootstrap-theme .dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#000;outline:0}#bootstrap-theme .dropdown-menu>.disabled>a,#bootstrap-theme .dropdown-menu>.disabled>a:hover,#bootstrap-theme .dropdown-menu>.disabled>a:focus{color:#999}#bootstrap-theme .dropdown-menu>.disabled>a:hover,#bootstrap-theme .dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;-webkit-filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}#bootstrap-theme .open>.dropdown-menu{display:block}#bootstrap-theme .open>a{outline:0}#bootstrap-theme .dropdown-menu-right{right:0;left:auto}#bootstrap-theme .dropdown-menu-left{right:auto;left:0}#bootstrap-theme .dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999;white-space:nowrap}#bootstrap-theme .dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}#bootstrap-theme .pull-right>.dropdown-menu{right:0;left:auto}#bootstrap-theme .dropup .caret,#bootstrap-theme .navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid \9}#bootstrap-theme .dropup .dropdown-menu,#bootstrap-theme .navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){#bootstrap-theme .navbar-right .dropdown-menu{right:0;left:auto}#bootstrap-theme .navbar-right .dropdown-menu-left{left:0;right:auto}}#bootstrap-theme .btn-group,#bootstrap-theme .btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}#bootstrap-theme .btn-group>.btn,#bootstrap-theme .btn-group-vertical>.btn{position:relative;float:left}#bootstrap-theme .btn-group>.btn:hover,#bootstrap-theme .btn-group>.btn:focus,#bootstrap-theme .btn-group>.btn:active,#bootstrap-theme .btn-group>.btn.active,#bootstrap-theme .btn-group-vertical>.btn:hover,#bootstrap-theme .btn-group-vertical>.btn:focus,#bootstrap-theme .btn-group-vertical>.btn:active,#bootstrap-theme .btn-group-vertical>.btn.active{z-index:2}#bootstrap-theme .btn-group .btn+.btn,#bootstrap-theme .btn-group .btn+.btn-group,#bootstrap-theme .btn-group .btn-group+.btn,#bootstrap-theme .btn-group .btn-group+.btn-group{margin-left:-1px}#bootstrap-theme .btn-toolbar{margin-left:-5px}#bootstrap-theme .btn-toolbar:before,#bootstrap-theme .btn-toolbar:after{display:table;content:" "}#bootstrap-theme .btn-toolbar:after{clear:both}#bootstrap-theme .btn-toolbar .btn,#bootstrap-theme .btn-toolbar .btn-group,#bootstrap-theme .btn-toolbar .input-group{float:left}#bootstrap-theme .btn-toolbar>.btn,#bootstrap-theme .btn-toolbar>.btn-group,#bootstrap-theme .btn-toolbar>.input-group{margin-left:5px}#bootstrap-theme .btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}#bootstrap-theme .btn-group>.btn:first-child{margin-left:0}#bootstrap-theme .btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}#bootstrap-theme .btn-group>.btn:last-child:not(:first-child),#bootstrap-theme .btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}#bootstrap-theme .btn-group>.btn-group{float:left}#bootstrap-theme .btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}#bootstrap-theme .btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,#bootstrap-theme .btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}#bootstrap-theme .btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}#bootstrap-theme .btn-group .dropdown-toggle:active,#bootstrap-theme .btn-group.open .dropdown-toggle{outline:0}#bootstrap-theme .btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}#bootstrap-theme .btn-group>.btn-lg+.dropdown-toggle,#bootstrap-theme .btn-group-lg.btn-group>.btn+.dropdown-toggle,#bootstrap-theme .btn-group-lg>.btn-group>.btn+.dropdown-toggle{padding-right:12px;padding-left:12px}#bootstrap-theme .btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}#bootstrap-theme .btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}#bootstrap-theme .btn .caret{margin-left:0}#bootstrap-theme .btn-lg .caret,#bootstrap-theme .btn-group-lg>.btn .caret{border-width:5px 5px 0;border-bottom-width:0}#bootstrap-theme .dropup .btn-lg .caret,#bootstrap-theme .dropup .btn-group-lg>.btn .caret{border-width:0 5px 5px}#bootstrap-theme .btn-group-vertical>.btn,#bootstrap-theme .btn-group-vertical>.btn-group,#bootstrap-theme .btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}#bootstrap-theme .btn-group-vertical>.btn-group:before,#bootstrap-theme .btn-group-vertical>.btn-group:after{display:table;content:" "}#bootstrap-theme .btn-group-vertical>.btn-group:after{clear:both}#bootstrap-theme .btn-group-vertical>.btn-group>.btn{float:none}#bootstrap-theme .btn-group-vertical>.btn+.btn,#bootstrap-theme .btn-group-vertical>.btn+.btn-group,#bootstrap-theme .btn-group-vertical>.btn-group+.btn,#bootstrap-theme .btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}#bootstrap-theme .btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}#bootstrap-theme .btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}#bootstrap-theme .btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}#bootstrap-theme .btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}#bootstrap-theme .btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,#bootstrap-theme .btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}#bootstrap-theme .btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}#bootstrap-theme .btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}#bootstrap-theme .btn-group-justified>.btn,#bootstrap-theme .btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}#bootstrap-theme .btn-group-justified>.btn-group .btn{width:100%}#bootstrap-theme .btn-group-justified>.btn-group .dropdown-menu{left:auto}#bootstrap-theme [data-toggle=buttons]>.btn input[type=radio],#bootstrap-theme [data-toggle=buttons]>.btn input[type=checkbox],#bootstrap-theme [data-toggle=buttons]>.btn-group>.btn input[type=radio],#bootstrap-theme [data-toggle=buttons]>.btn-group>.btn input[type=checkbox]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}#bootstrap-theme .input-group{position:relative;display:table;border-collapse:separate}#bootstrap-theme .input-group[class*=col-]{float:none;padding-right:0;padding-left:0}#bootstrap-theme .input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}#bootstrap-theme .input-group .form-control:focus{z-index:3}#bootstrap-theme .input-group-addon,#bootstrap-theme .input-group-btn,#bootstrap-theme .input-group .form-control{display:table-cell}#bootstrap-theme .input-group-addon:not(:first-child):not(:last-child),#bootstrap-theme .input-group-btn:not(:first-child):not(:last-child),#bootstrap-theme .input-group .form-control:not(:first-child):not(:last-child){border-radius:0}#bootstrap-theme .input-group-addon,#bootstrap-theme .input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}#bootstrap-theme .input-group-addon{padding:4px 8px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}#bootstrap-theme .input-group-addon.input-sm,#bootstrap-theme .input-group-sm>.input-group-addon.form-control,#bootstrap-theme .input-group-sm>.input-group-addon,#bootstrap-theme .input-group-sm>.input-group-btn>.input-group-addon.btn{padding:5px 10px;font-size:12px;border-radius:3px}#bootstrap-theme .input-group-addon.input-lg,#bootstrap-theme .input-group-lg>.input-group-addon.form-control,#bootstrap-theme .input-group-lg>.input-group-addon,#bootstrap-theme .input-group-lg>.input-group-btn>.input-group-addon.btn{padding:14px 16px;font-size:18px;border-radius:6px}#bootstrap-theme .input-group-addon input[type=radio],#bootstrap-theme .input-group-addon input[type=checkbox]{margin-top:0}#bootstrap-theme .input-group .form-control:first-child,#bootstrap-theme .input-group-addon:first-child,#bootstrap-theme .input-group-btn:first-child>.btn,#bootstrap-theme .input-group-btn:first-child>.btn-group>.btn,#bootstrap-theme .input-group-btn:first-child>.dropdown-toggle,#bootstrap-theme .input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),#bootstrap-theme .input-group-btn:last-child>.btn-group:not(:last-child)>.btn{border-top-right-radius:0;border-bottom-right-radius:0}#bootstrap-theme .input-group-addon:first-child{border-right:0}#bootstrap-theme .input-group .form-control:last-child,#bootstrap-theme .input-group-addon:last-child,#bootstrap-theme .input-group-btn:last-child>.btn,#bootstrap-theme .input-group-btn:last-child>.btn-group>.btn,#bootstrap-theme .input-group-btn:last-child>.dropdown-toggle,#bootstrap-theme .input-group-btn:first-child>.btn:not(:first-child),#bootstrap-theme .input-group-btn:first-child>.btn-group:not(:first-child)>.btn{border-top-left-radius:0;border-bottom-left-radius:0}#bootstrap-theme .input-group-addon:last-child{border-left:0}#bootstrap-theme .input-group-btn{position:relative;font-size:0;white-space:nowrap}#bootstrap-theme .input-group-btn>.btn{position:relative}#bootstrap-theme .input-group-btn>.btn+.btn{margin-left:-1px}#bootstrap-theme .input-group-btn>.btn:hover,#bootstrap-theme .input-group-btn>.btn:focus,#bootstrap-theme .input-group-btn>.btn:active{z-index:2}#bootstrap-theme .input-group-btn:first-child>.btn,#bootstrap-theme .input-group-btn:first-child>.btn-group{margin-right:-1px}#bootstrap-theme .input-group-btn:last-child>.btn,#bootstrap-theme .input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}#bootstrap-theme .nav{padding-left:0;margin-bottom:0;list-style:none}#bootstrap-theme .nav:before,#bootstrap-theme .nav:after{display:table;content:" "}#bootstrap-theme .nav:after{clear:both}#bootstrap-theme .nav>li{position:relative;display:block}#bootstrap-theme .nav>li>a{position:relative;display:block;padding:10px 15px}#bootstrap-theme .nav>li>a:hover,#bootstrap-theme .nav>li>a:focus{text-decoration:none;background-color:#eee}#bootstrap-theme .nav>li.disabled>a{color:#999}#bootstrap-theme .nav>li.disabled>a:hover,#bootstrap-theme .nav>li.disabled>a:focus{color:#999;text-decoration:none;cursor:not-allowed;background-color:transparent}#bootstrap-theme .nav .open>a,#bootstrap-theme .nav .open>a:hover,#bootstrap-theme .nav .open>a:focus{background-color:#eee;border-color:#2786c2}#bootstrap-theme .nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}#bootstrap-theme .nav>li>a>img{max-width:none}#bootstrap-theme .nav-tabs{border-bottom:1px solid #ddd}#bootstrap-theme .nav-tabs>li{float:left;margin-bottom:-1px}#bootstrap-theme .nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0}#bootstrap-theme .nav-tabs>li>a:hover{border-color:#eee #eee #ddd}#bootstrap-theme .nav-tabs>li.active>a,#bootstrap-theme .nav-tabs>li.active>a:hover,#bootstrap-theme .nav-tabs>li.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}#bootstrap-theme .nav-pills>li{float:left}#bootstrap-theme .nav-pills>li>a{border-radius:4px}#bootstrap-theme .nav-pills>li+li{margin-left:2px}#bootstrap-theme .nav-pills>li.active>a,#bootstrap-theme .nav-pills>li.active>a:hover,#bootstrap-theme .nav-pills>li.active>a:focus{color:#fff;background-color:#000}#bootstrap-theme .nav-stacked>li{float:none}#bootstrap-theme .nav-stacked>li+li{margin-top:2px;margin-left:0}#bootstrap-theme .nav-justified,#bootstrap-theme .nav-tabs.nav-justified{width:100%}#bootstrap-theme .nav-justified>li,#bootstrap-theme .nav-tabs.nav-justified>li{float:none}#bootstrap-theme .nav-justified>li>a,#bootstrap-theme .nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}#bootstrap-theme .nav-justified>.dropdown .dropdown-menu,#bootstrap-theme .nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){#bootstrap-theme .nav-justified>li,#bootstrap-theme .nav-tabs.nav-justified>li{display:table-cell;width:1%}#bootstrap-theme .nav-justified>li>a,#bootstrap-theme .nav-tabs.nav-justified>li>a{margin-bottom:0}}#bootstrap-theme .nav-tabs-justified,#bootstrap-theme .nav-tabs.nav-justified{border-bottom:0}#bootstrap-theme .nav-tabs-justified>li>a,#bootstrap-theme .nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}#bootstrap-theme .nav-tabs-justified>.active>a,#bootstrap-theme .nav-tabs.nav-justified>.active>a,#bootstrap-theme .nav-tabs-justified>.active>a:hover,#bootstrap-theme .nav-tabs.nav-justified>.active>a:hover,#bootstrap-theme .nav-tabs-justified>.active>a:focus,#bootstrap-theme .nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){#bootstrap-theme .nav-tabs-justified>li>a,#bootstrap-theme .nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}#bootstrap-theme .nav-tabs-justified>.active>a,#bootstrap-theme .nav-tabs.nav-justified>.active>a,#bootstrap-theme .nav-tabs-justified>.active>a:hover,#bootstrap-theme .nav-tabs.nav-justified>.active>a:hover,#bootstrap-theme .nav-tabs-justified>.active>a:focus,#bootstrap-theme .nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}#bootstrap-theme .tab-content>.tab-pane{display:none}#bootstrap-theme .tab-content>.active{display:block}#bootstrap-theme .nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}#bootstrap-theme .navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}#bootstrap-theme .navbar:before,#bootstrap-theme .navbar:after{display:table;content:" "}#bootstrap-theme .navbar:after{clear:both}@media (min-width:768px){#bootstrap-theme .navbar{border-radius:4px}}#bootstrap-theme .navbar-header:before,#bootstrap-theme .navbar-header:after{display:table;content:" "}#bootstrap-theme .navbar-header:after{clear:both}@media (min-width:768px){#bootstrap-theme .navbar-header{float:left}}#bootstrap-theme .navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,.1);-webkit-overflow-scrolling:touch}#bootstrap-theme .navbar-collapse:before,#bootstrap-theme .navbar-collapse:after{display:table;content:" "}#bootstrap-theme .navbar-collapse:after{clear:both}#bootstrap-theme .navbar-collapse.in{overflow-y:auto}@media (min-width:768px){#bootstrap-theme .navbar-collapse{width:auto;border-top:0;box-shadow:none}#bootstrap-theme .navbar-collapse.collapse{display:block !important;height:auto !important;padding-bottom:0;overflow:visible !important}#bootstrap-theme .navbar-collapse.in{overflow-y:visible}.navbar-fixed-top #bootstrap-theme .navbar-collapse,.navbar-static-top #bootstrap-theme .navbar-collapse,.navbar-fixed-bottom #bootstrap-theme .navbar-collapse{padding-right:0;padding-left:0}}#bootstrap-theme .navbar-fixed-top,#bootstrap-theme .navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}#bootstrap-theme .navbar-fixed-top .navbar-collapse,#bootstrap-theme .navbar-fixed-bottom .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){#bootstrap-theme .navbar-fixed-top .navbar-collapse,#bootstrap-theme .navbar-fixed-bottom .navbar-collapse{max-height:200px}}@media (min-width:768px){#bootstrap-theme .navbar-fixed-top,#bootstrap-theme .navbar-fixed-bottom{border-radius:0}}#bootstrap-theme .navbar-fixed-top{top:0;border-width:0 0 1px}#bootstrap-theme .navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}#bootstrap-theme .container>.navbar-header,#bootstrap-theme .container>.navbar-collapse,#bootstrap-theme .container-fluid>.navbar-header,#bootstrap-theme .container-fluid>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media (min-width:768px){#bootstrap-theme .container>.navbar-header,#bootstrap-theme .container>.navbar-collapse,#bootstrap-theme .container-fluid>.navbar-header,#bootstrap-theme .container-fluid>.navbar-collapse{margin-right:0;margin-left:0}}#bootstrap-theme .navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){#bootstrap-theme .navbar-static-top{border-radius:0}}#bootstrap-theme .navbar-brand{float:left;height:50px;padding:15px;font-size:18px;line-height:20px}#bootstrap-theme .navbar-brand:hover,#bootstrap-theme .navbar-brand:focus{text-decoration:none}#bootstrap-theme .navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container #bootstrap-theme .navbar-brand,.navbar>.container-fluid #bootstrap-theme .navbar-brand{margin-left:-15px}}#bootstrap-theme .navbar-toggle{position:relative;float:right;padding:9px 10px;margin-right:15px;margin-top:8px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}#bootstrap-theme .navbar-toggle:focus{outline:0}#bootstrap-theme .navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}#bootstrap-theme .navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){#bootstrap-theme .navbar-toggle{display:none}}#bootstrap-theme .navbar-nav{margin:7.5px -15px}#bootstrap-theme .navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){#bootstrap-theme .navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}#bootstrap-theme .navbar-nav .open .dropdown-menu>li>a,#bootstrap-theme .navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}#bootstrap-theme .navbar-nav .open .dropdown-menu>li>a{line-height:20px}#bootstrap-theme .navbar-nav .open .dropdown-menu>li>a:hover,#bootstrap-theme .navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media (min-width:768px){#bootstrap-theme .navbar-nav{float:left;margin:0}#bootstrap-theme .navbar-nav>li{float:left}#bootstrap-theme .navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}#bootstrap-theme .navbar-form{padding:10px 15px;margin-right:-15px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);margin-top:10px;margin-bottom:10px}@media (min-width:768px){#bootstrap-theme .navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}#bootstrap-theme .navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}#bootstrap-theme .navbar-form .form-control-static{display:inline-block}#bootstrap-theme .navbar-form .input-group{display:inline-table;vertical-align:middle}#bootstrap-theme .navbar-form .input-group .input-group-addon,#bootstrap-theme .navbar-form .input-group .input-group-btn,#bootstrap-theme .navbar-form .input-group .form-control{width:auto}#bootstrap-theme .navbar-form .input-group>.form-control{width:100%}#bootstrap-theme .navbar-form .control-label{margin-bottom:0;vertical-align:middle}#bootstrap-theme .navbar-form .radio,#bootstrap-theme .navbar-form .checkbox{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}#bootstrap-theme .navbar-form .radio label,#bootstrap-theme .navbar-form .checkbox label{padding-left:0}#bootstrap-theme .navbar-form .radio input[type=radio],#bootstrap-theme .navbar-form .checkbox input[type=checkbox]{position:relative;margin-left:0}#bootstrap-theme .navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){#bootstrap-theme .navbar-form .form-group{margin-bottom:5px}#bootstrap-theme .navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){#bootstrap-theme .navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}#bootstrap-theme .navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}#bootstrap-theme .navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}#bootstrap-theme .navbar-btn{margin-top:10px;margin-bottom:10px}#bootstrap-theme .navbar-btn.btn-sm,#bootstrap-theme .btn-group-sm>.navbar-btn.btn{margin-top:10px;margin-bottom:10px}#bootstrap-theme .navbar-btn.btn-xs,#bootstrap-theme .btn-group-xs>.navbar-btn.btn{margin-top:14px;margin-bottom:14px}#bootstrap-theme .navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){#bootstrap-theme .navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){#bootstrap-theme .navbar-left{float:left !important}#bootstrap-theme .navbar-right{float:right !important;margin-right:-15px}#bootstrap-theme .navbar-right~.navbar-right{margin-right:0}}#bootstrap-theme .navbar-default{background-color:#000;border-color:#000}#bootstrap-theme .navbar-default .navbar-brand{color:#fff}#bootstrap-theme .navbar-default .navbar-brand:hover,#bootstrap-theme .navbar-default .navbar-brand:focus{color:#fff;background-color:none}#bootstrap-theme .navbar-default .navbar-text{color:#ddd}#bootstrap-theme .navbar-default .navbar-nav>li>a{color:#fff}#bootstrap-theme .navbar-default .navbar-nav>li>a:hover,#bootstrap-theme .navbar-default .navbar-nav>li>a:focus{color:#fff;background-color:#000}#bootstrap-theme .navbar-default .navbar-nav>.active>a,#bootstrap-theme .navbar-default .navbar-nav>.active>a:hover,#bootstrap-theme .navbar-default .navbar-nav>.active>a:focus{color:#fff;background-color:#000}#bootstrap-theme .navbar-default .navbar-nav>.disabled>a,#bootstrap-theme .navbar-default .navbar-nav>.disabled>a:hover,#bootstrap-theme .navbar-default .navbar-nav>.disabled>a:focus{color:#ddd;background-color:transparent}#bootstrap-theme .navbar-default .navbar-nav>.open>a,#bootstrap-theme .navbar-default .navbar-nav>.open>a:hover,#bootstrap-theme .navbar-default .navbar-nav>.open>a:focus{color:#fff;background-color:#000}@media (max-width:767px){#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#fff}#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:#000}#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>.active>a,#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#000}#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,#bootstrap-theme .navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ddd;background-color:transparent}}#bootstrap-theme .navbar-default .navbar-toggle{border-color:#000}#bootstrap-theme .navbar-default .navbar-toggle:hover,#bootstrap-theme .navbar-default .navbar-toggle:focus{background-color:#000}#bootstrap-theme .navbar-default .navbar-toggle .icon-bar{background-color:#fff}#bootstrap-theme .navbar-default .navbar-collapse,#bootstrap-theme .navbar-default .navbar-form{border-color:#000}#bootstrap-theme .navbar-default .navbar-link{color:#fff}#bootstrap-theme .navbar-default .navbar-link:hover{color:#fff}#bootstrap-theme .navbar-default .btn-link{color:#fff}#bootstrap-theme .navbar-default .btn-link:hover,#bootstrap-theme .navbar-default .btn-link:focus{color:#fff}#bootstrap-theme .navbar-default .btn-link[disabled]:hover,#bootstrap-theme .navbar-default .btn-link[disabled]:focus,fieldset[disabled] #bootstrap-theme .navbar-default .btn-link:hover,fieldset[disabled] #bootstrap-theme .navbar-default .btn-link:focus{color:#ddd}#bootstrap-theme .navbar-inverse{background-color:#cde8fe;border-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-brand{color:#fff}#bootstrap-theme .navbar-inverse .navbar-brand:hover,#bootstrap-theme .navbar-inverse .navbar-brand:focus{color:#fff;background-color:none}#bootstrap-theme .navbar-inverse .navbar-text{color:#fff}#bootstrap-theme .navbar-inverse .navbar-nav>li>a{color:#fff}#bootstrap-theme .navbar-inverse .navbar-nav>li>a:hover,#bootstrap-theme .navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-nav>.active>a,#bootstrap-theme .navbar-inverse .navbar-nav>.active>a:hover,#bootstrap-theme .navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-nav>.disabled>a,#bootstrap-theme .navbar-inverse .navbar-nav>.disabled>a:hover,#bootstrap-theme .navbar-inverse .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}#bootstrap-theme .navbar-inverse .navbar-nav>.open>a,#bootstrap-theme .navbar-inverse .navbar-nav>.open>a:hover,#bootstrap-theme .navbar-inverse .navbar-nav>.open>a:focus{color:#fff;background-color:#b4ddfe}@media (max-width:767px){#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#fff}#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,#bootstrap-theme .navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}#bootstrap-theme .navbar-inverse .navbar-toggle{border-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-toggle:hover,#bootstrap-theme .navbar-inverse .navbar-toggle:focus{background-color:#b4ddfe}#bootstrap-theme .navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}#bootstrap-theme .navbar-inverse .navbar-collapse,#bootstrap-theme .navbar-inverse .navbar-form{border-color:#aad8fd}#bootstrap-theme .navbar-inverse .navbar-link{color:#fff}#bootstrap-theme .navbar-inverse .navbar-link:hover{color:#fff}#bootstrap-theme .navbar-inverse .btn-link{color:#fff}#bootstrap-theme .navbar-inverse .btn-link:hover,#bootstrap-theme .navbar-inverse .btn-link:focus{color:#fff}#bootstrap-theme .navbar-inverse .btn-link[disabled]:hover,#bootstrap-theme .navbar-inverse .btn-link[disabled]:focus,fieldset[disabled] #bootstrap-theme .navbar-inverse .btn-link:hover,fieldset[disabled] #bootstrap-theme .navbar-inverse .btn-link:focus{color:#ccc}#bootstrap-theme .breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}#bootstrap-theme .breadcrumb>li{display:inline-block}#bootstrap-theme .breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/ "}#bootstrap-theme .breadcrumb>.active{color:#999}#bootstrap-theme .pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}#bootstrap-theme .pagination>li{display:inline}#bootstrap-theme .pagination>li>a,#bootstrap-theme .pagination>li>span{position:relative;float:left;padding:4px 8px;margin-left:-1px;line-height:1.428571429;color:#2786c2;text-decoration:none;background-color:#fff;border:1px solid #ddd}#bootstrap-theme .pagination>li>a:hover,#bootstrap-theme .pagination>li>a:focus,#bootstrap-theme .pagination>li>span:hover,#bootstrap-theme .pagination>li>span:focus{z-index:2;color:#1a5a82;background-color:#eee;border-color:#ddd}#bootstrap-theme .pagination>li:first-child>a,#bootstrap-theme .pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}#bootstrap-theme .pagination>li:last-child>a,#bootstrap-theme .pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}#bootstrap-theme .pagination>.active>a,#bootstrap-theme .pagination>.active>a:hover,#bootstrap-theme .pagination>.active>a:focus,#bootstrap-theme .pagination>.active>span,#bootstrap-theme .pagination>.active>span:hover,#bootstrap-theme .pagination>.active>span:focus{z-index:3;color:#999;cursor:default;background-color:#f5f5f5;border-color:#ddd}#bootstrap-theme .pagination>.disabled>span,#bootstrap-theme .pagination>.disabled>span:hover,#bootstrap-theme .pagination>.disabled>span:focus,#bootstrap-theme .pagination>.disabled>a,#bootstrap-theme .pagination>.disabled>a:hover,#bootstrap-theme .pagination>.disabled>a:focus{color:#999;cursor:not-allowed;background-color:#fff;border-color:#ddd}#bootstrap-theme .pagination-lg>li>a,#bootstrap-theme .pagination-lg>li>span{padding:14px 16px;font-size:18px;line-height:1.3333333}#bootstrap-theme .pagination-lg>li:first-child>a,#bootstrap-theme .pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}#bootstrap-theme .pagination-lg>li:last-child>a,#bootstrap-theme .pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}#bootstrap-theme .pagination-sm>li>a,#bootstrap-theme .pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}#bootstrap-theme .pagination-sm>li:first-child>a,#bootstrap-theme .pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}#bootstrap-theme .pagination-sm>li:last-child>a,#bootstrap-theme .pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}#bootstrap-theme .pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}#bootstrap-theme .pager:before,#bootstrap-theme .pager:after{display:table;content:" "}#bootstrap-theme .pager:after{clear:both}#bootstrap-theme .pager li{display:inline}#bootstrap-theme .pager li>a,#bootstrap-theme .pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}#bootstrap-theme .pager li>a:hover,#bootstrap-theme .pager li>a:focus{text-decoration:none;background-color:#eee}#bootstrap-theme .pager .next>a,#bootstrap-theme .pager .next>span{float:right}#bootstrap-theme .pager .previous>a,#bootstrap-theme .pager .previous>span{float:left}#bootstrap-theme .pager .disabled>a,#bootstrap-theme .pager .disabled>a:hover,#bootstrap-theme .pager .disabled>a:focus,#bootstrap-theme .pager .disabled>span{color:#999;cursor:not-allowed;background-color:#fff}#bootstrap-theme .label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}#bootstrap-theme .label:empty{display:none}.btn #bootstrap-theme .label{position:relative;top:-1px}#bootstrap-theme a.label:hover,#bootstrap-theme a.label:focus{color:#fff;text-decoration:none;cursor:pointer}#bootstrap-theme .label-default{background-color:#999}#bootstrap-theme .label-default[href]:hover,#bootstrap-theme .label-default[href]:focus{background-color:gray}#bootstrap-theme .label-primary{background-color:#000}#bootstrap-theme .label-primary[href]:hover,#bootstrap-theme .label-primary[href]:focus{background-color:#000}#bootstrap-theme .label-success{background-color:#73a839}#bootstrap-theme .label-success[href]:hover,#bootstrap-theme .label-success[href]:focus{background-color:#59822c}#bootstrap-theme .label-info{background-color:#cde8fe}#bootstrap-theme .label-info[href]:hover,#bootstrap-theme .label-info[href]:focus{background-color:#9bd1fd}#bootstrap-theme .label-warning{background-color:#dd5600}#bootstrap-theme .label-warning[href]:hover,#bootstrap-theme .label-warning[href]:focus{background-color:#aa4200}#bootstrap-theme .label-danger{background-color:#c71c22}#bootstrap-theme .label-danger[href]:hover,#bootstrap-theme .label-danger[href]:focus{background-color:#9a161a}#bootstrap-theme .badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#000;border-radius:10px}#bootstrap-theme .badge:empty{display:none}.btn #bootstrap-theme .badge{position:relative;top:-1px}.btn-xs #bootstrap-theme .badge,#bootstrap-theme .btn-group-xs>.btn #bootstrap-theme .badge,.btn-group-xs>.btn #bootstrap-theme .badge{top:0;padding:1px 5px}.list-group-item.active>#bootstrap-theme .badge,.nav-pills>.active>a>#bootstrap-theme .badge{color:#2786c2;background-color:#fff}.list-group-item>#bootstrap-theme .badge{float:right}.list-group-item>#bootstrap-theme .badge+#bootstrap-theme .badge{margin-right:5px}.nav-pills>li>a>#bootstrap-theme .badge{margin-left:3px}#bootstrap-theme a.badge:hover,#bootstrap-theme a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}#bootstrap-theme .jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}#bootstrap-theme .jumbotron h1,#bootstrap-theme .jumbotron .h1{color:inherit}#bootstrap-theme .jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}#bootstrap-theme .jumbotron>hr{border-top-color:#d5d5d5}.container #bootstrap-theme .jumbotron,.container-fluid #bootstrap-theme .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}#bootstrap-theme .jumbotron .container{max-width:100%}@media screen and (min-width:768px){#bootstrap-theme .jumbotron{padding-top:48px;padding-bottom:48px}.container #bootstrap-theme .jumbotron,.container-fluid #bootstrap-theme .jumbotron{padding-right:60px;padding-left:60px}#bootstrap-theme .jumbotron h1,#bootstrap-theme .jumbotron .h1{font-size:63px}}#bootstrap-theme .thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}#bootstrap-theme .thumbnail>img,#bootstrap-theme .thumbnail a>img{display:block;max-width:100%;height:auto;margin-right:auto;margin-left:auto}#bootstrap-theme .thumbnail .caption{padding:9px;color:#555}#bootstrap-theme a.thumbnail:hover,#bootstrap-theme a.thumbnail:focus,#bootstrap-theme a.thumbnail.active{border-color:#2786c2}#bootstrap-theme .alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}#bootstrap-theme .alert h4{margin-top:0;color:inherit}#bootstrap-theme .alert .alert-link{font-weight:700}#bootstrap-theme .alert>p,#bootstrap-theme .alert>ul{margin-bottom:0}#bootstrap-theme .alert>p+p{margin-top:5px}#bootstrap-theme .alert-dismissable,#bootstrap-theme .alert-dismissible{padding-right:35px}#bootstrap-theme .alert-dismissable .close,#bootstrap-theme .alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}#bootstrap-theme .alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}#bootstrap-theme .alert-success hr{border-top-color:#c9e2b3}#bootstrap-theme .alert-success .alert-link{color:#356635}#bootstrap-theme .alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}#bootstrap-theme .alert-info hr{border-top-color:#a6e1ec}#bootstrap-theme .alert-info .alert-link{color:#2d6987}#bootstrap-theme .alert-warning{color:#c09853;background-color:#fcf8e3;border-color:#fbeed5}#bootstrap-theme .alert-warning hr{border-top-color:#f8e5be}#bootstrap-theme .alert-warning .alert-link{color:#a47e3c}#bootstrap-theme .alert-danger{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}#bootstrap-theme .alert-danger hr{border-top-color:#e6c1c7}#bootstrap-theme .alert-danger .alert-link{color:#953b39}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}#bootstrap-theme .progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}#bootstrap-theme .progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#000;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}#bootstrap-theme .progress-striped .progress-bar,#bootstrap-theme .progress-bar-striped{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:40px 40px}#bootstrap-theme .progress.active .progress-bar,#bootstrap-theme .progress-bar.active{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}#bootstrap-theme .progress-bar-success{background-color:#73a839}.progress-striped #bootstrap-theme .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}#bootstrap-theme .progress-bar-info{background-color:#cde8fe}.progress-striped #bootstrap-theme .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}#bootstrap-theme .progress-bar-warning{background-color:#dd5600}.progress-striped #bootstrap-theme .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}#bootstrap-theme .progress-bar-danger{background-color:#c71c22}.progress-striped #bootstrap-theme .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}#bootstrap-theme .media{margin-top:15px}#bootstrap-theme .media:first-child{margin-top:0}#bootstrap-theme .media,#bootstrap-theme .media-body{overflow:hidden;zoom:1}#bootstrap-theme .media-body{width:10000px}#bootstrap-theme .media-object{display:block}#bootstrap-theme .media-object.img-thumbnail{max-width:none}#bootstrap-theme .media-right,#bootstrap-theme .media>.pull-right{padding-left:10px}#bootstrap-theme .media-left,#bootstrap-theme .media>.pull-left{padding-right:10px}#bootstrap-theme .media-left,#bootstrap-theme .media-right,#bootstrap-theme .media-body{display:table-cell;vertical-align:top}#bootstrap-theme .media-middle{vertical-align:middle}#bootstrap-theme .media-bottom{vertical-align:bottom}#bootstrap-theme .media-heading{margin-top:0;margin-bottom:5px}#bootstrap-theme .media-list{padding-left:0;list-style:none}#bootstrap-theme .list-group{padding-left:0;margin-bottom:20px}#bootstrap-theme .list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}#bootstrap-theme .list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}#bootstrap-theme .list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}#bootstrap-theme .list-group-item.disabled,#bootstrap-theme .list-group-item.disabled:hover,#bootstrap-theme .list-group-item.disabled:focus{color:#999;cursor:not-allowed;background-color:#eee}#bootstrap-theme .list-group-item.disabled .list-group-item-heading,#bootstrap-theme .list-group-item.disabled:hover .list-group-item-heading,#bootstrap-theme .list-group-item.disabled:focus .list-group-item-heading{color:inherit}#bootstrap-theme .list-group-item.disabled .list-group-item-text,#bootstrap-theme .list-group-item.disabled:hover .list-group-item-text,#bootstrap-theme .list-group-item.disabled:focus .list-group-item-text{color:#999}#bootstrap-theme .list-group-item.active,#bootstrap-theme .list-group-item.active:hover,#bootstrap-theme .list-group-item.active:focus{z-index:2;color:#fff;background-color:#000;border-color:#000}#bootstrap-theme .list-group-item.active .list-group-item-heading,#bootstrap-theme .list-group-item.active .list-group-item-heading>small,#bootstrap-theme .list-group-item.active .list-group-item-heading>.small,#bootstrap-theme .list-group-item.active:hover .list-group-item-heading,#bootstrap-theme .list-group-item.active:hover .list-group-item-heading>small,#bootstrap-theme .list-group-item.active:hover .list-group-item-heading>.small,#bootstrap-theme .list-group-item.active:focus .list-group-item-heading,#bootstrap-theme .list-group-item.active:focus .list-group-item-heading>small,#bootstrap-theme .list-group-item.active:focus .list-group-item-heading>.small{color:inherit}#bootstrap-theme .list-group-item.active .list-group-item-text,#bootstrap-theme .list-group-item.active:hover .list-group-item-text,#bootstrap-theme .list-group-item.active:focus .list-group-item-text{color:#666}#bootstrap-theme a.list-group-item,#bootstrap-theme button.list-group-item{color:#555}#bootstrap-theme a.list-group-item .list-group-item-heading,#bootstrap-theme button.list-group-item .list-group-item-heading{color:#333}#bootstrap-theme a.list-group-item:hover,#bootstrap-theme a.list-group-item:focus,#bootstrap-theme button.list-group-item:hover,#bootstrap-theme button.list-group-item:focus{color:#555;text-decoration:none;background-color:#f5f5f5}#bootstrap-theme button.list-group-item{width:100%;text-align:left}#bootstrap-theme .list-group-item-success{color:#468847;background-color:#dff0d8}#bootstrap-theme a.list-group-item-success,#bootstrap-theme button.list-group-item-success{color:#468847}#bootstrap-theme a.list-group-item-success .list-group-item-heading,#bootstrap-theme button.list-group-item-success .list-group-item-heading{color:inherit}#bootstrap-theme a.list-group-item-success:hover,#bootstrap-theme a.list-group-item-success:focus,#bootstrap-theme button.list-group-item-success:hover,#bootstrap-theme button.list-group-item-success:focus{color:#468847;background-color:#d0e9c6}#bootstrap-theme a.list-group-item-success.active,#bootstrap-theme a.list-group-item-success.active:hover,#bootstrap-theme a.list-group-item-success.active:focus,#bootstrap-theme button.list-group-item-success.active,#bootstrap-theme button.list-group-item-success.active:hover,#bootstrap-theme button.list-group-item-success.active:focus{color:#fff;background-color:#468847;border-color:#468847}#bootstrap-theme .list-group-item-info{color:#3a87ad;background-color:#d9edf7}#bootstrap-theme a.list-group-item-info,#bootstrap-theme button.list-group-item-info{color:#3a87ad}#bootstrap-theme a.list-group-item-info .list-group-item-heading,#bootstrap-theme button.list-group-item-info .list-group-item-heading{color:inherit}#bootstrap-theme a.list-group-item-info:hover,#bootstrap-theme a.list-group-item-info:focus,#bootstrap-theme button.list-group-item-info:hover,#bootstrap-theme button.list-group-item-info:focus{color:#3a87ad;background-color:#c4e3f3}#bootstrap-theme a.list-group-item-info.active,#bootstrap-theme a.list-group-item-info.active:hover,#bootstrap-theme a.list-group-item-info.active:focus,#bootstrap-theme button.list-group-item-info.active,#bootstrap-theme button.list-group-item-info.active:hover,#bootstrap-theme button.list-group-item-info.active:focus{color:#fff;background-color:#3a87ad;border-color:#3a87ad}#bootstrap-theme .list-group-item-warning{color:#c09853;background-color:#fcf8e3}#bootstrap-theme a.list-group-item-warning,#bootstrap-theme button.list-group-item-warning{color:#c09853}#bootstrap-theme a.list-group-item-warning .list-group-item-heading,#bootstrap-theme button.list-group-item-warning .list-group-item-heading{color:inherit}#bootstrap-theme a.list-group-item-warning:hover,#bootstrap-theme a.list-group-item-warning:focus,#bootstrap-theme button.list-group-item-warning:hover,#bootstrap-theme button.list-group-item-warning:focus{color:#c09853;background-color:#faf2cc}#bootstrap-theme a.list-group-item-warning.active,#bootstrap-theme a.list-group-item-warning.active:hover,#bootstrap-theme a.list-group-item-warning.active:focus,#bootstrap-theme button.list-group-item-warning.active,#bootstrap-theme button.list-group-item-warning.active:hover,#bootstrap-theme button.list-group-item-warning.active:focus{color:#fff;background-color:#c09853;border-color:#c09853}#bootstrap-theme .list-group-item-danger{color:#b94a48;background-color:#f2dede}#bootstrap-theme a.list-group-item-danger,#bootstrap-theme button.list-group-item-danger{color:#b94a48}#bootstrap-theme a.list-group-item-danger .list-group-item-heading,#bootstrap-theme button.list-group-item-danger .list-group-item-heading{color:inherit}#bootstrap-theme a.list-group-item-danger:hover,#bootstrap-theme a.list-group-item-danger:focus,#bootstrap-theme button.list-group-item-danger:hover,#bootstrap-theme button.list-group-item-danger:focus{color:#b94a48;background-color:#ebcccc}#bootstrap-theme a.list-group-item-danger.active,#bootstrap-theme a.list-group-item-danger.active:hover,#bootstrap-theme a.list-group-item-danger.active:focus,#bootstrap-theme button.list-group-item-danger.active,#bootstrap-theme button.list-group-item-danger.active:hover,#bootstrap-theme button.list-group-item-danger.active:focus{color:#fff;background-color:#b94a48;border-color:#b94a48}#bootstrap-theme .list-group-item-heading{margin-top:0;margin-bottom:5px}#bootstrap-theme .list-group-item-text{margin-bottom:0;line-height:1.3}#bootstrap-theme .panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}#bootstrap-theme .panel-body{padding:15px}#bootstrap-theme .panel-body:before,#bootstrap-theme .panel-body:after{display:table;content:" "}#bootstrap-theme .panel-body:after{clear:both}#bootstrap-theme .panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}#bootstrap-theme .panel-heading>.dropdown .dropdown-toggle{color:inherit}#bootstrap-theme .panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}#bootstrap-theme .panel-title>a,#bootstrap-theme .panel-title>small,#bootstrap-theme .panel-title>.small,#bootstrap-theme .panel-title>small>a,#bootstrap-theme .panel-title>.small>a{color:inherit}#bootstrap-theme .panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}#bootstrap-theme .panel>.list-group,#bootstrap-theme .panel>.panel-collapse>.list-group{margin-bottom:0}#bootstrap-theme .panel>.list-group .list-group-item,#bootstrap-theme .panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}#bootstrap-theme .panel>.list-group:first-child .list-group-item:first-child,#bootstrap-theme .panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}#bootstrap-theme .panel>.list-group:last-child .list-group-item:last-child,#bootstrap-theme .panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}#bootstrap-theme .panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}#bootstrap-theme .panel-heading+.list-group .list-group-item:first-child{border-top-width:0}#bootstrap-theme .list-group+.panel-footer{border-top-width:0}#bootstrap-theme .panel>.table,#bootstrap-theme .panel>.table-responsive>.table,#bootstrap-theme .panel>.panel-collapse>.table{margin-bottom:0}#bootstrap-theme .panel>.table caption,#bootstrap-theme .panel>.table-responsive>.table caption,#bootstrap-theme .panel>.panel-collapse>.table caption{padding-right:15px;padding-left:15px}#bootstrap-theme .panel>.table:first-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}#bootstrap-theme .panel>.table:first-child>thead:first-child>tr:first-child,#bootstrap-theme .panel>.table:first-child>tbody:first-child>tr:first-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}#bootstrap-theme .panel>.table:first-child>thead:first-child>tr:first-child td:first-child,#bootstrap-theme .panel>.table:first-child>thead:first-child>tr:first-child th:first-child,#bootstrap-theme .panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,#bootstrap-theme .panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child{border-top-left-radius:3px}#bootstrap-theme .panel>.table:first-child>thead:first-child>tr:first-child td:last-child,#bootstrap-theme .panel>.table:first-child>thead:first-child>tr:first-child th:last-child,#bootstrap-theme .panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,#bootstrap-theme .panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,#bootstrap-theme .panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child{border-top-right-radius:3px}#bootstrap-theme .panel>.table:last-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}#bootstrap-theme .panel>.table:last-child>tbody:last-child>tr:last-child,#bootstrap-theme .panel>.table:last-child>tfoot:last-child>tr:last-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}#bootstrap-theme .panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,#bootstrap-theme .panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,#bootstrap-theme .panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,#bootstrap-theme .panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}#bootstrap-theme .panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,#bootstrap-theme .panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,#bootstrap-theme .panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,#bootstrap-theme .panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,#bootstrap-theme .panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}#bootstrap-theme .panel>.panel-body+.table,#bootstrap-theme .panel>.panel-body+.table-responsive,#bootstrap-theme .panel>.table+.panel-body,#bootstrap-theme .panel>.table-responsive+.panel-body{border-top:1px solid #ddd}#bootstrap-theme .panel>.table>tbody:first-child>tr:first-child th,#bootstrap-theme .panel>.table>tbody:first-child>tr:first-child td{border-top:0}#bootstrap-theme .panel>.table-bordered,#bootstrap-theme .panel>.table-responsive>.table-bordered{border:0}#bootstrap-theme .panel>.table-bordered>thead>tr>th:first-child,#bootstrap-theme .panel>.table-bordered>thead>tr>td:first-child,#bootstrap-theme .panel>.table-bordered>tbody>tr>th:first-child,#bootstrap-theme .panel>.table-bordered>tbody>tr>td:first-child,#bootstrap-theme .panel>.table-bordered>tfoot>tr>th:first-child,#bootstrap-theme .panel>.table-bordered>tfoot>tr>td:first-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>thead>tr>th:first-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>thead>tr>td:first-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}#bootstrap-theme .panel>.table-bordered>thead>tr>th:last-child,#bootstrap-theme .panel>.table-bordered>thead>tr>td:last-child,#bootstrap-theme .panel>.table-bordered>tbody>tr>th:last-child,#bootstrap-theme .panel>.table-bordered>tbody>tr>td:last-child,#bootstrap-theme .panel>.table-bordered>tfoot>tr>th:last-child,#bootstrap-theme .panel>.table-bordered>tfoot>tr>td:last-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>thead>tr>th:last-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>thead>tr>td:last-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,#bootstrap-theme .panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}#bootstrap-theme .panel>.table-bordered>thead>tr:first-child>td,#bootstrap-theme .panel>.table-bordered>thead>tr:first-child>th,#bootstrap-theme .panel>.table-bordered>tbody>tr:first-child>td,#bootstrap-theme .panel>.table-bordered>tbody>tr:first-child>th,#bootstrap-theme .panel>.table-responsive>.table-bordered>thead>tr:first-child>td,#bootstrap-theme .panel>.table-responsive>.table-bordered>thead>tr:first-child>th,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr:first-child>th{border-bottom:0}#bootstrap-theme .panel>.table-bordered>tbody>tr:last-child>td,#bootstrap-theme .panel>.table-bordered>tbody>tr:last-child>th,#bootstrap-theme .panel>.table-bordered>tfoot>tr:last-child>td,#bootstrap-theme .panel>.table-bordered>tfoot>tr:last-child>th,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,#bootstrap-theme .panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,#bootstrap-theme .panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,#bootstrap-theme .panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}#bootstrap-theme .panel>.table-responsive{margin-bottom:0;border:0}#bootstrap-theme .panel-group{margin-bottom:20px}#bootstrap-theme .panel-group .panel{margin-bottom:0;border-radius:4px}#bootstrap-theme .panel-group .panel+.panel{margin-top:5px}#bootstrap-theme .panel-group .panel-heading{border-bottom:0}#bootstrap-theme .panel-group .panel-heading+.panel-collapse>.panel-body,#bootstrap-theme .panel-group .panel-heading+.panel-collapse>.list-group{border-top:1px solid #ddd}#bootstrap-theme .panel-group .panel-footer{border-top:0}#bootstrap-theme .panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}#bootstrap-theme .panel-default{border-color:#ddd}#bootstrap-theme .panel-default>.panel-heading{color:#555;background-color:#f5f5f5;border-color:#ddd}#bootstrap-theme .panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}#bootstrap-theme .panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#555}#bootstrap-theme .panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}#bootstrap-theme .panel-primary{border-color:#ddd}#bootstrap-theme .panel-primary>.panel-heading{color:#fff;background-color:#000;border-color:#ddd}#bootstrap-theme .panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}#bootstrap-theme .panel-primary>.panel-heading .badge{color:#000;background-color:#fff}#bootstrap-theme .panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}#bootstrap-theme .panel-success{border-color:#ddd}#bootstrap-theme .panel-success>.panel-heading{color:#468847;background-color:#73a839;border-color:#ddd}#bootstrap-theme .panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}#bootstrap-theme .panel-success>.panel-heading .badge{color:#73a839;background-color:#468847}#bootstrap-theme .panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}#bootstrap-theme .panel-info{border-color:#ddd}#bootstrap-theme .panel-info>.panel-heading{color:#3a87ad;background-color:#cde8fe;border-color:#ddd}#bootstrap-theme .panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}#bootstrap-theme .panel-info>.panel-heading .badge{color:#cde8fe;background-color:#3a87ad}#bootstrap-theme .panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}#bootstrap-theme .panel-warning{border-color:#ddd}#bootstrap-theme .panel-warning>.panel-heading{color:#c09853;background-color:#dd5600;border-color:#ddd}#bootstrap-theme .panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}#bootstrap-theme .panel-warning>.panel-heading .badge{color:#dd5600;background-color:#c09853}#bootstrap-theme .panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}#bootstrap-theme .panel-danger{border-color:#ddd}#bootstrap-theme .panel-danger>.panel-heading{color:#b94a48;background-color:#c71c22;border-color:#ddd}#bootstrap-theme .panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}#bootstrap-theme .panel-danger>.panel-heading .badge{color:#c71c22;background-color:#b94a48}#bootstrap-theme .panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}#bootstrap-theme .embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}#bootstrap-theme .embed-responsive .embed-responsive-item,#bootstrap-theme .embed-responsive iframe,#bootstrap-theme .embed-responsive embed,#bootstrap-theme .embed-responsive object,#bootstrap-theme .embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}#bootstrap-theme .embed-responsive-16by9{padding-bottom:56.25%}#bootstrap-theme .embed-responsive-4by3{padding-bottom:75%}#bootstrap-theme .well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}#bootstrap-theme .well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}#bootstrap-theme .well-lg{padding:24px;border-radius:6px}#bootstrap-theme .well-sm{padding:9px;border-radius:3px}#bootstrap-theme .close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;-webkit-filter:alpha(opacity=20);filter:alpha(opacity=20);opacity:.2}#bootstrap-theme .close:hover,#bootstrap-theme .close:focus{color:#000;text-decoration:none;cursor:pointer;-webkit-filter:alpha(opacity=50);filter:alpha(opacity=50);opacity:.5}#bootstrap-theme button.close{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance:none;-moz-appearance:none;appearance:none}#bootstrap-theme .modal-open{overflow:hidden}#bootstrap-theme .modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}#bootstrap-theme .modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:-ms-transform .3s ease-out;transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out}#bootstrap-theme .modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}#bootstrap-theme .modal-open .modal{overflow-x:hidden;overflow-y:auto}#bootstrap-theme .modal-dialog{position:relative;width:auto;margin:10px}#bootstrap-theme .modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5);outline:0}#bootstrap-theme .modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}#bootstrap-theme .modal-backdrop.fade{-webkit-filter:alpha(opacity=0);filter:alpha(opacity=0);opacity:0}#bootstrap-theme .modal-backdrop.in{-webkit-filter:alpha(opacity=50);filter:alpha(opacity=50);opacity:.5}#bootstrap-theme .modal-header{padding:15px;border-bottom:1px solid #e5e5e5}#bootstrap-theme .modal-header:before,#bootstrap-theme .modal-header:after{display:table;content:" "}#bootstrap-theme .modal-header:after{clear:both}#bootstrap-theme .modal-header .close{margin-top:-2px}#bootstrap-theme .modal-title{margin:0;line-height:1.428571429}#bootstrap-theme .modal-body{position:relative;padding:20px}#bootstrap-theme .modal-footer{padding:20px;text-align:right;border-top:1px solid #e5e5e5}#bootstrap-theme .modal-footer:before,#bootstrap-theme .modal-footer:after{display:table;content:" "}#bootstrap-theme .modal-footer:after{clear:both}#bootstrap-theme .modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}#bootstrap-theme .modal-footer .btn-group .btn+.btn{margin-left:-1px}#bootstrap-theme .modal-footer .btn-block+.btn-block{margin-left:0}#bootstrap-theme .modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){#bootstrap-theme .modal-dialog{width:600px;margin:30px auto}#bootstrap-theme .modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}#bootstrap-theme .modal-sm{width:300px}}@media (min-width:992px){#bootstrap-theme .modal-lg{width:900px}}#bootstrap-theme .tooltip{position:absolute;z-index:1070;display:block;font-family:"Verdana","Helvetica Neue",Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1.428571429;line-break:auto;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;-ms-word-break:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;font-size:12px;-webkit-filter:alpha(opacity=0);filter:alpha(opacity=0);opacity:0}#bootstrap-theme .tooltip.in{-webkit-filter:alpha(opacity=90);filter:alpha(opacity=90);opacity:.9}#bootstrap-theme .tooltip.top{padding:5px 0;margin-top:-3px}#bootstrap-theme .tooltip.right{padding:0 5px;margin-left:3px}#bootstrap-theme .tooltip.bottom{padding:5px 0;margin-top:3px}#bootstrap-theme .tooltip.left{padding:0 5px;margin-left:-3px}#bootstrap-theme .tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}#bootstrap-theme .tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}#bootstrap-theme .tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}#bootstrap-theme .tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}#bootstrap-theme .tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}#bootstrap-theme .tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}#bootstrap-theme .tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}#bootstrap-theme .tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}#bootstrap-theme .tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}#bootstrap-theme .tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}#bootstrap-theme .popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Verdana","Helvetica Neue",Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1.428571429;line-break:auto;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;-ms-word-break:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;font-size:14px;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}#bootstrap-theme .popover.top{margin-top:-10px}#bootstrap-theme .popover.right{margin-left:10px}#bootstrap-theme .popover.bottom{margin-top:10px}#bootstrap-theme .popover.left{margin-left:-10px}#bootstrap-theme .popover>.arrow{border-width:11px}#bootstrap-theme .popover>.arrow,#bootstrap-theme .popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}#bootstrap-theme .popover>.arrow:after{content:"";border-width:10px}#bootstrap-theme .popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}#bootstrap-theme .popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}#bootstrap-theme .popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}#bootstrap-theme .popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}#bootstrap-theme .popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}#bootstrap-theme .popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}#bootstrap-theme .popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}#bootstrap-theme .popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}#bootstrap-theme .popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}#bootstrap-theme .popover-content{padding:9px 14px}#bootstrap-theme .carousel{position:relative}#bootstrap-theme .carousel-inner{position:relative;width:100%;overflow:hidden}#bootstrap-theme .carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}#bootstrap-theme .carousel-inner>.item>img,#bootstrap-theme .carousel-inner>.item>a>img{display:block;max-width:100%;height:auto;line-height:1}@media (transform-3d),(-webkit-transform-3d){#bootstrap-theme .carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-moz-transition:-moz-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:-ms-transform .6s ease-in-out;transition:-webkit-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;-moz-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;-moz-perspective:1000px;perspective:1000px}#bootstrap-theme .carousel-inner>.item.next,#bootstrap-theme .carousel-inner>.item.active.right{-webkit-transform:translate3d(100%,0,0);-ms-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0);left:0}#bootstrap-theme .carousel-inner>.item.prev,#bootstrap-theme .carousel-inner>.item.active.left{-webkit-transform:translate3d(-100%,0,0);-ms-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0);left:0}#bootstrap-theme .carousel-inner>.item.next.left,#bootstrap-theme .carousel-inner>.item.prev.right,#bootstrap-theme .carousel-inner>.item.active{-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0);left:0}}#bootstrap-theme .carousel-inner>.active,#bootstrap-theme .carousel-inner>.next,#bootstrap-theme .carousel-inner>.prev{display:block}#bootstrap-theme .carousel-inner>.active{left:0}#bootstrap-theme .carousel-inner>.next,#bootstrap-theme .carousel-inner>.prev{position:absolute;top:0;width:100%}#bootstrap-theme .carousel-inner>.next{left:100%}#bootstrap-theme .carousel-inner>.prev{left:-100%}#bootstrap-theme .carousel-inner>.next.left,#bootstrap-theme .carousel-inner>.prev.right{left:0}#bootstrap-theme .carousel-inner>.active.left{left:-100%}#bootstrap-theme .carousel-inner>.active.right{left:100%}#bootstrap-theme .carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:rgba(0,0,0,0);-webkit-filter:alpha(opacity=50);filter:alpha(opacity=50);opacity:.5}#bootstrap-theme .carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0%,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0%,rgba(0,0,0,.0001) 100%);background-image:linear-gradient(to right,rgba(0,0,0,.5) 0%,rgba(0,0,0,.0001) 100%);-webkit-filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#80000000",endColorstr="#00000000",GradientType=1);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#80000000",endColorstr="#00000000",GradientType=1);background-repeat:repeat-x}#bootstrap-theme .carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0%,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0%,rgba(0,0,0,.5) 100%);background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0%,rgba(0,0,0,.5) 100%);-webkit-filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#00000000",endColorstr="#80000000",GradientType=1);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr="#00000000",endColorstr="#80000000",GradientType=1);background-repeat:repeat-x}#bootstrap-theme .carousel-control:hover,#bootstrap-theme .carousel-control:focus{color:#fff;text-decoration:none;outline:0;-webkit-filter:alpha(opacity=90);filter:alpha(opacity=90);opacity:.9}#bootstrap-theme .carousel-control .icon-prev,#bootstrap-theme .carousel-control .icon-next,#bootstrap-theme .carousel-control .glyphicon-chevron-left,#bootstrap-theme .carousel-control .glyphicon-chevron-right{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}#bootstrap-theme .carousel-control .icon-prev,#bootstrap-theme .carousel-control .glyphicon-chevron-left{left:50%;margin-left:-10px}#bootstrap-theme .carousel-control .icon-next,#bootstrap-theme .carousel-control .glyphicon-chevron-right{right:50%;margin-right:-10px}#bootstrap-theme .carousel-control .icon-prev,#bootstrap-theme .carousel-control .icon-next{width:20px;height:20px;font-family:serif;line-height:1}#bootstrap-theme .carousel-control .icon-prev:before{content:"‹"}#bootstrap-theme .carousel-control .icon-next:before{content:"›"}#bootstrap-theme .carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}#bootstrap-theme .carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}#bootstrap-theme .carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}#bootstrap-theme .carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}#bootstrap-theme .carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){#bootstrap-theme .carousel-control .glyphicon-chevron-left,#bootstrap-theme .carousel-control .glyphicon-chevron-right,#bootstrap-theme .carousel-control .icon-prev,#bootstrap-theme .carousel-control .icon-next{width:30px;height:30px;margin-top:-10px;font-size:30px}#bootstrap-theme .carousel-control .glyphicon-chevron-left,#bootstrap-theme .carousel-control .icon-prev{margin-left:-10px}#bootstrap-theme .carousel-control .glyphicon-chevron-right,#bootstrap-theme .carousel-control .icon-next{margin-right:-10px}#bootstrap-theme .carousel-caption{right:20%;left:20%;padding-bottom:30px}#bootstrap-theme .carousel-indicators{bottom:20px}}#bootstrap-theme .clearfix:before,#bootstrap-theme .clearfix:after{display:table;content:" "}#bootstrap-theme .clearfix:after{clear:both}#bootstrap-theme .center-block{display:block;margin-right:auto;margin-left:auto}#bootstrap-theme .pull-right{float:right !important}#bootstrap-theme .pull-left{float:left !important}#bootstrap-theme .hide{display:none !important}#bootstrap-theme .show{display:block !important}#bootstrap-theme .invisible{visibility:hidden}#bootstrap-theme .text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}#bootstrap-theme .hidden{display:none !important}#bootstrap-theme .affix{position:fixed}@-ms-viewport{width:device-width}#bootstrap-theme .visible-sm{display:none !important}#bootstrap-theme .visible-md{display:none !important}#bootstrap-theme .visible-lg{display:none !important}#bootstrap-theme .visible-xs-block,#bootstrap-theme .visible-xs-inline,#bootstrap-theme .visible-xs-inline-block,#bootstrap-theme .visible-sm-block,#bootstrap-theme .visible-sm-inline,#bootstrap-theme .visible-sm-inline-block,#bootstrap-theme .visible-md-block,#bootstrap-theme .visible-md-inline,#bootstrap-theme .visible-md-inline-block,#bootstrap-theme .visible-lg-block,#bootstrap-theme .visible-lg-inline,#bootstrap-theme .visible-lg-inline-block{display:none !important}@media (max-width:767px){#bootstrap-theme .visible-xs{display:block !important}#bootstrap-theme table.visible-xs{display:table !important}#bootstrap-theme tr.visible-xs{display:table-row !important}#bootstrap-theme th.visible-xs,#bootstrap-theme td.visible-xs{display:table-cell !important}}@media (max-width:767px){#bootstrap-theme .visible-xs-block{display:block !important}}@media (max-width:767px){#bootstrap-theme .visible-xs-inline{display:inline !important}}@media (max-width:767px){#bootstrap-theme .visible-xs-inline-block{display:inline-block !important}}@media (min-width:768px) and (max-width:991px){#bootstrap-theme .visible-sm{display:block !important}#bootstrap-theme table.visible-sm{display:table !important}#bootstrap-theme tr.visible-sm{display:table-row !important}#bootstrap-theme th.visible-sm,#bootstrap-theme td.visible-sm{display:table-cell !important}}@media (min-width:768px) and (max-width:991px){#bootstrap-theme .visible-sm-block{display:block !important}}@media (min-width:768px) and (max-width:991px){#bootstrap-theme .visible-sm-inline{display:inline !important}}@media (min-width:768px) and (max-width:991px){#bootstrap-theme .visible-sm-inline-block{display:inline-block !important}}@media (min-width:992px) and (max-width:1199px){#bootstrap-theme .visible-md{display:block !important}#bootstrap-theme table.visible-md{display:table !important}#bootstrap-theme tr.visible-md{display:table-row !important}#bootstrap-theme th.visible-md,#bootstrap-theme td.visible-md{display:table-cell !important}}@media (min-width:992px) and (max-width:1199px){#bootstrap-theme .visible-md-block{display:block !important}}@media (min-width:992px) and (max-width:1199px){#bootstrap-theme .visible-md-inline{display:inline !important}}@media (min-width:992px) and (max-width:1199px){#bootstrap-theme .visible-md-inline-block{display:inline-block !important}}@media (min-width:1200px){#bootstrap-theme .visible-lg{display:block !important}#bootstrap-theme table.visible-lg{display:table !important}#bootstrap-theme tr.visible-lg{display:table-row !important}#bootstrap-theme th.visible-lg,#bootstrap-theme td.visible-lg{display:table-cell !important}}@media (min-width:1200px){#bootstrap-theme .visible-lg-block{display:block !important}}@media (min-width:1200px){#bootstrap-theme .visible-lg-inline{display:inline !important}}@media (min-width:1200px){#bootstrap-theme .visible-lg-inline-block{display:inline-block !important}}@media (max-width:767px){#bootstrap-theme .hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){#bootstrap-theme .hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){#bootstrap-theme .hidden-md{display:none !important}}@media (min-width:1200px){#bootstrap-theme .hidden-lg{display:none !important}}#bootstrap-theme .visible-print{display:none !important}@media print{#bootstrap-theme .visible-print{display:block !important}#bootstrap-theme table.visible-print{display:table !important}#bootstrap-theme tr.visible-print{display:table-row !important}#bootstrap-theme th.visible-print,#bootstrap-theme td.visible-print{display:table-cell !important}}#bootstrap-theme .visible-print-block{display:none !important}@media print{#bootstrap-theme .visible-print-block{display:block !important}}#bootstrap-theme .visible-print-inline{display:none !important}@media print{#bootstrap-theme .visible-print-inline{display:inline !important}}#bootstrap-theme .visible-print-inline-block{display:none !important}@media print{#bootstrap-theme .visible-print-inline-block{display:inline-block !important}}@media print{#bootstrap-theme .hidden-print{display:none !important}}#bootstrap-theme ul,#bootstrap-theme ol{margin-left:0;margin-right:0}#bootstrap-theme .form-control.checkbox-inline>label{margin-left:9px}#bootstrap-theme label input[type=checkbox]:not(:checked)+*{font-weight:400}#bootstrap-theme .select2-choices{margin-bottom:0}#bootstrap-theme input[type=search]::-webkit-search-cancel-button{-webkit-appearance:searchfield-cancel-button}#bootstrap-theme .select2-container .select2-choice>.select2-chosen{font-size:inherit;font-weight:400}#bootstrap-theme summary{display:list-item}#bootstrap-theme .form-control .select2-choice{border:0;border-radius:2px}#bootstrap-theme .form-control .select2-choice .select2-arrow{border-radius:0 2px 2px 0}#bootstrap-theme .form-control.select2-container{height:auto !important;padding:0}#bootstrap-theme .form-control.select2-container.select2-dropdown-open{border-color:#5897fb;border-radius:3px 3px 0 0}#bootstrap-theme .form-control .select2-container.select2-dropdown-open .select2-choices{border-radius:3px 3px 0 0}#bootstrap-theme .form-control.select2-container .select2-choices{border:0 !important;border-radius:3px}#bootstrap-theme .control-group.warning .select2-container .select2-choice,#bootstrap-theme .control-group.warning .select2-container .select2-choices,#bootstrap-theme .control-group.warning .select2-container-active .select2-choice,#bootstrap-theme .control-group.warning .select2-container-active .select2-choices,#bootstrap-theme .control-group.warning .select2-dropdown-open.select2-drop-above .select2-choice,#bootstrap-theme .control-group.warning .select2-dropdown-open.select2-drop-above .select2-choices,#bootstrap-theme .control-group.warning .select2-container-multi.select2-container-active .select2-choices{border:1px solid #c09853 !important}#bootstrap-theme .control-group.warning .select2-container .select2-choice div{border-left:1px solid #c09853 !important;background:#fcf8e3 !important}#bootstrap-theme .control-group.error .select2-container .select2-choice,#bootstrap-theme .control-group.error .select2-container .select2-choices,#bootstrap-theme .control-group.error .select2-container-active .select2-choice,#bootstrap-theme .control-group.error .select2-container-active .select2-choices,#bootstrap-theme .control-group.error .select2-dropdown-open.select2-drop-above .select2-choice,#bootstrap-theme .control-group.error .select2-dropdown-open.select2-drop-above .select2-choices,#bootstrap-theme .control-group.error .select2-container-multi.select2-container-active .select2-choices{border:1px solid #b94a48 !important}#bootstrap-theme .control-group.error .select2-container .select2-choice div{border-left:1px solid #b94a48 !important;background:#f2dede !important}#bootstrap-theme .control-group.info .select2-container .select2-choice,#bootstrap-theme .control-group.info .select2-container .select2-choices,#bootstrap-theme .control-group.info .select2-container-active .select2-choice,#bootstrap-theme .control-group.info .select2-container-active .select2-choices,#bootstrap-theme .control-group.info .select2-dropdown-open.select2-drop-above .select2-choice,#bootstrap-theme .control-group.info .select2-dropdown-open.select2-drop-above .select2-choices,#bootstrap-theme .control-group.info .select2-container-multi.select2-container-active .select2-choices{border:1px solid #3a87ad !important}#bootstrap-theme .control-group.info .select2-container .select2-choice div{border-left:1px solid #3a87ad !important;background:#d9edf7 !important}#bootstrap-theme .control-group.success .select2-container .select2-choice,#bootstrap-theme .control-group.success .select2-container .select2-choices,#bootstrap-theme .control-group.success .select2-container-active .select2-choice,#bootstrap-theme .control-group.success .select2-container-active .select2-choices,#bootstrap-theme .control-group.success .select2-dropdown-open.select2-drop-above .select2-choice,#bootstrap-theme .control-group.success .select2-dropdown-open.select2-drop-above .select2-choices,#bootstrap-theme .control-group.success .select2-container-multi.select2-container-active .select2-choices{border:1px solid #468847 !important}#bootstrap-theme .control-group.success .select2-container .select2-choice div{border-left:1px solid #468847 !important;background:#dff0d8 !important}
\ No newline at end of file
diff --git a/www/modules/civicrm/ext/greenwich/info.xml b/www/modules/civicrm/ext/greenwich/info.xml
index 746676a0c..3e210a113 100644
--- a/www/modules/civicrm/ext/greenwich/info.xml
+++ b/www/modules/civicrm/ext/greenwich/info.xml
@@ -14,14 +14,14 @@
     <url desc="Support">http://civicrm.org</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>
   <develStage>stable</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <classloader>
     <psr0 prefix="CRM_" path="."/>
diff --git a/www/modules/civicrm/ext/greenwich/scss/_greenwich.scss b/www/modules/civicrm/ext/greenwich/scss/_greenwich.scss
index 8138ab206..203593276 100644
--- a/www/modules/civicrm/ext/greenwich/scss/_greenwich.scss
+++ b/www/modules/civicrm/ext/greenwich/scss/_greenwich.scss
@@ -159,7 +159,7 @@ $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-color: rgb(0, 0, 0);
 $btn-info-bg: $brand-info;
 $btn-info-border: $btn-info-bg;
 
diff --git a/www/modules/civicrm/ext/iatspayments/CRM/Core/Payment/Faps.php b/www/modules/civicrm/ext/iatspayments/CRM/Core/Payment/Faps.php
index d72b13c58..39c0f86a7 100644
--- a/www/modules/civicrm/ext/iatspayments/CRM/Core/Payment/Faps.php
+++ b/www/modules/civicrm/ext/iatspayments/CRM/Core/Payment/Faps.php
@@ -87,7 +87,7 @@ protected function getSettings($key = '') {
     static $settings = array();
     if (empty($settings)) {
       try {
-        $settings = civicrm_api3('Setting', 'getvalue', array('name' => 'iats_settings'));
+        $settings = CRM_Iats_Utils::getSettings();
         if (empty($settings['days'])) {
           $settings['days'] = array('-1');
         }
diff --git a/www/modules/civicrm/ext/iatspayments/CRM/Core/Payment/iATSService.php b/www/modules/civicrm/ext/iatspayments/CRM/Core/Payment/iATSService.php
index 95169d269..25e3fd60f 100644
--- a/www/modules/civicrm/ext/iatspayments/CRM/Core/Payment/iATSService.php
+++ b/www/modules/civicrm/ext/iatspayments/CRM/Core/Payment/iATSService.php
@@ -76,7 +76,7 @@ protected function getSettings($key = '') {
     static $settings = array();
     if (empty($settings)) {
       try {
-        $settings = civicrm_api3('Setting', 'getvalue', array('name' => 'iats_settings'));
+        $settings = CRM_Iats_Utils::getSettings();
         if (empty($settings['days'])) {
           $settings['days'] = array('-1');
         }
@@ -253,7 +253,7 @@ public function doPayment(&$params, $component = 'contribute') {
         }
         $receive_ts = empty($receive_date) ? time() : strtotime($receive_date);
         // If the admin setting is in force, ensure it's compatible.
-        if (max($allow_days) > 0) {
+        if (!empty($allow_days) && (max($allow_days) > 0)) {
           $receive_ts = CRM_Iats_Transaction::contributionrecur_next($receive_ts, $allow_days);
         }
         // convert to a reliable format
diff --git a/www/modules/civicrm/ext/iatspayments/CRM/Iats/Form/Settings.php b/www/modules/civicrm/ext/iatspayments/CRM/Iats/Form/Settings.php
deleted file mode 100644
index 2805404e6..000000000
--- a/www/modules/civicrm/ext/iatspayments/CRM/Iats/Form/Settings.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-use CRM_Iats_ExtensionUtil as E;
-
-/**
- * Form controller class
- *
- * @see https://wiki.civicrm.org/confluence/display/CRMDOC/QuickForm+Reference
- */
-class CRM_Iats_Form_Settings extends CRM_Core_Form {
-  public function buildQuickForm() {
-
-    // Add form elements.
-    $this->add(
-      'text',
-      'email_recurring_failure_report',
-      ts('Email Recurring Contribution failure reports to this Email address')
-    );
-    $this->add(
-      'email',
-      'bcc_email_recurring_failure_report',
-      ts('BCC Email Recurring Contribution failure reports to this Email address.')
-    );
-    $this->addRule('email_recurring_failure_report', ts('Email address is not a valid format.'), 'email');
-    $this->addRule('bcc_email_recurring_failure_report', ts('Email address is not a valid format.'), 'email');
-    $this->add(
-      'text',
-      'recurring_failure_threshhold',
-      ts('When failure count is equal to or greater than this number, push the next scheduled contribution date forward')
-    );
-    $this->addRule('recurring_failure_threshhold', ts('Threshhold must be a positive integer.'), 'integer');
-    $receipt_recurring_options =  array('0' => 'Never', '1' => 'Always', '2' => 'As set for a specific Contribution Series');
-    $this->add(
-      'select',
-      'receipt_recurring',
-      ts('Email receipt for a Contribution in a Recurring Series'),
-      $receipt_recurring_options
-    );
-    
-    $this->add(
-      'checkbox',
-      'email_failure_contribution_receipt',
-        ts('Email receipt for a Contribution if Recurring payment fails - with error message')
-    );
-
-    $this->add(
-      'checkbox',
-      'disable_cryptogram',
-      ts('Disable use of cryptogram (only applies to FirstAmerican).')
-    );
-    
-    $this->add(
-      'text',
-      'ach_category_text',
-      ts('ACH Category Text (only applies to FirstAmerican).')
-    );
-
-    $this->add(
-      'checkbox',
-      'no_edit_extra',
-      ts('Disable extra edit fields for Recurring Contributions')
-    );
-
-    $this->add(
-      'checkbox',
-      'enable_update_subscription_billing_info',
-      ts('Enable self-service updates to recurring contribution Contact Billing Info.')
-    );
-
-    $this->add(
-      'checkbox',
-      'enable_change_subscription_amount',
-      ts('Allow self-service updates to recurring contribution amount.')
-    );
-
-    $this->add(
-      'checkbox',
-      'enable_cancel_recurring',
-      ts('Enable self-service cancellation of a recurring contribution.')
-    );
-
-    /* These checkboxes are not yet implemented, ignore for now
-    $this->add(
-      'checkbox', // field type
-      'import_quick', // field name
-      ts('Import one-time/new iATS transactions into CiviCRM (e.g. "mobile").')
-    );
-
-    $this->add(
-      'checkbox', // field type
-      'import_recur', // field name
-      ts('Import recurring iATS transactions into CiviCRM for known series (e.g. "iATS managed recurring").')
-    );
-
-    $this->add(
-      'checkbox', // field type
-      'import_series', // field name
-      ts('Allow creation of new recurring series from iATS imports. (e.g. "mobile recurring")')
-    );
-    */
-    
-    $this->add(
-      'checkbox',
-      'enable_public_future_recurring_start',
-      ts('Enable public selection of future recurring start dates.')
-    );
-
-    $days = array('-1' => 'disabled');
-    for ($i = 1; $i <= 28; $i++) {
-      $days["$i"] = "$i";
-    }
-    $attr = array(
-      'size' => 29,
-      'style' => 'width:150px',
-      'required' => FALSE,
-    );
-    $day_select = $this->add(
-      'select',
-      'days',
-      ts('Restrict allowable days of the month for Recurring Contributions'),
-      $days,
-      FALSE,
-      $attr
-    );
-
-    $day_select->setMultiple(TRUE);
-    $day_select->setSize(29);
-    $this->addButtons(array(
-      array(
-        'type' => 'submit',
-        'name' => ts('Submit'),
-        'isDefault' => TRUE,
-      ),
-    ));
-
-    $result = Civi::settings()->get('iats_settings');
-    $defaults = (empty($result)) ? array() : $result;
-    if (empty($defaults['recurring_failure_threshhold'])) {
-      $defaults['recurring_failure_threshhold'] = 3;
-    }
-    if (empty($defaults['ach_category_text'])) {
-      $defaults['ach_category_text'] = FAPS_DEFAULT_ACH_CATEGORY_TEXT;
-    }
-    $this->setDefaults($defaults);
-
-    $this->addButtons(array(
-      array(
-        'type' => 'submit',
-        'name' => E::ts('Submit'),
-        'isDefault' => TRUE,
-      ),
-    ));
-
-    // export form elements
-    $this->assign('elementNames', $this->getRenderableElementNames());
-    parent::buildQuickForm();
-  }
-
-  public function postProcess() {
-    $values = $this->exportValues();
-    foreach (array('qfKey', '_qf_default', '_qf_Settings_submit', 'entryURL') as $key) {
-      if (isset($values[$key])) {
-        unset($values[$key]);
-      }
-    }
-    Civi::settings()->set('iats_settings', $values);
-    parent::postProcess();
-  }
-
-  /**
-   * Get the fields/elements defined in this form.
-   *
-   * @return array (string)
-   */
-  public function getRenderableElementNames() {
-    // The _elements list includes some items which should not be
-    // auto-rendered in the loop -- such as "qfKey" and "buttons".  These
-    // items don't have labels.  We'll identify renderable by filtering on
-    // the 'label'.
-    $elementNames = array();
-    foreach ($this->_elements as $element) {
-      /** @var HTML_QuickForm_Element $element */
-      $label = $element->getLabel();
-      if (!empty($label)) {
-        $elementNames[] = $element->getName();
-      }
-    }
-    return $elementNames;
-  }
-
-}
diff --git a/www/modules/civicrm/ext/iatspayments/CRM/Iats/Upgrader.php b/www/modules/civicrm/ext/iatspayments/CRM/Iats/Upgrader.php
index a23d9ea87..8ca729ff4 100644
--- a/www/modules/civicrm/ext/iatspayments/CRM/Iats/Upgrader.php
+++ b/www/modules/civicrm/ext/iatspayments/CRM/Iats/Upgrader.php
@@ -162,10 +162,10 @@ public function upgrade_1_7_001() {
   public function upgrade_1_7_002() {
     $this->ctx->log->info('Applying update 1_7_002');
     try {
-      $insert = 'INSERT INTO civicrm_payment_token (contact_id, payment_processor_id, token, ip_address, email) 
+      $insert = 'INSERT INTO civicrm_payment_token (contact_id, payment_processor_id, token, ip_address, email)
         SELECT cr.contact_id, cr.payment_processor_id, icc.customer_code, icc.ip, icc.email FROM civicrm_contribution_recur cr INNER JOIN civicrm_iats_customer_codes icc ON cr.id = icc.recur_id';
       $dao = CRM_Core_DAO::executeQuery($insert);
-      $update = 'UPDATE civicrm_contribution_recur cr INNER JOIN civicrm_iats_customer_codes icc ON cr.id = icc.recur_id 
+      $update = 'UPDATE civicrm_contribution_recur cr INNER JOIN civicrm_iats_customer_codes icc ON cr.id = icc.recur_id
         INNER JOIN civicrm_payment_token pt on pt.token = icc.customer_code SET cr.payment_token_id = pt.id';
       $dao = CRM_Core_DAO::executeQuery($update);
       $rename = 'RENAME TABLE `civicrm_iats_customer_codes` TO `backup_iats_customer_codes`';
@@ -202,6 +202,12 @@ public function upgrade_1_7_003() {
     return TRUE;
   }
 
+  public function upgrade_1_9_001() {
+    $this->ctx->log->info('Applying update 1_9_001 convert settings from an array into individual settings in CiviCRM');
+    CRM_Iats_Utils::migrateSettings();
+    return TRUE;
+  }
+
 
   /**
    * Example: Run an external SQL script
diff --git a/www/modules/civicrm/ext/iatspayments/CRM/Iats/Utils.php b/www/modules/civicrm/ext/iatspayments/CRM/Iats/Utils.php
new file mode 100644
index 000000000..79d5ea093
--- /dev/null
+++ b/www/modules/civicrm/ext/iatspayments/CRM/Iats/Utils.php
@@ -0,0 +1,56 @@
+<?php
+
+class CRM_Iats_Utils {
+
+  public static function getSettings(): array {
+    $settingValues = [];
+    $settings = ['email_recurring_failure_report', 'bcc_email_recurring_failure_report', 'receipt_recurring', 'recurring_failure_threshhold', 'email_failure_contribution_receipt', 'disable_cryptogram', 'ach_category_text', 'no_edit_extra', 'enable_update_subscription_billing_info', 'enable_change_subscription_amount', 'enable_cancel_recurring', 'enable_cancel_recurring', 'days'];
+    $hasNotbeenMigrated = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_setting WHERE name = 'iats_settings'");
+    if ($hasNotbeenMigrated) {
+      return Civi::settings()->get('iats_settings');
+    }
+    else {
+      foreach ($settings as $setting) {
+        $settingValue = Civi::settings()->get('iats_' . $setting);
+        if ($setting === 'days') {
+          // the days setting value is unpredictable, fix that here
+          // convert value to an array if it's a serialized string
+          if (is_string($settingValue)) {
+            // if setting value is empty or blank set it to be the "disabled" serialized array of [-1].
+            if (empty($settingValue) || trim($settingValue, CRM_Core_DAO::VALUE_SEPARATOR) === '') {
+              $settingValue = ['-1'];
+            }
+            else {
+              $settingValue = CRM_Core_DAO::unSerializeField($settingValue, CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND);
+            }
+          }
+          // in case we end up with something wacky, set it to the "disabled" option
+          if (empty($settingValue) || !is_array($settingValue)) {
+            $settingValue = ['-1'];
+          }
+        }
+        $settingValues[$setting] = $settingValue;
+      }
+    }
+    return $settingValues;
+  }
+
+
+  public static function migrateSettings(): void {
+    $settings = ['email_recurring_failure_report', 'bcc_email_recurring_failure_report', 'receipt_recurring', 'recurring_failure_threshhold', 'email_failure_contribution_receipt', 'disable_cryptogram', 'ach_category_text', 'no_edit_extra', 'enable_update_subscription_billing_info', 'enable_change_subscription_amount', 'enable_cancel_recurring', 'enable_cancel_recurring', 'days'];
+    $currentSettingsValues = Civi::settings()->get('iats_settings');
+    foreach ($settings as $setting) {
+      Civi::settings()->set('iats_' . $setting, $currentSettingsValues[$setting]);
+    }
+    CRM_Core_DAO::executeQuery("DELETE FROM civicrm_setting WHERE name = 'iats_settings'");
+  }
+
+  public static function settingDateOptions(): array {
+    $days = array('-1' => 'disabled');
+    for ($i = 1; $i <= 28; $i++) {
+      $days["$i"] = "$i";
+    }
+    return $days;
+  }
+
+}
diff --git a/www/modules/civicrm/ext/iatspayments/api/v3/Job/Fapsquery.php b/www/modules/civicrm/ext/iatspayments/api/v3/Job/Fapsquery.php
index adcfe6ab4..290605361 100644
--- a/www/modules/civicrm/ext/iatspayments/api/v3/Job/Fapsquery.php
+++ b/www/modules/civicrm/ext/iatspayments/api/v3/Job/Fapsquery.php
@@ -65,7 +65,7 @@ function civicrm_api3_job_fapsquery($params) {
   }
   // CRM_Core_Error::debug_var('Payment Processors', $payment_processors);
   // get the settings: TODO allow more detailed configuration of which transactions to import?
-  $iats_settings = Civi::settings()->get('iats_settings');
+  $iats_settings = CRM_Iats_Utils::getSettings();
   // I also use the settings to keep track of the last time I imported journal data from iATS/FAPS.
   $iats_faps_journal = Civi::settings()->get('iats_faps_journal');
   /* initialize some values so I can report at the end */
diff --git a/www/modules/civicrm/ext/iatspayments/api/v3/Job/Iatsrecurringcontributions.php b/www/modules/civicrm/ext/iatspayments/api/v3/Job/Iatsrecurringcontributions.php
index 5fb7c271d..a01bf84d0 100644
--- a/www/modules/civicrm/ext/iatspayments/api/v3/Job/Iatsrecurringcontributions.php
+++ b/www/modules/civicrm/ext/iatspayments/api/v3/Job/Iatsrecurringcontributions.php
@@ -129,7 +129,7 @@ function civicrm_api3_job_Iatsrecurringcontributions($params) {
     $output[] = "Failsafe Analysis: stale date $stale_date, limit $failsafe_limit, count ".$staleRecurringContributions['count'];
     $output[] = "Failsafe Decision: ". ($failsafeFlag ? 'Flagged': 'Clear');
   }
-  $settings = Civi::settings()->get('iats_settings');
+  $settings = CRM_Iats_Utils::getSettings();
   $receipt_recurring = $settings['receipt_recurring'] ?? null;
   $email_failure_report = empty($settings['email_recurring_failure_report']) ? '' : $settings['email_recurring_failure_report'];
   $email_failure_contribution_receipt = empty($settings['email_failure_contribution_receipt']) ? FALSE : TRUE;
diff --git a/www/modules/civicrm/ext/iatspayments/api/v3/Job/Iatsreport.php b/www/modules/civicrm/ext/iatspayments/api/v3/Job/Iatsreport.php
index 549d7530a..5cd0c9d80 100644
--- a/www/modules/civicrm/ext/iatspayments/api/v3/Job/Iatsreport.php
+++ b/www/modules/civicrm/ext/iatspayments/api/v3/Job/Iatsreport.php
@@ -65,7 +65,7 @@ function civicrm_api3_job_iatsreport($params) {
   }
   // CRM_Core_Error::debug_var('Payment Processors', $payment_processors);
   // get the settings: TODO allow more detailed configuration of which transactions to import?
-  $iats_settings = Civi::settings()->get('iats_settings');
+  $iats_settings = CRM_Iats_Utils::getSettings();
   // I also use the setttings to keep track of the last time I imported journal data from iATS.
   $iats_journal = Civi::settings()->get('iats_journal');
   foreach (array('quick', 'recur', 'series') as $setting) {
diff --git a/www/modules/civicrm/ext/iatspayments/api/v3/Job/Iatsverify.php b/www/modules/civicrm/ext/iatspayments/api/v3/Job/Iatsverify.php
index e648291c7..31f816d9f 100644
--- a/www/modules/civicrm/ext/iatspayments/api/v3/Job/Iatsverify.php
+++ b/www/modules/civicrm/ext/iatspayments/api/v3/Job/Iatsverify.php
@@ -68,7 +68,7 @@ function _civicrm_api3_job_iatsverify_spec(&$spec) {
  */
 function civicrm_api3_job_iatsverify($params) {
 
-  $settings = Civi::settings()->get('iats_settings');
+  $settings = CRM_Iats_Utils::getSettings();
   $receipt_recurring = $settings['receipt_recurring'] ?? null;
   define('IATS_VERIFY_DAYS', 30);
   // I've added an extra 2 days when getting candidates from CiviCRM to be sure i've got them all.
diff --git a/www/modules/civicrm/ext/iatspayments/iats.php b/www/modules/civicrm/ext/iatspayments/iats.php
index 0316e6cd1..6eab7c477 100644
--- a/www/modules/civicrm/ext/iatspayments/iats.php
+++ b/www/modules/civicrm/ext/iatspayments/iats.php
@@ -195,7 +195,7 @@ function iats_civicrm_navigationMenu(&$navMenu) {
     'settings_page' => array(
       'label'      => 'iATS Payments Settings',
       'name'       => 'iATS Payments Settings',
-      'url'        => 'civicrm/admin/contribute/iatssettings',
+      'url'        => 'civicrm/admin/setting/iats',
       'parent'    => array('Administer', 'CiviContribute'),
       'permission' => 'access CiviContribute,administer CiviCRM',
       'operator'   => 'AND',
@@ -233,9 +233,9 @@ function iats_civicrm_buildForm($formName, &$form) {
  * Modifications to a (public/frontend) contribution financial forms for iATS
  * procesors.
  * 1. enable public selection of future recurring contribution start date, but only if the form allows recurring!
- * 
+ *
  * We're only handling financial payment class forms here. Note that we can no
- * longer test for whether the page has/is recurring or not. 
+ * longer test for whether the page has/is recurring or not.
  * Special note - if a page offers recurring contributions and if
  * future recurring start dates are enabled with restrictions on which days,
  * then any one-time contribution will be forced to use those rules as well.
@@ -257,9 +257,12 @@ function iats_civicrm_buildForm_CRM_Financial_Form_Payment(&$form) {
   }
   // If future public start dates are enabled on a recurring-enabled page ...
   // Uses javascript to hide/reset unless they have recurring contributions checked.
-  $settings = Civi::settings()->get('iats_settings');
+  // 2023-11-08 updated how the payment processor object is found temporarily
+  //   update to use getter method in the future.
+  $settings = CRM_Iats_Utils::getSettings();
   if (!empty($settings['enable_public_future_recurring_start'])
-    && $form->_paymentObject->supports('FutureRecurStartDate')
+  //  && $form->getPaymentProcessorObject()->supports('FutureRecurStartDate') 
+    && $form->_paymentProcessor['object']->supports('FutureRecurStartDate')
   ) {
     $allow_days = empty($settings['days']) ? array('-1') : $settings['days'];
     $start_dates = CRM_Iats_Transaction::get_future_monthly_start_dates(time(), $allow_days);
@@ -284,6 +287,19 @@ function iats_civicrm_buildForm_CRM_Contribute_Form_Contribution_Main(&$form) {
   return iats_civicrm_buildForm_CRM_Financial_Form_Payment($form);
 }
 
+/**
+ * Implements hook_civicrm_buildForm for the CRM_Admin_Form_Generic form
+ *
+ * @var CRM_Admin_Form_Generic $form
+ */
+function iats_civicrm_buildForm_CRM_Admin_Form_Generic($form) {
+  if ($form->getSettingPageFIlter() === 'iats') {
+    $form->addRule('iats_email_recurring_failure_report', ts('Email address is not a valid format.'), 'email');
+    $form->addRule('iats_bcc_email_recurring_failure_report', ts('Email address is not a valid format.'), 'email');
+    $form->addRule('iats_recurring_failure_threshhold', ts('Threshhold must be a positive integer.'), 'integer');
+  }
+}
+
 /**
  *
  */
@@ -300,7 +316,7 @@ function iats_civicrm_pageRun(&$page) {
  * link to iATS CustomerLink display and editing pages.
  */
 function iats_civicrm_pageRun_CRM_Contribute_Page_ContributionRecur($page) {
-  // Get the corresponding (most recently created) iATS customer code record 
+  // Get the corresponding (most recently created) iATS customer code record
   // we'll also get the expiry date and last four digits (at least, our best information about that).
   $extra = array();
   $crid = CRM_Utils_Request::retrieve('id', 'Integer', $page, FALSE);
@@ -381,7 +397,7 @@ function iats_civicrm_pre($op, $objectName, $objectId, &$params) {
   if (('ContributionRecur' == $objectName) && ('create' == $op || 'edit' == $op) && !empty($params['payment_processor_id'])) {
     if ($type = _iats_civicrm_is_iats($params['payment_processor_id'])) {
       if (!empty($params['next_sched_contribution_date'])) {
-        $settings = Civi::settings()->get('iats_settings');
+        $settings = CRM_Iats_Utils::getSettings();
         $allow_days = empty($settings['days']) ? array('-1') : $settings['days'];
         // Force one of the fixed days, and set the cycle_day at the same time.
         if (0 < max($allow_days)) {
@@ -402,8 +418,8 @@ function iats_civicrm_pre($op, $objectName, $objectId, &$params) {
 
 function iats_get_setting($key = NULL) {
   static $settings;
-  if (empty($settings)) { 
-    $settings = Civi::settings()->get('iats_settings');
+  if (empty($settings)) {
+    $settings = CRM_Iats_Utils::getSettings();
   }
   return empty($key) ?  $settings : (isset($settings[$key]) ? $settings[$key] : '');
 }
@@ -497,7 +513,7 @@ function _iats_get_form_payment_processors($form) {
     $id = $form->_paymentProcessor['id'];
     return array($id => $form->_paymentProcessor);
   }
-  else { 
+  else {
     // Handle the legacy: event and contribution page forms
     if (empty($form->_paymentProcessors)) {
       if (empty($form->_paymentProcessorIDs)) {
@@ -609,14 +625,14 @@ function iats_civicrm_buildForm_CRM_Contribute_Form_UpdateSubscription(&$form) {
      && (0 !== strpos($payment_processor_type, 'Payment_Faps')) ){
     return;
   }
-  $settings = civicrm_api3('Setting', 'getvalue', array('name' => 'iats_settings'));
+  $settings = CRM_Iats_Utils::getSettings();
   // don't do this if the site administrator has disabled it.
   if (!empty($settings['no_edit_extra'])) {
     return;
   }
   $allow_days = empty($settings['days']) ? array('-1') : $settings['days'];
   if (0 < max($allow_days)) {
-    $userAlert = ts('Your next scheduled contribution date will automatically be updated to the next allowable day of the month: %1', 
+    $userAlert = ts('Your next scheduled contribution date will automatically be updated to the next allowable day of the month: %1',
       array(1 => implode(', ', $allow_days)));
     CRM_Core_Session::setStatus($userAlert, ts('Warning'), 'alert');
   }
@@ -649,7 +665,7 @@ function iats_civicrm_buildForm_CRM_Contribute_Form_UpdateSubscription(&$form) {
     'is_email_receipt' => 'Email receipt for each Contribution in this Recurring Series',
   );
   $dupe_fields = array();
-  // To be a good citizen, I check if core or another extension hasn't already added these fields 
+  // To be a good citizen, I check if core or another extension hasn't already added these fields
   // and don't add them again if they have.
   foreach (array_keys($edit_fields) as $fid) {
     if ($form->elementExists($fid)) {
diff --git a/www/modules/civicrm/ext/iatspayments/info.xml b/www/modules/civicrm/ext/iatspayments/info.xml
index 2e219693b..a7ef3268f 100644
--- a/www/modules/civicrm/ext/iatspayments/info.xml
+++ b/www/modules/civicrm/ext/iatspayments/info.xml
@@ -9,7 +9,7 @@
     <url desc="Support">https://github.com/iATSPayments/com.iatspayments.civicrm/issues?state=open</url>
     <url desc="Installation Instructions">https://github.com/iATSPayments/com.iatspayments.civicrm</url>
     <url desc="Documentation">https://github.com/iATSPayments/com.iatspayments.civicrm</url>
-    <url desc="Release Notes">https://github.com/iATSPayments/com.iatspayments.civicrm/blob/master/release-notes/1.8.0.md</url>
+    <url desc="Release Notes">https://github.com/iATSPayments/com.iatspayments.civicrm/blob/master/release-notes/1.9.0.md</url>
     <url desc="Getting Started">https://www.semper-it.com/civicamp-iats-payments-slides</url>
   </urls>
   <license>AGPL-3.0</license>
@@ -17,13 +17,13 @@
     <author>Alan Dixon</author>
     <email>iats@blackflysolutions.ca</email>
   </maintainer>
-  <releaseDate>2023-10-20</releaseDate>
-  <version>1.8.0</version>
+  <releaseDate>2024-05-23</releaseDate>
+  <version>1.9.2</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.63</ver>
   </compatibility>
-  <comments>A recommended 1.x maintenance release, see release notes above for details.</comments>
+  <comments>A recommended maintenance + bugfixes release, see release notes for 1.9.0 above for details.</comments>
   <civix>
     <namespace>CRM/Iats</namespace>
     <format>23.02.1</format>
@@ -32,6 +32,7 @@
     <mixin>menu-xml@1.0.0</mixin>
     <mixin>mgd-php@1.0.0</mixin>
     <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>setting-php@1.0.0</mixin>
   </mixins>
   <classloader>
     <psr0 prefix="CRM_" path="."/>
diff --git a/www/modules/civicrm/ext/iatspayments/release-notes/1.8.0.md b/www/modules/civicrm/ext/iatspayments/release-notes/1.8.0.md
index 4ecd89677..80a9c9a29 100644
--- a/www/modules/civicrm/ext/iatspayments/release-notes/1.8.0.md
+++ b/www/modules/civicrm/ext/iatspayments/release-notes/1.8.0.md
@@ -6,7 +6,7 @@ This release is a maintenance release for the 1.x series.
 
 It is recommended for all CiviCRM installs on 5.63+ and above. 
 
-Note that as of this release, we've started using sematic versioning.
+Note that as of this release, we've started using semantic versioning.
 
 This release covers 8 issues and improvements since Mar 2023.
 
diff --git a/www/modules/civicrm/ext/iatspayments/release-notes/1.9.0.md b/www/modules/civicrm/ext/iatspayments/release-notes/1.9.0.md
new file mode 100644
index 000000000..6ffe026c0
--- /dev/null
+++ b/www/modules/civicrm/ext/iatspayments/release-notes/1.9.0.md
@@ -0,0 +1,15 @@
+# iATS CiviCRM Extension 1.9.0
+
+May 16, 2024
+
+This release is a maintenance release for the 1.x series. 
+
+It is recommended for all CiviCRM installs on 5.63+ and above. 
+
+Note that as of this release, we've started using semantic versioning.
+
+This release covers 3 issues and improvements since Oct 2023.
+
+1. convert use of _paymentObject in buildForm hook (issue 438, thanks to Eileen)
+2. Convert IATS Settings to be standard practice (thanks Seamus and Karin)
+3. Fix for Smarty 3+4 (thanks Armin Kathrein)
diff --git a/www/modules/civicrm/ext/iatspayments/settings/iats.setting.php b/www/modules/civicrm/ext/iatspayments/settings/iats.setting.php
new file mode 100644
index 000000000..9b6dc32ca
--- /dev/null
+++ b/www/modules/civicrm/ext/iatspayments/settings/iats.setting.php
@@ -0,0 +1,147 @@
+<?php
+
+use CRM_Iats_ExtensionUtil as E;
+
+return [
+  'iats_email_recurring_failure_report' => [
+    'name' => 'iats_email_recurring_failure_report',
+    'type' => 'String',
+    'default' => '',
+    'html_type' => 'text',
+    'title' => E::ts('Email Recurring Contribution failure reports to this Email address'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'settings_pages' => ['iats' => ['weight' => 10]],
+  ],
+  'iats_bcc_email_recurring_failure_report' => [
+    'name' => 'iats_bcc_email_recurring_failure_report',
+    'type' => 'String',
+    'default' => '',
+    'html_type' => 'email',
+    'title' => E::ts('BCC Email Recurring Contribution failure reports to this Email address.'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'settings_pages' => ['iats' => ['weight' => 20]],
+  ],
+  'iats_recurring_failure_threshhold' => [
+    'name' => 'iats_recurring_failure_threshhold',
+    'type' => 'Integer',
+    'default' => 3,
+    'html_type' => 'text',
+    'title' => E::ts('When failure count is equal to or greater than this number, push the next scheduled contribution date forward'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'settings_pages' => ['iats' => ['weight' => 30]],
+  ],
+  'iats_receipt_recurring' => [
+    'name' => 'iats_receipt_recurring',
+    'type' => 'String',
+    'default' => '',
+    'html_type' => 'select',
+    'title' => E::ts('Email Recurring Contribution failure reports to this Email address'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'settings_pages' => ['iats' => ['weight' => 40]],
+    'options' => array('0' => E::ts('Never'), '1' => E::ts('Always'), '2' => E::ts('As set for a specific Contribution Series'))
+  ],
+  'iats_email_failure_contribution_receipt' => [
+    'name' => 'iats_email_failure_contribution_receipt',
+    'type' => 'Boolean',
+    'default' => 0,
+    'html_type' => 'checkbox',
+    'title' => E::ts('Email receipt for a Contribution if Recurring payment fails - with error message'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'settings_pages' => ['iats' => ['weight' => 50]],
+  ],
+  'iats_disable_cryptogram' => [
+    'name' => 'iats_disable_cryptogram',
+    'type' => 'Boolean',
+    'default' => 0,
+    'html_type' => 'checkbox',
+    'title' => E::ts('Disable use of cryptogram (only applies to FirstAmerican).'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'settings_pages' => ['iats' => ['weight' => 60]],
+  ],
+  'iats_ach_category_text' => [
+    'name' => 'iats_ach_category_text',
+    'type' => 'String',
+    'default' => FAPS_DEFAULT_ACH_CATEGORY_TEXT,
+    'html_type' => 'text',
+    'title' => E::ts('ACH Category Text (only applies to FirstAmerican).'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'settings_pages' => ['iats' => ['weight' => 70]],
+  ],
+  'iats_no_edit_extra' => [
+    'name' => 'iats_no_edit_extra',
+    'type' => 'Boolean',
+    'default' => 0,
+    'html_type' => 'checkbox',
+    'title' => E::ts('Disable extra edit fields for Recurring Contributions'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'settings_pages' => ['iats' => ['weight' => 80]],
+  ],
+  'iats_enable_update_subscription_billing_info' => [
+    'name' => 'iats_enable_update_subscription_billing_info',
+    'type' => 'Boolean',
+    'default' => 0,
+    'html_type' => 'checkbox',
+    'title' => E::ts('Enable self-service updates to recurring contribution Contact Billing Info.'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'settings_pages' => ['iats' => ['weight' => 90]],
+  ],
+  'iats_enable_change_subscription_amount' => [
+    'name' => 'iats_enable_change_subscription_amount',
+    'type' => 'Boolean',
+    'default' => 0,
+    'html_type' => 'checkbox',
+    'title' => E::ts('Allow self-service updates to recurring contribution amount.'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'settings_pages' => ['iats' => ['weight' => 100]],
+  ],
+  'iats_enable_cancel_recurring' => [
+    'name' => 'iats_enable_cancel_recurring',
+    'type' => 'Boolean',
+    'default' => 0,
+    'html_type' => 'checkbox',
+    'title' => E::ts('Enable self-service cancellation of a recurring contribution.'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'settings_pages' => ['iats' => ['weight' => 110]],
+  ],
+  'iats_enable_public_future_recurring_start' => [
+    'name' => 'iats_enable_public_future_recurring_start',
+    'type' => 'Boolean',
+    'default' => 0,
+    'html_type' => 'checkbox',
+    'title' => E::ts('Enable public selection of future recurring start dates.'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'settings_pages' => ['iats' => ['weight' => 120]],
+  ],
+  'iats_days' => [
+    'name' => 'iats_days',
+    'type' => 'String',
+    'default' => '
-1
',
+    'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND,
+    'html_type' => 'select',
+    'html_attributes' => [
+      'class' => 'crm-form-multiselect',
+      'size' => '29',
+      'style' => 'width:150px',
+      'multiple' => 1,
+    ],
+    'title' => E::ts('Restrict allowable days of the month for Recurring Contributions'),
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'settings_pages' => ['iats' => ['weight' => 130]],
+    'pseudoconstant' => [
+      'callback' => 'CRM_Iats_Utils::settingDateOptions',
+    ]
+  ],
+];
diff --git a/www/modules/civicrm/ext/iatspayments/templates/CRM/Iats/BillingBlockDirectDebitExtra_USD.tpl b/www/modules/civicrm/ext/iatspayments/templates/CRM/Iats/BillingBlockDirectDebitExtra_USD.tpl
index eee253241..e4f72672e 100644
--- a/www/modules/civicrm/ext/iatspayments/templates/CRM/Iats/BillingBlockDirectDebitExtra_USD.tpl
+++ b/www/modules/civicrm/ext/iatspayments/templates/CRM/Iats/BillingBlockDirectDebitExtra_USD.tpl
@@ -5,15 +5,15 @@
 <div id="iats-direct-debit-extra">
   <div class="crm-section usd-instructions-section">
     <div class="label"><em>{ts domain='com.iatspayments.civicrm'}You can find your Bank Routing Number and Bank Account number by inspecting a check.{/ts}</em></div>
-    <div class="content"><img width=500 height=303 src="{crmResURL ext=com.iatspayments.civicrm file=templates/CRM/Iats/USD_check_500x.jpg}"></div>
+    <div class="content"><img width="500" height="303" src="{crmResURL ext='com.iatspayments.civicrm' file='templates/CRM/Iats/USD_check_500x.jpg'}"></div>
     <div class="clear"></div>
   </div>
 </div>
 <script type="text/javascript">
-  var ddAcheftJs = "{crmResURL ext=com.iatspayments.civicrm file=js/dd_acheft.js}";
-{literal}
+  {literal}
   CRM.$(function ($) {
+    var ddAcheftJs = {/literal}"{crmResURL ext='com.iatspayments.civicrm' file='js/dd_acheft.js'}"{literal};
     $.getScript(ddAcheftJs);
   });
-{/literal}
+  {/literal}
 </script>
diff --git a/www/modules/civicrm/ext/iatspayments/templates/CRM/Iats/Form/IATSOneTimeCharge.tpl b/www/modules/civicrm/ext/iatspayments/templates/CRM/Iats/Form/IATSOneTimeCharge.tpl
index 470ef7771..08f3d8f07 100644
--- a/www/modules/civicrm/ext/iatspayments/templates/CRM/Iats/Form/IATSOneTimeCharge.tpl
+++ b/www/modules/civicrm/ext/iatspayments/templates/CRM/Iats/Form/IATSOneTimeCharge.tpl
@@ -11,11 +11,6 @@
   </div>
 {/foreach}
 
-  <div>
-    <span>{$form.favorite_color.label}</span>
-    <span>{$form.favorite_color.html}</span>
-  </div>
-
 {* FOOTER *}
 <div class="crm-submit-buttons">
 {include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/www/modules/civicrm/ext/iatspayments/templates/CRM/Iats/Form/Settings.tpl b/www/modules/civicrm/ext/iatspayments/templates/CRM/Iats/Form/Settings.tpl
deleted file mode 100644
index 8a7f58ee7..000000000
--- a/www/modules/civicrm/ext/iatspayments/templates/CRM/Iats/Form/Settings.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{* HEADER *}
-
-<div class="crm-submit-buttons">
-{include file="CRM/common/formButtons.tpl" location="top"}
-</div>
-
-{foreach from=$elementNames item=elementName}
-  <div class="crm-section">
-    <div class="label">{$form.$elementName.label}</div>
-    <div class="content">{$form.$elementName.html}</div>
-    <div class="clear"></div>
-  </div>
-{/foreach}
-
-{* FOOTER *}
-<div class="crm-submit-buttons">
-{include file="CRM/common/formButtons.tpl" location="bottom"}
-</div>
diff --git a/www/modules/civicrm/ext/iatspayments/tests/phpunit/CRM/Iats/SettingsTest.php b/www/modules/civicrm/ext/iatspayments/tests/phpunit/CRM/Iats/SettingsTest.php
new file mode 100644
index 000000000..21b2cefb4
--- /dev/null
+++ b/www/modules/civicrm/ext/iatspayments/tests/phpunit/CRM/Iats/SettingsTest.php
@@ -0,0 +1,61 @@
+<?php
+
+use CRM_Iats_ExtensionUtil as E;
+use Civi\Test\CiviEnvBuilder;
+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_Iats_SettingsTest extends \PHPUnit\Framework\TestCase implements HeadlessInterface, HookInterface {
+
+  /**
+   * Setup used when HeadlessInterface is implemented.
+   *
+   * Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
+   *
+   * @link https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
+   *
+   * @return \Civi\Test\CiviEnvBuilder
+   *
+   * @throws \CRM_Extension_Exception_ParseException
+   */
+  public function setUpHeadless(): CiviEnvBuilder {
+    return \Civi\Test::headless()
+      ->installMe(__DIR__)
+      ->apply();
+  }
+
+  public function setUp():void {
+    parent::setUp();
+  }
+
+  public function tearDown():void {
+    parent::tearDown();
+  }
+
+  /**
+   * Example: Test that a version is returned.
+   */
+  public function testGetDates():void {
+    Civi::settings()->set('iats_days', '1');
+    $this->assertIsArray(CRM_Iats_Utils::getSettings()['days']);
+    Civi::settings()->set('iats_days', ['1', '2', '3', '5', '7']);
+    $this->assertIsArray(CRM_Iats_Utils::getSettings()['days']);
+    $this->assertEquals(['1', '2', '3', '5', '7'], CRM_Iats_Utils::getSettings()['days']);
+  }
+
+
+}
diff --git a/www/modules/civicrm/ext/iatspayments/xml/Menu/iats.xml b/www/modules/civicrm/ext/iatspayments/xml/Menu/iats.xml
index bf2c127d5..9ca002d0b 100644
--- a/www/modules/civicrm/ext/iatspayments/xml/Menu/iats.xml
+++ b/www/modules/civicrm/ext/iatspayments/xml/Menu/iats.xml
@@ -12,8 +12,8 @@
     <access_arguments>make online contributions</access_arguments>
   </item>
   <item>
-    <path>civicrm/admin/contribute/iatssettings</path>
-    <page_callback>CRM_Iats_Form_Settings</page_callback>
+    <path>civicrm/admin/setting/iats</path>
+    <page_callback>CRM_Admin_Form_Generic</page_callback>
     <title>iATS Payments Settings</title>
     <access_arguments>access CiviContribute,administer CiviCRM</access_arguments>
   </item>
diff --git a/www/modules/civicrm/ext/iframe/CRM/Iframe/Page/InstallPage.php b/www/modules/civicrm/ext/iframe/CRM/Iframe/Page/InstallPage.php
new file mode 100644
index 000000000..6909c66d4
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/CRM/Iframe/Page/InstallPage.php
@@ -0,0 +1,20 @@
+<?php
+use CRM_Iframe_ExtensionUtil as E;
+
+class CRM_Iframe_Page_InstallPage extends CRM_Core_Page {
+
+  public function run() {
+    CRM_Utils_System::setTitle(E::ts('IFRAME Installation'));
+
+    $iframe = Civi::service('iframe');
+    $scriptMgr = Civi::service('iframe.script');
+    $this->assign('filePath', $scriptMgr->getPath());
+    $this->assign('fileUrl', (string) \Civi::url('[civicrm.iframe]'));
+    $this->assign('newCode', $scriptMgr->render($iframe->getTemplate()));
+    $this->assign('oldCode', $scriptMgr->getCurrent());
+    $this->assign('isCurrent', $scriptMgr->render($iframe->getTemplate()) === $scriptMgr->getCurrent());
+
+    parent::run();
+  }
+
+}
diff --git a/www/modules/civicrm/ext/iframe/CRM/Iframe/Utils.php b/www/modules/civicrm/ext/iframe/CRM/Iframe/Utils.php
new file mode 100644
index 000000000..feb168b2e
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/CRM/Iframe/Utils.php
@@ -0,0 +1,23 @@
+<?php
+
+use CRM_Iframe_ExtensionUtil as E;
+
+class CRM_Iframe_Utils {
+
+  public static function getAllowOptions(): array {
+    return [
+      'public' => E::ts('All public pages'),
+      'ajax' => E::ts('All AJAX routes'),
+    ];
+  }
+
+  public static function getLayoutOptions(): array {
+    return [
+      'auto' => E::ts('Automatic'),
+      'raw' => E::ts('Raw page layout (no headers)'),
+      'basic' => E::ts('Basic page layout (with headers, without navigation)'),
+      'cms' => E::ts('Full page layout (with CMS navigation)'),
+    ];
+  }
+
+}
diff --git a/www/modules/civicrm/ext/iframe/Civi/Api4/Iframe.php b/www/modules/civicrm/ext/iframe/Civi/Api4/Iframe.php
new file mode 100644
index 000000000..b23f99d86
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/Civi/Api4/Iframe.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Civi\Api4;
+
+use Civi\Api4\Generic\AbstractAction;
+use Civi\Api4\Generic\BasicEntity;
+use Civi\Api4\Generic\BasicGetFieldsAction;
+use Civi\Api4\Generic\Result;
+
+class Iframe extends BasicEntity {
+
+  public static function getFields(): BasicGetFieldsAction {
+    return new BasicGetFieldsAction('Iframe', __FUNCTION__, fn() => []);
+  }
+
+  public static function installScript(): AbstractAction {
+    return new class('Iframe', __FUNCTION__) extends AbstractAction {
+
+      public function _run(Result $result) {
+        \Civi::service('iframe.script')->install();
+      }
+
+    };
+  }
+
+  public static function permissions(): array {
+    return [
+      'installScript' => ['administer iframe'],
+    ];
+  }
+
+}
diff --git a/www/modules/civicrm/ext/iframe/Civi/Iframe/Cosession.php b/www/modules/civicrm/ext/iframe/Civi/Iframe/Cosession.php
new file mode 100644
index 000000000..3adbf4f53
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/Civi/Iframe/Cosession.php
@@ -0,0 +1,230 @@
+<?php
+namespace Civi\Iframe;
+
+use CRM_Iframe_ExtensionUtil as E;
+use Civi\Core\Service\AutoService;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * The co-session provides a long (real) session built on top of short (fake) sessions.
+ *
+ * Within an iframe context, cookies are unreliable. The CMS creates cookies and sessions,
+ * but they only work for 1 page-load. On the next page-load, you're in a new session. These
+ * short sessions are kind of pointless - but they're baked into each CMS (*cumbersome to fine-tune*).
+ * To achieve session-like behavior, we need to propagate request-parameters instead.
+ *
+ * For the "iframe co-session", we sync the short-lived CMS sessions with a long-lived co-session.
+ *
+ * - The co-session is stored separately (via `Civi::cache('session')`)
+ * - The co-session is activated by a request-parameter (`?_cosession={JWT}`) instead of a cookie.
+ * - The request-parameter is outputted at key moments (e.g. `hook_buildForm`) so that it propagates
+ *   to subsequent requests.
+ * - As the request begins (*as the CMS session starts*), we import data from the co-session.
+ * - As the request finishes (*as the CMS session ends*), we export data back to the co-session.
+ *
+ * @service iframe.cosession
+ */
+class Cosession extends AutoService implements EventSubscriberInterface {
+
+  protected $ttl = '+3 hour';
+
+  public static function getSubscribedEvents(): array {
+    return [
+      '&civi.invoke.auth' => ['onInvoke', 100],
+      '&civi.session.storeObjects' => ['export', 0],
+      '&hook_civicrm_buildForm' => ['onBuildForm', 0],
+      '&hook_civicrm_alterRedirect' => ['onRedirect', 0],
+      '&hook_civicrm_activeTheme' => ['pickTheme', 0],
+    ];
+  }
+
+  /**
+   * @var \Civi\Crypto\CryptoJwt
+   * @inject crypto.jwt
+   */
+  protected $jwt;
+
+  protected ?string $sessionId = NULL;
+
+  public function findCreateSessionId(): ?string {
+    if (!defined('CIVICRM_IFRAME')) {
+      return NULL;
+    }
+
+    // We store a copy of sessionId on $this. However, there are some unclear situations
+    // where $this is recreated in the middle of a request (e.g. toward the end
+    // of "civicrm/contribution/transact" flow). This helper allows rereading multiple times.
+
+    if ($this->sessionId === NULL) {
+      defined('DBG') && $cleanup = dbg_scope('getSessionId');
+      // TODO: Accept _cosession if one of these criteria are met:
+      //   - POST to quickform (non-conflicted referer)
+      //   - POST to AJAX (non-conflicted referer)
+      //   - GET for an approved landing-page
+      //     ("Approved" ==> Per-route? Or is distinct to th page-flow/step/JWT?)
+      //   - What about GET for AJAX?
+      // OR: If it's a GET for approved landing-page, then force-change the underlying sessionId?
+      //     In effect, that invalidates all existing tokens. Mitigates known-session-id attacks?
+      // MAYBE: Store the entry-point where we started the session. If session ever fails, give link back.
+      if (isset($_REQUEST['_cosession'])) {
+        $this->sessionId = $this->parseToken($_REQUEST['_cosession']);
+        // TODO: In non-debug mode, perhaps we catch JWT exceptions, log them, and redirect/restart - like when you have invalid qfKey.
+      }
+      else {
+        $this->sessionId = $this->createSessionId();
+        $_REQUEST['_cosession'] = $this->createToken($this->sessionId);
+      }
+    }
+    return $this->sessionId;
+  }
+
+  public function onInvoke(array $path) {
+    if (!defined('CIVICRM_IFRAME') || !$this->isEmbeddable(implode('/', $path))) {
+      return;
+    }
+
+    defined('DBG') && $cleanup = dbg_scope('onInvoke');
+
+    $this->findCreateSessionId();
+
+    $session = \CRM_Core_Session::singleton();
+    if ($session->isEmpty()) {
+      $session->initialize();
+    }
+    $this->import();
+
+    // In principle, this will propagate to AJAX subrequests...
+    // ...but currently all our JS broken due to CIVICRM_UF_BASEURL override...
+
+    // Defer resolution of sessionId as long as possible
+    \CRM_Core_Region::instance('page-header')->add([
+      'callback' => function() {
+        $token = $this->createToken($this->sessionId);
+        $script = sprintf('CRM.$.ajaxSetup({data: {_cosession: %s}});', json_encode($token));
+        return "<script type='text/javascript'>\n$script\n</script>";
+      },
+    ]);
+  }
+
+  /**
+   * @param $themeKey
+   * @param $context
+   * @return void
+   * @see \CRM_Utils_Hook::activeTheme()
+   */
+  public function pickTheme(&$themeKey, $context): void {
+    if (!defined('CIVICRM_IFRAME')) {
+      return;
+    }
+
+    $setting = \Civi::settings()->get('iframe_theme');
+    if ($setting && $setting !== 'default') {
+      $themeKey = $setting;
+    }
+  }
+
+  /**
+   * Determine whether the request is allowed within an iframe iframe.
+   *
+   * @param string $path
+   *  Ex: 'civicrm/foo/bar'
+   * @return bool
+   *   TRUE if this path is embeddable
+   */
+  public function isEmbeddable(string $path): bool {
+    if (preg_match(';^civicrm/ajax/;', $path)) {
+      return TRUE;
+    }
+
+    $route = \CRM_Core_Invoke::getItem($path);
+    return !empty($route['is_public']) && !empty($route['is_active']);
+  }
+
+  /**
+   * @see \CRM_Utils_Hook::buildForm()
+   */
+  public function onBuildForm($formName, $form) {
+    if (!$this->findCreateSessionId()) {
+      return;
+    }
+    defined('DBG') && $cleanup = dbg_scope('onBuildForm');
+    $form->addElement('hidden', '_cosession', $this->createToken($this->sessionId));
+  }
+
+  public function onRedirect(\Psr\Http\Message\UriInterface &$redirectUrl, &$context) {
+    if (!$this->findCreateSessionId()) {
+      return;
+    }
+
+    defined('DBG') && $cleanup = dbg_scope('onRedirect');
+    $embedUrl = \Civi::url('iframe://');
+    if (\CRM_Utils_Url::isChildOf($redirectUrl, $embedUrl)) {
+      $token = $this->createToken($this->sessionId);
+      $redirectUrl = $redirectUrl->withQuery($redirectUrl->getQuery() . '&_cosession=' . urlencode($token));
+    }
+  }
+
+  /**
+   * Get the long-lived co-session. Import data into the short-lived CMS session.
+   */
+  public function import() {
+    if (!$this->findCreateSessionId()) {
+      return;
+    }
+    defined('DBG') && $cleanup = dbg_scope('import');
+    $sessionData = \Civi::cache('session')->get('co_' . $this->sessionId);
+    foreach ($sessionData ?: [] as $key => $value) {
+      $_SESSION[$key] = $value;
+    }
+  }
+
+  /**
+   * Export data from the short-lived CMS session. Save it to the co-session.
+   */
+  public function export() {
+    if (!$this->findCreateSessionId()) {
+      return;
+    }
+    defined('DBG') && $cleanup = dbg_scope('export');
+    \Civi::cache('session')->set('co_' . $this->sessionId, $_SESSION);
+    // TODO: we should probably clean-up the CMS session to avoid leaks.
+    // But need to explore/experiment to find the best moment.
+  }
+
+  protected function createToken($sessionId): string {
+    return $this->jwt->encode([
+      'scope' => 'session',
+      'sessionId' => $sessionId,
+      'sessionIp' => \CRM_Utils_System::ipAddress(),
+      'exp' => \CRM_Utils_Time::strtotime($this->ttl),
+    ]);
+  }
+
+  protected function parseToken(string $token): string {
+    $claims = $this->jwt->decode($token);
+    if ($claims['scope'] !== 'session') {
+      throw new \CRM_Core_Exception("Invalid session token. Missing scope=session");
+    }
+    if ($claims['sessionIp'] !== \CRM_Utils_System::ipAddress()) {
+      throw new \CRM_Core_Exception("Invalid session token. IP address changed");
+    }
+    return $claims['sessionId'];
+  }
+
+  /**
+   * @return string
+   */
+  protected function createSessionId(): string {
+    return \CRM_Utils_String::createRandom(32, \CRM_Utils_String::ALPHANUMERIC);
+  }
+
+  protected function rotateSessionId(): void {
+    $oldId = $this->sessionId;
+    $newId = $this->createSessionId();
+    $storage = \Civi::cache('session');
+    $storage->set($newId, $storage->get($oldId));
+    $storage->delete($oldId);
+    $this->sessionId = $newId;
+  }
+
+}
diff --git a/www/modules/civicrm/ext/iframe/Civi/Iframe/EntryPoint/Backdrop.php b/www/modules/civicrm/ext/iframe/Civi/Iframe/EntryPoint/Backdrop.php
new file mode 100644
index 000000000..6dfd78b7e
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/Civi/Iframe/EntryPoint/Backdrop.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Civi\Iframe\EntryPoint;
+
+//TEMPLATE:START
+
+/**
+ * Begin processing of an embedded page-view on Backdrop
+ */
+class Backdrop {
+
+  public static function main(): void {
+
+    define('CIVICRM_IFRAME', 1);
+    define('BACKDROP_ROOT', getcwd());
+
+    // Do not accept cookies.
+    // The whole issue is that browsers disagree on cookie-handling for embedded iframe content.
+    // (Ex: Safari 16 doesn't send cookies; but Firefox 118 does.)
+    // This means that `iframe.php` has the same cookie-less behavior for all browsers/users/tools.
+    foreach (array_keys($_COOKIE) as $cookie) {
+      unset($_COOKIE[$cookie]);
+    }
+
+    $GLOBALS['civicrm_url_defaults'][]['scheme'] = 'iframe';
+
+    require_once BACKDROP_ROOT . '/core/includes/bootstrap.inc';
+    \backdrop_bootstrap(BACKDROP_BOOTSTRAP_FULL);
+    $GLOBALS['config']['x_frame_options'] = '';
+    \civicrm_initialize();
+
+    \Civi::service('iframe.router')->invoke([
+      'route' => trim($_SERVER['PATH_INFO'], '/'),
+    ]);
+  }
+
+}
+
+//TEMPLATE:END
diff --git a/www/modules/civicrm/ext/iframe/Civi/Iframe/EntryPoint/Drupal.php b/www/modules/civicrm/ext/iframe/Civi/Iframe/EntryPoint/Drupal.php
new file mode 100644
index 000000000..997fb6097
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/Civi/Iframe/EntryPoint/Drupal.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Civi\Iframe\EntryPoint;
+
+//TEMPLATE:START
+
+/**
+ * Begin processing of an embedded page-view on Drupal 7.
+ */
+class Drupal {
+
+  public static function main(): void {
+
+    define('CIVICRM_IFRAME', 1);
+    define('DRUPAL_ROOT', getcwd());
+
+    // Do not accept cookies.
+    // The whole issue is that browsers disagree on cookie-handling for embedded iframe content.
+    // (Ex: Safari 16 doesn't send cookies; but Firefox 118 does.)
+    // This means that `iframe.php` has the same cookie-less behavior for all browsers/users/tools.
+    foreach (array_keys($_COOKIE) as $cookie) {
+      unset($_COOKIE[$cookie]);
+    }
+
+    $GLOBALS['civicrm_url_defaults'][]['scheme'] = 'iframe';
+
+    require_once DRUPAL_ROOT . '/includes/bootstrap.inc';
+    \drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+    $GLOBALS['conf']['x_frame_options'] = '';
+    \civicrm_initialize();
+
+    \Civi::service('iframe.router')->invoke([
+      'route' => trim($_SERVER['PATH_INFO'], '/'),
+    ]);
+  }
+
+}
+
+//TEMPLATE:END
diff --git a/www/modules/civicrm/ext/iframe/Civi/Iframe/EntryPoint/Drupal8.php b/www/modules/civicrm/ext/iframe/Civi/Iframe/EntryPoint/Drupal8.php
new file mode 100644
index 000000000..2a08c1096
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/Civi/Iframe/EntryPoint/Drupal8.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Civi\Iframe\EntryPoint;
+
+use Civi\Iframe\IframeDrupalKernel;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\ResponseEvent;
+
+//TEMPLATE:START
+
+/**
+ * Begin processing of an embedded page-view on Drupal 8/9/10/etc.
+ */
+class Drupal8 {
+
+  public static function main(): void {
+    define('CIVICRM_IFRAME', 1);
+
+    // Do not accept cookies.
+    // The whole issue is that browsers disagree on cookie-handling for embedded iframe content.
+    // (Ex: Safari 16 doesn't send cookies; but Firefox 118 does.)
+    // This means that `iframe.php` has the same cookie-less behavior for all browsers/users/tools.
+    foreach (array_keys($_COOKIE) as $cookie) {
+      unset($_COOKIE[$cookie]);
+    }
+
+    $GLOBALS['civicrm_url_defaults'][]['scheme'] = 'iframe';
+
+    /** @var \Composer\Autoload\ClassLoader $autoloader */
+    $autoloader = require_once 'autoload.php';
+    $autoloader->addPsr4('Civi\\Iframe\\', realpath($GLOBALS['CIVICRM_IFRAME_META']['extPath']) . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR);
+
+    $route = trim($_SERVER['PATH_INFO'], '/');
+
+    $request = Request::createFromGlobals();
+    $kernel = IframeDrupalKernel::createFromRequest($request, $autoloader, 'prod');
+    $kernel->boot();
+    $kernel->preHandle($request);
+    $request->attributes->set(\Drupal\Core\Routing\RouteObjectInterface::ROUTE_OBJECT, new \Symfony\Component\Routing\Route($route));
+    $request->attributes->set(\Drupal\Core\Routing\RouteObjectInterface::ROUTE_NAME, 'civicrm.' . implode('_', explode('/', $route)));
+
+    \Drupal::service('civicrm')->initialize();
+    \Drupal::service('event_dispatcher')->addListener('kernel.response', function(ResponseEvent $event) {
+      $event->getResponse()->headers->remove('X-Frame-Options');
+    });
+
+    \Civi::service('iframe.router')->invoke([
+      'route' => $route,
+      'drupalKernel' => $kernel,
+      'drupalRequest' => $request,
+    ]);
+  }
+
+}
+
+//TEMPLATE:END
diff --git a/www/modules/civicrm/ext/iframe/Civi/Iframe/Iframe.php b/www/modules/civicrm/ext/iframe/Civi/Iframe/Iframe.php
new file mode 100644
index 000000000..1bddcd6e7
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/Civi/Iframe/Iframe.php
@@ -0,0 +1,40 @@
+<?php
+namespace Civi\Iframe;
+
+use Civi\Core\Url;
+use Civi\Core\Service\AutoService;
+use CRM_Iframe_ExtensionUtil as E;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * @service iframe
+ */
+class Iframe extends AutoService implements EventSubscriberInterface {
+
+  public static function getSubscribedEvents() {
+    return ['&civi.url.render.iframe' => 'onRenderUrl'];
+  }
+
+  /**
+   * Determine which template to use for the iframe entry-point.
+   *
+   * @return string
+   *   Ex: 'Civi\Iframe\EntryPoint\Drupal8'
+   */
+  public function getTemplate(): string {
+    return 'Civi\\Iframe\\EntryPoint\\' . CIVICRM_UF;
+  }
+
+  /**
+   * Generate physical URLs for `iframe://` links
+   * (per `civi.url.render.iframe`).
+   *
+   * @param \Civi\Core\Url $url
+   * @param string|null $result
+   * @throws \CRM_Core_Exception
+   */
+  public function onRenderUrl(Url $url, ?string &$result) {
+    $result = \Civi::url('[civicrm.iframe]', 'a')->merge($url, ['path', 'query', 'fragment', 'fragmentQuery', 'flags']);
+  }
+
+}
diff --git a/www/modules/civicrm/ext/iframe/Civi/Iframe/Router.php b/www/modules/civicrm/ext/iframe/Civi/Iframe/Router.php
new file mode 100644
index 000000000..5b839c6b3
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/Civi/Iframe/Router.php
@@ -0,0 +1,126 @@
+<?php
+namespace Civi\Iframe;
+
+use CRM_Iframe_ExtensionUtil as E;
+use Civi\Core\Service\AutoService;
+
+/**
+ * @service iframe.router
+ */
+class Router extends AutoService {
+
+  public function invoke(array $params) {
+    if (!$this->isAllowedRoute($params['route'])) {
+      throw new \CRM_Core_Exception("Route not available for embedding.");
+    }
+
+    $config = \CRM_Core_Config::singleton();
+    $_GET[$config->userFrameworkURLVar] = $params['route'];
+
+    $handler = $this->getHandler();
+    $handler($params);
+  }
+
+  public function isAllowedRoute(string $route): bool {
+    if (!preg_match(';^civicrm/;', $route)) {
+      return FALSE;
+    }
+
+    $flags = \Civi::settings()->get('iframe_allow');
+    if (in_array('ajax', $flags) && preg_match(';^civicrm/ajax/;', $route)) {
+      return TRUE;
+    }
+    if (in_array('public', $flags) && \CRM_Core_Menu::isPublicRoute($route)) {
+      return TRUE;
+    }
+
+    $list = explode("\n", \Civi::settings()->get('iframe_allow_other'));
+    \Civi::dispatcher()->dispatch('civi.iframe.allowRoutes', \Civi\Core\Event\GenericHookEvent::create([
+      'routes' => &$list,
+    ]));
+    $matches = \CRM_Utils_String::filterByWildcards($list, [$route]);
+    if (!empty($matches)) {
+      return TRUE;
+    }
+
+    return FALSE;
+  }
+
+  protected function getHandler(): callable {
+    $setting = \Civi::settings()->get('iframe_layout');
+    if ($setting === 'auto') {
+      $setting = 'basic';
+    }
+    return [$this, 'invoke' . ucfirst($setting)];
+  }
+
+  protected function invokeRaw(array $params): void {
+    // Based on Civi-D7 `civicrm_invoke()`
+
+    ob_start();
+    $pageContent = \CRM_Core_Invoke::invoke(explode('/', $params['route']));
+    $printedContent = ob_get_clean();
+
+    if (empty($pageContent) && !empty($printedContent)) {
+      $pageContent = $printedContent;
+    }
+    echo $pageContent;
+  }
+
+  /**
+   * Execute and display the requested route. Apply basic formatting.
+   *
+   * This means that CMS navigation and theming are disabled. However,
+   * HTML <HEAD> and Civi theming are enabled.
+   *
+   * @param array $params
+   *   Open-ended parameters provided by the entry-script (`iframe.php`).
+   * @throws \CRM_Core_Exception
+   */
+  protected function invokeBasic(array $params): void {
+    \CRM_Core_Resources::singleton()->addCoreResources('html-header');
+
+    ob_start();
+    $pageContent = \CRM_Core_Invoke::invoke(explode('/', $params['route']));
+    $printedContent = ob_get_clean();
+    if (empty($pageContent) && !empty($printedContent)) {
+      $pageContent = $printedContent;
+    }
+
+    $htmlHeader = \CRM_Core_Region::instance('html-header')->render('');
+    $locale = \CRM_Core_I18n::getLocale();
+
+    echo \CRM_Core_Smarty::singleton()->fetchWith('iframe-basic-page.tpl', [
+      'lang' => substr($locale, 0, 2),
+      'dir' => \CRM_Core_I18n::isLanguageRTL($locale) ? 'rtl' : 'ltr',
+      'head' => $htmlHeader,
+      'body' => $pageContent,
+    ]);
+  }
+
+  protected function invokeCms(array $params):void {
+    switch (CIVICRM_UF) {
+      case 'Drupal':
+        \CRM_Core_Resources::singleton()->addCoreResources();
+        // FIXME: ^^^ should be handled by civicrm_html_head(), but the arg(0) guard misfires.
+
+        \menu_execute_active_handler();
+        break;
+
+      case 'Drupal8':
+        /** @var \Drupal\Core\DrupalKernel $kernel */
+        $kernel = $params['drupalKernel'];
+        /** @var \Symfony\Component\HttpFoundation\Request $request */
+        $request = $params['drupalRequest'];
+
+        $response = $kernel->handle($request);
+        $response->send();
+        $kernel->terminate($request, $response);
+        break;
+
+      default:
+        throw new \CRM_Core_Exception("Unimplemented: invokeCms(" . CIVICRM_UF . ")");
+    }
+  }
+
+}
diff --git a/www/modules/civicrm/ext/iframe/Civi/Iframe/ScriptManager.php b/www/modules/civicrm/ext/iframe/Civi/Iframe/ScriptManager.php
new file mode 100644
index 000000000..301c4dcd2
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/Civi/Iframe/ScriptManager.php
@@ -0,0 +1,176 @@
+<?php
+
+namespace Civi\Iframe;
+
+use Civi\Core\HookInterface;
+use Civi\Core\Service\AutoService;
+use CRM_Iframe_ExtensionUtil as E;
+
+/**
+ * Manage the iframe entry-point script.
+ *
+ * @service iframe.script
+ */
+class ScriptManager extends AutoService implements HookInterface {
+
+  /**
+   * The symbolic of the system status-check which monitors the script.
+   */
+  const CHECK_NAME = 'iframeInstall';
+
+  /**
+   * @var \Civi\Iframe\Iframe
+   * @inject
+   */
+  protected $iframe;
+
+  /**
+   * @see \CRM_Utils_Hook::check()
+   */
+  public function hook_civicrm_check(&$messages, $statusNames = [], $includeDisabled = FALSE): void {
+    if ($statusNames && !in_array(static::CHECK_NAME, $statusNames)) {
+      return;
+    }
+
+    $path = $this->getPath();
+    $template = $this->iframe->getTemplate();
+
+    if (!class_exists($template)) {
+      $messages[] = new \CRM_Utils_Check_Message(
+        static::CHECK_NAME,
+        ts('The IFrame Connector cannot be deployed. The template class ("<code>%1</code>") is missing.', [1 => htmlentities($template)]),
+        ts('IFrame Connector: Deployment'),
+        \Psr\Log\LogLevel::ERROR,
+        'fa-download'
+      );
+      return;
+    }
+
+    if (file_exists($path) && file_get_contents($path) === $this->render($template)) {
+      return;
+    }
+
+    $tsVars = [
+      1 => htmlentities(basename($this->getPath())),
+    ];
+    $message = new \CRM_Utils_Check_Message(
+      static::CHECK_NAME,
+      file_exists($path)
+        ? ts('The IFrame Connector requires a utility script ("<code>%1</code>"). This script needs to be updated.', $tsVars)
+        : ts('The IFrame Connector requires a utility script ("<code>%1</code>"). This script needs to be installed.', $tsVars),
+      ts('IFrame Connector: Deployment'),
+      \Psr\Log\LogLevel::ERROR,
+      'fa-download'
+    );
+    if ($this->isInstallable()) {
+      $message->addAction(ts('Deploy now'), FALSE, 'api4', ['Iframe', 'installScript']);
+    }
+    $message->addAction(ts('Deploy instructions'), FALSE, 'href', ['path' => 'civicrm/admin/iframe/install', 'query' => 'reset=1']);
+    $messages[] = $message;
+  }
+
+  public function isInstallable(): bool {
+    $path = $this->getPath();
+    $parent = dirname($path);
+    if (file_exists($path) && is_writable($path)) {
+      return TRUE;
+    }
+    if (!file_exists($path) && file_exists($parent) &&  is_writable($parent)) {
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  public function install(): void {
+    $content = $this->render($this->iframe->getTemplate());
+    $path = $this->getPath();
+    if (!file_put_contents($path, $content)) {
+      throw new \CRM_Core_Exception("Failed to install $path");
+    }
+  }
+
+  /**
+   * Generate the literal code for the entry-point script.
+   *
+   * @param string $sourceClass
+   *  Ex: 'Civi\Iframe\EntryPoint\Drupal'
+   * @return string
+   */
+  public function render(string $sourceClass): string {
+    $meta = [
+      'uf' => CIVICRM_UF,
+      'sourceClass' => $sourceClass,
+      'extPath' => static::relativize(E::path(), dirname($this->getPath())),
+      'scriptUrl' => (string) \Civi::url('iframe://'),
+    ];
+
+    $metaCode =
+      "// This file is auto-generated by the CiviCRM `iframe` extension.\n"
+      . sprintf("\$GLOBALS['CIVICRM_IFRAME_META'] = %s;\n", var_export($meta, 1))
+      . sprintf("if (!empty(\$GLOBALS['CIVICRM_IFRAME_READ'])) {\n  return \$GLOBALS['CIVICRM_IFRAME_META'];\n}\n");
+
+    $class = new \ReflectionClass($sourceClass);
+    $classCode = file_get_contents($class->getFileName());
+
+    if (!str_contains($classCode, '//TEMPLATE:START') || !str_contains($classCode, '//TEMPLATE:END')) {
+      throw new \RuntimeException("Template class ($sourceClass) is malformed. Missing TEMPLATE flags.");
+    }
+
+    return strtr($classCode, [
+      '//TEMPLATE:START' => $metaCode,
+      '//TEMPLATE:END' => sprintf("%s::main();\n", $class->getShortName()),
+    ]);
+  }
+
+  public function getCurrent(): ?string {
+    $path = $this->getPath();
+    return file_exists($path) ? file_get_contents($path) : NULL;
+  }
+
+  /**
+   * Read metadata about the existing script.
+   *
+   * @return array|null
+   */
+  public function getMeta(): ?array {
+    $path = $this->getPath();
+    if (!file_exists($path)) {
+      return NULL;
+    }
+
+    try {
+      $GLOBALS['CIVICRM_IFRAME_READ'] = TRUE;
+      return (include $this->getPath());
+    }
+    finally {
+      unset($GLOBALS['CIVICRM_IFRAME_READ']);
+    }
+  }
+
+  /**
+   * Convert the absolute path of $target to a relative path (as seen from $base).
+   * This variant will attempt to use `../`.
+   *
+   * @param string $target
+   * @param string $base
+   * @return string
+   */
+  protected function relativize(string $target, string $base): string {
+    $prefix = '..' . DIRECTORY_SEPARATOR;
+    while ($base && !\CRM_Utils_File::isChildPath($base, $target)) {
+      $base = dirname($base);
+    }
+    $relPath = \CRM_Utils_File::relativize($target, $base . DIRECTORY_SEPARATOR);
+    return $prefix . $relPath;
+  }
+
+  /**
+   * Get the local path to the IFRAME entry-point.
+   *
+   * @return string
+   */
+  public function getPath(): string {
+    return \Civi::paths()->getVariable('civicrm.iframe', 'path');
+  }
+
+}
diff --git a/www/modules/civicrm/ext/iframe/README.md b/www/modules/civicrm/ext/iframe/README.md
new file mode 100644
index 000000000..a59538817
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/README.md
@@ -0,0 +1,127 @@
+# IFrame Connector
+
+The IFrame Connector enables external websites to embed CiviCRM pages using an HTML `<iframe>`.  Specifically, it supports public-facing pages (such
+as "Contribution Pages").  This is a primary building-block for the [oEmbed](https://oembed.com/) integration
+([dev/core#2994](https://lab.civicrm.org/dev/core/-/issues/2994)).
+
+At time of writing, the extension is in an incubation period. It does not appear in the regular list of extensions.
+
+## Quick start
+
+* Enable the `iframe` extension.
+
+    ```bash
+    ## During the incubation period, you can enable via CLI or API
+    cv en iframe
+    ```
+
+* Install the entry-point script (`iframe.php`). There are three ways to do this:
+    * __Web UI__: Open the "System Status". If you have permission, it will show a button "Deploy now".
+    * __Manual__: Open the "System Status". It will show a button "Deploy instructions". Copy-paste the content into the target file.
+    * __CLI/API__: Run `cv api4 Iframe.installScript`
+
+* Pick a CiviCRM page (eg `civicrm/contribute/transact?reset=1&id=1`). On an external website, you can make an HTML page which embeds the CiviCRM page:
+    ```html
+    <IFRAME SRC="http://example.org/iframe.php/civicrm/contribute/transact?reset=1&id=1"/>
+    ```
+
+* Optionally, navigate to "Administer > System Settings > IFrame Connector Settings" to fine-tune the options.
+
+## Overview
+
+The extension is a building-block for oEmbed support.  Many oEmbed providers use `<iframe>`s as the lower-level mechanisms for embedding rich content on
+remote sites, and `<iframe>`s generally work with a range of browsers+servers.  The approach should support core CiviCRM technologies such as
+UFs/Extensions/Hooks/CRUD APIs as well as QuickForm/jQuery and Angular/Afform/SearchKit.
+
+However, embedding is not trivial.  Embedded pages differ from regular pages in important ways:
+
+* __Browser authorization__: Based on default CMS policies, browsers will decline to show iframes for regular pages. We need to opt-in to support specific pages.
+* __Page-flow and state__: Many useful pages require AJAX subrequests and/or HTTP POST-backs. The requests often rely on sessions, but iframes don't reliably support ordinary (cookie-based) sessions.
+* __Styling, navigation, and sizing__: The host web-page will have its own appearance. Embedded content should have minimal styling that allows it to visually fit-in.
+* __User identity__: Embedded pages are generally anonymous. You do not inherit the user-identity from CiviCRM-UF.
+
+On the whole, embeds represent a distinctive runtime context.  For comparison, many web platforms address 3+ runtime contexts: "public frontend",
+"staff backend", "web services".  Each context has a different set of rules regarding sessions, headers, pageflow/state, styling, etc.  The "embedded
+frontend" is similar runtime context.
+
+The extension implements this with a new entry-point, `iframe.php`. Compare:
+
+```
+Site URL:             https://example.org/
+Example Page:         https://example.org/civicrm/contribute/transact?reset=1&id=1
+
+IFRAME Entry Point:   https://example.org/iframe.php
+IFRAME Example Page:  https://example.org/iframe.php/civicrm/contribute/transact?reset=1&id=1
+```
+
+## In depth: Developing the entry-point
+
+* The `iframe.php` script needs to be deployed by content-providers. It does not need to be deployed by content-consumers.
+
+* The `iframe.php` script is based on a template.  There are multiple template files (`Civi/Iframe/EntryPoint/*.php`) for different web-environments.  The
+  current convention is to name each template for its intended environment (`Drupal.php`, `Drupal8.php`, etc).
+
+* Whenever you edit your template in `Civi/Iframe/EntryPoint/`, the status-check will complain that `iframe.php` is out-of-date and prompt you to re-deploy it.
+
+    (The quickest way to republish is to run `cv api4 Iframe.installScript`)
+
+* The D10 template is ore involved. It needs some helper classes. These are in `lib/`.
+
+* Does this absolutely need to be a separate PHP file in the web-root?  Maybe not; it depends.
+    * It has some benefits.  It can use the regular UF bootstrap methods.  The URL is easy to predict and interpret.  It gets high privileges in manipulating the app (e.g.  to configure session options).
+    * Alas, it does require an extra installation step, and some mass-market/vertically-integrated web-hosts may not allow the installation step.  So rewriting another way might be nice.
+    * Suggestion for anyone wanting to go that way:
+        1. Wait until we've hit some more milestones (*like: abstracting the embed-route-generator -- so you can layer-in whatever gnarly URLs*)
+        2. Read the existing templates for inspiration on the kind of steps needed for each UF. Some UF's may provide sufficient runtime APIs; others may not.
+
+## In depth: Page-flow and state
+
+TODO
+
+## Issues / TODOs
+
+* [ ] March 5.72-RC Target
+    * [x] Rename existing stuff to `ext/iframe`
+    * [ ] Add the real `ext/oembed` (https://oembed.com/#section4)
+        * [ ] End-point for `civicrm/share/` which outputs an oEmbed stub
+    * [ ] IFRAME sizing: setting
+        * Setting for default (maybe width=480? width=720? https://mediag.com/blog/popular-screen-resolutions-designing-for-all/)
+    * [ ] IFRAME sizing: customizable (`civicrm/share?size=NNNxNNN`)
+* [ ] March 5.72-RC Addendum Extension
+    * [ ] JS or CSS to hide elements that we don't want to deal with yet ("Tell a Friend", "Create PCP")
+* [ ] March 5.72-RC Testing
+    * Use case retest/targetting/reassessment (*works better after fixing layout+URL issues above; still need to figure out inline HREFs targetting*)
+        * [ ] contribution page
+        * [ ] event page
+        * [ ] jma petition
+        * et al
+* [ ] Tidy up (March-ish/April-ish)
+    * [ ] Document: Page-flow and state (JWTs, cookies)
+    * [ ] Make the "Deploy instructions" prettier. Add more help. Mention `$civicrm_paths`
+    * [x] Doc: info.xml FIXMEs
+    * [ ] E2E tests for cookie/session behavior of `iframe.php`
+    * [ ] E2E tests for rendering
+    * [ ] E2E tests for settings `oembed_allow`, `oembed_allow_other`
+    * [x] Consider stricter X-Frame-Options/Content-Security-Policy
+* [ ] Important but not ASAP
+    * [ ] Stricter JWT: https://lab.civicrm.org/dev/core/-/issues/2994#note_156045
+        * If referrer doesn't match our iframe setup, then reset or reject the session id; probably includes test
+    * [ ] Add entry-point for UF=Standalone (boot; invoke; X-Frame-Options; etc)
+    * [ ] Add entry-point for UF=WordPress (script-file)
+    * [ ] Add entry-point for UF=Backdrop
+* [ ] Wishlist (Budget guided)
+    * [ ] Add entry-point for UF=WordPress (wp-rest)
+    * [ ] Share Workflow: Public Links (templates/CRM/common/SocialNetwork.tpl; crmRegion or hook)
+    * [ ] Share Workflow: Admin Links (Contribution Page, Event Page, Petition?)
+    * [ ] Share Workflow: Page Default/Singular/Standard/Built-in
+    * [ ] Share Workflow: Afform Share Widget
+    * [ ] Session-propagation targetting
+      On the last page, there are hyperlinks like "Tell Friend" and "Create PCP" and "Back to CiviCRM Home Page".
+      URL's generated by BAO (wchich calls to CRM_Utils_System::url()). Question is how to make a selector to change these?
+      - Tweak each call to url()? Maybe `Civi::url('civicrm/contribute/campaign...')->setSession(TRUE)
+      - Add some JS that filters all hyperlinks within a certain area? (`CRM.$('thankyoupage a).addSessionId('xyz')`)
+      - Add some alterContent to do the same as above? Or add a filter to the regeion?
+      - Define an attr for `<A HREF= SESSION=1`> or `<A HREF= CLASS="crm-session">`. But interpret client-side or server-side?
+    * [ ] IFRAME sizing: dynamic
+* [ ] Wishlist (Long term)
+    * [ ] Add entry-point for UF=Joomla
diff --git a/www/modules/civicrm/ext/iframe/iframe.civix.php b/www/modules/civicrm/ext/iframe/iframe.civix.php
new file mode 100644
index 000000000..89d459293
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/iframe.civix.php
@@ -0,0 +1,200 @@
+<?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_Iframe_ExtensionUtil {
+  const SHORT_NAME = 'iframe';
+  const LONG_NAME = 'iframe';
+  const CLASS_PREFIX = 'CRM_Iframe';
+
+  /**
+   * 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 = []): string {
+    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): string {
+    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_Iframe_ExtensionUtil as E;
+
+/**
+ * (Delegated) Implements hook_civicrm_config().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
+ */
+function _iframe_civix_civicrm_config($config = NULL) {
+  static $configured = FALSE;
+  if ($configured) {
+    return;
+  }
+  $configured = TRUE;
+
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
+  $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
+  set_include_path($include_path);
+  // Based on <compatibility>, this does not currently require mixin/polyfill.php.
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
+ */
+function _iframe_civix_civicrm_install() {
+  _iframe_civix_civicrm_config();
+  // Based on <compatibility>, this does not currently require mixin/polyfill.php.
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_enable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
+ */
+function _iframe_civix_civicrm_enable(): void {
+  _iframe_civix_civicrm_config();
+  // Based on <compatibility>, this does not currently require mixin/polyfill.php.
+}
+
+/**
+ * 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 _iframe_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' => $item['name'] ?? NULL,
+        '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 = _iframe_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item);
+      }
+    }
+    return $found;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_navigationMenu().
+ */
+function _iframe_civix_navigationMenu(&$nodes) {
+  if (!is_callable(['CRM_Core_BAO_Navigation', 'fixNavigationMenu'])) {
+    _iframe_civix_fixNavigationMenu($nodes);
+  }
+}
+
+/**
+ * Given a navigation menu, generate navIDs for any items which are
+ * missing them.
+ */
+function _iframe_civix_fixNavigationMenu(&$nodes) {
+  $maxNavID = 1;
+  array_walk_recursive($nodes, function($item, $key) use (&$maxNavID) {
+    if ($key === 'navID') {
+      $maxNavID = max($maxNavID, $item);
+    }
+  });
+  _iframe_civix_fixNavigationMenuItems($nodes, $maxNavID, NULL);
+}
+
+function _iframe_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'])) {
+      _iframe_civix_fixNavigationMenuItems($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']);
+    }
+  }
+}
diff --git a/www/modules/civicrm/ext/iframe/iframe.php b/www/modules/civicrm/ext/iframe/iframe.php
new file mode 100644
index 000000000..da62979e7
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/iframe.php
@@ -0,0 +1,40 @@
+<?php
+
+require_once 'iframe.civix.php';
+
+use CRM_Iframe_ExtensionUtil as E;
+
+/**
+ * Implements hook_civicrm_config().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config/
+ */
+function iframe_civicrm_config(&$config, ?array $flags = NULL): void {
+  _iframe_civix_civicrm_config($config);
+  if ($flags['civicrm']) {
+    \Civi::paths()->register('civicrm.iframe', function() {
+      return [
+        'path' => \Civi::paths()->getPath('[cms.root]/iframe.php'),
+        'url' => \Civi::paths()->getUrl('[cms.root]/iframe.php', 'absolute'),
+      ];
+    });
+  }
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
+ */
+function iframe_civicrm_install(): void {
+  _iframe_civix_civicrm_install();
+}
+
+/**
+ * Implements hook_civicrm_enable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
+ */
+function iframe_civicrm_enable(): void {
+  _iframe_civix_civicrm_enable();
+}
diff --git a/www/modules/civicrm/ext/iframe/info.xml b/www/modules/civicrm/ext/iframe/info.xml
new file mode 100644
index 000000000..84250d8cb
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/info.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<extension key="iframe" type="module">
+  <file>iframe</file>
+  <name>IFrame Connector</name>
+  <description>Enable external websites to embed CiviCRM pages using an HTML IFRAME.</description>
+  <license>AGPL-3.0</license>
+  <maintainer>
+    <author>Tim Otten</author>
+    <email>totten@civicrm.org</email>
+  </maintainer>
+  <urls>
+    <url desc="Documentation">https://docs.civicrm.org/</url>
+    <url desc="Chat">https://chat.civicrm.org/civicrm/channels/dev</url>
+    <url desc="Issues">https://lab.civicrm.org/dev/core/-/issues</url>
+    <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
+  </urls>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
+  <develStage>alpha</develStage>
+  <tags>
+    <tag>mgmt:hidden</tag>
+  </tags>
+  <compatibility>
+    <ver>5.74</ver>
+  </compatibility>
+  <comments>This is a new, undeveloped module</comments>
+  <classloader>
+    <psr0 prefix="CRM_" path="."/>
+    <psr4 prefix="Civi\" path="Civi"/>
+  </classloader>
+  <civix>
+    <namespace>CRM/Iframe</namespace>
+    <format>23.02.1</format>
+    <angularModule>crmIframe</angularModule>
+  </civix>
+  <mixins>
+    <mixin>mgd-php@1.0.0</mixin>
+    <mixin>setting-php@1.0.0</mixin>
+    <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>scan-classes@1.0.0</mixin>
+    <mixin>menu-xml@1.0.0</mixin>
+    <mixin>setting-admin@1.0.1</mixin>
+  </mixins>
+</extension>
diff --git a/www/modules/civicrm/ext/iframe/lib/IframeDrupalKernel.php b/www/modules/civicrm/ext/iframe/lib/IframeDrupalKernel.php
new file mode 100644
index 000000000..485466b41
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/lib/IframeDrupalKernel.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Civi\Iframe;
+
+use Drupal\Core\DrupalKernel;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * We want to set the cookie-name so that `iframe.php` doesn't try to use or change cookies
+ * issued by `index.php`. This will be... fun...
+ */
+class IframeDrupalKernel extends DrupalKernel {
+
+  protected function getContainerCacheKey() {
+    return parent::getContainerCacheKey() . ':oe1';
+  }
+
+  protected function getContainerBuilder() {
+    $container = parent::getContainerBuilder();
+    $container->addCompilerPass(new class implements CompilerPassInterface {
+
+      public function process(ContainerBuilder $container) {
+        $container->findDefinition('session_configuration')
+          ->setClass(IframeSessionConfiguration::class);
+      }
+
+    }, PassConfig::TYPE_BEFORE_REMOVING);
+    return $container;
+  }
+
+}
diff --git a/www/modules/civicrm/ext/iframe/lib/IframeSessionConfiguration.php b/www/modules/civicrm/ext/iframe/lib/IframeSessionConfiguration.php
new file mode 100644
index 000000000..f02866932
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/lib/IframeSessionConfiguration.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Civi\Iframe;
+
+use Drupal\Core\Session\SessionConfiguration;
+use Symfony\Component\HttpFoundation\Request;
+
+class IframeSessionConfiguration extends SessionConfiguration {
+
+  protected function getUnprefixedName(Request $request) {
+    return 'OE' . parent::getUnprefixedName($request);
+  }
+
+}
diff --git a/www/modules/civicrm/ext/iframe/settings/iframe.setting.php b/www/modules/civicrm/ext/iframe/settings/iframe.setting.php
new file mode 100644
index 000000000..e5f2d8105
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/settings/iframe.setting.php
@@ -0,0 +1,71 @@
+<?php
+
+use CRM_Iframe_ExtensionUtil as E;
+
+$basic = [
+  'group_name' => 'Iframe Preferences',
+  'group' => 'iframe',
+  'is_domain' => 1,
+  'is_contact' => 0,
+  'add' => '5.70',
+];
+
+return [
+  'iframe_allow' => $basic + [
+    'name' => 'iframe_allow',
+    'type' => 'Array',
+    'quick_form_type' => 'Select',
+    'html_type' => 'Select',
+    'html_attributes' => [
+      'multiple' => 1,
+      'class' => 'huge crm-select2',
+    ],
+    'default' => ['public', 'ajax'],
+    'title' => ts('Allow pages (Common)'),
+    'description' => ts('List of pages and use-cases which may be accessed via embedded IFRAME.'),
+    'pseudoconstant' => [
+      'callback' => 'CRM_Iframe_Utils::getAllowOptions',
+    ],
+  ],
+  'iframe_allow_other' => $basic + [
+    'name' => 'iframe_allow_other',
+    'type' => 'String',
+    'html_type' => 'textarea',
+    'default' => "",
+    'title' => ts('Allow pages (Other)'),
+    'description' => E::ts('List of other pages that may be embedded. One line per item. May use wildcards. Example: "<code>civicrm/ajax/*</code>"'),
+    'help_text' => NULL,
+  ],
+  'iframe_theme' => $basic + [
+    'name' => 'iframe_theme',
+    'type' => 'String',
+    'quick_form_type' => 'Select',
+    'html_type' => 'Select',
+    'html_attributes' => [
+      'class' => 'crm-select2',
+    ],
+    'pseudoconstant' => [
+      'callback' => 'call://themes/getAvailable',
+    ],
+    'default' => 'default',
+    'title' => E::ts('Theme'),
+    'description' => E::ts('Apply styling to elements inside the IFRAME. In "Automatic" mode, inherit styling from the CiviCRM frontend.'),
+    'help_text' => NULL,
+  ],
+  'iframe_layout' => $basic + [
+    'name' => 'iframe_layout',
+    'type' => 'String',
+    'quick_form_type' => 'Select',
+    'html_type' => 'Select',
+    'html_attributes' => [
+      'class' => 'huge crm-select2',
+    ],
+    'default' => 'auto',
+    'title' => E::ts('Layout'),
+    'description' => E::ts('Apply wrapping to the page layout.'),
+    'help_text' => NULL,
+    'pseudoconstant' => [
+      'callback' => 'CRM_Iframe_Utils::getLayoutOptions',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/ext/iframe/templates/CRM/Iframe/Page/InstallPage.tpl b/www/modules/civicrm/ext/iframe/templates/CRM/Iframe/Page/InstallPage.tpl
new file mode 100644
index 000000000..a786e3b6d
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/templates/CRM/Iframe/Page/InstallPage.tpl
@@ -0,0 +1,25 @@
+<p>{ts}You may need to manually create the file...{/ts}</p>
+
+<div>
+  <label>
+      {ts}Script Path{/ts}
+  </label>
+  <input readonly value="{$filePath|escape}">
+</div>
+
+<div>
+  <label>
+      {ts}Script URL{/ts}
+  </label>
+  <input readonly value="{$fileUrl|escape}">
+</div>
+
+{if $isCurrent}<h3>{ts}Code{/ts}</h3>{/if}
+{if !$isCurrent}<h3>{ts}New Code{/ts}</h3>{/if}
+
+<textarea readonly cols="100" rows="20">{$newCode|escape}</textarea>
+
+{if !$isCurrent}
+  <h3>{ts}Old Code{/ts}</h3>
+  <textarea readonly cols="100" rows="20">{$oldCode|escape}</textarea>
+{/if}
diff --git a/www/modules/civicrm/ext/iframe/templates/iframe-basic-page.tpl b/www/modules/civicrm/ext/iframe/templates/iframe-basic-page.tpl
new file mode 100644
index 000000000..de8773898
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/templates/iframe-basic-page.tpl
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="{$lang|escape}" dir="{$dir|escape}">
+
+<head>
+{$head}
+</head>
+
+<body class="civicrm-iframe-page">
+{$body}
+</body>
+
+</html>
diff --git a/www/modules/civicrm/ext/iframe/xml/Menu/iframe.xml b/www/modules/civicrm/ext/iframe/xml/Menu/iframe.xml
new file mode 100644
index 000000000..fcd66ac5c
--- /dev/null
+++ b/www/modules/civicrm/ext/iframe/xml/Menu/iframe.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<menu>
+  <item>
+    <path>civicrm/admin/iframe/install</path>
+    <page_callback>CRM_Iframe_Page_InstallPage</page_callback>
+    <title>IFRAME Installation</title>
+    <access_arguments>access CiviCRM</access_arguments>
+  </item>
+</menu>
diff --git a/www/modules/civicrm/ext/legacycustomsearches/CRM/Contact/Form/Search/Custom/FullText.php b/www/modules/civicrm/ext/legacycustomsearches/CRM/Contact/Form/Search/Custom/FullText.php
index d19435aaa..3eaff29a5 100644
--- a/www/modules/civicrm/ext/legacycustomsearches/CRM/Contact/Form/Search/Custom/FullText.php
+++ b/www/modules/civicrm/ext/legacycustomsearches/CRM/Contact/Form/Search/Custom/FullText.php
@@ -304,6 +304,8 @@ public function buildForm(&$form) {
     $form->applyFilter('__ALL__', 'trim');
     $form->add('text', 'text', ts('Find'), NULL, TRUE);
 
+    $form->assign('hasAllACLs', CRM_Core_Permission::giveMeAllACLs());
+
     // also add a select box to allow the search to be constrained
     $tables = ['' => ts('All tables')];
     /** @var CRM_Contact_Form_Search_Custom_FullText_AbstractPartialQuery $partialQuery */
diff --git a/www/modules/civicrm/ext/legacycustomsearches/README.md b/www/modules/civicrm/ext/legacycustomsearches/README.md
index 8f344fefa..f3b3e2947 100644
--- a/www/modules/civicrm/ext/legacycustomsearches/README.md
+++ b/www/modules/civicrm/ext/legacycustomsearches/README.md
@@ -1,44 +1,3 @@
-# legacycustomsearches
+# Legacy Custom Search Extension
 
-![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.2+
-* CiviCRM (*FIXME: Version number*)
-
-## Installation (Web UI)
-
-Learn more about installing CiviCRM extensions in the [CiviCRM Sysadmin Guide](https://docs.civicrm.org/sysadmin/en/latest/customize/extensions/).
-
-## 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 legacycustomsearches@https://github.com/FIXME/legacycustomsearches/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/legacycustomsearches.git
-cv en legacycustomsearches
-```
-
-## Getting Started
-
-(* FIXME: Where would a new user navigate to get started? What changes would they see? *)
-
-## Known Issues
-
-(* FIXME *)
+Contains the old "Custom Search" code for sites that require it for backward-compatability.
diff --git a/www/modules/civicrm/ext/legacycustomsearches/images/screenshot.png b/www/modules/civicrm/ext/legacycustomsearches/images/screenshot.png
deleted file mode 100644
index 6765b696f..000000000
Binary files a/www/modules/civicrm/ext/legacycustomsearches/images/screenshot.png and /dev/null differ
diff --git a/www/modules/civicrm/ext/legacycustomsearches/info.xml b/www/modules/civicrm/ext/legacycustomsearches/info.xml
index 22c2d2900..091e2424f 100644
--- a/www/modules/civicrm/ext/legacycustomsearches/info.xml
+++ b/www/modules/civicrm/ext/legacycustomsearches/info.xml
@@ -14,11 +14,11 @@
     <url desc="Support">http://FIXME</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>This is our old search system which has limited support. All new effort is on SearchKit</comments>
   <classloader>
@@ -28,7 +28,7 @@
   <mixins>
     <mixin>menu-xml@1.0.0</mixin>
     <mixin>mgd-php@1.0.0</mixin>
-    <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>smarty@1.0.0</mixin>
     <mixin>setting-php@1.0.0</mixin>
   </mixins>
   <civix>
diff --git a/www/modules/civicrm/ext/legacycustomsearches/legacycustomsearches.php b/www/modules/civicrm/ext/legacycustomsearches/legacycustomsearches.php
index fa19fc582..7917b105e 100644
--- a/www/modules/civicrm/ext/legacycustomsearches/legacycustomsearches.php
+++ b/www/modules/civicrm/ext/legacycustomsearches/legacycustomsearches.php
@@ -53,9 +53,11 @@ function legacycustomsearches_civicrm_buildGroupContactCache(array $savedSearch,
   $addSelect = "$groupID AS group_id";
   $ssParams = CRM_Contact_BAO_SavedSearch::getFormValues($savedSearchID);
 
-  $customSearchClass = $ssParams['customSearchClass'];
+  // A lack of customSearchClass key probably indicates a deeper problem, but shouldn't hold up the system
+  $customSearchClass = $ssParams['customSearchClass'] ?? NULL;
+
   // check if there is a special function - formatSavedSearchFields defined in the custom search form
-  if (method_exists($customSearchClass, 'formatSavedSearchFields')) {
+  if ($customSearchClass && method_exists($customSearchClass, 'formatSavedSearchFields')) {
     $customSearchClass::formatSavedSearchFields($ssParams);
   }
 
diff --git a/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom.tpl b/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom.tpl
index 89d6c23cf..5155fa7a6 100644
--- a/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom.tpl
+++ b/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom.tpl
@@ -11,10 +11,10 @@
    custom search .php file. If you want a different layout, clone and customize this file and point to new file using
    templateFile() function.*}
 <div class="crm-block crm-form-block crm-contact-custom-search-form-block">
-<div class="crm-accordion-wrapper crm-custom_search_form-accordion {if $rows}collapsed{/if}">
-    <div class="crm-accordion-header crm-master-accordion-header">
+<details class="crm-accordion-light crm-custom_search_form-accordion" {if $rows}{else}open{/if}>
+    <summary>
       {ts}Edit Search Criteria{/ts}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
     <div class="crm-accordion-body">
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
         <table class="form-layout-compressed">
@@ -27,8 +27,8 @@
             {/foreach}
         </table>
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-    </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+    </div>
+</details>
 </div><!-- /.crm-form-block -->
 
 {if $rowsEmpty || $rows}
diff --git a/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl b/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl
index fe35dced9..9edf27057 100644
--- a/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl
+++ b/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl
@@ -9,10 +9,10 @@
 *}
 {* Template for "Sample" custom search component. *}
 <div class="crm-form-block crm-search-form-block">
-  <div class="crm-accordion-wrapper crm-activity_search-accordion {if $rows}collapsed{/if}">
-    <div class="crm-accordion-header crm-master-accordion-header">
+  <details class="crm-accordion-light crm-activity_search-accordion" {if $rows}{else}open{/if}>
+    <summary>
       {ts}Edit Search Criteria{/ts}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
     <div class="crm-accordion-body">
       <div id="searchForm" class="crm-block crm-form-block crm-contact-custom-search-activity-search-form-block">
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
@@ -27,8 +27,8 @@
         </table>
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
       </div>
-    </div><!-- /.crm-accordion-body -->
-  </div><!-- /.crm-accordion-wrapper -->
+    </div>
+  </details>
 </div><!-- /.crm-form-block -->
 
 {if $rowsEmpty || $rows}
diff --git a/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl b/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl
index 7a412239a..cd7684529 100644
--- a/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl
+++ b/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl
@@ -11,10 +11,10 @@
    custom search .php file. If you want a different layout, clone and customize this file and point to new file using
    templateFile() function.*}
 <div class="crm-block crm-form-block crm-contact-custom-search-form-block">
-<div class="crm-accordion-wrapper crm-custom_search_form-accordion {if $rows}collapsed{/if}">
-    <div class="crm-accordion-header crm-master-accordion-header">
+<details class="crm-accordion-light crm-custom_search_form-accordion" {if $rows}{else}open{/if}>
+    <summary>
       {ts}Edit Search Criteria{/ts}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
     <div class="crm-accordion-body">
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
         <table class="form-layout-compressed">
@@ -56,8 +56,8 @@
            </tr>
         </table>
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-    </div><!-- /.crm-accordion-body -->
-    </div><!-- /.crm-accordion-wrapper -->
+    </div>
+    </details>
     </div><!-- /.crm-form-block -->
 
 {if $rowsEmpty || $rows}
diff --git a/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl b/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
index 781088fa9..65a689feb 100644
--- a/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
+++ b/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
@@ -8,10 +8,10 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-contact-custom-search-form-block">
-<div class="crm-accordion-wrapper crm-custom_search_form-accordion {if $rows}collapsed{/if}">
-    <div class="crm-accordion-header crm-master-accordion-header">
+<details class="crm-accordion-light crm-custom_search_form-accordion" {if $rows}{else}open{/if}>
+    <summary>
       {ts}Edit Search Criteria{/ts}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
     <div class="crm-accordion-body">
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
         <table class="form-layout-compressed">
@@ -36,8 +36,8 @@
             </tr>
         </table>
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-    </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+    </div>
+</details>
 </div><!-- /.crm-form-block -->
 
 {if $rowsEmpty || $rows}
diff --git a/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/EventDetails.tpl b/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/EventDetails.tpl
index 2ad2a0bea..00513f8b4 100644
--- a/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/EventDetails.tpl
+++ b/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/EventDetails.tpl
@@ -11,10 +11,10 @@
 {assign var="showBlock" value="'searchForm'"}
 {assign var="hideBlock" value="'searchForm_show','searchForm_hide'"}
 <div class="crm-block crm-form-block crm-search-form-block">
-  <div class="crm-accordion-wrapper crm-eventDetails_search-accordion {if $rows}collapsed{/if}">
-    <div class="crm-accordion-header crm-master-accordion-header">
+  <details class="crm-accordion-light crm-eventDetails_search-accordion" {if $rows}{else}open{/if}>
+    <summary>
       {ts}Edit Search Criteria{/ts}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
     <div class="crm-accordion-body">
       <div id="searchForm" class="crm-block crm-form-block crm-contact-custom-search-eventDetails-form-block">
           <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
@@ -43,7 +43,7 @@
           <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
       </div>
     </div>
-  </div>
+  </details>
 
 {if $rowsEmpty}
     {include file="CRM/Contact/Form/Search/Custom/EmptyResults.tpl"}
diff --git a/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl b/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
index 1b3ab635b..fee4a7cb2 100644
--- a/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
+++ b/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
@@ -14,10 +14,10 @@
 
 {strip}
 <div class="crm-block crm-form-block crm-basic-criteria-form-block">
-    <div class="crm-accordion-wrapper crm-case_search-accordion {if $rows}collapsed{/if}">
-     <div class="crm-accordion-header crm-master-accordion-header">
+    <details class="crm-accordion-light crm-case_search-accordion" {if $rows}{else}open{/if}>
+     <summary>
         {$editTitle}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
     <div class="crm-accordion-body">
         <div class="crm-section sort_name-section">
           <div class="label">
@@ -87,7 +87,7 @@
             </div>
 
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
-    </div><!-- /.crm-accordion-body -->
-    </div><!-- /.crm-accordion-wrapper -->
+    </div>
+    </details>
 </div><!-- /.crm-form-block -->
 {/strip}
diff --git a/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl b/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
index 6f3164227..2e9dd0b49 100644
--- a/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
+++ b/www/modules/civicrm/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
@@ -11,10 +11,10 @@
    custom search .php file. If you want a different layout, clone and customize this file and point to new file using
    templateFile() function.*}
 <div class="crm-block crm-form-block crm-contact-custom-search-form-block">
-<div class="crm-accordion-wrapper crm-custom_search_form-accordion {if $rows}collapsed{/if}">
-    <div class="crm-accordion-header crm-master-accordion-header">
+<details class="crm-accordion-light crm-custom_search_form-accordion" {if $rows}{else}open{/if}>
+    <summary>
       {ts}Edit Search Criteria{/ts}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
     <div class="crm-accordion-body">
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
         <table class="form-layout-compressed">
@@ -34,8 +34,8 @@
            <tr><td class="label">{$form.tag.label}</td><td>{$form.tag.html}</td></tr>
         </table>
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-    </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+    </div>
+</details>
 </div><!-- /.crm-form-block -->
 
 {if $rowsEmpty || $rows}
diff --git a/www/modules/civicrm/ext/message_admin/README.md b/www/modules/civicrm/ext/message_admin/README.md
index 1a7652d84..0f536f08d 100644
--- a/www/modules/civicrm/ext/message_admin/README.md
+++ b/www/modules/civicrm/ext/message_admin/README.md
@@ -1,44 +1 @@
-# message_admin
-
-![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.2+
-* CiviCRM (*FIXME: Version number*)
-
-## Installation (Web UI)
-
-Learn more about installing CiviCRM extensions in the [CiviCRM Sysadmin Guide](https://docs.civicrm.org/sysadmin/en/latest/customize/extensions/).
-
-## 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 message_admin@https://github.com/FIXME/message_admin/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/message_admin.git
-cv en message_admin
-```
-
-## Getting Started
-
-(* FIXME: Where would a new user navigate to get started? What changes would they see? *)
-
-## Known Issues
-
-(* FIXME *)
+# Message Admin Extension
diff --git a/www/modules/civicrm/ext/message_admin/images/screenshot.png b/www/modules/civicrm/ext/message_admin/images/screenshot.png
deleted file mode 100644
index 6765b696f..000000000
Binary files a/www/modules/civicrm/ext/message_admin/images/screenshot.png and /dev/null differ
diff --git a/www/modules/civicrm/ext/message_admin/info.xml b/www/modules/civicrm/ext/message_admin/info.xml
index 038abad0f..a8ae5a086 100644
--- a/www/modules/civicrm/ext/message_admin/info.xml
+++ b/www/modules/civicrm/ext/message_admin/info.xml
@@ -14,11 +14,11 @@
     <url desc="Support">http://civicrm.org</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <requires>
     <ext>org.civicrm.afform</ext>
@@ -31,7 +31,7 @@
   <mixins>
     <mixin>ang-php@1.0.0</mixin>
     <mixin>menu-xml@1.0.0</mixin>
-    <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>smarty@1.0.0</mixin>
   </mixins>
   <civix>
     <namespace>CRM/MessageAdmin</namespace>
diff --git a/www/modules/civicrm/ext/oauth-client/CRM/OAuth/BAO/OAuthContactToken.php b/www/modules/civicrm/ext/oauth-client/CRM/OAuth/BAO/OAuthContactToken.php
index 8e8c88c91..16d24528b 100644
--- a/www/modules/civicrm/ext/oauth-client/CRM/OAuth/BAO/OAuthContactToken.php
+++ b/www/modules/civicrm/ext/oauth-client/CRM/OAuth/BAO/OAuthContactToken.php
@@ -1,6 +1,8 @@
 <?php
 
-class CRM_OAuth_BAO_OAuthContactToken extends CRM_OAuth_DAO_OAuthContactToken {
+use Civi\Api4\Event\AuthorizeRecordEvent;
+
+class CRM_OAuth_BAO_OAuthContactToken extends CRM_OAuth_DAO_OAuthContactToken implements \Civi\Core\HookInterface {
 
   /**
    * Create or update OAuthContactToken based on array-data
@@ -26,21 +28,18 @@ public static function del($id) {
   }
 
   /**
-   * @param string $entityName
-   * @param string $action
-   * @param array $record
-   * @param $userId
-   * @return bool
    * @see \Civi\Api4\Utils\CoreUtil::checkAccessRecord
    */
-  public static function _checkAccess(string $entityName, string $action, array $record, $userId): bool {
+  public static function self_civi_api4_authorizeRecord(AuthorizeRecordEvent $e): void {
+    $record = $e->getRecord();
+    $userId = $e->getUserID();
     try {
       $record['check_permissions'] = TRUE;
       self::fillAndValidate($record, $userId);
-      return TRUE;
+      $e->setAuthorized(TRUE);
     }
-    catch (\Civi\API\Exception\UnauthorizedException $e) {
-      return FALSE;
+    catch (\Civi\API\Exception\UnauthorizedException $exception) {
+      $e->setAuthorized(FALSE);
     }
   }
 
@@ -59,7 +58,7 @@ private static function fillAndValidate(&$record, $userId) {
       if (!CRM_Contact_BAO_Contact_Permission::allow($cid, CRM_Core_Permission::EDIT, $userId)) {
         throw new \Civi\API\Exception\UnauthorizedException('Access denied to contact');
       }
-      if (!CRM_Core_Permission::check([['manage all OAuth contact tokens', 'manage my OAuth contact tokens']], $userId)) {
+      if (!CRM_Core_Permission::check('manage my OAuth contact tokens', $userId)) {
         throw new \Civi\API\Exception\UnauthorizedException('Access denied to OAuthContactToken');
       }
       if (
diff --git a/www/modules/civicrm/ext/oauth-client/Civi/Api4/OAuthContactToken.php b/www/modules/civicrm/ext/oauth-client/Civi/Api4/OAuthContactToken.php
index 8c361adb0..99aa03bbc 100644
--- a/www/modules/civicrm/ext/oauth-client/Civi/Api4/OAuthContactToken.php
+++ b/www/modules/civicrm/ext/oauth-client/Civi/Api4/OAuthContactToken.php
@@ -15,12 +15,7 @@ class OAuthContactToken extends Generic\DAOEntity {
   public static function permissions(): array {
     return [
       'meta' => ['access CiviCRM'],
-      'default' => [
-        [
-          'manage my OAuth contact tokens',
-          'manage all OAuth contact tokens',
-        ],
-      ],
+      'default' => ['manage my OAuth contact tokens'],
     ];
   }
 
diff --git a/www/modules/civicrm/ext/oauth-client/info.xml b/www/modules/civicrm/ext/oauth-client/info.xml
index 04cb08e25..61a1a94a8 100644
--- a/www/modules/civicrm/ext/oauth-client/info.xml
+++ b/www/modules/civicrm/ext/oauth-client/info.xml
@@ -14,11 +14,11 @@
     <url desc="Support">https://lab.civicrm.org/dev/core/-/issues</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <requires>
     <ext version="~4.5">org.civicrm.afform</ext>
@@ -33,7 +33,7 @@
     <mixin>ang-php@1.0.0</mixin>
     <mixin>menu-xml@1.0.0</mixin>
     <mixin>setting-php@1.0.0</mixin>
-    <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>smarty@1.0.0</mixin>
     <mixin>entity-types-php@1.0.0</mixin>
   </mixins>
   <civix>
diff --git a/www/modules/civicrm/ext/oauth-client/oauth_client.php b/www/modules/civicrm/ext/oauth-client/oauth_client.php
index fd23498bf..7d2b619da 100644
--- a/www/modules/civicrm/ext/oauth-client/oauth_client.php
+++ b/www/modules/civicrm/ext/oauth-client/oauth_client.php
@@ -23,24 +23,25 @@ function oauth_client_civicrm_config(&$config) {
 function oauth_client_civicrm_permission(&$permissions) {
   $prefix = ts('CiviCRM') . ': ';
   $permissions['manage OAuth client'] = [
-    $prefix . ts('manage OAuth client'),
-    ts('Create and delete OAuth client connections'),
+    'label' => $prefix . ts('manage OAuth client'),
+    'description' => ts('Create and delete OAuth client connections'),
   ];
   $permissions['manage OAuth client secrets'] = [
-    $prefix . ts('manage OAuth client secrets'),
-    ts('Access OAuth secrets'),
+    'label' => $prefix . ts('manage OAuth client secrets'),
+    'description' => ts('Access OAuth secrets'),
   ];
   $permissions['create OAuth tokens via auth code flow'] = [
-    $prefix . ts('create OAuth tokens via auth code flow'),
-    ts('Create OAuth tokens via the authorization code flow'),
+    'label' => $prefix . ts('create OAuth tokens via auth code flow'),
+    'description' => ts('Create OAuth tokens via the authorization code flow'),
   ];
   $permissions['manage my OAuth contact tokens'] = [
-    $prefix . ts('manage my OAuth contact tokens'),
-    ts("Manage user's own OAuth tokens"),
+    'label' => $prefix . ts('manage my OAuth contact tokens'),
+    'description' => ts("Manage user's own OAuth tokens"),
   ];
   $permissions['manage all OAuth contact tokens'] = [
-    $prefix . ts('manage all OAuth contact tokens'),
-    ts("Manage OAuth tokens for all contacts"),
+    'label' => $prefix . ts('manage all OAuth contact tokens'),
+    'description' => ts("Manage OAuth tokens for all contacts"),
+    'implies' => ['manage my OAuth contact tokens'],
   ];
 }
 
diff --git a/www/modules/civicrm/ext/oauth-client/sql/auto_install.sql b/www/modules/civicrm/ext/oauth-client/sql/auto_install.sql
index 7c27e6ce5..8aa045207 100644
--- a/www/modules/civicrm/ext/oauth-client/sql/auto_install.sql
+++ b/www/modules/civicrm/ext/oauth-client/sql/auto_install.sql
@@ -47,7 +47,7 @@ CREATE TABLE `civicrm_oauth_client` (
   INDEX `UI_provider`(provider),
   INDEX `UI_guid`(guid)
 )
-ENGINE=InnoDB;
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 
 -- /*******************************************************
 -- *
@@ -76,7 +76,7 @@ CREATE TABLE `civicrm_oauth_contact_token` (
   CONSTRAINT FK_civicrm_oauth_contact_token_client_id FOREIGN KEY (`client_id`) REFERENCES `civicrm_oauth_client`(`id`) ON DELETE CASCADE,
   CONSTRAINT FK_civicrm_oauth_contact_token_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
 )
-ENGINE=InnoDB;
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 
 -- /*******************************************************
 -- *
@@ -103,4 +103,4 @@ CREATE TABLE `civicrm_oauth_systoken` (
   INDEX `UI_tag`(tag),
   CONSTRAINT FK_civicrm_oauth_systoken_client_id FOREIGN KEY (`client_id`) REFERENCES `civicrm_oauth_client`(`id`) ON DELETE CASCADE
 )
-ENGINE=InnoDB;
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
diff --git a/www/modules/civicrm/ext/oauth-client/sql/upgrade_0001.sql b/www/modules/civicrm/ext/oauth-client/sql/upgrade_0001.sql
index 17fc3191a..550f418e1 100644
--- a/www/modules/civicrm/ext/oauth-client/sql/upgrade_0001.sql
+++ b/www/modules/civicrm/ext/oauth-client/sql/upgrade_0001.sql
@@ -70,4 +70,4 @@ CREATE TABLE `civicrm_oauth_contact_token` (
   )
 
 ,          CONSTRAINT FK_civicrm_oauth_contact_token_client_id FOREIGN KEY (`client_id`) REFERENCES `civicrm_oauth_client`(`id`) ON DELETE CASCADE,          CONSTRAINT FK_civicrm_oauth_contact_token_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
-)  ENGINE=InnoDB  ;
+)  ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
diff --git a/www/modules/civicrm/ext/oauth-client/templates/CRM/OAuth/Page/Return.tpl b/www/modules/civicrm/ext/oauth-client/templates/CRM/OAuth/Page/Return.tpl
index 093950846..87c323143 100644
--- a/www/modules/civicrm/ext/oauth-client/templates/CRM/OAuth/Page/Return.tpl
+++ b/www/modules/civicrm/ext/oauth-client/templates/CRM/OAuth/Page/Return.tpl
@@ -1,8 +1,8 @@
 {if $error}
-    <div class="crm-accordion-wrapper">
-        <div class="crm-accordion-header">
+    <details class="crm-accordion-bold" open>
+        <summary>
             {ts}OAuth Error Details{/ts}
-        </div>
+        </summary>
         <div class="crm-accordion-body">
             <ul>
                 <li><strong>{ts}Error type:{/ts}</strong> {$error.error|escape:'html'}</li>
@@ -12,30 +12,30 @@
                 <li><strong>{ts}Error URI:{/ts}</strong> <code>{$error.error_uri|escape:'html'}</code></li>
             </ul>
         </div>
-    </div>
+    </details>
 {else}
     <p>{ts}An OAuth token was created!{/ts}</p>
     <p>{ts}There is no clear "next step", so this may be a new integration. Please update the integration to define a next step via "hook_civicrm_oauthReturn" or "landingUrl".{/ts}</p>
 {/if}
 
 {if $stateJson}
-    <div class="crm-accordion-wrapper collapsed">
-        <div class="crm-accordion-header">
+    <details class="crm-accordion-bold">
+        <summary>
             {ts}OAuth State{/ts}
-        </div>
+        </summary>
         <div class="crm-accordion-body">
             <pre>{$stateJson}</pre>
         </div>
-    </div>
+    </details>
 {/if}
 
 {if $tokenJson}
-    <div class="crm-accordion-wrapper collapsed">
-        <div class="crm-accordion-header">
+    <details class="crm-accordion-bold">
+        <summary>
             {ts}OAuth Token{/ts}
-        </div>
+        </summary>
         <div class="crm-accordion-body">
             <pre>{$tokenJson}</pre>
         </div>
-    </div>
+    </details>
 {/if}
diff --git a/www/modules/civicrm/ext/oauth-client/tests/phpunit/api/v4/OAuthSessionTokenTest.php b/www/modules/civicrm/ext/oauth-client/tests/phpunit/api/v4/OAuthSessionTokenTest.php
index 7979155e4..61407cab5 100644
--- a/www/modules/civicrm/ext/oauth-client/tests/phpunit/api/v4/OAuthSessionTokenTest.php
+++ b/www/modules/civicrm/ext/oauth-client/tests/phpunit/api/v4/OAuthSessionTokenTest.php
@@ -25,7 +25,7 @@ public function setUpHeadless(): \Civi\Test\CiviEnvBuilder {
   public function setUp(): void {
     parent::setUp();
     $this->assertEquals(0, CRM_Core_DAO::singleValueQuery('SELECT count(*) FROM civicrm_oauth_client'));
-    $this->assertNull(CRM_Core_Session::singleton()->get('OAuthSessionTokens') ?? NULL);
+    $this->assertNull(CRM_Core_Session::singleton()->get('OAuthSessionTokens'));
   }
 
   protected function tearDown(): void {
diff --git a/www/modules/civicrm/ext/oembed/CRM/Oembed/Page/Oembed.php b/www/modules/civicrm/ext/oembed/CRM/Oembed/Page/Oembed.php
new file mode 100644
index 000000000..8bc725a88
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/CRM/Oembed/Page/Oembed.php
@@ -0,0 +1,100 @@
+<?php
+
+use CRM_Oembed_ExtensionUtil as E;
+
+/**
+ * The `civicrm/oembed` route supports these modes:
+ *
+ * - civicrm/oembed?format=json&url=ABSOLUTE_URL
+ * - civicrm/oembed?format=xml&url=ABSOLUTE_URL
+ *
+ * The absolute URL must be an internal reference (matching the current domain or BASE_URL).
+ * It may be a reference to `civicrm/share?url=OTHER_ABSOLUTE_URL` (in which case will be
+ * recursively evaluated).
+ *
+ * @link https://oembed.com
+ */
+class CRM_Oembed_Page_Oembed extends CRM_Core_Page {
+
+  public function run() {
+    if ($_SERVER['REQUEST_METHOD'] !== 'GET') {
+      throw new \CRM_Core_Exception("Unsupported method");
+    }
+
+    $format = CRM_Utils_Request::retrieve('format', 'String') ?: 'share';
+    $options = [];
+    $this->extractOptions($options, $_GET);
+
+    try {
+      $targetUrl = CRM_Utils_Request::retrieve('url', 'String');
+      $targetUrlParsed = \CRM_Utils_Url::parseInternalRoute($targetUrl);
+      parse_str($targetUrlParsed['query'] ?? '', $targetUrlQuery);
+    }
+    catch (\CRM_Core_Exception $e) {
+      return $this->sendError('Invalid URL: ' . $e->getMessage());
+    }
+
+    if ($targetUrlParsed['path'] === 'civicrm/share') {
+      $this->extractOptions($options, $targetUrlQuery);
+      try {
+        $effectiveUrl = $targetUrlQuery['url'];
+        $effectiveUrlParsed = \CRM_Utils_Url::parseInternalRoute($effectiveUrl);
+        parse_str($effectiveUrlParsed['query'] ?? '', $effectiveUrlQuery);
+      }
+      catch (\CRM_Core_Exception $e) {
+        return $this->sendError('Invalid URL (nested): ' . $e->getMessage());
+      }
+    }
+    else {
+      $effectiveUrl = $targetUrl;
+      $effectiveUrlParsed = $targetUrlParsed;
+      $effectiveUrlQuery = $targetUrlQuery;
+    }
+
+    if (!Civi::service('oembed')->isAllowedRoute($effectiveUrlParsed['path'])) {
+      return $this->sendError('Route does permit embedding');
+    }
+
+    switch ($format) {
+      case 'json':
+        $oembed = Civi::service('oembed')->create($effectiveUrlParsed['path'], $effectiveUrlQuery, $options);
+        return $this->send(200, ['Content-type' => 'application/json'], json_encode($oembed));
+
+      case 'xml':
+        $oembed = Civi::service('oembed')->create($effectiveUrlParsed['path'], $effectiveUrlQuery, $options);
+        return $this->send(200, ['Content-type' => 'text/xml'], $this->encodeXml($oembed));
+
+      default:
+        return $this->sendError('Unsupported format');
+    }
+  }
+
+  private function send(int $status, array $headers, string $body) {
+    $response = new \GuzzleHttp\Psr7\Response($status, $headers, $body);
+    CRM_Utils_System::sendResponse($response);
+  }
+
+  private function sendError(string $body) {
+    return $this->send(501, ['Content-type' => 'text/plain'], $body);
+  }
+
+  private function encodeXml(array $oembed) {
+    $xml = new SimpleXMLElement('<?xml version="1.0" encoding="utf-8" standalone="yes"?><oembed></oembed>');
+    foreach ($oembed as $key => $value) {
+      $xml->addChild($key, htmlentities($value));
+    }
+    return $xml->asXML();
+  }
+
+  /**
+   * Given a set of GET query parameters, find any that are intended as control-options for oEmbed.
+   */
+  private function extractOptions(array &$options, array $newValues) {
+    foreach (['maxwidth', 'maxheight'] as $field) {
+      if (isset($newValues[$field]) && is_numeric($newValues[$field])) {
+        $options[$field] = $newValues[$field];
+      }
+    }
+  }
+
+}
diff --git a/www/modules/civicrm/ext/oembed/CRM/Oembed/Page/OembedShare.php b/www/modules/civicrm/ext/oembed/CRM/Oembed/Page/OembedShare.php
new file mode 100644
index 000000000..ce322136b
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/CRM/Oembed/Page/OembedShare.php
@@ -0,0 +1,34 @@
+<?php
+
+use CRM_Oembed_ExtensionUtil as E;
+
+/**
+ * The `civicrm/share?url=ABSOLUTE_URL` route defines a stub/placeholder.
+ * It can be used to generate alternative oEmbed links with coerced parameters
+ * (such as `maxwidth` or `maxheight`).
+ */
+class CRM_Oembed_Page_OembedShare extends CRM_Core_Page {
+
+  public function run() {
+    $url = CRM_Utils_Request::retrieve('url', 'String');
+
+    $parsedUrl = \CRM_Utils_Url::parseInternalRoute($url);
+    parse_str($parsedUrl['query'] ?? '', $parsedUrlQuery);
+
+    if (!Civi::service('oembed')->isAllowedRoute($parsedUrl['path'])) {
+      throw new \CRM_Core_Exception('Route does permit sharing');
+    }
+
+    // The actual <HEAD><LINK></HEAD> tags are generated by OembedDiscovery.
+
+    CRM_Core_Region::instance('oembed-share')->add([
+      'script' => sprintf("window.location.href = %s;", json_encode((string) $url)),
+    ]);
+    CRM_Core_Region::instance('oembed-share')->add([
+      'markup' => htmlentities(ts('Redirecting...')),
+    ]);
+
+    return parent::run();
+  }
+
+}
diff --git a/www/modules/civicrm/ext/oembed/Civi/Oembed/Oembed.php b/www/modules/civicrm/ext/oembed/Civi/Oembed/Oembed.php
new file mode 100644
index 000000000..ba78f97b6
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/Civi/Oembed/Oembed.php
@@ -0,0 +1,131 @@
+<?php
+namespace Civi\Oembed;
+
+use Civi\Core\Service\AutoService;
+
+/**
+ * @service oembed
+ */
+class Oembed extends AutoService {
+
+  private int $minPixels = 100;
+
+  private int $maxPixels = 8000;
+
+  private int $defaultWidth = 600;
+
+  private int $defaultHeight = 400;
+
+  public function create(string $path, array $query = [], array $options = []): array {
+    $options = $this->normalizeOptions($options);
+    $query = $this->findPropagatedParams($query);
+
+    $route = \CRM_Core_Menu::get($path);
+    $result = [
+      'type' => 'rich',
+      'version' => '1.0',
+      'title' => $route['title'],
+      // 'author_name' => 'Bees',
+      // 'author_url' => 'http://www.flickr.com/photos/bees/',
+      // 'cache_age' => 'xxx',
+      'provider_name' => \CRM_Core_BAO_Domain::getDomain()->name,
+      'provider_url' => \Civi::paths()->getUrl('[cms.root]/.', 'absolute'),
+      'html' => sprintf('<iframe src="%s" width="%s" height="%d"></iframe>',
+        \Civi::url("iframe://$path")->addQuery($query),
+        $options['maxwidth'],
+        $options['maxheight']
+      ),
+      'width' => $options['maxwidth'],
+      'height' => $options['maxheight'],
+    ];
+
+    // Allow other components to alter values like `title` or `provider_name`.
+    \Civi::dispatcher()->dispatch('hook_civicrm_oembed', \Civi\Core\Event\GenericHookEvent::create([
+      'oembed' => &$result,
+      'request' => [
+        'route' => $route,
+        'path' => $path,
+        'query' => $query,
+      ],
+    ]));
+
+    return $result;
+  }
+
+  /**
+   * @param string $path
+   * @param array $query
+   * @param array $options
+   *   Ex: ['maxwidth' => '102']
+   * @return string
+   */
+  public function createLinkTags(string $path, array $query = [], array $options = []): string {
+    $oembed = static::create($path, $query);
+    $query = $this->findPropagatedParams($query);
+    $url = \Civi::url('frontend://civicrm/oembed', 'a')->addQuery([
+      'url' => (string) \Civi::url('frontend://' . $path, 'a')->addQuery($query),
+    ]);
+    $url->addQuery(\CRM_Utils_Array::subset($options, ['maxwidth', 'maxheight']));
+
+    $buf = '';
+    $buf .= sprintf("<link rel='alternate' type='application/json+oembed' href='%s' title='%s' />\n",
+      (clone $url)->addQuery('format=json'),
+      htmlentities($oembed['title'])
+    );
+    $buf .= sprintf("<link rel='alternate' type='text/xml+oembed' href='%s' title='%s' />\n",
+      (clone $url)->addQuery('format=xml'),
+      htmlentities($oembed['title'])
+    );
+    return $buf;
+  }
+
+  protected function normalizeOptions(array $options): array {
+    $result = $options;
+    $result['maxwidth'] = $this->applyPixelConstraint($result['maxwidth'] ?? $this->defaultWidth);
+    $result['maxheight'] = $this->applyPixelConstraint($result['maxheight'] ?? $this->defaultHeight);
+    return $result;
+  }
+
+  private function applyPixelConstraint($value): int {
+    $value = \CRM_Utils_Type::validate($value, 'Integer');
+    $value = max($value, $this->minPixels);
+    $value = min($value, $this->maxPixels);
+    return $value;
+  }
+
+  /**
+   * Identify any query parameters that should be preserved/propagated to the equivalent oEmbed request.
+   *
+   * Note that support for this may vary by oEmbed client. When using <LINK>-based discovery,
+   * some clients (eg WordPress) may interject with their preferred value of `url=XYZ`.
+   */
+  public function findPropagatedParams(array $query): array {
+    $urlVar = \CRM_Core_Config::singleton()->userFrameworkURLVar;
+    $result = [];
+    foreach ($query as $key => $value) {
+      if ($key[0] !== '_' && !in_array($key, [$urlVar])) {
+        $result[$key] = $value;
+      }
+    }
+    return $result;
+  }
+
+  /**
+   * Do we permit embedding of this route?
+   *
+   * @param string $path
+   * @return bool
+   */
+  public function isAllowedRoute(string $path): bool {
+    return \Civi::service('iframe.router')->isAllowedRoute($path) && !preg_match(';^civicrm/(ajax|asset);', $path);
+  }
+
+  public function getDefaultWidth(): int {
+    return $this->defaultWidth;
+  }
+
+  public function getDefaultHeight(): int {
+    return $this->defaultHeight;
+  }
+
+}
diff --git a/www/modules/civicrm/ext/oembed/Civi/Oembed/OembedDiscovery.php b/www/modules/civicrm/ext/oembed/Civi/Oembed/OembedDiscovery.php
new file mode 100644
index 000000000..5007cb715
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/Civi/Oembed/OembedDiscovery.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Civi\Oembed;
+
+use Civi;
+use Civi\Core\Service\AutoService;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Emit tags so that downstream users know that pages are embeddable.
+ *
+ * @service oembed.discovery
+ */
+class OembedDiscovery extends AutoService implements EventSubscriberInterface {
+
+  public static function getSubscribedEvents() {
+    return [
+      '&civi.invoke.auth' => ['onInvoke', 100],
+    ];
+  }
+
+  public function onInvoke(array $path) {
+    if ($_SERVER['REQUEST_METHOD'] !== 'GET') {
+      return;
+    }
+
+    $pathStr = implode('/', $path);
+    $oembed = Civi::service('oembed');
+    if (!$oembed->isAllowedRoute($pathStr)) {
+      return;
+    }
+
+    // In standard discovery, any supported page (aka public pages) will include <LINK>
+    // tag to advertise its support for oEmbed.
+    if (Civi::settings()->get('oembed_standard') || $pathStr === 'civicrm/share') {
+      $query = $oembed->findPropagatedParams($_GET);
+      \CRM_Core_Region::instance('html-header')->add([
+        'name' => 'oembed',
+        'markup' => $oembed->createLinkTags($pathStr, $query),
+      ]);
+    }
+
+    // In explicit sharing, the administrator sees a panel with options for sharing.
+    if (Civi::settings()->get('oembed_share') && \CRM_Core_Permission::check('administer oembed')) {
+      $query = $oembed->findPropagatedParams($_GET);
+
+      $data = [
+        'page' => Civi::url('frontend://' . $pathStr, 'a')->addQuery($query),
+        'iframe' => Civi::url('iframe://' . $pathStr, 'a')->addQuery($query),
+        'share' => Civi::url('frontend://civicrm/share', 'a')->addQuery(['url' => Civi::url('frontend://' . $pathStr, 'a')->addQuery($query)]),
+      ];
+      $options = [
+        'maxwidth' => Civi::service('oembed')->getDefaultWidth(),
+        'maxheight' => Civi::service('oembed')->getDefaultHeight(),
+      ];
+
+      Civi::service('angularjs.loader')->addModules(['crmOembedSharing']);
+      \CRM_Core_Region::instance('page-footer')->add([
+        'name' => 'oembed-share',
+        'markup' => sprintf('<crm-angular-js modules="crmOembedSharing"> <crm-oembed-sharing urls="%s" options="%s" /> </crm-angular-js>',
+          htmlentities(\CRM_Utils_JS::encode($data)),
+          htmlentities(\CRM_Utils_JS::encode($options)),
+        ),
+      ]);
+    }
+  }
+
+}
diff --git a/www/modules/civicrm/ext/oembed/LICENSE.txt b/www/modules/civicrm/ext/oembed/LICENSE.txt
new file mode 100644
index 000000000..cd2ae9c72
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/LICENSE.txt
@@ -0,0 +1,667 @@
+Package: oembed
+Copyright (C) 2024, 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/www/modules/civicrm/ext/oembed/README.md b/www/modules/civicrm/ext/oembed/README.md
new file mode 100644
index 000000000..ce5d093c6
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/README.md
@@ -0,0 +1,30 @@
+# oembed (Developmental)
+
+The [oEmbed protocol](https://oembed.com/) allows you to share content between websites:
+
+> oEmbed is a format for allowing an embedded representation of a URL on
+> third party sites.  The simple API allows a website to display embedded
+> content (such as photos or videos) when a user posts a link to that
+> resource, without having to parse the resource directly.
+
+With this extension, CiviCRM acts as an oEmbed provider. It is under development.
+
+oEmbed providers and oEmbed clients exchange small snippets of HTML to represent the embedded content.
+While the protocol theoretically allows many tags, prudent behavior on the open Internet is to limit
+the range of tags. For content which needs rich information, the typical approach is to convey
+an `<iframe>` tag.
+
+Consequently, the `oembed` extension relies heavily on the `iframe` extension.
+
+## "Share" Links
+
+The oEmbed protocol tends to assume that there is only one way to embed a piece of content.  If you want to embed
+similar content in two different ways, then you need two URLs. For example, with a contribution page, you might
+have both these possibilities:
+
+* Paste a link to the contribution-page. Display a widget with fine-tuned call-to-action.
+* Paste a link to the contribution-page. Display a full copy of the page (wherein the user can actually donate).
+
+To support this distinction, we can generate alternate URL's specifically to feed oEmbed clients. The extension includes
+a generic/configurable adapter, `civicrm/oembed`. By constructing a `civicrm/oembed` link, you can describe how the
+embedded element will behave.
diff --git a/www/modules/civicrm/ext/oembed/ang/crmOembedSharing.ang.php b/www/modules/civicrm/ext/oembed/ang/crmOembedSharing.ang.php
new file mode 100644
index 000000000..d951c06ce
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/ang/crmOembedSharing.ang.php
@@ -0,0 +1,23 @@
+<?php
+// Angular module oembedSharing.
+// @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
+return [
+  'js' => [
+    'ang/crmOembedSharing.js',
+    'ang/crmOembedSharing/*.js',
+    'ang/crmOembedSharing/*/*.js',
+  ],
+  'css' => [
+    'ang/crmOembedSharing.css',
+  ],
+  'partials' => [
+    'ang/crmOembedSharing',
+  ],
+  'requires' => ['crmUi', 'crmUtil'],
+  'settings' => [],
+  'basePages' => [],
+  'bundles' => ['bootstrap3'],
+  'exports' => [
+    'oembed-sharing' => 'A',
+  ],
+];
diff --git a/www/modules/civicrm/ext/oembed/ang/crmOembedSharing.css b/www/modules/civicrm/ext/oembed/ang/crmOembedSharing.css
new file mode 100644
index 000000000..f180f3515
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/ang/crmOembedSharing.css
@@ -0,0 +1,3 @@
+#bootstrap-theme.crm-oembed-sharing textarea.form-control {
+  width: 90%;
+}
diff --git a/www/modules/civicrm/ext/oembed/ang/crmOembedSharing.js b/www/modules/civicrm/ext/oembed/ang/crmOembedSharing.js
new file mode 100644
index 000000000..6d401f2c0
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/ang/crmOembedSharing.js
@@ -0,0 +1,4 @@
+(function(angular, $, _) {
+  // Declare a list of dependencies.
+  angular.module('crmOembedSharing', CRM.angRequires('crmOembedSharing'));
+})(angular, CRM.$, CRM._);
diff --git a/www/modules/civicrm/ext/oembed/ang/crmOembedSharing/main.html b/www/modules/civicrm/ext/oembed/ang/crmOembedSharing/main.html
new file mode 100644
index 000000000..adb51002f
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/ang/crmOembedSharing/main.html
@@ -0,0 +1,43 @@
+<div id="bootstrap-theme" class="crm-container crm-oembed-sharing">
+
+  <details class="crm-accordion-bold crm-oembed-sharing-accordion">
+    <summary>
+      {{::ts('Cross-Site Sharing')}}
+    </summary>
+    <div class="crm-accordion-body">
+
+      <div class="container-fluid">
+        <form class="form-horizontal">
+          <div class="form-group">
+            <label for="oembed-url">
+              {{::ts('oEmbed URL')}}:
+            </label>
+            <textarea readonly class="form-control" id="oembed-url">{{ctrl.getShareUrl()}}</textarea>
+          </div>
+          <div class="form-group">
+            <label for="oembed-iframe">
+              {{ts('IFrame HTML')}}:
+            </label>
+            <textarea readonly class="form-control" id="oembed-iframe">{{ctrl.getIframeCode()}}</textarea>
+          </div>
+
+          <div class="form-group">
+            <label for="oembed-width">
+              {{::ts('Width')}}:
+            </label>
+            <input id="oembed-width" type="number" ng-model="options.maxwidth" />
+          </div>
+          <div class="form-group">
+            <label for="oembed-height">
+              {{::ts('Height')}}:
+            </label>
+            <input id="oembed-height" type="number" ng-model="options.maxheight" />
+          </div>
+        </form>
+      </div>
+
+    </div>
+  </details>
+
+
+</div>
diff --git a/www/modules/civicrm/ext/oembed/ang/crmOembedSharing/main.js b/www/modules/civicrm/ext/oembed/ang/crmOembedSharing/main.js
new file mode 100644
index 000000000..7bd8bf58d
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/ang/crmOembedSharing/main.js
@@ -0,0 +1,41 @@
+(function(angular, $, _) {
+  // Example usage: <crm oembed-sharing page="https://example.com/foo/bar?id=123"></div>
+  angular.module('crmOembedSharing').directive('crmOembedSharing', function() {
+    return {
+      restrict: 'AE',
+      templateUrl: '~/crmOembedSharing/main.html',
+      scope: {
+        urls: '=',
+        options: '=',
+      },
+      link: function($scope, $el, $attr) {
+        var ts = $scope.ts = CRM.ts('oembed');
+
+        function addQuery(baseUrl, key, value) {
+          if (value !== '') {
+            baseUrl += (!baseUrl.includes('?') ? '?' : '&');
+            baseUrl += encodeURIComponent(key) + '=' + encodeURIComponent(value);
+          }
+          return baseUrl;
+        }
+
+        $scope.ctrl = {
+          getShareUrl: function() {
+            var buf = $scope.urls.share;
+            buf = addQuery(buf, 'maxwidth', $scope.options.maxwidth);
+            buf = addQuery(buf, 'maxheight', $scope.options.maxheight);
+            return buf;
+          },
+          getIframeCode: function() {
+            var iframe = cj('<iframe/>');
+            iframe.attr('src', $scope.urls.iframe);
+            if ($scope.options.maxwidth) iframe.attr('width', $scope.options.maxwidth);
+            if ($scope.options.maxheight) iframe.attr('height', $scope.options.maxheight);
+            return iframe[0].outerHTML;
+          }
+        };
+
+      }
+    };
+  });
+})(angular, CRM.$, CRM._);
diff --git a/www/modules/civicrm/ext/oembed/info.xml b/www/modules/civicrm/ext/oembed/info.xml
new file mode 100644
index 000000000..1f9e77194
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/info.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<extension key="oembed" type="module">
+  <file>oembed</file>
+  <name>oEmbed</name>
+  <description>Export CiviCRM content using the oEmbed protocol</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>2024-06-19</releaseDate>
+  <version>5.74.4</version>
+  <develStage>alpha</develStage>
+  <tags>
+    <tag>mgmt:hidden</tag>
+  </tags>
+  <compatibility>
+    <ver>5.74</ver>
+  </compatibility>
+  <comments>This is a new, undeveloped module</comments>
+  <classloader>
+    <psr0 prefix="CRM_" path="."/>
+    <psr4 prefix="Civi\" path="Civi"/>
+  </classloader>
+  <requires>
+    <ext>iframe</ext>
+  </requires>
+  <civix>
+    <namespace>CRM/Oembed</namespace>
+    <format>23.02.1</format>
+    <angularModule>crmOembed</angularModule>
+  </civix>
+  <mixins>
+    <mixin>mgd-php@1.0.0</mixin>
+    <mixin>setting-php@1.0.0</mixin>
+    <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>menu-xml@1.0.0</mixin>
+    <mixin>scan-classes@1.0.0</mixin>
+    <mixin>setting-admin@1.0.1</mixin>
+    <mixin>ang-php@1.0.0</mixin>
+  </mixins>
+</extension>
diff --git a/www/modules/civicrm/ext/oembed/oembed.civix.php b/www/modules/civicrm/ext/oembed/oembed.civix.php
new file mode 100644
index 000000000..119b0eb21
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/oembed.civix.php
@@ -0,0 +1,200 @@
+<?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_Oembed_ExtensionUtil {
+  const SHORT_NAME = 'oembed';
+  const LONG_NAME = 'oembed';
+  const CLASS_PREFIX = 'CRM_Oembed';
+
+  /**
+   * 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 = []): string {
+    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): string {
+    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_Oembed_ExtensionUtil as E;
+
+/**
+ * (Delegated) Implements hook_civicrm_config().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
+ */
+function _oembed_civix_civicrm_config($config = NULL) {
+  static $configured = FALSE;
+  if ($configured) {
+    return;
+  }
+  $configured = TRUE;
+
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
+  $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
+  set_include_path($include_path);
+  // Based on <compatibility>, this does not currently require mixin/polyfill.php.
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
+ */
+function _oembed_civix_civicrm_install() {
+  _oembed_civix_civicrm_config();
+  // Based on <compatibility>, this does not currently require mixin/polyfill.php.
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_enable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
+ */
+function _oembed_civix_civicrm_enable(): void {
+  _oembed_civix_civicrm_config();
+  // Based on <compatibility>, this does not currently require mixin/polyfill.php.
+}
+
+/**
+ * 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 _oembed_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' => $item['name'] ?? NULL,
+        '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 = _oembed_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item);
+      }
+    }
+    return $found;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_navigationMenu().
+ */
+function _oembed_civix_navigationMenu(&$nodes) {
+  if (!is_callable(['CRM_Core_BAO_Navigation', 'fixNavigationMenu'])) {
+    _oembed_civix_fixNavigationMenu($nodes);
+  }
+}
+
+/**
+ * Given a navigation menu, generate navIDs for any items which are
+ * missing them.
+ */
+function _oembed_civix_fixNavigationMenu(&$nodes) {
+  $maxNavID = 1;
+  array_walk_recursive($nodes, function($item, $key) use (&$maxNavID) {
+    if ($key === 'navID') {
+      $maxNavID = max($maxNavID, $item);
+    }
+  });
+  _oembed_civix_fixNavigationMenuItems($nodes, $maxNavID, NULL);
+}
+
+function _oembed_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'])) {
+      _oembed_civix_fixNavigationMenuItems($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']);
+    }
+  }
+}
diff --git a/www/modules/civicrm/ext/oembed/oembed.php b/www/modules/civicrm/ext/oembed/oembed.php
new file mode 100644
index 000000000..e67d4ba57
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/oembed.php
@@ -0,0 +1,32 @@
+<?php
+
+require_once 'oembed.civix.php';
+
+use CRM_Oembed_ExtensionUtil as E;
+
+/**
+ * Implements hook_civicrm_config().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config/
+ */
+function oembed_civicrm_config(&$config): void {
+  _oembed_civix_civicrm_config($config);
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
+ */
+function oembed_civicrm_install(): void {
+  _oembed_civix_civicrm_install();
+}
+
+/**
+ * Implements hook_civicrm_enable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
+ */
+function oembed_civicrm_enable(): void {
+  _oembed_civix_civicrm_enable();
+}
diff --git a/www/modules/civicrm/ext/oembed/phpunit.xml.dist b/www/modules/civicrm/ext/oembed/phpunit.xml.dist
new file mode 100644
index 000000000..ea391745f
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/phpunit.xml.dist
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<phpunit backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" convertDeprecationsToExceptions="true" processIsolation="false" stopOnFailure="false" cacheResult="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/www/modules/civicrm/ext/oembed/settings/oembed.setting.php b/www/modules/civicrm/ext/oembed/settings/oembed.setting.php
new file mode 100644
index 000000000..d79c620bd
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/settings/oembed.setting.php
@@ -0,0 +1,34 @@
+<?php
+
+use CRM_Oembed_ExtensionUtil as E;
+
+$basic = [
+  'group_name' => 'oEmbed Preferences',
+  'group' => 'oembed',
+  'is_domain' => 1,
+  'is_contact' => 0,
+  'add' => '5.72',
+];
+
+return [
+  'oembed_standard' => $basic + [
+    'name' => 'oembed_standard',
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'default' => TRUE,
+    'html_type' => 'radio',
+    'title' => E::ts('oEmbed Auto Discovery'),
+    'description' => E::ts('All pages with IFRAME support will support auto-discovery via oEmbed.'),
+    'help_text' => NULL,
+  ],
+  'oembed_share' => $basic + [
+    'name' => 'oembed_share',
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'default' => TRUE,
+    'html_type' => 'radio',
+    'title' => E::ts('oEmbed Explicit Sharing'),
+    'description' => E::ts('When administrators ("administer oembed") view a public page, present options for advanced sharing.'),
+    'help_text' => NULL,
+  ],
+];
diff --git a/www/modules/civicrm/ext/oembed/templates/CRM/Oembed/Page/Oembed.tpl b/www/modules/civicrm/ext/oembed/templates/CRM/Oembed/Page/Oembed.tpl
new file mode 100644
index 000000000..0c2b6f6b3
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/templates/CRM/Oembed/Page/Oembed.tpl
@@ -0,0 +1 @@
+{crmRegion name="oembed-share"}{/crmRegion}
diff --git a/www/modules/civicrm/ext/oembed/templates/CRM/Oembed/Page/OembedShare.tpl b/www/modules/civicrm/ext/oembed/templates/CRM/Oembed/Page/OembedShare.tpl
new file mode 100644
index 000000000..0c2b6f6b3
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/templates/CRM/Oembed/Page/OembedShare.tpl
@@ -0,0 +1 @@
+{crmRegion name="oembed-share"}{/crmRegion}
diff --git a/www/modules/civicrm/ext/oembed/tests/phpunit/CRM/Oembed/Page/OembedDiscoveryTest.php b/www/modules/civicrm/ext/oembed/tests/phpunit/CRM/Oembed/Page/OembedDiscoveryTest.php
new file mode 100644
index 000000000..d21f254cb
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/tests/phpunit/CRM/Oembed/Page/OembedDiscoveryTest.php
@@ -0,0 +1,107 @@
+<?php
+
+use CRM_Oembed_ExtensionUtil as E;
+use Civi\Test\CiviEnvBuilder;
+use Civi\Test\HeadlessInterface;
+use Civi\Test\HookInterface;
+use Civi\Test\TransactionalInterface;
+use Civi\Test\LocalHttpClient;
+use GuzzleHttp\Psr7\Request;
+
+/**
+ * @group headless
+ */
+class CRM_Oembed_Page_OembedDiscoveryTest extends \PHPUnit\Framework\TestCase implements HeadlessInterface, HookInterface, TransactionalInterface {
+
+  use \Civi\Test\EntityTrait;
+
+  protected ?LocalHttpClient $client;
+
+  protected ?array $exampleRecord;
+
+  public function setUpHeadless(): CiviEnvBuilder {
+    return \Civi\Test::headless()
+      ->install(['iframe', 'oembed'])
+      ->apply();
+  }
+
+  public function setUp():void {
+    parent::setUp();
+    $this->client = new LocalHttpClient();
+    $this->exampleRecord = $this->createTestEntity('Event', [
+      'title' => 'Walla walla',
+      'start_date' => '2024-01-05',
+      'event_type_id' => 1,
+      'participant_listing_id' => 1,
+    ]);
+    // $this->exampleRecord = $this->createTestEntity('ContributionPage', [
+    //   'title' => 'Test Contribution Page',
+    //   'financial_type_id:name' => 'Donation',
+    //   'currency' => 'USD',
+    //   'financial_account_id' => 1,
+    //   'is_active' => 1,
+    //   'is_allow_other_amount' => 1,
+    //   'min_amount' => 10,
+    //   'max_amount' => 1000,
+    // ], 'test');
+  }
+
+  protected function getExampleUrl(): \Civi\Core\Url {
+    return Civi::url('frontend://civicrm/event/info?reset=1&id=' . $this->exampleRecord['id']);
+    // return Civi::url('frontend://civicrm/contribute/transact?reset=1&id=' . $this->exampleRecord['id']);
+  }
+
+  protected function getShareUrl(array $shareOpts = []): \Civi\Core\Url {
+    $pageUrl = $this->getExampleUrl();
+    $shareOpts['url'] = $pageUrl;
+    return Civi::url('frontend://civicrm/share')->addQuery($shareOpts);
+  }
+
+  public function testStandard() {
+    $cleanup = CRM_Utils_AutoClean::with(fn() => Civi::settings()->revert('oembed_standard'));
+    Civi::settings()->set('oembed_standard', TRUE);
+
+    $pageUrl = $this->getExampleUrl();
+
+    $response = $this->client->sendRequest(new Request('GET', (string) $pageUrl));
+    $this->assertEquals(200, $response->getStatusCode());
+    $responseBody = (string) $response->getBody();
+    $doc = \phpQuery::newDocument($responseBody, 'text/html');
+
+    $link = $doc->find('link[type=application/json+oembed]');
+    $this->assertMatchesRegularExpression(';civicrm/oembed.*url=http.*civicrm%2Fevent%2Finfo.*reset%3D1.*id%3D\d+&format=json;', $link->attr('href'));
+
+    $link = $doc->find('link[type=text/xml+oembed]');
+    $this->assertMatchesRegularExpression(';civicrm/oembed.*url=http.*civicrm%2Fevent%2Finfo.*reset%3D1.*id%3D\d+&format=xml;', $link->attr('href'));
+  }
+
+  public function testShare_default() {
+    $shareUrl = $this->getShareUrl();
+    $response = $this->client->sendRequest(new Request('GET', (string) $shareUrl));
+    $this->assertEquals(200, $response->getStatusCode());
+    $responseBody = (string) $response->getBody();
+    $doc = \phpQuery::newDocument($responseBody, 'text/html');
+
+    $link = $doc->find('link[type=application/json+oembed]');
+    $this->assertMatchesRegularExpression(';civicrm/oembed.url=http.*civicrm%2Fshare.*civicrm.*event.*info.*reset%253D1.*id%253D\d+&format=json;', $link->attr('href'));
+
+    $link = $doc->find('link[type=text/xml+oembed]');
+    $this->assertMatchesRegularExpression(';civicrm/oembed.url=http.*civicrm%2Fshare.*civicrm.*event.*info.*reset%253D1.*id%253D\d+&format=xml;', $link->attr('href'));
+  }
+
+  public function testShare_1024() {
+    $shareUrl = $this->getShareUrl(['maxwidth' => 1024, 'maxheight' => 768]);
+
+    $response = $this->client->sendRequest(new Request('GET', (string) $shareUrl));
+    $this->assertEquals(200, $response->getStatusCode());
+    $responseBody = (string) $response->getBody();
+    $doc = \phpQuery::newDocument($responseBody, 'text/html');
+
+    $link = $doc->find('link[type=application/json+oembed]');
+    $this->assertMatchesRegularExpression(';civicrm/oembed.url=http.*civicrm%2Fshare%26maxwidth%3D1024%26maxheight%3D768%26url.*civicrm.*event.*info.*reset%253D1.*id%253D\d+&format=json;', $link->attr('href'));
+
+    $link = $doc->find('link[type=text/xml+oembed]');
+    $this->assertMatchesRegularExpression(';civicrm/oembed.url=http.*civicrm%2Fshare%26maxwidth%3D1024%26maxheight%3D768%26url.*civicrm.*event.*info.*reset%253D1.*id%253D\d+&format=xml;', $link->attr('href'));
+  }
+
+}
diff --git a/www/modules/civicrm/ext/oembed/tests/phpunit/CRM/Oembed/Page/OembedTest.php b/www/modules/civicrm/ext/oembed/tests/phpunit/CRM/Oembed/Page/OembedTest.php
new file mode 100644
index 000000000..084193c11
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/tests/phpunit/CRM/Oembed/Page/OembedTest.php
@@ -0,0 +1,96 @@
+<?php
+
+use CRM_Oembed_ExtensionUtil as E;
+use Civi\Test\CiviEnvBuilder;
+use Civi\Test\HeadlessInterface;
+use Civi\Test\HookInterface;
+use Civi\Test\TransactionalInterface;
+use Civi\Test\LocalHttpClient;
+use GuzzleHttp\Psr7\Request;
+
+/**
+ * @group headless
+ */
+class CRM_Oembed_Page_OembedTest extends \PHPUnit\Framework\TestCase implements HeadlessInterface, HookInterface, TransactionalInterface {
+
+  protected LocalHttpClient $client;
+
+  public function setUpHeadless(): CiviEnvBuilder {
+    return \Civi\Test::headless()
+      ->install(['iframe', 'oembed'])
+      ->apply();
+  }
+
+  public function setUp():void {
+    parent::setUp();
+    $this->client = new LocalHttpClient();
+  }
+
+  public function testUnknownFormat() {
+    $pageUrl = Civi::url('frontend://civicrm/contribute/transact?reset=1&id=1');
+    $oembedUrl = Civi::url('frontend://civicrm/oembed?format=zzz')->addQuery([
+      'url' => $pageUrl,
+    ]);
+    $response = $this->client->sendRequest(new Request('GET', (string) $oembedUrl));
+    $this->assertEquals(501, $response->getStatusCode());
+    $this->assertEquals('Unsupported format', (string) $response->getBody());
+  }
+
+  public function testWrongDomain() {
+    $pageUrl = Civi::url('https://othersite.com/civicrm/contribute/transact?reset=1&id=1');
+    $oembedUrl = Civi::url('frontend://civicrm/oembed?format=zzz')->addQuery([
+      'url' => $pageUrl,
+    ]);
+    $response = $this->client->sendRequest(new Request('GET', (string) $oembedUrl));
+    $this->assertEquals(501, $response->getStatusCode());
+    $this->assertStringContainsString('Unrecognized host', (string) $response->getBody());
+  }
+
+  public function testJson() {
+    $pageUrl = Civi::url('frontend://civicrm/contribute/transact?reset=1&id=1');
+    $oembedUrl = Civi::url('frontend://civicrm/oembed?format=json')->addQuery([
+      'url' => $pageUrl,
+    ]);
+    $response = $this->client->sendRequest(new Request('GET', (string) $oembedUrl));
+    $this->assertEquals(200, $response->getStatusCode());
+    $responseBody = (string) $response->getBody();
+    $data = json_decode($responseBody, TRUE);
+    $this->assertEquals('rich', $data['type']);
+    $this->assertMatchesRegularExpression(';iframe.*src=.*contribute;', $data['html']);
+    $this->assertEquals(600, $data['width']);
+    $this->assertEquals(400, $data['height']);
+    $this->assertTrue(is_int($data['width']));
+  }
+
+  public function testJson_1024() {
+    $pageUrl = Civi::url('frontend://civicrm/contribute/transact?reset=1&id=1');
+    $oembedUrl = Civi::url('frontend://civicrm/oembed?format=json&maxwidth=1024&maxheight=768')->addQuery([
+      'url' => $pageUrl,
+    ]);
+    $response = $this->client->sendRequest(new Request('GET', (string) $oembedUrl));
+    $this->assertEquals(200, $response->getStatusCode());
+    $responseBody = (string) $response->getBody();
+    $data = json_decode($responseBody, TRUE);
+    $this->assertEquals('rich', $data['type']);
+    $this->assertMatchesRegularExpression(';iframe.*src=.*contribute;', $data['html']);
+    $this->assertEquals(1024, $data['width']);
+    $this->assertEquals(768, $data['height']);
+  }
+
+  public function testXml() {
+    $pageUrl = Civi::url('frontend://civicrm/contribute/transact?reset=1&id=1');
+    $oembedUrl = Civi::url('frontend://civicrm/oembed?format=xml')->addQuery([
+      'url' => $pageUrl,
+    ]);
+    $response = $this->client->sendRequest(new Request('GET', (string) $oembedUrl));
+    $this->assertEquals(200, $response->getStatusCode());
+    $responseBody = (string) $response->getBody();
+    $xml = simplexml_load_string($responseBody);
+
+    $this->assertEquals('rich', $xml->type);
+    $this->assertMatchesRegularExpression(';iframe.*src=.*contribute;', $xml->html);
+    $this->assertEquals('600', $xml->width);
+    $this->assertEquals('400', $xml->height);
+  }
+
+}
diff --git a/www/modules/civicrm/ext/oembed/tests/phpunit/bootstrap.php b/www/modules/civicrm/ext/oembed/tests/phpunit/bootstrap.php
new file mode 100644
index 000000000..eaa837944
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/tests/phpunit/bootstrap.php
@@ -0,0 +1,65 @@
+<?php
+
+ini_set('memory_limit', '2G');
+
+// 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__ . '/../..', __DIR__]);
+$loader->addPsr4('Civi\\', [__DIR__ . '/../../Civi', __DIR__ . '/Civi']);
+$loader->add('api_', [__DIR__ . '/../..', __DIR__]);
+$loader->addPsr4('api\\', [__DIR__ . '/../../api', __DIR__ . '/api']);
+
+$loader->register();
+
+/**
+ * Call the "cv" command.
+ *
+ * @param string $cmd
+ *   The rest of the command to send.
+ * @param string $decode
+ *   Ex: 'json' or 'phpcode'.
+ * @return mixed
+ *   Response output (if the command executed normally).
+ *   For 'raw' or 'phpcode', this will be a string. For 'json', it could be any JSON value.
+ * @throws \RuntimeException
+ *   If the command terminates abnormally.
+ */
+function cv(string $cmd, string $decode = 'json') {
+  $cmd = 'cv ' . $cmd;
+  $descriptorSpec = [0 => ['pipe', 'r'], 1 => ['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)");
+  }
+}
diff --git a/www/modules/civicrm/ext/oembed/xml/Menu/oembed.xml b/www/modules/civicrm/ext/oembed/xml/Menu/oembed.xml
new file mode 100644
index 000000000..5748293b0
--- /dev/null
+++ b/www/modules/civicrm/ext/oembed/xml/Menu/oembed.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<menu>
+  <item>
+    <path>civicrm/oembed</path>
+    <page_callback>CRM_Oembed_Page_Oembed</page_callback>
+    <title>Oembed</title>
+    <is_public>1</is_public>
+    <access_arguments>*always allow*</access_arguments>
+  </item>
+  <item>
+    <path>civicrm/share</path>
+    <page_callback>CRM_Oembed_Page_OembedShare</page_callback>
+    <title>OembedShare</title>
+    <is_public>1</is_public>
+    <access_arguments>*always allow*</access_arguments>
+  </item>
+</menu>
diff --git a/www/modules/civicrm/ext/payflowpro/README.md b/www/modules/civicrm/ext/payflowpro/README.md
index 99f89bd8e..9aaacdcb7 100644
--- a/www/modules/civicrm/ext/payflowpro/README.md
+++ b/www/modules/civicrm/ext/payflowpro/README.md
@@ -4,15 +4,6 @@ This extension provides an integration with PayPal's Payflow Pro service. It sup
 
 The extension is licensed under [AGPL-3.0](LICENSE.txt).
 
-## Requirements
-
-* PHP v7.2+
-* CiviCRM 5.38
-
-## Installation (Web UI)
-
-Learn more about installing CiviCRM extensions in the [CiviCRM Sysadmin Guide](https://docs.civicrm.org/sysadmin/en/latest/customize/extensions/).
-
 ## Getting Started
 
 After enabling the extension you will need to go to Administer >> System Settings >> Payment Processors and create a Payment Processor that uses Payflow Pro
diff --git a/www/modules/civicrm/ext/payflowpro/images/screenshot.png b/www/modules/civicrm/ext/payflowpro/images/screenshot.png
deleted file mode 100644
index 6765b696f..000000000
Binary files a/www/modules/civicrm/ext/payflowpro/images/screenshot.png and /dev/null differ
diff --git a/www/modules/civicrm/ext/payflowpro/info.xml b/www/modules/civicrm/ext/payflowpro/info.xml
index 06320a8f3..ede38fe7b 100644
--- a/www/modules/civicrm/ext/payflowpro/info.xml
+++ b/www/modules/civicrm/ext/payflowpro/info.xml
@@ -14,11 +14,11 @@
     <url desc="Support">https://lab.civicrm.org</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>This extension is extraction of the original Core Payflow Pro Payment Processor</comments>
   <classloader>
diff --git a/www/modules/civicrm/ext/recaptcha/info.xml b/www/modules/civicrm/ext/recaptcha/info.xml
index 1b5839fda..5841e3183 100644
--- a/www/modules/civicrm/ext/recaptcha/info.xml
+++ b/www/modules/civicrm/ext/recaptcha/info.xml
@@ -12,14 +12,14 @@
     <url desc="Main Extension Page">https://github.com/civicrm/civicrm-core/tree/master/ext/recaptcha</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>
   <develStage>stable</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <classloader>
     <psr0 prefix="CRM_" path="."/>
@@ -30,7 +30,7 @@
     <mixin>setting-php@1.0.0</mixin>
     <mixin>ang-php@1.0.0</mixin>
     <mixin>scan-classes@1.0.0</mixin>
-    <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>smarty@1.0.0</mixin>
   </mixins>
   <civix>
     <namespace>CRM/Recaptcha</namespace>
diff --git a/www/modules/civicrm/ext/scheduled_communications/Civi/Search/ActionMapping.php b/www/modules/civicrm/ext/scheduled_communications/Civi/Search/ActionMapping.php
index 7986f6f54..2819bcdb9 100644
--- a/www/modules/civicrm/ext/scheduled_communications/Civi/Search/ActionMapping.php
+++ b/www/modules/civicrm/ext/scheduled_communications/Civi/Search/ActionMapping.php
@@ -45,7 +45,7 @@ public function getEntityTable(\CRM_Core_DAO_ActionSchedule $actionSchedule): st
     return \CRM_Core_DAO_AllCoreTables::getTableForEntityName($this->savedSearch['api_entity']);
   }
 
-  public function modifySpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
+  public function modifyApiSpec(\Civi\Api4\Service\Spec\RequestSpec $spec) {
     $spec->getFieldByName('entity_value')
       ->setLabel(ts('Saved Search'))
       ->setInputAttr('multiple', FALSE);
diff --git a/www/modules/civicrm/ext/scheduled_communications/info.xml b/www/modules/civicrm/ext/scheduled_communications/info.xml
index a65eae622..47805d38d 100644
--- a/www/modules/civicrm/ext/scheduled_communications/info.xml
+++ b/www/modules/civicrm/ext/scheduled_communications/info.xml
@@ -12,11 +12,11 @@
     <url desc="Chat">https://chat.civicrm.org/civicrm/channels/search-improvements</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>beta</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>Click on the chat link above to discuss development, report problems or ask questions.</comments>
   <classloader>
diff --git a/www/modules/civicrm/ext/search_kit/CRM/Search/BAO/SearchDisplay.php b/www/modules/civicrm/ext/search_kit/CRM/Search/BAO/SearchDisplay.php
index 3ab1f66a0..5ae4b4970 100644
--- a/www/modules/civicrm/ext/search_kit/CRM/Search/BAO/SearchDisplay.php
+++ b/www/modules/civicrm/ext/search_kit/CRM/Search/BAO/SearchDisplay.php
@@ -9,49 +9,47 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\Event\AuthorizeRecordEvent;
+
 /**
  * Search Display BAO
  */
-class CRM_Search_BAO_SearchDisplay extends CRM_Search_DAO_SearchDisplay {
+class CRM_Search_BAO_SearchDisplay extends CRM_Search_DAO_SearchDisplay implements \Civi\Core\HookInterface {
 
   /**
-   * Ensure only super-admins are allowed to create or update displays with acl_bypass
-   *
-   * @param string $entityName
-   * @param string $action
-   * @param array $record
-   * @param int $userCID
-   * @return bool
+   * @see \Civi\Api4\Utils\CoreUtil::checkAccessRecord
    */
-  public static function _checkAccess(string $entityName, string $action, array $record, int $userCID) {
-    // Super-admins can do anything with search displays
-    if (CRM_Core_Permission::check('all CiviCRM permissions and ACLs', $userCID)) {
-      return TRUE;
-    }
-    // Must be at least a SearchKit administrator
-    if (!CRM_Core_Permission::check([['administer CiviCRM data', 'administer search_kit']], $userCID)) {
-      return FALSE;
-    }
-    if (in_array($action, ['create', 'update'], TRUE)) {
-      // Do not allow acl_bypass to be set to TRUE
-      if (!empty($record['acl_bypass'])) {
-        return FALSE;
+  public static function on_civi_api4_authorizeRecord(AuthorizeRecordEvent $e): void {
+    $recordType = $e->getEntityName();
+    $record = $e->getRecord();
+    $userCID = $e->getUserID();
+
+    // Control access to search displays that have `acl_bypass` set.
+    if ($recordType === 'SearchDisplay') {
+      // Super-admins can do anything with search displays
+      if (CRM_Core_Permission::check('all CiviCRM permissions and ACLs', $userCID)) {
+        $e->setAuthorized(TRUE);
+        return;
       }
-      // Do not allow edits to an existing record with acl_bypass = TRUE
-      if (!empty($record['id'])) {
-        return !CRM_Core_DAO::getFieldValue(__CLASS__, $record['id'], 'acl_bypass');
+      // Must be at least a SearchKit administrator
+      if (!CRM_Core_Permission::check('administer search_kit', $userCID)) {
+        $e->setAuthorized(FALSE);
+        return;
+      }
+      if (in_array($e->getActionName(), ['create', 'update'], TRUE)) {
+        // Do not allow acl_bypass to be set to TRUE
+        if (!empty($record['acl_bypass'])) {
+          $e->setAuthorized(FALSE);
+        }
+        // Do not allow edits to an existing record with acl_bypass = TRUE
+        elseif (!empty($record['id'])) {
+          $e->setAuthorized(!CRM_Core_DAO::getFieldValue(__CLASS__, $record['id'], 'acl_bypass'));
+        }
       }
     }
-    return TRUE;
-  }
 
-  /**
-   * Ensure only super-admins may update SavedSearches linked to displays with acl_bypass
-   *
-   * @param \Civi\Api4\Event\AuthorizeRecordEvent $e
-   */
-  public static function savedSearchCheckAccessByDisplay(\Civi\Api4\Event\AuthorizeRecordEvent $e) {
-    if ($e->getActionName() === 'update') {
+    // Ensure only super-admins may update SavedSearches linked to displays with `acl_bypass`
+    if ($recordType === 'SavedSearch' && $e->getActionName() === 'update' && !CRM_Core_Permission::check('all CiviCRM permissions and ACLs', $userCID)) {
       $id = (int) $e->getRecord()['id'];
       $sql = "SELECT COUNT(id) FROM civicrm_search_display WHERE acl_bypass = 1 AND saved_search_id = $id";
       if (CRM_Core_DAO::singleValueQuery($sql)) {
diff --git a/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php b/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
index cce62e357..e5f917b63 100644
--- a/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
+++ b/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/AbstractRunAction.php
@@ -307,8 +307,41 @@ private function rewrite(array $column, array $data): string {
     $hasSmarty = strpos($column['rewrite'], '{') !== FALSE;
     $output = $this->replaceTokens($column['rewrite'], $data, 'view');
     if ($hasSmarty) {
-      $smarty = \CRM_Core_Smarty::singleton();
-      $output = $smarty->fetchWith("string:$output", []);
+      $vars = [];
+      $nestedIds = [];
+      // Convert dots to nested arrays which are more Smarty-friendly
+      foreach ($data as $key => $value) {
+        $parent = &$vars;
+        $allKeys = $keys = array_map('CRM_Utils_String::munge', explode('.', $key));
+        while (count($keys) > 1) {
+          $level = array_shift($keys);
+          $parent[$level] = $parent[$level] ?? [];
+          // Fix collisions between e.g. contact_id & contact_id.display_name by nesting the id
+          if (is_scalar($parent[$level])) {
+            $nestedIds[] = implode('.', array_slice($allKeys, 0, count($keys)));
+            $parent[$level] = [
+              'id' => $parent[$level],
+            ];
+          }
+          $parent = &$parent[$level];
+        }
+        $level = array_shift($keys);
+        // Fix collisions between e.g. contact_id & contact_id.display_name by nesting the id
+        if (isset($parent[$level]) && is_array($parent[$level])) {
+          $nestedIds[] = implode('.', $allKeys);
+          $parent[$level]['id'] = $value;
+        }
+        else {
+          $parent[$level] = $value;
+        }
+      }
+      // Fix references to e.g. contact_id as scalar if it was moved by above fixes, change reference to nested id
+      foreach (array_unique($nestedIds) as $nestedId) {
+        $quotedId = preg_quote('$' . $nestedId);
+        $output = preg_replace("/$quotedId(?![.\w])/", '$' . "$nestedId.id", $output);
+      }
+
+      $output = \CRM_Utils_String::parseOneOffStringThroughSmarty($output, $vars);
     }
     return $output;
   }
@@ -496,7 +529,7 @@ private function formatLinksColumn($column, $data): array {
       $out['text'] = $this->replaceTokens($column['text'], $data, 'view');
     }
     foreach ($column['links'] as $item) {
-      if (!$this->checkLinkCondition($item, $data)) {
+      if (!$this->checkLinkConditions($item, $data)) {
         continue;
       }
       $link = $this->formatLink($item, $data);
@@ -690,21 +723,37 @@ private function getPermittedLinkAction(string $entityName, string $actionName):
    * Given a link, check if it is set to be displayed conditionally.
    * If so, evaluate the condition, else return TRUE.
    *
-   * @param array $item
+   * @param array $link
    * @param array $data
    * @return bool
    */
-  protected function checkLinkCondition(array $item, array $data): bool {
-    if (empty($item['condition'][0]) || empty($item['condition'][1])) {
+  protected function checkLinkConditions(array $link, array $data): bool {
+    foreach ($link['conditions'] ?? [] as $condition) {
+      if (!$this->checkLinkCondition($condition, $data)) {
+        return FALSE;
+      }
+    }
+    return TRUE;
+  }
+
+  /**
+   * Evaluate a link condition.
+   *
+   * @param array $condition
+   * @param array $data
+   * @return bool
+   */
+  protected function checkLinkCondition(array $condition, array $data): bool {
+    if (empty($condition[0]) || empty($condition[1])) {
       return TRUE;
     }
-    $op = $item['condition'][1];
-    if ($item['condition'][0] === 'check user permission') {
+    $op = $condition[1];
+    if ($condition[0] === 'check user permission') {
       // No permission == open access
-      if (empty($item['condition'][2])) {
+      if (empty($condition[2])) {
         return TRUE;
       }
-      $permissions = (array) $item['condition'][2];
+      $permissions = (array) $condition[2];
       if ($op === 'CONTAINS') {
         // Place conditions in OR array for CONTAINS operator
         $permissions = [$permissions];
@@ -712,15 +761,15 @@ protected function checkLinkCondition(array $item, array $data): bool {
       return \CRM_Core_Permission::check($permissions) == ($op !== '!=');
     }
     // Convert the conditional value of 'current_domain' into an actual value that filterCompare can work with
-    if (($item['condition'][2] ?? '') === 'current_domain') {
-      if (str_ends_with($item['condition'][0], ':label') !== FALSE) {
-        $item['condition'][2] = \CRM_Core_BAO_Domain::getDomain()->name;
+    if (($condition[2] ?? '') === 'current_domain') {
+      if (str_ends_with($condition[0], ':label') !== FALSE) {
+        $condition[2] = \CRM_Core_BAO_Domain::getDomain()->name;
       }
       else {
-        $item['condition'][2] = \CRM_Core_Config::domainID();
+        $condition[2] = \CRM_Core_Config::domainID();
       }
     }
-    return self::filterCompare($data, $item['condition']);
+    return self::filterCompare($data, $condition);
   }
 
   /**
@@ -745,7 +794,7 @@ protected function preprocessLinks(): void {
   }
 
   /**
-   * @param array{path: string, entity: string, action: string, task: string, join: string, target: string, style: string, title: string, text: string, prefix: string} $link
+   * @param array{path: string, entity: string, action: string, task: string, join: string, target: string, style: string, title: string, text: string, prefix: string, conditions: array} $link
    */
   private function preprocessLink(array &$link): void {
     $link += [
@@ -756,6 +805,7 @@ private function preprocessLink(array &$link): void {
       'title' => '',
       'prefix' => '',
       'key' => '',
+      'conditions' => [],
     ];
     $entity = $link['entity'];
     if ($entity && CoreUtil::entityExists($entity)) {
@@ -776,6 +826,7 @@ private function preprocessLink(array &$link): void {
           ],
         ]);
         $link['path'] = $getLinks[0]['path'] ?? NULL;
+        $link['conditions'] = $getLinks[0]['conditions'] ?? [];
         // This is a bit clunky, the function_join_field gets un-munged later by $this->getJoinFromAlias()
         if ($this->canAggregate($link['prefix'] . $idKey)) {
           $link['prefix'] = 'GROUP_CONCAT_' . str_replace('.', '_', $link['prefix']);
@@ -786,6 +837,7 @@ private function preprocessLink(array &$link): void {
       }
       elseif (!$link['path'] && !empty($link['task'])) {
         $task = $this->getTask($link['task']);
+        $link['conditions'] = $task['conditions'] ?? [];
         // Convert legacy tasks (which have a url)
         if (!empty($task['crmPopup'])) {
           $idField = CoreUtil::getIdFieldName($link['entity']);
@@ -811,6 +863,17 @@ private function preprocessLink(array &$link): void {
       }
       $link['key'] = $link['prefix'] . $idKey;
     }
+    // Add join prefix to predefined conditions
+    foreach ($link['conditions'] as &$condition) {
+      if (!empty($condition[0]) && $condition[0] !== 'check user permission') {
+        $condition[0] = $link['prefix'] . $condition[0];
+      }
+    }
+    // Combine predefined link conditions with condition set in the search display
+    if (!empty($link['condition'])) {
+      $link['conditions'][] = $link['condition'];
+    }
+    unset($link['condition']);
   }
 
   /**
@@ -824,8 +887,10 @@ private function getLinkTokens(array $link): array {
     if (!$link['path'] && !empty($link['task'])) {
       $tokens[] = $link['prefix'] . $this->getIdKeyName($link['entity']);
     }
-    if (!empty($link['condition'][0])) {
-      $tokens[] = $link['condition'][0];
+    foreach ($link['conditions'] ?? [] as $condition) {
+      if (!empty($condition[0]) && $condition[0] !== 'check user permission') {
+        $tokens[] = $condition[0];
+      }
     }
     return array_merge($tokens, $this->getTokens($link['path'] . $link['text'] . $link['title']));
   }
diff --git a/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/GetDefault.php b/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/GetDefault.php
index e388bccb7..39d3fb738 100644
--- a/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/GetDefault.php
+++ b/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/GetDefault.php
@@ -154,6 +154,20 @@ public function getLinksMenu() {
         $menu[] = $link;
       }
     }
+    if ($this->getField('is_active')) {
+      $menu[] = [
+        'entity' => $mainEntity,
+        'task' => 'enable',
+        'icon' => 'fa-toggle-on',
+        'text' => E::ts('Enable'),
+      ];
+      $menu[] = [
+        'entity' => $mainEntity,
+        'task' => 'disable',
+        'icon' => 'fa-toggle-off',
+        'text' => E::ts('Disable'),
+      ];
+    }
     $keys = ['entity' => TRUE, 'bridge' => TRUE];
     foreach ($this->getJoins() as $join) {
       if (!$this->canAggregate($join['alias'] . '.' . CoreUtil::getIdFieldName($join['entity']))) {
diff --git a/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/GetSearchTasks.php b/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/GetSearchTasks.php
index 56595b207..8b1b6377b 100644
--- a/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/GetSearchTasks.php
+++ b/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/GetSearchTasks.php
@@ -84,6 +84,7 @@ public function _run(\Civi\Api4\Generic\Result $result) {
         $tasks[$entity['name']]['enable'] = [
           'title' => E::ts('Enable %1', [1 => $entity['title_plural']]),
           'icon' => 'fa-toggle-on',
+          'conditions' => [['is_active', '=', FALSE]],
           'apiBatch' => [
             'action' => 'update',
             'params' => ['values' => ['is_active' => TRUE]],
@@ -95,6 +96,7 @@ public function _run(\Civi\Api4\Generic\Result $result) {
         $tasks[$entity['name']]['disable'] = [
           'title' => E::ts('Disable %1', [1 => $entity['title_plural']]),
           'icon' => 'fa-toggle-off',
+          'conditions' => [['is_active', '=', TRUE]],
           'apiBatch' => [
             'action' => 'update',
             'params' => ['values' => ['is_active' => FALSE]],
@@ -193,36 +195,6 @@ public function _run(\Civi\Api4\Generic\Result $result) {
           ],
         ];
       }
-      if (\CRM_Core_Component::isEnabled('CiviMail') && (
-        \CRM_Core_Permission::access('CiviMail') || !$this->checkPermissions ||
-        (\CRM_Mailing_Info::workflowEnabled() && \CRM_Core_Permission::check('create mailings'))
-      )) {
-        $tasks[$entity['name']]['contact.mailing'] = [
-          'title' => E::ts('Email - schedule/send via CiviMail'),
-          'uiDialog' => ['templateUrl' => '~/crmSearchTasks/crmSearchTaskMailing.html'],
-          'icon' => 'fa-paper-plane',
-        ];
-      }
-    }
-
-    if ($entity['name'] === 'Contribution') {
-      // FIXME: tasks() function always checks permissions, should respect `$this->checkPermissions`
-      foreach (\CRM_Contribute_Task::tasks() as $id => $task) {
-        if (!empty($task['url'])) {
-          $path = explode('?', $task['url'], 2)[0];
-          $menu = \CRM_Core_Menu::get($path);
-          $key = \CRM_Core_Key::get($menu['page_callback'], TRUE);
-
-          $tasks[$entity['name']]['contribution.' . $id] = [
-            'title' => $task['title'],
-            'icon' => $task['icon'] ?? 'fa-gear',
-            'crmPopup' => [
-              'path' => "'{$task['url']}'",
-              'data' => "{id: ids.join(','), qfKey: '$key'}",
-            ],
-          ];
-        }
-      }
     }
 
     // Call `hook_civicrm_searchKitTasks` which serves 3 purposes:
diff --git a/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/Run.php b/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/Run.php
index acf179ed1..5ec3728f0 100644
--- a/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/Run.php
+++ b/www/modules/civicrm/ext/search_kit/Civi/Api4/Action/SearchDisplay/Run.php
@@ -159,7 +159,7 @@ private function formatToolbar(): array {
       $settings['toolbar'][] = $settings['addButton'] + ['style' => 'primary', 'target' => 'crm-popup'];
     }
     foreach ($settings['toolbar'] ?? [] as $button) {
-      if (!$this->checkLinkCondition($button, $data)) {
+      if (!$this->checkLinkConditions($button, $data)) {
         continue;
       }
       $button = $this->formatLink($button, $data, TRUE);
diff --git a/www/modules/civicrm/ext/search_kit/Civi/Api4/Event/Subscriber/DefaultDisplaySubscriber.php b/www/modules/civicrm/ext/search_kit/Civi/Api4/Event/Subscriber/DefaultDisplaySubscriber.php
index 54cd5ce2c..e0f18d740 100644
--- a/www/modules/civicrm/ext/search_kit/Civi/Api4/Event/Subscriber/DefaultDisplaySubscriber.php
+++ b/www/modules/civicrm/ext/search_kit/Civi/Api4/Event/Subscriber/DefaultDisplaySubscriber.php
@@ -122,6 +122,8 @@ public static function fallbackDefault(GenericHookEvent $e) {
     if ($e->display['settings']) {
       return;
     }
+    /** @var \Civi\Api4\Action\SearchDisplay\GetDefault $getDefaultAction */
+    $getDefaultAction = $e->apiAction;
     $e->display['settings'] += [
       'description' => $e->savedSearch['description'] ?? NULL,
       'sort' => [],
@@ -137,8 +139,8 @@ public static function fallbackDefault(GenericHookEvent $e) {
     if (!empty($e->savedSearch['api_entity']) && empty($e->savedSearch['api_params']['orderBy'])) {
       $e->display['settings']['sort'] = self::getDefaultSort($e->savedSearch['api_entity']);
     }
-    foreach ($e->apiAction->getSelectClause() as $key => $clause) {
-      $e->display['settings']['columns'][] = $e->apiAction->configureColumn($clause, $key);
+    foreach ($getDefaultAction->getSelectClause() as $key => $clause) {
+      $e->display['settings']['columns'][] = $getDefaultAction->configureColumn($clause, $key);
     }
     // Table-specific settings
     if ($e->display['type'] === 'table') {
@@ -151,7 +153,7 @@ public static function fallbackDefault(GenericHookEvent $e) {
         'size' => 'btn-xs',
         'style' => 'secondary-outline',
         'alignment' => 'text-right',
-        'links' => $e->apiAction->getLinksMenu(),
+        'links' => $getDefaultAction->getLinksMenu(),
       ];
     }
   }
diff --git a/www/modules/civicrm/ext/search_kit/Civi/Api4/Event/Subscriber/SearchDisplayTasksSubscriber.php b/www/modules/civicrm/ext/search_kit/Civi/Api4/Event/Subscriber/SearchDisplayTasksSubscriber.php
index 832ce2808..206b8791e 100644
--- a/www/modules/civicrm/ext/search_kit/Civi/Api4/Event/Subscriber/SearchDisplayTasksSubscriber.php
+++ b/www/modules/civicrm/ext/search_kit/Civi/Api4/Event/Subscriber/SearchDisplayTasksSubscriber.php
@@ -22,14 +22,20 @@
 class SearchDisplayTasksSubscriber extends \Civi\Core\Service\AutoService implements EventSubscriberInterface {
 
   /**
-   * Filter tasks with a priority of -50, which allows W_MIDDLE & W_EARLY to go first, but W_LATE to go after.
+   * Listen for hook_civicrm_searchKitTasks with a low priority so that most other hooks have gone first.
+   * Setting the priority to -200 because:
+   *  - The default for symfony-style hooks is W_MIDDLE = 0.
+   *  - The default for CMS-style hooks is DEFAULT_HOOK_PRIORITY = -100.
+   *
+   * Generally speaking, the configuration settings enforced by `filterTasksForDisplay` should be respected,
+   * but if an extension needs to override them it can do so by listening to this event with an even lower priority.
    *
    * @return array
    */
   public static function getSubscribedEvents() {
     return [
       'hook_civicrm_searchKitTasks' => [
-        ['filterTasksForDisplay', -50],
+        ['filterTasksForDisplay', -200],
       ],
     ];
   }
diff --git a/www/modules/civicrm/ext/search_kit/Civi/Api4/SKEntity.php b/www/modules/civicrm/ext/search_kit/Civi/Api4/SKEntity.php
index dc5820ef2..e23d5bf4c 100644
--- a/www/modules/civicrm/ext/search_kit/Civi/Api4/SKEntity.php
+++ b/www/modules/civicrm/ext/search_kit/Civi/Api4/SKEntity.php
@@ -87,8 +87,8 @@ public static function checkAccess(string $displayEntity): Generic\CheckAccessAc
   public static function permissions(): array {
     return [
       'meta' => ['access CiviCRM'],
-      'refresh' => [['administer CiviCRM data', 'administer search_kit']],
-      'getRefreshDate' => [['administer CiviCRM data', 'administer search_kit']],
+      'refresh' => ['administer search_kit'],
+      'getRefreshDate' => ['administer search_kit'],
     ];
   }
 
diff --git a/www/modules/civicrm/ext/search_kit/Civi/Api4/SearchDisplay.php b/www/modules/civicrm/ext/search_kit/Civi/Api4/SearchDisplay.php
index 2b6a54750..04b136f2e 100644
--- a/www/modules/civicrm/ext/search_kit/Civi/Api4/SearchDisplay.php
+++ b/www/modules/civicrm/ext/search_kit/Civi/Api4/SearchDisplay.php
@@ -52,7 +52,7 @@ public static function getDefault($checkPermissions = TRUE) {
 
   public static function permissions() {
     $permissions = parent::permissions();
-    $permissions['default'] = [['administer CiviCRM data', 'administer search_kit']];
+    $permissions['default'] = ['administer search_kit'];
     // Anyone with access to CiviCRM can view search displays (but not necessarily the results)
     $permissions['get'] = $permissions['getDefault'] = ['access CiviCRM'];
     // Anyone with access to CiviCRM can do search tasks (but not necessarily all of them)
diff --git a/www/modules/civicrm/ext/search_kit/Civi/Api4/SearchSegment.php b/www/modules/civicrm/ext/search_kit/Civi/Api4/SearchSegment.php
index 03cbaf370..2f497d516 100644
--- a/www/modules/civicrm/ext/search_kit/Civi/Api4/SearchSegment.php
+++ b/www/modules/civicrm/ext/search_kit/Civi/Api4/SearchSegment.php
@@ -12,7 +12,7 @@ class SearchSegment extends Generic\DAOEntity {
 
   public static function permissions() {
     $permissions = parent::permissions();
-    $permissions['default'] = [['administer CiviCRM data', 'administer search_kit']];
+    $permissions['default'] = ['administer search_kit'];
     return $permissions;
   }
 
diff --git a/www/modules/civicrm/ext/search_kit/Civi/Api4/Service/Spec/Provider/SKEntitySpecProvider.php b/www/modules/civicrm/ext/search_kit/Civi/Api4/Service/Spec/Provider/SKEntitySpecProvider.php
index 7b101e82d..f6b7b255d 100644
--- a/www/modules/civicrm/ext/search_kit/Civi/Api4/Service/Spec/Provider/SKEntitySpecProvider.php
+++ b/www/modules/civicrm/ext/search_kit/Civi/Api4/Service/Spec/Provider/SKEntitySpecProvider.php
@@ -74,14 +74,14 @@ public function applies($entity, $action): bool {
   /**
    * Callback function retrieve options from original field.
    *
-   * @param \Civi\Api4\Service\Spec\FieldSpec $spec
+   * @param array $field
    * @param array $values
    * @param bool|array $returnFormat
    * @param bool $checkPermissions
    * @param array $params
    * @return array|false
    */
-  public static function getOptionsForSKEntityField($spec, $values, $returnFormat, $checkPermissions, $params) {
+  public static function getOptionsForSKEntityField($field, $values, $returnFormat, $checkPermissions, $params) {
     return civicrm_api4($params['original_field_entity'], 'getFields', [
       'where' => [['name', '=', $params['original_field_name']]],
       'loadOptions' => $returnFormat,
diff --git a/www/modules/civicrm/ext/search_kit/Civi/BAO/SK_Entity.php b/www/modules/civicrm/ext/search_kit/Civi/BAO/SK_Entity.php
index 787ac96dd..90b696d14 100644
--- a/www/modules/civicrm/ext/search_kit/Civi/BAO/SK_Entity.php
+++ b/www/modules/civicrm/ext/search_kit/Civi/BAO/SK_Entity.php
@@ -51,23 +51,4 @@ public static function tableHasBeenAdded(): bool {
     return TRUE;
   }
 
-  /**
-   * Defines the primary key(s).
-   *
-   * @return array
-   */
-  public function keys() {
-    return ['_row'];
-  }
-
-  /**
-   * Tells DB_DataObject which keys use autoincrement.
-   * Overrides the default 'id'.
-   *
-   * @return array
-   */
-  public function sequenceKey() {
-    return ['_row', TRUE];
-  }
-
 }
diff --git a/www/modules/civicrm/ext/search_kit/Civi/Search/Admin.php b/www/modules/civicrm/ext/search_kit/Civi/Search/Admin.php
index ea19b652b..1d0ace574 100644
--- a/www/modules/civicrm/ext/search_kit/Civi/Search/Admin.php
+++ b/www/modules/civicrm/ext/search_kit/Civi/Search/Admin.php
@@ -144,10 +144,6 @@ public static function getSchema(): array {
         if ($links) {
           $entity['links'] = array_values($links);
         }
-        $paths = CoreUtil::getInfoItem($entity['name'], 'paths');
-        if (!empty($paths['add'])) {
-          $entity['addPath'] = $paths['add'];
-        }
         try {
           $getFields = civicrm_api4($entity['name'], 'getFields', [
             'select' => ['name', 'title', 'label', 'description', 'type', 'options', 'input_type', 'input_attrs', 'data_type', 'serialize', 'entity', 'fk_entity', 'readonly', 'operators', 'suffixes', 'nullable'],
@@ -310,25 +306,21 @@ public static function getJoins(array $allowedEntities):array {
             $dynamicCol = $reference->getTypeColumn();
 
             // For dynamic references getTargetEntities will return multiple targets; for normal joins this loop will only run once
-            foreach ($reference->getTargetEntities() as $targetTable => $targetEntityName) {
-              if (
-                !isset($allowedEntities[$targetEntityName]) ||
-                // What to do with self-references? They're weird but sometimes useful.
-                // For now, only allowing it for dynamic columns since they're explicitly declared
-                // (e.g. a Note can be a comment on a Note), and only the 1-n join since n-1 can be done with implicit joins.
-                ($targetEntityName === $entity['name'] && !$dynamicCol)
-              ) {
+            foreach ($reference->getTargetEntities() as $dynamicValue => $targetEntityName) {
+              if (!isset($allowedEntities[$targetEntityName])) {
+                // Skip if target entity doesn't exist
                 continue;
               }
               $targetEntity = $allowedEntities[$targetEntityName];
-              // Add the straight 1-1 join (but only if it's not a reference to itself, see above)
-              if ($targetEntityName !== $entity['name']) {
+              $isSelf = $targetEntityName === $entity['name'];
+              // Add the straight 1-1 join (but only if it's not a reference to itself, those can be done with implicit joins)
+              if (!$isSelf) {
                 $alias = $entity['name'] . '_' . $targetEntityName . '_' . $keyField['name'];
                 $joins[$entity['name']][] = [
                   'label' => $entity['title'] . ' ' . ($dynamicCol ? $targetEntity['title'] : $keyField['label']),
                   'description' => '',
                   'entity' => $targetEntityName,
-                  'conditions' => self::getJoinConditions($keyField['name'], $alias . '.' . $reference->getTargetKey(), $targetTable, $dynamicCol),
+                  'conditions' => self::getJoinConditions($keyField['name'], $alias . '.' . $reference->getTargetKey(), $dynamicValue, $dynamicCol),
                   'defaults' => self::getJoinDefaults($alias, $targetEntity),
                   'alias' => $alias,
                   'multi' => FALSE,
@@ -337,10 +329,10 @@ public static function getJoins(array $allowedEntities):array {
               // Flip the conditions & add the reverse (1-n) join
               $alias = $targetEntityName . '_' . $entity['name'] . '_' . $keyField['name'];
               $joins[$targetEntityName][] = [
-                'label' => $targetEntity['title'] . ' ' . $entity['title_plural'],
-                'description' => $dynamicCol ? '' : $keyField['label'],
+                'label' => ($isSelf ? $keyField['label'] : $targetEntity['title']) . ' ' . $entity['title_plural'],
+                'description' => $dynamicCol || $isSelf ? '' : $keyField['label'],
                 'entity' => $entity['name'],
-                'conditions' => self::getJoinConditions($reference->getTargetKey(), $alias . '.' . $keyField['name'], $targetTable, $dynamicCol ? $alias . '.' . $dynamicCol : NULL),
+                'conditions' => self::getJoinConditions($reference->getTargetKey(), $alias . '.' . $keyField['name'], $dynamicValue, $dynamicCol ? $alias . '.' . $dynamicCol : NULL),
                 'defaults' => self::getJoinDefaults($alias, $entity),
                 'alias' => $alias,
                 'multi' => TRUE,
@@ -355,7 +347,7 @@ public static function getJoins(array $allowedEntities):array {
             $reference = self::getReference($targetKey, $references);
             $dynamicCol = $reference->getTypeColumn();
             $keyField = $fields[$reference->getReferenceKey()] ?? NULL;
-            foreach ($reference->getTargetEntities() as $targetTable => $targetEntityName) {
+            foreach ($reference->getTargetEntities() as $dynamicValue => $targetEntityName) {
               $targetEntity = $allowedEntities[$targetEntityName] ?? NULL;
               $baseEntity = $allowedEntities[$fields[$baseKey]['fk_entity']] ?? NULL;
               if (!$targetEntity || !$baseEntity) {
@@ -370,7 +362,7 @@ public static function getJoins(array $allowedEntities):array {
                 'entity' => $targetEntityName,
                 'conditions' => array_merge(
                   [$bridge],
-                  self::getJoinConditions('id', $alias . '.' . $baseKey, NULL, NULL)
+                  self::getJoinConditions('id', $alias . '.' . $baseKey)
                 ),
                 'defaults' => self::getJoinDefaults($alias, $targetEntity, $entity),
                 'bridge' => $bridge,
@@ -386,7 +378,7 @@ public static function getJoins(array $allowedEntities):array {
                   'entity' => $baseEntity['name'],
                   'conditions' => array_merge(
                     [$bridge],
-                    self::getJoinConditions($reference->getTargetKey(), $alias . '.' . $keyField['name'], $targetTable, $dynamicCol ? $alias . '.' . $dynamicCol : NULL)
+                    self::getJoinConditions($reference->getTargetKey(), $alias . '.' . $keyField['name'], $dynamicValue, $alias . '.' . $dynamicCol)
                   ),
                   'defaults' => self::getJoinDefaults($alias, $baseEntity, $entity),
                   'bridge' => $bridge,
@@ -467,11 +459,11 @@ private static function getReference(string $fieldName, array $references) {
    *
    * @param string $nearCol
    * @param string $farCol
-   * @param string|null $targetTable
+   * @param string|null $dynamicValue
    * @param string|null $dynamicCol
    * @return array[]
    */
-  private static function getJoinConditions(string $nearCol, string $farCol, string $targetTable = NULL, string $dynamicCol = NULL):array {
+  private static function getJoinConditions(string $nearCol, string $farCol, string $dynamicValue = NULL, string $dynamicCol = NULL):array {
     $conditions = [
       [
         $nearCol,
@@ -483,7 +475,7 @@ private static function getJoinConditions(string $nearCol, string $farCol, strin
       $conditions[] = [
         $dynamicCol,
         '=',
-        "'$targetTable'",
+        "'$dynamicValue'",
       ];
     }
     return $conditions;
diff --git a/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js b/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
index e4969a185..21128fc62 100644
--- a/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
+++ b/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
@@ -23,7 +23,7 @@
     $scope.hs = crmUiHelp({file: 'CRM/Search/Help/Compose'});
 
     this.afformEnabled = 'org.civicrm.afform' in CRM.crmSearchAdmin.modules;
-    this.afformAdminEnabled = (CRM.checkPerm('administer CiviCRM') || CRM.checkPerm('administer afform')) &&
+    this.afformAdminEnabled = CRM.checkPerm('administer afform') &&
       'org.civicrm.afform_admin' in CRM.crmSearchAdmin.modules;
     this.displayTypes = _.indexBy(CRM.crmSearchAdmin.displayTypes, 'id');
     this.searchDisplayPath = CRM.url('civicrm/search');
diff --git a/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminFields.html b/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminFields.html
index b1c2a804b..f609bf0b8 100644
--- a/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminFields.html
+++ b/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/crmSearchAdminFields.html
@@ -4,7 +4,7 @@
     <crm-search-function ng-if="!col.isPseudoField" class="form-inline" mode="select" expr="col.key"></crm-search-function>
     <label ng-if="col.isPseudoField">{{:: col.label }}</label>
     <button type="button" class="btn btn-xs pull-right" ng-if="$ctrl.select.length > 1" ng-click="$ctrl.crmSearchAdmin.clearParam('select', $index)" title="{{:: ts('Remove') }}">
-      <i class="crm-i fa-ban"></i>
+      <i class="crm-i fa-times"></i>
     </button>
   </fieldset>
 </div>
diff --git a/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html b/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html
index 27aee9a6b..f3fd497dc 100644
--- a/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html
+++ b/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/displays/colType/field.html
@@ -46,7 +46,7 @@
     {{:: ts('Rewrite Text') }}
   </label>
   <a crm-ui-help="hs({id: 'rewrite', title: ts('Rewrite Text')})"></a>
-  <textarea rows="2" class="form-control crm-flex-1" ng-if="col.rewrite" ng-model="col.rewrite" ng-model-options="{updateOn: 'blur'}"></textarea>
+  <textarea rows="2" class="form-control crm-flex-1" ng-if="col.rewrite" ng-model="col.rewrite" ng-model-options="{updateOn: 'blur'}" ng-trim="false"></textarea>
   <crm-search-admin-token-select ng-if="col.rewrite" model="col" field="rewrite" suffix=":label"></crm-search-admin-token-select>
 </div>
 <div class="form-inline">
diff --git a/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.component.js b/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.component.js
index 9cb68b2bf..aeb47d235 100644
--- a/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.component.js
+++ b/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/searchListing/crmSearchAdminSearchListing.component.js
@@ -18,7 +18,7 @@
       this.searchDisplayPath = CRM.url('civicrm/search');
       this.afformPath = CRM.url('civicrm/admin/afform');
       this.afformEnabled = 'org.civicrm.afform' in CRM.crmSearchAdmin.modules;
-      this.afformAdminEnabled = (CRM.checkPerm('administer CiviCRM') || CRM.checkPerm('administer afform')) &&
+      this.afformAdminEnabled = CRM.checkPerm('administer afform') &&
         'org.civicrm.afform_admin' in CRM.crmSearchAdmin.modules;
       const scheduledCommunicationsEnabled = 'scheduled_communications' in CRM.crmSearchAdmin.modules;
 
diff --git a/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/searchSegment/crmSearchAdminSegment.component.js b/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/searchSegment/crmSearchAdminSegment.component.js
index f79b766dc..56aeb5271 100644
--- a/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/searchSegment/crmSearchAdminSegment.component.js
+++ b/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/searchSegment/crmSearchAdminSegment.component.js
@@ -57,6 +57,10 @@
         }
       };
 
+      this.getOptionKey = function(expr) {
+        return expr.split(':')[1] || 'id';
+      };
+
       function getDefaultField() {
         var item = _.findLast(ctrl.segment.items, function(item) {
           return item.when && item.when[0] && item.when[0][0];
diff --git a/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/searchSegment/crmSearchAdminSegment.html b/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/searchSegment/crmSearchAdminSegment.html
index ae20d3b22..67a8d371c 100644
--- a/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/searchSegment/crmSearchAdminSegment.html
+++ b/www/modules/civicrm/ext/search_kit/ang/crmSearchAdmin/searchSegment/crmSearchAdminSegment.html
@@ -34,7 +34,7 @@
             <td>
               <div ng-repeat="condition in item.when" class="form-inline">
                 <input class="form-control" ng-model="condition[0]" crm-ui-select="{data: $ctrl.selectFields, allowClear: false}" >
-                <crm-search-condition clause="condition" field="$ctrl.getField(condition[0])" offset="1" option-key="'name'" class="form-group"></crm-search-condition>
+                <crm-search-condition clause="condition" field="$ctrl.getField(condition[0])" offset="1" option-key="$ctrl.getOptionKey(condition[0])" class="form-group"></crm-search-condition>
                 <a class="crm-hover-button" ng-if="$index" ng-click="item.when.splice($index, 1)">
                   <i class="crm-i fa-times" aria-hidden="true"></i>
                 </a>
diff --git a/www/modules/civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html b/www/modules/civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html
index e864bc09d..2524041a1 100644
--- a/www/modules/civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html
+++ b/www/modules/civicrm/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayTableBody.html
@@ -1,11 +1,11 @@
-<tr ng-repeat="(rowIndex, row) in $ctrl.results">
+<tr ng-repeat="(rowIndex, row) in $ctrl.results" data-entity-id="{{:: row.key }}">
   <td ng-if=":: $ctrl.hasExtraFirstColumn()" class="{{:: row.cssClass }}">
     <span ng-if=":: $ctrl.settings.draggable" class="crm-draggable" title="{{:: ts('Drag to reposition') }}">
       <i class="crm-i fa-arrows-v"></i>
     </span>
     <input ng-if=":: $ctrl.settings.actions" type="checkbox" ng-checked="$ctrl.isRowSelected(row)" ng-click="$ctrl.toggleRow(row, $event)" ng-disabled="!!$ctrl.loadingAllRows">
   </td>
-  <td ng-repeat="(colIndex, colData) in row.columns" ng-include="'~/crmSearchDisplay/colType/' + $ctrl.settings.columns[colIndex].type + '.html'" title="{{:: colData.title }}" class="crm-search-col-type-{{:: $ctrl.settings.columns[colIndex].type }} {{:: row.cssClass }} {{:: colData.cssClass }}">
+  <td ng-repeat="(colIndex, colData) in row.columns" ng-include="'~/crmSearchDisplay/colType/' + $ctrl.settings.columns[colIndex].type + '.html'" title="{{:: colData.title }}" class="crm-search-col-type-{{:: $ctrl.settings.columns[colIndex].type }} {{:: row.cssClass }} {{:: colData.cssClass }}" data-field-name="{{:: colData.edit.value_key }}">
   </td>
 </tr>
 <tr ng-if="$ctrl.rowCount === 0">
diff --git a/www/modules/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/date.html b/www/modules/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/date.html
index 5fdfa7267..f5c7508be 100644
--- a/www/modules/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/date.html
+++ b/www/modules/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/date.html
@@ -10,7 +10,7 @@
   <div class="form-group" ng-switch="$ctrl.dateType">
 
     <div class="form-group" ng-switch-when="fixed">
-      <input class="form-control" crm-ui-datepicker="{time: $ctrl.field.data_type === 'Timestamp', start_date_years: 100, end_date_years: 100}" ng-model="$ctrl.value" ng-required="!$ctrl.field.nullable" ng-if="!$ctrl.isMulti()">
+      <input class="form-control" crm-ui-datepicker="{time: $ctrl.field.data_type === 'Timestamp'}" ng-model="$ctrl.value" ng-required="!$ctrl.field.nullable" ng-if="!$ctrl.isMulti()">
       <input class="form-control" crm-multi-select-date ng-model="$ctrl.value" ng-required="!$ctrl.field.nullable" ng-if="$ctrl.isMulti()">
     </div>
 
diff --git a/www/modules/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/select.html b/www/modules/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/select.html
index c98500db3..3b08f98e9 100644
--- a/www/modules/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/select.html
+++ b/www/modules/civicrm/ext/search_kit/ang/crmSearchTasks/crmSearchInput/select.html
@@ -5,5 +5,5 @@
   <input class="form-control" ng-model="$ctrl.value" crm-ui-select="{data: $ctrl.getFieldOptions, allowClear: $ctrl.field.nullable, placeholder: $ctrl.field.nullable ? ts('None') : ts('Select')}">
 </div>
 <div class="form-group" ng-if="$ctrl.isMulti() && $ctrl.field.options !== true">
-  <input class="form-control" ng-model="$ctrl.value" crm-ui-select="{data: $ctrl.getFieldOptions, multiple: true}" ng-list >
+  <input class="form-control" ng-model="$ctrl.value" crm-ui-select="{data: $ctrl.getFieldOptions, multiple: true, separator: '\u0001'}" ng-list="
" >
 </div>
diff --git a/www/modules/civicrm/ext/search_kit/info.xml b/www/modules/civicrm/ext/search_kit/info.xml
index 8e1eb2574..5932b2fd4 100644
--- a/www/modules/civicrm/ext/search_kit/info.xml
+++ b/www/modules/civicrm/ext/search_kit/info.xml
@@ -14,14 +14,14 @@
     <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>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>stable</develStage>
   <tags>
     <tag>mgmt:required</tag>
   </tags>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>Click on the chat link above to discuss development, report problems or ask questions.</comments>
   <classloader>
@@ -35,7 +35,7 @@
     <mixin>menu-xml@1.0.0</mixin>
     <mixin>mgd-php@1.0.0</mixin>
     <mixin>entity-types-php@1.0.0</mixin>
-    <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>smarty@1.0.0</mixin>
   </mixins>
   <civix>
     <namespace>CRM/Search</namespace>
diff --git a/www/modules/civicrm/ext/search_kit/managed/Navigation_search_kit.mgd.php b/www/modules/civicrm/ext/search_kit/managed/Navigation_search_kit.mgd.php
index dbaaae9ad..e67a32038 100644
--- a/www/modules/civicrm/ext/search_kit/managed/Navigation_search_kit.mgd.php
+++ b/www/modules/civicrm/ext/search_kit/managed/Navigation_search_kit.mgd.php
@@ -15,7 +15,6 @@
         'url' => 'civicrm/admin/search',
         'icon' => 'crm-i fa-search-plus',
         'permission' => [
-          'administer CiviCRM data',
           'administer search_kit',
         ],
         'permission_operator' => 'OR',
diff --git a/www/modules/civicrm/ext/search_kit/search_kit.php b/www/modules/civicrm/ext/search_kit/search_kit.php
index a305ff155..f7bbc1b44 100644
--- a/www/modules/civicrm/ext/search_kit/search_kit.php
+++ b/www/modules/civicrm/ext/search_kit/search_kit.php
@@ -13,17 +13,6 @@ function search_kit_civicrm_config(&$config) {
   Civi::dispatcher()->addListener('hook_civicrm_alterAngular', ['\Civi\Search\AfformSearchMetadataInjector', 'preprocess'], 1000);
 }
 
-/**
- * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
- */
-function search_kit_civicrm_container($container) {
-  $container->getDefinition('dispatcher')
-    ->addMethodCall('addListener', [
-      'civi.api4.authorizeRecord::SavedSearch',
-      ['CRM_Search_BAO_SearchDisplay', 'savedSearchCheckAccessByDisplay'],
-    ]);
-}
-
 /**
  * Implements hook_civicrm_permission().
  *
@@ -31,8 +20,9 @@ function search_kit_civicrm_container($container) {
  */
 function search_kit_civicrm_permission(&$permissions) {
   $permissions['administer search_kit'] = [
-    E::ts('SearchKit: edit and delete searches'),
-    E::ts('Gives non-admin users access to the SearchKit UI to create, update and delete searches and displays'),
+    'label' => E::ts('SearchKit: edit and delete searches'),
+    'description' => E::ts('Gives non-admin users access to the SearchKit UI to create, update and delete searches and displays'),
+    'implied_by' => ['administer CiviCRM data'],
   ];
 }
 
diff --git a/www/modules/civicrm/ext/search_kit/sql/auto_install.sql b/www/modules/civicrm/ext/search_kit/sql/auto_install.sql
index 5e3e2ffaf..7f8fc3f60 100644
--- a/www/modules/civicrm/ext/search_kit/sql/auto_install.sql
+++ b/www/modules/civicrm/ext/search_kit/sql/auto_install.sql
@@ -46,7 +46,7 @@ CREATE TABLE `civicrm_search_display` (
   UNIQUE INDEX `UI_saved_search__id_name`(saved_search_id, name),
   CONSTRAINT FK_civicrm_search_display_saved_search_id FOREIGN KEY (`saved_search_id`) REFERENCES `civicrm_saved_search`(`id`) ON DELETE CASCADE
 )
-ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 
 -- /*******************************************************
 -- *
@@ -65,4 +65,4 @@ CREATE TABLE `civicrm_search_segment` (
   PRIMARY KEY (`id`),
   UNIQUE INDEX `UI_name`(name)
 )
-ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
diff --git a/www/modules/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php b/www/modules/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php
index d2637ea2a..078376be7 100644
--- a/www/modules/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php
+++ b/www/modules/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchDisplay/SearchRunTest.php
@@ -403,7 +403,9 @@ public function testActionAndTaskLinks():void {
   }
 
   public function testEnableDisableTaskLinks():void {
-    $contributionPage = $this->createTestRecord('ContributionPage');
+    $contributionPage = $this->createTestRecord('ContributionPage', [
+      'is_active' => TRUE,
+    ]);
     $params = [
       'checkPermissions' => FALSE,
       'return' => 'page:1',
@@ -452,11 +454,12 @@ public function testEnableDisableTaskLinks():void {
     ];
     $result = civicrm_api4('SearchDisplay', 'run', $params);
     $this->assertEquals(1, $result->count());
+    $this->assertCount(1, $result[0]['columns'][1]['links']);
     // Native SK tasks should not have a url
-    $this->assertArrayNotHasKey('url', $result[0]['columns'][1]['links'][1]);
-    $this->assertArrayNotHasKey('action', $result[0]['columns'][1]['links'][1]);
-    $this->assertEquals('disable', $result[0]['columns'][1]['links'][1]['task']);
-    $this->assertEquals('fa-pencil', $result[0]['columns'][1]['links'][1]['icon']);
+    $this->assertArrayNotHasKey('url', $result[0]['columns'][1]['links'][0]);
+    $this->assertArrayNotHasKey('action', $result[0]['columns'][1]['links'][0]);
+    $this->assertEquals('disable', $result[0]['columns'][1]['links'][0]['task']);
+    $this->assertEquals('fa-pencil', $result[0]['columns'][1]['links'][0]['icon']);
   }
 
   public function testRelationshipCacheLinks():void {
@@ -515,12 +518,10 @@ public function testRelationshipCacheLinks():void {
                 [
                   'entity' => 'Relationship',
                   'task' => 'enable',
-                  'condition' => ['is_active', '=', FALSE],
                 ],
                 [
                   'entity' => 'Relationship',
                   'task' => 'disable',
-                  'condition' => ['is_active', '=', TRUE],
                 ],
                 [
                   'entity' => 'Case',
@@ -609,13 +610,13 @@ public function testRunWithSmartyRewrite() {
               'key' => 'first_name',
               'label' => 'Name',
               'type' => 'field',
-              'rewrite' => '{if "[nick_name]"}[nick_name]{else}[first_name]{/if} [last_name]',
+              'rewrite' => '{if $nick_name}{$nick_name}{else}[first_name]{/if} [last_name]',
             ],
             [
               'key' => 'Contact_Email_contact_id_01.email',
               'label' => 'Email',
               'type' => 'field',
-              'rewrite' => '{if "[Contact_Email_contact_id_01.email]"}[Contact_Email_contact_id_01.email] ([Contact_Email_contact_id_01.location_type_id:label]){/if}',
+              'rewrite' => '{if $Contact_Email_contact_id_01.email}{$Contact_Email_contact_id_01.email} ({$Contact_Email_contact_id_01.location_type_id_label}){/if}',
             ],
           ],
           'sort' => [
@@ -638,6 +639,49 @@ public function testRunWithSmartyRewrite() {
     }
     catch (\Exception $e) {
     }
+
+    // Start with email as base entity and use implicit join
+
+    $params = [
+      'checkPermissions' => FALSE,
+      'return' => 'page:1',
+      'savedSearch' => [
+        'api_entity' => 'Email',
+        'api_params' => [
+          'version' => 4,
+          'select' => ['id', 'email', 'contact_id', 'contact_id.first_name', 'contact_id.last_name', 'contact_id.nick_name'],
+          'where' => [['contact_id.last_name', '=', $lastName]],
+        ],
+      ],
+      'display' => [
+        'type' => 'table',
+        'label' => 'testDisplay',
+        'settings' => [
+          'limit' => 20,
+          'pager' => TRUE,
+          'columns' => [
+            [
+              'key' => 'contact_id',
+              'label' => 'Contact ID',
+              'type' => 'field',
+              'rewrite' => '#{$contact_id.id} is #{$contact_id}',
+            ],
+            [
+              'key' => 'first_name',
+              'label' => 'Name',
+              'type' => 'field',
+              'rewrite' => '{if $contact_id.nick_name}{$contact_id.nick_name}{else}[contact_id.first_name]{/if} {$contact_id.last_name}',
+            ],
+          ],
+          'sort' => [
+            ['id', 'ASC'],
+          ],
+        ],
+      ],
+    ];
+    $result = civicrm_api4('SearchDisplay', 'run', $params);
+    $this->assertEquals("#{$contacts[0]['id']} is #{$contacts[0]['id']}", $result[0]['columns'][0]['val']);
+    $this->assertEquals("Uno $lastName", $result[0]['columns'][1]['val']);
   }
 
   /**
@@ -1059,7 +1103,7 @@ public function testWithACLBypass() {
     }
     $this->assertStringContainsString('failed', $error);
 
-    $config->userPermissionClass->permissions = ['access CiviCRM', 'administer search_kit'];
+    $config->userPermissionClass->permissions = ['administer CiviCRM'];
 
     // Admins can edit the search and the display
     SavedSearch::update()->addWhere('name', '=', $searchName)
diff --git a/www/modules/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchSegment/SearchSegmentTest.php b/www/modules/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchSegment/SearchSegmentTest.php
index feff968ec..a610dd659 100644
--- a/www/modules/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchSegment/SearchSegmentTest.php
+++ b/www/modules/civicrm/ext/search_kit/tests/phpunit/api/v4/SearchSegment/SearchSegmentTest.php
@@ -25,12 +25,20 @@ public function setUpHeadless() {
   }
 
   public function tearDown(): void {
-    foreach (['Activity', 'SearchSegment', 'CustomGroup', 'Contact'] as $entity) {
+    foreach (['Activity', 'SearchSegment', 'CustomGroup'] as $entity) {
       civicrm_api4($entity, 'delete', [
         'checkPermissions' => FALSE,
         'where' => [['id', '>', '0']],
       ]);
     }
+    // Delete all contacts without a UFMatch.
+    $contacts = Contact::get(FALSE)
+      ->addSelect('id')
+      ->addJoin('UFMatch AS uf_match', 'EXCLUDE')
+      ->execute()->column('id');
+    Contact::delete(FALSE)
+      ->addWhere('id', 'IN', $contacts)
+      ->execute();
     parent::tearDown();
   }
 
diff --git a/www/modules/civicrm/ext/sequentialcreditnotes/info.xml b/www/modules/civicrm/ext/sequentialcreditnotes/info.xml
index 653bf4322..29f41bdb8 100644
--- a/www/modules/civicrm/ext/sequentialcreditnotes/info.xml
+++ b/www/modules/civicrm/ext/sequentialcreditnotes/info.xml
@@ -14,14 +14,14 @@
     <url desc="Support">https://lab.civicrm.org/extensions/sequentialcreditnotes</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>
   <develStage>stable</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <mixins>
     <mixin>setting-php@1.0.0</mixin>
diff --git a/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/BAO/Role.php b/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/BAO/Role.php
index f203f2fa1..a7fb11cb0 100644
--- a/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/BAO/Role.php
+++ b/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/BAO/Role.php
@@ -4,7 +4,7 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
-use CRM_Standaloneusers_ExtensionUtil as E;
+use Civi\Api4\Event\AuthorizeRecordEvent;
 
 class CRM_Standaloneusers_BAO_Role extends CRM_Standaloneusers_DAO_Role implements \Civi\Core\HookInterface {
 
@@ -20,22 +20,41 @@ public static function self_hook_civicrm_post(\Civi\Core\Event\PostEvent $event)
   /**
    * Check access permission
    *
-   * @param string $entityName
-   * @param string $action
-   * @param array $record
-   * @param integer|null $userID
-   * @return boolean
+   * Note that $e->getRecord() returns the data passed INTO the API, e.g. if it
+   * has a 'name' key, then the value is that passed into the API (e.g. for an
+   * update action), not the current value.
+   *
+   * @param \Civi\Api4\Event\AuthorizeRecordEvent $e
    * @see \Civi\Api4\Utils\CoreUtil::checkAccessRecord
    */
-  public static function _checkAccess(string $entityName, string $action, array $record, ?int $userID): bool {
-    // Prevent users from updating or deleting the admin and everyone roles
-    if (in_array($action, ['delete', 'update'], TRUE)) {
-      $name = $record['name'] ?? CRM_Core_DAO::getFieldValue(self::class, $record['id']);
-      if (in_array($name, ['admin', 'everyone'], TRUE)) {
-        return FALSE;
+  public static function self_civi_api4_authorizeRecord(AuthorizeRecordEvent $e): void {
+    $record = $e->getRecord();
+    $action = $e->getActionName();
+    if (!in_array($action, ['delete', 'update'], TRUE)) {
+      // We only care about these actions.
+      return;
+    }
+
+    // Load the role name from the record that is to be updated/deleted.
+    $storedRoleName = CRM_Core_DAO::getFieldValue(self::class, $record['id'], 'name');
+
+    // Protect the admin role: it must have access to everything.
+    if ($storedRoleName === 'admin') {
+      $e->setAuthorized(FALSE);
+      return;
+    }
+
+    // Protect the everyone role
+    if ($storedRoleName === 'everyone') {
+      if ($action === 'delete') {
+        // Do not allow deletion of the everyone role.
+        $e->setAuthorized(FALSE);
+      }
+      // Updates: Disallow changing name and is_active
+      if (array_intersect(['name', 'is_active'], array_keys($record))) {
+        $e->setAuthorized(FALSE);
       }
     }
-    return TRUE;
   }
 
 }
diff --git a/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/BAO/User.php b/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/BAO/User.php
index 5db83b717..d9dc07632 100644
--- a/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/BAO/User.php
+++ b/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/BAO/User.php
@@ -4,13 +4,44 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
+use Civi\Api4\Event\AuthorizeRecordEvent;
 use Civi\Api4\UserRole;
-use CRM_Standaloneusers_ExtensionUtil as E;
+use Civi\Core\HookInterface;
 
 /**
  * Business access object for the User entity.
  */
-class CRM_Standaloneusers_BAO_User extends CRM_Standaloneusers_DAO_User implements \Civi\Core\HookInterface {
+class CRM_Standaloneusers_BAO_User extends CRM_Standaloneusers_DAO_User implements HookInterface {
+
+  /**
+   * @see \Civi\Api4\Utils\CoreUtil::checkAccessRecord
+   */
+  public static function self_civi_api4_authorizeRecord(AuthorizeRecordEvent $e): void {
+    $record = $e->getRecord();
+    $action = $e->getActionName();
+    $mayAdminUsers = \CRM_Core_Permission::check('cms:administer users');
+    $isOwnUser = ((int) \CRM_Utils_System::getLoggedInUfID()) == $record['id'] ?? NULL;
+    if ($action === 'delete') {
+      if ($isOwnUser) {
+        // Prevent users from deleting their own user account
+        $e->setAuthorized(FALSE);
+      }
+      else {
+        // Enforce administer user permission requirement
+        $e->setAuthorized($mayAdminUsers);
+      }
+    }
+    elseif ($action === 'update') {
+      $e->setAuthorized($isOwnUser ?: $mayAdminUsers);
+    }
+    elseif ($action === 'create') {
+      $e->setAuthorized($mayAdminUsers);
+    }
+    else {
+      // Is there another write action we don't know about? If so, play it safe and say No.
+      $e->setAuthorized(FALSE);
+    }
+  }
 
   /**
    * Event fired before an action is taken on a User record.
@@ -73,26 +104,39 @@ public static function getTimeZones(): array {
     return $timeZones;
   }
 
-  /**
-   * Check access permission
-   *
-   * @param string $entityName
-   * @param string $action
-   * @param array $record
-   * @param integer|null $userID
-   * @return boolean
-   * @see \Civi\Api4\Utils\CoreUtil::checkAccessRecord
-   */
-  public static function _checkAccess(string $entityName, string $action, array $record, ?int $userID): bool {
-    // Prevent users from deleting their own user account
-    if (in_array($action, ['delete'], TRUE)) {
-      $sess = CRM_Core_Session::singleton();
-      $ufID = (int) $sess->get('ufID');
-      if ($record['id'] == $ufID) {
-        return FALSE;
-      };
+  public function addSelectWhereClause(string $entityName = NULL, int $userId = NULL, array $conditions = []): array {
+    $clauses = [];
+
+    // ↓ The following is copied from parent::addSelectWhereClause(). Is it needed? :shrug:
+    $fields = $this::getSupportedFields();
+    foreach ($fields as $fieldName => $field) {
+      // Clause for contact-related entities like Email, Relationship, etc.
+      if (str_starts_with($fieldName, 'contact_id') && ($field['FKClassName'] ?? NULL) === 'CRM_Contact_DAO_Contact') {
+        $contactClause = CRM_Utils_SQL::mergeSubquery('Contact');
+        if (!empty($contactClause)) {
+          $clauses[$fieldName] = $contactClause;
+        }
+      }
+      // Clause for an entity_table/entity_id combo
+      if ($fieldName === 'entity_id' && isset($fields['entity_table'])) {
+        $relatedClauses = self::getDynamicFkAclClauses('entity_table', 'entity_id', $conditions['entity_table'] ?? NULL);
+        if ($relatedClauses) {
+          // Nested array will be joined with OR
+          $clauses['entity_table'] = [$relatedClauses];
+        }
+      }
     }
-    return TRUE;
+    // ↑ end copy of parent's code.
+
+    // Limit those without administer users permission to their own record.
+    if (!CRM_Core_Permission::check('cms:administer users')) {
+      // A user without administer users permission is potentially requesting record(s)
+      // other than their own. Limit to their own.
+      $clauses['id'] = [sprintf('= %s', (int) CRM_Utils_System::getLoggedInUfID())];
+    }
+
+    CRM_Utils_Hook::selectWhereClause($entityName ?? $this, $clauses);
+    return $clauses;
   }
 
 }
diff --git a/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/DAO/User.php b/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/DAO/User.php
index e8b612646..5a847b271 100644
--- a/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/DAO/User.php
+++ b/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/DAO/User.php
@@ -6,7 +6,7 @@
  *
  * Generated from standaloneusers/xml/schema/CRM/Standaloneusers/User.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ffc15573377f7cc25f4df498d62fc185)
+ * (GenCodeChecksum:b7e5920d71c6d2ea6ee10a4f6e9b101b)
  */
 use CRM_Standaloneusers_ExtensionUtil as E;
 
@@ -159,7 +159,7 @@ class CRM_Standaloneusers_DAO_User extends CRM_Core_DAO {
    * The unspent token
    *
    * @var string|null
-   *   (SQL type: varchar(40))
+   *   (SQL type: varchar(255))
    *   Note that values will be retrieved from the database as a string.
    */
   public $password_reset_token;
@@ -302,7 +302,6 @@ public static function &fields() {
           'bao' => 'CRM_Standaloneusers_DAO_User',
           'localizable' => 0,
           'FKClassName' => 'CRM_Contact_DAO_Contact',
-          'FKColumnName' => 'id',
           'html' => [
             'type' => 'EntityRef',
             'label' => E::ts("Contact"),
@@ -350,6 +349,12 @@ public static function &fields() {
             'token' => FALSE,
           ],
           'where' => 'civicrm_uf_match.hashed_password',
+          'permission' => [
+            [
+              'administer CiviCRM',
+              'cms:administer users',
+            ],
+          ],
           'default' => '',
           'table_name' => 'civicrm_uf_match',
           'entity' => 'User',
@@ -493,8 +498,8 @@ public static function &fields() {
           'type' => CRM_Utils_Type::T_STRING,
           'title' => E::ts('Password Reset Token'),
           'description' => E::ts('The unspent token'),
-          'maxlength' => 40,
-          'size' => CRM_Utils_Type::BIG,
+          'maxlength' => 255,
+          'size' => CRM_Utils_Type::HUGE,
           'usage' => [
             'import' => FALSE,
             'export' => FALSE,
@@ -502,6 +507,12 @@ public static function &fields() {
             'token' => FALSE,
           ],
           'where' => 'civicrm_uf_match.password_reset_token',
+          'permission' => [
+            [
+              'administer CiviCRM',
+              'cms:administer users',
+            ],
+          ],
           'table_name' => 'civicrm_uf_match',
           'entity' => 'User',
           'bao' => 'CRM_Standaloneusers_DAO_User',
diff --git a/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/DAO/UserRole.php b/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/DAO/UserRole.php
index bca4afbce..1e33a6557 100644
--- a/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/DAO/UserRole.php
+++ b/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/DAO/UserRole.php
@@ -6,7 +6,7 @@
  *
  * Generated from standaloneusers/xml/schema/CRM/Standaloneusers/UserRole.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e639eab915fc9ac8649926d907213b3e)
+ * (GenCodeChecksum:261a62783e6628b718b812b096080e69)
  */
 use CRM_Standaloneusers_ExtensionUtil as E;
 
@@ -124,7 +124,6 @@ public static function &fields() {
           'bao' => 'CRM_Standaloneusers_DAO_UserRole',
           'localizable' => 0,
           'FKClassName' => 'CRM_Standaloneusers_DAO_User',
-          'FKColumnName' => 'id',
           'html' => [
             'type' => 'EntityRef',
             'label' => E::ts("User"),
@@ -148,7 +147,6 @@ public static function &fields() {
           'bao' => 'CRM_Standaloneusers_DAO_UserRole',
           'localizable' => 0,
           'FKClassName' => 'CRM_Standaloneusers_DAO_Role',
-          'FKColumnName' => 'id',
           'html' => [
             'type' => 'EntityRef',
             'label' => E::ts("Role"),
diff --git a/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/Upgrader.php b/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/Upgrader.php
index 5a2b22605..2fca2d688 100644
--- a/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/Upgrader.php
+++ b/www/modules/civicrm/ext/standaloneusers/CRM/Standaloneusers/Upgrader.php
@@ -1,6 +1,7 @@
 <?php
 use CRM_Standaloneusers_ExtensionUtil as E;
 use Civi\Api4\MessageTemplate;
+use Civi\Api4\Navigation;
 
 /**
  * Collection of upgrade steps.
@@ -99,18 +100,28 @@ protected function createPasswordResetMessageTemplate() {
   // }
 
   /**
-   * Example: Run a simple query when a module is enabled.
+   * On enable:
+   * - disable the user sync menu item
    */
-  // public function enable() {
-  //  CRM_Core_DAO::executeQuery('UPDATE foo SET is_active = 1 WHERE bar = "whiz"');
-  // }
+  public function enable() {
+    // standaloneusers is incompatible with user sync, so disable this nav menu item
+    Navigation::update(FALSE)
+      ->addWhere('url', '=', 'civicrm/admin/synchUser?reset=1')
+      ->addValue('is_active', FALSE)
+      ->execute();
+  }
 
   /**
-   * Example: Run a simple query when a module is disabled.
+   * On disable:
+   * - re-enable the user sync menu item
    */
-  // public function disable() {
-  //   CRM_Core_DAO::executeQuery('UPDATE foo SET is_active = 0 WHERE bar = "whiz"');
-  // }
+  public function disable() {
+    // reinstate user sync menu item
+    Navigation::update(FALSE)
+      ->addWhere('url', '=', 'civicrm/admin/synchUser?reset=1')
+      ->addValue('is_active', TRUE)
+      ->execute();
+  }
 
   /**
    * Example: Run a couple simple queries.
diff --git a/www/modules/civicrm/ext/standaloneusers/Civi/Api4/Action/User/SendPasswordReset.php b/www/modules/civicrm/ext/standaloneusers/Civi/Api4/Action/User/SendPasswordReset.php
index 54f99a76f..5c864d312 100644
--- a/www/modules/civicrm/ext/standaloneusers/Civi/Api4/Action/User/SendPasswordReset.php
+++ b/www/modules/civicrm/ext/standaloneusers/Civi/Api4/Action/User/SendPasswordReset.php
@@ -102,20 +102,20 @@ public function _run(Result $result) {
    *   The token
    */
   public static function updateToken(int $userID): string {
-    // Generate a once-use token that expires in 1 hour.
+    // Generate a JWT that expires in 1 hour.
     // We'll store this on the User record, that way invalidating any previous token that may have been generated.
-    // The format is <expiry><random><userID>
-    // The UserID shouldn't need to be secret.
-    // We only store <expiry><random> on the User record.
     $expires = time() + 60 * 60;
-    $token = dechex($expires) . substr(preg_replace('@[/+=]+@', '', base64_encode(random_bytes(64))), 0, 32);
-
+    $token = \Civi::service('crypto.jwt')->encode([
+      'exp' => $expires,
+      'sub' => "uid:$userID",
+      'scope' => Security::PASSWORD_RESET_SCOPE,
+    ]);
     User::update(FALSE)
       ->addValue('password_reset_token', $token)
       ->addWhere('id', '=', $userID)
       ->execute();
 
-    return $token . dechex($userID);
+    return $token;
   }
 
 }
diff --git a/www/modules/civicrm/ext/standaloneusers/Civi/Api4/Action/User/Update.php b/www/modules/civicrm/ext/standaloneusers/Civi/Api4/Action/User/Update.php
index 2fcdace1f..f78c26d18 100644
--- a/www/modules/civicrm/ext/standaloneusers/Civi/Api4/Action/User/Update.php
+++ b/www/modules/civicrm/ext/standaloneusers/Civi/Api4/Action/User/Update.php
@@ -1,9 +1,41 @@
 <?php
 namespace Civi\Api4\Action\User;
 
+use Civi\API\Exception\UnauthorizedException;
 use Civi\Api4\Generic\DAOUpdateAction;
+use Civi\Api4\Generic\Result;
+
+use CRM_Core_Permission;
 
 class Update extends DAOUpdateAction {
   use WriteTrait;
 
+  /**
+   * Run some permission checks before doing the update.
+   */
+  public function _run(Result $result) {
+    if ($this->getCheckPermissions()) {
+      $loggedInUfID = (int) \CRM_Utils_System::getLoggedInUfID();
+      if (!$loggedInUfID) {
+        // Never allow update if not logged in.
+        throw new UnauthorizedException("User.update API call when not logged in.");
+      }
+      if (!CRM_Core_Permission::check('cms:administer users')) {
+        // Non-admin users should only be allowed to update their own record.
+        $found = FALSE;
+        foreach ($this->where as $where) {
+          if ($where[0] === 'id' && $where[1] === '=' && $where[2] == $loggedInUfID) {
+            $found = TRUE;
+            break;
+          }
+        }
+        if (!$found) {
+          throw new UnauthorizedException("User.update called without 'cms:administer users' permission and without a where clause limiting to logged-in user.");
+        }
+      }
+    }
+
+    return parent::_run($result);
+  }
+
 }
diff --git a/www/modules/civicrm/ext/standaloneusers/Civi/Api4/Action/User/WriteTrait.php b/www/modules/civicrm/ext/standaloneusers/Civi/Api4/Action/User/WriteTrait.php
index 7b7b99832..f99d6e3b0 100644
--- a/www/modules/civicrm/ext/standaloneusers/Civi/Api4/Action/User/WriteTrait.php
+++ b/www/modules/civicrm/ext/standaloneusers/Civi/Api4/Action/User/WriteTrait.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Civi\Api4\Action\User;
 
 use Civi\API\Exception\UnauthorizedException;
@@ -20,9 +21,7 @@ trait WriteTrait {
    *
    * We can do some basic checks.
    *
-   * Do all most of our complex permissions checks here.
-   *
-   * Convert plaintext passwords into hashed ones for storage.
+   * Do most of our complex permissions checks here.
    *
    * @param array $record
    * @throws \CRM_Core_Exception
@@ -54,10 +53,10 @@ protected function formatWriteValues(&$record) {
     }
     if (array_key_exists('password', $record)) {
       if (!empty($record['hashed_password'])) {
-        throw new API_Exception("Ambiguous password parameters: Cannot pass password AND hashed_password.");
+        throw new \API_Exception("Ambiguous password parameters: Cannot pass password AND hashed_password.");
       }
       if (empty($record['password'])) {
-        throw new API_Exception("Disallowing empty password.");
+        throw new \API_Exception("Disallowing empty password.");
       }
     }
     parent::formatWriteValues($record);
@@ -104,7 +103,7 @@ protected function validateValues() {
         throw new UnauthorizedException("Unauthorized");
       }
       else {
-        $changingOtherUser = ($values['id'] ?? FALSE) !== $loggedInUserID;
+        $changingOtherUser = intval($values['id'] ?? 0) !== $loggedInUserID;
         if ($changingOtherUser && !$hasAdminPermission) {
           throw new UnauthorizedException("You are not permitted to change other users' accounts.");
         }
diff --git a/www/modules/civicrm/ext/standaloneusers/Civi/Api4/User.php b/www/modules/civicrm/ext/standaloneusers/Civi/Api4/User.php
index a013da726..6dbb2a7e7 100644
--- a/www/modules/civicrm/ext/standaloneusers/Civi/Api4/User.php
+++ b/www/modules/civicrm/ext/standaloneusers/Civi/Api4/User.php
@@ -52,11 +52,30 @@ public static function sendPasswordReset($checkPermissions = TRUE): SendPassword
   }
 
   /**
-   * Permissions are wide on this but are checked in validateValues.
+   * Permissions are only used to *authorize* API actions for the
+   * current user. This authorization knows nothing of the parameters,
+   * values etc. passed into the API call, so it's authorization or not
+   * cannot depend on the values. So you do not implement "update own
+   * user, but not others" here.
+   *
+   * For this reason, the default permission is just 'access CiviCRM'
+   * which is very (too) permissive, but each API method implemented
+   * further restricts its use, e.g. write methods typically use
+   * _checkAccess()
+   *
+   * Note that 'access password resets' permission is defined in
+   * this standaloneusers ext. and is intended to be public.
+   *
+   * We have to provide a permission for 'save' because it won't use
+   * 'default'; it will use the same as 'create' and we want users
+   * to be able to use save (on their own record).
    */
   public static function permissions() {
     return [
       'default'           => ['access CiviCRM'],
+      'save'              => ['access CiviCRM'],
+      'create'            => ['cms:administer users'],
+      'delete'            => ['cms:administer users'],
       'passwordReset'     => ['access password resets'],
       'sendPasswordReset' => ['access password resets'],
     ];
diff --git a/www/modules/civicrm/ext/standaloneusers/Civi/Api4/UserRole.php b/www/modules/civicrm/ext/standaloneusers/Civi/Api4/UserRole.php
index 75179552c..bea426854 100644
--- a/www/modules/civicrm/ext/standaloneusers/Civi/Api4/UserRole.php
+++ b/www/modules/civicrm/ext/standaloneusers/Civi/Api4/UserRole.php
@@ -12,4 +12,14 @@
 class UserRole extends Generic\DAOEntity {
   use \Civi\Api4\Generic\Traits\EntityBridge;
 
+  /**
+   * Permissions are only used to *authorize* API actions for the
+   * current user.
+   */
+  public static function permissions() {
+    return [
+      'default'           => ['cms:administer users'],
+    ];
+  }
+
 }
diff --git a/www/modules/civicrm/ext/standaloneusers/Civi/Standalone/Security.php b/www/modules/civicrm/ext/standaloneusers/Civi/Standalone/Security.php
index 56d7d723d..2eae225a4 100644
--- a/www/modules/civicrm/ext/standaloneusers/Civi/Standalone/Security.php
+++ b/www/modules/civicrm/ext/standaloneusers/Civi/Standalone/Security.php
@@ -1,6 +1,7 @@
 <?php
 namespace Civi\Standalone;
 
+use Civi\Crypto\Exception\CryptoException;
 use CRM_Core_Session;
 use Civi;
 use Civi\Api4\User;
@@ -16,6 +17,11 @@
  */
 class Security {
 
+  /**
+   * Scope identifier for password reset JWTs
+   */
+  const PASSWORD_RESET_SCOPE = 'pw_reset';
+
   /**
    * @return static
    */
@@ -224,7 +230,7 @@ public function authenticate($name, $password, $loadCMSBootstrap = FALSE, $realP
   }
 
   /**
-   * Currently only used by CRM_Utils_System_Standalone::loadBootstrap
+   * Register the given user as the currently logged in user.
    */
   public function loginAuthenticatedUserRecord(array $user, bool $withSession) {
     global $loggedInUserId, $loggedInUser;
@@ -279,21 +285,6 @@ public function getCMSPermissionsUrlParams() {
     return ['ufAccessURL' => '/civicrm/admin/roles'];
   }
 
-  /**
-   * Since our User entity contains a FK to a contact, it's not possible for a User to exist without a contact.
-   *
-   * @todo review this (what if contact is deleted?)
-   */
-  public function synchronizeUsers() {
-
-    $userCount = \Civi\Api4\User::get(FALSE)->selectRowCount()->execute()->countMatched();
-    return [
-      'contactCount' => $userCount,
-      'contactMatching' => $userCount,
-      'contactCreated' => 0,
-    ];
-  }
-
   /**
    * High level function to encrypt password using the site-default mechanism.
    */
@@ -384,30 +375,36 @@ public function checkPassword(string $plaintextPassword, string $storedHashedPas
    *
    */
   public function checkPasswordResetToken(string $token, bool $spend = TRUE): ?int {
-    if (!preg_match('/^([0-9a-f]{8})([a-zA-Z0-9]{32})([0-9a-f]+)$/', $token, $matches)) {
-      // Hacker
-      Civi::log()->warning("Rejected passwordResetToken with invalid syntax.", compact('token'));
+    try {
+      $decodedToken = \Civi::service('crypto.jwt')->decode($token);
+    }
+    catch (CryptoException $e) {
+      Civi::log()->warning('Exception while decoding JWT', ['exception' => $e]);
       return NULL;
     }
 
-    $userID = hexdec($matches[3]);
-    if (!$userID > 0) {
-      // Hacker
-      Civi::log()->warning("Rejected passwordResetToken with invalid userID.", compact('token', 'userID'));
+    $scope = $decodedToken['scope'] ?? '';
+    if ($scope != Security::PASSWORD_RESET_SCOPE) {
+      Civi::log()->warning('Expected JWT password reset, got ' . $scope);
       return NULL;
     }
 
-    $expiry = hexdec($matches[1]);
-    if (time() > $expiry) {
-      // Less serious
-      Civi::log()->info("Rejected expired passwordResetToken for user $userID");
+    if (empty($decodedToken['sub']) || substr($decodedToken['sub'], 0, 4) !== 'uid:') {
+      Civi::log()->warning('Missing uid in JWT sub field');
+      return NULL;
+    }
+    else {
+      $userID = substr($decodedToken['sub'], 4);
+    }
+    if (!$userID > 0) {
+      // Hacker
+      Civi::log()->warning("Rejected passwordResetToken with invalid userID.", compact('token', 'userID'));
       return NULL;
     }
 
-    $storedToken = $matches[1] . $matches[2];
     $matched = User::get(FALSE)
       ->addWhere('id', '=', $userID)
-      ->addWhere('password_reset_token', '=', $storedToken)
+      ->addWhere('password_reset_token', '=', $token)
       ->addWhere('is_active', '=', 1)
       ->selectRowCount()
       ->execute()->countMatched() === 1;
@@ -447,7 +444,7 @@ public function preparePasswordResetWorkflow(array $user, string $token): ?CRM_S
     }
 
     // The template_params are used in the template like {$resetUrlHtml} and {$resetUrlHtml} {$usernamePlaintext} {$usernameHtml}
-    list($domainFromName, $domainFromEmail) = \CRM_Core_BAO_Domain::getNameAndEmail(TRUE);
+    [$domainFromName, $domainFromEmail] = \CRM_Core_BAO_Domain::getNameAndEmail(TRUE);
     $workflowMessage = (new \CRM_Standaloneusers_WorkflowMessage_PasswordReset())
       ->setDataFromUser($user, $token)
       ->setFrom("\"$domainFromName\" <$domainFromEmail>");
diff --git a/www/modules/civicrm/ext/standaloneusers/Civi/Standalone/SessionHandler.php b/www/modules/civicrm/ext/standaloneusers/Civi/Standalone/SessionHandler.php
index 4d24071dd..4985a795c 100644
--- a/www/modules/civicrm/ext/standaloneusers/Civi/Standalone/SessionHandler.php
+++ b/www/modules/civicrm/ext/standaloneusers/Civi/Standalone/SessionHandler.php
@@ -143,7 +143,7 @@ public function validateId($id): bool {
     }
 
     $this->data = $session['data'];
-    $max_lifetime = \Civi::settings()->get('standaloneusers_session_max_lifetime');
+    $maxLifetime = \Civi::settings()->get('standaloneusers_session_max_lifetime');
 
     return strtotime($session['last_accessed']) >= strtotime("-$maxLifetime seconds");
   }
diff --git a/www/modules/civicrm/ext/standaloneusers/README.md b/www/modules/civicrm/ext/standaloneusers/README.md
index 0979eb377..1a0f32a07 100644
--- a/www/modules/civicrm/ext/standaloneusers/README.md
+++ b/www/modules/civicrm/ext/standaloneusers/README.md
@@ -50,3 +50,12 @@ cv core:install ... \
 ## Conventions
 
 From the `Civi\Auth\Standalone` class, the User.id is stored in the global `$loggedInUserId` and when there's a session, under the key `ufId`.
+
+## Have I Been Pwned integration
+
+Standalone’s password change form integrates by default with the service at https://haveibeenpwned.com/Passwords
+to check if a given password is known to have been compromised. This is controlled by the constant
+`CIVICRM_HIBP_URL` - if you want to disable this, add this line to your `civicrm.settings.php` file:
+
+    // Disable haveibeenpwned checking.
+    define('CIVICRM_HIBP_URL', '');
diff --git a/www/modules/civicrm/ext/standaloneusers/ang/crmChangePassword.js b/www/modules/civicrm/ext/standaloneusers/ang/crmChangePassword.js
index 80d087661..831f478aa 100644
--- a/www/modules/civicrm/ext/standaloneusers/ang/crmChangePassword.js
+++ b/www/modules/civicrm/ext/standaloneusers/ang/crmChangePassword.js
@@ -1,4 +1,4 @@
-(function (angular, $, _) {
+(function(angular, $, _) {
   "use strict";
 
   angular.module('crmChangePassword', CRM.angRequires('crmChangePassword'));
@@ -10,11 +10,11 @@
       hibp: '@',
       userId: '@'
     },
-    controller: function($scope, $timeout, crmApi4) {
+    controller: function($scope, $timeout, crmApi4, crmStatus) {
       var ts = $scope.ts = CRM.ts(null),
-      ctrl = this;
+        ctrl = this;
 
-      console.log('init crmChangePassword component starting');
+      console.log('init crmChangePassword component starting 1');
       // $onInit gets run after the this controller is called, and after the bindings have been applied.
       // this.$onInit = function() { console.log('user', ctrl.userId); };
       ctrl.actorPassword = '';
@@ -23,34 +23,25 @@
       ctrl.busy = '';
       ctrl.pwnd = false;
 
-      let updateAngular = (prop, newVal) => {
-        $timeout(() => {
-          console.log("Setting", prop, "to", newVal);
-          ctrl[prop] = newVal;
-        }, 0);
+      let updateAngular = (newVals) => {
+        $timeout(() => Object.assign(ctrl, newVals), 0);
       };
 
       ctrl.attemptChange = () => {
-        updateAngular('busy', '');
-        updateAngular('pwnd', false);
-        updateAngular('formInactive', true);
-        if (ctrl.newPassword.length < 8) {
-          alert(ts("C'mon now, you can do better than that."));
-          return;
-        }
+        updateAngular({ busy: '', pwnd: false, formInactive: true });
         if (ctrl.newPassword != ctrl.newPasswordAgain) {
           alert(ts("Passwords do not match"));
           return;
         }
 
-        let promises = Promise.resolve(null);
+        let promises = Promise.resolve({ okToProceed: true });
         if (ctrl.hibp) {
           promises = promises.then(() => {
-            updateAngular('busy', ts('Checking password is not known to have been involved in data breach...'));
+            updateAngular({ busy: ts('Checking password is not known to have been involved in data breach...') });
             return sha1(ctrl.newPassword)
               .then(hash => {
                 if (!hash.match(/^[a-f0-9]+$/)) {
-                  updateAngular('busy', ts('Could not check. Is your browser up-to-date?'));
+                  updateAngular({ busy: ts('Could not check. Is your browser up-to-date?') });
                 }
                 else {
                   hash = hash.toUpperCase();
@@ -61,34 +52,51 @@
                       if (hibpResult &&
                         hibpResult.split(/\r\n/).find(line => hashPrefix + line.replace(/:\d+$/, '') === hash)) {
                         // e.g. Password123
-                        updateAngular('pwn', true);
-                        return;
+                        updateAngular({ pwnd: true, busy: '' });
+                        return { okToProceed: false };
                       }
-                      updateAngular('busy', '');
+                      updateAngular({ busy: '' });
+                      return { okToProceed: true };
                     })
-                    .catch( () => {
-                      updateAngular('busy', ts('Could not perform check; service error.'));
+                    .catch(() => {
+                      updateAngular({ busy: ts('Could not perform check; service error.') });
+                      return { okToProceed: false };
                     });
                 }
               });
           });
         }
 
-        promises = promises.then(() => {
-          updateAngular('busy', ctrl.busy + ts('Changing...'));
+        promises = promises.then((status) => {
+          if (!status.okToProceed) {
+            CRM.alert(
+              ts('The given password cannot be considered secure.'),
+              ts('Password NOT changed'),
+              'error');
+            console.log("Prevented changing password because of hibp result");
+            return;
+          }
+
+          updateAngular({ busy: ctrl.busy + ts('Changing...') });
           // Now submit api request.
           const userUpdateParams = {
             actorPassword: ctrl.actorPassword,
-            values: {password: ctrl.newPassword},
+            values: { password: ctrl.newPassword },
             where: [['id', '=', ctrl.userId]]
           };
           return crmApi4('User', 'Update', userUpdateParams)
-            .then(r => updateAngular('busy', ts('Password successfully updated')))
+            .then(r => {
+              CRM.alert(ts('Your password was successfully changed.'), ts('Password updated'), 'success');
+              updateAngular({ busy: '' });
+            })
             .catch(e => {
-              let msg = (e.error_message === 'Authorization failed') ?
-                ts("Sorry, that didn't work. Perhaps you mistyped your password?") :
-                e.error_message;
-              updateAngular('busy', msg);
+              CRM.alert(
+                (e.error_message === 'Authorization failed') ?
+                  ts('Perhaps you mistyped your existing password?') :
+                  e.error_message,
+                ts('Password NOT changed'),
+                'error');
+              updateAngular({ busy: '' });
             });
         });
       };
@@ -102,8 +110,8 @@
           .then(hashBuffer => {
             const hashArray = Array.from(new Uint8Array(hashBuffer)); // convert buffer to byte array
             const hashHex = hashArray
-            .map((b) => b.toString(16).padStart(2, "0"))
-            .join(""); // convert bytes to hex string
+              .map((b) => b.toString(16).padStart(2, "0"))
+              .join(""); // convert bytes to hex string
             return hashHex;
           });
       }
diff --git a/www/modules/civicrm/ext/standaloneusers/ang/crmChangePassword/crmChangePassword.html b/www/modules/civicrm/ext/standaloneusers/ang/crmChangePassword/crmChangePassword.html
index d9332425c..f19ac2083 100644
--- a/www/modules/civicrm/ext/standaloneusers/ang/crmChangePassword/crmChangePassword.html
+++ b/www/modules/civicrm/ext/standaloneusers/ang/crmChangePassword/crmChangePassword.html
@@ -1,50 +1,61 @@
 <div>
-  <h1>Forgotten Password</h1>
-  <form name="changePassword" crm-ui-id-scope>
+  <form name="changePassword" crm-ui-id-scope ng-submit="$ctrl.attemptChange()">
 
     <div crm-ui-field="{name: 'actorPassword', title: ts('Enter your current password')}">
-      <input
-        crm-ui-id="actorPassword"
-        name="actorPassword"
-        ng-model="$ctrl.actorPassword"
-        class="crm-form-text"
-        type=password
-      />
+      <input crm-ui-id="actorPassword" name="actorPassword" ng-model="$ctrl.actorPassword" class="crm-form-text"
+        type=password autocomplete="current-password" />
     </div>
 
     <div crm-ui-field="{name: 'newPassword', title: ts('Enter a new password')}">
-      <input
-        crm-ui-id="newPassword"
-        name="newPassword"
-        ng-model="$ctrl.newPassword"
-        class="crm-form-text"
-        type=password
-      />
+      <input crm-ui-id="newPassword" minlength=11 name="newPassword" ng-model="$ctrl.newPassword" class="crm-form-text"
+        type=password autocomplete="new-password" />
     </div>
 
     <div crm-ui-field="{name: 'newPasswordAgain', title: ts('Re-enter new password')}">
-      <input
-        crm-ui-id="newPasswordAgain"
-        name="newPasswordAgain"
-        ng-model="$ctrl.newPasswordAgain"
-        class="crm-form-text"
-        type=password
-      />
-      <span class="crm-error" ng-show="$ctrl.newPasswordAgain && $ctrl.newPassword && $ctrl.newPassword !== $ctrl.newPasswordAgain">
+      <input crm-ui-id="newPasswordAgain" name="newPasswordAgain" ng-model="$ctrl.newPasswordAgain"
+        class="crm-form-text" type=password autocomplete="new-password" />
+      <span class="crm-error"
+        ng-show="$ctrl.newPasswordAgain && $ctrl.newPassword && $ctrl.newPassword !== $ctrl.newPasswordAgain">
         {{ts('Passwords do not match')}}
       </span>
     </div>
 
-    <button class=btn ng-click="$ctrl.attemptChange()" >{{ts('Change Password')}}</button>
+    <p>
+      <button class=btn>{{ts('Change Password')}}</button>
+    </p>
+
+    <div ng-if="$ctrl.busy">{{$ctrl.busy}}</div>
+
+    <div ng-if="$ctrl.pwnd" class="messages error no-popup">
+      <h2>{{ts('Compromised password')}}</h2>
+      <p>{{ts('The password you entered is known to have been included in data breaches. This means it can no longer be
+        considered secure.')}}</p>
+      <p>{{ts('Please choose a different password.')}}</p>
+      <p>{{ts('Also, if you have used that password anywhere else, you should change it as soon as you can.')}}</p>
+      <p>{{ts('For more information, see:')}} <a href="https://haveibeenpwned.com/FAQs">haveibeenpwned.com</a></p>
+    </div>
+
+    <div class=help>
+      <h2>{{ts('Password tips')}}</h2>
+      <ul>
+        <li>
+          <p>{{ts("Your password is likely the gateway to a lot of other people’s personal data. It only takes one user to have weak password to make a system insecure.")}}</p>
+        </li>
+        <li>
+          <p>{{ts("Use of a password manager is highly recommended because we humans are not great at remembering a lot of unique passwords and we don’t like typing them out!")}}</p>
+        </li>
+        <li>
+          <p>{{ts("A reasonable password is a mix of 11+ upper and lowercase letters, numbers, symbols, or a long phrase.")}}</p>
+        </li>
+        <li>
+          <p>{{ts("Use a unique password; do not use a password that you use, or have used, anywhere else because if that system has been, or becomes compromised, your password may be used in future attacks.")}}</p>
+        </li>
+        <li>
+          <p>{{ts("Did you know? An 8-character password — even with a mix of numbers, upper and lowercase letters and symbols can be cracked in under 5 minutes. A password with only lowercase letters needs to be 15+ characters long before it could be considered secure, and if it is made up of words, then it needs to be much longer.")}}</p>
+        </li>
+      </ul>
+    </div>
 
   </form>
-  <div ng-if="$ctrl.busy" >{{$ctrl.busy}}</div>
-  <div ng-if="$ctrl.pwnd"  class="messages error no-popup">
-    <h2>{{ts('Known compromised password')}}</h2>
-    <p>{{ts('The password you entered is known to have been included in data breaches. This means it can no longer be considered secure.')}}</p>
-    <p>{{ts('Please choose a different password.')}}</p>
-    <p>{{ts('Also, if you have used that password anywhere else, you should change it as soon as you can.')}}</p>
-    <p>{{ts('For more information, see:')}} <a href="https://haveibeenpwned.com/FAQs" >haveibeenpwned.com</a></p>
-  </div>
 
 </div>
diff --git a/www/modules/civicrm/ext/standaloneusers/info.xml b/www/modules/civicrm/ext/standaloneusers/info.xml
index 0c2ecb6eb..606f7c990 100644
--- a/www/modules/civicrm/ext/standaloneusers/info.xml
+++ b/www/modules/civicrm/ext/standaloneusers/info.xml
@@ -14,11 +14,11 @@
     <url desc="Support">http://FIXME</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <requires>
     <ext>org.civicrm.search_kit</ext>
@@ -41,7 +41,7 @@
     <mixin>ang-php@1.0.0</mixin>
     <mixin>setting-php@1.0.0</mixin>
     <mixin>menu-xml@1.0.0</mixin>
-    <mixin>smarty-v2@1.0.1</mixin>
+    <mixin>smarty@1.0.0</mixin>
     <mixin>entity-types-php@1.0.0</mixin>
     <mixin>afform-entity-php@1.0.0</mixin>
   </mixins>
diff --git a/www/modules/civicrm/ext/standaloneusers/managed/SavedSearch_Administer_Roles.mgd.php b/www/modules/civicrm/ext/standaloneusers/managed/SavedSearch_Administer_Roles.mgd.php
index 9492a64ab..9823d3fa7 100644
--- a/www/modules/civicrm/ext/standaloneusers/managed/SavedSearch_Administer_Roles.mgd.php
+++ b/www/modules/civicrm/ext/standaloneusers/managed/SavedSearch_Administer_Roles.mgd.php
@@ -102,7 +102,7 @@
                   'icon' => 'fa-toggle-on',
                   'text' => E::ts('Enable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', FALSE],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'disable',
@@ -111,7 +111,7 @@
                   'icon' => 'fa-toggle-off',
                   'text' => E::ts('Disable'),
                   'style' => 'default',
-                  'condition' => ['is_active', '=', TRUE],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'Role',
diff --git a/www/modules/civicrm/ext/standaloneusers/managed/SavedSearch_Administer_UserAccounts.mgd.php b/www/modules/civicrm/ext/standaloneusers/managed/SavedSearch_Administer_UserAccounts.mgd.php
index db05087cf..c85e94801 100644
--- a/www/modules/civicrm/ext/standaloneusers/managed/SavedSearch_Administer_UserAccounts.mgd.php
+++ b/www/modules/civicrm/ext/standaloneusers/managed/SavedSearch_Administer_UserAccounts.mgd.php
@@ -152,11 +152,7 @@
                   'style' => 'default',
                   'path' => '',
                   'action' => '',
-                  'condition' => [
-                    'is_active',
-                    '=',
-                    TRUE,
-                  ],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'enable',
@@ -168,11 +164,7 @@
                   'style' => 'default',
                   'path' => '',
                   'action' => '',
-                  'condition' => [
-                    'is_active',
-                    '=',
-                    FALSE,
-                  ],
+                  'condition' => [],
                 ],
                 [
                   'task' => 'delete',
diff --git a/www/modules/civicrm/ext/standaloneusers/sql/auto_install.sql b/www/modules/civicrm/ext/standaloneusers/sql/auto_install.sql
index ae77fcf2f..b3d895797 100644
--- a/www/modules/civicrm/ext/standaloneusers/sql/auto_install.sql
+++ b/www/modules/civicrm/ext/standaloneusers/sql/auto_install.sql
@@ -44,7 +44,7 @@ CREATE TABLE `civicrm_role` (
   `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Only active roles grant permissions',
   PRIMARY KEY (`id`)
 )
-ENGINE=InnoDB;
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 
 -- /*******************************************************
 -- *
@@ -61,7 +61,7 @@ CREATE TABLE `civicrm_session` (
   PRIMARY KEY (`id`),
   UNIQUE INDEX `index_session_id`(session_id)
 )
-ENGINE=InnoDB;
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 
 -- /*******************************************************
 -- *
@@ -84,7 +84,7 @@ CREATE TABLE `civicrm_uf_match` (
   `is_active` tinyint NOT NULL DEFAULT 1,
   `timezone` varchar(32) NULL COMMENT 'User\'s timezone',
   `language` varchar(5) COMMENT 'UI language preferred by the given user/contact',
-  `password_reset_token` varchar(40) COMMENT 'The unspent token',
+  `password_reset_token` varchar(255) COMMENT 'The unspent token',
   PRIMARY KEY (`id`),
   INDEX `I_civicrm_uf_match_uf_id`(uf_id),
   UNIQUE INDEX `UI_username`(username),
@@ -93,7 +93,7 @@ CREATE TABLE `civicrm_uf_match` (
   CONSTRAINT FK_civicrm_uf_match_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
   CONSTRAINT FK_civicrm_uf_match_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
 )
-ENGINE=InnoDB;
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 
 -- /*******************************************************
 -- *
@@ -110,4 +110,4 @@ CREATE TABLE `civicrm_user_role` (
   CONSTRAINT FK_civicrm_user_role_user_id FOREIGN KEY (`user_id`) REFERENCES `civicrm_uf_match`(`id`) ON DELETE CASCADE,
   CONSTRAINT FK_civicrm_user_role_role_id FOREIGN KEY (`role_id`) REFERENCES `civicrm_role`(`id`) ON DELETE CASCADE
 )
-ENGINE=InnoDB;
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
diff --git a/www/modules/civicrm/ext/standaloneusers/sql/upgrade_5691.sql b/www/modules/civicrm/ext/standaloneusers/sql/upgrade_5691.sql
index 78312767e..47bb4d6b7 100644
--- a/www/modules/civicrm/ext/standaloneusers/sql/upgrade_5691.sql
+++ b/www/modules/civicrm/ext/standaloneusers/sql/upgrade_5691.sql
@@ -6,4 +6,4 @@ CREATE TABLE `civicrm_session` (
   PRIMARY KEY (`id`),
   UNIQUE INDEX `index_session_id`(session_id)
 )
-ENGINE=InnoDB;
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
diff --git a/www/modules/civicrm/ext/standaloneusers/standaloneusers.php b/www/modules/civicrm/ext/standaloneusers/standaloneusers.php
index 7960ae2f5..7617882f1 100644
--- a/www/modules/civicrm/ext/standaloneusers/standaloneusers.php
+++ b/www/modules/civicrm/ext/standaloneusers/standaloneusers.php
@@ -76,8 +76,15 @@ function standaloneusers_civicrm_enable() {
  * Implements hook_civicrm_permission().
  */
 function standaloneusers_civicrm_permission(&$permissions) {
-  $permissions['access password resets'] = ts('Allow users to access the reset password system');
-  // Concrete implementations of synthetic cms: permissions.
-  $permissions['administer users'] = ts('Administer user accounts');
-  $permissions['view user account'] = ts('View user accounts');
+  $permissions['access password resets'] = [
+    'label' => E::ts('CiviCRM Standalone Users: Allow users to access the reset password system'),
+  ];
+  // provide expected cms: permissions.
+  $permissions['cms:administer users'] = [
+    'label' => E::ts('CiviCRM Standalone Users: Administer user accounts'),
+    'implies' => ['cms:view user account'],
+  ];
+  $permissions['cms:view user account'] = [
+    'label' => E::ts('CiviCRM Standalone Users: View user accounts'),
+  ];
 }
diff --git a/www/modules/civicrm/ext/standaloneusers/tests/phpunit/Civi/Api4/Action/UserTest.php b/www/modules/civicrm/ext/standaloneusers/tests/phpunit/Civi/Api4/Action/UserTest.php
new file mode 100644
index 000000000..0fa5ac4cc
--- /dev/null
+++ b/www/modules/civicrm/ext/standaloneusers/tests/phpunit/Civi/Api4/Action/UserTest.php
@@ -0,0 +1,808 @@
+<?php
+namespace Civi\Api4\Action;
+
+use Civi\Test\EndToEndInterface;
+use Civi\Test\TransactionalInterface;
+use Civi\API\Request;
+use Civi\Api4\User;
+use Civi\Api4\Role;
+use Civi\Api4\UserRole;
+use Civi\Api4\Contact;
+use Civi\Standalone\Security;
+
+/**
+ * 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.
+ *
+ * Fun fact: Running E2E tests with TransactionalInterface is usually prohibitive because of the
+ * split DB. However, with Standalone, there's a single DB, so it may work some of the time.
+ * (It only becomes prohibitive if you actually use HTTP.)
+ *
+ * @group e2e
+ */
+class UserTest extends \PHPUnit\Framework\TestCase implements EndToEndInterface, TransactionalInterface {
+
+  /**
+   * @var int
+   */
+  protected $contactID;
+
+  /**
+   * @var int
+   */
+  protected $userID;
+
+  /**
+   * @var int
+   */
+  protected $adminContactID;
+
+  /**
+   * @var int
+   */
+  protected $adminUserID;
+
+  /**
+   * @var int
+   */
+  protected $nonAdminContactID;
+
+  /**
+   * @var int
+   */
+  protected $nonAdminUserID;
+
+  /**
+   * @var int
+   */
+  protected $nonAdminRoleID;
+
+  /**
+   * @var array
+   */
+  protected $otherUserIDs = [];
+
+  const ADMIN_ROLE_ID = 1;
+
+  public static function setUpBeforeClass(): void {
+    parent::setUpBeforeClass();
+    \Civi\Test::e2e()
+      // ->install(['authx', 'org.civicrm.search_kit', 'org.civicrm.afform', 'standaloneusers'])
+      // We only run on "Standalone", so all the above is given.
+      // ->installMe(__DIR__) This causes failure, so we do                 ↑
+      ->apply(FALSE);
+  }
+
+  public function setUp():void {
+    parent::setUp();
+    if (CIVICRM_UF !== 'Standalone') {
+      $this->markTestSkipped('Test only applies on Standalone');
+    }
+    else {
+      $this->createFixture();
+      $this->ensureLoggedOut();
+    }
+  }
+
+  /**
+   * Note I thought I could use \Civi\Authx\Standalone::logoutSession()
+   * but it calls session_destroy which messes up future tests.
+   *
+   * Not sure if there is a generic logout without session destroy.
+   *
+   */
+  public function ensureLoggedOut() {
+    global $loggedInUserId, $loggedInUser;
+
+    if (\CRM_Utils_System::getLoggedInUfID()) {
+      \CRM_Core_Session::singleton()->reset();
+      $loggedInUser = $loggedInUserId = NULL;
+    }
+  }
+
+  public function tearDown():void {
+    $this->deleteStuffWeMade();
+    parent::tearDown();
+  }
+
+  protected function loginUser($userID) {
+    $security = Security::singleton();
+    $user = \Civi\Api4\User::get(FALSE)
+      ->addWhere('id', '=', $userID)
+      ->execute()->first();
+
+    $contactID = civicrm_api3('UFMatch', 'get', [
+      'sequential' => 1,
+      'return' => ['contact_id'],
+      'uf_id' => $user['id'],
+    ])['values'][0]['contact_id'] ?? NULL;
+    $this->assertNotNull($contactID);
+    /** @var \Civi\Standalone\Security $security */
+    $security->loginAuthenticatedUserRecord($user, FALSE);
+  }
+
+  /**
+   * Temporary debugging function
+   */
+  public function dumpUFMatch(string $s = '') {
+    $d = \CRM_Core_DAO::executeQuery("SELECT * FROM civicrm_uf_match;");
+    print "\ndump---------- $s\n";
+    foreach ($d->fetchAll() as $row) {
+      print json_encode($row, JSON_UNESCAPED_SLASHES) . "\n";
+    }
+    print "--------------\n";
+  }
+
+  /**
+   */
+  protected function createFixture(): void {
+
+    // Create admin contact and user.
+    $this->adminContactID = \Civi\Api4\Contact::create(FALSE)
+      ->setValues([
+        'contact_type' => 'Individual',
+        'display_name' => 'Admin McTest',
+      ])->execute()->first()['id'];
+    $params = [
+      'cms_name' => 'user_one',
+      'cms_pass' => 'secret1',
+      'notify' => FALSE,
+      'contact_id' => $this->adminContactID,
+      'email' => 'user_one@example.org',
+    ];
+    $this->adminUserID = \CRM_Core_BAO_CMSUser::create($params, 'email');
+    $this->assertGreaterThan(0, $this->adminUserID);
+    $user = User::get(FALSE)->addWhere('id', '=', $this->adminUserID)->execute()->single();
+    $this->assertEquals('user_one', $user['username']);
+    $this->assertEquals($this->adminContactID, $user['contact_id']);
+    $this->assertEquals($this->adminUserID, $user['uf_id']);
+    $this->assertEquals('user_one@example.org', $user['uf_name']);
+    $this->assertStringStartsWith('$', $user['hashed_password']);
+    // The bundled staff role has lots of permissions including 'administer users'.
+    $result = UserRole::create(FALSE)
+      ->setValues([
+        'user_id' => $this->adminUserID,
+        'role_id.name' => 'staff',
+      ])
+      ->execute()->first();
+    $this->assertNotEmpty($result);
+
+    // Create low privileges contact and user.
+    $this->nonAdminContactID = \Civi\Api4\Contact::create(FALSE)
+      ->setValues([
+        'contact_type' => 'Individual',
+        'display_name' => 'Nonadmin McTest',
+      ])->execute()->first()['id'];
+    $params = ['cms_name' => 'nonadmin', 'cms_pass' => 'secret2', 'notify' => FALSE, 'contact_id' => $this->nonAdminContactID, 'email' => 'nonadmin@example.org'];
+    $this->nonAdminUserID = \CRM_Core_BAO_CMSUser::create($params, 'email');
+    $this->assertGreaterThan(0, $this->nonAdminUserID);
+    $this->assertGreaterThan(0, $this->adminUserID);
+    $roleID = $this->createNonadminRole();
+    $result = UserRole::create(FALSE)
+      ->setValues([
+        'user_id' => $this->nonAdminUserID,
+        'role_id' => $roleID,
+      ])
+      ->execute();
+    $this->assertNotEmpty($result);
+  }
+
+  protected function createNonadminRole(): int {
+
+    $this->nonAdminRoleID = \Civi\Api4\Role::save(FALSE)
+      ->setMatch(['name'])
+      ->setRecords([
+        [
+          'name' => 'nonadmin',
+          'label' => ts('Non-user-admin accounts'),
+          'is_active' => TRUE,
+          'permissions' => [
+            'access AJAX API',
+            'access CiviCRM',
+            'access Contact Dashboard',
+            'access uploaded files',
+            'add contacts',
+            'view my contact',
+            'view all contacts',
+            'edit all contacts',
+            'edit my contact',
+            'delete contacts',
+            'import contacts',
+            'access deleted contacts',
+            'merge duplicate contacts',
+            'edit groups',
+            'manage tags',
+            'administer Tagsets',
+            'view all activities',
+            'delete activities',
+            'add contact notes',
+            'view all notes',
+            'access CiviContribute',
+            'delete in CiviContribute',
+            'edit contributions',
+            'make online contributions',
+            'view my invoices',
+            'access CiviEvent',
+            'delete in CiviEvent',
+            'edit all events',
+            'edit event participants',
+            'register for events',
+            'view event info',
+            'view event participants',
+            'gotv campaign contacts',
+            'interview campaign contacts',
+            'manage campaign',
+            'release campaign contacts',
+            'reserve campaign contacts',
+            'sign CiviCRM Petition',
+            'access CiviGrant',
+            'delete in CiviGrant',
+            'edit grants',
+            'access CiviMail',
+            'access CiviMail subscribe/unsubscribe pages',
+            'delete in CiviMail',
+            'view public CiviMail content',
+            'access CiviMember',
+            'delete in CiviMember',
+            'edit memberships',
+            'access all cases and activities',
+            'access my cases and activities',
+            'add cases',
+            'delete in CiviCase',
+            'access CiviPledge',
+            'delete in CiviPledge',
+            'edit pledges',
+            'access CiviReport',
+            'access Report Criteria',
+            'administer reserved reports',
+            'save Report Criteria',
+            'profile create',
+            'profile edit',
+            'profile listings',
+            'profile listings and forms',
+            'profile view',
+            'close all manual batches',
+            'close own manual batches',
+            'create manual batch',
+            'delete all manual batches',
+            'delete own manual batches',
+            'edit all manual batches',
+            'edit own manual batches',
+            'export all manual batches',
+            'export own manual batches',
+            'reopen all manual batches',
+            'reopen own manual batches',
+            'view all manual batches',
+            'view own manual batches',
+            'access all custom data',
+            'access contact reference fields',
+            // Standalone-defined permissions that stand in for the synthetic ones on CMSes
+            // 'cms: administer users',
+            'cms: view user account',
+            // The administer CiviCRM data implicitly sets other permissions as well.
+            // Such as, edit message templates and administer dedupe rules.
+            'administer CiviCRM Data',
+          ],
+        ],
+      ])
+      ->execute()->first()['id'];
+    $this->assertNotEmpty($this->nonAdminRoleID);
+    return $this->nonAdminRoleID;
+  }
+
+  protected function deleteStuffWeMade() {
+    User::delete(FALSE)->addWhere('id', 'IN', [$this->nonAdminUserID, $this->adminUserID, ...$this->otherUserIDs])->execute();
+    Contact::delete(FALSE)->addWhere('id', 'IN', [$this->nonAdminContactID, $this->adminContactID])->execute();
+    Role::delete(FALSE)->addWhere('name', '=', 'nonadmin')->execute();
+  }
+
+  /*
+   * Test methods
+   */
+
+  /**
+   * Check non-permissioned password changing.
+   */
+  public function testNonPermissionedPasswordChanging() {
+
+    $user = User::get(FALSE)
+      ->addWhere('id', '=', $this->nonAdminUserID)
+      ->execute()->single();
+    $this->assertMatchesRegularExpression('/^[$].+[$].+/', $user['hashed_password']);
+
+    // Update to the loaded values should NOT result in the password being changed.
+    $updatedUser = User::update(FALSE)
+      ->setValues($user)
+      ->addWhere('id', '=', $user['id'])
+      ->setReload(TRUE)
+      ->execute()->first();
+    $this->assertEquals($user['hashed_password'], $updatedUser['hashed_password']);
+
+    // Ditto save
+    User::save(FALSE)
+      ->setRecords([$user])
+      ->setReload(TRUE)
+      ->execute()->first();
+    $updatedUser = User::get(FALSE)->addWhere('id', '=', $user['id'])->execute()->first();
+    $this->assertEquals($user['hashed_password'], $updatedUser['hashed_password']);
+
+    // Test we can force saving a raw hashed password
+    $updatedUser = User::update(FALSE)
+      ->setReload(TRUE)
+      ->addValue('hashed_password', '$shhh')
+      ->addWhere('id', '=', $user['id'])
+      ->execute()->first();
+    $this->assertEquals('$shhh', $updatedUser['hashed_password']);
+
+    // Test we can saving a new password. (This also resets the fixture's nonadmin user's password to secret2)
+    $updatedUser = User::update(FALSE)
+      ->setReload(TRUE)
+      ->addValue('password', 'secret2')
+      ->addWhere('id', '=', $user['id'])
+      ->execute()->first();
+    $this->assertNotEquals('$shhh', $updatedUser['hashed_password']);
+  }
+
+  /**
+   * Check non-permissioned password changing.
+   */
+  public function testPermissionedPasswordChangingAsAdmin() {
+    $this->loginUser($this->adminUserID);
+    $this->assertTrue(\CRM_Core_Permission::check('cms:administer users'));
+
+    // Check we are allowed to update another user's password if we provide our own,
+    // since we have 'cms:administer users'
+    $nonAdminUser = User::get(FALSE)->addWhere('id', '=', $this->nonAdminUserID)->execute()->single();
+    // ...by password
+    $previousHash = $nonAdminUser['hashed_password'];
+    $updatedUser = User::update(TRUE)
+      ->addValue('password', 'topSecret')
+      ->addWhere('id', '=', $this->nonAdminUserID)
+      ->setActorPassword('secret1')
+      ->setReload(TRUE)
+      ->execute()->first();
+    $this->assertNotEquals($previousHash, $updatedUser['hashed_password'], "Expected that the password was changed, but it wasn't.");
+    $previousHash = $updatedUser['hashed_password'];
+
+    // ...but NOT by hashed_password
+    try {
+      $updatedUser = User::update(TRUE)
+        ->addValue('hashed_password', '$someNefariousHash')
+        ->addWhere('id', '=', $nonAdminUser['id'])
+        ->setActorPassword('secret1')
+        ->execute();
+      $this->fail("Expected UnauthorizedException got none.");
+    }
+    catch (\Civi\API\Exception\UnauthorizedException $e) {
+      $this->assertEquals('Not allowed to change hashed_password', $e->getMessage());
+    }
+
+    // If we don't supply OUR correct password, we're not allowed to update the user's password.
+    try {
+      User::update(TRUE)
+        ->addValue('password', 'anotherNewPassword')
+        ->addWhere('id', '=', $nonAdminUser['id'])
+        ->setActorPassword('wrong password')
+        ->execute();
+      $this->fail("Expected UnauthorizedException got none.");
+    }
+    catch (\Civi\API\Exception\UnauthorizedException $e) {
+      $this->assertEquals('Incorrect password', $e->getMessage());
+    }
+
+    // If we don't supply OUR password at all, we're not allowed to update the user's password.
+    try {
+      User::update(TRUE)
+        ->addValue('password', 'anotherNewPassword')
+        ->addWhere('id', '=', $nonAdminUser['id'])
+        ->execute();
+      $this->fail("Expected UnauthorizedException got none.");
+    }
+    catch (\Civi\API\Exception\UnauthorizedException $e) {
+      $this->assertEquals('Unauthorized', $e->getMessage());
+    }
+
+  }
+
+  /**
+   * Check non-permissioned password changing.
+   */
+  public function testPermissionedPasswordChangingAsNonAdmin() {
+    $this->loginUser($this->nonAdminUserID);
+    $nonAdminUser = User::get(FALSE)->addWhere('id', '=', $this->nonAdminUserID)->execute()->single();
+
+    // We are allowed to update our own password if we provide the current one.
+    $previousHash = $nonAdminUser['hashed_password'];
+    $updatedUser = User::update(TRUE)
+      ->setActorPassword('secret2')
+      ->addValue('password', 'ourNewSecret')
+      ->addWhere('id', '=', $this->nonAdminUserID)
+      ->setReload(TRUE)
+      ->execute()->first();
+    $this->assertNotEquals($previousHash, $updatedUser['hashed_password'], "Expected that the password was changed, but it wasn't.");
+    $previousHash = $updatedUser['hashed_password'];
+
+    // If we don't supply OUR correct password, we're not allowed to update our password.
+    try {
+      User::update(TRUE)
+        ->addValue('password', 'anotherNewPassword')
+        ->addWhere('id', '=', $this->nonAdminUserID)
+        ->setActorPassword('wrong password')
+        ->execute();
+      $this->fail("Expected UnauthorizedException got none.");
+    }
+    catch (\Civi\API\Exception\UnauthorizedException $e) {
+      $this->assertEquals('Incorrect password', $e->getMessage());
+    }
+
+    // If we don't supply OUR password at all, we're not allowed to update the user's password.
+    try {
+      User::update(TRUE)
+        ->addValue('password', 'anotherNewPassword')
+        ->addWhere('id', '=', $this->nonAdminUserID)
+        ->execute();
+      $this->fail("Expected UnauthorizedException got none.");
+    }
+    catch (\Civi\API\Exception\UnauthorizedException $e) {
+      $this->assertEquals('Unauthorized', $e->getMessage());
+    }
+
+    // We're not allowed to update the admin user's password, since we are not an admin.
+    try {
+      User::update(TRUE)
+        ->addValue('password', 'anotherNewPassword')
+        ->addWhere('id', '=', $this->adminUserID)
+        ->setActorPassword('ourNewSecret')
+        ->execute();
+      $this->fail("Expected UnauthorizedException got none.");
+    }
+    catch (\Civi\API\Exception\UnauthorizedException $e) {
+      $this->assertEquals("User.update called without 'cms:administer users' permission and without a where clause limiting to logged-in user.", $e->getMessage());
+    }
+
+    // We're allowed to use User.save to update our account, IF we provide our password.
+    $updatedUser = User::save(TRUE)
+      ->setActorPassword('ourNewSecret')
+      ->setRecords([
+        [
+          'id' => $this->nonAdminUserID,
+          'password' => 'yetAnotherPassword',
+        ],
+      ])
+      ->execute()->first();
+    $updatedUser = User::get(FALSE)->addWhere('id', '=', $this->nonAdminUserID)->execute()->first();
+    $this->assertNotEquals($previousHash, $updatedUser['hashed_password'], "Expected that the password was changed, but it wasn't.");
+    $previousHash = $updatedUser['hashed_password'];
+  }
+
+  public function testPermissionedSaveAsNonAdmin() {
+
+    // We can save our own record.
+    $this->loginUser($this->nonAdminUserID);
+    $updatedUser = User::save(TRUE)
+      ->setRecords([[
+        'id' => $this->nonAdminUserID,
+        'username' => 'nonadmin2',
+      ],
+      ])
+      ->execute()->first();
+    $updatedUser = User::get(FALSE)->addWhere('id', '=', $this->nonAdminUserID)->execute()->first();
+    $this->assertEquals('nonadmin2', $updatedUser['username']);
+
+    // We cannot create via save
+    $this->loginUser($this->nonAdminUserID);
+    try {
+      $updatedUser = User::save(TRUE)
+        ->setRecords([[
+          'username' => 'newUser',
+        ],
+        ])
+        ->execute()->first();
+      $this->fail("User::save should have thrown exception");
+    }
+    catch (\Exception $e) {
+      $this->assertEquals("You are not permitted to change other users' accounts.", $e->getMessage());
+    }
+
+    // We cannot update other users via save
+    $this->loginUser($this->nonAdminUserID);
+    try {
+      $updatedUser = User::save(TRUE)
+        ->setRecords([
+          ['id' => $this->nonAdminUserID, 'username' => 'nonadmin3'],
+          ['id' => $this->adminUserID, 'username' => 'mwahaha'],
+        ])
+        ->execute();
+      $this->fail("User::save should have thrown exception");
+    }
+    catch (\Exception $e) {
+      $this->assertEquals("You are not permitted to change other users' accounts.", $e->getMessage());
+    }
+    $updatedUser = User::get(FALSE)->addWhere('id', '=', $this->nonAdminUserID)->execute()->first();
+    $this->assertEquals('nonadmin2', $updatedUser['username'], "The save should NOT have updated the nonadmin user; the whole save operation should have been aborted.");
+  }
+
+  public function testPermissionedSaveAsAdmin() {
+
+    // We can save and create records.
+    $this->loginUser($this->adminUserID);
+    $newUserID = User::save(TRUE)
+      ->setRecords([
+        ['id' => $this->adminUserID, 'username' => 'admin2'],
+        ['id' => $this->nonAdminUserID, 'username' => 'nonadmin2'],
+        ['username' => 'newUser'],
+      ])
+      ->execute()->last()['id'];
+
+    $updatedUser = User::get(FALSE)
+      ->addWhere('id', 'IN', [$this->nonAdminUserID, $this->adminUserID, $newUserID])
+      ->execute()->indexBy('id')->column('username');
+    $this->assertEquals([
+      $this->nonAdminUserID => 'nonadmin2',
+      $this->adminUserID => 'admin2',
+      $newUserID => 'newUser',
+    ], $updatedUser);
+    $this->otherUserIDs[] = $newUserID;
+  }
+
+  public function testAdminDeletes() {
+    $this->loginUser($this->adminUserID);
+
+    // Don't let us delete our own account.
+    try {
+      User::delete(TRUE)
+        ->addWhere('id', '=', $this->adminUserID)
+        ->execute();
+      $this->fail("Should not be allowed to delete logged in User");
+    }
+    catch (\Civi\API\Exception\UnauthorizedException $e) {
+      $this->assertEquals('ACL check failed', $e->getMessage());
+    }
+
+    // Admin should be able to delete other accounts.
+    User::delete(TRUE)
+      ->addWhere('id', '=', $this->nonAdminUserID)
+      ->execute()->single();
+
+    // Admin are able to delete own account if not checking permissions.
+    // This is still stupid, and the test is here to acknowledge/document
+    // current rather than desired behaviour.
+    User::delete(FALSE)
+      ->addWhere('id', '=', $this->adminUserID)
+      ->execute()->single();
+  }
+
+  public function testNonAdminDeletes() {
+    $this->loginUser($this->nonAdminUserID);
+
+    // Don't let us delete any account.
+    // ...try our own account
+    try {
+      User::delete(TRUE)
+        ->addWhere('id', '=', $this->nonAdminUserID)
+        ->execute();
+      $this->fail("Non-admins should not be able to use User.delete API");
+    }
+    catch (\Civi\API\Exception\UnauthorizedException $e) {
+      $this->assertStringContainsString('Authorization failed', $e->getMessage());
+    }
+
+    // ...try another account
+    try {
+      User::delete(TRUE)
+        ->addWhere('id', '=', $this->adminUserID)
+        ->execute();
+      $this->fail("Non-admins should not be able to use User.delete API");
+    }
+    catch (\Civi\API\Exception\UnauthorizedException $e) {
+      $this->assertStringContainsString('Authorization failed', $e->getMessage());
+    }
+  }
+
+  public function testNonAdminsCantCreate() {
+    $this->loginUser($this->nonAdminUserID);
+    try {
+      $user = User::create(TRUE)
+        ->addValue('username', 'newUser2')
+        ->execute()->first();
+      $this->otherUserIDs[] = $user['id'];
+      $this->fail("Non admins should not be allowed to use User.create");
+    }
+    catch (\Civi\API\Exception\UnauthorizedException $e) {
+      $this->assertStringContainsString('Authorization failed', $e->getMessage());
+    }
+  }
+
+  public function testAdminsCanCreate() {
+    $this->loginUser($this->adminUserID);
+    $user = User::create(TRUE)
+      ->addValue('username', 'newUser3')
+      ->execute()->first();
+    $this->assertNotEmpty($user['id']);
+    $this->otherUserIDs[] = $user['id'];
+  }
+
+  public function testGetIsLimited() {
+
+    $this->loginUser($this->nonAdminUserID);
+
+    $user = User::get(TRUE)->execute();
+    $this->assertEquals(1, $user->countFetched());
+    $this->assertArrayNotHasKey('hashed_password', $user->first());
+    $this->assertArrayNotHasKey('password_reset_token', $user->first());
+
+    $user = User::get(TRUE)->addWhere('id', '=', $this->adminUserID)->execute();
+    $this->assertEquals(0, $user->countFetched());
+
+    $user = User::get(FALSE)->execute();
+    $this->assertGreaterThan(1, $user->countFetched());
+    $this->assertArrayHasKey('hashed_password', $user->first());
+    $this->assertArrayHasKey('password_reset_token', $user->first());
+  }
+
+  /**
+   * Superflous test but here for completeness' sake
+   * since it would be bad if anon users could access the User API!
+   */
+  public function testAnonymousUserHasNoAccess() {
+    $userID = \CRM_Utils_System::getLoggedInUfID();
+    $this->assertEmpty($userID);
+    foreach (['save', 'create', 'get', 'delete', 'update'] as $actionName) {
+
+      try {
+        User::$actionName(TRUE)->execute();
+        $this->fail("User::$actionName should have thrown exception");
+      }
+      catch (\Exception $e) {
+        $this->assertStringContainsString("Authorization failed", $e->getMessage());
+      }
+    }
+  }
+
+  public function testNonAdminCannotChangeRoles() {
+    $this->loginUser($this->nonAdminUserID);
+
+    // ...via UserRole.create
+    $adminRoleID = Role::get(FALSE)->addWhere('name', '=', 'admin')->execute()->single()['id'];
+    try {
+      UserRole::create(TRUE)
+        ->addValue('user_id', $this->nonAdminUserID)
+        ->addValue('role_id', $adminRoleID)
+        ->execute();
+      $this->fail("UserRole::create should have thrown exception");
+    }
+    catch (\Exception $e) {
+      $this->assertStringContainsString("Authorization failed", $e->getMessage());
+    }
+
+    // ...via editing own user.
+    try {
+      User::update(TRUE)
+        ->addWhere('id', '=', $this->nonAdminUserID)
+        ->addValue('roles', [$adminRoleID])
+        ->execute();
+      $this->fail("User::update should have thrown exception");
+    }
+    catch (\Exception $e) {
+      $this->assertEquals("Not allowed to change roles", $e->getMessage());
+    }
+  }
+
+  public function testAdminCanChangeRoles() {
+    $this->loginUser($this->adminUserID);
+
+    // ...via UserRole.create
+    $adminRoleID = Role::get(FALSE)->addWhere('name', '=', 'admin')->execute()->single()['id'];
+    UserRole::create(TRUE)
+      ->addValue('user_id', $this->nonAdminUserID)
+      ->addValue('role_id', $adminRoleID)
+      ->execute()->single();
+
+    // ...via editing a user.
+    User::update(TRUE)
+      ->addWhere('id', '=', $this->nonAdminUserID)
+      ->addValue('roles', [$this->nonAdminRoleID])
+      ->execute()->single();
+  }
+
+  /**
+   * Important that roles, permissions, sessions can't be messed about with or inspected by non-admins.
+   */
+  public function testOtherApiAccess() {
+
+    // Anon users should have no access
+    $userID = \CRM_Utils_System::getLoggedInUfID();
+    $this->assertEmpty($userID);
+    $entities = ['Role', 'RolePermission', 'Session'];
+    foreach ($entities as $entity) {
+      try {
+        Request::create($entity, 'get', ['version' => 4])->execute();
+        $this->fail("$entity::get should fail for anon user.");
+      }
+      catch (\Exception $e) {
+        $this->assertStringContainsString("Authorization failed", $e->getMessage());
+      }
+    }
+
+    // Non-admins also...
+    $this->loginUser($this->nonAdminUserID);
+    foreach ($entities as $entity) {
+      try {
+        Request::create($entity, 'get', ['version' => 4])->execute();
+        $this->fail("$entity::get should fail for anon user.");
+      }
+      catch (\Exception $e) {
+        $this->assertStringContainsString("Authorization failed", $e->getMessage());
+      }
+    }
+
+    // Admins should have access though.
+    $this->loginUser($this->adminUserID);
+    foreach ($entities as $entity) {
+      // We don't test session, since there isn't one in this context.
+      $count = Request::create($entity, 'get', ['version' => 4])->execute()->countFetched();
+      if ($entity !== 'Session') {
+        $this->assertGreaterThan(0, $count, "Admin should find 1+ $entity entities");
+      }
+      else {
+        $this->assertEquals(0, $count, "Not expecting a session to be present in this context.");
+      }
+    }
+  }
+
+  public function testEveryoneRoleProtections() {
+    $this->loginUser($this->adminUserID);
+    $this->assertRoleCannotBeDeleted('everyone');
+    $this->assertRoleUpdateFails('everyone', ['name' => 'everyone']);
+    $this->assertRoleUpdateFails('everyone', ['is_active' => FALSE]);
+    // Check we can change permissions
+    $user = Role::update(TRUE)
+      ->addWhere('name', '=', 'everyone')
+      ->setValues([
+        'permissions' => ['access CiviMail subscribe/unsubscribe pages'],
+        'label' => 'Y’all',
+      ])
+      ->execute();
+  }
+
+  public function testAdminRoleProtections() {
+    $this->loginUser($this->adminUserID);
+    $this->assertRoleCannotBeDeleted('admin');
+    $this->assertRoleUpdateFails('admin', ['name' => 'admin']);
+    $this->assertRoleUpdateFails('admin', ['is_active' => FALSE]);
+  }
+
+  protected function assertRoleCannotBeDeleted($roleName) {
+    try {
+      $user = Role::delete(TRUE)
+        ->addWhere('name', '=', $roleName)
+        ->execute();
+      $this->fail("We were able to delete the '$roleName' role and we should not be allowed to.");
+    }
+    catch (\Civi\API\Exception\UnauthorizedException $e) {
+      $this->assertEquals('ACL check failed', $e->getMessage());
+    }
+  }
+
+  protected function assertRoleUpdateFails($roleName, array $updates) {
+    try {
+      $user = Role::update(TRUE)
+        ->addWhere('name', '=', $roleName)
+        ->setValues($updates)
+        ->execute();
+      $this->fail("We were able to update the '$roleName' role and we should not be allowed to.");
+    }
+    catch (\Civi\API\Exception\UnauthorizedException $e) {
+      $this->assertEquals('ACL check failed', $e->getMessage());
+    }
+  }
+
+}
diff --git a/www/modules/civicrm/ext/standaloneusers/tests/phpunit/Civi/Standalone/SecurityTest.php b/www/modules/civicrm/ext/standaloneusers/tests/phpunit/Civi/Standalone/SecurityTest.php
index a63ec2c98..e08e65d63 100644
--- a/www/modules/civicrm/ext/standaloneusers/tests/phpunit/Civi/Standalone/SecurityTest.php
+++ b/www/modules/civicrm/ext/standaloneusers/tests/phpunit/Civi/Standalone/SecurityTest.php
@@ -25,8 +25,6 @@
  */
 class SecurityTest extends \PHPUnit\Framework\TestCase implements EndToEndInterface, TransactionalInterface {
 
-  protected $originalUF;
-  protected $originalUFPermission;
   protected $contactID;
   protected $userID;
 
@@ -50,7 +48,6 @@ public function setUp():void {
 
   public function tearDown():void {
     $this->deleteStuffWeMade();
-    // $this->switchBackFromOurUFClasses(TRUE);
     parent::tearDown();
   }
 
@@ -70,20 +67,13 @@ protected function loginUser($userID) {
     $security->loginAuthenticatedUserRecord($user, FALSE);
   }
 
-  public function testCreateUser():void {
+  public function testCheckPassword():void {
     [$contactID, $userID, $security] = $this->createFixtureContactAndUser();
 
     $user = \Civi\Api4\User::get(FALSE)
       ->addWhere('id', '=', $userID)
       ->execute()->single();
 
-    $this->assertEquals('user_one', $user['username']);
-    $this->assertEquals($contactID, $user['contact_id']);
-    $this->assertEquals($userID, $user['id']);
-    $this->assertEquals($userID, $user['uf_id']);
-    $this->assertEquals('user_one@example.org', $user['uf_name']);
-    $this->assertStringStartsWith('$', $user['hashed_password']);
-
     // Test that the password can be checked ok.
     $this->assertTrue($security->checkPassword('secret1', $user['hashed_password']));
     $this->assertFalse($security->checkPassword('some other password', $user['hashed_password']));
@@ -115,37 +105,14 @@ public function testPerms() {
       ->addWhere('id', '=', $userID)
       ->execute();
 
-    // $this->switchToOurUFClasses();
     foreach (['access CiviCRM', 'view all contacts', 'add contacts', 'edit all contacts'] as $allowed) {
       $this->assertTrue(\CRM_Core_Permission::check([$allowed], $contactID), "Should have '$allowed' permission but don't");
     }
     foreach (['administer CiviCRM', 'access uploaded files'] as $notAllowed) {
       $this->assertFalse(\CRM_Core_Permission::check([$notAllowed], $contactID), "Should NOT have '$allowed' permission but do");
     }
-    // $this->switchBackFromOurUFClasses();
   }
 
-  // protected function switchToOurUFClasses() {
-  //   return;
-  //   if (!empty($this->originalUFPermission)) {
-  //     throw new \RuntimeException("are you calling switchToOurUFClasses twice?");
-  //   }
-  //   $this->originalUFPermission = \CRM_Core_Config::singleton()->userPermissionClass;
-  //   $this->originalUF = \CRM_Core_Config::singleton()->userSystem;
-  //   \CRM_Core_Config::singleton()->userPermissionClass = new \CRM_Core_Permission_Standalone();
-  //   \CRM_Core_Config::singleton()->userSystem = new \CRM_Utils_System_Standalone();
-  // }
-  //
-  // protected function switchBackFromOurUFClasses($justInCase = FALSE) {
-  //   return;
-  //   if (!$justInCase && empty($this->originalUFPermission)) {
-  //     throw new \RuntimeException("are you calling switchBackFromOurUFClasses() twice?");
-  //   }
-  //   \CRM_Core_Config::singleton()->userPermissionClass = $this->originalUFPermission;
-  //   \CRM_Core_Config::singleton()->userSystem = $this->originalUF;
-  //   $this->originalUFPermission = $this->originalUF = NULL;
-  // }
-
   /**
    * Temporary debugging function
    */
@@ -169,9 +136,7 @@ public function createFixtureContactAndUser(): array {
       ])->execute()->first()['id'];
 
     $params = ['cms_name' => 'user_one', 'cms_pass' => 'secret1', 'notify' => FALSE, 'contact_id' => $contactID, 'email' => 'user_one@example.org'];
-    // $this->switchToOurUFClasses();
     $userID = \CRM_Core_BAO_CMSUser::create($params, 'email');
-    // $this->switchBackFromOurUFClasses();
     $this->assertGreaterThan(0, $userID);
     $this->contactID = $contactID;
     $this->userID = $userID;
@@ -203,170 +168,18 @@ public function ensureStaffRoleExists() {
     }
   }
 
-  public function testUserApi() {
-    [$contactID, $adminUserID, $security] = $this->createFixtureContactAndUser();
-    // Make our main user an admin and log them in.
-    User::update(FALSE)->addWhere('id', '=', $adminUserID)->addValue('roles:name', ['admin'])->execute();
-    $this->loginUser($adminUserID);
-    $this->ensureStaffRoleExists();
-
-    // Create a 2nd contact and linked user.
-    $stafferContactID = \Civi\Api4\Contact::create(FALSE)
-      ->setValues(['display_name' => 'Test Staffer'])
-      ->execute()->first()['id'];
-    /** @var \Civi\Api4\Action\User\Create */
-    $userID = User::create(FALSE)
-      ->setValues([
-        'username' => 'testuser1',
-        'password' => 'shhh',
-        'contact_id' => $stafferContactID,
-        'roles:name' => ['staff'],
-        'uf_name' => 'testuser1@example.org',
-      ])
-      ->execute()->first()['id'];
-    $user = User::get(FALSE)->addWhere('id', '=', $userID)->execute()->first();
-    \Civi\Api4\UFMatch::create(FALSE)
-      ->setValues([
-        'contact_id' => $stafferContactID,
-        'uf_id' => $user['id'],
-      ])
+  public static function storeFakePasswordResetToken(int $userID, int $expires): string {
+    $token = \Civi::service('crypto.jwt')->encode([
+      'exp' => $expires,
+      'sub' => "uid:$userID",
+      'scope' => Security::PASSWORD_RESET_SCOPE,
+    ]);
+    User::update(FALSE)
+      ->addValue('password_reset_token', $token)
+      ->addWhere('id', '=', $userID)
       ->execute();
-    ;
-    $userId = \CRM_Core_BAO_UFMatch::getUFId($stafferContactID);
-    $this->assertNotNull($userId);
-
-    $this->assertArrayNotHasKey('password', $user);
-    $this->assertMatchesRegularExpression('/^[$].+[$].+/', $user['hashed_password']);
-
-    // Update to the loaded values should NOT result in the password being changed.
-    $updatedUser = User::update(FALSE)
-      ->setValues($user)
-      ->addWhere('id', '=', $user['id'])
-      ->setReload(TRUE)
-      ->execute()->first();
-    $this->assertEquals($user['hashed_password'], $updatedUser['hashed_password']);
-
-    // Ditto save
-    $updated = User::save(FALSE)
-      ->setRecords([$user])
-      ->setReload(TRUE)
-      ->execute()->first();
-    $updatedUser = User::get(FALSE)->addWhere('id', '=', $user['id'])->execute()->first();
-    $this->assertEquals($user['hashed_password'], $updatedUser['hashed_password']);
-
-    // Test we can force saving a raw password
-    $updatedUser = User::update(FALSE)
-      ->setReload(TRUE)
-      ->addValue('hashed_password', '$shhh')
-      ->addWhere('id', '=', $user['id'])
-      ->execute()->first();
-    $this->assertEquals('$shhh', $updatedUser['hashed_password']);
-
-    // Now move on to tests with checkPermissions:TRUE
-
-    // Check we are allowed to update this user's password if we provide our own, since we have 'cms:administer users'
-    // ...by password
-    $previousHash = $updatedUser['hashed_password'];
-    $updatedUser = User::update(TRUE)
-      ->addValue('password', 'topSecret')
-      ->addWhere('id', '=', $user['id'])
-      ->setActorPassword('secret1')
-      ->setReload(TRUE)
-      ->execute()->first();
-    $this->assertNotEquals($previousHash, $updatedUser['hashed_password'], "Expected that the password was changed, but it wasn't.");
-    $previousHash = $updatedUser['hashed_password'];
-
-    // ...but NOT by hashed_password
-    $previousHash = $updatedUser['hashed_password'];
-    try {
-      $updatedUser = User::update(TRUE)
-        ->addValue('hashed_password', '$someNefariousHash')
-        ->addWhere('id', '=', $user['id'])
-        ->setActorPassword('secret1')
-        ->execute();
-      $this->fail("Expected UnauthorizedException got none.");
-    }
-    catch (\Civi\API\Exception\UnauthorizedException $e) {
-      $this->assertEquals('Not allowed to change hashed_password', $e->getMessage());
-    }
-
-    // Check that if we don't supply OUR correct password, we're not allowed to update the user's password.
-    try {
-      User::update(TRUE)
-        ->addValue('password', 'anotherNewPassword')
-        ->addWhere('id', '=', $user['id'])
-        ->setActorPassword('wrong pass')
-        ->execute();
-      $this->fail("Expected UnauthorizedException got none.");
-    }
-    catch (\Civi\API\Exception\UnauthorizedException $e) {
-      $this->assertEquals('Incorrect password', $e->getMessage());
-    }
-
-    // Check that if we don't supply OUR password at all, we're not allowed to update the user's password.
-    try {
-      User::update(TRUE)
-        ->addValue('password', 'anotherNewPassword')
-        ->addWhere('id', '=', $user['id'])
-        ->execute();
-      $this->fail("Expected UnauthorizedException got none.");
-    }
-    catch (\Civi\API\Exception\UnauthorizedException $e) {
-      $this->assertEquals('Unauthorized', $e->getMessage());
-    }
 
-    // Now login as the user in question who only has the 'staff' role.
-    $this->loginUser($user['id']);
-
-    // Check we are allowed to update our own password if we provide the current one.
-    $updatedUser = User::update(TRUE)
-      ->setActorPassword('topSecret')
-      ->addValue('password', 'ourNewSecret')
-      ->addWhere('id', '=', $user['id'])
-      ->setReload(TRUE)
-      ->execute()->first();
-    $this->assertNotEquals($previousHash, $updatedUser['hashed_password'], "Expected that the password was changed, but it wasn't.");
-    $previousHash = $updatedUser['hashed_password'];
-
-    // Check that if we don't supply OUR correct password, we're not allowed to update our password.
-    try {
-      User::update(TRUE)
-        ->addValue('password', 'anotherNewPassword')
-        ->addWhere('id', '=', $user['id'])
-        ->setActorPassword('wrong pass')
-        ->execute();
-      $this->fail("Expected UnauthorizedException got none.");
-    }
-    catch (\Civi\API\Exception\UnauthorizedException $e) {
-      $this->assertEquals('Incorrect password', $e->getMessage());
-    }
-
-    // Check that if we don't supply OUR password at all, we're not allowed to update the user's password.
-    try {
-      User::update(TRUE)
-        ->addValue('password', 'anotherNewPassword')
-        ->addWhere('id', '=', $user['id'])
-        ->execute();
-      $this->fail("Expected UnauthorizedException got none.");
-    }
-    catch (\Civi\API\Exception\UnauthorizedException $e) {
-      $this->assertEquals('Unauthorized', $e->getMessage());
-    }
-
-    // Check that we're not allowed to update the admin user's password, since we are not an admin.
-    try {
-      User::update(TRUE)
-        ->addValue('password', 'anotherNewPassword')
-        ->addWhere('id', '=', $adminUserID)
-        ->setActorPassword('ourNewSecret')
-        ->execute();
-      $this->fail("Expected UnauthorizedException got none.");
-    }
-    catch (\Civi\API\Exception\UnauthorizedException $e) {
-      $this->assertEquals("You are not permitted to change other users' accounts.", $e->getMessage());
-    }
-
-    $this->deleteStuffWeMade();
+    return $token;
   }
 
   public function testForgottenPassword() {
@@ -376,14 +189,9 @@ public function testForgottenPassword() {
 
     // Create token.
     $token = \Civi\Api4\Action\User\SendPasswordReset::updateToken($userID);
-    $this->assertMatchesRegularExpression('/^([0-9a-f]{8}[a-zA-Z0-9]{32})([0-9a-f]+)$/', $token);
-
-    // Fake an expired token
-    $old = dechex(time() - 1);
-    $this->assertNull($security->checkPasswordResetToken($old . substr($token, 9)));
-
-    // Check token fails if contact ID is different.
-    $this->assertNull($security->checkPasswordResetToken($token . '0'));
+    $decodedToken = \Civi::service('crypto.jwt')->decode($token);
+    $this->assertEquals('uid:' . $userID, $decodedToken['sub']);
+    $this->assertEquals(Security::PASSWORD_RESET_SCOPE, $decodedToken['scope']);
 
     // Check it works, but only once.
     $extractedUserID = $security->checkPasswordResetToken($token);
@@ -424,6 +232,10 @@ public function testForgottenPassword() {
     $this->assertMatchesRegularExpression(';https?://[^/]+/civicrm/login/password.*' . $token . ';', $result['text']);
     $this->assertMatchesRegularExpression(';https?://[^/]+/civicrm/login/password.*' . $token . ';', $result['html']);
     $this->assertEquals('Password reset link for Demonstrators Anonymous', $result['subject']);
+
+    // Fake an expired token
+    $token = $this->storeFakePasswordResetToken($userID, time() - 1);
+    $this->assertNull($security->checkPasswordResetToken($token));
   }
 
   public function testGetUserIDFromUsername() {
diff --git a/www/modules/civicrm/ext/standaloneusers/xml/schema/CRM/Standaloneusers/User.xml b/www/modules/civicrm/ext/standaloneusers/xml/schema/CRM/Standaloneusers/User.xml
index 61b7fce8d..01780dd2c 100644
--- a/www/modules/civicrm/ext/standaloneusers/xml/schema/CRM/Standaloneusers/User.xml
+++ b/www/modules/civicrm/ext/standaloneusers/xml/schema/CRM/Standaloneusers/User.xml
@@ -119,6 +119,9 @@
     <length>128</length>
     <readonly>true</readonly>
     <comment>Hashed, not plaintext password</comment>
+    <permission>
+      <or>administer CiviCRM, cms:administer users</or>
+    </permission>
   </field>
 
   <field>
@@ -197,7 +200,10 @@
     <title>Password Reset Token</title>
     <comment>The unspent token</comment>
     <type>varchar</type>
-    <length>40</length>
+    <length>255</length>
     <readonly>true</readonly>
+    <permission>
+      <or>administer CiviCRM, cms:administer users</or>
+    </permission>
   </field>
 </table>
diff --git a/www/modules/civicrm/ext/user_dashboard/info.xml b/www/modules/civicrm/ext/user_dashboard/info.xml
index 031137f2d..085a86af1 100644
--- a/www/modules/civicrm/ext/user_dashboard/info.xml
+++ b/www/modules/civicrm/ext/user_dashboard/info.xml
@@ -14,11 +14,11 @@
     <url desc="Support">http://FIXME</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2024-03-02</releaseDate>
-  <version>5.70.2</version>
+  <releaseDate>2024-06-19</releaseDate>
+  <version>5.74.4</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.74</ver>
   </compatibility>
   <comments>This extension is still experimental</comments>
   <classloader>
diff --git a/www/modules/civicrm/extern/ipn.php b/www/modules/civicrm/extern/ipn.php
index 5f5f6bef1..846b68d66 100644
--- a/www/modules/civicrm/extern/ipn.php
+++ b/www/modules/civicrm/extern/ipn.php
@@ -46,16 +46,6 @@
 /* Cache the real UF, override it with the SOAP environment */
 
 CRM_Core_Config::singleton();
-$log = new CRM_Utils_SystemLogger();
-if (empty($_GET)) {
-  $log->alert('payment_notification processor_name=PayPal', $_REQUEST);
-  $paypalIPN = new CRM_Core_Payment_PayPalProIPN($_REQUEST);
-}
-else {
-  $log->alert('payment_notification PayPal_Standard', $_REQUEST);
-  $paypalIPN = new CRM_Core_Payment_PayPalIPN($_REQUEST);
-  // @todo upgrade standard per Pro
-}
 try {
   switch ($config->userFramework) {
     case 'Joomla':
@@ -69,6 +59,16 @@
       break;
 
   }
+  $log = new CRM_Utils_SystemLogger();
+  if (empty($_GET)) {
+    $log->alert('payment_notification processor_name=PayPal', $_REQUEST);
+    $paypalIPN = new CRM_Core_Payment_PayPalProIPN($_REQUEST);
+  }
+  else {
+    $log->alert('payment_notification PayPal_Standard', $_REQUEST);
+    $paypalIPN = new CRM_Core_Payment_PayPalIPN($_REQUEST);
+    // @todo upgrade standard per Pro
+  }
   $paypalIPN->main();
 }
 catch (CRM_Core_Exception $e) {
diff --git a/www/modules/civicrm/functions.php b/www/modules/civicrm/functions.php
new file mode 100644
index 000000000..1082bf58e
--- /dev/null
+++ b/www/modules/civicrm/functions.php
@@ -0,0 +1,86 @@
+<?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       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * @file
+ *
+ * CiviCRM is generally organized around classes, but there are a handful of global functions.
+ * Declare them here.
+ */
+
+/**
+ * Short-named function for string translation, defined in global scope so it's available everywhere.
+ *
+ * @param string $text
+ *   String for translating.
+ *   Ex: 'Hello, %1!'
+ * @param array $params
+ *   An array of additional parameters, as per `crm_translate()`.
+ *   Ex: [1 => 'Dave']
+ * @return string
+ *   The translated string
+ *   Ex: '¡Buenos días Dave!`
+ * @see \CRM_Core_I18n::crm_translate()
+ */
+function ts($text, $params = []) {
+  static $bootstrapReady = FALSE;
+  static $lastLocale = NULL;
+  static $i18n = NULL;
+  static $function = NULL;
+
+  if ($text == '') {
+    return '';
+  }
+
+  // When the settings become available, lookup customTranslateFunction.
+  if (!$bootstrapReady) {
+    $bootstrapReady = (bool) \Civi\Core\Container::isContainerBooted();
+    if ($bootstrapReady) {
+      // just got ready: determine whether there is a working custom translation function
+      $config = CRM_Core_Config::singleton();
+      if (!empty($config->customTranslateFunction) && function_exists($config->customTranslateFunction)) {
+        $function = $config->customTranslateFunction;
+      }
+    }
+  }
+
+  $civicrmLocale = CRM_Core_I18n::getLocale();
+  if (!$i18n or $lastLocale != $civicrmLocale) {
+    $i18n = CRM_Core_I18n::singleton();
+    $lastLocale = $civicrmLocale;
+  }
+
+  if ($function) {
+    return $function($text, $params);
+  }
+  else {
+    return $i18n->crm_translate($text, $params);
+  }
+}
+
+/**
+ * Alternate name for `ts()`
+ *
+ * This is functionally equivalent to `ts()`. However, regular `ts()` is subject to extra linting
+ * rules. Using `_ts()` can bypass the linting rules for the rare cases where you really want
+ * special/dynamic values.
+ *
+ * @param array ...$args
+ * @return string
+ * @see ts()
+ * @see \CRM_Core_I18n::crm_translate()
+ * @internal
+ */
+function _ts(...$args) {
+  $f = 'ts';
+  return $f(...$args);
+}
diff --git a/www/modules/civicrm/js/Common.js b/www/modules/civicrm/js/Common.js
index dd084d11e..eda05d76c 100644
--- a/www/modules/civicrm/js/Common.js
+++ b/www/modules/civicrm/js/Common.js
@@ -1172,20 +1172,10 @@ if (!CRM.vars) CRM.vars = {};
       $('table.crm-ajax-table', e.target).each(function() {
         var
           $table = $(this),
-          script = CRM.config.resourceBase + 'js/jquery/jquery.crmAjaxTable.js',
-          $accordion = $table.closest('.crm-accordion-wrapper.collapsed, .crm-collapsible.collapsed');
-        // For tables hidden by collapsed accordions, wait.
-        if ($accordion.length) {
-          $accordion.one('crmAccordion:open', function() {
-            CRM.loadScript(script).done(function() {
-              $table.crmAjaxTable();
-            });
-          });
-        } else {
-          CRM.loadScript(script).done(function() {
-            $table.crmAjaxTable();
-          });
-        }
+          script = CRM.config.resourceBase + 'js/jquery/jquery.crmAjaxTable.js';
+        CRM.loadScript(script).done(function() {
+          $table.crmAjaxTable();
+        });
       });
       if ($("input:radio[name=radio_ts]").length == 1) {
         $("input:radio[name=radio_ts]").prop("checked", true);
@@ -1713,15 +1703,13 @@ if (!CRM.vars) CRM.vars = {};
       })
       // Handle accordions
       .on('click.crmAccordions', 'div.crm-accordion-header, fieldset.crm-accordion-header, .crm-collapsible .collapsible-title', function (e) {
-        var action = 'open';
         if ($(this).parent().hasClass('collapsed')) {
           $(this).next().css('display', 'none').slideDown(200);
         }
         else {
           $(this).next().css('display', 'block').slideUp(200);
-          action = 'close';
         }
-        $(this).parent().toggleClass('collapsed').trigger('crmAccordion:' + action);
+        $(this).parent().toggleClass('collapsed');
         e.preventDefault();
       });
 
@@ -1730,19 +1718,23 @@ if (!CRM.vars) CRM.vars = {};
 
   /**
    * Collapse or expand an accordion
+   * @deprecated
    * @param speed
    */
   $.fn.crmAccordionToggle = function (speed) {
     $(this).each(function () {
-      var action = 'open';
+      // Backward-compat, for when this older function is used on a newer <details> element
+      if ($(this).is('details')) {
+        this.open = !this.open;
+        return;
+      }
       if ($(this).hasClass('collapsed')) {
         $('.crm-accordion-body', this).first().css('display', 'none').slideDown(speed);
       }
       else {
         $('.crm-accordion-body', this).first().css('display', 'block').slideUp(speed);
-        action = 'close';
       }
-      $(this).toggleClass('collapsed').trigger('crmAccordion:' + action);
+      $(this).toggleClass('collapsed');
     });
   };
 
diff --git a/www/modules/civicrm/js/model/crm.uf.js b/www/modules/civicrm/js/model/crm.uf.js
index 77eb19489..1aacf0994 100644
--- a/www/modules/civicrm/js/model/crm.uf.js
+++ b/www/modules/civicrm/js/model/crm.uf.js
@@ -8,8 +8,8 @@
 
   var VISIBILITY = [
     {val: 'User and User Admin Only', label: ts('User and User Admin Only'), isInSelectorAllowed: false},
-    {val: 'Public Pages', label: ts('Expose Publicly'), isInSelectorAllowed: true},
-    {val: 'Public Pages and Listings', label: ts('Expose Publicly and for Listings'), isInSelectorAllowed: true}
+    {val: 'Public Pages', label: ts('Public Pages'), isInSelectorAllowed: true},
+    {val: 'Public Pages and Listings', label: ts('Public Pages and Listings'), isInSelectorAllowed: true}
   ];
 
   var LOCATION_TYPES = _.map(CRM.PseudoConstant.locationType, function(value, key) {
diff --git a/www/modules/civicrm/js/version.json b/www/modules/civicrm/js/version.json
index a0bf55f44..7aeb9837d 100644
--- a/www/modules/civicrm/js/version.json
+++ b/www/modules/civicrm/js/version.json
@@ -1 +1 @@
-"5.70.2"
+"5.74.4"
diff --git a/www/modules/civicrm/managed/contactSummary/SavedSearch_Contact_Summary_Relationships.mgd.php b/www/modules/civicrm/managed/contactSummary/SavedSearch_Contact_Summary_Relationships.mgd.php
index fb94f75c9..543bfae40 100644
--- a/www/modules/civicrm/managed/contactSummary/SavedSearch_Contact_Summary_Relationships.mgd.php
+++ b/www/modules/civicrm/managed/contactSummary/SavedSearch_Contact_Summary_Relationships.mgd.php
@@ -44,11 +44,7 @@
     'style' => 'default',
     'path' => '',
     'action' => '',
-    'condition' => [
-      'is_active',
-      '=',
-      TRUE,
-    ],
+    'condition' => [],
   ],
   [
     'entity' => 'Relationship',
@@ -443,11 +439,7 @@
                   'style' => 'default',
                   'path' => '',
                   'action' => '',
-                  'condition' => [
-                    'is_active',
-                    '=',
-                    FALSE,
-                  ],
+                  'condition' => [],
                 ],
                 [
                   'entity' => 'Relationship',
diff --git a/www/modules/civicrm/mixin/entity-types-php@2/mixin.php b/www/modules/civicrm/mixin/entity-types-php@2/mixin.php
new file mode 100644
index 000000000..54616e6b7
--- /dev/null
+++ b/www/modules/civicrm/mixin/entity-types-php@2/mixin.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Auto-register entity declarations from `schema/*.entityType.php`.
+ *
+ * @mixinName entity-types-php
+ * @mixinVersion 2.0.0
+ * @since 5.73
+ *
+ * Changelog:
+ *  - v2.0 scans /schema directory instead of /xml/schema/*
+ *  - v2.0 supports only one entity per file
+ *  - v2.0 adds 'module' key to each entity
+ *
+ * @param CRM_Extension_MixInfo $mixInfo
+ *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.
+ * @param \CRM_Extension_BootCache $bootCache
+ *   On newer deployments, this will be an instance of BootCache. On older deployments, Civix may polyfill with a work-a-like.
+ */
+return function ($mixInfo, $bootCache) {
+
+  /**
+   * @param \Civi\Core\Event\GenericHookEvent $e
+   * @see CRM_Utils_Hook::entityTypes()
+   */
+  Civi::dispatcher()->addListener('hook_civicrm_entityTypes', function ($e) use ($mixInfo) {
+    // When deactivating on a polyfill/pre-mixin system, listeners may not cleanup automatically.
+    if (!$mixInfo->isActive() || !is_dir($mixInfo->getPath('schema'))) {
+      return;
+    }
+
+    $files = (array) glob($mixInfo->getPath('schema/*.entityType.php'));
+    foreach ($files as $file) {
+      $entity = include $file;
+      $entity['module'] = $mixInfo->longName;
+      $e->entityTypes[$entity['name']] = $entity;
+    }
+  });
+
+};
diff --git a/www/modules/civicrm/mixin/lib/civimix-schema/pathload.main.php b/www/modules/civicrm/mixin/lib/civimix-schema/pathload.main.php
new file mode 100644
index 000000000..f0442e848
--- /dev/null
+++ b/www/modules/civicrm/mixin/lib/civimix-schema/pathload.main.php
@@ -0,0 +1,28 @@
+<?php
+namespace CiviMix\Schema;
+
+\pathload()->activatePackage('civimix-schema@5', __DIR__, [
+  'reloadable' => TRUE,
+  // The civimix-schema library specifically supports installation processes. From a
+  // bootstrap/service-availability POV, this is a rough environment which leads to
+  // the "Multi-Activation Issue" and "Multi-Download Issue". To adapt to them,
+  // civimix-schema follows "Reloadable Library" patterns.
+  // More information: https://github.com/totten/pathload-poc/blob/master/doc/issues.md
+]);
+
+// When reloading, we make newer instance of the Facade object.
+$GLOBALS['CiviMixSchema'] = require __DIR__ . '/src/CiviMixSchema.php';
+
+if (!interface_exists(__NAMESPACE__ . '\SchemaHelperInterface')) {
+  require __DIR__ . '/src/SchemaHelperInterface.php';
+}
+
+// \CiviMix\Schema\loadClass() is a facade. The facade should remain identical across versions.
+if (!function_exists(__NAMESPACE__ . '\loadClass')) {
+
+  function loadClass(string $class) {
+    return $GLOBALS['CiviMixSchema']->loadClass($class);
+  }
+
+  spl_autoload_register(__NAMESPACE__ . '\loadClass');
+}
diff --git a/www/modules/civicrm/mixin/lib/civimix-schema/src/AutomaticUpgrader.php b/www/modules/civicrm/mixin/lib/civimix-schema/src/AutomaticUpgrader.php
new file mode 100644
index 000000000..8d1cc70e9
--- /dev/null
+++ b/www/modules/civicrm/mixin/lib/civimix-schema/src/AutomaticUpgrader.php
@@ -0,0 +1,176 @@
+<?php
+
+namespace CiviMix\Schema;
+
+use Civi\Test\Invasive;
+
+/**
+ * The "AutomaticUpgrader" will create and destroy the SQL tables
+ * using schema files (`SchemaHelper`). It also calls-out to any custom
+ * upgrade code (eg `CRM_Myext_Upgrader`).
+ *
+ * To simplify backport considerations, `AutomaticUpgrader` does not have formal name.
+ * It is accessed via aliases like "CiviMix\Schema\*\AutomaticUpgrader".
+ *
+ * Target: CiviCRM v5.38+
+ */
+return new class() implements \CRM_Extension_Upgrader_Interface {
+
+  use \CRM_Extension_Upgrader_IdentityTrait {
+
+    init as initIdentity;
+
+  }
+
+  /**
+   * Optionally delegate to "CRM_Myext_Upgrader" or "Civi\Myext\Upgrader".
+   *
+   * @var \CRM_Extension_Upgrader_Interface|null
+   */
+  private $customUpgrader;
+
+  public function init(array $params) {
+    $this->initIdentity($params);
+    if ($info = $this->getInfo()) {
+      if ($class = $this->getDelegateUpgraderClass($info)) {
+        $this->customUpgrader = new $class();
+        $this->customUpgrader->init($params);
+        if ($errors = $this->checkDelegateCompatibility($this->customUpgrader)) {
+          throw new \CRM_Core_Exception("AutomaticUpgrader is not compatible with $class:\n" . implode("\n", $errors));
+        }
+      }
+    }
+  }
+
+  public function notify(string $event, array $params = []) {
+    $info = $this->getInfo();
+    if (!$info) {
+      return;
+    }
+
+    if ($event === 'install') {
+      $GLOBALS['CiviMixSchema']->getHelper($this->getExtensionKey())->install();
+    }
+
+    if ($this->customUpgrader) {
+      $this->customUpgrader->notify($event, $params);
+    }
+
+    if ($event === 'uninstall') {
+      $GLOBALS['CiviMixSchema']->getHelper($this->getExtensionKey())->uninstall();
+    }
+  }
+
+  /**
+   * Civix-based extensions have a conventional name for their upgrader class ("CRM_Myext_Upgrader"
+   * or "Civi\Myext\Upgrader"). Figure out if this class exists.
+   *
+   * @param \CRM_Extension_Info $info
+   * @return string|null
+   *   Ex: 'CRM_Myext_Upgrader' or 'Civi\Myext\Upgrader'
+   */
+  public function getDelegateUpgraderClass(\CRM_Extension_Info $info): ?string {
+    $candidates = [];
+
+    if (!empty($info->civix['namespace'])) {
+      $namespace = $info->civix['namespace'];
+      $candidates[] = sprintf('%s_Upgrader', str_replace('/', '_', $namespace));
+      $candidates[] = sprintf('%s\\Upgrader', str_replace('/', '\\', $namespace));
+    }
+
+    foreach ($candidates as $candidate) {
+      if (class_exists($candidate)) {
+        return $candidate;
+      }
+    }
+
+    return NULL;
+  }
+
+  public function getInfo(): ?\CRM_Extension_Info {
+    try {
+      return \CRM_Extension_System::singleton()->getMapper()->keyToInfo($this->extensionName);
+    }
+    catch (\CRM_Extension_Exception_ParseException $e) {
+      \Civi::log()->error("Parse error in extension " . $this->extensionName . ": " . $e->getMessage());
+      return NULL;
+    }
+  }
+
+  /**
+   * @param \CRM_Extension_Upgrader_Interface $upgrader
+   * @return array
+   *   List of error messages.
+   */
+  public function checkDelegateCompatibility($upgrader): array {
+    $class = get_class($upgrader);
+
+    $errors = [];
+
+    if (!($upgrader instanceof \CRM_Extension_Upgrader_Base)) {
+      $errors[] = "$class is not based on CRM_Extension_Upgrader_Base.";
+      return $errors;
+    }
+
+    // In the future, we will probably modify AutomaticUpgrader to build its own
+    // sequence of revisions (based on other sources of data). AutomaticUpgrader
+    // is only regarded as compatible with classes that strictly follow the standard revision-model.
+    $methodNames = [
+      'appendTask',
+      'onUpgrade',
+      'getRevisions',
+      'getCurrentRevision',
+      'setCurrentRevision',
+      'enqueuePendingRevisions',
+      'hasPendingRevisions',
+    ];
+    foreach ($methodNames as $methodName) {
+      $method = new \ReflectionMethod($upgrader, $methodName);
+      if ($method->getDeclaringClass()->getName() !== 'CRM_Extension_Upgrader_Base') {
+        $errors[] = "To ensure future interoperability, AutomaticUpgrader only supports {$class}::{$methodName}()  if it's inherited from CRM_Extension_Upgrader_Base";
+      }
+    }
+
+    return $errors;
+  }
+
+  public function __set($property, $value) {
+    switch ($property) {
+      // _queueAdapter() needs these properties.
+      case 'ctx':
+      case 'queue':
+        if (!$this->customUpgrader) {
+          throw new \RuntimeException("AutomaticUpgrader($this->extensionName): Cannot assign delegated property: $property (No custom-upgrader found)");
+        }
+        // "Invasive": unlike QueueTrait, we are not in the same class as the recipient. And we can't replace previously-published QueueTraits.
+        Invasive::set([$this->customUpgrader, $property], $value);
+        return;
+    }
+
+    throw new \RuntimeException("AutomaticUpgrader($this->extensionName): Cannot assign unknown property: $property");
+  }
+
+  public function __get($property) {
+    switch ($property) {
+      // _queueAdapter() needs these properties.
+      case 'ctx':
+      case 'queue':
+        if (!$this->customUpgrader) {
+          throw new \RuntimeException("AutomaticUpgrader($this->extensionName): Cannot read delegated property: $property (No custom-upgrader found)");
+        }
+        // "Invasive": Unlike QueueTrait, we are not in the same class as the recipient. And we can't replace previously-published QueueTraits.
+        return Invasive::get([$this->customUpgrader, $property]);
+    }
+    throw new \RuntimeException("AutomaticUpgrader($this->extensionName): Cannot read unknown property: $property");
+  }
+
+  public function __call($name, $arguments) {
+    if ($this->customUpgrader) {
+      return call_user_func_array([$this->customUpgrader, $name], $arguments);
+    }
+    else {
+      throw new \RuntimeException("AutomaticUpgrader($this->extensionName): Cannot delegate method $name (No custom-upgrader found)");
+    }
+  }
+
+};
diff --git a/www/modules/civicrm/mixin/lib/civimix-schema/src/CiviMixSchema.php b/www/modules/civicrm/mixin/lib/civimix-schema/src/CiviMixSchema.php
new file mode 100644
index 000000000..72223e701
--- /dev/null
+++ b/www/modules/civicrm/mixin/lib/civimix-schema/src/CiviMixSchema.php
@@ -0,0 +1,46 @@
+<?php
+namespace CiviMix\Schema;
+
+/**
+ * This object is known as $GLOBALS['CiviMixSchema']. It is a reloadable service-object.
+ * (It may be reloaded if you enable a new extension that includes an upgraded copy.)
+ */
+return new class() {
+
+  /**
+   * @var string
+   *   Regular expression. Note the 2 groupings. $m[1] identifies a per-extension namespace. $m[2] identifies the actual class.
+   */
+  private $regex = ';^CiviMix\\\Schema\\\(\w+)\\\(AutomaticUpgrader)$;';
+
+  /**
+   * If someone requests a class like:
+   *
+   *    CiviMix\Schema\MyExt\AutomaticUpgrader
+   *
+   * then load the latest version of:
+   *
+   *    civimix-schema/src/Helper.php
+   */
+  public function loadClass(string $class) {
+    if (preg_match($this->regex, $class, $m)) {
+      $absPath = __DIR__ . DIRECTORY_SEPARATOR . $m[2] . '.php';
+      class_alias(get_class(require $absPath), $class);
+    }
+  }
+
+  /**
+   * @param string $extensionKey
+   *   Ex: 'org.civicrm.flexmailer'
+   * @return \CiviMix\Schema\SchemaHelperInterface
+   */
+  public function getHelper(string $extensionKey) {
+    $store = &\Civi::$statics['CiviMixSchema-helpers'];
+    if (!isset($store[$extensionKey])) {
+      $class = get_class(require __DIR__ . '/SchemaHelper.php');
+      $store[$extensionKey] = new $class($extensionKey);
+    }
+    return $store[$extensionKey];
+  }
+
+};
diff --git a/www/modules/civicrm/mixin/lib/civimix-schema/src/SchemaHelper.php b/www/modules/civicrm/mixin/lib/civimix-schema/src/SchemaHelper.php
new file mode 100644
index 000000000..41e68e48b
--- /dev/null
+++ b/www/modules/civicrm/mixin/lib/civimix-schema/src/SchemaHelper.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace CiviMix\Schema;
+
+/**
+ * The "SchemaHelper" class provides helper methods for an extension to manage its schema.
+ *
+ * Target: CiviCRM v5.38+
+ */
+return new class() implements SchemaHelperInterface {
+
+  /**
+   * @var string
+   *
+   * Ex: 'org.civicrm.flexmailer'
+   */
+  private $key;
+
+  private $sqlGenerator;
+
+  public function __construct(?string $key = NULL) {
+    $this->key = $key;
+  }
+
+  public function install(): void {
+    $this->runSqls([$this->generateInstallSql()]);
+  }
+
+  public function uninstall(): void {
+    $this->runSqls([$this->generateUninstallSql()]);
+  }
+
+  public function generateInstallSql(): ?string {
+    return $this->getSqlGenerator()->getCreateTablesSql();
+  }
+
+  public function generateUninstallSql(): string {
+    return $this->getSqlGenerator()->getDropTablesSql();
+  }
+
+  public function hasSchema(): bool {
+    return file_exists($this->getExtensionDir() . '/schema');
+  }
+
+  // FIXME: You can add more utility methods here
+
+  // public function addTables(array $names): void {
+  //   throw new \RuntimeException("TODO: Install a single tables");
+  // }
+  //
+  // public function addColumn(string $table, string $column): void {
+  //   throw new \RuntimeException("TODO: Install a single tables");
+  // }
+
+  /**
+   * @param array $sqls
+   *  List of SQL scripts.
+   */
+  private function runSqls(array $sqls): void {
+    foreach ($sqls as $sql) {
+      \CRM_Utils_File::runSqlQuery(CIVICRM_DSN, $sql);
+    }
+  }
+
+  protected function getExtensionDir(): string {
+    if ($this->key === 'civicrm') {
+      $r = new \ReflectionClass('CRM_Core_ClassLoader');
+      return dirname($r->getFileName(), 3);
+    }
+    $system = \CRM_Extension_System::singleton();
+    return $system->getMapper()->keyToBasePath($this->key);
+  }
+
+  private function getSqlGenerator() {
+    if ($this->sqlGenerator === NULL) {
+      $gen = require __DIR__ . '/SqlGenerator.php';
+      $this->sqlGenerator = $gen::createFromFolder($this->key, $this->getExtensionDir() . '/schema', $this->key === 'civicrm');
+    }
+    return $this->sqlGenerator;
+  }
+
+};
diff --git a/www/modules/civicrm/mixin/lib/civimix-schema/src/SchemaHelperInterface.php b/www/modules/civicrm/mixin/lib/civimix-schema/src/SchemaHelperInterface.php
new file mode 100644
index 000000000..e915a8064
--- /dev/null
+++ b/www/modules/civicrm/mixin/lib/civimix-schema/src/SchemaHelperInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace CiviMix\Schema;
+
+/**
+ * The SchemaHelperInterface provides utility methods for managing the schema
+ * in an extension (e.g. installing or uninstalling all SQL tables).
+ *
+ * The interface is implemented by the reloadable library (civimix-schema@5). To ensure
+ * newer revisions of the library can be loaded, the implementation is an anonymous-class,
+ * and the interface uses soft type-hints.
+ *
+ * @method bool hasSchema()
+ *
+ * @method void install()
+ * @method void uninstall()
+ *
+ * @method string generateInstallSql()
+ * @method string generateUninstallSql()
+ *
+ * TODO: void addTables(string[] $tables)
+ * TODO: void addColumn(string $table, string $column)
+ *
+ * To see the latest implementation:
+ *
+ * @see ./SchemaHelper.php
+ */
+interface SchemaHelperInterface {
+
+}
diff --git a/www/modules/civicrm/mixin/lib/civimix-schema/src/SqlGenerator.php b/www/modules/civicrm/mixin/lib/civimix-schema/src/SqlGenerator.php
new file mode 100644
index 000000000..5857297da
--- /dev/null
+++ b/www/modules/civicrm/mixin/lib/civimix-schema/src/SqlGenerator.php
@@ -0,0 +1,205 @@
+<?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       |
+ +--------------------------------------------------------------------+
+ */
+
+return new class() {
+
+  /**
+   * @var array
+   */
+  private $entities;
+
+  /**
+   * @var callable
+   */
+  private $findExternalTable;
+
+  /**
+   * @param string $module
+   *   Ex: 'civicrm' or 'org.example.mymodule'
+   * @param string $path
+   *   Ex: '/var/www/sites/all/modules/civicrm/schema'
+   * @param bool $isolated
+   *   TRUE if these entities should be a self-sufficient (i.e. no external references).
+   *   FALSE if these entities may include references to other tables.
+   *   TRUE would make sense in (eg) civicrm-core, before installation or bootstrap
+   *   FALSE would make sense in (eg) an extension on an active system.
+   *
+   * @return static
+   */
+  public static function createFromFolder(string $module, string $path, bool $isolated) {
+    $files = \CRM_Utils_File::findFiles($path, '*.entityType.php');
+    $entities = [];
+    foreach ($files as $file) {
+      $entity = include $file;
+      $entity['module'] = $module;
+      $entities[$entity['name']] = $entity;
+    }
+
+    $findExternalTable = $isolated ? NULL : (['CRM_Core_DAO_AllCoreTables', 'getTableForEntityName']);
+    return new static($entities, $findExternalTable);
+  }
+
+  public function __construct(array $entities = [], ?callable $findExternalTable = NULL) {
+    $this->entities = $entities;
+    $this->findExternalTable = $findExternalTable ?: function() {
+      return NULL;
+    };
+  }
+
+  public function getEntities(): array {
+    return $this->entities;
+  }
+
+  public function getCreateTablesSql(): string {
+    $sql = '';
+    foreach ($this->entities as $entity) {
+      $sql .= $this->generateCreateTableSql($entity);
+    }
+    foreach ($this->entities as $entity) {
+      $sql .= $this->generateConstraintsSql($entity);
+    }
+    return $sql;
+  }
+
+  public function getCreateTableSql(string $entityName): string {
+    $sql = $this->generateCreateTableSql($this->entities[$entityName]);
+    $sql .= $this->generateConstraintsSql($this->entities[$entityName]);
+    return $sql;
+  }
+
+  public function getDropTablesSql(): string {
+    $sql = "SET FOREIGN_KEY_CHECKS=0;\n";
+    foreach ($this->entities as $entity) {
+      $sql .= "DROP TABLE IF EXISTS `{$entity['table']}`;\n";
+    }
+    $sql .= "SET FOREIGN_KEY_CHECKS=1;\n";
+    return $sql;
+  }
+
+  private function generateCreateTableSql(array $entity): string {
+    $definition = [];
+    $primaryKeys = [];
+    foreach ($entity['getFields']() as $fieldName => $field) {
+      if (!empty($field['primary_key'])) {
+        $primaryKeys[] = "`$fieldName`";
+      }
+      $fieldSql = "`$fieldName` {$field['sql_type']}";
+      if (!empty($field['collate'])) {
+        $fieldSql .= " COLLATE {$field['collate']}";
+      }
+      // Required fields and booleans cannot be null
+      // FIXME: For legacy support this doesn't force boolean fields to be NOT NULL... but it really should.
+      if (!empty($field['required'])) {
+        $fieldSql .= ' NOT NULL';
+      }
+      // Mysql 5.7 requires timestamp to be explicitly declared NULL
+      if (empty($field['required']) && $field['sql_type'] === 'timestamp') {
+        $fieldSql .= ' NULL';
+      }
+      if (!empty($field['auto_increment'])) {
+        $fieldSql .= " AUTO_INCREMENT";
+      }
+      $fieldSql .= self::getDefaultSql($field);
+      if (!empty($field['description'])) {
+        $fieldSql .= " COMMENT '" . \CRM_Core_DAO::escapeString($field['description']) . "'";
+      }
+      $definition[] = $fieldSql;
+    }
+    if ($primaryKeys) {
+      $definition[] = 'PRIMARY KEY (' . implode(', ', $primaryKeys) . ')';
+    }
+    $indices = isset($entity['getIndices']) ? $entity['getIndices']() : [];
+    foreach ($indices as $indexName => $index) {
+      $indexFields = [];
+      foreach ($index['fields'] as $fieldName => $length) {
+        $indexFields[] = "`$fieldName`" . (is_int($length) ? "($length)" : '');
+      }
+      $definition[] = (!empty($index['unique']) ? 'UNIQUE ' : '') . "INDEX `$indexName`(" . implode(', ', $indexFields) . ')';
+    }
+
+    $sql = "CREATE TABLE `{$entity['table']}` (\n  " .
+      implode(",\n  ", $definition) .
+      "\n)\n" .
+      $this->getTableOptions() . ";\n";
+    return $sql;
+  }
+
+  private function generateConstraintsSql(array $entity): string {
+    $constraints = [];
+    foreach ($entity['getFields']() as $fieldName => $field) {
+      if (!empty($field['entity_reference']['entity'])) {
+        $constraint = "ADD CONSTRAINT `FK_{$entity['table']}_$fieldName` FOREIGN KEY (`$fieldName`)" .
+          " REFERENCES `" . $this->getTableForEntity($field['entity_reference']['entity']) . "`(`{$field['entity_reference']['key']}`)";
+        if (!empty($field['entity_reference']['on_delete'])) {
+          $constraint .= " ON DELETE {$field['entity_reference']['on_delete']}";
+        }
+        $constraints[] = $constraint;
+      }
+    }
+    $sql = '';
+    if ($constraints) {
+      $sql .= "ALTER TABLE `{$entity['table']}`\n  ";
+      $sql .= implode(",\n  ", $constraints) . ";\n";
+    }
+    return $sql;
+  }
+
+  private static function getDefaultSql(array $field): string {
+    // Booleans always have a default
+    if ($field['sql_type'] === 'boolean') {
+      $field += ['default' => FALSE];
+    }
+    if (!array_key_exists('default', $field)) {
+      return '';
+    }
+    if (is_null($field['default'])) {
+      $default = 'NULL';
+    }
+    elseif (is_bool($field['default'])) {
+      $default = $field['default'] ? 'TRUE' : 'FALSE';
+    }
+    elseif (!is_string($field['default']) || str_starts_with($field['default'], 'CURRENT_TIMESTAMP')) {
+      $default = $field['default'];
+    }
+    else {
+      $default = "'" . \CRM_Core_DAO::escapeString($field['default']) . "'";
+    }
+    return ' DEFAULT ' . $default;
+  }
+
+  private function getTableForEntity(string $entityName): string {
+    return $this->entities[$entityName]['table'] ?? call_user_func($this->findExternalTable, $entityName);
+  }
+
+  /**
+   * Get general/default options for use in CREATE TABLE (eg character set, collation).
+   */
+  private function getTableOptions(): string {
+    if (!Civi\Core\Container::isContainerBooted()) {
+      // Pre-installation environment ==> aka new install
+      $collation = CRM_Core_BAO_SchemaHandler::DEFAULT_COLLATION;
+    }
+    else {
+      // What character-set is used for CiviCRM core schema? What collation?
+      // This depends on when the DB was *initialized*:
+      // - civicrm-core >= 5.33 has used `CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci`
+      // - civicrm-core 4.3-5.32 has used `CHARACTER SET utf8 COLLATE utf8_unicode_ci`
+      // - civicrm-core <= 4.2 -- I haven't checked, but it's probably the same.
+      // Some systems have migrated (eg APIv3's `System.utf8conversion`), but (as of Feb 2024)
+      // we haven't made any effort to push to this change.
+      $collation = \CRM_Core_BAO_SchemaHandler::getInUseCollation();
+    }
+
+    $characterSet = (stripos($collation, 'utf8mb4') !== FALSE) ? 'utf8mb4' : 'utf8';
+    return "ENGINE=InnoDB DEFAULT CHARACTER SET {$characterSet} COLLATE {$collation} ROW_FORMAT=DYNAMIC";
+  }
+
+};
diff --git a/www/modules/civicrm/mixin/lib/pathload-0.php b/www/modules/civicrm/mixin/lib/pathload-0.php
new file mode 100644
index 000000000..76d642548
--- /dev/null
+++ b/www/modules/civicrm/mixin/lib/pathload-0.php
@@ -0,0 +1,711 @@
+<?php
+//phpcs:disable
+/*
+PHP PathLoad (MIT License)
+Copyright (c) 2022-2024 CiviCRM LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+*/
+namespace {
+  if (isset($GLOBALS['_PathLoad'][0])) {
+    return $GLOBALS['_PathLoad'][0];
+  }
+  if (!interface_exists('PathLoadInterface')) {
+    /**
+     * The PathLoad interface is defined via soft signatures ("duck-typing") rather than hard signatures.
+     * This matters when multiple parties inject PathLoad support onto a pre-existing framework.
+     * In the event of future language changes or contract changes, the soft signatures
+     * give wiggle-room to address interoperability/conversion.
+     *
+     * ==== PACKAGE CONSUMER APIS ===
+     *
+     * (PathLoad v0) Enable autoloading of `*.phar`, `*.php`, and folders from a search directory.
+     *
+     * @method PathLoadInterface addSearchDir(string $baseDir)
+     *
+     * (Pathload v0) Enable autoloading of a specific `*.phar`, `*.php`, or folder.
+     * Useful for non-standard file-layout.
+     *
+     * @method PathLoadInterface addSearchItem(string $name, string $version, string $file, ?string $type = NULL)
+     *
+     * (PathLoad v0) Add auto-loading hints. If someone requests a class in $namespace, then we load $package.
+     *
+     * Consecutive/identical calls to addNamespace() are de-duplicated.
+     *
+     * @method PathLoadInterface addNamespace(string $package, $namespaces)
+     *
+     * (Pathload v0) When you need resources from a package, call loadPackage().
+     * This locates the relevant files and loads them.
+     * If you use namespace-autoloading, then this shouldn't be necessary.
+     *
+     * @method PathLoadInterface loadPackage(string $majorName)
+     *
+     * ==== PACKAGE PROVIDER APIS ====
+     *
+     * (PathLoad v0) Activate your package. This allows you to add metadata about activating
+     * your own package. In particular, this may be necessary if you have transitive
+     * dependencies. This would be appropriate for single-file PHP package (`cloud-io@1.0.0.php`)
+     * which lack direct support for `pathload.json`.
+     *
+     * @method PathLoadInterface activatePackage(string $majorName, string $dir, array $config)
+     */
+    interface PathLoadInterface {
+    }
+  }
+}
+
+namespace PathLoad\V0 {
+  if (!class_exists('PathLoad')) {
+    function doRequire(string $file) {
+      require_once $file;
+    }
+    /**
+     * Locate version-compliant instances of PathLoad.
+     */
+    class Versions implements \ArrayAccess {
+      public $top;
+      public function __construct($top) {
+        $this->top = $top;
+      }
+      public function offsetExists($version): bool {
+        return ($version === 'top' || $version <= $this->top->version);
+      }
+      public function offsetGet($version): ?\PathLoadInterface {
+        if ($version === 'top' || $version <= $this->top->version) {
+          return $this->top;
+        }
+        return NULL;
+      }
+      public function offsetSet($offset, $value): void {
+        error_log("Cannot overwrite PathLoad[$offset]");
+      }
+      public function offsetUnset($offset): void {
+        error_log("Cannot remove PathLoad[$offset]");
+      }
+    }
+    class Package {
+      /**
+       * Split a package identifier into its parts.
+       *
+       * @param string $package
+       *   Ex: 'foobar@1.2.3'
+       * @return array
+       *   Tuple: [$majorName, $name, $version]
+       *   Ex: 'foobar@1', 'foobar', '1.2.3'
+       */
+      public static function parseExpr(string $package): array {
+        if (strpos($package, '@') === FALSE) {
+          throw new \RuntimeException("Malformed package name: $package");
+        }
+        [$prefix, $suffix] = explode('@', $package, 2);
+        $prefix = str_replace('/', '~', $prefix);
+        [$major] = explode('.', $suffix, 2);
+        return ["$prefix@$major", $prefix, $suffix];
+      }
+      public static function parseFileType(string $file): array {
+        if (substr($file, -4) === '.php') {
+          return ['php', substr(basename($file), 0, -4)];
+        }
+        elseif (substr($file, '-5') === '.phar') {
+          return ['phar', substr(basename($file), 0, -5)];
+        }
+        elseif (is_dir($file)) {
+          return ['dir', basename($file)];
+        }
+        else {
+          return [NULL, NULL];
+        }
+      }
+      /**
+       * @param string $file
+       *  Ex: '/var/www/app-1/lib/foobar@.1.2.3.phar'
+       * @return \PathLoad\Vn\Package|null
+       */
+      public static function create(string $file): ?Package {
+        [$type, $base] = self::parseFileType($file);
+        if ($type === NULL) {
+          return NULL;
+        }
+        $self = new Package();
+        [$self->majorName, $self->name, $self->version] = static::parseExpr($base);
+        $self->file = $file;
+        $self->type = $type;
+        return $self;
+      }
+      /**
+       * @var string
+       *   Ex: '/var/www/app-1/lib/cloud-file-io@1.2.3.phar'
+       */
+      public $file;
+      /**
+       * @var string
+       *   Ex: 'cloud-file-io'
+       */
+      public $name;
+      /**
+       * @var string
+       *   Ex: 'cloud-file-io@1'
+       */
+      public $majorName;
+      /**
+       * @var string
+       *   Ex: '1.2.3'
+       */
+      public $version;
+      /**
+       * @var string
+       *   Ex: 'php' or 'phar' or 'dir'
+       */
+      public $type;
+      public $reloadable = FALSE;
+    }
+    class Scanner {
+      /**
+       * @var array
+       *   Array(string $id => [package => string, glob => string])
+       * @internal
+       */
+      public $allRules = [];
+      /**
+       * @var array
+       *   Array(string $id => [package => string, glob => string])
+       * @internal
+       */
+      public $newRules = [];
+      /**
+       * @param array $rule
+       *   Ex: ['package' => '*', 'glob' => '/var/www/lib/*@*']
+       *   Ex: ['package' => 'cloud-file-io@1', 'glob' => '/var/www/lib/cloud-io@1*.phar'])
+       * @return void
+       */
+      public function addRule(array $rule): void {
+        $id = static::id($rule);
+        $this->newRules[$id] = $this->allRules[$id] = $rule;
+      }
+      public function reset(): void {
+        $this->newRules = $this->allRules;
+      }
+      /**
+       * Evaluate any rules that have a chance of finding $packageHint.
+       *
+       * @param string $packageHint
+       *   Give a hint about what package we're looking for.
+       *   The scanner will try to target packages based on this hint.
+       *   Ex: '*' or 'cloud-file-io'
+       * @return \Generator
+       *   A list of packages. These may not be the exact package you're looking for.
+       *   You should assimilate knowledge of all outputs because you may not get them again.
+       */
+      public function scan(string $packageHint): \Generator {
+        yield from [];
+        foreach (array_keys($this->newRules) as $id) {
+          $searchRule = $this->newRules[$id];
+          if ($searchRule['package'] === '*' || $searchRule['package'] === $packageHint) {
+            unset($this->newRules[$id]);
+            if (isset($searchRule['glob'])) {
+              foreach ((array) glob($searchRule['glob']) as $file) {
+                if (($package = Package::create($file)) !== NULL) {
+                  yield $package;
+                }
+              }
+            }
+            if (isset($searchRule['file'])) {
+              $package = new Package();
+              $package->file = $searchRule['file'];
+              $package->name = $searchRule['package'];
+              $package->majorName = $searchRule['package'] . '@' . explode('.', $searchRule['version'])[0];
+              $package->version = $searchRule['version'];
+              $package->type = $searchRule['type'] ?: Package::parseFileType($searchRule['file'])[0];
+              yield $package;
+            }
+          }
+        }
+      }
+      protected static function id(array $rule): string {
+        if (isset($rule['glob'])) {
+          return $rule['glob'];
+        }
+        elseif (isset($rule['file'])) {
+          return md5(implode(' ', [$rule['file'], $rule['package'], $rule['version']]));
+        }
+        else {
+          throw new \RuntimeException("Cannot identify rule: " . json_encode($rule));
+        }
+      }
+    }
+    class Psr0Loader {
+      /**
+       * @var array
+       *  Ex: $paths['F']['Foo_'][0] = '/var/www/app/lib/foo@1.0.0/src/';
+       * @internal
+       */
+      public $paths = [];
+      /**
+       * @param string $dir
+       * @param array $config
+       *   Ex: ['Foo_' => ['src/']] or ['Foo_' => ['Foo_']]
+       */
+      public function addAll(string $dir, array $config) {
+        $dir = rtrim($dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        foreach ($config as $prefix => $relPaths) {
+          $bucket = $prefix[0];
+          foreach ((array) $relPaths as $relPath) {
+            $this->paths[$bucket][$prefix][] = $dir . $relPath;
+          }
+        }
+      }
+      /**
+       * Loads the class file for a given class name.
+       *
+       * @param string $class The fully-qualified class name.
+       * @return mixed The mapped file name on success, or boolean false on failure.
+       */
+      public function loadClass(string $class) {
+        $bucket = $class[0];
+        if (!isset($this->paths[$bucket])) {
+          return FALSE;
+        }
+        $file = DIRECTORY_SEPARATOR . str_replace(['_', '\\'], [DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR], $class) . '.php';
+        foreach ($this->paths[$bucket] as $prefix => $paths) {
+          if ($prefix === substr($class, 0, strlen($prefix))) {
+            foreach ($paths as $path) {
+              $fullFile = $path . $file;
+              if (file_exists($fullFile)) {
+                doRequire($fullFile);
+                return $fullFile;
+              }
+            }
+          }
+        }
+        return FALSE;
+      }
+    }
+    class Psr4Loader {
+      /**
+       * @var array
+       *   Ex: $prefixes['Foo\\'][0] = '/var/www/app/lib/foo@1.0.0/src/']
+       * @internal
+       */
+      public $prefixes = [];
+      public function addAll(string $dir, array $config) {
+        foreach ($config as $prefix => $relPaths) {
+          foreach ($relPaths as $relPath) {
+            $this->addNamespace($prefix, $dir . '/' . $relPath);
+          }
+        }
+      }
+      /**
+       * Adds a base directory for a namespace prefix.
+       *
+       * @param string $prefix
+       *   The namespace prefix.
+       * @param string $baseDir
+       *   A base directory for class files in the namespace.
+       * @return void
+       */
+      private function addNamespace($prefix, $baseDir) {
+        $prefix = trim($prefix, '\\') . '\\';
+        $baseDir = rtrim($baseDir, DIRECTORY_SEPARATOR) . '/';
+        if (isset($this->prefixes[$prefix]) === FALSE) {
+          $this->prefixes[$prefix] = [];
+        }
+        array_push($this->prefixes[$prefix], $baseDir);
+      }
+      /**
+       * Loads the class file for a given class name.
+       *
+       * @param string $class The fully-qualified class name.
+       * @return mixed The mapped file name on success, or boolean false on failure.
+       */
+      public function loadClass(string $class) {
+        $prefix = $class;
+        while (FALSE !== $pos = strrpos($prefix, '\\')) {
+          $prefix = substr($class, 0, $pos + 1);
+          $relativeClass = substr($class, $pos + 1);
+          if ($mappedFile = $this->findRelativeClass($prefix, $relativeClass)) {
+            doRequire($mappedFile);
+            return $mappedFile;
+          }
+          $prefix = rtrim($prefix, '\\');
+        }
+        return FALSE;
+      }
+      /**
+       * Load the mapped file for a namespace prefix and relative class.
+       *
+       * @param string $prefix
+       *   The namespace prefix.
+       * @param string $relativeClass
+       *   The relative class name.
+       * @return string|FALSE
+       *   Matched file name, or FALSE if none found.
+       */
+      private function findRelativeClass($prefix, $relativeClass) {
+        if (isset($this->prefixes[$prefix]) === FALSE) {
+          return FALSE;
+        }
+        $relFile = str_replace('\\', DIRECTORY_SEPARATOR, $relativeClass) . '.php';
+        foreach ($this->prefixes[$prefix] as $baseDir) {
+          $file = $baseDir . $relFile;
+          if (file_exists($file)) {
+            return $file;
+          }
+        }
+        return FALSE;
+      }
+    }
+    class PathLoad implements \PathLoadInterface {
+      /**
+       * @var null|int
+       */
+      public $version;
+      /**
+       * @var Scanner
+       * @internal
+       */
+      public $scanner;
+      /**
+       * List of best-known versions for each package.
+       *
+       * Packages are loaded lazily. Once loaded, the data is moved to $loadedPackages.
+       *
+       * @var Package[]
+       *   Ex: ['cloud-file-io@1' => new Package('/usr/share/php-pathload/cloud-file-io@1.2.3.phar',
+       *   ...)]
+       * @internal
+       */
+      public $availablePackages = [];
+      /**
+       * List of packages that have already been resolved.
+       *
+       * @var Package[]
+       *   Ex: ['cloud-file-io@1' => new Package('/usr/share/php-pathload/cloud-file-io@1.2.3.phar',
+       *   ...)] Note: If PathLoad version is super-ceded, then the loadedPackages may be instances of
+       *   an old `Package` class. Be mindful of duck-type compatibility. We don't strictly need to
+       *   retain this data, but it feels it'd be handy for debugging.
+       * @internal
+       */
+      public $loadedPackages = [];
+      /**
+       * Log of package activations. Used to re-initialize class-loader if we upgrade.
+       *
+       * @var array
+       * @internal
+       */
+      public $activatedPackages = [];
+      /**
+       * List of hints for class-loading. If someone tries to use a matching class, then
+       * load the corresponding package.
+       *
+       * Namespace-rules are evaluated lazily. Once evaluated, the data is removed.
+       *
+       * @var array
+       *   Array(string $prefix => [string $package => string $package])
+       *   Ex: ['Super\Cloud\IO\' => ['cloud-io@1' => 'cloud-io@1']
+       * @internal
+       */
+      public $availableNamespaces;
+      /**
+       * @var \PathLoad\Vn\Psr0Loader
+       * @internal
+       */
+      public $psr0;
+      /**
+       * @var \PathLoad\Vn\Psr4Loader
+       * @internal
+       */
+      public $psr4;
+      /**
+       * @param int $version
+       *   Identify the version being instantiated.
+       * @param \PathLoadInterface|null $old
+       *   If this instance is a replacement for an older instance, then it will be passed in.
+       * @return \ArrayAccess
+       *   Versioned work-a-like array.
+       */
+      public static function create(int $version, ?\PathLoadInterface $old = NULL) {
+        if ($old !== NULL) {
+          $old->unregister();
+        }
+        $new = new static();
+        $new->version = $version;
+        $new->scanner = new Scanner();
+        $new->psr0 = new Psr0Loader();
+        $new->psr4 = new Psr4Loader();
+        $new->register();
+        // The exact protocol for assimilating $old instances may need change.
+        // This seems like a fair guess as long as old properties are forward-compatible.
+
+        if ($old === NULL) {
+          $baseDirs = getenv('PHP_PATHLOAD') ? explode(PATH_SEPARATOR, getenv('PHP_PATHLOAD')) : [];
+          foreach ($baseDirs as $baseDir) {
+            $new->addSearchDir($baseDir);
+          }
+        }
+        else {
+          // TIP: You might use $old->version to decide what to use.
+          foreach ($old->scanner->allRules as $rule) {
+            $new->scanner->addRule($rule);
+          }
+          $new->loadedPackages = $old->loadedPackages;
+          $new->availableNamespaces = $old->availableNamespaces;
+          foreach ($old->activatedPackages as $activatedPackage) {
+            $new->activatePackage($activatedPackage['name'], $activatedPackage['dir'], $activatedPackage['config']);
+          }
+        }
+        return new Versions($new);
+      }
+      public function register(): \PathLoadInterface {
+        spl_autoload_register([$this, 'loadClass']);
+        return $this;
+      }
+      public function unregister(): \PathLoadInterface {
+        spl_autoload_unregister([$this, 'loadClass']);
+        return $this;
+      }
+      public function reset(): \PathLoadInterface {
+        $this->scanner->reset();
+        return $this;
+      }
+      /**
+       * Append a directory (with many packages) to the search-path.
+       *
+       * @param string $baseDir
+       *   The path to a base directory (e.g. `/var/www/myapp/lib`) which contains many packages (e.g.
+       *   `foo@1.2.3.phar` or `bar@4.5.6/autoload.php`).
+       */
+      public function addSearchDir(string $baseDir): \PathLoadInterface {
+        $this->scanner->addRule(['package' => '*', 'glob' => "$baseDir/*@*"]);
+        return $this;
+      }
+      /**
+       * Append one specific item to the search list.
+       *
+       * @param string $name
+       *   Ex: 'cloud-file-io'
+       * @param string $version
+       *   Ex: '1.2.3'
+       * @param string $file
+       *   Full path to the file or folder.
+       * @param string|null $type
+       *   One of: 'php', 'phar', or 'dir'. NULL will auto-detect.
+       *
+       * @return \PathLoadInterface
+       */
+      public function addSearchItem(string $name, string $version, string $file, ?string $type = NULL): \PathLoadInterface {
+        $this->scanner->addRule(['package' => $name, 'version' => $version, 'file' => $file, 'type' => $type]);
+        return $this;
+      }
+      /**
+       * Add auto-loading hints. If someone requests a class in $namespace, then we load $package.
+       *
+       * Consecutive/identical calls to addNamespace() are de-duplicated.
+       *
+       * @param string $package
+       *   Ex: 'cloud-io@1'
+       * @param string|string[] $namespaces
+       *   Ex: 'Super\Cloud\IO\'
+       */
+      public function addNamespace(string $package, $namespaces): \PathLoadInterface {
+        foreach ((array) $namespaces as $namespace) {
+          $this->availableNamespaces[$namespace][$package] = $package;
+        }
+        return $this;
+      }
+      public function loadClass(string $class) {
+        if (strpos($class, '\\') !== FALSE) {
+          $this->loadPackagesByNamespace('\\', explode('\\', $class));
+        }
+        elseif (strpos($class, '_') !== FALSE) {
+          $this->loadPackagesByNamespace('_', explode('_', $class));
+        }
+        return $this->psr4->loadClass($class) || $this->psr0->loadClass($class);
+      }
+      /**
+       * If the application requests class "Foo\Bar\Whiz\Bang", then you should load
+       * any packages related to "Foo\*", "Foo\Bar\*", or "Foo\Bar\Whiz\*".
+       *
+       * @param string $delim
+       *   Ex: '\\' or '_'
+       * @param string[] $classParts
+       *   Ex: ['Symfony', 'Components', 'Filesystem', 'Filesystem']
+       */
+      private function loadPackagesByNamespace(string $delim, array $classParts): void {
+        array_pop($classParts);
+        do {
+          $foundPackages = FALSE;
+          $namespace = '';
+          foreach ($classParts as $nsPart) {
+            $namespace .= $nsPart . $delim;
+            if (isset($this->availableNamespaces[$namespace])) {
+              $packages = $this->availableNamespaces[$namespace];
+              foreach ($packages as $package) {
+                unset($this->availableNamespaces[$namespace][$package]);
+                if ($this->loadPackage($package)) {
+                  $foundPackages = TRUE;
+                }
+                else {
+                  trigger_error("PathLoad: Failed to locate package \"$package\" required for namespace \"$namespace\"", E_USER_WARNING);
+                  $this->availableNamespaces[$namespace][$package] = $package; /* Maybe some other time */
+                }
+              }
+            }
+          }
+        } while ($foundPackages);
+        // Loading a package could produce metadata about other packages. Assimilate those too.
+      }
+      /**
+       * Load the content of a package.
+       *
+       * @param string $majorName
+       *   Ex: 'cloud-io@1'
+       * @param bool $reload
+       * @return string|NULL
+       *   The version# of the loaded package. Otherwise, NULL
+       */
+      public function loadPackage(string $majorName, bool $reload = FALSE): ?string {
+        if (isset($this->loadedPackages[$majorName])) {
+          if ($reload && $this->loadedPackages[$majorName]->reloadable) {
+            $this->scanner->reset();
+          }
+          else {
+            if ($reload) {
+              trigger_error("PathLoad: Declined to reload \"$majorName\". Package is not reloadable.", E_USER_WARNING);
+            }
+            return $this->loadedPackages[$majorName]->version;
+          }
+        }
+        $this->scanAvailablePackages(explode('@', $majorName, 2)[0], $this->availablePackages);
+        if (!isset($this->availablePackages[$majorName])) {
+          return NULL;
+        }
+        $package = $this->loadedPackages[$majorName] = $this->availablePackages[$majorName];
+        unset($this->availablePackages[$majorName]);
+        switch ($package->type ?? NULL) {
+          case 'php':
+            doRequire($package->file);
+            return $package->version;
+          case 'phar':
+            doRequire($package->file);
+            $this->useMetadataFiles($package, 'phar://' . $package->file);
+            return $package->version;
+          case 'dir':
+            $this->useMetadataFiles($package, $package->file);
+            return $package->version;
+          default:
+            \error_log("PathLoad: Package (\"$majorName\") appears malformed.");
+            return NULL;
+        }
+      }
+      private function scanAvailablePackages(string $hint, array &$avail): void {
+        foreach ($this->scanner->scan($hint) as $package) {
+          /** @var Package $package */
+          if (!isset($avail[$package->majorName]) || \version_compare($package->version, $avail[$package->majorName]->version, '>')) {
+            $avail[$package->majorName] = $package;
+          }
+        }
+      }
+      /**
+       * When loading a package, execute metadata files like "pathload.main.php" or "pathload.json".
+       *
+       * @param Package $package
+       * @param string $dir
+       *   Ex: '/var/www/lib/cloud-io@1.2.0'
+       *   Ex: 'phar:///var/www/lib/cloud-io@1.2.0.phar'
+       */
+      private function useMetadataFiles(Package $package, string $dir): void {
+        $phpFile = "$dir/pathload.main.php";
+        $jsonFile = "$dir/pathload.json";
+        if (file_exists($phpFile)) {
+          require $phpFile;
+        }
+        elseif (file_exists($jsonFile)) {
+          $jsonData = json_decode(file_get_contents($jsonFile), TRUE);
+          $id = $package->name . '@' . $package->version;
+          $this->activatePackage($id, $dir, $jsonData);
+        }
+      }
+      /**
+       * Given a configuration for the package, activate the correspond autoloader rules.
+       *
+       * @param string $majorName
+       *   Ex: 'cloud-io@1'
+       * @param string|null $dir
+       *   Used for applying the 'autoload' rules.
+       *   Ex: '/var/www/lib/cloud-io@1.2.3'
+       * @param array $config
+       *   Ex: ['autoload' => ['psr4' => ...], 'require-namespace' => [...], 'require-package' => [...]]
+       * @return \PathLoadInterface
+       */
+      public function activatePackage(string $majorName, ?string $dir, array $config): \PathLoadInterface {
+        if (isset($config['reloadable'])) {
+          $this->loadedPackages[$majorName]->reloadable = $config['reloadable'];
+        }
+        if (!isset($config['autoload'])) {
+          return $this;
+        }
+        if ($dir === NULL) {
+          throw new \RuntimeException("Cannot activate package $majorName. The 'autoload' property requires a base-directory.");
+        }
+        $this->activatedPackages[] = ['name' => $majorName, 'dir' => $dir, 'config' => $config];
+        if (!empty($config['autoload']['include'])) {
+          foreach ($config['autoload']['include'] as $file) {
+            doRequire($dir . DIRECTORY_SEPARATOR . $file);
+          }
+        }
+        if (isset($config['autoload']['psr-0'])) {
+          $this->psr0->addAll($dir, $config['autoload']['psr-0']);
+        }
+        if (isset($config['autoload']['psr-4'])) {
+          $this->psr4->addAll($dir, $config['autoload']['psr-4']);
+        }
+        foreach ($config['require-namespace'] ?? [] as $nsRule) {
+          foreach ((array) $nsRule['package'] as $package) {
+            foreach ((array) $nsRule['prefix'] as $prefix) {
+              $this->availableNamespaces[$prefix][$package] = $package;
+            }
+          }
+        }
+        foreach ($config['require-package'] ?? [] as $package) {
+          $this->loadPackage($package);
+        }
+        return $this;
+      }
+    }
+  }
+}
+
+namespace {
+  // New or upgraded instance.
+  $GLOBALS['_PathLoad'] = \PathLoad\V0\PathLoad::create(0, $GLOBALS['_PathLoad']['top'] ?? NULL);
+  if (!function_exists('pathload')) {
+    /**
+     * Get a reference the PathLoad manager.
+     *
+     * @param int|string $version
+     * @return \PathLoadInterface
+     */
+    function pathload($version = 'top') {
+      return $GLOBALS['_PathLoad'][$version];
+    }
+  }
+  return pathload();
+}
diff --git a/www/modules/civicrm/mixin/lib/pathload.index.php b/www/modules/civicrm/mixin/lib/pathload.index.php
new file mode 100644
index 000000000..26b81a767
--- /dev/null
+++ b/www/modules/civicrm/mixin/lib/pathload.index.php
@@ -0,0 +1,15 @@
+<?php
+namespace Civi\PathLoadSetup;
+
+// Pathload folder would usually be registered by saying something like:
+//
+//   pathload()->addSearchDir(__DIR__ . '/lib');
+//
+// However, that would detect version#'s from the filenames. In this folder,
+// we want all subprojects to have the same version-number as the main
+// project. It would be quite inconvenient to rename them every month.
+//
+// So instead, we use `addSearchItem()` and register with explicit versions.
+
+$version = \CRM_Utils_System::version() . '.1'; /* Higher priority than contrib copies of same version... */
+\pathload()->addSearchItem('civimix-schema', $version, __DIR__ . '/civimix-schema');
diff --git a/www/modules/civicrm/mixin/setting-admin@1/mixin.php b/www/modules/civicrm/mixin/setting-admin@1/mixin.php
index 7cfd42999..d32088cac 100644
--- a/www/modules/civicrm/mixin/setting-admin@1/mixin.php
+++ b/www/modules/civicrm/mixin/setting-admin@1/mixin.php
@@ -23,7 +23,7 @@
  *   <civix><setting-page-title>My Custom Title</setting-page-title></civix>
  *
  * @mixinName setting-admin
- * @mixinVersion 1.1.0
+ * @mixinVersion 1.1.1
  * @since 5.68
  */
 
@@ -157,7 +157,10 @@ public static function walk(&$items, callable $callback) {
     $about = About::instance($mixInfo);
     $perm = 'administer ' . $mixInfo->shortName;
     if (!isset($permissions[$perm])) {
-      $permissions[$perm] = ts('%1: Administer settings', [1 => $about->getLabel()]);
+      $permissions[$perm] = [
+        'label' => ts('%1: Administer settings', [1 => $about->getLabel()]),
+        'description' => ts('Edit configuration settings for the %1 extension', [1 => $about->getLabel()]),
+      ];
     }
   }, -1000);
 
diff --git a/www/modules/civicrm/mixin/smarty-v2@1/mixin.php b/www/modules/civicrm/mixin/smarty-v2@1/mixin.php
index 5972dbdc5..f8718c8cc 100644
--- a/www/modules/civicrm/mixin/smarty-v2@1/mixin.php
+++ b/www/modules/civicrm/mixin/smarty-v2@1/mixin.php
@@ -4,9 +4,13 @@
  * Auto-register "templates/" folder.
  *
  * @mixinName smarty-v2
- * @mixinVersion 1.0.1
+ * @mixinVersion 1.0.3
  * @since 5.59
  *
+ * @deprecated - it turns out that the mixin is not version specific so the 'smarty'
+ * mixin is preferred over smarty-v2 (they are the same but not having the version
+ * in the name is less misleading.)
+ *
  * @param CRM_Extension_MixInfo $mixInfo
  *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.
  * @param \CRM_Extension_BootCache $bootCache
@@ -18,10 +22,22 @@
     return;
   }
 
-  $register = function() use ($dir) {
-    // This implementation has a theoretical edge-case bug on older versions of CiviCRM where a template could
-    // be registered more than once.
-    CRM_Core_Smarty::singleton()->addTemplateDir($dir);
+  $register = function($newDirs) {
+    $smarty = CRM_Core_Smarty::singleton();
+    $v2 = isset($smarty->_version) && version_compare($smarty->_version, 3, '<');
+    $templateDirs = (array) ($v2 ? $smarty->template_dir : $smarty->getTemplateDir());
+    $templateDirs = array_merge($newDirs, $templateDirs);
+    $templateDirs = array_unique(array_map(function($v) {
+      $v = str_replace(DIRECTORY_SEPARATOR, '/', $v);
+      $v = rtrim($v, '/') . '/';
+      return $v;
+    }, $templateDirs));
+    if ($v2) {
+      $smarty->template_dir = $templateDirs;
+    }
+    else {
+      $smarty->setTemplateDir($templateDirs);
+    }
   };
 
   // Let's figure out what environment we're in -- so that we know the best way to call $register().
@@ -29,7 +45,7 @@
   if (!empty($GLOBALS['_CIVIX_MIXIN_POLYFILL'])) {
     // Polyfill Loader (v<=5.45): We're already in the middle of firing `hook_config`.
     if ($mixInfo->isActive()) {
-      $register();
+      $register([$dir]);
     }
     return;
   }
@@ -37,14 +53,25 @@
   if (CRM_Extension_System::singleton()->getManager()->extensionIsBeingInstalledOrEnabled($mixInfo->longName)) {
     // New Install, Standard Loader: The extension has just been enabled, and we're now setting it up.
     // System has already booted. New templates may be needed for upcoming installation steps.
-    $register();
+    $register([$dir]);
     return;
   }
 
   // Typical Pageview, Standard Loader: Defer the actual registration for a moment -- to ensure that Smarty is online.
-  \Civi::dispatcher()->addListener('hook_civicrm_config', function() use ($mixInfo, $register) {
+  // We need to bundle-up all dirs -- Smarty 3/4/5 is inefficient with processing repeated calls to `getTemplateDir()`+`setTemplateDir()`
+  if (!isset(Civi::$statics[__FILE__]['event'])) {
+    Civi::$statics[__FILE__]['event'] = 'civi.smarty-v2.addPaths.' . md5(__FILE__);
+    Civi::dispatcher()->addListener('hook_civicrm_config', function() use ($register) {
+      $dirs = [];
+      $event = \Civi\Core\Event\GenericHookEvent::create(['dirs' => &$dirs]);
+      Civi::dispatcher()->dispatch(Civi::$statics[__FILE__]['event'], $event);
+      $register($dirs);
+    });
+  }
+
+  Civi::dispatcher()->addListener(Civi::$statics[__FILE__]['event'], function($event) use ($mixInfo, $dir) {
     if ($mixInfo->isActive()) {
-      $register();
+      array_unshift($event->dirs, $dir);
     }
   });
 
diff --git a/www/modules/civicrm/mixin/smarty@1/mixin.php b/www/modules/civicrm/mixin/smarty@1/mixin.php
new file mode 100644
index 000000000..f64019789
--- /dev/null
+++ b/www/modules/civicrm/mixin/smarty@1/mixin.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * Auto-register "templates/" folder.
+ *
+ * @mixinName smarty
+ * @mixinVersion 1.0.3
+ * @since 5.71
+ *
+ * @param CRM_Extension_MixInfo $mixInfo
+ *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.
+ * @param \CRM_Extension_BootCache $bootCache
+ *   On newer deployments, this will be an instance of MixInfo. On older deployments, Civix may polyfill with a work-a-like.
+ */
+return function ($mixInfo, $bootCache) {
+  $dir = $mixInfo->getPath('templates');
+  if (!file_exists($dir)) {
+    return;
+  }
+
+  $register = function($newDirs) {
+    $smarty = CRM_Core_Smarty::singleton();
+    $v2 = isset($smarty->_version) && version_compare($smarty->_version, 3, '<');
+    $templateDirs = (array) ($v2 ? $smarty->template_dir : $smarty->getTemplateDir());
+    $templateDirs = array_merge($newDirs, $templateDirs);
+    $templateDirs = array_unique(array_map(function($v) {
+      $v = str_replace(DIRECTORY_SEPARATOR, '/', $v);
+      $v = rtrim($v, '/') . '/';
+      return $v;
+    }, $templateDirs));
+    if ($v2) {
+      $smarty->template_dir = $templateDirs;
+    }
+    else {
+      $smarty->setTemplateDir($templateDirs);
+    }
+  };
+
+  // Let's figure out what environment we're in -- so that we know the best way to call $register().
+
+  if (!empty($GLOBALS['_CIVIX_MIXIN_POLYFILL'])) {
+    // Polyfill Loader (v<=5.45): We're already in the middle of firing `hook_config`.
+    if ($mixInfo->isActive()) {
+      $register([$dir]);
+    }
+    return;
+  }
+
+  if (CRM_Extension_System::singleton()->getManager()->extensionIsBeingInstalledOrEnabled($mixInfo->longName)) {
+    // New Install, Standard Loader: The extension has just been enabled, and we're now setting it up.
+    // System has already booted. New templates may be needed for upcoming installation steps.
+    $register([$dir]);
+    return;
+  }
+
+  // Typical Pageview, Standard Loader: Defer the actual registration for a moment -- to ensure that Smarty is online.
+  // We need to bundle-up all dirs -- Smarty 3/4/5 is inefficient with processing repeated calls to `getTemplateDir()`+`setTemplateDir()`
+  if (!isset(Civi::$statics[__FILE__]['event'])) {
+    Civi::$statics[__FILE__]['event'] = 'civi.smarty.addPaths.' . md5(__FILE__);
+    Civi::dispatcher()->addListener('hook_civicrm_config', function() use ($register) {
+      $dirs = [];
+      $event = \Civi\Core\Event\GenericHookEvent::create(['dirs' => &$dirs]);
+      Civi::dispatcher()->dispatch(Civi::$statics[__FILE__]['event'], $event);
+      $register($dirs);
+    });
+  }
+
+  Civi::dispatcher()->addListener(Civi::$statics[__FILE__]['event'], function($event) use ($mixInfo, $dir) {
+    if ($mixInfo->isActive()) {
+      array_unshift($event->dirs, $dir);
+    }
+  });
+
+};
diff --git a/www/modules/civicrm/packages/Smarty/Smarty.class.php b/www/modules/civicrm/packages/Smarty/Smarty.class.php
index 716f55134..c5cd9e2e7 100644
--- a/www/modules/civicrm/packages/Smarty/Smarty.class.php
+++ b/www/modules/civicrm/packages/Smarty/Smarty.class.php
@@ -672,6 +672,9 @@ function append_by_ref($tpl_var, &$value, $merge=false)
         }
     }
 
+    public function clearAssign($tpl_var) {
+      $this->clear_assign($tpl_var);
+    }
 
     /**
      * clear the given assigned template variable.
@@ -1068,6 +1071,118 @@ function &get_template_vars($name=null)
         }
     }
 
+  /**
+   * Returns a single or all template variables
+   *
+   * @api  Smarty::getTemplateVars()
+   * @link http://www.smarty.net/docs/en/api.get.template.vars.tpl
+   *
+   * @param string $varName variable name or NULL
+   * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr optional pointer to data object
+   * @param bool $searchParents include parent templates?
+   *
+   * @return mixed variable value or or array of variables
+   */
+  public function getTemplateVars($varName = NULL, Smarty_Internal_Data $_ptr = NULL, $searchParents = TRUE) {
+    return $this->get_template_vars($varName);
+  }
+
+  /**
+   * Check if a template resource exists
+   *
+   * @param string $resource_name template name
+   *
+   * @return bool status
+   * @throws \SmartyException
+   */
+  public function templateExists($resource_name) {
+    return $this->template_exists($resource_name);
+  }
+
+  /**
+   * Set template directory
+   *
+   * @param string|array $template_dir directory(s) of template sources
+   * @param bool $isConfig true for config_dir
+   *
+   * @return \Smarty current Smarty instance for chaining
+   */
+  public function setTemplateDir($template_dir) {
+    $this->template_dir = (array) $template_dir;
+    return $this;
+  }
+
+  /**
+   * Add template directory(s).
+   *
+   * @param string|array $template_dir directory(s) of template sources
+   * @param string $key (Smarty3+) of the array element to assign the template dir to
+   * @param bool $isConfig (Smarty3+) true for config_dir
+   *
+   * @return Smarty          current Smarty instance for chaining
+   */
+  public function addTemplateDir($template_dir, $key = NULL, $isConfig = FALSE) {
+    if (is_array($this->template_dir)) {
+      if (!in_array($template_dir, $this->template_dir)) {
+        array_unshift($this->template_dir, $template_dir);
+      }
+    }
+    else {
+      $this->template_dir = [$template_dir, $this->template_dir];
+    }
+    return $this;
+  }
+
+  public function loadFilter($type, $name) {
+    $this->load_filter($type, $name);
+  }
+
+  public function getPluginsDir() {
+    return (array) $this->plugins_dir;
+  }
+
+  public function clearAllCache() {
+    $this->clear_all_cache();
+  }
+
+  public function setPluginsDir(array $directory) {
+    $this->plugins_dir = $directory;
+  }
+
+  public function setCompileDir($compileDirectory) {
+    $this->compile_dir = $compileDirectory;
+  }
+
+  public function registerPlugin($type, $name, $callback, $cacheable = TRUE, $cache_attr = NULL) {
+    if ($type === 'modifier') {
+      $this->register_modifier($name, $callback);
+    }
+    if ($type === 'block') {
+      $this->register_block('localize', 'smarty_block_localize');
+    }
+  }
+
+  /**
+   * Get template directories
+   *
+   * @param mixed $index    index of directory to get, null to get all
+   * @param bool  $isConfig true for config_dir
+   *
+   * @return array|string list of template directories, or directory of $index
+   */
+  public function getTemplateDir($index = null, $isConfig = false)
+  {
+    if ($isConfig) {
+      $dir = &$this->config_dir;
+    } else {
+      $dir = &$this->template_dir;
+    }
+    if ($index !== null) {
+      return isset($dir[ $index ]) ? $dir[ $index ] : null;
+    }
+    return $dir;
+  }
+
     /**
      * Returns an array containing config variables
      *
@@ -1126,9 +1241,10 @@ function display($resource_name, $cache_id = null, $compile_id = null)
      */
     function fetch($resource_name, $cache_id = null, $compile_id = null, $display = false)
     {
-      if (preg_match('/^(\s+)?string:/', $resource_name)) {
-        $old_security = $this->security;
-        $this->security = TRUE;
+      // Do we need this forked? Seems like recipe for confusion.
+      $useSecurityPolicy = preg_match('/^(\s+)?string:/', $resource_name) && empty($smarty->security);
+      if ($useSecurityPolicy) {
+        Civi::service('civi.smarty.userContent')->enable();
       }
       try {
         static $_cache_info = [];
@@ -1242,8 +1358,8 @@ function fetch($resource_name, $cache_id = null, $compile_id = null, $display =
               error_reporting($_smarty_old_error_level);
               // restore initial cache_info
               $this->_cache_info = array_pop($_cache_info);
-              if (isset($old_security)) {
-                $this->security = $old_security;
+              if ($useSecurityPolicy) {
+                Civi::service('civi.smarty.userContent')->disable();
               }
               return TRUE;
             }
@@ -1336,24 +1452,24 @@ function fetch($resource_name, $cache_id = null, $compile_id = null, $display =
             echo smarty_core_display_debug_console($_params, $this);
           }
           error_reporting($_smarty_old_error_level);
-          if (isset($old_security)) {
-            $this->security = $old_security;
+          if ($useSecurityPolicy) {
+            Civi::service('civi.smarty.userContent')->disable();
           }
           return;
         }
         else {
           error_reporting($_smarty_old_error_level);
           if (isset($_smarty_results)) {
-            if (isset($old_security)) {
-              $this->security = $old_security;
+            if ($useSecurityPolicy) {
+              Civi::service('civi.smarty.userContent')->disable();
             }
             return $_smarty_results;
           }
         }
       }
       finally {
-        if (isset($old_security)) {
-          $this->security = $old_security;
+        if ($useSecurityPolicy) {
+          Civi::service('civi.smarty.userContent')->disable();
         }
       }
     }
@@ -2036,6 +2152,19 @@ function _get_filter_name($function)
 		}
 	}
 
+  /**
+   * Adds directory of plugin files
+   *
+   * @param null|array|string $plugins_dir
+   *
+   * @return Smarty current Smarty instance for chaining
+   */
+  public function addPluginsDir($plugins_dir)
+  {
+    $this->plugins_dir = array_merge($this->plugins_dir, (array) $plugins_dir);
+    return $this;
+  }
+
     /**#@-*/
 
 }
diff --git a/www/modules/civicrm/packages/kcfinder/integration/civicrm.php b/www/modules/civicrm/packages/kcfinder/integration/civicrm.php
index b511535fe..cb3ceeed6 100644
--- a/www/modules/civicrm/packages/kcfinder/integration/civicrm.php
+++ b/www/modules/civicrm/packages/kcfinder/integration/civicrm.php
@@ -200,10 +200,25 @@ function authenticate_joomla($config) {
   require_once ( JPATH_BASE .DS.'includes'.DS.'defines.php' );
   require_once ( JPATH_BASE .DS.'includes'.DS.'framework.php' );
 
-  $mainframe = JFactory::getApplication('administrator');
-  $mainframe->initialise();
+  if (version_compare(JVERSION, '4.0.0', 'lt')) {
+    $mainframe = JFactory::getApplication('administrator');
+    $mainframe->initialise();
+    
+    $user_id = JFactory::getUser()->id;
+  } else {
+    // Boot the DI container.
+    $container = \Joomla\CMS\Factory::getContainer();
+
+    // Alias the session service key to the web session service.
+    $container->alias(\Joomla\Session\SessionInterface::class, 'session.web.site');
+
+    // Get the application.
+    $app = $container->get(\Joomla\CMS\Application\AdministratorApplication::class);
+    
+    $user_id = Joomla\CMS\Factory::getUser()->id;
+  }
 
-  if (JFactory::getUser()->id == 0) {
+  if ($user_id == 0) {
     return false;
   }
   return true;
diff --git a/www/modules/civicrm/packages/smarty4/composer.json b/www/modules/civicrm/packages/smarty4/composer.json
new file mode 100644
index 000000000..06f451209
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "smarty/smarty": "^4"
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/composer.lock b/www/modules/civicrm/packages/smarty4/composer.lock
new file mode 100644
index 000000000..5e36bec8c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/composer.lock
@@ -0,0 +1,85 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "0fc0610848e8899f5fe6b0f942a4166c",
+    "packages": [
+        {
+            "name": "smarty/smarty",
+            "version": "v4.5.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/smarty-php/smarty.git",
+                "reference": "9fc96a13dbaf546c3d7bcf95466726578cd4e0fa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/9fc96a13dbaf546c3d7bcf95466726578cd4e0fa",
+                "reference": "9fc96a13dbaf546c3d7bcf95466726578cd4e0fa",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5 || ^7.5",
+                "smarty/smarty-lexer": "^3.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "libs/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Monte Ohrt",
+                    "email": "monte@ohrt.com"
+                },
+                {
+                    "name": "Uwe Tews",
+                    "email": "uwe.tews@googlemail.com"
+                },
+                {
+                    "name": "Rodney Rehm",
+                    "email": "rodney.rehm@medialize.de"
+                },
+                {
+                    "name": "Simon Wisselink",
+                    "homepage": "https://www.iwink.nl/"
+                }
+            ],
+            "description": "Smarty - the compiling PHP template engine",
+            "homepage": "https://smarty-php.github.io/smarty/",
+            "keywords": [
+                "templating"
+            ],
+            "support": {
+                "forum": "https://github.com/smarty-php/smarty/discussions",
+                "issues": "https://github.com/smarty-php/smarty/issues",
+                "source": "https://github.com/smarty-php/smarty/tree/v4.5.3"
+            },
+            "time": "2024-05-28T21:46:01+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": [],
+    "plugin-api-version": "2.3.0"
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/autoload.php b/www/modules/civicrm/packages/smarty4/vendor/autoload.php
new file mode 100644
index 000000000..7e3b68ad6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/autoload.php
@@ -0,0 +1,12 @@
+<?php
+
+// autoload.php @generated by Composer
+
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInit363d3bd17dd36f25504ff707e7affe62::getLoader();
diff --git a/www/modules/civicrm/packages/smarty4/vendor/composer/ClassLoader.php b/www/modules/civicrm/packages/smarty4/vendor/composer/ClassLoader.php
new file mode 100644
index 000000000..afef3fa2a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/composer/ClassLoader.php
@@ -0,0 +1,572 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
+ *
+ *     $loader = new \Composer\Autoload\ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (eg. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
+ */
+class ClassLoader
+{
+    /** @var ?string */
+    private $vendorDir;
+
+    // PSR-4
+    /**
+     * @var array[]
+     * @psalm-var array<string, array<string, int>>
+     */
+    private $prefixLengthsPsr4 = array();
+    /**
+     * @var array[]
+     * @psalm-var array<string, array<int, string>>
+     */
+    private $prefixDirsPsr4 = array();
+    /**
+     * @var array[]
+     * @psalm-var array<string, string>
+     */
+    private $fallbackDirsPsr4 = array();
+
+    // PSR-0
+    /**
+     * @var array[]
+     * @psalm-var array<string, array<string, string[]>>
+     */
+    private $prefixesPsr0 = array();
+    /**
+     * @var array[]
+     * @psalm-var array<string, string>
+     */
+    private $fallbackDirsPsr0 = array();
+
+    /** @var bool */
+    private $useIncludePath = false;
+
+    /**
+     * @var string[]
+     * @psalm-var array<string, string>
+     */
+    private $classMap = array();
+
+    /** @var bool */
+    private $classMapAuthoritative = false;
+
+    /**
+     * @var bool[]
+     * @psalm-var array<string, bool>
+     */
+    private $missingClasses = array();
+
+    /** @var ?string */
+    private $apcuPrefix;
+
+    /**
+     * @var self[]
+     */
+    private static $registeredLoaders = array();
+
+    /**
+     * @param ?string $vendorDir
+     */
+    public function __construct($vendorDir = null)
+    {
+        $this->vendorDir = $vendorDir;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getPrefixes()
+    {
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
+        }
+
+        return array();
+    }
+
+    /**
+     * @return array[]
+     * @psalm-return array<string, array<int, string>>
+     */
+    public function getPrefixesPsr4()
+    {
+        return $this->prefixDirsPsr4;
+    }
+
+    /**
+     * @return array[]
+     * @psalm-return array<string, string>
+     */
+    public function getFallbackDirs()
+    {
+        return $this->fallbackDirsPsr0;
+    }
+
+    /**
+     * @return array[]
+     * @psalm-return array<string, string>
+     */
+    public function getFallbackDirsPsr4()
+    {
+        return $this->fallbackDirsPsr4;
+    }
+
+    /**
+     * @return string[] Array of classname => path
+     * @psalm-return array<string, string>
+     */
+    public function getClassMap()
+    {
+        return $this->classMap;
+    }
+
+    /**
+     * @param string[] $classMap Class to filename map
+     * @psalm-param array<string, string> $classMap
+     *
+     * @return void
+     */
+    public function addClassMap(array $classMap)
+    {
+        if ($this->classMap) {
+            $this->classMap = array_merge($this->classMap, $classMap);
+        } else {
+            $this->classMap = $classMap;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix, either
+     * appending or prepending to the ones previously set for this prefix.
+     *
+     * @param string          $prefix  The prefix
+     * @param string[]|string $paths   The PSR-0 root directories
+     * @param bool            $prepend Whether to prepend the directories
+     *
+     * @return void
+     */
+    public function add($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            if ($prepend) {
+                $this->fallbackDirsPsr0 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr0
+                );
+            } else {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $this->fallbackDirsPsr0,
+                    (array) $paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+            return;
+        }
+        if ($prepend) {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixesPsr0[$first][$prefix]
+            );
+        } else {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $this->prefixesPsr0[$first][$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace, either
+     * appending or prepending to the ones previously set for this namespace.
+     *
+     * @param string          $prefix  The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths   The PSR-4 base directories
+     * @param bool            $prepend Whether to prepend the directories
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return void
+     */
+    public function addPsr4($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                $this->fallbackDirsPsr4 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr4
+                );
+            } else {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $this->fallbackDirsPsr4,
+                    (array) $paths
+                );
+            }
+        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $this->prefixDirsPsr4[$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix,
+     * replacing any others previously set for this prefix.
+     *
+     * @param string          $prefix The prefix
+     * @param string[]|string $paths  The PSR-0 base directories
+     *
+     * @return void
+     */
+    public function set($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr0 = (array) $paths;
+        } else {
+            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace,
+     * replacing any others previously set for this namespace.
+     *
+     * @param string          $prefix The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths  The PSR-4 base directories
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return void
+     */
+    public function setPsr4($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr4 = (array) $paths;
+        } else {
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Turns on searching the include path for class files.
+     *
+     * @param bool $useIncludePath
+     *
+     * @return void
+     */
+    public function setUseIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return bool
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     *
+     * @return void
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     *
+     * @return void
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not
+     *
+     * @return void
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            return;
+        }
+
+        if ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+            self::$registeredLoaders[$this->vendorDir] = $this;
+        }
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     *
+     * @return void
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+        }
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param  string    $class The name of the class
+     * @return true|null True if loaded, null otherwise
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            includeFile($file);
+
+            return true;
+        }
+
+        return null;
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|false The path if found, false otherwise
+     */
+    public function findFile($class)
+    {
+        // class map lookup
+        if (isset($this->classMap[$class])) {
+            return $this->classMap[$class];
+        }
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+            return false;
+        }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
+
+        $file = $this->findFileWithExtension($class, '.php');
+
+        // Search for Hack files if we are running on HHVM
+        if (false === $file && defined('HHVM_VERSION')) {
+            $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
+        if (false === $file) {
+            // Remember that this class does not exist.
+            $this->missingClasses[$class] = true;
+        }
+
+        return $file;
+    }
+
+    /**
+     * Returns the currently registered loaders indexed by their corresponding vendor directories.
+     *
+     * @return self[]
+     */
+    public static function getRegisteredLoaders()
+    {
+        return self::$registeredLoaders;
+    }
+
+    /**
+     * @param  string       $class
+     * @param  string       $ext
+     * @return string|false
+     */
+    private function findFileWithExtension($class, $ext)
+    {
+        // PSR-4 lookup
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+        $first = $class[0];
+        if (isset($this->prefixLengthsPsr4[$first])) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath . '\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        if (file_exists($file = $dir . $pathEnd)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-4 fallback dirs
+        foreach ($this->fallbackDirsPsr4 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 lookup
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+        } else {
+            // PEAR-like class name
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+        }
+
+        if (isset($this->prefixesPsr0[$first])) {
+            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($dirs as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-0 fallback dirs
+        foreach ($this->fallbackDirsPsr0 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 include paths.
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+            return $file;
+        }
+
+        return false;
+    }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ *
+ * @param  string $file
+ * @return void
+ * @private
+ */
+function includeFile($file)
+{
+    include $file;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/composer/InstalledVersions.php b/www/modules/civicrm/packages/smarty4/vendor/composer/InstalledVersions.php
new file mode 100644
index 000000000..c6b54af7b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/composer/InstalledVersions.php
@@ -0,0 +1,352 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer;
+
+use Composer\Autoload\ClassLoader;
+use Composer\Semver\VersionParser;
+
+/**
+ * This class is copied in every Composer installed project and available to all
+ *
+ * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
+ *
+ * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
+ */
+class InstalledVersions
+{
+    /**
+     * @var mixed[]|null
+     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
+     */
+    private static $installed;
+
+    /**
+     * @var bool|null
+     */
+    private static $canGetVendors;
+
+    /**
+     * @var array[]
+     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    private static $installedByVendor = array();
+
+    /**
+     * Returns a list of all package names which are present, either by being installed, replaced or provided
+     *
+     * @return string[]
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackages()
+    {
+        $packages = array();
+        foreach (self::getInstalled() as $installed) {
+            $packages[] = array_keys($installed['versions']);
+        }
+
+        if (1 === \count($packages)) {
+            return $packages[0];
+        }
+
+        return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
+    }
+
+    /**
+     * Returns a list of all package names with a specific type e.g. 'library'
+     *
+     * @param  string   $type
+     * @return string[]
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackagesByType($type)
+    {
+        $packagesByType = array();
+
+        foreach (self::getInstalled() as $installed) {
+            foreach ($installed['versions'] as $name => $package) {
+                if (isset($package['type']) && $package['type'] === $type) {
+                    $packagesByType[] = $name;
+                }
+            }
+        }
+
+        return $packagesByType;
+    }
+
+    /**
+     * Checks whether the given package is installed
+     *
+     * This also returns true if the package name is provided or replaced by another package
+     *
+     * @param  string $packageName
+     * @param  bool   $includeDevRequirements
+     * @return bool
+     */
+    public static function isInstalled($packageName, $includeDevRequirements = true)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (isset($installed['versions'][$packageName])) {
+                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks whether the given package satisfies a version constraint
+     *
+     * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
+     *
+     *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
+     *
+     * @param  VersionParser $parser      Install composer/semver to have access to this class and functionality
+     * @param  string        $packageName
+     * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
+     * @return bool
+     */
+    public static function satisfies(VersionParser $parser, $packageName, $constraint)
+    {
+        $constraint = $parser->parseConstraints($constraint);
+        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
+
+        return $provided->matches($constraint);
+    }
+
+    /**
+     * Returns a version constraint representing all the range(s) which are installed for a given package
+     *
+     * It is easier to use this via isInstalled() with the $constraint argument if you need to check
+     * whether a given version of a package is installed, and not just whether it exists
+     *
+     * @param  string $packageName
+     * @return string Version constraint usable with composer/semver
+     */
+    public static function getVersionRanges($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            $ranges = array();
+            if (isset($installed['versions'][$packageName]['pretty_version'])) {
+                $ranges[] = $installed['versions'][$packageName]['pretty_version'];
+            }
+            if (array_key_exists('aliases', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
+            }
+            if (array_key_exists('replaced', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
+            }
+            if (array_key_exists('provided', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
+            }
+
+            return implode(' || ', $ranges);
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getPrettyVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['pretty_version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['pretty_version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
+     */
+    public static function getReference($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['reference'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['reference'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
+     */
+    public static function getInstallPath($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @return array
+     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
+     */
+    public static function getRootPackage()
+    {
+        $installed = self::getInstalled();
+
+        return $installed[0]['root'];
+    }
+
+    /**
+     * Returns the raw installed.php data for custom implementations
+     *
+     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
+     * @return array[]
+     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
+     */
+    public static function getRawData()
+    {
+        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                self::$installed = include __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
+        }
+
+        return self::$installed;
+    }
+
+    /**
+     * Returns the raw data of all installed.php which are currently loaded for custom implementations
+     *
+     * @return array[]
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    public static function getAllRawData()
+    {
+        return self::getInstalled();
+    }
+
+    /**
+     * Lets you reload the static array from another file
+     *
+     * This is only useful for complex integrations in which a project needs to use
+     * this class but then also needs to execute another project's autoloader in process,
+     * and wants to ensure both projects have access to their version of installed.php.
+     *
+     * A typical case would be PHPUnit, where it would need to make sure it reads all
+     * the data it needs from this class, then call reload() with
+     * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
+     * the project in which it runs can then also use this class safely, without
+     * interference between PHPUnit's dependencies and the project's dependencies.
+     *
+     * @param  array[] $data A vendor/composer/installed.php data set
+     * @return void
+     *
+     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
+     */
+    public static function reload($data)
+    {
+        self::$installed = $data;
+        self::$installedByVendor = array();
+    }
+
+    /**
+     * @return array[]
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    private static function getInstalled()
+    {
+        if (null === self::$canGetVendors) {
+            self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
+        }
+
+        $installed = array();
+
+        if (self::$canGetVendors) {
+            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                if (isset(self::$installedByVendor[$vendorDir])) {
+                    $installed[] = self::$installedByVendor[$vendorDir];
+                } elseif (is_file($vendorDir.'/composer/installed.php')) {
+                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
+                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $installed[count($installed) - 1];
+                    }
+                }
+            }
+        }
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                self::$installed = require __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
+        }
+        $installed[] = self::$installed;
+
+        return $installed;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/composer/LICENSE b/www/modules/civicrm/packages/smarty4/vendor/composer/LICENSE
new file mode 100644
index 000000000..f27399a04
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/composer/LICENSE
@@ -0,0 +1,21 @@
+
+Copyright (c) Nils Adermann, Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/www/modules/civicrm/packages/smarty4/vendor/composer/autoload_classmap.php b/www/modules/civicrm/packages/smarty4/vendor/composer/autoload_classmap.php
new file mode 100644
index 000000000..841a528ef
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/composer/autoload_classmap.php
@@ -0,0 +1,179 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
+    'Smarty' => $vendorDir . '/smarty/smarty/libs/Smarty.class.php',
+    'SmartyCompilerException' => $vendorDir . '/smarty/smarty/libs/sysplugins/smartycompilerexception.php',
+    'SmartyException' => $vendorDir . '/smarty/smarty/libs/sysplugins/smartyexception.php',
+    'Smarty_Autoloader' => $vendorDir . '/smarty/smarty/libs/Autoloader.php',
+    'Smarty_CacheResource' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_cacheresource.php',
+    'Smarty_CacheResource_Custom' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_cacheresource_custom.php',
+    'Smarty_CacheResource_KeyValueStore' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php',
+    'Smarty_Data' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_data.php',
+    'Smarty_Internal_Block' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_block.php',
+    'Smarty_Internal_CacheResource_File' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php',
+    'Smarty_Internal_CompileBase' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compilebase.php',
+    'Smarty_Internal_Compile_Append' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_append.php',
+    'Smarty_Internal_Compile_Assign' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_assign.php',
+    'Smarty_Internal_Compile_Block' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_block.php',
+    'Smarty_Internal_Compile_Block_Child' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_child.php',
+    'Smarty_Internal_Compile_Block_Parent' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_parent.php',
+    'Smarty_Internal_Compile_Blockclose' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_block.php',
+    'Smarty_Internal_Compile_Break' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_break.php',
+    'Smarty_Internal_Compile_Call' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_call.php',
+    'Smarty_Internal_Compile_Capture' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_capture.php',
+    'Smarty_Internal_Compile_CaptureClose' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_capture.php',
+    'Smarty_Internal_Compile_Child' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_child.php',
+    'Smarty_Internal_Compile_Config_Load' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_config_load.php',
+    'Smarty_Internal_Compile_Continue' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_continue.php',
+    'Smarty_Internal_Compile_Debug' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_debug.php',
+    'Smarty_Internal_Compile_Else' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_if.php',
+    'Smarty_Internal_Compile_Elseif' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_if.php',
+    'Smarty_Internal_Compile_Eval' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_eval.php',
+    'Smarty_Internal_Compile_Extends' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_extends.php',
+    'Smarty_Internal_Compile_For' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_for.php',
+    'Smarty_Internal_Compile_Forclose' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_for.php',
+    'Smarty_Internal_Compile_Foreach' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_foreach.php',
+    'Smarty_Internal_Compile_Foreachclose' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_foreach.php',
+    'Smarty_Internal_Compile_Foreachelse' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_foreach.php',
+    'Smarty_Internal_Compile_Forelse' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_for.php',
+    'Smarty_Internal_Compile_Function' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php',
+    'Smarty_Internal_Compile_Functionclose' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php',
+    'Smarty_Internal_Compile_If' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_if.php',
+    'Smarty_Internal_Compile_Ifclose' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_if.php',
+    'Smarty_Internal_Compile_Include' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_include.php',
+    'Smarty_Internal_Compile_Insert' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_insert.php',
+    'Smarty_Internal_Compile_Ldelim' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php',
+    'Smarty_Internal_Compile_Make_Nocache' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_make_nocache.php',
+    'Smarty_Internal_Compile_Nocache' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_nocache.php',
+    'Smarty_Internal_Compile_Nocacheclose' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_nocache.php',
+    'Smarty_Internal_Compile_Parent' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_parent.php',
+    'Smarty_Internal_Compile_Private_Block_Plugin' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php',
+    'Smarty_Internal_Compile_Private_ForeachSection' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php',
+    'Smarty_Internal_Compile_Private_Function_Plugin' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php',
+    'Smarty_Internal_Compile_Private_Modifier' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php',
+    'Smarty_Internal_Compile_Private_Object_Block_Function' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php',
+    'Smarty_Internal_Compile_Private_Object_Function' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php',
+    'Smarty_Internal_Compile_Private_Print_Expression' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php',
+    'Smarty_Internal_Compile_Private_Registered_Block' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php',
+    'Smarty_Internal_Compile_Private_Registered_Function' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php',
+    'Smarty_Internal_Compile_Private_Special_Variable' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php',
+    'Smarty_Internal_Compile_Rdelim' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php',
+    'Smarty_Internal_Compile_Section' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_section.php',
+    'Smarty_Internal_Compile_Sectionclose' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_section.php',
+    'Smarty_Internal_Compile_Sectionelse' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_section.php',
+    'Smarty_Internal_Compile_Setfilter' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php',
+    'Smarty_Internal_Compile_Setfilterclose' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php',
+    'Smarty_Internal_Compile_Shared_Inheritance' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php',
+    'Smarty_Internal_Compile_While' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_while.php',
+    'Smarty_Internal_Compile_Whileclose' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_while.php',
+    'Smarty_Internal_Config_File_Compiler' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php',
+    'Smarty_Internal_Configfilelexer' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_configfilelexer.php',
+    'Smarty_Internal_Configfileparser' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php',
+    'Smarty_Internal_Data' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_data.php',
+    'Smarty_Internal_Debug' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_debug.php',
+    'Smarty_Internal_ErrorHandler' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_errorhandler.php',
+    'Smarty_Internal_Extension_Handler' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_extension_handler.php',
+    'Smarty_Internal_Method_AddAutoloadFilters' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php',
+    'Smarty_Internal_Method_AddDefaultModifiers' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php',
+    'Smarty_Internal_Method_Append' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_append.php',
+    'Smarty_Internal_Method_AppendByRef' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php',
+    'Smarty_Internal_Method_AssignByRef' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php',
+    'Smarty_Internal_Method_AssignGlobal' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php',
+    'Smarty_Internal_Method_ClearAllAssign' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_clearallassign.php',
+    'Smarty_Internal_Method_ClearAllCache' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php',
+    'Smarty_Internal_Method_ClearAssign' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_clearassign.php',
+    'Smarty_Internal_Method_ClearCache' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcache.php',
+    'Smarty_Internal_Method_ClearCompiledTemplate' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php',
+    'Smarty_Internal_Method_ClearConfig' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_clearconfig.php',
+    'Smarty_Internal_Method_CompileAllConfig' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php',
+    'Smarty_Internal_Method_CompileAllTemplates' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php',
+    'Smarty_Internal_Method_ConfigLoad' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_configload.php',
+    'Smarty_Internal_Method_CreateData' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_createdata.php',
+    'Smarty_Internal_Method_GetAutoloadFilters' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php',
+    'Smarty_Internal_Method_GetConfigVariable' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getconfigvariable.php',
+    'Smarty_Internal_Method_GetConfigVars' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php',
+    'Smarty_Internal_Method_GetDebugTemplate' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php',
+    'Smarty_Internal_Method_GetDefaultModifiers' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php',
+    'Smarty_Internal_Method_GetGlobal' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getglobal.php',
+    'Smarty_Internal_Method_GetRegisteredObject' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php',
+    'Smarty_Internal_Method_GetStreamVariable' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php',
+    'Smarty_Internal_Method_GetTags' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_gettags.php',
+    'Smarty_Internal_Method_GetTemplateVars' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php',
+    'Smarty_Internal_Method_Literals' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_literals.php',
+    'Smarty_Internal_Method_LoadFilter' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php',
+    'Smarty_Internal_Method_LoadPlugin' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php',
+    'Smarty_Internal_Method_MustCompile' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php',
+    'Smarty_Internal_Method_RegisterCacheResource' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php',
+    'Smarty_Internal_Method_RegisterClass' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerclass.php',
+    'Smarty_Internal_Method_RegisterDefaultConfigHandler' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php',
+    'Smarty_Internal_Method_RegisterDefaultPluginHandler' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php',
+    'Smarty_Internal_Method_RegisterDefaultTemplateHandler' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php',
+    'Smarty_Internal_Method_RegisterFilter' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php',
+    'Smarty_Internal_Method_RegisterObject' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerobject.php',
+    'Smarty_Internal_Method_RegisterPlugin' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php',
+    'Smarty_Internal_Method_RegisterResource' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerresource.php',
+    'Smarty_Internal_Method_SetAutoloadFilters' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php',
+    'Smarty_Internal_Method_SetDebugTemplate' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php',
+    'Smarty_Internal_Method_SetDefaultModifiers' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php',
+    'Smarty_Internal_Method_UnloadFilter' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php',
+    'Smarty_Internal_Method_UnregisterCacheResource' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php',
+    'Smarty_Internal_Method_UnregisterFilter' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php',
+    'Smarty_Internal_Method_UnregisterObject' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php',
+    'Smarty_Internal_Method_UnregisterPlugin' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php',
+    'Smarty_Internal_Method_UnregisterResource' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php',
+    'Smarty_Internal_Nocache_Insert' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_nocache_insert.php',
+    'Smarty_Internal_ParseTree' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_parsetree.php',
+    'Smarty_Internal_ParseTree_Code' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_code.php',
+    'Smarty_Internal_ParseTree_Dq' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php',
+    'Smarty_Internal_ParseTree_DqContent' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php',
+    'Smarty_Internal_ParseTree_Tag' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php',
+    'Smarty_Internal_ParseTree_Template' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_template.php',
+    'Smarty_Internal_ParseTree_Text' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_text.php',
+    'Smarty_Internal_Resource_Eval' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_resource_eval.php',
+    'Smarty_Internal_Resource_Extends' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_resource_extends.php',
+    'Smarty_Internal_Resource_File' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_resource_file.php',
+    'Smarty_Internal_Resource_Php' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_resource_php.php',
+    'Smarty_Internal_Resource_Stream' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_resource_stream.php',
+    'Smarty_Internal_Resource_String' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_resource_string.php',
+    'Smarty_Internal_Runtime_CacheModify' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php',
+    'Smarty_Internal_Runtime_CacheResourceFile' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cacheresourcefile.php',
+    'Smarty_Internal_Runtime_Capture' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_capture.php',
+    'Smarty_Internal_Runtime_CodeFrame' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php',
+    'Smarty_Internal_Runtime_FilterHandler' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php',
+    'Smarty_Internal_Runtime_Foreach' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php',
+    'Smarty_Internal_Runtime_GetIncludePath' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php',
+    'Smarty_Internal_Runtime_Inheritance' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php',
+    'Smarty_Internal_Runtime_Make_Nocache' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_make_nocache.php',
+    'Smarty_Internal_Runtime_TplFunction' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php',
+    'Smarty_Internal_Runtime_UpdateCache' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php',
+    'Smarty_Internal_Runtime_UpdateScope' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php',
+    'Smarty_Internal_Runtime_WriteFile' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php',
+    'Smarty_Internal_SmartyTemplateCompiler' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php',
+    'Smarty_Internal_Template' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_template.php',
+    'Smarty_Internal_TemplateBase' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_templatebase.php',
+    'Smarty_Internal_TemplateCompilerBase' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php',
+    'Smarty_Internal_Templatelexer' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_templatelexer.php',
+    'Smarty_Internal_Templateparser' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php',
+    'Smarty_Internal_TestInstall' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_testinstall.php',
+    'Smarty_Internal_Undefined' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_undefined.php',
+    'Smarty_Resource' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_resource.php',
+    'Smarty_Resource_Custom' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_resource_custom.php',
+    'Smarty_Resource_Recompiled' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_resource_recompiled.php',
+    'Smarty_Resource_Uncompiled' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_resource_uncompiled.php',
+    'Smarty_Security' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_security.php',
+    'Smarty_Template_Cached' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_template_cached.php',
+    'Smarty_Template_Compiled' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_template_compiled.php',
+    'Smarty_Template_Config' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_template_config.php',
+    'Smarty_Template_Resource_Base' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_template_resource_base.php',
+    'Smarty_Template_Source' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_template_source.php',
+    'Smarty_Undefined_Variable' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_undefined_variable.php',
+    'Smarty_Variable' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_variable.php',
+    'TPC_yyStackEntry' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php',
+    'TP_yyStackEntry' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php',
+);
diff --git a/www/modules/civicrm/packages/smarty4/vendor/composer/autoload_namespaces.php b/www/modules/civicrm/packages/smarty4/vendor/composer/autoload_namespaces.php
new file mode 100644
index 000000000..15a2ff3ad
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/composer/autoload_namespaces.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/www/modules/civicrm/packages/smarty4/vendor/composer/autoload_psr4.php b/www/modules/civicrm/packages/smarty4/vendor/composer/autoload_psr4.php
new file mode 100644
index 000000000..3890ddc24
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/composer/autoload_psr4.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/www/modules/civicrm/packages/smarty4/vendor/composer/autoload_real.php b/www/modules/civicrm/packages/smarty4/vendor/composer/autoload_real.php
new file mode 100644
index 000000000..7650c8fc5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/composer/autoload_real.php
@@ -0,0 +1,38 @@
+<?php
+
+// autoload_real.php @generated by Composer
+
+class ComposerAutoloaderInit363d3bd17dd36f25504ff707e7affe62
+{
+    private static $loader;
+
+    public static function loadClassLoader($class)
+    {
+        if ('Composer\Autoload\ClassLoader' === $class) {
+            require __DIR__ . '/ClassLoader.php';
+        }
+    }
+
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
+    public static function getLoader()
+    {
+        if (null !== self::$loader) {
+            return self::$loader;
+        }
+
+        require __DIR__ . '/platform_check.php';
+
+        spl_autoload_register(array('ComposerAutoloaderInit363d3bd17dd36f25504ff707e7affe62', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
+        spl_autoload_unregister(array('ComposerAutoloaderInit363d3bd17dd36f25504ff707e7affe62', 'loadClassLoader'));
+
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInit363d3bd17dd36f25504ff707e7affe62::getInitializer($loader));
+
+        $loader->register(true);
+
+        return $loader;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/composer/autoload_static.php b/www/modules/civicrm/packages/smarty4/vendor/composer/autoload_static.php
new file mode 100644
index 000000000..7527cffe4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/composer/autoload_static.php
@@ -0,0 +1,189 @@
+<?php
+
+// autoload_static.php @generated by Composer
+
+namespace Composer\Autoload;
+
+class ComposerStaticInit363d3bd17dd36f25504ff707e7affe62
+{
+    public static $classMap = array (
+        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
+        'Smarty' => __DIR__ . '/..' . '/smarty/smarty/libs/Smarty.class.php',
+        'SmartyCompilerException' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smartycompilerexception.php',
+        'SmartyException' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smartyexception.php',
+        'Smarty_Autoloader' => __DIR__ . '/..' . '/smarty/smarty/libs/Autoloader.php',
+        'Smarty_CacheResource' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_cacheresource.php',
+        'Smarty_CacheResource_Custom' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_cacheresource_custom.php',
+        'Smarty_CacheResource_KeyValueStore' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php',
+        'Smarty_Data' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_data.php',
+        'Smarty_Internal_Block' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_block.php',
+        'Smarty_Internal_CacheResource_File' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php',
+        'Smarty_Internal_CompileBase' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compilebase.php',
+        'Smarty_Internal_Compile_Append' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_append.php',
+        'Smarty_Internal_Compile_Assign' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_assign.php',
+        'Smarty_Internal_Compile_Block' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_block.php',
+        'Smarty_Internal_Compile_Block_Child' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_child.php',
+        'Smarty_Internal_Compile_Block_Parent' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_parent.php',
+        'Smarty_Internal_Compile_Blockclose' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_block.php',
+        'Smarty_Internal_Compile_Break' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_break.php',
+        'Smarty_Internal_Compile_Call' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_call.php',
+        'Smarty_Internal_Compile_Capture' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_capture.php',
+        'Smarty_Internal_Compile_CaptureClose' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_capture.php',
+        'Smarty_Internal_Compile_Child' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_child.php',
+        'Smarty_Internal_Compile_Config_Load' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_config_load.php',
+        'Smarty_Internal_Compile_Continue' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_continue.php',
+        'Smarty_Internal_Compile_Debug' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_debug.php',
+        'Smarty_Internal_Compile_Else' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_if.php',
+        'Smarty_Internal_Compile_Elseif' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_if.php',
+        'Smarty_Internal_Compile_Eval' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_eval.php',
+        'Smarty_Internal_Compile_Extends' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_extends.php',
+        'Smarty_Internal_Compile_For' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_for.php',
+        'Smarty_Internal_Compile_Forclose' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_for.php',
+        'Smarty_Internal_Compile_Foreach' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_foreach.php',
+        'Smarty_Internal_Compile_Foreachclose' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_foreach.php',
+        'Smarty_Internal_Compile_Foreachelse' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_foreach.php',
+        'Smarty_Internal_Compile_Forelse' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_for.php',
+        'Smarty_Internal_Compile_Function' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php',
+        'Smarty_Internal_Compile_Functionclose' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php',
+        'Smarty_Internal_Compile_If' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_if.php',
+        'Smarty_Internal_Compile_Ifclose' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_if.php',
+        'Smarty_Internal_Compile_Include' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_include.php',
+        'Smarty_Internal_Compile_Insert' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_insert.php',
+        'Smarty_Internal_Compile_Ldelim' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php',
+        'Smarty_Internal_Compile_Make_Nocache' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_make_nocache.php',
+        'Smarty_Internal_Compile_Nocache' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_nocache.php',
+        'Smarty_Internal_Compile_Nocacheclose' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_nocache.php',
+        'Smarty_Internal_Compile_Parent' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_parent.php',
+        'Smarty_Internal_Compile_Private_Block_Plugin' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php',
+        'Smarty_Internal_Compile_Private_ForeachSection' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php',
+        'Smarty_Internal_Compile_Private_Function_Plugin' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php',
+        'Smarty_Internal_Compile_Private_Modifier' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php',
+        'Smarty_Internal_Compile_Private_Object_Block_Function' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php',
+        'Smarty_Internal_Compile_Private_Object_Function' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php',
+        'Smarty_Internal_Compile_Private_Print_Expression' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php',
+        'Smarty_Internal_Compile_Private_Registered_Block' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php',
+        'Smarty_Internal_Compile_Private_Registered_Function' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php',
+        'Smarty_Internal_Compile_Private_Special_Variable' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php',
+        'Smarty_Internal_Compile_Rdelim' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php',
+        'Smarty_Internal_Compile_Section' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_section.php',
+        'Smarty_Internal_Compile_Sectionclose' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_section.php',
+        'Smarty_Internal_Compile_Sectionelse' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_section.php',
+        'Smarty_Internal_Compile_Setfilter' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php',
+        'Smarty_Internal_Compile_Setfilterclose' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php',
+        'Smarty_Internal_Compile_Shared_Inheritance' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php',
+        'Smarty_Internal_Compile_While' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_while.php',
+        'Smarty_Internal_Compile_Whileclose' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_compile_while.php',
+        'Smarty_Internal_Config_File_Compiler' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php',
+        'Smarty_Internal_Configfilelexer' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_configfilelexer.php',
+        'Smarty_Internal_Configfileparser' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php',
+        'Smarty_Internal_Data' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_data.php',
+        'Smarty_Internal_Debug' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_debug.php',
+        'Smarty_Internal_ErrorHandler' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_errorhandler.php',
+        'Smarty_Internal_Extension_Handler' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_extension_handler.php',
+        'Smarty_Internal_Method_AddAutoloadFilters' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php',
+        'Smarty_Internal_Method_AddDefaultModifiers' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php',
+        'Smarty_Internal_Method_Append' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_append.php',
+        'Smarty_Internal_Method_AppendByRef' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php',
+        'Smarty_Internal_Method_AssignByRef' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php',
+        'Smarty_Internal_Method_AssignGlobal' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php',
+        'Smarty_Internal_Method_ClearAllAssign' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_clearallassign.php',
+        'Smarty_Internal_Method_ClearAllCache' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php',
+        'Smarty_Internal_Method_ClearAssign' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_clearassign.php',
+        'Smarty_Internal_Method_ClearCache' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcache.php',
+        'Smarty_Internal_Method_ClearCompiledTemplate' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php',
+        'Smarty_Internal_Method_ClearConfig' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_clearconfig.php',
+        'Smarty_Internal_Method_CompileAllConfig' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php',
+        'Smarty_Internal_Method_CompileAllTemplates' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php',
+        'Smarty_Internal_Method_ConfigLoad' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_configload.php',
+        'Smarty_Internal_Method_CreateData' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_createdata.php',
+        'Smarty_Internal_Method_GetAutoloadFilters' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php',
+        'Smarty_Internal_Method_GetConfigVariable' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getconfigvariable.php',
+        'Smarty_Internal_Method_GetConfigVars' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php',
+        'Smarty_Internal_Method_GetDebugTemplate' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php',
+        'Smarty_Internal_Method_GetDefaultModifiers' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php',
+        'Smarty_Internal_Method_GetGlobal' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getglobal.php',
+        'Smarty_Internal_Method_GetRegisteredObject' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php',
+        'Smarty_Internal_Method_GetStreamVariable' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php',
+        'Smarty_Internal_Method_GetTags' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_gettags.php',
+        'Smarty_Internal_Method_GetTemplateVars' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php',
+        'Smarty_Internal_Method_Literals' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_literals.php',
+        'Smarty_Internal_Method_LoadFilter' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php',
+        'Smarty_Internal_Method_LoadPlugin' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php',
+        'Smarty_Internal_Method_MustCompile' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php',
+        'Smarty_Internal_Method_RegisterCacheResource' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php',
+        'Smarty_Internal_Method_RegisterClass' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerclass.php',
+        'Smarty_Internal_Method_RegisterDefaultConfigHandler' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php',
+        'Smarty_Internal_Method_RegisterDefaultPluginHandler' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php',
+        'Smarty_Internal_Method_RegisterDefaultTemplateHandler' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php',
+        'Smarty_Internal_Method_RegisterFilter' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php',
+        'Smarty_Internal_Method_RegisterObject' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerobject.php',
+        'Smarty_Internal_Method_RegisterPlugin' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php',
+        'Smarty_Internal_Method_RegisterResource' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_registerresource.php',
+        'Smarty_Internal_Method_SetAutoloadFilters' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php',
+        'Smarty_Internal_Method_SetDebugTemplate' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php',
+        'Smarty_Internal_Method_SetDefaultModifiers' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php',
+        'Smarty_Internal_Method_UnloadFilter' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php',
+        'Smarty_Internal_Method_UnregisterCacheResource' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php',
+        'Smarty_Internal_Method_UnregisterFilter' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php',
+        'Smarty_Internal_Method_UnregisterObject' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php',
+        'Smarty_Internal_Method_UnregisterPlugin' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php',
+        'Smarty_Internal_Method_UnregisterResource' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php',
+        'Smarty_Internal_Nocache_Insert' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_nocache_insert.php',
+        'Smarty_Internal_ParseTree' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_parsetree.php',
+        'Smarty_Internal_ParseTree_Code' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_code.php',
+        'Smarty_Internal_ParseTree_Dq' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php',
+        'Smarty_Internal_ParseTree_DqContent' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php',
+        'Smarty_Internal_ParseTree_Tag' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php',
+        'Smarty_Internal_ParseTree_Template' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_template.php',
+        'Smarty_Internal_ParseTree_Text' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_text.php',
+        'Smarty_Internal_Resource_Eval' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_resource_eval.php',
+        'Smarty_Internal_Resource_Extends' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_resource_extends.php',
+        'Smarty_Internal_Resource_File' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_resource_file.php',
+        'Smarty_Internal_Resource_Php' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_resource_php.php',
+        'Smarty_Internal_Resource_Stream' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_resource_stream.php',
+        'Smarty_Internal_Resource_String' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_resource_string.php',
+        'Smarty_Internal_Runtime_CacheModify' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php',
+        'Smarty_Internal_Runtime_CacheResourceFile' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cacheresourcefile.php',
+        'Smarty_Internal_Runtime_Capture' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_capture.php',
+        'Smarty_Internal_Runtime_CodeFrame' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php',
+        'Smarty_Internal_Runtime_FilterHandler' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php',
+        'Smarty_Internal_Runtime_Foreach' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php',
+        'Smarty_Internal_Runtime_GetIncludePath' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php',
+        'Smarty_Internal_Runtime_Inheritance' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php',
+        'Smarty_Internal_Runtime_Make_Nocache' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_make_nocache.php',
+        'Smarty_Internal_Runtime_TplFunction' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php',
+        'Smarty_Internal_Runtime_UpdateCache' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php',
+        'Smarty_Internal_Runtime_UpdateScope' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php',
+        'Smarty_Internal_Runtime_WriteFile' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php',
+        'Smarty_Internal_SmartyTemplateCompiler' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php',
+        'Smarty_Internal_Template' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_template.php',
+        'Smarty_Internal_TemplateBase' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_templatebase.php',
+        'Smarty_Internal_TemplateCompilerBase' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php',
+        'Smarty_Internal_Templatelexer' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_templatelexer.php',
+        'Smarty_Internal_Templateparser' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php',
+        'Smarty_Internal_TestInstall' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_testinstall.php',
+        'Smarty_Internal_Undefined' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_undefined.php',
+        'Smarty_Resource' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_resource.php',
+        'Smarty_Resource_Custom' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_resource_custom.php',
+        'Smarty_Resource_Recompiled' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_resource_recompiled.php',
+        'Smarty_Resource_Uncompiled' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_resource_uncompiled.php',
+        'Smarty_Security' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_security.php',
+        'Smarty_Template_Cached' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_template_cached.php',
+        'Smarty_Template_Compiled' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_template_compiled.php',
+        'Smarty_Template_Config' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_template_config.php',
+        'Smarty_Template_Resource_Base' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_template_resource_base.php',
+        'Smarty_Template_Source' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_template_source.php',
+        'Smarty_Undefined_Variable' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_undefined_variable.php',
+        'Smarty_Variable' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_variable.php',
+        'TPC_yyStackEntry' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php',
+        'TP_yyStackEntry' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php',
+    );
+
+    public static function getInitializer(ClassLoader $loader)
+    {
+        return \Closure::bind(function () use ($loader) {
+            $loader->classMap = ComposerStaticInit363d3bd17dd36f25504ff707e7affe62::$classMap;
+
+        }, null, ClassLoader::class);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/composer/installed.json b/www/modules/civicrm/packages/smarty4/vendor/composer/installed.json
new file mode 100644
index 000000000..77fd6aecb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/composer/installed.json
@@ -0,0 +1,75 @@
+{
+    "packages": [
+        {
+            "name": "smarty/smarty",
+            "version": "v4.5.3",
+            "version_normalized": "4.5.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/smarty-php/smarty.git",
+                "reference": "9fc96a13dbaf546c3d7bcf95466726578cd4e0fa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/9fc96a13dbaf546c3d7bcf95466726578cd4e0fa",
+                "reference": "9fc96a13dbaf546c3d7bcf95466726578cd4e0fa",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5 || ^7.5",
+                "smarty/smarty-lexer": "^3.1"
+            },
+            "time": "2024-05-28T21:46:01+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "libs/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Monte Ohrt",
+                    "email": "monte@ohrt.com"
+                },
+                {
+                    "name": "Uwe Tews",
+                    "email": "uwe.tews@googlemail.com"
+                },
+                {
+                    "name": "Rodney Rehm",
+                    "email": "rodney.rehm@medialize.de"
+                },
+                {
+                    "name": "Simon Wisselink",
+                    "homepage": "https://www.iwink.nl/"
+                }
+            ],
+            "description": "Smarty - the compiling PHP template engine",
+            "homepage": "https://smarty-php.github.io/smarty/",
+            "keywords": [
+                "templating"
+            ],
+            "support": {
+                "forum": "https://github.com/smarty-php/smarty/discussions",
+                "issues": "https://github.com/smarty-php/smarty/issues",
+                "source": "https://github.com/smarty-php/smarty/tree/v4.5.3"
+            },
+            "install-path": "../smarty/smarty"
+        }
+    ],
+    "dev": true,
+    "dev-package-names": []
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/composer/installed.php b/www/modules/civicrm/packages/smarty4/vendor/composer/installed.php
new file mode 100644
index 000000000..c972d65ab
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/composer/installed.php
@@ -0,0 +1,32 @@
+<?php return array(
+    'root' => array(
+        'name' => '__root__',
+        'pretty_version' => 'dev-master',
+        'version' => 'dev-master',
+        'reference' => 'bfa3c101f9cdda54c10fa607846ea1bafe388fce',
+        'type' => 'library',
+        'install_path' => __DIR__ . '/../../',
+        'aliases' => array(),
+        'dev' => true,
+    ),
+    'versions' => array(
+        '__root__' => array(
+            'pretty_version' => 'dev-master',
+            'version' => 'dev-master',
+            'reference' => 'bfa3c101f9cdda54c10fa607846ea1bafe388fce',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../../',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'smarty/smarty' => array(
+            'pretty_version' => 'v4.5.3',
+            'version' => '4.5.3.0',
+            'reference' => '9fc96a13dbaf546c3d7bcf95466726578cd4e0fa',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../smarty/smarty',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+    ),
+);
diff --git a/www/modules/civicrm/packages/smarty4/vendor/composer/platform_check.php b/www/modules/civicrm/packages/smarty4/vendor/composer/platform_check.php
new file mode 100644
index 000000000..6d3407dbb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/composer/platform_check.php
@@ -0,0 +1,26 @@
+<?php
+
+// platform_check.php @generated by Composer
+
+$issues = array();
+
+if (!(PHP_VERSION_ID >= 70100)) {
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.1.0". You are running ' . PHP_VERSION . '.';
+}
+
+if ($issues) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
+        } elseif (!headers_sent()) {
+            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
+        }
+    }
+    trigger_error(
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
+        E_USER_ERROR
+    );
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/CHANGELOG.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/CHANGELOG.md
new file mode 100644
index 000000000..97355b6df
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/CHANGELOG.md
@@ -0,0 +1,3625 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [4.5.3] - 2024-05-28
+- Fixed a code injection vulnerability in extends-tag. This addresses CVE-2024-35226.
+
+
+## [4.5.2] - 2024-04-06
+- Fixed argument must be passed by reference error introduced in v4.5.1 [#964](https://github.com/smarty-php/smarty/issues/964)
+
+## [4.5.1] - 2024-03-18
+- Using unregistered static class methods in expressions now also triggers a deprecation notice because we will drop support for this in the next major release [#813](https://github.com/smarty-php/smarty/issues/813)
+
+## [4.5.0] - 2024-03-18
+- (this release accidentally didn't contain any changes, fixed in 4.5.1)
+
+## [4.4.1] - 2024-02-26
+- Fixed internal release-tooling
+
+## [4.4.0] - 2024-02-26
+- Using the `|implode`, `|json_encode` and `|substr` modifiers does not generate a deprecation warning anymore as they will continue to be supported in v5 [#939](https://github.com/smarty-php/smarty/issues/939) 
+
+### Added
+- PHP8.3 support [#925](https://github.com/smarty-php/smarty/issues/925)
+
+### Fixed
+- Incorrect compilation of expressions when escape_html=true [#930](https://github.com/smarty-php/smarty/pull/930)
+
+## [4.3.4] - 2023-09-14
+
+## [4.3.3] - 2023-09-14
+
+### Fixed
+- `|strip_tags` does not work if the input is 0 [#890](https://github.com/smarty-php/smarty/issues/890)
+- Use of negative numbers in {math} equations [#895](https://github.com/smarty-php/smarty/issues/895)
+
+## [4.3.2] - 2023-07-19
+
+### Fixed
+- `$smarty->muteUndefinedOrNullWarnings()` now also mutes PHP8 warnings for undefined properties
+
+## [4.3.1] - 2023-03-28
+
+### Security
+- Fixed Cross site scripting vulnerability in Javascript escaping. This addresses CVE-2023-28447.
+
+### Fixed
+- `$smarty->muteUndefinedOrNullWarnings()` now also mutes PHP7 notices for undefined array indexes [#736](https://github.com/smarty-php/smarty/issues/736)
+- `$smarty->muteUndefinedOrNullWarnings()` now treats undefined vars and array access of a null or false variables 
+  equivalent across all supported PHP versions
+- `$smarty->muteUndefinedOrNullWarnings()` now allows dereferencing of non-objects across all supported PHP versions [#831](https://github.com/smarty-php/smarty/issues/831)
+- PHP 8.1 deprecation warnings on null strings in modifiers [#834](https://github.com/smarty-php/smarty/pull/834)
+
+## [4.3.0] - 2022-11-22
+
+### Added
+- PHP8.2 compatibility [#775](https://github.com/smarty-php/smarty/pull/775)
+
+### Changed
+- Include docs and demo in the releases [#799](https://github.com/smarty-php/smarty/issues/799)
+- Using PHP functions as modifiers now triggers a deprecation notice because we will drop support for this in the next major release [#813](https://github.com/smarty-php/smarty/issues/813) 
+- Dropped remaining references to removed PHP-support in Smarty 4 from docs, lexer and security class. [#816](https://github.com/smarty-php/smarty/issues/816)
+- Support umask when writing (template) files and set dir permissions to 777 [#548](https://github.com/smarty-php/smarty/issues/548) [#819](https://github.com/smarty-php/smarty/issues/819) 
+ 
+### Fixed
+- Output buffer is now cleaned for internal PHP errors as well, not just for Exceptions [#514](https://github.com/smarty-php/smarty/issues/514)
+- Fixed recursion and out of memory errors when caching in complicated template set-ups using inheritance and includes [#801](https://github.com/smarty-php/smarty/pull/801)
+- Fixed PHP8.1 deprecation errors in strip_tags 
+- Fix Variable Usage in Exception message when unable to load subtemplate [#808](https://github.com/smarty-php/smarty/pull/808)
+- Fixed PHP8.1 deprecation notices for strftime [#672](https://github.com/smarty-php/smarty/issues/672)
+- Fixed PHP8.1 deprecation errors passing null to parameter in trim [#807](https://github.com/smarty-php/smarty/pull/807)
+- Adapt Smarty upper/lower functions to be codesafe (e.g. for Turkish locale) [#586](https://github.com/smarty-php/smarty/pull/586)
+- Bug fix for underscore and limited length in template name in custom resources [#581](https://github.com/smarty-php/smarty/pull/581)
+
+## [4.2.1] - 2022-09-14
+
+### Security
+- Applied appropriate javascript and html escaping in mailto plugin to counter injection attacks [#454](https://github.com/smarty-php/smarty/issues/454)
+
+### Fixed
+- Fixed PHP8.1 deprecation notices in modifiers (upper, explode, number_format and replace) [#755](https://github.com/smarty-php/smarty/pull/755) and [#788](https://github.com/smarty-php/smarty/pull/788)
+- Fixed PHP8.1 deprecation notices in capitalize modifier [#789](https://github.com/smarty-php/smarty/issues/789)
+- Fixed use of `rand()` without a parameter in math function [#794](https://github.com/smarty-php/smarty/issues/794)
+- Fixed unselected year/month/day not working in html_select_date [#395](https://github.com/smarty-php/smarty/issues/395)
+
+## [4.2.0] - 2022-08-01
+
+### Fixed
+- Fixed problems with smarty_mb_str_replace [#549](https://github.com/smarty-php/smarty/issues/549)
+- Fixed second parameter of unescape modifier not working [#777](https://github.com/smarty-php/smarty/issues/777)
+
+### Changed
+- Updated HTML of the debug template [#599](https://github.com/smarty-php/smarty/pull/599)
+
+## [4.1.1] - 2022-05-17
+
+### Security
+- Prevent PHP injection through malicious block name or include file name. This addresses CVE-2022-29221
+
+### Fixed
+- Exclude docs and demo from export and composer [#751](https://github.com/smarty-php/smarty/pull/751)
+- PHP 8.1 deprecation notices in demo/plugins/cacheresource.pdo.php [#706](https://github.com/smarty-php/smarty/issues/706)
+- PHP 8.1 deprecation notices in truncate modifier [#699](https://github.com/smarty-php/smarty/issues/699)
+- Math equation `max(x, y)` didn't work anymore [#721](https://github.com/smarty-php/smarty/issues/721)
+- Fix PHP 8.1 deprecated warning when calling rtrim [#743](https://github.com/smarty-php/smarty/pull/743)
+- PHP 8.1: fix deprecation in escape modifier [#727](https://github.com/smarty-php/smarty/pull/727)
+
+## [4.1.0] - 2022-02-06
+
+### Added
+- PHP8.1 compatibility [#713](https://github.com/smarty-php/smarty/pull/713)
+
+## [4.0.4] - 2022-01-18
+
+### Fixed
+- Fixed illegal characters bug in math function security check [#702](https://github.com/smarty-php/smarty/issues/702)
+
+## [4.0.3] - 2022-01-10
+
+### Security
+- Prevent evasion of the `static_classes` security policy. This addresses CVE-2021-21408
+
+## [4.0.2] - 2022-01-10
+
+### Security
+- Prevent arbitrary PHP code execution through maliciously crafted expression for the math function. This addresses CVE-2021-29454
+
+## [4.0.1] - 2022-01-09
+
+### Security
+- Rewrote the mailto function to not use `eval` when encoding with javascript
+
+## [4.0.0] - 2021-11-25
+
+## [4.0.0-rc.0] - 2021-10-13
+
+### Added
+- You can now use `$smarty->muteUndefinedOrNullWarnings()` to activate convert warnings about undefined or null template vars to notices when running PHP8
+
+### Changed
+- Switch CI from Travis to Github CI
+- Updated unit tests to avoid skipped and risky test warnings
+
+### Removed
+- Dropped support for PHP7.0 and below, so Smarty now requires PHP >=7.1
+- Dropped support for php asp tags in templates (removed from php since php7.0)
+- Dropped deprecated API calls that where only accessible through SmartyBC
+- Dropped support for {php} and {include_php} tags and embedded PHP in templates. Embedded PHP will now be passed through as is.
+- Removed all PHP_VERSION_ID and compare_version checks and conditional code blocks that are now no longer required
+- Dropped deprecated SMARTY_RESOURCE_CHAR_SET and SMARTY_RESOURCE_DATE_FORMAT constants
+- Dropped deprecated Smarty::muteExpectedErrors and Smarty::unmuteExpectedErrors API methods
+- Dropped deprecated $smarty->getVariable() method. Use $smarty->getTemplateVars() instead.
+- $smarty->registerResource() no longer accepts an array of callback functions
+
+## [3.1.40] - 2021-10-13
+
+### Changed
+- modifier escape now triggers a E_USER_NOTICE when an unsupported escape type is used https://github.com/smarty-php/smarty/pull/649
+
+### Security
+- More advanced javascript escaping to handle https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements thanks to m-haritonov
+
+## [3.1.39] - 2021-02-17
+
+### Security
+- Prevent access to `$smarty.template_object` in sandbox mode. This addresses CVE-2021-26119.
+- Fixed code injection vulnerability by using illegal function names in `{function name='blah'}{/function}`. This addresses CVE-2021-26120.
+
+## [3.1.38] - 2021-01-08
+
+### Fixed
+- Smarty::SMARTY_VERSION wasn't updated https://github.com/smarty-php/smarty/issues/628
+
+## [3.1.37] - 2021-01-07
+
+### Changed
+- Changed error handlers and handling of undefined constants for php8-compatibility (set $errcontext argument optional) https://github.com/smarty-php/smarty/issues/605
+- Changed expected error levels in unit tests for php8-compatibility
+- Travis unit tests now run for all php versions >= 5.3, including php8
+- Travis runs on Xenial where possible
+
+### Fixed
+- PHP5.3 compatibility fixes
+- Brought lexer source functionally up-to-date with compiled version
+
+## [3.1.36] - 2020-04-14
+
+### Fixed
+ - Smarty::SMARTY_VERSION wasn't updated in v3.1.35 https://github.com/smarty-php/smarty/issues/584
+
+## [3.1.35] - 2020-04-14
+ - remove whitespaces after comments https://github.com/smarty-php/smarty/issues/447
+ - fix foreachelse on arrayiterators https://github.com/smarty-php/smarty/issues/506
+ - fix files contained in git export archive for package maintainers https://github.com/smarty-php/smarty/issues/325
+ - throw SmartyException when setting caching attributes for cacheable plugin https://github.com/smarty-php/smarty/issues/457
+ - fix errors that occured where isset was replaced with null check such as https://github.com/smarty-php/smarty/issues/453
+ - unit tests are now in the repository
+
+## 3.1.34 release - 05.11.2019
+13.01.2020
+ - fix typo in exception message (JercSi)
+ - fix typehint warning with callable (bets4breakfast)
+ - add travis badge and compatability info to readme (matks)
+ - fix stdClass cast when compiling foreach (carpii)
+ - fix wrong set/get methods for memcached (IT-Experte)
+ - fix pborm assigning value to object variables in smarty_internal_compile_assign (Hunman)
+ - exclude error_reporting.ini from git export (glensc)
+
+## 3.1.34-dev-6 -
+30.10.2018
+ - bugfix a nested subblock in an inheritance child template was not replace by
+   outer level block with same name in same child template https://github.com/smarty-php/smarty/issues/500
+
+29.10.2018
+ - bugfix Smarty::$php_handling == PHP_PASSTHRU (default) did eat the "\n" (newline) character if it did directly followed
+   a PHP tag like "?>" or other https://github.com/smarty-php/smarty/issues/501
+
+14.10.2018
+ - bugfix autoloader exit shortcut https://github.com/smarty-php/smarty/issues/467
+
+11.10.2018
+ - bugfix {insert} not works when caching is enabled and included template is present
+   https://github.com/smarty-php/smarty/issues/496
+ - bugfix in date-format modifier; NULL at date string or default_date did not produce correct output
+   https://github.com/smarty-php/smarty/pull/458
+
+09.10.2018
+ - bugfix fix of 26.8.2017 https://github.com/smarty-php/smarty/issues/327
+   modifier is applied to sum expression https://github.com/smarty-php/smarty/issues/491
+ - bugfix indexed arrays could not be defined "array(...)""
+
+18.09.2018
+  - bugfix large plain text template sections without a Smarty tag > 700kB could
+    could fail in version 3.1.32 and 3.1.33 because PHP preg_match() restrictions
+    https://github.com/smarty-php/smarty/issues/488
+
+## 3.1.33 release - 12.09.2018
+## 3.1.33-dev-12 -
+03.09.2018
+  - bugfix {foreach} using new style property access like {$item@property} on
+    Smarty 2 style named foreach loop could produce errors https://github.com/smarty-php/smarty/issues/484
+
+31.08.2018
+  - bugfix some custom left and right delimiters like '{^' '^}' did not work
+    https://github.com/smarty-php/smarty/issues/450 https://github.com/smarty-php/smarty/pull/482
+
+  - reformating for PSR-2 coding standards https://github.com/smarty-php/smarty/pull/483
+
+  - bugfix on Windows absolute filepathes did fail if the drive letter was followed by a linux DIRECTORY_SEPARATOR
+    like C:/  at Smarty > 3.1.33-dev-5 https://github.com/smarty-php/smarty/issues/451
+
+  - PSR-2 code style fixes for config and template file Lexer/Parser generated with
+    the Smarty Lexer/Parser generator from https://github.com/smarty-php/smarty-lexer
+    https://github.com/smarty-php/smarty/pull/483
+
+26.08.2018
+  - bugfix/enhancement {capture} allow variable as capture block name in Smarty special variable
+    like $smarty.capture.$foo https://github.com/smarty-php/smarty/issues/478 https://github.com/smarty-php/smarty/pull/481
+
+## 3.1.33-dev-6 -
+19.08.2018
+  - fix PSR-2 coding standards and PHPDoc blocks https://github.com/smarty-php/smarty/pull/452
+    https://github.com/smarty-php/smarty/pull/475
+    https://github.com/smarty-php/smarty/pull/473
+  - bugfix PHP5.2 compatibility https://github.com/smarty-php/smarty/pull/472
+
+## 3.1.33-dev-4 -
+17.05.2018
+ - bugfix strip-block produces different output in Smarty v3.1.32 https://github.com/smarty-php/smarty/issues/436
+ - bugfix Smarty::compileAllTemplates ignores `$extension` parameter https://github.com/smarty-php/smarty/issues/437
+   https://github.com/smarty-php/smarty/pull/438
+ - improvement do not compute total property in {foreach} if not needed https://github.com/smarty-php/smarty/issues/443
+ - bugfix  plugins may not be loaded when setMergeCompiledIncludes is true https://github.com/smarty-php/smarty/issues/435
+
+26.04.2018
+ - bugfix  regarding Security Vulnerability did not solve the problem under Linux.
+   Security issue CVE-2018-16831
+
+## 3.1.32 - (24.04.2018)
+24.04.2018
+ - bugfix  possible Security Vulnerability in Smarty_Security class.
+
+26.03.2018
+ - bugfix plugins may not be loaded if {function} or {block} tags are executed in nocache mode
+   https://github.com/smarty-php/smarty/issues/371
+
+26.03.2018
+ - new feature {parent} =  {$smarty.block.parent} {child} =  {$smarty.block.child}
+
+23.03.2018
+ - bugfix preg_replace could fail on large content resulting in a blank page https://github.com/smarty-php/smarty/issues/417
+
+21.03.2018
+ - bugfix {$smarty.section...} used outside {section}{/section} showed incorrect values if {section}{/section} was called inside
+   another loop https://github.com/smarty-php/smarty/issues/422
+ - bugfix short form of {section} attributes did not work https://github.com/smarty-php/smarty/issues/428
+
+17.03.2018
+ - improvement Smarty::compileAllTemplates() exit with a non-zero status code if max errors is reached https://github.com/smarty-php/smarty/pull/402
+
+16.03.2018
+ - bugfix extends resource did not work with user defined left/right delimiter https://github.com/smarty-php/smarty/issues/419
+
+22.11.2017
+ - bugfix {break} and {continue} could fail if {foreach}{/foreach} did contain other
+   looping tags like {for}, {section} and {while} https://github.com/smarty-php/smarty/issues/323
+
+20.11.2017
+  - bugfix rework of newline spacing between tag code and template text.
+    now again identical with Smarty2 (forum topic 26878)
+  - replacement of " by '
+
+05.11.2017
+  - lexer/parser optimization
+  - code cleanup and optimizations
+  - bugfix {$smarty.section.name.loop} used together with {$smarty.section.name.total} could produce
+    wrong results (forum topic 27041)
+
+26.10.2017
+  - bugfix Smarty version was  not filled in header comment of compiled and cached  files
+  - optimization replace internal Smarty::$ds property by DIRECTORY_SEPARATOR
+  - deprecate functions Smarty::muteExpectedErrors() and Smarty::unmuteExpectedErrors()
+    as Smarty does no longer use error suppression like @filemtime().
+    for backward compatibility code is moved from Smarty class to an external class and still can be
+    called.
+  - correction of PHPDoc blocks
+  - minor code cleanup
+
+21.10.2017
+  - bugfix custom delimiters could fail since modification of  version 3.1.32-dev-23
+    https://github.com/smarty-php/smarty/issues/394
+
+18.10.2017
+  - bugfix fix implementation of unclosed block tag in double quoted string of 12.10.2017
+    https://github.com/smarty-php/smarty/issues/396 https://github.com/smarty-php/smarty/issues/397
+    https://github.com/smarty-php/smarty/issues/391 https://github.com/smarty-php/smarty/issues/392
+
+12.10.2017
+  - bugfix $smarty.block.child and $smarty.block.parent could not be used like any
+    $smarty special variable https://github.com/smarty-php/smarty/issues/393
+  - unclosed block tag in double quoted string must throw compiler exception.
+     https://github.com/smarty-php/smarty/issues/391 https://github.com/smarty-php/smarty/issues/392
+
+07.10.2017
+  - bugfix modification of 9.8.2017 did fail on some recursive
+    tag nesting. https://github.com/smarty-php/smarty/issues/389
+
+26.8.2017
+  - bugfix chained modifier failed when last modifier parameter is a signed value
+    https://github.com/smarty-php/smarty/issues/327
+  - bugfix templates filepath with multibyte characters did not work
+    https://github.com/smarty-php/smarty/issues/385
+  - bugfix {make_nocache} did display code if the template did not contain other nocache code
+    https://github.com/smarty-php/smarty/issues/369
+
+09.8.2017
+  - improvement repeated delimiter like {{ and }} will be treated as literal
+    https://groups.google.com/forum/#!topic/smarty-developers/h9r82Bx4KZw
+
+05.8.2017
+  - bugfix wordwrap modifier could fail if used in nocache code.
+    converted plugin file shared.mb_wordwrap.php into modifier.mb_wordwrap.php
+  - cleanup of _getSmartyObj()
+
+31.7.2017
+  - Call clearstatcache() after mkdir() failure https://github.com/smarty-php/smarty/pull/379
+
+30.7.2017
+  - rewrite mkdir() bugfix to retry automatically see https://github.com/smarty-php/smarty/pull/377
+    https://github.com/smarty-php/smarty/pull/379
+
+21.7.2017
+  - security possible PHP code injection on custom resources at display() or fetch()
+    calls if the resource does not sanitize the template name
+  - bugfix fix 'mkdir(): File exists' error on create directory from parallel
+    processes https://github.com/smarty-php/smarty/pull/377
+  - bugfix solve preg_match() hhvm parameter problem https://github.com/smarty-php/smarty/pull/372
+
+27.5.2017
+  - bugfix change compiled code for registered function and modifiers to called as callable to allow closures
+    https://github.com/smarty-php/smarty/pull/368, https://github.com/smarty-php/smarty/issues/273
+  - bugfix https://github.com/smarty-php/smarty/pull/368 did break the default plugin handler
+  - improvement replace phpversion() by PHP_VERSION constant.
+    https://github.com/smarty-php/smarty/pull/363
+
+21.5.2017
+  - performance store flag for already required shared plugin functions in static variable or
+    Smarty's $_cache to improve performance when plugins are often called
+    https://github.com/smarty-php/smarty/commit/51e0d5cd405d764a4ea257d1bac1fb1205f74528#commitcomment-22280086
+  - bugfix remove special treatment of classes implementing ArrayAccess in {foreach}
+    https://github.com/smarty-php/smarty/issues/332
+  - bugfix remove deleted files by clear_cache() and clear_compiled_template() from
+    ACP cache if present, add some is_file() checks to avoid possible warnings on filemtime()
+    caused by above functions.
+    https://github.com/smarty-php/smarty/issues/341
+  - bugfix version 3.1.31 did fail under PHP 5.2
+    https://github.com/smarty-php/smarty/issues/365
+
+19.5.2017
+  - change properties $accessMap and $obsoleteProperties from private to protected
+    https://github.com/smarty-php/smarty/issues/351
+  - new feature The named capture buffers can now be accessed also as array
+    See NEWS_FEATURES.txt https://github.com/smarty-php/smarty/issues/366
+  - improvement check if ini_get() and ini_set() not disabled
+    https://github.com/smarty-php/smarty/pull/362
+
+24.4.2017
+  - fix spelling https://github.com/smarty-php/smarty/commit/e3eda8a5f5653d8abb960eb1bc47e3eca679b1b4#commitcomment-21803095
+
+17.4.2017
+  - correct generated code on empty() and isset() call, observe change PHP behaviour since PHP 5.5
+    https://github.com/smarty-php/smarty/issues/347
+
+14.4.2017
+  - merge pull requests https://github.com/smarty-php/smarty/pull/349, https://github.com/smarty-php/smarty/pull/322 and    https://github.com/smarty-php/smarty/pull/337 to fix spelling and annotation
+
+13.4.2017
+  - bugfix array_merge() parameter should be checked https://github.com/smarty-php/smarty/issues/350
+
+## 3.1.31 - (14.12.2016)
+  23.11.2016
+   - move template object cache into static variables
+
+  19.11.2016
+  - bugfix inheritance root child templates containing nested {block}{/block} could call sub-bock content from parent
+    template https://github.com/smarty-php/smarty/issues/317
+  - change version checking
+
+ 11.11.2016
+  - bugfix when Smarty is using a cached template object on Smarty::fetch() or Smarty::isCached() the inheritance data
+    must be removed https://github.com/smarty-php/smarty/issues/312
+  - smaller speed optimization
+
+ 08.11.2016
+  - add bootstrap file to load and register Smarty_Autoloader. Change composer.json to make it known to composer
+
+ 07.11.2016
+  - optimization of lexer speed https://github.com/smarty-php/smarty/issues/311
+
+ 27.10.2016
+  - bugfix template function definitions array has not been cached between Smarty::fetch() and Smarty::display() calls
+    https://github.com/smarty-php/smarty/issues/301
+
+ 23.10.2016
+  - improvement/bugfix when Smarty::fetch() is called on a template object the inheritance and tplFunctions property
+    should be copied to the called template object
+
+ 21.10.2016
+  - bugfix for compile locking touched timestamp of old compiled file was not restored on compilation error https://github.com/smarty-php/smarty/issues/308
+
+ 20.10.2016
+  - bugfix nocache code was not removed in cache file when subtemplate did contain PHP short tags in text but no other
+    nocache code https://github.com/smarty-php/smarty/issues/300
+
+ 19.10.2016
+  - bugfix {make_nocache $var} did fail when variable value did contain '\' https://github.com/smarty-php/smarty/issues/305
+  - bugfix {make_nocache $var} remove spaces from variable value https://github.com/smarty-php/smarty/issues/304
+
+ 12.10.2016
+  - bugfix {include} with template names including variable or constants could fail after bugfix from
+     28.09.2016 https://github.com/smarty-php/smarty/issues/302
+
+ 08.10.2016
+  - optimization move runtime extension for template functions into Smarty objects
+
+ 29.09.2016
+  - improvement new Smarty::$extends_recursion property to disable execution of {extends} in templates called by extends resource
+     https://github.com/smarty-php/smarty/issues/296
+
+ 28.09.2016
+  - bugfix the generated code for calling a subtemplate must pass the template resource name in single quotes https://github.com/smarty-php/smarty/issues/299
+  - bugfix nocache hash was not removed for <?xml ?> tags in subtemplates https://github.com/smarty-php/smarty/issues/300
+
+ 27.09.2016
+  - bugfix when Smarty does use an internally cached template object on Smarty::fetch() calls
+           the template and config variables must be cleared https://github.com/smarty-php/smarty/issues/297
+
+ 20.09.2016
+  - bugfix some $smarty special template variables are no longer accessed as real variable.
+    using them on calls like {if isset($smarty.foo)} or {if empty($smarty.foo)} will fail
+    http://www.smarty.net/forums/viewtopic.php?t=26222
+  - temporary fix for https://github.com/smarty-php/smarty/issues/293 main reason still under investigation
+  - improvement new tags {block_parent} {block_child} in template inheritance
+
+ 19.09.2016
+  - optimization clear compiled and cached folder completely on detected version change
+  - cleanup convert cache resource file method clear into runtime extension
+
+ 15.09.2016
+  - bugfix assigning a variable in if condition by function like {if $value = array_shift($array)} the function got called twice https://github.com/smarty-php/smarty/issues/291
+  - bugfix function plugins called with assign attribute like {foo assign='bar'} did not output returned content because
+           because assumption was made that it was assigned to a variable https://github.com/smarty-php/smarty/issues/292
+  - bugfix calling $smarty->isCached() on a not existing cache file with $smarty->cache_locking = true; could cause a 10 second delay http://www.smarty.net/forums/viewtopic.php?t=26282
+  - improvement make Smarty::clearCompiledTemplate() on custom resource independent from changes of templateId computation
+
+ 11.09.2016
+  - improvement {math} misleading E_USER_WARNING messages when parameter value = null https://github.com/smarty-php/smarty/issues/288
+  - improvement move often used code snippets into methods
+  - performance Smarty::configLoad() did load unneeded template source object
+
+ 09.09.2016
+  - bugfix/optimization {foreach} did not execute the {foreachelse} when iterating empty objects https://github.com/smarty-php/smarty/pull/287
+  - bugfix {foreach} must keep the @properties when restoring a saved $item variable as the properties might be used outside {foreach} https://github.com/smarty-php/smarty/issues/267
+  - improvement {foreach} observe {break n} and {continue n} nesting levels when restoring saved $item and $key variables
+
+ 08.09.2016
+  - bugfix implement wrapper for removed method getConfigVariable() https://github.com/smarty-php/smarty/issues/286
+
+ 07.09.2016
+  - bugfix using nocache like attribute with value true like {plugin nocache=true} did not work https://github.com/smarty-php/smarty/issues/285
+  - bugfix uppercase TRUE, FALSE and NULL did not work when security was enabled https://github.com/smarty-php/smarty/issues/282
+  - bugfix when {foreach} was looping over an object the total property like {$item@total} did always return 1 https://github.com/smarty-php/smarty/issues/281
+  - bugfix {capture}{/capture} did add in 3.1.30 unintended additional blank lines https://github.com/smarty-php/smarty/issues/268
+
+ 01.09.2016
+  - performance require_once should be called only once for shared plugins https://github.com/smarty-php/smarty/issues/280
+
+ 26.08.2016
+  - bugfix change of 23.08.2016 failed on linux when use_include_path = true
+
+ 23.08.2016
+  - bugfix remove constant DS as shortcut for DIRECTORY_SEPARATOR as the user may have defined it to something else https://github.com/smarty-php/smarty/issues/277
+
+ 20.08-2016
+  - bugfix {config_load ... scope="global"} shall not throw an arror but fallback to scope="smarty" https://github.com/smarty-php/smarty/issues/274
+  - bugfix {make_nocache} failed when using composer autoloader https://github.com/smarty-php/smarty/issues/275
+
+ 14.08.2016
+  - bugfix $smarty_>debugging = true; did E_NOTICE messages when {eval} tag was used https://github.com/smarty-php/smarty/issues/266
+  - bugfix Class 'Smarty_Internal_Runtime_ValidateCompiled' not found when upgrading from some older Smarty versions with existing
+           compiled or cached template files https://github.com/smarty-php/smarty/issues/269
+  - optimization remove unneeded call to update acopes when {assign} scope and template scope was local (default)
+
+## 3.1.30 - (07.08.2016)
+
+ 07.08.2016
+  - bugfix update of 04.08.2016 was incomplete
+
+ 05.08.2016
+  - bugfix compiling of templates failed when the Smarty delimiter did contain '/' https://github.com/smarty-php/smarty/issues/264
+  - updated error checking at template and config default handler
+
+ 04.08.2016
+  - improvement move template function source parameter into extension
+
+ 26.07.2016
+  - optimization unneeded loading of compiled resource
+
+ 24.07.2016
+  - regression this->addPluginsDir('/abs/path/to/dir') adding absolute path without trailing '/' did fail https://github.com/smarty-php/smarty/issues/260
+
+ 23.07.2016
+  - bugfix setTemplateDir('/') and setTemplateDir('') did create wrong absolute filepath https://github.com/smarty-php/smarty/issues/245
+  - optimization of filepath normalization
+  - improvement remove double function declaration in plugin shared.escape_special_cars.php https://github.com/smarty-php/smarty/issues/229
+
+ 19.07.2016
+  - bugfix multiple {include} with relative filepath within {block}{/block} could fail https://github.com/smarty-php/smarty/issues/246
+  - bugfix {math} shell injection vulnerability patch provided by Tim Weber
+
+ 18.07.2016
+  - bugfix {foreach} if key variable and item@key attribute have been used both the key variable was not updated https://github.com/smarty-php/smarty/issues/254
+  - bugfix modifier on plugins like {plugin|modifier ... } did fail when the plugin does return an array https://github.com/smarty-php/smarty/issues/228
+  - bugfix avoid opcache_invalidate to result in ErrorException when opcache.restrict_api is not empty https://github.com/smarty-php/smarty/pull/244
+  - bugfix multiple {include} with relative filepath within {block}{/block} could fail https://github.com/smarty-php/smarty/issues/246
+
+ 14.07.2016
+  - bugfix wrong parameter on compileAllTemplates() and compileAllConfig() https://github.com/smarty-php/smarty/issues/231
+
+ 13.07.2016
+  - bugfix PHP 7 compatibility on registered compiler plugins https://github.com/smarty-php/smarty/issues/241
+  - update testInstall() https://github.com/smarty-php/smarty/issues/248https://github.com/smarty-php/smarty/issues/248
+  - bugfix enable debugging could fail when template objects did already exists https://github.com/smarty-php/smarty/issues/237
+  - bugfix template function data should be merged when loading subtemplate https://github.com/smarty-php/smarty/issues/240
+  - bugfix wrong parameter on compileAllTemplates() https://github.com/smarty-php/smarty/issues/231
+
+ 12.07.2016
+  - bugfix {foreach} item variable must be created also on empty from array https://github.com/smarty-php/smarty/issues/238 and https://github.com/smarty-php/smarty/issues/239
+  - bugfix enableSecurity() must init cache flags https://github.com/smarty-php/smarty/issues/247
+
+ 27.05.2016
+  - bugfix/improvement of compileAlltemplates() follow symlinks in template folder (PHP >= 5.3.1) https://github.com/smarty-php/smarty/issues/224
+      clear internal cache and expension handler for each template to avoid possible conflicts https://github.com/smarty-php/smarty/issues/231
+
+ 16.05.2016
+  - optimization {foreach} compiler and processing
+  - broken PHP 5.3 and 5.4 compatibility
+
+ 15.05.2016
+  - optimization and cleanup of resource code
+
+ 10.05.2016
+  - optimization of inheritance processing
+
+ 07.05.2016
+  -bugfix Only variables should be assigned by reference https://github.com/smarty-php/smarty/issues/227
+
+ 02.05.2016
+  - enhancement {block} tag names can now be variable https://github.com/smarty-php/smarty/issues/221
+
+ 01.05.2016
+  - bugfix same relative filepath at {include} called from template in different folders could display wrong sub-template
+
+ 29.04.2016
+  - bugfix {strip} remove space on linebreak between html tags https://github.com/smarty-php/smarty/issues/213
+
+ 24.04.2016
+  - bugfix nested {include} with relative file path could fail when called in {block} ... {/block} https://github.com/smarty-php/smarty/issues/218
+
+ 14.04.2016
+  - bugfix special variable {$smarty.capture.name} was not case sensitive on name https://github.com/smarty-php/smarty/issues/210
+  - bugfix the default template handler must calculate the source uid https://github.com/smarty-php/smarty/issues/205
+
+ 13.04.2016
+  - bugfix template inheritance status must be saved when calling sub-templates https://github.com/smarty-php/smarty/issues/215
+
+ 27.03.2016
+  - bugfix change of 11.03.2016 cause again {capture} data could not been seen in other templates with {$smarty.capture.name} https://github.com/smarty-php/smarty/issues/153
+
+ 11.03.2016
+  - optimization of capture and security handling
+  - improvement $smarty->clearCompiledTemplate() should return on recompiled or uncompiled resources
+
+ 10.03.2016
+  - optimization of resource processing
+
+ 09.03.2016
+  - improvement rework of 'scope' attribute handling see see NEW_FEATURES.txt https://github.com/smarty-php/smarty/issues/194
+    https://github.com/smarty-php/smarty/issues/186 https://github.com/smarty-php/smarty/issues/179
+  - bugfix correct Autoloader update of 2.3.2014 https://github.com/smarty-php/smarty/issues/199
+
+ 04.03.2016
+  - bugfix change from 01.03.2016 will cause $smarty->isCached(..) failure if called multiple time for same template
+    (forum topic 25935)
+
+ 02.03.2016
+  - revert autoloader optimizations because of unexplainable warning when using plugins https://github.com/smarty-php/smarty/issues/199
+
+ 01.03.2016
+  - bugfix template objects must be cached on $smarty->fetch('foo.tpl) calls incase the template is fetched
+    multiple times (forum topic 25909)
+
+ 25.02.2016
+  - bugfix wrong _realpath with 4 or more parent-directories https://github.com/smarty-php/smarty/issues/190
+  - optimization of _realpath
+  - bugfix instanceof expression in template code must be treated as value https://github.com/smarty-php/smarty/issues/191
+
+ 20.02.2016
+  - bugfix {strip} must keep space between hmtl tags. Broken by changes of 10.2.2016 https://github.com/smarty-php/smarty/issues/184
+  - new feature/bugfix  {foreach}{section} add 'properties' attribute to force compilation of loop properties
+    see NEW_FEATURES.txt https://github.com/smarty-php/smarty/issues/189
+
+ 19.02.2016
+  - revert output buffer flushing on display, echo content again because possible problems when PHP files had
+    characters (newline} after ?> at file end https://github.com/smarty-php/smarty/issues/187
+
+ 14.02.2016
+  - new tag {make_nocache} read NEW_FEATURES.txt https://github.com/smarty-php/smarty/issues/110
+  - optimization of sub-template processing
+  - bugfix using extendsall as default resource and {include} inside {block} tags could produce unexpected results https://github.com/smarty-php/smarty/issues/183
+  - optimization of tag attribute compiling
+  - optimization make compiler tag object cache static for higher compilation speed
+
+ 11.02.2016
+  - improvement added KnockoutJS comments to trimwhitespace outputfilter https://github.com/smarty-php/smarty/issues/82
+    https://github.com/smarty-php/smarty/pull/181
+
+ 10.02.2016
+  - bugfix {strip} must keep space on output creating smarty tags within html tags https://github.com/smarty-php/smarty/issues/177
+  - bugfix wrong precedence on special if conditions like '$foo is ... by $bar' could cause wrong code https://github.com/smarty-php/smarty/issues/178
+  - improvement because of ambiguities the inline constant support has been removed from the $foo.bar syntax https://github.com/smarty-php/smarty/issues/149
+  - bugfix other {strip} error with output tags between hmtl https://github.com/smarty-php/smarty/issues/180
+
+ 09.02.2016
+  - move some code from parser into compiler
+  - reformat all code for unique style
+  - update/bugfix scope attribute handling reworked. Read the newfeatures.txt file
+
+ 05.02.2016
+  - improvement internal compiler changes
+
+ 01.02.2016
+  - bugfix {foreach} compilation failed when $smarty->merge_compiled_includes = true and pre-filters are used.
+
+ 29.01.2016
+  - bugfix implement replacement code for _tag_stack property https://github.com/smarty-php/smarty/issues/151
+
+ 28.01.2016
+  - bugfix allow windows network filepath or wrapper (forum topic 25876) https://github.com/smarty-php/smarty/issues/170
+  - bugfix if fetch('foo.tpl') is called on a template object the $parent parameter should default to the calling template object https://github.com/smarty-php/smarty/issues/152
+
+ 27.01.2016
+  - revert bugfix compiling {section} did create warning
+  - bugfix {$smarty.section.customer.loop} did throw compiler error https://github.com/smarty-php/smarty/issues/161
+    update of yesterdays fix
+  - bugfix string resource could inject code at {block} or inline subtemplates through PHP comments https://github.com/smarty-php/smarty/issues/157		
+  - bugfix output filters did not observe nocache code flhttps://github.com/smarty-php/smarty/issues/154g https://github.com/smarty-php/smarty/issues/160
+  - bugfix {extends} with relative file path did not work https://github.com/smarty-php/smarty/issues/154
+    https://github.com/smarty-php/smarty/issues/158
+  - bugfix {capture} data could not been seen in other templates with {$smarty.capture.name} https://github.com/smarty-php/smarty/issues/153
+
+ 26.01.2016
+  - improvement observe Smarty::$_CHARSET in debugging console https://github.com/smarty-php/smarty/issues/169
+  - bugfix compiling {section} did create warning
+  - bugfix {$smarty.section.customer.loop} did throw compiler error https://github.com/smarty-php/smarty/issues/161
+
+ 02.01.2016
+  - update scope handling
+  - optimize block plugin compiler
+  - improvement runtime checks if registered block plugins are callable
+
+ 01.01.2016
+  - remove Smarty::$resource_cache_mode property
+
+ 31.12.2015
+  - optimization of {assign}, {if} and {while} compiled code
+
+ 30.12.2015
+  - bugfix plugin names starting with "php" did not compile https://github.com/smarty-php/smarty/issues/147
+
+ 29.12.2015
+  - bugfix Smarty::error_reporting was not observed when display() or fetch() was called on template objects https://github.com/smarty-php/smarty/issues/145
+
+ 28.12.2015
+  - optimization of {foreach} code size and processing
+
+ 27.12.2015
+  - improve inheritance code
+  - update external methods
+  - code fixes
+  - PHPdoc updates
+
+ 25.12.2015
+  - compile {block} tag code and its processing into classes
+  - optimization replace hhvm extension by inline code
+  - new feature If ACP is enabled force an apc_compile_file() when compiled or cached template was updated
+
+ 24.12.2015
+  - new feature Compiler does now observe the template_dir setting and will create separate compiled files if required
+  - bugfix post filter did fail on template inheritance https://github.com/smarty-php/smarty/issues/144
+
+ 23.12.2015
+  - optimization move internal method decodeProperties back into template object
+  - optimization move subtemplate processing back into template object
+  - new feature Caching does now observe the template_dir setting and will create separate cache files if required
+
+ 22.12.2015
+  - change $xxx_dir properties from private to protected in case Smarty class gets extended
+  - code optimizations
+
+ 21.12.2015
+  - bugfix a filepath starting with '/' or '\' on windows should normalize to the root dir
+    of current working drive https://github.com/smarty-php/smarty/issues/134
+  - optimization of filepath normalization
+  - bugfix {strip} must remove all blanks between html tags https://github.com/smarty-php/smarty/issues/136
+
+ - 3.1.29 - (21.12.2015)
+ 21.12.2015
+  - optimization improve speed of filetime checks on extends and extendsall resource
+
+ 20.12.2015
+  - bugfix failure when the default resource type was set to 'extendsall' https://github.com/smarty-php/smarty/issues/123
+  - update compilation of Smarty special variables
+  - bugfix add addition check for OS type on normalization of file path https://github.com/smarty-php/smarty/issues/134
+  - bugfix the source uid of the extendsall resource must contain $template_dir settings https://github.com/smarty-php/smarty/issues/123
+
+ 19.12.2015
+  - bugfix using $smarty.capture.foo in expressions could fail https://github.com/smarty-php/smarty/pull/138
+  - bugfix broken PHP 5.2 compatibility https://github.com/smarty-php/smarty/issues/139
+  - remove no longer used code
+  - improvement make sure that compiled and cache templates never can contain a trailing '?>?
+
+ 18.12.2015
+  - bugfix regression when modifier parameter was followed by math https://github.com/smarty-php/smarty/issues/132
+
+ 17.12.2015
+  - bugfix {$smarty.capture.nameFail} did lowercase capture name https://github.com/smarty-php/smarty/issues/135
+  - bugfix using {block append/prepend} on same block in multiple levels of inheritance templates could fail (forum topic 25827)
+  - bugfix text content consisting of just a single '0' like in {if true}0{/if} was suppressed (forum topic 25834)
+
+ 16.12.2015
+  - bugfix {foreach} did fail if from atrribute is a Generator class https://github.com/smarty-php/smarty/issues/128
+  - bugfix direct access $smarty->template_dir = 'foo'; should call Smarty::setTemplateDir() https://github.com/smarty-php/smarty/issues/121
+
+ 15.12.2015
+  - bugfix  {$smarty.cookies.foo} did return the $_COOKIE array not the 'foo' value https://github.com/smarty-php/smarty/issues/122
+  - bugfix  a call to clearAllCache() and other should clear all internal template object caches (forum topic 25828)
+
+ 14.12.2015
+  - bugfix  {$smarty.config.foo} broken in 3.1.28 https://github.com/smarty-php/smarty/issues/120
+  - bugfix  multiple calls of {section} with same name droped E_NOTICE error https://github.com/smarty-php/smarty/issues/118
+
+ - 3.1.28 - (13.12.2015)
+ 13.12.2015
+  - bugfix {foreach} and {section} with uppercase characters in name attribute did not work (forum topic 25819)
+  - bugfix $smarty->debugging_ctrl = 'URL' did not work (forum topic 25811)
+  - bugfix Debug Console could display incorrect data when using subtemplates
+
+ 09.12.2015
+  - bugfix Smarty did fail under PHP 7.0.0 with use_include_path = true;
+
+ 09.12.2015
+  - bugfix {strip} should exclude some html tags from stripping, related to fix for https://github.com/smarty-php/smarty/issues/111
+
+ 08.12.2015
+  - bugfix internal template function data got stored in wrong compiled file https://github.com/smarty-php/smarty/issues/114
+
+ 05.12.2015
+  -bugfix {strip} should insert a single space https://github.com/smarty-php/smarty/issues/111
+
+ 25.11.2015
+  -bugfix a left delimter like '[%' did fail on [%$var_[%$variable%]%] (forum topic 25798)
+
+ 02.11.2015
+  - bugfix {include} with variable file name like {include file="foo_`$bar`.tpl"} did fail in 3.1.28-dev https://github.com/smarty-php/smarty/issues/102
+
+ 01.11.2015
+  - update config file processing
+
+ 31.10.2015
+  - bugfix add missing $trusted_dir property to SmartyBC class (forum topic 25751)
+
+ 29.10.2015
+  - improve template scope handling
+
+ 24.10.2015
+  - more optimizations of template processing
+  - bugfix Error when using {include} within {capture} https://github.com/smarty-php/smarty/issues/100
+
+ 21.10.2015
+  - move some code into runtime extensions
+
+ 18.10.2015
+  - optimize filepath normalization
+  - rework of template inheritance
+  - speed and size optimizations
+  - bugfix under HHVM temporary cache file must only be created when caches template was updated
+  - fix compiled code for new {block} assign attribute
+  - update code generated by template function call handler
+
+ 18.09.2015
+  - bugfix {if $foo instanceof $bar} failed to compile if 2nd value is a variable https://github.com/smarty-php/smarty/issues/92
+
+ 17.09.2015
+  - bugfix {foreach} first attribute was not correctly reset since commit 05a8fa2 of 02.08.2015 https://github.com/smarty-php/smarty/issues/90
+
+ 16.09.2015
+  - update compiler by moving no longer needed properties, code optimizations and other
+
+ 14.09.2015
+  - optimize autoloader
+  - optimize subtemplate handling
+  - update template inheritance processing
+  - move code of {call} processing back into Smarty_Internal_Template class
+  - improvement invalidate OPCACHE for cleared compiled and cached template files (forum topic 25557)
+  - bugfix unintended multiple debug windows (forum topic 25699)
+
+ 30.08.2015
+  - size optimization move some runtime functions into extension
+  - optimize inline template processing
+  - optimization merge inheritance child and parent templates into one compiled template file
+
+ 29.08.2015
+  - improvement convert template inheritance into runtime processing
+  - bugfix {$smarty.block.parent} did always reference the root parent block https://github.com/smarty-php/smarty/issues/68
+
+ 23.08.2015
+  - introduce Smarty::$resource_cache_mode and cache template object of {include} inside loop
+  - load seldom used Smarty API methods dynamically to reduce memory footprint
+  - cache template object of {include} if same template is included several times
+  - convert debug console processing to object
+  - use output buffers for better performance and less memory usage
+  - optimize nocache hash processing
+  - remove not really needed properties
+  - optimize rendering
+  - move caching to Smarty::_cache
+  - remove properties with redundant content
+  - optimize Smarty::templateExists()
+  - optimize use_include_path processing
+  - relocate properties for size optimization
+  - remove redundant code
+  - bugfix compiling super globals like {$smarty.get.foo} did fail in the master branch https://github.com/smarty-php/smarty/issues/77
+
+ 06.08.2015
+  - avoid possible circular object references caused by parser/lexer objects
+  - rewrite compileAll... utility methods
+  - commit several  internal improvements
+  - bugfix Smarty failed when compile_id did contain "|"
+
+ 03.08.2015
+  - rework clear cache methods
+  - bugfix compileAllConfig() was broken since 3.1.22 because of the changes in config file processing
+  - improve getIncludePath() to return directory if no file was given
+
+ 02.08.2015
+  - optimization and code cleanup of {foreach} and {section} compiler
+  - rework {capture} compiler
+
+ 01.08.2015
+  - update DateTime object can be instance of DateTimeImmutable since PHP5.5 https://github.com/smarty-php/smarty/pull/75
+  - improvement show resource type and start of template source instead of uid on eval: and string: resource (forum topic 25630)
+
+ 31.07.2015
+  - optimize {foreach} and {section} compiler
+
+ 29.07.2015
+  - optimize {section} compiler for speed and size of compiled code
+
+ 28.07.2015
+  - update for PHP 7 compatibility
+
+ 26.07.2015
+  - improvement impement workaround for HHVM PHP incompatibillity https://github.com/facebook/hhvm/issues/4797
+
+ 25.07.2015
+  - bugfix parser did hang on text starting <?something https://github.com/smarty-php/smarty/issues/74
+
+ 20.07.2015
+  - bugfix config files got recompiled on each request
+  - improvement invalidate PHP 5.5 opcache for recompiled and cached templates  https://github.com/smarty-php/smarty/issues/72
+
+ 12.07.2015
+  - optimize {extends} compilation
+
+ 10.07.2015
+  - bugfix force file: resource in demo resource.extendsall.php
+
+ 08.07.2015
+  - bugfix convert each word of class names to ucfirst in in compiler. (forum topic 25588)
+
+ 07.07.2015
+  - improvement allow fetch() or display() called on a template object to get output from other template
+     like $template->fetch('foo.tpl') https://github.com/smarty-php/smarty/issues/70
+  - improvement Added $limit parameter to regex_replace modifier #71
+  - new feature multiple indices on file: resource
+
+ 06.07.2015
+  - optimize {block} compilation
+  - optimization get rid of __get and __set in source object
+
+ 01.07.2015
+  - optimize compile check handling
+  - update {foreach} compiler
+  - bugfix debugging console did not display string values containing \n, \r or \t correctly https://github.com/smarty-php/smarty/issues/66
+  - optimize source resources
+
+ 28.06.2015
+  - move $smarty->enableSecurity() into Smarty_Security class
+  - optimize security isTrustedResourceDir()
+  - move auto load filter methods into extension
+  - move $smarty->getTemplateVars() into extension
+  - move getStreamVariable() into extension
+  - move $smarty->append() and $smarty->appendByRef() into extension
+  - optimize autoloader
+  - optimize file path normalization
+  - bugfix PATH_SEPARATOR was replaced by mistake in autoloader
+  - remove redundant code
+
+ 27.06.2015
+  - bugfix resolve naming conflict between custom Smarty delimiter '<%' and PHP ASP tags https://github.com/smarty-php/smarty/issues/64
+  - update $smarty->_realpath for relative path not starting with './'
+  - update Smarty security with new realpath handling
+  - update {include_php} with new realpath handling
+  - move $smarty->loadPlugin() into extension
+  - minor compiler optimizations
+  - bugfix allow function plugins with name ending with 'close' https://github.com/smarty-php/smarty/issues/52
+  - rework of $smarty->clearCompiledTemplate() and move it to its own extension
+
+ 19.06.2015
+  - improvement allow closures as callback at $smarty->registerFilter() https://github.com/smarty-php/smarty/issues/59
+
+ - 3.1.27- (18.06.2015)
+ 18.06.2015
+  - bugfix another update on file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56
+
+ - 3.1.26- (18.06.2015)
+ 18.06.2015
+  - bugfix file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56
+
+ 17.06.2015
+  - bugfix calling a plugin with nocache option but no other attributes like {foo nocache} caused call to undefined function https://github.com/smarty-php/smarty/issues/55
+
+ - 3.1.25- (15.06.2015)
+ 15.06.2015
+  - optimization of smarty_cachereource_keyvaluestore.php code
+
+ 14.06.2015
+  - bugfix a relative sub template path could fail if template_dir path did contain /../ https://github.com/smarty-php/smarty/issues/50
+  - optimization rework of path normalization
+  - bugfix an output tag with variable, modifier followed by an operator like {$foo|modifier+1} did fail https://github.com/smarty-php/smarty/issues/53
+
+ 13.06.2015
+  - bugfix a custom cache resource using smarty_cachereource_keyvaluestore.php did fail if php.ini mbstring.func_overload = 2 (forum topic 25568)
+
+ 11.06.2015
+  - bugfix the lexer could hang on very large quoted strings (forum topic 25570)
+
+ 08.06.2015
+  - bugfix using {$foo} as array index like $bar.{$foo} or in double quoted string like "some {$foo} thing" failed https://github.com/smarty-php/smarty/issues/49
+
+ 04.06.2015
+  - bugfix possible error message on unset() while compiling {block} tags https://github.com/smarty-php/smarty/issues/46
+
+ 01.06.2015
+  - bugfix <?xml ... ?> including template variables broken  since 3.1.22 https://github.com/smarty-php/smarty/issues/47
+
+ 27.05.2015
+  - bugfix {include} with variable file name must not create by default individual cache file (since 3.1.22) https://github.com/smarty-php/smarty/issues/43
+
+ 24.05.2015
+  - bugfix if condition string 'neq' broken due to a typo https://github.com/smarty-php/smarty/issues/42
+
+ - 3.1.24- (23.05.2015)
+ 23.05.2015
+  - improvement on php_handling to allow very large PHP sections, better error handling
+  - improvement allow extreme large comment sections (forum 25538)
+
+ 21.05.2015
+  - bugfix broken PHP 5.2 compatibility when compiling <?php tags https://github.com/smarty-php/smarty/issues/40
+  - bugfix named {foreach} comparison like $smarty.foreach.foobar.index > 1 did compile into wrong code https://github.com/smarty-php/smarty/issues/41
+
+ 19.05.2015
+  - bugfix compiler did overwrite existing variable value when setting the nocache attribute https://github.com/smarty-php/smarty/issues/39
+  - bugfix output filter trimwhitespace could run into the pcre.backtrack_limit on large output (code.google issue 220)
+  - bugfix compiler could run into the pcre.backtrack_limit on larger comment or {php} tag sections (forum 25538)
+
+ 18.05.2015
+  - improvement introduce shortcuts in lexer/parser rules for most frequent terms for higher
+    compilation speed
+
+ 16.05.2015
+  - bugfix {php}{/php} did work just for single lines https://github.com/smarty-php/smarty/issues/33
+  - improvement remove not needed ?><?php transitions from compiled code
+  - improvement reduce number of lexer tokens on operators and if conditions
+  - improvement higher compilation speed by modified lexer/parser generator at "smarty/smarty-lexer"
+
+ 13.05.2015
+  - improvement remove not needed ?><?php transitions from compiled code
+  - improvement of debugging:
+      - use fresh Smarty object to display the debug console because of possible problems when the Smarty
+        was extended or Smarty properties had been modified in the class source
+      - display Smarty version number
+      - Truncate lenght of Origin display and extend strin value display to 80 character
+  - bugfix in Smarty_Security  'nl2br' should be a trusted modifier, not PHP function (code.google issue 223)
+
+ 12.05.2015
+  - bugfix {$smarty.constant.TEST} did fail  on undefined constant https://github.com/smarty-php/smarty/issues/28
+  - bugfix access to undefined config variable like {#undef#} did fail https://github.com/smarty-php/smarty/issues/29
+  - bugfix in nested {foreach} saved item attributes got overwritten https://github.com/smarty-php/smarty/issues/33
+
+ - 3.1.23 - (12.05.2015)
+ 12.05.2015
+  - bugfix of smaller performance issue introduce in 3.1.22 when caching is enabled
+  - bugfix missig entry for smarty-temmplate-config in autoloader
+
+ - 3.1.22 - tag was deleted because 3.1.22 did fail caused by the missing entry for smarty-temmplate-config in autoloader
+ 10.05.2015
+  - bugfix custom cache resource did not observe compile_id and cache_id when $cache_locking == true
+  - bugfix cache lock was not handled correctly after timeout when $cache_locking == true
+  - improvement added constants for $debugging
+
+ 07.05.2015
+  - improvement of the debugging console. Read NEW_FEATURES.txt
+  - optimization of resource class loading
+
+ 06.05.2015
+  - bugfix in 3.1.22-dev cache resource must not be loaded for subtemplates
+  - bugfix/improvement in 3.1.22-dev cache locking did not work as expected
+
+ 05.05.2015
+  - optimization on cache update when main template is modified
+  - optimization move <?php ?> handling from parser to new compiler module
+
+ 05.05.2015
+  - bugfix code could be messed up when {tags} are used in multiple attributes https://github.com/smarty-php/smarty/issues/23
+
+ 04.05.2015
+  - bugfix Smarty_Resource::parseResourceName incompatible with Google AppEngine (https://github.com/smarty-php/smarty/issues/22)
+  - improvement use is_file() checks to avoid errors suppressed by @ which could still cause problems (https://github.com/smarty-php/smarty/issues/24)
+
+ 28.04.2015
+  - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508) 2nd fix
+
+ 28.04.2015
+  - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508)
+
+ 23.04.2015
+  - bugfix a nocache template variable used as parameter at {insert} was by mistake cached
+
+ 20.04.2015
+  - bugfix at a template function containing nocache code a parmeter could overwrite a template variable of same name
+
+ 27.03.2015
+  - bugfix Smarty_Security->allow_constants=false; did also disable true, false and null (change of 16.03.2015)
+  - improvement added a whitelist for trusted constants to security Smarty_Security::$trusted_constants (forum topic 25471)
+
+ 20.03.2015
+  - bugfix make sure that function properties get saved only in compiled files containing the fuction definition {forum topic 25452}
+  - bugfix correct update of global variable values on exit of template functions. (reported under Smarty Developers)
+
+ 16.03.2015
+ - bugfix  problems with {function}{/function} and {call} tags in different subtemplate cache files {forum topic 25452}
+ - bugfix  Smarty_Security->allow_constants=false; did not disallow direct usage of defined constants like {SMARTY_DIR} {forum topic 25457}
+ - bugfix  {block}{/block} tags did not work inside double quoted strings https://github.com/smarty-php/smarty/issues/18
+
+
+ 15.03.2015
+ - bugfix  $smarty->compile_check must be restored before rendering of a just updated cache file {forum 25452}
+
+ 14.03.2015
+ - bugfix  {nocache}  {/nocache} tags corrupted code when used within a nocache section caused by a nocache template variable.
+
+ - bugfix  template functions defined with {function} in an included subtemplate could not be called in nocache
+           mode with {call... nocache} if the subtemplate had it's own cache file {forum 25452}
+
+ 10.03.2015
+ - bugfix {include ... nocache} whith variable file or compile_id attribute was not executed in nocache mode.
+
+ 12.02.2015
+ - bugfix multiple Smarty::fetch() of same template when $smarty->merge_compiled_includes = true; could cause function already defined error
+
+ 11.02.2015
+ - bugfix recursive {includes} did create E_NOTICE message when $smarty->merge_compiled_includes = true; (github issue #16)
+
+ 22.01.2015
+ - new feature security can now control access to static methods and properties
+                see also NEW_FEATURES.txt
+
+ 21.01.2015
+ - bugfix clearCompiledTemplates(), clearAll() and clear() could try to delete whole drive at wrong path permissions because realpath() fail (forum 25397)
+ - bugfix 'self::' and 'parent::' was interpreted in template syntax as static class
+
+ 04.01.2015
+ - push last weeks changes to github
+
+ - different optimizations
+ - improvement automatically create different versions of compiled templates and config files depending
+   on property settings.
+ - optimization restructure template processing by moving code into classes it better belongs to
+ - optimization restructure config file processing
+
+ 31.12.2014
+ - bugfix use function_exists('mb_get_info') for setting Smarty::$_MBSTRING.
+   Function mb_split could be overloaded depending on php.ini mbstring.func_overload
+
+
+ 29.12.2014
+ - new feature security can now limit the template nesting level by property $max_template_nesting
+                see also NEW_FEATURES.txt (forum 25370)
+
+ 29.12.2014
+ - new feature security can now disable special $smarty variables listed in property $disabled_special_smarty_vars
+                see also NEW_FEATURES.txt (forum 25370)
+
+ 27.12.2014
+  - bugfix clear internal _is_file_cache when plugins_dir was modified
+
+ 13.12.2014
+  - improvement optimization of lexer and parser resulting in a up to 30% higher compiling speed
+
+ 11.12.2014
+  - bugfix resolve parser ambiguity between constant print tag {CONST} and other smarty tags after change of 09.12.2014
+
+ 09.12.2014
+  - bugfix variables $null, $true and $false did not work after the change of 12.11.2014 (forum 25342)
+  - bugfix call of template function by a variable name did not work after latest changes (forum 25342)
+
+ 23.11.2014
+  - bugfix a plugin with attached modifier could fail if the tag was immediately followed by another Smarty tag (since 3.1.21) (forum 25326)
+
+ 13.11.2014
+  - improvement move autoload code into Autoloader.php. Use Composer autoloader when possible
+
+ 12.11.2014
+ - new feature added support of namespaces to template code
+
+ 08.11.2014 - 10.11.2014
+ - bugfix subtemplate called in nocache mode could be called with wrong compile_id when it did change on one of the calling templates
+ - improvement add code of template functions called in nocache mode dynamically to cache file (related to bugfix of 01.11.2014)
+ - bugfix Debug Console did not include all data from merged compiled subtemplates
+
+ 04.11.2014
+ - new feature $smarty->debugging = true; => overwrite existing Debug Console window (old behaviour)
+               $smarty->debugging = 2; => individual Debug Console window by template name
+
+ 03.11.2014
+ - bugfix Debug Console did not show included subtemplates since 3.1.17 (forum 25301)
+ - bugfix Modifier debug_print_var did not limit recursion or prevent recursive object display at Debug Console
+    (ATTENTION: parameter order has changed to be able to specify maximum recursion)
+ - bugfix Debug consol did not include subtemplate information with $smarty->merge_compiled_includes = true
+ - improvement The template variables are no longer displayed as objects on the Debug Console
+ - improvement $smarty->createData($parent = null, $name = null) new optional name parameter for display at Debug Console
+ - addition of some hooks for future extension of Debug Console
+
+ 01.11.2014
+ - bugfix and enhancement on subtemplate {include} and template {function} tags.
+   * Calling a template which has a nocache section could fail if it was called from a cached and a not cached subtemplate.
+   * Calling the same subtemplate cached and not cached with the $smarty->merge_compiled_includes enabled could cause problems
+   * Many smaller related changes
+
+ 30.10.2014
+ - bugfix access to class constant by object like {$object::CONST} or variable class name {$class::CONST} did not work (forum 25301)
+
+ 26.10.2014
+ - bugfix E_NOTICE message was created during compilation when ASP tags '<%' or '%>' are in template source text
+ - bugfix merge_compiled_includes option failed when caching  enables and same subtemplate was included cached and not cached
+
+ - 3.1.21 - (18.10.2014)
+ 18.10.2014
+  - composer moved to github
+
+ 17.10.2014
+ - bugfix on $php_handling security and optimization of smarty_internal_parsetree (Thue Kristensen)
+
+ 16.10.2014
+ - bugfix composer.json update
+
+ 15.10.2014
+ - bugfix calling a new created cache file with fetch() and Smarty::CACHING_LIFETIME_SAVED multiple times did fail (forum 22350)
+
+ 14.10.2014
+ - bugfix any tag placed within "<script language=php>" will throw a security exception to close all thinkable holes
+ - bugfix classmap in root composer.json should start at "libs/..."
+ - improvement cache is_file(file_exists) results of loadPlugin() to avoid unnecessary calls during compilation (Issue 201}
+
+ 12.10.2014
+ - bugfix a comment like "<script{*foo*} language=php>" bypassed $php_handling checking (Thue Kristensen)
+ - bugfix change of 08.10.2014 could create E_NOTICE meassage when using "<?php" tags
+ - bugfix "<script language=php>" with $php_handling PHP_PASSTHRU was executed in {nocache} sections
+
+ - 3.1.20 - (09.10.2014)
+ 08.10.2014
+ - bugfix security mode of "<script language=php>" must be controlled by $php_handling property (Thue Kristensen)
+
+ 01.10.2014
+ - bugfix template resource of inheritance blocks could get invalid if the default resource type is not 'file'(Issue 202)
+ - bugfix existing child {block} tag must override parent {block} tag append / prepend setting (topic 25259)
+
+ 02.08.2014
+ - bugfix modifier wordwrap did output break string wrong if first word was exceeding length with cut = true (topic 25193)
+
+ 24.07.2014
+ - bugfix cache clear when cache folder does not exist
+
+ 16.07.2014
+ - enhancement remove BOM automatically from template source (topic 25161)
+
+ 04.07.2014
+ - bugfix the bufix of 02.06.2014 broke correct handling of child templates with same name but different template folders in extends resource (issue 194 and topic 25099)
+
+ - 3.1.19 - (30.06.2014)
+ 20.06.2014
+ - bugfix template variables could not be passed as parameter in {include} when the include was in a {nocache} section (topic 25131)
+
+ 17.06.2014
+ - bugfix large template text of some charsets could cause parsing errors (topic 24630)
+
+ 08.06.2014
+ - bugfix registered objects did not work after spelling fixes of 06.06.2014
+ - bugfix {block} tags within {literal} .. {/literal} got not displayed correctly (topic 25024)
+ - bugfix UNC WINDOWS PATH like "\\psf\path\to\dir" did not work as template directory (Issue 192)
+ - bugfix {html_image} security check did fail on files relative to basedir (Issue 191)
+
+ 06.06.2014
+ - fixed PHPUnit outputFilterTrimWhitespaceTests.php assertion of test result
+ - fixed spelling, PHPDoc , minor errors, code cleanup
+
+ 02.06.2014
+ - using multiple cwd with relative template dirs could result in identical compiled file names. (issue 194 and topic 25099)
+
+ 19.04.2014
+ - bugfix calling createTemplate(template, data) with empty data array caused notice of array to string conversion (Issue 189)
+ - bugfix clearCompiledTemplate() did not delete files on WINDOWS when a compile_id was specified
+
+ 18.04.2014
+ - revert bugfix of 5.4.2014 because %-e date format is not supported on all operating systems
+
+ - 3.1.18 - (07.04.2014)
+ 06.04.2014
+ - bugfix template inheritance fail when using custom resource after patch of 8.3.2014 (Issue 187)
+ - bugfix update of composer file (Issue 168 and 184)
+
+ 05.04.2014
+ - bugfix default date format leads to extra spaces when displaying dates with single digit days (Issue 165)
+
+ 26.03.2014
+ - bugfix Smart_Resource_Custom should not lowercase the resource name (Issue 183)
+
+ 24.03.2014
+ - bugfix using a {foreach} property like @iteration could fail when used in inheritance parent templates (Issue 182)
+
+ 20.03.2014
+ - bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899)
+
+ 18.03.2014
+ - revert change of 17.03.2014
+
+17.03.2014
+ - bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899)
+
+ 15.03.2014
+ - bugfix Smarty_CacheResource_Keyvaluestore did use different keys on read/writes and clearCache() calls (Issue 169)
+
+ 13.03.2014
+ - bugfix clearXxx() change of 27.1.2014 did not work when specifing cache_id or compile_id  (forum topic 24868 and 24867)
+
+ - 3.1.17 -
+ 08.03.2014
+ - bugfix relative file path {include} within {block} of child templates did throw exception on first call (Issue 177)
+
+ 17.02.2014
+ - bugfix Smarty failed when executing PHP on HHVM (Hip Hop 2.4) because uniqid('',true) does return string with ',' (forum topic 20343)
+
+ 16.02.2014
+ - bugfix a '//' or '\\' in template_dir path could produce wrong path on relative filepath in {include} (Issue 175)
+
+ 05.02.2014
+ - bugfix shared.literal_compiler_param.php did throw an exception when literal did contain a '-' (smarty-developers group)
+
+ 27.01.2014
+ - bugfix $smarty->debugging = true; did show the variable of the $smarty object not the variables used in display() call (forum topic 24764)
+ - bugfix clearCompiledTemplate(), clearAll() and clear() should use realpath to avoid possible exception from RecursiveDirectoryIterator (Issue 171)
+
+ 26.01.2014
+ - bugfix  undo block nesting checks for {nocache} for reasons like forum topic 23280 (forum topic 24762)
+
+ 18.01.2014
+ - bugfix the compiler did fail when using template inheritance and recursive {include} (smarty-developers group)
+
+ 11.01.2014
+ - bugfix "* }" (spaces before right delimiter) was interpreted by mistake as comment end tag (Issue 170)
+ - internals  content cache should be clear when updating cache file
+
+ 08.01.2014
+ - bugfix Smarty_CacheResource_Custom did not handle template resource type specifications on clearCache() calls (Issue 169)
+ - bugfix SmartyBC.class.php should use require_once to load Smarty.class.php (forum topic 24683)
+
+ - 3.1.16 -
+ 15.12.2013
+ - bugfix {include} with {block} tag handling (forum topic 24599, 24594, 24682) (Issue 161)
+   Read 3.1.16_RELEASE_NOTES for more details
+ - enhancement additional debug output at $smarty->_parserdebug = true;
+
+ 07.11.2013
+ - bugfix too restrictive handling of {include} within {block} tags. 3.1.15 did throw errors where 3.1.14 did not (forum topic 24599)
+ - bugfix compiler could fail if PHP mbstring.func_overload is enabled  (Issue 164)
+
+ 28.10.2013
+ - bugfix variable resource name at custom resource plugin did not work within {block} tags (Issue 163)
+ - bugfix notice "Trying to get property of non-object" removed (Issue 163)
+ - bugfix correction of modifier capitalize fix from 3.10.2013  (issue 159)
+ - bugfix multiple {block}s with same name in parent did not work (forum topic 24631)
+
+ 20.10.2013
+ - bugfix a variable file name at {extends} tag did fail (forum topic 24618)
+
+ 14.10.2013
+ - bugfix yesterdays fix could result in an undefined variable
+
+ 13.10.2013
+ - bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24594) (Issue 161)
+.- bugfix relative includes with same name like {include './foo.tpl'} from different folder failed (forum topic 24590)(Issue 161)
+
+ 04.10.2013
+ - bugfix variable file names at {extends} had been disbabled by mistake with the rewrite of
+   template inheritance of 24.08.2013   (forum topic 24585)
+
+03.10.2013
+ - bugfix loops using modifier capitalize did eat up memory (issue 159)
+
+ - Smarty 3.1.15 -
+01.10.2013
+ - use current delimiters in compiler error messages (issue 157)
+ - improvement on performance when using error handler and multiple template folders (issue 152)
+
+17.09.2013
+ - improvement added patch for additional SmartyCompilerException properties for better access to source information (forum topic 24559)
+
+16.09.2013
+ - bugfix recompiled templates did not show on first request with zend opcache cache (forum topic 24320)
+
+13.09.2013
+ - bugfix html_select_time defaulting error for the Meridian dropdown (forum topic 24549)
+
+09.09.2012
+- bugfix incorrect compiled code with array(object,method) callback at registered Variable Filter (forum topic 24542)
+
+27.08.2013
+- bugfix delimiter followed by linebreak did not work as auto literal after update from 24.08.2013 (forum topic 24518)
+
+24.08.2013
+- bugfix and enhancement
+  Because several recent problems with template inheritance the {block} tag compiler has been rewriten
+   - Error messages shown now the correct child template file and line number
+   - The compiler could fail on some larger UTF-8 text block (forum topic 24455)
+   - The {strip} tag can now be placed outside {block} tags in child templates (forum topic 24289)
+- change SmartyException::$escape  is now false by default
+- change PHP traceback has been remove for SmartyException and SmartyCompilerException
+
+14.08.2013
+- bugfix compiled filepath of config file did not observe different config_dir (forum topic 24493)
+
+13.08.2013
+- bugfix the internal resource cache did not observe config_dir changes (forum topic 24493)
+
+12.08.2013
+- bugfix internal $tmpx variables must be unique over all inheritance templates (Issue 149)
+
+10.08.2013
+- bugfix a newline was eaten when a <?xml ... ?> was passed by a Smarty variable and caching was enabled (forum topic 24482)
+
+29.07.2013
+- bugfix headers already send warning thrown when using 'SMARTY_DEBUG=on' from URL (Issue 148)
+
+27.07.2013
+- enhancement allow access to properties of registered opjects for Smarty2 BC (forum topic 24344)
+
+26.07.2013
+- bugfix template inheritance nesting problem (forum topic 24387)
+
+15.7.2013
+- update code generated by PSR-2 standards fixer which introduced PHP 5.4 incompatibilities of 14.7.2013
+
+14.7.2013
+- bugfix increase of internal maximum parser stacksize to allow more complex tag code {forum topic 24426}
+- update for PHP 5.4 compatibility
+- reformat source to PSR-2 standard
+
+12.7.2013
+- bugfix Do not remove '//' from file path at normalization (Issue 142)
+
+2.7.2013
+- bugfix trimwhitespace would replace captured items in wrong order (forum topic 24387)
+
+## Smarty-3.1.14 -
+27.06.2013
+- bugfix removed PHP 5.5 deprecated preg_replace /e option in modifier capitalize (forum topic 24389)
+
+17.06.2013
+- fixed spelling in sources and documentation (from smarty-developers forum Veres Lajos)
+- enhancement added constant SMARTY::CLEAR_EXPIRED for the change of 26.05.2013 (forum topic 24310)
+- bugfix added smarty_security.php to composer.json (Issue 135)
+
+26.05.2013
+- enhancement an expire_time of -1 in clearCache() and clearAllCache() will delete outdated cache files
+  by their individual cache_lifetime used at creation (forum topic 24310)
+
+21.05.2013
+- bugfix modifier strip_tags:true was compiled into wrong code (Forum Topic 24287)
+- bugfix /n after ?> in Smarty.class.php did start output buffering (Issue 138)
+
+25.04.2013
+- bugfix escape and wordrap modifier could be compiled into wrong code when used in {nocache}{/nocache}
+  section but caching is disabled  (Forum Topic 24260)
+
+05.04.2013
+- bugfix post filter must not run when compiling inheritance child blocks (Forum Topic 24094)
+- bugfix after the fix for Issue #130 compiler exceptions got double escaped (Forum Topic 24199)
+
+28.02.2013
+- bugfix nocache blocks could be lost when using CACHING_LIFETIME_SAVED (Issue #133)
+- bugfix Compile ID gets nulled when compiling child blocks (Issue #134)
+
+
+24.01.2013
+- bugfix wrong tag type in smarty_internal_templatecompilerbase.php could cause wrong plugin search order (Forum Topic 24028)
+
+## Smarty-3.1.13 -
+13.01.2013
+- enhancement allow to disable exception message escaping by SmartyException::$escape = false;  (Issue #130)
+
+09.01.2013
+- bugfix compilation did fail when a prefilter did modify an {extends} tag c
+- bugfix template inheritance could fail if nested {block} tags in childs did contain {$smarty.block.child} (Issue #127)
+- bugfix template inheritance could fail if {block} tags in childs did have similar name as used plugins (Issue #128)
+- added abstract method declaration doCompile() in Smarty_Internal_TemplateCompilerBase (Forum Topic 23969)
+
+06.01.2013
+- Allow '://' URL syntax in template names of stream resources  (Issue #129)
+
+27.11.2012
+- bugfix wrong variable usage in smarty_internal_utility.php (Issue #125)
+
+26.11.2012
+- bugfix global variable assigned within template function are not seen after template function exit (Forum Topic 23800)
+
+24.11.2012
+- made SmartyBC loadable via composer (Issue #124)
+
+20.11.2012
+- bugfix assignGlobal() called from plugins did not work (Forum Topic 23771)
+
+13.11.2012
+- adding attribute "strict" to html_options, html_checkboxes, html_radios to only print disabled/readonly attributes if their values are true or "disabled"/"readonly" (Issue #120)
+
+01.11.2012
+- bugfix muteExcpetedErrors() would screw up for non-readable paths (Issue #118)
+
+## Smarty-3.1.12  -
+14.09.2012
+- bugfix template inheritance failed to compile with delimiters {/ and /} (Forum Topic 23008)
+
+11.09.2012
+- bugfix escape Smarty exception messages to avoid possible script execution
+
+10.09.2012
+- bugfix tag option flags and shorttag attributes did not work when rdel started with '=' (Forum Topic 22979)
+
+31.08.2012
+- bugfix resolving relative paths broke in some circumstances (Issue #114)
+
+22.08.2012
+- bugfix test MBString availability through mb_split, as it could've been compiled without regex support (--enable-mbregex).
+  Either we get MBstring's full package, or we pretend it's not there at all.
+
+21.08.2012
+- bugfix $auto_literal = false did not work with { block} tags in child templates
+  (problem was reintroduced after fix in 3.1.7)(Forum Topic 20581)
+
+17.08.2012
+- bugfix compiled code of nocache sections could contain wrong escaping (Forum Topic 22810)
+
+15.08.2012
+- bugfix template inheritance did produce wrong code if subtemplates with {block} was
+  included several times (from smarty-developers forum)
+
+14.08.2012
+- bugfix PHP5.2 compatibility compromised by SplFileInfo::getBasename() (Issue 110)
+
+01.08.2012
+- bugfix avoid PHP error on $smarty->configLoad(...) with invalid section specification (Forum Topic 22608)
+
+30.07.2012
+-bugfix {assign} in a nocache section should not overwrite existing variable values
+   during compilation (issue 109)
+
+28.07.2012
+- bugfix array access of config variables did not work (Forum Topic 22527)
+
+19.07.2012
+- bugfix the default plugin handler did create wrong compiled code for static class methods
+  from external script files (issue 108)
+
+## Smarty-3.1.11 -
+30.06.2012
+- bugfix {block.. hide} did not work as nested child (Forum Topic 22216)
+
+25.06.2012
+- bugfix the default plugin handler did not allow static class methods for modifier (issue 85)
+
+24.06.2012
+- bugfix escape modifier support for PHP < 5.2.3 (Forum Topic 21176)
+
+11.06.2012
+- bugfix the patch for Topic 21856 did break tabs between tag attributes (Forum Topic 22124)
+
+## Smarty-3.1.10  -
+09.06.2012
+- bugfix the compiler did ignore registered compiler plugins for closing tags (Forum Topic 22094)
+- bugfix the patch for Topic 21856 did break multiline tags (Forum Topic 22124)
+
+## Smarty-3.1.9 -
+07.06.2012
+- bugfix fetch() and display() with relative paths (Issue 104)
+- bugfix treat "0000-00-00" as 0 in modifier.date_format (Issue 103)
+
+24.05.2012
+- bugfix Smarty_Internal_Write_File::writeFile() could cause race-conditions on linux systems (Issue 101)
+- bugfix attribute parameter names of plugins may now contain also "-"  and ":"  (Forum Topic 21856)
+- bugfix add compile_id to cache key of of source (Issue 97)
+
+22.05.2012
+- bugfix recursive {include} within {section} did fail (Smarty developer group)
+
+12.05.2012
+- bugfix {html_options} did not properly escape values (Issue 98)
+
+03.05.2012
+- bugfix make HTTP protocall version variable (issue 96)
+
+02.05.2012
+- bugfix  {nocache}{block}{plugin}... did produce wrong compiled code when caching is disabled (Forum Topic 21572, issue 95)
+
+12.04.2012
+- bugfix Smarty did eat the linebreak after the <?xml...?> closing tag (Issue 93)
+- bugfix concurrent cache updates could create a warning (Forum Topic 21403)
+
+08.04.2012
+- bugfix "\\" was not escaped correctly when generating nocache code (Forum Topic 21364)
+
+30.03.2012
+- bugfix template inheritance did  not throw exception when a parent template was deleted (issue 90)
+
+27.03.2012
+- bugfix prefilter did run multiple times on inline subtemplates compiled into several main templates (Forum Topic 21325)
+- bugfix implement Smarty2's behaviour of variables assigned by reference in SmartyBC. {assign} will affect all references.
+  (issue 88)
+
+21.03.2012
+- bugfix compileAllTemplates() and compileAllConfig() did not return the number of compiled files (Forum Topic 21286)
+
+13.03.2012
+- correction of yesterdays bugfix (Forum Topic 21175 and 21182)
+
+12.03.2012
+- bugfix a double quoted string of "$foo" did not compile into PHP "$foo" (Forum Topic 21175)
+- bugfix template inheritance did set $merge_compiled_includes globally true
+
+03.03.2012
+- optimization of compiling speed when same modifier was used several times
+
+02.03.2012
+- enhancement the default plugin handler can now also resolve undefined modifier (Smarty::PLUGIN_MODIFIER)
+  (Issue 85)
+
+## Smarty-3.1.8  -
+19.02.2012
+- bugfix {include} could result in a fatal error if used in appended or prepended nested {block} tags
+  (reported by mh and Issue 83)
+- enhancement added Smarty special variable $smarty.template_object to return the current template object (Forum Topic 20289)
+
+
+07.02.2012
+- bugfix increase entropy of internal function names in compiled and cached template files (Forum Topic 20996)
+- enhancement cacheable parameter added to default plugin handler, same functionality as in registerPlugin (request by calguy1000)
+
+06.02.2012
+- improvement stream_resolve_include_path() added to Smarty_Internal_Get_Include_Path (Forum Topic 20980)
+- bugfix fetch('extends:foo.tpl') always yielded $source->exists == true (Forum Topic 20980)
+- added modifier unescape:"url", fix (Forum Topic 20980)
+- improvement replaced some calls of preg_replace with str_replace (Issue 73)
+
+30.01.2012
+- bugfix Smarty_Security internal $_resource_dir cache wasn't properly propagated
+
+27.01.2012
+- bugfix Smarty did not a template name of "0" (Forum Topic 20895)
+
+20.01.2012
+- bugfix typo in Smarty_Internal_Get_IncludePath did cause runtime overhead (Issue 74)
+- improvment remove unneeded assigments (Issue 75 and 76)
+- fixed typo in template parser
+- bugfix output filter must not run before writing cache when template does contain nocache code (Issue 71)
+
+02.01.2012
+- bugfix {block foo nocache} did not load plugins within child {block} in nocache mode (Forum Topic 20753)
+
+29.12.2011
+- bugfix enable more entropy in Smarty_Internal_Write_File for "more uniqueness" and Cygwin compatibility (Forum Topic 20724)
+- bugfix embedded quotes in single quoted strings did not compile correctly in {nocache} sections (Forum Topic 20730)
+
+28.12.2011
+- bugfix Smarty's internal header code must be excluded from postfilters (issue 71)
+
+22.12.2011
+- bugfix the new lexer of 17.12.2011 did fail if mbstring.func_overload != 0 (issue 70) (Forum Topic 20680)
+- bugfix template inheritace did fail if mbstring.func_overload != 0 (issue 70) (Forum Topic 20680)
+
+20.12.2011
+- bugfix template inheritance: {$smarty.block.child} in nested child {block} tags did not return
+  content after {$smarty.block.child} (Forum Topic 20564)
+
+## Smarty-3.1.7 -
+18.12.2011
+- bugfix strings ending with " in multiline strings of config files failed to compile (issue #67)
+- added chaining to Smarty_Internal_Templatebase
+- changed unloadFilter() to not return a boolean in favor of chaining and API conformity
+- bugfix unregisterObject() raised notice when object to unregister did not exist
+- changed internals to use Smarty::$_MBSTRING ($_CHARSET, $_DATE_FORMAT) for better unit testing
+- added Smarty::$_UTF8_MODIFIER for proper PCRE charset handling (Forum Topic 20452)
+- added Smarty_Security::isTrustedUri() and Smarty_Security::$trusted_uri to validate
+  remote resource calls through {fetch} and {html_image} (Forum Topic 20627)
+
+17.12.2011
+- improvement of compiling speed by new handling of plain text blocks in the lexer/parser (issue #68)
+
+16.12.2011
+- bugfix the source exits flag and timestamp was not setup when template was in php include path (issue #69)
+
+9.12.2011
+- bugfix {capture} tags around recursive {include} calls did throw exception (Forum Topic 20549)
+- bugfix $auto_literal = false did not work with { block} tags in child templates (Forum Topic 20581)
+- bugfix template inheritance: do not include code of {include} in overloaded {block} into compiled
+  parent template (Issue #66}
+- bugfix template inheritance: {$smarty.block.child} in nested child {block} tags did not return expected
+  result (Forum Topic 20564)
+
+## Smarty-3.1.6  -
+30.11.2011
+- bugfix is_cache() for individual cached subtemplates with $smarty->caching = CACHING_OFF did produce
+  an exception (Forum Topic 20531)
+
+29.11.2011
+- bugfix added exception if the default plugin handler did return a not static callback (Forum Topic 20512)
+
+25.11.2011
+- bugfix {html_select_date} and {html_slecet_time} did not default to current time if "time" was not specified
+  since r4432 (issue 60)
+
+24.11.2011
+- bugfix a subtemplate later used as main template did use old variable values
+
+21.11.2011
+- bugfix cache file could include unneeded modifier plugins under certain condition
+
+18.11.2011
+- bugfix declare all directory properties private to map direct access to getter/setter also on extended Smarty class
+
+16.11.2011
+- bugfix Smarty_Resource::load() did not always return a proper resource handler (Forum Topic 20414)
+- added escape argument to html_checkboxes and html_radios (Forum Topic 20425)
+
+## Smarty-3.1.5  -
+14.11.2011
+- bugfix allow space between function name and open bracket (forum topic 20375)
+
+09.11.2011
+- bugfix different behaviour of uniqid() on cygwin. See https://bugs.php.net/bug.php?id=34908
+  (forum topic 20343)
+
+01.11.2011
+- bugfix {if} and {while} tags without condition did not throw a SmartyCompilerException (Issue #57)
+- bugfix multiline strings in config files could fail on longer strings (reopened Issue #55)
+
+22.10.2011
+- bugfix smarty_mb_from_unicode() would not decode unicode-points properly
+- bugfix use catch Exception instead UnexpectedValueException in
+  clearCompiledTemplate to be PHP 5.2 compatible
+
+21.10.2011
+- bugfix apostrophe in plugins_dir path name failed (forum topic 20199)
+- improvement sha1() for array keys longer than 150 characters
+- add Smarty::$allow_ambiguous_resources to activate unique resource handling (Forum Topic 20128)
+
+20.10.2011
+- @silenced unlink() in Smarty_Internal_Write_File since debuggers go haywire without it.
+- bugfix Smarty::clearCompiledTemplate() threw an Exception if $cache_id was not present in $compile_dir when $use_sub_dirs = true.
+- bugfix {html_select_date} and {html_select_time} did not properly handle empty time arguments (Forum Topic 20190)
+- improvement removed unnecessary sha1()
+
+19.10.2011
+- revert PHP4 constructor message
+- fixed PHP4 constructor message
+
+## Smarty-3.1.4 -
+19.10.2011
+- added exception when using PHP4 style constructor
+
+16.10.2011
+- bugfix testInstall() did not propery check cache_dir and compile_dir
+
+15.10.2011
+- bugfix Smarty_Resource and Smarty_CacheResource runtime caching (Forum Post 75264)
+
+14.10.2011
+- bugfix unique_resource did not properly apply to compiled resources (Forum Topic 20128)
+- add locking to custom resources (Forum Post 75252)
+- add Smarty_Internal_Template::clearCache() to accompany isCached() fetch() etc.
+
+13.10.2011
+- add caching for config files in Smarty_Resource
+- bugfix disable of caching after isCached() call did not work (Forum Topic 20131)
+- add concept unique_resource to combat potentially ambiguous template_resource values when custom resource handlers are used (Forum Topic 20128)
+- bugfix multiline strings in config files could fail on longer strings (Issue #55)
+
+11.10.2011
+- add runtime checks for not matching {capture}/{/capture} calls (Forum Topic 20120)
+
+10.10.2011
+- bugfix variable name typo in {html_options} and {html_checkboxes} (Issue #54)
+- bugfix <?xml> tag did create wrong output when caching enabled and the tag was in included subtemplate
+- bugfix Smarty_CacheResource_mysql example was missing strtotime() calls
+
+## Smarty-3.1.3  -
+07.10.2011
+- improvement removed html comments from {mailto} (Forum Topic 20092)
+- bugfix testInstall() would not show path to internal plugins_dir (Forum Post 74627)
+- improvement testInstall() now showing resolved paths and checking the include_path if necessary
+- bugfix html_options plugin did not handle object values properly (Issue #49, Forum Topic 20049)
+- improvement html_checkboxes and html_radios to accept null- and object values, and label_ids attribute
+- improvement removed some unnecessary count()s
+- bugfix parent pointer was not set when fetch() for other template was called on template object
+
+06.10.2011
+- bugfix switch lexer internals depending on mbstring.func_overload
+- bugfix start_year and end_year of {html_select_date} did not use current year as offset base (Issue #53)
+
+05.10.2011
+- bugfix of problem introduced with r4342 by replacing strlen() with isset()
+- add environment configuration issue with mbstring.func_overload Smarty cannot compensate for (Issue #45)
+- bugfix nofilter tag option did not disable default modifier
+- bugfix html_options plugin did not handle null- and object values properly (Issue #49, Forum Topic 20049)
+
+04.10.2011
+- bugfix assign() in plugins called in subtemplates did change value also in parent template
+- bugfix of problem introduced with r4342 on math plugin
+- bugfix output filter should not run on individually cached subtemplates
+- add unloadFilter() method
+- bugfix has_nocache_code flag was not reset before compilation
+
+## Smarty-3.1.2  -
+03.10.2011
+- improvement add internal $joined_template_dir property instead computing it on the fly several times
+
+01.10.2011
+- improvement replaced most in_array() calls by more efficient isset() on array_flip()ed haystacks
+- improvement replaced some strlen($foo) > 3 calls by isset($foo[3])
+- improvement Smarty_Internal_Utility::clearCompiledTemplate() removed redundant strlen()s
+
+29.09.2011
+- improvement of Smarty_Internal_Config::loadConfigVars() dropped the in_array for index look up
+
+28.09.2011
+- bugfix on template functions called nocache calling other template functions
+
+27.09.2011
+- bugfix possible warning "attempt to modify property of non-object" in {section} (issue #34)
+- added chaining to Smarty_Internal_Data so $smarty->assign('a',1)->assign('b',2); is possible now
+- bugfix remove race condition when a custom resource did change timestamp during compilation
+- bugfix variable property did not work on objects variable in template
+- bugfix smarty_make_timestamp() failed to process DateTime objects properly
+- bugfix wrong resource could be used on compile check of custom resource
+
+26.09.2011
+- bugfix repeated calls to same subtemplate did not make use of cached template object
+
+24.09.2011
+- removed internal muteExpectedErrors() calls in favor of having the implementor call this once from his application
+- optimized muteExpectedErrors() to pass errors to the latest registered error handler, if appliccable
+- added compile_dir and cache_dir to list of muted directories
+- improvment better error message for undefined templates at {include}
+
+23.09.2011
+- remove unused properties
+- optimization use real function instead anonymous function for preg_replace_callback
+- bugfix a relative {include} in child template blocks failed
+- bugfix direct setting of $template_dir, $config_dir, $plugins_dir in __construct() of an
+  extended Smarty class created problems
+- bugfix error muting was not implemented for cache locking
+
+## Smarty 3.1.1  -
+22.09.2011
+- bugfix {foreachelse} does fail if {section} was nested inside {foreach}
+- bugfix debug.tpl did not display correctly when it was compiled with escape_html = true
+
+21.09.2011
+- bugfix look for mixed case plugin file names as in 3.0 if not found try all lowercase
+- added $error_muting to suppress error messages even for badly implemented error_handlers
+- optimized autoloader
+- reverted ./ and ../ handling in fetch() and display() - they're allowed again
+
+20.09.2011
+- bugfix removed debug echo output while compiling template inheritance
+- bugfix relative paths in $template_dir broke relative path resolving in {include "../foo.tpl"}
+- bugfix {include} did not work inside nested {block} tags
+- bugfix {assign} with scope root and global did not work in all cases
+
+19.09.2011
+- bugfix regression in Smarty_CacheReource_KeyValueStore introduced by r4261
+- bugfix output filter shall not run on included subtemplates
+
+18.09.2011
+- bugfix template caching did not care about file.tpl in different template_dir
+- bugfix {include $file} was broken when merge_compiled_incluges = true
+- bugfix {include} was broken when merge_compiled_incluges = true and same indluded template
+  was used in different main templates in one compilation run
+- bugfix for Smarty2 style compiler plugins on unnamed attribute passing like {tag $foo $bar}
+- bugfix debug.tpl did not display correctly when it was compiled with escape_html = true
+
+17.09.2011
+- bugfix lock_id for file resource would create invalid filepath
+- bugfix resource caching did not care about file.tpl in different template_dir
+
+## Smarty 3.1.0  -
+15/09/2011
+- optimization of {foreach}; call internal _count() method only when "total" or "last" {foreach} properties are used
+
+11/09/2011
+- added  unregisterObject() method
+
+06/09/2011
+- bugfix  isset() did not work in templates on config variables
+
+03/09/2011
+- bugfix createTemplate() must default to cache_id and compile_id of Smarty object
+- bugfix Smarty_CacheResource_KeyValueStore must include $source->uid in cache filepath to keep templates with same
+  name but different folders separated
+- added cacheresource.apc.php example in demo folder
+
+02/09/2011
+- bugfix cache lock file must use absolute filepath
+
+01/09/2011
+- update of cache locking
+
+30/08/2011
+- added locking mechanism to CacheResource API (implemented with File and KeyValueStores)
+
+28/08/2011
+- bugfix clearCompileTemplate() did not work for specific template subfolder or resource
+
+27/08/2011
+- bugfix {$foo|bar+1} did create syntax error
+
+26/08/2011
+- bugfix when generating nocache code which contains double \
+- bugfix handle race condition if cache file was deleted between filemtime and include
+
+17/08/2011
+- bugfix CacheResource_Custom bad internal fetch() call
+
+15/08/2011
+- bugfix CacheResource would load content twice for KeyValueStore and Custom handlers
+
+06/08/2011
+- bugfix {include} with scope attribute could execute in wrong scope
+- optimization of compile_check processing
+
+03/08/2011
+- allow comment tags to comment {block} tags out in child templates
+
+26/07/2011
+- bugfix experimental getTags() method did not work
+
+24/07/2011
+- sure opened output buffers are closed on exception
+- bugfix {foreach} did not work on IteratorAggregate
+
+22/07/2011
+- clear internal caches on clearAllCache(), clearCache(), clearCompiledTemplate()
+
+21/07/2011
+- bugfix value changes of variable values assigned to Smarty object could not be seen on repeated $smarty->fetch() calls
+
+17/07/2011
+- bugfix {$smarty.block.child} did drop a notice at undefined child
+
+15/07/2011
+- bugfix individual cache_lifetime of {include} did not work correctly inside {block} tags
+- added caches for Smarty_Internal_TemplateSource and Smarty_Internal_TemplateCompiled to reduce I/O for multiple cache_id rendering
+
+14/07/2011
+- made Smarty::loadPlugin() respect the include_path if required
+
+13/07/2011
+- optimized internal file write functionality
+- bugfix PHP did eat line break on nocache sections
+- fixed typo of Smarty_Security properties $allowed_modifiers and $disabled_modifiers
+
+06/07/2011
+- bugfix variable modifier must run befor gereral filtering/escaping
+
+04/07/2011
+- bugfix use (?P<name>) syntax at preg_match as some pcre libraries failed on (?<name>)
+- some performance improvement when using generic getter/setter on template objects
+
+30/06/2011
+- bugfix generic getter/setter of Smarty properties used on template objects did throw exception
+- removed is_dir and is_readable checks from directory setters for better performance
+
+28/06/2011
+- added back support of php template resource as undocumented feature
+- bugfix automatic recompilation on version change could drop undefined index notice on old 3.0 cache and compiled files
+- update of README_3_1_DEV.txt and moved into the distribution folder
+- improvement show first characters of eval and string templates instead sha1 Uid in debug window
+
+## Smarty 3.1-RC1 -
+25/06/2011
+- revert change of 17/06/2011. $_smarty varibale removed. call loadPlugin() from inside plugin code if required
+- code cleanup, remove no longer used properties and methods
+- update of PHPdoc comments
+
+23/06/2011
+- bugfix {html_select_date} would not respect current time zone
+
+19/06/2011
+- added $errors argument to testInstall() functions to suppress output.
+- added plugin-file checks to testInstall()
+
+18/06/2011
+- bugfix mixed use of same subtemplate inline and not inline in same script could cause a warning during compilation
+
+17/06/2011
+- bugfix/change use $_smarty->loadPlugin() when loading nested depending plugins via loadPlugin
+- bugfix {include ... inline} within {block}...{/block} did fail
+
+16/06/2011
+- bugfix do not overwrite '$smarty' template variable when {include ... scope=parent} is called
+- bugfix complete empty inline subtemplates did fail
+
+15/06/2011
+- bugfix template variables where not accessable within inline subtemplates
+
+12/06/2011
+- bugfix removed unneeded merging of template variable when fetching includled subtemplates
+
+10/06/2011
+- made protected properties $template_dir, $plugins_dir, $cache_dir, $compile_dir, $config_dir accessible via magic methods
+
+09/06/2011
+- fix smarty security_policy issue in plugins {html_image} and {fetch}
+
+05/06/2011
+- update of SMARTY_VERSION
+- bugfix made getTags() working again
+
+04/06/2011
+- allow extends resource in file attribute of {extends} tag
+
+03/06/2011
+- added {setfilter} tag to set filters for variable output
+- added escape_html property to control autoescaping of variable output
+
+27/05/2011
+- added allowed/disabled tags and modifiers in security for sandboxing
+
+23/05/2011
+- added base64: and urlencode: arguments to eval and string resource types
+
+22/05/2011
+- made time-attribute of {html_select_date} and {html_select_time} accept arrays as defined by attributes prefix and field_array
+
+13/05/2011
+- remove setOption / getOption calls from SamrtyBC class
+
+02/05/2011
+- removed experimental setOption() getOption() methods
+- output returned content also on opening tag calls of block plugins
+- rewrite of default plugin handler
+- compile code of variable filters for better performance
+
+20/04/2011
+- allow {php} {include_php} tags and PHP_ALLOW handling only with the SmartyBC class
+- removed support of php template resource
+
+20/04/2011
+- added extendsall resource example
+- optimization of template variable access
+- optimization of subtemplate handling {include}
+- optimization of template class
+
+01/04/2011
+- bugfix quote handling in capitalize modifier
+
+28/03/2011
+- bugfix stripslashes() requried when using PCRE e-modifier
+
+04/03/2011
+- upgrade to new PHP_LexerGenerator version 0.4.0 for better performance
+
+27/02/2011
+- ignore .svn folders when clearing cache and compiled files
+- string resources do not need a modify check
+
+26/02/2011
+- replaced smarty_internal_wrapper by SmartyBC class
+- load utility functions as static methods instead through __call()
+- bugfix in extends resource when subresources are used
+- optimization of modify checks
+
+25/02/2011
+- use $smarty->error_unassigned to control NOTICE handling on unassigned variables
+
+21/02/2011
+- added new new compile_check mode COMPILECHECK_CACHEMISS
+- corrected new cloning behaviour of createTemplate()
+- do no longer store the compiler object as property in the compile_tag classes to avoid possible memory leaks
+  during compilation
+
+19/02/2011
+- optimizations on merge_compiled_includes handling
+- a couple of optimizations and bugfixes related to new resource structure
+
+17/02/2011
+- changed ./ and ../ behaviour
+
+14/02/2011
+- added {block ... hide} option to suppress block if no child is defined
+
+13/02/2011
+- update handling of recursive subtemplate calls
+- bugfix replace $smarty->triggerError() by exception in smarty_internal_resource_extends.php
+
+12/02/2011
+- new class Smarty_Internal_TemplateBase with shared methods of Smarty and Template objects
+- optimizations of template processing
+- made register... methods permanet
+- code for default_plugin_handler
+- add automatic recompilation at version change
+
+04/02/2011
+- change in Smarty_CacheResource_Custom
+- bugfix cache_lifetime did not compile correctly at {include} after last update
+- moved isCached processing into CacheResource class
+- bugfix new CacheResource API did not work with disabled compile_check
+
+03/02/2011
+- handle template content as function to improve speed on multiple calls of same subtemplate and isCached()/display() calls
+- bugfixes and improvents in the new resource API
+- optimizations of template class code
+
+25/01/2011
+- optimized function html_select_time
+
+22/01/2011
+- added Smarty::$use_include_path configuration directive for Resource API
+
+21/01/2011
+- optimized function html_select_date
+
+19/01/2011
+- optimized outputfilter trimwhitespace
+
+18/01/2011
+- bugfix Config to use Smarty_Resource to fetch sources
+- optimized Smarty_Security's isTrustedDir() and isTrustedPHPDir()
+
+17/01/2011
+- bugfix HTTP headers for CGI SAPIs
+
+16/01/2011
+- optimized internals of Smarty_Resource and Smarty_CacheResource
+
+14/01/2011
+- added modifiercompiler escape to improve performance of escaping html, htmlall, url, urlpathinfo, quotes, javascript
+- added support to choose template_dir to load from: [index]filename.tpl
+
+12/01/2011
+- added unencode modifier to revert results of encode modifier
+- added to_charset and from_charset modifier for character encoding
+
+11/01/2011
+- added SMARTY_MBSTRING to generalize MBString detection
+- added argument $lc_rest to modifier.capitalize to lower-case anything but the first character of a word
+- changed strip modifier to consider unicode white-space, too
+- changed wordwrap modifier to accept UTF-8 strings
+- changed count_sentences modifier to consider unicode characters and treat sequences delimited by ? and ! as sentences, too
+- added argument $double_encode to modifier.escape (applies to html and htmlall only)
+- changed escape modifier to be UTF-8 compliant
+- changed textformat block to be UTF-8 compliant
+- optimized performance of mailto function
+- fixed spacify modifier so characters are not prepended and appended, made it unicode compatible
+- fixed truncate modifier to properly use mb_string if possible
+- removed UTF-8 frenzy from count_characters modifier
+- fixed count_words modifier to treat "hello-world" as a single word like str_count_words() does
+- removed UTF-8 frenzy from upper modifier
+- removed UTF-8 frenzy from lower modifier
+
+01/01/2011
+- optimize smarty_modified_escape for hex, hexentity, decentity.
+
+28/12/2010
+- changed $tpl_vars, $config_vars and $parent to belong to Smarty_Internal_Data
+- added Smarty::registerCacheResource() for dynamic cache resource object registration
+
+27/12/2010
+- added Smarty_CacheResource API and refactored existing cache resources accordingly
+- added Smarty_CacheResource_Custom and Smarty_CacheResource_Mysql
+
+26/12/2010
+- added Smarty_Resource API and refactored existing resources accordingly
+- added Smarty_Resource_Custom and Smarty_Resource_Mysql
+- bugfix Smarty::createTemplate() to return properly cloned template instances
+
+24/12/2010
+- optimize smarty_function_escape_special_chars() for PHP >= 5.2.3
+
+## SVN 3.0 trunk  -
+14/05/2011
+- bugfix error handling at stream resources
+
+13/05/2011
+- bugfix condition starting with "-" did fail at {if} and {while} tags
+
+22/04/2011
+- bugfix allow only fixed string as file attribute at {extends} tag
+
+01/04/2011
+- bugfix do not run filters and default modifier when displaying the debug template
+- bugfix of embedded double quotes within multi line strings (""")
+
+29/03/2011
+- bugfix on error message in smarty_internal_compile_block.php
+- bugfix mb handling in strip modifier
+- bugfix for Smarty2 style registered compiler function on unnamed attribute passing like {tag $foo $bar}
+
+17/03/2011
+- bugfix on default {function} parameters when {function} was used in nocache sections
+- bugfix on compiler object destruction. compiler_object property was by mistake unset.
+
+09/03/2011
+-bugfix a variable filter should run before modifiers on an output tag (see change of 23/07/2010)
+
+08/03/2011
+- bugfix loading config file without section should load only defaults
+
+03/03/2011
+- bugfix "smarty" template variable was not recreated when cached templated had expired
+- bugfix internal rendered_content must be cleared after subtemplate was included
+
+01/03/2011
+- bugfix replace modifier did not work in 3.0.7 on systems without multibyte support
+- bugfix {$smarty.template} could return in 3.0.7 parent template name instead of
+         child name when it needed to compile
+
+25/02/2011
+- bugfix for Smarty2 style compiler plugins on unnamed attribute passing like {tag $foo $bar}
+
+24/02/2011
+- bugfix $smarty->clearCache('some.tpl') did by mistake cache the template object
+
+18/02/2011
+- bugfix removed possible race condition when isCached() was called for an individually cached subtemplate
+- bugfix force default debug.tpl to be loaded by the file resource
+
+17/02/2011
+-improvement not to delete files starting with '.' from cache and template_c folders on clearCompiledTemplate() and clearCache()
+
+16/02/2011
+-fixed typo in exception message of Smarty_Internal_Template
+-improvement allow leading spaces on } tag closing if auto_literal is enabled
+
+13/02/2011
+- bufix replace $smarty->triggerError() by exception
+- removed obsolete {popup_init..} plugin from demo templates
+- bugfix replace $smarty->triggerError() by exception in smarty_internal_resource_extends.php
+
+## Smarty 3.0.7  -
+09/02/2011
+- patched vulnerability when using {$smarty.template}
+
+01/02/2011
+- removed assert() from config and template parser
+
+31/01/2011
+- bugfix the lexer/parser did fail on special characters like VT
+
+16/01/2011
+-bugfix of ArrayAccess object handling in internal _count() method
+-bugfix of Iterator object handling in internal _count() method
+
+14/01/2011
+-bugfix removed memory leak while processing compileAllTemplates
+
+12/01/2011
+- bugfix in {if} and {while} tag compiler when using assignments as condition and nocache mode
+
+10/01/2011
+- bugfix when using {$smarty.block.child} and name of {block} was in double quoted string
+- bugfix updateParentVariables() was called twice when leaving {include} processing
+
+- bugfix mb_str_replace in replace and escape modifiers work with utf8
+
+31/12/2010
+- bugfix dynamic configuration of $debugging_crtl did not work
+- bugfix default value of $config_read_hidden changed to false
+- bugfix format of attribute array on compiler plugins
+- bugfix getTemplateVars() could return value from wrong scope
+
+28/12/2010
+- bugfix multiple {append} tags failed to compile.
+
+22/12/2010
+- update do not clone the Smarty object an internal createTemplate() calls to increase performance
+
+21/12/2010
+- update html_options to support class and id attrs
+
+17/12/2010
+- bugfix added missing support of $cache_attrs for registered plugins
+
+15/12/2010
+- bugfix assignment as condition in {while} did drop an E_NOTICE
+
+14/12/2010
+- bugfix when passing an array as default parameter at {function} tag
+
+13/12/2010
+- bugfix {$smarty.template} in child template did not return right content
+- bugfix Smarty3 did not search the PHP include_path for template files
+
+## Smarty 3.0.6  -
+
+12/12/2010
+- bugfix fixed typo regarding yesterdays change to allow streamWrapper
+
+11/12/2010
+- bugfix nested block tags in template inheritance child templates did not work correctly
+- bugfix {$smarty.current_dir} in child template did not point to dir of child template
+- bugfix changed code when writing temporary compiled files to allow stream_wrapper
+
+06/12/2010
+- bugfix getTemplateVars() should return 'null' instead dropping E_NOTICE on an unassigned variable
+
+05/12/2010
+- bugfix missing declaration of $smarty in Smarty class
+- bugfix empty($foo) in {if} did drop a notice when $foo was not assigned
+
+01/12/2010
+- improvement of {debug} tag output
+
+27/11/2010
+-change run output filter before cache file is written. (same as in Smarty2)
+
+24/11/2011
+-bugfix on parser at  !$foo|modifier
+-change parser logic when assignments used as condition in {if] and {while} to allow assign to array element
+
+23/11/2011
+-bugfix allow integer as attribute name in plugin calls
+-change  trimm whitespace from error message, removed long list of expected tokens
+
+22/11/2010
+- bugfix on template inheritance when an {extends} tag was inserted by a prefilter
+- added error message for illegal variable file attributes at {extends...} tags
+
+## Smarty 3.0.5  -
+
+
+19/11/2010
+- bugfix on block plugins with modifiers
+
+18/11/2010
+- change on handling of unassigned template variable -- default will drop E_NOTICE
+- bugfix on Smarty2 wrapper load_filter() did not work
+
+17/11/2010
+- bugfix on {call} with variable function name
+- bugfix on {block} if name did contain '-'
+- bugfix in function.fetch.php , referece to undefined $smarty
+
+16/11/2010
+- bugfix whitespace in front of "<?php" in smarty_internal_compile_private_block_plugin.php
+- bugfix {$smarty.now} did compile incorrectly
+- bugfix on reset(),end(),next(),prev(),current() within templates
+- bugfix on default parameter for {function}
+
+15/11/2010
+- bugfix when using {$smarty.session} as object
+- bugfix scoping problem on $smarty object passed to filters
+- bugfix captured content could not be accessed globally
+- bugfix Smarty2 wrapper functions could not be call from within plugins
+
+## Smarty 3.0.4  -
+
+14/11/2010
+- bugfix isset() did not allow multiple parameter
+- improvment of some error messages
+- bugfix html_image did use removed property $request_use_auto_globals
+- small performace patch in Smarty class
+
+13/11/2010
+- bugfix  overloading problem when $smarty->fetch()/display() have been used in plugins
+				(introduced with 3.0.2)
+- code cleanup
+								
+## Smarty 3.0.3  -
+
+13/11/2010
+- bugfix on {debug}
+- reverted location of loadPlugin() to Smarty class
+- fixed comments in plugins
+- fixed internal_config (removed unwanted code line)
+- improvement  remove last linebreak from {function} definition
+
+## Smarty 3.0.2  -
+
+12/11/2010
+- reactivated $error_reporting property handling
+- fixed typo in compile_continue
+- fixed security in {fetch} plugin
+- changed back plugin parameters to two. second is template object
+  with transparent access to Smarty object
+- fixed {config_load} scoping form compile time to run time
+
+## Smarty 3.0.0  -
+
+
+
+11/11/2010
+- major update including some API changes
+
+10/11/2010
+- observe compile_id also for config files
+
+09/11/2010
+-bugfix on  complex expressions as start value for {for} tag
+request_use_auto_globals
+04/11/2010
+- bugfix do not allow access of dynamic and private object members of assigned objects when
+  security is enabled.
+
+01/11/2010
+- bugfix related to E_NOTICE change.  {if empty($foo)} did fail when $foo contained a string
+
+28/10/2010
+- bugfix on compiling modifiers within $smarty special vars like {$smarty.post.{$foo|lower}}
+
+27/10/2010
+- bugfix default parameter values did not work for template functions included with {include}
+
+25/10/2010
+- bugfix for E_NOTICE change, array elements did not work as modifier parameter
+
+20/10/2010
+- bugfix for the E_NOTICE change
+
+19/10/2010
+- change Smarty does no longer mask out E_NOTICE by default during template processing
+
+13/10/2010
+- bugfix removed ambiguity between ternary and stream variable in template syntax
+- bugfix use caching properties of template instead of smarty object when compiling child {block}
+- bugfix {*block}...{/block*} did throw an exception in template inheritance
+- bugfix on template inheritance using nested eval or string resource in {extends} tags
+- bugfix on output buffer handling in isCached() method
+
+##  RC4 -
+
+01/10/2010
+- added {break} and {continue} tags for flow control of {foreach},{section},{for} and {while} loops
+- change of 'string' resource. It's no longer evaluated and compiled files are now stored
+- new 'eval' resource which evaluates a template without saving the compiled file
+- change in isCached() method to allow multiple calls for the same template
+
+25/09/2010
+- bugfix on some compiling modifiers
+
+24/09/2010
+- bugfix merge_compiled_includes flag was not restored correctly in {block} tag
+
+22/09/2010
+- bugfix on default modifier
+
+18/09/2010
+- bugfix untility compileAllConfig() did not create sha1 code for compiled template file names if template_dir was defined with no trailing DS
+- bugfix on templateExists() for extends resource
+
+17/09/2010
+- bugfix {$smarty.template} and {$smarty.current_dir} did not compile correctly within {block} tags
+- bugfix corrected error message on missing template files in extends resource
+- bugfix untility compileAllTemplates() did not create sha1 code for compiled template file names if template_dir was defined with no trailing DS
+
+16/09/2010
+- bugfix when a doublequoted modifier parameter did contain Smarty tags and ':'
+
+15/09/2010
+- bugfix resolving conflict between '<%'/'%>' as custom Smarty delimiter and ASP tags
+- use ucfirst for resource name on internal resource class names
+
+12/09/2010
+- bugfix for change of 08/09/2010 (final {block} tags in subtemplates did not produce correct results)
+
+10/09/2010
+- bugfix for change of 08/09/2010 (final {block} tags in subtemplates did not produce correct results)
+
+08/09/2010
+- allow multiple template inheritance branches starting in subtemplates
+
+07/09/2010
+- bugfix {counter} and {cycle} plugin assigned result to smarty variable not in local(template) scope
+- bugfix templates containing just {strip} {/strip} tags did produce an error
+
+
+23/08/2010
+- fixed E_STRICT errors for uninitialized variables
+
+22/08/2010
+- added attribute cache_id to {include} tag
+
+13/08/2010
+- remove exception_handler property from Smarty class
+- added Smarty's own exceptions SmartyException and SmartyCompilerException
+
+09/08/2010
+- bugfix on modifier with doublequoted strings as parameter containing embedded tags
+
+06/08/2010
+- bugfix when cascading some modifier like |strip|strip_tags modifier
+
+05/08/2010
+- added plugin type modifiercompiler to produce compiled modifier code
+- changed standard modifier plugins to the compiling versions whenever possible
+- bugfix in nocache sections {include} must not cache the subtemplate
+
+02/08/2010
+- bugfix strip did not work correctly in conjunction with comment lines
+
+31/07/2010
+- bugfix on nocache attribute at {assign} and {append}
+
+30/07/2010
+- bugfix passing scope attributes in doublequoted strings did not work at {include} {assign} and {append}
+
+25/07/2010
+- another bugfix of change from 23/07/2010 when compiling modifier
+
+24/07/2010
+- bugfix of change from 23/07/2010 when compiling modifier
+
+23/07/2010
+- changed execution order. A variable filter does now run before modifiers on output of variables
+- bugfix use always { and } as delimiter for debug.tpl
+
+
+22/07/2010
+- bugfix in templateExists() method
+
+20/07/2010
+- fixed handling of { strip } tag with whitespaces
+
+15/07/2010
+- bufix  {$smarty.template} does include now the relative path, not just filename
+
+##  RC3 -
+
+
+
+
+15/07/2010
+- make the date_format modifier work also on objects of the DateTime class
+- implementation of parsetrees in the parser to close security holes and remove unwanted empty line in HTML output
+
+08/07/2010
+- bugfix on assigning multidimensional arrays within templates
+- corrected bugfix for truncate modifier
+
+07/07/2010
+- bugfix the truncate modifier needs to check if the string is utf-8 encoded or not
+- bugfix support of script files relative to trusted_dir
+
+06/07/2010
+- create exception on recursive {extends} calls
+- fixed reported line number at "unexpected closing tag " exception
+- bugfix on escape:'mail' modifier
+- drop exception if 'item' variable is equal 'from' variable in {foreach} tag
+
+01/07/2010
+- removed call_user_func_array calls for optimization of compiled code when using registered modifiers and plugins
+
+25/06/2010
+- bugfix escaping " when block tags are used within doublequoted strings
+
+24/06/2010
+- replace internal get_time() calls with standard PHP5 microtime(true) calls in Smarty_Internal_Utility
+- added $smarty->register->templateClass() and $smarty->unregister->templateClass() methods for supporting static classes with namespace
+
+
+22/06/2010
+- allow spaces between typecast and value in template syntax
+- bugfix get correct count of traversables in {foreach} tag
+
+21/06/2010
+- removed use of PHP shortags SMARTY_PHP_PASSTHRU mode
+- improved speed of cache->clear() when a compile_id was specified and use_sub_dirs is true
+
+20/06/2010
+- replace internal get_time() calls with standard PHP5 microtime(true) calls
+- closed security hole when php.ini asp_tags = on
+
+18/06/2010
+- added __toString method to the Smarty_Variable class
+
+
+14/06/2010
+- make handling of Smarty comments followed by newline BC to Smarty2
+
+
+##  RC2 -
+
+
+
+13/06/2010
+- bugfix Smarty3 did not handle hexadecimals like 0x0F as numerical value
+- bugifx Smarty3 did not accept numerical constants like .1 or 2. (without a leading or trailing digit)
+
+11/06/2010
+- bugfix the lexer did fail on larger {literal} ... {/literal} sections
+
+03/06/2010
+- bugfix on calling template functions like Smarty tags
+
+01/06/2010
+- bugfix on template functions used with template inheritance
+- removed /* vim: set expandtab: */ comments
+- bugfix of auto literal problem introduce with fix of 31/05/2010
+
+31/05/2010
+- bugfix the parser did not allow some smarty variables with special name like $for, $if, $else and others.
+
+27/05/2010
+- bugfix on object chaining using variable properties
+- make scope of {counter} and {cycle} tags again global as in Smarty2
+
+26/05/2010
+- bugfix removed decrepated register_resource call in smarty_internal_template.php
+
+25/05/2010
+- rewrite of template function handling to improve speed
+- bugfix on file dependency when merge_compiled_includes = true
+
+
+16/05/2010
+- bugfix when passing parameter with numeric name like {foo 1='bar' 2='blar'}
+
+14/05/2010
+- bugfix compile new config files if compile_check and force_compile = false
+- added variable static classes names to template syntax
+
+11/05/2010
+- bugfix  make sure that the cache resource is loaded in all conditions when template methods getCached... are called externally
+- reverted the change 0f 30/04/2010. With the exception of forward references template functions can be again called by a standard tag.
+
+10/05/2010
+- bugfix on {foreach} and {for} optimizations of 27/04/2010
+
+09/05/2010
+- update of template and config file parser because of minor parser generator bugs
+
+07/05/2010
+- bugfix on {insert}
+
+06/05/2010
+- bugfix when merging compiled templates and objects are passed as parameter of the {include} tag
+
+05/05/2010
+- bugfix on {insert} to cache parameter
+- implementation of $smarty->default_modifiers as in Smarty2
+- bugfix on getTemplateVars method
+
+01/05/2010
+- bugfix on handling of variable method names at object chaning
+
+30/04/2010
+- bugfix when comparing timestamps in sysplugins/smarty_internal_config.php
+- work around of a substr_compare bug in older PHP5 versions
+- bugfix on template inheritance for tag names starting with "block"
+- bugfix on {function} tag with name attribute in doublequoted strings
+- fix to make calling of template functions unambiguously by madatory usage of the {call} tag
+
+##  RC1 -
+
+27/04/2010
+- change default of $debugging_ctrl to 'NONE'
+- optimization of compiled code of {foreach} and {for} loops
+- change of compiler for config variables
+
+27/04/2010
+- bugfix in $smarty->cache->clear() method. (do not cache template object)
+
+
+17/04/2010
+- security fix in {math} plugin
+
+
+12/04/2010
+- bugfix in smarty_internal_templatecompilerbase (overloaded property)
+- removed parser restrictions in using true,false and null as ID
+
+07/04/2010
+- bugfix typo in smarty_internal_templatecompilerbase
+
+31/03/2010
+- compile locking by touching old compiled files to avoid concurrent compilations
+
+29/03/2010
+- bugfix allow array definitions as modifier parameter
+- bugfix observe compile_check property when loading config files
+- added the template object as third filter parameter
+
+25/03/2010
+- change of utility->compileAllTemplates() log messages
+- bugfix on nocache code in {function} tags
+- new method utility->compileAllConfig() to compile all config files
+
+24/03/2010
+- bugfix on register->modifier() error messages
+
+23/03/2010
+- bugfix on template inheritance when calling multiple child/parent relations
+- bugfix on caching mode SMARTY_CACHING_LIFETIME_SAVED and cache_lifetime = 0
+
+22/03/2010
+- bugfix make directory separator operating system independend in compileAllTemplates()
+
+21/03/2010
+- removed unused code in compileAllTemplates()
+
+19/03/2010
+- bugfix for multiple {/block} tags on same line
+
+17/03/2010
+- bugfix make $smarty->cache->clear() function independent from caching status
+
+16/03/2010
+- bugfix on assign attribute at registered template objects
+- make handling of modifiers on expression BC to Smarty2
+
+15/03/2010
+- bugfix on block plugin calls
+
+11/03/2010
+- changed parsing of <?php and ?> back to Smarty2 behaviour
+
+08/03/2010
+- bugfix on uninitialized properties in smarty_internal_template
+- bugfix on $smarty->disableSecurity()
+
+04/03/2010
+- bugfix allow uppercase chars in registered resource names
+- bugfix on accessing chained objects of static classes
+
+01/03/2010
+- bugfix on nocache code in {block} tags if child template was included by {include}
+
+27/02/2010
+- allow block tags inside double quoted string
+
+26/02/2010
+- cache modified check implemented
+- support of access to a class constant from an object (since PHP 5.3)
+
+24/02/2010
+- bugfix on expressions in doublequoted string enclosed in backticks
+- added security property $static_classes for static class security
+
+18/02/2010
+- bugfix on parsing Smarty tags inside <?xml ... ?>
+- bugfix on truncate modifier
+
+17/02/2010
+- removed restriction that modifiers did require surrounding parenthesis in some cases
+- added {$smarty.block.child} special variable for template inheritance
+
+16/02/2010
+- bugfix on <?xml ... ?> tags for all php_handling modes
+- bugfix on parameter of variablefilter.htmlspecialchars.php plugin
+
+14/02/2010
+- added missing _plugins property in smarty.class.php
+- bugfix $smarty.const... inside doublequoted strings and backticks was compiled into wrong PHP code
+
+12/02/2010
+- bugfix on nested {block} tags
+- changed Smarty special variable $smarty.parent to $smarty.block.parent
+- added support of nested {bock} tags
+
+10/02/2010
+- avoid possible notice on $smarty->cache->clear(...), $smarty->clear_cache(....)
+- allow Smarty tags inside <? ... ?> tags in SMARTY_PHP_QUOTE and SMARTY_PHP_PASSTHRU mode
+- bugfix at new "for" syntax like {for $x=1 to 10 step 2}
+
+09/02/2010
+- added $smarty->_tag_stack for tracing block tag hierarchy
+
+08/02/2010
+- bugfix  use template fullpath at §smarty->cache->clear(...), $smarty->clear_cache(....)
+- bugfix of cache filename on extended templates when force_compile=true
+
+07/02/2010
+- bugfix on changes of 05/02/2010
+- preserve line endings type form template source
+- API changes (see README file)
+
+05/02/2010
+- bugfix on modifier and block plugins with same name
+
+02/02/2010
+- retaining newlines at registered functions and function plugins
+
+01/25/2010
+- bugfix cache resource was not loaded when caching was globally off but enabled at a template object
+- added test that $_SERVER['SCRIPT_NAME'] does exist in Smarty.class.php
+
+01/22/2010
+- new method $smarty->createData([$parent]) for creating a data object (required for bugfixes below)
+- bugfix config_load() method now works also on a data object
+- bugfix get_config_vars() method now works also on a data and template objects
+- bugfix clear_config() method now works also on a data and template objects
+
+01/19/2010
+- bugfix on plugins if same plugin was called from a nocache section first and later from a cached section
+
+
+###beta 7###
+
+
+01/17/2010
+- bugfix on $smarty.const... in double quoted strings
+
+01/16/2010
+- internal change of config file lexer/parser on handling of section names
+- bugfix on registered objects (format parameter of register_object was not handled correctly)
+
+01/14/2010
+- bugfix on backslash within single quoted strings
+- bugfix allow absolute filepath for config files
+- bugfix on special Smarty variable $smarty.cookies
+- revert handling of newline on no output tags like {if...}
+- allow special characters in config file section names for Smarty2 BC
+
+01/13/2010
+- bugfix on {if} tags
+
+01/12/2010
+- changed back modifier handling in parser. Some restrictions still apply:
+    if modifiers are used in side {if...} expression or in mathematical expressions
+    parentheses must be used.
+- bugfix the {function..} tag did not accept the name attribute in double quotes
+- closed possible security hole at <?php ... ?> tags
+- bugfix of config file parser on large config files
+
+
+###beta 6####
+
+01/11/2010
+- added \n to the compiled code of the {if},{else},{elseif},{/if} tags to get output of newlines as expected by the template source
+- added missing support of insert plugins
+- added optional nocache attribute to {block} tags in parent template
+- updated <?php...?> handling supporting now heredocs and newdocs. (thanks to Thue Jnaus Kristensen)
+
+01/09/2010
+- bugfix on nocache {block} tags in parent templates
+
+01/08/2010
+- bugfix on variable filters. filter/nofilter attributes did not work on output statements
+
+01/07/2010
+- bugfix on file dependency at template inheritance
+- bugfix on nocache code at template inheritance
+
+01/06/2010
+- fixed typo in smarty_internal_resource_registered
+- bugfix for custom delimiter at extends resource and {extends} tag
+
+01/05/2010
+- bugfix sha1() calculations at extends resource and some general improvments on sha1() handling
+
+
+01/03/2010
+- internal change on building cache files
+
+01/02/2010
+- update cached_timestamp at the template object after cache file is written to avoid possible side effects
+- use internally always SMARTY_CACHING_LIFETIME_* constants
+
+01/01/2010
+- bugfix for obtaining plugins which must be included (related to change of 12/30/2009)
+- bugfix for {php} tag (trow an exception if allow_php_tag = false)
+
+12/31/2009
+- optimization of generated code for doublequoted strings containing variables
+- rewrite of {function} tag handling
+  - can now be declared in an external subtemplate
+  - can contain nocache sections (nocache_hash handling)
+  - can be called in noccache sections (nocache_hash handling)
+  - new {call..} tag to call template functions with a variable name {call name=$foo}
+- fixed nocache_hash handling in merged compiled templates
+
+12/30/2009
+- bugfix for plugins defined in the script as smarty_function_foo
+
+12/29/2009
+- use sha1() for filepath encoding
+- updates on nocache_hash handling
+- internal change on merging some data
+- fixed cache filename for custom resources
+
+12/28/2009
+- update for security fixes
+- make modifier plugins always trusted
+- fixed bug loading modifiers in child template at template inheritance
+
+12/27/2009
+--- this is a major update with a couple of internal changes ---
+- new config file lexer/parser (thanks to Thue Jnaus Kristensen)
+- template lexer/parser fixes for PHP and {literal} handing (thanks to Thue Jnaus Kristensen)
+- fix on registered plugins with different type but same name
+- rewrite of plugin handling (optimized execution speed)
+- closed a security hole regarding PHP code injection into cache files
+- fixed bug in clear cache handling
+- Renamed a couple of internal classes
+- code cleanup for merging compiled templates
+- couple of runtime optimizations (still not all done)
+- update of getCachedTimestamp()
+- fixed bug on modifier plugins at nocache output
+
+12/19/2009
+- bugfix on comment lines in config files
+
+12/17/2009
+- bugfix of parent/global variable update at included/merged subtemplates
+- encode final template filepath into filename of compiled and cached files
+- fixed {strip} handling in auto literals
+
+12/16/2009
+- update of changelog
+- added {include file='foo.tpl' inline}  inline option to merge compiled code of subtemplate into the calling template
+
+12/14/2009
+- fixed sideefect of last modification (objects in array index did not work anymore)
+
+12/13/2009
+- allow boolean negation ("!") as operator on variables outside {if} tag
+
+12/12/2009
+- bugfix on single quotes inside {function} tag
+- fix short append/prepend attributes in {block} tags
+
+12/11/2009
+- bugfix on clear_compiled_tpl (avoid possible warning)
+
+12/10/2009
+- bugfix on {function} tags and template inheritance
+
+12/05/2009
+- fixed problem when a cached file was fetched several times
+- removed unneeded lexer code
+
+12/04/2009
+- added max attribute to for loop
+- added security mode allow_super_globals
+
+12/03/2009
+- template inheritance: child templates can now call functions defined by the {function} tag in the parent template
+- added {for $foo = 1 to 5 step 2}  syntax
+- bugfix for {$foo.$x.$y.$z}
+
+12/01/2009
+- fixed parsing of names of special formated tags like if,elseif,while,for,foreach
+- removed direct access to constants in templates because of some syntax problems
+- removed cache resource plugin for mysql from the distribution
+- replaced most hard errors (exceptions) by softerrors(trigger_error) in plugins
+- use $template_class property for template class name when compiling {include},{eval} and {extends} tags
+
+11/30/2009
+- map 'true' to SMARTY_CACHING_LIFETIME_CURRENT for the $smarty->caching parameter
+- allow {function} tags within {block} tags
+
+11/28/2009
+- ignore compile_id at debug template
+- added direct access to constants in templates
+- some lexer/parser optimizations
+
+11/27/2009
+- added cache resource MYSQL plugin
+
+11/26/2009
+- bugfix on nested doublequoted strings
+- correct line number on unknown tag error message
+- changed {include} compiled code
+- fix on checking dynamic varibales with error_unassigned = true
+
+11/25/2009
+- allow the following writing for boolean: true, TRUE, True, false, FALSE, False
+- {strip} tag functionality rewritten
+
+11/24/2009
+- bugfix for $smarty->config_overwrite = false
+
+11/23/2009
+- suppress warnings on unlink caused by race conditions
+- correct line number on unknown tag error message
+
+------- beta 5
+11/23/2009
+- fixed configfile parser for text starting with a numeric char
+- the default_template_handler_func may now return a filepath to a template source
+
+11/20/2009
+- bugfix for empty config files
+- convert timestamps of registered resources to integer
+
+11/19/2009
+- compiled templates are no longer touched with the filemtime of template source
+
+11/18/2009
+- allow integer as attribute name in plugin calls
+
+------- beta 4
+11/18/2009
+- observe umask settings when setting file permissions
+- avoide unneeded cache file creation for subtemplates which did occur in some situations
+- make $smarty->_current_file available during compilation for Smarty2 BC
+
+11/17/2009
+- sanitize compile_id and cache_id (replace illegal chars with _)
+- use _dir_perms and _file_perms properties at file creation
+- new constant SMARTY_RESOURCE_DATE_FORMAT (default '%b %e, %Y') which is used as default format in modifier date_format
+- added {foreach $array as $key=>$value} syntax
+- renamed extend tag and resource to extends: {extends file='foo.tol'} , $smarty->display('extends:foo.tpl|bar.tpl);
+- bugfix cycle plugin
+
+11/15/2009
+- lexer/parser optimizations on quoted strings
+
+11/14/2009
+- bugfix on merging compiled templates when source files got removed or renamed.
+- bugfix modifiers on registered object tags
+- fixed locaion where outputfilters are running
+- fixed config file definitions at EOF
+- fix on merging compiled templates with nocache sections in nocache includes
+- parser could run into a PHP error on wrong file attribute
+
+11/12/2009
+- fixed variable filenames in {include_php} and {insert}
+- added scope to Smarty variables in the {block} tag compiler
+- fix on nocache code in child {block} tags
+
+11/11/2009
+- fixed {foreachelse}, {forelse}, {sectionelse} compiled code at nocache variables
+- removed checking for reserved variables
+- changed debugging handling
+
+11/10/2009
+- fixed preg_qoute on delimiters
+
+11/09/2009
+- lexer/parser bugfix
+- new SMARTY_SPL_AUTOLOAD constant to control the autoloader option
+- bugfix for {function} block tags in included templates
+
+11/08/2009
+- fixed alphanumeric array index
+- bugfix on complex double quoted strings
+
+11/05/2009
+- config_load method can now be called on data and template objects
+
+11/04/2009
+- added typecasting support for template variables
+- bugfix on complex indexed special Smarty variables
+
+11/03/2009
+- fixed parser error on objects with special smarty vars
+- fixed file dependency for {incude} inside {block} tag
+- fixed not compiling on non existing compiled templates when compile_check = false
+- renamed function names of autoloaded Smarty methods to Smarty_Method_....
+- new security_class property (default is Smarty_Security)
+
+11/02/2009
+- added neq,lte,gte,mod as aliases to if conditions
+- throw exception on illegal Smarty() constructor calls
+
+10/31/2009
+- change of filenames in sysplugins folder for internal spl_autoload function
+- lexer/parser changed for increased compilation speed
+
+10/27/2009
+- fixed missing quotes in include_php.php
+
+10/27/2009
+- fixed typo in method.register_resource
+- pass {} through as literal
+
+10/26/2009
+- merge only compiled subtemplates into the compiled code of the main template
+
+10/24/2009
+- fixed nocache vars at internal block tags
+- fixed merging of recursive includes
+
+10/23/2009
+- fixed nocache var problem
+
+10/22/2009
+- fix trimwhitespace outputfilter parameter
+
+10/21/2009
+- added {$foo++}{$foo--} syntax
+- buxfix changed PHP "if (..):" to "if (..){" because of possible bad code when concenating PHP tags
+- autoload Smarty internal classes
+- fixed file dependency for config files
+- some code optimizations
+- fixed function definitions on some autoloaded methods
+- fixed nocache variable inside if condition of {if} tag
+
+10/20/2009
+- check at compile time for variable filter to improve rendering speed if no filter is used
+- fixed bug at combination of {elseif} tag and {...} in double quoted strings of static class parameter
+
+10/19/2009
+- fixed compiled template merging on variable double quoted strings as name
+- fixed bug in caching mode 2 and cache_lifetime -1
+- fixed modifier support on block tags
+
+10/17/2009
+- remove ?>\n<?php and ?><?php sequences from compiled template
+
+10/15/2009
+- buxfix on assigning array elements inside templates
+- parser bugfix on array access
+
+10/15/2009
+- allow bit operator '&' inside {if} tag
+- implementation of ternary operator
+
+10/13/2009
+- do not recompile evaluated templates if reused just with other data
+- recompile config files when config properties did change
+- some lexer/parser otimizations
+
+10/11/2009
+- allow {block} tags inside included templates
+- bugfix for resource plugins in Smarty2 format
+- some optimizations of internal.template.php
+
+10/11/2009
+- fixed bug when template with same name is used with different data objects
+- fixed bug with double quoted name attribute at {insert} tag
+- reenabled assign_by_ref and append_by_ref methods
+
+10/07/2009
+- removed block nesting checks for {capture}
+
+10/05/2009
+- added support of "isinstance" to {if} tag
+
+10/03/2009
+- internal changes to improve performance
+- fix registering of filters for classes
+
+10/01/2009
+- removed default timezone setting
+- reactivated PHP resource for simple PHP templates. Must set allow_php_templates = true to enable
+- {PHP} tag can be enabled by allow_php_tag = true
+
+09/30/2009
+- fixed handling template_exits method for all resource types
+- bugfix for other cache resources than file
+- the methods assign_by_ref is now wrapped to assign, append_by_ref to append
+- allow arrays of variables pass in display, fetch and createTemplate calls
+  $data = array('foo'=>'bar','foo2'=>'blar');
+  $smarty->display('my.tpl',$data);
+
+09/29/2009
+- changed {php} tag handling
+- removed support of Smarty::instance()
+- removed support of PHP resource type
+- improved execution speed of {foreach} tags
+- fixed bug in {section} tag
+
+09/23/2009
+- improvements and bugfix on {include} tag handling
+NOTICE: existing compiled template and cache files must be deleted
+
+09/19/2009
+- replace internal "eval()" calls by "include" during rendering process
+- speed improvment for templates which have included subtemplates
+    the compiled code of included templates is merged into the compiled code of the parent template
+- added logical operator "xor" for {if} tag
+- changed parameter ordering for Smarty2 BC
+    fetch($template, $cache_id = null, $compile_id = null, $parent = null)
+    display($template, $cache_id = null, $compile_id = null, $parent = null)
+    createTemplate($template, $cache_id = null, $compile_id = null, $parent = null)
+- property resource_char_set is now replaced by constant SMARTY_RESOURCE_CHAR_SET
+- fixed handling of classes in registered blocks
+- speed improvement of lexer on text sections
+
+09/01/2009
+- dropped nl2br as plugin
+- added '<>' as comparission operator in {if} tags
+- cached caching_lifetime property to cache_liftime for backward compatibility with Smarty2.
+  {include} optional attribute is also now cache_lifetime
+- fixed trigger_error method (moved into Smarty class)
+- version is now  Beta!!!
+
+
+08/30/2009
+- some speed optimizations on loading internal plugins
+
+
+08/29/2009
+- implemented caching of registered Resources
+- new property 'auto_literal'. if true(default)  '{ ' and ' }' interpreted as literal, not as Smarty delimiter
+
+
+08/28/2009
+- Fix on line breaks inside {if} tags
+
+08/26/2009
+- implemented registered resources as in Smarty2. NOTE: caching does not work yet
+- new property 'force_cache'. if true it forces the creation of a new cache file
+- fixed modifiers on arrays
+- some speed optimization on loading internal classes
+
+
+08/24/2009
+- fixed typo in lexer definition for '!==' operator
+- bugfix - the ouput of plugins was not cached
+- added global variable SCRIPT_NAME
+
+08/21/2009
+- fixed problems whitespace in conjuction with custom delimiters
+- Smarty tags can now be used as value anywhere
+
+08/18/2009
+- definition of template class name moded in internal.templatebase.php
+- whitespace parser changes
+
+08/12/2009
+- fixed parser problems
+
+08/11/2009
+- fixed parser problems with custom delimiter
+
+08/10/2009
+- update of mb support in plugins
+
+
+08/09/2009
+- fixed problems with doublequoted strings at name attribute of {block} tag
+- bugfix at scope attribute of {append} tag
+
+08/08/2009
+- removed all internal calls of Smarty::instance()
+- fixed code in double quoted strings
+
+08/05/2009
+- bugfix mb_string support
+- bugfix of \n.\t etc in double quoted strings
+
+07/29/2009
+- added syntax for variable config vars  like  #$foo#
+
+07/28/2009
+- fixed parsing of $smarty.session vars containing objects
+
+07/22/2009
+- fix of "$" handling in double quoted strings
+
+07/21/2009
+- fix that {$smarty.current_dir} return correct value within {block} tags.
+
+07/20/2009
+- drop error message on unmatched {block} {/block} pairs
+
+07/01/2009
+- fixed smarty_function_html_options call in plugin function.html_select_date.php (missing ,)
+
+06/24/2009
+- fixed smarty_function_html_options call in plugin function.html_select_date.php
+
+06/22/2009
+- fix on \n and spaces inside smarty tags
+- removed request_use_auto_globals propert as it is no longer needed because Smarty 3 will always run under PHP 5
+
+
+06/18/2009
+- fixed compilation of block plugins when caching enabled
+- added $smarty.current_dir  which returns the current working directory
+
+06/14/2009
+- fixed array access on super globals
+- allow smarty tags within xml tags
+
+06/13/2009
+- bugfix at extend resource: create unique files for compiled template and cache for each combination of template files
+- update extend resource to handle appen and prepend block attributes
+- instantiate classes of plugins instead of calling them static
+
+06/03/2009
+- fixed repeat at block plugins
+
+05/25/2009
+- fixed problem with caching of compiler plugins
+
+05/14/2009
+- fixed directory separator handling
+
+05/09/2009
+- syntax change for stream variables
+- fixed bug when using absolute template filepath and caching
+
+05/08/2009
+- fixed bug of {nocache}  tag in included templates
+
+05/06/2009
+- allow that plugins_dir folder names can end without directory separator
+
+05/05/2009
+- fixed E_STRICT incompabilities
+- {function} tag bug fix
+- security policy definitions have been moved from plugins folder to file Security.class.php in libs folder
+- added allow_super_global configuration to security
+
+04/30/2009
+- functions defined with the {function} tag now always have global scope
+
+04/29/2009
+- fixed problem with directory setter methods
+- allow that cache_dir can end without directory separator
+
+04/28/2009
+- the {function} tag can no longer overwrite standard smarty tags
+- inherit functions defined by the {fuction} tag into subtemplates
+- added {while <statement>} sytax to while tag
+
+04/26/2009
+- added trusted stream checking to security
+- internal changes at file dependency check for caching
+
+04/24/2009
+- changed name of {template} tag to {function}
+- added new {template} tag
+
+04/23/2009
+- fixed access of special smarty variables from included template
+
+04/22/2009
+- unified template stream syntax with standard Smarty resource syntax  $smarty->display('mystream:mytemplate')
+
+04/21/2009
+- change of new style syntax for forach. Now:  {foreach $array as $var}  like in PHP
+
+04/20/2009
+- fixed "$foo.bar  ..." variable replacement in double quoted strings
+- fixed error in {include} tag with variable file attribute
+
+04/18/2009
+- added stream resources  ($smarty->display('mystream://mytemplate'))
+- added stream variables  {$mystream:myvar}
+
+04/14/2009
+- fixed compile_id handling on {include} tags
+- fixed append/prepend attributes in {block} tag
+- added  {if  'expression' is in 'array'}  syntax
+- use crc32 as hash for compiled config files.
+
+04/13/2009
+- fixed scope problem with parent variables when appending variables within templates.
+- fixed code for {block} without childs (possible sources for notice errors removed)
+
+04/12/2009
+- added append and prepend attribute to {block} tag
+
+04/11/2009
+- fixed variables in 'file' attribute of {extend} tag
+- fixed problems in modifiers (if mb string functions not present)
+
+04/10/2009
+- check if mb string functions available otherwise fallback to normal string functions
+- added global variable scope SMARTY_GLOBAL_SCOPE
+- enable 'variable' filter by default
+- fixed {$smarty.block.parent.foo}
+- implementation of a 'variable' filter as replacement for default modifier
+
+04/09/2009
+- fixed execution of filters defined by classes
+- compile the always the content of {block} tags to make shure that the filters are running over it
+- syntax corrections on variable object property
+- syntax corrections on array access in dot syntax
+
+04/08/2009
+- allow variable object property
+
+04/07/2009
+- changed variable scopes to SMARTY_LOCAL_SCOPE, SMARTY_PARENT_SCOPE, SMARTY_ROOT_SCOPE to avoid possible conflicts with user constants
+- Smarty variable global attribute replaced with scope attribute
+
+04/06/2009
+- variable scopes LOCAL_SCOPE, PARENT_SCOPE, ROOT_SCOPE
+- more getter/setter methods
+
+04/05/2009
+- replaced new array looping syntax {for $foo in $array} with {foreach $foo in $array} to avoid confusion
+- added append array for short form of assign  {$foo[]='bar'} and allow assignments to nested arrays {$foo['bla']['blue']='bar'}
+
+04/04/2009
+- make output of template default handlers cachable and save compiled source
+- some fixes on yesterdays update
+
+04/03/2006
+- added registerDefaultTemplateHandler method and functionallity
+- added registerDefaultPluginHandler method and functionallity
+- added {append} tag to extend Smarty array variabled
+
+04/02/2009
+- added setter/getter methods
+- added $foo@first and $foo@last properties at {for} tag
+- added $set_timezone (true/false) property to setup optionally the default time zone
+
+03/31/2009
+- bugfix smarty.class and internal.security_handler
+- added compile_check configuration
+- added setter/getter methods
+
+03/30/2009
+- added all major setter/getter methods
+
+03/28/2009
+- {block} tags can be nested now
+- md5 hash function replace with crc32 for speed optimization
+- file order for exted resource inverted
+- clear_compiled_tpl and clear_cache_all will not touch .svn folder any longer
+
+03/27/2009
+- added extend resource
+
+03/26/2009
+- fixed parser not to create error on `word` in double quoted strings
+- allow PHP  array(...)
+- implemented  $smarty.block.name.parent to access parent block content
+- fixed smarty.class
+
+
+03/23/2009
+- fixed {foreachelse} and {forelse} tags
+
+03/22/2009
+- fixed possible sources for notice errors
+- rearrange SVN into distribution and development folders
+
+03/21/2009
+- fixed exceptions in function plugins
+- fixed notice error in Smarty.class.php
+- allow chained objects to span multiple lines
+- fixed error in modifiers
+
+03/20/2009
+- moved /plugins folder into /libs folder
+- added noprint modifier
+- autoappend a directory separator if the xxxxx_dir definition have no trailing one
+
+03/19/2009
+- allow array definition as modifier parameter
+- changed modifier to use multi byte string funktions.
+
+03/17/2009
+- bugfix
+
+03/15/2009
+- added {include_php} tag for BC
+- removed @ error suppression
+- bugfix fetch did always repeat output of first call when calling same template several times
+- PHPunit tests extended
+
+03/13/2009
+- changed block syntax to be Smarty like  {block:titel} -> {block name=titel}
+- compiling of {block} and {extend} tags rewriten for better performance
+- added special Smarty variable block  ($smarty.block.foo} returns the parent definition of block foo
+- optimization of {block} tag compiled code.
+- fixed problem with escaped double quotes in double quoted strings
+
+03/12/2009
+- added support of template inheritance by {extend } and {block } tags.
+- bugfix comments within literals
+- added scope attribuie to {include} tag
+
+03/10/2009
+- couple of bugfixes and improvements
+- PHPunit tests extended
+
+03/09/2009
+- added support for global template vars.  {assign_global...}  $smarty->assign_global(...)
+- added direct_access_security
+- PHPunit tests extended
+- added missing {if} tag conditions like "is div by" etc.
+
+03/08/2009
+- splitted up the Compiler class to make it easier to use a coustom compiler
+- made default plugins_dir relative to Smarty root and not current working directory
+- some changes to make the lexer parser better configurable
+- implemented {section} tag for Smarty2 BC
+
+03/07/2009
+- fixed problem with comment tags
+- fixed problem with #xxxx in double quoted string
+- new {while} tag implemented
+- made lexer and paser class configurable as $smarty property
+- Smarty method get_template_vars implemented
+- Smarty method get_registered_object implemented
+- Smarty method trigger_error implemented
+- PHPunit tests extended
+
+03/06/2009
+- final changes on config variable handling
+- parser change - unquoted strings will by be converted into single quoted strings
+- PHPunit tests extended
+- some code cleanup
+- fixed problem on catenate strings with expression
+- update of count_words modifier
+- bugfix on comment tags
+
+
+03/05/2009
+- bugfix on <?xml...> tag with caching enabled
+- changes on exception handling (by Monte)
+
+03/04/2009
+- added support for config variables
+- bugfix on <?xml...> tag
+
+03/02/2009
+- fixed unqouted strings within modifier parameter
+- bugfix parsing of mofifier parameter
+
+03/01/2009
+- modifier chaining works now as in Smarty2
+
+02/28/2009
+- changed handling of unqouted strings
+
+02/26/2009
+- bugfix
+- changed $smarty.capture.foo to be global for Smarty2 BC.
+
+02/24/2009
+- bugfix {php} {/php} tags for backward compatibility
+- bugfix for expressions on arrays
+- fixed usage of "null" value
+- added $smarty.foreach.foo.first and $smarty.foreach.foo.last
+
+02/06/2009
+- bugfix for request variables without index  for example $smarty.get
+- experimental solution for variable functions in static class
+
+02/05/2009
+- update of popup plugin
+- added config variables to template parser (load config functions still missing)
+- parser bugfix for empty quoted strings
+
+02/03/2009
+- allow array of objects as static class variabales.
+- use htmlentities at source output at template errors.
+
+02/02/2009
+- changed search order on modifiers to look at plugins folder first
+- parser bug fix for modifier on array elements  $foo.bar|modifier
+- parser bug fix on single quoted srings
+- internal: splitted up compiler plugin files
+
+02/01/2009
+- allow method chaining on static classes
+- special Smarty variables  $smarty.... implemented
+- added {PHP} {/PHP} tags for backward compatibility
+
+01/31/2009
+- added {math} plugin for Smarty2 BC
+- added template_exists method
+- changed Smarty3 method enable_security() to enableSecurity() to follow camelCase standards
+
+01/30/2009
+- bugfix in single quoted strings
+- changed syntax for variable property access from $foo:property to $foo@property because of ambiguous syntax at modifiers
+
+01/29/2009
+- syntax for array definition changed from (1,2,3) to [1,2,3] to remove ambiguous syntax
+- allow  {for $foo in [1,2,3]} syntax
+- bugfix in double quoted strings
+- allow <?xml...?> tags in template even if short_tags are enabled
+
+01/28/2009
+- fixed '!==' if condition.
+
+01/28/2009
+- added support of {strip} {/strip} tag.
+
+01/27/2009
+- bug fix on backticks in double quoted strings at objects
+
+01/25/2009
+- Smarty2 modfiers added to SVN
+
+01/25/2009
+- bugfix allow arrays at object properties in Smarty syntax
+- the template object is now passed as additional parameter at plugin calls
+- clear_compiled_tpl method completed
+
+01/20/2009
+- access to class constants implemented  ( class::CONSTANT )
+- access to static class variables implemented ( class::$variable )
+- call of static class methods implemented ( class::method() )
+
+01/16/2009
+- reallow leading _ in variable names  {$_var}
+- allow array of objects  {$array.index->method()} syntax
+- finished work on clear_cache and clear_cache_all methods
+
+01/11/2009
+- added support of {literal} tag
+- added support of {ldelim} and {rdelim} tags
+- make code compatible to run with E_STRICT error setting
+
+01/08/2009
+- moved clear_assign and clear_all_assign to internal.templatebase.php
+- added assign_by_ref, append and append_by_ref methods
+
+01/02/2009
+- added load_filter method
+- fished work on filter handling
+- optimization of plugin loading
+
+12/30/2008
+- added compiler support of registered object
+- added backtick support in doubled quoted strings for backward compatibility
+- some minor bug fixes and improvments
+
+12/23/2008
+- fixed problem of not working "not" operator in if-expressions
+- added handling of compiler function plugins
+- finished work on (un)register_compiler_function method
+- finished work on (un)register_modifier method
+- plugin handling from plugins folder changed for modifier plugins
+  deleted - internal.modifier.php
+- added modifier chaining to parser
+
+12/17/2008
+- finished (un)register_function method
+- finished (un)register_block method
+- added security checking for PHP functions in PHP templates
+- plugin handling from plugins folder rewritten
+  new - internal.plugin_handler.php
+  deleted - internal.block.php
+  deleted - internal.function.php
+- removed plugin checking from security handler
+
+12/16/2008
+
+- new start of this change_log file
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/LICENSE b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/LICENSE
new file mode 100644
index 000000000..595e5993d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/LICENSE
@@ -0,0 +1,179 @@
+Smarty: the PHP compiling template engine
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
+
+ This library 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 Lesser General Public License below for more details.
+
+
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 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.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser 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
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/README.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/README.md
new file mode 100644
index 000000000..9b8706d45
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/README.md
@@ -0,0 +1,20 @@
+# Smarty template engine
+Smarty is a template engine for PHP, facilitating the separation of presentation (HTML/CSS) from application logic. 
+
+![CI](https://github.com/smarty-php/smarty/workflows/CI/badge.svg)
+
+## Documentation
+Read the [documentation](https://smarty-php.github.io/smarty/) to find out how to use it. 
+
+## Requirements
+Smarty can be run with PHP 7.1 to PHP 8.3.
+
+## Installation
+Smarty versions 3.1.11 or later can be installed with [Composer](https://getcomposer.org/).
+
+To get the latest stable version of Smarty use:
+```bash
+composer require smarty/smarty
+````
+
+More in the [Getting Started](./docs/getting-started.md) section of the docs.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/SECURITY.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/SECURITY.md
new file mode 100644
index 000000000..80b5ef5c8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/SECURITY.md
@@ -0,0 +1,20 @@
+# Security Policy
+
+## Supported Versions
+
+Smarty currently supports the latest minor version of Smarty 3 and Smarty 4.
+
+| Version | Supported          |
+|---------|--------------------|
+| 4.3.x   | :white_check_mark: |
+| 3.1.x   | :white_check_mark: |
+| < 3.1   | :x:                |
+
+## Reporting a Vulnerability
+
+If you have discovered a security issue with Smarty, please contact us at mail [at] simonwisselink.nl. Do not 
+disclose your findings publicly and **PLEASE** do not file an Issue (because that would disclose your findings 
+publicly.)
+ 
+We will try to confirm the vulnerability and develop a fix if appropriate. When we release the fix, we will publish 
+a security release. Please let us know if you want to be credited.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/changelog/.gitkeep b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/changelog/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/composer.json b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/composer.json
new file mode 100644
index 000000000..165bfd2a1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/composer.json
@@ -0,0 +1,49 @@
+{
+    "name": "smarty/smarty",
+    "type": "library",
+    "description": "Smarty - the compiling PHP template engine",
+    "keywords": [
+        "templating"
+    ],
+    "homepage": "https://smarty-php.github.io/smarty/",
+    "license": "LGPL-3.0",
+    "authors": [
+        {
+            "name": "Monte Ohrt",
+            "email": "monte@ohrt.com"
+        },
+        {
+            "name": "Uwe Tews",
+            "email": "uwe.tews@googlemail.com"
+        },
+        {
+            "name": "Rodney Rehm",
+            "email": "rodney.rehm@medialize.de"
+        },
+        {
+            "name": "Simon Wisselink",
+            "homepage": "https://www.iwink.nl/"
+        }
+    ],
+    "support": {
+        "issues": "https://github.com/smarty-php/smarty/issues",
+        "forum": "https://github.com/smarty-php/smarty/discussions"
+    },
+    "require": {
+        "php": "^7.1 || ^8.0"
+    },
+    "autoload": {
+        "classmap": [
+            "libs/"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "4.0.x-dev"
+        }
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^8.5 || ^7.5",
+        "smarty/smarty-lexer": "^3.1"
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/configs/test.conf b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/configs/test.conf
new file mode 100644
index 000000000..5eac748ec
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/configs/test.conf
@@ -0,0 +1,5 @@
+title = Welcome to Smarty!
+cutoff_size = 40
+
+[setup]
+bold = true
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/index.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/index.php
new file mode 100644
index 000000000..3aed37168
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/index.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Example Application
+ *
+ * @package Example-application
+ */
+require '../libs/Smarty.class.php';
+$smarty = new Smarty;
+//$smarty->force_compile = true;
+$smarty->debugging = true;
+$smarty->caching = true;
+$smarty->cache_lifetime = 120;
+$smarty->assign("Name", "Fred Irving Johnathan Bradley Peppergill", true);
+$smarty->assign("FirstName", array("John", "Mary", "James", "Henry"));
+$smarty->assign("LastName", array("Doe", "Smith", "Johnson", "Case"));
+$smarty->assign(
+    "Class",
+    array(
+        array("A", "B", "C", "D"),
+        array("E", "F", "G", "H"),
+        array("I", "J", "K", "L"),
+        array("M", "N", "O", "P")
+    )
+);
+$smarty->assign(
+    "contacts",
+    array(
+        array("phone" => "1", "fax" => "2", "cell" => "3"),
+        array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234")
+    )
+);
+$smarty->assign("option_values", array("NY", "NE", "KS", "IA", "OK", "TX"));
+$smarty->assign("option_output", array("New York", "Nebraska", "Kansas", "Iowa", "Oklahoma", "Texas"));
+$smarty->assign("option_selected", "NE");
+$smarty->display('index.tpl');
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/cacheresource.apc.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/cacheresource.apc.php
new file mode 100644
index 000000000..7867cc598
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/cacheresource.apc.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * APC CacheResource
+ * CacheResource Implementation based on the KeyValueStore API to use
+ * memcache as the storage resource for Smarty's output caching.
+ * *
+ *
+ * @package CacheResource-examples
+ * @author  Uwe Tews
+ */
+class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
+{
+    /**
+     * Smarty_CacheResource_Apc constructor.
+     *
+     * @throws \Exception
+     */
+    public function __construct()
+    {
+        // test if APC is present
+        if (!function_exists('apc_cache_info')) {
+            throw new Exception('APC Template Caching Error: APC is not installed');
+        }
+    }
+
+    /**
+     * Read values for a set of keys from cache
+     *
+     * @param array $keys list of keys to fetch
+     *
+     * @return array   list of values with the given keys used as indexes
+     * @return boolean true on success, false on failure
+     */
+    protected function read(array $keys)
+    {
+        $_res = array();
+        $res = apc_fetch($keys);
+        foreach ($res as $k => $v) {
+            $_res[ $k ] = $v;
+        }
+        return $_res;
+    }
+
+    /**
+     * Save values for a set of keys to cache
+     *
+     * @param array $keys   list of values to save
+     * @param int   $expire expiration time
+     *
+     * @return boolean true on success, false on failure
+     */
+    protected function write(array $keys, $expire = null)
+    {
+        foreach ($keys as $k => $v) {
+            apc_store($k, $v, $expire);
+        }
+        return true;
+    }
+
+    /**
+     * Remove values from cache
+     *
+     * @param array $keys list of keys to delete
+     *
+     * @return boolean true on success, false on failure
+     */
+    protected function delete(array $keys)
+    {
+        foreach ($keys as $k) {
+            apc_delete($k);
+        }
+        return true;
+    }
+
+    /**
+     * Remove *all* values from cache
+     *
+     * @return boolean true on success, false on failure
+     */
+    protected function purge()
+    {
+        return apc_clear_cache('user');
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/cacheresource.memcache.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/cacheresource.memcache.php
new file mode 100644
index 000000000..71fe9d3f1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/cacheresource.memcache.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * Memcache CacheResource
+ * CacheResource Implementation based on the KeyValueStore API to use
+ * memcache as the storage resource for Smarty's output caching.
+ * Note that memcache has a limitation of 256 characters per cache-key.
+ * To avoid complications all cache-keys are translated to a sha1 hash.
+ *
+ * @package CacheResource-examples
+ * @author  Rodney Rehm
+ */
+class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
+{
+    /**
+     * memcache instance
+     *
+     * @var Memcache
+     */
+    protected $memcache = null;
+
+    /**
+     * Smarty_CacheResource_Memcache constructor.
+     */
+    public function __construct()
+    {
+        if (class_exists('Memcached')) {
+            $this->memcache = new Memcached();
+        } else {
+            $this->memcache = new Memcache();
+        }
+        $this->memcache->addServer('127.0.0.1', 11211);
+    }
+
+    /**
+     * Read values for a set of keys from cache
+     *
+     * @param array $keys list of keys to fetch
+     *
+     * @return array   list of values with the given keys used as indexes
+     * @return boolean true on success, false on failure
+     */
+    protected function read(array $keys)
+    {
+        $res = array();
+        foreach ($keys as $key) {
+            $k = sha1($key);
+            $res[$key] = $this->memcache->get($k);
+        }
+        return $res;
+    }
+
+    /**
+     * Save values for a set of keys to cache
+     *
+     * @param array $keys   list of values to save
+     * @param int   $expire expiration time
+     *
+     * @return boolean true on success, false on failure
+     */
+    protected function write(array $keys, $expire = null)
+    {
+        foreach ($keys as $k => $v) {
+            $k = sha1($k);
+            if (class_exists('Memcached')) {
+                $this->memcache->set($k, $v, $expire);
+            } else {
+                $this->memcache->set($k, $v, 0, $expire);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Remove values from cache
+     *
+     * @param array $keys list of keys to delete
+     *
+     * @return boolean true on success, false on failure
+     */
+    protected function delete(array $keys)
+    {
+        foreach ($keys as $k) {
+            $k = sha1($k);
+            $this->memcache->delete($k);
+        }
+        return true;
+    }
+
+    /**
+     * Remove *all* values from cache
+     *
+     * @return boolean true on success, false on failure
+     */
+    protected function purge()
+    {
+        return $this->memcache->flush();
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/cacheresource.mysql.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/cacheresource.mysql.php
new file mode 100644
index 000000000..c5037eb13
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/cacheresource.mysql.php
@@ -0,0 +1,183 @@
+<?php
+
+/**
+ * MySQL CacheResource
+ * CacheResource Implementation based on the Custom API to use
+ * MySQL as the storage resource for Smarty's output caching.
+ * Table definition:
+ * <pre>CREATE TABLE IF NOT EXISTS `output_cache` (
+ *   `id` CHAR(40) NOT NULL COMMENT 'sha1 hash',
+ *   `name` VARCHAR(250) NOT NULL,
+ *   `cache_id` VARCHAR(250) NULL DEFAULT NULL,
+ *   `compile_id` VARCHAR(250) NULL DEFAULT NULL,
+ *   `modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ *   `content` LONGTEXT NOT NULL,
+ *   PRIMARY KEY (`id`),
+ *   INDEX(`name`),
+ *   INDEX(`cache_id`),
+ *   INDEX(`compile_id`),
+ *   INDEX(`modified`)
+ * ) ENGINE = InnoDB;</pre>
+ *
+ * @package CacheResource-examples
+ * @author  Rodney Rehm
+ */
+class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
+{
+    /**
+     * @var \PDO
+     */
+    protected $db;
+
+    /**
+     * @var \PDOStatement
+     */
+    protected $fetch;
+
+    /**
+     * @var \PDOStatement
+     */
+    protected $fetchTimestamp;
+
+    /**
+     * @var \PDOStatement
+     */
+    protected $save;
+
+    /**
+     * Smarty_CacheResource_Mysql constructor.
+     *
+     * @throws \SmartyException
+     */
+    public function __construct()
+    {
+        try {
+            $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
+        } catch (PDOException $e) {
+            throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
+        }
+        $this->fetch = $this->db->prepare('SELECT modified, content FROM output_cache WHERE id = :id');
+        $this->fetchTimestamp = $this->db->prepare('SELECT modified FROM output_cache WHERE id = :id');
+        $this->save = $this->db->prepare(
+            'REPLACE INTO output_cache (id, name, cache_id, compile_id, content)
+            VALUES  (:id, :name, :cache_id, :compile_id, :content)'
+        );
+    }
+
+    /**
+     * fetch cached content and its modification time from data source
+     *
+     * @param string  $id         unique cache content identifier
+     * @param string  $name       template name
+     * @param string  $cache_id   cache id
+     * @param string  $compile_id compile id
+     * @param string  $content    cached content
+     * @param integer $mtime      cache modification timestamp (epoch)
+     *
+     * @return void
+     */
+    protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime)
+    {
+        $this->fetch->execute(array('id' => $id));
+        $row = $this->fetch->fetch();
+        $this->fetch->closeCursor();
+        if ($row) {
+            $content = $row[ 'content' ];
+            $mtime = strtotime($row[ 'modified' ]);
+        } else {
+            $content = null;
+            $mtime = null;
+        }
+    }
+
+    /**
+     * Fetch cached content's modification timestamp from data source
+     *
+     * @note implementing this method is optional. Only implement it if modification times can be accessed faster than
+     *       loading the complete cached content.
+     *
+     * @param string $id         unique cache content identifier
+     * @param string $name       template name
+     * @param string $cache_id   cache id
+     * @param string $compile_id compile id
+     *
+     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+     */
+    protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
+    {
+        $this->fetchTimestamp->execute(array('id' => $id));
+        $mtime = strtotime($this->fetchTimestamp->fetchColumn());
+        $this->fetchTimestamp->closeCursor();
+        return $mtime;
+    }
+
+    /**
+     * Save content to cache
+     *
+     * @param string       $id         unique cache content identifier
+     * @param string       $name       template name
+     * @param string       $cache_id   cache id
+     * @param string       $compile_id compile id
+     * @param integer|null $exp_time   seconds till expiration time in seconds or null
+     * @param string       $content    content to cache
+     *
+     * @return boolean      success
+     */
+    protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content)
+    {
+        $this->save->execute(
+            array('id' => $id,
+                  'name' => $name,
+                  'cache_id' => $cache_id,
+                  'compile_id' => $compile_id,
+                  'content' => $content,)
+        );
+        return !!$this->save->rowCount();
+    }
+
+    /**
+     * Delete content from cache
+     *
+     * @param string       $name       template name
+     * @param string       $cache_id   cache id
+     * @param string       $compile_id compile id
+     * @param integer|null $exp_time   seconds till expiration or null
+     *
+     * @return integer      number of deleted caches
+     */
+    protected function delete($name, $cache_id, $compile_id, $exp_time)
+    {
+        // delete the whole cache
+        if ($name === null && $cache_id === null && $compile_id === null && $exp_time === null) {
+            // returning the number of deleted caches would require a second query to count them
+            $query = $this->db->query('TRUNCATE TABLE output_cache');
+            return -1;
+        }
+        // build the filter
+        $where = array();
+        // equal test name
+        if ($name !== null) {
+            $where[] = 'name = ' . $this->db->quote($name);
+        }
+        // equal test compile_id
+        if ($compile_id !== null) {
+            $where[] = 'compile_id = ' . $this->db->quote($compile_id);
+        }
+        // range test expiration time
+        if ($exp_time !== null) {
+            $where[] = 'modified < DATE_SUB(NOW(), INTERVAL ' . intval($exp_time) . ' SECOND)';
+        }
+        // equal test cache_id and match sub-groups
+        if ($cache_id !== null) {
+            $where[] =
+                '(cache_id = ' .
+                $this->db->quote($cache_id) .
+                ' OR cache_id LIKE ' .
+                $this->db->quote($cache_id . '|%') .
+                ')';
+        }
+        // run delete query
+        $query = $this->db->query('DELETE FROM output_cache WHERE ' . join(' AND ', $where));
+        return $query->rowCount();
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/cacheresource.pdo.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/cacheresource.pdo.php
new file mode 100644
index 000000000..ae3ebbf7d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/cacheresource.pdo.php
@@ -0,0 +1,346 @@
+<?php
+
+/**
+ * PDO Cache Handler
+ * Allows you to store Smarty Cache files into your db.
+ * Example table :
+ * CREATE TABLE `smarty_cache` (
+ * `id` char(40) NOT NULL COMMENT 'sha1 hash',
+ * `name` varchar(250) NOT NULL,
+ * `cache_id` varchar(250) DEFAULT NULL,
+ * `compile_id` varchar(250) DEFAULT NULL,
+ * `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ * `expire` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+ * `content` mediumblob NOT NULL,
+ * PRIMARY KEY (`id`),
+ * KEY `name` (`name`),
+ * KEY `cache_id` (`cache_id`),
+ * KEY `compile_id` (`compile_id`),
+ * KEY `modified` (`modified`),
+ * KEY `expire` (`expire`)
+ * ) ENGINE=InnoDB
+ * Example usage :
+ *      $cnx    =   new PDO("mysql:host=localhost;dbname=mydb", "username", "password");
+ *      $smarty->setCachingType('pdo');
+ *      $smarty->loadPlugin('Smarty_CacheResource_Pdo');
+ *      $smarty->registerCacheResource('pdo', new Smarty_CacheResource_Pdo($cnx, 'smarty_cache'));
+ *
+ * @author Beno!t POLASZEK - 2014
+ */
+class Smarty_CacheResource_Pdo extends Smarty_CacheResource_Custom
+{
+    /**
+     * @var string[]
+     */
+    protected $fetchStatements = array('default' => 'SELECT %2$s
+                                                                                    FROM %1$s 
+                                                                                    WHERE 1 
+                                                                                    AND id          = :id 
+                                                                                    AND cache_id    IS NULL 
+                                                                                    AND compile_id  IS NULL',
+                                       'withCacheId' => 'SELECT %2$s
+                                                                                FROM %1$s 
+                                                                                WHERE 1 
+                                                                                AND id          = :id 
+                                                                                AND cache_id    = :cache_id 
+                                                                                AND compile_id  IS NULL',
+                                       'withCompileId' => 'SELECT %2$s
+                                                                                FROM %1$s 
+                                                                                WHERE 1 
+                                                                                AND id          = :id 
+                                                                                AND compile_id  = :compile_id 
+                                                                                AND cache_id    IS NULL',
+                                       'withCacheIdAndCompileId' => 'SELECT %2$s
+                                                                                FROM %1$s 
+                                                                                WHERE 1 
+                                                                                AND id          = :id 
+                                                                                AND cache_id    = :cache_id 
+                                                                                AND compile_id  = :compile_id');
+
+    /**
+     * @var string
+     */
+    protected $insertStatement = 'INSERT INTO %s
+
+                                                SET id          =   :id, 
+                                                    name        =   :name, 
+                                                    cache_id    =   :cache_id, 
+                                                    compile_id  =   :compile_id, 
+                                                    modified    =   CURRENT_TIMESTAMP, 
+                                                    expire      =   DATE_ADD(CURRENT_TIMESTAMP, INTERVAL :expire SECOND), 
+                                                    content     =   :content 
+
+                                                ON DUPLICATE KEY UPDATE 
+                                                    name        =   :name, 
+                                                    cache_id    =   :cache_id, 
+                                                    compile_id  =   :compile_id, 
+                                                    modified    =   CURRENT_TIMESTAMP, 
+                                                    expire      =   DATE_ADD(CURRENT_TIMESTAMP, INTERVAL :expire SECOND), 
+                                                    content     =   :content';
+
+    /**
+     * @var string
+     */
+    protected $deleteStatement = 'DELETE FROM %1$s WHERE %2$s';
+
+    /**
+     * @var string
+     */
+    protected $truncateStatement = 'TRUNCATE TABLE %s';
+
+    /**
+     * @var string
+     */
+    protected $fetchColumns = 'modified, content';
+
+    /**
+     * @var string
+     */
+    protected $fetchTimestampColumns = 'modified';
+
+    /**
+     * @var \PDO
+     */
+    protected $pdo;
+
+    /**
+     * @var
+     */
+    protected $table;
+
+    /**
+     * @var null
+     */
+    protected $database;
+
+    /**
+     * Constructor
+     *
+     * @param PDO    $pdo      PDO : active connection
+     * @param string $table    : table (or view) name
+     * @param string $database : optional - if table is located in another db
+     *
+     * @throws \SmartyException
+     */
+    public function __construct(PDO $pdo, $table, $database = null)
+    {
+        if (is_null($table)) {
+            throw new SmartyException("Table name for caching can't be null");
+        }
+        $this->pdo = $pdo;
+        $this->table = $table;
+        $this->database = $database;
+        $this->fillStatementsWithTableName();
+    }
+
+    /**
+     * Fills the table name into the statements.
+     *
+     * @return $this Current Instance
+     * @access protected
+     */
+    protected function fillStatementsWithTableName()
+    {
+        foreach ($this->fetchStatements as &$statement) {
+            $statement = sprintf($statement, $this->getTableName(), '%s');
+        }
+        $this->insertStatement = sprintf($this->insertStatement, $this->getTableName());
+        $this->deleteStatement = sprintf($this->deleteStatement, $this->getTableName(), '%s');
+        $this->truncateStatement = sprintf($this->truncateStatement, $this->getTableName());
+        return $this;
+    }
+
+    /**
+     * Gets the fetch statement, depending on what you specify
+     *
+     * @param string      $columns    : the column(s) name(s) you want to retrieve from the database
+     * @param string      $id         unique cache content identifier
+     * @param string|null $cache_id   cache id
+     * @param string|null $compile_id compile id
+     *
+     * @access protected
+     * @return \PDOStatement
+     */
+    protected function getFetchStatement($columns, $id, $cache_id = null, $compile_id = null)
+    {
+        $args = array();
+        if (!is_null($cache_id) && !is_null($compile_id)) {
+            $query = $this->fetchStatements[ 'withCacheIdAndCompileId' ] and
+            $args = array('id' => $id, 'cache_id' => $cache_id, 'compile_id' => $compile_id);
+        } elseif (is_null($cache_id) && !is_null($compile_id)) {
+            $query = $this->fetchStatements[ 'withCompileId' ] and
+            $args = array('id' => $id, 'compile_id' => $compile_id);
+        } elseif (!is_null($cache_id) && is_null($compile_id)) {
+            $query = $this->fetchStatements[ 'withCacheId' ] and $args = array('id' => $id, 'cache_id' => $cache_id);
+        } else {
+            $query = $this->fetchStatements[ 'default' ] and $args = array('id' => $id);
+        }
+        $query = sprintf($query, $columns);
+        $stmt = $this->pdo->prepare($query);
+        foreach ($args as $key => $value) {
+            $stmt->bindValue($key, $value);
+        }
+        return $stmt;
+    }
+
+    /**
+     * fetch cached content and its modification time from data source
+     *
+     * @param string      $id         unique cache content identifier
+     * @param string      $name       template name
+     * @param string|null $cache_id   cache id
+     * @param string|null $compile_id compile id
+     * @param string      $content    cached content
+     * @param integer     $mtime      cache modification timestamp (epoch)
+     *
+     * @return void
+     * @access protected
+     */
+    protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime)
+    {
+        $stmt = $this->getFetchStatement($this->fetchColumns, $id, $cache_id, $compile_id);
+        $stmt->execute();
+        $row = $stmt->fetch();
+        $stmt->closeCursor();
+        if ($row) {
+            $content = $this->outputContent($row[ 'content' ]);
+            $mtime = strtotime($row[ 'modified' ]);
+        } else {
+            $content = null;
+            $mtime = null;
+        }
+    }
+
+    /**
+     * Fetch cached content's modification timestamp from data source
+     * {@internal implementing this method is optional.
+     *  Only implement it if modification times can be accessed faster than loading the complete cached content.}}
+     *
+     * @param string      $id         unique cache content identifier
+     * @param string      $name       template name
+     * @param string|null $cache_id   cache id
+     * @param string|null $compile_id compile id
+     *
+     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+     * @access protected
+     */
+    //    protected function fetchTimestamp($id, $name, $cache_id = null, $compile_id = null) {
+    //        $stmt       =   $this->getFetchStatement($this->fetchTimestampColumns, $id, $cache_id, $compile_id);
+    //        $stmt       ->  execute();
+    //        $mtime      =   strtotime($stmt->fetchColumn());
+    //        $stmt       ->  closeCursor();
+    //        return $mtime;
+    //    }
+    /**
+     * Save content to cache
+     *
+     * @param string       $id         unique cache content identifier
+     * @param string       $name       template name
+     * @param string|null  $cache_id   cache id
+     * @param string|null  $compile_id compile id
+     * @param integer|null $exp_time   seconds till expiration time in seconds or null
+     * @param string       $content    content to cache
+     *
+     * @return boolean success
+     * @access protected
+     */
+    protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content)
+    {
+        $stmt = $this->pdo->prepare($this->insertStatement);
+        $stmt->bindValue('id', $id);
+        $stmt->bindValue('name', $name);
+        $stmt->bindValue('cache_id', $cache_id, (is_null($cache_id)) ? PDO::PARAM_NULL : PDO::PARAM_STR);
+        $stmt->bindValue('compile_id', $compile_id, (is_null($compile_id)) ? PDO::PARAM_NULL : PDO::PARAM_STR);
+        $stmt->bindValue('expire', (int)$exp_time, PDO::PARAM_INT);
+        $stmt->bindValue('content', $this->inputContent($content));
+        $stmt->execute();
+        return !!$stmt->rowCount();
+    }
+
+    /**
+     * Encodes the content before saving to database
+     *
+     * @param string $content
+     *
+     * @return string $content
+     * @access protected
+     */
+    protected function inputContent($content)
+    {
+        return $content;
+    }
+
+    /**
+     * Decodes the content before saving to database
+     *
+     * @param string $content
+     *
+     * @return string $content
+     * @access protected
+     */
+    protected function outputContent($content)
+    {
+        return $content;
+    }
+
+    /**
+     * Delete content from cache
+     *
+     * @param string|null $name       template name
+     * @param string|null $cache_id   cache id
+     * @param string|null $compile_id compile id
+     * @param              integer|null|-1 $exp_time   seconds till expiration or null
+     *
+     * @return integer number of deleted caches
+     * @access             protected
+     */
+    protected function delete($name = null, $cache_id = null, $compile_id = null, $exp_time = null)
+    {
+        // delete the whole cache
+        if ($name === null && $cache_id === null && $compile_id === null && $exp_time === null) {
+            // returning the number of deleted caches would require a second query to count them
+            $this->pdo->query($this->truncateStatement);
+            return -1;
+        }
+        // build the filter
+        $where = array();
+        // equal test name
+        if ($name !== null) {
+            $where[] = 'name = ' . $this->pdo->quote($name);
+        }
+        // equal test cache_id and match sub-groups
+        if ($cache_id !== null) {
+            $where[] =
+                '(cache_id = ' .
+                $this->pdo->quote($cache_id) .
+                ' OR cache_id LIKE ' .
+                $this->pdo->quote($cache_id . '|%') .
+                ')';
+        }
+        // equal test compile_id
+        if ($compile_id !== null) {
+            $where[] = 'compile_id = ' . $this->pdo->quote($compile_id);
+        }
+        // for clearing expired caches
+        if ($exp_time === Smarty::CLEAR_EXPIRED) {
+            $where[] = 'expire < CURRENT_TIMESTAMP';
+        } // range test expiration time
+        elseif ($exp_time !== null) {
+            $where[] = 'modified < DATE_SUB(NOW(), INTERVAL ' . intval($exp_time) . ' SECOND)';
+        }
+        // run delete query
+        $query = $this->pdo->query(sprintf($this->deleteStatement, join(' AND ', $where)));
+        return $query->rowCount();
+    }
+
+    /**
+     * Gets the formatted table name
+     *
+     * @return string
+     * @access protected
+     */
+    protected function getTableName()
+    {
+        return (is_null($this->database)) ? "`{$this->table}`" : "`{$this->database}`.`{$this->table}`";
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/cacheresource.pdo_gzip.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/cacheresource.pdo_gzip.php
new file mode 100644
index 000000000..5560b9e39
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/cacheresource.pdo_gzip.php
@@ -0,0 +1,42 @@
+<?php
+require_once 'cacheresource.pdo.php';
+
+/**
+ * PDO Cache Handler with GZIP support
+ * Example usage :
+ *      $cnx    =   new PDO("mysql:host=localhost;dbname=mydb", "username", "password");
+ *      $smarty->setCachingType('pdo_gzip');
+ *      $smarty->loadPlugin('Smarty_CacheResource_Pdo_Gzip');
+ *      $smarty->registerCacheResource('pdo_gzip', new Smarty_CacheResource_Pdo_Gzip($cnx, 'smarty_cache'));
+ *
+ * @require Smarty_CacheResource_Pdo class
+ * @author  Beno!t POLASZEK - 2014
+ */
+class Smarty_CacheResource_Pdo_Gzip extends Smarty_CacheResource_Pdo
+{
+    /**
+     * Encodes the content before saving to database
+     *
+     * @param string $content
+     *
+     * @return string $content
+     * @access protected
+     */
+    protected function inputContent($content)
+    {
+        return gzdeflate($content);
+    }
+
+    /**
+     * Decodes the content before saving to database
+     *
+     * @param string $content
+     *
+     * @return string $content
+     * @access protected
+     */
+    protected function outputContent($content)
+    {
+        return gzinflate($content);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/resource.extendsall.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/resource.extendsall.php
new file mode 100644
index 000000000..a547d41db
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/resource.extendsall.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Extends All Resource
+ * Resource Implementation modifying the extends-Resource to walk
+ * through the template_dirs and inherit all templates of the same name
+ *
+ * @package Resource-examples
+ * @author  Rodney Rehm
+ */
+class Smarty_Resource_Extendsall extends Smarty_Internal_Resource_Extends
+{
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    {
+        $uid = '';
+        $sources = array();
+        $timestamp = 0;
+        foreach ($source->smarty->getTemplateDir() as $key => $directory) {
+            try {
+                $s = Smarty_Resource::source(null, $source->smarty, 'file:' . '[' . $key . ']' . $source->name);
+                if (!$s->exists) {
+                    continue;
+                }
+                $sources[ $s->uid ] = $s;
+                $uid .= $s->filepath;
+                $timestamp = $s->timestamp > $timestamp ? $s->timestamp : $timestamp;
+            } catch (SmartyException $e) {
+            }
+        }
+        if (!$sources) {
+            $source->exists = false;
+            return;
+        }
+        $sources = array_reverse($sources, true);
+        reset($sources);
+        $s = current($sources);
+        $source->components = $sources;
+        $source->filepath = $s->filepath;
+        $source->uid = sha1($uid . $source->smarty->_joined_template_dir);
+        $source->exists = true;
+        $source->timestamp = $timestamp;
+    }
+
+    /**
+     * Disable timestamp checks for extendsall resource.
+     * The individual source components will be checked.
+     *
+     * @return bool false
+     */
+    public function checkTimestamps()
+    {
+        return false;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/resource.mysql.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/resource.mysql.php
new file mode 100644
index 000000000..95a3c2baf
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/resource.mysql.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * MySQL Resource
+ * Resource Implementation based on the Custom API to use
+ * MySQL as the storage resource for Smarty's templates and configs.
+ * Table definition:
+ * <pre>CREATE TABLE IF NOT EXISTS `templates` (
+ *   `name` varchar(100) NOT NULL,
+ *   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ *   `source` text,
+ *   PRIMARY KEY (`name`)
+ * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
+ * Demo data:
+ * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello
+ * world"}{$x}');</pre>
+ *
+ *
+ * @package Resource-examples
+ * @author  Rodney Rehm
+ */
+class Smarty_Resource_Mysql extends Smarty_Resource_Custom
+{
+    /**
+     * PDO instance
+     *
+     * @var \PDO
+     */
+    protected $db;
+
+    /**
+     * prepared fetch() statement
+     *
+     * @var \PDOStatement
+     */
+    protected $fetch;
+
+    /**
+     * prepared fetchTimestamp() statement
+     *
+     * @var \PDOStatement
+     */
+    protected $mtime;
+
+    /**
+     * Smarty_Resource_Mysql constructor.
+     *
+     * @throws \SmartyException
+     */
+    public function __construct()
+    {
+        try {
+            $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
+        } catch (PDOException $e) {
+            throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
+        }
+        $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
+        $this->mtime = $this->db->prepare('SELECT modified FROM templates WHERE name = :name');
+    }
+
+    /**
+     * Fetch a template and its modification time from database
+     *
+     * @param string  $name   template name
+     * @param string  $source template source
+     * @param integer $mtime  template modification timestamp (epoch)
+     *
+     * @return void
+     */
+    protected function fetch($name, &$source, &$mtime)
+    {
+        $this->fetch->execute(array('name' => $name));
+        $row = $this->fetch->fetch();
+        $this->fetch->closeCursor();
+        if ($row) {
+            $source = $row[ 'source' ];
+            $mtime = strtotime($row[ 'modified' ]);
+        } else {
+            $source = null;
+            $mtime = null;
+        }
+    }
+
+    /**
+     * Fetch a template's modification time from database
+     *
+     * @note implementing this method is optional. Only implement it if modification times can be accessed faster than
+     *       loading the comple template source.
+     *
+     * @param string $name template name
+     *
+     * @return integer timestamp (epoch) the template was modified
+     */
+    protected function fetchTimestamp($name)
+    {
+        $this->mtime->execute(array('name' => $name));
+        $mtime = $this->mtime->fetchColumn();
+        $this->mtime->closeCursor();
+        return strtotime($mtime);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/resource.mysqls.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/resource.mysqls.php
new file mode 100644
index 000000000..148a8dd61
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/plugins/resource.mysqls.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * MySQL Resource
+ * Resource Implementation based on the Custom API to use
+ * MySQL as the storage resource for Smarty's templates and configs.
+ * Note that this MySQL implementation fetches the source and timestamps in
+ * a single database query, instead of two separate like resource.mysql.php does.
+ * Table definition:
+ * <pre>CREATE TABLE IF NOT EXISTS `templates` (
+ *   `name` varchar(100) NOT NULL,
+ *   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ *   `source` text,
+ *   PRIMARY KEY (`name`)
+ * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
+ * Demo data:
+ * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello
+ * world"}{$x}');</pre>
+ *
+ *
+ * @package Resource-examples
+ * @author  Rodney Rehm
+ */
+class Smarty_Resource_Mysqls extends Smarty_Resource_Custom
+{
+    /**
+     * PDO instance
+     *
+     * @var \PDO
+     */
+    protected $db;
+
+    /**
+     * prepared fetch() statement
+     *
+     * @var \PDOStatement
+     */
+    protected $fetch;
+
+    /**
+     * Smarty_Resource_Mysqls constructor.
+     *
+     * @throws \SmartyException
+     */
+    public function __construct()
+    {
+        try {
+            $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
+        } catch (PDOException $e) {
+            throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
+        }
+        $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
+    }
+
+    /**
+     * Fetch a template and its modification time from database
+     *
+     * @param string  $name   template name
+     * @param string  $source template source
+     * @param integer $mtime  template modification timestamp (epoch)
+     *
+     * @return void
+     */
+    protected function fetch($name, &$source, &$mtime)
+    {
+        $this->fetch->execute(array('name' => $name));
+        $row = $this->fetch->fetch();
+        $this->fetch->closeCursor();
+        if ($row) {
+            $source = $row[ 'source' ];
+            $mtime = strtotime($row[ 'modified' ]);
+        } else {
+            $source = null;
+            $mtime = null;
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/templates/footer.tpl b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/templates/footer.tpl
new file mode 100644
index 000000000..e04310fdd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/templates/footer.tpl
@@ -0,0 +1,2 @@
+</BODY>
+</HTML>
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/templates/header.tpl b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/templates/header.tpl
new file mode 100644
index 000000000..783210a18
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/templates/header.tpl
@@ -0,0 +1,5 @@
+<HTML>
+<HEAD>
+<TITLE>{$title} - {$Name}</TITLE>
+</HEAD>
+<BODY bgcolor="#ffffff">
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/templates/index.tpl b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/templates/index.tpl
new file mode 100644
index 000000000..1fbb6d379
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/demo/templates/index.tpl
@@ -0,0 +1,87 @@
+{config_load file="test.conf" section="setup"}
+{include file="header.tpl" title=foo}
+
+<PRE>
+
+{* bold and title are read from the config file *}
+    {if #bold#}<b>{/if}
+        {* capitalize the first letters of each word of the title *}
+        Title: {#title#|capitalize}
+        {if #bold#}</b>{/if}
+
+    The current date and time is {$smarty.now|date_format:"%Y-%m-%d %H:%M:%S"}
+
+    The value of global assigned variable $SCRIPT_NAME is {$SCRIPT_NAME}
+
+    Example of accessing server environment variable SERVER_NAME: {$smarty.server.SERVER_NAME}
+
+    The value of {ldelim}$Name{rdelim} is <b>{$Name}</b>
+
+variable modifier example of {ldelim}$Name|upper{rdelim}
+
+<b>{$Name|upper}</b>
+
+
+An example of a section loop:
+
+    {section name=outer
+    loop=$FirstName}
+        {if $smarty.section.outer.index is odd by 2}
+            {$smarty.section.outer.rownum} . {$FirstName[outer]} {$LastName[outer]}
+        {else}
+            {$smarty.section.outer.rownum} * {$FirstName[outer]} {$LastName[outer]}
+        {/if}
+        {sectionelse}
+        none
+    {/section}
+
+    An example of section looped key values:
+
+    {section name=sec1 loop=$contacts}
+        phone: {$contacts[sec1].phone}
+        <br>
+
+            fax: {$contacts[sec1].fax}
+        <br>
+
+            cell: {$contacts[sec1].cell}
+        <br>
+    {/section}
+    <p>
+
+        testing strip tags
+        {strip}
+<table border=0>
+    <tr>
+        <td>
+            <A HREF="{$SCRIPT_NAME}">
+                <font color="red">This is a test </font>
+            </A>
+        </td>
+    </tr>
+</table>
+    {/strip}
+
+</PRE>
+
+This is an example of the html_select_date function:
+
+<form>
+    {html_select_date start_year=1998 end_year=2010}
+</form>
+
+This is an example of the html_select_time function:
+
+<form>
+    {html_select_time use_24_hours=false}
+</form>
+
+This is an example of the html_options function:
+
+<form>
+    <select name=states>
+        {html_options values=$option_values selected=$option_selected output=$option_output}
+    </select>
+</form>
+
+{include file="footer.tpl"}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/_config.yml b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/_config.yml
new file mode 100644
index 000000000..2f7efbeab
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-minimal
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/appendixes/tips.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/appendixes/tips.md
new file mode 100644
index 000000000..3c6e6b96f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/appendixes/tips.md
@@ -0,0 +1,274 @@
+# Tips & Tricks
+
+## Blank Variable Handling
+
+There may be times when you want to print a default value for an empty
+variable instead of printing nothing, such as printing `&nbsp;` so that
+html table backgrounds work properly. Many would use an
+[`{if}`](../designers/language-builtin-functions/language-function-if.md) statement to handle this, but there is a
+shorthand way with Smarty, using the
+[`default`](../designers/language-modifiers/language-modifier-default.md) variable modifier.
+
+> **Note**
+>
+> "Undefined variable" errors will show an E\_NOTICE if not disabled in
+> PHP's [`error_reporting()`](https://www.php.net/error_reporting) level or
+> Smarty's [`$error_reporting`](../programmers/api-variables/variable-error-reporting.md) property and
+> a variable had not been assigned to Smarty.
+
+```smarty
+
+    {* the long way *}
+    {if $title eq ''}
+       &nbsp;
+    {else}
+       {$title}
+    {/if}
+
+    {* the short way *}
+    {$title|default:'&nbsp;'}
+
+```        
+
+See also [`default`](../designers/language-modifiers/language-modifier-default.md) modifier and [default
+variable handling](#default-variable-handling).
+
+## Default Variable Handling
+
+If a variable is used frequently throughout your templates, applying the
+[`default`](../designers/language-modifiers/language-modifier-default.md) modifier every time it is
+mentioned can get a bit ugly. You can remedy this by assigning the
+variable its default value with the
+[`{assign}`](../designers/language-builtin-functions/language-function-assign.md) function.
+
+
+    {* do this somewhere at the top of your template *}
+    {assign var='title' value=$title|default:'no title'}
+
+    {* if $title was empty, it now contains the value "no title" when you use it *}
+    {$title}
+
+        
+
+See also [`default`](../designers/language-modifiers/language-modifier-default.md) modifier and [blank
+variable handling](#blank-variable-handling).
+
+## Passing variable title to header template
+
+When the majority of your templates use the same headers and footers, it
+is common to split those out into their own templates and
+[`{include}`](../designers/language-builtin-functions/language-function-include.md) them. But what if the header
+needs to have a different title, depending on what page you are coming
+from? You can pass the title to the header as an
+[attribute](../designers/language-basic-syntax/language-syntax-attributes.md) when it is included.
+
+`mainpage.tpl` - When the main page is drawn, the title of "Main Page"
+is passed to the `header.tpl`, and will subsequently be used as the
+title.
+
+```smarty
+
+{include file='header.tpl' title='Main Page'}
+{* template body goes here *}
+{include file='footer.tpl'}
+
+```
+
+`archives.tpl` - When the archives page is drawn, the title will be
+"Archives". Notice in the archive example, we are using a variable from
+the `archives_page.conf` file instead of a hard coded variable.
+
+```smarty
+
+{config_load file='archive_page.conf'}
+
+{include file='header.tpl' title=#archivePageTitle#}
+{* template body goes here *}
+{include file='footer.tpl'}
+
+```
+        
+
+`header.tpl` - Notice that "Smarty News" is printed if the `$title`
+variable is not set, using the [`default`](../designers/language-modifiers/language-modifier-default.md)
+variable modifier.
+
+```smarty
+
+<html>
+    <head>
+        <title>{$title|default:'Smarty News'}</title>
+    </head>
+<body>
+    
+```
+        
+
+`footer.tpl`
+
+```smarty
+
+    </body>
+</html>
+
+```
+        
+
+## Dates
+
+As a rule of thumb, always pass dates to Smarty as
+[timestamps](https://www.php.net/time). This allows template designers to
+use the [`date_format`](../designers/language-modifiers/language-modifier-date-format.md) modifier for
+full control over date formatting, and also makes it easy to compare
+dates if necessary.
+
+```smarty
+{$startDate|date_format}
+```
+        
+
+This will output:
+
+```
+Jan 4, 2009
+```
+
+```smarty
+
+{$startDate|date_format:"%Y/%m/%d"}
+
+```
+        
+
+This will output:
+
+```
+2009/01/04
+```
+
+Dates can be compared in the template by timestamps with:
+
+```smarty
+
+{if $order_date < $invoice_date}
+   ...do something..
+{/if}
+
+```        
+
+When using [`{html_select_date}`](../designers/language-custom-functions/language-function-html-select-date.md)
+in a template, the programmer will most likely want to convert the
+output from the form back into timestamp format. Here is a function to
+help you with that.
+
+```php
+
+<?php
+
+// this assumes your form elements are named
+// startDate_Day, startDate_Month, startDate_Year
+
+$startDate = makeTimeStamp($startDate_Year, $startDate_Month, $startDate_Day);
+
+function makeTimeStamp($year='', $month='', $day='')
+{
+   if(empty($year)) {
+       $year = strftime('%Y');
+   }
+   if(empty($month)) {
+       $month = strftime('%m');
+   }
+   if(empty($day)) {
+       $day = strftime('%d');
+   }
+
+   return mktime(0, 0, 0, $month, $day, $year);
+}
+
+```
+    
+
+See also [`{html_select_date}`](../designers/language-custom-functions/language-function-html-select-date.md),
+[`{html_select_time}`](../designers/language-custom-functions/language-function-html-select-time.md),
+[`date_format`](../designers/language-modifiers/language-modifier-date-format.md) and
+[`$smarty.now`](../designers/language-variables/language-variables-smarty.md#smarty-now),
+
+## Componentized Templates
+
+Traditionally, programming templates into your applications goes as
+follows: First, you accumulate your variables within your PHP
+application, (maybe with database queries.) Then, you instantiate your
+Smarty object, [`assign()`](../programmers/api-functions/api-assign.md) the variables and
+[`display()`](../programmers/api-functions/api-display.md) the template. So lets say for example we
+have a stock ticker on our template. We would collect the stock data in
+our application, then assign these variables in the template and display
+it. Now wouldn't it be nice if you could add this stock ticker to any
+application by merely including the template, and not worry about
+fetching the data up front?
+
+You can do this by writing a custom plugin for fetching the content and
+assigning it to a template variable.
+
+`function.load_ticker.php` - drop file in
+[`$plugins directory`](../programmers/api-variables/variable-plugins-dir.md)
+
+```php
+
+<?php
+
+// setup our function for fetching stock data
+function fetch_ticker($symbol)
+{
+   // put logic here that fetches $ticker_info
+   // from some ticker resource
+   return $ticker_info;
+}
+
+function smarty_function_load_ticker($params, $smarty)
+{
+   // call the function
+   $ticker_info = fetch_ticker($params['symbol']);
+
+   // assign template variable
+   $smarty->assign($params['assign'], $ticker_info);
+}
+
+```
+
+`index.tpl`
+
+```smarty
+
+{load_ticker symbol='SMARTY' assign='ticker'}
+
+Stock Name: {$ticker.name} Stock Price: {$ticker.price}
+
+``` 
+
+See also: [`{include}`](../designers/language-builtin-functions/language-function-include.md).
+
+## Obfuscating E-mail Addresses
+
+Do you ever wonder how your email address gets on so many spam mailing
+lists? One way spammers collect email addresses is from web pages. To
+help combat this problem, you can make your email address show up in
+scrambled javascript in the HTML source, yet it it will look and work
+correctly in the browser. This is done with the
+[`{mailto}`](../designers/language-custom-functions/language-function-mailto.md) plugin.
+
+```smarty
+
+<div id="contact">Send inquiries to
+{mailto address=$EmailAddress encode='javascript' subject='Hello'}
+</div>
+
+```        
+
+> **Note**
+>
+> This method isn\'t 100% foolproof. A spammer could conceivably program
+> his e-mail collector to decode these values, but not likely\....
+> hopefully..yet \... wheres that quantum computer :-?.
+
+See also [`escape`](../designers/language-modifiers/language-modifier-escape.md) modifier and
+[`{mailto}`](../designers/language-custom-functions/language-function-mailto.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/appendixes/troubleshooting.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/appendixes/troubleshooting.md
new file mode 100644
index 000000000..8364534af
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/appendixes/troubleshooting.md
@@ -0,0 +1,104 @@
+# Troubleshooting
+
+## Smarty/PHP errors
+
+Smarty can catch many errors such as missing tag attributes or malformed
+variable names. If this happens, you will see an error similar to the
+following:
+
+```
+Warning: Smarty: [in index.tpl line 4]: syntax error: unknown tag - '%blah'
+       in /path/to/smarty/Smarty.class.php on line 1041
+
+Fatal error: Smarty: [in index.tpl line 28]: syntax error: missing section name
+       in /path/to/smarty/Smarty.class.php on line 1041
+```
+        
+
+Smarty shows you the template name, the line number and the error. After
+that, the error consists of the actual line number in the Smarty class
+that the error occurred.
+
+There are certain errors that Smarty cannot catch, such as missing close
+tags. These types of errors usually end up in PHP compile-time parsing
+errors.
+
+`Parse error: parse error in /path/to/smarty/templates_c/index.tpl.php on line 75`
+    
+When you encounter a PHP parsing error, the error line number will
+correspond to the compiled PHP script, NOT the template itself. Usually
+you can look at the template and spot the syntax error. Here are some
+common things to look for: missing close tags for
+[`{if}{/if}`](../designers/language-builtin-functions/language-function-if.md) or
+[`{section}{/section}`](../designers/language-builtin-functions/language-function-section.md), 
+or syntax of logic within an `{if}` tag. If you can\'t find the error, you might have to
+open the compiled PHP file and go to the line number to figure out where
+the corresponding error is in the template.
+
+```
+Warning: Smarty error: unable to read resource: "index.tpl" in...
+```
+or
+```
+Warning: Smarty error: unable to read resource: "site.conf" in...
+```
+
+-   The [`$template_dir`](../programmers/api-variables/variable-template-dir.md) is incorrect, doesn't
+    exist or the file `index.tpl` is not in the `templates/` directory
+
+-   A [`{config_load}`](../designers/language-builtin-functions/language-function-config-load.md) function is
+    within a template (or [`configLoad()`](../programmers/api-functions/api-config-load.md) has been
+    called) and either [`$config_dir`](../programmers/api-variables/variable-config-dir.md) is
+    incorrect, does not exist or `site.conf` is not in the directory.
+
+```
+Fatal error: Smarty error: the $compile_dir 'templates_c' does not exist,
+or is not a directory...
+```
+
+-   Either the [`$compile_dir`](../programmers/api-variables/variable-compile-dir.md)is incorrectly
+    set, the directory does not exist, or `templates_c` is a file and
+    not a directory.
+
+```
+Fatal error: Smarty error: unable to write to $compile_dir '....
+```
+        
+
+-   The [`$compile_dir`](../programmers/api-variables/variable-compile-dir.md) is not writable by the
+    web server. See the bottom of the [installing
+    smarty](../getting-started.md#installation) page for more about permissions.
+
+```
+Fatal error: Smarty error: the $cache_dir 'cache' does not exist,
+or is not a directory. in /..
+```
+        
+-   This means that [`$caching`](../programmers/api-variables/variable-caching.md) is enabled and
+    either; the [`$cache_dir`](../programmers/api-variables/variable-cache-dir.md) is incorrectly set,
+    the directory does not exist, or `cache/` is a file and not a
+    directory.
+
+```
+Fatal error: Smarty error: unable to write to $cache_dir '/...
+```
+
+-   This means that [`$caching`](../programmers/api-variables/variable-caching.md) is enabled and the
+    [`$cache_dir`](../programmers/api-variables/variable-cache-dir.md) is not writable by the web
+    server. See the bottom of the [installing
+    smarty](../getting-started.md#installation) page for permissions.
+
+```
+Warning: filemtime(): stat failed for /path/to/smarty/cache/3ab50a623e65185c49bf17c63c90cc56070ea85c.one.tpl.php 
+in /path/to/smarty/libs/sysplugins/smarty_resource.php
+```
+
+-   This means that your application registered a custom error handler
+    (using [set_error_handler()](https://www.php.net/set_error_handler))
+    which is not respecting the given `$errno` as it should. If, for
+    whatever reason, this is the desired behaviour of your custom error
+    handler, please call
+    [`muteExpectedErrors()`](../programmers/api-functions/api-mute-expected-errors.md) after you've
+    registered your custom error handler.
+
+See also [debugging](../designers/chapter-debugging-console.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/chapter-debugging-console.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/chapter-debugging-console.md
new file mode 100644
index 000000000..6704fce2f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/chapter-debugging-console.md
@@ -0,0 +1,40 @@
+# Debugging Console
+
+There is a debugging console included with Smarty. The console informs
+you of all the [included](./language-builtin-functions/language-function-include.md) templates,
+[assigned](../programmers/api-functions/api-assign.md) variables and
+[config](./language-variables/language-config-variables.md) file variables for the current
+invocation of the template. A template file named `debug.tpl` is
+included with the distribution of Smarty which controls the formatting
+of the console.
+
+Set [`$debugging`](../programmers/api-variables/variable-debugging.md) to TRUE in Smarty, and if needed
+set [`$debug_tpl`](../programmers/api-variables/variable-debug-template.md) to the template resource
+path to `debug.tpl` (this is in [`SMARTY_DIR`](../programmers/smarty-constants.md) by
+default). When you load the page, a Javascript console window will pop
+up and give you the names of all the included templates and assigned
+variables for the current page.
+
+To see the available variables for a particular template, see the
+[`{debug}`](./language-builtin-functions/language-function-debug.md) template function. To disable the
+debugging console, set [`$debugging`](../programmers/api-variables/variable-debugging.md) to FALSE. You
+can also temporarily turn on the debugging console by putting
+`SMARTY_DEBUG` in the URL if you enable this option with
+[`$debugging_ctrl`](../programmers/api-variables/variable-debugging-ctrl.md).
+
+> **Note**
+>
+> The debugging console does not work when you use the
+> [`fetch()`](../programmers/api-functions/api-fetch.md) API, only when using
+> [`display()`](../programmers/api-functions/api-display.md). It is a set of javascript statements
+> added to the very bottom of the generated template. If you do not like
+> javascript, you can edit the `debug.tpl` template to format the output
+> however you like. Debug data is not cached and `debug.tpl` info is not
+> included in the output of the debug console.
+
+> **Note**
+>
+> The load times of each template and config file are in seconds, or
+> fractions thereof.
+
+See also [troubleshooting](../appendixes/troubleshooting.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/config-files.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/config-files.md
new file mode 100644
index 000000000..1e1db2d5a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/config-files.md
@@ -0,0 +1,74 @@
+# Config Files
+
+Config files are handy for designers to manage global template variables
+from one file. One example is template colors. Normally if you wanted to
+change the color scheme of an application, you would have to go through
+each and every template file and change the colors. With a config file,
+the colors can be kept in one place, and only one file needs to be
+updated.
+
+```ini
+# global variables
+pageTitle = "Main Menu"
+bodyBgColor = #000000
+tableBgColor = #000000
+rowBgColor = #00ff00
+
+[Customer]
+pageTitle = "Customer Info"
+
+[Login]
+pageTitle = "Login"
+focus = "username"
+Intro = """This is a value that spans more
+           than one line. you must enclose
+           it in triple quotes."""
+
+# hidden section
+[.Database]
+host=my.example.com
+db=ADDRESSBOOK
+user=php-user
+pass=foobar
+```
+      
+
+Values of [config file variables](./language-variables/language-config-variables.md) can be in
+quotes, but not necessary. You can use either single or double quotes.
+If you have a value that spans more than one line, enclose the entire
+value with triple quotes \("""\). You can put comments into config
+files by any syntax that is not a valid config file syntax. We recommend
+using a `#` (hash) at the beginning of the line.
+
+The example config file above has two sections. Section names are
+enclosed in \[brackets\]. Section names can be arbitrary strings not
+containing `[` or `]` symbols. The four variables at the top are global
+variables, or variables not within a section. These variables are always
+loaded from the config file. If a particular section is loaded, then the
+global variables and the variables from that section are also loaded. If
+a variable exists both as a global and in a section, the section
+variable is used. If you name two variables the same within a section,
+the last one will be used unless
+[`$config_overwrite`](../programmers/api-variables/variable-config-overwrite.md) is disabled.
+
+Config files are loaded into templates with the built-in template
+function [`{config_load}`](./language-builtin-functions/language-function-config-load.md) or the API
+[`configLoad()`](../programmers/api-functions/api-config-load.md) function.
+
+You can hide variables or entire sections by prepending the variable
+name or section name with a period(.) eg `[.hidden]`. This is useful if
+your application reads the config files and gets sensitive data from
+them that the template engine does not need. If you have third parties
+doing template editing, you can be certain that they cannot read
+sensitive data from the config file by loading it into the template.
+
+Config files (or resources) are loaded by the same resource facilities
+as templates. That means that a config file can also be loaded from a db
+`$smarty->configLoad("db:my.conf")`.
+
+See also [`{config_load}`](./language-builtin-functions/language-function-config-load.md),
+[`$config_overwrite`](../programmers/api-variables/variable-config-overwrite.md),
+[`$default_config_handler_func`](../programmers/api-variables/variable-default-config-handler-func.md),
+[`getConfigVars()`](../programmers/api-functions/api-get-config-vars.md),
+[`clearConfig()`](../programmers/api-functions/api-clear-config.md) and
+[`configLoad()`](../programmers/api-functions/api-config-load.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/index.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/index.md
new file mode 100644
index 000000000..c0a12a9be
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/index.md
@@ -0,0 +1,33 @@
+# Basic Syntax
+
+A simple Smarty template could look like this:
+```smarty
+<h1>{$title|escape}</h1>
+<ul>
+    {foreach $cities as $city}
+        <li>{$city.name|escape} ({$city.population})</li>
+    {foreachelse}
+        <li>no cities found</li>        
+    {/foreach}
+</ul>
+```
+
+All Smarty template tags are enclosed within delimiters. By default
+these are `{` and `}`, but they can be
+[changed](../../programmers/api-variables/variable-left-delimiter.md).
+
+For the examples in this manual, we will assume that you are using the
+default delimiters. In Smarty, all content outside of delimiters is
+displayed as static content, or unchanged. When Smarty encounters
+template tags, it attempts to interpret them, and displays the
+appropriate output in their place.
+
+The basis components of the Smarty syntax are:
+
+- [Comments](language-syntax-comments.md)
+- [Variables](language-syntax-variables.md)
+- [Functions](language-syntax-functions.md)
+- [Attributes](language-syntax-attributes.md)
+- [Quotes](language-syntax-quotes.md)
+- [Math](language-math.md)
+- [Escaping](language-escaping.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-escaping.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-escaping.md
new file mode 100644
index 000000000..4c75e09e6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-escaping.md
@@ -0,0 +1,79 @@
+# Escaping Smarty parsing
+
+It is sometimes desirable or even necessary to have Smarty ignore
+sections it would otherwise parse. A classic example is embedding
+Javascript or CSS code in a template. The problem arises as those
+languages use the { and } characters which are also the default
+[delimiters](../language-builtin-functions/language-function-ldelim.md) for Smarty.
+
+> **Note**
+>
+> A good practice for avoiding escapement altogether is by separating
+> your Javascript/CSS into their own files and use standard HTML methods
+> to access them. This will also take advantage of browser script
+> caching. When you need to embed Smarty variables/functions into your
+> Javascript/CSS, then the following applies.
+
+In Smarty templates, the { and } braces will be ignored so long as they
+are surrounded by white space. This behavior can be disabled by setting
+the Smarty class variable [`$auto_literal`](../../programmers/api-variables/variable-auto-literal.md) to
+false.
+
+## Examples
+
+```smarty
+<script>
+   // the following braces are ignored by Smarty
+   // since they are surrounded by whitespace
+   function foobar {
+    alert('foobar!');
+   }
+   // this one will need literal escapement
+   {literal}
+    function bazzy {alert('foobar!');}
+   {/literal}
+</script>
+```  
+     
+[`{literal}..{/literal}`](../language-builtin-functions/language-function-literal.md) blocks are used
+for escaping blocks of template logic. You can also escape the braces
+individually with
+[`{ldelim}`, `{rdelim}`](../language-builtin-functions/language-function-ldelim.md) tags or
+[`{$smarty.ldelim}`,`{$smarty.rdelim}`](../language-variables/language-variables-smarty.md#smartyldelim-smartyrdelim-languagevariablessmartyldelim)
+variables.
+
+Smarty's default delimiters { and } cleanly represent presentational
+content. However, if another set of delimiters suit your needs better,
+you can change them with Smarty's
+[`$left_delimiter`](../../programmers/api-variables/variable-left-delimiter.md) and
+[`$right_delimiter`](../../programmers/api-variables/variable-right-delimiter.md) values.
+
+> **Note**
+>
+> Changing delimiters affects ALL template syntax and escapement. Be
+> sure to clear out cache and compiled files if you decide to change
+> them.
+
+```php
+<?php
+
+$smarty->left_delimiter = '<!--{';
+$smarty->right_delimiter = '}-->';
+
+$smarty->assign('foo', 'bar');
+$smarty->assign('name', 'Albert');
+$smarty->display('example.tpl');
+```
+
+Where the template is:
+
+```smarty
+Welcome <!--{$name}--> to Smarty
+<script language="javascript">
+  var foo = <!--{$foo}-->;
+  function dosomething() {
+    alert("foo is " + foo);
+  }
+  dosomething();
+</script>
+```
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-math.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-math.md
new file mode 100644
index 000000000..a9a43efd9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-math.md
@@ -0,0 +1,28 @@
+# Math
+
+Math can be applied directly to variable values.
+
+## Examples
+```smarty
+{$foo+1}
+
+{$foo*$bar}
+
+{* some more complicated examples *}
+
+{$foo->bar-$bar[1]*$baz->foo->bar()-3*7}
+
+{if ($foo+$bar.test%$baz*134232+10+$b+10)}
+
+{$foo|truncate:"`$fooTruncCount/$barTruncFactor-1`"}
+
+{assign var="foo" value="`$foo+$bar`"}
+```
+      
+> **Note**
+>
+> Although Smarty can handle some very complex expressions and syntax,
+> it is a good rule of thumb to keep the template syntax minimal and
+> focused on presentation. If you find your template syntax getting too
+> complex, it may be a good idea to move the bits that do not deal
+> explicitly with presentation to PHP by way of plugins or modifiers.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-attributes.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-attributes.md
new file mode 100644
index 000000000..41f6c458d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-attributes.md
@@ -0,0 +1,49 @@
+# Attributes
+
+Most of the [functions](./language-syntax-functions.md) take attributes that
+specify or modify their behavior. Attributes to Smarty functions are
+much like HTML attributes. Static values don't have to be enclosed in
+quotes, but it is required for literal strings. Variables with or
+without modifiers may also be used, and should not be in quotes. You can
+even use PHP function results, plugin results and complex expressions.
+
+Some attributes require boolean values (TRUE or FALSE). These can be
+specified as `true` and `false`. If an attribute has no value assigned
+it gets the default boolean value of true.
+
+## Examples
+```smarty
+{include file="header.tpl"}
+
+{include file="header.tpl" nocache}  // is equivalent to nocache=true
+
+{include file="header.tpl" attrib_name="attrib value"}
+
+{include file=$includeFile}
+
+{include file=#includeFile# title="My Title"}
+
+{assign var=foo value={counter}}  // plugin result
+
+{assign var=foo value=substr($bar,2,5)}  // PHP function result
+
+{assign var=foo value=$bar|strlen}  // using modifier
+
+{assign var=foo value=$buh+$bar|strlen}  // more complex expression
+
+{html_select_date display_days=true}
+
+{mailto address="smarty@example.com"}
+
+<select name="company_id">
+  {html_options options=$companies selected=$company_id}
+</select>
+```
+      
+> **Note**
+>
+> Although Smarty can handle some very complex expressions and syntax,
+> it is a good rule of thumb to keep the template syntax minimal and
+> focused on presentation. If you find your template syntax getting too
+> complex, it may be a good idea to move the bits that do not deal
+> explicitly with presentation to PHP by way of plugins or modifiers.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-comments.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-comments.md
new file mode 100644
index 000000000..7052c20ef
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-comments.md
@@ -0,0 +1,69 @@
+# Comments
+
+Template comments are surrounded by asterisks, and that is surrounded by
+the [delimiter](../../programmers/api-variables/variable-left-delimiter.md) tags like so:
+
+## Examples
+
+```smarty
+{* this is a comment *}
+```
+
+Smarty comments are NOT displayed in the final output of the template,
+unlike `<!-- HTML comments -->`. These are useful for making internal
+notes in the templates which no one will see ;-)
+
+```smarty
+{* I am a Smarty comment, I don't exist in the compiled output  *}
+<html>
+    <head>
+     <title>{$title}</title>
+    </head>
+<body>
+
+    {* another single line smarty comment  *}
+    <!-- HTML comment that is sent to the browser -->
+
+    {* this multiline smarty
+       comment is
+       not sent to browser
+    *}
+
+    {*********************************************************
+    Multi line comment block with credits block
+      @ author:         bg@example.com
+      @ maintainer:     support@example.com
+      @ para:           var that sets block style
+      @ css:            the style output
+    **********************************************************}
+
+    {* The header file with the main logo and stuff  *}
+    {include file='header.tpl'}
+
+
+    {* Dev note:  the $includeFile var is assigned in foo.php script  *}
+    <!-- Displays main content block -->
+    {include file=$includeFile}
+
+    {* this <select> block is redundant *}
+    {*
+    <select name="company">
+      {html_options options=$vals selected=$selected_id}
+    </select>
+    *}
+
+    <!-- Show header from affiliate is disabled -->
+    {* $affiliate|upper *}
+
+    {* you cannot nest comments *}
+    {*
+    <select name="company">
+      {* <option value="0">-- none -- </option> *}
+      {html_options options=$vals selected=$selected_id}
+    </select>
+    *}
+
+    </body>
+</html>
+```
+      
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-functions.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-functions.md
new file mode 100644
index 000000000..c3c8c21ce
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-functions.md
@@ -0,0 +1,40 @@
+# Functions
+
+Every Smarty tag either prints a [variable](./language-syntax-variables.md) or
+invokes some sort of function. These are processed and displayed by
+enclosing the function and its [attributes](./language-syntax-attributes.md)
+within delimiters like so: `{funcname attr1="val1" attr2="val2"}`.
+
+## Examples
+
+```smarty
+{config_load file="colors.conf"}
+
+{include file="header.tpl"}
+{insert file="banner_ads.tpl" title="My Site"}
+
+{if $logged_in}
+    Welcome, <span style="color:{#fontColor#}">{$name}!</span>
+{else}
+    hi, {$name}
+{/if}
+
+{include file="footer.tpl"}
+```
+      
+-   Both [built-in functions](../language-builtin-functions/index.md) and [custom
+    functions](../language-custom-functions/index.md) have the same syntax within
+    templates.
+
+-   Built-in functions are the **inner** workings of Smarty, such as
+    [`{if}`](../language-builtin-functions/language-function-if.md),
+    [`{section}`](../language-builtin-functions/language-function-section.md) and
+    [`{strip}`](../language-builtin-functions/language-function-strip.md). There should be no need to
+    change or modify them.
+
+-   Custom functions are **additional** functions implemented via
+    [plugins](../../programmers/plugins.md). They can be modified to your liking, or you can
+    create new ones. [`{html_options}`](../language-custom-functions/language-function-html-options.md)
+    is an example of a custom function.
+
+See also [`registerPlugin()`](../../programmers/api-functions/api-register-plugin.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-quotes.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-quotes.md
new file mode 100644
index 000000000..e04e6da76
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-quotes.md
@@ -0,0 +1,54 @@
+# Embedding Vars in Double Quotes
+
+-   Smarty will recognize [assigned](../../programmers/api-functions/api-assign.md)
+    [variables](./language-syntax-variables.md) embedded in "double
+    quotes" so long as the variable name contains only numbers, letters
+    and under_scores. See [naming](https://www.php.net/language.variables)
+    for more detail.
+
+-   With any other characters, for example a period(.) or
+    `$object->reference`, then the variable must be surrounded by `` `backticks` ``.
+
+-   In addition, Smarty does allow embedded Smarty tags in double-quoted
+    strings. This is useful if you want to include variables with
+    modifiers, plugin or PHP function results.
+
+## Examples
+```smarty
+{func var="test $foo test"}              // sees $foo
+{func var="test $foo_bar test"}          // sees $foo_bar
+{func var="test `$foo[0]` test"}         // sees $foo[0]
+{func var="test `$foo[bar]` test"}       // sees $foo[bar]
+{func var="test $foo.bar test"}          // sees $foo (not $foo.bar)
+{func var="test `$foo.bar` test"}        // sees $foo.bar
+{func var="test `$foo.bar` test"|escape} // modifiers outside quotes!
+{func var="test {$foo|escape} test"}     // modifiers inside quotes!
+{func var="test {time()} test"}          // PHP function result
+{func var="test {counter} test"}         // plugin result
+{func var="variable foo is {if !$foo}not {/if} defined"} // Smarty block function
+
+{* will replace $tpl_name with value *}
+{include file="subdir/$tpl_name.tpl"}
+
+{* does NOT replace $tpl_name *}
+{include file='subdir/$tpl_name.tpl'} // vars require double quotes!
+
+{* must have backticks as it contains a dot "." *}
+{cycle values="one,two,`$smarty.config.myval`"}
+
+{* must have backticks as it contains a dot "." *}
+{include file="`$module.contact`.tpl"}
+
+{* can use variable with dot syntax *}
+{include file="`$module.$view`.tpl"}
+```
+      
+> **Note**
+>
+> Although Smarty can handle some very complex expressions and syntax,
+> it is a good rule of thumb to keep the template syntax minimal and
+> focused on presentation. If you find your template syntax getting too
+> complex, it may be a good idea to move the bits that do not deal
+> explicitly with presentation to PHP by way of plugins or modifiers.
+
+See also [`escape`](../language-modifiers/language-modifier-escape.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-variables.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-variables.md
new file mode 100644
index 000000000..c0285d078
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-variables.md
@@ -0,0 +1,109 @@
+# Variables
+
+Template variables start with the $dollar sign. They can contain
+numbers, letters and underscores, much like a [PHP
+variable](https://www.php.net/language.variables). You can reference arrays
+by index numerically or non-numerically. Also reference object
+properties and methods.
+
+[Config file variables](../language-variables/language-config-variables.md) are an exception to
+the \$dollar syntax and are instead referenced with surrounding
+\#hashmarks\#, or via the [`$smarty.config`](../language-variables/language-variables-smarty.md#smartyconfig-languagevariablessmartyconfig) variable.
+
+## Examples
+
+```smarty
+{$foo}        <-- displaying a simple variable (non array/object)
+{$foo[4]}     <-- display the 5th element of a zero-indexed array
+{$foo.bar}    <-- display the "bar" key value of an array, similar to PHP $foo['bar']
+{$foo.$bar}   <-- display variable key value of an array, similar to PHP $foo[$bar]
+{$foo->bar}   <-- display the object property "bar"
+{$foo->bar()} <-- display the return value of object method "bar"
+{#foo#}       <-- display the config file variable "foo"
+{$smarty.config.foo} <-- synonym for {#foo#}
+{$foo[bar]}   <-- syntax only valid in a section loop, see {section}
+{assign var=foo value='baa'}{$foo} <--  displays "baa", see {assign}
+
+Many other combinations are allowed
+
+{$foo.bar.baz}
+{$foo.$bar.$baz}
+{$foo[4].baz}
+{$foo[4].$baz}
+{$foo.bar.baz[4]}
+{$foo->bar($baz,2,$bar)} <-- passing parameters
+{"foo"}       <-- static values are allowed
+
+{* display the server variable "SERVER_NAME" ($_SERVER['SERVER_NAME'])*}
+{$smarty.server.SERVER_NAME}
+
+Math and embedding tags:
+
+{$x+$y}                             // will output the sum of x and y.
+{assign var=foo value=$x+$y}        // in attributes 
+{$foo[$x+3]}                        // as array index
+{$foo={counter}+3}                  // tags within tags
+{$foo="this is message {counter}"}  // tags within double quoted strings
+
+Defining Arrays:
+
+{assign var=foo value=[1,2,3]}
+{assign var=foo value=['y'=>'yellow','b'=>'blue']}
+{assign var=foo value=[1,[9,8],3]}   // can be nested
+
+Short variable assignment:
+
+{$foo=$bar+2}
+{$foo = strlen($bar)}               // function in assignment
+{$foo = myfunct( ($x+$y)*3 )}       // as function parameter 
+{$foo.bar=1}                        // assign to specific array element
+{$foo.bar.baz=1}                    
+{$foo[]=1}                          // appending to an array
+
+Smarty "dot" syntax (note: embedded {} are used to address ambiguities):
+
+{$foo.a.b.c}        =>  $foo['a']['b']['c'] 
+{$foo.a.$b.c}       =>  $foo['a'][$b]['c']         // with variable index
+{$foo.a.{$b+4}.c}   =>  $foo['a'][$b+4]['c']       // with expression as index
+{$foo.a.{$b.c}}     =>  $foo['a'][$b['c']]         // with nested index
+
+PHP-like syntax, alternative to "dot" syntax:
+
+{$foo[1]}             // normal access
+{$foo['bar']}
+{$foo['bar'][1]}
+{$foo[$x+$x]}         // index may contain any expression
+{$foo[$bar[1]]}       // nested index
+{$foo[section_name]}  // smarty {section} access, not array access!
+
+Variable variables:
+
+$foo                     // normal variable
+$foo_{$bar}              // variable name containing other variable 
+$foo_{$x+$y}             // variable name containing expressions 
+$foo_{$bar}_buh_{$blar}  // variable name with multiple segments
+{$foo_{$x}}              // will output the variable $foo_1 if $x has a value of 1.
+
+Object chaining:
+
+{$object->method1($x)->method2($y)}
+
+Direct PHP function access:
+
+{time()}
+```
+
+> **Note**
+>
+> Although Smarty can handle some very complex expressions and syntax,
+> it is a good rule of thumb to keep the template syntax minimal and
+> focused on presentation. If you find your template syntax getting too
+> complex, it may be a good idea to move the bits that do not deal
+> explicitly with presentation to PHP by way of plugins or modifiers.
+
+Request variables such as `$_GET`, `$_SESSION`, etc are available via
+the reserved [`$smarty`](../language-variables/language-variables-smarty.md) variable.
+
+See also [`$smarty`](../language-variables/language-variables-smarty.md), [config
+variables](../language-variables/language-config-variables.md)
+[`{assign}`](../language-builtin-functions/language-function-assign.md) and [`assign()`](../../programmers/api-functions/api-assign.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/index.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/index.md
new file mode 100644
index 000000000..10dc3a6f0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/index.md
@@ -0,0 +1,35 @@
+# Built-in Functions
+
+Smarty comes with several built-in functions. These built-in functions
+are the integral part of the smarty template engine. They are compiled
+into corresponding inline PHP code for maximum performance.
+
+You cannot create your own [custom functions](../language-custom-functions/index.md) with the same name; and you
+should not need to modify the built-in functions.
+
+A few of these functions have an `assign` attribute which collects the
+result the function to a named template variable instead of being
+output; much like the [`{assign}`](language-function-assign.md) function.
+
+- [{append}](language-function-append.md)
+- [{assign} or {$var=...}](language-function-assign.md)
+- [{block}](language-function-block.md)
+- [{call}](language-function-call.md)
+- [{capture}](language-function-capture.md)
+- [{config_load}](language-function-config-load.md)
+- [{debug}](language-function-debug.md)
+- [{extends}](language-function-extends.md)
+- [{for}](language-function-for.md)
+- [{foreach}, {foreachelse}](language-function-foreach.md)
+- [{function}](language-function-function.md)
+- [{if}, {elseif}, {else}](language-function-if.md)
+- [{include}](language-function-include.md)
+- [{insert}](language-function-insert.md)
+- [{ldelim}, {rdelim}](language-function-ldelim.md)
+- [{literal}](language-function-literal.md)
+- [{nocache}](language-function-nocache.md)
+- [{section}, {sectionelse}](language-function-section.md)
+- [{setfilter}](language-function-setfilter.md)
+- [{strip}](language-function-strip.md)
+- [{while}](language-function-while.md)
+
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-append.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-append.md
new file mode 100644
index 000000000..37e1b81e9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-append.md
@@ -0,0 +1,49 @@
+# {append}
+
+`{append}` is used for creating or appending template variable arrays
+**during the execution of a template**.
+
+## Attributes
+
+| Attribute | Required   | Description                                                                                        |
+|-----------|------------|----------------------------------------------------------------------------------------------------|
+| var       |            | The name of the variable being assigned                                                            |
+| value     |            | The value being assigned                                                                           |
+| index     | (optional) | The index for the new array element. If not specified the value is append to the end of the array. |
+| scope     | (optional) | The scope of the assigned variable: parent, root or global. Defaults to local if omitted.          |
+
+## Option Flags
+
+| Name    | Description                                         |
+|---------|-----------------------------------------------------|
+| nocache | Assigns the variable with the 'nocache' attribute   | 
+
+> **Note**
+>
+> Assignment of variables in-template is essentially placing application
+> logic into the presentation that may be better handled in PHP. Use at
+> your own discretion.
+
+## Examples
+
+```smarty
+{append var='name' value='Bob' index='first'}
+{append var='name' value='Meyer' index='last'}
+// or 
+{append 'name' 'Bob' index='first'} {* short-hand *}
+{append 'name' 'Meyer' index='last'} {* short-hand *}
+
+The first name is {$name.first}.<br>
+The last name is {$name.last}.
+```
+      
+The above example will output:
+
+
+    The first name is Bob.
+    The last name is Meyer.
+
+      
+
+See also [`append()`](#api.append) and
+[`getTemplateVars()`](#api.get.template.vars).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-assign.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-assign.md
new file mode 100644
index 000000000..f5faa46d5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-assign.md
@@ -0,0 +1,147 @@
+# {assign}, {$var=...}
+
+`{assign}` or `{$var=...}` is used for assigning template variables **during the
+execution of a template**.
+
+## Attributes of the {assign} syntax
+| Attribute Name | Required   | Description                                                           |
+|----------------|------------|-----------------------------------------------------------------------|
+| var            |            | The name of the variable being assigned                               | 
+| value          |            | The value being assigned                                              |                             
+| scope          | (optional) | The scope of the assigned variable: \'parent\',\'root\' or \'global\' | 
+
+## Attributes of the {$var=...} syntax
+| Attribute Name | Required   | Description                                                           |
+|----------------|------------|-----------------------------------------------------------------------|
+| scope          | (optional) | The scope of the assigned variable: \'parent\',\'root\' or \'global\' | 
+
+## Option Flags
+| Name    | Description                                       |
+|---------|---------------------------------------------------|
+| nocache | Assigns the variable with the 'nocache' attribute |
+
+
+> **Note**
+>
+> Assignment of variables in-template is essentially placing application
+> logic into the presentation that may be better handled in PHP. Use at
+> your own discretion.
+
+## Examples
+
+```smarty
+{assign var="name" value="Bob"}  {* or *}
+{assign "name" "Bob"} {* short-hand, or *}
+{$name='Bob'}
+
+The value of $name is {$name}.
+```
+      
+
+The above example will output:
+
+```
+The value of $name is Bob.
+```
+
+
+```smarty
+{assign var="name" value="Bob" nocache}  {* or *}
+{assign "name" "Bob" nocache} {* short-hand, or *}
+{$name='Bob' nocache}
+
+The value of $name is {$name}.
+```
+The above example will output:
+```
+The value of $name is Bob.
+```
+      
+
+```smarty
+{assign var=running_total value=$running_total+$some_array[$row].some_value}  {* or *}
+{$running_total=$running_total+$some_array[row].some_value}
+```
+
+Variables assigned in the included template will be seen in the
+including template.
+
+```smarty
+{include file="sub_template.tpl"}
+
+{* display variable assigned in sub_template *}
+{$foo}<br>
+```
+
+The template above includes the example `sub_template.tpl` below:
+
+```smarty
+
+{* foo will be known also in the including template *}
+{assign var="foo" value="something" scope=parent}
+{$foo="something" scope=parent}
+
+{* bar is assigned only local in the including template *}
+{assign var="bar" value="value"} {* or *}
+{$var="value"}
+
+```
+
+You can assign a variable to root of the current root tree. The variable
+is seen by all templates using the same root tree.
+
+```smarty
+{assign var=foo value="bar" scope="root"}
+```
+      
+A global variable is seen by all templates.
+
+```smarty
+{assign var=foo value="bar" scope="global"} {* or *}
+{assign "foo" "bar" scope="global"} {* short-hand, or *}
+{$foo="bar" scope="global"}
+```
+ 
+To access `{assign}` variables from a php script use
+[`getTemplateVars()`](../../programmers/api-functions/api-get-template-vars.md). 
+Here's the template that creates the variable `$foo`.
+
+```smarty
+{assign var="foo" value="Smarty"} {* or *}
+{$foo="Smarty"}
+```
+
+The template variables are only available after/during template
+execution as in the following script.
+
+```php
+<?php
+
+// this will output nothing as the template has not been executed
+echo $smarty->getTemplateVars('foo');
+
+// fetch the template to a variable
+$whole_page = $smarty->fetch('index.tpl');
+
+// this will output 'smarty' as the template has been executed
+echo $smarty->getTemplateVars('foo');
+
+$smarty->assign('foo','Even smarter');
+
+// this will output 'Even smarter'
+echo $smarty->getTemplateVars('foo');
+```
+
+The following functions can also *optionally* assign template variables: [`{capture}`](#language.function.capture),
+[`{include}`](#language.function.include),
+[`{insert}`](#language.function.insert),
+[`{counter}`](#language.function.counter),
+[`{cycle}`](#language.function.cycle),
+[`{eval}`](#language.function.eval),
+[`{fetch}`](#language.function.fetch),
+[`{math}`](#language.function.math) and
+[`{textformat}`](#language.function.textformat).
+
+See also [`{append}`](./language-function-append.md),
+[`assign()`](#api.assign) and
+[`getTemplateVars()`](#api.get.template.vars).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-block.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-block.md
new file mode 100644
index 000000000..c2acd1972
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-block.md
@@ -0,0 +1,201 @@
+# {block}
+
+`{block}` is used to define a named area of template source for template
+inheritance. For details see section of [Template
+Inheritance](../../programmers/advanced-features/advanced-features-template-inheritance.md).
+
+The `{block}` template source area of a child template will replace the
+corresponding areas in the parent template(s).
+
+Optionally `{block}` areas of child and parent templates can be merged
+into each other. You can append or prepend the parent `{block}` content
+by using the `append` or `prepend` option flag with the child's `{block}`
+definition. With `{$smarty.block.parent}` the `{block}` content of
+the parent template can be inserted at any location of the child
+`{block}` content. `{$smarty.block.child}` inserts the `{block}` content
+of the child template at any location of the parent `{block}`.
+
+`{blocks}'s` can be nested.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                                                          |
+|----------------|----------|----------------------------------------------------------------------------------------------------------------------|
+| name           | yes      | The name of the template source block                                                                                |
+| assign         | no       | The name of variable to assign the output of the block to. |
+
+> **Note** 
+> 
+> The assign attribute only works on the block that actually gets executed, so you may need 
+> to add it to each child block as well.
+
+
+## Option Flags (in child templates only):
+
+| Name    | Description                                                                             |
+|---------|-----------------------------------------------------------------------------------------|
+| append  | The `{block}` content will be appended to the content of the parent template `{block}`  |
+| prepend | The `{block}` content will be prepended to the content of the parent template `{block}` |
+| hide    | Ignore the block content if no child block of same name is existing.                    |
+| nocache | Disables caching of the `{block}` content                                               |
+
+
+## Examples
+
+parent.tpl
+
+```smarty
+    <html>
+      <head>
+        <title>{block name="title"}Default Title{/block}</title>
+        <title>{block "title"}Default Title{/block}</title>  {* short-hand  *}
+      </head>
+    </html>
+```
+      
+
+child.tpl
+
+```smarty
+    {extends file="parent.tpl"} 
+    {block name="title"}
+    Page Title
+    {/block}
+```
+      
+
+The result would look like
+
+```html
+    <html>
+      <head>
+        <title>Page Title</title>
+      </head>
+    </html>
+```
+
+parent.tpl
+
+```smarty
+    <html>
+      <head>
+        <title>{block name="title"}Title - {/block}</title>
+      </head>
+    </html>
+```
+      
+
+child.tpl
+
+```smarty
+    {extends file="parent.tpl"} 
+    {block name="title" append}
+        Page Title
+    {/block}
+```
+      
+
+The result would look like
+
+```html
+    <html>
+      <head>
+        <title>Title - Page Title</title>
+      </head>
+    </html>
+```
+
+parent.tpl
+
+```smarty
+    <html>
+      <head>
+        <title>{block name="title"} is my title{/block}</title>
+      </head>
+    </html>
+```
+      
+child.tpl
+
+```smarty
+    {extends file="parent.tpl"} 
+    {block name="title" prepend}
+    Page Title
+    {/block}
+```
+      
+
+The result would look like
+
+```html
+    <html>
+      <head>
+        <title>Page title is my titel</title>
+      </head>
+    </html>
+```
+
+parent.tpl
+
+```smarty
+    <html>
+      <head>
+        <title>{block name="title"}The {$smarty.block.child} was inserted here{/block}</title>
+      </head>
+    </html>
+```
+      
+child.tpl
+
+```smarty
+    {extends file="parent.tpl"} 
+    {block name="title"}
+        Child Title
+    {/block}
+```
+     
+The result would look like
+
+```html
+    <html>
+      <head>
+        <title>The Child Title was inserted here</title>
+      </head>
+    </html>
+```
+
+parent.tpl
+
+```smarty
+    <html>
+      <head>
+        <title>{block name="title"}Parent Title{/block}</title>
+      </head>
+    </html>
+```
+      
+
+child.tpl
+
+```smarty
+    {extends file="parent.tpl"} 
+    {block name="title"}
+        You will see now - {$smarty.block.parent} - here
+    {/block}
+```
+     
+The result would look like
+
+```html
+    <html>
+      <head>
+        <title>You will see now - Parent Title - here</title>
+      </head>
+    </html>
+```
+
+See also [Template
+Inheritance](../../programmers/advanced-features/advanced-features-template-inheritance.md),
+[`$smarty.block.parent`](../language-variables/language-variables-smarty.md#smartyblockparent-languagevariablessmartyblockparent),
+[`$smarty.block.child`](../language-variables/language-variables-smarty.md#smartyblockchild-languagevariablessmartyblockchild), and
+[`{extends}`](./language-function-extends.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-call.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-call.md
new file mode 100644
index 000000000..c07fb49b9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-call.md
@@ -0,0 +1,77 @@
+# {call}
+
+`{call}` is used to call a template function defined by the
+[`{function}`](./language-function-function.md) tag just like a plugin
+function.
+
+> **Note**
+>
+> Template functions are defined global. Since the Smarty compiler is a
+> single-pass compiler, The `{call}` tag must
+> be used to call a template function defined externally from the given
+> template. Otherwise you can directly use the function as
+> `{funcname ...}` in the template.
+
+-   The `{call}` tag must have the `name` attribute which contains the
+    name of the template function.
+
+-   Values for variables can be passed to the template function as
+    [attributes](../language-basic-syntax/language-syntax-attributes.md).
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                              |
+|----------------|----------|------------------------------------------------------------------------------------------|
+| name           | Yes      | The name of the template function                                                        |
+| assign         | No       | The name of the variable that the output of called template function will be assigned to |
+| [var ...]      | No       | variable to pass local to template function                                              |
+
+## Option Flags
+
+| Name    | Description                                |
+|---------|--------------------------------------------|
+| nocache | Call the template function in nocache mode |
+
+
+## Examples
+
+```smarty
+    {* define the function *}
+    {function name=menu level=0}
+      <ul class="level{$level}">
+      {foreach $data as $entry}
+        {if is_array($entry)}
+          <li>{$entry@key}</li>
+          {call name=menu data=$entry level=$level+1}
+        {else}
+          <li>{$entry}</li>
+        {/if}
+      {/foreach}
+      </ul>
+    {/function}
+
+    {* create an array to demonstrate *}
+    {$menu = ['item1','item2','item3' => ['item3-1','item3-2','item3-3' =>
+    ['item3-3-1','item3-3-2']],'item4']}
+
+    {* run the array through the function *}
+    {call name=menu data=$menu}
+    {call menu data=$menu} {* short-hand *}
+```
+     
+
+Will generate the following output
+
+```
+    * item1
+    * item2
+    * item3
+          o item3-1
+          o item3-2
+          o item3-3
+                + item3-3-1
+                + item3-3-2
+    * item4
+```
+
+See also [`{function}`](./language-function-function.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-capture.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-capture.md
new file mode 100644
index 000000000..657f077cd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-capture.md
@@ -0,0 +1,81 @@
+# {capture}
+
+`{capture}` is used to collect the output of the template between the
+tags into a variable instead of displaying it. Any content between
+`{capture name='foo'}` and `{/capture}` is collected into the variable
+specified in the `name` attribute.
+
+The captured content can be used in the template from the variable
+[`$smarty.capture.foo`](../language-variables/language-variables-smarty.md#smartycapture-languagevariablessmartycapture) where "foo"
+is the value passed in the `name` attribute. If you do not supply the
+`name` attribute, then "default" will be used as the name ie
+`$smarty.capture.default`.
+
+`{capture}'s` can be nested.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                          |
+|----------------|----------|----------------------------------------------------------------------|
+| name           | Yes      | The name of the captured block                                       |
+| assign         | No       | The variable name where to assign the captured output to             |
+| append         | No       | The name of an array variable where to append the captured output to |
+
+## Option Flags
+
+| Name    | Description                             |
+|---------|-----------------------------------------|
+| nocache | Disables caching of this captured block |
+
+> **Note**
+>
+> Be careful when capturing [`{insert}`](#language.function.insert)
+> output. If you have [`$caching`](#caching) enabled and you have
+> [`{insert}`](#language.function.insert) commands that you expect to
+> run within cached content, do not capture this content.
+
+## Examples
+
+```smarty
+{* we don't want to print a div tag unless content is displayed *}
+{capture name="banner"}
+{capture "banner"} {* short-hand *}
+  {include file="get_banner.tpl"}
+{/capture}
+
+{if $smarty.capture.banner ne ""}
+<div id="banner">{$smarty.capture.banner}</div>
+{/if}
+```
+      
+This example demonstrates the capture function.
+```smarty
+
+{capture name=some_content assign=popText}
+{capture some_content assign=popText} {* short-hand *}
+The server is {$my_server_name|upper} at {$my_server_addr}<br>
+Your ip is {$my_ip}.
+{/capture}
+<a href="#">{$popText}</a>
+```
+         
+
+This example also demonstrates how multiple calls of capture can be used
+to create an array with captured content.
+
+```smarty
+{capture append="foo"}hello{/capture}I say just {capture append="foo"}world{/capture}
+{foreach $foo as $text}{$text} {/foreach}
+```
+
+The above example will output:
+
+```
+I say just hello world
+```
+      
+
+See also [`$smarty.capture`](../language-variables/language-variables-smarty.md#smartycapture-languagevariablessmartycapture),
+[`{eval}`](../language-custom-functions/language-function-eval.md),
+[`{fetch}`](../language-custom-functions/language-function-fetch.md), [`fetch()`](../../programmers/api-functions/api-fetch.md) and
+[`{assign}`](./language-function-assign.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-config-load.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-config-load.md
new file mode 100644
index 000000000..e13c30836
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-config-load.md
@@ -0,0 +1,88 @@
+# {config_load}
+
+`{config_load}` is used for loading config
+[`#variables#`](#language.config.variables) from a [configuration file](#config.files) into the template.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                                                                                                                                                                                                                                                                     |
+|----------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| file           | Yes      | The name of the config file to include                                                                                                                                                                                                                                                                                          |
+| section        | No       | The name of the section to load                                                                                                                                                                                                                                                                                                 |
+| scope          | no       | How the scope of the loaded variables are treated, which must be one of local, parent or global. local means variables are loaded into the local template context. parent means variables are loaded into both the local context and the parent template that called it. global means variables are available to all templates. |
+
+
+## Examples
+
+The `example.conf` file.
+
+```ini
+#this is config file comment
+
+# global variables
+pageTitle = "Main Menu"
+bodyBgColor = #000000
+tableBgColor = #000000
+rowBgColor = #00ff00
+
+#customer variables section
+[Customer]
+pageTitle = "Customer Info"
+```
+      
+and the template
+
+```smarty
+{config_load file="example.conf"}
+{config_load "example.conf"}  {* short-hand *}
+
+<html>
+    <title>{#pageTitle#|default:"No title"}</title>
+    <body bgcolor="{#bodyBgColor#}">
+        <table border="{#tableBorderSize#}" bgcolor="{#tableBgColor#}">
+           <tr bgcolor="{#rowBgColor#}">
+              <td>First</td>
+              <td>Last</td>
+              <td>Address</td>
+           </tr>
+        </table>
+    </body>
+</html>
+```
+      
+[Config Files](#config.files) may also contain sections. You can load
+variables from within a section with the added attribute `section`. Note
+that global config variables are always loaded along with section
+variables, and same-named section variables overwrite the globals.
+
+> **Note**
+>
+> Config file *sections* and the built-in template function called
+> [`{section}`](../language-builtin-functions/language-function-section.md) have nothing to do with each
+> other, they just happen to share a common naming convention.
+
+```smarty
+{config_load file='example.conf' section='Customer'}
+{config_load 'example.conf' 'Customer'} {* short-hand *}
+
+<html>
+    <title>{#pageTitle#}</title>
+    <body bgcolor="{#bodyBgColor#}">
+        <table border="{#tableBorderSize#}" bgcolor="{#tableBgColor#}">
+           <tr bgcolor="{#rowBgColor#}">
+              <td>First</td>
+              <td>Last</td>
+              <td>Address</td>
+           </tr>
+        </table>
+    </body>
+</html>
+```
+
+See [`$config_overwrite`](../../programmers/api-variables/variable-config-overwrite.md) to create arrays
+of config file variables.
+
+See also the [config files](../config-files.md) page, [config variables](../language-variables/language-config-variables.md) page,
+[`$config_dir`](../../programmers/api-variables/variable-config-dir.md),
+[`getConfigVars()`](../../programmers/api-functions/api-get-config-vars.md) and
+[`configLoad()`](../../programmers/api-functions/api-config-load.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-debug.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-debug.md
new file mode 100644
index 000000000..29485d549
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-debug.md
@@ -0,0 +1,17 @@
+# {debug}
+
+`{debug}` dumps the debug console to the page. This works regardless of
+the [debug](../chapter-debugging-console.md) settings in the php script.
+Since this gets executed at runtime, this is only able to show the
+[assigned](../../programmers/api-functions/api-assign.md) variables; not the templates that are in use.
+However, you can see all the currently available variables within the
+scope of a template.
+
+If caching is enabled and a page is loaded from cache `{debug}` does
+show only the variables which assigned for the cached page.
+
+In order to see also the variables which have been locally assigned
+within the template it does make sense to place the `{debug}` tag at the
+end of the template.
+
+See also the [debugging console page](../chapter-debugging-console.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-extends.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-extends.md
new file mode 100644
index 000000000..eba17b9bd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-extends.md
@@ -0,0 +1,37 @@
+# {extends}
+
+`{extends}` tags are used in child templates in template inheritance for
+extending parent templates. For details see section of [Template
+Inheritance](../../programmers/advanced-features/advanced-features-template-inheritance.md).
+
+-   The `{extends}` tag must be on the first line of the template.
+
+-   If a child template extends a parent template with the `{extends}`
+    tag it may contain only `{block}` tags. Any other template content
+    is ignored.
+
+-   Use the syntax for [template resources](../../programmers/resources.md) to extend files
+    outside the [`$template_dir`](../../programmers/api-variables/variable-template-dir.md) directory.
+
+## Attributes
+
+| Attribute | Required | Description                                     |
+|-----------|----------|-------------------------------------------------|
+| file      | Yes      | The name of the template file which is extended |
+
+> **Note**
+>
+> When extending a variable parent like `{extends file=$parent_file}`,
+> make sure you include `$parent_file` in the
+> [`$compile_id`](../../programmers/api-variables/variable-compile-id.md). Otherwise, Smarty cannot
+> distinguish between different `$parent_file`s.
+
+## Examples
+
+```smarty
+{extends file='parent.tpl'}
+{extends 'parent.tpl'}  {* short-hand *}
+```
+
+See also [Template Inheritance](../../programmers/advanced-features/advanced-features-template-inheritance.md)
+and [`{block}`](./language-function-block.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-for.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-for.md
new file mode 100644
index 000000000..619b61efe
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-for.md
@@ -0,0 +1,91 @@
+# {for}
+
+The `{for}{forelse}` tag is used to create simple loops. The following different formats are supported:
+
+-   `{for $var=$start to $end}` simple loop with step size of 1.
+
+-   `{for $var=$start to $end step $step}` loop with individual step
+    size.
+
+`{forelse}` is executed when the loop is not iterated.
+
+## Attributes
+
+| Attribute | Required | Description                    |
+|-----------|----------|--------------------------------|
+| max       | No       | Limit the number of iterations |
+
+## Option Flags
+
+| Name    | Description                          |
+|---------|--------------------------------------|
+| nocache | Disables caching of the `{for}` loop |
+
+## Examples
+
+```smarty
+<ul>
+    {for $foo=1 to 3}
+        <li>{$foo}</li>
+    {/for}
+</ul>
+```
+      
+The above example will output:
+
+```html
+<ul>
+    <li>1</li>
+    <li>2</li>
+    <li>3</li>
+</ul>
+```
+      
+```php
+<?php
+$smarty->assign('to',10);
+```
+    
+```smarty
+<ul>
+    {for $foo=3 to $to max=3}
+        <li>{$foo}</li>
+    {/for}
+</ul>
+```
+
+The above example will output:
+
+```html
+<ul>
+    <li>3</li>
+    <li>4</li>
+    <li>5</li>
+</ul>
+```
+
+```php
+<?php
+$smarty->assign('start',10);
+$smarty->assign('to',5);
+```
+
+```smarty
+<ul>
+    {for $foo=$start to $to}
+        <li>{$foo}</li>
+    {forelse}
+      no iteration
+    {/for}
+</ul>
+```
+
+The above example will output:
+
+```
+   no iteration
+```
+      
+See also [`{foreach}`](./language-function-foreach.md),
+[`{section}`](./language-function-section.md) and
+[`{while}`](./language-function-while.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-foreach.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-foreach.md
new file mode 100644
index 000000000..645d6c52c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-foreach.md
@@ -0,0 +1,389 @@
+# {foreach},{foreachelse}
+
+`{foreach}` is used for looping over arrays of data. `{foreach}` has a
+simpler and cleaner syntax than the
+[`{section}`](./language-function-section.md) loop, and can also loop over
+associative arrays.
+
+## Option Flags
+
+| Name    | Description                              |
+|---------|------------------------------------------|
+| nocache | Disables caching of the `{foreach}` loop |
+
+
+## Examples
+
+```smarty
+
+{foreach $arrayvar as $itemvar}
+  {$itemvar|escape}
+{/foreach}
+
+{foreach $arrayvar as $keyvar=>$itemvar}
+  {$keyvar}: {$itemvar|escape}
+{/foreach}
+
+```
+> **Note**
+>
+> This foreach syntax does not accept any named attributes. This syntax
+> is new to Smarty 3, however the Smarty 2.x syntax
+> `{foreach from=$myarray key="mykey" item="myitem"}` is still
+> supported.
+
+-   `{foreach}` loops can be nested.
+
+-   The `array` variable, usually an array of values, determines the
+    number of times `{foreach}` will loop. You can also pass an integer
+    for arbitrary loops.
+
+-   `{foreachelse}` is executed when there are no values in the `array`
+    variable.
+
+-   `{foreach}` properties are [`@index`](#index),
+    [`@iteration`](#iteration),
+    [`@first`](#first),
+    [`@last`](#last),
+    [`@show`](#show),
+    [`@total`](#total).
+
+-   `{foreach}` constructs are [`{break}`](#break),
+    [`{continue}`](#continue).
+
+-   Instead of specifying the `key` variable you can access the current
+    key of the loop item by `{$item@key}` (see examples below).
+
+> **Note**
+>
+> The `$var@property` syntax is new to Smarty 3, however when using the
+> Smarty 2 `{foreach from=$myarray key="mykey" item="myitem"}` style
+> syntax, the `$smarty.foreach.name.property` syntax is still supported.
+
+> **Note**
+>
+> Although you can retrieve the array key with the syntax
+> `{foreach $myArray as $myKey => $myValue}`, the key is always
+> available as `$myValue@key` within the foreach loop.
+
+```php
+<?php
+$arr = array('red', 'green', 'blue');
+$smarty->assign('myColors', $arr);
+```
+    
+Template to output `$myColors` in an un-ordered list
+
+```smarty
+<ul>
+    {foreach $myColors as $color}
+        <li>{$color}</li>
+    {/foreach}
+</ul>
+```
+      
+The above example will output:
+
+```html
+<ul>
+    <li>red</li>
+    <li>green</li>
+    <li>blue</li>
+</ul>
+```
+
+```php      
+<?php
+$people = array('fname' => 'John', 'lname' => 'Doe', 'email' => 'j.doe@example.com');
+$smarty->assign('myPeople', $people);
+```
+
+Template to output `$myArray` as key/value pairs.
+
+```smarty
+<ul>
+    {foreach $myPeople as $value}
+       <li>{$value@key}: {$value}</li>
+    {/foreach}
+</ul>
+```
+     
+The above example will output:
+
+```html
+<ul>
+    <li>fname: John</li>
+    <li>lname: Doe</li>
+    <li>email: j.doe@example.com</li>
+</ul>
+```
+      
+Assign an array to Smarty, the key contains the key for each looped
+value.
+
+```php
+<?php
+ $smarty->assign(
+    'contacts', 
+    [
+         ['phone' => '555-555-1234', 'fax' => '555-555-5678', 'cell' => '555-555-0357'],
+         ['phone' => '800-555-4444', 'fax' => '800-555-3333', 'cell' => '800-555-2222'],
+     ]
+ );
+```
+
+The template to output `$contact`.
+
+```smarty
+{* key always available as a property *}
+{foreach $contacts as $contact}
+  {foreach $contact as $value}
+    {$value@key}: {$value}
+  {/foreach}
+{/foreach}
+
+{* accessing key the PHP syntax alternate *}
+{foreach $contacts as $contact}
+  {foreach $contact as $key => $value}
+    {$key}: {$value}
+  {/foreach}
+{/foreach}
+```
+      
+Either of the above examples will output:
+
+```
+  phone: 555-555-1234
+  fax: 555-555-5678
+  cell: 555-555-0357
+  phone: 800-555-4444
+  fax: 800-555-3333
+  cell: 800-555-2222
+```
+      
+A database (PDO) example of looping over search results. This example is
+looping over a PHP iterator instead of an array().
+
+```php
+<?php 
+  include('Smarty.class.php'); 
+
+  $smarty = new Smarty; 
+
+  $dsn = 'mysql:host=localhost;dbname=test'; 
+  $login = 'test'; 
+  $passwd = 'test'; 
+
+  // setting PDO to use buffered queries in mysql is 
+  // important if you plan on using multiple result cursors 
+  // in the template. 
+
+  $db = new PDO($dsn, $login, $passwd, array( 
+     PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true)); 
+
+  $res = $db->prepare("select * from users"); 
+  $res->execute(); 
+  $res->setFetchMode(PDO::FETCH_LAZY); 
+
+  // assign to smarty 
+  $smarty->assign('res',$res); 
+
+  $smarty->display('index.tpl');?>
+```
+
+```smarty
+{foreach $res as $r} 
+  {$r.id} 
+  {$r.name}
+{foreachelse}
+  .. no results .. 
+{/foreach}
+```
+
+The above is assuming the results contain the columns named `id` and
+`name`.
+
+What is the advantage of an iterator vs. looping over a plain old array?
+With an array, all the results are accumulated into memory before being
+looped. With an iterator, each result is loaded/released within the
+loop. This saves processing time and memory, especially for very large
+result sets.
+
+## @index
+
+`index` contains the current array index, starting with zero.
+
+```smarty
+{* output empty row on the 4th iteration (when index is 3) *}
+<table>
+    {foreach $items as $i}
+      {if $i@index eq 3}
+         {* put empty table row *}
+         <tr><td>nbsp;</td></tr>
+      {/if}
+      <tr><td>{$i.label}</td></tr>
+    {/foreach}
+</table>
+```
+      
+
+## @iteration
+
+`iteration` contains the current loop iteration and always starts at
+one, unlike [`index`](#index). It is incremented by one
+on each iteration.
+
+The *"is div by"* operator can be used to detect a specific iteration.
+Here we bold-face the name every 4th iteration.
+
+```smarty
+{foreach $myNames as $name}
+  {if $name@iteration is div by 4}
+    <b>{$name}</b>
+  {/if}
+  {$name}
+{/foreach}
+```
+
+The *"is even by"* and *"is odd by"* operators can be used to
+alternate something every so many iterations. Choosing between even or
+odd rotates which one starts. Here we switch the font color every 3rd
+iteration.
+
+```smarty
+ {foreach $myNames as $name}
+   {if $name@iteration is even by 3}
+     <span style="color: #000">{$name}</span>
+   {else}
+     <span style="color: #eee">{$name}</span>
+   {/if}
+ {/foreach}
+```
+
+This will output something similar to this:
+
+```html
+<span style="color: #000">...</span>
+<span style="color: #000">...</span>
+<span style="color: #000">...</span>
+<span style="color: #eee">...</span>
+<span style="color: #eee">...</span>
+<span style="color: #eee">...</span>
+<span style="color: #000">...</span>
+<span style="color: #000">...</span>
+<span style="color: #000">...</span>
+<span style="color: #eee">...</span>
+<span style="color: #eee">...</span>
+<span style="color: #eee">...</span>
+...
+```
+       
+## @first
+
+`first` is TRUE if the current `{foreach}` iteration is the initial one.
+Here we display a table header row on the first iteration.
+
+```smarty
+{* show table header at first iteration *}
+<table>
+    {foreach $items as $i}
+      {if $i@first}
+        <tr>
+          <th>key</td>
+          <th>name</td>
+        </tr>
+      {/if}
+      <tr>
+        <td>{$i@key}</td>
+        <td>{$i.name}</td>
+      </tr>
+    {/foreach}
+</table>
+```
+      
+## @last
+
+`last` is set to TRUE if the current `{foreach}` iteration is the final
+one. Here we display a horizontal rule on the last iteration.
+
+```smarty
+{* Add horizontal rule at end of list *}
+{foreach $items as $item}
+  <a href="#{$item.id}">{$item.name}</a>{if $item@last}<hr>{else},{/if}
+{foreachelse}
+  ... no items to loop ...
+{/foreach}
+```
+      
+## @show
+
+The show `show` property can be used after the execution of a
+`{foreach}` loop to detect if data has been displayed or not. `show` is
+a boolean value.
+
+```smarty
+<ul>
+    {foreach $myArray as $name}
+        <li>{$name}</li>
+    {/foreach}
+</ul>
+{if $name@show} do something here if the array contained data {/if}
+```
+
+## @total
+
+`total` contains the number of iterations that this `{foreach}` will
+loop. This can be used inside or after the `{foreach}`.
+
+```smarty
+{* show number of rows at end *}
+{foreach $items as $item}
+  {$item.name}<hr/>
+  {if $item@last}
+    <div id="total">{$item@total} items</div>
+  {/if}
+{foreachelse}
+ ... no items to loop ...
+{/foreach}
+```
+
+See also [`{section}`](./language-function-section.md),
+[`{for}`](./language-function-for.md) and
+[`{while}`](./language-function-while.md)
+
+## {break}
+
+`{break}` aborts the iteration of the array
+
+```smarty     
+  {$data = [1,2,3,4,5]}
+  {foreach $data as $value}
+    {if $value == 3}
+      {* abort iterating the array *}
+      {break}
+    {/if}
+    {$value}
+  {/foreach}
+  {*
+    prints: 1 2
+  *}
+``` 
+       
+## {continue}
+
+`{continue}` leaves the current iteration and begins with the next
+iteration.
+
+```smarty
+  {$data = [1,2,3,4,5]}
+  {foreach $data as $value}
+    {if $value == 3}
+      {* skip this iteration *}
+      {continue}
+    {/if}
+    {$value}
+  {/foreach}
+  {*
+    prints: 1 2 4 5
+  *}
+```
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-function.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-function.md
new file mode 100644
index 000000000..cee6762c8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-function.md
@@ -0,0 +1,89 @@
+# {function}
+
+`{function}` is used to create functions within a template and call them
+just like a plugin function. Instead of writing a plugin that generates
+presentational content, keeping it in the template is often a more
+manageable choice. It also simplifies data traversal, such as deeply
+nested menus.
+
+> **Note**
+>
+> Template functions are defined global. Since the Smarty compiler is a
+> single-pass compiler, The [`{call}`](#language.function.call) tag must
+> be used to call a template function defined externally from the given
+> template. Otherwise, you can directly use the function as
+> `{funcname ...}` in the template.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                   |
+|----------------|----------|---------------------------------------------------------------|
+| name           | Yes      | The name of the template function                             |
+| \[var \...\]   | No       | default variable value to pass local to the template function |
+
+-   The `{function}` tag must have the `name` attribute which contains
+    the name of the template function. A tag with this name can be
+    used to call the template function.
+
+-   Default values for variables can be passed to the template function
+    as [attributes](../language-basic-syntax/language-syntax-attributes.md). Like in PHP function
+    declarations you can only use scalar values as default. The default
+    values can be overwritten when the template function is being
+    called.
+
+-   You can use all variables from the calling template inside the
+    template function. Changes to variables or new created variables
+    inside the template function have local scope and are not visible
+    inside the calling template after the template function is executed.
+
+
+
+> **Note**
+>
+> You can pass any number of parameter to the template function when it
+> is called. The parameter variables must not be declared in the
+> `{funcname ...}` tag unless you what to use default values. Default
+> values must be scalar and can not be variable. Variables must be
+> passed when the template is called.
+
+## Examples
+
+```smarty
+{* define the function *}
+{function name=menu level=0}
+{function menu level=0}          {* short-hand *}
+  <ul class="level{$level}">
+  {foreach $data as $entry}
+    {if is_array($entry)}
+      <li>{$entry@key}</li>
+      {menu data=$entry level=$level+1}
+    {else}
+      <li>{$entry}</li>
+    {/if}
+  {/foreach}
+  </ul>
+{/function}
+
+{* create an array to demonstrate *}
+{$menu = ['item1','item2','item3' => ['item3-1','item3-2','item3-3' =>
+['item3-3-1','item3-3-2']],'item4']}
+
+{* run the array through the function *}
+{menu data=$menu}
+```
+
+Will generate the following output
+
+```
+* item1
+* item2
+* item3
+      o item3-1
+      o item3-2
+      o item3-3
+            + item3-3-1
+            + item3-3-2
+* item4
+```
+      
+See also [`{call}`](./language-function-call.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-if.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-if.md
new file mode 100644
index 000000000..c7be37a2c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-if.md
@@ -0,0 +1,120 @@
+# {if},{elseif},{else}
+
+`{if}` statements in Smarty have much the same flexibility as PHP
+[if](https://www.php.net/if) statements, with a few added features for the
+template engine. Every `{if}` must be paired with a matching `{/if}`.
+`{else}` and `{elseif}` are also permitted. All PHP conditionals and
+functions are recognized, such as *\|\|*, *or*, *&&*, *and*,
+*is_array()*, etc.
+
+If security is enabled, only PHP functions from `$php_functions` property
+of the security policy are allowed. See the
+[Security](../../programmers/advanced-features/advanced-features-security.md) section for details.
+
+The following is a list of recognized qualifiers, which must be
+separated from surrounding elements by spaces. Note that items listed in
+\[brackets\] are optional. PHP equivalents are shown where applicable.
+
+## Qualifiers
+
+| Qualifier          | Alternates | Syntax Example       | Meaning                        | PHP Equivalent     |
+|--------------------|------------|----------------------|--------------------------------|--------------------|
+| ==                 | eq         | $a eq $b             | equals                         | ==                 |
+| !=                 | ne, neq    | $a neq $b            | not equals                     | !=                 |
+| >                  | gt         | $a gt $b             | greater than                   | >                  |
+| <                  | lt         | $a lt $b             | less than                      | <                  |
+| >=                 | gte, ge    | $a ge $b             | greater than or equal          | >=                 |
+| <=                 | lte, le    | $a le $b             | less than or equal             | <=                 |
+| ===                |            | $a === 0             | check for identity             | ===                |
+| !                  | not        | not $a               | negation (unary)               | !                  |
+| %                  | mod        | $a mod $b            | modulo                         | %                  |
+| is \[not\] div by  |            | $a is not div by 4   | divisible by                   | $a % $b == 0       |
+| is \[not\] even    |            | $a is not even       | \[not\] an even number (unary) | $a % 2 == 0        |
+| is \[not\] even by |            | $a is not even by $b | grouping level \[not\] even    | ($a / $b) % 2 == 0 |
+| is \[not\] odd     |            | $a is not odd        | \[not\] an odd number (unary)  | $a % 2 != 0        |
+| is \[not\] odd by  |            | $a is not odd by $b  | \[not\] an odd grouping        | ($a / $b) % 2 != 0 |
+
+## Examples
+```smarty
+{if $name eq 'Fred'}
+    Welcome Sir.
+{elseif $name eq 'Wilma'}
+    Welcome Ma'am.
+{else}
+    Welcome, whatever you are.
+{/if}
+
+{* an example with "or" logic *}
+{if $name eq 'Fred' or $name eq 'Wilma'}
+   ...
+{/if}
+
+{* same as above *}
+{if $name == 'Fred' || $name == 'Wilma'}
+   ...
+{/if}
+
+
+{* parenthesis are allowed *}
+{if ( $amount < 0 or $amount > 1000 ) and $volume >= #minVolAmt#}
+   ...
+{/if}
+
+
+{* you can also embed php function calls *}
+{if count($var) gt 0}
+   ...
+{/if}
+
+{* check for array. *}
+{if is_array($foo) }
+   .....
+{/if}
+
+{* check for not null. *}
+{if isset($foo) }
+   .....
+{/if}
+
+
+{* test if values are even or odd *}
+{if $var is even}
+   ...
+{/if}
+{if $var is odd}
+   ...
+{/if}
+{if $var is not odd}
+   ...
+{/if}
+
+
+{* test if var is divisible by 4 *}
+{if $var is div by 4}
+   ...
+{/if}
+
+
+{*
+  test if var is even, grouped by two. i.e.,
+  0=even, 1=even, 2=odd, 3=odd, 4=even, 5=even, etc.
+*}
+{if $var is even by 2}
+   ...
+{/if}
+
+{* 0=even, 1=even, 2=even, 3=odd, 4=odd, 5=odd, etc. *}
+{if $var is even by 3}
+   ...
+{/if}
+ 
+{if isset($name) && $name == 'Blog'}
+     {* do something *}
+{elseif $name == $foo}
+    {* do something *}
+{/if}
+
+{if is_array($foo) && count($foo) > 0}
+    {* do a foreach loop *}
+{/if}
+```
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-include.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-include.md
new file mode 100644
index 000000000..d12a817e0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-include.md
@@ -0,0 +1,187 @@
+# {include}
+
+`{include}` tags are used for including other templates in the current
+template. Any variables available in the current template are also
+available within the included template.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                                |
+|----------------|----------|--------------------------------------------------------------------------------------------|
+| file           | Yes      | The name of the template file to include                                                   |
+| assign         | No       | The name of the variable that the output of include will be assigned to                    |
+| cache_lifetime | No       | Enable caching of this subtemplate with an individual cache lifetime                       |
+| compile_id     | No       | Compile this subtemplate with an individual compile_id                                     |
+| cache_id       | No       | Enable caching of this subtemplate with an individual cache_id                             |
+| scope          | No       | Define the scope of all in the subtemplate assigned variables: 'parent','root' or 'global' |
+| \[var \...\]   | No       | variable to pass local to template                                                         |
+
+
+-   The `{include}` tag must have the `file` attribute which contains
+    the template resource path.
+
+-   Setting the optional `assign` attribute specifies the template
+    variable that the output of `{include}` is assigned to, instead of
+    being displayed. Similar to [`{assign}`](./language-function-assign.md).
+
+-   Variables can be passed to included templates as
+    [attributes](../language-basic-syntax/language-syntax-attributes.md). Any variables explicitly
+    passed to an included template are only available within the scope
+    of the included file. Attribute variables override current template
+    variables, in the case when they are named the same.
+
+-   You can use all variables from the including template inside the
+    included template. But changes to variables or new created variables
+    inside the included template have local scope and are not visible
+    inside the including template after the `{include}` statement. This
+    default behaviour can be changed for all variables assigned in the
+    included template by using the scope attribute at the `{include}`
+    statement or for individual variables by using the scope attribute
+    at the [`{assign}`](./language-function-assign.md) statement. The later
+    is useful to return values from the included template to the
+    including template.
+
+-   Use the syntax for [template resources](../../programmers/resources.md) to `{include}`
+    files outside of the [`$template_dir`](../../programmers/api-variables/variable-template-dir.md)
+    directory.
+
+## Option Flags
+
+| Name    | Description                                                                          |
+|---------|--------------------------------------------------------------------------------------|
+| nocache | Disables caching of this subtemplate                                                 |
+| caching | Enable caching of this subtemplate                                                   |
+| inline  | If set, merge the compile-code of the subtemplate into the compiled calling template |
+
+## Examples
+```smarty
+<html>
+    <head>
+      <title>{$title}</title>
+    </head>
+    <body>
+    {include file='page_header.tpl'}
+
+    {* body of template goes here, the $tpl_name variable
+       is replaced with a value eg 'contact.tpl'
+    *}
+    {include file="$tpl_name.tpl"}
+
+    {* using shortform file attribute *}
+    {include 'page_footer.tpl'}
+    </body>
+</html>
+```
+
+```smarty
+
+{include 'links.tpl' title='Newest links' links=$link_array}
+{* body of template goes here *}
+{include 'footer.tpl' foo='bar'}
+
+```
+
+The template above includes the example `links.tpl` below
+
+```smarty
+<div id="box">
+    <h3>{$title}{/h3>
+    <ul>
+        {foreach from=$links item=l}
+            .. do stuff  ...
+        </foreach}
+    </ul>
+</div>
+```
+Variables assigned in the included template will be seen in the
+including template.
+
+```smarty
+{include 'sub_template.tpl' scope=parent}
+...
+{* display variables assigned in sub_template *}
+{$foo}<br>
+{$bar}<br>
+...
+```
+      
+The template above includes the example `sub_template.tpl` below
+
+```smarty
+...
+{assign var=foo value='something'}
+{assign var=bar value='value'}
+...
+```
+
+The included template will not be cached.
+
+```smarty
+{include 'sub_template.tpl' nocache}
+...
+```
+      
+In this example included template will be cached with an individual
+cache lifetime of 500 seconds.
+
+```smarty
+{include 'sub_template.tpl' cache_lifetime=500}
+...
+```
+      
+In this example included template will be cached independent of the
+global caching setting.
+
+```smarty
+{include 'sub_template.tpl' caching}
+...
+```
+      
+This example assigns the contents of `nav.tpl` to the `$navbar`
+variable, which is then output at both the top and bottom of the page.
+
+```smarty     
+<body>
+  {include 'nav.tpl' assign=navbar}
+  {include 'header.tpl' title='Smarty is cool'}
+    {$navbar}
+    {* body of template goes here *}
+    {$navbar}
+  {include 'footer.tpl'}
+</body>
+```
+       
+This example includes another template relative to the directory of the
+current template.
+
+```smarty
+{include 'template-in-a-template_dir-directory.tpl'}
+{include './template-in-same-directory.tpl'}
+{include '../template-in-parent-directory.tpl'}
+```
+        
+```smarty
+{* absolute filepath *}
+{include file='/usr/local/include/templates/header.tpl'}
+
+{* absolute filepath (same thing) *}
+{include file='file:/usr/local/include/templates/header.tpl'}
+
+{* windows absolute filepath (MUST use "file:" prefix) *}
+{include file='file:C:/www/pub/templates/header.tpl'}
+
+{* include from template resource named "db" *}
+{include file='db:header.tpl'}
+
+{* include a $variable template - eg $module = 'contacts' *}
+{include file="$module.tpl"}
+
+{* wont work as its single quotes ie no variable substitution *}
+{include file='$module.tpl'}
+
+{* include a multi $variable template - eg amber/links.view.tpl *}
+{include file="$style_dir/$module.$view.tpl"}
+```
+      
+See also [`{insert}`](./language-function-insert.md), [template resources](../../programmers/resources.md) and
+[componentized templates](../../appendixes/tips.md#componentized-templates).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-insert.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-insert.md
new file mode 100644
index 000000000..54f0729dd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-insert.md
@@ -0,0 +1,86 @@
+# {insert}
+
+> **Note**
+>
+> `{insert}` tags are deprecated from Smarty, and should not be used.
+> Put your PHP logic in PHP scripts or plugin functions instead.
+> As of Smarty 3.1 the `{insert}` tags are only available from
+> [SmartyBC](#bc).
+
+`{insert}` tags work much like [`{include}`](./language-function-include.md)
+tags, except that `{insert}` tags are NOT cached when template
+[caching](../../programmers/caching.md) is enabled. They will be executed on every
+invocation of the template.
+
+| Attribute Name | Required | Description                                                                      |
+|----------------|----------|----------------------------------------------------------------------------------|
+| name           | Yes      | The name of the insert function (insert_`name`) or insert plugin                 |
+| assign         | No       | The name of the template variable the output will be assigned to                 |
+| script         | No       | The name of the php script that is included before the insert function is called |
+| \[var \...\]   | No       | variable to pass to insert function                                              |
+
+## Examples
+
+Let's say you have a template with a banner slot at the top of the
+page. The banner can contain any mixture of HTML, images, flash, etc. so
+we can't just use a static link here, and we don't want this contents
+cached with the page. In comes the {insert} tag: the template knows
+\#banner\_location\_id\# and \#site\_id\# values (gathered from a
+[config file](../config-files.md)), and needs to call a function to get the
+banner contents.
+
+```smarty
+    {* example of fetching a banner *}
+    {insert name="getBanner" lid=#banner_location_id# sid=#site_id#}
+    {insert "getBanner" lid=#banner_location_id# sid=#site_id#} {* short-hand *}
+```
+
+In this example, we are using the name "getBanner" and passing the
+parameters \#banner\_location\_id\# and \#site\_id\#. Smarty will look
+for a function named insert\_getBanner() in your PHP application,
+passing the values of \#banner\_location\_id\# and \#site\_id\# as the
+first argument in an associative array. All {insert} function names in
+your application must be prepended with "insert_" to remedy possible
+function name-space conflicts. Your insert\_getBanner() function should
+do something with the passed values and return the results. These
+results are then displayed in the template in place of the {insert} tag.
+In this example, Smarty would call this function:
+insert_getBanner(array("lid" => "12345","sid" => "67890"));
+and display the returned results in place of the {insert} tag.
+
+-   If you supply the `assign` attribute, the output of the `{insert}`
+    tag will be assigned to this template variable instead of being
+    output to the template.
+
+    > **Note**
+    >
+    > Assigning the output to a template variable isn't too useful with
+    > [caching](../../programmers/api-variables/variable-caching.md) enabled.
+
+-   If you supply the `script` attribute, this php script will be
+    included (only once) before the `{insert}` function is executed.
+    This is the case where the insert function may not exist yet, and a
+    php script must be included first to make it work.
+
+    The path can be either absolute, or relative to
+    [`$trusted_dir`](../../programmers/api-variables/variable-trusted-dir.md). If security is enabled,
+    then the script must be located in the `$trusted_dir` path of the
+    security policy. See the [Security](../../programmers/advanced-features/advanced-features-security.md)
+    section for details.
+
+The Smarty object is passed as the second argument. This way you can
+reference and modify information in the Smarty object from within the
+`{insert}` function.
+
+If no PHP script can be found Smarty is looking for a corresponding
+insert plugin.
+
+> **Note**
+>
+> It is possible to have portions of the template not cached. If you
+> have [caching](../../programmers/api-variables/variable-caching.md) turned on, `{insert}` tags will not be
+> cached. They will run dynamically every time the page is created, even
+> within cached pages. This works good for things like banners, polls,
+> live weather, search results, user feedback areas, etc.
+
+See also [`{include}`](./language-function-include.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-ldelim.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-ldelim.md
new file mode 100644
index 000000000..c9f73c307
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-ldelim.md
@@ -0,0 +1,51 @@
+# {ldelim}, {rdelim}
+
+`{ldelim}` and `{rdelim}` are used for [escaping](../language-basic-syntax/language-escaping.md)
+template delimiters, by default **{** and **}**. You can also use
+[`{literal}{/literal}`](./language-function-literal.md) to escape blocks of
+text eg Javascript or CSS. See also the complementary
+[`{$smarty.ldelim}`](../../programmers/api-variables/variable-left-delimiter.md).
+
+```smarty
+{* this will print literal delimiters out of the template *}
+
+{ldelim}funcname{rdelim} is how functions look in Smarty!
+```
+
+The above example will output:
+
+```
+{funcname} is how functions look in Smarty!
+```
+
+Another example with some Javascript
+
+```smarty
+<script>
+function foo() {ldelim}
+    ... code ...
+{rdelim}
+</script>
+```
+
+will output
+
+```html
+<script>
+function foo() {
+    .... code ...
+}
+</script>
+```
+
+```smarty
+<script>
+    function myJsFunction(){ldelim}
+        alert("The server name\n{$smarty.server.SERVER_NAME|escape:javascript}\n{$smarty.server.SERVER_ADDR|escape:javascript}");
+    {rdelim}
+</script>
+<a href="javascript:myJsFunction()">Click here for Server Info</a>
+```
+
+See also [`{literal}`](./language-function-literal.md) and [escaping Smarty
+parsing](../language-basic-syntax/language-escaping.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-literal.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-literal.md
new file mode 100644
index 000000000..4bc12f9d0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-literal.md
@@ -0,0 +1,34 @@
+# {literal}
+
+`{literal}` tags allow a block of data to be taken literally. This is
+typically used around Javascript or stylesheet blocks where {curly
+braces} would interfere with the template
+[delimiter](../../programmers/api-variables/variable-left-delimiter.md) syntax. Anything within
+`{literal}{/literal}` tags is not interpreted, but displayed as-is. If
+you need template tags embedded in a `{literal}` block, consider using
+[`{ldelim}{rdelim}`](./language-function-ldelim.md) to escape the individual
+delimiters instead.
+
+> **Note**
+>
+> `{literal}{/literal}` tags are normally not necessary, as Smarty
+> ignores delimiters that are surrounded by whitespace. Be sure your
+> javascript and CSS curly braces are surrounded by whitespace. This is
+> new behavior to Smarty 3.
+
+```smarty
+<script>
+   // the following braces are ignored by Smarty
+   // since they are surrounded by whitespace
+   function myFoo {
+     alert('Foo!');
+   }
+   // this one will need literal escapement
+   {literal}
+     function myBar {alert('Bar!');}
+   {/literal}
+</script>
+```
+
+See also [`{ldelim} {rdelim}`](./language-function-ldelim.md) and the
+[escaping Smarty parsing](../language-basic-syntax/language-escaping.md) page.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-nocache.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-nocache.md
new file mode 100644
index 000000000..e6d8453fd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-nocache.md
@@ -0,0 +1,20 @@
+# {nocache}
+
+`{nocache}` is used to disable caching of a template section. Every
+`{nocache}` must be paired with a matching `{/nocache}`.
+
+> **Note**
+>
+> Be sure any variables used within a non-cached section are also
+> assigned from PHP when the page is loaded from the cache.
+
+```smarty
+Today's date is
+{nocache}
+{$smarty.now|date_format}
+{/nocache}
+```
+   
+The above code will output the current date on a cached page.
+
+See also the [caching section](../../programmers/caching.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-section.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-section.md
new file mode 100644
index 000000000..427902512
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-section.md
@@ -0,0 +1,610 @@
+# {section}, {sectionelse}
+
+A `{section}` is for looping over **sequentially indexed arrays of
+data**, unlike [`{foreach}`](./language-function-foreach.md) which is used
+to loop over a **single associative array**. Every `{section}` tag must
+be paired with a closing `{/section}` tag.
+
+> **Note**
+>
+> The [`{foreach}`](./language-function-foreach.md) loop can do everything a
+> {section} loop can do, and has a simpler and easier syntax. It is
+> usually preferred over the {section} loop.
+
+> **Note**
+>
+> {section} loops cannot loop over associative arrays, they must be
+> numerically indexed, and sequential (0,1,2,\...). For associative
+> arrays, use the [`{foreach}`](./language-function-foreach.md) loop.
+
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                                                                                                                                                                                                                                                                                                                          |
+|----------------|----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| name           | Yes      | The name of the section                                                                                                                                                                                                                                                                                                                                                              |
+| loop           | Yes      | Value to determine the number of loop iterations                                                                                                                                                                                                                                                                                                                                     |
+| start          | No       | The index position that the section will begin looping. If the value is negative, the start position is calculated from the end of the array. For example, if there are seven values in the loop array and start is -2, the start index is 5. Invalid values (values outside of the length of the loop array) are automatically truncated to the closest valid value. Defaults to 0. |
+| step           | No       | The step value that will be used to traverse the loop array. For example, step=2 will loop on index 0, 2, 4, etc. If step is negative, it will step through the array backwards. Defaults to 1.                                                                                                                                                                                      |
+| max            | No       | Sets the maximum number of times the section will loop.                                                                                                                                                                                                                                                                                                                              |
+| show           | No       | Determines whether to show this section (defaults to true)                                                                                                                                                                                                                                                                                                                           |
+
+## Option Flags
+
+| Name    | Description                              |
+|---------|------------------------------------------|
+| nocache | Disables caching of the `{section}` loop |
+
+-   Required attributes are `name` and `loop`.
+
+-   The `name` of the `{section}` can be anything you like, made up of
+    letters, numbers and underscores, like [PHP
+    variables](https://www.php.net/language.variables).
+
+-   {section}'s can be nested, and the nested `{section}` names must be
+    unique from each other.
+
+-   The `loop` attribute, usually an array of values, determines the
+    number of times the `{section}` will loop. You can also pass an
+    integer as the loop value.
+
+-   When printing a variable within a `{section}`, the `{section}`
+    `name` must be given next to variable name within \[brackets\].
+
+-   `{sectionelse}` is executed when there are no values in the loop
+    variable.
+
+-   A `{section}` also has its own variables that handle `{section}`
+    properties. These properties are accessible as:
+    [`{$smarty.section.name.property}`](../language-variables/language-variables-smarty.md#smartysection-languagevariablessmartyloops)
+    where "name" is the attribute `name`.
+
+-   `{section}` properties are [`index`](#index),
+    [`index_prev`](#index_prev),
+    [`index_next`](#index_next),
+    [`iteration`](#iteration),
+    [`first`](#first),
+    [`last`](#last),
+    [`rownum`](#rownum),
+    [`loop`](#loop), [`show`](#show),
+    [`total`](#total).
+
+[`assign()`](../../programmers/api-functions/api-assign.md) an array to Smarty
+
+## Examples
+
+```php
+<?php
+$data = [1000, 1001, 1002];
+$smarty->assign('custid', $data);
+```
+
+The template that outputs the array
+
+```smarty
+{* this example will print out all the values of the $custid array *}
+{section name=customer loop=$custid}
+{section customer $custid} {* short-hand *}
+  id: {$custid[customer]}<br />
+{/section}
+<hr />
+{*  print out all the values of the $custid array reversed *}
+{section name=foo loop=$custid step=-1}
+{section foo $custid step=-1} {* short-hand *}
+  {$custid[foo]}<br />
+{/section}
+```
+      
+The above example will output:
+
+```html
+id: 1000<br />
+id: 1001<br />
+id: 1002<br />
+<hr />
+id: 1002<br />
+id: 1001<br />
+id: 1000<br />
+```
+      
+```smarty
+{section name=foo start=10 loop=20 step=2}
+  {$smarty.section.foo.index}
+{/section}
+<hr />
+{section name=bar loop=21 max=6 step=-2}
+  {$smarty.section.bar.index}
+{/section}
+```
+
+The above example will output:
+
+```html
+10 12 14 16 18
+<hr />
+20 18 16 14 12 10
+```
+
+The `name` of the `{section}` can be anything you like, see [PHP
+variables](https://www.php.net/language.variables). It is used to reference
+the data within the `{section}`.
+
+```smarty
+{section name=anything loop=$myArray}
+  {$myArray[anything].foo}
+  {$name[anything]}
+  {$address[anything].bar}
+{/section}
+```
+
+This is an example of printing an associative array of data with a
+`{section}`. Following is the php script to assign the `$contacts` array
+to Smarty.
+
+```php
+<?php
+$data = [
+      ['name' => 'John Smith', 'home' => '555-555-5555',
+            'cell' => '666-555-5555', 'email' => 'john@myexample.com'],
+      ['name' => 'Jack Jones', 'home' => '777-555-5555',
+            'cell' => '888-555-5555', 'email' => 'jack@myexample.com'],
+      ['name' => 'Jane Munson', 'home' => '000-555-5555',
+            'cell' => '123456', 'email' => 'jane@myexample.com']
+];
+$smarty->assign('contacts',$data);
+```
+    
+The template to output `$contacts`
+
+```smarty
+{section name=customer loop=$contacts}
+<p>
+  name: {$contacts[customer].name}<br />
+  home: {$contacts[customer].home}<br />
+  cell: {$contacts[customer].cell}<br />
+  e-mail: {$contacts[customer].email}
+</p>
+{/section}
+```
+
+The above example will output:
+
+```html
+<p>
+  name: John Smith<br />
+  home: 555-555-5555<br />
+  cell: 666-555-5555<br />
+  e-mail: john@myexample.com
+</p>
+<p>
+  name: Jack Jones<br />
+  home: 777-555-5555<br />
+  cell: 888-555-5555<br />
+  e-mail: jack@myexample.com
+</p>
+<p>
+  name: Jane Munson<br />
+  home: 000-555-5555<br />
+  cell: 123456<br />
+  e-mail: jane@myexample.com
+</p>
+```
+      
+This example assumes that `$custid`, `$name` and `$address` are all
+arrays containing the same number of values. First the php script that
+assign's the arrays to Smarty.
+
+```php
+<?php
+
+$id = [1001,1002,1003];
+$smarty->assign('custid',$id);
+
+$fullnames = ['John Smith','Jack Jones','Jane Munson'];
+$smarty->assign('name',$fullnames);
+
+$addr = ['253 Abbey road', '417 Mulberry ln', '5605 apple st'];
+$smarty->assign('address',$addr);
+```
+
+The `loop` variable only determines the number of times to loop. You can
+access ANY variable from the template within the `{section}`. This is
+useful for looping multiple arrays. You can pass an array which will
+determine the loop count by the array size, or you can pass an integer
+to specify the number of loops.
+
+```smarty
+{section name=customer loop=$custid}
+<p>
+  id: {$custid[customer]}<br />
+  name: {$name[customer]}<br />
+  address: {$address[customer]}
+</p>
+{/section}
+```
+      
+The above example will output:
+
+```html
+<p>
+  id: 1000<br />
+  name: John Smith<br />
+  address: 253 Abbey road
+</p>
+<p>
+  id: 1001<br />
+  name: Jack Jones<br />
+  address: 417 Mulberry ln
+</p>
+<p>
+  id: 1002<br />
+  name: Jane Munson<br />
+  address: 5605 apple st
+</p>
+```
+      
+{section}'s can be nested as deep as you like. With nested
+{section}'s, you can access complex data structures, such as
+multidimensional arrays. This is an example `.php` script that
+assigns the arrays.
+
+```php
+<?php
+
+$id = [1001,1002,1003];
+$smarty->assign('custid',$id);
+
+$fullnames = ['John Smith','Jack Jones','Jane Munson'];
+$smarty->assign('name',$fullnames);
+
+$addr = ['253 N 45th', '417 Mulberry ln', '5605 apple st'];
+$smarty->assign('address',$addr);
+
+$types = [
+           [ 'home phone', 'cell phone', 'e-mail'],
+           [ 'home phone', 'web'],
+           [ 'cell phone']
+         ];
+$smarty->assign('contact_type', $types);
+
+$info = [
+           ['555-555-5555', '666-555-5555', 'john@myexample.com'],
+           [ '123-456-4', 'www.example.com'],
+           [ '0457878']
+        ];
+$smarty->assign('contact_info', $info);
+```
+      
+In this template, *$contact_type\[customer\]* is an array of contact
+types for the current customer.
+
+```smarty
+{section name=customer loop=$custid}
+<hr>
+  id: {$custid[customer]}<br />
+  name: {$name[customer]}<br />
+  address: {$address[customer]}<br />
+  {section name=contact loop=$contact_type[customer]}
+    {$contact_type[customer][contact]}: {$contact_info[customer][contact]}<br />
+  {/section}
+{/section}
+```
+      
+The above example will output:
+
+```html
+<hr>
+  id: 1000<br />
+  name: John Smith<br />
+  address: 253 N 45th<br />
+    home phone: 555-555-5555<br />
+    cell phone: 666-555-5555<br />
+    e-mail: john@myexample.com<br />
+<hr>
+  id: 1001<br />
+  name: Jack Jones<br />
+  address: 417 Mulberry ln<br />
+    home phone: 123-456-4<br />
+    web: www.example.com<br />
+<hr>
+  id: 1002<br />
+  name: Jane Munson<br />
+  address: 5605 apple st<br />
+    cell phone: 0457878<br />
+```
+      
+Results of a database search (eg ADODB or PEAR) are assigned to Smarty
+
+```php      
+<?php
+$sql = 'select id, name, home, cell, email from contacts '
+      ."where name like '$foo%' ";
+$smarty->assign('contacts', $db->getAll($sql));
+```
+
+The template to output the database result in a HTML table
+
+```smarty
+<table>
+    <tr><th>&nbsp;</th><th>Name></th><th>Home</th><th>Cell</th><th>Email</th></tr>
+    {section name=co loop=$contacts}
+      <tr>
+        <td><a href="view.php?id={$contacts[co].id}">view<a></td>
+        <td>{$contacts[co].name}</td>
+        <td>{$contacts[co].home}</td>
+        <td>{$contacts[co].cell}</td>
+        <td>{$contacts[co].email}</td>
+      <tr>
+    {sectionelse}
+      <tr><td colspan="5">No items found</td></tr>
+    {/section}
+</table>
+```
+
+## .index
+`index` contains the current array index, starting with zero or the
+`start` attribute if given. It increments by one or by the `step`
+attribute if given.
+
+> **Note**
+>
+> If the `step` and `start` properties are not modified, then this works
+> the same as the [`iteration`](#iteration) property,
+> except it starts at zero instead of one.
+
+> **Note**
+>
+> `$custid[customer.index]` and `$custid[customer]` are identical.
+
+```smarty
+{section name=customer loop=$custid}
+  {$smarty.section.customer.index} id: {$custid[customer]}<br />
+{/section}
+```
+      
+The above example will output:
+
+```html
+0 id: 1000<br />
+1 id: 1001<br />
+2 id: 1002<br />
+```
+       
+
+## .index_prev
+
+`index_prev` is the previous loop index. On the first loop, this is set to -1.
+
+## .index_next
+
+`index_next` is the next loop index. On the last loop, this is still one
+more than the current index, respecting the setting of the `step`
+attribute, if given.
+
+```php
+<?php
+    $data = [1001,1002,1003,1004,1005];
+    $smarty->assign('rows',$data);
+```
+
+Template to output the above array in a table
+
+```smarty
+{* $rows[row.index] and $rows[row] are identical in meaning *}
+<table>
+  <tr>
+    <th>index</th><th>id</th>
+    <th>index_prev</th><th>prev_id</th>
+    <th>index_next</th><th>next_id</th>
+  </tr>
+{section name=row loop=$rows}
+  <tr>
+    <td>{$smarty.section.row.index}</td><td>{$rows[row]}</td>
+    <td>{$smarty.section.row.index_prev}</td><td>{$rows[row.index_prev]}</td>
+    <td>{$smarty.section.row.index_next}</td><td>{$rows[row.index_next]}</td>
+  </tr>
+{/section}
+</table>
+```
+      
+The above example will output a table containing the following:
+
+```
+    index  id    index_prev prev_id index_next next_id
+    0      1001  -1                 1          1002
+    1      1002  0          1001    2          1003
+    2      1003  1          1002    3          1004
+    3      1004  2          1003    4          1005
+    4      1005  3          1004    5
+```
+       
+## .iteration
+
+`iteration` contains the current loop iteration and starts at one.
+
+> **Note**
+>
+> This is not affected by the `{section}` properties `start`, `step` and
+> `max`, unlike the [`index`](#index) property.
+> `iteration` also starts with one instead of zero unlike `index`.
+> [`rownum`](#rownum) is an alias to `iteration`, they
+> are identical.
+
+```php
+<?php
+// array of 3000 to 3015
+$id = range(3000,3015);
+$smarty->assign('arr', $id);
+```
+
+Template to output every other element of the `$arr` array as `step=2`
+
+```smarty
+{section name=cu loop=$arr start=5 step=2}
+  iteration={$smarty.section.cu.iteration}
+  index={$smarty.section.cu.index}
+  id={$custid[cu]}<br />
+{/section}
+```
+      
+The above example will output:
+
+```html
+iteration=1 index=5 id=3005<br />
+iteration=2 index=7 id=3007<br />
+iteration=3 index=9 id=3009<br />
+iteration=4 index=11 id=3011<br />
+iteration=5 index=13 id=3013<br />
+iteration=6 index=15 id=3015<br />
+```
+
+Another example that uses the `iteration` property to output a table
+header block every five rows.
+
+```smarty
+<table>
+    {section name=co loop=$contacts}
+      {if $smarty.section.co.iteration is div by 5}
+        <tr><th>&nbsp;</th><th>Name></th><th>Home</th><th>Cell</th><th>Email</th></tr>
+      {/if}
+      <tr>
+        <td><a href="view.php?id={$contacts[co].id}">view<a></td>
+        <td>{$contacts[co].name}</td>
+        <td>{$contacts[co].home}</td>
+        <td>{$contacts[co].cell}</td>
+        <td>{$contacts[co].email}</td>
+      <tr>
+    {/section}
+</table>
+```
+
+An example that uses the `iteration` property to alternate a text color every
+third row.
+
+```smarty
+<table>
+  {section name=co loop=$contacts}
+    {if $smarty.section.co.iteration is even by 3}
+      <span style="color: #ffffff">{$contacts[co].name}</span>
+    {else}
+      <span style="color: #dddddd">{$contacts[co].name}</span>
+    {/if}
+  {/section}
+</table>
+```
+
+> **Note**
+>
+> The *"is div by"* syntax is a simpler alternative to the PHP mod
+> operator syntax. The mod operator is allowed:
+> `{if $smarty.section.co.iteration % 5 == 1}` will work just the same.
+
+> **Note**
+>
+> You can also use *"is odd by"* to reverse the alternating.
+
+## .first
+
+`first` is set to TRUE if the current `{section}` iteration is the initial one.
+
+## .last
+
+`last` is set to TRUE if the current section iteration is the final one.
+
+This example loops the `$customers` array, outputs a header block on the
+first iteration and on the last outputs the footer block. Also uses the
+[`total`](#total) property.
+
+```smarty
+{section name=customer loop=$customers}
+  {if $smarty.section.customer.first}
+    <table>
+    <tr><th>id</th><th>customer</th></tr>
+  {/if}
+
+  <tr>
+    <td>{$customers[customer].id}}</td>
+    <td>{$customers[customer].name}</td>
+  </tr>
+
+  {if $smarty.section.customer.last}
+    <tr><td></td><td>{$smarty.section.customer.total} customers</td></tr>
+    </table>
+  {/if}
+{/section}
+```
+
+## .rownum
+
+`rownum` contains the current loop iteration, starting with one. It is
+an alias to [`iteration`](#iteration), they work
+identically.
+
+## .loop
+
+`loop` contains the last index number that this {section} looped. This
+can be used inside or after the `{section}`.
+
+```smarty
+{section name=customer loop=$custid}
+  {$smarty.section.customer.index} id: {$custid[customer]}<br />
+{/section}
+There are {$smarty.section.customer.loop} customers shown above.
+```
+
+The above example will output:
+
+```html
+0 id: 1000<br />
+1 id: 1001<br />
+2 id: 1002<br />
+There are 3 customers shown above.
+```
+
+## .show
+
+`show` is used as a parameter to section and is a boolean value. If
+FALSE, the section will not be displayed. If there is a `{sectionelse}`
+present, that will be alternately displayed.
+
+Boolean `$show_customer_info` has been passed from the PHP application,
+to regulate whether this section shows.
+
+```smarty
+{section name=customer loop=$customers show=$show_customer_info}
+  {$smarty.section.customer.rownum} id: {$customers[customer]}<br />
+{/section}
+
+{if $smarty.section.customer.show}
+  the section was shown.
+{else}
+  the section was not shown.
+{/if}
+```
+      
+The above example will output:
+
+```html
+1 id: 1000<br />
+2 id: 1001<br />
+3 id: 1002<br />
+
+the section was shown.
+```
+       
+
+## .total
+
+`total` contains the number of iterations that this `{section}` will
+loop. This can be used inside or after a `{section}`.
+
+```smarty
+{section name=customer loop=$custid step=2}
+  {$smarty.section.customer.index} id: {$custid[customer]}<br />
+{/section}
+   There are {$smarty.section.customer.total} customers shown above.
+```
+      
+See also [`{foreach}`](./language-function-foreach.md),
+[`{for}`](./language-function-for.md), [`{while}`](./language-function-while.md)
+and [`$smarty.section`](../language-variables/language-variables-smarty.md#smartysection-languagevariablessmartyloops).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-setfilter.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-setfilter.md
new file mode 100644
index 000000000..eb11cbf1e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-setfilter.md
@@ -0,0 +1,43 @@
+# {setfilter}
+
+The `{setfilter}...{/setfilter}` block tag allows the definition of
+template instance's variable filters.
+
+SYNTAX: `{setfilter filter1\|filter2\|filter3\....}\...{/setfilter}`
+
+The filter can be:
+
+-   A variable filter plugin specified by it's name.
+
+-   A modifier specified by it's name and optional additional
+    parameter.
+
+`{setfilter}...{/setfilter}` blocks can be nested. The filter definition
+of inner blocks does replace the definition of the outer block.
+
+Template instance filters run in addition to other modifiers and
+filters. They run in the following order: modifier, default_modifier,
+$escape_html, registered variable filters, autoloaded variable
+filters, template instance's variable filters. Everything after
+default_modifier can be disabled with the `nofilter` flag.
+
+> **Note**
+>
+> The setting of template instance filters does not affect the output of
+> included subtemplates.
+
+## Examples
+
+```smarty
+<script>
+    {setfilter filter1}
+      {$foo} {* filter1 runs on output of $foo *}
+      {setfilter filter2|mod:true}
+        {$bar} {* filter2 and modifier mod runs on output of $bar *}
+      {/setfilter}
+      {$buh} {* filter1 runs on output of $buh *}
+    {/setfilter}
+    {$blar} {* no template instance filter runs on output of $blar}
+</script>
+```
+
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-strip.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-strip.md
new file mode 100644
index 000000000..800de84bf
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-strip.md
@@ -0,0 +1,45 @@
+# {strip}
+
+Many times web designers run into the issue where white space and
+carriage returns affect the output of the rendered HTML (browser
+"features"), so you must run all your tags together in the template to
+get the desired results. This usually ends up in unreadable or
+unmanageable templates.
+
+Anything within `{strip}{/strip}` tags are stripped of the extra spaces
+or carriage returns at the beginnings and ends of the lines before they
+are displayed. This way you can keep your templates readable, and not
+worry about extra white space causing problems.
+
+> **Note**
+>
+> `{strip}{/strip}` does not affect the contents of template variables,
+> see the [strip modifier](../language-modifiers/language-modifier-strip.md) instead.
+
+```smarty
+{* the following will be all run into one line upon output *}
+{strip}
+    <table>
+     <tr>
+      <td>
+       <a href="#">
+        This is a test
+       </a>
+      </td>
+     </tr>
+    </table>
+{/strip}
+```
+      
+The above example will output:
+
+```html
+<table><tr><td><a href="#">This is a test</a></td></tr></table>
+```
+
+Notice that in the above example, all the lines begin and end with HTML
+tags. Be aware that all the lines are run together. If you have plain
+text at the beginning or end of any line, they will be run together, and
+may not be desired results.
+
+See also the [`strip`](../language-modifiers/language-modifier-strip.md) modifier.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-while.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-while.md
new file mode 100644
index 000000000..13eaef9b4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-while.md
@@ -0,0 +1,43 @@
+# {while}
+
+`{while}` loops in Smarty have much the same flexibility as PHP
+[while](https://www.php.net/while) statements, with a few added features for
+the template engine. Every `{while}` must be paired with a matching
+`{/while}`. All PHP conditionals and functions are recognized, such as
+*\|\|*, *or*, *&&*, *and*, *is_array()*, etc.
+
+The following is a list of recognized qualifiers, which must be
+separated from surrounding elements by spaces. Note that items listed in
+\[brackets\] are optional. PHP equivalents are shown where applicable.
+
+## Qualifiers
+
+| Qualifier          | Alternates | Syntax Example       | Meaning                        | PHP Equivalent     |
+|--------------------|------------|----------------------|--------------------------------|--------------------|
+| ==                 | eq         | $a eq $b             | equals                         | ==                 |
+| !=                 | ne, neq    | $a neq $b            | not equals                     | !=                 |
+| >                  | gt         | $a gt $b             | greater than                   | >                  |
+| <                  | lt         | $a lt $b             | less than                      | <                  |
+| >=                 | gte, ge    | $a ge $b             | greater than or equal          | >=                 |
+| <=                 | lte, le    | $a le $b             | less than or equal             | <=                 |
+| ===                |            | $a === 0             | check for identity             | ===                |
+| !                  | not        | not $a               | negation (unary)               | !                  |
+| %                  | mod        | $a mod $b            | modulo                         | %                  |
+| is \[not\] div by  |            | $a is not div by 4   | divisible by                   | $a % $b == 0       |
+| is \[not\] even    |            | $a is not even       | \[not\] an even number (unary) | $a % 2 == 0        |
+| is \[not\] even by |            | $a is not even by $b | grouping level \[not\] even    | ($a / $b) % 2 == 0 |
+| is \[not\] odd     |            | $a is not odd        | \[not\] an odd number (unary)  | $a % 2 != 0        |
+| is \[not\] odd by  |            | $a is not odd by $b  | \[not\] an odd grouping        | ($a / $b) % 2 != 0 |
+
+## Examples
+```smarty
+{while $foo > 0}
+  {$foo--}
+{/while}
+```
+
+The above example will count down the value of $foo until 1 is reached.
+
+See also [`{foreach}`](./language-function-foreach.md),
+[`{for}`](./language-function-for.md) and
+[`{section}`](./language-function-section.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-combining-modifiers.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-combining-modifiers.md
new file mode 100644
index 000000000..97903c535
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-combining-modifiers.md
@@ -0,0 +1,32 @@
+# Combining Modifiers
+
+You can apply any number of modifiers to a variable. They will be
+applied in the order they are combined, from left to right. They must be
+separated with a `|` (pipe) character.
+
+```php
+<?php
+
+$smarty->assign('articleTitle', 'Smokers are Productive, but Death Cuts Efficiency.');
+```
+
+where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|upper|spacify}
+{$articleTitle|lower|spacify|truncate}
+{$articleTitle|lower|truncate:30|spacify}
+{$articleTitle|lower|spacify|truncate:30:". . ."}
+```
+      
+
+The above example will output:
+
+```
+Smokers are Productive, but Death Cuts Efficiency.
+S M O K E R S   A R ....snip....  H   C U T S   E F F I C I E N C Y .
+s m o k e r s   a r ....snip....  b u t   d e a t h   c u t s...
+s m o k e r s   a r e   p r o d u c t i v e ,   b u t . . .
+s m o k e r s   a r e   p. . .
+```
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/index.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/index.md
new file mode 100644
index 000000000..81979654c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/index.md
@@ -0,0 +1,19 @@
+# Custom Functions
+
+Smarty comes with several custom plugin functions that you can use in
+the templates.
+
+- [{counter}](language-function-counter.md)
+- [{cycle}](language-function-cycle.md)
+- [{eval}](language-function-eval.md)
+- [{fetch}](language-function-fetch.md)
+- [{html_checkboxes}](language-function-html-checkboxes.md)
+- [{html_image}](language-function-html-image.md)
+- [{html_options}](language-function-html-options.md)
+- [{html_radios}](language-function-html-radios.md)
+- [{html_select_date}](language-function-html-select-date.md)
+- [{html_select_time}](language-function-html-select-time.md)
+- [{html_table}](language-function-html-table.md)
+- [{mailto}](language-function-mailto.md)
+- [{math}](language-function-math.md)
+- [{textformat}](language-function-textformat.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-counter.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-counter.md
new file mode 100644
index 000000000..de04c2fee
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-counter.md
@@ -0,0 +1,45 @@
+# {counter}
+
+`{counter}` is used to print out a count. `{counter}` will remember the
+count on each iteration. You can adjust the number, the interval and the
+direction of the count, as well as determine whether to print the
+value. You can run multiple counters concurrently by supplying a unique
+name for each one. If you do not supply a name, the name "default" will
+be used.
+
+## Attributes
+
+| Attribute Name | Required | Description                                               |
+|----------------|----------|-----------------------------------------------------------|
+| name           | No       | The name of the counter                                   |
+| start          | No       | The initial number to start counting from (defaults to 1) |
+| skip           | No       | The interval to count by (defaults to 1)                  |
+| direction      | No       | The direction to count (up/down) (defaults to 'up')       |
+| print          | No       | Whether or not to print the value (defaults to true)      |
+| assign         | No       | the template variable the output will be assigned to      |
+
+If you supply the `assign` attribute, the output of the `{counter}`
+function will be assigned to this template variable instead of being
+output to the template.
+
+## Examples
+
+```smarty
+
+{* initialize the count *}
+{counter start=0 skip=2}<br />
+{counter}<br />
+{counter}<br />
+{counter}<br />
+
+```
+
+this will output:
+
+```html
+0<br />
+2<br />
+4<br />
+6<br />
+```
+      
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-cycle.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-cycle.md
new file mode 100644
index 000000000..661e490dc
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-cycle.md
@@ -0,0 +1,55 @@
+# {cycle}
+
+`{cycle}` is used to alternate a set of values. This makes it easy to
+for example, alternate between two or more colors in a table, or cycle
+through an array of values.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                                                 |
+|----------------|----------|-------------------------------------------------------------------------------------------------------------|
+| name           | No       | The name of the cycle                                                                                       |
+| values         | Yes      | The values to cycle through, either a comma delimited list (see delimiter attribute), or an array of values |
+| print          | No       | Whether to print the value or not (defaults to true)                                                        |
+| advance        | No       | Whether or not to advance to the next value (defaults to true)                                              |
+| delimiter      | No       | The delimiter to use in the values attribute (defaults to ',')                                              |
+| assign         | No       | The template variable the output will be assigned to                                                        |
+| reset          | No       | The cycle will be set to the first value and not advanced (defaults to false)                               |
+
+-   You can `{cycle}` through more than one set of values in a template
+    by supplying a `name` attribute. Give each `{cycle}` a unique
+    `name`.
+
+-   You can force the current value not to print with the `print`
+    attribute set to FALSE. This would be useful for silently skipping a
+    value.
+
+-   The `advance` attribute is used to repeat a value. When set to
+    FALSE, the next call to `{cycle}` will print the same value.
+
+-   If you supply the `assign` attribute, the output of the `{cycle}`
+    function will be assigned to a template variable instead of being
+    output to the template.
+
+## Examples
+```smarty
+{section name=rows loop=$data}
+    <tr class="{cycle values="odd,even"}">
+       <td>{$data[rows]}</td>
+    </tr>
+{/section}
+```
+
+The above template would output:
+
+```html
+    <tr class="odd">
+       <td>1</td>
+    </tr>
+    <tr class="even">
+       <td>2</td>
+    </tr>
+    <tr class="odd">
+       <td>3</td>
+    </tr>
+```
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-debug.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-debug.md
new file mode 100644
index 000000000..788614537
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-debug.md
@@ -0,0 +1,14 @@
+# {debug}
+
+`{debug}` dumps the debug console to the page. This works regardless of
+the [debug](../chapter-debugging-console.md) settings in the php script.
+Since this gets executed at runtime, this is only able to show the
+[assigned](../../programmers/api-functions/api-assign.md) variables; not the templates that are in use.
+However, you can see all the currently available variables within the
+scope of a template.
+
+| Attribute Name | Required | Description                                                |
+|----------------|----------|------------------------------------------------------------|
+| output         | No       | output type, html or javascript (defaults to 'javascript') |
+
+See also the [debugging console page](../chapter-debugging-console.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-eval.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-eval.md
new file mode 100644
index 000000000..70c7a3d19
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-eval.md
@@ -0,0 +1,81 @@
+# {eval}
+
+`{eval}` is used to evaluate a variable as a template. This can be used
+for things like embedding template tags/variables into variables or
+tags/variables into config file variables.
+
+## Attributes
+
+| Attribute Name | Required | Description                                          |
+|----------------|----------|------------------------------------------------------|
+| var            | Yes      | Variable (or string) to evaluate                     |
+| assign         | No       | The template variable the output will be assigned to |
+
+If you supply the `assign` attribute, the output of the `{eval}`
+function will be assigned to this template variable instead of being
+output to the template.
+
+> **Note**
+>
+> -   Evaluated variables are treated the same as templates. They follow
+>     the same escapement and security features just as if they were
+>     templates.
+>
+> -   Evaluated variables are compiled on every invocation, the compiled
+>     versions are not saved! However, if you have [caching](../../programmers/caching.md)
+>     enabled, the output will be cached with the rest of the template.
+>
+> -   If the content to evaluate doesn't change often, or is used
+>     repeatedly, consider using
+>     `{include file="string:{$template_code}"}` instead. This may cache
+>     the compiled state and thus doesn't have to run the (comparably
+>     slow) compiler on every invocation.
+
+## Examples
+
+The contents of the config file, `setup.conf`.
+
+```ini
+emphstart = <strong>
+emphend = </strong>
+title = Welcome to {$company}'s home page!
+ErrorCity = You must supply a {#emphstart#}city{#emphend#}.
+ErrorState = You must supply a {#emphstart#}state{#emphend#}.
+```
+
+Where the template is:
+
+```smarty
+{config_load file='setup.conf'}
+
+{eval var=$foo}
+{eval var=#title#}
+{eval var=#ErrorCity#}
+{eval var=#ErrorState# assign='state_error'}
+{$state_error}
+```
+      
+The above template will output:
+
+```html
+This is the contents of foo.
+Welcome to Foobar Pub & Grill's home page!
+You must supply a <strong>city</strong>.
+You must supply a <strong>state</strong>.
+```
+
+This outputs the server name (in uppercase) and IP. The assigned
+variable `$str` could be from a database query.
+
+```php
+<?php
+    $str = 'The server name is {$smarty.server.SERVER_NAME|upper} '
+           .'at {$smarty.server.SERVER_ADDR}';
+    $smarty->assign('foo',$str);
+```
+
+Where the template is:
+
+```smarty
+{eval var=$foo}
+```
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-fetch.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-fetch.md
new file mode 100644
index 000000000..2ff494fdd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-fetch.md
@@ -0,0 +1,61 @@
+# {fetch}
+
+`{fetch}` is used to retrieve files from the local file system, http, or
+ftp and display the contents.
+
+## Attributes
+| Attribute | Required | Description                                          |
+|-----------|----------|------------------------------------------------------|
+| file      | Yes      | The file, http or ftp site to fetch                  |
+| assign    | No       | The template variable the output will be assigned to |
+
+-   If the file name begins with `http://`, the website page will be
+    fetched and displayed.
+
+    > **Note**
+    >
+    > This will not support http redirects, be sure to include a
+    > trailing slash on your web page fetches where necessary.
+
+-   If the file name begins with `ftp://`, the file will be downloaded
+    from the ftp server and displayed.
+
+-   For local files, either a full system file path must be given, or a
+    path relative to the executed php script.
+
+    > **Note**
+    >
+    > If security is enabled, and you are fetching a file from the local
+    > file system, `{fetch}` will only allow files from within the
+    > `$secure_dir` path of the security policy. See the
+    > [Security](../../programmers/advanced-features/advanced-features-security.md) section for details.
+
+-   If the `assign` attribute is set, the output of the `{fetch}`
+    function will be assigned to this template variable instead of being
+    output to the template.
+
+## Examples
+
+```smarty
+{* include some javascript in your template *}
+{fetch file='/export/httpd/www.example.com/docs/navbar.js'}
+
+{* embed some weather text in your template from another web site *}
+{fetch file='http://www.myweather.com/68502/'}
+
+{* fetch a news headline file via ftp *}
+{fetch file='ftp://user:password@ftp.example.com/path/to/currentheadlines.txt'}
+{* as above but with variables *}
+{fetch file="ftp://`$user`:`$password`@`$server`/`$path`"}
+
+{* assign the fetched contents to a template variable *}
+{fetch file='http://www.myweather.com/68502/' assign='weather'}
+{if $weather ne ''}
+  <div id="weather">{$weather}</div>
+{/if}
+```
+      
+
+See also [`{capture}`](../language-builtin-functions/language-function-capture.md),
+[`{eval}`](language-function-eval.md),
+[`{assign}`](../language-builtin-functions/language-function-assign.md) and [`fetch()`](../../programmers/api-functions/api-fetch.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-checkboxes.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-checkboxes.md
new file mode 100644
index 000000000..3ab36096a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-checkboxes.md
@@ -0,0 +1,102 @@
+# {html_checkboxes}
+
+`{html_checkboxes}` is a [custom function](index.md)
+that creates an html checkbox group with provided data. It takes care of
+which item(s) are selected by default as well.
+
+## Attributes
+
+| Attribute Name | Required                            | Description                                                                                                                                                                                       |
+|----------------|-------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| name           | No                                  | Name of checkbox list (defaults to 'checkbox')                                                                                                                                                    |
+| values         | Yes, unless using options attribute | An array of values for checkbox buttons                                                                                                                                                           |
+| output         | Yes, unless using options attribute | An array of output for checkbox buttons                                                                                                                                                           |
+| selected       | No                                  | The selected checkbox element(s) as a string or array                                                                                                                                             |
+| options        | Yes, unless using values and output | An associative array of values and output                                                                                                                                                         |
+| separator      | No                                  | String of text to separate each checkbox item                                                                                                                                                     |
+| assign         | No                                  | Assign checkbox tags to an array instead of output                                                                                                                                                |
+| labels         | No                                  | Add <label\>-tags to the output (defaults to true)                                                                                                                                                |
+| label\_ids     | No                                  | Add id-attributes to <label\> and <input\> to the output (defaults to false)                                                                                                                      |
+| escape         | No                                  | Escape the output / content (values are always escaped) (defaults to true)                                                                                                                        |
+| strict         | No                                  | Will make the "extra" attributes *disabled* and *readonly* only be set, if they were supplied with either boolean *TRUE* or string *"disabled"* and *"readonly"* respectively (defaults to false) |
+
+-   Required attributes are `values` and `output`, unless you use `options` instead.
+
+-   All output is XHTML compliant.
+
+-   All parameters that are not in the list above are printed as
+    name/value-pairs inside each of the created <input\>-tags.
+
+## Examples
+```php
+<?php
+
+$smarty->assign('cust_ids', array(1000,1001,1002,1003));
+$smarty->assign('cust_names', array(
+                                'Joe Schmoe',
+                                'Jack Smith',
+                                'Jane Johnson',
+                                'Charlie Brown')
+                              );
+$smarty->assign('customer_id', 1001);
+```
+
+where template is
+
+```smarty
+{html_checkboxes name='id' values=$cust_ids output=$cust_names selected=$customer_id  separator='<br />'}
+```
+
+or where PHP code is:
+
+```php
+<?php
+
+$smarty->assign(
+    'cust_checkboxes', 
+    [
+     1000 => 'Joe Schmoe',
+     1001 => 'Jack Smith',
+     1002 => 'Jane Johnson',
+     1003 => 'Charlie Brown',
+    ]
+);
+$smarty->assign('customer_id', 1001);
+```
+
+and the template is
+
+```smarty
+{html_checkboxes name='id' options=$cust_checkboxes selected=$customer_id separator='<br />'}
+```
+
+both examples will output:
+
+```html
+<label><input type="checkbox" name="id[]" value="1000" />Joe Schmoe</label><br />
+<label><input type="checkbox" name="id[]" value="1001" checked="checked" />Jack Smith</label>
+<br />
+<label><input type="checkbox" name="id[]" value="1002" />Jane Johnson</label><br />
+<label><input type="checkbox" name="id[]" value="1003" />Charlie Brown</label><br />
+```
+      
+
+```php
+<?php
+
+$sql = 'select type_id, types from contact_types order by type';
+$smarty->assign('contact_types',$db->getAssoc($sql));
+
+$sql = 'select contact_id, contact_type_id, contact '
+       .'from contacts where contact_id=12';
+$smarty->assign('contact',$db->getRow($sql));
+```
+
+The results of the database queries above would be output with.
+
+```smarty
+{html_checkboxes name='contact_type_id' options=$contact_types selected=$contact.contact_type_id separator='<br />'}
+```
+
+See also [`{html_radios}`](./language-function-html-radios.md) and
+[`{html_options}`](./language-function-html-options.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-image.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-image.md
new file mode 100644
index 000000000..7ecde2654
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-image.md
@@ -0,0 +1,58 @@
+# {html_image}
+
+`{html_image}` is a [custom function](index.md) that
+generates an HTML `<img>` tag. The `height` and `width` are
+automatically calculated from the image file if they are not supplied.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                             |
+|----------------|----------|-------------------------------------------------------------------------|
+| file           | Yes      | name/path to image                                                      |
+| height         | No       | Height to display image (defaults to actual image height)               |
+| width          | No       | Width to display image (defaults to actual image width)                 |
+| basedir        | no       | Directory to base relative paths from (defaults to web server doc root) |
+| alt            | no       | Alternative description of the image                                    |
+| href           | no       | href value to link the image to                                         |
+| path\_prefix   | no       | Prefix for output path                                                  |
+
+-   `basedir` is the base directory that relative image paths are based
+    from. If not given, the web server's document root
+    `$_ENV['DOCUMENT_ROOT']` is used as the base. If security is
+    enabled, then the image must be located in the `$secure_dir` path of
+    the security policy. See the [Security](../../programmers/advanced-features/advanced-features-security.md)
+    section for details.
+
+-   `href` is the href value to link the image to. If link is supplied,
+    an `<a href="LINKVALUE"><a>` tag is placed around the image tag.
+
+-   `path_prefix` is an optional prefix string you can give the output
+    path. This is useful if you want to supply a different server name
+    for the image.
+
+-   All parameters that are not in the list above are printed as
+    name/value-pairs inside the created `<img>` tag.
+
+> **Note**
+>
+> `{html_image}` requires a hit to the disk to read the image and
+> calculate the height and width. If you don't use template
+> [caching](../../programmers/caching.md), it is generally better to avoid `{html_image}`
+> and leave image tags static for optimal performance.
+
+## Examples
+
+```smarty
+{html_image file='pumpkin.jpg'}
+{html_image file='/path/from/docroot/pumpkin.jpg'}
+{html_image file='../path/relative/to/currdir/pumpkin.jpg'}
+```
+
+Example output of the above template would be:
+
+```html
+<img src="pumpkin.jpg" alt="" width="44" height="68" />
+<img src="/path/from/docroot/pumpkin.jpg" alt="" width="44" height="68" />
+<img src="../path/relative/to/currdir/pumpkin.jpg" alt="" width="44" height="68" />
+```
+      
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-options.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-options.md
new file mode 100644
index 000000000..a63ccc56b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-options.md
@@ -0,0 +1,146 @@
+# {html_options}
+
+`{html_options}` is a [custom function](index.md) that
+creates the html `<select><option>` group with the assigned data. It
+takes care of which item(s) are selected by default as well.
+
+## Attributes
+
+| Attribute Name | Required                            | Description                                                                                                                                                                                             |
+|----------------|-------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| values         | Yes, unless using options attribute | An array of values for dropdown                                                                                                                                                                         |
+| output         | Yes, unless using options attribute | An array of output for dropdown                                                                                                                                                                         |
+| selected       | No                                  | The selected option element(s) as a string or array                                                                                                                                                     |
+| options        | Yes, unless using values and output | An associative array of values and output                                                                                                                                                               |
+| name           | No                                  | Name of select group                                                                                                                                                                                    |
+| strict         | No                                  | Will make the "extra" attributes *disabled* and *readonly* only be set, if they were supplied with either boolean *TRUE* or string *"disabled"* and *"readonly"* respectively (defaults to false) |
+
+-   Required attributes are `values` and `output`, unless you use the
+    combined `options` instead.
+
+-   If the optional `name` attribute is given, the `<select></select>`
+    tags are created, otherwise ONLY the `<option>` list is generated.
+
+-   If a given value is an array, it will treat it as an html
+    `<optgroup>`, and display the groups. Recursion is supported with
+    `<optgroup>`.
+
+-   All parameters that are not in the list above are printed as
+    name/value-pairs inside the `<select>` tag. They are ignored if the
+    optional `name` is not given.
+
+-   All output is XHTML compliant.
+
+## Examples
+
+```php
+<?php
+$smarty->assign('myOptions', [
+                                1800 => 'Joe Schmoe',
+                                9904 => 'Jack Smith',
+                                2003 => 'Charlie Brown']
+                                );
+$smarty->assign('mySelect', 9904);
+```
+
+The following template will generate a drop-down list. Note the presence
+of the `name` attribute which creates the `<select>` tags.
+
+```smarty
+{html_options name=foo options=$myOptions selected=$mySelect}
+```
+
+Output of the above example would be:
+
+```html
+<select name="foo">
+    <option value="1800">Joe Schmoe</option>
+    <option value="9904" selected="selected">Jack Smith</option>
+    <option value="2003">Charlie Brown</option>
+</select>   
+```
+
+```php
+<?php
+$smarty->assign('cust_ids', [56,92,13]);
+$smarty->assign('cust_names', [
+                              'Joe Schmoe',
+                              'Jane Johnson',
+                              'Charlie Brown']);
+$smarty->assign('customer_id', 92);
+```
+
+The above arrays would be output with the following template (note the
+use of the php [`count()`](https://www.php.net/function.count) function as a
+modifier to set the select size).
+
+```smarty
+<select name="customer_id" size="{$cust_names|@count}">
+   {html_options values=$cust_ids output=$cust_names selected=$customer_id}
+</select>
+```
+
+The above example would output:
+
+```html
+<select name="customer_id" size="3">
+    <option value="56">Joe Schmoe</option>
+    <option value="92" selected="selected">Jane Johnson</option>
+    <option value="13">Charlie Brown</option>
+</select>
+```
+
+```php
+<?php
+
+$sql = 'select type_id, types from contact_types order by type';
+$smarty->assign('contact_types',$db->getAssoc($sql));
+
+$sql = 'select contact_id, name, email, contact_type_id
+        from contacts where contact_id='.$contact_id;
+$smarty->assign('contact',$db->getRow($sql));
+
+```
+
+Where a template could be as follows. Note the use of the
+[`truncate`](../language-modifiers/language-modifier-truncate.md) modifier.
+
+```smarty
+<select name="type_id">
+    <option value='null'>-- none --</option>
+    {html_options options=$contact_types|truncate:20 selected=$contact.type_id}
+</select>
+```
+
+```php
+<?php
+$arr['Sport'] = array(6 => 'Golf', 9 => 'Cricket',7 => 'Swim');
+$arr['Rest']  = array(3 => 'Sauna',1 => 'Massage');
+$smarty->assign('lookups', $arr);
+$smarty->assign('fav', 7);
+```
+
+The script above and the following template
+
+```smarty
+{html_options name=foo options=$lookups selected=$fav}
+```
+
+would output:
+
+```html
+<select name="foo">
+    <optgroup label="Sport">
+        <option value="6">Golf</option>
+        <option value="9">Cricket</option>
+        <option value="7" selected="selected">Swim</option>
+    </optgroup>
+    <optgroup label="Rest">
+        <option value="3">Sauna</option>
+        <option value="1">Massage</option>
+    </optgroup>
+</select>
+```
+
+See also [`{html_checkboxes}`](./language-function-html-checkboxes.md) and
+[`{html_radios}`](./language-function-html-radios.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-radios.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-radios.md
new file mode 100644
index 000000000..af8ecda68
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-radios.md
@@ -0,0 +1,104 @@
+# {html_radios}
+
+`{html_radios}` is a [custom function](index.md) that
+creates an HTML radio button group. It also takes care of which item is
+selected by default as well.
+
+## Attributes
+
+| Attribute Name | Required                            | Description                                                                                                                                                                                       |
+|----------------|-------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| name           | No                                  | Name of radio list                                                                                                                                                                                |
+| values         | Yes, unless using options attribute | An array of values for radio buttons                                                                                                                                                              |
+| output         | Yes, unless using options attribute | An array of output for radio buttons                                                                                                                                                              |
+| selected       | No                                  | The selected radio element                                                                                                                                                                        |
+| options        | Yes, unless using values and output | An associative array of values and output                                                                                                                                                         |
+| separator      | No                                  | String of text to separate each radio item                                                                                                                                                        |
+| assign         | No                                  | Assign radio tags to an array instead of output                                                                                                                                                   |
+| labels         | No                                  | Add <label>-tags to the output (defaults to true)                                                                                                                                                 |
+| label\_ids     | No                                  | Add id-attributes to <label\> and <input\> to the output (defaults to false)                                                                                                                      |
+| escape         | No                                  | Escape the output / content (values are always escaped) (defaults to true)                                                                                                                        |
+| strict         | No                                  | Will make the "extra" attributes *disabled* and *readonly* only be set, if they were supplied with either boolean *TRUE* or string *"disabled"* and *"readonly"* respectively (defaults to false) |
+
+-   Required attributes are `values` and `output`, unless you use
+    `options` instead.
+
+-   All output is XHTML compliant.
+
+-   All parameters that are not in the list above are output as
+    name/value-pairs inside each of the created `<input>`-tags.
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('cust_ids', array(1000,1001,1002,1003));
+$smarty->assign('cust_names', array(
+                              'Joe Schmoe',
+                              'Jack Smith',
+                              'Jane Johnson',
+                              'Charlie Brown')
+                              );
+$smarty->assign('customer_id', 1001);
+```
+      
+Where template is:
+
+```smarty
+{html_radios name='id' values=$cust_ids output=$cust_names
+       selected=$customer_id separator='<br />'}
+```
+
+
+```php
+<?php
+$smarty->assign('cust_radios', array(
+                               1000 => 'Joe Schmoe',
+                               1001 => 'Jack Smith',
+                               1002 => 'Jane Johnson',
+                               1003 => 'Charlie Brown'));
+$smarty->assign('customer_id', 1001);
+
+```
+
+Where template is:
+
+```smarty
+
+{html_radios name='id' options=$cust_radios
+     selected=$customer_id separator='<br />'}
+```
+      
+Both examples will output:
+
+```html
+<label><input type="radio" name="id" value="1000" />Joe Schmoe</label><br />
+<label><input type="radio" name="id" value="1001" checked="checked" />Jack Smith</label><br />
+<label><input type="radio" name="id" value="1002" />Jane Johnson</label><br />
+<label><input type="radio" name="id" value="1003" />Charlie Brown</label><br />
+```
+      
+```php
+
+<?php
+
+$sql = 'select type_id, types from contact_types order by type';
+$smarty->assign('contact_types',$db->getAssoc($sql));
+
+$sql = 'select contact_id, name, email, contact_type_id '
+        .'from contacts where contact_id='.$contact_id;
+$smarty->assign('contact',$db->getRow($sql));
+
+```
+
+The variable assigned from the database above would be output with the
+template:
+
+```smarty
+{html_radios name='contact_type_id' options=$contact_types
+     selected=$contact.contact_type_id separator='<br />'}
+```
+
+See also [`{html_checkboxes}`](language-function-html-checkboxes.md) and
+[`{html_options}`](language-function-html-options.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-date.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-date.md
new file mode 100644
index 000000000..2a045baf8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-date.md
@@ -0,0 +1,118 @@
+# {html_select_date}
+
+`{html_select_date}` is a [custom function](index.md)
+that creates date dropdowns. It can display any or all of: year, month,
+and day. All parameters that are not in the list below are printed as
+name/value-pairs inside the `<select>` tags of day, month and year.
+
+## Attributes
+
+| Attribute Name     | Default            | Description                                                                                                                                                                                                                                                                                                                                                                                                    |
+|--------------------|--------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| prefix             | Date_              | What to prefix the var name with                                                                                                                                                                                                                                                                                                                                                                               |
+| time               |                    | What date/time to pre-select. Accepts timestamps, DateTime objects or any string parseable by [strtotime()](https://www.php.net/strtotime). If an array is given, the attributes field_array and prefix are used to identify the array elements to extract year, month and day from. Omitting this parameter or supplying a falsy value will select the current date. To prevent date selection, pass in NULL. |
+| start_year         | current year       | The first year in the dropdown, either year number, or relative to current year (+/- N)                                                                                                                                                                                                                                                                                                                        |
+| end_year           | same as start_year | The last year in the dropdown, either year number, or relative to current year (+/- N)                                                                                                                                                                                                                                                                                                                         |
+| display_days       | TRUE               | Whether to display days or not                                                                                                                                                                                                                                                                                                                                                                                 |
+| display_months     | TRUE               | Whether to display months or not                                                                                                                                                                                                                                                                                                                                                                               |
+| display_years      | TRUE               | Whether to display years or not                                                                                                                                                                                                                                                                                                                                                                                |
+| month_names        |                    | List of strings to display for months. array(1 =\> 'Jan', ..., 12 =\> 'Dec')                                                                                                                                                                                                                                                                                                                                   |
+| month_format       | \%B                | What format the month should be in (strftime)                                                                                                                                                                                                                                                                                                                                                                  |
+| day_format         | \%02d              | What format the day output should be in (sprintf)                                                                                                                                                                                                                                                                                                                                                              |
+| day_value_format   | \%d                | What format the day value should be in (sprintf)                                                                                                                                                                                                                                                                                                                                                               |
+| year_as_text       | FALSE              | Whether or not to display the year as text                                                                                                                                                                                                                                                                                                                                                                     |
+| reverse_years      | FALSE              | Display years in reverse order                                                                                                                                                                                                                                                                                                                                                                                 |
+| field_array        |                    | If a name is given, the select boxes will be drawn such that the results will be returned to PHP in the form of name\[Day\], name\[Year\], name\[Month\].                                                                                                                                                                                                                                                      |
+| day_size           |                    | Adds size attribute to select tag if given                                                                                                                                                                                                                                                                                                                                                                     |
+| month_size         |                    | Adds size attribute to select tag if given                                                                                                                                                                                                                                                                                                                                                                     |
+| year_size          |                    | Adds size attribute to select tag if given                                                                                                                                                                                                                                                                                                                                                                     |
+| all_extra          |                    | Adds extra attributes to all select/input tags if given                                                                                                                                                                                                                                                                                                                                                        |
+| day_extra          |                    | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                                            |
+| month_extra        |                    | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                                            |
+| year_extra         |                    | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                                            |
+| all_id             |                    | Adds id-attribute to all select/input tags if given                                                                                                                                                                                                                                                                                                                                                            |
+| day_id             |                    | Adds id-attribute to select/input tags if given                                                                                                                                                                                                                                                                                                                                                                |
+| month_id           |                    | Adds id-attribute to select/input tags if given                                                                                                                                                                                                                                                                                                                                                                |
+| year_id            |                    | Adds id-attribute to select/input tags if given                                                                                                                                                                                                                                                                                                                                                                |
+| field_order        | MDY                | The order in which to display the fields                                                                                                                                                                                                                                                                                                                                                                       |
+| field_separator    | \\n                | String printed between different fields                                                                                                                                                                                                                                                                                                                                                                        |
+| month_value_format | \%m                | strftime() format of the month values, default is %m for month numbers.                                                                                                                                                                                                                                                                                                                                        |
+| all_empty          |                    | If supplied then the first element of any select-box has this value as it's label and "" as it's value. This is useful to make the select-boxes read "Please select" for example.                                                                                                                                                                                                                              |
+| year_empty         |                    | If supplied then the first element of the year's select-box has this value as it's label and "" as it's value. This is useful to make the select-box read "Please select a year" for example. Note that you can use values like "-MM-DD" as time-attribute to indicate an unselected year.                                                                                                                     |
+| month_empty        |                    | If supplied then the first element of the month's select-box has this value as it's label and "" as it's value. . Note that you can use values like "YYYY\--DD" as time-attribute to indicate an unselected month.                                                                                                                                                                                             |
+| day_empty          |                    | If supplied then the first element of the day's select-box has this value as it's label and "" as it's value. Note that you can use values like "YYYY-MM-" as time-attribute to indicate an unselected day.                                                                                                                                                                                                    |
+
+> **Note**
+>
+> There is an useful php function on the [date tips page](../../appendixes/tips.md)
+> for converting `{html_select_date}` form values to a timestamp.
+
+## Exaples
+
+Template code
+
+```smarty
+{html_select_date}
+```
+
+This will output:
+
+```html
+<select name="Date_Month">
+    <option value="1">January</option>
+    <option value="2">February</option>
+    <option value="3">March</option>
+      ..... snipped .....
+    <option value="10">October</option>
+    <option value="11">November</option>
+    <option value="12" selected="selected">December</option>
+</select>
+<select name="Date_Day">
+    <option value="1">01</option>
+    <option value="2">02</option>
+    <option value="3">03</option>
+      ..... snipped .....
+    <option value="11">11</option>
+    <option value="12">12</option>
+    <option value="13" selected="selected">13</option>
+    <option value="14">14</option>
+    <option value="15">15</option>
+      ..... snipped .....
+    <option value="29">29</option>
+    <option value="30">30</option>
+    <option value="31">31</option>
+</select>
+<select name="Date_Year">
+    <option value="2006" selected="selected">2006</option>
+</select>
+```
+      
+```smarty
+{* start and end year can be relative to current year *}
+{html_select_date prefix='StartDate' time=$time start_year='-5'
+       end_year='+1' display_days=false}
+```
+
+With 2000 as the current year the output:
+
+```html
+<select name="StartDateMonth">
+    <option value="1">January</option>
+    <option value="2">February</option>
+    .... snipped ....
+    <option value="11">November</option>
+    <option value="12" selected="selected">December</option>
+</select>
+<select name="StartDateYear">
+    <option value="1995">1995</option>
+    .... snipped ....
+    <option value="1999">1999</option>
+    <option value="2000" selected="selected">2000</option>
+    <option value="2001">2001</option>
+</select>
+```
+      
+See also [`{html_select_time}`](language-function-html-select-time.md),
+[`date_format`](../language-modifiers/language-modifier-date-format.md),
+[`$smarty.now`](../language-variables/language-variables-smarty.md#smartynow-languagevariablessmartynow) and the [date tips
+page](../../appendixes/tips.md#dates).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-time.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-time.md
new file mode 100644
index 000000000..001734523
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-time.md
@@ -0,0 +1,100 @@
+# {html_select_time}
+
+`{html_select_time}` is a [custom function](index.md)
+that creates time dropdowns for you. It can display any or all of: hour,
+minute, second and meridian.
+
+The `time` attribute can have different formats. It can be a unique
+timestamp, a string of the format `YYYYMMDDHHMMSS` or a string that is
+parseable by PHP's [`strtotime()`](https://www.php.net/strtotime).
+
+## Attributes
+
+| Attribute Name        | Default                                                | Description                                                                                                                                                                                                                                                                                                                                                                              |
+|-----------------------|--------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| prefix                | Time\_                                                 | What to prefix the var name with                                                                                                                                                                                                                                                                                                                                                         |
+| time                  | current [timestamp](https://www.php.net/function.time) | What date/time to pre-select. Accepts  [timestamp](https://www.php.net/function.time), [DateTime](https://www.php.net/class.DateTime), mysql timestamp or any string parsable by [`strtotime()`](https://www.php.net/strtotime). If an array is given, the attributes field\_array and prefix are used to identify the array elements to extract hour, minute, second and meridian from. |
+| display\_hours        | TRUE                                                   | Whether or not to display hours                                                                                                                                                                                                                                                                                                                                                          |
+| display\_minutes      | TRUE                                                   | Whether or not to display minutes                                                                                                                                                                                                                                                                                                                                                        |
+| display\_seconds      | TRUE                                                   | Whether or not to display seconds                                                                                                                                                                                                                                                                                                                                                        |
+| display\_meridian     | TRUE                                                   | Whether or not to display meridian (am/pm)                                                                                                                                                                                                                                                                                                                                               |
+| use\_24\_hours        | TRUE                                                   | Whether or not to use 24 hour clock                                                                                                                                                                                                                                                                                                                                                      |
+| minute\_interval      | 1                                                      | Number interval in minute dropdown                                                                                                                                                                                                                                                                                                                                                       |
+| second\_interval      | 1                                                      | Number interval in second dropdown                                                                                                                                                                                                                                                                                                                                                       |
+| hour\_format          | \%02d                                                  | What format the hour label should be in (sprintf)                                                                                                                                                                                                                                                                                                                                        |
+| hour\_value\_format   | \%20d                                                  | What format the hour value should be in (sprintf)                                                                                                                                                                                                                                                                                                                                        |
+| minute\_format        | \%02d                                                  | What format the minute label should be in (sprintf)                                                                                                                                                                                                                                                                                                                                      |
+| minute\_value\_format | \%20d                                                  | What format the minute value should be in (sprintf)                                                                                                                                                                                                                                                                                                                                      |
+| second\_format        | \%02d                                                  | What format the second label should be in (sprintf)                                                                                                                                                                                                                                                                                                                                      |
+| second\_value\_format | \%20d                                                  | What format the second value should be in (sprintf)                                                                                                                                                                                                                                                                                                                                      |
+| field\_array          | n/a                                                    | Outputs values to array of this name                                                                                                                                                                                                                                                                                                                                                     |
+| all\_extra            | null                                                   | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                      |
+| hour\_extra           | null                                                   | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                      |
+| minute\_extra         | null                                                   | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                      |
+| second\_extra         | null                                                   | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                      |
+| meridian\_extra       | null                                                   | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                      |
+| field\_separator      | \\n                                                    | String printed between different fields                                                                                                                                                                                                                                                                                                                                                  |
+| option\_separator     | \\n                                                    | String printed between different options of a field                                                                                                                                                                                                                                                                                                                                      |
+| all\_id               | null                                                   | Adds id-attribute to all select/input tags if given                                                                                                                                                                                                                                                                                                                                      |
+| hour\_id              | null                                                   | Adds id-attribute to select/input tags if given                                                                                                                                                                                                                                                                                                                                          |
+| minute\_id            | null                                                   | Adds id-attribute to select/input tags if given                                                                                                                                                                                                                                                                                                                                          |
+| second\_id            | null                                                   | Adds id-attribute to select/input tags if given                                                                                                                                                                                                                                                                                                                                          |
+| meridian\_id          | null                                                   | Adds id-attribute to select/input tags if given                                                                                                                                                                                                                                                                                                                                          |
+| all\_empty            | null                                                   | If supplied then the first element of any select-box has this value as it's label and "" as it's value. This is useful to make the select-boxes read "Please select" for example.                                                                                                                                                                                                        |
+| hour\_empty           | null                                                   | If supplied then the first element of the hour's select-box has this value as it's label and "" as it's value. This is useful to make the select-box read "Please select an hour" for example.                                                                                                                                                                                           |
+| minute\_empty         | null                                                   | If supplied then the first element of the minute's select-box has this value as it's label and "" as it's value. This is useful to make the select-box read "Please select an minute" for example.                                                                                                                                                                                       |
+| second\_empty         | null                                                   | If supplied then the first element of the second's select-box has this value as it's label and "" as it's value. This is useful to make the select-box read "Please select an second" for example.                                                                                                                                                                                       |
+| meridian\_empty       | null                                                   | If supplied then the first element of the meridian's select-box has this value as it's label and "" as it's value. This is useful to make the select-box read "Please select an meridian" for example.                                                                                                                                                                                   |
+
+
+## Examples
+
+```smarty
+{html_select_time use_24_hours=true}
+```
+     
+At 9:20 and 23 seconds in the morning the template above would output:
+
+```html
+<select name="Time_Hour">
+    <option value="00">00</option>
+    <option value="01">01</option>
+    ... snipped ....
+    <option value="08">08</option>
+    <option value="09" selected>09</option>
+    <option value="10">10</option>
+    ... snipped ....
+    <option value="22">22</option>
+    <option value="23">23</option>
+</select>
+<select name="Time_Minute">
+    <option value="00">00</option>
+    <option value="01">01</option>
+    ... snipped ....
+    <option value="19">19</option>
+    <option value="20" selected>20</option>
+    <option value="21">21</option>
+    ... snipped ....
+    <option value="58">58</option>
+    <option value="59">59</option>
+</select>
+<select name="Time_Second">
+    <option value="00">00</option>
+    <option value="01">01</option>
+    ... snipped ....
+    <option value="22">22</option>
+    <option value="23" selected>23</option>
+    <option value="24">24</option>
+    ... snipped ....
+    <option value="58">58</option>
+    <option value="59">59</option>
+</select>
+<select name="Time_Meridian">
+    <option value="am" selected>AM</option>
+    <option value="pm">PM</option>
+</select>
+```
+
+See also [`$smarty.now`](../language-variables/language-variables-smarty.md#smartynow-languagevariablessmartynow),
+[`{html_select_date}`](language-function-html-select-date.md) and the
+[date tips page](../../appendixes/tips.md#dates).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-table.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-table.md
new file mode 100644
index 000000000..b0eaf0ddf
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-table.md
@@ -0,0 +1,93 @@
+# {html_table}
+
+`{html_table}` is a [custom function](index.md) that
+dumps an array of data into an HTML `<table>`.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+|----------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| loop           | Yes      | Array of data to loop through                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| cols           | No       | Number of columns in the table or a comma-separated list of column heading names or an array of column heading names.if the cols-attribute is empty, but rows are given, then the number of cols is computed by the number of rows and the number of elements to display to be just enough cols to display all elements. If both, rows and cols, are omitted cols defaults to 3. if given as a list or array, the number of columns is computed from the number of elements in the list or array. |
+| rows           | No       | Number of rows in the table. if the rows-attribute is empty, but cols are given, then the number of rows is computed by the number of cols and the number of elements to display to be just enough rows to display all elements.                                                                                                                                                                                                                                                                  |
+| inner          | No       | Direction of consecutive elements in the loop-array to be rendered. *cols* means elements are displayed col-by-col. *rows* means elements are displayed row-by-row.                                                                                                                                                                                                                                                                                                                               |
+| caption        | No       | Text to be used for the `<caption>` element of the table                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| table\_attr    | No       | Attributes for `<table>` tag (defaults to 'border="1"')                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| th\_attr       | No       | Attributes for `<th>` tag (arrays are cycled)                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| tr\_attr       | No       | attributes for `<tr>` tag (arrays are cycled)                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| td\_attr       | No       | Attributes for `<td>` tag (arrays are cycled)                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| trailpad       | No       | Value to pad the trailing cells on last row with (if any) (defaults to '&nbsp;')                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| hdir           | No       | Direction of each row to be rendered. possible values: *right* (left-to-right), and *left* (right-to-left) (defaults to 'right')                                                                                                                                                                                                                                                                                                                                                                  |
+| vdir           | No       | Direction of each column to be rendered. possible values: *down* (top-to-bottom), *up* (bottom-to-top) (defaults to 'down')                                                                                                                                                                                                                                                                                                                                                                       |
+
+-   The `cols` attribute determines how many columns will be in the
+    table.
+
+-   The `table_attr`, `tr_attr` and `td_attr` values determine the
+    attributes given to the `<table>`, `<tr>` and `<td>` tags.
+
+-   If `tr_attr` or `td_attr` are arrays, they will be cycled through.
+
+-   `trailpad` is the value put into the trailing cells on the last
+    table row if there are any present.
+
+## Examples
+
+```php
+<?php
+$smarty->assign( 'data', array(1,2,3,4,5,6,7,8,9) );
+$smarty->assign( 'tr', array('bgcolor="#eeeeee"','bgcolor="#dddddd"') );
+$smarty->display('index.tpl');
+```
+
+The variables assigned from php could be displayed as these three
+examples demonstrate. Each example shows the template followed by
+output.
+
+** Example 1 **
+```smarty
+{html_table loop=$data}
+```
+```html
+<table border="1">
+    <tbody>
+        <tr><td>1</td><td>2</td><td>3</td></tr>
+        <tr><td>4</td><td>5</td><td>6</td></tr>
+        <tr><td>7</td><td>8</td><td>9</td></tr>
+    </tbody>
+</table>
+```
+
+** Example 2 **
+```smarty
+{html_table loop=$data cols=4 table_attr='border="0"'}
+```
+```html
+<table border="0">
+    <tbody>
+        <tr><td>1</td><td>2</td><td>3</td><td>4</td></tr>
+        <tr><td>5</td><td>6</td><td>7</td><td>8</td></tr>
+        <tr><td>9</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+    </tbody>
+</table>
+```
+
+** Example 3 **
+```smarty
+{html_table loop=$data cols="first,second,third,fourth" tr_attr=$tr}
+```
+```html
+<table border="1">
+    <thead>
+        <tr>
+        <th>first</th><th>second</th><th>third</th><th>fourth</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr bgcolor="#eeeeee"><td>1</td><td>2</td><td>3</td><td>4</td></tr>
+        <tr bgcolor="#dddddd"><td>5</td><td>6</td><td>7</td><td>8</td></tr>
+        <tr bgcolor="#eeeeee"><td>9</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+    </tbody>
+</table>
+```
+      
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-mailto.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-mailto.md
new file mode 100644
index 000000000..bcb8b7d4d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-mailto.md
@@ -0,0 +1,61 @@
+# {mailto}
+
+`{mailto}` automates the creation of a `mailto:` anchor links and
+optionally encodes them. Encoding emails makes it more difficult for web
+spiders to lift email addresses off of a site.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                                   |
+|----------------|----------|-----------------------------------------------------------------------------------------------|
+| address        | Yes      | The e-mail address                                                                            |
+| text           | No       | The text to display, default is the e-mail address                                            |
+| encode         | No       | How to encode the e-mail. Can be one of `none`, `hex`, `javascript` or `javascript_charcode`. |
+| cc             | No       | Email addresses to carbon copy, separate entries by a comma.                                  |
+| bcc            | No       | Email addresses to blind carbon copy, separate entries by a comma                             |
+| subject        | No       | Email subject                                                                                 |
+| newsgroups     | No       | Newsgroups to post to, separate entries by a comma.                                           |
+| followupto     | No       | Addresses to follow up to, separate entries by a comma.                                       |
+| extra          | No       | Any extra information you want passed to the link, such as style sheet classes                |
+
+> **Note**
+>
+> Javascript is probably the most thorough form of encoding, although
+> you can use hex encoding too.
+
+
+## Examples
+
+```smarty
+{mailto address="me@example.com"}
+<a href="mailto:me@example.com" >me@example.com</a>
+
+{mailto address="me@example.com" text="send me some mail"}
+<a href="mailto:me@example.com" >send me some mail</a>
+
+{mailto address="me@example.com" encode="javascript"}
+<script type="text/javascript" language="javascript">
+   eval(unescape('%64%6f% ... snipped ...%61%3e%27%29%3b'))
+</script>
+
+{mailto address="me@example.com" encode="hex"}
+<a href="mailto:%6d%65.. snipped..3%6f%6d">&#x6d;&..snipped...#x6f;&#x6d;</a>
+
+{mailto address="me@example.com" subject="Hello to you!"}
+<a href="mailto:me@example.com?subject=Hello%20to%20you%21" >me@example.com</a>
+
+{mailto address="me@example.com" cc="you@example.com,they@example.com"}
+<a href="mailto:me@example.com?cc=you@example.com,they@example.com" >me@example.com</a>
+
+{mailto address="me@example.com" extra='class="email"'}
+<a href="mailto:me@example.com" class="email">me@example.com</a>
+
+{mailto address="me@example.com" encode="javascript_charcode"}
+<script type="text/javascript" language="javascript">
+    {document.write(String.fromCharCode(60,97, ... snipped ....60,47,97,62))}
+</script>
+```
+
+See also [`escape`](../language-modifiers/language-modifier-escape.md),
+[`{textformat}`](../language-custom-functions/language-function-textformat.md) and [obfuscating email
+addresses](../../appendixes/tips.md#obfuscating-e-mail-addresses).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-math.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-math.md
new file mode 100644
index 000000000..7b34fccff
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-math.md
@@ -0,0 +1,99 @@
+# {math}
+
+`{math}` allows the template designer to do math equations in the
+template.
+
+## Attributes
+
+| Attribute Name | Required | Description                                      |
+|----------------|----------|--------------------------------------------------|
+| equation       | Yes      | The equation to execute                          |
+| format         | No       | The format of the result (sprintf)               |
+| var            | Yes      | Equation variable value                          |
+| assign         | No       | Template variable the output will be assigned to |
+| \[var \...\]   | Yes      | Equation variable value                          |
+
+-   Any numeric template variables may be used in the equations, and the
+    result is printed in place of the tag.
+
+-   The variables used in the equation are passed as parameters, which
+    can be template variables or static values.
+
+-   +, -, /, \*, abs, ceil, cos, exp, floor, log, log10, max, min, pi,
+    pow, rand, round, sin, sqrt, srans and tan are all valid operators.
+    Check the PHP documentation for further information on these
+    [math](https://www.php.net/eval) functions.
+
+-   If you supply the `assign` attribute, the output of the `{math}`
+    function will be assigned to this template variable instead of being
+    output to the template.
+
+> **Note**
+>
+> `{math}` is an expensive function in performance due to its use of the
+> php [`eval()`](https://www.php.net/eval) function. Doing the math in PHP
+> is much more efficient, so whenever possible do the math calculations
+> in the script and [`assign()`](../../programmers/api-functions/api-assign.md) the results to the
+> template. Definitely avoid repetitive `{math}` function calls, eg
+> within [`{section}`](../language-builtin-functions/language-function-section.md) loops.
+
+## Examples
+
+**Example 1**
+```smarty
+
+{* $height=4, $width=5 *}
+
+{math equation="x + y" x=$height y=$width}
+```
+      
+The above example will output:
+
+```
+9
+```
+
+
+**Example 2**
+
+```smarty
+{* $row_height = 10, $row_width = 20, #col_div# = 2, assigned in template *}
+
+{math equation="height * width / division"
+    height=$row_height
+    width=$row_width
+    division=#col_div#}
+```
+
+The above example will output:
+
+```
+100
+```
+      
+**Example 3**
+
+```smarty
+{* you can use parenthesis *}
+
+{math equation="(( x + y ) / z )" x=2 y=10 z=2}
+```
+
+The above example will output:
+
+```
+6
+```
+
+**Example 4**
+
+```smarty
+{* you can supply a format parameter in sprintf format *}
+
+{math equation="x + y" x=4.4444 y=5.0000 format="%.2f"}
+```     
+      
+The above example will output:
+```
+9.44
+```
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-textformat.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-textformat.md
new file mode 100644
index 000000000..4089fdb33
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-textformat.md
@@ -0,0 +1,182 @@
+# {textformat}
+
+`{textformat}` is a [block function](../../programmers/plugins/plugins-block-functions.md) used to
+format text. It basically cleans up spaces and special characters, and
+formats paragraphs by wrapping at a boundary and indenting lines.
+
+You can set the parameters explicitly, or use a preset style. Currently,
+"email" is the only available style.
+
+## Attributes
+
+| Attribute Name | Default          | Description                                                                            |
+|----------------|------------------|----------------------------------------------------------------------------------------|
+| style          | *n/a*            | Preset style                                                                           |
+| indent         | *0*              | The number of chars to indent every line                                               |
+| indent\_first  | *0*              | The number of chars to indent the first line                                           |
+| indent\_char   | *(single space)* | The character (or string of chars) to indent with                                      |
+| wrap           | *80*             | How many characters to wrap each line to                                               |
+| wrap\_char     | *\\n*            | The character (or string of chars) to break each line with                             |
+| wrap\_cut      | *FALSE*          | If TRUE, wrap will break the line at the exact character instead of at a word boundary |
+| assign         | *n/a*            | The template variable the output will be assigned to                                   |
+
+## Examples
+
+```smarty
+{textformat wrap=40}
+
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+
+This is bar.
+
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+
+{/textformat}
+```
+
+The above example will output:
+
+```
+This is foo. This is foo. This is foo.
+This is foo. This is foo. This is foo.
+
+This is bar.
+
+bar foo bar foo foo. bar foo bar foo
+foo. bar foo bar foo foo. bar foo bar
+foo foo. bar foo bar foo foo. bar foo
+bar foo foo. bar foo bar foo foo.
+```
+
+```smarty
+{textformat wrap=40 indent=4}
+
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+
+This is bar.
+
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+
+{/textformat}
+```
+
+The above example will output:
+
+```
+    This is foo. This is foo. This is
+    foo. This is foo. This is foo. This
+    is foo.
+    
+    This is bar.
+    
+    bar foo bar foo foo. bar foo bar foo
+    foo. bar foo bar foo foo. bar foo
+    bar foo foo. bar foo bar foo foo.
+    bar foo bar foo foo. bar foo bar
+    foo foo.
+```
+
+
+```smarty
+{textformat wrap=40 indent=4 indent_first=4}
+
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+
+This is bar.
+
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+
+{/textformat}
+```
+
+The above example will output:
+
+
+```
+   This is foo. This is foo. This
+   is foo. This is foo. This is foo.
+   This is foo.
+
+   This is bar.
+
+   bar foo bar foo foo. bar foo bar
+   foo foo. bar foo bar foo foo. bar
+   foo bar foo foo. bar foo bar foo
+   foo. bar foo bar foo foo. bar foo
+   bar foo foo.
+```
+      
+
+```smarty
+{textformat style="email"}
+
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+
+This is bar.
+
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+
+{/textformat}
+```
+
+The above example will output:
+
+
+```
+This is foo. This is foo. This is foo. This is foo. This is foo. This is
+foo.
+
+This is bar.
+
+bar foo bar foo foo. bar foo bar foo foo. bar foo bar foo foo. bar foo
+bar foo foo. bar foo bar foo foo. bar foo bar foo foo. bar foo bar foo
+foo.
+```
+     
+
+See also [`{strip}`](../language-builtin-functions/language-function-strip.md) and
+[`wordwrap`](../language-modifiers/language-modifier-wordwrap.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/index.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/index.md
new file mode 100644
index 000000000..c9aeef887
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/index.md
@@ -0,0 +1,122 @@
+# Variable Modifiers
+
+Variable modifiers can be applied to
+[variables](../language-variables/index.md), [custom functions](../language-custom-functions/index.md)
+or strings. To apply a modifier,
+specify the value followed by a `|` (pipe) and the modifier name. A
+modifier may accept additional parameters that affect its behavior.
+These parameters follow the modifier name and are separated by a `:`
+(colon). Also, *all php-functions can be used as modifiers implicitly*
+(more below) and modifiers can be
+[combined](../language-combining-modifiers.md).
+
+- [capitalize](language-modifier-capitalize.md)
+- [cat](language-modifier-cat.md)
+- [count_characters](language-modifier-count-characters.md)
+- [count_paragraphs](language-modifier-count-paragraphs.md)
+- [count_sentences](language-modifier-count-sentences.md)
+- [count_words](language-modifier-count-words.md)
+- [date_format](language-modifier-date-format.md)
+- [default](language-modifier-default.md)
+- [escape](language-modifier-escape.md)
+- [from_charset](language-modifier-from-charset.md)
+- [indent](language-modifier-indent.md)
+- [lower](language-modifier-lower.md)
+- [nl2br](language-modifier-nl2br.md)
+- [regex_replace](language-modifier-regex-replace.md)
+- [replace](language-modifier-replace.md)
+- [spacify](language-modifier-spacify.md)
+- [string_format](language-modifier-string-format.md)
+- [strip](language-modifier-strip.md)
+- [strip_tags](language-modifier-strip-tags.md)
+- [to_charset](language-modifier-to-charset.md)
+- [truncate](language-modifier-truncate.md)
+- [unescape](language-modifier-unescape.md)
+- [upper](language-modifier-upper.md)
+- [wordwrap](language-modifier-wordwrap.md)
+
+## Examples
+
+```smarty
+{* apply modifier to a variable *}
+{$title|upper}
+
+{* modifier with parameters *}
+{$title|truncate:40:"..."}
+
+{* apply modifier to a function parameter *}
+{html_table loop=$myvar|upper}
+
+{* with parameters *}
+{html_table loop=$myvar|truncate:40:"..."}
+
+{* apply modifier to literal string *}
+{"foobar"|upper}
+
+{* using date_format to format the current date *}
+{$smarty.now|date_format:"%Y/%m/%d"}
+
+{* apply modifier to a custom function *}
+{mailto|upper address="smarty@example.com"}
+
+{* using  php's str_repeat *}
+{"="|str_repeat:80}
+
+{* php's count *}
+{$myArray|@count}
+
+{* this will uppercase and truncate the whole array *}
+<select name="name_id">
+{html_options output=$my_array|upper|truncate:20}
+</select>
+```
+      
+- Modifiers can be applied to any type of variables, including arrays
+    and objects.
+
+    > **Note**
+    >
+    > The default behavior was changed with Smarty 3. In Smarty 2.x, you
+    > had to use an "`@`" symbol to apply a modifier to an array, such
+    > as `{$articleTitle|@count}`. With Smarty 3, the "`@`" is no
+    > longer necessary, and is ignored.
+    >
+    > If you want a modifier to apply to each individual item of an
+    > array, you will either need to loop the array in the template, or
+    > provide for this functionality inside your modifier function.
+
+    > **Note**
+    >
+    > Second, in Smarty 2.x, modifiers were applied to the result of
+    > math expressions like `{8+2}`, meaning that
+    > `{8+2|count_characters}` would give `2`, as 8+2=10 and 10 is two
+    > characters long. With Smarty 3, modifiers are applied to the
+    > variables or atomic expressions before executing the calculations,
+    > so since 2 is one character long, `{8+2|count_characters}`
+    > gives 9. To get the old result use parentheses like
+    > `{(8+2)|count_characters}`.
+
+- Modifiers are autoloaded from the
+    [`$plugins_dir`](../../programmers/api-variables/variable-plugins-dir.md) or can be registered
+    explicitly with the [`registerPlugin()`](../../programmers/api-functions/api-register-plugin.md)
+    function. The later is useful for sharing a function between php
+    scripts and smarty templates.
+
+- All php-functions can be used as modifiers implicitly, as
+    demonstrated in the example above. However, using php-functions as
+    modifiers has two little pitfalls:
+
+    -   First - sometimes the order of the function-parameters is not
+        the desirable one. Formatting `$foo` with
+        `{"%2.f"|sprintf:$foo}` actually works, but asks for the more
+        intuitive, like `{$foo|string_format:"%2.f"}` that is provided
+        by the Smarty distribution.
+
+    -   Secondly - if security is enabled, all php-functions that are to
+        be used as modifiers have to be declared trusted in the
+        `$modifiers` property of the security policy. See the
+        [Security](../../programmers/advanced-features/advanced-features-security.md) section for details.
+
+See also [`registerPlugin()`](../../programmers/api-functions/api-register-plugin.md), [combining
+modifiers](../language-combining-modifiers.md). and [extending smarty with
+plugins](../../programmers/plugins.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-capitalize.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-capitalize.md
new file mode 100644
index 000000000..0368c7b3b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-capitalize.md
@@ -0,0 +1,49 @@
+# capitalize
+
+This is used to capitalize the first letter of all words in a variable.
+This is similar to the PHP [`ucwords()`](https://www.php.net/ucwords)
+function.
+
+## Basic usage
+```smarty
+{$myVar|capitalize}
+```
+
+## Parameters
+
+| Parameter | Type    | Required | Description                                                                                           |
+|-----------|---------|----------|-------------------------------------------------------------------------------------------------------|
+| 1         | boolean | No       | This determines whether or not words with digits will be uppercased                                   |
+| 2         | boolean | No       | This determines whether or not Capital letters within words should be lowercased, e.g. "aAa" to "Aaa" |
+
+
+## Examples
+
+```php
+<?php
+
+    $smarty->assign('articleTitle', 'next x-men film, x3, delayed.');
+
+```
+       
+
+Where the template is:
+
+```smarty
+    {$articleTitle}
+    {$articleTitle|capitalize}
+    {$articleTitle|capitalize:true}
+```
+       
+
+Will output:
+
+```
+    next x-men film, x3, delayed.
+    Next X-Men Film, x3, Delayed.
+    Next X-Men Film, X3, Delayed.
+```
+       
+
+See also [`lower`](language-modifier-lower.md) and
+[`upper`](language-modifier-upper.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-cat.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-cat.md
new file mode 100644
index 000000000..97dda4b37
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-cat.md
@@ -0,0 +1,36 @@
+# cat
+
+This value is concatenated to the given variable.
+
+## Basic usage
+```smarty
+{$myVar|cat:' units'}
+```
+
+## Parameters
+
+| Parameter | Type   | Required | Description                                      |
+|-----------|--------|----------|--------------------------------------------------|
+| 1         | string | No       | This value to concatenate to the given variable. |
+
+## Examples
+
+```php
+<?php
+
+    $smarty->assign('articleTitle', "Psychics predict world didn't end");
+
+```
+
+Where template is:
+
+```smarty
+    {$articleTitle|cat:' yesterday.'}
+```
+
+Will output:
+
+```
+    Psychics predict world didn't end yesterday.
+```
+       
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-characters.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-characters.md
new file mode 100644
index 000000000..8fc37d7a9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-characters.md
@@ -0,0 +1,43 @@
+# count_characters
+
+This is used to count the number of characters in a variable.
+
+## Basic usage
+```smarty
+{$myVar|count_characters}
+```
+
+## Parameters
+
+| Parameter | Type    | Required | Description                                                            |
+|-----------|---------|----------|------------------------------------------------------------------------|
+| 1         | boolean | No       | This determines whether to include whitespace characters in the count. |
+
+## Examples
+
+```php
+<?php
+
+    $smarty->assign('articleTitle', 'Cold Wave Linked to Temperatures.');
+
+```
+
+Where template is:
+
+```smarty
+    {$articleTitle}
+    {$articleTitle|count_characters}
+    {$articleTitle|count_characters:true}
+```
+
+Will output:
+
+```
+    Cold Wave Linked to Temperatures.
+    29
+    33
+```
+       
+See also [`count_words`](language-modifier-count-words.md),
+[`count_sentences`](language-modifier-count-sentences.md) and
+[`count_paragraphs`](language-modifier-count-paragraphs.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-paragraphs.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-paragraphs.md
new file mode 100644
index 000000000..060cb98a5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-paragraphs.md
@@ -0,0 +1,41 @@
+# count_paragraphs
+
+This is used to count the number of paragraphs in a variable.
+
+## Basic usage
+```smarty
+{$myVar|count_paragraphs}
+```
+
+## Examples
+
+```php
+<?php
+
+    $smarty->assign('articleTitle',
+                     "War Dims Hope for Peace. Child's Death Ruins Couple's Holiday.\n\n
+                     Man is Fatally Slain. Death Causes Loneliness, Feeling of Isolation."
+                    );
+
+```
+
+Where template is:
+
+```smarty
+    {$articleTitle}
+    {$articleTitle|count_paragraphs}
+```
+       
+
+Will output:
+
+```
+    War Dims Hope for Peace. Child's Death Ruins Couple's Holiday.
+
+    Man is Fatally Slain. Death Causes Loneliness, Feeling of Isolation.
+    2
+```
+
+See also [`count_characters`](language-modifier-count-characters.md),
+[`count_sentences`](language-modifier-count-sentences.md) and
+[`count_words`](language-modifier-count-words.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-sentences.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-sentences.md
new file mode 100644
index 000000000..dd2f69c61
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-sentences.md
@@ -0,0 +1,39 @@
+# count_sentences
+
+This is used to count the number of sentences in a variable. A sentence
+being delimited by a dot, question- or exclamation-mark (.?!).
+
+## Basic usage
+```smarty
+{$myVar|count_sentences}
+```
+
+## Examples
+
+```php
+<?php
+
+    $smarty->assign('articleTitle',
+                     'Two Soviet Ships Collide - One Dies.
+                     Enraged Cow Injures Farmer with Axe.'
+                     );
+
+```
+
+Where template is:
+
+```smarty
+    {$articleTitle}
+    {$articleTitle|count_sentences}
+```
+
+Will output:
+
+```
+    Two Soviet Ships Collide - One Dies. Enraged Cow Injures Farmer with Axe.
+    2
+```
+       
+See also [`count_characters`](language-modifier-count-characters.md),
+[`count_paragraphs`](language-modifier-count-paragraphs.md) and
+[`count_words`](language-modifier-count-words.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-words.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-words.md
new file mode 100644
index 000000000..1ab0d1d47
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-words.md
@@ -0,0 +1,35 @@
+# count_words
+
+This is used to count the number of words in a variable.
+
+## Basic usage
+```smarty
+{$myVar|count_words}
+```
+
+## Examples
+
+```php
+<?php
+
+    $smarty->assign('articleTitle', 'Dealers Will Hear Car Talk at Noon.');
+
+```
+
+Where template is:
+
+```smarty
+    {$articleTitle}
+    {$articleTitle|count_words}
+```
+
+This will output:
+
+```
+    Dealers Will Hear Car Talk at Noon.
+    7
+```
+
+See also [`count_characters`](language-modifier-count-characters.md),
+[`count_paragraphs`](language-modifier-count-paragraphs.md) and
+[`count_sentences`](language-modifier-count-sentences.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-date-format.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-date-format.md
new file mode 100644
index 000000000..620d085b8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-date-format.md
@@ -0,0 +1,145 @@
+# date_format
+
+This formats a date and time into the given
+[`strftime()`](https://www.php.net/strftime) format. Dates can be passed to
+Smarty as unix [timestamps](https://www.php.net/function.time), [DateTime
+objects](https://www.php.net/class.DateTime), mysql timestamps or any string
+made up of month day year, parsable by php\'s
+[`strtotime()`](https://www.php.net/strtotime). Designers can then use
+`date_format` to have complete control of the formatting of the date. If
+the date passed to `date_format` is empty and a second parameter is
+passed, that will be used as the date to format.
+
+## Basic usage
+```smarty
+{$myVar|date_format:"%Y-%m-%d"}
+```
+
+## Parameters
+
+| Parameter Position | Type   | Required | Default   | Description                                     |
+|--------------------|--------|----------|-----------|-------------------------------------------------|
+| 1                  | string | No       | %b %e, %Y | This is the format for the outputted date.      |
+| 2                  | string | No       | n/a       | This is the default date if the input is empty. |
+
+> **Note**
+>
+> Since Smarty-2.6.10 numeric values passed to `date_format` are
+> *always* (except for mysql timestamps, see below) interpreted as a
+> unix timestamp.
+>
+> Before Smarty-2.6.10 numeric strings that where also parsable by
+> `strtotime()` in php (like `YYYYMMDD`) where sometimes (depending on
+> the underlying implementation of `strtotime()`) interpreted as date
+> strings and NOT as timestamps.
+>
+> The only exception are mysql timestamps: They are also numeric only
+> and 14 characters long (`YYYYMMDDHHMMSS`), mysql timestamps have
+> precedence over unix timestamps.
+
+> **Note**
+>
+> `date_format` is essentially a wrapper to PHP's
+> [`strftime()`](https://www.php.net/strftime) function. You may have more
+> or less conversion specifiers available depending on your system's
+> [`strftime()`](https://www.php.net/strftime) function where PHP was
+> compiled. Check your system\'s manpage for a full list of valid
+> specifiers. However, a few of the specifiers are emulated on Windows.
+> These are: %D, %e, %h, %l, %n, %r, %R, %t, %T.
+
+## Examples
+
+```php
+<?php
+
+$config['date'] = '%I:%M %p';
+$config['time'] = '%H:%M:%S';
+$smarty->assign('config', $config);
+$smarty->assign('yesterday', strtotime('-1 day'));
+
+```
+
+This template uses [`$smarty.now`](../language-variables/language-variables-smarty.md#smartynow-languagevariablessmartynow) to
+get the current time:
+
+```smarty
+{$smarty.now|date_format}
+{$smarty.now|date_format:"%D"}
+{$smarty.now|date_format:$config.date}
+{$yesterday|date_format}
+{$yesterday|date_format:"%A, %B %e, %Y"}
+{$yesterday|date_format:$config.time}
+```
+
+This above will output:
+
+```
+Jan 1, 2022
+01/01/22
+02:33 pm
+Dec 31, 2021
+Monday, December 1, 2021
+14:33:00
+```
+       
+## Conversion specifiers
+
+`date_format` conversion specifiers:
+
+-   %a - abbreviated weekday name according to the current locale
+-   %A - full weekday name according to the current locale
+-   %b - abbreviated month name according to the current locale
+-   %B - full month name according to the current locale
+-   %c - preferred date and time representation for the current locale
+-   %C - century number (the year divided by 100 and truncated to an
+    integer, range 00 to 99)
+-   %d - day of the month as a decimal number (range 01 to 31)
+-   %D - same as %m/%d/%y
+-   %e - day of the month as a decimal number, a single digit is
+    preceded by a space (range 1 to 31)
+-   %g - Week-based year within century \[00,99\]
+-   %G - Week-based year, including the century \[0000,9999\]
+-   %h - same as %b
+-   %H - hour as a decimal number using a 24-hour clock (range 00
+    to 23)
+-   %I - hour as a decimal number using a 12-hour clock (range 01
+    to 12)
+-   %j - day of the year as a decimal number (range 001 to 366)
+-   %k - Hour (24-hour clock) single digits are preceded by a blank.
+    (range 0 to 23)
+-   %l - hour as a decimal number using a 12-hour clock, single digits
+    preceded by a space (range 1 to 12)
+-   %m - month as a decimal number (range 01 to 12)
+-   %M - minute as a decimal number
+-   %n - newline character
+-   %p - either 'am' or 'pm' according to the given time value, or
+    the corresponding strings for the current locale
+-   %r - time in a.m. and p.m. notation
+-   %R - time in 24 hour notation
+-   %S - second as a decimal number
+-   %t - tab character
+-   %T - current time, equal to %H:%M:%S
+-   %u - weekday as a decimal number \[1,7\], with 1 representing
+    Monday
+-   %U - week number of the current year as a decimal number, starting
+    with the first Sunday as the first day of the first week
+-   %V - The ISO 8601:1988 week number of the current year as a decimal
+    number, range 01 to 53, where week 1 is the first week that has at
+    least 4 days in the current year, and with Monday as the first day
+    of the week.
+-   %w - day of the week as a decimal, Sunday being 0
+-   %W - week number of the current year as a decimal number, starting
+    with the first Monday as the first day of the first week
+-   %x - preferred date representation for the current locale without
+    the time
+-   %X - preferred time representation for the current locale without
+    the date
+-   %y - year as a decimal number without a century (range 00 to 99)
+-   %Y - year as a decimal number including the century
+-   %Z - time zone or name or abbreviation
+-   %% - a literal '%' character
+
+See also [`$smarty.now`](../language-variables/language-variables-smarty.md#smartynow-languagevariablessmartynow),
+[`strftime()`](https://www.php.net/strftime),
+[`{html_select_date}`](../language-custom-functions/language-function-html-select-date.md) and the
+[date tips](../../appendixes/tips.md#dates) page.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-default.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-default.md
new file mode 100644
index 000000000..b8697a0d9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-default.md
@@ -0,0 +1,45 @@
+# default
+
+This is used to set a default value for a variable. If the variable is
+unset or an empty string, the given default value is printed instead.
+Default takes the one argument.
+
+## Basic usage
+```smarty
+{$myVar|default:"(none)"}
+```
+
+## Parameters
+
+| Parameter | Type   | Required | Default | Description                                                   |
+|-----------|--------|----------|---------|---------------------------------------------------------------|
+| 1         | string | No       | *empty* | This is the default value to output if the variable is empty. |
+
+## Examples
+
+```php
+<?php
+
+    $smarty->assign('articleTitle', 'Dealers Will Hear Car Talk at Noon.');
+    $smarty->assign('email', '');
+
+```
+
+Where template is:
+
+```smarty
+{$articleTitle|default:'no title'}
+{$myTitle|default:'no title'}
+{$email|default:'No email address available'}
+```  
+
+Will output:
+
+```
+Dealers Will Hear Car Talk at Noon.
+no title
+No email address available
+```
+
+See also the [default variable handling](../../appendixes/tips.md#default-variable-handling) and
+the [blank variable handling](../../appendixes/tips.md#blank-variable-handling) pages.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-escape.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-escape.md
new file mode 100644
index 000000000..6fd5dd2b4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-escape.md
@@ -0,0 +1,78 @@
+# escape
+
+`escape` is used to encode or escape a variable to `html`, `url`,
+`single quotes`, `hex`, `hexentity`, `javascript` and `mail`. By default
+its `html`.
+
+## Basic usage
+```smarty
+{$myVar|escape}
+```
+
+## Parameters
+
+| Parameter Position | Type    | Required | Possible Values                                                                                                | Default | Description                                                                          |
+|--------------------|---------|----------|----------------------------------------------------------------------------------------------------------------|---------|--------------------------------------------------------------------------------------|
+| 1                  | string  | No       | `html`, `htmlall`, `url`, `urlpathinfo`, `quotes`, `hex`, `hexentity`, `javascript`, `mail`                    | `html`  | This is the escape format to use.                                                    |
+| 2                  | string  | No       | `ISO-8859-1`, `UTF-8`, and any character set supported by [`htmlentities()`](https://www.php.net/htmlentities) | `UTF-8` | The character set encoding passed to htmlentities() et. al.                          |
+| 3                  | boolean | No       | FALSE                                                                                                          | TRUE    | Double encode entities from &amp; to &amp;amp; (applies to `html` and `htmlall` only) |
+
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle',
+                "'Stiff Opposition Expected to Casketless Funeral Plan'"
+                );
+$smarty->assign('EmailAddress','smarty@example.com');
+
+```
+       
+
+These are example `escape` template lines followed by the output
+
+```smarty
+{$articleTitle}
+'Stiff Opposition Expected to Casketless Funeral Plan'
+
+{$articleTitle|escape}
+&#039;Stiff Opposition Expected to Casketless Funeral Plan&#039;
+
+{$articleTitle|escape:'html'}    {* escapes  & " ' < > *}
+&#039;Stiff Opposition Expected to Casketless Funeral Plan&#039;
+
+{$articleTitle|escape:'htmlall'} {* escapes ALL html entities *}
+&#039;Stiff Opposition Expected to Casketless Funeral Plan&#039;
+
+<a href="?title={$articleTitle|escape:'url'}">click here</a>
+<a
+href="?title=%27Stiff%20Opposition%20Expected%20to%20Casketless%20Funeral%20Plan%27">click here</a>
+
+{$articleTitle|escape:'quotes'}
+\'Stiff Opposition Expected to Casketless Funeral Plan\'
+
+<a href="mailto:{$EmailAddress|escape:"hex"}">{$EmailAddress|escape:"hexentity"}</a>
+{$EmailAddress|escape:'mail'}    {* this converts to email to text *}
+<a href="mailto:%62%6f%..snip..%65%74">&#x62;&#x6f;&#x62..snip..&#x65;&#x74;</a>
+
+{'mail@example.com'|escape:'mail'}
+smarty [AT] example [DOT] com
+
+{* the "rewind" parameter registers the current location *}
+<a href="$my_path?page=foo&rewind={$my_uri|escape:url}">click here</a>
+
+```
+
+This snippet is useful for emails, but see also
+[`{mailto}`](../language-custom-functions/language-function-mailto.md)
+
+```smarty
+{* email address mangled *}
+<a href="mailto:{$EmailAddress|escape:'hex'}">{$EmailAddress|escape:'mail'}</a>
+```
+
+See also [escaping smarty parsing](../language-basic-syntax/language-escaping.md),
+[`{mailto}`](../language-custom-functions/language-function-mailto.md) and the [obfuscating email
+addresses](../../appendixes/tips.md#obfuscating-e-mail-addresses) page.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-from-charset.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-from-charset.md
new file mode 100644
index 000000000..bf4b4769e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-from-charset.md
@@ -0,0 +1,20 @@
+# from_charset
+
+`from_charset` is used to transcode a string from a given charset to the
+internal charset. This is the exact opposite of the [to_charset
+modifier](language-modifier-to-charset.md).
+
+## Parameters
+
+| Parameter Position | Type   | Required | Possible Values                                                                                                              | Default      | Description                                                   |
+|--------------------|--------|----------|------------------------------------------------------------------------------------------------------------------------------|--------------|---------------------------------------------------------------|
+| 1                  | string | No       | `ISO-8859-1`, `UTF-8`, and any character set supported by [`mb_convert_encoding()`](https://www.php.net/mb_convert_encoding) | `ISO-8859-1` | The charset encoding the value is supposed to be decoded from |
+
+> **Note**
+>
+> Charset encoding should be handled by the application itself. This
+> modifier should only be used in cases where the application cannot
+> anticipate that a certain string is required in another encoding.
+
+See also [Charset Encoding](../../programmers/charset.md), [to_charset
+modifier](language-modifier-to-charset.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-indent.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-indent.md
new file mode 100644
index 000000000..9fa3540a3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-indent.md
@@ -0,0 +1,67 @@
+# indent
+
+This indents a string on each line, default is 4. As an optional
+parameter, you can specify the number of characters to indent. As an
+optional second parameter, you can specify the character to use to
+indent with. For example: use `"\t"` for a tab.
+
+## Basic usage
+```smarty
+{$myVar|indent:4}
+```
+
+## Parameters
+
+| Parameter Position | Type    | Required | Default     | Description                                       |
+|--------------------|---------|----------|-------------|---------------------------------------------------|
+| 1                  | integer | No       | 4           | This determines how many characters to indent to. |
+| 2                  | string  | No       | (one space) | This is the character used to indent with.        |
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle',
+                'NJ judge to rule on nude beach.
+Sun or rain expected today, dark tonight.
+Statistics show that teen pregnancy drops off significantly after 25.'
+                );
+```
+
+Where template is:
+
+```smarty
+{$articleTitle}
+
+{$articleTitle|indent}
+
+{$articleTitle|indent:10}
+
+{$articleTitle|indent:1:"\t"}
+```
+       
+Will output:
+
+```
+NJ judge to rule on nude beach.
+Sun or rain expected today, dark tonight.
+Statistics show that teen pregnancy drops off significantly after 25.
+
+    NJ judge to rule on nude beach.
+    Sun or rain expected today, dark tonight.
+    Statistics show that teen pregnancy drops off significantly after 25.
+
+          NJ judge to rule on nude beach.
+          Sun or rain expected today, dark tonight.
+          Statistics show that teen pregnancy drops off significantly after 25.
+
+        NJ judge to rule on nude beach.
+        Sun or rain expected today, dark tonight.
+        Statistics show that teen pregnancy drops off significantly after 25.
+```
+       
+
+See also [`strip`](language-modifier-strip.md),
+[`wordwrap`](language-modifier-wordwrap.md) and
+[`spacify`](language-modifier-spacify.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-lower.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-lower.md
new file mode 100644
index 000000000..e5e6886f1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-lower.md
@@ -0,0 +1,34 @@
+# lower
+
+This is used to lowercase a variable. This is equivalent to the PHP
+[`strtolower()`](https://www.php.net/strtolower) function.
+
+## Basic usage
+```smarty
+{$myVar|lower}
+```
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle', 'Two Convicts Evade Noose, Jury Hung.');
+```
+
+Where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|lower}
+```
+
+This will output:
+
+```
+Two Convicts Evade Noose, Jury Hung.
+two convicts evade noose, jury hung.
+```
+       
+See also [`upper`](language-modifier-upper.md) and
+[`capitalize`](language-modifier-capitalize.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-nl2br.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-nl2br.md
new file mode 100644
index 000000000..2808716fc
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-nl2br.md
@@ -0,0 +1,37 @@
+# nl2br
+
+All `"\n"` line breaks will be converted to html `<br />` tags in the
+given variable. This is equivalent to the PHP\'s
+[`nl2br()`](https://www.php.net/nl2br) function.
+
+## Basic usage
+```smarty
+{$myVar|nl2br}
+```
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle',
+                "Sun or rain expected\ntoday, dark tonight"
+                );
+
+```
+
+Where the template is:
+
+```smarty
+{$articleTitle|nl2br}
+```
+       
+Will output:
+
+```
+Sun or rain expected<br />today, dark tonight
+```
+
+See also [`word_wrap`](language-modifier-wordwrap.md),
+[`count_paragraphs`](language-modifier-count-paragraphs.md) and
+[`count_sentences`](language-modifier-count-sentences.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-regex-replace.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-regex-replace.md
new file mode 100644
index 000000000..033d2a43d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-regex-replace.md
@@ -0,0 +1,55 @@
+# regex_replace
+
+A regular expression search and replace on a variable. Use the
+[`preg_replace()`](https://www.php.net/preg_replace) syntax from the PHP
+manual.
+
+## Basic usage
+```smarty
+{$myVar|regex_replace:"/foo/":"bar"}
+```
+
+> **Note**
+>
+> Although Smarty supplies this regex convenience modifier, it is
+> usually better to apply regular expressions in PHP, either via custom
+> functions or modifiers. Regular expressions are considered application
+> code and are not part of presentation logic.
+
+## Parameters
+
+| Parameter Position | Type   | Required | Description                                    |
+|--------------------|--------|----------|------------------------------------------------|
+| 1                  | string | Yes      | This is the regular expression to be replaced. |
+| 2                  | string | Yes      | This is the string of text to replace with.    |
+
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle', "Infertility unlikely to\nbe passed on, experts say.");
+
+```
+
+Where template is:
+
+```smarty
+{* replace each carriage return, tab and new line with a space *}
+
+{$articleTitle}
+{$articleTitle|regex_replace:"/[\r\t\n]/":" "}
+```
+       
+Will output:
+
+```
+Infertility unlikely to
+be passed on, experts say.
+Infertility unlikely to be passed on, experts say.
+```
+       
+
+See also [`replace`](language-modifier-replace.md) and
+[`escape`](language-modifier-escape.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-replace.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-replace.md
new file mode 100644
index 000000000..0e01ab46f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-replace.md
@@ -0,0 +1,45 @@
+# replace
+
+A simple search and replace on a variable. This is equivalent to the
+PHP's [`str_replace()`](https://www.php.net/str_replace) function.
+
+## Basic usage
+```smarty
+{$myVar|replace:"foo":"bar"}
+```
+
+## Parameters
+
+| Parameter Position | Type   | Required | Description                                 |
+|--------------------|--------|----------|---------------------------------------------|
+| 1                  | string | Yes      | This is the string of text to be replaced.  |
+| 2                  | string | Yes      | This is the string of text to replace with. |
+
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle', "Child's Stool Great for Use in Garden.");
+
+```
+
+Where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|replace:'Garden':'Vineyard'}
+{$articleTitle|replace:' ':'   '}
+```
+       
+Will output:
+
+```
+Child's Stool Great for Use in Garden.
+Child's Stool Great for Use in Vineyard.
+Child's   Stool   Great   for   Use   in   Garden.
+```
+
+See also [`regex_replace`](language-modifier-regex-replace.md) and
+[`escape`](language-modifier-escape.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-spacify.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-spacify.md
new file mode 100644
index 000000000..229e2d22d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-spacify.md
@@ -0,0 +1,44 @@
+# spacify
+
+`spacify` is a way to insert a space between every character of a
+variable. You can optionally pass a different character or string to
+insert.
+
+## Basic usage
+```smarty
+{$myVar|spacify}
+```
+
+## Parameters
+
+| Parameter Position | Type   | Required | Default     | Description                                                     |
+|--------------------|--------|----------|-------------|-----------------------------------------------------------------|
+| 1                  | string | No       | *one space* | This what gets inserted between each character of the variable. |
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle', 'Something Went Wrong in Jet Crash, Experts Say.');
+
+```
+
+Where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|spacify}
+{$articleTitle|spacify:"^^"}
+```
+
+Will output:
+
+```
+Something Went Wrong in Jet Crash, Experts Say.
+S o m e t h i n g   W .... snip ....  s h ,   E x p e r t s   S a y .
+S^^o^^m^^e^^t^^h^^i^^n^^g^^ .... snip .... ^^e^^r^^t^^s^^ ^^S^^a^^y^^.
+```
+
+See also [`wordwrap`](language-modifier-wordwrap.md) and
+[`nl2br`](language-modifier-nl2br.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-string-format.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-string-format.md
new file mode 100644
index 000000000..6163a0785
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-string-format.md
@@ -0,0 +1,43 @@
+# string_format
+
+This is a way to format strings, such as decimal numbers and such. Use
+the syntax for [`sprintf()`](https://www.php.net/sprintf) for the
+formatting.
+
+## Basic usage
+```smarty
+{$myVar|string_format:"%d"}
+```
+
+## Parameters
+
+| Parameter Position | Type   | Required | Description                           |
+|--------------------|--------|----------|---------------------------------------|
+| 1                  | string | Yes      | This is what format to use. (sprintf) |
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('number', 23.5787446);
+
+```
+
+Where template is:
+
+```smarty
+{$number}
+{$number|string_format:"%.2f"}
+{$number|string_format:"%d"}
+```
+
+Will output:
+
+```
+23.5787446
+23.58
+23
+```
+
+See also [`date_format`](language-modifier-date-format.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip-tags.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip-tags.md
new file mode 100644
index 000000000..7d94fdd0d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip-tags.md
@@ -0,0 +1,46 @@
+# strip_tags
+
+This strips out HTML markup tags, basically anything between `<` and `>`.
+
+## Basic usage
+```smarty
+{$myVar|strip_tags}
+```
+
+## Parameters
+
+| Parameter Position | Type | Required | Default | Description                                                |
+|--------------------|------|----------|---------|------------------------------------------------------------|
+| 1                  | bool | No       | TRUE    | This determines whether the tags are replaced by ' ' or '' |
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle',
+                "Blind Woman Gets <font face=\"helvetica\">New
+Kidney</font> from Dad she Hasn't Seen in <b>years</b>."
+               );
+
+```
+       
+
+Where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|strip_tags} {* same as {$articleTitle|strip_tags:true} *}
+{$articleTitle|strip_tags:false}
+```
+
+Will output:
+
+```html
+Blind Woman Gets <font face="helvetica">New Kidney</font> from Dad she Hasn't Seen in <b>years</b>.
+Blind Woman Gets  New Kidney  from Dad she Hasn't Seen in  years .
+Blind Woman Gets New Kidney from Dad she Hasn't Seen in years.
+```
+
+See also [`replace`](language-modifier-replace.md) and
+[`regex_replace`](language-modifier-regex-replace.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip.md
new file mode 100644
index 000000000..b7bdc282c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip.md
@@ -0,0 +1,42 @@
+# strip
+
+This replaces all spaces, newlines and tabs with a single space, or with
+the supplied string.
+
+## Basic usage
+```smarty
+{$myVar|strip}
+```
+
+> **Note**
+>
+> If you want to strip blocks of template text, use the built-in
+> [`{strip}`](../language-builtin-functions/language-function-strip.md) function.
+
+## Examples
+
+```php
+<?php
+$smarty->assign('articleTitle', "Grandmother of\neight makes\t    hole in one.");
+$smarty->display('index.tpl');
+```
+
+Where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|strip}
+{$articleTitle|strip:'&nbsp;'}
+```
+
+Will output:
+
+```html
+Grandmother of
+eight makes        hole in one.
+Grandmother of eight makes hole in one.
+Grandmother&nbsp;of&nbsp;eight&nbsp;makes&nbsp;hole&nbsp;in&nbsp;one.
+```
+
+See also [`{strip}`](../language-builtin-functions/language-function-strip.md) and
+[`truncate`](language-modifier-truncate.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-to-charset.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-to-charset.md
new file mode 100644
index 000000000..c0b003842
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-to-charset.md
@@ -0,0 +1,20 @@
+# to_charset
+
+`to_charset` is used to transcode a string from the internal charset to
+a given charset. This is the exact opposite of the [from_charset
+modifier](#language.modifier.from_charset).
+
+## Parameters
+
+| Parameter Position | Type   | Required | Possible Values                                                                                                              | Default      | Description                                                 |
+|--------------------|--------|----------|------------------------------------------------------------------------------------------------------------------------------|--------------|-------------------------------------------------------------|
+| 1                  | string | No       | `ISO-8859-1`, `UTF-8`, and any character set supported by [`mb_convert_encoding()`](https://www.php.net/mb_convert_encoding) | `ISO-8859-1` | The charset encoding the value is supposed to be encoded to |
+
+> **Note**
+>
+> Charset encoding should be handled by the application itself. This
+> modifier should only be used in cases where the application cannot
+> anticipate that a certain string is required in another encoding.
+
+See also [Charset Encoding](../../programmers/charset.md), [from_charset
+modifier](language-modifier-from-charset.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-truncate.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-truncate.md
new file mode 100644
index 000000000..1cbb7abcb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-truncate.md
@@ -0,0 +1,57 @@
+# truncate
+
+This truncates a variable to a character length, the default is 80. As
+an optional second parameter, you can specify a string of text to
+display at the end if the variable was truncated. The characters in the
+string are included with the original truncation length. By default,
+`truncate` will attempt to cut off at a word boundary. If you want to
+cut off at the exact character length, pass the optional third parameter
+of TRUE.
+
+## Basic usage
+```smarty
+{$myVar|truncate:40:"..."}
+```
+
+## Parameters
+
+| Parameter Position | Type    | Required | Default | Description                                                                                                                                                                                        |
+|--------------------|---------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 1                  | integer | No       | 80      | This determines how many characters to truncate to.                                                                                                                                                |
+| 2                  | string  | No       | \...    | This is a text string that replaces the truncated text. Its length is included in the truncation length setting.                                                                                   |
+| 3                  | boolean | No       | FALSE   | This determines whether or not to truncate at a word boundary with FALSE, or at the exact character with TRUE.                                                                                     |
+| 4                  | boolean | No       | FALSE   | This determines whether the truncation happens at the end of the string with FALSE, or in the middle of the string with TRUE. Note that if this setting is TRUE, then word boundaries are ignored. |
+
+## Examples
+
+```php
+<?php
+$smarty->assign('articleTitle', 'Two Sisters Reunite after Eighteen Years at Checkout Counter.');
+```
+
+where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|truncate}
+{$articleTitle|truncate:30}
+{$articleTitle|truncate:30:""}
+{$articleTitle|truncate:30:"---"}
+{$articleTitle|truncate:30:"":true}
+{$articleTitle|truncate:30:"...":true}
+{$articleTitle|truncate:30:'..':true:true}
+```
+
+This will output:
+
+```
+Two Sisters Reunite after Eighteen Years at Checkout Counter.
+Two Sisters Reunite after Eighteen Years at Checkout Counter.
+Two Sisters Reunite after...
+Two Sisters Reunite after
+Two Sisters Reunite after---
+Two Sisters Reunite after Eigh
+Two Sisters Reunite after E...
+Two Sisters Re..ckout Counter.
+```
+       
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-unescape.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-unescape.md
new file mode 100644
index 000000000..8e8603053
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-unescape.md
@@ -0,0 +1,43 @@
+# unescape
+
+`unescape` is used to decode `entity`, `html` and `htmlall`. It counters
+the effects of the [escape modifier](language-modifier-escape.md) for the
+given types.
+
+## Basic usage
+```smarty
+{$myVar|unescape}
+```
+
+## Parameters
+
+| Parameter Position | Type   | Required | Possible Values                                                                                                | Default | Description                                                                                                                  |
+|--------------------|--------|----------|----------------------------------------------------------------------------------------------------------------|---------|------------------------------------------------------------------------------------------------------------------------------|
+| 1                  | string | No       | `html`, `htmlall`, `entity`,                                                                                   | `html`  | This is the escape format to use.                                                                                            |
+| 2                  | string | No       | `ISO-8859-1`, `UTF-8`, and any character set supported by [`htmlentities()`](https://www.php.net/htmlentities) | `UTF-8` | The character set encoding passed to html\_entity\_decode() or htmlspecialchars\_decode() or mb\_convert\_encoding() et. al. |
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle',
+                "Germans use &quot;&Uuml;mlauts&quot; and pay in &euro;uro"
+                );
+```
+
+These are example `unescape` template lines followed by the output
+
+```smarty
+{$articleTitle}
+Germans use &quot;&Uuml;mlauts&quot; and pay in &euro;uro
+
+{$articleTitle|unescape:"html"}
+Germans use "&Uuml;mlauts" and pay in &euro;uro
+
+{$articleTitle|unescape:"htmlall"}
+Germans use "Ümlauts" and pay in €uro
+```
+
+See also [escaping smarty parsing](../language-basic-syntax/language-escaping.md), [escape
+modifier](language-modifier-escape.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-upper.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-upper.md
new file mode 100644
index 000000000..3173059c9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-upper.md
@@ -0,0 +1,33 @@
+# upper
+
+This is used to uppercase a variable. This is equivalent to the PHP
+[`strtoupper()`](https://www.php.net/strtoupper) function.
+
+## Basic usage
+```smarty
+{$myVar|upper}
+```
+
+## Examples
+
+```php
+<?php
+$smarty->assign('articleTitle', "If Strike isn't Settled Quickly it may Last a While.");
+```
+
+Where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|upper}
+```
+
+Will output:
+
+```
+If Strike isn't Settled Quickly it may Last a While.
+IF STRIKE ISN'T SETTLED QUICKLY IT MAY LAST A WHILE.
+```
+
+See also [`lower`](lower) and
+[`capitalize`](language-modifier-capitalize.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-wordwrap.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-wordwrap.md
new file mode 100644
index 000000000..f3348fd72
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-wordwrap.md
@@ -0,0 +1,73 @@
+# wordwrap
+
+Wraps a string to a column width, the default is 80. As an optional
+second parameter, you can specify a string of text to wrap the text to
+the next line, the default is a carriage return `"\n"`. By default,
+`wordwrap` will attempt to wrap at a word boundary. If you want to cut
+off at the exact character length, pass the optional third parameter as
+TRUE. This is equivalent to the PHP
+[`wordwrap()`](https://www.php.net/wordwrap) function.
+
+## Basic usage
+```smarty
+{$myVar|wordwrap:30}
+```
+
+## Parameters
+
+| Parameter Position | Type    | Required | Default | Description                                                                                   |
+|--------------------|---------|----------|---------|-----------------------------------------------------------------------------------------------|
+| 1                  | integer | No       | 80      | This determines how many columns to wrap to.                                                  |
+| 2                  | string  | No       | \\n     | This is the string used to wrap words with.                                                   |
+| 3                  | boolean | No       | FALSE   | This determines whether to wrap at a word boundary (FALSE), or at the exact character (TRUE). |
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle',
+                "Blind woman gets new kidney from dad she hasn't seen in years."
+               );
+
+```
+
+Where template is
+
+```smarty
+{$articleTitle}
+
+{$articleTitle|wordwrap:30}
+
+{$articleTitle|wordwrap:20}
+
+{$articleTitle|wordwrap:30:"<br />\n"}
+
+{$articleTitle|wordwrap:26:"\n":true}
+```
+
+Will output:
+
+```html
+Blind woman gets new kidney from dad she hasn't seen in years.
+
+Blind woman gets new kidney
+from dad she hasn't seen in
+years.
+
+Blind woman gets new
+kidney from dad she
+hasn't seen in
+years.
+
+Blind woman gets new kidney<br />
+from dad she hasn't seen in<br />
+years.
+
+Blind woman gets new kidn
+ey from dad she hasn't se
+en in years.
+```       
+
+See also [`nl2br`](language-modifier-nl2br.md) and
+[`{textformat}`](../language-custom-functions/language-function-textformat.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-variables/index.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-variables/index.md
new file mode 100644
index 000000000..58ae6eb95
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-variables/index.md
@@ -0,0 +1,36 @@
+# Variables
+
+Smarty has several types of variables. The type of the
+variable depends on what symbol it is prefixed or enclosed within.
+
+- [Variables assigned from PHP](language-assigned-variables.md)
+- [Variables loaded from config files](language-config-variables.md)
+- [{$smarty} reserved variable](language-variables-smarty.md)
+
+Variables in Smarty can be either displayed directly or used as
+arguments for [functions](../language-basic-syntax/language-syntax-functions.md),
+[attributes](../language-basic-syntax/language-syntax-attributes.md) and
+[modifiers](../language-modifiers/index.md), inside conditional expressions, etc.
+To print a variable, simply enclose it in the
+[delimiters](../../programmers/api-variables/variable-left-delimiter.md) so that it is the only thing
+contained between them.
+
+```smarty
+{$Name}
+
+{$product.part_no} <b>{$product.description}</b>
+
+{$Contacts[row].Phone}
+
+<body bgcolor="{#bgcolor#}">
+```
+
+## Scopes
+You can assign variables to specific [variable scopes](language-variable-scopes.md).
+
+      
+> **Note**
+>
+> An easy way to examine assigned Smarty variables is with the
+> [debugging console](../chapter-debugging-console.md).
+
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-variables/language-assigned-variables.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-variables/language-assigned-variables.md
new file mode 100644
index 000000000..bd356a2b0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-variables/language-assigned-variables.md
@@ -0,0 +1,126 @@
+# Variables assigned from PHP
+
+Variables assigned from PHP are referenced by preceding them with a dollar
+(`$`) sign.
+
+## Examples
+
+```php
+<?php
+
+$smarty = new Smarty();
+
+$smarty->assign('firstname', 'Doug');
+$smarty->assign('lastname', 'Evans');
+$smarty->assign('meetingPlace', 'New York');
+
+$smarty->display('index.tpl');
+
+```
+
+`index.tpl` source:
+
+```smarty
+Hello {$firstname} {$lastname}, glad to see you can make it.
+<br />
+{* this will not work as $variables are case sensitive *}
+This weeks meeting is in {$meetingplace}.
+{* this will work *}
+This weeks meeting is in {$meetingPlace}.
+```
+       
+This above would output:
+
+```html
+Hello Doug Evans, glad to see you can make it.
+<br />
+This weeks meeting is in .
+This weeks meeting is in New York.
+```
+      
+## Associative arrays
+
+You can also reference associative array variables by specifying the key
+after a dot "." symbol.
+
+```php
+<?php
+$smarty->assign('Contacts',
+    array('fax' => '555-222-9876',
+          'email' => 'zaphod@slartibartfast.example.com',
+          'phone' => array('home' => '555-444-3333',
+                           'cell' => '555-111-1234')
+                           )
+         );
+$smarty->display('index.tpl');
+```
+
+`index.tpl` source:
+
+```smarty
+{$Contacts.fax}<br />
+{$Contacts.email}<br />
+{* you can print arrays of arrays as well *}
+{$Contacts.phone.home}<br />
+{$Contacts.phone.cell}<br />
+```
+
+this will output:
+
+```html
+555-222-9876<br />
+zaphod@slartibartfast.example.com<br />
+555-444-3333<br />
+555-111-1234<br />
+```
+
+## Array indexes
+
+You can reference arrays by their index, much like native PHP syntax.
+
+```php
+<?php
+$smarty->assign('Contacts', array(
+                           '555-222-9876',
+                           'zaphod@slartibartfast.example.com',
+                            array('555-444-3333',
+                                  '555-111-1234')
+                            ));
+$smarty->display('index.tpl');
+```
+
+`index.tpl` source:
+
+```smarty
+{$Contacts[0]}<br />
+{$Contacts[1]}<br />
+{* you can print arrays of arrays as well *}
+{$Contacts[2][0]}<br />
+{$Contacts[2][1]}<br />
+```
+
+This will output:
+
+```html
+555-222-9876<br />
+zaphod@slartibartfast.example.com<br />
+555-444-3333<br />
+555-111-1234<br />
+```
+
+## Objects
+
+Properties of [objects](../../programmers/advanced-features/advanced-features-objects.md) assigned from PHP
+can be referenced by specifying the property name after the `->` symbol.
+
+```smarty
+name:  {$person->name}<br />
+email: {$person->email}<br />
+```
+
+this will output:
+
+```html
+name:  Zaphod Beeblebrox<br />
+email: zaphod@slartibartfast.example.com<br />
+```
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-variables/language-config-variables.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-variables/language-config-variables.md
new file mode 100644
index 000000000..89a90ce11
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-variables/language-config-variables.md
@@ -0,0 +1,79 @@
+# Variables loaded from config files
+
+Variables that are loaded from the [config files](../config-files.md) are
+referenced by enclosing them within `#hash_marks#`, or with the smarty
+variable [`$smarty.config`](language-variables-smarty.md#smartyconfig-languagevariablessmartyconfig). The
+later syntax is useful for embedding into quoted attribute values, or
+accessing variable values such as `$smarty.config.$foo`.
+
+## Examples
+
+Example config file - `foo.conf`:
+```ini
+pageTitle = "This is mine"
+bodyBgColor = '#eeeeee'
+tableBorderSize = 3
+tableBgColor = "#bbbbbb"
+rowBgColor = "#cccccc"
+```
+
+A template demonstrating the `#hash#` method:
+
+```smarty
+{config_load file='foo.conf'}
+<html>
+    <title>{#pageTitle#}</title>
+    <body bgcolor="{#bodyBgColor#}">
+        <table border="{#tableBorderSize#}" bgcolor="{#tableBgColor#}">
+            <tr bgcolor="{#rowBgColor#}">
+                <td>First</td>
+                <td>Last</td>
+                <td>Address</td>
+            </tr>
+        </table>
+    </body>
+</html>
+```
+        
+A template demonstrating the
+[`$smarty.config`](language-variables-smarty.md#smartyconfig-languagevariablessmartyconfig) method:
+
+```smarty
+{config_load file='foo.conf'}
+<html>
+<title>{$smarty.config.pageTitle}</title>
+    <body bgcolor="{$smarty.config.bodyBgColor}">
+        <table border="{$smarty.config.tableBorderSize}" bgcolor="{$smarty.config.tableBgColor}">
+            <tr bgcolor="{$smarty.config.rowBgColor}">
+                <td>First</td>
+                <td>Last</td>
+                <td>Address</td>
+            </tr>
+        </table>
+    </body>
+</html>
+```
+
+Both examples would output:
+
+```html
+<html>
+    <title>This is mine</title>
+    <body bgcolor="#eeeeee">
+        <table border="3" bgcolor="#bbbbbb">
+            <tr bgcolor="#cccccc">
+                <td>First</td>
+                <td>Last</td>
+                <td>Address</td>
+            </tr>
+        </table>
+    </body>
+</html>
+```
+
+Config file variables cannot be used until after they are loaded in from
+a config file. This procedure is explained later in this document under
+[`{config_load}`](../language-builtin-functions/language-function-config-load.md).
+
+See also [variables](../language-basic-syntax/language-syntax-variables.md) and [$smarty reserved
+variables](language-variables-smarty.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-variables/language-variable-scopes.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-variables/language-variable-scopes.md
new file mode 100644
index 000000000..e2b244661
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-variables/language-variable-scopes.md
@@ -0,0 +1,60 @@
+# Variable scopes
+
+You have the choice to assign variables to the scope of the main Smarty
+object, data objects created with [`createData()`](../../programmers/api-functions/api-create-data.md),
+and template objects created with
+[`createTemplate()`](../../programmers/api-functions/api-create-template.md). These objects can be
+chained. A template sees all the variables of its own object and all
+variables assigned to the objects in its chain of parent objects.
+
+By default, templates which are rendered by
+[`$smarty->display(...)`](../../programmers/api-functions/api-display.md) or
+[`$smarty->fetch(...)`](../../programmers/api-functions/api-fetch.md) calls are automatically linked to
+the Smarty object variable scope.
+
+By assigning variables to individual data or template objects you have
+full control which variables can be seen by a template.
+
+```php
+<?php
+// assign variable to Smarty object scope
+$smarty->assign('foo','smarty');
+
+// assign variables to data object scope
+$data = $smarty->createData();
+$data->assign('foo','data');
+$data->assign('bar','bar-data');
+
+// assign variables to other data object scope
+$data2 = $smarty->createData($data);
+$data2->assign('bar','bar-data2');
+
+// assign variable to template object scope
+$tpl = $smarty->createTemplate('index.tpl');
+$tpl->assign('bar','bar-template');
+
+// assign variable to template object scope with link to Smarty object
+$tpl2 = $smarty->createTemplate('index.tpl',$smarty);
+$tpl2->assign('bar','bar-template2');
+
+// This display() does see $foo='smarty' from the $smarty object
+$smarty->display('index.tpl');
+
+// This display() does see $foo='data' and $bar='bar-data' from the data object $data
+$smarty->display('index.tpl',$data);
+
+// This display() does see $foo='data' from the data object $data 
+// and $bar='bar-data2' from the data object $data2
+$smarty->display('index.tpl',$data2);
+
+// This display() does see $bar='bar-template' from the template object $tpl
+$tpl->display();  // or $smarty->display($tpl);
+
+// This display() does see $bar='bar-template2' from the template object $tpl2
+// and $foo='smarty' form the Smarty object $foo
+$tpl2->display();  // or $smarty->display($tpl2);
+```
+
+See also [`assign()`](../../programmers/api-functions/api-assign.md), 
+[`createData()`](../../programmers/api-functions/api-create-data.md)
+and [`createTemplate()`](../../programmers/api-functions/api-create-template.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-variables/language-variables-smarty.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-variables/language-variables-smarty.md
new file mode 100644
index 000000000..da543fb62
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/designers/language-variables/language-variables-smarty.md
@@ -0,0 +1,156 @@
+# {$smarty} reserved variable
+
+The PHP reserved `{$smarty}` variable can be used to access several
+environment and request variables. The full list of them follows.
+
+## Request variables
+
+The [request variables](https://www.php.net/reserved.variables) such as
+`$_GET`, `$_POST`, `$_COOKIE`, `$_SERVER`, `$_ENV` and `$_SESSION` can
+be accessed as demonstrated in the examples below:
+
+```smarty
+{* display value of page from URL ($_GET) http://www.example.com/index.php?page=foo *}
+{$smarty.get.page}
+
+{* display the variable "page" from a form ($_POST['page']) *}
+{$smarty.post.page}
+
+{* display the value of the cookie "username" ($_COOKIE['username']) *}
+{$smarty.cookies.username}
+
+{* display the server variable "SERVER_NAME" ($_SERVER['SERVER_NAME'])*}
+{$smarty.server.SERVER_NAME}
+
+{* display the system environment variable "PATH" *}
+{$smarty.env.PATH}
+
+{* display the php session variable "id" ($_SESSION['id']) *}
+{$smarty.session.id}
+
+{* display the variable "username" from merged get/post/cookies/server/env *}
+{$smarty.request.username}
+```
+
+> **Note**
+>
+> For historical reasons `{$SCRIPT_NAME}` is shorthand for
+> `{$smarty.server.SCRIPT_NAME}`.
+>
+>
+>     <a href="{$SCRIPT_NAME}?page=smarty">click me</a>
+>     <a href="{$smarty.server.SCRIPT_NAME}?page=smarty">click me</a>
+
+> **Note**
+>
+> Although Smarty provides direct access to PHP super globals for
+> convenience, it should be used with caution. Directly accessing super
+> globals mixes underlying application code structure with templates. A
+> good practice is to assign specific needed values to template vars.
+
+## {$smarty.now}
+
+The current [timestamp](https://www.php.net/function.time) can be accessed
+with `{$smarty.now}`. The value reflects the number of seconds passed
+since the so-called Epoch on January 1, 1970, and can be passed directly
+to the [`date_format`](../language-modifiers/language-modifier-date-format.md) modifier for
+display. Note that [`time()`](https://www.php.net/function.time) is called
+on each invocation; eg a script that takes three seconds to execute with
+a call to `$smarty.now` at start and end will show the three-second
+difference.
+
+```smarty
+{* use the date_format modifier to show current date and time *}
+{$smarty.now|date_format:'%Y-%m-%d %H:%M:%S'}
+```
+
+## {$smarty.const}
+
+You can access PHP constant values directly. See also [smarty
+constants](../../programmers/smarty-constants.md).
+
+```php
+<?php
+// the constant defined in php
+define('MY_CONST_VAL','CHERRIES');
+```
+
+Output the constant in a template with
+
+```smarty
+{$smarty.const.MY_CONST_VAL}
+```
+
+> **Note**
+>
+> Although Smarty provides direct access to PHP constants for
+> convenience, it is typically avoided as this is mixing underlying
+> application code structure into the templates. A good practice is to
+> assign specific needed values to template vars.
+
+## {$smarty.capture}
+
+Template output captured via the built-in
+[`{capture}..{/capture}`](../language-builtin-functions/language-function-capture.md) function can be
+accessed using the `{$smarty.capture}` variable. See the
+[`{capture}`](../language-builtin-functions/language-function-capture.md) page for more information.
+
+## {$smarty.config}
+
+`{$smarty.config}` variable can be used to refer to loaded [config
+variables](language-config-variables.md). `{$smarty.config.foo}` is a
+synonym for `{#foo#}`. See the
+[{config_load}](../language-builtin-functions/language-function-config-load.md) page for more info.
+
+## {$smarty.section}
+
+The `{$smarty.section}` variables can be used to refer to
+[`{section}`](../language-builtin-functions/language-function-section.md) loop properties. These have
+some very useful values such as `.first`, `.index`, etc.
+
+> **Note**
+>
+> The `{$smarty.foreach}` variable is no longer used with the new
+> [`{foreach}`](../language-builtin-functions/language-function-foreach.md) syntax, but is still
+> supported with Smarty 2.x style foreach syntax.
+
+## {$smarty.template}
+
+Returns the name of the current template being processed (without the
+directory).
+
+## {$smarty.template_object}
+
+Returns the template object of the current template being processed.
+
+## {$smarty.current_dir}
+
+Returns the name of the directory for the current template being
+processed if it is loaded from the filesystem (the default).
+
+## {$smarty.version}
+
+Returns the version of Smarty the template was compiled with.
+
+```smarty
+<div id="footer">Powered by Smarty {$smarty.version}</div>
+```
+
+## {$smarty.block.child}
+
+Returns block text from child template. See [Template
+inheritance](../../programmers/advanced-features/advanced-features-template-inheritance.md).
+
+## {$smarty.block.parent}
+
+Returns block text from parent template. See [Template
+inheritance](../../programmers/advanced-features/advanced-features-template-inheritance.md)
+
+## {$smarty.ldelim}, {$smarty.rdelim}
+
+These variables are used for printing the left-delimiter and
+right-delimiter value literally, the same as
+[`{ldelim},{rdelim}`](../language-builtin-functions/language-function-ldelim.md).
+
+See also [assigned variables](language-assigned-variables.md) and [config
+variables](language-config-variables.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/features.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/features.md
new file mode 100644
index 000000000..8405b46eb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/features.md
@@ -0,0 +1,152 @@
+Features
+=======
+
+Some of Smarty's features:
+-   It is extremely fast.
+-   It is efficient since the PHP parser does the dirty work.
+-   No template parsing overhead, only compiles once.
+-   It is smart about [recompiling](#variable.compile.check) only the
+    template files that have changed.
+-   You can easily create your own custom
+    [functions](#language.custom.functions) and [variable
+    modifiers](#language.modifiers), so the template language is
+    extremely extensible.
+-   Configurable template [{delimiter}](#variable.left.delimiter) tag
+    syntax, so you can use `{$foo}`, `{{$foo}}`, `<!--{$foo}-->`, etc.
+-   The [`{if}..{elseif}..{else}..{/if}`](#language.function.if)
+    constructs are passed to the PHP parser, so the `{if...}` expression
+    syntax can be as simple or as complex an evaluation as you like.
+-   Allows unlimited nesting of
+    [`sections`](#language.function.section), `if's` etc.
+-   Built-in [caching](#caching) support
+-   Arbitrary [template](#resources) sources
+-   [Template Inheritance](#advanced.features.template.inheritance) for
+    easy management of template content.
+-   [Plugin](#plugins) architecture
+
+## Separation of presentation from application code
+-   This means templates can certainly contain logic under the condition
+    that it is for presentation only. Things such as
+    [including](./designers/language-builtin-functions/language-function-include.md) other templates,
+    [alternating](./designers/language-custom-functions/language-function-cycle.md) table row colors,
+    [upper-casing](./designers/language-modifiers/language-modifier-upper.md) a variable,
+    [looping](./designers/language-builtin-functions/language-function-foreach.md) over an array of data and
+    rendering it are examples of presentation logic.
+-   This does not mean however that Smarty forces a separation of
+    business and presentation logic. Smarty has no knowledge of which is
+    which, so placing business logic in the template is your own doing.
+-   Also, if you desire *no* logic in your templates you certainly can
+    do so by boiling the content down to text and variables only.
+
+## How does it work?
+
+Under the hood, Smarty "compiles" (basically copies and converts) the
+templates into PHP scripts. This happens once when each template is
+first invoked, and then the compiled versions are used from that point
+forward. Smarty takes care of this for you, so the template designer
+just edits the Smarty templates and never has to manage the compiled
+versions. This approach keeps the templates easy to maintain, and yet
+keeps execution times extremely fast since the compiled code is just
+PHP. And of course, all PHP scripts take advantage of PHP op-code caches
+such as APC.
+
+## Template Inheritance
+
+Template inheritance was introduced in Smarty 3. Before template
+inheritance, we managed our templates in
+pieces such as header and footer templates. This organization lends
+itself to many problems that require some hoop-jumping, such as managing
+content within the header/footer on a per-page basis. With template
+inheritance, instead of including other templates we maintain our
+templates as single pages. We can then manipulate blocks of content
+within by inheriting them. This makes templates intuitive, efficient and
+easy to manage. See
+[Template Inheritance](./programmers/advanced-features/advanced-features-template-inheritance.md)
+for more info.
+
+## Why not use XML/XSLT syntax?
+There are a couple of good reasons. First, Smarty can be used for more
+than just XML/HTML based templates, such as generating emails,
+javascript, CSV, and PDF documents. Second, XML/XSLT syntax is even more
+verbose and fragile than PHP code! It is perfect for computers, but
+horrible for humans. Smarty is about being easy to read, understand and
+maintain.
+
+## Template Security
+Although Smarty insulates you from PHP, you still have the option to use
+it in certain ways if you wish. Template security forces the restriction
+of PHP (and select Smarty functions.) This is useful if you have third
+parties editing templates, and you don't want to unleash the full power
+of PHP or Smarty to them.
+
+## Integration
+Sometimes Smarty gets compared to Model-View-Controller (MVC)
+frameworks. Smarty is not an MVC, it is just the presentation layer,
+much like the View (V) part of an MVC. As a matter of fact, Smarty can
+easily be integrated as the view layer of an MVC. Many of the more
+popular ones have integration instructions for Smarty, or you may find
+some help here in the forums and documentation.
+
+## Other Template Engines
+Smarty is not the only engine following the *"Separate Programming Code
+from Presentation"* philosophy. For instance, Python has template
+engines built around the same principles such as Django Templates and
+CheetahTemplate. *Note: Languages such as Python do not mix with HTML
+natively, which give them the advantage of proper programming code
+separation from the outset. There are libraries available to mix Python
+with HTML, but they are typically avoided.*
+
+## What Smarty is Not
+
+Smarty is not an application development framework. Smarty is not an
+MVC. Smarty is not an alternative to Laravel, Symfony, CodeIgniter,
+or any of the other application development frameworks for PHP.
+
+Smarty is a template engine, and works as the (V)iew component of your
+application. Smarty can easily be coupled to any of the engines listed
+above as the view component. No different than any other software,
+Smarty has a learning curve. Smarty does not guarantee good application
+design or proper separation of presentation, this still needs to be
+addressed by a competent developer and web designer.
+
+## Is Smarty Right for Me?
+
+Smarty is not meant to be a tool for every job. The important thing is
+to identify if Smarty fits your needs. There are some important
+questions to ask yourself:
+
+### Template Syntax
+Are you content with PHP tags mixed with HTML? Are your
+web designers comfortable with PHP? Would your web designers prefer a
+tag-based syntax designed for presentation? Some experience working with
+both Smarty and PHP helps answer these questions.
+
+### The Business Case
+Is there a requirement to insulate the templates from
+PHP? Do you have untrusted parties editing templates that you do not
+wish to unleash the power of PHP to? Do you need to programmatically
+control what is and is not available within the templates? Smarty
+supplies these capabilities by design.
+
+## Feature set
+Does Smarty's features such as caching, template
+inheritance and plugin architecture save development cycles writing code
+that would be needed otherwise? Does the codebase or framework you plan
+on using have the features you need for the presentation component?
+
+## Sites using Smarty
+Many well-known PHP projects make use of Smarty such as XOOPS CMS, CMS Made Simple, Tiki
+CMS/Groupware and X-Cart to name a few.
+
+## Summary
+Whether you are using Smarty for a small website or massive enterprise
+solution, it can accommodate your needs. There are numerous features
+that make Smarty a great choice:
+
+-   separation of PHP from HTML/CSS just makes sense
+-   readability for organization and management
+-   security for 3rd party template access
+-   feature completeness, and easily extendable to your own needs
+-   massive user base, Smarty is here to stay
+-   LGPL license for commercial use
+-   100% free to use, open source project
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/getting-started.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/getting-started.md
new file mode 100644
index 000000000..f549e50e7
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/getting-started.md
@@ -0,0 +1,167 @@
+# Getting started
+
+## Requirements
+Smarty can be run with PHP 7.1 to PHP 8.3.
+
+## Installation
+Smarty can be installed with [Composer](https://getcomposer.org/).
+
+To get the latest stable version of Smarty use:
+```shell
+composer require smarty/smarty
+```
+
+To get the latest, unreleased version, use:
+```shell
+composer require smarty/smarty:dev-master
+```
+
+To get the previous stable version of Smarty, Smarty 3, use:
+```shell
+composer require smarty/smarty:^3
+```
+
+Here's how you create an instance of Smarty in your PHP scripts:
+```php
+<?php
+
+require 'vendor/autoload.php';
+$smarty = new Smarty();
+```
+
+Now that the library files are in place, it's time to set up the Smarty
+directories for your application.
+
+Smarty requires four directories which are by default named
+    [`templates`](./programmers/api-variables/variable-template-dir.md),
+    [`configs`](./programmers/api-variables/variable-config-dir.md),
+    [`templates_c`](./programmers/api-variables/variable-compile-dir.md)
+     and 
+    [`cache`](./programmers/api-variables/variable-cache-dir.md) 
+    relative to the current working directory.
+
+The defaults can be changed as follows:
+```php
+$smarty = new Smarty();
+$smarty->setTemplateDir('/some/template/dir');
+$smarty->setConfigDir('/some/config/dir');
+$smarty->setCompileDir('/some/compile/dir');
+$smarty->setCacheDir('/some/cache/dir');
+```
+
+The compile dir and cache dir need to be writable for the user running the PHP script.
+
+> **Note**
+>
+> This is usually user "nobody" and group "nobody". For OS X users, the
+> default is user "www" and group "www". If you are using Apache, you
+> can look in your `httpd.conf` file to see what user and group are
+> being used.
+
+```bash
+chown nobody:nobody /web/www.example.com/guestbook/templates_c/
+chmod 770 /web/www.example.com/guestbook/templates_c/
+
+chown nobody:nobody /web/www.example.com/guestbook/cache/
+chmod 770 /web/www.example.com/guestbook/cache/
+```
+
+You can verify if your system has the correct access rights for
+    these directories with [`testInstall()`](./programmers/api-functions/api-test-install.md):
+
+```php
+$smarty = new Smarty();
+$smarty->setTemplateDir('/some/template/dir');
+$smarty->setConfigDir('/some/config/dir');
+$smarty->setCompileDir('/some/compile/dir');
+$smarty->setCacheDir('/some/cache/dir');
+$smarty->testInstall();
+```
+
+Now, let's create the `index.tpl` file that Smarty will display. This
+needs to be located in the [`$template_dir`](./programmers/api-variables/variable-template-dir.md).
+
+```smarty
+{* Smarty *}
+Hello {$name}, welcome to Smarty!
+```
+
+> **Note**
+>
+> `{* Smarty *}` is a template [comment](./designers/language-basic-syntax/language-syntax-comments.md). It
+> is not required, but it is good practice to start all your template
+> files with this comment. It makes the file easy to recognize
+> regardless of the file extension. For example, text editors could
+> recognize the file and turn on special syntax highlighting.
+
+Now lets edit our php file. We'll create an instance of Smarty,
+[`assign()`](./programmers/api-functions/api-assign.md) a template variable and
+[`display()`](./programmers/api-functions/api-display.md) the `index.tpl` file.
+
+```php
+<?php
+
+require 'vendor/autoload.php';
+
+$smarty = new Smarty();
+
+$smarty->setTemplateDir('/web/www.example.com/guestbook/templates/');
+$smarty->setCompileDir('/web/www.example.com/guestbook/templates_c/');
+$smarty->setConfigDir('/web/www.example.com/guestbook/configs/');
+$smarty->setCacheDir('/web/www.example.com/guestbook/cache/');
+
+$smarty->assign('name', 'Ned');
+$smarty->display('index.tpl');
+
+```
+
+> **Note**
+>
+> In our example, we are setting absolute paths to all the Smarty
+> directories. If `/web/www.example.com/guestbook/` is within your PHP
+> include\_path, then these settings are not necessary. However, it is
+> more efficient and (from experience) less error-prone to set them to
+> absolute paths. This ensures that Smarty is getting files from the
+> directories you intended.
+
+Now, run your PHP file. You should see *"Hello Ned, welcome to Smarty!"*
+
+You have completed the basic setup for Smarty!
+
+## Extended Setup
+
+This is a continuation of the [basic installation](#installation), please read that first!
+
+A slightly more flexible way to set up Smarty is to extend the Smarty
+class and initialize your Smarty
+environment. So instead of repeatedly setting directory paths, assigning
+the same vars, etc., we can do that in one place.
+
+```php
+<?php
+
+class Smarty_GuestBook extends Smarty {
+
+   public function __construct()
+   {
+        parent::__construct();
+
+        $this->setTemplateDir('/web/www.example.com/guestbook/templates/');
+        $this->setCompileDir('/web/www.example.com/guestbook/templates_c/');
+        $this->setConfigDir('/web/www.example.com/guestbook/configs/');
+        $this->setCacheDir('/web/www.example.com/guestbook/cache/');
+
+        $this->caching = Smarty::CACHING_LIFETIME_CURRENT;
+        $this->assign('app_name', 'Guest Book');
+   }
+
+}
+```
+
+Now, we can use `Smarty_GuestBook` instead of `Smarty` in our scripts:
+```php
+<?php
+$smarty = new Smarty_GuestBook();
+$smarty->assign('name', 'Ned');
+$smarty->display('index.tpl');
+```
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/index.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/index.md
new file mode 100644
index 000000000..cff5e490e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/index.md
@@ -0,0 +1,50 @@
+# Smarty 4 Documentation
+Smarty is a template engine for PHP, facilitating the separation of presentation (HTML/CSS) from application logic. 
+
+It allows you to write **templates**, using **variables**, **modifiers**, **functions** and **comments**, like this:
+```html
+<h1>{$title|escape}</h1>
+
+<p>
+    The number of pixels is: {math equation="x * y" x=$height y=$width}.
+</p>
+```
+
+When this template is rendered, with the value "Hello world" for the variable $title, 640 for $width, 
+and 480 for $height, the result is:
+```html
+<h1>Hello world</h1>
+
+<p>
+    The number of pixels is: 307200.
+</p>
+```
+
+## Introduction
+- [Philosophy](./philosophy.md) - or "Why do I need a template engine?"
+- [Features](./features.md) - or "Why do I want Smarty?"
+- [Getting Started](./getting-started.md)
+
+## Smarty for template designers
+- [Basic Syntax](designers/language-basic-syntax/index.md)
+- [Variables](designers/language-variables/index.md)
+- [Variable Modifiers](designers/language-modifiers/index.md)
+- [Combining Modifiers](./designers/language-combining-modifiers.md)
+- [Built-in Functions](designers/language-builtin-functions/index.md)
+- [Custom Functions](designers/language-custom-functions/index.md)
+- [Config Files](./designers/config-files.md)
+- [Debugging Console](./designers/chapter-debugging-console.md)
+
+## Smarty for php developers
+- [Charset Encoding](./programmers/charset.md)
+- [Constants](./programmers/smarty-constants.md)
+- [Smarty Class Variables](./programmers/api-variables.md)
+- [Smarty Class Methods](./programmers/api-functions.md)
+- [Caching](./programmers/caching.md)
+- [Resources](./programmers/resources.md)
+- [Advanced Features](./programmers/advanced-features.md)
+- [Extending Smarty With Plugins](./programmers/plugins.md)
+
+## Other
+- [Some random tips & tricks](./appendixes/tips.md)
+- [Troubleshooting](./appendixes/troubleshooting.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/philosophy.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/philosophy.md
new file mode 100644
index 000000000..34555c288
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/philosophy.md
@@ -0,0 +1,107 @@
+# Philosophy
+
+## What is Smarty?
+
+Smarty is a template engine for PHP. More specifically, it facilitates a
+manageable way to separate application logic and content from its
+presentation. This is best described in a situation where the
+application programmer and the template designer play different roles,
+or in most cases are not the same person.
+
+For example, let\'s say you are creating a web page that is displaying a
+newspaper article.
+
+-   The article `$headline`, `$tagline`, `$author` and `$body` are
+    content elements, they contain no information about how they will be
+    presented. They are [passed](#api.assign) into Smarty by the
+    application.
+
+-   Then the template designer edits the templates and uses a
+    combination of HTML tags and [template tags](#language.basic.syntax)
+    to format the presentation of these
+    [variables](#language.syntax.variables) with elements such as
+    tables, div\'s, background colors, font sizes, style sheets, svg
+    etc.
+
+-   One day the programmer needs to change the way the article content
+    is retrieved, ie a change in application logic. This change does not
+    affect the template designer, the content will still arrive in the
+    template exactly the same.
+
+-   Likewise, if the template designer wants to completely redesign the
+    templates, this would require no change to the application logic.
+
+-   Therefore, the programmer can make changes to the application logic
+    without the need to restructure templates, and the template designer
+    can make changes to templates without breaking application logic.
+
+## Goals
+
+The Smarty design was largely driven by these goals:
+-   clean separation of presentation from application code
+-   PHP backend, Smarty template frontend
+-   complement PHP, not replace it
+-   fast development/deployment for programmers and designers
+-   quick and easy to maintain
+-   syntax easy to understand, no PHP knowledge necessary
+-   flexibility for custom development
+-   security: insulation from PHP
+-   free, open source
+
+
+
+## Two camps of thought
+
+When it comes to templating in PHP, there are basically two camps of
+thought. The first camp exclaims that \"PHP is a template engine\". This
+approach simply mixes PHP code with HTML. Although this approach is
+fastest from a pure script-execution point of view, many would argue
+that the PHP syntax is messy and complicated when mixed with tagged
+markup such as HTML.
+
+The second camp exclaims that presentation should be void of all
+programming code, and instead use simple tags to indicate where
+application content is revealed. This approach is common with other
+template engines (even in other programming languages), and is also the
+approach that Smarty takes. The idea is to keep the templates focused
+squarely on presentation, void of application code, and with as little
+overhead as possible.
+
+## Why is separating PHP from templates important?
+
+Two major benefits:
+
+-   SYNTAX: Templates typically consist of semantic markup such as HTML.
+    PHP syntax works well for application code, but quickly degenerates
+    when mixed with HTML. Smarty\'s simple {tag} syntax is designed
+    specifically to express presentation. Smarty focuses your templates
+    on presentation and less on \"code\". This lends to quicker template
+    deployment and easier maintenance. Smarty syntax requires no working
+    knowledge of PHP, and is intuitive for programmers and
+    non-programmers alike.
+
+-   INSULATION: When PHP is mixed with templates, there are no
+    restrictions on what type of logic can be injected into a template.
+    Smarty insulates the templates from PHP, creating a controlled
+    separation of presentation from business logic. Smarty also has
+    security features that can further enforce restrictions on
+    templates.
+
+## Web designers and PHP
+
+A common question: "Web designers have to learn a syntax anyway, why
+not PHP?" Of course web designers can learn PHP, and they may already
+be familiar with it. The issue isn't their ability to learn PHP, it is
+about the consequences of mixing PHP with HTML. If designers use PHP, it
+is too easy to add code into templates that doesn't belong there (you
+just handed them a swiss-army knife when they just needed a knife.) You
+can teach them the rules of application design, but this is probably
+something they don't really need to learn (now they are developers!)
+The PHP manual is also an overwhelming pile of information to sift
+through. It is like handing the owner of a car the factory assembly
+manual when all they need is the owners manual. Smarty gives web
+designers exactly the tools they need, and gives developers fine-grained
+control over those tools. The simplicity of the tag-based syntax is also
+a huge welcome for designers, it helps them streamline the organization
+and management of templates.
+
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features.md
new file mode 100644
index 000000000..60d4416b5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features.md
@@ -0,0 +1,14 @@
+Advanced Features {#advanced.features}
+=================
+
+## Table of contents
+
+- [Security](./advanced-features/advanced-features-security.md)
+- [Changing settings by template](./advanced-features/advanced-features-template-settings.md)
+- [Template Inheritance](./advanced-features/advanced-features-template-inheritance.md)
+- [Streams](./advanced-features/advanced-features-streams.md)
+- [Objects](./advanced-features/advanced-features-objects.md)
+- [Static Classes](./advanced-features/advanced-features-static-classes.md)
+- [Prefilters](./advanced-features/advanced-features-prefilters.md)
+- [Postfilters](./advanced-features/advanced-features-postfilters.md)
+- [Output Filters](./advanced-features/advanced-features-outputfilters.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-objects.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-objects.md
new file mode 100644
index 000000000..b681945e1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-objects.md
@@ -0,0 +1,99 @@
+Objects {#advanced.features.objects}
+=======
+
+Smarty allows access to PHP [objects](https://www.php.net/object) through
+the templates.
+
+> **Note**
+>
+> When you assign/register objects to templates, be sure that all
+> properties and methods accessed from the template are for presentation
+> purposes only. It is very easy to inject application logic through
+> objects, and this leads to poor designs that are difficult to manage.
+> See the Best Practices section of the Smarty website.
+
+There are two ways to access them.
+
+-   One way is to [register objects](#api.register.object) to the
+    template, then use access them via syntax similar to [custom
+    functions](#language.custom.functions).
+
+-   The other way is to [`assign()`](#api.assign) objects to the
+    templates and access them much like any other assigned variable.
+
+The first method has a much nicer template syntax. It is also more
+secure, as a registered object can be restricted to certain methods or
+properties. However, **a registered object cannot be looped over or
+assigned in arrays of objects**, etc. The method you choose will be
+determined by your needs, but use the first method whenever possible to
+keep template syntax to a minimum.
+
+If security is enabled, no private methods or functions can be accessed
+(beginning with \'\_\'). If a method and property of the same name exist,
+the method will be used.
+
+You can restrict the methods and properties that can be accessed by
+listing them in an array as the third registration parameter.
+
+By default, parameters passed to objects through the templates are
+passed the same way [custom functions](#language.custom.functions) get
+them. An associative array is passed as the first parameter, and the
+smarty object as the second. If you want the parameters passed one at a
+time for each argument like traditional object parameter passing, set
+the fourth registration parameter to FALSE.
+
+The optional fifth parameter has only effect with `format` being TRUE
+and contains a list of methods that should be treated as blocks. That
+means these methods have a closing tag in the template
+(`{foobar->meth2}...{/foobar->meth2}`) and the parameters to the methods
+have the same synopsis as the parameters for
+[`block-function-plugins`](#plugins.block.functions): They get the four
+parameters `$params`, `$content`, `$smarty` and `&$repeat` and they also
+behave like block-function-plugins.
+
+
+    <?php
+    // the object
+
+    class My_Object {
+        function meth1($params, $smarty_obj) {
+            return 'this is my meth1';
+        }
+    }
+
+    $myobj = new My_Object;
+
+    // registering the object (will be by reference)
+    $smarty->registerObject('foobar',$myobj);
+
+    // if we want to restrict access to certain methods or properties, list them
+    $smarty->registerObject('foobar',$myobj,array('meth1','meth2','prop1'));
+
+    // if you want to use the traditional object parameter format, pass a boolean of false
+    $smarty->registerObject('foobar',$myobj,null,false);
+
+    // We can also assign objects. assign_by_ref when possible.
+    $smarty->assign_by_ref('myobj', $myobj);
+
+    $smarty->display('index.tpl');
+    ?>
+
+      
+
+And here\'s how to access your objects in `index.tpl`:
+
+
+    {* access our registered object *}
+    {foobar->meth1 p1='foo' p2=$bar}
+
+    {* you can also assign the output *}
+    {foobar->meth1 p1='foo' p2=$bar assign='output'}
+    the output was {$output}
+
+    {* access our assigned object *}
+    {$myobj->meth1('foo',$bar)}
+
+      
+
+See also [`registerObject()`](#api.register.object) and
+[`assign()`](#api.assign).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-outputfilters.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-outputfilters.md
new file mode 100644
index 000000000..393d7da23
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-outputfilters.md
@@ -0,0 +1,43 @@
+Output Filters {#advanced.features.outputfilters}
+==============
+
+When the template is invoked via [`display()`](#api.display) or
+[`fetch()`](#api.fetch), its output can be sent through one or more
+output filters. This differs from
+[`postfilters`](#advanced.features.postfilters) because postfilters
+operate on compiled templates before they are saved to the disk, whereas
+output filters operate on the template output when it is executed.
+
+Output filters can be either [registered](#api.register.filter) or
+loaded from the [plugins directory](#variable.plugins.dir) by using the
+[`loadFilter()`](#api.load.filter) method or by setting the
+[`$autoload_filters`](#variable.autoload.filters) variable. Smarty will
+pass the template output as the first argument, and expect the function
+to return the result of the processing.
+
+
+    <?php
+    // put this in your application
+    function protect_email($tpl_output, Smarty_Internal_Template $template)
+    {
+        $tpl_output =
+           preg_replace('!(\S+)@([a-zA-Z0-9\.\-]+\.([a-zA-Z]{2,3}|[0-9]{1,3}))!',
+                        '$1%40$2', $tpl_output);
+        return $tpl_output;
+    }
+
+    // register the outputfilter
+    $smarty->registerFilter("output","protect_email");
+    $smarty->display("index.tpl');
+
+    // now any occurrence of an email address in the template output will have
+    // a simple protection against spambots
+    ?>
+
+        
+
+See also [`registerFilter()`](#api.register.filter),
+[`loadFilter()`](#api.load.filter),
+[`$autoload_filters`](#variable.autoload.filters),
+[postfilters](#advanced.features.postfilters) and
+[`$plugins_dir`](#variable.plugins.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-postfilters.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-postfilters.md
new file mode 100644
index 000000000..d3bad546a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-postfilters.md
@@ -0,0 +1,40 @@
+Postfilters {#advanced.features.postfilters}
+===========
+
+Template postfilters are PHP functions that your templates are ran
+through *after they are compiled*. Postfilters can be either
+[registered](#api.register.filter) or loaded from the [plugins
+directory](#variable.plugins.dir) by using the
+[`loadFilter()`](#api.load.filter) function or by setting the
+[`$autoload_filters`](#variable.autoload.filters) variable. Smarty will
+pass the compiled template code as the first argument, and expect the
+function to return the result of the processing.
+
+
+    <?php
+    // put this in your application
+    function add_header_comment($tpl_source, Smarty_Internal_Template $template)
+    {
+        return "<?php echo \"<!-- Created by Smarty! -->\n\"; ?>\n".$tpl_source;
+    }
+
+    // register the postfilter
+    $smarty->registerFilter('post','add_header_comment');
+    $smarty->display('index.tpl');
+    ?>
+
+      
+
+The postfilter above will make the compiled Smarty template `index.tpl`
+look like:
+
+
+    <!-- Created by Smarty! -->
+    {* rest of template content... *}
+
+      
+
+See also [`registerFilter()`](#api.register.filter),
+[prefilters](#advanced.features.prefilters),
+[outputfilters](#advanced.features.outputfilters), and
+[`loadFilter()`](#api.load.filter).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-prefilters.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-prefilters.md
new file mode 100644
index 000000000..76229e633
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-prefilters.md
@@ -0,0 +1,36 @@
+Prefilters {#advanced.features.prefilters}
+==========
+
+Template prefilters are PHP functions that your templates are ran
+through *before they are compiled*. This is good for preprocessing your
+templates to remove unwanted comments, keeping an eye on what people are
+putting in their templates, etc.
+
+Prefilters can be either [registered](#api.register.filter) or loaded
+from the [plugins directory](#variable.plugins.dir) by using
+[`loadFilter()`](#api.load.filter) function or by setting the
+[`$autoload_filters`](#variable.autoload.filters) variable.
+
+Smarty will pass the template source code as the first argument, and
+expect the function to return the resulting template source code.
+
+This will remove all the html comments in the template source.
+
+
+    <?php
+    // put this in your application
+    function remove_dw_comments($tpl_source, Smarty_Internal_Template $template)
+    {
+        return preg_replace("/<!--#.*-->/U",'',$tpl_source);
+    }
+
+    // register the prefilter
+    $smarty->registerFilter('pre','remove_dw_comments');
+    $smarty->display('index.tpl');
+    ?>
+
+      
+
+See also [`registerFilter()`](#api.register.filter),
+[postfilters](#advanced.features.postfilters) and
+[`loadFilter()`](#api.load.filter).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-security.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-security.md
new file mode 100644
index 000000000..730915f14
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-security.md
@@ -0,0 +1,144 @@
+Security {#advanced.features.security}
+========
+
+Security is good for situations when you have untrusted parties editing
+the templates e.g. via ftp, and you want to reduce the risk of system
+security compromises through the template language.
+
+The settings of the security policy are defined by properties of an
+instance of the Smarty\_Security class. These are the possible settings:
+
+-   `$secure_dir` is an array of template directories that are
+    considered secure. [`$template_dir`](#variable.template.dir)
+    considered secure implicitly. The default is an empty array.
+
+-   `$trusted_dir` is an array of all directories that are considered
+    trusted. Trusted directories are where you keep php scripts that are
+    executed directly from the templates with
+    [`{insert}`](#language.function.insert.php). The default is an
+    empty array.
+
+-   `$trusted_uri` is an array of regular expressions matching URIs that
+    are considered trusted. This security directive used by
+    [`{fetch}`](#language.function.fetch) and
+    [`{html_image}`](#language.function.html.image). URIs passed to
+    these functions are reduced to `{$PROTOCOL}://{$HOSTNAME}` to allow
+    simple regular expressions (without having to deal with edge cases
+    like authentication-tokens).
+
+    The expression `'#https?://.*smarty.net$#i'` would allow accessing
+    the following URIs:
+
+    -   `http://smarty.net/foo`
+
+    -   `http://smarty.net/foo`
+
+    -   `http://www.smarty.net/foo`
+
+    -   `http://smarty.net/foo`
+
+    -   `https://foo.bar.www.smarty.net/foo/bla?blubb=1`
+
+    but deny access to these URIs:
+
+    -   `http://smarty.com/foo` (not matching top-level domain \"com\")
+
+    -   `ftp://www.smarty.net/foo` (not matching protocol \"ftp\")
+
+    -   `http://www.smarty.net.otherdomain.com/foo` (not matching end of
+        domain \"smarty.net\")
+
+-   `$static_classes` is an array of classes that are considered
+    trusted. The default is an empty array which allows access to all
+    static classes. To disable access to all static classes set
+    \$static\_classes = null.
+
+-   `$php_functions` is an array of PHP functions that are considered
+    trusted and can be used from within template. To disable access to
+    all PHP functions set \$php\_functions = null. An empty array (
+    \$php\_functions = array() ) will allow all PHP functions. The
+    default is array(\'isset\', \'empty\', \'count\', \'sizeof\',
+    \'in\_array\', \'is\_array\',\'time\',\'nl2br\').
+
+-   `$php_modifiers` is an array of PHP functions that are considered
+    trusted and can be used from within template as modifier. To disable
+    access to all PHP modifier set \$php\_modifier = null. An empty
+    array ( \$php\_modifier = array() ) will allow all PHP functions.
+    The default is array(\'escape\',\'count\').
+
+-   `$streams` is an array of streams that are considered trusted and
+    can be used from within template. To disable access to all streams
+    set \$streams = null. An empty array ( \$streams = array() ) will
+    allow all streams. The default is array(\'file\').
+
+-   `$allowed_modifiers` is an array of (registered / autoloaded)
+    modifiers that should be accessible to the template. If this array
+    is non-empty, only the herein listed modifiers may be used. This is
+    a whitelist.
+
+-   `$disabled_modifiers` is an array of (registered / autoloaded)
+    modifiers that may not be accessible to the template.
+
+-   `$allowed_tags` is a boolean flag which controls if constants can
+    function-, block and filter plugins that should be accessible to the
+    template. If this array is non-empty, only the herein listed
+    modifiers may be used. This is a whitelist.
+
+-   `$disabled_tags` is an array of (registered / autoloaded) function-,
+    block and filter plugins that may not be accessible to the template.
+
+-   `$allow_constants` is a boolean flag which controls if constants can
+    be accessed by the template. The default is \"true\".
+
+-   `$allow_super_globals` is a boolean flag which controls if the PHP
+    super globals can be accessed by the template. The default is
+    \"true\".
+
+If security is enabled, no private methods, functions or properties of
+static classes or assigned objects can be accessed (beginning with
+\'\_\') by the template.
+
+To customize the security policy settings you can extend the
+Smarty\_Security class or create an instance of it.
+
+
+    <?php
+    require 'Smarty.class.php';
+
+    class My_Security_Policy extends Smarty_Security {
+      // disable all PHP functions
+      public $php_functions = null;
+      // allow everthing as modifier
+      public $php_modifiers = array();
+    }
+    $smarty = new Smarty();
+    // enable security
+    $smarty->enableSecurity('My_Security_Policy');
+    ?>
+
+
+    <?php
+    require 'Smarty.class.php';
+    $smarty = new Smarty();
+    $my_security_policy = new Smarty_Security($smarty);
+    // disable all PHP functions
+    $my_security_policy->php_functions = null;
+    // allow everthing as modifier
+    $my_security_policy->php_modifiers = array();
+    // enable security
+    $smarty->enableSecurity($my_security_policy);
+    ?>
+
+
+    <?php
+    require 'Smarty.class.php';
+    $smarty = new Smarty();
+    // enable default security
+    $smarty->enableSecurity();
+    ?>
+
+> **Note**
+>
+> Most security policy settings are only checked when the template gets
+> compiled. For that reason you should delete all cached and compiled
+> template files when you change your security settings.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-static-classes.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-static-classes.md
new file mode 100644
index 000000000..8ef79113c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-static-classes.md
@@ -0,0 +1,27 @@
+Static Classes {#advanced.features.static.classes}
+==============
+
+You can directly access static classes. The syntax is the same as in
+PHP.
+
+> **Note**
+>
+> Direct access to PHP classes is not recommended. This ties the
+> underlying application code structure directly to the presentation,
+> and also complicates template syntax. It is recommended to register
+> plugins which insulate templates from PHP classes/objects. Use at your
+> own discretion. See the Best Practices section of the Smarty website.
+
+
+    {assign var=foo value=myclass::BAR}  <--- class constant BAR
+
+    {assign var=foo value=myclass::method()}  <--- method result
+
+    {assign var=foo value=myclass::method1()->method2}  <--- method chaining
+
+    {assign var=foo value=myclass::$bar}  <--- property bar of class myclass
+
+    {assign var=foo value=$bar::method}  <--- using Smarty variable bar as class name
+
+
+      
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-streams.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-streams.md
new file mode 100644
index 000000000..d6f7a0de5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-streams.md
@@ -0,0 +1,15 @@
+Streams {#advanced.features.streams}
+=======
+
+You can also use streams to call variables. *{\$foo:bar}* will use the
+*foo://bar* stream to get the template variable.
+
+Using a PHP stream for a template variable resource from within a
+template.
+
+
+    {$foo:bar}
+
+      
+
+See also [`Template Resources`](#resources)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-template-inheritance.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-template-inheritance.md
new file mode 100644
index 000000000..ce47310ca
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-template-inheritance.md
@@ -0,0 +1,128 @@
+Template Inheritance {#advanced.features.template.inheritance}
+====================
+
+Inheritance brings the concept of Object Oriented Programming to
+templates, allowing you to define one (or more) base templates that can
+be extended by child templates. Extending means that the child template
+can override all or some of the parent named block areas.
+
+-   The inheritance tree can be as deep as you want, meaning you can
+    extend a file that extends another one that extends another one and
+    so on.
+
+-   The child templates can not define any content besides what\'s
+    inside [`{block}`](#language.function.block) tags they override.
+    Anything outside of [`{block}`](#language.function.block) tags will
+    be removed.
+
+-   The content of [`{block}`](#language.function.block) tags from child
+    and parent templates can be merged by the `append` or `prepend`
+    [`{block}`](#language.function.block) tag option flags and
+    `{$smarty.block.parent}` or `{$smarty.block.child}` placeholders.
+
+-   Template inheritance is a compile time process which creates a
+    single compiled template file. Compared to corresponding solutions
+    based on subtemplates included with the
+    [`{include}`](#language.function.include) tag it does have much
+    better performance when rendering.
+
+-   The child template extends its parent defined with the
+    [`{extends}`](#language.function.extends) tag, which must be the
+    first line in the child template. Instead of using the
+    [`{extends}`](#language.function.extends) tags in the template files
+    you can define the whole template inheritance tree in the PHP script
+    when you are calling [`fetch()`](#api.fetch) or
+    [`display()`](#api.display) with the `extends:` template resource
+    type. The later provides even more flexibility.
+
+> **Note**
+>
+> When `$compile_check` is enabled, all files in the inheritance tree
+> are checked for modifications upon each invocation. You may want to
+> disable `$compile_check` on production servers for this reason.
+
+> **Note**
+>
+> If you have a subtemplate which is included with
+> [`{include}`](#language.function.include) and it contains
+> [`{block}`](#language.function.block) areas it works only if the
+> [`{include}`](#language.function.include) itself is called from within
+> a surrounding [`{block}`](#language.function.block). In the final
+> parent template you may need a dummy
+> [`{block}`](#language.function.block) for it.
+
+layout.tpl (parent)
+
+
+    <html>
+    <head>
+      <title>{block name=title}Default Page Title{/block}</title>
+      {block name=head}{/block}
+    </head>
+    <body>
+    {block name=body}{/block}
+    </body>
+    </html>
+
+      
+
+myproject.tpl (child)
+
+
+    {extends file='layout.tpl'}
+    {block name=head}
+      <link href="/css/mypage.css" rel="stylesheet" type="text/css"/>
+      <script src="/js/mypage.js"></script>
+    {/block}
+
+
+      
+
+mypage.tpl (grandchild)
+
+
+    {extends file='myproject.tpl'}
+    {block name=title}My Page Title{/block}
+    {block name=head}
+      <link href="/css/mypage.css" rel="stylesheet" type="text/css"/>
+      <script src="/js/mypage.js"></script>
+    {/block}
+    {block name=body}My HTML Page Body goes here{/block}
+
+      
+
+To render the above use
+
+
+     $smarty->display('mypage.tpl');
+
+The resulting output is
+
+
+    <html>
+    <head>
+      <title>My Page Title</title>
+      <link href="/css/mypage.css" rel="stylesheet" type="text/css"/>
+      <script src="/js/mypage.js"></script>
+    </head>
+    <body>
+    My HTML Page Body goes here
+    </body>
+    </html>
+
+Instead of using [`{extends}`](#language.function.extends) tags in the
+template files you can define the inheritance tree in your PHP script by
+using the [`extends:` resource](#resources.extends) type.
+
+The code below will return same result as the example above.
+
+
+    <?php
+    $smarty->display('extends:layout.tpl|myproject.tpl|mypage.tpl'); 
+    ?>
+
+       
+
+See also [`{block}`](#language.function.block),
+[`{extends}`](#language.function.extends) and [`extends:`
+resource](#resources.extends)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-template-settings.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-template-settings.md
new file mode 100644
index 000000000..b06430ff0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-template-settings.md
@@ -0,0 +1,32 @@
+Changing settings by template {#advanced.features.template.settings}
+=============================
+
+Normally you configure the Smarty settings by modifying the
+[`Smarty class variables`](#api.variables). Furthermore you can register
+plugins, filters etc. with [`Smarty functions`](#api.functions).
+Modifications done to the Smarty object will be global for all
+templates.
+
+However the Smarty class variables and functions can be accessed or
+called by individual template objects. Modification done to a template
+object will apply only for that template and its included subtemplates.
+
+
+    <?php
+    $tpl = $smarty->createTemplate('index.tpl);
+    $tpl->cache_lifetime = 600;
+    //or
+    $tpl->setCacheLifetime(600);
+    $smarty->display($tpl);
+    ?>
+
+        
+
+
+    <?php
+    $tpl = $smarty->createTemplate('index.tpl);
+    $tpl->registerPlugin('modifier','mymodifier');
+    $smarty->display($tpl);
+    ?>
+
+        
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions.md
new file mode 100644
index 000000000..6f120fa9a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions.md
@@ -0,0 +1,64 @@
+Smarty Class Methods {#api.functions}
+====================
+
+## Table of contents
+
+- [addConfigDir()](./api-functions/api-add-config-dir.md) — add a directory to the list of directories where config files are stored
+- [addPluginsDir()](./api-functions/api-add-plugins-dir.md) — add a directory to the list of directories where plugins are stored
+- [addTemplateDir()](./api-functions/api-add-template-dir.md) — add a directory to the list of directories where templates are stored
+- [append()](./api-functions/api-append.md) — append an element to an assigned array
+- [appendByRef()](./api-functions/api-append-by-ref.md) — append values  by reference
+- [assign()](./api-functions/api-assign.md) — assign variables/objects to the templates
+- [assignByRef()](./api-functions/api-assign-by-ref.md) — assign values by reference
+- [clearAllAssign()](./api-functions/api-clear-all-assign.md) — clears the values of all assigned variables
+- [clearAllCache()](./api-functions/api-clear-all-cache.md) — clears the entire template cache
+- [clearAssign()](./api-functions/api-clear-assign.md) — clears the value of an assigned variable
+- [clearCache()](./api-functions/api-clear-cache.md) — clears the cache for a specific template
+- [clearCompiledTemplate()](./api-functions/api-clear-compiled-tpl.md) — clears the compiled version of the specified template resource
+- [clearConfig()](./api-functions/api-clear-config.md) — clears assigned config variables
+- [compileAllConfig()](./api-functions/api-compile-all-config.md) — compiles all known config files
+- [compileAllTemplates()](./api-functions/api-compile-all-templates.md) — compiles all known templates
+- [configLoad()](./api-functions/api-config-load.md) —  loads config file  data and assigns it to the template
+- [createData()](./api-functions/api-create-data.md) — creates a data object
+- [createTemplate()](./api-functions/api-create-template.md) — returns a template object
+- [disableSecurity()](./api-functions/api-disable-security.md) — disables template security
+- [display()](./api-functions/api-display.md) — displays the template
+- [enableSecurity()](./api-functions/api-enable-security.md) — enables template security
+- [fetch()](./api-functions/api-fetch.md) — returns the template output
+- [getCacheDir()](./api-functions/api-get-cache-dir.md) — return the directory where the rendered template's output is stored
+- [getCompileDir()](./api-functions/api-get-compile-dir.md) — returns the directory where compiled templates are stored
+- [getConfigDir()](./api-functions/api-get-config-dir.md) — return the directory where config files are stored
+- [getConfigVars()](./api-functions/api-get-config-vars.md) — returns the given loaded config variable value
+- [getPluginsDir()](./api-functions/api-get-plugins-dir.md) — return the directory where plugins are stored
+- [getRegisteredObject()](./api-functions/api-get-registered-object.md) — returns a reference to a registered object
+- [getTags()](./api-functions/api-get-tags.md) — return tags used by template
+- [getTemplateDir()](./api-functions/api-get-template-dir.md) — return the directory where templates are stored
+- [getTemplateVars()](./api-functions/api-get-template-vars.md) — returns  assigned variable value(s)
+- [isCached()](./api-functions/api-is-cached.md) — returns true if there is a valid cache for this template
+- [loadFilter()](./api-functions/api-load-filter.md) — load a filter plugin
+- [muteExpectedErrors()](./api-functions/api-mute-expected-errors.md) — mutes expected warnings and notices deliberately generated by Smarty
+- [registerCacheResource()](./api-functions/api-register-cacheresource.md) — dynamically register CacheResources
+- [registerClass()](./api-functions/api-register-class.md) — register a class for use in the templates
+- [registerDefaultPluginHandler()](./api-functions/api-register-default-plugin-handler.md) — register a function which gets called on undefined tags
+- [registerFilter()](./api-functions/api-register-filter.md) — dynamically register filters
+- [registerPlugin()](./api-functions/api-register-plugin.md) — dynamically register plugins
+- [registerObject()](./api-functions/api-register-object.md) — register an object for use in the templates
+- [registerResource()](./api-functions/api-register-resource.md) — dynamically register resources
+- [setCacheDir()](./api-functions/api-set-cache-dir.md) — set the directory where the rendered template's output is stored
+- [setCompileDir()](./api-functions/api-set-compile-dir.md) — set the directory where compiled templates are stored
+- [setConfigDir()](./api-functions/api-set-config-dir.md) — set the directories where config files are stored
+- [setPluginsDir()](./api-functions/api-set-plugins-dir.md) — set the directories where plugins are stored
+- [setTemplateDir()](./api-functions/api-set-template-dir.md) — set the directories where templates are stored
+- [templateExists()](./api-functions/api-template-exists.md) — checks whether the specified template exists
+- [unregisterCacheResource()](./api-functions/api-unregister-cacheresource.md) — dynamically unregister a CacheResource plugin
+- [unregisterFilter()](./api-functions/api-unregister-filter.md) — dynamically unregister a filter
+- [unregisterPlugin()](./api-functions/api-unregister-plugin.md) — dynamically unregister plugins
+- [unregisterObject()](./api-functions/api-unregister-object.md) — dynamically unregister an object
+- [unregisterResource()](./api-functions/api-unregister-resource.md) — dynamically unregister a resource plugin
+- [testInstall()](./api-functions/api-test-install.md) — checks Smarty installation
+
+> **Note**
+>
+> See
+> [`Changing settings by template`](./advanced-features/advanced-features-template-settings.md)
+> section for how to use the functions for individual templates.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-add-config-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-add-config-dir.md
new file mode 100644
index 000000000..c3a052289
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-add-config-dir.md
@@ -0,0 +1,49 @@
+addConfigDir()
+
+add a directory to the list of directories where config files are stored
+
+Description
+===========
+
+Smarty
+
+addConfigDir
+
+string\|array
+
+config\_dir
+
+string
+
+key
+
+
+    <?php
+
+    // add directory where config files are stored
+    $smarty->addConfigDir('./config_1');
+
+    // add directory where config files are stored and specify array-key
+    $smarty->addConfigDir('./config_1', 'one');
+
+    // add multiple directories where config files are stored and specify array-keys
+    $smarty->addTemplateDir(array(
+        'two' => './config_2',
+        'three' => './config_3',
+    ));
+
+    // view the template dir chain
+    var_dump($smarty->getConfigDir());
+
+    // chaining of method calls
+    $smarty->setConfigDir('./config')
+           ->addConfigDir('./config_1', 'one')
+           ->addConfigDir('./config_2', 'two');
+
+    ?>
+
+       
+
+See also [`getConfigDir()`](#api.get.config.dir),
+[`setConfigDir()`](#api.set.config.dir) and
+[`$config_dir`](#variable.config.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-add-plugins-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-add-plugins-dir.md
new file mode 100644
index 000000000..ec9741b6e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-add-plugins-dir.md
@@ -0,0 +1,42 @@
+addPluginsDir()
+
+add a directory to the list of directories where plugins are stored
+
+Description
+===========
+
+Smarty
+
+addPluginsDir
+
+string\|array
+
+plugins\_dir
+
+
+    <?php
+
+    // add directory where plugins are stored
+    $smarty->addPluginsDir('./plugins_1');
+
+    // add multiple directories where plugins are stored
+    $smarty->setPluginsDir(array(
+        './plugins_2',
+        './plugins_3',
+    ));
+
+    // view the plugins dir chain
+    var_dump($smarty->getPluginsDir());
+
+    // chaining of method calls
+    $smarty->setPluginsDir('./plugins')
+           ->addPluginsDir('./plugins_1')
+           ->addPluginsDir('./plugins_2');
+
+    ?>
+
+       
+
+See also [`getPluginsDir()`](#api.get.plugins.dir),
+[`setPluginsDir()`](#api.set.plugins.dir) and
+[`$plugins_dir`](#variable.plugins.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-add-template-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-add-template-dir.md
new file mode 100644
index 000000000..e0d24564c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-add-template-dir.md
@@ -0,0 +1,49 @@
+addTemplateDir()
+
+add a directory to the list of directories where templates are stored
+
+Description
+===========
+
+Smarty
+
+addTemplateDir
+
+string\|array
+
+template\_dir
+
+string
+
+key
+
+
+    <?php
+
+    // add directory where templates are stored
+    $smarty->addTemplateDir('./templates_1');
+
+    // add directory where templates are stored and specify array-key
+    $smarty->addTemplateDir('./templates_1', 'one');
+
+    // add multiple directories where templates are stored and specify array-keys
+    $smarty->addTemplateDir(array(
+        'two' => './templates_2',
+        'three' => './templates_3',
+    ));
+
+    // view the template dir chain
+    var_dump($smarty->getTemplateDir());
+
+    // chaining of method calls
+    $smarty->setTemplateDir('./templates')
+           ->addTemplateDir('./templates_1', 'one')
+           ->addTemplateDir('./templates_2', 'two');
+
+    ?>
+
+       
+
+See also [`getTemplateDir()`](#api.get.template.dir),
+[`setTemplateDir()`](#api.set.template.dir) and
+[`$template_dir`](#variable.template.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-append-by-ref.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-append-by-ref.md
new file mode 100644
index 000000000..cd396d9cc
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-append-by-ref.md
@@ -0,0 +1,46 @@
+appendByRef()
+
+append values by reference
+
+Description
+===========
+
+void
+
+appendByRef
+
+string
+
+varname
+
+mixed
+
+var
+
+bool
+
+merge
+
+This is used to [`append()`](#api.append) values to the templates by
+reference.
+
+> **Note**
+>
+> With the introduction of PHP5, `appendByRef()` is not necessary for
+> most intents and purposes. `appendByRef()` is useful if you want a PHP
+> array index value to be affected by its reassignment from a template.
+> Assigned object properties behave this way by default.
+
+NOTE.PARAMETER.MERGE
+
+
+    <?php
+    // appending name/value pairs
+    $smarty->appendByRef('Name', $myname);
+    $smarty->appendByRef('Address', $address);
+    ?>
+
+       
+
+See also [`append()`](#api.append), [`assign()`](#api.assign) and
+[`getTemplateVars()`](#api.get.template.vars).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-append.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-append.md
new file mode 100644
index 000000000..b94586417
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-append.md
@@ -0,0 +1,61 @@
+append()
+
+append an element to an assigned array
+
+Description
+===========
+
+void
+
+append
+
+mixed
+
+var
+
+void
+
+append
+
+string
+
+varname
+
+mixed
+
+var
+
+bool
+
+merge
+
+If you append to a string value, it is converted to an array value and
+then appended to. You can explicitly pass name/value pairs, or
+associative arrays containing the name/value pairs. If you pass the
+optional third parameter of TRUE, the value will be merged with the
+current array instead of appended.
+
+NOTE.PARAMETER.MERGE
+
+
+    <?php
+    // This is effectively the same as assign()
+    $smarty->append('foo', 'Fred');
+    // After this line, foo will now be seen as an array in the template
+    $smarty->append('foo', 'Albert');
+
+    $array = array(1 => 'one', 2 => 'two');
+    $smarty->append('X', $array);
+    $array2 = array(3 => 'three', 4 => 'four');
+    // The following line will add a second element to the X array
+    $smarty->append('X', $array2);
+
+    // passing an associative array
+    $smarty->append(array('city' => 'Lincoln', 'state' => 'Nebraska'));
+    ?>
+
+       
+
+See also [`appendByRef()`](#api.append.by.ref),
+[`assign()`](#api.assign) and
+[`getTemplateVars()`](#api.get.template.vars)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-assign-by-ref.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-assign-by-ref.md
new file mode 100644
index 000000000..7c42b4836
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-assign-by-ref.md
@@ -0,0 +1,42 @@
+assignByRef()
+
+assign values by reference
+
+Description
+===========
+
+void
+
+assignByRef
+
+string
+
+varname
+
+mixed
+
+var
+
+This is used to [`assign()`](#api.assign) values to the templates by
+reference.
+
+> **Note**
+>
+> With the introduction of PHP5, `assignByRef()` is not necessary for
+> most intents and purposes. `assignByRef()` is useful if you want a PHP
+> array index value to be affected by its reassignment from a template.
+> Assigned object properties behave this way by default.
+
+
+    <?php
+    // passing name/value pairs
+    $smarty->assignByRef('Name', $myname);
+    $smarty->assignByRef('Address', $address);
+    ?>
+
+       
+
+See also [`assign()`](#api.assign),
+[`clearAllAssign()`](#api.clear.all.assign), [`append()`](#api.append),
+[`{assign}`](#language.function.assign) and
+[`getTemplateVars()`](#api.get.template.vars).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-assign.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-assign.md
new file mode 100644
index 000000000..c3b9985d4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-assign.md
@@ -0,0 +1,84 @@
+assign()
+
+assign variables/objects to the templates
+
+Description
+===========
+
+void
+
+assign
+
+mixed
+
+var
+
+void
+
+assign
+
+string
+
+varname
+
+mixed
+
+var
+
+bool
+
+nocache
+
+You can explicitly pass name/value pairs, or associative arrays
+containing the name/value pairs.
+
+If you pass the optional third `nocache` parameter of TRUE, the variable
+is assigned as nocache variable. See
+[`Cacheability of Variables`](#cacheability.variables) for details.
+
+> **Note**
+>
+> When you assign/register objects to templates, be sure that all
+> properties and methods accessed from the template are for presentation
+> purposes only. It is very easy to inject application logic through
+> objects, and this leads to poor designs that are difficult to manage.
+> See the Best Practices section of the Smarty website.
+
+
+    <?php
+    // passing name/value pairs
+    $smarty->assign('Name', 'Fred');
+    $smarty->assign('Address', $address);
+
+    // passing an associative array
+    $smarty->assign(array('city' => 'Lincoln', 'state' => 'Nebraska'));
+
+    // passing an array
+    $myArray = array('no' => 10, 'label' => 'Peanuts');
+    $smarty->assign('foo',$myArray);
+
+    // passing a row from a database (eg adodb)
+    $sql = 'select id, name, email from contacts where contact ='.$id;
+    $smarty->assign('contact', $db->getRow($sql));
+    ?>
+
+These are accessed in the template with
+
+
+    {* note the vars are case sensitive like php *}
+    {$Name}
+    {$Address}
+    {$city}
+    {$state}
+
+    {$foo.no}, {$foo.label}
+    {$contact.id}, {$contact.name},{$contact.email}
+
+To access more complex array assignments see
+[`{foreach}`](#language.function.foreach) and
+[`{section}`](#language.function.section)
+
+See also [`assignByRef()`](#api.assign.by.ref),
+[`getTemplateVars()`](#api.get.template.vars),
+[`clearAssign()`](#api.clear.assign), [`append()`](#api.append) and
+[`{assign}`](#language.function.assign)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-assign.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-assign.md
new file mode 100644
index 000000000..cc75fad0f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-assign.md
@@ -0,0 +1,34 @@
+clearAllAssign()
+
+clears the values of all assigned variables
+
+Description
+===========
+
+void
+
+clearAllAssign
+
+
+    <?php
+    // passing name/value pairs
+    $smarty->assign('Name', 'Fred');
+    $smarty->assign('Address', $address);
+
+    // will output above
+    print_r( $smarty->getTemplateVars() );
+
+    // clear all assigned variables
+    $smarty->clearAllAssign();
+
+    // will output nothing
+    print_r( $smarty->getTemplateVars() );
+
+    ?>
+
+       
+
+See also [`clearAssign()`](#api.clear.assign),
+[`clearConfig()`](#api.clear.config),
+[`getTemplateVars()`](#api.get.template.vars), [`assign()`](#api.assign)
+and [`append()`](#api.append)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-cache.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-cache.md
new file mode 100644
index 000000000..55cbe5795
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-cache.md
@@ -0,0 +1,37 @@
+clearAllCache()
+
+clears the entire template cache
+
+Description
+===========
+
+void
+
+clearAllCache
+
+int
+
+expire\_time
+
+As an optional parameter, you can supply a minimum age in seconds the
+cache files must be before they will get cleared.
+
+> **Note**
+>
+> Since Smarty version 3.1.14 it is possible to delete cache files by
+> their individual expiration time at creation by passing constant
+> SMARTY::CLEAR\_EXPIRED as `expire_time` parameter.
+
+
+    <?php
+    // clear the entire cache
+    $smarty->clearAllCache();
+
+    // clears all files over one hour old
+    $smarty->clearAllCache(3600);
+    ?>
+
+       
+
+See also [`clearCache()`](#api.clear.cache),
+[`isCached()`](#api.is.cached) and the [caching](#caching) page.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-assign.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-assign.md
new file mode 100644
index 000000000..ac0731e86
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-assign.md
@@ -0,0 +1,32 @@
+clearAssign()
+
+clears the value of an assigned variable
+
+Description
+===========
+
+void
+
+clearAssign
+
+mixed
+
+var
+
+This can be a single value, or an array of values.
+
+
+    <?php
+    // clear a single variable
+    $smarty->clearAssign('Name');
+
+    // clears multiple variables
+    $smarty->clearAssign(array('Name', 'Address', 'Zip'));
+    ?>
+
+       
+
+See also [`clearAllAssign()`](#api.clear.all.assign),
+[`clearConfig()`](#api.clear.config),
+[`getTemplateVars()`](#api.get.template.vars), [`assign()`](#api.assign)
+and [`append()`](#api.append)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-cache.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-cache.md
new file mode 100644
index 000000000..3e17d80c8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-cache.md
@@ -0,0 +1,60 @@
+clearCache()
+
+clears the cache for a specific template
+
+Description
+===========
+
+void
+
+clearCache
+
+string
+
+template
+
+string
+
+cache\_id
+
+string
+
+compile\_id
+
+int
+
+expire\_time
+
+-   If you have [multiple caches](#caching.multiple.caches) for a
+    template, you can clear a specific cache by supplying the `cache_id`
+    as the second parameter.
+
+-   You can also pass a [`$compile_id`](#variable.compile.id) as a third
+    parameter. You can [group templates together](#caching.groups) so
+    they can be removed as a group, see the [caching section](#caching)
+    for more information.
+
+-   As an optional fourth parameter, you can supply a minimum age in
+    seconds the cache file must be before it will get cleared.
+
+    > **Note**
+    >
+    > Since Smarty version 3.1.14 it is possible to delete cache files
+    > by their individual expiration time at creation by passing
+    > constant SMARTY::CLEAR\_EXPIRED as fourth parameter.
+
+<!-- -->
+
+
+    <?php
+    // clear the cache for a template
+    $smarty->clearCache('index.tpl');
+
+    // clear the cache for a particular cache id in an multiple-cache template
+    $smarty->clearCache('index.tpl', 'MY_CACHE_ID');
+    ?>
+
+       
+
+See also [`clearAllCache()`](#api.clear.all.cache) and
+[`caching`](#caching) section.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-compiled-tpl.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-compiled-tpl.md
new file mode 100644
index 000000000..dfa688eb6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-compiled-tpl.md
@@ -0,0 +1,44 @@
+clearCompiledTemplate()
+
+clears the compiled version of the specified template resource
+
+Description
+===========
+
+void
+
+clearCompiledTemplate
+
+string
+
+tpl\_file
+
+string
+
+compile\_id
+
+int
+
+exp\_time
+
+This clears the compiled version of the specified template resource, or
+all compiled template files if one is not specified. If you pass a
+[`$compile_id`](#variable.compile.id) only the compiled template for
+this specific [`$compile_id`](#variable.compile.id) is cleared. If you
+pass an exp\_time, then only compiled templates older than `exp_time`
+seconds are cleared, by default all compiled templates are cleared
+regardless of their age. This function is for advanced use only, not
+normally needed.
+
+
+    <?php
+    // clear a specific template resource
+    $smarty->clearCompiledTemplate('index.tpl');
+
+    // clear entire compile directory
+    $smarty->clearCompiledTemplate();
+    ?>
+
+       
+
+See also [`clearCache()`](#api.clear.cache).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-config.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-config.md
new file mode 100644
index 000000000..43e86be17
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-config.md
@@ -0,0 +1,35 @@
+clearConfig()
+
+clears assigned config variables
+
+Description
+===========
+
+void
+
+clearConfig
+
+string
+
+var
+
+This clears all assigned [config variables](#language.config.variables).
+If a variable name is supplied, only that variable is cleared.
+
+
+    <?php
+    // clear all assigned config variables.
+    $smarty->clearConfig();
+
+    // clear one variable
+    $smarty->clearConfig('foobar');
+    ?>
+
+       
+
+See also [`getConfigVars()`](#api.get.config.vars),
+[`config variables`](#language.config.variables),
+[`config files`](#config.files),
+[`{config_load}`](#language.function.config.load),
+[`configLoad()`](#api.config.load) and
+[`clearAssign()`](#api.clear.assign).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-config.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-config.md
new file mode 100644
index 000000000..a102fc97e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-config.md
@@ -0,0 +1,61 @@
+compileAllConfig()
+
+compiles all known config files
+
+Description
+===========
+
+string
+
+compileAllConfig
+
+string
+
+extension
+
+boolean
+
+force
+
+integer
+
+timelimit
+
+integer
+
+maxerror
+
+This function compiles config files found in the
+[`$config_dir`](#variable.config.dir) folder. It uses the following
+parameters:
+
+-   `extension` is an optional string which defines the file extension
+    for the config files. The default is \".conf\".
+
+-   `force` is an optional boolean which controls if only modified
+    (false) or all (true) config files shall be compiled. The default is
+    \"false\".
+
+-   `timelimit` is an optional integer to set a runtime limit in seconds
+    for the compilation process. The default is no limit.
+
+-   `maxerror` is an optional integer to set an error limit. If more
+    config files failed to compile the function will be aborted. The
+    default is no limit.
+
+> **Note**
+>
+> This function may not create desired results in all configurations.
+> Use is on own risk.
+
+
+    <?php
+    include('Smarty.class.php');
+    $smarty = new Smarty;
+
+    // force compilation of all config files
+    $smarty->compileAllConfig('.config',true);
+
+    ?>
+
+        
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-templates.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-templates.md
new file mode 100644
index 000000000..53a021da8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-templates.md
@@ -0,0 +1,71 @@
+compileAllTemplates()
+
+compiles all known templates
+
+Description
+===========
+
+string
+
+compileAllTemplates
+
+string
+
+extension
+
+boolean
+
+force
+
+integer
+
+timelimit
+
+integer
+
+maxerror
+
+This function compiles template files found in the
+[`$template_dir`](#variable.template.dir) folder. It uses the following
+parameters:
+
+-   `extension` is an optional string which defines the file extension
+    for the template files. The default is \".tpl\".
+
+-   `force` is an optional boolean which controls if only modified
+    (false) or all (true) templates shall be compiled. The default is
+    \"false\".
+
+-   `timelimit` is an optional integer to set a runtime limit in seconds
+    for the compilation process. The default is no limit.
+
+-   `maxerror` is an optional integer to set an error limit. If more
+    templates failed to compile the function will be aborted. The
+    default is no limit.
+
+> **Note**
+>
+> This function may not create desired results in all configurations.
+> Use is on own risk.
+
+> **Note**
+>
+> If any template requires registered plugins, filters or objects you
+> must register all of them before running this function.
+
+> **Note**
+>
+> If you are using template inheritance this function will create
+> compiled files of parent templates which will never be used.
+
+
+    <?php
+    include('Smarty.class.php');
+    $smarty = new Smarty;
+
+    // force compilation of all template files
+    $smarty->compileAllTemplates('.tpl',true);
+
+    ?>
+
+        
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-config-load.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-config-load.md
new file mode 100644
index 000000000..bf6001fa4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-config-load.md
@@ -0,0 +1,47 @@
+configLoad()
+
+loads config file data and assigns it to the template
+
+Description
+===========
+
+void
+
+configLoad
+
+string
+
+file
+
+string
+
+section
+
+This loads [config file](#config.files) data and assigns it to the
+template. This works identically to the template
+[`{config_load}`](#language.function.config.load) function.
+
+> **Note**
+>
+> As of Smarty 2.4.0, assigned template variables are kept across
+> invocations of [`fetch()`](#api.fetch) and
+> [`display()`](#api.display). Config vars loaded from `configLoad()`
+> are always global in scope. Config files are also compiled for faster
+> execution, and respect the [`$force_compile`](#variable.force.compile)
+> and [`$compile_check`](#variable.compile.check) settings.
+
+
+    <?php
+    // load config variables and assign them
+    $smarty->configLoad('my.conf');
+
+    // load a section
+    $smarty->configLoad('my.conf', 'foobar');
+    ?>
+
+       
+
+See also [`{config_load}`](#language.function.config.load),
+[`getConfigVars()`](#api.get.config.vars),
+[`clearConfig()`](#api.clear.config), and
+[`config variables`](#language.config.variables)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-create-data.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-create-data.md
new file mode 100644
index 000000000..7e083776e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-create-data.md
@@ -0,0 +1,52 @@
+createData()
+
+creates a data object
+
+Description
+===========
+
+string
+
+createData
+
+object
+
+parent
+
+string
+
+createData
+
+This creates a data object which will hold assigned variables. It uses
+the following parameters:
+
+-   `parent` is an optional parameter. It is an uplink to the main
+    Smarty object, a another user-created data object or to user-created
+    template object. These objects can be chained. Templates can access
+    variables assigned to any of the objects in it\'s parent chain.
+
+Data objects are used to create scopes for assigned variables. They can
+be used to control which variables are seen by which templates.
+
+
+    <?php
+    include('Smarty.class.php');
+    $smarty = new Smarty;
+
+    // create data object with its private variable scope
+    $data = $smarty->createData();
+
+    // assign variable to data scope
+    $data->assign('foo','bar');
+
+    // create template object which will use variables from data object
+    $tpl = $smarty->createTemplate('index.tpl',$data);
+
+    // display the template
+    $tpl->display();
+    ?>
+
+        
+
+See also [`display()`](#api.display), and
+[`createTemplate()`](#api.create.template),
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-create-template.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-create-template.md
new file mode 100644
index 000000000..5129406d4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-create-template.md
@@ -0,0 +1,99 @@
+createTemplate()
+
+returns a template object
+
+Description
+===========
+
+Smarty\_Internal\_Template
+
+createTemplate
+
+string
+
+template
+
+object
+
+parent
+
+Smarty\_Internal\_Template
+
+createTemplate
+
+string
+
+template
+
+array
+
+data
+
+Smarty\_Internal\_Template
+
+createTemplate
+
+string
+
+template
+
+string
+
+cache\_id
+
+string
+
+compile\_id
+
+object
+
+parent
+
+Smarty\_Internal\_Template
+
+createTemplate
+
+string
+
+template
+
+string
+
+cache\_id
+
+string
+
+compile\_id
+
+array
+
+data
+
+This creates a template object which later can be rendered by the
+[display](#api.display) or [fetch](#api.fetch) method. It uses the
+following parameters:
+
+-   `template` must be a valid [template resource](#resources) type and
+    path.
+
+<!-- -->
+
+
+    <?php
+    include('Smarty.class.php');
+    $smarty = new Smarty;
+
+    // create template object with its private variable scope
+    $tpl = $smarty->createTemplate('index.tpl');
+
+    // assign variable to template scope
+    $tpl->assign('foo','bar');
+
+    // display the template
+    $tpl->display();
+    ?>
+
+        
+
+See also [`display()`](#api.display), and
+[`templateExists()`](#api.template.exists).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-disable-security.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-disable-security.md
new file mode 100644
index 000000000..1166828e5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-disable-security.md
@@ -0,0 +1,15 @@
+disableSecurity()
+
+disables template security
+
+Description
+===========
+
+string
+
+disableSecurity
+
+This disables security checking on templates.
+
+See also [`enableSecurity()`](#api.enable.security), and
+[Security](#advanced.features.security).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-display.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-display.md
new file mode 100644
index 000000000..59726195e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-display.md
@@ -0,0 +1,82 @@
+display()
+
+displays the template
+
+Description
+===========
+
+void
+
+display
+
+string
+
+template
+
+string
+
+cache\_id
+
+string
+
+compile\_id
+
+This displays the contents of a template. To return the contents of a
+template into a variable, use [`fetch()`](#api.fetch). Supply a valid
+[template resource](#resources) type and path. As an optional second
+parameter, you can pass a `$cache_id`, see the [caching
+section](#caching) for more information.
+
+PARAMETER.COMPILEID
+
+
+    <?php
+    include(SMARTY_DIR.'Smarty.class.php');
+    $smarty = new Smarty();
+    $smarty->setCaching(true);
+
+    // only do db calls if cache doesn't exist
+    if(!$smarty->isCached('index.tpl')) {
+
+      // dummy up some data
+      $address = '245 N 50th';
+      $db_data = array(
+                   'City' => 'Lincoln',
+                   'State' => 'Nebraska',
+                   'Zip' => '68502'
+                 );
+
+      $smarty->assign('Name', 'Fred');
+      $smarty->assign('Address', $address);
+      $smarty->assign('data', $db_data);
+
+    }
+
+    // display the output
+    $smarty->display('index.tpl');
+    ?>
+
+       
+
+Use the syntax for [template resources](#resources) to display files
+outside of the [`$template_dir`](#variable.template.dir) directory.
+
+
+    <?php
+    // absolute filepath
+    $smarty->display('/usr/local/include/templates/header.tpl');
+
+    // absolute filepath (same thing)
+    $smarty->display('file:/usr/local/include/templates/header.tpl');
+
+    // windows absolute filepath (MUST use "file:" prefix)
+    $smarty->display('file:C:/www/pub/templates/header.tpl');
+
+    // include from template resource named "db"
+    $smarty->display('db:header.tpl');
+    ?>
+
+       
+
+See also [`fetch()`](#api.fetch) and
+[`templateExists()`](#api.template.exists).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-enable-security.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-enable-security.md
new file mode 100644
index 000000000..72ee38bb9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-enable-security.md
@@ -0,0 +1,41 @@
+enableSecurity()
+
+enables template security
+
+Description
+===========
+
+string
+
+enableSecurity
+
+string
+
+securityclass
+
+string
+
+enableSecurity
+
+object
+
+securityobject
+
+string
+
+enableSecurity
+
+This enables security checking on templates. It uses the following
+parameters:
+
+-   `securityclass` is an optional parameter. It\'s the name of the
+    class with defines the security policy parameters.
+
+-   `securityobject` is an optional parameter. It\'s the object with
+    defines the security policy parameters.
+
+For the details how to setup a security policy see the
+[Security](#advanced.features.security) section.
+
+See also [`disableSecurity()`](#api.disable.security), and
+[Security](#advanced.features.security).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-fetch.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-fetch.md
new file mode 100644
index 000000000..6da05bd0e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-fetch.md
@@ -0,0 +1,91 @@
+fetch()
+
+returns the template output
+
+Description
+===========
+
+string
+
+fetch
+
+string
+
+template
+
+string
+
+cache\_id
+
+string
+
+compile\_id
+
+This returns the template output instead of [displaying](#api.display)
+it. Supply a valid [template resource](#resources) type and path. As an
+optional second parameter, you can pass a `$cache id`, see the [caching
+section](#caching) for more information.
+
+PARAMETER.COMPILEID
+
+
+    <?php
+    include('Smarty.class.php');
+    $smarty = new Smarty;
+
+    $smarty->setCaching(true);
+
+    // set a separate cache_id for each unique URL
+    $cache_id = md5($_SERVER['REQUEST_URI']);
+
+    // capture the output
+    $output = $smarty->fetch('index.tpl', $cache_id);
+
+    // do something with $output here
+    echo $output;
+    ?>
+
+        
+
+The `email_body.tpl` template
+
+
+    Dear {$contact_info.name},
+
+    Welcome and thank you for signing up as a member of our user group.
+
+    Click on the link below to login with your user name
+    of '{$contact_info.username}' so you can post in our forums.
+
+    {$login_url}
+
+    List master
+
+    {textformat wrap=40}
+    This is some long-winded disclaimer text that would automatically get wrapped
+    at 40 characters. This helps make the text easier to read in mail programs that
+    do not wrap sentences for you.
+    {/textformat}
+
+        
+
+The php script using the PHP [`mail()`](https://www.php.net/function.mail)
+function
+
+
+    <?php
+
+    // get $contact_info from db or other resource here
+
+    $smarty->assign('contact_info',$contact_info);
+    $smarty->assign('login_url',"http://{$_SERVER['SERVER_NAME']}/login");
+
+    mail($contact_info['email'], 'Thank You', $smarty->fetch('email_body.tpl'));
+
+    ?>
+
+        
+
+See also [`{fetch}`](#language.function.fetch)
+[`display()`](#api.display), [`{eval}`](#language.function.eval), and
+[`templateExists()`](#api.template.exists).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-cache-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-cache-dir.md
new file mode 100644
index 000000000..9e55d8d0b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-cache-dir.md
@@ -0,0 +1,23 @@
+getCacheDir()
+
+return the directory where the rendered template\'s output is stored
+
+Description
+===========
+
+string
+
+getCacheDir
+
+
+    <?php
+
+    // get directory where compiled templates are stored
+    $cacheDir = $smarty->getCacheDir();
+
+    ?>
+
+       
+
+See also [`setCacheDir()`](#api.set.cache.dir) and
+[`$cache_dir`](#variable.cache.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-compile-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-compile-dir.md
new file mode 100644
index 000000000..3bfae7306
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-compile-dir.md
@@ -0,0 +1,23 @@
+getCompileDir()
+
+returns the directory where compiled templates are stored
+
+Description
+===========
+
+string
+
+getCompileDir
+
+
+    <?php
+
+    // get directory where compiled templates are stored
+    $compileDir = $smarty->getCompileDir();
+
+    ?>
+
+       
+
+See also [`setCompileDir()`](#api.set.compile.dir) and
+[`$compile_dir`](#variable.compile.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-dir.md
new file mode 100644
index 000000000..f41472ca4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-dir.md
@@ -0,0 +1,40 @@
+getConfigDir()
+
+return the directory where config files are stored
+
+Description
+===========
+
+string\|array
+
+getConfigDir
+
+string
+
+key
+
+
+    <?php
+
+    // set some config directories
+    $smarty->setConfigDir(array(
+        'one' => './config',
+        'two' => './config_2',
+        'three' => './config_3',
+    ));
+
+    // get all directories where config files are stored
+    $config_dir = $smarty->getConfigDir();
+    var_dump($config_dir); // array
+
+    // get directory identified by key
+    $config_dir = $smarty->getConfigDir('one');
+    var_dump($config_dir); // string
+
+    ?>
+
+       
+
+See also [`setConfigDir()`](#api.set.config.dir),
+[`addConfigDir()`](#api.add.config.dir) and
+[`$config_dir`](#variable.config.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-vars.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-vars.md
new file mode 100644
index 000000000..f252e8674
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-vars.md
@@ -0,0 +1,37 @@
+getConfigVars()
+
+returns the given loaded config variable value
+
+Description
+===========
+
+array
+
+getConfigVars
+
+string
+
+varname
+
+If no parameter is given, an array of all loaded [config
+variables](#language.config.variables) is returned.
+
+
+    <?php
+
+    // get loaded config template var #foo#
+    $myVar = $smarty->getConfigVars('foo');
+
+    // get all loaded config template vars
+    $all_config_vars = $smarty->getConfigVars();
+
+    // take a look at them
+    print_r($all_config_vars);
+    ?>
+
+       
+
+See also [`clearConfig()`](#api.clear.config),
+[`{config_load}`](#language.function.config.load),
+[`configLoad()`](#api.config.load) and
+[`getTemplateVars()`](#api.get.template.vars).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-plugins-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-plugins-dir.md
new file mode 100644
index 000000000..aa6035549
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-plugins-dir.md
@@ -0,0 +1,31 @@
+getPluginsDir()
+
+return the directory where plugins are stored
+
+Description
+===========
+
+array
+
+getPluginsDir
+
+
+    <?php
+
+    // set some plugins directories
+    $smarty->setPluginsDir(array(
+        './plugins',
+        './plugins_2',
+    ));
+
+    // get all directories where plugins are stored
+    $config_dir = $smarty->getPluginsDir();
+    var_dump($config_dir); // array
+
+    ?>
+
+       
+
+See also [`setPluginsDir()`](#api.set.plugins.dir),
+[`addPluginsDir()`](#api.add.plugins.dir) and
+[`$plugins_dir`](#variable.plugins.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-registered-object.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-registered-object.md
new file mode 100644
index 000000000..a7c920e14
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-registered-object.md
@@ -0,0 +1,36 @@
+getRegisteredObject()
+
+returns a reference to a registered object
+
+Description
+===========
+
+array
+
+getRegisteredObject
+
+string
+
+object\_name
+
+This is useful from within a custom function when you need direct access
+to a [registered object](#api.register.object). See the
+[objects](#advanced.features.objects) page for more info.
+
+
+    <?php
+    function smarty_block_foo($params, $smarty)
+    {
+      if (isset($params['object'])) {
+        // get reference to registered object
+        $obj_ref = $smarty->getRegisteredObject($params['object']);
+        // use $obj_ref is now a reference to the object
+      }
+    }
+    ?>
+
+       
+
+See also [`registerObject()`](#api.register.object),
+[`unregisterObject()`](#api.unregister.object) and [objects
+page](#advanced.features.objects)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-tags.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-tags.md
new file mode 100644
index 000000000..7729b468b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-tags.md
@@ -0,0 +1,40 @@
+getTags()
+
+return tags used by template
+
+Description
+===========
+
+string
+
+getTags
+
+object
+
+template
+
+This function returns an array of tagname/attribute pairs for all tags
+used by the template. It uses the following parameters:
+
+-   `template` is the template object.
+
+> **Note**
+>
+> This function is experimental.
+
+
+    <?php
+    include('Smarty.class.php');
+    $smarty = new Smarty;
+
+    // create template object
+    $tpl = $smarty->createTemplate('index.tpl');
+
+    // get tags
+    $tags = $smarty->getTags($tpl);
+
+    print_r($tags);
+
+    ?>
+
+        
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-template-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-template-dir.md
new file mode 100644
index 000000000..42c75908b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-template-dir.md
@@ -0,0 +1,40 @@
+getTemplateDir()
+
+return the directory where templates are stored
+
+Description
+===========
+
+string\|array
+
+getTemplateDir
+
+string
+
+key
+
+
+    <?php
+
+    // set some template directories
+    $smarty->setTemplateDir(array(
+        'one' => './templates',
+        'two' => './templates_2',
+        'three' => './templates_3',
+    ));
+
+    // get all directories where templates are stored
+    $template_dir = $smarty->getTemplateDir();
+    var_dump($template_dir); // array
+
+    // get directory identified by key
+    $template_dir = $smarty->getTemplateDir('one');
+    var_dump($template_dir); // string
+
+    ?>
+
+       
+
+See also [`setTemplateDir()`](#api.set.template.dir),
+[`addTemplateDir()`](#api.add.template.dir) and
+[`$template_dir`](#variable.template.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-template-vars.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-template-vars.md
new file mode 100644
index 000000000..27882eef4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-get-template-vars.md
@@ -0,0 +1,37 @@
+getTemplateVars()
+
+returns assigned variable value(s)
+
+Description
+===========
+
+array
+
+getTemplateVars
+
+string
+
+varname
+
+If no parameter is given, an array of all [assigned](#api.assign)
+variables are returned.
+
+
+    <?php
+    // get assigned template var 'foo'
+    $myVar = $smarty->getTemplateVars('foo');
+
+    // get all assigned template vars
+    $all_tpl_vars = $smarty->getTemplateVars();
+
+    // take a look at them
+    print_r($all_tpl_vars);
+    ?>
+
+       
+
+See also [`assign()`](#api.assign),
+[`{assign}`](#language.function.assign), [`append()`](#api.append),
+[`clearAssign()`](#api.clear.assign),
+[`clearAllAssign()`](#api.clear.all.assign) and
+[`getConfigVars()`](#api.get.config.vars)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-is-cached.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-is-cached.md
new file mode 100644
index 000000000..0c41bf04a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-is-cached.md
@@ -0,0 +1,81 @@
+isCached()
+
+returns true if there is a valid cache for this template
+
+Description
+===========
+
+bool
+
+isCached
+
+string
+
+template
+
+string
+
+cache\_id
+
+string
+
+compile\_id
+
+-   This only works if [`$caching`](#variable.caching) is set to one of
+    `Smarty::CACHING_LIFETIME_CURRENT` or
+    `Smarty::CACHING_LIFETIME_SAVED` to enable caching. See the [caching
+    section](#caching) for more info.
+
+-   You can also pass a `$cache_id` as an optional second parameter in
+    case you want [multiple caches](#caching.multiple.caches) for the
+    given template.
+
+-   You can supply a [`$compile id`](#variable.compile.id) as an
+    optional third parameter. If you omit that parameter the persistent
+    [`$compile_id`](#variable.compile.id) is used if its set.
+
+-   If you do not want to pass a `$cache_id` but want to pass a
+    [`$compile_id`](#variable.compile.id) you have to pass NULL as a
+    `$cache_id`.
+
+> **Note**
+>
+> If `isCached()` returns TRUE it actually loads the cached output and
+> stores it internally. Any subsequent call to
+> [`display()`](#api.display) or [`fetch()`](#api.fetch) will return
+> this internally stored output and does not try to reload the cache
+> file. This prevents a race condition that may occur when a second
+> process clears the cache between the calls to `isCached()` and to
+> [`display()`](#api.display) in the example above. This also means
+> calls to [`clearCache()`](#api.clear.cache) and other changes of the
+> cache-settings may have no effect after `isCached()` returned TRUE.
+
+
+    <?php
+    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+    if(!$smarty->isCached('index.tpl')) {
+    // do database calls, assign vars here
+    }
+
+    $smarty->display('index.tpl');
+    ?>
+
+       
+
+
+    <?php
+    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+    if(!$smarty->isCached('index.tpl', 'FrontPage')) {
+      // do database calls, assign vars here
+    }
+
+    $smarty->display('index.tpl', 'FrontPage');
+    ?>
+
+       
+
+See also [`clearCache()`](#api.clear.cache),
+[`clearAllCache()`](#api.clear.all.cache), and [caching
+section](#caching).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-load-filter.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-load-filter.md
new file mode 100644
index 000000000..19286ee33
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-load-filter.md
@@ -0,0 +1,42 @@
+loadFilter()
+
+load a filter plugin
+
+Description
+===========
+
+void
+
+loadFilter
+
+string
+
+type
+
+string
+
+name
+
+The first argument specifies the type of the filter to load and can be
+one of the following: `pre`, `post` or `output`. The second argument
+specifies the `name` of the filter plugin.
+
+
+    <?php
+
+    // load prefilter named 'trim'
+    $smarty->loadFilter('pre', 'trim');
+
+    // load another prefilter named 'datefooter'
+    $smarty->loadFilter('pre', 'datefooter');
+
+    // load output filter named 'compress'
+    $smarty->loadFilter('output', 'compress');
+
+    ?>
+
+       
+
+See also [`registerFilter()`](#api.register.filter),
+[`$autoload_filters`](#variable.autoload.filters) and [advanced
+features](#advanced.features).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-mute-expected-errors.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-mute-expected-errors.md
new file mode 100644
index 000000000..626288ea6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-mute-expected-errors.md
@@ -0,0 +1,21 @@
+Smarty::muteExpectedErrors()
+
+mutes expected warnings and notices deliberately generated by Smarty
+
+Description
+===========
+
+string
+
+muteExpectedErrors
+
+muteExpectedErrors() registers a custom error handler using
+[set\_error\_handler()](https://www.php.net/set_error_handler). The error
+handler merely inspects `$errno` and `$errfile` to determine if the
+given error was produced deliberately and must be ignored, or should be
+passed on to the next error handler.
+
+`Smarty::unmuteExpectedErrors()` removes the current error handler.
+Please note, that if you\'ve registered any custom error handlers after
+the muteExpectedErrors() call, the unmute will not remove Smarty\'s
+muting error handler, but the one registered last.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-cacheresource.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-cacheresource.md
new file mode 100644
index 000000000..60ae60308
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-cacheresource.md
@@ -0,0 +1,40 @@
+registerCacheResource()
+
+dynamically register CacheResources
+
+Description
+===========
+
+void
+
+registerCacheResource
+
+string
+
+name
+
+Smarty\_CacheResource
+
+resource\_handler
+
+Use this to dynamically register a [CacheResource
+plugin](#caching.custom) with Smarty. Pass in the `name` of the
+CacheResource and the object extending Smarty\_CacheResource. See
+[Custom Cache Implementation](#caching.custom) for more information on
+how to create custom CacheResources.
+
+> **Note**
+>
+> In Smarty2 this used to be a callback function called
+> `$cache_handler_func`. Smarty3 replaced this callback by the
+> `Smarty_CacheResource` module.
+
+
+    <?php
+    $smarty->registerCacheResource('mysql', new Smarty_CacheResource_Mysql());
+    ?>
+
+       
+
+See also [`unregisterCacheResource()`](#api.unregister.cacheresource)
+and the [Custom CacheResource Implementation](#caching.custom) section.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-class.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-class.md
new file mode 100644
index 000000000..ee339cadb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-class.md
@@ -0,0 +1,65 @@
+registerClass()
+
+register a class for use in the templates
+
+Description
+===========
+
+void
+
+registerClass
+
+string
+
+class\_name
+
+string
+
+class\_impl
+
+Smarty allows you to access static classes from templates as long as the
+[Security Policy](#advanced.features.security) does not tell it
+otherwise. If security is enabled, classes registered with
+`registerClass()` are accessible to templates.
+
+
+    <?php
+
+    class Bar {
+      $property = "hello world";
+    }
+
+    $smarty = new Smarty();
+    $smarty->registerClass("Foo", "Bar");
+
+       
+
+
+    {* Smarty will access this class as long as it's not prohibited by security *}
+    {Bar::$property}
+    {* Foo translates to the real class Bar *}
+    {Foo::$property}
+
+       
+
+
+    <?php
+    namespace my\php\application {
+      class Bar {
+        $property = "hello world";
+      }
+    }
+
+    $smarty = new Smarty();
+    $smarty->registerClass("Foo", "\my\php\application\Bar");
+
+       
+
+
+    {* Foo translates to the real class \my\php\application\Bar *}
+    {Foo::$property}
+
+       
+
+See also [`registerObject()`](#api.register.object), and
+[Security](#advanced.features.security).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-default-plugin-handler.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-default-plugin-handler.md
new file mode 100644
index 000000000..03547df71
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-default-plugin-handler.md
@@ -0,0 +1,93 @@
+registerDefaultPluginHandler()
+
+register a function which gets called on undefined tags
+
+Description
+===========
+
+void
+
+registerDefaultPluginHandler
+
+mixed
+
+callback
+
+Register a default plugin handler which gets called if the compiler can
+not find a definition for a tag otherwise. It uses the following
+parameters:
+
+If during compilation Smarty encounters tag which is not defined
+internal, registered or located in the plugins folder it tries to
+resolve it by calling the registered default plugin handler. The handler
+may be called several times for same undefined tag looping over valid
+plugin types.
+
+
+    <?php
+
+    $smarty = new Smarty();
+    $smarty->registerDefaultPluginHandler('my_plugin_handler');
+
+    /**
+     * Default Plugin Handler
+     *
+     * called when Smarty encounters an undefined tag during compilation
+     * 
+     * @param string                     $name      name of the undefined tag
+     * @param string                     $type     tag type (e.g. Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK, 
+                                                   Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_MODIFIER, Smarty::PLUGIN_MODIFIERCOMPILER)
+     * @param Smarty_Internal_Template   $template     template object
+     * @param string                     &$callback    returned function name 
+     * @param string                     &$script      optional returned script filepath if function is external
+     * @param bool                       &$cacheable    true by default, set to false if plugin is not cachable (Smarty >= 3.1.8)
+     * @return bool                      true if successfull
+     */
+    function my_plugin_handler ($name, $type, $template, &$callback, &$script, &$cacheable)
+    {
+        switch ($type) {
+            case Smarty::PLUGIN_FUNCTION:
+                switch ($name) {
+                    case 'scriptfunction':
+                        $script = './scripts/script_function_tag.php';
+                        $callback = 'default_script_function_tag';
+                        return true;
+                    case 'localfunction':
+                        $callback = 'default_local_function_tag';
+                        return true;
+                    default:
+                    return false;
+                }
+            case Smarty::PLUGIN_COMPILER:
+                switch ($name) {
+                    case 'scriptcompilerfunction':
+                        $script = './scripts/script_compiler_function_tag.php';
+                        $callback = 'default_script_compiler_function_tag';
+                        return true;
+                    default:
+                    return false;
+                }
+            case Smarty::PLUGIN_BLOCK:
+                switch ($name) {
+                    case 'scriptblock':
+                        $script = './scripts/script_block_tag.php';
+                        $callback = 'default_script_block_tag';
+                        return true;
+                    default:
+                    return false;
+                }
+            default:
+            return false;
+        }
+     }
+
+    ?>
+
+      
+
+> **Note**
+>
+> The return callback must be static; a function name or an array of
+> class and method name.
+>
+> Dynamic callbacks like objects methods are not supported.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-filter.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-filter.md
new file mode 100644
index 000000000..fd91d2661
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-filter.md
@@ -0,0 +1,45 @@
+registerFilter()
+
+dynamically register filters
+
+Description
+===========
+
+void
+
+registerFilter
+
+string
+
+type
+
+mixed
+
+callback
+
+Use this to dynamically register filters to operate on a templates. It
+uses the following parameters:
+
+NOTE.PARAMETER.FUNCTION
+
+A [prefilter](#plugins.prefilters.postfilters) runs through the template
+source before it gets compiled. See [template
+prefilters](#advanced.features.prefilters) for more information on how
+to setup a prefiltering function.
+
+A [postfilter](#plugins.prefilters.postfilters) runs through the
+template code after it was compiled to PHP. See [template
+postfilters](#advanced.features.postfilters) for more information on how
+to setup a postfiltering function.
+
+A [outputfilter](#plugins.outputfilters) operates on a template\'s
+output before it is [displayed](#api.display). See [template output
+filters](#advanced.features.outputfilters) for more information on how
+to set up an output filter function.
+
+See also [`unregisterFilter()`](#api.unregister.filter),
+[`loadFilter()`](#api.load.filter),
+[`$autoload_filters`](#variable.autoload.filters), [template pre
+filters](#advanced.features.prefilters) [template post
+filters](#advanced.features.postfilters) [template output
+filters](#advanced.features.outputfilters) section.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-object.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-object.md
new file mode 100644
index 000000000..c310e8c2a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-object.md
@@ -0,0 +1,44 @@
+registerObject()
+
+register an object for use in the templates
+
+Description
+===========
+
+void
+
+registerObject
+
+string
+
+object\_name
+
+object
+
+object
+
+array
+
+allowed\_methods\_properties
+
+boolean
+
+format
+
+array
+
+block\_methods
+
+> **Note**
+>
+> When you register/assign objects to templates, be sure that all
+> properties and methods accessed from the template are for presentation
+> purposes only. It is very easy to inject application logic through
+> objects, and this leads to poor designs that are difficult to manage.
+> See the Best Practices section of the Smarty website.
+
+See the [objects section](#advanced.features.objects) for more
+information.
+
+See also [`getRegisteredObject()`](#api.get.registered.object), and
+[`unregisterObject()`](#api.unregister.object).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-plugin.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-plugin.md
new file mode 100644
index 000000000..6eb433810
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-plugin.md
@@ -0,0 +1,110 @@
+registerPlugin()
+
+dynamically register plugins
+
+Description
+===========
+
+void
+
+registerPlugin
+
+string
+
+type
+
+string
+
+name
+
+mixed
+
+callback
+
+bool
+
+cacheable
+
+mixed
+
+cache\_attrs
+
+This method registers functions or methods defined in your script as
+plugin. It uses the following parameters:
+
+-   `cacheable` and `cache_attrs` can be omitted in most cases. See
+    [controlling cacheability of plugins output](#caching.cacheable) on
+    how to use them properly.
+
+<!-- -->
+
+
+    <?php
+    $smarty->registerPlugin("function","date_now", "print_current_date");
+
+    function print_current_date($params, $smarty)
+    {
+      if(empty($params["format"])) {
+        $format = "%b %e, %Y";
+      } else {
+        $format = $params["format"];
+      }
+      return strftime($format,time());
+    }
+    ?>
+
+       
+
+And in the template
+
+
+    {date_now}
+
+    {* or to format differently *}
+    {date_now format="%Y/%m/%d"}
+
+
+    <?php
+    // function declaration
+    function do_translation ($params, $content, $smarty, &$repeat, $template)
+    {
+      if (isset($content)) {
+        $lang = $params["lang"];
+        // do some translation with $content
+        return $translation;
+      }
+    }
+
+    // register with smarty
+    $smarty->registerPlugin("block","translate", "do_translation");
+    ?>
+
+       
+
+Where the template is:
+
+
+    {translate lang="br"}Hello, world!{/translate}
+
+       
+
+
+    <?php
+
+    // let's map PHP's stripslashes function to a Smarty modifier.
+    $smarty->registerPlugin("modifier","ss", "stripslashes");
+
+    ?>
+
+In the template, use `ss` to strip slashes.
+
+
+    <?php
+    {$var|ss}
+    ?>
+
+See also [`unregisterPlugin()`](#api.unregister.plugin), [plugin
+functions](#plugins.functions), [plugin block
+functions](#plugins.block.functions), [plugin compiler
+functions](#plugins.compiler.functions), and the [creating plugin
+modifiers](#plugins.modifiers) section.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-resource.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-resource.md
new file mode 100644
index 000000000..ca4005460
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-register-resource.md
@@ -0,0 +1,46 @@
+registerResource()
+
+dynamically register resources
+
+Description
+===========
+
+void
+
+registerResource
+
+string
+
+name
+
+Smarty\_resource
+
+resource\_handler
+
+Use this to dynamically register a [Resource plugin](#resources) with
+Smarty. Pass in the `name` of the Resource and the object extending
+Smarty\_Resource. See [template resources](#resources) for more
+information on how to setup a function for fetching templates.
+
+> **Note**
+>
+> A resource name must be at least two characters in length. One
+> character resource names will be ignored and used as part of the file
+> path, such as `$smarty->display('c:/path/to/index.tpl');`
+
+> **Note**
+>
+> Prior to Smarty 3.1 `registerResource()` accepted an array of callback
+> functions. While this is still possible for backward compatibility
+> reasons, it is strongly discouraged as callback functions have been
+> deprecated as of Smarty 3.1.
+
+
+    <?php
+    $smarty->registerResource('mysql', new Smarty_Resource_Mysql());
+    ?>
+
+       
+
+See also [`unregisterResource()`](#api.unregister.resource) and the
+[template resources](#resources) section.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-set-cache-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-set-cache-dir.md
new file mode 100644
index 000000000..7f7c4b60d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-set-cache-dir.md
@@ -0,0 +1,32 @@
+setCacheDir()
+
+set the directory where the rendered template\'s output is stored
+
+Description
+===========
+
+Smarty
+
+setCacheDir
+
+string
+
+cache\_dir
+
+
+    <?php
+
+    // set directory where rendered template's output is stored
+    $smarty->setCacheDir('./cache');
+
+    // chaining of method calls
+    $smarty->setTemplateDir('./templates')
+           ->setCompileDir('./templates_c')
+           ->setCacheDir('./cache');
+
+    ?>
+
+       
+
+See also [`getCacheDir()`](#api.get.cache.dir) and
+[`$cache_dir`](#variable.cache.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-set-compile-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-set-compile-dir.md
new file mode 100644
index 000000000..bfeb55a53
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-set-compile-dir.md
@@ -0,0 +1,32 @@
+setCompileDir()
+
+set the directory where compiled templates are stored
+
+Description
+===========
+
+Smarty
+
+setCompileDir
+
+string
+
+compile\_dir
+
+
+    <?php
+
+    // set directory where compiled templates are stored
+    $smarty->setCompileDir('./templates_c');
+
+    // chaining of method calls
+    $smarty->setTemplateDir('./templates')
+           ->setCompileDir('./templates_c')
+           ->setCacheDir('./cache');
+
+    ?>
+
+       
+
+See also [`getCompileDir()`](#api.get.compile.dir) and
+[`$compile_dir`](#variable.compile.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-set-config-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-set-config-dir.md
new file mode 100644
index 000000000..97a6ae977
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-set-config-dir.md
@@ -0,0 +1,47 @@
+setConfigDir()
+
+set the directories where config files are stored
+
+Description
+===========
+
+Smarty
+
+setConfigDir
+
+string\|array
+
+config\_dir
+
+
+    <?php
+
+    // set a single directory where the config files are stored
+    $smarty->setConfigDir('./config');
+
+    // view the config dir chain
+    var_dump($smarty->getConfigDir());
+
+    // set multiple directoríes where config files are stored
+    $smarty->setConfigDir(array(
+        'one' => './config',
+        'two' => './config_2',
+        'three' => './config_3',
+    ));
+
+    // view the config dir chain
+    var_dump($smarty->getConfigDir());
+
+    // chaining of method calls
+    $smarty->setTemplateDir('./templates')
+           ->setConfigDir('./config')
+           ->setCompileDir('./templates_c')
+           ->setCacheDir('./cache');
+
+    ?>
+
+       
+
+See also [`getConfigDir()`](#api.get.config.dir),
+[`addConfigDir()`](#api.add.config.dir) and
+[`$config_dir`](#variable.config.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-set-plugins-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-set-plugins-dir.md
new file mode 100644
index 000000000..25b0567b1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-set-plugins-dir.md
@@ -0,0 +1,46 @@
+setPluginsDir()
+
+set the directories where plugins are stored
+
+Description
+===========
+
+Smarty
+
+setPluginsDir
+
+string\|array
+
+plugins\_dir
+
+
+    <?php
+
+    // set a single directory where the plugins are stored
+    $smarty->setPluginsDir('./plugins');
+
+    // view the plugins dir chain
+    var_dump($smarty->getPluginsDir());
+
+    // set multiple directoríes where plugins are stored
+    $smarty->setPluginsDir(array(
+        './plugins',
+        './plugins_2',
+    ));
+
+    // view the plugins dir chain
+    var_dump($smarty->getPluginsDir());
+
+    // chaining of method calls
+    $smarty->setTemplateDir('./templates')
+           ->setPluginsDir('./plugins')
+           ->setCompileDir('./templates_c')
+           ->setCacheDir('./cache');
+
+    ?>
+
+       
+
+See also [`getPluginsDir()`](#api.get.plugins.dir),
+[`addPluginsDir()`](#api.add.plugins.dir) and
+[`$plugins_dir`](#variable.plugins.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-set-template-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-set-template-dir.md
new file mode 100644
index 000000000..2de23309b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-set-template-dir.md
@@ -0,0 +1,46 @@
+setTemplateDir()
+
+set the directories where templates are stored
+
+Description
+===========
+
+Smarty
+
+setTemplateDir
+
+string\|array
+
+template\_dir
+
+
+    <?php
+
+    // set a single directory where the templates are stored
+    $smarty->setTemplateDir('./cache');
+
+    // view the template dir chain
+    var_dump($smarty->getTemplateDir());
+
+    // set multiple directoríes where templates are stored
+    $smarty->setTemplateDir(array(
+        'one' => './templates',
+        'two' => './templates_2',
+        'three' => './templates_3',
+    ));
+
+    // view the template dir chain
+    var_dump($smarty->getTemplateDir());
+
+    // chaining of method calls
+    $smarty->setTemplateDir('./templates')
+           ->setCompileDir('./templates_c')
+           ->setCacheDir('./cache');
+
+    ?>
+
+       
+
+See also [`getTemplateDir()`](#api.get.template.dir),
+[`addTemplateDir()`](#api.add.template.dir) and
+[`$template_dir`](#variable.template.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-template-exists.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-template-exists.md
new file mode 100644
index 000000000..07f61b12e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-template-exists.md
@@ -0,0 +1,59 @@
+templateExists()
+
+checks whether the specified template exists
+
+Description
+===========
+
+bool
+
+templateExists
+
+string
+
+template
+
+It can accept either a path to the template on the filesystem or a
+resource string specifying the template.
+
+This example uses `$_GET['page']` to
+[`{include}`](#language.function.include) a content template. If the
+template does not exist then an error page is displayed instead. First
+the `page_container.tpl`
+
+
+    <html>
+    <head><title>{$title}</title></head>
+    <body>
+    {include file='page_top.tpl'}
+
+    {* include middle content page *}
+    {include file=$content_template}
+
+    {include file='page_footer.tpl'}
+    </body>
+
+      
+
+And the php script
+
+
+    <?php
+
+    // set the filename eg index.inc.tpl
+    $mid_template = $_GET['page'].'.inc.tpl';
+
+    if( !$smarty->templateExists($mid_template) ){
+        $mid_template = 'page_not_found.tpl';
+    }
+    $smarty->assign('content_template', $mid_template);
+
+    $smarty->display('page_container.tpl');
+
+    ?>
+
+      
+
+See also [`display()`](#api.display), [`fetch()`](#api.fetch),
+[`{include}`](#language.function.include) and
+[`{insert}`](#language.function.insert)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-test-install.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-test-install.md
new file mode 100644
index 000000000..918bd220a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-test-install.md
@@ -0,0 +1,22 @@
+testInstall()
+
+checks Smarty installation
+
+Description
+===========
+
+void
+
+testInstall
+
+This function verifies that all required working folders of the Smarty
+installation can be accessed. It does output a corresponding protocol.
+
+
+    <?php
+    require_once('Smarty.class.php');
+    $smarty  = new Smarty();
+    $smarty->testInstall();
+    ?>
+
+       
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-cacheresource.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-cacheresource.md
new file mode 100644
index 000000000..d097519db
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-cacheresource.md
@@ -0,0 +1,28 @@
+unregisterCacheResource()
+
+dynamically unregister a CacheResource plugin
+
+Description
+===========
+
+void
+
+unregisterCacheResource
+
+string
+
+name
+
+Pass in the `name` of the CacheResource.
+
+
+    <?php
+
+    $smarty->unregisterCacheResource('mysql');
+
+    ?>
+
+       
+
+See also [`registerCacheResource()`](#api.register.cacheresource) and
+the [Custom CacheResource Implementation](#caching.custom) section.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-filter.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-filter.md
new file mode 100644
index 000000000..44020eb40
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-filter.md
@@ -0,0 +1,23 @@
+unregisterFilter()
+
+dynamically unregister a filter
+
+Description
+===========
+
+void
+
+unregisterFilter
+
+string
+
+type
+
+string\|array
+
+callback
+
+Use this to dynamically unregister filters. It uses the following
+parameters:
+
+See also [`registerFilter()`](#api.register.filter).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-object.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-object.md
new file mode 100644
index 000000000..c012581f9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-object.md
@@ -0,0 +1,17 @@
+unregisterObject()
+
+dynamically unregister an object
+
+Description
+===========
+
+void
+
+unregisterObject
+
+string
+
+object\_name
+
+See also [`registerObject()`](#api.register.object) and [objects
+section](#advanced.features.objects)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-plugin.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-plugin.md
new file mode 100644
index 000000000..c692ac60f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-plugin.md
@@ -0,0 +1,36 @@
+unregisterPlugin
+
+dynamically unregister plugins
+
+Description
+===========
+
+void
+
+unregisterPlugin
+
+string
+
+type
+
+string
+
+name
+
+This method unregisters plugins which previously have been registered by
+[registerPlugin()](#api.register.plugin), It uses the following
+parameters:
+
+<!-- -->
+
+
+    <?php
+
+    // we don't want template designers to have access to function plugin "date_now" 
+    $smarty->unregisterPlugin("function","date_now");
+
+    ?>
+
+       
+
+See also [`registerPlugin()`](#api.register.plugin).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-resource.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-resource.md
new file mode 100644
index 000000000..1a6067bd2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-resource.md
@@ -0,0 +1,28 @@
+unregisterResource()
+
+dynamically unregister a resource plugin
+
+Description
+===========
+
+void
+
+unregisterResource
+
+string
+
+name
+
+Pass in the `name` of the resource.
+
+
+    <?php
+
+    $smarty->unregisterResource('db');
+
+    ?>
+
+       
+
+See also [`registerResource()`](#api.register.resource) and [template
+resources](#resources)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables.md
new file mode 100644
index 000000000..ee9c07611
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables.md
@@ -0,0 +1,63 @@
+Smarty Class Variables {#api.variables}
+======================
+
+These are all of the available Smarty class variables. You can access
+them directly, or use the corresponding setter/getter methods.
+
+- [$allow_php_templates](./api-variables/variable-allow-php-templates.md)
+- [$auto_literal](./api-variables/variable-auto-literal.md)
+- [$autoload_filters](./api-variables/variable-autoload-filters.md)
+- [$cache_dir](./api-variables/variable-cache-dir.md)
+- [$cache_id](./api-variables/variable-cache-id.md)
+- [$cache_lifetime](./api-variables/variable-cache-lifetime.md)
+- [$cache_locking](./api-variables/variable-cache-locking.md)
+- [$cache_modified_check](./api-variables/variable-cache-modified-check.md)
+- [$caching](./api-variables/variable-caching.md)
+- [$caching_type](./api-variables/variable-caching-type.md)
+- [$compile_check](./api-variables/variable-compile-check.md)
+- [$compile_dir](./api-variables/variable-compile-dir.md)
+- [$compile_id](./api-variables/variable-compile-id.md)
+- [$compile_locking](./api-variables/variable-compile-locking.md)
+- [$compiler_class](./api-variables/variable-compiler-class.md)
+- [$config_booleanize](./api-variables/variable-config-booleanize.md)
+- [$config_dir](./api-variables/variable-config-dir.md)
+- [$config_overwrite](./api-variables/variable-config-overwrite.md)
+- [$config_read_hidden](./api-variables/variable-config-read-hidden.md)
+- [$debug_tpl](./api-variables/variable-debug-template.md)
+- [$debugging](./api-variables/variable-debugging.md)
+- [$debugging_ctrl](./api-variables/variable-debugging-ctrl.md)
+- [$default_config_type](./api-variables/variable-default-config-type.md)
+- [$default_modifiers](./api-variables/variable-default-modifiers.md)
+- [$default_resource_type](./api-variables/variable-default-resource-type.md)
+- [$default_config_handler_func](./api-variables/variable-default-config-handler-func.md)
+- [$default_template_handler_func](./api-variables/variable-default-template-handler-func.md)
+- [$direct_access_security](./api-variables/variable-direct-access-security.md)
+- [$error_reporting](./api-variables/variable-error-reporting.md)
+- [$escape_html](./api-variables/variable-escape-html.md)
+- [$force_cache](./api-variables/variable-force-cache.md)
+- [$force_compile](./api-variables/variable-force-compile.md)
+- [$left_delimiter](./api-variables/variable-left-delimiter.md)
+- [$locking_timeout](./api-variables/variable-locking-timeout.md)
+- [$merge_compiled_includes](./api-variables/variable-merge-compiled-includes.md)
+- [$plugins_dir](./api-variables/variable-plugins-dir.md)
+- [$right_delimiter](./api-variables/variable-right-delimiter.md)
+- [$smarty_debug_id](./api-variables/variable-smarty-debug-id.md)
+- [$template_dir](./api-variables/variable-template-dir.md)
+- [$trusted_dir](./api-variables/variable-trusted-dir.md)
+- [$use_include_path](./api-variables/variable-use-include-path.md)
+- [$use_sub_dirs](./api-variables/variable-use-sub-dirs.md)
+
+> **Note**
+>
+> All class variables have magic setter/getter methods available.
+> setter/getter methods are camelCaseFormat, unlike the variable itself.
+> So for example, you can set and get the \$smarty-\>template\_dir
+> variable with \$smarty-\>setTemplateDir(\$dir) and \$dir =
+> \$smarty-\>getTemplateDir() respectively.
+
+> **Note**
+>
+> See
+> [`Changing settings by template`](./advanced-features/advanced-features-template-settings.md)
+> section for how to change Smarty class variables for individual
+> templates.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-allow-php-templates.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-allow-php-templates.md
new file mode 100644
index 000000000..e15520e2d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-allow-php-templates.md
@@ -0,0 +1,18 @@
+\$allow\_php\_templates {#variable.allow.php.templates}
+=======================
+
+By default the PHP template file resource is disabled. Setting
+`$allow_php_templates` to TRUE will enable PHP template files.
+
+::: {.informalexample}
+
+    <?php
+    $smarty->allow_php_templates = true;
+    ?>
+
+            
+:::
+
+> **Note**
+>
+> The PHP template file resource is an undocumented deprecated feature.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-auto-literal.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-auto-literal.md
new file mode 100644
index 000000000..8d0685025
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-auto-literal.md
@@ -0,0 +1,17 @@
+\$auto\_literal {#variable.auto.literal}
+===============
+
+The Smarty delimiter tags { and } will be ignored so long as they are
+surrounded by white space. This behavior can be disabled by setting
+auto\_literal to false.
+
+::: {.informalexample}
+
+    <?php
+    $smarty->auto_literal = false;
+    ?>
+
+            
+:::
+
+See also [Escaping Smarty parsing](#language.escaping),
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-autoload-filters.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-autoload-filters.md
new file mode 100644
index 000000000..8a300b065
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-autoload-filters.md
@@ -0,0 +1,21 @@
+\$autoload\_filters {#variable.autoload.filters}
+===================
+
+If there are some filters that you wish to load on every template
+invocation, you can specify them using this variable and Smarty will
+automatically load them for you. The variable is an associative array
+where keys are filter types and values are arrays of the filter names.
+For example:
+
+::: {.informalexample}
+
+    <?php
+    $smarty->autoload_filters = array('pre' => array('trim', 'stamp'),
+                                      'output' => array('convert'));
+    ?>
+
+            
+:::
+
+See also [`registerFilter()`](#api.register.filter) and
+[`loadFilter()`](#api.load.filter)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-dir.md
new file mode 100644
index 000000000..6cb2b5559
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-dir.md
@@ -0,0 +1,35 @@
+\$cache\_dir {#variable.cache.dir}
+============
+
+This is the name of the directory where template caches are stored. By
+default this is `./cache`, meaning that Smarty will look for the
+`cache/` directory in the same directory as the executing php script.
+**This directory must be writeable by the web server**, [see
+install](#installing.smarty.basic) for more info.
+
+You can also use your own [custom cache implementation](#caching.custom)
+to control cache files, which will ignore this setting. See also
+[`$use_sub_dirs`](#variable.use.sub.dirs).
+
+> **Note**
+>
+> This setting must be either a relative or absolute path. include\_path
+> is not used for writing files.
+
+> **Note**
+>
+> It is not recommended to put this directory under the web server
+> document root.
+
+> **Note**
+>
+> As of Smarty 3.1 the attribute \$cache\_dir is no longer accessible
+> directly. Use [`getCacheDir()`](#api.get.cache.dir) and
+> [`setCacheDir()`](#api.set.cache.dir) instead.
+
+See also [`getCacheDir()`](#api.get.cache.dir),
+[`setCacheDir()`](#api.set.cache.dir), [`$caching`](#variable.caching),
+[`$use_sub_dirs`](#variable.use.sub.dirs),
+[`$cache_lifetime`](#variable.cache.lifetime),
+[`$cache_modified_check`](#variable.cache.modified.check) and the
+[caching section](#caching).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-id.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-id.md
new file mode 100644
index 000000000..c27fae921
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-id.md
@@ -0,0 +1,11 @@
+\$cache\_id {#variable.cache.id}
+===========
+
+Persistent cache\_id identifier. As an alternative to passing the same
+`$cache_id` to each and every function call, you can set this
+`$cache_id` and it will be used implicitly thereafter.
+
+With a `$cache_id` you can have multiple cache files for a single call
+to [`display()`](#api.display) or [`fetch()`](#api.fetch) depending for
+example from different content of the same template. See the [caching
+section](#caching) for more information.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-lifetime.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-lifetime.md
new file mode 100644
index 000000000..c9624b556
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-lifetime.md
@@ -0,0 +1,30 @@
+\$cache\_lifetime {#variable.cache.lifetime}
+=================
+
+This is the length of time in seconds that a template cache is valid.
+Once this time has expired, the cache will be regenerated.
+
+-   `$caching` must be turned on (either
+    Smarty::CACHING\_LIFETIME\_CURRENT or
+    Smarty::CACHING\_LIFETIME\_SAVED) for `$cache_lifetime` to have any
+    purpose.
+
+-   A `$cache_lifetime` value of -1 will force the cache to never
+    expire.
+
+-   A value of 0 will cause the cache to always regenerate (good for
+    testing only, to disable caching a more efficient method is to set
+    [`$caching`](#variable.caching) = Smarty::CACHING\_OFF).
+
+-   If you want to give certain templates their own cache lifetime, you
+    could do this by setting [`$caching`](#variable.caching) =
+    Smarty::CACHING\_LIFETIME\_SAVED, then set `$cache_lifetime` to a
+    unique value just before calling [`display()`](#api.display) or
+    [`fetch()`](#api.fetch).
+
+If [`$force_compile`](#variable.force.compile) is enabled, the cache
+files will be regenerated every time, effectively disabling caching. You
+can clear all the cache files with the
+[`clear_all_cache()`](#api.clear.all.cache) function, or individual
+cache files (or groups) with the [`clear_cache()`](#api.clear.cache)
+function.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-locking.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-locking.md
new file mode 100644
index 000000000..6dca30c7b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-locking.md
@@ -0,0 +1,11 @@
+\$cache\_locking {#variable.cache.locking}
+================
+
+Cache locking avoids concurrent cache generation. This means resource
+intensive pages can be generated only once, even if they\'ve been
+requested multiple times in the same moment.
+
+Cache locking is disabled by default. To enable it set `$cache_locking`
+to TRUE.
+
+See also [`$locking_timeout`](#variable.locking.timeout)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-modified-check.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-modified-check.md
new file mode 100644
index 000000000..05e00bb91
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-modified-check.md
@@ -0,0 +1,12 @@
+\$cache\_modified\_check {#variable.cache.modified.check}
+========================
+
+If set to TRUE, Smarty will respect the If-Modified-Since header sent
+from the client. If the cached file timestamp has not changed since the
+last visit, then a `'304: Not Modified'` header will be sent instead of
+the content. This works only on cached content without
+[`{insert}`](#language.function.insert) tags.
+
+See also [`$caching`](#variable.caching),
+[`$cache_lifetime`](#variable.cache.lifetime), and the [caching
+section](#caching).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching-type.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching-type.md
new file mode 100644
index 000000000..22b88cf6a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching-type.md
@@ -0,0 +1,9 @@
+\$caching\_type {#variable.caching.type}
+===============
+
+This property specifies the name of the caching handler to use. It
+defaults to `file`, enabling the internal filesystem based cache
+handler.
+
+See [Custom Cache Implementation](#caching.custom) for pointers on
+setting up your own cache handler.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching.md
new file mode 100644
index 000000000..9377e3b6d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching.md
@@ -0,0 +1,38 @@
+\$caching {#variable.caching}
+=========
+
+This tells Smarty whether or not to cache the output of the templates to
+the [`$cache_dir`](#variable.cache.dir). By default this is set to the
+constant Smarty::CACHING\_OFF. If your templates consistently generate
+the same content, it is advisable to turn on `$caching`, as this may
+result in significant performance gains.
+
+You can also have [multiple](#caching.multiple.caches) caches for the
+same template.
+
+-   A constant value of Smarty::CACHING\_LIFETIME\_CURRENT or
+    Smarty::CACHING\_LIFETIME\_SAVED enables caching.
+
+-   A value of Smarty::CACHING\_LIFETIME\_CURRENT tells Smarty to use
+    the current [`$cache_lifetime`](#variable.cache.lifetime) variable
+    to determine if the cache has expired.
+
+-   A value of Smarty::CACHING\_LIFETIME\_SAVED tells Smarty to use the
+    [`$cache_lifetime`](#variable.cache.lifetime) value at the time the
+    cache was generated. This way you can set the
+    [`$cache_lifetime`](#variable.cache.lifetime) just before
+    [fetching](#api.fetch) the template to have granular control over
+    when that particular cache expires. See also
+    [`isCached()`](#api.is.cached).
+
+-   If [`$compile_check`](#variable.compile.check) is enabled, the
+    cached content will be regenerated if any of the templates or config
+    files that are part of this cache are changed.
+
+-   If [`$force_compile`](#variable.force.compile) is enabled, the
+    cached content will always be regenerated.
+
+See also [`$cache_dir`](#variable.cache.dir),
+[`$cache_lifetime`](#variable.cache.lifetime),
+[`$cache_modified_check`](#variable.cache.modified.check),
+[`is_cached()`](#api.is.cached) and the [caching section](#caching).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-check.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-check.md
new file mode 100644
index 000000000..075e7f17a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-check.md
@@ -0,0 +1,30 @@
+\$compile\_check {#variable.compile.check}
+================
+
+Upon each invocation of the PHP application, Smarty tests to see if the
+current template has changed (different timestamp) since the last time
+it was compiled. If it has changed, it recompiles that template. If the
+template has yet not been compiled at all, it will compile regardless of
+this setting. By default this variable is set to TRUE.
+
+Once an application is put into production (ie the templates won\'t be
+changing), the compile check step is no longer needed. Be sure to set
+`$compile_check` to FALSE for maximum performance. Note that if you
+change this to FALSE and a template file is changed, you will \*not\*
+see the change since the template will not get recompiled.
+
+Note that up to Smarty 4.x, Smarty will check for the existence of 
+the source template even if `$compile_check` is disabled.
+
+If [`$caching`](#variable.caching) is enabled and `$compile_check` is
+enabled, then the cache files will get regenerated if an involved
+template file or config file was updated.
+
+As of Smarty 3.1 `$compile_check` can be set to the value
+`Smarty::COMPILECHECK_CACHEMISS`. This enables Smarty to revalidate the
+compiled template, once a cache file is regenerated. So if there was a
+cached template, but it\'s expired, Smarty will run a single
+compile\_check before regenerating the cache.
+
+See [`$force_compile`](#variable.force.compile) and
+[`clearCompiledTemplate()`](#api.clear.compiled.tpl).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-dir.md
new file mode 100644
index 000000000..c18c9acba
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-dir.md
@@ -0,0 +1,29 @@
+\$compile\_dir {#variable.compile.dir}
+==============
+
+This is the name of the directory where compiled templates are located.
+By default this is `./templates_c`, meaning that Smarty will look for
+the `templates_c/` directory in the same directory as the executing php
+script. **This directory must be writeable by the web server**, [see
+install](#installing.smarty.basic) for more info.
+
+> **Note**
+>
+> This setting must be either a relative or absolute path. include\_path
+> is not used for writing files.
+
+> **Note**
+>
+> It is not recommended to put this directory under the web server
+> document root.
+
+> **Note**
+>
+> As of Smarty 3.1 the attribute \$compile\_dir is no longer accessible
+> directly. Use [`getCompileDir()`](#api.get.compile.dir) and
+> [`setCompileDir()`](#api.set.compile.dir) instead.
+
+See also [`getCompileDir()`](#api.get.compile.dir),
+[`setCompileDir()`](#api.set.compile.dir),
+[`$compile_id`](#variable.compile.id) and
+[`$use_sub_dirs`](#variable.use.sub.dirs).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-id.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-id.md
new file mode 100644
index 000000000..ca2b08fb5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-id.md
@@ -0,0 +1,44 @@
+\$compile\_id {#variable.compile.id}
+=============
+
+Persistent compile identifier. As an alternative to passing the same
+`$compile_id` to each and every function call, you can set this
+`$compile_id` and it will be used implicitly thereafter.
+
+If you use the same template with different [pre- and/or
+post-filters](#plugins.prefilters.postfilters) you must use a unique
+`$compile_id` to keep the compiled template files separated.
+
+For example a [prefilter](#plugins.prefilters.postfilters) that
+localizes your templates (that is: translates language dependent parts)
+at compile time, then you could use the current language as
+`$compile_id` and you will get a set of compiled templates for each
+language you use.
+
+
+    <?php
+    $smarty->compile_id = 'en';
+    ?>
+
+      
+
+Another application would be to use the same compile directory across
+multiple domains / multiple virtual hosts.
+
+
+    <?php
+
+    $smarty->compile_id = $_SERVER['SERVER_NAME'];
+    $smarty->compile_dir = '/path/to/shared_compile_dir';
+
+    ?>
+
+      
+
+> **Note**
+>
+> In Smarty 3 a `$compile_id` is no longer required to keep templates
+> with same name in different [`$template_dir`
+> folders](#variable.template.dir) separated. The [`$template_dir` file
+> path](#variable.template.dir) is encoded in the file name of compiled
+> and cached template files.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-locking.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-locking.md
new file mode 100644
index 000000000..ff7a66f3a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-locking.md
@@ -0,0 +1,7 @@
+\$compile\_locking {#variable.compile.locking}
+==================
+
+Compile locking avoids concurrent compilation of the same template.
+
+Compile locking is enabled by default. To disable it set
+`$compile_locking` to FALSE.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-compiler-class.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-compiler-class.md
new file mode 100644
index 000000000..32ea982d6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-compiler-class.md
@@ -0,0 +1,6 @@
+\$compiler\_class {#variable.compiler.class}
+=================
+
+Specifies the name of the compiler class that Smarty will use to compile
+the templates. The default is \'Smarty\_Compiler\'. For advanced users
+only.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-booleanize.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-booleanize.md
new file mode 100644
index 000000000..4ba555f84
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-booleanize.md
@@ -0,0 +1,8 @@
+\$config\_booleanize {#variable.config.booleanize}
+====================
+
+If set to TRUE, [config files](#config.files) values of `on/true/yes`
+and `off/false/no` get converted to boolean values automatically. This
+way you can use the values in the template like so:
+`{if #foobar#}...{/if}`. If foobar was `on`, `true` or `yes`, the `{if}`
+statement will execute. Defaults to TRUE.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-dir.md
new file mode 100644
index 000000000..d73f3274f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-dir.md
@@ -0,0 +1,23 @@
+\$config\_dir {#variable.config.dir}
+=============
+
+This is the directory used to store [config files](#config.files) used
+in the templates. Default is `./configs`, meaning that Smarty will look
+for the `configs/` directory in the same directory as the executing php
+script.
+
+> **Note**
+>
+> It is not recommended to put this directory under the web server
+> document root.
+
+> **Note**
+>
+> As of Smarty 3.1 the attribute \$config\_dir is no longer accessible
+> directly. Use [`getConfigDir()`](#api.get.config.dir),
+> [`setConfigDir()`](#api.set.config.dir) and
+> [`addConfigDir()`](#api.add.config.dir) instead.
+
+See also [`getConfigDir()`](#api.get.config.dir),
+[`setConfigDir()`](#api.set.config.dir) and
+[`addConfigDir()`](#api.add.config.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-overwrite.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-overwrite.md
new file mode 100644
index 000000000..0b8968374
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-overwrite.md
@@ -0,0 +1,40 @@
+\$config\_overwrite {#variable.config.overwrite}
+===================
+
+If set to TRUE, the default then variables read in from [config
+files](#config.files) will overwrite each other. Otherwise, the
+variables will be pushed onto an array. This is helpful if you want to
+store arrays of data in config files, just list each element multiple
+times.
+
+This examples uses [`{cycle}`](#language.function.cycle) to output a
+table with alternating red/green/blue row colors with
+`$config_overwrite` = FALSE.
+
+The config file.
+
+
+    # row colors
+    rowColors = #FF0000
+    rowColors = #00FF00
+    rowColors = #0000FF
+
+        
+
+The template with a [`{section}`](#language.function.section) loop.
+
+
+    <table>
+      {section name=r loop=$rows}
+      <tr bgcolor="{cycle values=#rowColors#}">
+        <td> ....etc.... </td>
+      </tr>
+      {/section}
+    </table>
+
+        
+
+See also [`{config_load}`](#language.function.config.load),
+[`getConfigVars()`](#api.get.config.vars),
+[`clearConfig()`](#api.clear.config), [`configLoad()`](#api.config.load)
+and the [config files section](#config.files).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-read-hidden.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-read-hidden.md
new file mode 100644
index 000000000..19cde68bd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-read-hidden.md
@@ -0,0 +1,8 @@
+\$config\_read\_hidden {#variable.config.read.hidden}
+======================
+
+If set to TRUE, hidden sections ie section names beginning with a
+period(.) in [config files](#config.files) can be read from templates.
+Typically you would leave this FALSE, that way you can store sensitive
+data in the config files such as database parameters and not worry about
+the template loading them. FALSE by default.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-debug-template.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-debug-template.md
new file mode 100644
index 000000000..faec0e171
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-debug-template.md
@@ -0,0 +1,9 @@
+\$debug\_tpl {#variable.debug_template}
+============
+
+This is the name of the template file used for the debugging console. By
+default, it is named `debug.tpl` and is located in the
+[`SMARTY_DIR`](#constant.smarty.dir).
+
+See also [`$debugging`](#variable.debugging) and the [debugging
+console](#chapter.debugging.console) section.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging-ctrl.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging-ctrl.md
new file mode 100644
index 000000000..a9355c0a2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging-ctrl.md
@@ -0,0 +1,20 @@
+\$debugging\_ctrl {#variable.debugging.ctrl}
+=================
+
+This allows alternate ways to enable debugging. `NONE` means no
+alternate methods are allowed. `URL` means when the keyword
+`SMARTY_DEBUG` is found in the `QUERY_STRING`, debugging is enabled for
+that invocation of the script. If [`$debugging`](#variable.debugging) is
+TRUE, this value is ignored.
+
+
+    <?php
+    // shows debug console only on localhost ie
+    // http://localhost/script.php?foo=bar&SMARTY_DEBUG
+    $smarty->debugging = false; // the default
+    $smarty->debugging_ctrl = ($_SERVER['SERVER_NAME'] == 'localhost') ? 'URL' : 'NONE';
+    ?>
+
+See also [debugging console](#chapter.debugging.console) section,
+[`$debugging`](#variable.debugging) and
+[`$smarty_debug_id`](#variable.smarty.debug.id).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging.md
new file mode 100644
index 000000000..4473e0c8d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging.md
@@ -0,0 +1,17 @@
+\$debugging {#variable.debugging}
+===========
+
+This enables the [debugging console](#chapter.debugging.console). The
+console is a javascript popup window that informs you of the
+[included](#language.function.include) templates, variables
+[assigned](#api.assign) from php and [config file
+variables](#language.config.variables) for the current script. It does
+not show variables assigned within a template with the
+[`{assign}`](#language.function.assign) function.
+
+The console can also be enabled from the url with
+[`$debugging_ctrl`](#variable.debugging.ctrl).
+
+See also [`{debug}`](#language.function.debug),
+[`$debug_tpl`](#variable.debug_template), and
+[`$debugging_ctrl`](#variable.debugging.ctrl).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-handler-func.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-handler-func.md
new file mode 100644
index 000000000..0d6ec5e0d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-handler-func.md
@@ -0,0 +1,50 @@
+\$default\_config\_handler\_func {#variable.default.config.handler.func}
+================================
+
+This function is called when a config file cannot be obtained from its
+resource.
+
+> **Note**
+>
+> The default handler is currently only invoked for file resources. It
+> is not triggered when the resource itself cannot be found, in which
+> case a SmartyException is thrown.
+
+
+    <?php
+
+    $smarty = new Smarty();
+    $smarty->default_config_handler_func = 'my_default_config_handler_func';
+
+    /**
+     * Default Config Handler
+     *
+     * called when Smarty's file: resource is unable to load a requested file
+     * 
+     * @param string   $type     resource type (e.g. "file", "string", "eval", "resource")
+     * @param string   $name     resource name (e.g. "foo/bar.tpl")
+     * @param string  &$content  config's content
+     * @param integer &$modified config's modification time
+     * @param Smarty   $smarty   Smarty instance
+     * @return string|boolean   path to file or boolean true if $content and $modified 
+     *                          have been filled, boolean false if no default config 
+     *                          could be loaded
+     */
+    function my_default_config_handler_func($type, $name, &$content, &$modified, Smarty $smarty) {
+        if (false) {
+            // return corrected filepath
+            return "/tmp/some/foobar.tpl";
+        } elseif (false) {
+            // return a config directly
+            $content = 'someVar = "the config source"';
+            $modified = time();
+            return true;
+        } else {
+            // tell smarty that we failed
+            return false;
+        }
+    }
+
+    ?>
+
+      
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-type.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-type.md
new file mode 100644
index 000000000..60bf9f1ea
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-type.md
@@ -0,0 +1,7 @@
+\$default\_config\_type {#variable.default.config.type}
+=======================
+
+This tells smarty what resource type to use for config files. The
+default value is `file`, meaning that `$smarty->configLoad('test.conf')`
+and `$smarty->configLoad('file:test.conf')` are identical in meaning.
+See the [resource](#resources) chapter for more details.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-modifiers.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-modifiers.md
new file mode 100644
index 000000000..c6b73eb12
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-modifiers.md
@@ -0,0 +1,8 @@
+\$default\_modifiers {#variable.default.modifiers}
+====================
+
+This is an array of modifiers to implicitly apply to every variable in a
+template. For example, to HTML-escape every variable by default, use
+`array('escape:"htmlall"')`. To make a variable exempt from default
+modifiers, add the \'nofilter\' attribute to the output tag such as
+`{$var nofilter}`.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-resource-type.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-resource-type.md
new file mode 100644
index 000000000..e8a803178
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-resource-type.md
@@ -0,0 +1,7 @@
+\$default\_resource\_type {#variable.default.resource.type}
+=========================
+
+This tells smarty what resource type to use implicitly. The default
+value is `file`, meaning that `$smarty->display('index.tpl')` and
+`$smarty->display('file:index.tpl')` are identical in meaning. See the
+[resource](#resources) chapter for more details.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-template-handler-func.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-template-handler-func.md
new file mode 100644
index 000000000..d8fcbb1ad
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-template-handler-func.md
@@ -0,0 +1,50 @@
+\$default\_template\_handler\_func {#variable.default.template.handler.func}
+==================================
+
+This function is called when a template cannot be obtained from its
+resource.
+
+> **Note**
+>
+> The default handler is currently only invoked for file resources. It
+> is not triggered when the resource itself cannot be found, in which
+> case a SmartyException is thrown.
+
+
+    <?php
+
+    $smarty = new Smarty();
+    $smarty->default_template_handler_func = 'my_default_template_handler_func';
+
+    /**
+     * Default Template Handler
+     *
+     * called when Smarty's file: resource is unable to load a requested file
+     * 
+     * @param string   $type     resource type (e.g. "file", "string", "eval", "resource")
+     * @param string   $name     resource name (e.g. "foo/bar.tpl")
+     * @param string  &$content  template's content
+     * @param integer &$modified template's modification time
+     * @param Smarty   $smarty   Smarty instance
+     * @return string|boolean   path to file or boolean true if $content and $modified 
+     *                          have been filled, boolean false if no default template 
+     *                          could be loaded
+     */
+    function my_default_template_handler_func($type, $name, &$content, &$modified, Smarty $smarty) {
+        if (false) {
+            // return corrected filepath
+            return "/tmp/some/foobar.tpl";
+        } elseif (false) {
+            // return a template directly
+            $content = "the template source";
+            $modified = time();
+            return true;
+        } else {
+            // tell smarty that we failed
+            return false;
+        }
+    }
+
+    ?>
+
+      
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-direct-access-security.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-direct-access-security.md
new file mode 100644
index 000000000..f471f5de0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-direct-access-security.md
@@ -0,0 +1,13 @@
+\$direct\_access\_security {#variable.direct.access.security}
+==========================
+
+Direct access security inhibits direct browser access to compiled or
+cached template files.
+
+Direct access security is enabled by default. To disable it set
+`$direct_access_security` to FALSE.
+
+> **Note**
+>
+> This is a compile time option. If you change the setting you must make
+> sure that the templates get recompiled.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-error-reporting.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-error-reporting.md
new file mode 100644
index 000000000..c0aa9cedb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-error-reporting.md
@@ -0,0 +1,17 @@
+\$error\_reporting {#variable.error.reporting}
+==================
+
+When this value is set to a non-null-value it\'s value is used as php\'s
+[`error_reporting`](https://www.php.net/error_reporting) level inside of
+[`display()`](#api.display) and [`fetch()`](#api.fetch).
+
+Smarty 3.1.2 introduced the
+[`muteExpectedErrors()`](#api.mute.expected.errors) function. Calling
+`Smarty::muteExpectedErrors();` after setting up custom error handling
+will ensure that warnings and notices (deliberately) produced by Smarty
+will not be passed to other custom error handlers. If your error logs
+are filling up with warnings regarding `filemtime()` or `unlink()`
+calls, please enable Smarty\'s error muting.
+
+See also [debugging](#chapter.debugging.console) and
+[troubleshooting](#troubleshooting).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-escape-html.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-escape-html.md
new file mode 100644
index 000000000..87c7b9672
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-escape-html.md
@@ -0,0 +1,21 @@
+\$escape\_html {#variable.escape.html}
+==============
+
+Setting `$escape_html` to TRUE will escape all template variable output
+by wrapping it in
+`htmlspecialchars({$output}, ENT_QUOTES, $char_set);`,
+which is the same as `{$variable|escape:"html"}`.
+
+Template designers can choose to selectively disable this feature by
+adding the `nofilter` flag: `{$variable nofilter}`.
+
+Modifiers and Filters are run in the following order: modifier,
+default\_modifier, \$escape\_html, registered variable filters,
+autoloaded variable filters, template instance\'s variable filters.
+Everything except the individual modifier can be disabled with the
+`nofilter` flag.
+
+> **Note**
+>
+> This is a compile time option. If you change the setting you must make
+> sure that the templates get recompiled.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-cache.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-cache.md
new file mode 100644
index 000000000..de0c0c15a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-cache.md
@@ -0,0 +1,6 @@
+\$force\_cache {#variable.force.cache}
+==============
+
+This forces Smarty to (re)cache templates on every invocation. It does
+not override the [`$caching`](#variable.caching) level, but merely
+pretends the template has never been cached before.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-compile.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-compile.md
new file mode 100644
index 000000000..73f1e792d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-compile.md
@@ -0,0 +1,9 @@
+\$force\_compile {#variable.force.compile}
+================
+
+This forces Smarty to (re)compile templates on every invocation. This
+setting overrides [`$compile_check`](#variable.compile.check). By
+default this is FALSE. This is handy for development and
+[debugging](#chapter.debugging.console). It should never be used in a
+production environment. If [`$caching`](#variable.caching) is enabled,
+the cache file(s) will be regenerated every time.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-left-delimiter.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-left-delimiter.md
new file mode 100644
index 000000000..bcc13f0e5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-left-delimiter.md
@@ -0,0 +1,8 @@
+\$left\_delimiter {#variable.left.delimiter}
+=================
+
+This is the left delimiter used by the template language. Default is
+`{`.
+
+See also [`$right_delimiter`](#variable.right.delimiter) and [escaping
+smarty parsing](#language.escaping) .
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-locking-timeout.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-locking-timeout.md
new file mode 100644
index 000000000..82fd0568a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-locking-timeout.md
@@ -0,0 +1,7 @@
+\$locking\_timeout {#variable.locking.timeout}
+==================
+
+This is maximum time in seconds a cache lock is valid to avoid dead
+locks. The default value is 10 seconds.
+
+See also [`$cache_locking`](#variable.cache.locking)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-merge-compiled-includes.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-merge-compiled-includes.md
new file mode 100644
index 000000000..8220c442b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-merge-compiled-includes.md
@@ -0,0 +1,27 @@
+\$merge\_compiled\_includes {#variable.merge.compiled.includes}
+===========================
+
+By setting `$merge_compiled_includes` to TRUE Smarty will merge the
+compiled template code of subtemplates into the compiled code of the
+main template. This increases rendering speed of templates using a many
+different sub-templates.
+
+Individual sub-templates can be merged by setting the `inline` option
+flag within the `{include}` tag. `$merge_compiled_includes` does not
+have to be enabled for the `inline` merge.
+
+::: {.informalexample}
+
+    <?php
+    $smarty->merge_compiled_includes = true;
+    ?>
+
+            
+:::
+
+> **Note**
+>
+> This is a compile time option. If you change the setting you must make
+> sure that the templates get recompiled.
+
+See also [`{include}`](#language.function.include) tag
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-plugins-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-plugins-dir.md
new file mode 100644
index 000000000..8a7cfcdb2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-plugins-dir.md
@@ -0,0 +1,28 @@
+\$plugins\_dir {#variable.plugins.dir}
+==============
+
+This is the directory or directories where Smarty will look for the
+plugins that it needs. Default is `plugins/` under the
+[`SMARTY_DIR`](#constant.smarty.dir). If you supply a relative path,
+Smarty will first look under the [`SMARTY_DIR`](#constant.smarty.dir),
+then relative to the current working directory, then relative to the PHP
+include\_path. If `$plugins_dir` is an array of directories, Smarty will
+search for your plugin in each plugin directory **in the order they are
+given**.
+
+> **Note**
+>
+> For best performance, do not setup your `$plugins_dir` to have to use
+> the PHP include path. Use an absolute pathname, or a path relative to
+> `SMARTY_DIR` or the current working directory.
+
+> **Note**
+>
+> As of Smarty 3.1 the attribute \$plugins\_dir is no longer accessible
+> directly. Use [`getPluginsDir()`](#api.get.plugins.dir),
+> [`setPluginsDir()`](#api.set.plugins.dir) and
+> [`addPluginsDir()`](#api.add.plugins.dir) instead.
+
+See also [`getPluginsDir()`](#api.get.plugins.dir),
+[`setPluginsDir()`](#api.set.plugins.dir) and
+[`addPluginsDir()`](#api.add.plugins.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-right-delimiter.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-right-delimiter.md
new file mode 100644
index 000000000..14a9b568e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-right-delimiter.md
@@ -0,0 +1,8 @@
+\$right\_delimiter {#variable.right.delimiter}
+==================
+
+This is the right delimiter used by the template language. Default is
+`}`.
+
+See also [`$left_delimiter`](#variable.left.delimiter) and [escaping
+smarty parsing](#language.escaping).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-smarty-debug-id.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-smarty-debug-id.md
new file mode 100644
index 000000000..0733ed518
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-smarty-debug-id.md
@@ -0,0 +1,9 @@
+\$smarty\_debug\_id {#variable.smarty.debug.id}
+===================
+
+The value of `$smarty_debug_id` defines the URL keyword to enable
+debugging at browser level. The default value is `SMARTY_DEBUG`.
+
+See also [debugging console](#chapter.debugging.console) section,
+[`$debugging`](#variable.debugging) and
+[`$debugging_ctrl`](#variable.debugging.ctrl).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-template-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-template-dir.md
new file mode 100644
index 000000000..1db9c4139
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-template-dir.md
@@ -0,0 +1,36 @@
+\$template\_dir {#variable.template.dir}
+===============
+
+This is the name of the default template directory. If you do not supply
+a resource type when including files, they will be found here. By
+default this is `./templates`, meaning that Smarty will look for the
+`templates/` directory in the same directory as the executing php
+script. \$template\_dir can also be an array of directory paths: Smarty
+will traverse the directories and stop on the first matching template
+found.
+
+> **Note**
+>
+> It is not recommended to put this directory under the web server
+> document root.
+
+> **Note**
+>
+> If the directories known to `$template_dir` are relative to
+> directories known to the
+> [include\_path](https://www.php.net/ini.core.php#ini.include-path) you
+> need to activate the [`$use_include_path`](#variable.use.include.path)
+> option.
+
+> **Note**
+>
+> As of Smarty 3.1 the attribute \$template\_dir is no longer accessible
+> directly. Use [`getTemplateDir()`](#api.get.template.dir),
+> [`setTemplateDir()`](#api.set.template.dir) and
+> [`addTemplateDir()`](#api.add.template.dir) instead.
+
+See also [`Template Resources`](#resources),
+[`$use_include_path`](#variable.use.include.path),
+[`getTemplateDir()`](#api.get.template.dir),
+[`setTemplateDir()`](#api.set.template.dir) and
+[`addTemplateDir()`](#api.add.template.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-trusted-dir.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-trusted-dir.md
new file mode 100644
index 000000000..9720ae8a6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-trusted-dir.md
@@ -0,0 +1,8 @@
+\$trusted\_dir {#variable.trusted.dir}
+==============
+
+`$trusted_dir` is only for use when security is enabled. This is an
+array of all directories that are considered trusted. Trusted
+directories are where you keep php scripts that are executed directly
+from the templates with
+[`{insert}`](#language.function.insert.php).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-include-path.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-include-path.md
new file mode 100644
index 000000000..90f55f073
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-include-path.md
@@ -0,0 +1,49 @@
+\$use\_include\_path {#variable.use.include.path}
+====================
+
+This tells smarty to respect the
+[include\_path](https://www.php.net/ini.core.php#ini.include-path) within
+the [`File Template Resource`](#resources.file) handler and the plugin
+loader to resolve the directories known to
+[`$template_dir`](#variable.template.dir). The flag also makes the
+plugin loader check the include\_path for
+[`$plugins_dir`](#variable.plugins.dir).
+
+> **Note**
+>
+> You should not design your applications to rely on the include\_path,
+> as this may - depending on your implementation - slow down your system
+> (and Smarty) considerably.
+
+If use\_include\_path is enabled, file discovery for
+[`$template_dir`](#variable.template.dir) and
+[`$plugins_dir`](#variable.plugins.dir) work as follows.
+
+-   For each element `$directory` in array (\$template\_dir or
+    \$plugins\_dir) do
+
+-   Test if requested file is in `$directory` relative to the [current
+    working directory](https://www.php.net/function.getcwd.php). If file
+    found, return it.
+
+-   For each `$path` in include\_path do
+
+-   Test if requested file is in `$directory` relative to the `$path`
+    (possibly relative to the [current working
+    directory](https://www.php.net/function.getcwd.php)). If file found,
+    return it.
+
+-   Try default\_handler or fail.
+
+This means that whenever a directory/file relative to the current
+working directory is encountered, it is preferred over anything
+potentially accessible through the include\_path.
+
+> **Note**
+>
+> Smarty does not filter elements of the include\_path. That means a
+> \".:\" within your include path will trigger the current working
+> directory lookup twice.
+
+See also [`Template Resources`](#resources) and
+[`$template_dir`](#variable.template.dir)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-sub-dirs.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-sub-dirs.md
new file mode 100644
index 000000000..dcda3f2d6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-sub-dirs.md
@@ -0,0 +1,31 @@
+\$use\_sub\_dirs {#variable.use.sub.dirs}
+================
+
+Smarty will create subdirectories under the [compiled
+templates](#variable.compile.dir) and [cache](#variable.cache.dir)
+directories if `$use_sub_dirs` is set to TRUE, default is FALSE. In an
+environment where there are potentially tens of thousands of files
+created, this may help the filesystem speed. On the other hand, some
+environments do not allow PHP processes to create directories, so this
+must be disabled which is the default.
+
+Sub directories are more efficient, so use them if you can.
+Theoretically you get much better performance on a filesystem with 10
+directories each having 100 files, than with 1 directory having 1000
+files. This was certainly the case with Solaris 7 (UFS)\... with newer
+filesystems such as ext3 and especially reiserfs, the difference is
+almost nothing.
+
+> **Note**
+>
+> -   `$use_sub_dirs=true` doesn\'t work with
+>     [safe\_mode=On](https://www.php.net/features.safe-mode), that\'s why
+>     it\'s switchable and why it\'s off by default.
+>
+> -   `$use_sub_dirs=true` on Windows can cause problems.
+>
+> -   Safe\_mode is being deprecated in PHP6.
+>
+See also [`$compile_id`](#variable.compile.id),
+[`$cache_dir`](#variable.cache.dir), and
+[`$compile_dir`](#variable.compile.dir).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching.md
new file mode 100644
index 000000000..5656b71b5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching.md
@@ -0,0 +1,24 @@
+Caching
+=======
+
+Caching is used to speed up a call to [`display()`](./api-functions/api-display.md) or
+[`fetch()`](./api-functions/api-fetch.md) by saving its output to a file. If a cached
+version of the call is available, that is displayed instead of
+regenerating the output. Caching can speed things up tremendously,
+especially templates with longer computation times. Since the output of
+[`display()`](./api-functions/api-display.md) or [`fetch()`](./api-functions/api-fetch.md) is cached, one
+cache file could conceivably be made up of several template files,
+config files, etc.
+
+Since templates are dynamic, it is important to be careful what you are
+caching and for how long. For instance, if you are displaying the front
+page of your website that does not change its content very often, it
+might work well to cache this page for an hour or more. On the other
+hand, if you are displaying a page with a timetable containing new
+information by the minute, it would not make sense to cache this page.
+
+## Table of contents
+- [Setting Up Caching](./caching/caching-setting-up.md)
+- [Multiple Caches Per Page](./caching/caching-multiple-caches.md)
+- [Controlling Cacheability of Output](./caching/caching-groups.md)
+- [Custom Cache Implementation](./caching/caching-custom.md)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching/caching-cacheable.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching/caching-cacheable.md
new file mode 100644
index 000000000..ee9b60090
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching/caching-cacheable.md
@@ -0,0 +1,176 @@
+Controlling Cacheability of Output {#caching.cacheable}
+==================================
+
+If caching is enabled normally the whole final output of the page gets
+cached. However Smarty3 offers several options how to exclude sections
+of your output from caching.
+
+> **Note**
+>
+> Be sure any variables used within a non-cached section are also
+> assigned from PHP when the page is loaded from the cache.
+
+Cacheability of Template Section {#cacheability.sections}
+--------------------------------
+
+A larger section of your template can easily excluded from caching by
+using the [`{nocache}`](#language.function.nocache) and
+[`{/nocache}`](#language.function.nocache) tags.
+
+
+
+    Today's date is
+    {nocache}
+    {$smarty.now|date_format}
+    {/nocache}
+
+       
+
+The above code will output the current date on a cached page.
+
+Cacheability of Tags {#cacheability.tags}
+--------------------
+
+Caching for an individual tag can be disabled by adding the \"nocache\"
+option flag to the tag.
+
+
+    Today's date is
+    {$smarty.now|date_format nocache}
+
+        
+
+Cacheability of Variables {#cacheability.variables}
+-------------------------
+
+You can [`assign()`](#api.assign) variables as not cachable. Any tag
+which uses such variable will be automatically executed in nocache mode.
+
+> **Note**
+>
+> If a tag is executed in nocache mode you must make sure that all other
+> variables used by that tag are also assigned from PHP when the page is
+> loaded from the cache.
+
+> **Note**
+>
+> The nocache status of an assigned variable will effect the compiled
+> template code. If you change the status you must manually delete
+> existing compiled and cached template files to force a recompile.
+
+
+    // assign $foo as nocahe variable
+    $smarty->assign('foo',time(),true);
+
+
+    Dynamic time value is {$foo}
+
+        
+
+Cacheability of Plugins {#cacheability.plugins}
+-----------------------
+
+The cacheability of plugins can be declared when registering them. The
+third parameter to [`registerPlugin()`](#api.register.plugin) is called
+`$cacheable` and defaults to TRUE.
+
+When registering a plugin with `$cacheable=false` the plugin is called
+everytime the page is displayed, even if the page comes from the cache.
+The plugin function behaves a little like an
+[`{insert}`](#plugins.inserts) function.
+
+> **Note**
+>
+> The `$cacheable` status will effect the compiled template code. If you
+> change the status you must manually delete existing compiled and
+> cached template files to force a recompile.
+
+In contrast to [`{insert}`](#plugins.inserts) the attributes to the
+plugins are not cached by default. They can be declared to be cached
+with the fourth parameter `$cache_attrs`. `$cache_attrs` is an array of
+attribute-names that should be cached, so the plugin-function get value
+as it was the time the page was written to cache everytime it is fetched
+from the cache.
+
+
+    <?php
+    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+    function remaining_seconds($params, $smarty) {
+        $remain = $params['endtime'] - time();
+        if($remain >= 0){
+            return $remain . ' second(s)';
+        }else{
+            return 'done';
+        }
+    }
+
+    $smarty->registerPlugin('function','remaining', 'remaining_seconds', false, array('endtime'));
+
+    if (!$smarty->isCached('index.tpl')) {
+        // fetch $obj from db and assign...
+        $smarty->assignByRef('obj', $obj);
+    }
+
+    $smarty->display('index.tpl');
+    ?>
+
+       
+
+where `index.tpl` is:
+
+
+    Time Remaining: {remaining endtime=$obj->endtime}
+
+       
+
+The number of seconds till the endtime of `$obj` is reached changes on
+each display of the page, even if the page is cached. Since the endtime
+attribute is cached the object only has to be pulled from the database
+when page is written to the cache but not on subsequent requests of the
+page.
+
+
+    index.php:
+
+    <?php
+    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+    function smarty_block_dynamic($param, $content, $smarty) {
+        return $content;
+    }
+    $smarty->registerPlugin('block','dynamic', 'smarty_block_dynamic', false);
+
+    $smarty->display('index.tpl');
+    ?>
+
+       
+
+where `index.tpl` is:
+
+
+    Page created: {'0'|date_format:'%D %H:%M:%S'}
+
+    {dynamic}
+
+    Now is: {'0'|date_format:'%D %H:%M:%S'}
+
+    ... do other stuff ...
+
+    {/dynamic}
+
+       
+
+When reloading the page you will notice that both dates differ. One is
+"dynamic" one is "static". You can do everything between
+`{dynamic}...{/dynamic}` and be sure it will not be cached like the rest
+of the page.
+
+> **Note**
+>
+> The above example shall just demonstrate how a dynamic block plugins
+> works. See
+> [`Cacheability of Template Section`](#cacheability.sections) on how to
+> disable caching of a template section by the built-in
+> [`{nocache}`](#language.function.nocache) and
+> [`{/nocache}`](#language.function.nocache) tags.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching/caching-custom.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching/caching-custom.md
new file mode 100644
index 000000000..77d2ce7b3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching/caching-custom.md
@@ -0,0 +1,296 @@
+Custom Cache Implementation {#caching.custom}
+===========================
+
+As an alternative to using the default file-based caching mechanism, you
+can specify a custom cache implementation that will be used to read,
+write and clear cached files.
+
+> **Note**
+>
+> In Smarty2 this used to be a callback function called
+> `$cache_handler_func`. Smarty3 replaced this callback by the
+> `Smarty_CacheResource` module.
+
+With a custom cache implementation you\'re likely trying to achieve at
+least one of the following goals: replace the slow filesystem by a
+faster storage engine, centralize the cache to be accessible to multiple
+servers.
+
+Smarty allows CacheResource implementations to use one of the APIs
+`Smarty_CacheResource_Custom` or `Smarty_CacheResource_KeyValueStore`.
+`Smarty_CacheResource_Custom` is a simple API directing all read, write,
+clear calls to your implementation. This API allows you to store
+wherever and however you deem fit. The
+`Smarty_CacheResource_KeyValueStore` API allows you to turn any \"dumb\"
+KeyValue-Store (like APC, Memcache, ...) into a full-featured
+CacheResource implementation. That is, everything around deep
+cache-groups like \"a\|b\|c\" is being handled for you in way that
+allows clearing the cache-group \"a\" and all nested groups are cleared
+as well - even though KeyValue-Stores don\'t allow this kind of
+hierarchy by nature.
+
+Custom CacheResources may be put in a file `cacheresource.foobarxyz.php`
+within your [`$plugins_dir`](#variable.plugins.dir), or registered on
+runtime with [`registerCacheResource()`](#api.register.cacheresource).
+In either case you need to set [`$caching_type`](#variable.caching.type)
+to invoke your custom CacheResource implementation.
+
+
+    <?php
+
+    require_once 'libs/Smarty.class.php';
+    $smarty = new Smarty();
+    $smarty->caching_type = 'mysql';
+
+    /**
+     * MySQL CacheResource
+     *
+     * CacheResource Implementation based on the Custom API to use
+     * MySQL as the storage resource for Smarty's output caching.
+     *
+     * Table definition:
+     * <pre>CREATE TABLE IF NOT EXISTS `output_cache` (
+     *   `id` CHAR(40) NOT NULL COMMENT 'sha1 hash',
+     *   `name` VARCHAR(250) NOT NULL,
+     *   `cache_id` VARCHAR(250) NULL DEFAULT NULL,
+     *   `compile_id` VARCHAR(250) NULL DEFAULT NULL,
+     *   `modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+     *   `content` LONGTEXT NOT NULL,
+     *   PRIMARY KEY (`id`),
+     *   INDEX(`name`),
+     *   INDEX(`cache_id`),
+     *   INDEX(`compile_id`),
+     *   INDEX(`modified`)
+     * ) ENGINE = InnoDB;</pre>
+     *
+     * @package CacheResource-examples
+     * @author Rodney Rehm
+     */
+    class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom {
+        // PDO instance
+        protected $db;
+        protected $fetch;
+        protected $fetchTimestamp;
+        protected $save;
+        
+        public function __construct() {
+            try {
+                $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty", "smarty");
+            } catch (PDOException $e) {
+                throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
+            }
+            $this->fetch = $this->db->prepare('SELECT modified, content FROM output_cache WHERE id = :id');
+            $this->fetchTimestamp = $this->db->prepare('SELECT modified FROM output_cache WHERE id = :id');
+            $this->save = $this->db->prepare('REPLACE INTO output_cache (id, name, cache_id, compile_id, content)
+                VALUES  (:id, :name, :cache_id, :compile_id, :content)');
+        }
+
+        /**
+         * fetch cached content and its modification time from data source
+         *
+         * @param string $id unique cache content identifier
+         * @param string $name template name
+         * @param string $cache_id cache id
+         * @param string $compile_id compile id
+         * @param string $content cached content
+         * @param integer $mtime cache modification timestamp (epoch)
+         * @return void
+         */
+        protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime)
+        {
+            $this->fetch->execute(array('id' => $id));
+            $row = $this->fetch->fetch();
+            $this->fetch->closeCursor();        
+            if ($row) {
+                $content = $row['content'];
+                $mtime = strtotime($row['modified']);
+            } else {
+                $content = null;
+                $mtime = null;
+            }
+        }
+        
+        /**
+         * Fetch cached content's modification timestamp from data source
+         *
+         * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the complete cached content.
+         * @param string $id unique cache content identifier
+         * @param string $name template name
+         * @param string $cache_id cache id
+         * @param string $compile_id compile id
+         * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+         */
+        protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
+        {
+            $this->fetchTimestamp->execute(array('id' => $id));
+            $mtime = strtotime($this->fetchTimestamp->fetchColumn());
+            $this->fetchTimestamp->closeCursor();
+            return $mtime;
+        }
+        
+        /**
+         * Save content to cache
+         *
+         * @param string $id unique cache content identifier
+         * @param string $name template name
+         * @param string $cache_id cache id
+         * @param string $compile_id compile id
+         * @param integer|null $exp_time seconds till expiration time in seconds or null
+         * @param string $content content to cache
+         * @return boolean success
+         */
+        protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content)
+        {
+            $this->save->execute(array(
+                'id' => $id,
+                'name' => $name,
+                'cache_id' => $cache_id,
+                'compile_id' => $compile_id,
+                'content' => $content,
+            ));
+            return !!$this->save->rowCount();
+        }
+        
+        /**
+         * Delete content from cache
+         *
+         * @param string $name template name
+         * @param string $cache_id cache id
+         * @param string $compile_id compile id
+         * @param integer|null $exp_time seconds till expiration or null
+         * @return integer number of deleted caches
+         */
+        protected function delete($name, $cache_id, $compile_id, $exp_time)
+        {
+            // delete the whole cache
+            if ($name === null && $cache_id === null && $compile_id === null && $exp_time === null) {
+                // returning the number of deleted caches would require a second query to count them
+                $query = $this->db->query('TRUNCATE TABLE output_cache');
+                return -1;
+            }
+            // build the filter
+            $where = array();
+            // equal test name
+            if ($name !== null) {
+                $where[] = 'name = ' . $this->db->quote($name);
+            }
+            // equal test compile_id
+            if ($compile_id !== null) {
+                $where[] = 'compile_id = ' . $this->db->quote($compile_id);
+            }
+            // range test expiration time
+            if ($exp_time !== null) {
+                $where[] = 'modified < DATE_SUB(NOW(), INTERVAL ' . intval($exp_time) . ' SECOND)';
+            }
+            // equal test cache_id and match sub-groups
+            if ($cache_id !== null) {
+                $where[] = '(cache_id = '. $this->db->quote($cache_id)
+                    . ' OR cache_id LIKE '. $this->db->quote($cache_id .'|%') .')';
+            }
+            // run delete query
+            $query = $this->db->query('DELETE FROM output_cache WHERE ' . join(' AND ', $where));
+            return $query->rowCount();
+        }
+    }
+
+       
+
+
+    <?php
+
+    require_once 'libs/Smarty.class.php';
+    $smarty = new Smarty();
+    $smarty->caching_type = 'memcache';
+
+    /**
+     * Memcache CacheResource
+     *
+     * CacheResource Implementation based on the KeyValueStore API to use
+     * memcache as the storage resource for Smarty's output caching.
+     *
+     * Note that memcache has a limitation of 256 characters per cache-key.
+     * To avoid complications all cache-keys are translated to a sha1 hash.
+     *
+     * @package CacheResource-examples
+     * @author Rodney Rehm
+     */
+    class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore {
+        /**
+         * memcache instance
+         * @var Memcache
+         */
+        protected $memcache = null;
+        
+        public function __construct()
+        {
+            $this->memcache = new Memcache();
+            $this->memcache->addServer( '127.0.0.1', 11211 );
+        }
+        
+        /**
+         * Read values for a set of keys from cache
+         *
+         * @param array $keys list of keys to fetch
+         * @return array list of values with the given keys used as indexes
+         * @return boolean true on success, false on failure
+         */
+        protected function read(array $keys)
+        {
+            $_keys = $lookup = array();
+            foreach ($keys as $k) {
+                $_k = sha1($k);
+                $_keys[] = $_k;
+                $lookup[$_k] = $k;
+            }
+            $_res = array();
+            $res = $this->memcache->get($_keys);
+            foreach ($res as $k => $v) {
+                $_res[$lookup[$k]] = $v;
+            }
+            return $_res;
+        }
+        
+        /**
+         * Save values for a set of keys to cache
+         *
+         * @param array $keys list of values to save
+         * @param int $expire expiration time
+         * @return boolean true on success, false on failure
+         */
+        protected function write(array $keys, $expire=null)
+        {
+            foreach ($keys as $k => $v) {
+                $k = sha1($k);
+                $this->memcache->set($k, $v, 0, $expire);
+            }
+            return true;
+        }
+
+        /**
+         * Remove values from cache
+         *
+         * @param array $keys list of keys to delete
+         * @return boolean true on success, false on failure
+         */
+        protected function delete(array $keys)
+        {
+            foreach ($keys as $k) {
+                $k = sha1($k);
+                $this->memcache->delete($k);
+            }
+            return true;
+        }
+
+        /**
+         * Remove *all* values from cache
+         *
+         * @return boolean true on success, false on failure
+         */
+        protected function purge()
+        {
+            return $this->memcache->flush();
+        }
+    }
+
+
+       
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching/caching-groups.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching/caching-groups.md
new file mode 100644
index 000000000..7e248b2f3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching/caching-groups.md
@@ -0,0 +1,60 @@
+Cache Groups {#caching.groups}
+============
+
+You can do more elaborate grouping by setting up `$cache_id` groups.
+This is accomplished by separating each sub-group with a vertical bar
+`|` in the `$cache_id` value. You can have as many sub-groups as you
+like.
+
+-   You can think of cache groups like a directory hierarchy. For
+    instance, a cache group of `'a|b|c'` could be thought of as the
+    directory structure `'/a/b/c/'`.
+
+-   `clearCache(null,'a|b|c')` would be like removing the files
+    `'/a/b/c/*'`. `clearCache(null,'a|b')` would be like removing the
+    files `'/a/b/*'`.
+
+-   If you specify a [`$compile_id`](#variable.compile.id) such as
+    `clearCache(null,'a|b','foo')` it is treated as an appended cache
+    group `'/a/b/c/foo/'`.
+
+-   If you specify a template name such as
+    `clearCache('foo.tpl','a|b|c')` then Smarty will attempt to remove
+    `'/a/b/c/foo.tpl'`.
+
+-   You CANNOT remove a specified template name under multiple cache
+    groups such as `'/a/b/*/foo.tpl'`, the cache grouping works
+    left-to-right ONLY. You will need to group your templates under a
+    single cache group hierarchy to be able to clear them as a group.
+
+Cache grouping should not be confused with your template directory
+hierarchy, the cache grouping has no knowledge of how your templates are
+structured. So for example, if you have a template structure like
+`themes/blue/index.tpl` and you want to be able to clear all the cache
+files for the "blue" theme, you will need to create a cache group
+structure that mimics your template file structure, such as
+`display('themes/blue/index.tpl','themes|blue')`, then clear them with
+`clearCache(null,'themes|blue')`.
+
+
+    <?php
+    require('Smarty.class.php');
+    $smarty = new Smarty;
+
+    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+    // clear all caches with 'sports|basketball' as the first two cache_id groups
+    $smarty->clearCache(null,'sports|basketball');
+
+    // clear all caches with "sports" as the first cache_id group. This would
+    // include "sports|basketball", or "sports|(anything)|(anything)|(anything)|..."
+    $smarty->clearCache(null,'sports');
+
+    // clear the foo.tpl cache file with "sports|basketball" as the cache_id
+    $smarty->clearCache('foo.tpl','sports|basketball');
+
+
+    $smarty->display('index.tpl','sports|basketball');
+    ?>
+
+          
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching/caching-multiple-caches.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching/caching-multiple-caches.md
new file mode 100644
index 000000000..40fffc3d7
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching/caching-multiple-caches.md
@@ -0,0 +1,87 @@
+Multiple Caches Per Page {#caching.multiple.caches}
+========================
+
+You can have multiple cache files for a single call to
+[`display()`](#api.display) or [`fetch()`](#api.fetch). Let\'s say that
+a call to `display('index.tpl')` may have several different output
+contents depending on some condition, and you want separate caches for
+each one. You can do this by passing a `$cache_id` as the second
+parameter to the function call.
+
+
+    <?php
+    require('Smarty.class.php');
+    $smarty = new Smarty;
+
+    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+    $my_cache_id = $_GET['article_id'];
+
+    $smarty->display('index.tpl', $my_cache_id);
+    ?>
+
+         
+
+Above, we are passing the variable `$my_cache_id` to
+[`display()`](#api.display) as the `$cache_id`. For each unique value of
+`$my_cache_id`, a separate cache will be generated for `index.tpl`. In
+this example, `article_id` was passed in the URL and is used as the
+`$cache_id`.
+
+> **Note**
+>
+> Be very cautious when passing values from a client (web browser) into
+> Smarty or any PHP application. Although the above example of using the
+> article\_id from the URL looks handy, it could have bad consequences.
+> The `$cache_id` is used to create a directory on the file system, so
+> if the user decided to pass an extremely large value for article\_id,
+> or write a script that sends random article\_id\'s at a rapid pace,
+> this could possibly cause problems at the server level. Be sure to
+> sanitize any data passed in before using it. In this instance, maybe
+> you know the article\_id has a length of ten characters and is made up
+> of alpha-numerics only, and must be a valid article\_id in the
+> database. Check for this!
+
+Be sure to pass the same `$cache_id` as the second parameter to
+[`isCached()`](#api.is.cached) and [`clearCache()`](#api.clear.cache).
+
+
+    <?php
+    require('Smarty.class.php');
+    $smarty = new Smarty;
+
+    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+    $my_cache_id = $_GET['article_id'];
+
+    if(!$smarty->isCached('index.tpl',$my_cache_id)) {
+        // No cache available, do variable assignments here.
+        $contents = get_database_contents();
+        $smarty->assign($contents);
+    }
+
+    $smarty->display('index.tpl',$my_cache_id);
+    ?>
+
+         
+
+You can clear all caches for a particular `$cache_id` by passing NULL as
+the first parameter to [`clearCache()`](#api.clear.cache).
+
+
+    <?php
+    require('Smarty.class.php');
+    $smarty = new Smarty;
+
+    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+    // clear all caches with "sports" as the $cache_id
+    $smarty->clearCache(null,'sports');
+
+    $smarty->display('index.tpl','sports');
+    ?>
+
+         
+
+In this manner, you can "group" your caches together by giving them the
+same `$cache_id`.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching/caching-setting-up.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching/caching-setting-up.md
new file mode 100644
index 000000000..bc9d2ad9e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/caching/caching-setting-up.md
@@ -0,0 +1,153 @@
+Setting Up Caching {#caching.setting.up}
+==================
+
+The first thing to do is enable caching by setting
+[`$caching`](#variable.caching) to one of
+`Smarty::CACHING_LIFETIME_CURRENT` or `Smarty::CACHING_LIFETIME_SAVED`.
+
+
+    <?php
+    require('Smarty.class.php');
+    $smarty = new Smarty;
+
+    // uses the value of $smarty->cacheLifetime() to determine
+    // the number of seconds a cache is good for
+    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+    $smarty->display('index.tpl');
+    ?>
+
+        
+
+With caching enabled, the function call to `display('index.tpl')` will
+render the template as usual, but also saves a copy of its output to a
+file (a cached copy) in the [`$cache_dir`](#variable.cache.dir). On the
+next call to `display('index.tpl')`, the cached copy will be used
+instead of rendering the template again.
+
+> **Note**
+>
+> The files in the [`$cache_dir`](#variable.cache.dir) are named similar
+> to the template name. Although they end in the `.php` extension, they
+> are not intended to be directly executable. Do not edit these files!
+
+Each cached page has a limited lifetime determined by
+[`$cache_lifetime`](#variable.cache.lifetime). The default value is 3600
+seconds, or one hour. After that time expires, the cache is regenerated.
+It is possible to give individual caches their own expiration time by
+setting [`$caching`](#variable.caching) to
+`Smarty::CACHING_LIFETIME_SAVED`. See
+[`$cache_lifetime`](#variable.cache.lifetime) for more details.
+
+
+    <?php
+    require('Smarty.class.php');
+    $smarty = new Smarty;
+
+    // retain current cache lifetime for each specific display call
+    $smarty->setCaching(Smarty::CACHING_LIFETIME_SAVED);
+
+    // set the cache_lifetime for index.tpl to 5 minutes
+    $smarty->setCacheLifetime(300);
+    $smarty->display('index.tpl');
+
+    // set the cache_lifetime for home.tpl to 1 hour
+    $smarty->setCacheLifetime(3600);
+    $smarty->display('home.tpl');
+
+    // NOTE: the following $cache_lifetime setting will not work when $caching
+    // is set to Smarty::CACHING_LIFETIME_SAVED.
+    // The cache lifetime for home.tpl has already been set
+    // to 1 hour, and will no longer respect the value of $cache_lifetime.
+    // The home.tpl cache will still expire after 1 hour.
+    $smarty->setCacheLifetime(30); // 30 seconds
+    $smarty->display('home.tpl');
+    ?>
+
+        
+
+If [`$compile_check`](#variable.compile.check) is enabled (default),
+every template file and config file that is involved with the cache file
+is checked for modification. If any of the files have been modified
+since the cache was generated, the cache is immediately regenerated.
+This is a computational overhead, so for optimum performance set
+[`$compile_check`](#variable.compile.check) to FALSE.
+
+
+    <?php
+    require('Smarty.class.php');
+    $smarty = new Smarty;
+
+    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+    $smarty->setCompileCheck(false);
+
+    $smarty->display('index.tpl');
+    ?>
+
+        
+
+If [`$force_compile`](#variable.force.compile) is enabled, the cache
+files will always be regenerated. This effectively disables caching,
+however this also seriously degrades performance.
+[`$force_compile`](#variable.force.compile) is meant to be used for
+[debugging](#chapter.debugging.console) purposes. The appropriate way to
+disable caching is to set [`$caching`](#variable.caching) to
+Smarty::CACHING\_OFF.
+
+The [`isCached()`](#api.is.cached) function can be used to test if a
+template has a valid cache or not. If you have a cached template that
+requires something like a database fetch, you can use this to skip that
+process.
+
+
+    <?php
+    require('Smarty.class.php');
+    $smarty = new Smarty;
+
+    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+    if(!$smarty->isCached('index.tpl')) {
+        // No cache available, do variable assignments here.
+        $contents = get_database_contents();
+        $smarty->assign($contents);
+    }
+
+    $smarty->display('index.tpl');
+    ?>
+
+        
+
+You can keep parts of a page dynamic (disable caching) with the
+[`{nocache}{/nocache}`](#language.function.nocache) block function, the
+[`{insert}`](#language.function.insert) function, or by using the
+`nocache` parameter for most template functions.
+
+Let\'s say the whole page can be cached except for a banner that is
+displayed down the side of the page. By using the
+[`{insert}`](#language.function.insert) function for the banner, you can
+keep this element dynamic within the cached content. See the
+documentation on [`{insert}`](#language.function.insert) for more
+details and examples.
+
+You can clear all the cache files with the
+[`clearAllCache()`](#api.clear.all.cache) function, or individual cache
+files [and groups](#caching.groups) with the
+[`clearCache()`](#api.clear.cache) function.
+
+
+    <?php
+    require('Smarty.class.php');
+    $smarty = new Smarty;
+
+    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+    // clear only cache for index.tpl
+    $smarty->clearCache('index.tpl');
+
+    // clear out all cache files
+    $smarty->clearAllCache();
+
+    $smarty->display('index.tpl');
+    ?>
+
+        
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/charset.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/charset.md
new file mode 100644
index 000000000..9dedf4dcd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/charset.md
@@ -0,0 +1,44 @@
+Charset Encoding {#charset}
+================
+
+Charset Encoding {#charset.encoding}
+================
+
+There are a variety of encodings for textual data, ISO-8859-1 (Latin1)
+and UTF-8 being the most popular. Unless you change `Smarty::$_CHARSET`, 
+Smarty recognizes `UTF-8` as the internal charset if 
+[Multibyte String](https://www.php.net/mbstring) is available, 
+`ISO-8859-1` if not.
+
+> **Note**
+>
+> `ISO-8859-1` has been PHP\'s default internal charset since the
+> beginning. Unicode has been evolving since 1991. Since then it has
+> become the one charset to conquer them all, as it is capable of
+> encoding most of the known characters even across different character
+> systems (latin, cyrillic, japanese, ...). `UTF-8` is unicode\'s most
+> used encoding, as it allows referencing the thousands of character
+> with the smallest size overhead possible.
+>
+> Since unicode and UTF-8 are very wide spread nowadays, their use is
+> strongly encouraged.
+
+> **Note**
+>
+> Smarty\'s internals and core plugins are truly UTF-8 compatible since
+> Smarty 3.1. To achieve unicode compatibility, the [Multibyte
+> String](https://www.php.net/mbstring) PECL is required. Unless your PHP
+> environment offers this package, Smarty will not be able to offer
+> full-scale UTF-8 compatibility.
+
+
+    // use japanese character encoding
+    if (function_exists('mb_internal_charset')) {
+      mb_internal_charset('EUC-JP');
+    }
+
+    require_once 'libs/Smarty.class.php';
+    Smarty::$_CHARSET = 'EUC-JP';
+    $smarty = new Smarty();
+      
+     
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins.md
new file mode 100644
index 000000000..41a7ea0c4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins.md
@@ -0,0 +1,44 @@
+Extending Smarty With Plugins {#plugins}
+=============================
+
+## Table of contents
+
+- [How Plugins Work](./plugins/plugins-howto.md)
+- [Naming Conventions](./plugins/plugins-naming-conventions.md) 
+- [Writing Plugins](./plugins/plugins-writing.md) 
+- [Template Functions](./plugins/plugins-functions.md) 
+- [Modifiers](./plugins/plugins-modifiers.md)
+- [Block Functions](./plugins/plugins-block-functions.md) 
+- [Compiler Functions](./plugins/plugins-compiler-functions.md) 
+- [Prefilters/Postfilters](./plugins/plugins-prefilters-postfilters.md)
+- [Output Filters](./plugins/plugins-outputfilters.md) 
+- [Resources](./plugins/plugins-resources.md)
+- [Inserts](./plugins/plugins-inserts.md)
+
+Version 2.0 introduced the plugin architecture that is used for almost
+all the customizable functionality of Smarty. This includes:
+
+-   functions
+
+-   modifiers
+
+-   block functions
+
+-   compiler functions
+
+-   prefilters
+
+-   postfilters
+
+-   outputfilters
+
+-   resources
+
+-   inserts
+
+With the exception of resources, backwards compatibility with the old
+way of registering handler functions via register\_\* API is preserved.
+If you did not use the API but instead modified the class variables
+`$custom_funcs`, `$custom_mods`, and other ones directly, then you will
+need to adjust your scripts to either use the API or convert your custom
+functionality into plugins.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-block-functions.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-block-functions.md
new file mode 100644
index 000000000..0e11c0782
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-block-functions.md
@@ -0,0 +1,95 @@
+Block Functions {#plugins.block.functions}
+===============
+
+void
+
+smarty\_block\_
+
+name
+
+array
+
+\$params
+
+mixed
+
+\$content
+
+object
+
+\$template
+
+boolean
+
+&\$repeat
+
+Block functions are functions of the form: `{func} .. {/func}`. In other
+words, they enclose a template block and operate on the contents of this
+block. Block functions take precedence over [custom
+functions](#language.custom.functions) of the same name, that is, you
+cannot have both custom function `{func}` and block function
+`{func}..{/func}`.
+
+-   By default your function implementation is called twice by Smarty:
+    once for the opening tag, and once for the closing tag. (See
+    `$repeat` below on how to change this.)
+
+-   Starting with Smarty 3.1 the returned value of the opening tag call
+    is displayed as well.
+
+-   Only the opening tag of the block function may have
+    [attributes](#language.syntax.attributes). All attributes passed to
+    template functions from the template are contained in the `$params`
+    variable as an associative array. The opening tag attributes are
+    also accessible to your function when processing the closing tag.
+
+-   The value of the `$content` variable depends on whether your
+    function is called for the opening or closing tag. In case of the
+    opening tag, it will be NULL, and in case of the closing tag it will
+    be the contents of the template block. Note that the template block
+    will have already been processed by Smarty, so all you will receive
+    is the template output, not the template source.
+
+-   The parameter `$repeat` is passed by reference to the function
+    implementation and provides a possibility for it to control how many
+    times the block is displayed. By default `$repeat` is TRUE at the
+    first call of the block-function (the opening tag) and FALSE on all
+    subsequent calls to the block function (the block\'s closing tag).
+    Each time the function implementation returns with `$repeat` being
+    TRUE, the contents between `{func}...{/func}` are evaluated and the
+    function implementation is called again with the new block contents
+    in the parameter `$content`.
+
+If you have nested block functions, it\'s possible to find out what the
+parent block function is by accessing `$smarty->_tag_stack` variable.
+Just do a [`var_dump()`](https://www.php.net/var_dump) on it and the
+structure should be apparent.
+
+
+    <?php
+    /*
+     * Smarty plugin
+     * -------------------------------------------------------------
+     * File:     block.translate.php
+     * Type:     block
+     * Name:     translate
+     * Purpose:  translate a block of text
+     * -------------------------------------------------------------
+     */
+    function smarty_block_translate($params, $content, Smarty_Internal_Template $template, &$repeat)
+    {
+        // only output on the closing tag
+        if(!$repeat){
+            if (isset($content)) {
+                $lang = $params['lang'];
+                // do some intelligent translation thing here with $content
+                return $translation;
+            }
+        }
+    }
+    ?>
+
+         
+
+See also: [`registerPlugin()`](#api.register.plugin),
+[`unregisterPlugin()`](#api.unregister.plugin).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-compiler-functions.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-compiler-functions.md
new file mode 100644
index 000000000..ef2454e8a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-compiler-functions.md
@@ -0,0 +1,66 @@
+Compiler Functions {#plugins.compiler.functions}
+==================
+
+Compiler functions are called only during compilation of the template.
+They are useful for injecting PHP code or time-sensitive static content
+into the template. If there is both a compiler function and a [custom
+function](#language.custom.functions) registered under the same name,
+the compiler function has precedence.
+
+mixed
+
+smarty\_compiler\_
+
+name
+
+array
+
+\$params
+
+object
+
+\$smarty
+
+The compiler function is passed two parameters: the params array which
+contains precompiled strings for the attribute values and the Smarty
+object. It\'s supposed to return the code to be injected into the
+compiled template including the surrounding PHP tags.
+
+
+    <?php
+    /*
+     * Smarty plugin
+     * -------------------------------------------------------------
+     * File:     compiler.tplheader.php
+     * Type:     compiler
+     * Name:     tplheader
+     * Purpose:  Output header containing the source file name and
+     *           the time it was compiled.
+     * -------------------------------------------------------------
+     */
+    function smarty_compiler_tplheader($params, Smarty $smarty)
+    {
+        return "<?php\necho '" . $smarty->_current_file . " compiled at " . date('Y-m-d H:M'). "';\n?>";
+    }
+    ?>
+
+This function can be called from the template as:
+
+
+    {* this function gets executed at compile time only *}
+    {tplheader}
+
+         
+
+The resulting PHP code in the compiled template would be something like
+this:
+
+
+    <?php
+    echo 'index.tpl compiled at 2002-02-20 20:02';
+    ?>
+
+         
+
+See also [`registerPlugin()`](#api.register.plugin),
+[`unregisterPlugin()`](#api.unregister.plugin).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-functions.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-functions.md
new file mode 100644
index 000000000..067b93826
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-functions.md
@@ -0,0 +1,94 @@
+Template Functions {#plugins.functions}
+==================
+
+void
+
+smarty\_function\_
+
+name
+
+array
+
+\$params
+
+object
+
+\$template
+
+All [attributes](#language.syntax.attributes) passed to template
+functions from the template are contained in the `$params` as an
+associative array.
+
+The output (return value) of the function will be substituted in place
+of the function tag in the template, eg the
+[`{fetch}`](#language.function.fetch) function. Alternatively, the
+function can simply perform some other task without any output, eg the
+[`{assign}`](#language.function.assign) function.
+
+If the function needs to assign some variables to the template or use
+some other Smarty-provided functionality, it can use the supplied
+`$template` object to do so eg `$template->foo()`.
+
+
+    <?php
+    /*
+     * Smarty plugin
+     * -------------------------------------------------------------
+     * File:     function.eightball.php
+     * Type:     function
+     * Name:     eightball
+     * Purpose:  outputs a random magic answer
+     * -------------------------------------------------------------
+     */
+    function smarty_function_eightball($params, Smarty_Internal_Template $template)
+    {
+        $answers = array('Yes',
+                         'No',
+                         'No way',
+                         'Outlook not so good',
+                         'Ask again soon',
+                         'Maybe in your reality');
+
+        $result = array_rand($answers);
+        return $answers[$result];
+    }
+    ?>
+
+which can be used in the template as:
+
+    Question: Will we ever have time travel?
+    Answer: {eightball}.
+        
+
+
+    <?php
+    /*
+     * Smarty plugin
+     * -------------------------------------------------------------
+     * File:     function.assign.php
+     * Type:     function
+     * Name:     assign
+     * Purpose:  assign a value to a template variable
+     * -------------------------------------------------------------
+     */
+    function smarty_function_assign($params, Smarty_Internal_Template $template)
+    {
+        if (empty($params['var'])) {
+            trigger_error("assign: missing 'var' parameter");
+            return;
+        }
+
+        if (!in_array('value', array_keys($params))) {
+            trigger_error("assign: missing 'value' parameter");
+            return;
+        }
+
+        $template->assign($params['var'], $params['value']);     
+        
+    }
+    ?>
+
+          
+
+See also: [`registerPlugin()`](#api.register.plugin),
+[`unregisterPlugin()`](#api.unregister.plugin).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-howto.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-howto.md
new file mode 100644
index 000000000..5738c3fcb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-howto.md
@@ -0,0 +1,18 @@
+How Plugins Work {#plugins.howto}
+================
+
+Plugins are always loaded on demand. Only the specific modifiers,
+functions, resources, etc invoked in the templates scripts will be
+loaded. Moreover, each plugin is loaded only once, even if you have
+several different instances of Smarty running within the same request.
+
+Pre/postfilters and output filters are a bit of a special case. Since
+they are not mentioned in the templates, they must be registered or
+loaded explicitly via API functions before the template is processed.
+The order in which multiple filters of the same type are executed
+depends on the order in which they are registered or loaded.
+
+The [plugins directory](#variable.plugins.dir) can be a string
+containing a path or an array containing multiple paths. To install a
+plugin, simply place it in one of the directories and Smarty will use it
+automatically.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-inserts.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-inserts.md
new file mode 100644
index 000000000..370a97bd0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-inserts.md
@@ -0,0 +1,48 @@
+Inserts {#plugins.inserts}
+=======
+
+Insert plugins are used to implement functions that are invoked by
+[`{insert}`](#language.function.insert) tags in the template.
+
+string
+
+smarty\_insert\_
+
+name
+
+array
+
+\$params
+
+object
+
+\$template
+
+The first parameter to the function is an associative array of
+attributes passed to the insert.
+
+The insert function is supposed to return the result which will be
+substituted in place of the `{insert}` tag in the template.
+
+
+    <?php
+    /*
+     * Smarty plugin
+     * -------------------------------------------------------------
+     * File:     insert.time.php
+     * Type:     time
+     * Name:     time
+     * Purpose:  Inserts current date/time according to format
+     * -------------------------------------------------------------
+     */
+    function smarty_insert_time($params, Smarty_Internal_Template $template)
+    {
+        if (empty($params['format'])) {
+            trigger_error("insert time: missing 'format' parameter");
+            return;
+        }
+        return strftime($params['format']);
+    }
+    ?>
+
+         
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-modifiers.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-modifiers.md
new file mode 100644
index 000000000..a4e99daa3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-modifiers.md
@@ -0,0 +1,86 @@
+Modifiers {#plugins.modifiers}
+=========
+
+[Modifiers](#language.modifiers) are little functions that are applied
+to a variable in the template before it is displayed or used in some
+other context. Modifiers can be chained together.
+
+mixed
+
+smarty\_modifier\_
+
+name
+
+mixed
+
+\$value
+
+\[mixed
+
+\$param1
+
+, \...\]
+
+The first parameter to the modifier plugin is the value on which the
+modifier is to operate. The rest of the parameters are optional,
+depending on what kind of operation is to be performed.
+
+The modifier has to [return](https://www.php.net/return) the result of its
+processing.
+
+This plugin basically aliases one of the built-in PHP functions. It does
+not have any additional parameters.
+
+
+    <?php
+    /*
+     * Smarty plugin
+     * -------------------------------------------------------------
+     * File:     modifier.capitalize.php
+     * Type:     modifier
+     * Name:     capitalize
+     * Purpose:  capitalize words in the string
+     * -------------------------------------------------------------
+     */
+    function smarty_modifier_capitalize($string)
+    {
+        return ucwords($string);
+    }
+    ?>
+
+
+    <?php
+    /*
+     * Smarty plugin
+     * -------------------------------------------------------------
+     * File:     modifier.truncate.php
+     * Type:     modifier
+     * Name:     truncate
+     * Purpose:  Truncate a string to a certain length if necessary,
+     *           optionally splitting in the middle of a word, and
+     *           appending the $etc string.
+     * -------------------------------------------------------------
+     */
+    function smarty_modifier_truncate($string, $length = 80, $etc = '...',
+                                      $break_words = false)
+    {
+        if ($length == 0)
+            return '';
+
+        if (strlen($string) > $length) {
+            $length -= strlen($etc);
+            $fragment = substr($string, 0, $length+1);
+            if ($break_words)
+                $fragment = substr($fragment, 0, -1);
+            else
+                $fragment = preg_replace('/\s+(\S+)?$/', '', $fragment);
+            return $fragment.$etc;
+        } else
+            return $string;
+    }
+    ?>
+
+         
+
+See also [`registerPlugin()`](#api.register.plugin),
+[`unregisterPlugin()`](#api.unregister.plugin).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-naming-conventions.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-naming-conventions.md
new file mode 100644
index 000000000..15bc26015
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-naming-conventions.md
@@ -0,0 +1,51 @@
+Naming Conventions {#plugins.naming.conventions}
+==================
+
+Plugin files and functions must follow a very specific naming convention
+in order to be located by Smarty.
+
+**plugin files** must be named as follows:
+
+> `
+>         type.name.php
+>        `
+
+-   Where `type` is one of these plugin types:
+
+    -   function
+
+    -   modifier
+
+    -   block
+
+    -   compiler
+
+    -   prefilter
+
+    -   postfilter
+
+    -   outputfilter
+
+    -   resource
+
+    -   insert
+
+-   And `name` should be a valid identifier; letters, numbers, and
+    underscores only, see [php
+    variables](https://www.php.net/language.variables).
+
+-   Some examples: `function.html_select_date.php`, `resource.db.php`,
+    `modifier.spacify.php`.
+
+**plugin functions** inside the PHP files must be named as follows:
+
+> `smarty_type_name`
+
+-   The meanings of `type` and `name` are the same as above.
+
+-   An example modifier name `foo` would be
+    `function smarty_modifier_foo()`.
+
+Smarty will output appropriate error messages if the plugin file it
+needs is not found, or if the file or the plugin function are named
+improperly.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-outputfilters.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-outputfilters.md
new file mode 100644
index 000000000..4e34ab7eb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-outputfilters.md
@@ -0,0 +1,48 @@
+Output Filters {#plugins.outputfilters}
+==============
+
+Output filter plugins operate on a template\'s output, after the
+template is loaded and executed, but before the output is displayed.
+
+string
+
+smarty\_outputfilter\_
+
+name
+
+string
+
+\$template\_output
+
+object
+
+\$template
+
+The first parameter to the output filter function is the template output
+that needs to be processed, and the second parameter is the instance of
+Smarty invoking the plugin. The plugin is supposed to do the processing
+and return the results.
+
+
+    <?php
+    /*
+     * Smarty plugin
+     * -------------------------------------------------------------
+     * File:     outputfilter.protect_email.php
+     * Type:     outputfilter
+     * Name:     protect_email
+     * Purpose:  Converts @ sign in email addresses to %40 as
+     *           a simple protection against spambots
+     * -------------------------------------------------------------
+     */
+     function smarty_outputfilter_protect_email($output, Smarty_Internal_Template $template)
+     {
+         return preg_replace('!(\S+)@([a-zA-Z0-9\.\-]+\.([a-zA-Z]{2,3}|[0-9]{1,3}))!',
+                             '$1%40$2', $output);
+     }
+    ?>
+
+         
+
+See also [`registerFilter()`](#api.register.filter),
+[`unregisterFilter()`](#api.unregister.filter).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-prefilters-postfilters.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-prefilters-postfilters.md
new file mode 100644
index 000000000..39467cbcb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-prefilters-postfilters.md
@@ -0,0 +1,89 @@
+Prefilters/Postfilters {#plugins.prefilters.postfilters}
+======================
+
+Prefilter and postfilter plugins are very similar in concept; where they
+differ is in the execution \-- more precisely the time of their
+execution.
+
+string
+
+smarty\_prefilter\_
+
+name
+
+string
+
+\$source
+
+object
+
+\$template
+
+Prefilters are used to process the source of the template immediately
+before compilation. The first parameter to the prefilter function is the
+template source, possibly modified by some other prefilters. The plugin
+is supposed to return the modified source. Note that this source is not
+saved anywhere, it is only used for compilation.
+
+string
+
+smarty\_postfilter\_
+
+name
+
+string
+
+\$compiled
+
+object
+
+\$template
+
+Postfilters are used to process the compiled output of the template (the
+PHP code) immediately after the compilation is done but before the
+compiled template is saved to the filesystem. The first parameter to the
+postfilter function is the compiled template code, possibly modified by
+other postfilters. The plugin is supposed to return the modified version
+of this code.
+
+
+    <?php
+    /*
+     * Smarty plugin
+     * -------------------------------------------------------------
+     * File:     prefilter.pre01.php
+     * Type:     prefilter
+     * Name:     pre01
+     * Purpose:  Convert html tags to be lowercase.
+     * -------------------------------------------------------------
+     */
+     function smarty_prefilter_pre01($source, Smarty_Internal_Template $template)
+     {
+         return preg_replace('!<(\w+)[^>]+>!e', 'strtolower("$1")', $source);
+     }
+    ?>
+
+         
+
+
+    <?php
+    /*
+     * Smarty plugin
+     * -------------------------------------------------------------
+     * File:     postfilter.post01.php
+     * Type:     postfilter
+     * Name:     post01
+     * Purpose:  Output code that lists all current template vars.
+     * -------------------------------------------------------------
+     */
+     function smarty_postfilter_post01($compiled, Smarty_Internal_Template $template)
+     {
+         $compiled = "<pre>\n<?php print_r(\$template->getTemplateVars()); ?>\n</pre>" . $compiled;
+         return $compiled;
+     }
+    ?>
+
+         
+
+See also [`registerFilter()`](#api.register.filter) and
+[`unregisterFilter()`](#api.unregister.filter).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-resources.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-resources.md
new file mode 100644
index 000000000..1b1fdf0ab
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-resources.md
@@ -0,0 +1,128 @@
+Resources {#plugins.resources}
+=========
+
+Resource plugins are meant as a generic way of providing template
+sources or PHP script components to Smarty. Some examples of resources:
+databases, LDAP, shared memory, sockets, and so on.
+
+Custom Resources may be put in a file `resource.foobarxyz.php` within
+your [`$plugins_dir`](#variable.plugins.dir), or registered on runtime
+with [`registerResource()`](#api.register.resource). In either case you
+will be able to access that resource by prepending its name to the
+template you\'re addressing: `foobarxyz:yourtemplate.tpl`.
+
+If a Resource\'s templates should not be run through the Smarty
+compiler, the Custom Resource may extend `Smarty_Resource_Uncompiled`.
+The Resource Handler must then implement the function
+`renderUncompiled(Smarty_Internal_Template $_template)`. `$_template` is
+a reference to the current template and contains all assigned variables
+which the implementor can access via
+`$_template->smarty->getTemplateVars()`. These Resources simply echo
+their rendered content to the output stream. The rendered output will be
+output-cached if the Smarty instance was configured accordingly. See
+`libs/sysplugins/smarty_internal_resource_php.php` for an example.
+
+If the Resource\'s compiled templates should not be cached on disk, the
+Custom Resource may extend `Smarty_Resource_Recompiled`. These Resources
+are compiled every time they are accessed. This may be an expensive
+overhead. See `libs/sysplugins/smarty_internal_resource_eval.php` for an
+example.
+
+
+    <?php
+
+    /**
+     * MySQL Resource
+     *
+     * Resource Implementation based on the Custom API to use
+     * MySQL as the storage resource for Smarty's templates and configs.
+     *
+     * Table definition:
+     * <pre>CREATE TABLE IF NOT EXISTS `templates` (
+     *   `name` varchar(100) NOT NULL,
+     *   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+     *   `source` text,
+     *   PRIMARY KEY (`name`)
+     * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
+     *
+     * Demo data:
+     * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
+     *
+     * @package Resource-examples
+     * @author Rodney Rehm
+     */
+    class Smarty_Resource_Mysql extends Smarty_Resource_Custom {
+        // PDO instance
+        protected $db;
+        // prepared fetch() statement
+        protected $fetch;
+        // prepared fetchTimestamp() statement
+        protected $mtime;
+
+        public function __construct() {
+            try {
+                $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty", "smarty");
+            } catch (PDOException $e) {
+                throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
+            }
+            $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
+            $this->mtime = $this->db->prepare('SELECT modified FROM templates WHERE name = :name');
+        }
+        
+        /**
+         * Fetch a template and its modification time from database
+         *
+         * @param string $name template name
+         * @param string $source template source
+         * @param integer $mtime template modification timestamp (epoch)
+         * @return void
+         */
+        protected function fetch($name, &$source, &$mtime)
+        {
+            $this->fetch->execute(array('name' => $name));
+            $row = $this->fetch->fetch();
+            $this->fetch->closeCursor();
+            if ($row) {
+                $source = $row['source'];
+                $mtime = strtotime($row['modified']);
+            } else {
+                $source = null;
+                $mtime = null;
+            }
+        }
+        
+        /**
+         * Fetch a template's modification time from database
+         *
+         * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the comple template source.
+         * @param string $name template name
+         * @return integer timestamp (epoch) the template was modified
+         */
+        protected function fetchTimestamp($name) {
+            $this->mtime->execute(array('name' => $name));
+            $mtime = $this->mtime->fetchColumn();
+            $this->mtime->closeCursor();
+            return strtotime($mtime);
+        }
+    }
+
+
+    require_once 'libs/Smarty.class.php';
+    $smarty = new Smarty();
+    $smarty->registerResource('mysql', new Smarty_Resource_Mysql());
+
+    // using resource from php script
+    $smarty->display("mysql:index.tpl");
+    ?>
+
+         
+
+And from within Smarty template:
+
+
+    {include file='mysql:extras/navigation.tpl'}
+
+         
+
+See also [`registerResource()`](#api.register.resource),
+[`unregisterResource()`](#api.unregister.resource).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-writing.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-writing.md
new file mode 100644
index 000000000..972911d97
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/plugins/plugins-writing.md
@@ -0,0 +1,36 @@
+Writing Plugins {#plugins.writing}
+===============
+
+Plugins can be either loaded by Smarty automatically from the filesystem
+or they can be registered at runtime via one of the register\_\* API
+functions. They can also be unregistered by using unregister\_\* API
+functions.
+
+For the plugins that are registered at runtime, the name of the plugin
+function(s) does not have to follow the naming convention.
+
+If a plugin depends on some functionality provided by another plugin (as
+is the case with some plugins bundled with Smarty), then the proper way
+to load the needed plugin is this:
+
+
+    <?php
+    function smarty_function_yourPlugin(array $params, Smarty_Internal_Template $template)
+    {
+      // load plugin depended upon
+      $template->smarty->loadPlugin('smarty_shared_make_timestamp');
+      // plugin code
+    }
+    ?>
+
+        
+
+As a general rule, the currently evaluated template\'s
+Smarty\_Internal\_Template object is always passed to the plugins as the
+last parameter with two exceptions:
+
+-   modifiers do not get passed the Smarty\_Internal\_Template object at
+    all
+
+-   blocks get passed `$repeat` after the Smarty\_Internal\_Template
+    object to keep backwards compatibility to older versions of Smarty.
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources.md
new file mode 100644
index 000000000..239690061
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources.md
@@ -0,0 +1,19 @@
+Resources
+=========
+
+The templates may come from a variety of sources. When you
+[`display()`](./api-functions/api-display.md) or [`fetch()`](./api-functions/api-fetch.md) a template, or
+when you include a template from within another template, you supply a
+resource type, followed by the appropriate path and template name. If a
+resource is not explicitly given, the value of
+[`$default_resource_type`](./api-variables/variable-default-resource-type.md) (default:
+\"file\") is assumed.
+
+## Table of contents
+
+- [File Template Resources](./resources/resources-file.md)
+- [String Template Resources](./resources/resources-string.md)
+- [Stream Template Resources](./resources/resources-streams.md)
+- [Extends Template Resources](./resources/resources-extends.md)
+- [Custom Template Resources](./resources/resources-custom.md)
+
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/resources-custom.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/resources-custom.md
new file mode 100644
index 000000000..d679afcb1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/resources-custom.md
@@ -0,0 +1,111 @@
+Custom Template Resources {#resources.custom}
+=========================
+
+You can retrieve templates using whatever possible source you can access
+with PHP: databases, sockets, files, etc. You do this by writing
+resource plugin functions and registering them with Smarty.
+
+See [resource plugins](#plugins.resources) section for more information
+on the functions you are supposed to provide.
+
+> **Note**
+>
+> Note that you cannot override the built-in `file:` resource, but you
+> can provide a resource that fetches templates from the file system in
+> some other way by registering under another resource name.
+
+
+    <?php
+
+    /**
+    * MySQL Resource
+    *
+    * Resource Implementation based on the Custom API to use
+    * MySQL as the storage resource for Smarty's templates and configs.
+    *
+    * Table definition:
+    * <pre>CREATE TABLE IF NOT EXISTS `templates` (
+    *   `name` varchar(100) NOT NULL,
+    *   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    *   `source` text,
+    *   PRIMARY KEY (`name`)
+    * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
+    *
+    * Demo data:
+    * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
+    *
+    * @package Resource-examples
+    * @author Rodney Rehm
+    */
+    class Smarty_Resource_Mysql extends Smarty_Resource_Custom {
+     // PDO instance
+     protected $db;
+     // prepared fetch() statement
+     protected $fetch;
+     // prepared fetchTimestamp() statement
+     protected $mtime;
+
+     public function __construct() {
+         try {
+             $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty", "smarty");
+         } catch (PDOException $e) {
+             throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
+         }
+         $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
+         $this->mtime = $this->db->prepare('SELECT modified FROM templates WHERE name = :name');
+     }
+     
+     /**
+      * Fetch a template and its modification time from database
+      *
+      * @param string $name template name
+      * @param string $source template source
+      * @param integer $mtime template modification timestamp (epoch)
+      * @return void
+      */
+     protected function fetch($name, &$source, &$mtime)
+     {
+         $this->fetch->execute(array('name' => $name));
+         $row = $this->fetch->fetch();
+         $this->fetch->closeCursor();
+         if ($row) {
+             $source = $row['source'];
+             $mtime = strtotime($row['modified']);
+         } else {
+             $source = null;
+             $mtime = null;
+         }
+     }
+     
+     /**
+      * Fetch a template's modification time from database
+      *
+      * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the comple template source.
+      * @param string $name template name
+      * @return integer timestamp (epoch) the template was modified
+      */
+     protected function fetchTimestamp($name) {
+         $this->mtime->execute(array('name' => $name));
+         $mtime = $this->mtime->fetchColumn();
+         $this->mtime->closeCursor();
+         return strtotime($mtime);
+     }
+    }
+
+
+    require_once 'libs/Smarty.class.php';
+    $smarty = new Smarty();
+    $smarty->registerResource('mysql', new Smarty_Resource_Mysql());
+
+    // using resource from php script
+    $smarty->display("mysql:index.tpl");
+    ?>
+
+      
+
+And from within Smarty template:
+
+
+    {include file='mysql:extras/navigation.tpl'}
+
+      
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/resources-extends.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/resources-extends.md
new file mode 100644
index 000000000..d7213d894
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/resources-extends.md
@@ -0,0 +1,36 @@
+Extends Template Resources {#resources.extends}
+==========================
+
+The `extends:` resource is used to define child/parent relationships for
+template inheritance from the PHP script. For details see section of
+[Template Inheritance](#advanced.features.template.inheritance).
+
+As of Smarty 3.1 the `extends:` resource may use any available [template
+resource](#resources), including `string:` and `eval:`. When [templates
+from strings](#resources.string) are used, make sure they are properly
+(url or base64) encoded. Is an `eval:` resource found within an
+inheritance chain, its \"don\'t save a compile file\" property is
+superseded by the `extends:` resource. The templates within an
+inheritance chain are not compiled separately, though. Only a single
+compiled template will be generated.
+
+> **Note**
+>
+> Use this when inheritance is required programmatically. When inheriting
+> within PHP, it is not obvious from the child template what inheritance
+> took place. If you have a choice, it is normally more flexible and
+> intuitive to handle inheritance chains from within the templates.
+
+
+    <?php
+    $smarty->display('extends:parent.tpl|child.tpl|grandchild.tpl'); 
+
+    // inheritance from multiple template sources
+    $smarty->display('extends:db:parent.tpl|file:child.tpl|grandchild.tpl|eval:{block name="fooBazVar_"}hello world{/block}'); 
+    ?>
+
+      
+
+See also [Template Inheritance](#advanced.features.template.inheritance)
+[`{block}`](#language.function.block) and
+[`{extends}`](#language.function.extends).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/resources-file.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/resources-file.md
new file mode 100644
index 000000000..9a89af183
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/resources-file.md
@@ -0,0 +1,160 @@
+File Template Resources {#resources.file}
+=======================
+
+Smarty ships with a built-in template resource for the filesystem. The
+`file:` is the default resource. The resource key `file:` must only be
+specified, if the
+[`$default_resource_type`](#variable.default.resource.type) has been
+changed.
+
+If the file resource cannot find the requested template, the
+[`$default_template_handler_func`](#variable.default.template.handler.func)
+is invoked.
+
+> **Note**
+>
+> As of Smarty 3.1 the file resource no longer walks through the
+> [include\_path](https://www.php.net/ini.core.php#ini.include-path) unless
+> [`$use_include_path` is activated](#variable.use.include.path)
+
+Templates from \$template\_dir {#templates.from.template.dir}
+------------------------------
+
+The file resource pulls templates source files from the directories
+specified in [`$template_dir`](#variable.template.dir). The list of
+directories is traversed in the order they appear in the array. The
+first template found is the one to process.
+
+
+    <?php
+    $smarty->display('index.tpl');
+    $smarty->display('file:index.tpl'); // same as above
+    ?>
+
+       
+
+From within a Smarty template
+
+
+    {include file='index.tpl'}
+    {include file='file:index.tpl'} {* same as above *}
+
+       
+
+Templates from a specific \$template\_dir {#templates.from.specified.template.dir}
+-----------------------------------------
+
+Smarty 3.1 introduced the bracket-syntax for specifying an element from
+[`$template_dir`](#variable.template.dir). This allows websites
+employing multiple sets of templates better control over which template
+to access.
+
+The bracket-syntax can be used from anywhere you can specify the `file:`
+resource type.
+
+
+    <?php
+
+    // setup template directories
+    $smarty->setTemplateDir(array(
+        './templates',            // element: 0, index: 0
+        './templates_2',          // element: 1, index: 1
+        '10' => 'templates_10',   // element: 2, index: '10'
+        'foo' => 'templates_foo', // element: 3, index: 'foo'
+    ));
+
+    /*
+      assume the template structure
+      ./templates/foo.tpl
+      ./templates_2/foo.tpl
+      ./templates_2/bar.tpl
+      ./templates_10/foo.tpl
+      ./templates_10/bar.tpl
+      ./templates_foo/foo.tpl
+    */
+
+    // regular access
+    $smarty->display('file:foo.tpl'); 
+    // will load ./templates/foo.tpl
+
+    // using numeric index
+    $smarty->display('file:[1]foo.tpl'); 
+    // will load ./templates_2/foo.tpl
+
+    // using numeric string index
+    $smarty->display('file:[10]foo.tpl'); 
+    // will load ./templates_10/foo.tpl
+
+    // using string index
+    $smarty->display('file:[foo]foo.tpl'); 
+    // will load ./templates_foo/foo.tpl
+
+    // using "unknown" numeric index (using element number)
+    $smarty->display('file:[2]foo.tpl'); 
+    // will load ./templates_10/foo.tpl
+
+    ?>
+
+       
+
+From within a Smarty template
+
+
+    {include file="file:foo.tpl"}
+    {* will load ./templates/foo.tpl *}
+
+    {include file="file:[1]foo.tpl"}
+    {* will load ./templates_2/foo.tpl *}
+
+    {include file="file:[foo]foo.tpl"}
+    {* will load ./templates_foo/foo.tpl *}
+
+       
+
+Templates from any directory {#templates.from.any.dir}
+----------------------------
+
+Templates outside of the [`$template_dir`](#variable.template.dir)
+require the `file:` template resource type, followed by the absolute
+path to the template (with leading slash.)
+
+> **Note**
+>
+> With [`Security`](#advanced.features.security) enabled, access to
+> templates outside of the [`$template_dir`](#variable.template.dir) is
+> not allowed unless you list those directories in `$secure_dir`.
+
+
+    <?php
+    $smarty->display('file:/export/templates/index.tpl');
+    $smarty->display('file:/path/to/my/templates/menu.tpl');
+    ?>
+
+       
+
+And from within a Smarty template:
+
+
+    {include file='file:/usr/local/share/templates/navigation.tpl'}
+
+       
+
+Windows Filepaths {#templates.windows.filepath}
+-----------------
+
+If you are using a Windows machine, filepaths usually include a drive
+letter (C:) at the beginning of the pathname. Be sure to use `file:` in
+the path to avoid namespace conflicts and get the desired results.
+
+
+    <?php
+    $smarty->display('file:C:/export/templates/index.tpl');
+    $smarty->display('file:F:/path/to/my/templates/menu.tpl');
+    ?>
+
+      
+
+And from within Smarty template:
+
+
+    {include file='file:D:/usr/local/share/templates/navigation.tpl'}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/resources-streams.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/resources-streams.md
new file mode 100644
index 000000000..e0596f591
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/resources-streams.md
@@ -0,0 +1,27 @@
+Stream Template Resources {#resources.streams}
+=========================
+
+Streams allow you to use PHP streams as a template resource. The syntax
+is much the same a traditional template resource names.
+
+Smarty will first look for a registered template resource. If nothing is
+found, it will check if a PHP stream is available. If a stream is
+available, Smarty will use it to fetch the template.
+
+> **Note**
+>
+> You can further define allowed streams with security enabled.
+
+Using a PHP stream for a template resource from the display() function.
+
+     
+     $smarty->display('foo:bar.tpl');
+     
+       
+
+Using a PHP stream for a template resource from within a template.
+
+     
+     {include file="foo:bar.tpl"}
+     
+       
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/resources-string.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/resources-string.md
new file mode 100644
index 000000000..d3f6d4155
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/resources-string.md
@@ -0,0 +1,73 @@
+String Template Resources {#resources.string}
+=========================
+
+Smarty can render templates from a string by using the `string:` or
+`eval:` resource.
+
+-   The `string:` resource behaves much the same as a template file. The
+    template source is compiled from a string and stores the compiled
+    template code for later reuse. Each unique template string will
+    create a new compiled template file. If your template strings are
+    accessed frequently, this is a good choice. If you have frequently
+    changing template strings (or strings with low reuse value), the
+    `eval:` resource may be a better choice, as it doesn\'t save
+    compiled templates to disk.
+
+-   The `eval:` resource evaluates the template source every time a page
+    is rendered. This is a good choice for strings with low reuse value.
+    If the same string is accessed frequently, the `string:` resource
+    may be a better choice.
+
+> **Note**
+>
+> With a `string:` resource type, each unique string generates a
+> compiled file. Smarty cannot detect a string that has changed, and
+> therefore will generate a new compiled file for each unique string. It
+> is important to choose the correct resource so that you do not fill
+> your disk space with wasted compiled strings.
+
+
+    <?php
+    $smarty->assign('foo','value');
+    $template_string = 'display {$foo} here';
+    $smarty->display('string:'.$template_string); // compiles for later reuse
+    $smarty->display('eval:'.$template_string); // compiles every time
+    ?>
+
+      
+
+From within a Smarty template
+
+
+    {include file="string:$template_string"} {* compiles for later reuse *}
+    {include file="eval:$template_string"} {* compiles every time *}
+
+
+      
+
+Both `string:` and `eval:` resources may be encoded with
+[`urlencode()`](https://www.php.net/urlencode) or
+[`base64_encode()`](https://www.php.net/urlencode). This is not necessary
+for the usual use of `string:` and `eval:`, but is required when using
+either of them in conjunction with
+[`Extends Template Resource`](#resources.extends)
+
+     
+     <?php
+     $smarty->assign('foo','value');
+     $template_string_urlencode = urlencode('display {$foo} here');
+     $template_string_base64 = base64_encode('display {$foo} here');
+     $smarty->display('eval:urlencode:'.$template_string_urlencode); // will decode string using urldecode()
+     $smarty->display('eval:base64:'.$template_string_base64); // will decode string using base64_decode()
+     ?>
+     
+       
+
+From within a Smarty template
+
+     
+     {include file="string:urlencode:$template_string_urlencode"} {* will decode string using urldecode() *}
+     {include file="eval:base64:$template_string_base64"} {* will decode string using base64_decode() *}
+
+     
+       
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/template-resources.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/template-resources.md
new file mode 100644
index 000000000..7bb5d752e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/resources/template-resources.md
@@ -0,0 +1,130 @@
+Resources {#resasdources}
+=========
+
+The templates may come from a variety of sources. When you
+[`display()`](#api.display) or [`fetch()`](#api.fetch) a template, or
+when you include a template from within another template, you supply a
+resource type, followed by the appropriate path and template name. If a
+resource is not explicitly given, the value of
+[`$default_resource_type`](#variable.default.resource.type) is assumed.
+
+Templates from other sources {#templates.from.elsewhere}
+----------------------------
+
+You can retrieve templates using whatever possible source you can access
+with PHP: databases, sockets, files, etc. You do this by writing
+resource plugin functions and registering them with Smarty.
+
+See [resource plugins](#plugins.resources) section for more information
+on the functions you are supposed to provide.
+
+> **Note**
+>
+> Note that you cannot override the built-in `file:` resource, but you
+> can provide a resource that fetches templates from the file system in
+> some other way by registering under another resource name.
+
+
+    <?php
+
+    /**
+     * MySQL Resource
+     *
+     * Resource Implementation based on the Custom API to use
+     * MySQL as the storage resource for Smarty's templates and configs.
+     *
+     * Table definition:
+     * <pre>CREATE TABLE IF NOT EXISTS `templates` (
+     *   `name` varchar(100) NOT NULL,
+     *   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+     *   `source` text,
+     *   PRIMARY KEY (`name`)
+     * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
+     *
+     * Demo data:
+     * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
+     *
+     * @package Resource-examples
+     * @author Rodney Rehm
+     */
+    class Smarty_Resource_Mysql extends Smarty_Resource_Custom {
+        // PDO instance
+        protected $db;
+        // prepared fetch() statement
+        protected $fetch;
+        // prepared fetchTimestamp() statement
+        protected $mtime;
+
+        public function __construct() {
+            try {
+                $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty", "smarty");
+            } catch (PDOException $e) {
+                throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
+            }
+            $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
+            $this->mtime = $this->db->prepare('SELECT modified FROM templates WHERE name = :name');
+        }
+        
+        /**
+         * Fetch a template and its modification time from database
+         *
+         * @param string $name template name
+         * @param string $source template source
+         * @param integer $mtime template modification timestamp (epoch)
+         * @return void
+         */
+        protected function fetch($name, &$source, &$mtime)
+        {
+            $this->fetch->execute(array('name' => $name));
+            $row = $this->fetch->fetch();
+            $this->fetch->closeCursor();
+            if ($row) {
+                $source = $row['source'];
+                $mtime = strtotime($row['modified']);
+            } else {
+                $source = null;
+                $mtime = null;
+            }
+        }
+        
+        /**
+         * Fetch a template's modification time from database
+         *
+         * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the comple template source.
+         * @param string $name template name
+         * @return integer timestamp (epoch) the template was modified
+         */
+        protected function fetchTimestamp($name) {
+            $this->mtime->execute(array('name' => $name));
+            $mtime = $this->mtime->fetchColumn();
+            $this->mtime->closeCursor();
+            return strtotime($mtime);
+        }
+    }
+
+
+    require_once 'libs/Smarty.class.php';
+    $smarty = new Smarty();
+    $smarty->registerResource('mysql', new Smarty_Resource_Mysql());
+
+    // using resource from php script
+    $smarty->display("mysql:index.tpl");
+    ?>
+
+         
+
+And from within Smarty template:
+
+
+    {include file='mysql:extras/navigation.tpl'}
+
+         
+
+Default template handler function {#default.template.handler.function}
+---------------------------------
+
+You can specify a function that is used to retrieve template contents in
+the event the template cannot be retrieved from its resource. One use of
+this is to create templates that do not exist on-the-fly.
+
+See also [`Streams`](#advanced.features.streams)
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/smarty-constants.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/smarty-constants.md
new file mode 100644
index 000000000..de04e1b59
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/programmers/smarty-constants.md
@@ -0,0 +1,26 @@
+Constants {#smarty.constants}
+=========
+
+SMARTY\_DIR {#constant.smarty.dir}
+===========
+
+This is the **full system path** to the location of the Smarty class
+files. If this is not defined in your script, then Smarty will attempt
+to determine the appropriate value automatically. If defined, the path
+**must end with a trailing slash/**.
+
+
+    <?php
+    // set path to Smarty directory *nix style
+    define('SMARTY_DIR', '/usr/local/lib/php/Smarty-v.e.r/libs/');
+
+    // path to Smarty windows style
+    define('SMARTY_DIR', 'c:/webroot/libs/Smarty-v.e.r/libs/');
+
+    // include the smarty class, note 'S' is upper case
+    require_once(SMARTY_DIR . 'Smarty.class.php');
+    ?>
+
+         
+
+See also [`$smarty.const`](../designers/language-variables/language-variables-smarty.md).
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/upgrading.md b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/upgrading.md
new file mode 100644
index 000000000..667a1422c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/docs/upgrading.md
@@ -0,0 +1,38 @@
+# Upgrading from an older version
+
+## Upgrading from v3 to v4
+
+Smarty 4 is mostly identical to Smarty 3. Most notably, it adds support for PHP8 and drops support for PHP7.0 and below.
+Additionally, some deprecated features that have long been discouraged have been dropped from the language.
+
+### Muting PHP8 warnings
+If you simultaneously upgrade Smarty to v4 van PHP to v8, you may notice your error logs filling up with warnings about undefined or null template vars
+due to a change in how PHP handles these. This may be helpful to spot errors, but if you find this annoying, you can use
+`$smarty->muteUndefinedOrNullWarnings()` to make Smarty convert these warnings into notices.
+
+### ASP tags
+You can no longer user ASP-style tags like `<% %>` and `<%= %>` in your templates.
+Replace them with `{...}` tags.
+
+### SmartyBC
+Check your codebase for `SmartyBC`.
+We have dropped deprecated API calls that where only accessible through the SmartyBC class.
+
+### No more embedded PHP
+We have completely dropped support for `{php}` and `{include_php}` tags and embedded PHP in templates.
+Check your templates for this, and rewrite any embedded PHP blocks, by moving logic to your PHP files or by
+creating a [plugin function](./programmers/plugins/plugins-functions.md).
+
+### Other changes
+
+Search your code for the following changes:
+
+- `SMARTY_RESOURCE_CHAR_SET` and `SMARTY_RESOURCE_DATE_FORMAT` constants have been removed
+- `Smarty::muteExpectedErrors` and `Smarty::unmuteExpectedErrors` API methods have been removed
+- `Smarty::getVariable` method has been removed. Use [Smarty::getTemplateVars](programmers/api-functions/api-get-template-vars.md) instead.
+- [Smarty::registerResource](programmers/api-functions/api-register-resource.md) no longer accepts an array of callback functions
+
+
+
+
+
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/lexer/smarty_internal_configfilelexer.plex b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/lexer/smarty_internal_configfilelexer.plex
new file mode 100644
index 000000000..7a86fadc4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/lexer/smarty_internal_configfilelexer.plex
@@ -0,0 +1,318 @@
+<?php
+/**
+* Smarty Internal Plugin Configfilelexer
+*
+* This is the lexer to break the config file source into tokens 
+* @package Smarty
+* @subpackage Config
+* @author Uwe Tews 
+*/
+/**
+* Smarty_Internal_Configfilelexer
+*
+* This is the config file lexer.
+* It is generated from the smarty_internal_configfilelexer.plex file
+*
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+class Smarty_Internal_Configfilelexer
+{
+    /**
+     * Source
+     *
+     * @var string
+     */
+    public $data;
+      /**
+      * Source length
+      *
+      * @var int
+      */
+     public $dataLength = null;
+   /**
+     * byte counter
+     *
+     * @var int
+     */
+    public $counter;
+    /**
+     * token number
+     *
+     * @var int
+     */
+    public $token;
+    /**
+     * token value
+     *
+     * @var string
+     */
+    public $value;
+    /**
+     * current line
+     *
+     * @var int
+     */
+    public $line;
+    /**
+     * state number
+     *
+     * @var int
+     */
+    public $state = 1;
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_Config_File_Compiler
+     */
+    private $compiler = null;
+    /**
+     * copy of config_booleanize
+     *
+     * @var bool
+     */
+    private $configBooleanize = false;
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE');
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+    private $yy_global_pattern2 = null;
+    private $yy_global_pattern3 = null;
+    private $yy_global_pattern4 = null;
+    private $yy_global_pattern5 = null;
+    private $yy_global_pattern6 = null;
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+    );
+
+    /**
+     * constructor
+     *
+     * @param   string                             $data template source
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    public function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
+    {
+        $this->data = $data . "\n"; //now all lines are \n-terminated
+        $this->dataLength = strlen($data);
+        $this->counter = 0;
+        if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
+            $this->counter += strlen($match[0]);
+        }
+        $this->line = 1;
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        $this->configBooleanize = $this->smarty->config_booleanize;
+    }
+
+   public function replace ($input) {
+        return $input;
+   }
+
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+
+/*!lex2php
+%input $this->data
+%counter $this->counter
+%token $this->token
+%value $this->value
+%line $this->line
+commentstart = /#|;/
+openB = /\[/
+closeB = /\]/
+section = /.*?(?=[\.=\[\]\r\n])/
+equal = /=/
+whitespace = /[ \t\r]+/
+dot = /\./
+id = /[0-9]*[a-zA-Z_]\w*/
+newline = /\n/
+single_quoted_string = /'[^'\\]*(?:\\.[^'\\]*)*'(?=[ \t\r]*[\n#;])/
+double_quoted_string = /"[^"\\]*(?:\\.[^"\\]*)*"(?=[ \t\r]*[\n#;])/
+tripple_quotes = /"""/
+tripple_quotes_end = /"""(?=[ \t\r]*[\n#;])/
+text = /[\S\s]/
+float = /\d+\.\d+(?=[ \t\r]*[\n#;])/
+int = /\d+(?=[ \t\r]*[\n#;])/
+maybe_bool = /[a-zA-Z]+(?=[ \t\r]*[\n#;])/
+naked_string = /[^\n]+?(?=[ \t\r]*\n)/
+*/
+
+/*!lex2php
+%statename START
+
+commentstart {
+    $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
+    $this->yypushstate(self::COMMENT);
+}
+openB {
+    $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
+    $this->yypushstate(self::SECTION);
+}
+closeB {
+    $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
+}
+equal {
+    $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
+    $this->yypushstate(self::VALUE);
+}
+whitespace {
+    return false;
+}
+newline {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+}
+id {
+    $this->token = Smarty_Internal_Configfileparser::TPC_ID;
+}
+text {
+    $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+}
+
+*/
+
+/*!lex2php
+%statename VALUE
+
+whitespace {
+    return false;
+}
+float {
+    $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
+    $this->yypopstate();
+}
+int {
+    $this->token = Smarty_Internal_Configfileparser::TPC_INT;
+    $this->yypopstate();
+}
+tripple_quotes {
+    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
+    $this->yypushstate(self::TRIPPLE);
+}
+single_quoted_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
+    $this->yypopstate();
+}
+double_quoted_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
+    $this->yypopstate();
+}
+maybe_bool {
+    if (!$this->configBooleanize || !in_array(strtolower($this->value), array('true', 'false', 'on', 'off', 'yes', 'no')) ) {
+        $this->yypopstate();
+        $this->yypushstate(self::NAKED_STRING_VALUE);
+        return true; //reprocess in new state
+    } else {
+        $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
+        $this->yypopstate();
+    }
+}
+naked_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->yypopstate();
+}
+newline {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->value = '';
+    $this->yypopstate();
+}
+
+*/
+
+/*!lex2php
+%statename NAKED_STRING_VALUE
+
+naked_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    $this->yypopstate();
+}
+
+*/
+
+/*!lex2php
+%statename COMMENT
+
+whitespace {
+    return false;
+}
+naked_string {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+}
+newline {
+    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+    $this->yypopstate();
+}
+
+*/
+
+/*!lex2php
+%statename SECTION
+
+dot {
+    $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
+}
+section {
+    $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
+    $this->yypopstate();
+}
+
+*/
+/*!lex2php
+%statename TRIPPLE
+
+tripple_quotes_end {
+    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
+    $this->yypopstate();
+    $this->yypushstate(self::START);
+}
+text {
+  $to = strlen($this->data);
+  preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+  if (isset($match[0][1])) {
+    $to = $match[0][1];
+  } else {
+    $this->compiler->trigger_config_file_error ('missing or misspelled literal closing tag');
+  }  
+  $this->value = substr($this->data,$this->counter,$to-$this->counter);
+  $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
+}
+*/
+
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/lexer/smarty_internal_configfileparser.y b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/lexer/smarty_internal_configfileparser.y
new file mode 100644
index 000000000..c981b58e9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/lexer/smarty_internal_configfileparser.y
@@ -0,0 +1,346 @@
+/**
+* Smarty Internal Plugin Configfileparser
+*
+* This is the config file parser
+* 
+* 
+* @package Smarty
+* @subpackage Config
+* @author Uwe Tews
+*/
+%name TPC_
+%declare_class {
+/**
+* Smarty Internal Plugin Configfileparse
+*
+* This is the config file parser.
+* It is generated from the smarty_internal_configfileparser.y file
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+class Smarty_Internal_Configfileparser
+}
+%include_class
+{
+    /**
+     * result status
+     *
+     * @var bool
+     */
+    public $successful = true;
+    /**
+     * return value
+     *
+     * @var mixed
+     */
+    public $retvalue = 0;
+    /**
+     * @var
+     */
+    public $yymajor;
+    /**
+     * lexer object
+     *
+     * @var Smarty_Internal_Configfilelexer
+     */
+    private $lex;
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_Config_File_Compiler
+     */
+    public $compiler = null;
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+    /**
+     * copy of config_overwrite property
+     *
+     * @var bool
+     */
+    private $configOverwrite = false;
+    /**
+     * copy of config_read_hidden property
+     *
+     * @var bool
+     */
+    private $configReadHidden = false;
+    /**
+     * helper map
+     *
+     * @var array
+     */
+    private static $escapes_single = array('\\' => '\\',
+                                           '\'' => '\'');
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Configfilelexer      $lex
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    public function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
+    {
+        $this->lex = $lex;
+        $this->smarty = $compiler->smarty;
+        $this->compiler = $compiler;
+        $this->configOverwrite = $this->smarty->config_overwrite;
+        $this->configReadHidden = $this->smarty->config_read_hidden;
+    }
+
+    /**
+     * parse optional boolean keywords
+     *
+     * @param string $str
+     *
+     * @return bool
+     */
+    private function parse_bool($str)
+    {
+        $str = strtolower($str);
+        if (in_array($str, array('on', 'yes', 'true'))) {
+            $res = true;
+        } else {
+            $res = false;
+        }
+        return $res;
+    }
+
+    /**
+     * parse single quoted string
+     *  remove outer quotes
+     *  unescape inner quotes
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_single_quoted_string($qstr)
+    {
+        $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
+
+        $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
+
+        $str = '';
+        foreach ($ss as $s) {
+            if (strlen($s) === 2 && $s[0] === '\\') {
+                if (isset(self::$escapes_single[$s[1]])) {
+                    $s = self::$escapes_single[$s[1]];
+                }
+            }
+            $str .= $s;
+        }
+        return $str;
+    }
+
+    /**
+     * parse double quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_double_quoted_string($qstr)
+    {
+        $inner_str = substr($qstr, 1, strlen($qstr) - 2);
+        return stripcslashes($inner_str);
+    }
+
+    /**
+     * parse triple quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_tripple_double_quoted_string($qstr)
+    {
+        return stripcslashes($qstr);
+    }
+
+    /**
+     * set a config variable in target array
+     *
+     * @param array $var
+     * @param array $target_array
+     */
+    private function set_var(array $var, array &$target_array)
+    {
+        $key = $var['key'];
+        $value = $var['value'];
+
+        if ($this->configOverwrite || !isset($target_array['vars'][$key])) {
+            $target_array['vars'][$key] = $value;
+        } else {
+            settype($target_array['vars'][$key], 'array');
+            $target_array['vars'][$key][] = $value;
+        }
+    }
+
+    /**
+     * add config variable to global vars
+     *
+     * @param array $vars
+     */
+    private function add_global_vars(array $vars)
+    {
+        if (!isset($this->compiler->config_data['vars'])) {
+            $this->compiler->config_data['vars'] = array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data);
+        }
+    }
+
+    /**
+     * add config variable to section
+     *
+     * @param string $section_name
+     * @param array  $vars
+     */
+    private function add_section_vars($section_name, array $vars)
+    {
+        if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
+            $this->compiler->config_data['sections'][$section_name]['vars'] = array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
+        }
+    }
+}
+
+%token_prefix TPC_
+
+%parse_accept
+{
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+}
+
+%syntax_error
+{
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_config_file_error();
+}
+
+%stack_overflow
+{
+    $this->internalError = true;
+    $this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
+}
+
+// Complete config file
+start(res) ::= global_vars sections. {
+    res = null;
+}
+
+// Global vars
+global_vars(res) ::= var_list(vl). {
+    $this->add_global_vars(vl);
+    res = null;
+}
+
+// Sections
+sections(res) ::= sections section. {
+    res = null;
+}
+
+sections(res) ::= . {
+    res = null;
+}
+
+section(res) ::= OPENB SECTION(i) CLOSEB newline var_list(vars). {
+    $this->add_section_vars(i, vars);
+    res = null;
+}
+
+section(res) ::= OPENB DOT SECTION(i) CLOSEB newline var_list(vars). {
+    if ($this->configReadHidden) {
+        $this->add_section_vars(i, vars);
+    }
+    res = null;
+}
+
+// Var list
+var_list(res) ::= var_list(vl) newline. {
+    res = vl;
+}
+
+var_list(res) ::= var_list(vl) var(v). {
+    res = array_merge(vl, array(v));
+}
+
+var_list(res) ::= . {
+    res = array();
+}
+
+
+// Var
+var(res) ::= ID(id) EQUAL value(v). {
+    res = array('key' => id, 'value' => v);
+}
+
+
+value(res) ::= FLOAT(i). {
+    res = (float) i;
+}
+
+value(res) ::= INT(i). {
+    res = (int) i;
+}
+
+value(res) ::= BOOL(i). {
+    res = $this->parse_bool(i);
+}
+
+value(res) ::= SINGLE_QUOTED_STRING(i). {
+    res = self::parse_single_quoted_string(i);
+}
+
+value(res) ::= DOUBLE_QUOTED_STRING(i). {
+    res = self::parse_double_quoted_string(i);
+}
+
+value(res) ::= TRIPPLE_QUOTES(i) TRIPPLE_TEXT(c) TRIPPLE_QUOTES_END(ii). {
+    res = self::parse_tripple_double_quoted_string(c);
+}
+
+value(res) ::= TRIPPLE_QUOTES(i) TRIPPLE_QUOTES_END(ii). {
+    res = '';
+}
+
+value(res) ::= NAKED_STRING(i). {
+    res = i;
+}
+
+// NOTE: this is not a valid rule
+// It is added hier to produce a usefull error message on a missing '=';
+value(res) ::= OTHER(i). {
+    res = i;
+}
+
+
+// Newline and comments
+newline(res) ::= NEWLINE. {
+    res = null;
+}
+
+newline(res) ::= COMMENTSTART NEWLINE. {
+    res = null;
+}
+
+newline(res) ::= COMMENTSTART NAKED_STRING NEWLINE. {
+    res = null;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/lexer/smarty_internal_templatelexer.plex b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/lexer/smarty_internal_templatelexer.plex
new file mode 100644
index 000000000..2cd46df97
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/lexer/smarty_internal_templatelexer.plex
@@ -0,0 +1,687 @@
+<?php
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty_Internal_Templatelexer
+ * This is the template file lexer.
+ * It is generated from the smarty_internal_templatelexer.plex file
+ *
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Templatelexer
+{
+    /**
+     * Source
+     *
+     * @var string
+     */
+    public $data;
+
+    /**
+     * Source length
+     *
+     * @var int
+     */
+    public $dataLength = null;
+
+    /**
+     * byte counter
+     *
+     * @var int
+     */
+    public $counter;
+
+    /**
+     * token number
+     *
+     * @var int
+     */
+    public $token;
+
+    /**
+     * token value
+     *
+     * @var string
+     */
+    public $value;
+
+    /**
+     * current line
+     *
+     * @var int
+     */
+    public $line;
+
+    /**
+     * tag start line
+     *
+     * @var
+     */
+    public $taglineno;
+
+    /**
+     * php code type
+     *
+     * @var string
+     */
+    public $phpType = '';
+
+   /**
+     * state number
+     *
+     * @var int
+     */
+    public $state = 1;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $compiler = null;
+
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+
+    /**
+     * XML flag true while processing xml
+     *
+     * @var bool
+     */
+    public $is_xml = false;
+
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',);
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+                                               'NOT'         => '(!,not)',
+                                               'OPENP'       => '(',
+                                               'CLOSEP'      => ')',
+                                               'OPENB'       => '[',
+                                               'CLOSEB'      => ']',
+                                               'PTR'         => '->',
+                                               'APTR'        => '=>',
+                                               'EQUAL'       => '=',
+                                               'NUMBER'      => 'number',
+                                               'UNIMATH'     => '+" , "-',
+                                               'MATH'        => '*" , "/" , "%',
+                                               'INCDEC'      => '++" , "--',
+                                               'SPACE'       => ' ',
+                                               'DOLLAR'      => '$',
+                                               'SEMICOLON'   => ';',
+                                               'COLON'       => ':',
+                                               'DOUBLECOLON' => '::',
+                                               'AT'          => '@',
+                                               'HATCH'       => '#',
+                                               'QUOTE'       => '"',
+                                               'BACKTICK'    => '`',
+                                               'VERT'        => '"|" modifier',
+                                               'DOT'         => '.',
+                                               'COMMA'       => '","',
+                                               'QMARK'       => '"?"',
+                                               'ID'          => 'id, name',
+                                               'TEXT'        => 'text',
+                                               'LDELSLASH'   => '{/..} closing tag',
+                                               'LDEL'        => '{...} Smarty tag',
+                                               'COMMENT'     => 'comment',
+                                               'AS'          => 'as',
+                                               'TO'          => 'to',
+                                               'LOGOP'       => '"<", "==" ... logical operator',
+                                               'TLOGOP'      => '"lt", "eq" ... logical operator; "is div by" ... if condition',
+                                               'SCOND'       => '"is even" ... if condition',
+    );
+
+    /**
+     * literal tag nesting level
+     *
+     * @var int
+     */
+    private $literal_cnt = 0;
+
+    /**
+     * preg token pattern for state TEXT
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+
+    /**
+     * preg token pattern for state TAG
+     *
+     * @var string
+     */
+    private $yy_global_pattern2 = null;
+
+    /**
+     * preg token pattern for state TAGBODY
+     *
+     * @var string
+     */
+    private $yy_global_pattern3 = null;
+
+    /**
+     * preg token pattern for state LITERAL
+     *
+     * @var string
+     */
+    private $yy_global_pattern4 = null;
+
+    /**
+     * preg token pattern for state DOUBLEQUOTEDSTRING
+     *
+     * @var null
+     */
+    private $yy_global_pattern5 = null;
+
+    /**
+     * preg token pattern for text
+     *
+     * @var null
+     */
+    private $yy_global_text = null;
+
+    /**
+     * preg token pattern for literal
+     *
+     * @var null
+     */
+    private $yy_global_literal = null;
+
+    /**
+     * constructor
+     *
+     * @param   string                             $source template source
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function __construct($source, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->data = $source;
+        $this->dataLength = strlen($this->data);
+        $this->counter = 0;
+        if (preg_match('/^\xEF\xBB\xBF/i', $this->data, $match)) {
+            $this->counter += strlen($match[0]);
+        }
+        $this->line = 1;
+        $this->smarty = $compiler->template->smarty;
+        $this->compiler = $compiler;
+        $this->compiler->initDelimiterPreg();
+        $this->smarty_token_names['LDEL'] = $this->smarty->getLeftDelimiter();
+        $this->smarty_token_names['RDEL'] = $this->smarty->getRightDelimiter();
+    }
+
+    /**
+     * open lexer/parser trace file
+     *
+     */
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+   /**
+     * replace placeholders with runtime preg  code
+     *
+     * @param string $preg
+     *
+     * @return string
+     */
+   public function replace($preg)
+   {
+        return $this->compiler->replaceDelimiter($preg);
+   }
+
+    /**
+     * check if current value is an autoliteral left delimiter
+     *
+     * @return bool
+     */
+    public function isAutoLiteral()
+    {
+        return $this->smarty->getAutoLiteral() && isset($this->value[ $this->compiler->getLdelLength() ]) ?
+            strpos(" \n\t\r", $this->value[ $this->compiler->getLdelLength() ]) !== false : false;
+    }
+
+     /*!lex2php
+     %input $this->data
+     %counter $this->counter
+     %token $this->token
+     %value $this->value
+     %line $this->line
+     userliteral = ~(SMARTYldel)SMARTYautoliteral\s+SMARTYliteral~
+     char = ~[\S\s]~
+     textdoublequoted = ~([^"\\]*?)((?:\\.[^"\\]*?)*?)(?=((SMARTYldel)SMARTYal|\$|`\$|"SMARTYliteral))~
+     namespace = ~([0-9]*[a-zA-Z_]\w*)?(\\[0-9]*[a-zA-Z_]\w*)+~
+     emptyjava = ~[{][}]~
+     slash = ~[/]~
+     ldel = ~(SMARTYldel)SMARTYal~
+     rdel = ~\s*SMARTYrdel~
+     nocacherdel = ~(\s+nocache)?\s*SMARTYrdel~
+     smartyblockchildparent = ~[\$]smarty\.block\.(child|parent)~
+     integer = ~\d+~
+     hex =  ~0[xX][0-9a-fA-F]+~
+     math = ~\s*([*]{1,2}|[%/^&]|[<>]{2})\s*~
+     comment = ~(SMARTYldel)SMARTYal[*]~
+     incdec = ~([+]|[-]){2}~
+     unimath = ~\s*([+]|[-])\s*~
+     openP = ~\s*[(]\s*~
+     closeP = ~\s*[)]~
+     openB = ~\[\s*~
+     closeB = ~\s*\]~
+     dollar = ~[$]~
+     dot = ~[.]~
+     comma = ~\s*[,]\s*~
+     doublecolon = ~[:]{2}~
+     colon = ~\s*[:]\s*~
+     at = ~[@]~
+     hatch = ~[#]~
+     semicolon = ~\s*[;]\s*~
+     equal = ~\s*[=]\s*~
+     space = ~\s+~
+     ptr = ~\s*[-][>]\s*~
+     aptr = ~\s*[=][>]\s*~
+     singlequotestring = ~'[^'\\]*(?:\\.[^'\\]*)*'~
+     backtick = ~[`]~
+     vert = ~[|][@]?~
+     qmark = ~\s*[?]\s*~
+     constant = ~[_]+[A-Z0-9][0-9A-Z_]*|[A-Z][0-9A-Z_]*(?![0-9A-Z_]*[a-z])~
+     attr = ~\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\s*[=]\s*~
+     id = ~[0-9]*[a-zA-Z_]\w*~
+     literal = ~literal~
+     strip = ~strip~
+     lop = ~\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\s*~
+     slop = ~\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\s+~
+     tlop = ~\s+is\s+(not\s+)?(odd|even|div)\s+by\s+~
+     scond = ~\s+is\s+(not\s+)?(odd|even)~
+     isin = ~\s+is\s+in\s+~
+     as = ~\s+as\s+~
+     to = ~\s+to\s+~
+     step = ~\s+step\s+~
+     if = ~(if|elseif|else if|while)\s+~
+     for = ~for\s+~
+     makenocache = ~make_nocache\s+~
+     array = ~array~
+     foreach = ~foreach(?![^\s])~
+     setfilter = ~setfilter\s+~
+     instanceof = ~\s+instanceof\s+~
+     not = ~[!]\s*|not\s+~
+     typecast = ~[(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\s*~
+     double_quote = ~["]~
+     */
+     /*!lex2php
+     %statename TEXT
+     emptyjava {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     comment {
+       $to = $this->dataLength;
+       preg_match("/[*]{$this->compiler->getRdelPreg()}[\n]?/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+        if (isset($match[0][1])) {
+            $to = $match[0][1] + strlen($match[0][0]);
+        } else {
+            $this->compiler->trigger_template_error ("missing or misspelled comment closing tag '{$this->smarty->getRightDelimiter()}'");
+        }
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
+        return false;
+     }
+     userliteral {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     ldel literal rdel {
+        $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+        $this->yypushstate(self::LITERAL);
+     }
+     ldel slash literal rdel {
+        $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+        $this->yypushstate(self::LITERAL);
+     }
+     ldel {
+        $this->yypushstate(self::TAG);
+        return true;
+     }
+     char {
+       if (!isset($this->yy_global_text)) {
+           $this->yy_global_text = $this->replace('/(SMARTYldel)SMARTYal/isS');
+       }
+       $to = $this->dataLength;
+       preg_match($this->yy_global_text, $this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+       if (isset($match[0][1])) {
+         $to = $match[0][1];
+       }
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     */
+     /*!lex2php
+     %statename TAG
+     ldel if {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel for {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel foreach {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel setfilter {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel makenocache {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel id nocacherdel {
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+        $this->taglineno = $this->line;
+     }
+     ldel smartyblockchildparent rdel {
+         $this->yypopstate();
+         $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+         $this->taglineno = $this->line;
+     }
+     ldel slash id rdel {
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+        $this->taglineno = $this->line;
+     }
+     ldel dollar id nocacherdel {
+        if ($this->_yy_stack[count($this->_yy_stack)-1] === self::TEXT) {
+            $this->yypopstate();
+            $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
+            $this->taglineno = $this->line;
+        } else {
+            $this->value = $this->smarty->getLeftDelimiter();
+            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+            $this->yybegin(self::TAGBODY);
+            $this->taglineno = $this->line;
+        }
+     }
+     ldel slash {
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel {
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     */
+     /*!lex2php
+     %statename TAGBODY
+     rdel {
+        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+        $this->yypopstate();
+     }
+     ldel {
+        $this->yypushstate(self::TAG);
+        return true;
+     }
+     double_quote {
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+        $this->compiler->enterDoubleQuote();
+     }
+     singlequotestring {
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+     }
+     dollar id {
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+     }
+     dollar {
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+     }
+     isin {
+        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+     }
+     as {
+        $this->token = Smarty_Internal_Templateparser::TP_AS;
+     }
+     to {
+        $this->token = Smarty_Internal_Templateparser::TP_TO;
+     }
+     step {
+        $this->token = Smarty_Internal_Templateparser::TP_STEP;
+     }
+     instanceof {
+        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+     }
+     lop {
+        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+     }
+     slop {
+        $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
+     }
+     tlop {
+        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+     }
+     scond {
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
+     }
+     not{
+        $this->token = Smarty_Internal_Templateparser::TP_NOT;
+     }
+     typecast {
+        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+     }
+     openP {
+        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+     }
+     closeP {
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+     }
+     openB {
+        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+     }
+     closeB {
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+     }
+     ptr {
+        $this->token = Smarty_Internal_Templateparser::TP_PTR;
+     }
+     aptr {
+        $this->token = Smarty_Internal_Templateparser::TP_APTR;
+     }
+     equal {
+        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+     }
+     incdec {
+        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+     }
+     unimath {
+        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+     }
+     math {
+        $this->token = Smarty_Internal_Templateparser::TP_MATH;
+     }
+     at {
+        $this->token = Smarty_Internal_Templateparser::TP_AT;
+     }
+     array openP {
+        $this->token = Smarty_Internal_Templateparser::TP_ARRAYOPEN;
+     }
+     hatch {
+        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+     }
+     attr {
+        // resolve conflicts with shorttag and right_delimiter starting with '='
+        if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) === $this->smarty->getRightDelimiter()) {
+            preg_match('/\s+/',$this->value,$match);
+            $this->value = $match[0];
+            $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_ATTR;
+        }
+     }
+     namespace {
+        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
+     }
+     id {
+        $this->token = Smarty_Internal_Templateparser::TP_ID;
+     }
+     integer {
+        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+     }
+     backtick {
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->yypopstate();
+     }
+     vert {
+        $this->token = Smarty_Internal_Templateparser::TP_VERT;
+     }
+     dot {
+        $this->token = Smarty_Internal_Templateparser::TP_DOT;
+     }
+     comma {
+        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+     }
+     semicolon {
+        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+     }
+     doublecolon {
+        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+     }
+     colon {
+        $this->token = Smarty_Internal_Templateparser::TP_COLON;
+     }
+     qmark {
+        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+     }
+     hex {
+        $this->token = Smarty_Internal_Templateparser::TP_HEX;
+     }
+     space {
+        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+     }
+     char {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     */
+
+     /*!lex2php
+     %statename LITERAL
+     ldel literal rdel {
+        $this->literal_cnt++;
+        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+     }
+     ldel slash literal rdel {
+        if ($this->literal_cnt) {
+             $this->literal_cnt--;
+            $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+            $this->yypopstate();
+        }
+     }
+     char {
+       if (!isset($this->yy_global_literal)) {
+           $this->yy_global_literal = $this->replace('/(SMARTYldel)SMARTYal[\/]?literalSMARTYrdel/isS');
+       }
+       $to = $this->dataLength;
+       preg_match($this->yy_global_literal, $this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+       if (isset($match[0][1])) {
+         $to = $match[0][1];
+       } else {
+          $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
+       }
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+     }
+     */
+     /*!lex2php
+     %statename DOUBLEQUOTEDSTRING
+     userliteral {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     ldel literal rdel {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     ldel slash literal rdel {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     ldel slash {
+        $this->yypushstate(self::TAG);
+        return true;
+     }
+     ldel id {
+        $this->yypushstate(self::TAG);
+        return true;
+     }
+     ldel {
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->taglineno = $this->line;
+        $this->yypushstate(self::TAGBODY);
+     }
+     double_quote {
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypopstate();
+     }
+     backtick dollar {
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->value = substr($this->value,0,-1);
+        $this->yypushstate(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     dollar id {
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+     }
+     dollar {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     textdoublequoted {
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+     char {
+        $to = $this->dataLength;
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+     }
+    */
+  }
+
+     
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/lexer/smarty_internal_templateparser.y b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/lexer/smarty_internal_templateparser.y
new file mode 100644
index 000000000..ffc85bc06
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/lexer/smarty_internal_templateparser.y
@@ -0,0 +1,1272 @@
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+%stack_size 500
+%name TP_
+%declare_class {
+/**
+* Smarty Template Parser Class
+*
+* This is the template parser.
+* It is generated from the smarty_internal_templateparser.y file
+* 
+* @author Uwe Tews <uwe.tews@googlemail.com>
+*/
+class Smarty_Internal_Templateparser
+}
+%include_class
+{
+    const ERR1 = 'Security error: Call to private object member not allowed';
+    const ERR2 = 'Security error: Call to dynamic object member not allowed';
+
+    /**
+     * result status
+     *
+     * @var bool
+     */
+    public $successful = true;
+
+    /**
+     * return value
+     *
+     * @var mixed
+     */
+    public $retvalue = 0;
+
+    /**
+     * @var
+     */
+    public $yymajor;
+
+    /**
+     * last index of array variable
+     *
+     * @var mixed
+     */
+    public $last_index;
+
+    /**
+     * last variable name
+     *
+     * @var string
+     */
+    public $last_variable;
+
+    /**
+     * root parse tree buffer
+     *
+     * @var Smarty_Internal_ParseTree_Template
+     */
+    public $root_buffer;
+
+    /**
+     * current parse tree object
+     *
+     * @var Smarty_Internal_ParseTree
+     */
+    public $current_buffer;
+
+    /**
+     * lexer object
+     *
+     * @var Smarty_Internal_Templatelexer
+     */
+    public $lex;
+
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+
+    /**
+     * {strip} status
+     *
+     * @var bool
+     */
+    public $strip = false;
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $compiler = null;
+
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * template object
+     *
+     * @var Smarty_Internal_Template
+     */
+    public $template = null;
+
+    /**
+     * block nesting level
+     *
+     * @var int
+     */
+    public $block_nesting_level = 0;
+
+    /**
+     * security object
+     *
+     * @var Smarty_Security
+     */
+    public $security = null;
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_prefix = array();
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_postfix = array();
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Templatelexer        $lex
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function __construct(Smarty_Internal_Templatelexer $lex, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->lex = $lex;
+        $this->compiler = $compiler;
+        $this->template = $this->compiler->template;
+        $this->smarty = $this->template->smarty;
+        $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
+        $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template();
+    }
+
+     /**
+     * insert PHP code in current buffer
+     *
+     * @param string $code
+     */
+    public function insertPhpCode($code)
+    {
+        $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Tag($this, $code));
+    }
+
+    /**
+     * error rundown
+     *
+     */
+    public function errorRunDown()
+    {
+        while ($this->yystack !== array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
+        }
+    }
+
+    /**
+     *  merge PHP code with prefix code and return parse tree tag object
+     *
+     * @param string $code
+     *
+     * @return Smarty_Internal_ParseTree_Tag
+     */
+    public function mergePrefixCode($code)
+    {
+        $tmp = '';
+        foreach ($this->compiler->prefix_code as $preCode) {
+            $tmp .= $preCode;
+        }
+        $this->compiler->prefix_code = array();
+        $tmp .= $code;
+        return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true));
+    }
+
+}
+
+%token_prefix TP_
+
+%parse_accept
+{
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+}
+
+%syntax_error
+{
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_template_error();
+}
+
+%stack_overflow
+{
+    $this->internalError = true;
+    $this->compiler->trigger_template_error('Stack overflow in template parser');
+}
+
+
+%right VERT.
+%left COLON.
+
+
+    //
+    // complete template
+    //
+start(res)       ::= template. {
+    $this->root_buffer->prepend_array($this, $this->template_prefix);
+    $this->root_buffer->append_array($this, $this->template_postfix);
+    res = $this->root_buffer->to_smarty_php($this);
+}
+
+                      // template text
+template       ::= template  TEXT(B). {
+         $text = $this->yystack[ $this->yyidx + 0 ]->minor;
+
+         if ((string)$text == '') {
+            $this->current_buffer->append_subtree($this, null);
+         }
+
+         $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text($text, $this->strip));
+}
+                      // strip on
+template       ::= template  STRIPON. {
+    $this->strip = true;
+}
+                      // strip off
+template       ::= template STRIPOFF. {
+    $this->strip = false;
+}
+
+                     // Literal
+template       ::= template LITERALSTART literal_e2(B) LITERALEND. {
+       $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text(B));
+}
+
+
+literal_e2(A) ::= literal_e1(B) LITERALSTART literal_e1(C) LITERALEND. {
+    A = B.C;
+}
+literal_e2(A) ::= literal_e1(B). {
+    A = B;
+}
+
+literal_e1(A) ::= literal_e1(B) LITERAL(C). {
+        A = B.C;
+
+}
+
+literal_e1(A) ::= . {
+    A = '';
+}
+                      // Smarty tag
+template       ::= template smartytag(B). {
+      if ($this->compiler->has_code) {
+          $this->current_buffer->append_subtree($this, $this->mergePrefixCode(B));
+      }
+     $this->compiler->has_variable_string = false;
+     $this->block_nesting_level = count($this->compiler->_tag_stack);
+}
+
+
+                      // empty template
+template       ::= .
+
+smartytag(A)   ::= SIMPELOUTPUT(B). {
+    $var = trim(substr(B, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
+    if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+        A = $this->compiler->compileTag('private_print_expression',array('nocache'),array('value'=>$this->compiler->compileVariable('\''.$match[1].'\'')));
+    } else {
+        A = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->compiler->compileVariable('\''.$var.'\'')));
+    }
+}
+
+// simple tag like {name}
+smartytag(A)::= SIMPLETAG(B). {
+    $tag = trim(substr(B, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()));
+    if ($tag == 'strip') {
+        $this->strip = true;
+        A = null;
+    } else {
+        if (defined($tag)) {
+            if ($this->security) {
+               $this->security->isTrustedConstant($tag, $this->compiler);
+            }
+            A = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$tag));
+        } else {
+            if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                A = $this->compiler->compileTag($match[1],array('\'nocache\''));
+            } else {
+                A = $this->compiler->compileTag($tag,array());
+            }
+        }
+    }
+}
+                  // {$smarty.block.child} or {$smarty.block.parent}
+smartytag(A)   ::= SMARTYBLOCKCHILDPARENT(i). {
+    $j = strrpos(i,'.');
+    if (i[$j+1] == 'c') {
+        // {$smarty.block.child}
+        A = $this->compiler->compileTag('child',array(),array(i));
+    } else {
+        // {$smarty.block.parent}
+       A = $this->compiler->compileTag('parent',array(),array(i));
+     }
+}
+
+smartytag(A)   ::= LDEL tagbody(B) RDEL. {
+    A  = B;
+}
+
+ smartytag(A)   ::=  tag(B) RDEL. {
+     A  = B;
+ }
+                  // output with optional attributes
+tagbody(A) ::= outattr(B). {
+    A = $this->compiler->compileTag('private_print_expression',B[1],array('value'=>B[0]));
+}
+
+//
+// Smarty tags start here
+//
+
+                  // assign new style
+tagbody(A) ::= DOLLARID(B) eqoutattr(C). {
+    A = $this->compiler->compileTag('assign',array_merge(array(array('value'=>C[0]),array('var'=>'\''.substr(B,1).'\'')),C[1]));
+}
+
+tagbody(A) ::= varindexed(B) eqoutattr(C). {
+    A = $this->compiler->compileTag('assign',array_merge(array(array('value'=>C[0]),array('var'=>B['var'])),C[1]),array('smarty_internal_index'=>B['smarty_internal_index']));
+}
+
+eqoutattr(A) ::= EQUAL outattr(B). {
+       A = B;
+}
+
+outattr(A) ::= output(B) attributes(C). {
+    A = array(B,C);
+}
+
+output(A) ::= variable(B). {
+    A = B;
+}
+output(A) ::= value(B). {
+    A = B;
+}
+output(A) ::= expr(B). {
+    A = B;
+}
+
+                  // tag with optional Smarty2 style attributes
+tag(res)   ::= LDEL ID(i) attributes(a). {
+        if (defined(i)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant(i, $this->compiler);
+            }
+            res = $this->compiler->compileTag('private_print_expression',a,array('value'=>i));
+        } else {
+            res = $this->compiler->compileTag(i,a);
+        }
+}
+tag(res)   ::= LDEL ID(i). {
+        if (defined(i)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant(i, $this->compiler);
+            }
+            res = $this->compiler->compileTag('private_print_expression',array(),array('value'=>i));
+        } else {
+            res = $this->compiler->compileTag(i,array());
+        }
+}
+
+
+                  // tag with modifier and optional Smarty2 style attributes
+tag(res)   ::= LDEL ID(i) modifierlist(l)attributes(a). {
+        if (defined(i)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant(i, $this->compiler);
+            }
+            res = $this->compiler->compileTag('private_print_expression',a,array('value'=>i, 'modifierlist'=>l));
+        } else {
+            res = $this->compiler->compileTag(i,a, array('modifierlist'=>l));
+        }
+}
+
+                  // registered object tag
+tag(res)   ::= LDEL ID(i) PTR ID(m) attributes(a). {
+    res = $this->compiler->compileTag(i,a,array('object_method'=>m));
+}
+
+                  // registered object tag with modifiers
+tag(res)   ::= LDEL ID(i) PTR ID(me) modifierlist(l) attributes(a). {
+    res = $this->compiler->compileTag(i,a,array('modifierlist'=>l, 'object_method'=>me));
+}
+
+                  // nocache tag
+tag(res)   ::= LDELMAKENOCACHE DOLLARID(i). {
+    res = $this->compiler->compileTag('make_nocache',array(array('var'=>'\''.substr(i,1).'\'')));
+}
+
+                  // {if}, {elseif} and {while} tag
+tag(res)   ::= LDELIF(i) expr(ie). {
+    $tag = trim(substr(i,$this->compiler->getLdelLength())); 
+    res = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>ie));
+}
+
+tag(res)   ::= LDELIF(i) expr(ie) attributes(a). {
+    $tag = trim(substr(i,$this->compiler->getLdelLength()));
+    res = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,a,array('if condition'=>ie));
+}
+
+tag(res)   ::= LDELIF(i) statement(ie). {
+    $tag = trim(substr(i,$this->compiler->getLdelLength()));
+    res = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>ie));
+}
+
+tag(res)   ::= LDELIF(i) statement(ie)  attributes(a). {
+    $tag = trim(substr(i,$this->compiler->getLdelLength()));
+    res = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,a,array('if condition'=>ie));
+}
+
+                  // {for} tag
+tag(res)   ::= LDELFOR statements(st) SEMICOLON expr(ie) SEMICOLON varindexed(v2) foraction(e2) attributes(a). {
+    res = $this->compiler->compileTag('for',array_merge(a,array(array('start'=>st),array('ifexp'=>ie),array('var'=>v2),array('step'=>e2))),1);
+}
+
+  foraction(res)   ::= EQUAL expr(e). {
+    res = '='.e;
+}
+
+  foraction(res)   ::= INCDEC(e). {
+    res = e;
+}
+
+tag(res)   ::= LDELFOR statement(st) TO expr(v) attributes(a). {
+    res = $this->compiler->compileTag('for',array_merge(a,array(array('start'=>st),array('to'=>v))),0);
+}
+
+tag(res)   ::= LDELFOR statement(st) TO expr(v) STEP expr(v2) attributes(a). {
+    res = $this->compiler->compileTag('for',array_merge(a,array(array('start'=>st),array('to'=>v),array('step'=>v2))),0);
+}
+
+                  // {foreach} tag
+tag(res)   ::= LDELFOREACH SPACE expr(e) AS varvar(v0) attributes(a). {
+    res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>e),array('item'=>v0))));
+}
+
+tag(res)   ::= LDELFOREACH SPACE expr(e) AS varvar(v1) APTR varvar(v0) attributes(a). {
+    res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>e),array('item'=>v0),array('key'=>v1))));
+}
+tag(res)   ::= LDELFOREACH attributes(a). {
+    res = $this->compiler->compileTag('foreach',a);
+}
+
+                  // {setfilter}
+tag(res)   ::= LDELSETFILTER ID(m) modparameters(p). {
+    res = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array(m),p))));
+}
+
+tag(res)   ::= LDELSETFILTER ID(m) modparameters(p) modifierlist(l). {
+    res = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array(m),p)),l)));
+}
+
+                  
+                  // end of block tag  {/....}                  
+smartytag(res)::= CLOSETAG(t). {
+    $tag = trim(substr(t, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' /');
+    if ($tag === 'strip') {
+        $this->strip = false;
+        res = null;
+    } else {
+       res = $this->compiler->compileTag($tag.'close',array());
+    }
+ }
+tag(res)   ::= LDELSLASH ID(i). {
+    res = $this->compiler->compileTag(i.'close',array());
+}
+
+tag(res)   ::= LDELSLASH ID(i) modifierlist(l). {
+    res = $this->compiler->compileTag(i.'close',array(),array('modifier_list'=>l));
+}
+
+                  // end of block object tag  {/....}                 
+tag(res)   ::= LDELSLASH ID(i) PTR ID(m). {
+    res = $this->compiler->compileTag(i.'close',array(),array('object_method'=>m));
+}
+
+tag(res)   ::= LDELSLASH ID(i) PTR ID(m) modifierlist(l). {
+    res = $this->compiler->compileTag(i.'close',array(),array('object_method'=>m, 'modifier_list'=>l));
+}
+
+//
+//Attributes of Smarty tags 
+//
+                  // list of attributes
+attributes(res)  ::= attributes(a1) attribute(a2). {
+    res = a1;
+    res[] = a2;
+}
+
+                  // single attribute
+attributes(res)  ::= attribute(a). {
+    res = array(a);
+}
+
+                  // no attributes
+attributes(res)  ::= . {
+    res = array();
+}
+                  
+                  // attribute
+attribute(res)   ::= SPACE ID(v) EQUAL ID(id). {
+    if (defined(id)) {
+        if ($this->security) {
+            $this->security->isTrustedConstant(id, $this->compiler);
+        }
+        res = array(v=>id);
+    } else {
+        res = array(v=>'\''.id.'\'');
+    }
+}
+
+attribute(res)   ::= ATTR(v) expr(e). {
+    res = array(trim(v," =\n\r\t")=>e);
+}
+
+attribute(res)   ::= ATTR(v) value(e). {
+    res = array(trim(v," =\n\r\t")=>e);
+}
+
+attribute(res)   ::= SPACE ID(v). {
+    res = '\''.v.'\'';
+}
+
+attribute(res)   ::= SPACE expr(e). {
+    res = e;
+}
+
+attribute(res)   ::= SPACE value(v). {
+    res = v;
+}
+
+attribute(res)   ::= SPACE INTEGER(i) EQUAL expr(e). {
+    res = array(i=>e);
+}
+
+                  
+
+//
+// statement
+//
+statements(res)   ::= statement(s). {
+    res = array(s);
+}
+
+statements(res)   ::= statements(s1) COMMA statement(s). {
+    s1[]=s;
+    res = s1;
+}
+
+statement(res)    ::= DOLLARID(i) EQUAL INTEGER(e). {
+    res = array('var' => '\''.substr(i,1).'\'', 'value'=>e);
+}
+statement(res)    ::= DOLLARID(i) EQUAL expr(e). {
+    res = array('var' => '\''.substr(i,1).'\'', 'value'=>e);
+}
+
+statement(res)    ::= varindexed(vi) EQUAL expr(e). {
+    res = array('var' => vi, 'value'=>e);
+}
+
+statement(res)    ::= OPENP statement(st) CLOSEP. {
+    res = st;
+}
+
+
+//
+// expressions
+//
+
+                  // single value
+expr(res)        ::= value(v). {
+    res = v;
+}
+
+                 // ternary
+expr(res)        ::= ternary(v). {
+    res = v;
+}
+
+                 // resources/streams
+expr(res)        ::= DOLLARID(i) COLON ID(i2). {
+    res = '$_smarty_tpl->getStreamVariable(\''.substr(i,1).'://' . i2 . '\')';
+}
+
+                  // arithmetic expression
+expr(res)        ::= expr(e) MATH(m) value(v). {
+    res = e . trim(m) . v;
+}
+
+expr(res)        ::= expr(e) UNIMATH(m) value(v). {
+    res = e . trim(m) . v;
+}
+
+// if expression
+                    // special conditions
+expr(res)        ::= expr(e1) tlop(c) value(e2). {
+    res = c['pre']. e1.c['op'].e2 .')';
+}
+                    // simple expression
+expr(res)        ::= expr(e1) lop(c) expr(e2). {
+    res = e1.c.e2;
+}
+
+expr(res)        ::= expr(e1) scond(c). {
+    res = c . e1 . ')';
+}
+
+expr(res)        ::= expr(e1) ISIN array(a).  {
+    res = 'in_array('.e1.','.a.')';
+}
+
+expr(res)        ::= expr(e1) ISIN value(v).  {
+    res = 'in_array('.e1.',(array)'.v.')';
+}
+
+
+//
+// ternary
+//
+ternary(res)        ::= OPENP expr(v) CLOSEP  QMARK DOLLARID(e1) COLON  expr(e2). {
+    res = v.' ? '. $this->compiler->compileVariable('\''.substr(e1,1).'\'') . ' : '.e2;
+}
+
+ternary(res)        ::= OPENP expr(v) CLOSEP  QMARK  expr(e1) COLON  expr(e2). {
+    res = v.' ? '.e1.' : '.e2;
+}
+
+                 // value
+value(res)       ::= variable(v). {
+    res = v;
+}
+
+                  // +/- value
+value(res)        ::= UNIMATH(m) value(v). {
+    res = m.v;
+}
+
+                  // logical negation
+value(res)       ::= NOT value(v). {
+    res = '!'.v;
+}
+
+value(res)       ::= TYPECAST(t) value(v). {
+    res = t.v;
+}
+
+value(res)       ::= variable(v) INCDEC(o). {
+    res = v.o;
+}
+
+                 // numeric
+value(res)       ::= HEX(n). {
+    res = n;
+}
+
+value(res)       ::= INTEGER(n). {
+    res = n;
+}
+
+value(res)       ::= INTEGER(n1) DOT INTEGER(n2). {
+    res = n1.'.'.n2;
+}
+
+value(res)       ::= INTEGER(n1) DOT. {
+    res = n1.'.';
+}
+
+value(res)       ::= DOT INTEGER(n1). {
+    res = '.'.n1;
+}
+
+                 // ID, true, false, null
+value(res)       ::= ID(id). {
+    if (defined(id)) {
+        if ($this->security) {
+             $this->security->isTrustedConstant(id, $this->compiler);
+        }
+        res = id;
+    } else {
+        res = '\''.id.'\'';
+    }
+}
+
+                  // function call
+value(res)       ::= function(f). {
+    res = f;
+}
+
+                  // expression
+value(res)       ::= OPENP expr(e) CLOSEP. {
+    res = '('. e .')';
+}
+
+value(res)        ::= variable(v1) INSTANCEOF(i) ns1(v2). {
+      res = v1.i.v2;
+}
+value(res)        ::= variable(v1) INSTANCEOF(i) variable(v2). {
+      res = v1.i.v2;
+}
+
+                  // singele quoted string
+value(res)       ::= SINGLEQUOTESTRING(t). {
+    res = t;
+}
+
+                  // double quoted string
+value(res)       ::= doublequoted_with_quotes(s). {
+    res = s;
+}
+
+
+value(res)    ::= varindexed(vi) DOUBLECOLON static_class_access(r). {
+    if ($this->security && $this->security->static_classes !== array()) {
+        $this->compiler->trigger_template_error('dynamic static class not allowed by security setting');
+    }
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    if (vi['var'] === '\'smarty\'') {
+        $this->compiler->appendPrefixCode("<?php {$prefixVar} = ". $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']).';?>');
+     } else {
+        $this->compiler->appendPrefixCode("<?php  {$prefixVar} = ". $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'].';?>');
+    }
+    res = $prefixVar .'::'.r[0].r[1];
+}
+
+                  // Smarty tag
+value(res)       ::= smartytag(st). {
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    $tmp = $this->compiler->appendCode('<?php ob_start();?>', st);
+    $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php {$prefixVar} = ob_get_clean();?>"));
+    res = $prefixVar;
+}
+
+value(res)       ::= value(v) modifierlist(l). {
+    res = $this->compiler->compileTag('private_modifier',array(),array('value'=>v,'modifierlist'=>l));
+}
+                  // name space constant
+value(res)       ::= NAMESPACE(c). {
+    res = c;
+}
+
+                  // array
+value(res)       ::= arraydef(a). {
+    res = a;
+}
+                  // static class access
+value(res)       ::= ns1(c)DOUBLECOLON static_class_access(s). {
+    if (!in_array(strtolower(c), array('self', 'parent')) && (!$this->security || $this->security->isTrustedStaticClassAccess(c, s, $this->compiler))) {
+        if (isset($this->smarty->registered_classes[c])) {
+            res = $this->smarty->registered_classes[c].'::'.s[0].s[1];
+        } else {
+            trigger_error('Using unregistered static method "' . c.'::'.s[0] . '" in a template is deprecated and will be ' .
+                    'removed in a future release. Use Smarty::registerClass to explicitly register ' .
+                    'a class for access.', E_USER_DEPRECATED);
+            res = c.'::'.s[0].s[1];
+        } 
+    } else {
+        $this->compiler->trigger_template_error ('static class \''.c.'\' is undefined or not allowed by security setting');
+    }
+}
+//
+// namespace stuff
+//
+
+ns1(res)           ::= ID(i). {
+    res = i;
+}
+
+ns1(res)           ::= NAMESPACE(i). {
+    res = i;
+    }
+
+
+
+
+//
+// variables 
+//
+                  // Smarty variable (optional array)
+variable(res)    ::= DOLLARID(i). {
+   res = $this->compiler->compileVariable('\''.substr(i,1).'\'');
+}
+variable(res)    ::= varindexed(vi). {
+    if (vi['var'] === '\'smarty\'') {
+        $smarty_var = $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']);
+        res = $smarty_var;
+    } else {
+        // used for array reset,next,prev,end,current 
+        $this->last_variable = vi['var'];
+        $this->last_index = vi['smarty_internal_index'];
+        res = $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'];
+    }
+}
+
+                  // variable with property
+variable(res)    ::= varvar(v) AT ID(p). {
+    res = '$_smarty_tpl->tpl_vars['. v .']->'.p;
+}
+
+                  // object
+variable(res)    ::= object(o). {
+    res = o;
+}
+
+                  // config variable
+variable(res)    ::= HATCH ID(i) HATCH. {
+    res = $this->compiler->compileConfigVariable('\'' . i . '\'');
+}
+
+variable(res)    ::= HATCH ID(i) HATCH arrayindex(a). {
+    res = '(is_array($tmp = ' . $this->compiler->compileConfigVariable('\'' . i . '\'') . ') ? $tmp'.a.' :null)';
+}
+
+variable(res)    ::= HATCH variable(v) HATCH. {
+    res = $this->compiler->compileConfigVariable(v);
+}
+
+variable(res)    ::= HATCH variable(v) HATCH arrayindex(a). {
+    res = '(is_array($tmp = ' . $this->compiler->compileConfigVariable(v) . ') ? $tmp'.a.' : null)';
+}
+
+varindexed(res)  ::= DOLLARID(i) arrayindex(a). {
+    res = array('var'=>'\''.substr(i,1).'\'', 'smarty_internal_index'=>a);
+}
+varindexed(res)  ::= varvar(v) arrayindex(a). {
+    res = array('var'=>v, 'smarty_internal_index'=>a);
+}
+
+//
+// array index
+//
+                    // multiple array index
+arrayindex(res)  ::= arrayindex(a1) indexdef(a2). {
+    res = a1.a2;
+}
+
+                    // no array index
+arrayindex        ::= . {
+    return;
+}
+
+// single index definition
+                    // Smarty2 style index 
+indexdef(res)    ::= DOT DOLLARID(i).  {
+    res = '['.$this->compiler->compileVariable('\''.substr(i,1).'\'').']';
+}
+indexdef(res)    ::= DOT varvar(v).  {
+    res = '['.$this->compiler->compileVariable(v).']';
+}
+
+indexdef(res)    ::= DOT varvar(v) AT ID(p). {
+    res = '['.$this->compiler->compileVariable(v).'->'.p.']';
+}
+
+indexdef(res)   ::= DOT ID(i). {
+    res = '[\''. i .'\']';
+}
+
+indexdef(res)   ::= DOT INTEGER(n). {
+    res = '['. n .']';
+}
+
+
+indexdef(res)   ::= DOT LDEL expr(e) RDEL. {
+    res = '['. e .']';
+}
+
+                    // section tag index
+indexdef(res)   ::= OPENB ID(i)CLOSEB. {
+    res = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.i.'\'][\'index\']').']';
+}
+
+indexdef(res)   ::= OPENB ID(i) DOT ID(i2) CLOSEB. {
+    res = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.i.'\'][\''.i2.'\']').']';
+}
+indexdef(res)   ::= OPENB SINGLEQUOTESTRING(s) CLOSEB. {
+    res = '['.s.']';
+}
+indexdef(res)   ::= OPENB INTEGER(n) CLOSEB. {
+    res = '['.n.']';
+}
+indexdef(res)   ::= OPENB DOLLARID(i) CLOSEB. {
+    res = '['.$this->compiler->compileVariable('\''.substr(i,1).'\'').']';
+}
+indexdef(res)   ::= OPENB variable(v) CLOSEB. {
+    res = '['.v.']';
+}
+indexdef(res)   ::= OPENB value(v) CLOSEB. {
+    res = '['.v.']';
+}
+
+                    // PHP style index
+indexdef(res)   ::= OPENB expr(e) CLOSEB. {
+    res = '['. e .']';
+}
+
+                    // for assign append array
+indexdef(res)  ::= OPENB CLOSEB. {
+    res = '[]';
+}
+
+
+//
+// variable variable names
+//
+
+                    // singel identifier element
+varvar(res)      ::= DOLLARID(i). {
+    res = '\''.substr(i,1).'\'';
+}
+                    // single $
+varvar(res)      ::= DOLLAR. {
+    res = '\'\'';
+}
+
+                    // sequence of identifier elements
+varvar(res)      ::= varvar(v1) varvarele(v2). {
+    res = v1.'.'.v2;
+}
+
+                    // fix sections of element
+varvarele(res)   ::= ID(s). {
+    res = '\''.s.'\'';
+}
+varvarele(res)   ::= SIMPELOUTPUT(i). {
+    $var = trim(substr(i, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
+    res = $this->compiler->compileVariable('\''.$var.'\'');
+}
+
+                    // variable sections of element
+varvarele(res)   ::= LDEL expr(e) RDEL. {
+    res = '('.e.')';
+}
+
+//
+// objects
+//
+object(res)    ::= varindexed(vi) objectchain(oc). {
+    if (vi['var'] === '\'smarty\'') {
+        res =  $this->compiler->compileTag('private_special_variable',array(),vi['smarty_internal_index']).oc;
+    } else {
+        res = $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'].oc;
+    }
+}
+
+                    // single element
+objectchain(res) ::= objectelement(oe). {
+    res  = oe;
+}
+
+                    // chain of elements 
+objectchain(res) ::= objectchain(oc) objectelement(oe). {
+    res  = oc.oe;
+}
+
+                    // variable
+objectelement(res)::= PTR ID(i) arrayindex(a). {
+    if ($this->security && substr(i,0,1) === '_') {
+        $this->compiler->trigger_template_error (self::ERR1);
+    }
+    res = '->'.i.a;
+}
+
+objectelement(res)::= PTR varvar(v) arrayindex(a). {
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    res = '->{'.$this->compiler->compileVariable(v).a.'}';
+}
+
+objectelement(res)::= PTR LDEL expr(e) RDEL arrayindex(a). {
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    res = '->{'.e.a.'}';
+}
+
+objectelement(res)::= PTR ID(ii) LDEL expr(e) RDEL arrayindex(a). {
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    res = '->{\''.ii.'\'.'.e.a.'}';
+}
+
+                    // method
+objectelement(res)::= PTR method(f).  {
+    res = '->'.f;
+}
+
+
+//
+// function
+//
+function(res)     ::= ns1(f) OPENP params(p) CLOSEP. {
+    res = $this->compiler->compilePHPFunctionCall(f, p);
+}
+
+
+//
+// method
+//
+method(res)     ::= ID(f) OPENP params(p) CLOSEP. {
+    if ($this->security && substr(f,0,1) === '_') {
+        $this->compiler->trigger_template_error (self::ERR1);
+    }
+    res = f . '('. implode(',',p) .')';
+}
+
+method(res)     ::= DOLLARID(f) OPENP params(p) CLOSEP.  {
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    $this->compiler->appendPrefixCode("<?php {$prefixVar} = ".$this->compiler->compileVariable('\''.substr(f,1).'\'').';?>');
+    res = $prefixVar .'('. implode(',',p) .')';
+}
+
+// function/method parameter
+                    // multiple parameters
+params(res)       ::= params(p) COMMA expr(e). {
+    res = array_merge(p,array(e));
+}
+
+                    // single parameter
+params(res)       ::= expr(e). {
+    res = array(e);
+}
+
+                    // kein parameter
+params(res)       ::= . {
+    res = array();
+}
+
+//
+// modifier
+// 
+modifierlist(res) ::= modifierlist(l) modifier(m) modparameters(p). {
+    res = array_merge(l,array(array_merge(m,p)));
+}
+
+modifierlist(res) ::= modifier(m) modparameters(p). {
+    res = array(array_merge(m,p));
+}
+ 
+modifier(res)    ::= VERT AT ID(m). {
+    res = array(m);
+}
+
+modifier(res)    ::= VERT ID(m). {
+    res =  array(m);
+}
+
+//
+// modifier parameter
+//
+                    // multiple parameter
+modparameters(res) ::= modparameters(mps) modparameter(mp). {
+    res = array_merge(mps,mp);
+}
+
+                    // no parameter
+modparameters(res)      ::= . {
+    res = array();
+}
+
+                    // parameter expression
+modparameter(res) ::= COLON value(mp). {
+    res = array(mp);
+}
+modparameter(res) ::= COLON UNIMATH(m) value(mp). {
+    res = array(trim(m).mp);
+}
+
+modparameter(res) ::= COLON array(mp). {
+    res = array(mp);
+}
+
+                  // static class methode call
+static_class_access(res)       ::= method(m). {
+    res = array(m, '', 'method');
+}
+
+                  // static class methode call with object chainig
+static_class_access(res)       ::= method(m) objectchain(oc). {
+    res = array(m, oc, 'method');
+}
+
+                  // static class constant
+static_class_access(res)       ::= ID(v). {
+    res = array(v, '');
+}
+
+                  // static class variables
+static_class_access(res)       ::=  DOLLARID(v) arrayindex(a). {
+    res = array(v, a, 'property');
+}
+
+                  // static class variables with object chain
+static_class_access(res)       ::= DOLLARID(v) arrayindex(a) objectchain(oc). {
+    res = array(v, a.oc, 'property');
+}
+
+
+// if conditions and operators
+lop(res)        ::= LOGOP(o). {
+    res = ' '. trim(o) . ' ';
+}
+
+lop(res)        ::= SLOGOP(o). {
+    static $lops = array(
+        'eq' => ' == ',
+        'ne' => ' != ',
+        'neq' => ' != ',
+        'gt' => ' > ',
+        'ge' => ' >= ',
+        'gte' => ' >= ',
+        'lt' =>  ' < ',
+        'le' =>  ' <= ',
+        'lte' => ' <= ',
+        'mod' =>  ' % ',
+        'and' => ' && ',
+        'or' => ' || ',
+        'xor' => ' xor ',
+         );
+    $op = strtolower(preg_replace('/\s*/', '', o));
+    res = $lops[$op];
+}
+tlop(res)        ::= TLOGOP(o). {
+     static $tlops = array(
+         'isdivby' => array('op' => ' % ', 'pre' => '!('),
+         'isnotdivby' => array('op' => ' % ', 'pre' => '('),
+         'isevenby' => array('op' => ' / ', 'pre' => '!(1 & '),
+         'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
+         'isoddby' => array('op' => ' / ', 'pre' => '(1 & '),
+         'isnotoddby' => array('op' => ' / ', 'pre' => '!(1 & '),
+         );
+     $op = strtolower(preg_replace('/\s*/', '', o));
+     res = $tlops[$op];
+ }
+
+scond(res)  ::= SINGLECOND(o). {
+        static $scond = array (
+            'iseven' => '!(1 & ',
+            'isnoteven' => '(1 & ',
+            'isodd' => '(1 & ',
+            'isnotodd' => '!(1 & ',
+        );
+   $op = strtolower(str_replace(' ', '', o));
+   res = $scond[$op];
+}
+
+//
+// ARRAY element assignment
+//
+arraydef(res)           ::=  OPENB arrayelements(a) CLOSEB.  {
+    res = 'array('.a.')';
+}
+arraydef(res)           ::=  ARRAYOPEN arrayelements(a) CLOSEP.  {
+    res = 'array('.a.')';
+}
+
+arrayelements(res)   ::=  arrayelement(a).  {
+    res = a;
+}
+
+arrayelements(res)   ::=  arrayelements(a1) COMMA arrayelement(a).  {
+    res = a1.','.a;
+}
+
+arrayelements        ::=  .  {
+    return;
+}
+
+arrayelement(res)    ::=  value(e1) APTR expr(e2). {
+    res = e1.'=>'.e2;
+}
+
+arrayelement(res)    ::=  ID(i) APTR expr(e2). { 
+    res = '\''.i.'\'=>'.e2;
+}
+
+arrayelement(res)    ::=  expr(e). {
+    res = e;
+}
+
+
+//
+// double quoted strings
+//
+doublequoted_with_quotes(res) ::= QUOTE QUOTE. {
+    res = '\'\'';
+}
+
+doublequoted_with_quotes(res) ::= QUOTE doublequoted(s) QUOTE. {
+    $this->compiler->leaveDoubleQuote();
+    res = s->to_smarty_php($this);
+}
+
+
+doublequoted(res)          ::= doublequoted(o1) doublequotedcontent(o2). {
+    o1->append_subtree($this, o2);
+    res = o1;
+}
+
+doublequoted(res)          ::= doublequotedcontent(o). {
+    res = new Smarty_Internal_ParseTree_Dq($this, o);
+}
+
+doublequotedcontent(res)           ::=  BACKTICK variable(v) BACKTICK. {
+    res = new Smarty_Internal_ParseTree_Code('(string)'.v);
+}
+
+doublequotedcontent(res)           ::=  BACKTICK expr(e) BACKTICK. {
+    res = new Smarty_Internal_ParseTree_Code('(string)('.e.')');
+}
+
+doublequotedcontent(res)           ::=  DOLLARID(i). {
+    res = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\''. substr(i,1) .'\']->value');
+}
+
+doublequotedcontent(res)           ::=  LDEL variable(v) RDEL. {
+    res = new Smarty_Internal_ParseTree_Code('(string)'.v);
+}
+
+doublequotedcontent(res)           ::=  LDEL expr(e) RDEL. {
+    res = new Smarty_Internal_ParseTree_Code('(string)('.e.')');
+}
+
+doublequotedcontent(res)     ::=  smartytag(st). {
+    res = new Smarty_Internal_ParseTree_Tag($this, st);
+}
+
+doublequotedcontent(res)           ::=  TEXT(o). {
+    res = new Smarty_Internal_ParseTree_DqContent(o);
+}
+
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/Autoloader.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/Autoloader.php
new file mode 100644
index 000000000..da7e32abf
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/Autoloader.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Smarty Autoloader
+ *
+ * @package Smarty
+ */
+
+
+if (!defined('SMARTY_HELPER_FUNCTIONS_LOADED')) {
+	include __DIR__ . '/functions.php';
+}
+
+/**
+ * Smarty Autoloader
+ *
+ * @package Smarty
+ * @author  Uwe Tews
+ *             Usage:
+ *                  require_once '...path/Autoloader.php';
+ *                  Smarty_Autoloader::register();
+ *             or
+ *                  include '...path/bootstrap.php';
+ *
+ *                  $smarty = new Smarty();
+ */
+class Smarty_Autoloader
+{
+    /**
+     * Filepath to Smarty root
+     *
+     * @var string
+     */
+    public static $SMARTY_DIR = null;
+
+    /**
+     * Filepath to Smarty internal plugins
+     *
+     * @var string
+     */
+    public static $SMARTY_SYSPLUGINS_DIR = null;
+
+    /**
+     * Array with Smarty core classes and their filename
+     *
+     * @var array
+     */
+    public static $rootClasses = array('smarty' => 'Smarty.class.php');
+
+    /**
+     * Registers Smarty_Autoloader backward compatible to older installations.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not.
+     */
+    public static function registerBC($prepend = false)
+    {
+        /**
+         * register the class autoloader
+         */
+        if (!defined('SMARTY_SPL_AUTOLOAD')) {
+            define('SMARTY_SPL_AUTOLOAD', 0);
+        }
+        if (SMARTY_SPL_AUTOLOAD
+            && set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false
+        ) {
+            $registeredAutoLoadFunctions = spl_autoload_functions();
+            if (!isset($registeredAutoLoadFunctions[ 'spl_autoload' ])) {
+                spl_autoload_register();
+            }
+        } else {
+            self::register($prepend);
+        }
+    }
+
+    /**
+     * Registers Smarty_Autoloader as an SPL autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not.
+     */
+    public static function register($prepend = false)
+    {
+        self::$SMARTY_DIR = defined('SMARTY_DIR') ? SMARTY_DIR : __DIR__ . DIRECTORY_SEPARATOR;
+        self::$SMARTY_SYSPLUGINS_DIR = defined('SMARTY_SYSPLUGINS_DIR') ? SMARTY_SYSPLUGINS_DIR :
+            self::$SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR;
+        spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
+    }
+
+    /**
+     * Handles auto loading of classes.
+     *
+     * @param string $class A class name.
+     */
+    public static function autoload($class)
+    {
+        if ($class[ 0 ] !== 'S' || strpos($class, 'Smarty') !== 0) {
+            return;
+        }
+        $_class = smarty_strtolower_ascii($class);
+        if (isset(self::$rootClasses[ $_class ])) {
+            $file = self::$SMARTY_DIR . self::$rootClasses[ $_class ];
+            if (is_file($file)) {
+                include $file;
+            }
+        } else {
+            $file = self::$SMARTY_SYSPLUGINS_DIR . $_class . '.php';
+            if (is_file($file)) {
+                include $file;
+            }
+        }
+        return;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/Smarty.class.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/Smarty.class.php
new file mode 100644
index 000000000..b285a99e0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/Smarty.class.php
@@ -0,0 +1,1405 @@
+<?php
+/**
+ * Project:     Smarty: the PHP compiling template engine
+ * File:        Smarty.class.php
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * For questions, help, comments, discussion, etc., please join the
+ * Smarty mailing list. Send a blank e-mail to
+ * smarty-discussion-subscribe@googlegroups.com
+ *
+ * @link      https://www.smarty.net/
+ * @copyright 2018 New Digital Group, Inc.
+ * @copyright 2018 Uwe Tews
+ * @author    Monte Ohrt <monte at ohrt dot com>
+ * @author    Uwe Tews   <uwe dot tews at gmail dot com>
+ * @author    Rodney Rehm
+ * @package   Smarty
+ */
+/**
+ * set SMARTY_DIR to absolute path to Smarty library files.
+ * Sets SMARTY_DIR only if user application has not already defined it.
+ */
+if (!defined('SMARTY_DIR')) {
+    /**
+     *
+     */
+    define('SMARTY_DIR', __DIR__ . DIRECTORY_SEPARATOR);
+}
+/**
+ * set SMARTY_SYSPLUGINS_DIR to absolute path to Smarty internal plugins.
+ * Sets SMARTY_SYSPLUGINS_DIR only if user application has not already defined it.
+ */
+if (!defined('SMARTY_SYSPLUGINS_DIR')) {
+    /**
+     *
+     */
+    define('SMARTY_SYSPLUGINS_DIR', SMARTY_DIR . 'sysplugins' . DIRECTORY_SEPARATOR);
+}
+if (!defined('SMARTY_PLUGINS_DIR')) {
+    /**
+     *
+     */
+    define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DIRECTORY_SEPARATOR);
+}
+if (!defined('SMARTY_MBSTRING')) {
+    /**
+     *
+     */
+    define('SMARTY_MBSTRING', function_exists('mb_get_info'));
+}
+
+/**
+ * Load helper functions
+ */
+if (!defined('SMARTY_HELPER_FUNCTIONS_LOADED')) {
+    include __DIR__ . '/functions.php';
+}
+
+/**
+ * Load Smarty_Autoloader
+ */
+if (!class_exists('Smarty_Autoloader')) {
+    include __DIR__ . '/bootstrap.php';
+}
+
+/**
+ * Load always needed external class files
+ */
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_data.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_extension_handler.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_templatebase.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_template.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_resource.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_variable.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_source.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_template_resource_base.php';
+require_once SMARTY_SYSPLUGINS_DIR . 'smarty_internal_resource_file.php';
+
+/**
+ * This is the main Smarty class
+ *
+ * @package Smarty
+ *
+ * The following methods will be dynamically loaded by the extension handler when they are called.
+ * They are located in a corresponding Smarty_Internal_Method_xxxx class
+ *
+ * @method int clearAllCache(int $exp_time = null, string $type = null)
+ * @method int clearCache(string $template_name, string $cache_id = null, string $compile_id = null, int $exp_time = null, string $type = null)
+ * @method int compileAllTemplates(string $extension = '.tpl', bool $force_compile = false, int $time_limit = 0, $max_errors = null)
+ * @method int compileAllConfig(string $extension = '.conf', bool $force_compile = false, int $time_limit = 0, $max_errors = null)
+ * @method int clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
+ */
+class Smarty extends Smarty_Internal_TemplateBase
+{
+    /**
+     * smarty version
+     */
+    const SMARTY_VERSION = '4.5.3';
+    /**
+     * define variable scopes
+     */
+    const SCOPE_LOCAL    = 1;
+    const SCOPE_PARENT   = 2;
+    const SCOPE_TPL_ROOT = 4;
+    const SCOPE_ROOT     = 8;
+    const SCOPE_SMARTY   = 16;
+    const SCOPE_GLOBAL   = 32;
+    /**
+     * define caching modes
+     */
+    const CACHING_OFF              = 0;
+    const CACHING_LIFETIME_CURRENT = 1;
+    const CACHING_LIFETIME_SAVED   = 2;
+    /**
+     * define constant for clearing cache files be saved expiration dates
+     */
+    const CLEAR_EXPIRED = -1;
+    /**
+     * define compile check modes
+     */
+    const COMPILECHECK_OFF       = 0;
+    const COMPILECHECK_ON        = 1;
+    const COMPILECHECK_CACHEMISS = 2;
+    /**
+     * define debug modes
+     */
+    const DEBUG_OFF        = 0;
+    const DEBUG_ON         = 1;
+    const DEBUG_INDIVIDUAL = 2;
+
+    /**
+     * filter types
+     */
+    const FILTER_POST     = 'post';
+    const FILTER_PRE      = 'pre';
+    const FILTER_OUTPUT   = 'output';
+    const FILTER_VARIABLE = 'variable';
+    /**
+     * plugin types
+     */
+    const PLUGIN_FUNCTION         = 'function';
+    const PLUGIN_BLOCK            = 'block';
+    const PLUGIN_COMPILER         = 'compiler';
+    const PLUGIN_MODIFIER         = 'modifier';
+    const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
+
+    /**
+     * assigned global tpl vars
+     */
+    public static $global_tpl_vars = array();
+
+    /**
+     * Flag denoting if Multibyte String functions are available
+     */
+    public static $_MBSTRING = SMARTY_MBSTRING;
+
+    /**
+     * The character set to adhere to (e.g. "UTF-8")
+     */
+    public static $_CHARSET = SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1';
+
+    /**
+     * The date format to be used internally
+     * (accepts date() and strftime())
+     */
+    public static $_DATE_FORMAT = '%b %e, %Y';
+
+    /**
+     * Flag denoting if PCRE should run in UTF-8 mode
+     */
+    public static $_UTF8_MODIFIER = 'u';
+
+    /**
+     * Flag denoting if operating system is windows
+     */
+    public static $_IS_WINDOWS = false;
+
+    /**
+     * auto literal on delimiters with whitespace
+     *
+     * @var boolean
+     */
+    public $auto_literal = true;
+
+    /**
+     * display error on not assigned variables
+     *
+     * @var boolean
+     */
+    public $error_unassigned = false;
+
+    /**
+     * look up relative file path in include_path
+     *
+     * @var boolean
+     */
+    public $use_include_path = false;
+
+    /**
+     * flag if template_dir is normalized
+     *
+     * @var bool
+     */
+    public $_templateDirNormalized = false;
+
+    /**
+     * joined template directory string used in cache keys
+     *
+     * @var string
+     */
+    public $_joined_template_dir = null;
+
+    /**
+     * flag if config_dir is normalized
+     *
+     * @var bool
+     */
+    public $_configDirNormalized = false;
+
+    /**
+     * joined config directory string used in cache keys
+     *
+     * @var string
+     */
+    public $_joined_config_dir = null;
+
+    /**
+     * default template handler
+     *
+     * @var callable
+     */
+    public $default_template_handler_func = null;
+
+    /**
+     * default config handler
+     *
+     * @var callable
+     */
+    public $default_config_handler_func = null;
+
+    /**
+     * default plugin handler
+     *
+     * @var callable
+     */
+    public $default_plugin_handler_func = null;
+
+    /**
+     * flag if template_dir is normalized
+     *
+     * @var bool
+     */
+    public $_compileDirNormalized = false;
+
+    /**
+     * flag if plugins_dir is normalized
+     *
+     * @var bool
+     */
+    public $_pluginsDirNormalized = false;
+
+    /**
+     * flag if template_dir is normalized
+     *
+     * @var bool
+     */
+    public $_cacheDirNormalized = false;
+
+    /**
+     * force template compiling?
+     *
+     * @var boolean
+     */
+    public $force_compile = false;
+
+    /**
+     * use sub dirs for compiled/cached files?
+     *
+     * @var boolean
+     */
+    public $use_sub_dirs = false;
+
+    /**
+     * allow ambiguous resources (that are made unique by the resource handler)
+     *
+     * @var boolean
+     */
+    public $allow_ambiguous_resources = false;
+
+    /**
+     * merge compiled includes
+     *
+     * @var boolean
+     */
+    public $merge_compiled_includes = false;
+
+    /*
+    * flag for behaviour when extends: resource  and {extends} tag are used simultaneous
+    *   if false disable execution of {extends} in templates called by extends resource.
+    *   (behaviour as versions < 3.1.28)
+    *
+    * @var boolean
+    */
+    public $extends_recursion = true;
+
+    /**
+     * force cache file creation
+     *
+     * @var boolean
+     */
+    public $force_cache = false;
+
+    /**
+     * template left-delimiter
+     *
+     * @var string
+     */
+    public $left_delimiter = "{";
+
+    /**
+     * template right-delimiter
+     *
+     * @var string
+     */
+    public $right_delimiter = "}";
+
+    /**
+     * array of strings which shall be treated as literal by compiler
+     *
+     * @var array string
+     */
+    public $literals = array();
+
+    /**
+     * class name
+     * This should be instance of Smarty_Security.
+     *
+     * @var string
+     * @see Smarty_Security
+     */
+    public $security_class = 'Smarty_Security';
+
+    /**
+     * implementation of security class
+     *
+     * @var Smarty_Security
+     */
+    public $security_policy = null;
+
+    /**
+     * controls if the php template file resource is allowed
+     *
+     * @var bool
+     */
+    public $allow_php_templates = false;
+
+    /**
+     * debug mode
+     * Setting this to true enables the debug-console.
+     *
+     * @var boolean
+     */
+    public $debugging = false;
+
+    /**
+     * This determines if debugging is enable-able from the browser.
+     * <ul>
+     *  <li>NONE => no debugging control allowed</li>
+     *  <li>URL => enable debugging when SMARTY_DEBUG is found in the URL.</li>
+     * </ul>
+     *
+     * @var string
+     */
+    public $debugging_ctrl = 'NONE';
+
+    /**
+     * Name of debugging URL-param.
+     * Only used when $debugging_ctrl is set to 'URL'.
+     * The name of the URL-parameter that activates debugging.
+     *
+     * @var string
+     */
+    public $smarty_debug_id = 'SMARTY_DEBUG';
+
+    /**
+     * Path of debug template.
+     *
+     * @var string
+     */
+    public $debug_tpl = null;
+
+    /**
+     * When set, smarty uses this value as error_reporting-level.
+     *
+     * @var int
+     */
+    public $error_reporting = null;
+
+    /**
+     * Controls whether variables with the same name overwrite each other.
+     *
+     * @var boolean
+     */
+    public $config_overwrite = true;
+
+    /**
+     * Controls whether config values of on/true/yes and off/false/no get converted to boolean.
+     *
+     * @var boolean
+     */
+    public $config_booleanize = true;
+
+    /**
+     * Controls whether hidden config sections/vars are read from the file.
+     *
+     * @var boolean
+     */
+    public $config_read_hidden = false;
+
+    /**
+     * locking concurrent compiles
+     *
+     * @var boolean
+     */
+    public $compile_locking = true;
+
+    /**
+     * Controls whether cache resources should use locking mechanism
+     *
+     * @var boolean
+     */
+    public $cache_locking = false;
+
+    /**
+     * seconds to wait for acquiring a lock before ignoring the write lock
+     *
+     * @var float
+     */
+    public $locking_timeout = 10;
+
+    /**
+     * resource type used if none given
+     * Must be an valid key of $registered_resources.
+     *
+     * @var string
+     */
+    public $default_resource_type = 'file';
+
+    /**
+     * caching type
+     * Must be an element of $cache_resource_types.
+     *
+     * @var string
+     */
+    public $caching_type = 'file';
+
+    /**
+     * config type
+     *
+     * @var string
+     */
+    public $default_config_type = 'file';
+
+    /**
+     * check If-Modified-Since headers
+     *
+     * @var boolean
+     */
+    public $cache_modified_check = false;
+
+    /**
+     * registered plugins
+     *
+     * @var array
+     */
+    public $registered_plugins = array();
+
+    /**
+     * registered objects
+     *
+     * @var array
+     */
+    public $registered_objects = array();
+
+    /**
+     * registered classes
+     *
+     * @var array
+     */
+    public $registered_classes = array();
+
+    /**
+     * registered filters
+     *
+     * @var array
+     */
+    public $registered_filters = array();
+
+    /**
+     * registered resources
+     *
+     * @var array
+     */
+    public $registered_resources = array();
+
+    /**
+     * registered cache resources
+     *
+     * @var array
+     */
+    public $registered_cache_resources = array();
+
+    /**
+     * autoload filter
+     *
+     * @var array
+     */
+    public $autoload_filters = array();
+
+    /**
+     * default modifier
+     *
+     * @var array
+     */
+    public $default_modifiers = array();
+
+    /**
+     * autoescape variable output
+     *
+     * @var boolean
+     */
+    public $escape_html = false;
+
+    /**
+     * start time for execution time calculation
+     *
+     * @var int
+     */
+    public $start_time = 0;
+
+    /**
+     * required by the compiler for BC
+     *
+     * @var string
+     */
+    public $_current_file = null;
+
+    /**
+     * internal flag to enable parser debugging
+     *
+     * @var bool
+     */
+    public $_parserdebug = false;
+
+    /**
+     * This object type (Smarty = 1, template = 2, data = 4)
+     *
+     * @var int
+     */
+    public $_objType = 1;
+
+    /**
+     * Debug object
+     *
+     * @var Smarty_Internal_Debug
+     */
+    public $_debug = null;
+
+    /**
+     * template directory
+     *
+     * @var array
+     */
+    protected $template_dir = array('./templates/');
+
+    /**
+     * flags for normalized template directory entries
+     *
+     * @var array
+     */
+    protected $_processedTemplateDir = array();
+
+    /**
+     * config directory
+     *
+     * @var array
+     */
+    protected $config_dir = array('./configs/');
+
+    /**
+     * flags for normalized template directory entries
+     *
+     * @var array
+     */
+    protected $_processedConfigDir = array();
+
+    /**
+     * compile directory
+     *
+     * @var string
+     */
+    protected $compile_dir = './templates_c/';
+
+    /**
+     * plugins directory
+     *
+     * @var array
+     */
+    protected $plugins_dir = array();
+
+    /**
+     * cache directory
+     *
+     * @var string
+     */
+    protected $cache_dir = './cache/';
+
+    /**
+     * removed properties
+     *
+     * @var string[]
+     */
+    protected $obsoleteProperties = array(
+        'resource_caching', 'template_resource_caching', 'direct_access_security',
+        '_dir_perms', '_file_perms', 'plugin_search_order',
+        'inheritance_merge_compiled_includes', 'resource_cache_mode',
+    );
+
+    /**
+     * List of private properties which will call getter/setter on a direct access
+     *
+     * @var string[]
+     */
+    protected $accessMap = array(
+        'template_dir' => 'TemplateDir', 'config_dir' => 'ConfigDir',
+        'plugins_dir'  => 'PluginsDir', 'compile_dir' => 'CompileDir',
+        'cache_dir'    => 'CacheDir',
+    );
+
+    /**
+     * PHP7 Compatibility mode
+     * @var bool
+     */
+    private $isMutingUndefinedOrNullWarnings = false;
+
+    /**
+     * Initialize new Smarty object
+     */
+    public function __construct()
+    {
+        $this->_clearTemplateCache();
+        parent::__construct();
+        if (is_callable('mb_internal_encoding')) {
+            mb_internal_encoding(Smarty::$_CHARSET);
+        }
+        $this->start_time = microtime(true);
+        if (isset($_SERVER[ 'SCRIPT_NAME' ])) {
+            Smarty::$global_tpl_vars[ 'SCRIPT_NAME' ] = new Smarty_Variable($_SERVER[ 'SCRIPT_NAME' ]);
+        }
+        // Check if we're running on windows
+        Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
+        // let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
+        if (Smarty::$_CHARSET !== 'UTF-8') {
+            Smarty::$_UTF8_MODIFIER = '';
+        }
+    }
+
+    /**
+     * Check if a template resource exists
+     *
+     * @param string $resource_name template name
+     *
+     * @return bool status
+     * @throws \SmartyException
+     */
+    public function templateExists($resource_name)
+    {
+        // create source object
+        $source = Smarty_Template_Source::load(null, $this, $resource_name);
+        return $source->exists;
+    }
+
+    /**
+     * Loads security class and enables security
+     *
+     * @param string|Smarty_Security $security_class if a string is used, it must be class-name
+     *
+     * @return Smarty                 current Smarty instance for chaining
+     * @throws \SmartyException
+     */
+    public function enableSecurity($security_class = null)
+    {
+        Smarty_Security::enableSecurity($this, $security_class);
+        return $this;
+    }
+
+    /**
+     * Disable security
+     *
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function disableSecurity()
+    {
+        $this->security_policy = null;
+        return $this;
+    }
+
+    /**
+     * Add template directory(s)
+     *
+     * @param string|array $template_dir directory(s) of template sources
+     * @param string       $key          of the array element to assign the template dir to
+     * @param bool         $isConfig     true for config_dir
+     *
+     * @return Smarty          current Smarty instance for chaining
+     */
+    public function addTemplateDir($template_dir, $key = null, $isConfig = false)
+    {
+        if ($isConfig) {
+            $processed = &$this->_processedConfigDir;
+            $dir = &$this->config_dir;
+            $this->_configDirNormalized = false;
+        } else {
+            $processed = &$this->_processedTemplateDir;
+            $dir = &$this->template_dir;
+            $this->_templateDirNormalized = false;
+        }
+        if (is_array($template_dir)) {
+            foreach ($template_dir as $k => $v) {
+                if (is_int($k)) {
+                    // indexes are not merged but appended
+                    $dir[] = $v;
+                } else {
+                    // string indexes are overridden
+                    $dir[ $k ] = $v;
+                    unset($processed[ $key ]);
+                }
+            }
+        } else {
+            if ($key !== null) {
+                // override directory at specified index
+                $dir[ $key ] = $template_dir;
+                unset($processed[ $key ]);
+            } else {
+                // append new directory
+                $dir[] = $template_dir;
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Get template directories
+     *
+     * @param mixed $index    index of directory to get, null to get all
+     * @param bool  $isConfig true for config_dir
+     *
+     * @return array|string list of template directories, or directory of $index
+     */
+    public function getTemplateDir($index = null, $isConfig = false)
+    {
+        if ($isConfig) {
+            $dir = &$this->config_dir;
+        } else {
+            $dir = &$this->template_dir;
+        }
+        if ($isConfig ? !$this->_configDirNormalized : !$this->_templateDirNormalized) {
+            $this->_normalizeTemplateConfig($isConfig);
+        }
+        if ($index !== null) {
+            return isset($dir[ $index ]) ? $dir[ $index ] : null;
+        }
+        return $dir;
+    }
+
+    /**
+     * Set template directory
+     *
+     * @param string|array $template_dir directory(s) of template sources
+     * @param bool         $isConfig     true for config_dir
+     *
+     * @return \Smarty current Smarty instance for chaining
+     */
+    public function setTemplateDir($template_dir, $isConfig = false)
+    {
+        if ($isConfig) {
+            $this->config_dir = array();
+            $this->_processedConfigDir = array();
+        } else {
+            $this->template_dir = array();
+            $this->_processedTemplateDir = array();
+        }
+        $this->addTemplateDir($template_dir, null, $isConfig);
+        return $this;
+    }
+
+    /**
+     * Add config directory(s)
+     *
+     * @param string|array $config_dir directory(s) of config sources
+     * @param mixed        $key        key of the array element to assign the config dir to
+     *
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function addConfigDir($config_dir, $key = null)
+    {
+        return $this->addTemplateDir($config_dir, $key, true);
+    }
+
+    /**
+     * Get config directory
+     *
+     * @param mixed $index index of directory to get, null to get all
+     *
+     * @return array configuration directory
+     */
+    public function getConfigDir($index = null)
+    {
+        return $this->getTemplateDir($index, true);
+    }
+
+    /**
+     * Set config directory
+     *
+     * @param $config_dir
+     *
+     * @return Smarty       current Smarty instance for chaining
+     */
+    public function setConfigDir($config_dir)
+    {
+        return $this->setTemplateDir($config_dir, true);
+    }
+
+    /**
+     * Adds directory of plugin files
+     *
+     * @param null|array|string $plugins_dir
+     *
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function addPluginsDir($plugins_dir)
+    {
+        if (empty($this->plugins_dir)) {
+            $this->plugins_dir[] = SMARTY_PLUGINS_DIR;
+        }
+        $this->plugins_dir = array_merge($this->plugins_dir, (array)$plugins_dir);
+        $this->_pluginsDirNormalized = false;
+        return $this;
+    }
+
+    /**
+     * Get plugin directories
+     *
+     * @return array list of plugin directories
+     */
+    public function getPluginsDir()
+    {
+        if (empty($this->plugins_dir)) {
+            $this->plugins_dir[] = SMARTY_PLUGINS_DIR;
+            $this->_pluginsDirNormalized = false;
+        }
+        if (!$this->_pluginsDirNormalized) {
+            if (!is_array($this->plugins_dir)) {
+                $this->plugins_dir = (array)$this->plugins_dir;
+            }
+            foreach ($this->plugins_dir as $k => $v) {
+                $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v ?? '', '/\\') . DIRECTORY_SEPARATOR, true);
+            }
+            $this->_cache[ 'plugin_files' ] = array();
+            $this->_pluginsDirNormalized = true;
+        }
+        return $this->plugins_dir;
+    }
+
+    /**
+     * Set plugins directory
+     *
+     * @param string|array $plugins_dir directory(s) of plugins
+     *
+     * @return Smarty       current Smarty instance for chaining
+     */
+    public function setPluginsDir($plugins_dir)
+    {
+        $this->plugins_dir = (array)$plugins_dir;
+        $this->_pluginsDirNormalized = false;
+        return $this;
+    }
+
+    /**
+     * Get compiled directory
+     *
+     * @return string path to compiled templates
+     */
+    public function getCompileDir()
+    {
+        if (!$this->_compileDirNormalized) {
+            $this->_normalizeDir('compile_dir', $this->compile_dir);
+            $this->_compileDirNormalized = true;
+        }
+        return $this->compile_dir;
+    }
+
+    /**
+     *
+     * @param  string $compile_dir directory to store compiled templates in
+     *
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function setCompileDir($compile_dir)
+    {
+        $this->_normalizeDir('compile_dir', $compile_dir);
+        $this->_compileDirNormalized = true;
+        return $this;
+    }
+
+    /**
+     * Get cache directory
+     *
+     * @return string path of cache directory
+     */
+    public function getCacheDir()
+    {
+        if (!$this->_cacheDirNormalized) {
+            $this->_normalizeDir('cache_dir', $this->cache_dir);
+            $this->_cacheDirNormalized = true;
+        }
+        return $this->cache_dir;
+    }
+
+    /**
+     * Set cache directory
+     *
+     * @param string $cache_dir directory to store cached templates in
+     *
+     * @return Smarty current Smarty instance for chaining
+     */
+    public function setCacheDir($cache_dir)
+    {
+        $this->_normalizeDir('cache_dir', $cache_dir);
+        $this->_cacheDirNormalized = true;
+        return $this;
+    }
+
+    /**
+     * creates a template object
+     *
+     * @param string  $template   the resource handle of the template file
+     * @param mixed   $cache_id   cache id to be used with this template
+     * @param mixed   $compile_id compile id to be used with this template
+     * @param object  $parent     next higher level of Smarty variables
+     * @param boolean $do_clone   flag is Smarty object shall be cloned
+     *
+     * @return \Smarty_Internal_Template template object
+     * @throws \SmartyException
+     */
+    public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
+    {
+        if ($cache_id !== null && (is_object($cache_id) || is_array($cache_id))) {
+            $parent = $cache_id;
+            $cache_id = null;
+        }
+        if ($parent !== null && is_array($parent)) {
+            $data = $parent;
+            $parent = null;
+        } else {
+            $data = null;
+        }
+        if (!$this->_templateDirNormalized) {
+            $this->_normalizeTemplateConfig(false);
+        }
+        $_templateId = $this->_getTemplateId($template, $cache_id, $compile_id);
+        $tpl = null;
+        if ($this->caching && isset(Smarty_Internal_Template::$isCacheTplObj[ $_templateId ])) {
+            $tpl = $do_clone ? clone Smarty_Internal_Template::$isCacheTplObj[ $_templateId ] :
+                Smarty_Internal_Template::$isCacheTplObj[ $_templateId ];
+            $tpl->inheritance = null;
+            $tpl->tpl_vars = $tpl->config_vars = array();
+        } elseif (!$do_clone && isset(Smarty_Internal_Template::$tplObjCache[ $_templateId ])) {
+            $tpl = clone Smarty_Internal_Template::$tplObjCache[ $_templateId ];
+            $tpl->inheritance = null;
+            $tpl->tpl_vars = $tpl->config_vars = array();
+        } else {
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $this->template_class($template, $this, null, $cache_id, $compile_id, null, null);
+            $tpl->templateId = $_templateId;
+        }
+        if ($do_clone) {
+            $tpl->smarty = clone $tpl->smarty;
+        }
+        $tpl->parent = $parent ? $parent : $this;
+        // fill data if present
+        if (!empty($data) && is_array($data)) {
+            // set up variable values
+            foreach ($data as $_key => $_val) {
+                $tpl->tpl_vars[ $_key ] = new Smarty_Variable($_val);
+            }
+        }
+        if ($this->debugging || $this->debugging_ctrl === 'URL') {
+            $tpl->smarty->_debug = new Smarty_Internal_Debug();
+            // check URL debugging control
+            if (!$this->debugging && $this->debugging_ctrl === 'URL') {
+                $tpl->smarty->_debug->debugUrl($tpl->smarty);
+            }
+        }
+        return $tpl;
+    }
+
+    /**
+     * Takes unknown classes and loads plugin files for them
+     * class name format: Smarty_PluginType_PluginName
+     * plugin filename format: plugintype.pluginname.php
+     *
+     * @param string $plugin_name class plugin name to load
+     * @param bool   $check       check if already loaded
+     *
+     * @return string |boolean filepath of loaded file or false
+     * @throws \SmartyException
+     */
+    public function loadPlugin($plugin_name, $check = true)
+    {
+        return $this->ext->loadPlugin->loadPlugin($this, $plugin_name, $check);
+    }
+
+    /**
+     * Get unique template id
+     *
+     * @param string                    $template_name
+     * @param null|mixed                $cache_id
+     * @param null|mixed                $compile_id
+     * @param null                      $caching
+     * @param \Smarty_Internal_Template $template
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function _getTemplateId(
+        $template_name,
+        $cache_id = null,
+        $compile_id = null,
+        $caching = null,
+        Smarty_Internal_Template $template = null
+    ) {
+        $template_name = (strpos($template_name, ':') === false) ? "{$this->default_resource_type}:{$template_name}" :
+            $template_name;
+        $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
+        $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
+        $caching = (int)($caching === null ? $this->caching : $caching);
+        if ((isset($template) && strpos($template_name, ':.') !== false) || $this->allow_ambiguous_resources) {
+            $_templateId =
+                Smarty_Resource::getUniqueTemplateName((isset($template) ? $template : $this), $template_name) .
+                "#{$cache_id}#{$compile_id}#{$caching}";
+        } else {
+            $_templateId = $this->_joined_template_dir . "#{$template_name}#{$cache_id}#{$compile_id}#{$caching}";
+        }
+        if (isset($_templateId[ 150 ])) {
+            $_templateId = sha1($_templateId);
+        }
+        return $_templateId;
+    }
+
+    /**
+     * Normalize path
+     *  - remove /./ and /../
+     *  - make it absolute if required
+     *
+     * @param string $path     file path
+     * @param bool   $realpath if true - convert to absolute
+     *                         false - convert to relative
+     *                         null - keep as it is but
+     *                         remove /./ /../
+     *
+     * @return string
+     */
+    public function _realpath($path, $realpath = null)
+    {
+        $nds = array('/' => '\\', '\\' => '/');
+        preg_match(
+            '%^(?<root>(?:[[:alpha:]]:[\\\\/]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?<path>(.*))$%u',
+            $path,
+            $parts
+        );
+        $path = $parts[ 'path' ];
+        if ($parts[ 'root' ] === '\\') {
+            $parts[ 'root' ] = substr(getcwd(), 0, 2) . $parts[ 'root' ];
+        } else {
+            if ($realpath !== null && !$parts[ 'root' ]) {
+                $path = getcwd() . DIRECTORY_SEPARATOR . $path;
+            }
+        }
+        // normalize DIRECTORY_SEPARATOR
+        $path = str_replace($nds[ DIRECTORY_SEPARATOR ], DIRECTORY_SEPARATOR, $path);
+        $parts[ 'root' ] = str_replace($nds[ DIRECTORY_SEPARATOR ], DIRECTORY_SEPARATOR, $parts[ 'root' ]);
+        do {
+            $path = preg_replace(
+                array('#[\\\\/]{2}#', '#[\\\\/][.][\\\\/]#', '#[\\\\/]([^\\\\/.]+)[\\\\/][.][.][\\\\/]#'),
+                DIRECTORY_SEPARATOR,
+                $path,
+                -1,
+                $count
+            );
+        } while ($count > 0);
+        return $realpath !== false ? $parts[ 'root' ] . $path : str_ireplace(getcwd(), '.', $parts[ 'root' ] . $path);
+    }
+
+    /**
+     * Empty template objects cache
+     */
+    public function _clearTemplateCache()
+    {
+        Smarty_Internal_Template::$isCacheTplObj = array();
+        Smarty_Internal_Template::$tplObjCache = array();
+    }
+
+    /**
+     * @param boolean $use_sub_dirs
+     */
+    public function setUseSubDirs($use_sub_dirs)
+    {
+        $this->use_sub_dirs = $use_sub_dirs;
+    }
+
+    /**
+     * @param int $error_reporting
+     */
+    public function setErrorReporting($error_reporting)
+    {
+        $this->error_reporting = $error_reporting;
+    }
+
+    /**
+     * @param boolean $escape_html
+     */
+    public function setEscapeHtml($escape_html)
+    {
+        $this->escape_html = $escape_html;
+    }
+
+    /**
+     * Return auto_literal flag
+     *
+     * @return boolean
+     */
+    public function getAutoLiteral()
+    {
+        return $this->auto_literal;
+    }
+
+    /**
+     * Set auto_literal flag
+     *
+     * @param boolean $auto_literal
+     */
+    public function setAutoLiteral($auto_literal = true)
+    {
+        $this->auto_literal = $auto_literal;
+    }
+
+    /**
+     * @param boolean $force_compile
+     */
+    public function setForceCompile($force_compile)
+    {
+        $this->force_compile = $force_compile;
+    }
+
+    /**
+     * @param boolean $merge_compiled_includes
+     */
+    public function setMergeCompiledIncludes($merge_compiled_includes)
+    {
+        $this->merge_compiled_includes = $merge_compiled_includes;
+    }
+
+    /**
+     * Get left delimiter
+     *
+     * @return string
+     */
+    public function getLeftDelimiter()
+    {
+        return $this->left_delimiter;
+    }
+
+    /**
+     * Set left delimiter
+     *
+     * @param string $left_delimiter
+     */
+    public function setLeftDelimiter($left_delimiter)
+    {
+        $this->left_delimiter = $left_delimiter;
+    }
+
+    /**
+     * Get right delimiter
+     *
+     * @return string $right_delimiter
+     */
+    public function getRightDelimiter()
+    {
+        return $this->right_delimiter;
+    }
+
+    /**
+     * Set right delimiter
+     *
+     * @param string
+     */
+    public function setRightDelimiter($right_delimiter)
+    {
+        $this->right_delimiter = $right_delimiter;
+    }
+
+    /**
+     * @param boolean $debugging
+     */
+    public function setDebugging($debugging)
+    {
+        $this->debugging = $debugging;
+    }
+
+    /**
+     * @param boolean $config_overwrite
+     */
+    public function setConfigOverwrite($config_overwrite)
+    {
+        $this->config_overwrite = $config_overwrite;
+    }
+
+    /**
+     * @param boolean $config_booleanize
+     */
+    public function setConfigBooleanize($config_booleanize)
+    {
+        $this->config_booleanize = $config_booleanize;
+    }
+
+    /**
+     * @param boolean $config_read_hidden
+     */
+    public function setConfigReadHidden($config_read_hidden)
+    {
+        $this->config_read_hidden = $config_read_hidden;
+    }
+
+    /**
+     * @param boolean $compile_locking
+     */
+    public function setCompileLocking($compile_locking)
+    {
+        $this->compile_locking = $compile_locking;
+    }
+
+    /**
+     * @param string $default_resource_type
+     */
+    public function setDefaultResourceType($default_resource_type)
+    {
+        $this->default_resource_type = $default_resource_type;
+    }
+
+    /**
+     * @param string $caching_type
+     */
+    public function setCachingType($caching_type)
+    {
+        $this->caching_type = $caching_type;
+    }
+
+    /**
+     * Test install
+     *
+     * @param null $errors
+     */
+    public function testInstall(&$errors = null)
+    {
+        Smarty_Internal_TestInstall::testInstall($this, $errors);
+    }
+
+    /**
+     * Get Smarty object
+     *
+     * @return Smarty
+     */
+    public function _getSmartyObj()
+    {
+        return $this;
+    }
+
+    /**
+     * <<magic>> Generic getter.
+     * Calls the appropriate getter function.
+     * Issues an E_USER_NOTICE if no valid getter is found.
+     *
+     * @param string $name property name
+     *
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        if (isset($this->accessMap[ $name ])) {
+            $method = 'get' . $this->accessMap[ $name ];
+            return $this->{$method}();
+        } elseif (isset($this->_cache[ $name ])) {
+            return $this->_cache[ $name ];
+        } elseif (in_array($name, $this->obsoleteProperties)) {
+            return null;
+        } else {
+            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+        }
+        return null;
+    }
+
+    /**
+     * <<magic>> Generic setter.
+     * Calls the appropriate setter function.
+     * Issues an E_USER_NOTICE if no valid setter is found.
+     *
+     * @param string $name  property name
+     * @param mixed  $value parameter passed to setter
+     *
+     */
+    public function __set($name, $value)
+    {
+        if (isset($this->accessMap[ $name ])) {
+            $method = 'set' . $this->accessMap[ $name ];
+            $this->{$method}($value);
+        } elseif (in_array($name, $this->obsoleteProperties)) {
+            return;
+        } elseif (is_object($value) && method_exists($value, $name)) {
+            $this->$name = $value;
+        } else {
+            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
+        }
+    }
+
+    /**
+     * Normalize and set directory string
+     *
+     * @param string $dirName cache_dir or compile_dir
+     * @param string $dir     filepath of folder
+     */
+    private function _normalizeDir($dirName, $dir)
+    {
+        $this->{$dirName} = $this->_realpath(rtrim($dir ?? '', "/\\") . DIRECTORY_SEPARATOR, true);
+    }
+
+    /**
+     * Normalize template_dir or config_dir
+     *
+     * @param bool $isConfig true for config_dir
+     */
+    private function _normalizeTemplateConfig($isConfig)
+    {
+        if ($isConfig) {
+            $processed = &$this->_processedConfigDir;
+            $dir = &$this->config_dir;
+        } else {
+            $processed = &$this->_processedTemplateDir;
+            $dir = &$this->template_dir;
+        }
+        if (!is_array($dir)) {
+            $dir = (array)$dir;
+        }
+        foreach ($dir as $k => $v) {
+            if (!isset($processed[ $k ])) {
+                $dir[ $k ] = $v = $this->_realpath(rtrim($v ?? '', "/\\") . DIRECTORY_SEPARATOR, true);
+                $processed[ $k ] = true;
+            }
+        }
+        $isConfig ? $this->_configDirNormalized = true : $this->_templateDirNormalized = true;
+        $isConfig ? $this->_joined_config_dir = join('#', $this->config_dir) :
+            $this->_joined_template_dir = join('#', $this->template_dir);
+    }
+
+    /**
+     * Mutes errors for "undefined index", "undefined array key" and "trying to read property of null".
+     *
+     * @void
+     */
+    public function muteUndefinedOrNullWarnings(): void {
+        $this->isMutingUndefinedOrNullWarnings = true;
+    }
+
+    /**
+     * Indicates if Smarty will mute errors for "undefined index", "undefined array key" and "trying to read property of null".
+     * @bool
+     */
+    public function isMutingUndefinedOrNullWarnings(): bool {
+        return $this->isMutingUndefinedOrNullWarnings;
+    }
+
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/bootstrap.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/bootstrap.php
new file mode 100644
index 000000000..a226ac04e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/bootstrap.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * This file is part of the Smarty package.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+/**
+ * Load and register Smarty Autoloader
+ */
+if (!class_exists('Smarty_Autoloader')) {
+    include __DIR__ . '/Autoloader.php';
+}
+Smarty_Autoloader::register(true);
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/debug.tpl b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/debug.tpl
new file mode 100644
index 000000000..cd9325668
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/debug.tpl
@@ -0,0 +1,173 @@
+{capture name='_smarty_debug' assign=debug_output}
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <title>Smarty Debug Console</title>
+        <style>
+            {literal}
+            body, h1, h2, h3, td, th, p {
+                font-family: sans-serif;
+                font-weight: normal;
+                font-size: 0.9em;
+                margin: 1px;
+                padding: 0;
+            }
+
+            h1 {
+                margin: 0;
+                text-align: left;
+                padding: 2px;
+                background-color: #f0c040;
+                color: black;
+                font-weight: bold;
+                font-size: 1.2em;
+            }
+
+            h2 {
+                background-color: #9B410E;
+                color: white;
+                text-align: left;
+                font-weight: bold;
+                padding: 2px;
+                border-top: 1px solid black;
+            }
+
+            h3 {
+                text-align: left;
+                font-weight: bold;
+                color: black;
+                font-size: 0.7em;
+                padding: 2px;
+            }
+
+            body {
+                background: black;
+            }
+
+            p, table, div {
+                background: #f0ead8;
+            }
+
+            p {
+                margin: 0;
+                font-style: italic;
+                text-align: center;
+            }
+
+            table {
+                width: 100%;
+            }
+
+            th, td {
+                font-family: monospace;
+                vertical-align: top;
+                text-align: left;
+            }
+
+            td {
+                color: green;
+            }
+
+            tr:nth-child(odd) {
+                background-color: #eeeeee;
+            }
+
+            tr:nth-child(even) {
+                background-color: #fafafa;
+            }
+
+            .exectime {
+                font-size: 0.8em;
+                font-style: italic;
+            }
+
+            #bold div {
+                color: black;
+                font-weight: bold;
+            }
+
+            #blue h3 {
+                color: blue;
+            }
+
+            #normal div {
+                color: black;
+                font-weight: normal;
+            }
+
+            #table_assigned_vars th {
+                color: blue;
+                font-weight: bold;
+            }
+
+            #table_config_vars th {
+                color: maroon;
+            }
+            {/literal}
+        </style>
+    </head>
+    <body>
+
+    <h1>Smarty {Smarty::SMARTY_VERSION} Debug Console
+        -  {if isset($template_name)}{$template_name|debug_print_var nofilter} {/if}{if !empty($template_data)}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
+
+    {if !empty($template_data)}
+        <h2>included templates &amp; config files (load time in seconds)</h2>
+        <div>
+            {foreach $template_data as $template}
+                <span style="color: brown;">{$template.name}</span>
+                <br>&nbsp;&nbsp;<span class="exectime">
+                (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
+                 </span>
+                <br>
+            {/foreach}
+        </div>
+    {/if}
+
+    <h2>assigned template variables</h2>
+
+    <table id="table_assigned_vars">
+        {foreach $assigned_vars as $vars}
+            <tr>
+                <td>
+                    <h3 style="color: blue;">${$vars@key}</h3>
+                    {if isset($vars['nocache'])}<strong>Nocache</strong><br>{/if}
+                    {if isset($vars['scope'])}<strong>Origin:</strong> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td>
+                    <h3>Value</h3>
+                    {$vars['value']|debug_print_var:10:80 nofilter}
+                </td>
+                <td>
+                    {if isset($vars['attributes'])}
+                        <h3>Attributes</h3>
+                        {$vars['attributes']|debug_print_var nofilter}
+                    {/if}
+                </td>
+         {/foreach}
+    </table>
+
+    <h2>assigned config file variables</h2>
+
+    <table id="table_config_vars">
+        {foreach $config_vars as $vars}
+            <tr>
+                <td>
+                    <h3 style="color: blue;">#{$vars@key}#</h3>
+                    {if isset($vars['scope'])}<strong>Origin:</strong> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td>
+                    {$vars['value']|debug_print_var:10:80 nofilter}
+                </td>
+            </tr>
+        {/foreach}
+
+    </table>
+    </body>
+    </html>
+{/capture}
+<script type="text/javascript">
+    _smarty_console = window.open("", "console{$targetWindow}", "width=1024,height=600,left={$offset},top={$offset},resizable,scrollbars=yes");
+    _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
+    _smarty_console.document.close();
+</script>
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/functions.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/functions.php
new file mode 100644
index 000000000..bac00e521
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/functions.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * This file is part of the Smarty package.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+/**
+ * Registers some helper/polyfill functions.
+ */
+
+const SMARTY_HELPER_FUNCTIONS_LOADED = true;
+
+/**
+ * Converts the first characters in $string to uppercase (A-Z) if it is an ASCII lowercase character (a-z).
+ *
+ * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
+ *
+ * @param $string
+ *
+ * @return string
+ */
+function smarty_ucfirst_ascii($string): string {
+    return smarty_strtoupper_ascii(substr($string, 0, 1)) . substr($string, 1);
+}
+
+/**
+ * Converts all uppercase ASCII characters (A-Z) in $string to lowercase (a-z).
+ *
+ * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
+ *
+ * @param $string
+ *
+ * @return string
+ */
+function smarty_strtolower_ascii($string): string {
+    return strtr($string, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
+}
+
+/**
+ * Converts all lowercase ASCII characters (a-z) in $string to uppercase (A-Z).
+ *
+ * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
+ *
+ * @param $string
+ *
+ * @return string
+ */
+function smarty_strtoupper_ascii($string): string {
+    return strtr($string, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/block.textformat.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/block.textformat.php
new file mode 100644
index 000000000..fed090e4d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/block.textformat.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Smarty plugin to format text blocks
+ *
+ * @package    Smarty
+ * @subpackage PluginsBlock
+ */
+/**
+ * Smarty {textformat}{/textformat} block plugin
+ * Type:     block function
+ * Name:     textformat
+ * Purpose:  format text a certain way with preset styles
+ *           or custom wrap/indent settings
+ * Params:
+ *
+ * - style         - string (email)
+ * - indent        - integer (0)
+ * - wrap          - integer (80)
+ * - wrap_char     - string ("\n")
+ * - indent_char   - string (" ")
+ * - wrap_boundary - boolean (true)
+ *
+ * @link   https://www.smarty.net/manual/en/language.function.textformat.php {textformat}
+ *         (Smarty online manual)
+ *
+ * @param array                    $params   parameters
+ * @param string                   $content  contents of the block
+ * @param Smarty_Internal_Template $template template object
+ * @param boolean                  &$repeat  repeat flag
+ *
+ * @return string content re-formatted
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @throws \SmartyException
+ */
+function smarty_block_textformat($params, $content, Smarty_Internal_Template $template, &$repeat)
+{
+    if (is_null($content)) {
+        return;
+    }
+    if (Smarty::$_MBSTRING) {
+        $template->_checkPlugins(
+            array(
+                array(
+                    'function' => 'smarty_modifier_mb_wordwrap',
+                    'file'     => SMARTY_PLUGINS_DIR . 'modifier.mb_wordwrap.php'
+                )
+            )
+        );
+    }
+    $style = null;
+    $indent = 0;
+    $indent_first = 0;
+    $indent_char = ' ';
+    $wrap = 80;
+    $wrap_char = "\n";
+    $wrap_cut = false;
+    $assign = null;
+    foreach ($params as $_key => $_val) {
+        switch ($_key) {
+            case 'style':
+            case 'indent_char':
+            case 'wrap_char':
+            case 'assign':
+                $$_key = (string)$_val;
+                break;
+            case 'indent':
+            case 'indent_first':
+            case 'wrap':
+                $$_key = (int)$_val;
+                break;
+            case 'wrap_cut':
+                $$_key = (bool)$_val;
+                break;
+            default:
+                trigger_error("textformat: unknown attribute '{$_key}'");
+        }
+    }
+    if ($style === 'email') {
+        $wrap = 72;
+    }
+    // split into paragraphs
+    $_paragraphs = preg_split('![\r\n]{2}!', $content);
+    foreach ($_paragraphs as &$_paragraph) {
+        if (!$_paragraph) {
+            continue;
+        }
+        // convert mult. spaces & special chars to single space
+        $_paragraph =
+            preg_replace(
+                array(
+                    '!\s+!' . Smarty::$_UTF8_MODIFIER,
+                    '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER
+                ),
+                array(
+                    ' ',
+                    ''
+                ),
+                $_paragraph
+            );
+        // indent first line
+        if ($indent_first > 0) {
+            $_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph;
+        }
+        // wordwrap sentences
+        if (Smarty::$_MBSTRING) {
+            $_paragraph = smarty_modifier_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
+        } else {
+            $_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
+        }
+        // indent lines
+        if ($indent > 0) {
+            $_paragraph = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraph);
+        }
+    }
+    $_output = implode($wrap_char . $wrap_char, $_paragraphs);
+    if ($assign) {
+        $template->assign($assign, $_output);
+    } else {
+        return $_output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.counter.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.counter.php
new file mode 100644
index 000000000..54795459c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.counter.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsFunction
+ */
+/**
+ * Smarty {counter} function plugin
+ * Type:     function
+ * Name:     counter
+ * Purpose:  print out a counter value
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @link   https://www.smarty.net/manual/en/language.function.counter.php {counter}
+ *         (Smarty online manual)
+ *
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @return string|null
+ */
+function smarty_function_counter($params, $template)
+{
+    static $counters = array();
+    $name = (isset($params[ 'name' ])) ? $params[ 'name' ] : 'default';
+    if (!isset($counters[ $name ])) {
+        $counters[ $name ] = array('start' => 1, 'skip' => 1, 'direction' => 'up', 'count' => 1);
+    }
+    $counter =& $counters[ $name ];
+    if (isset($params[ 'start' ])) {
+        $counter[ 'start' ] = $counter[ 'count' ] = (int)$params[ 'start' ];
+    }
+    if (!empty($params[ 'assign' ])) {
+        $counter[ 'assign' ] = $params[ 'assign' ];
+    }
+    if (isset($counter[ 'assign' ])) {
+        $template->assign($counter[ 'assign' ], $counter[ 'count' ]);
+    }
+    if (isset($params[ 'print' ])) {
+        $print = (bool)$params[ 'print' ];
+    } else {
+        $print = empty($counter[ 'assign' ]);
+    }
+    if ($print) {
+        $retval = $counter[ 'count' ];
+    } else {
+        $retval = null;
+    }
+    if (isset($params[ 'skip' ])) {
+        $counter[ 'skip' ] = $params[ 'skip' ];
+    }
+    if (isset($params[ 'direction' ])) {
+        $counter[ 'direction' ] = $params[ 'direction' ];
+    }
+    if ($counter[ 'direction' ] === 'down') {
+        $counter[ 'count' ] -= $counter[ 'skip' ];
+    } else {
+        $counter[ 'count' ] += $counter[ 'skip' ];
+    }
+    return $retval;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.cycle.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.cycle.php
new file mode 100644
index 000000000..793569991
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.cycle.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsFunction
+ */
+/**
+ * Smarty {cycle} function plugin
+ * Type:     function
+ * Name:     cycle
+ * Date:     May 3, 2002
+ * Purpose:  cycle through given values
+ * Params:
+ *
+ * - name      - name of cycle (optional)
+ * - values    - comma separated list of values to cycle, or an array of values to cycle
+ *               (this can be left out for subsequent calls)
+ * - reset     - boolean - resets given var to true
+ * - print     - boolean - print var or not. default is true
+ * - advance   - boolean - whether or not to advance the cycle
+ * - delimiter - the value delimiter, default is ","
+ * - assign    - boolean, assigns to template var instead of printed.
+ *
+ * Examples:
+ *
+ * {cycle values="#eeeeee,#d0d0d0d"}
+ * {cycle name=row values="one,two,three" reset=true}
+ * {cycle name=row}
+ *
+ * @link    https://www.smarty.net/manual/en/language.function.cycle.php {cycle}
+ *           (Smarty online manual)
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credit to Mark Priatel <mpriatel@rogers.com>
+ * @author  credit to Gerard <gerard@interfold.com>
+ * @author  credit to Jason Sweat <jsweat_php@yahoo.com>
+ * @version 1.3
+ *
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @return string|null
+ */
+function smarty_function_cycle($params, $template)
+{
+    static $cycle_vars;
+    $name = (empty($params[ 'name' ])) ? 'default' : $params[ 'name' ];
+    $print = (isset($params[ 'print' ])) ? (bool)$params[ 'print' ] : true;
+    $advance = (isset($params[ 'advance' ])) ? (bool)$params[ 'advance' ] : true;
+    $reset = (isset($params[ 'reset' ])) ? (bool)$params[ 'reset' ] : false;
+    if (!isset($params[ 'values' ])) {
+        if (!isset($cycle_vars[ $name ][ 'values' ])) {
+            trigger_error('cycle: missing \'values\' parameter');
+            return;
+        }
+    } else {
+        if (isset($cycle_vars[ $name ][ 'values' ]) && $cycle_vars[ $name ][ 'values' ] !== $params[ 'values' ]) {
+            $cycle_vars[ $name ][ 'index' ] = 0;
+        }
+        $cycle_vars[ $name ][ 'values' ] = $params[ 'values' ];
+    }
+    if (isset($params[ 'delimiter' ])) {
+        $cycle_vars[ $name ][ 'delimiter' ] = $params[ 'delimiter' ];
+    } elseif (!isset($cycle_vars[ $name ][ 'delimiter' ])) {
+        $cycle_vars[ $name ][ 'delimiter' ] = ',';
+    }
+    if (is_array($cycle_vars[ $name ][ 'values' ])) {
+        $cycle_array = $cycle_vars[ $name ][ 'values' ];
+    } else {
+        $cycle_array = explode($cycle_vars[ $name ][ 'delimiter' ], $cycle_vars[ $name ][ 'values' ]);
+    }
+    if (!isset($cycle_vars[ $name ][ 'index' ]) || $reset) {
+        $cycle_vars[ $name ][ 'index' ] = 0;
+    }
+    if (isset($params[ 'assign' ])) {
+        $print = false;
+        $template->assign($params[ 'assign' ], $cycle_array[ $cycle_vars[ $name ][ 'index' ] ]);
+    }
+    if ($print) {
+        $retval = $cycle_array[ $cycle_vars[ $name ][ 'index' ] ];
+    } else {
+        $retval = null;
+    }
+    if ($advance) {
+        if ($cycle_vars[ $name ][ 'index' ] >= count($cycle_array) - 1) {
+            $cycle_vars[ $name ][ 'index' ] = 0;
+        } else {
+            $cycle_vars[ $name ][ 'index' ]++;
+        }
+    }
+    return $retval;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.fetch.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.fetch.php
new file mode 100644
index 000000000..4a3e88196
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.fetch.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsFunction
+ */
+/**
+ * Smarty {fetch} plugin
+ * Type:     function
+ * Name:     fetch
+ * Purpose:  fetch file, web or ftp data and display results
+ *
+ * @link   https://www.smarty.net/manual/en/language.function.fetch.php {fetch}
+ *         (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @throws SmartyException
+ * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable
+ */
+function smarty_function_fetch($params, $template)
+{
+    if (empty($params[ 'file' ])) {
+        trigger_error('[plugin] fetch parameter \'file\' cannot be empty', E_USER_NOTICE);
+        return;
+    }
+    // strip file protocol
+    if (stripos($params[ 'file' ], 'file://') === 0) {
+        $params[ 'file' ] = substr($params[ 'file' ], 7);
+    }
+    $protocol = strpos($params[ 'file' ], '://');
+    if ($protocol !== false) {
+        $protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
+    }
+    if (isset($template->smarty->security_policy)) {
+        if ($protocol) {
+            // remote resource (or php stream, …)
+            if (!$template->smarty->security_policy->isTrustedUri($params[ 'file' ])) {
+                return;
+            }
+        } else {
+            // local file
+            if (!$template->smarty->security_policy->isTrustedResourceDir($params[ 'file' ])) {
+                return;
+            }
+        }
+    }
+    $content = '';
+    if ($protocol === 'http') {
+        // http fetch
+        if ($uri_parts = parse_url($params[ 'file' ])) {
+            // set defaults
+            $host = $server_name = $uri_parts[ 'host' ];
+            $timeout = 30;
+            $accept = 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*';
+            $agent = 'Smarty Template Engine ' . Smarty::SMARTY_VERSION;
+            $referer = '';
+            $uri = !empty($uri_parts[ 'path' ]) ? $uri_parts[ 'path' ] : '/';
+            $uri .= !empty($uri_parts[ 'query' ]) ? '?' . $uri_parts[ 'query' ] : '';
+            $_is_proxy = false;
+            if (empty($uri_parts[ 'port' ])) {
+                $port = 80;
+            } else {
+                $port = $uri_parts[ 'port' ];
+            }
+            if (!empty($uri_parts[ 'user' ])) {
+                $user = $uri_parts[ 'user' ];
+            }
+            if (!empty($uri_parts[ 'pass' ])) {
+                $pass = $uri_parts[ 'pass' ];
+            }
+            // loop through parameters, setup headers
+            foreach ($params as $param_key => $param_value) {
+                switch ($param_key) {
+                    case 'file':
+                    case 'assign':
+                    case 'assign_headers':
+                        break;
+                    case 'user':
+                        if (!empty($param_value)) {
+                            $user = $param_value;
+                        }
+                        break;
+                    case 'pass':
+                        if (!empty($param_value)) {
+                            $pass = $param_value;
+                        }
+                        break;
+                    case 'accept':
+                        if (!empty($param_value)) {
+                            $accept = $param_value;
+                        }
+                        break;
+                    case 'header':
+                        if (!empty($param_value)) {
+                            if (!preg_match('![\w\d-]+: .+!', $param_value)) {
+                                trigger_error("[plugin] invalid header format '{$param_value}'", E_USER_NOTICE);
+                                return;
+                            } else {
+                                $extra_headers[] = $param_value;
+                            }
+                        }
+                        break;
+                    case 'proxy_host':
+                        if (!empty($param_value)) {
+                            $proxy_host = $param_value;
+                        }
+                        break;
+                    case 'proxy_port':
+                        if (!preg_match('!\D!', $param_value)) {
+                            $proxy_port = (int)$param_value;
+                        } else {
+                            trigger_error("[plugin] invalid value for attribute '{$param_key }'", E_USER_NOTICE);
+                            return;
+                        }
+                        break;
+                    case 'agent':
+                        if (!empty($param_value)) {
+                            $agent = $param_value;
+                        }
+                        break;
+                    case 'referer':
+                        if (!empty($param_value)) {
+                            $referer = $param_value;
+                        }
+                        break;
+                    case 'timeout':
+                        if (!preg_match('!\D!', $param_value)) {
+                            $timeout = (int)$param_value;
+                        } else {
+                            trigger_error("[plugin] invalid value for attribute '{$param_key}'", E_USER_NOTICE);
+                            return;
+                        }
+                        break;
+                    default:
+                        trigger_error("[plugin] unrecognized attribute '{$param_key}'", E_USER_NOTICE);
+                        return;
+                }
+            }
+            if (!empty($proxy_host) && !empty($proxy_port)) {
+                $_is_proxy = true;
+                $fp = fsockopen($proxy_host, $proxy_port, $errno, $errstr, $timeout);
+            } else {
+                $fp = fsockopen($server_name, $port, $errno, $errstr, $timeout);
+            }
+            if (!$fp) {
+                trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE);
+                return;
+            } else {
+                if ($_is_proxy) {
+                    fputs($fp, 'GET ' . $params[ 'file' ] . " HTTP/1.0\r\n");
+                } else {
+                    fputs($fp, "GET $uri HTTP/1.0\r\n");
+                }
+                if (!empty($host)) {
+                    fputs($fp, "Host: $host\r\n");
+                }
+                if (!empty($accept)) {
+                    fputs($fp, "Accept: $accept\r\n");
+                }
+                if (!empty($agent)) {
+                    fputs($fp, "User-Agent: $agent\r\n");
+                }
+                if (!empty($referer)) {
+                    fputs($fp, "Referer: $referer\r\n");
+                }
+                if (isset($extra_headers) && is_array($extra_headers)) {
+                    foreach ($extra_headers as $curr_header) {
+                        fputs($fp, $curr_header . "\r\n");
+                    }
+                }
+                if (!empty($user) && !empty($pass)) {
+                    fputs($fp, 'Authorization: BASIC ' . base64_encode("$user:$pass") . "\r\n");
+                }
+                fputs($fp, "\r\n");
+                while (!feof($fp)) {
+                    $content .= fgets($fp, 4096);
+                }
+                fclose($fp);
+                $csplit = preg_split("!\r\n\r\n!", $content, 2);
+                $content = $csplit[ 1 ];
+                if (!empty($params[ 'assign_headers' ])) {
+                    $template->assign($params[ 'assign_headers' ], preg_split("!\r\n!", $csplit[ 0 ]));
+                }
+            }
+        } else {
+            trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE);
+            return;
+        }
+    } else {
+        $content = @file_get_contents($params[ 'file' ]);
+        if ($content === false) {
+            throw new SmartyException("{fetch} cannot read resource '" . $params[ 'file' ] . "'");
+        }
+    }
+    if (!empty($params[ 'assign' ])) {
+        $template->assign($params[ 'assign' ], $content);
+    } else {
+        return $content;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_checkboxes.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_checkboxes.php
new file mode 100644
index 000000000..a8e7a07d8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_checkboxes.php
@@ -0,0 +1,286 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsFunction
+ */
+/**
+ * Smarty {html_checkboxes} function plugin
+ * File:       function.html_checkboxes.php
+ * Type:       function
+ * Name:       html_checkboxes
+ * Date:       24.Feb.2003
+ * Purpose:    Prints out a list of checkbox input types
+ * Examples:
+ *
+ * {html_checkboxes values=$ids output=$names}
+ * {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
+ * {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
+ *
+ * Params:
+ *
+ * - name       (optional) - string default "checkbox"
+ * - values     (required) - array
+ * - options    (optional) - associative array
+ * - checked    (optional) - array default not set
+ * - separator  (optional) - ie <br> or &nbsp;
+ * - output     (optional) - the output next to each checkbox
+ * - assign     (optional) - assign the output as an array to this variable
+ * - escape     (optional) - escape the content (not value), defaults to true
+ *
+ * @link    https://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
+ *             (Smarty online manual)
+ * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
+ * @author  credits to Monte Ohrt <monte at ohrt dot com>
+ * @version 1.0
+ *
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @return string
+ * @uses    smarty_function_escape_special_chars()
+ * @throws \SmartyException
+ */
+function smarty_function_html_checkboxes($params, Smarty_Internal_Template $template)
+{
+    $template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_function_escape_special_chars',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+            )
+        )
+    );
+    $name = 'checkbox';
+    $values = null;
+    $options = null;
+    $selected = array();
+    $separator = '';
+    $escape = true;
+    $labels = true;
+    $label_ids = false;
+    $output = null;
+    $extra = '';
+    foreach ($params as $_key => $_val) {
+        switch ($_key) {
+            case 'name':
+            case 'separator':
+                $$_key = (string)$_val;
+                break;
+            case 'escape':
+            case 'labels':
+            case 'label_ids':
+                $$_key = (bool)$_val;
+                break;
+            case 'options':
+                $$_key = (array)$_val;
+                break;
+            case 'values':
+            case 'output':
+                $$_key = array_values((array)$_val);
+                break;
+            case 'checked':
+            case 'selected':
+                if (is_array($_val)) {
+                    $selected = array();
+                    foreach ($_val as $_sel) {
+                        if (is_object($_sel)) {
+                            if (method_exists($_sel, '__toString')) {
+                                $_sel = smarty_function_escape_special_chars((string)$_sel->__toString());
+                            } else {
+                                trigger_error(
+                                    'html_checkboxes: selected attribute contains an object of class \'' .
+                                    get_class($_sel) . '\' without __toString() method',
+                                    E_USER_NOTICE
+                                );
+                                continue;
+                            }
+                        } else {
+                            $_sel = smarty_function_escape_special_chars((string)$_sel);
+                        }
+                        $selected[ $_sel ] = true;
+                    }
+                } elseif (is_object($_val)) {
+                    if (method_exists($_val, '__toString')) {
+                        $selected = smarty_function_escape_special_chars((string)$_val->__toString());
+                    } else {
+                        trigger_error(
+                            'html_checkboxes: selected attribute is an object of class \'' . get_class($_val) .
+                            '\' without __toString() method',
+                            E_USER_NOTICE
+                        );
+                    }
+                } else {
+                    $selected = smarty_function_escape_special_chars((string)$_val);
+                }
+                break;
+            case 'checkboxes':
+                trigger_error(
+                    'html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead',
+                    E_USER_WARNING
+                );
+                $options = (array)$_val;
+                break;
+            case 'assign':
+                break;
+            case 'strict':
+                break;
+            case 'disabled':
+            case 'readonly':
+                if (!empty($params[ 'strict' ])) {
+                    if (!is_scalar($_val)) {
+                        trigger_error(
+                            "html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
+                            E_USER_NOTICE
+                        );
+                    }
+                    if ($_val === true || $_val === $_key) {
+                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+                    }
+                    break;
+                }
+            // omit break; to fall through!
+            // no break
+            default:
+                if (!is_array($_val)) {
+                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+                } else {
+                    trigger_error("html_checkboxes: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+                }
+                break;
+        }
+    }
+    if (!isset($options) && !isset($values)) {
+        return '';
+    } /* raise error here? */
+    $_html_result = array();
+    if (isset($options)) {
+        foreach ($options as $_key => $_val) {
+            $_html_result[] =
+                smarty_function_html_checkboxes_output(
+                    $name,
+                    $_key,
+                    $_val,
+                    $selected,
+                    $extra,
+                    $separator,
+                    $labels,
+                    $label_ids,
+                    $escape
+                );
+        }
+    } else {
+        foreach ($values as $_i => $_key) {
+            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+            $_html_result[] =
+                smarty_function_html_checkboxes_output(
+                    $name,
+                    $_key,
+                    $_val,
+                    $selected,
+                    $extra,
+                    $separator,
+                    $labels,
+                    $label_ids,
+                    $escape
+                );
+        }
+    }
+    if (!empty($params[ 'assign' ])) {
+        $template->assign($params[ 'assign' ], $_html_result);
+    } else {
+        return implode("\n", $_html_result);
+    }
+}
+
+/**
+ * @param      $name
+ * @param      $value
+ * @param      $output
+ * @param      $selected
+ * @param      $extra
+ * @param      $separator
+ * @param      $labels
+ * @param      $label_ids
+ * @param bool $escape
+ *
+ * @return string
+ */
+function smarty_function_html_checkboxes_output(
+    $name,
+    $value,
+    $output,
+    $selected,
+    $extra,
+    $separator,
+    $labels,
+    $label_ids,
+    $escape = true
+) {
+    $_output = '';
+    if (is_object($value)) {
+        if (method_exists($value, '__toString')) {
+            $value = (string)$value->__toString();
+        } else {
+            trigger_error(
+                'html_options: value is an object of class \'' . get_class($value) .
+                '\' without __toString() method',
+                E_USER_NOTICE
+            );
+            return '';
+        }
+    } else {
+        $value = (string)$value;
+    }
+    if (is_object($output)) {
+        if (method_exists($output, '__toString')) {
+            $output = (string)$output->__toString();
+        } else {
+            trigger_error(
+                'html_options: output is an object of class \'' . get_class($output) .
+                '\' without __toString() method',
+                E_USER_NOTICE
+            );
+            return '';
+        }
+    } else {
+        $output = (string)$output;
+    }
+    if ($labels) {
+        if ($label_ids) {
+            $_id = smarty_function_escape_special_chars(
+                preg_replace(
+                    '![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER,
+                    '_',
+                    $name . '_' . $value
+                )
+            );
+            $_output .= '<label for="' . $_id . '">';
+        } else {
+            $_output .= '<label>';
+        }
+    }
+    $name = smarty_function_escape_special_chars($name);
+    $value = smarty_function_escape_special_chars($value);
+    if ($escape) {
+        $output = smarty_function_escape_special_chars($output);
+    }
+    $_output .= '<input type="checkbox" name="' . $name . '[]" value="' . $value . '"';
+    if ($labels && $label_ids) {
+        $_output .= ' id="' . $_id . '"';
+    }
+    if (is_array($selected)) {
+        if (isset($selected[ $value ])) {
+            $_output .= ' checked="checked"';
+        }
+    } elseif ($value === $selected) {
+        $_output .= ' checked="checked"';
+    }
+    $_output .= $extra . ' />' . $output;
+    if ($labels) {
+        $_output .= '</label>';
+    }
+    $_output .= $separator;
+    return $_output;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_image.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_image.php
new file mode 100644
index 000000000..71bc63864
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_image.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsFunction
+ */
+/**
+ * Smarty {html_image} function plugin
+ * Type:     function
+ * Name:     html_image
+ * Date:     Feb 24, 2003
+ * Purpose:  format HTML tags for the image
+ * Examples: {html_image file="/images/masthead.gif"}
+ * Output:   <img src="/images/masthead.gif" width=400 height=23>
+ * Params:
+ *
+ * - file        - (required) - file (and path) of image
+ * - height      - (optional) - image height (default actual height)
+ * - width       - (optional) - image width (default actual width)
+ * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
+ * - path_prefix - prefix for path output (optional, default empty)
+ *
+ * @link    https://www.smarty.net/manual/en/language.function.html.image.php {html_image}
+ *          (Smarty online manual)
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credits to Duda <duda@big.hu>
+ * @version 1.0
+ *
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @throws SmartyException
+ * @return string
+ * @uses    smarty_function_escape_special_chars()
+ */
+function smarty_function_html_image($params, Smarty_Internal_Template $template)
+{
+    $template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_function_escape_special_chars',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+            )
+        )
+    );
+    $alt = '';
+    $file = '';
+    $height = '';
+    $width = '';
+    $extra = '';
+    $prefix = '';
+    $suffix = '';
+    $path_prefix = '';
+    $basedir = isset($_SERVER[ 'DOCUMENT_ROOT' ]) ? $_SERVER[ 'DOCUMENT_ROOT' ] : '';
+    foreach ($params as $_key => $_val) {
+        switch ($_key) {
+            case 'file':
+            case 'height':
+            case 'width':
+            case 'dpi':
+            case 'path_prefix':
+            case 'basedir':
+                $$_key = $_val;
+                break;
+            case 'alt':
+                if (!is_array($_val)) {
+                    $$_key = smarty_function_escape_special_chars($_val);
+                } else {
+                    throw new SmartyException(
+                        "html_image: extra attribute '{$_key}' cannot be an array",
+                        E_USER_NOTICE
+                    );
+                }
+                break;
+            case 'link':
+            case 'href':
+                $prefix = '<a href="' . $_val . '">';
+                $suffix = '</a>';
+                break;
+            default:
+                if (!is_array($_val)) {
+                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+                } else {
+                    throw new SmartyException(
+                        "html_image: extra attribute '{$_key}' cannot be an array",
+                        E_USER_NOTICE
+                    );
+                }
+                break;
+        }
+    }
+    if (empty($file)) {
+        trigger_error('html_image: missing \'file\' parameter', E_USER_NOTICE);
+        return;
+    }
+    if ($file[ 0 ] === '/') {
+        $_image_path = $basedir . $file;
+    } else {
+        $_image_path = $file;
+    }
+    // strip file protocol
+    if (stripos($params[ 'file' ], 'file://') === 0) {
+        $params[ 'file' ] = substr($params[ 'file' ], 7);
+    }
+    $protocol = strpos($params[ 'file' ], '://');
+    if ($protocol !== false) {
+        $protocol = strtolower(substr($params[ 'file' ], 0, $protocol));
+    }
+    if (isset($template->smarty->security_policy)) {
+        if ($protocol) {
+            // remote resource (or php stream, …)
+            if (!$template->smarty->security_policy->isTrustedUri($params[ 'file' ])) {
+                return;
+            }
+        } else {
+            // local file
+            if (!$template->smarty->security_policy->isTrustedResourceDir($_image_path)) {
+                return;
+            }
+        }
+    }
+    if (!isset($params[ 'width' ]) || !isset($params[ 'height' ])) {
+        // FIXME: (rodneyrehm) getimagesize() loads the complete file off a remote resource, use custom [jpg,png,gif]header reader!
+        if (!$_image_data = @getimagesize($_image_path)) {
+            if (!file_exists($_image_path)) {
+                trigger_error("html_image: unable to find '{$_image_path}'", E_USER_NOTICE);
+                return;
+            } elseif (!is_readable($_image_path)) {
+                trigger_error("html_image: unable to read '{$_image_path}'", E_USER_NOTICE);
+                return;
+            } else {
+                trigger_error("html_image: '{$_image_path}' is not a valid image file", E_USER_NOTICE);
+                return;
+            }
+        }
+        if (!isset($params[ 'width' ])) {
+            $width = $_image_data[ 0 ];
+        }
+        if (!isset($params[ 'height' ])) {
+            $height = $_image_data[ 1 ];
+        }
+    }
+    if (isset($params[ 'dpi' ])) {
+        if (strstr($_SERVER[ 'HTTP_USER_AGENT' ], 'Mac')) {
+            // FIXME: (rodneyrehm) wrong dpi assumption
+            // don't know who thought this up… even if it was true in 1998, it's definitely wrong in 2011.
+            $dpi_default = 72;
+        } else {
+            $dpi_default = 96;
+        }
+        $_resize = $dpi_default / $params[ 'dpi' ];
+        $width = round($width * $_resize);
+        $height = round($height * $_resize);
+    }
+    return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' .
+           $height . '"' . $extra . ' />' . $suffix;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_options.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_options.php
new file mode 100644
index 000000000..3e4335340
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_options.php
@@ -0,0 +1,230 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsFunction
+ */
+/**
+ * Smarty {html_options} function plugin
+ * Type:     function
+ * Name:     html_options
+ * Purpose:  Prints the list of <option> tags generated from
+ *           the passed parameters
+ * Params:
+ *
+ * - name       (optional) - string default "select"
+ * - values     (required) - if no options supplied) - array
+ * - options    (required) - if no values supplied) - associative array
+ * - selected   (optional) - string default not set
+ * - output     (required) - if not options supplied) - array
+ * - id         (optional) - string default not set
+ * - class      (optional) - string default not set
+ *
+ * @link   https://www.smarty.net/manual/en/language.function.html.options.php {html_image}
+ *           (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
+ *
+ * @param array                     $params parameters
+ *
+ * @param \Smarty_Internal_Template $template
+ *
+ * @return string
+ * @uses   smarty_function_escape_special_chars()
+ * @throws \SmartyException
+ */
+function smarty_function_html_options($params, Smarty_Internal_Template $template)
+{
+    $template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_function_escape_special_chars',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+            )
+        )
+    );
+    $name = null;
+    $values = null;
+    $options = null;
+    $selected = null;
+    $output = null;
+    $id = null;
+    $class = null;
+    $extra = '';
+    foreach ($params as $_key => $_val) {
+        switch ($_key) {
+            case 'name':
+            case 'class':
+            case 'id':
+                $$_key = (string)$_val;
+                break;
+            case 'options':
+                $options = (array)$_val;
+                break;
+            case 'values':
+            case 'output':
+                $$_key = array_values((array)$_val);
+                break;
+            case 'selected':
+                if (is_array($_val)) {
+                    $selected = array();
+                    foreach ($_val as $_sel) {
+                        if (is_object($_sel)) {
+                            if (method_exists($_sel, '__toString')) {
+                                $_sel = smarty_function_escape_special_chars((string)$_sel->__toString());
+                            } else {
+                                trigger_error(
+                                    'html_options: selected attribute contains an object of class \'' .
+                                    get_class($_sel) . '\' without __toString() method',
+                                    E_USER_NOTICE
+                                );
+                                continue;
+                            }
+                        } else {
+                            $_sel = smarty_function_escape_special_chars((string)$_sel);
+                        }
+                        $selected[ $_sel ] = true;
+                    }
+                } elseif (is_object($_val)) {
+                    if (method_exists($_val, '__toString')) {
+                        $selected = smarty_function_escape_special_chars((string)$_val->__toString());
+                    } else {
+                        trigger_error(
+                            'html_options: selected attribute is an object of class \'' . get_class($_val) .
+                            '\' without __toString() method',
+                            E_USER_NOTICE
+                        );
+                    }
+                } else {
+                    $selected = smarty_function_escape_special_chars((string)$_val);
+                }
+                break;
+            case 'strict':
+                break;
+            case 'disabled':
+            case 'readonly':
+                if (!empty($params[ 'strict' ])) {
+                    if (!is_scalar($_val)) {
+                        trigger_error(
+                            "html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
+                            E_USER_NOTICE
+                        );
+                    }
+                    if ($_val === true || $_val === $_key) {
+                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+                    }
+                    break;
+                }
+            // omit break; to fall through!
+            // no break
+            default:
+                if (!is_array($_val)) {
+                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+                } else {
+                    trigger_error("html_options: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+                }
+                break;
+        }
+    }
+    if (!isset($options) && !isset($values)) {
+        /* raise error here? */
+        return '';
+    }
+    $_html_result = '';
+    $_idx = 0;
+    if (isset($options)) {
+        foreach ($options as $_key => $_val) {
+            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
+        }
+    } else {
+        foreach ($values as $_i => $_key) {
+            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
+        }
+    }
+    if (!empty($name)) {
+        $_html_class = !empty($class) ? ' class="' . $class . '"' : '';
+        $_html_id = !empty($id) ? ' id="' . $id . '"' : '';
+        $_html_result =
+            '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result .
+            '</select>' . "\n";
+    }
+    return $_html_result;
+}
+
+/**
+ * @param $key
+ * @param $value
+ * @param $selected
+ * @param $id
+ * @param $class
+ * @param $idx
+ *
+ * @return string
+ */
+function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, &$idx)
+{
+    if (!is_array($value)) {
+        $_key = smarty_function_escape_special_chars($key);
+        $_html_result = '<option value="' . $_key . '"';
+        if (is_array($selected)) {
+            if (isset($selected[ $_key ])) {
+                $_html_result .= ' selected="selected"';
+            }
+        } elseif ($_key === $selected) {
+            $_html_result .= ' selected="selected"';
+        }
+        $_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
+        $_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
+        if (is_object($value)) {
+            if (method_exists($value, '__toString')) {
+                $value = smarty_function_escape_special_chars((string)$value->__toString());
+            } else {
+                trigger_error(
+                    'html_options: value is an object of class \'' . get_class($value) .
+                    '\' without __toString() method',
+                    E_USER_NOTICE
+                );
+                return '';
+            }
+        } else {
+            $value = smarty_function_escape_special_chars((string)$value);
+        }
+        $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
+        $idx++;
+    } else {
+        $_idx = 0;
+        $_html_result =
+            smarty_function_html_options_optgroup(
+                $key,
+                $value,
+                $selected,
+                !empty($id) ? ($id . '-' . $idx) : null,
+                $class,
+                $_idx
+            );
+        $idx++;
+    }
+    return $_html_result;
+}
+
+/**
+ * @param $key
+ * @param $values
+ * @param $selected
+ * @param $id
+ * @param $class
+ * @param $idx
+ *
+ * @return string
+ */
+function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
+{
+    $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
+    foreach ($values as $key => $value) {
+        $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
+    }
+    $optgroup_html .= "</optgroup>\n";
+    return $optgroup_html;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_radios.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_radios.php
new file mode 100644
index 000000000..2223ff7ee
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_radios.php
@@ -0,0 +1,266 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsFunction
+ */
+/**
+ * Smarty {html_radios} function plugin
+ * File:       function.html_radios.php
+ * Type:       function
+ * Name:       html_radios
+ * Date:       24.Feb.2003
+ * Purpose:    Prints out a list of radio input types
+ * Params:
+ *
+ * - name       (optional) - string default "radio"
+ * - values     (required) - array
+ * - options    (required) - associative array
+ * - checked    (optional) - array default not set
+ * - separator  (optional) - ie <br> or &nbsp;
+ * - output     (optional) - the output next to each radio button
+ * - assign     (optional) - assign the output as an array to this variable
+ * - escape     (optional) - escape the content (not value), defaults to true
+ *
+ * Examples:
+ *
+ * {html_radios values=$ids output=$names}
+ * {html_radios values=$ids name='box' separator='<br>' output=$names}
+ * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
+ *
+ * @link    https://www.smarty.net/manual/en/language.function.html.radios.php {html_radios}
+ *          (Smarty online manual)
+ * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
+ * @author  credits to Monte Ohrt <monte at ohrt dot com>
+ * @version 1.0
+ *
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @return string
+ * @uses    smarty_function_escape_special_chars()
+ * @throws \SmartyException
+ */
+function smarty_function_html_radios($params, Smarty_Internal_Template $template)
+{
+    $template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_function_escape_special_chars',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+            )
+        )
+    );
+    $name = 'radio';
+    $values = null;
+    $options = null;
+    $selected = null;
+    $separator = '';
+    $escape = true;
+    $labels = true;
+    $label_ids = false;
+    $output = null;
+    $extra = '';
+    foreach ($params as $_key => $_val) {
+        switch ($_key) {
+            case 'name':
+            case 'separator':
+                $$_key = (string)$_val;
+                break;
+            case 'checked':
+            case 'selected':
+                if (is_array($_val)) {
+                    trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
+                } elseif (is_object($_val)) {
+                    if (method_exists($_val, '__toString')) {
+                        $selected = smarty_function_escape_special_chars((string)$_val->__toString());
+                    } else {
+                        trigger_error(
+                            'html_radios: selected attribute is an object of class \'' . get_class($_val) .
+                            '\' without __toString() method',
+                            E_USER_NOTICE
+                        );
+                    }
+                } else {
+                    $selected = (string)$_val;
+                }
+                break;
+            case 'escape':
+            case 'labels':
+            case 'label_ids':
+                $$_key = (bool)$_val;
+                break;
+            case 'options':
+                $$_key = (array)$_val;
+                break;
+            case 'values':
+            case 'output':
+                $$_key = array_values((array)$_val);
+                break;
+            case 'radios':
+                trigger_error(
+                    'html_radios: the use of the "radios" attribute is deprecated, use "options" instead',
+                    E_USER_WARNING
+                );
+                $options = (array)$_val;
+                break;
+            case 'assign':
+                break;
+            case 'strict':
+                break;
+            case 'disabled':
+            case 'readonly':
+                if (!empty($params[ 'strict' ])) {
+                    if (!is_scalar($_val)) {
+                        trigger_error(
+                            "html_options: {$_key} attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
+                            E_USER_NOTICE
+                        );
+                    }
+                    if ($_val === true || $_val === $_key) {
+                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+                    }
+                    break;
+                }
+            // omit break; to fall through!
+            // no break
+            default:
+                if (!is_array($_val)) {
+                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+                } else {
+                    trigger_error("html_radios: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+                }
+                break;
+        }
+    }
+    if (!isset($options) && !isset($values)) {
+        /* raise error here? */
+        return '';
+    }
+    $_html_result = array();
+    if (isset($options)) {
+        foreach ($options as $_key => $_val) {
+            $_html_result[] =
+                smarty_function_html_radios_output(
+                    $name,
+                    $_key,
+                    $_val,
+                    $selected,
+                    $extra,
+                    $separator,
+                    $labels,
+                    $label_ids,
+                    $escape
+                );
+        }
+    } else {
+        foreach ($values as $_i => $_key) {
+            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+            $_html_result[] =
+                smarty_function_html_radios_output(
+                    $name,
+                    $_key,
+                    $_val,
+                    $selected,
+                    $extra,
+                    $separator,
+                    $labels,
+                    $label_ids,
+                    $escape
+                );
+        }
+    }
+    if (!empty($params[ 'assign' ])) {
+        $template->assign($params[ 'assign' ], $_html_result);
+    } else {
+        return implode("\n", $_html_result);
+    }
+}
+
+/**
+ * @param $name
+ * @param $value
+ * @param $output
+ * @param $selected
+ * @param $extra
+ * @param $separator
+ * @param $labels
+ * @param $label_ids
+ * @param $escape
+ *
+ * @return string
+ */
+function smarty_function_html_radios_output(
+    $name,
+    $value,
+    $output,
+    $selected,
+    $extra,
+    $separator,
+    $labels,
+    $label_ids,
+    $escape
+) {
+    $_output = '';
+    if (is_object($value)) {
+        if (method_exists($value, '__toString')) {
+            $value = (string)$value->__toString();
+        } else {
+            trigger_error(
+                'html_options: value is an object of class \'' . get_class($value) .
+                '\' without __toString() method',
+                E_USER_NOTICE
+            );
+            return '';
+        }
+    } else {
+        $value = (string)$value;
+    }
+    if (is_object($output)) {
+        if (method_exists($output, '__toString')) {
+            $output = (string)$output->__toString();
+        } else {
+            trigger_error(
+                'html_options: output is an object of class \'' . get_class($output) .
+                '\' without __toString() method',
+                E_USER_NOTICE
+            );
+            return '';
+        }
+    } else {
+        $output = (string)$output;
+    }
+    if ($labels) {
+        if ($label_ids) {
+            $_id = smarty_function_escape_special_chars(
+                preg_replace(
+                    '![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER,
+                    '_',
+                    $name . '_' . $value
+                )
+            );
+            $_output .= '<label for="' . $_id . '">';
+        } else {
+            $_output .= '<label>';
+        }
+    }
+    $name = smarty_function_escape_special_chars($name);
+    $value = smarty_function_escape_special_chars($value);
+    if ($escape) {
+        $output = smarty_function_escape_special_chars($output);
+    }
+    $_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
+    if ($labels && $label_ids) {
+        $_output .= ' id="' . $_id . '"';
+    }
+    if ($value === $selected) {
+        $_output .= ' checked="checked"';
+    }
+    $_output .= $extra . ' />' . $output;
+    if ($labels) {
+        $_output .= '</label>';
+    }
+    $_output .= $separator;
+    return $_output;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_select_date.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_select_date.php
new file mode 100644
index 000000000..d9c571976
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_select_date.php
@@ -0,0 +1,395 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsFunction
+ */
+/**
+ * Smarty {html_select_date} plugin
+ * Type:     function
+ * Name:     html_select_date
+ * Purpose:  Prints the dropdowns for date selection.
+ * ChangeLog:
+ *
+ *            - 1.0 initial release
+ *            - 1.1 added support for +/- N syntax for begin
+ *              and end year values. (Monte)
+ *            - 1.2 added support for yyyy-mm-dd syntax for
+ *              time value. (Jan Rosier)
+ *            - 1.3 added support for choosing format for
+ *              month values (Gary Loescher)
+ *            - 1.3.1 added support for choosing format for
+ *              day values (Marcus Bointon)
+ *            - 1.3.2 support negative timestamps, force year
+ *              dropdown to include given date unless explicitly set (Monte)
+ *            - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
+ *              of 0000-00-00 dates (cybot, boots)
+ *            - 2.0 complete rewrite for performance,
+ *              added attributes month_names, *_id
+ *
+ * @link    https://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
+ *           (Smarty online manual)
+ * @version 2.0
+ * @author  Andrei Zmievski
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  Rodney Rehm
+ *
+ * @param array                     $params parameters
+ *
+ * @param \Smarty_Internal_Template $template
+ *
+ * @return string
+ * @throws \SmartyException
+ */
+function smarty_function_html_select_date($params, Smarty_Internal_Template $template)
+{
+    $template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_function_escape_special_chars',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+            )
+        )
+    );
+    // generate timestamps used for month names only
+    static $_month_timestamps = null;
+    static $_current_year = null;
+    if ($_month_timestamps === null) {
+        $_current_year = date('Y');
+        $_month_timestamps = array();
+        for ($i = 1; $i <= 12; $i++) {
+            $_month_timestamps[ $i ] = mktime(0, 0, 0, $i, 1, 2000);
+        }
+    }
+    /* Default values. */
+    $prefix = 'Date_';
+    $start_year = null;
+    $end_year = null;
+    $display_days = true;
+    $display_months = true;
+    $display_years = true;
+    $month_format = '%B';
+    /* Write months as numbers by default  GL */
+    $month_value_format = '%m';
+    $day_format = '%02d';
+    /* Write day values using this format MB */
+    $day_value_format = '%d';
+    $year_as_text = false;
+    /* Display years in reverse order? Ie. 2000,1999,.... */
+    $reverse_years = false;
+    /* Should the select boxes be part of an array when returned from PHP?
+       e.g. setting it to "birthday", would create "birthday[Day]",
+       "birthday[Month]" & "birthday[Year]". Can be combined with prefix */
+    $field_array = null;
+    /* <select size>'s of the different <select> tags.
+       If not set, uses default dropdown. */
+    $day_size = null;
+    $month_size = null;
+    $year_size = null;
+    /* Unparsed attributes common to *ALL* the <select>/<input> tags.
+       An example might be in the template: all_extra ='class ="foo"'. */
+    $all_extra = null;
+    /* Separate attributes for the tags. */
+    $day_extra = null;
+    $month_extra = null;
+    $year_extra = null;
+    /* Order in which to display the fields.
+       "D" -> day, "M" -> month, "Y" -> year. */
+    $field_order = 'MDY';
+    /* String printed between the different fields. */
+    $field_separator = "\n";
+    $option_separator = "\n";
+    $time = null;
+
+    // $all_empty = null;
+    // $day_empty = null;
+    // $month_empty = null;
+    // $year_empty = null;
+    $extra_attrs = '';
+    $all_id = null;
+    $day_id = null;
+    $month_id = null;
+    $year_id = null;
+    foreach ($params as $_key => $_value) {
+        switch ($_key) {
+            case 'time':
+                $$_key = $_value; // we'll handle conversion below
+                break;
+            case 'month_names':
+                if (is_array($_value) && count($_value) === 12) {
+                    $$_key = $_value;
+                } else {
+                    trigger_error('html_select_date: month_names must be an array of 12 strings', E_USER_NOTICE);
+                }
+                break;
+            case 'prefix':
+            case 'field_array':
+            case 'start_year':
+            case 'end_year':
+            case 'day_format':
+            case 'day_value_format':
+            case 'month_format':
+            case 'month_value_format':
+            case 'day_size':
+            case 'month_size':
+            case 'year_size':
+            case 'all_extra':
+            case 'day_extra':
+            case 'month_extra':
+            case 'year_extra':
+            case 'field_order':
+            case 'field_separator':
+            case 'option_separator':
+            case 'all_empty':
+            case 'month_empty':
+            case 'day_empty':
+            case 'year_empty':
+            case 'all_id':
+            case 'month_id':
+            case 'day_id':
+            case 'year_id':
+                $$_key = (string)$_value;
+                break;
+            case 'display_days':
+            case 'display_months':
+            case 'display_years':
+            case 'year_as_text':
+            case 'reverse_years':
+                $$_key = (bool)$_value;
+                break;
+            default:
+                if (!is_array($_value)) {
+                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
+                } else {
+                    trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+                }
+                break;
+        }
+    }
+    // Note: date() is faster than strftime()
+    // Note: explode(date()) is faster than date() date() date()
+
+    if (isset($time) && is_array($time)) {
+        if (isset($time[$prefix . 'Year'])) {
+            // $_REQUEST[$field_array] given
+            foreach ([
+                         'Y' => 'Year',
+                         'm' => 'Month',
+                         'd' => 'Day'
+                     ] as $_elementKey => $_elementName) {
+                $_variableName = '_' . strtolower($_elementName);
+                $$_variableName =
+                    isset($time[$prefix . $_elementName]) ? $time[$prefix . $_elementName] :
+                        date($_elementKey);
+            }
+        } elseif (isset($time[$field_array][$prefix . 'Year'])) {
+            // $_REQUEST given
+            foreach ([
+                         'Y' => 'Year',
+                         'm' => 'Month',
+                         'd' => 'Day'
+                     ] as $_elementKey => $_elementName) {
+                $_variableName = '_' . strtolower($_elementName);
+                $$_variableName = isset($time[$field_array][$prefix . $_elementName]) ?
+                    $time[$field_array][$prefix . $_elementName] : date($_elementKey);
+            }
+        } else {
+            // no date found, use NOW
+            [$_year, $_month, $_day] = explode('-', date('Y-m-d'));
+        }
+    } elseif (isset($time) && preg_match("/(\d*)-(\d*)-(\d*)/", $time, $matches)) {
+        $_year = $_month = $_day = null;
+        if ($matches[1] > '') $_year = (int) $matches[1];
+        if ($matches[2] > '') $_month = (int) $matches[2];
+        if ($matches[3] > '') $_day = (int) $matches[3];
+    } elseif ($time === null) {
+        if (array_key_exists('time', $params)) {
+            $_year = $_month = $_day = null;
+        } else {
+            [$_year, $_month, $_day] = explode('-', date('Y-m-d'));
+        }
+    } else {
+        $template->_checkPlugins(
+            array(
+                array(
+                    'function' => 'smarty_make_timestamp',
+                    'file'     => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
+                )
+            )
+        );
+        $time = smarty_make_timestamp($time);
+        [$_year, $_month, $_day] = explode('-', date('Y-m-d', $time));
+    }
+
+    // make syntax "+N" or "-N" work with $start_year and $end_year
+    // Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
+    foreach (array(
+        'start',
+        'end'
+    ) as $key) {
+        $key .= '_year';
+        $t = $$key;
+        if ($t === null) {
+            $$key = (int)$_current_year;
+        } elseif ($t[ 0 ] === '+') {
+            $$key = (int)($_current_year + (int)trim(substr($t, 1)));
+        } elseif ($t[ 0 ] === '-') {
+            $$key = (int)($_current_year - (int)trim(substr($t, 1)));
+        } else {
+            $$key = (int)$$key;
+        }
+    }
+    // flip for ascending or descending
+    if (($start_year > $end_year && !$reverse_years) || ($start_year < $end_year && $reverse_years)) {
+        $t = $end_year;
+        $end_year = $start_year;
+        $start_year = $t;
+    }
+    // generate year <select> or <input>
+    if ($display_years) {
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($year_extra) {
+            $_extra .= ' ' . $year_extra;
+        }
+        if ($year_as_text) {
+            $_html_years =
+                '<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra .
+                $extra_attrs . ' />';
+        } else {
+            $_html_years = '<select name="' . $_name . '"';
+            if ($year_id !== null || $all_id !== null) {
+                $_html_years .= ' id="' . smarty_function_escape_special_chars(
+                        $year_id !== null ?
+                            ($year_id ? $year_id : $_name) :
+                            ($all_id ? ($all_id . $_name) :
+                                $_name)
+                    ) . '"';
+            }
+            if ($year_size) {
+                $_html_years .= ' size="' . $year_size . '"';
+            }
+            $_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
+            if (isset($year_empty) || isset($all_empty)) {
+                $_html_years .= '<option value="">' . (isset($year_empty) ? $year_empty : $all_empty) . '</option>' .
+                                $option_separator;
+            }
+            $op = $start_year > $end_year ? -1 : 1;
+            for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
+                $_html_years .= '<option value="' . $i . '"' . ($_year == $i ? ' selected="selected"' : '') . '>' . $i .
+                                '</option>' . $option_separator;
+            }
+            $_html_years .= '</select>';
+        }
+    }
+    // generate month <select> or <input>
+    if ($display_months) {
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($month_extra) {
+            $_extra .= ' ' . $month_extra;
+        }
+        $_html_months = '<select name="' . $_name . '"';
+        if ($month_id !== null || $all_id !== null) {
+            $_html_months .= ' id="' . smarty_function_escape_special_chars(
+                    $month_id !== null ?
+                        ($month_id ? $month_id : $_name) :
+                        ($all_id ? ($all_id . $_name) :
+                            $_name)
+                ) . '"';
+        }
+        if ($month_size) {
+            $_html_months .= ' size="' . $month_size . '"';
+        }
+        $_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
+        if (isset($month_empty) || isset($all_empty)) {
+            $_html_months .= '<option value="">' . (isset($month_empty) ? $month_empty : $all_empty) . '</option>' .
+                             $option_separator;
+        }
+        for ($i = 1; $i <= 12; $i++) {
+            $_val = sprintf('%02d', $i);
+            $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[ $i ]) :
+                ($month_format === '%m' ? $_val : @strftime($month_format, $_month_timestamps[ $i ]));
+            $_value = $month_value_format === '%m' ? $_val : @strftime($month_value_format, $_month_timestamps[ $i ]);
+            $_html_months .= '<option value="' . $_value . '"' . ($_val == $_month ? ' selected="selected"' : '') .
+                             '>' . $_text . '</option>' . $option_separator;
+        }
+        $_html_months .= '</select>';
+    }
+    // generate day <select> or <input>
+    if ($display_days) {
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($day_extra) {
+            $_extra .= ' ' . $day_extra;
+        }
+        $_html_days = '<select name="' . $_name . '"';
+        if ($day_id !== null || $all_id !== null) {
+            $_html_days .= ' id="' .
+                           smarty_function_escape_special_chars(
+                               $day_id !== null ? ($day_id ? $day_id : $_name) :
+                                   ($all_id ? ($all_id . $_name) : $_name)
+                           ) . '"';
+        }
+        if ($day_size) {
+            $_html_days .= ' size="' . $day_size . '"';
+        }
+        $_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
+        if (isset($day_empty) || isset($all_empty)) {
+            $_html_days .= '<option value="">' . (isset($day_empty) ? $day_empty : $all_empty) . '</option>' .
+                           $option_separator;
+        }
+        for ($i = 1; $i <= 31; $i++) {
+            $_val = sprintf('%02d', $i);
+            $_text = $day_format === '%02d' ? $_val : sprintf($day_format, $i);
+            $_value = $day_value_format === '%02d' ? $_val : sprintf($day_value_format, $i);
+            $_html_days .= '<option value="' . $_value . '"' . ($_val == $_day ? ' selected="selected"' : '') . '>' .
+                           $_text . '</option>' . $option_separator;
+        }
+        $_html_days .= '</select>';
+    }
+    // order the fields for output
+    $_html = '';
+    for ($i = 0; $i <= 2; $i++) {
+        switch ($field_order[ $i ]) {
+            case 'Y':
+            case 'y':
+                if (isset($_html_years)) {
+                    if ($_html) {
+                        $_html .= $field_separator;
+                    }
+                    $_html .= $_html_years;
+                }
+                break;
+            case 'm':
+            case 'M':
+                if (isset($_html_months)) {
+                    if ($_html) {
+                        $_html .= $field_separator;
+                    }
+                    $_html .= $_html_months;
+                }
+                break;
+            case 'd':
+            case 'D':
+                if (isset($_html_days)) {
+                    if ($_html) {
+                        $_html .= $field_separator;
+                    }
+                    $_html .= $_html_days;
+                }
+                break;
+        }
+    }
+    return $_html;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_select_time.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_select_time.php
new file mode 100644
index 000000000..256b56b1c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_select_time.php
@@ -0,0 +1,354 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsFunction
+ */
+/**
+ * Smarty {html_select_time} function plugin
+ * Type:     function
+ * Name:     html_select_time
+ * Purpose:  Prints the dropdowns for time selection
+ *
+ * @link   https://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
+ *           (Smarty online manual)
+ * @author Roberto Berto <roberto@berto.net>
+ * @author Monte Ohrt <monte AT ohrt DOT com>
+ *
+ * @param array                     $params parameters
+ *
+ * @param \Smarty_Internal_Template $template
+ *
+ * @return string
+ * @uses   smarty_make_timestamp()
+ * @throws \SmartyException
+ */
+function smarty_function_html_select_time($params, Smarty_Internal_Template $template)
+{
+    $template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_function_escape_special_chars',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'
+            )
+        )
+    );
+    $prefix = 'Time_';
+    $field_array = null;
+    $field_separator = "\n";
+    $option_separator = "\n";
+    $time = null;
+    $display_hours = true;
+    $display_minutes = true;
+    $display_seconds = true;
+    $display_meridian = true;
+    $hour_format = '%02d';
+    $hour_value_format = '%02d';
+    $minute_format = '%02d';
+    $minute_value_format = '%02d';
+    $second_format = '%02d';
+    $second_value_format = '%02d';
+    $hour_size = null;
+    $minute_size = null;
+    $second_size = null;
+    $meridian_size = null;
+    $all_empty = null;
+    $hour_empty = null;
+    $minute_empty = null;
+    $second_empty = null;
+    $meridian_empty = null;
+    $all_id = null;
+    $hour_id = null;
+    $minute_id = null;
+    $second_id = null;
+    $meridian_id = null;
+    $use_24_hours = true;
+    $minute_interval = 1;
+    $second_interval = 1;
+    $extra_attrs = '';
+    $all_extra = null;
+    $hour_extra = null;
+    $minute_extra = null;
+    $second_extra = null;
+    $meridian_extra = null;
+    foreach ($params as $_key => $_value) {
+        switch ($_key) {
+            case 'time':
+                if (!is_array($_value) && $_value !== null) {
+                    $template->_checkPlugins(
+                        array(
+                            array(
+                                'function' => 'smarty_make_timestamp',
+                                'file'     => SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php'
+                            )
+                        )
+                    );
+                    $time = smarty_make_timestamp($_value);
+                }
+                break;
+            case 'prefix':
+            case 'field_array':
+            case 'field_separator':
+            case 'option_separator':
+            case 'all_extra':
+            case 'hour_extra':
+            case 'minute_extra':
+            case 'second_extra':
+            case 'meridian_extra':
+            case 'all_empty':
+            case 'hour_empty':
+            case 'minute_empty':
+            case 'second_empty':
+            case 'meridian_empty':
+            case 'all_id':
+            case 'hour_id':
+            case 'minute_id':
+            case 'second_id':
+            case 'meridian_id':
+            case 'hour_format':
+            case 'hour_value_format':
+            case 'minute_format':
+            case 'minute_value_format':
+            case 'second_format':
+            case 'second_value_format':
+                $$_key = (string)$_value;
+                break;
+            case 'display_hours':
+            case 'display_minutes':
+            case 'display_seconds':
+            case 'display_meridian':
+            case 'use_24_hours':
+                $$_key = (bool)$_value;
+                break;
+            case 'minute_interval':
+            case 'second_interval':
+            case 'hour_size':
+            case 'minute_size':
+            case 'second_size':
+            case 'meridian_size':
+                $$_key = (int)$_value;
+                break;
+            default:
+                if (!is_array($_value)) {
+                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
+                } else {
+                    trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+                }
+                break;
+        }
+    }
+    if (isset($params[ 'time' ]) && is_array($params[ 'time' ])) {
+        if (isset($params[ 'time' ][ $prefix . 'Hour' ])) {
+            // $_REQUEST[$field_array] given
+            foreach (array(
+                'H' => 'Hour',
+                'i' => 'Minute',
+                's' => 'Second'
+            ) as $_elementKey => $_elementName) {
+                $_variableName = '_' . strtolower($_elementName);
+                $$_variableName =
+                    isset($params[ 'time' ][ $prefix . $_elementName ]) ? $params[ 'time' ][ $prefix . $_elementName ] :
+                        date($_elementKey);
+            }
+            $_meridian =
+                isset($params[ 'time' ][ $prefix . 'Meridian' ]) ? (' ' . $params[ 'time' ][ $prefix . 'Meridian' ]) :
+                    '';
+            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
+            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
+        } elseif (isset($params[ 'time' ][ $field_array ][ $prefix . 'Hour' ])) {
+            // $_REQUEST given
+            foreach (array(
+                'H' => 'Hour',
+                'i' => 'Minute',
+                's' => 'Second'
+            ) as $_elementKey => $_elementName) {
+                $_variableName = '_' . strtolower($_elementName);
+                $$_variableName = isset($params[ 'time' ][ $field_array ][ $prefix . $_elementName ]) ?
+                    $params[ 'time' ][ $field_array ][ $prefix . $_elementName ] : date($_elementKey);
+            }
+            $_meridian = isset($params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) ?
+                (' ' . $params[ 'time' ][ $field_array ][ $prefix . 'Meridian' ]) : '';
+            $time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
+            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
+        } else {
+            // no date found, use NOW
+            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
+        }
+    } elseif ($time === null) {
+        if (array_key_exists('time', $params)) {
+            $_hour = $_minute = $_second = $time = null;
+        } else {
+            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s'));
+        }
+    } else {
+        list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
+    }
+    // generate hour <select>
+    if ($display_hours) {
+        $_html_hours = '';
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Hour]') : ($prefix . 'Hour');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($hour_extra) {
+            $_extra .= ' ' . $hour_extra;
+        }
+        $_html_hours = '<select name="' . $_name . '"';
+        if ($hour_id !== null || $all_id !== null) {
+            $_html_hours .= ' id="' .
+                            smarty_function_escape_special_chars(
+                                $hour_id !== null ? ($hour_id ? $hour_id : $_name) :
+                                    ($all_id ? ($all_id . $_name) : $_name)
+                            ) . '"';
+        }
+        if ($hour_size) {
+            $_html_hours .= ' size="' . $hour_size . '"';
+        }
+        $_html_hours .= $_extra . $extra_attrs . '>' . $option_separator;
+        if (isset($hour_empty) || isset($all_empty)) {
+            $_html_hours .= '<option value="">' . (isset($hour_empty) ? $hour_empty : $all_empty) . '</option>' .
+                            $option_separator;
+        }
+        $start = $use_24_hours ? 0 : 1;
+        $end = $use_24_hours ? 23 : 12;
+        for ($i = $start; $i <= $end; $i++) {
+            $_val = sprintf('%02d', $i);
+            $_text = $hour_format === '%02d' ? $_val : sprintf($hour_format, $i);
+            $_value = $hour_value_format === '%02d' ? $_val : sprintf($hour_value_format, $i);
+            if (!$use_24_hours) {
+                $_hour12 = $_hour == 0 ? 12 : ($_hour <= 12 ? $_hour : $_hour - 12);
+            }
+            $selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
+            $_html_hours .= '<option value="' . $_value . '"' . ($selected ? ' selected="selected"' : '') . '>' .
+                            $_text . '</option>' . $option_separator;
+        }
+        $_html_hours .= '</select>';
+    }
+    // generate minute <select>
+    if ($display_minutes) {
+        $_html_minutes = '';
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Minute]') : ($prefix . 'Minute');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($minute_extra) {
+            $_extra .= ' ' . $minute_extra;
+        }
+        $_html_minutes = '<select name="' . $_name . '"';
+        if ($minute_id !== null || $all_id !== null) {
+            $_html_minutes .= ' id="' . smarty_function_escape_special_chars(
+                    $minute_id !== null ?
+                        ($minute_id ? $minute_id : $_name) :
+                        ($all_id ? ($all_id . $_name) :
+                            $_name)
+                ) . '"';
+        }
+        if ($minute_size) {
+            $_html_minutes .= ' size="' . $minute_size . '"';
+        }
+        $_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator;
+        if (isset($minute_empty) || isset($all_empty)) {
+            $_html_minutes .= '<option value="">' . (isset($minute_empty) ? $minute_empty : $all_empty) . '</option>' .
+                              $option_separator;
+        }
+        $selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
+        for ($i = 0; $i <= 59; $i += $minute_interval) {
+            $_val = sprintf('%02d', $i);
+            $_text = $minute_format === '%02d' ? $_val : sprintf($minute_format, $i);
+            $_value = $minute_value_format === '%02d' ? $_val : sprintf($minute_value_format, $i);
+            $_html_minutes .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
+                              '>' . $_text . '</option>' . $option_separator;
+        }
+        $_html_minutes .= '</select>';
+    }
+    // generate second <select>
+    if ($display_seconds) {
+        $_html_seconds = '';
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Second]') : ($prefix . 'Second');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($second_extra) {
+            $_extra .= ' ' . $second_extra;
+        }
+        $_html_seconds = '<select name="' . $_name . '"';
+        if ($second_id !== null || $all_id !== null) {
+            $_html_seconds .= ' id="' . smarty_function_escape_special_chars(
+                    $second_id !== null ?
+                        ($second_id ? $second_id : $_name) :
+                        ($all_id ? ($all_id . $_name) :
+                            $_name)
+                ) . '"';
+        }
+        if ($second_size) {
+            $_html_seconds .= ' size="' . $second_size . '"';
+        }
+        $_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator;
+        if (isset($second_empty) || isset($all_empty)) {
+            $_html_seconds .= '<option value="">' . (isset($second_empty) ? $second_empty : $all_empty) . '</option>' .
+                              $option_separator;
+        }
+        $selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
+        for ($i = 0; $i <= 59; $i += $second_interval) {
+            $_val = sprintf('%02d', $i);
+            $_text = $second_format === '%02d' ? $_val : sprintf($second_format, $i);
+            $_value = $second_value_format === '%02d' ? $_val : sprintf($second_value_format, $i);
+            $_html_seconds .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
+                              '>' . $_text . '</option>' . $option_separator;
+        }
+        $_html_seconds .= '</select>';
+    }
+    // generate meridian <select>
+    if ($display_meridian && !$use_24_hours) {
+        $_html_meridian = '';
+        $_extra = '';
+        $_name = $field_array ? ($field_array . '[' . $prefix . 'Meridian]') : ($prefix . 'Meridian');
+        if ($all_extra) {
+            $_extra .= ' ' . $all_extra;
+        }
+        if ($meridian_extra) {
+            $_extra .= ' ' . $meridian_extra;
+        }
+        $_html_meridian = '<select name="' . $_name . '"';
+        if ($meridian_id !== null || $all_id !== null) {
+            $_html_meridian .= ' id="' . smarty_function_escape_special_chars(
+                    $meridian_id !== null ?
+                        ($meridian_id ? $meridian_id :
+                            $_name) :
+                        ($all_id ? ($all_id . $_name) :
+                            $_name)
+                ) . '"';
+        }
+        if ($meridian_size) {
+            $_html_meridian .= ' size="' . $meridian_size . '"';
+        }
+        $_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator;
+        if (isset($meridian_empty) || isset($all_empty)) {
+            $_html_meridian .= '<option value="">' . (isset($meridian_empty) ? $meridian_empty : $all_empty) .
+                               '</option>' . $option_separator;
+        }
+        $_html_meridian .= '<option value="am"' . ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') .
+                           '>AM</option>' . $option_separator . '<option value="pm"' .
+                           ($_hour < 12 ? '' : ' selected="selected"') . '>PM</option>' . $option_separator .
+                           '</select>';
+    }
+    $_html = '';
+    foreach (array(
+        '_html_hours',
+        '_html_minutes',
+        '_html_seconds',
+        '_html_meridian'
+    ) as $k) {
+        if (isset($$k)) {
+            if ($_html) {
+                $_html .= $field_separator;
+            }
+            $_html .= $$k;
+        }
+    }
+    return $_html;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_table.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_table.php
new file mode 100644
index 000000000..17b0586e2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.html_table.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsFunction
+ */
+/**
+ * Smarty {html_table} function plugin
+ * Type:     function
+ * Name:     html_table
+ * Date:     Feb 17, 2003
+ * Purpose:  make an html table from an array of data
+ * Params:
+ *
+ * - loop       - array to loop through
+ * - cols       - number of columns, comma separated list of column names
+ *                or array of column names
+ * - rows       - number of rows
+ * - table_attr - table attributes
+ * - th_attr    - table heading attributes (arrays are cycled)
+ * - tr_attr    - table row attributes (arrays are cycled)
+ * - td_attr    - table cell attributes (arrays are cycled)
+ * - trailpad   - value to pad trailing cells with
+ * - caption    - text for caption element
+ * - vdir       - vertical direction (default: "down", means top-to-bottom)
+ * - hdir       - horizontal direction (default: "right", means left-to-right)
+ * - inner      - inner loop (default "cols": print $loop line by line,
+ *                $loop will be printed column by column otherwise)
+ *
+ * Examples:
+ *
+ * {table loop=$data}
+ * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
+ * {table loop=$data cols="first,second,third" tr_attr=$colors}
+ *
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credit to Messju Mohr <messju at lammfellpuschen dot de>
+ * @author  credit to boots <boots dot smarty at yahoo dot com>
+ * @version 1.1
+ * @link    https://www.smarty.net/manual/en/language.function.html.table.php {html_table}
+ *           (Smarty online manual)
+ *
+ * @param array $params parameters
+ *
+ * @return string
+ */
+function smarty_function_html_table($params)
+{
+    $table_attr = 'border="1"';
+    $tr_attr = '';
+    $th_attr = '';
+    $td_attr = '';
+    $cols = $cols_count = 3;
+    $rows = 3;
+    $trailpad = '&nbsp;';
+    $vdir = 'down';
+    $hdir = 'right';
+    $inner = 'cols';
+    $caption = '';
+    $loop = null;
+    if (!isset($params[ 'loop' ])) {
+        trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
+        return;
+    }
+    foreach ($params as $_key => $_value) {
+        switch ($_key) {
+            case 'loop':
+                $$_key = (array)$_value;
+                break;
+            case 'cols':
+                if (is_array($_value) && !empty($_value)) {
+                    $cols = $_value;
+                    $cols_count = count($_value);
+                } elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
+                    $cols = explode(',', $_value);
+                    $cols_count = count($cols);
+                } elseif (!empty($_value)) {
+                    $cols_count = (int)$_value;
+                } else {
+                    $cols_count = $cols;
+                }
+                break;
+            case 'rows':
+                $$_key = (int)$_value;
+                break;
+            case 'table_attr':
+            case 'trailpad':
+            case 'hdir':
+            case 'vdir':
+            case 'inner':
+            case 'caption':
+                $$_key = (string)$_value;
+                break;
+            case 'tr_attr':
+            case 'td_attr':
+            case 'th_attr':
+                $$_key = $_value;
+                break;
+        }
+    }
+    $loop_count = count($loop);
+    if (empty($params[ 'rows' ])) {
+        /* no rows specified */
+        $rows = ceil($loop_count / $cols_count);
+    } elseif (empty($params[ 'cols' ])) {
+        if (!empty($params[ 'rows' ])) {
+            /* no cols specified, but rows */
+            $cols_count = ceil($loop_count / $rows);
+        }
+    }
+    $output = "<table $table_attr>\n";
+    if (!empty($caption)) {
+        $output .= '<caption>' . $caption . "</caption>\n";
+    }
+    if (is_array($cols)) {
+        $cols = ($hdir === 'right') ? $cols : array_reverse($cols);
+        $output .= "<thead><tr>\n";
+        for ($r = 0; $r < $cols_count; $r++) {
+            $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
+            $output .= $cols[ $r ];
+            $output .= "</th>\n";
+        }
+        $output .= "</tr></thead>\n";
+    }
+    $output .= "<tbody>\n";
+    for ($r = 0; $r < $rows; $r++) {
+        $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
+        $rx = ($vdir === 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
+        for ($c = 0; $c < $cols_count; $c++) {
+            $x = ($hdir === 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
+            if ($inner !== 'cols') {
+                /* shuffle x to loop over rows*/
+                $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
+            }
+            if ($x < $loop_count) {
+                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[ $x ] . "</td>\n";
+            } else {
+                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
+            }
+        }
+        $output .= "</tr>\n";
+    }
+    $output .= "</tbody>\n";
+    $output .= "</table>\n";
+    return $output;
+}
+
+/**
+ * @param $name
+ * @param $var
+ * @param $no
+ *
+ * @return string
+ */
+function smarty_function_html_table_cycle($name, $var, $no)
+{
+    if (!is_array($var)) {
+        $ret = $var;
+    } else {
+        $ret = $var[ $no % count($var) ];
+    }
+    return ($ret) ? ' ' . $ret : '';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.mailto.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.mailto.php
new file mode 100644
index 000000000..671ac0694
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.mailto.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsFunction
+ */
+/**
+ * Smarty {mailto} function plugin
+ * Type:     function
+ * Name:     mailto
+ * Date:     May 21, 2002
+ * Purpose:  automate mailto address link creation, and optionally encode them.
+ * Params:
+ *
+ * - address    - (required) - e-mail address
+ * - text       - (optional) - text to display, default is address
+ * - encode     - (optional) - can be one of:
+ *                             * none : no encoding (default)
+ *                             * javascript : encode with javascript
+ *                             * javascript_charcode : encode with javascript charcode
+ *                             * hex : encode with hexadecimal (no javascript)
+ * - cc         - (optional) - address(es) to carbon copy
+ * - bcc        - (optional) - address(es) to blind carbon copy
+ * - subject    - (optional) - e-mail subject
+ * - newsgroups - (optional) - newsgroup(s) to post to
+ * - followupto - (optional) - address(es) to follow up to
+ * - extra      - (optional) - extra tags for the href link
+ *
+ * Examples:
+ *
+ * {mailto address="me@domain.com"}
+ * {mailto address="me@domain.com" encode="javascript"}
+ * {mailto address="me@domain.com" encode="hex"}
+ * {mailto address="me@domain.com" subject="Hello to you!"}
+ * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
+ * {mailto address="me@domain.com" extra='class="mailto"'}
+ *
+ * @link    https://www.smarty.net/manual/en/language.function.mailto.php {mailto}
+ *           (Smarty online manual)
+ * @version 1.2
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credits to Jason Sweat (added cc, bcc and subject functionality)
+ *
+ * @param array $params parameters
+ *
+ * @return string
+ */
+function smarty_function_mailto($params)
+{
+    static $_allowed_encoding = [
+        'javascript' => true,
+        'javascript_charcode' => true,
+        'hex' => true,
+        'none' => true
+    ];
+
+    $extra = '';
+    if (empty($params[ 'address' ])) {
+        trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
+        return;
+    } else {
+        $address = $params[ 'address' ];
+    }
+
+    $text = $address;
+
+    // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
+    // so, don't encode it.
+    $mail_parms = [];
+    foreach ($params as $var => $value) {
+        switch ($var) {
+            case 'cc':
+            case 'bcc':
+            case 'followupto':
+                if (!empty($value)) {
+                    $mail_parms[] = $var . '=' . str_replace(['%40', '%2C'], ['@', ','], rawurlencode($value));
+                }
+                break;
+            case 'subject':
+            case 'newsgroups':
+                $mail_parms[] = $var . '=' . rawurlencode($value);
+                break;
+            case 'extra':
+            case 'text':
+                $$var = $value;
+            // no break
+            default:
+        }
+    }
+
+    if ($mail_parms) {
+        $address .= '?' . join('&', $mail_parms);
+    }
+    $encode = (empty($params[ 'encode' ])) ? 'none' : $params[ 'encode' ];
+    if (!isset($_allowed_encoding[ $encode ])) {
+        trigger_error(
+            "mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex",
+            E_USER_WARNING
+        );
+        return;
+    }
+
+    $string = '<a href="mailto:' . htmlspecialchars($address, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, Smarty::$_CHARSET) .
+        '" ' . $extra . '>' . htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, Smarty::$_CHARSET) . '</a>';
+
+    if ($encode === 'javascript') {
+        $js_encode = '';
+        for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
+            $js_encode .= '%' . bin2hex($string[ $x ]);
+        }
+        return '<script type="text/javascript">document.write(unescape(\'' . $js_encode . '\'))</script>';
+    } elseif ($encode === 'javascript_charcode') {
+        for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
+            $ord[] = ord($string[ $x ]);
+        }
+        return '<script type="text/javascript">document.write(String.fromCharCode(' . implode(',', $ord) . '))</script>';
+    } elseif ($encode === 'hex') {
+        preg_match('!^(.*)(\?.*)$!', $address, $match);
+        if (!empty($match[ 2 ])) {
+            trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);
+            return;
+        }
+        $address_encode = '';
+        for ($x = 0, $_length = strlen($address); $x < $_length; $x++) {
+            if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[ $x ])) {
+                $address_encode .= '%' . bin2hex($address[ $x ]);
+            } else {
+                $address_encode .= $address[ $x ];
+            }
+        }
+        $text_encode = '';
+        for ($x = 0, $_length = strlen($text); $x < $_length; $x++) {
+            $text_encode .= '&#x' . bin2hex($text[ $x ]) . ';';
+        }
+        $mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
+        return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
+    } else {
+        // no encoding
+        return $string;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.math.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.math.php
new file mode 100644
index 000000000..34912d239
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/function.math.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Smarty plugin
+ * This plugin is only for Smarty2 BC
+ *
+ * @package    Smarty
+ * @subpackage PluginsFunction
+ */
+/**
+ * Smarty {math} function plugin
+ * Type:     function
+ * Name:     math
+ * Purpose:  handle math computations in template
+ *
+ * @link   https://www.smarty.net/manual/en/language.function.math.php {math}
+ *           (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param array                    $params   parameters
+ * @param Smarty_Internal_Template $template template object
+ *
+ * @return string|null
+ */
+function smarty_function_math($params, $template)
+{
+    static $_allowed_funcs =
+        array(
+            'int'   => true,
+            'abs'   => true,
+            'ceil'  => true,
+            'acos'   => true,
+            'acosh'   => true,
+            'cos'   => true,
+            'cosh'   => true,
+            'deg2rad'   => true,
+            'rad2deg'   => true,
+            'exp'   => true,
+            'floor' => true,
+            'log'   => true,
+            'log10' => true,
+            'max'   => true,
+            'min'   => true,
+            'pi'    => true,
+            'pow'   => true,
+            'rand'  => true,
+            'round' => true,
+            'asin'   => true,
+            'asinh'   => true,
+            'sin'   => true,
+            'sinh'   => true,
+            'sqrt'  => true,
+            'srand' => true,
+            'atan'   => true,
+            'atanh'   => true,
+            'tan'   => true,
+            'tanh'   => true
+        );
+
+    // be sure equation parameter is present
+    if (empty($params[ 'equation' ])) {
+        trigger_error("math: missing equation parameter", E_USER_WARNING);
+        return;
+    }
+    $equation = $params[ 'equation' ];
+
+    // Remove whitespaces
+    $equation = preg_replace('/\s+/', '', $equation);
+
+    // Adapted from https://www.php.net/manual/en/function.eval.php#107377
+    $number = '-?(?:\d+(?:[,.]\d+)?|pi|Ï€)'; // What is a number
+    $functionsOrVars = '((?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))';
+    $operators = '[,+\/*\^%-]'; // Allowed math operators
+    $regexp = '/^(('.$number.'|'.$functionsOrVars.'|('.$functionsOrVars.'\s*\((?1)*\)|\((?1)*\)))(?:'.$operators.'(?1))?)+$/';
+
+    if (!preg_match($regexp, $equation)) {
+        trigger_error("math: illegal characters", E_USER_WARNING);
+        return;
+    }
+
+    // make sure parenthesis are balanced
+    if (substr_count($equation, '(') !== substr_count($equation, ')')) {
+        trigger_error("math: unbalanced parenthesis", E_USER_WARNING);
+        return;
+    }
+
+    // disallow backticks
+    if (strpos($equation, '`') !== false) {
+        trigger_error("math: backtick character not allowed in equation", E_USER_WARNING);
+        return;
+    }
+
+    // also disallow dollar signs
+    if (strpos($equation, '$') !== false) {
+        trigger_error("math: dollar signs not allowed in equation", E_USER_WARNING);
+        return;
+    }
+    foreach ($params as $key => $val) {
+        if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
+            // make sure value is not empty
+            if (strlen($val) === 0) {
+                trigger_error("math: parameter '{$key}' is empty", E_USER_WARNING);
+                return;
+            }
+            if (!is_numeric($val)) {
+                trigger_error("math: parameter '{$key}' is not numeric", E_USER_WARNING);
+                return;
+            }
+        }
+    }
+    // match all vars in equation, make sure all are passed
+    preg_match_all('!(?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)!', $equation, $match);
+    foreach ($match[ 1 ] as $curr_var) {
+        if ($curr_var && !isset($params[ $curr_var ]) && !isset($_allowed_funcs[ $curr_var ])) {
+            trigger_error(
+                "math: function call '{$curr_var}' not allowed, or missing parameter '{$curr_var}'",
+                E_USER_WARNING
+            );
+            return;
+        }
+    }
+    foreach ($params as $key => $val) {
+        if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
+            $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
+        }
+    }
+    $smarty_math_result = null;
+    eval("\$smarty_math_result = " . $equation . ";");
+
+    if (empty($params[ 'format' ])) {
+        if (empty($params[ 'assign' ])) {
+            return $smarty_math_result;
+        } else {
+            $template->assign($params[ 'assign' ], $smarty_math_result);
+        }
+    } else {
+        if (empty($params[ 'assign' ])) {
+            printf($params[ 'format' ], $smarty_math_result);
+        } else {
+            $template->assign($params[ 'assign' ], sprintf($params[ 'format' ], $smarty_math_result));
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.capitalize.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.capitalize.php
new file mode 100644
index 000000000..2903d61d7
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.capitalize.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+/**
+ * Smarty capitalize modifier plugin
+ * Type:     modifier
+ * Name:     capitalize
+ * Purpose:  capitalize words in the string
+ * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
+ *
+ * @param string  $string    string to capitalize
+ * @param boolean $uc_digits also capitalize "x123" to "X123"
+ * @param boolean $lc_rest   capitalize first letters, lowercase all following letters "aAa" to "Aaa"
+ *
+ * @return string capitalized string
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Rodney Rehm
+ */
+function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
+{
+    $string = (string) $string;
+
+    if (Smarty::$_MBSTRING) {
+        if ($lc_rest) {
+            // uppercase (including hyphenated words)
+            $upper_string = mb_convert_case($string, MB_CASE_TITLE, Smarty::$_CHARSET);
+        } else {
+            // uppercase word breaks
+            $upper_string = preg_replace_callback(
+                "!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER,
+                'smarty_mod_cap_mbconvert_cb',
+                $string
+            );
+        }
+        // check uc_digits case
+        if (!$uc_digits) {
+            if (preg_match_all(
+                "!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER,
+                $string,
+                $matches,
+                PREG_OFFSET_CAPTURE
+            )
+            ) {
+                foreach ($matches[ 1 ] as $match) {
+                    $upper_string =
+                        substr_replace(
+                            $upper_string,
+                            mb_strtolower($match[ 0 ], Smarty::$_CHARSET),
+                            $match[ 1 ],
+                            strlen($match[ 0 ])
+                        );
+                }
+            }
+        }
+        $upper_string =
+            preg_replace_callback(
+                "!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER,
+                'smarty_mod_cap_mbconvert2_cb',
+                $upper_string
+            );
+        return $upper_string;
+    }
+    // lowercase first
+    if ($lc_rest) {
+        $string = strtolower($string);
+    }
+    // uppercase (including hyphenated words)
+    $upper_string =
+        preg_replace_callback(
+            "!(^|[^\p{L}'])([\p{Ll}])!S" . Smarty::$_UTF8_MODIFIER,
+            'smarty_mod_cap_ucfirst_cb',
+            $string
+        );
+    // check uc_digits case
+    if (!$uc_digits) {
+        if (preg_match_all(
+            "!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER,
+            $string,
+            $matches,
+            PREG_OFFSET_CAPTURE
+        )
+        ) {
+            foreach ($matches[ 1 ] as $match) {
+                $upper_string =
+                    substr_replace($upper_string, strtolower($match[ 0 ]), $match[ 1 ], strlen($match[ 0 ]));
+            }
+        }
+    }
+    $upper_string = preg_replace_callback(
+        "!((^|\s)['\"])(\w)!" . Smarty::$_UTF8_MODIFIER,
+        'smarty_mod_cap_ucfirst2_cb',
+        $upper_string
+    );
+    return $upper_string;
+}
+
+/**
+ *
+ * Bug: create_function() use exhausts memory when used in long loops
+ * Fix: use declared functions for callbacks instead of using create_function()
+ * Note: This can be fixed using anonymous functions instead, but that requires PHP >= 5.3
+ *
+ * @author Kyle Renfrow
+ */
+/**
+ * @param $matches
+ *
+ * @return string
+ */
+function smarty_mod_cap_mbconvert_cb($matches)
+{
+    return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 2 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
+}
+
+/**
+ * @param $matches
+ *
+ * @return string
+ */
+function smarty_mod_cap_mbconvert2_cb($matches)
+{
+    return stripslashes($matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 3 ]), MB_CASE_UPPER, Smarty::$_CHARSET);
+}
+
+/**
+ * @param $matches
+ *
+ * @return string
+ */
+function smarty_mod_cap_ucfirst_cb($matches)
+{
+    return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 2 ]));
+}
+
+/**
+ * @param $matches
+ *
+ * @return string
+ */
+function smarty_mod_cap_ucfirst2_cb($matches)
+{
+    return stripslashes($matches[ 1 ]) . ucfirst(stripslashes($matches[ 3 ]));
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.count.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.count.php
new file mode 100644
index 000000000..ca35fc115
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.count.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+/**
+ * Smarty count modifier plugin
+ * Type:     modifier
+ * Name:     count
+ * Purpose:  counts all elements in an array or in a Countable object
+ * Input:
+ *          - Countable|array: array or object to count
+ *          - mode: int defaults to 0 for normal count mode, if set to 1 counts recursive
+  *
+ * @param mixed $arrayOrObject  input array/object
+ * @param int $mode       count mode
+ *
+ * @return int
+ */
+function smarty_modifier_count($arrayOrObject, $mode = 0)
+{
+    /*
+     * @see https://www.php.net/count
+     * > Prior to PHP 8.0.0, if the parameter was neither an array nor an object that implements the Countable interface,
+     * > 1 would be returned, unless value was null, in which case 0 would be returned.
+     */
+
+    if ($arrayOrObject instanceof Countable || is_array($arrayOrObject)) {
+        return count($arrayOrObject, (int) $mode);
+    } elseif ($arrayOrObject === null) {
+        return 0;
+    }
+    return 1;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.date_format.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.date_format.php
new file mode 100644
index 000000000..e3589fd07
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.date_format.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+/**
+ * Smarty date_format modifier plugin
+ * Type:     modifier
+ * Name:     date_format
+ * Purpose:  format datestamps via strftime
+ * Input:
+ *          - string: input date string
+ *          - format: strftime format for output
+ *          - default_date: default date if $string is empty
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string $string       input date string
+ * @param string $format       strftime format for output
+ * @param string $default_date default date if $string is empty
+ * @param string $formatter    either 'strftime' or 'auto'
+ *
+ * @return string |void
+ * @uses   smarty_make_timestamp()
+ */
+function smarty_modifier_date_format($string, $format = null, $default_date = '', $formatter = 'auto')
+{
+    if ($format === null) {
+        $format = Smarty::$_DATE_FORMAT;
+    }
+    /**
+     * require_once the {@link shared.make_timestamp.php} plugin
+     */
+    static $is_loaded = false;
+    if (!$is_loaded) {
+        if (!is_callable('smarty_make_timestamp')) {
+            include_once SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php';
+        }
+        $is_loaded = true;
+    }
+    if (!empty($string) && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') {
+        $timestamp = smarty_make_timestamp($string);
+    } elseif (!empty($default_date)) {
+        $timestamp = smarty_make_timestamp($default_date);
+    } else {
+        return;
+    }
+    if ($formatter === 'strftime' || ($formatter === 'auto' && strpos($format, '%') !== false)) {
+        if (Smarty::$_IS_WINDOWS) {
+            $_win_from = array(
+                '%D',
+                '%h',
+                '%n',
+                '%r',
+                '%R',
+                '%t',
+                '%T'
+            );
+            $_win_to = array(
+                '%m/%d/%y',
+                '%b',
+                "\n",
+                '%I:%M:%S %p',
+                '%H:%M',
+                "\t",
+                '%H:%M:%S'
+            );
+            if (strpos($format, '%e') !== false) {
+                $_win_from[] = '%e';
+                $_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
+            }
+            if (strpos($format, '%l') !== false) {
+                $_win_from[] = '%l';
+                $_win_to[] = sprintf('%\' 2d', date('h', $timestamp));
+            }
+            $format = str_replace($_win_from, $_win_to, $format);
+        }
+        // @ to suppress deprecation errors when running in PHP8.1 or higher.
+        return @strftime($format, $timestamp);
+    } else {
+        return date($format, $timestamp);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.debug_print_var.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.debug_print_var.php
new file mode 100644
index 000000000..78397d017
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.debug_print_var.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage Debug
+ */
+/**
+ * Smarty debug_print_var modifier plugin
+ * Type:     modifier
+ * Name:     debug_print_var
+ * Purpose:  formats variable contents for display in the console
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param array|object $var     variable to be formatted
+ * @param int          $max     maximum recursion depth if $var is an array or object
+ * @param int          $length  maximum string length if $var is a string
+ * @param int          $depth   actual recursion depth
+ * @param array        $objects processed objects in actual depth to prevent recursive object processing
+ *
+ * @return string
+ */
+function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = 0, $objects = array())
+{
+    $_replace = array("\n" => '\n', "\r" => '\r', "\t" => '\t');
+    switch (gettype($var)) {
+        case 'array':
+            $results = '<b>Array (' . count($var) . ')</b>';
+            if ($depth === $max) {
+                break;
+            }
+            foreach ($var as $curr_key => $curr_val) {
+                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b>' . strtr($curr_key, $_replace) .
+                            '</b> =&gt; ' .
+                            smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects);
+                $depth--;
+            }
+            break;
+        case 'object':
+            $object_vars = get_object_vars($var);
+            $results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
+            if (in_array($var, $objects)) {
+                $results .= ' called recursive';
+                break;
+            }
+            if ($depth === $max) {
+                break;
+            }
+            $objects[] = $var;
+            foreach ($object_vars as $curr_key => $curr_val) {
+                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b> -&gt;' . strtr($curr_key, $_replace) .
+                            '</b> = ' . smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects);
+                $depth--;
+            }
+            break;
+        case 'boolean':
+        case 'NULL':
+        case 'resource':
+            if (true === $var) {
+                $results = 'true';
+            } elseif (false === $var) {
+                $results = 'false';
+            } elseif (null === $var) {
+                $results = 'null';
+            } else {
+                $results = htmlspecialchars((string)$var);
+            }
+            $results = '<i>' . $results . '</i>';
+            break;
+        case 'integer':
+        case 'float':
+            $results = htmlspecialchars((string)$var);
+            break;
+        case 'string':
+            $results = strtr($var, $_replace);
+            if (Smarty::$_MBSTRING) {
+                if (mb_strlen($var, Smarty::$_CHARSET) > $length) {
+                    $results = mb_substr($var, 0, $length - 3, Smarty::$_CHARSET) . '...';
+                }
+            } else {
+                if (isset($var[ $length ])) {
+                    $results = substr($var, 0, $length - 3) . '...';
+                }
+            }
+            $results = htmlspecialchars('"' . $results . '"', ENT_QUOTES, Smarty::$_CHARSET);
+            break;
+        case 'unknown type':
+        default:
+            $results = strtr((string)$var, $_replace);
+            if (Smarty::$_MBSTRING) {
+                if (mb_strlen($results, Smarty::$_CHARSET) > $length) {
+                    $results = mb_substr($results, 0, $length - 3, Smarty::$_CHARSET) . '...';
+                }
+            } else {
+                if (strlen($results) > $length) {
+                    $results = substr($results, 0, $length - 3) . '...';
+                }
+            }
+            $results = htmlspecialchars($results, ENT_QUOTES, Smarty::$_CHARSET);
+    }
+    return $results;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.escape.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.escape.php
new file mode 100644
index 000000000..e168679c3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.escape.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+/**
+ * Smarty escape modifier plugin
+ * Type:     modifier
+ * Name:     escape
+ * Purpose:  escape string for output
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.escape
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string  $string        input string
+ * @param string  $esc_type      escape type
+ * @param string  $char_set      character set, used for htmlspecialchars() or htmlentities()
+ * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
+ *
+ * @return string escaped input string
+ */
+function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
+{
+    static $is_loaded_1 = false;
+    static $is_loaded_2 = false;
+    if (!$char_set) {
+        $char_set = Smarty::$_CHARSET;
+    }
+
+    $string = (string)$string;
+
+    switch ($esc_type) {
+        case 'html':
+            return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
+        // no break
+        case 'htmlall':
+            if (Smarty::$_MBSTRING) {
+                $string = mb_convert_encoding($string, 'UTF-8', $char_set);
+                return htmlentities($string, ENT_QUOTES, 'UTF-8', $double_encode);
+            }
+            // no MBString fallback
+            return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
+        // no break
+        case 'url':
+            return rawurlencode($string);
+        case 'urlpathinfo':
+            return str_replace('%2F', '/', rawurlencode($string));
+        case 'quotes':
+            // escape unescaped single quotes
+            return preg_replace("%(?<!\\\\)'%", "\\'", $string);
+        case 'hex':
+            // escape every byte into hex
+            // Note that the UTF-8 encoded character ä will be represented as %c3%a4
+            $return = '';
+            $_length = strlen($string);
+            for ($x = 0; $x < $_length; $x++) {
+                $return .= '%' . bin2hex($string[ $x ]);
+            }
+            return $return;
+        case 'hexentity':
+            $return = '';
+            if (Smarty::$_MBSTRING) {
+                if (!$is_loaded_1) {
+                    if (!is_callable('smarty_mb_to_unicode')) {
+                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php';
+                    }
+                    $is_loaded_1 = true;
+                }
+                $return = '';
+                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
+                    $return .= '&#x' . strtoupper(dechex($unicode)) . ';';
+                }
+                return $return;
+            }
+            // no MBString fallback
+            $_length = strlen($string);
+            for ($x = 0; $x < $_length; $x++) {
+                $return .= '&#x' . bin2hex($string[ $x ]) . ';';
+            }
+            return $return;
+        case 'decentity':
+            $return = '';
+            if (Smarty::$_MBSTRING) {
+                if (!$is_loaded_1) {
+                    if (!is_callable('smarty_mb_to_unicode')) {
+                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php';
+                    }
+                    $is_loaded_1 = true;
+                }
+                $return = '';
+                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
+                    $return .= '&#' . $unicode . ';';
+                }
+                return $return;
+            }
+            // no MBString fallback
+            $_length = strlen($string);
+            for ($x = 0; $x < $_length; $x++) {
+                $return .= '&#' . ord($string[ $x ]) . ';';
+            }
+            return $return;
+        case 'javascript':
+            // escape quotes and backslashes, newlines, etc.
+            return strtr(
+                $string,
+                array(
+                    '\\' => '\\\\',
+                    "'"  => "\\'",
+                    '"'  => '\\"',
+                    "\r" => '\\r',
+                    "\n" => '\\n',
+                    '</' => '<\/',
+                    // see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
+                    '<!--' => '<\!--',
+                    '<s'   => '<\s',
+                    '<S'   => '<\S',
+	                "`" => "\\\\`",
+	                "\${" => "\\\\\\$\\{"
+                )
+            );
+        case 'mail':
+            if (Smarty::$_MBSTRING) {
+                if (!$is_loaded_2) {
+                    if (!is_callable('smarty_mb_str_replace')) {
+                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php';
+                    }
+                    $is_loaded_2 = true;
+                }
+                return smarty_mb_str_replace(
+                    array(
+                        '@',
+                        '.'
+                    ),
+                    array(
+                        ' [AT] ',
+                        ' [DOT] '
+                    ),
+                    $string
+                );
+            }
+            // no MBString fallback
+            return str_replace(
+                array(
+                    '@',
+                    '.'
+                ),
+                array(
+                    ' [AT] ',
+                    ' [DOT] '
+                ),
+                $string
+            );
+        case 'nonstd':
+            // escape non-standard chars, such as ms document quotes
+            $return = '';
+            if (Smarty::$_MBSTRING) {
+                if (!$is_loaded_1) {
+                    if (!is_callable('smarty_mb_to_unicode')) {
+                        include_once SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php';
+                    }
+                    $is_loaded_1 = true;
+                }
+                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
+                    if ($unicode >= 126) {
+                        $return .= '&#' . $unicode . ';';
+                    } else {
+                        $return .= chr($unicode);
+                    }
+                }
+                return $return;
+            }
+            $_length = strlen($string);
+            for ($_i = 0; $_i < $_length; $_i++) {
+                $_ord = ord(substr($string, $_i, 1));
+                // non-standard char, escape it
+                if ($_ord >= 126) {
+                    $return .= '&#' . $_ord . ';';
+                } else {
+                    $return .= substr($string, $_i, 1);
+                }
+            }
+            return $return;
+        default:
+            trigger_error("escape: unsupported type: $esc_type - returning unmodified string", E_USER_NOTICE);
+            return $string;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.explode.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.explode.php
new file mode 100644
index 000000000..5186fde3d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.explode.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty explode modifier plugin
+ * Type:     modifier
+ * Name:     explode
+ * Purpose:  split a string by a string
+ *
+ * @param string   $separator
+ * @param string   $string
+ * @param int|null $limit
+ *
+ * @return array
+ */
+function smarty_modifier_explode($separator, $string, ?int $limit = null)
+{
+    // provide $string default to prevent deprecation errors in PHP >=8.1
+    return explode($separator, $string ?? '', $limit ?? PHP_INT_MAX);
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.implode.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.implode.php
new file mode 100644
index 000000000..679d71d72
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.implode.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+
+function smarty_modifier_implode($values, $separator = '')
+{
+	if (is_array($separator)) {
+		return implode((string) ($values ?? ''), (array) $separator);
+	}
+	return implode((string) ($separator ?? ''), (array) $values);
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.mb_wordwrap.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.mb_wordwrap.php
new file mode 100644
index 000000000..7c7bd875f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.mb_wordwrap.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+/**
+ * Smarty wordwrap modifier plugin
+ * Type:     modifier
+ * Name:     mb_wordwrap
+ * Purpose:  Wrap a string to a given number of characters
+ *
+ * @link   https://php.net/manual/en/function.wordwrap.php for similarity
+ *
+ * @param string  $str   the string to wrap
+ * @param int     $width the width of the output
+ * @param string  $break the character used to break the line
+ * @param boolean $cut   ignored parameter, just for the sake of
+ *
+ * @return string  wrapped string
+ * @author Rodney Rehm
+ */
+function smarty_modifier_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
+{
+    // break words into tokens using white space as a delimiter
+    $tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
+    $length = 0;
+    $t = '';
+    $_previous = false;
+    $_space = false;
+    foreach ($tokens as $_token) {
+        $token_length = mb_strlen($_token, Smarty::$_CHARSET);
+        $_tokens = array($_token);
+        if ($token_length > $width) {
+            if ($cut) {
+                $_tokens = preg_split(
+                    '!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER,
+                    $_token,
+                    -1,
+                    PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE
+                );
+            }
+        }
+        foreach ($_tokens as $token) {
+            $_space = !!preg_match('!^\s$!S' . Smarty::$_UTF8_MODIFIER, $token);
+            $token_length = mb_strlen($token, Smarty::$_CHARSET);
+            $length += $token_length;
+            if ($length > $width) {
+                // remove space before inserted break
+                if ($_previous) {
+                    $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
+                }
+                if (!$_space) {
+                    // add the break before the token
+                    if (!empty($t)) {
+                        $t .= $break;
+                    }
+                    $length = $token_length;
+                }
+            } elseif ($token === "\n") {
+                // hard break must reset counters
+                $length = 0;
+            }
+            $_previous = $_space;
+            // add the token
+            $t .= $token;
+        }
+    }
+    return $t;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.number_format.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.number_format.php
new file mode 100644
index 000000000..8c612601f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.number_format.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+
+/**
+ * Smarty number_format modifier plugin
+ * Type:     modifier
+ * Name:     number_format
+ * Purpose:  Format a number with grouped thousands
+ *
+ * @param float|null  $num
+ * @param int         $decimals
+ * @param string|null $decimal_separator
+ * @param string|null $thousands_separator
+ *
+ * @return string
+ */
+function smarty_modifier_number_format(?float $num, int $decimals = 0, ?string $decimal_separator = ".", ?string $thousands_separator = ",")
+{
+    // provide $num default to prevent deprecation errors in PHP >=8.1
+    return number_format($num ?? 0.0, $decimals, $decimal_separator, $thousands_separator);
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.regex_replace.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.regex_replace.php
new file mode 100644
index 000000000..cd57cdf33
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.regex_replace.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+/**
+ * Smarty regex_replace modifier plugin
+ * Type:     modifier
+ * Name:     regex_replace
+ * Purpose:  regular expression search/replace
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.regex.replace.php
+ *          regex_replace (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string       $string  input string
+ * @param string|array $search  regular expression(s) to search for
+ * @param string|array $replace string(s) that should be replaced
+ * @param int          $limit   the maximum number of replacements
+ *
+ * @return string
+ */
+function smarty_modifier_regex_replace($string, $search, $replace, $limit = -1)
+{
+    if (is_array($search)) {
+        foreach ($search as $idx => $s) {
+            $search[ $idx ] = _smarty_regex_replace_check($s);
+        }
+    } else {
+        $search = _smarty_regex_replace_check($search);
+    }
+    return preg_replace($search, $replace, $string, $limit);
+}
+
+/**
+ * @param  string $search string(s) that should be replaced
+ *
+ * @return string
+ * @ignore
+ */
+function _smarty_regex_replace_check($search)
+{
+    // null-byte injection detection
+    // anything behind the first null-byte is ignored
+    if (($pos = strpos($search, "\0")) !== false) {
+        $search = substr($search, 0, $pos);
+    }
+    // remove eval-modifier from $search
+    if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[ 1 ], 'e') !== false)) {
+        $search = substr($search, 0, -strlen($match[ 1 ])) . preg_replace('![e\s]+!', '', $match[ 1 ]);
+    }
+    return $search;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.replace.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.replace.php
new file mode 100644
index 000000000..71a7c632a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.replace.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+/**
+ * Smarty replace modifier plugin
+ * Type:     modifier
+ * Name:     replace
+ * Purpose:  simple search/replace
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Uwe Tews
+ *
+ * @param string $string  input string
+ * @param string $search  text to search for
+ * @param string $replace replacement text
+ *
+ * @return string
+ */
+function smarty_modifier_replace($string, $search, $replace)
+{
+    static $is_loaded = false;
+    if (Smarty::$_MBSTRING) {
+        if (!$is_loaded) {
+            if (!is_callable('smarty_mb_str_replace')) {
+                include_once SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php';
+            }
+            $is_loaded = true;
+        }
+        return smarty_mb_str_replace($search, $replace, $string);
+    }
+    return str_replace($search, $replace, $string);
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.spacify.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.spacify.php
new file mode 100644
index 000000000..251dbe71b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.spacify.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+/**
+ * Smarty spacify modifier plugin
+ * Type:     modifier
+ * Name:     spacify
+ * Purpose:  add spaces between characters in a string
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string $string       input string
+ * @param string $spacify_char string to insert between characters.
+ *
+ * @return string
+ */
+function smarty_modifier_spacify($string, $spacify_char = ' ')
+{
+    // well… what about charsets besides latin and UTF-8?
+    return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, -1, PREG_SPLIT_NO_EMPTY));
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.truncate.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.truncate.php
new file mode 100644
index 000000000..d253e4a61
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifier.truncate.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+/**
+ * Smarty truncate modifier plugin
+ * Type:     modifier
+ * Name:     truncate
+ * Purpose:  Truncate a string to a certain length if necessary,
+ *               optionally splitting in the middle of a word, and
+ *               appending the $etc string or inserting $etc into the middle.
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string  $string      input string
+ * @param integer $length      length of truncated text
+ * @param string  $etc         end string
+ * @param boolean $break_words truncate at word boundary
+ * @param boolean $middle      truncate in the middle of text
+ *
+ * @return string truncated string
+ */
+function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
+{
+    if ($length === 0 || $string === null) {
+        return '';
+    }
+    if (Smarty::$_MBSTRING) {
+        if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
+            $length -= min($length, mb_strlen($etc, Smarty::$_CHARSET));
+            if (!$break_words && !$middle) {
+                $string = preg_replace(
+                    '/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER,
+                    '',
+                    mb_substr($string, 0, $length + 1, Smarty::$_CHARSET)
+                );
+            }
+            if (!$middle) {
+                return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
+            }
+            return mb_substr($string, 0, intval($length / 2), Smarty::$_CHARSET) . $etc .
+                   mb_substr($string, -intval($length / 2), $length, Smarty::$_CHARSET);
+        }
+        return $string;
+    }
+    // no MBString fallback
+    if (isset($string[ $length ])) {
+        $length -= min($length, strlen($etc));
+        if (!$break_words && !$middle) {
+            $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
+        }
+        if (!$middle) {
+            return substr($string, 0, $length) . $etc;
+        }
+        return substr($string, 0, intval($length / 2)) . $etc . substr($string, -intval($length / 2));
+    }
+    return $string;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.cat.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.cat.php
new file mode 100644
index 000000000..2c3a8b2a4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.cat.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty cat modifier plugin
+ * Type:     modifier
+ * Name:     cat
+ * Date:     Feb 24, 2003
+ * Purpose:  catenate a value to a variable
+ * Input:    string to catenate
+ * Example:  {$var|cat:"foo"}
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.cat.php cat
+ *           (Smarty online manual)
+ * @author Uwe Tews
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_cat($params)
+{
+    return '(' . implode(').(', $params) . ')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_characters.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_characters.php
new file mode 100644
index 000000000..7798cabc1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_characters.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty count_characters modifier plugin
+ * Type:     modifier
+ * Name:     count_characters
+ * Purpose:  count the number of characters in a text
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online
+ *         manual)
+ * @author Uwe Tews
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_count_characters($params)
+{
+    if (!isset($params[ 1 ]) || $params[ 1 ] !== 'true') {
+        return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[ 0 ] . ', $tmp)';
+    }
+    if (Smarty::$_MBSTRING) {
+        return 'mb_strlen((string) ' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
+    }
+    // no MBString fallback
+    return 'strlen((string) ' . $params[ 0 ] . ')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_paragraphs.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_paragraphs.php
new file mode 100644
index 000000000..332402968
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_paragraphs.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty count_paragraphs modifier plugin
+ * Type:     modifier
+ * Name:     count_paragraphs
+ * Purpose:  count the number of paragraphs in a text
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ *          count_paragraphs (Smarty online manual)
+ * @author Uwe Tews
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_count_paragraphs($params)
+{
+    // count \r or \n characters
+    return '(preg_match_all(\'#[\r\n]+#\', ' . $params[ 0 ] . ', $tmp)+1)';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_sentences.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_sentences.php
new file mode 100644
index 000000000..30e36e5f0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_sentences.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty count_sentences modifier plugin
+ * Type:     modifier
+ * Name:     count_sentences
+ * Purpose:  count the number of sentences in a text
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
+ *          count_sentences (Smarty online manual)
+ * @author Uwe Tews
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_count_sentences($params)
+{
+    // find periods, question marks, exclamation marks with a word before but not after.
+    return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[ 0 ] . ', $tmp)';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_words.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_words.php
new file mode 100644
index 000000000..48a3daa17
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.count_words.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty count_words modifier plugin
+ * Type:     modifier
+ * Name:     count_words
+ * Purpose:  count the number of words in a text
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
+ * @author Uwe Tews
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_count_words($params)
+{
+    if (Smarty::$_MBSTRING) {
+        // return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
+        // expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
+        return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . Smarty::$_UTF8_MODIFIER . '\', ' .
+               $params[ 0 ] . ', $tmp)';
+    }
+    // no MBString fallback
+    return 'str_word_count((string) ' . $params[ 0 ] . ')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.default.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.default.php
new file mode 100644
index 000000000..dffa7a986
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.default.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty default modifier plugin
+ * Type:     modifier
+ * Name:     default
+ * Purpose:  designate default value for empty variables
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
+ * @author Uwe Tews
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_default($params)
+{
+    $output = $params[ 0 ];
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = "''";
+    }
+    array_shift($params);
+    foreach ($params as $param) {
+        $output = '(($tmp = ' . $output . ' ?? null)===null||$tmp===\'\' ? ' . $param . ' ?? null : $tmp)';
+    }
+    return $output;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.escape.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.escape.php
new file mode 100644
index 000000000..21b1b4c2a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.escape.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty escape modifier plugin
+ * Type:     modifier
+ * Name:     escape
+ * Purpose:  escape string for output
+ *
+ * @link   https://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
+ * @author Rodney Rehm
+ *
+ * @param array                                $params parameters
+ * @param Smarty_Internal_TemplateCompilerBase $compiler
+ *
+ * @return string with compiled code
+ * @throws SmartyException
+ */
+function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompilerBase $compiler)
+{
+    $compiler->template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_literal_compiler_param',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php'
+            )
+        )
+    );
+    try {
+        $esc_type = smarty_literal_compiler_param($params, 1, 'html');
+        $char_set = smarty_literal_compiler_param($params, 2, Smarty::$_CHARSET);
+        $double_encode = smarty_literal_compiler_param($params, 3, true);
+        if (!$char_set) {
+            $char_set = Smarty::$_CHARSET;
+        }
+        switch ($esc_type) {
+            case 'html':
+                return 'htmlspecialchars((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+                    var_export($double_encode, true) . ')';
+            // no break
+            case 'htmlall':
+                if (Smarty::$_MBSTRING) {
+                    return 'htmlentities(mb_convert_encoding((string)' . $params[ 0 ] . ', \'UTF-8\', ' .
+                        var_export($char_set, true) . '), ENT_QUOTES, \'UTF-8\', ' .
+                        var_export($double_encode, true) . ')';
+                }
+                // no MBString fallback
+                return 'htmlentities((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+                    var_export($double_encode, true) . ')';
+            // no break
+            case 'url':
+                return 'rawurlencode((string)' . $params[ 0 ] . ')';
+            case 'urlpathinfo':
+                return 'str_replace("%2F", "/", rawurlencode((string)' . $params[ 0 ] . '))';
+            case 'quotes':
+                // escape unescaped single quotes
+                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'", (string)' . $params[ 0 ] . ')';
+            case 'javascript':
+                // escape quotes and backslashes, newlines, etc.
+                // see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
+                return 'strtr((string)' .
+                       $params[ 0 ] .
+                       ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", 
+                       "\\n" => "\\\n", "</" => "<\/", "<!--" => "<\!--", "<s" => "<\s", "<S" => "<\S",
+                       "`" => "\\\\`", "\${" => "\\\\\\$\\{"))';
+        }
+    } catch (SmartyException $e) {
+        // pass through to regular plugin fallback
+    }
+    // could not optimize |escape call, so fallback to regular plugin
+    if ($compiler->template->caching && ($compiler->tag_nocache | $compiler->nocache)) {
+        $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'file' ] =
+            SMARTY_PLUGINS_DIR . 'modifier.escape.php';
+        $compiler->required_plugins[ 'nocache' ][ 'escape' ][ 'modifier' ][ 'function' ] =
+            'smarty_modifier_escape';
+    } else {
+        $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'file' ] =
+            SMARTY_PLUGINS_DIR . 'modifier.escape.php';
+        $compiler->required_plugins[ 'compiled' ][ 'escape' ][ 'modifier' ][ 'function' ] =
+            'smarty_modifier_escape';
+    }
+    return 'smarty_modifier_escape(' . join(', ', $params) . ')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.from_charset.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.from_charset.php
new file mode 100644
index 000000000..acce7784b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.from_charset.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty from_charset modifier plugin
+ * Type:     modifier
+ * Name:     from_charset
+ * Purpose:  convert character encoding from $charset to internal encoding
+ *
+ * @author Rodney Rehm
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_from_charset($params)
+{
+    if (!Smarty::$_MBSTRING) {
+        // FIXME: (rodneyrehm) shouldn't this throw an error?
+        return $params[ 0 ];
+    }
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = '"ISO-8859-1"';
+    }
+    return 'mb_convert_encoding(' . $params[ 0 ] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[ 1 ] . ')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.indent.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.indent.php
new file mode 100644
index 000000000..636f0edf1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.indent.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty indent modifier plugin
+ * Type:     modifier
+ * Name:     indent
+ * Purpose:  indent lines of text
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
+ * @author Uwe Tews
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_indent($params)
+{
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = 4;
+    }
+    if (!isset($params[ 2 ])) {
+        $params[ 2 ] = "' '";
+    }
+    return 'preg_replace(\'!^!m\',str_repeat(' . $params[ 2 ] . ',' . $params[ 1 ] . '),' . $params[ 0 ] . ')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.json_encode.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.json_encode.php
new file mode 100644
index 000000000..629277f28
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.json_encode.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+function smarty_modifiercompiler_json_encode($params) {
+	return 'json_encode(' . $params[0] . (isset($params[1]) ? ', (int) ' . $params[1] : '') . ')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.lower.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.lower.php
new file mode 100644
index 000000000..4144e5619
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.lower.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty lower modifier plugin
+ * Type:     modifier
+ * Name:     lower
+ * Purpose:  convert string to lowercase
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Uwe Tews
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_lower($params)
+{
+    if (Smarty::$_MBSTRING) {
+        return 'mb_strtolower((string) ' . $params[ 0 ] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
+    }
+    // no MBString fallback
+    return 'strtolower((string) ' . $params[ 0 ] . ')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.nl2br.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.nl2br.php
new file mode 100644
index 000000000..308c00e42
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.nl2br.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty nl2br modifier plugin
+ * Type:     modifier
+ * Name:     nl2br
+ * Purpose:  insert HTML line breaks before all newlines in a string
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.nl2br.tpl nl2br (Smarty online manual)
+  *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_nl2br($params) {
+    return 'nl2br((string) ' . $params[0] . ', (bool) ' . ($params[1] ?? true) . ')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.noprint.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.noprint.php
new file mode 100644
index 000000000..1275190e0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.noprint.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty noprint modifier plugin
+ * Type:     modifier
+ * Name:     noprint
+ * Purpose:  return an empty string
+ *
+ * @author Uwe Tews
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_noprint()
+{
+    return "''";
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.round.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.round.php
new file mode 100644
index 000000000..97f072f00
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.round.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty round modifier plugin
+ * Type:     modifier
+ * Name:     round
+ * Purpose:  Returns the rounded value of num to specified precision (number of digits after the decimal point)
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.round.tpl round (Smarty online manual)
+  *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_round($params) {
+    return 'round((float) ' . $params[0] . ', (int) ' . ($params[1] ?? 0) . ', (int) ' . ($params[2] ?? PHP_ROUND_HALF_UP) . ')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.str_repeat.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.str_repeat.php
new file mode 100644
index 000000000..18eb7a762
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.str_repeat.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty str_repeat modifier plugin
+ * Type:     modifier
+ * Name:     str_repeat
+ * Purpose:  returns string repeated times times
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.str_repeat.tpl str_repeat (Smarty online manual)
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_str_repeat($params) {
+    return 'str_repeat((string) ' . $params[0] . ', (int) ' . $params[1] . ')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.string_format.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.string_format.php
new file mode 100644
index 000000000..8df5632c5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.string_format.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty string_format modifier plugin
+ * Type:     modifier
+ * Name:     string_format
+ * Purpose:  format strings via sprintf
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
+ * @author Uwe Tews
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_string_format($params)
+{
+    return 'sprintf(' . $params[ 1 ] . ',' . $params[ 0 ] . ')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip.php
new file mode 100644
index 000000000..51944bde6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty strip modifier plugin
+ * Type:     modifier
+ * Name:     strip
+ * Purpose:  Replace all repeated spaces, newlines, tabs
+ *              with a single space or supplied replacement string.
+ * Example:  {$var|strip} {$var|strip:"&nbsp;"}
+ * Date:     September 25th, 2002
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
+ * @author Uwe Tews
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_strip($params)
+{
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = "' '";
+    }
+    return "preg_replace('!\s+!" . Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip_tags.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip_tags.php
new file mode 100644
index 000000000..fd6cc7251
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.strip_tags.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty strip_tags modifier plugin
+ * Type:     modifier
+ * Name:     strip_tags
+ * Purpose:  strip html tags from text
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.strip.tags.tpl strip_tags (Smarty online manual)
+ * @author Uwe Tews
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_strip_tags($params)
+{
+    if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') === 'true') {
+        return "preg_replace('!<[^>]*?>!', ' ', (string) {$params[0]})";
+    } else {
+        return 'strip_tags((string) ' . $params[ 0 ] . ')';
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.strlen.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.strlen.php
new file mode 100644
index 000000000..d43e8ef1c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.strlen.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty strlen modifier plugin
+ * Type:     modifier
+ * Name:     strlen
+ * Purpose:  return the length of the given string
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.strlen.tpl strlen (Smarty online manual)
+  *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_strlen($params) {
+    return 'strlen((string) ' . $params[0] . ')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.substr.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.substr.php
new file mode 100644
index 000000000..17721f52b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.substr.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+function smarty_modifiercompiler_substr($params) {
+	return 'substr((string) ' . $params[0] . ', (int) ' . $params[1] .
+		(isset($params[2]) ? ', (int) ' . $params[2] : '') . ')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.to_charset.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.to_charset.php
new file mode 100644
index 000000000..d652eab1b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.to_charset.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty to_charset modifier plugin
+ * Type:     modifier
+ * Name:     to_charset
+ * Purpose:  convert character encoding from internal encoding to $charset
+ *
+ * @author Rodney Rehm
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_to_charset($params)
+{
+    if (!Smarty::$_MBSTRING) {
+        // FIXME: (rodneyrehm) shouldn't this throw an error?
+        return $params[ 0 ];
+    }
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = '"ISO-8859-1"';
+    }
+    return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 1 ] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.unescape.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.unescape.php
new file mode 100644
index 000000000..9e1f06d67
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.unescape.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty unescape modifier plugin
+ * Type:     modifier
+ * Name:     unescape
+ * Purpose:  unescape html entities
+ *
+ * @author Rodney Rehm
+ *
+ * @param array $params parameters
+ * @param Smarty_Internal_TemplateCompilerBase $compiler
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_unescape($params, Smarty_Internal_TemplateCompilerBase $compiler)
+{
+    $compiler->template->_checkPlugins(
+        array(
+            array(
+                'function' => 'smarty_literal_compiler_param',
+                'file'     => SMARTY_PLUGINS_DIR . 'shared.literal_compiler_param.php'
+            )
+        )
+    );
+
+    $esc_type = smarty_literal_compiler_param($params, 1, 'html');
+
+    if (!isset($params[ 2 ])) {
+        $params[ 2 ] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
+    }
+
+    switch ($esc_type) {
+        case 'entity':
+        case 'htmlall':
+            if (Smarty::$_MBSTRING) {
+                return 'html_entity_decode(mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'UTF-8\'), ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, ' . $params[ 2 ] . ')';
+            }
+            return 'html_entity_decode(' . $params[ 0 ] . ', ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, ' . $params[ 2 ] . ')';
+        case 'html':
+            return 'htmlspecialchars_decode(' . $params[ 0 ] . ', ENT_QUOTES)';
+        case 'url':
+            return 'rawurldecode(' . $params[ 0 ] . ')';
+        default:
+            return $params[ 0 ];
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.upper.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.upper.php
new file mode 100644
index 000000000..96030518e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.upper.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty upper modifier plugin
+ * Type:     modifier
+ * Name:     lower
+ * Purpose:  convert string to uppercase
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
+ * @author Uwe Tews
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_upper($params)
+{
+    if (Smarty::$_MBSTRING) {
+        return 'mb_strtoupper((string) ' . $params[ 0 ] . ' ?? \'\', \'' . addslashes(Smarty::$_CHARSET) . '\')';
+    }
+    // no MBString fallback
+    return 'strtoupper((string) ' . $params[ 0 ] . ' ?? \'\')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.wordwrap.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.wordwrap.php
new file mode 100644
index 000000000..49cb40b0f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/modifiercompiler.wordwrap.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty wordwrap modifier plugin
+ * Type:     modifier
+ * Name:     wordwrap
+ * Purpose:  wrap a string of text at a given length
+ *
+ * @link   https://www.smarty.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
+ * @author Uwe Tews
+ *
+ * @param array                                 $params parameters
+ * @param \Smarty_Internal_TemplateCompilerBase $compiler
+ *
+ * @return string with compiled code
+ * @throws \SmartyException
+ */
+function smarty_modifiercompiler_wordwrap($params, Smarty_Internal_TemplateCompilerBase $compiler)
+{
+    if (!isset($params[ 1 ])) {
+        $params[ 1 ] = 80;
+    }
+    if (!isset($params[ 2 ])) {
+        $params[ 2 ] = '"\n"';
+    }
+    if (!isset($params[ 3 ])) {
+        $params[ 3 ] = 'false';
+    }
+    $function = 'wordwrap';
+    if (Smarty::$_MBSTRING) {
+        $function = $compiler->getPlugin('mb_wordwrap', 'modifier');
+    }
+    return $function . '(' . $params[ 0 ] . ',' . $params[ 1 ] . ',' . $params[ 2 ] . ',' . $params[ 3 ] . ')';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/outputfilter.trimwhitespace.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/outputfilter.trimwhitespace.php
new file mode 100644
index 000000000..180cdd081
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/outputfilter.trimwhitespace.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsFilter
+ */
+/**
+ * Smarty trimwhitespace outputfilter plugin
+ * Trim unnecessary whitespace from HTML markup.
+ *
+ * @author Rodney Rehm
+ *
+ * @param string $source input string
+ *
+ * @return string filtered output
+ * @todo   substr_replace() is not overloaded by mbstring.func_overload - so this function might fail!
+ */
+function smarty_outputfilter_trimwhitespace($source)
+{
+    $store = array();
+    $_store = 0;
+    $_offset = 0;
+    // Unify Line-Breaks to \n
+    $source = preg_replace('/\015\012|\015|\012/', "\n", $source);
+    // capture Internet Explorer and KnockoutJS Conditional Comments
+    if (preg_match_all(
+        '#<!--((\[[^\]]+\]>.*?<!\[[^\]]+\])|(\s*/?ko\s+.+))-->#is',
+        $source,
+        $matches,
+        PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+    )
+    ) {
+        foreach ($matches as $match) {
+            $store[] = $match[ 0 ][ 0 ];
+            $_length = strlen($match[ 0 ][ 0 ]);
+            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+            $_offset += $_length - strlen($replace);
+            $_store++;
+        }
+    }
+    // Strip all HTML-Comments
+    // yes, even the ones in <script> - see https://stackoverflow.com/a/808850/515124
+    $source = preg_replace('#<!--.*?-->#ms', '', $source);
+    // capture html elements not to be messed with
+    $_offset = 0;
+    if (preg_match_all(
+        '#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+        $source,
+        $matches,
+        PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+    )
+    ) {
+        foreach ($matches as $match) {
+            $store[] = $match[ 0 ][ 0 ];
+            $_length = strlen($match[ 0 ][ 0 ]);
+            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+            $_offset += $_length - strlen($replace);
+            $_store++;
+        }
+    }
+    $expressions = array(// replace multiple spaces between tags by a single space
+                         // can't remove them entirely, because that might break poorly implemented CSS display:inline-block elements
+                         '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s'                                    => '\1 \2',
+                         // remove spaces between attributes (but not in attribute values!)
+                         '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
+                         // note: for some very weird reason trim() seems to remove spaces inside attributes.
+                         // maybe a \0 byte or something is interfering?
+                         '#^\s+<#Ss'                                                               => '<',
+                         '#>\s+$#Ss'                                                               => '>',
+    );
+    $source = preg_replace(array_keys($expressions), array_values($expressions), $source);
+    // note: for some very weird reason trim() seems to remove spaces inside attributes.
+    // maybe a \0 byte or something is interfering?
+    // $source = trim( $source );
+    $_offset = 0;
+    if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+        foreach ($matches as $match) {
+            $_length = strlen($match[ 0 ][ 0 ]);
+            $replace = $store[ $match[ 1 ][ 0 ] ];
+            $source = substr_replace($source, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
+            $_offset += strlen($replace) - $_length;
+            $_store++;
+        }
+    }
+    return $source;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/shared.escape_special_chars.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/shared.escape_special_chars.php
new file mode 100644
index 000000000..355b02b57
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/shared.escape_special_chars.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Smarty shared plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsShared
+ */
+/**
+ * escape_special_chars common function
+ * Function: smarty_function_escape_special_chars
+ * Purpose:  used by other smarty functions to escape
+ *           special chars except for already escaped ones
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string $string text that should by escaped
+ *
+ * @return string
+ */
+function smarty_function_escape_special_chars($string)
+{
+    if (!is_array($string)) {
+        $string = htmlspecialchars((string) $string, ENT_COMPAT, Smarty::$_CHARSET, false);
+    }
+    return $string;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/shared.literal_compiler_param.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/shared.literal_compiler_param.php
new file mode 100644
index 000000000..65caf03c8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/shared.literal_compiler_param.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsShared
+ */
+/**
+ * evaluate compiler parameter
+ *
+ * @param array   $params  parameter array as given to the compiler function
+ * @param integer $index   array index of the parameter to convert
+ * @param mixed   $default value to be returned if the parameter is not present
+ *
+ * @return mixed evaluated value of parameter or $default
+ * @throws SmartyException if parameter is not a literal (but an expression, variable, …)
+ * @author Rodney Rehm
+ */
+function smarty_literal_compiler_param($params, $index, $default = null)
+{
+    // not set, go default
+    if (!isset($params[ $index ])) {
+        return $default;
+    }
+    // test if param is a literal
+    if (!preg_match('/^([\'"]?)[a-zA-Z0-9-]+(\\1)$/', $params[ $index ])) {
+        throw new SmartyException(
+            '$param[' . $index .
+            '] is not a literal and is thus not evaluatable at compile time'
+        );
+    }
+    $t = null;
+    eval("\$t = " . $params[ $index ] . ";");
+    return $t;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/shared.make_timestamp.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/shared.make_timestamp.php
new file mode 100644
index 000000000..9626dc68e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/shared.make_timestamp.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Smarty shared plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsShared
+ */
+/**
+ * Function: smarty_make_timestamp
+ * Purpose:  used by other smarty functions to make a timestamp from a string.
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime()
+ *
+ * @return int
+ */
+function smarty_make_timestamp($string)
+{
+    if (empty($string)) {
+        // use "now":
+        return time();
+    } elseif ($string instanceof DateTime
+              || (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface)
+    ) {
+        return (int)$string->format('U'); // PHP 5.2 BC
+    } elseif (strlen($string) === 14 && ctype_digit($string)) {
+        // it is mysql timestamp format of YYYYMMDDHHMMSS?
+        return mktime(
+            substr($string, 8, 2),
+            substr($string, 10, 2),
+            substr($string, 12, 2),
+            substr($string, 4, 2),
+            substr($string, 6, 2),
+            substr($string, 0, 4)
+        );
+    } elseif (is_numeric($string)) {
+        // it is a numeric string, we handle it as timestamp
+        return (int)$string;
+    } else {
+        // strtotime should handle it
+        $time = strtotime($string);
+        if ($time === -1 || $time === false) {
+            // strtotime() was not able to parse $string, use "now":
+            return time();
+        }
+        return $time;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/shared.mb_str_replace.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/shared.mb_str_replace.php
new file mode 100644
index 000000000..7e85f7aae
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/shared.mb_str_replace.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Smarty shared plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsShared
+ */
+if (!function_exists('smarty_mb_str_replace')) {
+    /**
+     * Multibyte string replace
+     *
+     * @param string|string[] $search  the string to be searched
+     * @param string|string[] $replace the replacement string
+     * @param string          $subject the source string
+     * @param int             &$count  number of matches found
+     *
+     * @return string replaced string
+     * @author Rodney Rehm
+     */
+    function smarty_mb_str_replace($search, $replace, $subject, &$count = 0)
+    {
+        if (!is_array($search) && is_array($replace)) {
+            return false;
+        }
+        if (is_array($subject)) {
+            // call mb_replace for each single string in $subject
+            foreach ($subject as &$string) {
+                $string = smarty_mb_str_replace($search, $replace, $string, $c);
+                $count += $c;
+            }
+        } elseif (is_array($search)) {
+            if (!is_array($replace)) {
+                foreach ($search as &$string) {
+                    $subject = smarty_mb_str_replace($string, $replace, $subject, $c);
+                    $count += $c;
+                }
+            } else {
+                $n = max(count($search), count($replace));
+                while ($n--) {
+                    $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
+                    $count += $c;
+                    next($search);
+                    next($replace);
+                }
+            }
+        } else {
+            $mb_reg_charset = mb_regex_encoding();
+            // Check if mbstring regex is using UTF-8
+            $reg_is_unicode = !strcasecmp($mb_reg_charset, "UTF-8");
+            if(!$reg_is_unicode) {
+                // ...and set to UTF-8 if not
+                mb_regex_encoding("UTF-8");
+            }
+
+            // See if charset used by Smarty is matching one used by regex...
+            $current_charset = mb_regex_encoding();
+            $convert_result = (bool)strcasecmp(Smarty::$_CHARSET, $current_charset);
+            if($convert_result) {
+                // ...convert to it if not.
+                $subject = mb_convert_encoding($subject, $current_charset, Smarty::$_CHARSET);
+                $search = mb_convert_encoding($search, $current_charset, Smarty::$_CHARSET);
+                $replace = mb_convert_encoding($replace, $current_charset, Smarty::$_CHARSET);
+            }
+
+            $parts = mb_split(preg_quote($search), $subject ?? "") ?: array();
+            // If original regex encoding was not unicode...
+            if(!$reg_is_unicode) {
+                // ...restore original regex encoding to avoid breaking the system.
+                mb_regex_encoding($mb_reg_charset);
+            }
+            if($parts === false) {
+                // This exception is thrown if call to mb_split failed.
+                // Usually it happens, when $search or $replace are not valid for given mb_regex_encoding().
+                // There may be other cases for it to fail, please file an issue if you find a reproducible one.
+                throw new SmartyException("Source string is not a valid $current_charset sequence (probably)");
+            }
+
+            $count = count($parts) - 1;
+            $subject = implode($replace, $parts);
+            // Convert results back to charset used by Smarty, if needed.
+            if($convert_result) {
+                $subject = mb_convert_encoding($subject, Smarty::$_CHARSET, $current_charset);
+            }
+        }
+        return $subject;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/shared.mb_unicode.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/shared.mb_unicode.php
new file mode 100644
index 000000000..7d1206506
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/shared.mb_unicode.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Smarty shared plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsShared
+ */
+/**
+ * convert characters to their decimal unicode equivalents
+ *
+ * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ *
+ * @param string $string   characters to calculate unicode of
+ * @param string $encoding encoding of $string, if null mb_internal_encoding() is used
+ *
+ * @return array sequence of unicodes
+ * @author Rodney Rehm
+ */
+function smarty_mb_to_unicode($string, $encoding = null)
+{
+    if ($encoding) {
+        $expanded = mb_convert_encoding($string, 'UTF-32BE', $encoding);
+    } else {
+        $expanded = mb_convert_encoding($string, 'UTF-32BE');
+    }
+    return unpack('N*', $expanded);
+}
+
+/**
+ * convert unicodes to the character of given encoding
+ *
+ * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+ *
+ * @param integer|array $unicode  single unicode or list of unicodes to convert
+ * @param string        $encoding encoding of returned string, if null mb_internal_encoding() is used
+ *
+ * @return string unicode as character sequence in given $encoding
+ * @author Rodney Rehm
+ */
+function smarty_mb_from_unicode($unicode, $encoding = null)
+{
+    $t = '';
+    if (!$encoding) {
+        $encoding = mb_internal_encoding();
+    }
+    foreach ((array)$unicode as $utf32be) {
+        $character = pack('N*', $utf32be);
+        $t .= mb_convert_encoding($character, $encoding, 'UTF-32BE');
+    }
+    return $t;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/variablefilter.htmlspecialchars.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/variablefilter.htmlspecialchars.php
new file mode 100644
index 000000000..2eb12d20a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/plugins/variablefilter.htmlspecialchars.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsFilter
+ */
+/**
+ * Smarty htmlspecialchars variablefilter plugin
+ *
+ * @param string                    $source input string
+ * @param \Smarty_Internal_Template $template
+ *
+ * @return string filtered output
+ */
+function smarty_variablefilter_htmlspecialchars($source, Smarty_Internal_Template $template)
+{
+    return htmlspecialchars((string) $source, ENT_QUOTES, Smarty::$_CHARSET);
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource.php
new file mode 100644
index 000000000..db68f9bfd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * Smarty Internal Plugin
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ */
+
+/**
+ * Cache Handler API
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ * @author     Rodney Rehm
+ */
+abstract class Smarty_CacheResource
+{
+    /**
+     * resource types provided by the core
+     *
+     * @var array
+     */
+    protected static $sysplugins = array('file' => 'smarty_internal_cacheresource_file.php',);
+
+    /**
+     * populate Cached Object with meta data from Resource
+     *
+     * @param \Smarty_Template_Cached  $cached    cached object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    abstract public function populate(\Smarty_Template_Cached $cached, Smarty_Internal_Template $_template);
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return void
+     */
+    abstract public function populateTimestamp(Smarty_Template_Cached $cached);
+
+    /**
+     * Read the cached template and process header
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param boolean                  $update    flag if called because cache update
+     *
+     * @return boolean true or false if the cached content does not exist
+     */
+    abstract public function process(
+        Smarty_Internal_Template $_template,
+        Smarty_Template_Cached $cached = null,
+        $update = false
+    );
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return boolean success
+     */
+    abstract public function writeCachedContent(Smarty_Internal_Template $_template, $content);
+
+    /**
+     * Read cached template from cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string  content
+     */
+    abstract public function readCachedContent(Smarty_Internal_Template $_template);
+
+    /**
+     * Return cached content
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return null|string
+     */
+    public function getCachedContent(Smarty_Internal_Template $_template)
+    {
+        if ($_template->cached->handler->process($_template)) {
+            ob_start();
+            $unifunc = $_template->cached->unifunc;
+            $unifunc($_template);
+            return ob_get_clean();
+        }
+        return null;
+    }
+
+    /**
+     * Empty cache
+     *
+     * @param Smarty  $smarty   Smarty object
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    abstract public function clearAll(Smarty $smarty, $exp_time = null);
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty        Smarty object
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    abstract public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time);
+
+    /**
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool|null
+     */
+    public function locked(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        // theoretically locking_timeout should be checked against time_limit (max_execution_time)
+        $start = microtime(true);
+        $hadLock = null;
+        while ($this->hasLock($smarty, $cached)) {
+            $hadLock = true;
+            if (microtime(true) - $start > $smarty->locking_timeout) {
+                // abort waiting for lock release
+                return false;
+            }
+            sleep(1);
+        }
+        return $hadLock;
+    }
+
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool
+     */
+    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        // check if lock exists
+        return false;
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool
+     */
+    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        // create lock
+        return true;
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return bool
+     */
+    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        // release lock
+        return true;
+    }
+
+    /**
+     * Load Cache Resource Handler
+     *
+     * @param Smarty $smarty Smarty object
+     * @param string $type   name of the cache resource
+     *
+     * @throws SmartyException
+     * @return Smarty_CacheResource Cache Resource Handler
+     */
+    public static function load(Smarty $smarty, $type = null)
+    {
+        if (!isset($type)) {
+            $type = $smarty->caching_type;
+        }
+        // try smarty's cache
+        if (isset($smarty->_cache[ 'cacheresource_handlers' ][ $type ])) {
+            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ];
+        }
+        // try registered resource
+        if (isset($smarty->registered_cache_resources[ $type ])) {
+            // do not cache these instances as they may vary from instance to instance
+            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = $smarty->registered_cache_resources[ $type ];
+        }
+        // try sysplugins dir
+        if (isset(self::$sysplugins[ $type ])) {
+            $cache_resource_class = 'Smarty_Internal_CacheResource_' . smarty_ucfirst_ascii($type);
+            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = new $cache_resource_class();
+        }
+        // try plugins dir
+        $cache_resource_class = 'Smarty_CacheResource_' . smarty_ucfirst_ascii($type);
+        if ($smarty->loadPlugin($cache_resource_class)) {
+            return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = new $cache_resource_class();
+        }
+        // give up
+        throw new SmartyException("Unable to load cache resource '{$type}'");
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource_custom.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource_custom.php
new file mode 100644
index 000000000..68ad11289
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource_custom.php
@@ -0,0 +1,297 @@
+<?php
+/**
+ * Smarty Internal Plugin
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ */
+
+/**
+ * Cache Handler API
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ * @author     Rodney Rehm
+ */
+abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource
+{
+    /**
+     * fetch cached content and its modification time from data source
+     *
+     * @param string  $id         unique cache content identifier
+     * @param string  $name       template name
+     * @param string  $cache_id   cache id
+     * @param string  $compile_id compile id
+     * @param string  $content    cached content
+     * @param integer $mtime      cache modification timestamp (epoch)
+     *
+     * @return void
+     */
+    abstract protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime);
+
+    /**
+     * Fetch cached content's modification timestamp from data source
+     * {@internal implementing this method is optional.
+     *  Only implement it if modification times can be accessed faster than loading the complete cached content.}}
+     *
+     * @param string $id         unique cache content identifier
+     * @param string $name       template name
+     * @param string $cache_id   cache id
+     * @param string $compile_id compile id
+     *
+     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+     */
+    protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
+    {
+        return false;
+    }
+
+    /**
+     * Save content to cache
+     *
+     * @param string       $id         unique cache content identifier
+     * @param string       $name       template name
+     * @param string       $cache_id   cache id
+     * @param string       $compile_id compile id
+     * @param integer|null $exp_time   seconds till expiration or null
+     * @param string       $content    content to cache
+     *
+     * @return boolean      success
+     */
+    abstract protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content);
+
+    /**
+     * Delete content from cache
+     *
+     * @param string|null  $name       template name
+     * @param string|null  $cache_id   cache id
+     * @param string|null  $compile_id compile id
+     * @param integer|null $exp_time   seconds till expiration time in seconds or null
+     *
+     * @return integer      number of deleted caches
+     */
+    abstract protected function delete($name, $cache_id, $compile_id, $exp_time);
+
+    /**
+     * populate Cached Object with meta data from Resource
+     *
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
+    {
+        $_cache_id = isset($cached->cache_id) ? preg_replace('![^\w\|]+!', '_', $cached->cache_id) : null;
+        $_compile_id = isset($cached->compile_id) ? preg_replace('![^\w]+!', '_', $cached->compile_id) : null;
+        $path = $cached->source->uid . $_cache_id . $_compile_id;
+        $cached->filepath = sha1($path);
+        if ($_template->smarty->cache_locking) {
+            $cached->lock_id = sha1('lock.' . $path);
+        }
+        $this->populateTimestamp($cached);
+    }
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Cached $cached
+     *
+     * @return void
+     */
+    public function populateTimestamp(Smarty_Template_Cached $cached)
+    {
+        $mtime =
+            $this->fetchTimestamp($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id);
+        if ($mtime !== null) {
+            $cached->timestamp = $mtime;
+            $cached->exists = !!$cached->timestamp;
+            return;
+        }
+        $timestamp = null;
+        $this->fetch(
+            $cached->filepath,
+            $cached->source->name,
+            $cached->cache_id,
+            $cached->compile_id,
+            $cached->content,
+            $timestamp
+        );
+        $cached->timestamp = isset($timestamp) ? $timestamp : false;
+        $cached->exists = !!$cached->timestamp;
+    }
+
+    /**
+     * Read the cached template and process the header
+     *
+     * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+     * @param Smarty_Template_Cached    $cached      cached object
+     * @param boolean                   $update      flag if called because cache update
+     *
+     * @return boolean                 true or false if the cached content does not exist
+     */
+    public function process(
+        Smarty_Internal_Template $_smarty_tpl,
+        Smarty_Template_Cached $cached = null,
+        $update = false
+    ) {
+        if (!$cached) {
+            $cached = $_smarty_tpl->cached;
+        }
+        $content = $cached->content ? $cached->content : null;
+        $timestamp = $cached->timestamp ? $cached->timestamp : null;
+        if ($content === null || !$timestamp) {
+            $this->fetch(
+                $_smarty_tpl->cached->filepath,
+                $_smarty_tpl->source->name,
+                $_smarty_tpl->cache_id,
+                $_smarty_tpl->compile_id,
+                $content,
+                $timestamp
+            );
+        }
+        if (isset($content)) {
+            eval('?>' . $content);
+            $cached->content = null;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return boolean                  success
+     */
+    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
+    {
+        return $this->save(
+            $_template->cached->filepath,
+            $_template->source->name,
+            $_template->cache_id,
+            $_template->compile_id,
+            $_template->cache_lifetime,
+            $content
+        );
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string|boolean  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        $content = $_template->cached->content ? $_template->cached->content : null;
+        $timestamp = null;
+        if ($content === null) {
+            $timestamp = null;
+            $this->fetch(
+                $_template->cached->filepath,
+                $_template->source->name,
+                $_template->cache_id,
+                $_template->compile_id,
+                $content,
+                $timestamp
+            );
+        }
+        if (isset($content)) {
+            return $content;
+        }
+        return false;
+    }
+
+    /**
+     * Empty cache
+     *
+     * @param Smarty  $smarty   Smarty object
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clearAll(Smarty $smarty, $exp_time = null)
+    {
+        return $this->delete(null, null, null, $exp_time);
+    }
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty        Smarty object
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return int number of cache files deleted
+     * @throws \SmartyException
+     */
+    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        $cache_name = null;
+        if (isset($resource_name)) {
+            $source = Smarty_Template_Source::load(null, $smarty, $resource_name);
+            if ($source->exists) {
+                $cache_name = $source->name;
+            } else {
+                return 0;
+            }
+        }
+        return $this->delete($cache_name, $cache_id, $compile_id, $exp_time);
+    }
+
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return boolean               true or false if cache is locked
+     */
+    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $id = $cached->lock_id;
+        $name = $cached->source->name . '.lock';
+        $mtime = $this->fetchTimestamp($id, $name, $cached->cache_id, $cached->compile_id);
+        if ($mtime === null) {
+            $this->fetch($id, $name, $cached->cache_id, $cached->compile_id, $content, $mtime);
+        }
+        return $mtime && ($t = time()) - $mtime < $smarty->locking_timeout;
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = true;
+        $id = $cached->lock_id;
+        $name = $cached->source->name . '.lock';
+        $this->save($id, $name, $cached->cache_id, $cached->compile_id, $smarty->locking_timeout, '');
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = false;
+        $name = $cached->source->name . '.lock';
+        $this->delete($name, $cached->cache_id, $cached->compile_id, null);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
new file mode 100644
index 000000000..4b1c0f6d8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
@@ -0,0 +1,538 @@
+<?php
+/**
+ * Smarty Internal Plugin
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ */
+
+/**
+ * Smarty Cache Handler Base for Key/Value Storage Implementations
+ * This class implements the functionality required to use simple key/value stores
+ * for hierarchical cache groups. key/value stores like memcache or APC do not support
+ * wildcards in keys, therefore a cache group cannot be cleared like "a|*" - which
+ * is no problem to filesystem and RDBMS implementations.
+ * This implementation is based on the concept of invalidation. While one specific cache
+ * can be identified and cleared, any range of caches cannot be identified. For this reason
+ * each level of the cache group hierarchy can have its own value in the store. These values
+ * are nothing but microtimes, telling us when a particular cache group was cleared for the
+ * last time. These keys are evaluated for every cache read to determine if the cache has
+ * been invalidated since it was created and should hence be treated as inexistent.
+ * Although deep hierarchies are possible, they are not recommended. Try to keep your
+ * cache groups as shallow as possible. Anything up 3-5 parents should be ok. So
+ * »a|b|c« is a good depth where »a|b|c|d|e|f|g|h|i|j|k« isn't. Try to join correlating
+ * cache groups: if your cache groups look somewhat like »a|b|$page|$items|$whatever«
+ * consider using »a|b|c|$page-$items-$whatever« instead.
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ * @author     Rodney Rehm
+ */
+abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource
+{
+    /**
+     * cache for contents
+     *
+     * @var array
+     */
+    protected $contents = array();
+
+    /**
+     * cache for timestamps
+     *
+     * @var array
+     */
+    protected $timestamps = array();
+
+    /**
+     * populate Cached Object with meta data from Resource
+     *
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
+    {
+        $cached->filepath = $_template->source->uid . '#' . $this->sanitize($cached->source->resource) . '#' .
+                            $this->sanitize($cached->cache_id) . '#' . $this->sanitize($cached->compile_id);
+        $this->populateTimestamp($cached);
+    }
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return void
+     */
+    public function populateTimestamp(Smarty_Template_Cached $cached)
+    {
+        if (!$this->fetch(
+            $cached->filepath,
+            $cached->source->name,
+            $cached->cache_id,
+            $cached->compile_id,
+            $content,
+            $timestamp,
+            $cached->source->uid
+        )
+        ) {
+            return;
+        }
+        $cached->content = $content;
+        $cached->timestamp = (int)$timestamp;
+        $cached->exists = !!$cached->timestamp;
+    }
+
+    /**
+     * Read the cached template and process the header
+     *
+     * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+     * @param Smarty_Template_Cached    $cached      cached object
+     * @param boolean                   $update      flag if called because cache update
+     *
+     * @return boolean                 true or false if the cached content does not exist
+     */
+    public function process(
+        Smarty_Internal_Template $_smarty_tpl,
+        Smarty_Template_Cached $cached = null,
+        $update = false
+    ) {
+        if (!$cached) {
+            $cached = $_smarty_tpl->cached;
+        }
+        $content = $cached->content ? $cached->content : null;
+        $timestamp = $cached->timestamp ? $cached->timestamp : null;
+        if ($content === null || !$timestamp) {
+            if (!$this->fetch(
+                $_smarty_tpl->cached->filepath,
+                $_smarty_tpl->source->name,
+                $_smarty_tpl->cache_id,
+                $_smarty_tpl->compile_id,
+                $content,
+                $timestamp,
+                $_smarty_tpl->source->uid
+            )
+            ) {
+                return false;
+            }
+        }
+        if (isset($content)) {
+            eval('?>' . $content);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return boolean                  success
+     */
+    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
+    {
+        $this->addMetaTimestamp($content);
+        return $this->write(array($_template->cached->filepath => $content), $_template->cache_lifetime);
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string|false  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        $content = $_template->cached->content ? $_template->cached->content : null;
+        $timestamp = null;
+        if ($content === null) {
+            if (!$this->fetch(
+                $_template->cached->filepath,
+                $_template->source->name,
+                $_template->cache_id,
+                $_template->compile_id,
+                $content,
+                $timestamp,
+                $_template->source->uid
+            )
+            ) {
+                return false;
+            }
+        }
+        if (isset($content)) {
+            return $content;
+        }
+        return false;
+    }
+
+    /**
+     * Empty cache
+     * {@internal the $exp_time argument is ignored altogether }}
+     *
+     * @param Smarty  $smarty   Smarty object
+     * @param integer $exp_time expiration time [being ignored]
+     *
+     * @return integer number of cache files deleted [always -1]
+     * @uses   purge() to clear the whole store
+     * @uses   invalidate() to mark everything outdated if purge() is inapplicable
+     */
+    public function clearAll(Smarty $smarty, $exp_time = null)
+    {
+        if (!$this->purge()) {
+            $this->invalidate(null);
+        }
+        return -1;
+    }
+
+    /**
+     * Empty cache for a specific template
+     * {@internal the $exp_time argument is ignored altogether}}
+     *
+     * @param Smarty  $smarty        Smarty object
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time [being ignored]
+     *
+     * @return int number of cache files deleted [always -1]
+     * @throws \SmartyException
+     * @uses   buildCachedFilepath() to generate the CacheID
+     * @uses   invalidate() to mark CacheIDs parent chain as outdated
+     * @uses   delete() to remove CacheID from cache
+     */
+    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        $uid = $this->getTemplateUid($smarty, $resource_name);
+        $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' .
+               $this->sanitize($compile_id);
+        $this->delete(array($cid));
+        $this->invalidate($cid, $resource_name, $cache_id, $compile_id, $uid);
+        return -1;
+    }
+
+    /**
+     * Get template's unique ID
+     *
+     * @param Smarty $smarty        Smarty object
+     * @param string $resource_name template name
+     *
+     * @return string filepath of cache file
+     * @throws \SmartyException
+     */
+    protected function getTemplateUid(Smarty $smarty, $resource_name)
+    {
+        if (isset($resource_name)) {
+            $source = Smarty_Template_Source::load(null, $smarty, $resource_name);
+            if ($source->exists) {
+                return $source->uid;
+            }
+        }
+        return '';
+    }
+
+    /**
+     * Sanitize CacheID components
+     *
+     * @param string $string CacheID component to sanitize
+     *
+     * @return string sanitized CacheID component
+     */
+    protected function sanitize($string)
+    {
+        $string = trim((string)$string, '|');
+        if (!$string) {
+            return '';
+        }
+        return preg_replace('#[^\w\|]+#S', '_', $string);
+    }
+
+    /**
+     * Fetch and prepare a cache object.
+     *
+     * @param string  $cid           CacheID to fetch
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param string  $content       cached content
+     * @param integer &$timestamp    cached timestamp (epoch)
+     * @param string  $resource_uid  resource's uid
+     *
+     * @return boolean success
+     */
+    protected function fetch(
+        $cid,
+        $resource_name = null,
+        $cache_id = null,
+        $compile_id = null,
+        &$content = null,
+        &$timestamp = null,
+        $resource_uid = null
+    ) {
+        $t = $this->read(array($cid));
+        $content = !empty($t[ $cid ]) ? $t[ $cid ] : null;
+        $timestamp = null;
+        if ($content && ($timestamp = $this->getMetaTimestamp($content))) {
+            $invalidated =
+                $this->getLatestInvalidationTimestamp($cid, $resource_name, $cache_id, $compile_id, $resource_uid);
+            if ($invalidated > $timestamp) {
+                $timestamp = null;
+                $content = null;
+            }
+        }
+        return !!$content;
+    }
+
+    /**
+     * Add current microtime to the beginning of $cache_content
+     * {@internal the header uses 8 Bytes, the first 4 Bytes are the seconds, the second 4 Bytes are the microseconds}}
+     *
+     * @param string &$content the content to be cached
+     */
+    protected function addMetaTimestamp(&$content)
+    {
+        $mt = explode(' ', microtime());
+        $ts = pack('NN', $mt[ 1 ], (int)($mt[ 0 ] * 100000000));
+        $content = $ts . $content;
+    }
+
+    /**
+     * Extract the timestamp the $content was cached
+     *
+     * @param string &$content the cached content
+     *
+     * @return float  the microtime the content was cached
+     */
+    protected function getMetaTimestamp(&$content)
+    {
+        extract(unpack('N1s/N1m/a*content', $content));
+        /**
+         * @var  int $s
+         * @var  int $m
+         */
+        return $s + ($m / 100000000);
+    }
+
+    /**
+     * Invalidate CacheID
+     *
+     * @param string $cid           CacheID
+     * @param string $resource_name template name
+     * @param string $cache_id      cache id
+     * @param string $compile_id    compile id
+     * @param string $resource_uid  source's uid
+     *
+     * @return void
+     */
+    protected function invalidate(
+        $cid = null,
+        $resource_name = null,
+        $cache_id = null,
+        $compile_id = null,
+        $resource_uid = null
+    ) {
+        $now = microtime(true);
+        $key = null;
+        // invalidate everything
+        if (!$resource_name && !$cache_id && !$compile_id) {
+            $key = 'IVK#ALL';
+        } // invalidate all caches by template
+        else {
+            if ($resource_name && !$cache_id && !$compile_id) {
+                $key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name);
+            } // invalidate all caches by cache group
+            else {
+                if (!$resource_name && $cache_id && !$compile_id) {
+                    $key = 'IVK#CACHE#' . $this->sanitize($cache_id);
+                } // invalidate all caches by compile id
+                else {
+                    if (!$resource_name && !$cache_id && $compile_id) {
+                        $key = 'IVK#COMPILE#' . $this->sanitize($compile_id);
+                    } // invalidate by combination
+                    else {
+                        $key = 'IVK#CID#' . $cid;
+                    }
+                }
+            }
+        }
+        $this->write(array($key => $now));
+    }
+
+    /**
+     * Determine the latest timestamp known to the invalidation chain
+     *
+     * @param string $cid           CacheID to determine latest invalidation timestamp of
+     * @param string $resource_name template name
+     * @param string $cache_id      cache id
+     * @param string $compile_id    compile id
+     * @param string $resource_uid  source's filepath
+     *
+     * @return float  the microtime the CacheID was invalidated
+     */
+    protected function getLatestInvalidationTimestamp(
+        $cid,
+        $resource_name = null,
+        $cache_id = null,
+        $compile_id = null,
+        $resource_uid = null
+    ) {
+        // abort if there is no CacheID
+        if (false && !$cid) {
+            return 0;
+        }
+        // abort if there are no InvalidationKeys to check
+        if (!($_cid = $this->listInvalidationKeys($cid, $resource_name, $cache_id, $compile_id, $resource_uid))) {
+            return 0;
+        }
+        // there are no InValidationKeys
+        if (!($values = $this->read($_cid))) {
+            return 0;
+        }
+        // make sure we're dealing with floats
+        $values = array_map('floatval', $values);
+        return max($values);
+    }
+
+    /**
+     * Translate a CacheID into the list of applicable InvalidationKeys.
+     * Splits 'some|chain|into|an|array' into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... )
+     *
+     * @param string $cid           CacheID to translate
+     * @param string $resource_name template name
+     * @param string $cache_id      cache id
+     * @param string $compile_id    compile id
+     * @param string $resource_uid  source's filepath
+     *
+     * @return array  list of InvalidationKeys
+     * @uses   $invalidationKeyPrefix to prepend to each InvalidationKey
+     */
+    protected function listInvalidationKeys(
+        $cid,
+        $resource_name = null,
+        $cache_id = null,
+        $compile_id = null,
+        $resource_uid = null
+    ) {
+        $t = array('IVK#ALL');
+        $_name = $_compile = '#';
+        if ($resource_name) {
+            $_name .= $resource_uid . '#' . $this->sanitize($resource_name);
+            $t[] = 'IVK#TEMPLATE' . $_name;
+        }
+        if ($compile_id) {
+            $_compile .= $this->sanitize($compile_id);
+            $t[] = 'IVK#COMPILE' . $_compile;
+        }
+        $_name .= '#';
+        $cid = trim((string)$cache_id, '|');
+        if (!$cid) {
+            return $t;
+        }
+        $i = 0;
+        while (true) {
+            // determine next delimiter position
+            $i = strpos($cid, '|', $i);
+            // add complete CacheID if there are no more delimiters
+            if ($i === false) {
+                $t[] = 'IVK#CACHE#' . $cid;
+                $t[] = 'IVK#CID' . $_name . $cid . $_compile;
+                $t[] = 'IVK#CID' . $_name . $_compile;
+                break;
+            }
+            $part = substr($cid, 0, $i);
+            // add slice to list
+            $t[] = 'IVK#CACHE#' . $part;
+            $t[] = 'IVK#CID' . $_name . $part . $_compile;
+            // skip past delimiter position
+            $i++;
+        }
+        return $t;
+    }
+
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return boolean               true or false if cache is locked
+     */
+    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $key = 'LOCK#' . $cached->filepath;
+        $data = $this->read(array($key));
+        return $data && time() - $data[ $key ] < $smarty->locking_timeout;
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = true;
+        $key = 'LOCK#' . $cached->filepath;
+        $this->write(array($key => time()), $smarty->locking_timeout);
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = false;
+        $key = 'LOCK#' . $cached->filepath;
+        $this->delete(array($key));
+    }
+
+    /**
+     * Read values for a set of keys from cache
+     *
+     * @param array $keys list of keys to fetch
+     *
+     * @return array list of values with the given keys used as indexes
+     */
+    abstract protected function read(array $keys);
+
+    /**
+     * Save values for a set of keys to cache
+     *
+     * @param array $keys   list of values to save
+     * @param int   $expire expiration time
+     *
+     * @return boolean true on success, false on failure
+     */
+    abstract protected function write(array $keys, $expire = null);
+
+    /**
+     * Remove values from cache
+     *
+     * @param array $keys list of keys to delete
+     *
+     * @return boolean true on success, false on failure
+     */
+    abstract protected function delete(array $keys);
+
+    /**
+     * Remove *all* values from cache
+     *
+     * @return boolean true on success, false on failure
+     */
+    protected function purge()
+    {
+        return false;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_data.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_data.php
new file mode 100644
index 000000000..2545ed3a8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_data.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Smarty Plugin Data
+ * This file contains the data object
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * class for the Smarty data object
+ * The Smarty data object will hold Smarty variables in the current scope
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+class Smarty_Data extends Smarty_Internal_Data
+{
+    /**
+     * Counter
+     *
+     * @var int
+     */
+    public static $count = 0;
+
+    /**
+     * Data block name
+     *
+     * @var string
+     */
+    public $dataObjectName = '';
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * create Smarty data object
+     *
+     * @param Smarty|array                    $_parent parent template
+     * @param Smarty|Smarty_Internal_Template $smarty  global smarty instance
+     * @param string                          $name    optional data block name
+     *
+     * @throws SmartyException
+     */
+    public function __construct($_parent = null, $smarty = null, $name = null)
+    {
+        parent::__construct();
+        self::$count++;
+        $this->dataObjectName = 'Data_object ' . (isset($name) ? "'{$name}'" : self::$count);
+        $this->smarty = $smarty;
+        if (is_object($_parent)) {
+            // when object set up back pointer
+            $this->parent = $_parent;
+        } elseif (is_array($_parent)) {
+            // set up variable values
+            foreach ($_parent as $_key => $_val) {
+                $this->tpl_vars[ $_key ] = new Smarty_Variable($_val);
+            }
+        } elseif ($_parent !== null) {
+            throw new SmartyException('Wrong type for template variables');
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_block.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_block.php
new file mode 100644
index 000000000..9956d642b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_block.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * Smarty {block} tag class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Block
+{
+    /**
+     * Block name
+     *
+     * @var string
+     */
+    public $name = '';
+
+    /**
+     * Hide attribute
+     *
+     * @var bool
+     */
+    public $hide = false;
+
+    /**
+     * Append attribute
+     *
+     * @var bool
+     */
+    public $append = false;
+
+    /**
+     * prepend attribute
+     *
+     * @var bool
+     */
+    public $prepend = false;
+
+    /**
+     * Block calls $smarty.block.child
+     *
+     * @var bool
+     */
+    public $callsChild = false;
+
+    /**
+     * Inheritance child block
+     *
+     * @var Smarty_Internal_Block|null
+     */
+    public $child = null;
+
+    /**
+     * Inheritance calling parent block
+     *
+     * @var Smarty_Internal_Block|null
+     */
+    public $parent = null;
+
+    /**
+     * Inheritance Template index
+     *
+     * @var int
+     */
+    public $tplIndex = 0;
+
+    /**
+     * Smarty_Internal_Block constructor.
+     * - if outer level {block} of child template ($state === 1) save it as child root block
+     * - otherwise process inheritance and render
+     *
+     * @param string   $name     block name
+     * @param int|null $tplIndex index of outer level {block} if nested
+     */
+    public function __construct($name, $tplIndex)
+    {
+        $this->name = $name;
+        $this->tplIndex = $tplIndex;
+    }
+
+    /**
+     * Compiled block code overloaded by {block} class
+     *
+     * @param \Smarty_Internal_Template $tpl
+     */
+    public function callBlock(Smarty_Internal_Template $tpl)
+    {
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
new file mode 100644
index 000000000..c77ae9e17
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_cacheresource_file.php
@@ -0,0 +1,235 @@
+<?php
+/**
+ * Smarty Internal Plugin CacheResource File
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+
+/**
+ * This class does contain all necessary methods for the HTML cache on file system
+ * Implements the file system as resource for the HTML cache Version ussing nocache inserts.
+ *
+ * @package    Smarty
+ * @subpackage Cacher
+ */
+class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
+{
+    /**
+     * populate Cached Object with meta data from Resource
+     *
+     * @param Smarty_Template_Cached   $cached    cached object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
+    {
+        $source = &$_template->source;
+        $smarty = &$_template->smarty;
+        $_compile_dir_sep = $smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
+        $_filepath = sha1($source->uid . $smarty->_joined_template_dir);
+        $cached->filepath = $smarty->getCacheDir();
+        if (isset($_template->cache_id)) {
+            $cached->filepath .= preg_replace(
+                                     array(
+                                         '![^\w|]+!',
+                                         '![|]+!'
+                                     ),
+                                     array(
+                                         '_',
+                                         $_compile_dir_sep
+                                     ),
+                                     $_template->cache_id
+                                 ) . $_compile_dir_sep;
+        }
+        if (isset($_template->compile_id)) {
+            $cached->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) . $_compile_dir_sep;
+        }
+        // if use_sub_dirs, break file into directories
+        if ($smarty->use_sub_dirs) {
+            $cached->filepath .= $_filepath[ 0 ] . $_filepath[ 1 ] . DIRECTORY_SEPARATOR . $_filepath[ 2 ] .
+                                 $_filepath[ 3 ] .
+                                 DIRECTORY_SEPARATOR .
+                                 $_filepath[ 4 ] . $_filepath[ 5 ] . DIRECTORY_SEPARATOR;
+        }
+        $cached->filepath .= $_filepath;
+        $basename = $source->handler->getBasename($source);
+        if (!empty($basename)) {
+            $cached->filepath .= '.' . $basename;
+        }
+        if ($smarty->cache_locking) {
+            $cached->lock_id = $cached->filepath . '.lock';
+        }
+        $cached->filepath .= '.php';
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
+        }
+    }
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return void
+     */
+    public function populateTimestamp(Smarty_Template_Cached $cached)
+    {
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
+        }
+    }
+
+    /**
+     * Read the cached template and process its header
+     *
+     * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+     * @param Smarty_Template_Cached    $cached      cached object
+     * @param bool                      $update      flag if called because cache update
+     *
+     * @return boolean true or false if the cached content does not exist
+     */
+    public function process(
+        Smarty_Internal_Template $_smarty_tpl,
+        Smarty_Template_Cached $cached = null,
+        $update = false
+    ) {
+        $_smarty_tpl->cached->valid = false;
+        if ($update && defined('HHVM_VERSION')) {
+            eval('?>' . file_get_contents($_smarty_tpl->cached->filepath));
+            return true;
+        } else {
+            return @include $_smarty_tpl->cached->filepath;
+        }
+    }
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return bool success
+     * @throws \SmartyException
+     */
+    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
+    {
+        if ($_template->smarty->ext->_writeFile->writeFile(
+                $_template->cached->filepath,
+                $content,
+                $_template->smarty
+            ) === true
+        ) {
+            if (function_exists('opcache_invalidate')
+                && (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api'))) < 1
+            ) {
+                opcache_invalidate($_template->cached->filepath, true);
+            } elseif (function_exists('apc_compile_file')) {
+                apc_compile_file($_template->cached->filepath);
+            }
+            $cached = $_template->cached;
+            $cached->timestamp = $cached->exists = is_file($cached->filepath);
+            if ($cached->exists) {
+                $cached->timestamp = filemtime($cached->filepath);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string  content
+     */
+    public function readCachedContent(Smarty_Internal_Template $_template)
+    {
+        if (is_file($_template->cached->filepath)) {
+            return file_get_contents($_template->cached->filepath);
+        }
+        return false;
+    }
+
+    /**
+     * Empty cache
+     *
+     * @param Smarty  $smarty
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clearAll(Smarty $smarty, $exp_time = null)
+    {
+        return $smarty->ext->_cacheResourceFile->clear($smarty, null, null, null, $exp_time);
+    }
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        return $smarty->ext->_cacheResourceFile->clear($smarty, $resource_name, $cache_id, $compile_id, $exp_time);
+    }
+
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return boolean true or false if cache is locked
+     */
+    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        clearstatcache(true, $cached->lock_id ?? '');
+        if (null !== $cached->lock_id && is_file($cached->lock_id)) {
+            $t = filemtime($cached->lock_id);
+            return $t && (time() - $t < $smarty->locking_timeout);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = true;
+        touch($cached->lock_id);
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Smarty_Template_Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
+    {
+        $cached->is_locked = false;
+        @unlink($cached->lock_id);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_append.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_append.php
new file mode 100644
index 000000000..1a9befbf6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_append.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Append
+ * Compiles the {append} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Append Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign
+{
+    /**
+     * Compiles code for the {append} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // the following must be assigned at runtime because it will be overwritten in parent class
+        $this->required_attributes = array('var', 'value');
+        $this->shorttag_order = array('var', 'value');
+        $this->optional_attributes = array('scope', 'index');
+        $this->mapCache = array();
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        // map to compile assign attributes
+        if (isset($_attr[ 'index' ])) {
+            $_params[ 'smarty_internal_index' ] = '[' . $_attr[ 'index' ] . ']';
+            unset($_attr[ 'index' ]);
+        } else {
+            $_params[ 'smarty_internal_index' ] = '[]';
+        }
+        $_new_attr = array();
+        foreach ($_attr as $key => $value) {
+            $_new_attr[] = array($key => $value);
+        }
+        // call compile assign
+        return parent::compile($_new_attr, $compiler, $_params);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_assign.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_assign.php
new file mode 100644
index 000000000..1f0ab9b7d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_assign.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Assign
+ * Compiles the {assign} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Assign Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $option_flags = array('nocache', 'noscope');
+
+    /**
+     * Valid scope names
+     *
+     * @var array
+     */
+    public $valid_scopes = array(
+        'local'    => Smarty::SCOPE_LOCAL, 'parent' => Smarty::SCOPE_PARENT,
+        'root'     => Smarty::SCOPE_ROOT, 'global' => Smarty::SCOPE_GLOBAL,
+        'tpl_root' => Smarty::SCOPE_TPL_ROOT, 'smarty' => Smarty::SCOPE_SMARTY
+    );
+
+    /**
+     * Compiles code for the {assign} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // the following must be assigned at runtime because it will be overwritten in Smarty_Internal_Compile_Append
+        $this->required_attributes = array('var', 'value');
+        $this->shorttag_order = array('var', 'value');
+        $this->optional_attributes = array('scope');
+        $this->mapCache = array();
+        $_nocache = false;
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        // nocache ?
+        if ($_var = $compiler->getId($_attr[ 'var' ])) {
+            $_var = "'{$_var}'";
+        } else {
+            $_var = $_attr[ 'var' ];
+        }
+        if ($compiler->tag_nocache || $compiler->nocache) {
+            $_nocache = true;
+            // create nocache var to make it know for further compiling
+            $compiler->setNocacheInVariable($_attr[ 'var' ]);
+        }
+        // scope setup
+        if ($_attr[ 'noscope' ]) {
+            $_scope = -1;
+        } else {
+            $_scope = $compiler->convertScope($_attr, $this->valid_scopes);
+        }
+        // optional parameter
+        $_params = '';
+        if ($_nocache || $_scope) {
+            $_params .= ' ,' . var_export($_nocache, true);
+        }
+        if ($_scope) {
+            $_params .= ' ,' . $_scope;
+        }
+        if (isset($parameter[ 'smarty_internal_index' ])) {
+            $output =
+                "<?php \$_tmp_array = isset(\$_smarty_tpl->tpl_vars[{$_var}]) ? \$_smarty_tpl->tpl_vars[{$_var}]->value : array();\n";
+            $output .= "if (!(is_array(\$_tmp_array) || \$_tmp_array instanceof ArrayAccess)) {\n";
+            $output .= "settype(\$_tmp_array, 'array');\n";
+            $output .= "}\n";
+            $output .= "\$_tmp_array{$parameter['smarty_internal_index']} = {$_attr['value']};\n";
+            $output .= "\$_smarty_tpl->_assignInScope({$_var}, \$_tmp_array{$_params});?>";
+        } else {
+            $output = "<?php \$_smarty_tpl->_assignInScope({$_var}, {$_attr['value']}{$_params});?>";
+        }
+        return $output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block.php
new file mode 100644
index 000000000..cbaccd2b3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Block Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Block extends Smarty_Internal_Compile_Shared_Inheritance
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('name');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('name');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $option_flags = array('hide', 'nocache');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('assign');
+
+    /**
+     * Compiles code for the {block} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        if (!isset($compiler->_cache[ 'blockNesting' ])) {
+            $compiler->_cache[ 'blockNesting' ] = 0;
+        }
+        if ($compiler->_cache[ 'blockNesting' ] === 0) {
+            // make sure that inheritance gets initialized in template code
+            $this->registerInit($compiler);
+            $this->option_flags = array('hide', 'nocache', 'append', 'prepend');
+        } else {
+            $this->option_flags = array('hide', 'nocache');
+        }
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        ++$compiler->_cache[ 'blockNesting' ];
+        $_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(mt_rand(), true));
+        $compiler->_cache[ 'blockName' ][ $compiler->_cache[ 'blockNesting' ] ] = $_attr[ 'name' ];
+        $compiler->_cache[ 'blockClass' ][ $compiler->_cache[ 'blockNesting' ] ] = $_className;
+        $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ] = array();
+        $compiler->_cache[ 'blockParams' ][ 1 ][ 'subBlocks' ][ trim($_attr[ 'name' ], '"\'') ][] = $_className;
+        $this->openTag(
+            $compiler,
+            'block',
+            array(
+                $_attr, $compiler->nocache, $compiler->parser->current_buffer,
+                $compiler->template->compiled->has_nocache_code,
+                $compiler->template->caching
+            )
+        );
+        $compiler->saveRequiredPlugins(true);
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        $compiler->template->compiled->has_nocache_code = false;
+        $compiler->suppressNocacheProcessing = true;
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile BlockClose Class
+ */
+class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_Inheritance
+{
+    /**
+     * Compiles code for the {/block} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return bool true
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        list($_attr, $_nocache, $_buffer, $_has_nocache_code, $_caching) = $this->closeTag($compiler, array('block'));
+        // init block parameter
+        $_block = $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ];
+        unset($compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ]);
+        $_name = $_attr[ 'name' ];
+        $_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
+        unset($_attr[ 'assign' ], $_attr[ 'name' ]);
+        foreach ($_attr as $name => $stat) {
+            if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat !== 'false')) {
+                $_block[ $name ] = 'true';
+            }
+        }
+        $_className = $compiler->_cache[ 'blockClass' ][ $compiler->_cache[ 'blockNesting' ] ];
+        // get compiled block code
+        $_functionCode = $compiler->parser->current_buffer;
+        // setup buffer for template function code
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        $output = "<?php\n";
+        $output .= $compiler->cStyleComment(" {block {$_name}} ") . "\n";
+        $output .= "class {$_className} extends Smarty_Internal_Block\n";
+        $output .= "{\n";
+        foreach ($_block as $property => $value) {
+            $output .= "public \${$property} = " . var_export($value, true) . ";\n";
+        }
+        $output .= "public function callBlock(Smarty_Internal_Template \$_smarty_tpl) {\n";
+        $output .= $compiler->compileRequiredPlugins();
+        $compiler->restoreRequiredPlugins();
+        if ($compiler->template->compiled->has_nocache_code) {
+            $output .= "\$_smarty_tpl->cached->hashes['{$compiler->template->compiled->nocache_hash}'] = true;\n";
+        }
+        if (isset($_assign)) {
+            $output .= "ob_start();\n";
+        }
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree(
+            $compiler->parser,
+            new Smarty_Internal_ParseTree_Tag(
+                $compiler->parser,
+                $output
+            )
+        );
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+        $output = "<?php\n";
+        if (isset($_assign)) {
+            $output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+        }
+        $output .= "}\n";
+        $output .= "}\n";
+        $output .= $compiler->cStyleComment(" {/block {$_name}} ") . "\n\n";
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree(
+            $compiler->parser,
+            new Smarty_Internal_ParseTree_Tag(
+                $compiler->parser,
+                $output
+            )
+        );
+        $compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        // restore old status
+        $compiler->template->compiled->has_nocache_code = $_has_nocache_code;
+        $compiler->tag_nocache = $compiler->nocache;
+        $compiler->nocache = $_nocache;
+        $compiler->parser->current_buffer = $_buffer;
+        $output = "<?php \n";
+        if ($compiler->_cache[ 'blockNesting' ] === 1) {
+            $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name);\n";
+        } else {
+            $output .= "\$_smarty_tpl->inheritance->instanceBlock(\$_smarty_tpl, '$_className', $_name, \$this->tplIndex);\n";
+        }
+        $output .= "?>\n";
+        --$compiler->_cache[ 'blockNesting' ];
+        if ($compiler->_cache[ 'blockNesting' ] === 0) {
+            unset($compiler->_cache[ 'blockNesting' ]);
+        }
+        $compiler->has_code = true;
+        $compiler->suppressNocacheProcessing = true;
+        return $output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_child.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_child.php
new file mode 100644
index 000000000..588d18628
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_child.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Block Child Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Block_Child extends Smarty_Internal_Compile_Child
+{
+    /**
+     * Tag name
+     *
+     * @var string
+     */
+    public $tag = 'block_child';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_parent.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_parent.php
new file mode 100644
index 000000000..97f11ca43
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block_parent.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Block Parent Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Block_Parent extends Smarty_Internal_Compile_Child
+{
+    /**
+     * Tag name
+     *
+     * @var string
+     */
+    public $tag = 'block_parent';
+
+    /**
+     * Block type
+     *
+     * @var string
+     */
+    public $blockType = 'Parent';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_break.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_break.php
new file mode 100644
index 000000000..1ee8d75d7
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_break.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Break
+ * Compiles the {break} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Break Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('levels');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('levels');
+
+    /**
+     * Tag name may be overloaded by Smarty_Internal_Compile_Continue
+     *
+     * @var string
+     */
+    public $tag = 'break';
+
+    /**
+     * Compiles code for the {break} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        list($levels, $foreachLevels) = $this->checkLevels($args, $compiler);
+        $output = "<?php ";
+        if ($foreachLevels > 0 && $this->tag === 'continue') {
+            $foreachLevels--;
+        }
+        if ($foreachLevels > 0) {
+            /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */
+            $foreachCompiler = $compiler->getTagCompiler('foreach');
+            $output .= $foreachCompiler->compileRestore($foreachLevels);
+        }
+        $output .= "{$this->tag} {$levels};?>";
+        return $output;
+    }
+
+    /**
+     * check attributes and return array of break and foreach levels
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return array
+     * @throws \SmartyCompilerException
+     */
+    public function checkLevels($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr[ 'nocache' ] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
+        }
+        if (isset($_attr[ 'levels' ])) {
+            if (!is_numeric($_attr[ 'levels' ])) {
+                $compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
+            }
+            $levels = $_attr[ 'levels' ];
+        } else {
+            $levels = 1;
+        }
+        $level_count = $levels;
+        $stack_count = count($compiler->_tag_stack) - 1;
+        $foreachLevels = 0;
+        $lastTag = '';
+        while ($level_count > 0 && $stack_count >= 0) {
+            if (isset($_is_loopy[ $compiler->_tag_stack[ $stack_count ][ 0 ] ])) {
+                $lastTag = $compiler->_tag_stack[ $stack_count ][ 0 ];
+                if ($level_count === 0) {
+                    break;
+                }
+                $level_count--;
+                if ($compiler->_tag_stack[ $stack_count ][ 0 ] === 'foreach') {
+                    $foreachLevels++;
+                }
+            }
+            $stack_count--;
+        }
+        if ($level_count !== 0) {
+            $compiler->trigger_template_error("cannot {$this->tag} {$levels} level(s)", null, true);
+        }
+        if ($lastTag === 'foreach' && $this->tag === 'break' && $foreachLevels > 0) {
+            $foreachLevels--;
+        }
+        return array($levels, $foreachLevels);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_call.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_call.php
new file mode 100644
index 000000000..445cabc60
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_call.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Function_Call
+ * Compiles the calls of user defined tags defined by {function}
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Function_Call Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('name');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('name');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Compiles the calls of user defined tags defined by {function}
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     *
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        // save possible attributes
+        if (isset($_attr[ 'assign' ])) {
+            // output will be stored in a smarty variable instead of being displayed
+            $_assign = $_attr[ 'assign' ];
+        }
+        //$_name = trim($_attr['name'], "''");
+        $_name = $_attr[ 'name' ];
+        unset($_attr[ 'name' ], $_attr[ 'assign' ], $_attr[ 'nocache' ]);
+        // set flag (compiled code of {function} must be included in cache file
+        if (!$compiler->template->caching || $compiler->nocache || $compiler->tag_nocache) {
+            $_nocache = 'true';
+        } else {
+            $_nocache = 'false';
+        }
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            }
+        }
+        $_params = 'array(' . implode(',', $_paramsArray) . ')';
+        //$compiler->suppressNocacheProcessing = true;
+        // was there an assign attribute
+        if (isset($_assign)) {
+            $_output =
+                "<?php ob_start();\n\$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});\n\$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
+        } else {
+            $_output =
+                "<?php \$_smarty_tpl->smarty->ext->_tplFunction->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});?>\n";
+        }
+        return $_output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_capture.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_capture.php
new file mode 100644
index 000000000..a4ffbc9ea
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_capture.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Capture
+ * Compiles the {capture} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Capture Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('name');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('name', 'assign', 'append');
+
+    /**
+     * Compiles code for the {$smarty.capture.xxx}
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     */
+    public static function compileSpecialVariable(
+        $args,
+        Smarty_Internal_TemplateCompilerBase $compiler,
+        $parameter = null
+    ) {
+        return '$_smarty_tpl->smarty->ext->_capture->getBuffer($_smarty_tpl' .
+               (isset($parameter[ 1 ]) ? ", {$parameter[ 1 ]})" : ')');
+    }
+
+    /**
+     * Compiles code for the {capture} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param null                                  $parameter
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter = null)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args, $parameter, 'capture');
+        $buffer = isset($_attr[ 'name' ]) ? $_attr[ 'name' ] : "'default'";
+        $assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : 'null';
+        $append = isset($_attr[ 'append' ]) ? $_attr[ 'append' ] : 'null';
+        $compiler->_cache[ 'capture_stack' ][] = array($compiler->nocache);
+        // maybe nocache because of nocache variables
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        $_output = "<?php \$_smarty_tpl->smarty->ext->_capture->open(\$_smarty_tpl, $buffer, $assign, $append);?>";
+        return $_output;
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Captureclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {/capture} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param null                                  $parameter
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args, $parameter, '/capture');
+        // must endblock be nocache?
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+        list($compiler->nocache) = array_pop($compiler->_cache[ 'capture_stack' ]);
+        return "<?php \$_smarty_tpl->smarty->ext->_capture->close(\$_smarty_tpl);?>";
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_child.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_child.php
new file mode 100644
index 000000000..f728c18bf
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_child.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Child Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Child extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('assign');
+
+    /**
+     * Tag name
+     *
+     * @var string
+     */
+    public $tag = 'child';
+
+    /**
+     * Block type
+     *
+     * @var string
+     */
+    public $blockType = 'Child';
+
+    /**
+     * Compiles code for the {child} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $tag = isset($parameter[ 0 ]) ? "'{$parameter[0]}'" : "'{{$this->tag}}'";
+        if (!isset($compiler->_cache[ 'blockNesting' ])) {
+            $compiler->trigger_template_error(
+                "{$tag} used outside {block} tags ",
+                $compiler->parser->lex->taglineno
+            );
+        }
+        $compiler->has_code = true;
+        $compiler->suppressNocacheProcessing = true;
+        if ($this->blockType === 'Child') {
+            $compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true';
+        }
+        $_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
+        $output = "<?php \n";
+        if (isset($_assign)) {
+            $output .= "ob_start();\n";
+        }
+        $output .= '$_smarty_tpl->inheritance->call' . $this->blockType . '($_smarty_tpl, $this' .
+                   ($this->blockType === 'Child' ? '' : ", {$tag}") . ");\n";
+        if (isset($_assign)) {
+            $output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+        }
+        $output .= "?>\n";
+        return $output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_config_load.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_config_load.php
new file mode 100644
index 000000000..8fe64ee10
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_config_load.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Config Load
+ * Compiles the {config load} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Config Load Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('file');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('file', 'section');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('section', 'scope');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $option_flags = array('nocache', 'noscope');
+
+    /**
+     * Valid scope names
+     *
+     * @var array
+     */
+    public $valid_scopes = array(
+        'local'  => Smarty::SCOPE_LOCAL, 'parent' => Smarty::SCOPE_PARENT,
+        'root'   => Smarty::SCOPE_ROOT, 'tpl_root' => Smarty::SCOPE_TPL_ROOT,
+        'smarty' => Smarty::SCOPE_SMARTY, 'global' => Smarty::SCOPE_SMARTY
+    );
+
+    /**
+     * Compiles code for the {config_load} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr[ 'nocache' ] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
+        }
+        // save possible attributes
+        $conf_file = $_attr[ 'file' ];
+        if (isset($_attr[ 'section' ])) {
+            $section = $_attr[ 'section' ];
+        } else {
+            $section = 'null';
+        }
+        // scope setup
+        if ($_attr[ 'noscope' ]) {
+            $_scope = -1;
+        } else {
+            $_scope = $compiler->convertScope($_attr, $this->valid_scopes);
+        }
+        // create config object
+        $_output =
+            "<?php\n\$_smarty_tpl->smarty->ext->configLoad->_loadConfigFile(\$_smarty_tpl, {$conf_file}, {$section}, {$_scope});\n?>\n";
+        return $_output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_continue.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_continue.php
new file mode 100644
index 000000000..e545728ee
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_continue.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Continue
+ * Compiles the {continue} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Continue Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Continue extends Smarty_Internal_Compile_Break
+{
+    /**
+     * Tag name
+     *
+     * @var string
+     */
+    public $tag = 'continue';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_debug.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_debug.php
new file mode 100644
index 000000000..799416689
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_debug.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Debug
+ * Compiles the {debug} tag.
+ * It opens a window the the Smarty Debugging Console.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Debug Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {debug} tag
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     *
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        // compile always as nocache
+        $compiler->tag_nocache = true;
+        // display debug template
+        $_output =
+            "<?php \$_smarty_debug = new Smarty_Internal_Debug;\n \$_smarty_debug->display_debug(\$_smarty_tpl);\n";
+        $_output .= "unset(\$_smarty_debug);\n?>";
+        return $_output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_eval.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_eval.php
new file mode 100644
index 000000000..8e0174e3e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_eval.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Eval
+ * Compiles the {eval} tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Eval Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('var');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('assign');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('var', 'assign');
+
+    /**
+     * Compiles code for the {eval} tag
+     *
+     * @param array  $args     array with attributes from parser
+     * @param object $compiler compiler object
+     *
+     * @return string compiled code
+     */
+    public function compile($args, $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        if (isset($_attr[ 'assign' ])) {
+            // output will be stored in a smarty variable instead of being displayed
+            $_assign = $_attr[ 'assign' ];
+        }
+        // create template object
+        $_output =
+            "\$_template = new {$compiler->smarty->template_class}('eval:'.{$_attr[ 'var' ]}, \$_smarty_tpl->smarty, \$_smarty_tpl);";
+        //was there an assign attribute?
+        if (isset($_assign)) {
+            $_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());";
+        } else {
+            $_output .= 'echo $_template->fetch();';
+        }
+        return "<?php $_output ?>";
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_extends.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_extends.php
new file mode 100644
index 000000000..69a7b5521
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_extends.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile extend
+ * Compiles the {extends} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile extend Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Extends extends Smarty_Internal_Compile_Shared_Inheritance
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('file');
+
+    /**
+     * Array of names of optional attribute required by tag
+     * use array('_any') if there is no restriction of attributes names
+     *
+     * @var array
+     */
+    public $optional_attributes = array();
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('file');
+
+    /**
+     * Compiles code for the {extends} tag extends: resource
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr[ 'nocache' ] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', $compiler->parser->lex->line - 1);
+        }
+        if (strpos($_attr[ 'file' ], '$_tmp') !== false) {
+            $compiler->trigger_template_error('illegal value for file attribute', $compiler->parser->lex->line - 1);
+        }
+        // add code to initialize inheritance
+        $this->registerInit($compiler, true);
+        $this->compileEndChild($compiler, $_attr[ 'file' ]);
+        $compiler->has_code = false;
+        return '';
+    }
+
+    /**
+     * Add code for inheritance endChild() method to end of template
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param null|string                           $template optional inheritance parent template
+     *
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    private function compileEndChild(Smarty_Internal_TemplateCompilerBase $compiler, $template = null)
+    {
+        $inlineUids = '';
+        if (isset($template) && $compiler->smarty->merge_compiled_includes) {
+            $code = $compiler->compileTag('include', array($template, array('scope' => 'parent')));
+            if (preg_match('/([,][\s]*[\'][a-z0-9]+[\'][,][\s]*[\']content.*[\'])[)]/', $code, $match)) {
+                $inlineUids = $match[ 1 ];
+            }
+        }
+        $compiler->parser->template_postfix[] = new Smarty_Internal_ParseTree_Tag(
+            $compiler->parser,
+            '<?php $_smarty_tpl->inheritance->endChild($_smarty_tpl' .
+            (isset($template) ?
+                ", {$template}{$inlineUids}" :
+                '') . ");\n?>"
+        );
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_for.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_for.php
new file mode 100644
index 000000000..969e22c1a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_for.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile For
+ * Compiles the {for} {forelse} {/for} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile For Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {for} tag
+     * Smarty supports two different syntax's:
+     * - {for $var in $array}
+     * For looping over arrays or iterators
+     * - {for $x=0; $x<$y; $x++}
+     * For general loops
+     * The parser is generating different sets of attribute by which this compiler can
+     * determine which syntax is used.
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $compiler->loopNesting++;
+        if ($parameter === 0) {
+            $this->required_attributes = array('start', 'to');
+            $this->optional_attributes = array('max', 'step');
+        } else {
+            $this->required_attributes = array('start', 'ifexp', 'var', 'step');
+            $this->optional_attributes = array();
+        }
+        $this->mapCache = array();
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $output = "<?php\n";
+        if ($parameter === 1) {
+            foreach ($_attr[ 'start' ] as $_statement) {
+                if (is_array($_statement[ 'var' ])) {
+                    $var = $_statement[ 'var' ][ 'var' ];
+                    $index = $_statement[ 'var' ][ 'smarty_internal_index' ];
+                } else {
+                    $var = $_statement[ 'var' ];
+                    $index = '';
+                }
+                $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable(null, \$_smarty_tpl->isRenderingCache);\n";
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->value{$index} = {$_statement['value']};\n";
+            }
+            if (is_array($_attr[ 'var' ])) {
+                $var = $_attr[ 'var' ][ 'var' ];
+                $index = $_attr[ 'var' ][ 'smarty_internal_index' ];
+            } else {
+                $var = $_attr[ 'var' ];
+                $index = '';
+            }
+            $output .= "if ($_attr[ifexp]) {\nfor (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$var]->value{$index}$_attr[step]) {\n";
+        } else {
+            $_statement = $_attr[ 'start' ];
+            if (is_array($_statement[ 'var' ])) {
+                $var = $_statement[ 'var' ][ 'var' ];
+                $index = $_statement[ 'var' ][ 'smarty_internal_index' ];
+            } else {
+                $var = $_statement[ 'var' ];
+                $index = '';
+            }
+            $output .= "\$_smarty_tpl->tpl_vars[$var] = new Smarty_Variable(null, \$_smarty_tpl->isRenderingCache);";
+            if (isset($_attr[ 'step' ])) {
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = $_attr[step];";
+            } else {
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->step = 1;";
+            }
+            if (isset($_attr[ 'max' ])) {
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step)),$_attr[max]);\n";
+            } else {
+                $output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step));\n";
+            }
+            $output .= "if (\$_smarty_tpl->tpl_vars[$var]->total > 0) {\n";
+            $output .= "for (\$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value], \$_smarty_tpl->tpl_vars[$var]->iteration = 1;\$_smarty_tpl->tpl_vars[$var]->iteration <= \$_smarty_tpl->tpl_vars[$var]->total;\$_smarty_tpl->tpl_vars[$var]->value{$index} += \$_smarty_tpl->tpl_vars[$var]->step, \$_smarty_tpl->tpl_vars[$var]->iteration++) {\n";
+            $output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration === 1;";
+            $output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration === \$_smarty_tpl->tpl_vars[$var]->total;";
+        }
+        $output .= '?>';
+        $this->openTag($compiler, 'for', array('for', $compiler->nocache));
+        // maybe nocache because of nocache variables
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        // return compiled code
+        return $output;
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Forelse Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {forelse} tag
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        list($openTag, $nocache) = $this->closeTag($compiler, array('for'));
+        $this->openTag($compiler, 'forelse', array('forelse', $nocache));
+        return "<?php }} else { ?>";
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Forclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {/for} tag
+     *
+     * @param array  $args      array with attributes from parser
+     * @param object $compiler  compiler object
+     * @param array  $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     */
+    public function compile($args, $compiler, $parameter)
+    {
+        $compiler->loopNesting--;
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        // must endblock be nocache?
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+        list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse'));
+        $output = "<?php }\n";
+        if ($openTag !== 'forelse') {
+            $output .= "}\n";
+        }
+        $output .= "?>";
+        return $output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_foreach.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_foreach.php
new file mode 100644
index 000000000..edfe358be
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_foreach.php
@@ -0,0 +1,343 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Foreach
+ * Compiles the {foreach} {foreachelse} {/foreach} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Foreach Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_ForeachSection
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('from', 'item');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('name', 'key', 'properties');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('from', 'item', 'key', 'name');
+
+    /**
+     * counter
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Name of this tag
+     *
+     * @var string
+     */
+    public $tagName = 'foreach';
+
+    /**
+     * Valid properties of $smarty.foreach.name.xxx variable
+     *
+     * @var array
+     */
+    public $nameProperties = array('first', 'last', 'index', 'iteration', 'show', 'total');
+
+    /**
+     * Valid properties of $item@xxx variable
+     *
+     * @var array
+     */
+    public $itemProperties = array('first', 'last', 'index', 'iteration', 'show', 'total', 'key');
+
+    /**
+     * Flag if tag had name attribute
+     *
+     * @var bool
+     */
+    public $isNamed = false;
+
+    /**
+     * Compiles code for the {foreach} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $compiler->loopNesting++;
+        // init
+        $this->isNamed = false;
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $from = $_attr[ 'from' ];
+        $item = $compiler->getId($_attr[ 'item' ]);
+        if ($item === false) {
+            $item = $compiler->getVariableName($_attr[ 'item' ]);
+        }
+        $key = $name = null;
+        $attributes = array('item' => $item);
+        if (isset($_attr[ 'key' ])) {
+            $key = $compiler->getId($_attr[ 'key' ]);
+            if ($key === false) {
+                $key = $compiler->getVariableName($_attr[ 'key' ]);
+            }
+            $attributes[ 'key' ] = $key;
+        }
+        if (isset($_attr[ 'name' ])) {
+            $this->isNamed = true;
+            $name = $attributes[ 'name' ] = $compiler->getId($_attr[ 'name' ]);
+        }
+        foreach ($attributes as $a => $v) {
+            if ($v === false) {
+                $compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
+            }
+        }
+        $fromName = $compiler->getVariableName($_attr[ 'from' ]);
+        if ($fromName) {
+            foreach (array('item', 'key') as $a) {
+                if (isset($attributes[ $a ]) && $attributes[ $a ] === $fromName) {
+                    $compiler->trigger_template_error(
+                        "'{$a}' and 'from' may not have same variable name '{$fromName}'",
+                        null,
+                        true
+                    );
+                }
+            }
+        }
+        $itemVar = "\$_smarty_tpl->tpl_vars['{$item}']";
+        $local = '$__foreach_' . $attributes[ 'item' ] . '_' . $this->counter++ . '_';
+        // search for used tag attributes
+        $itemAttr = array();
+        $namedAttr = array();
+        $this->scanForProperties($attributes, $compiler);
+        if (!empty($this->matchResults[ 'item' ])) {
+            $itemAttr = $this->matchResults[ 'item' ];
+        }
+        if (!empty($this->matchResults[ 'named' ])) {
+            $namedAttr = $this->matchResults[ 'named' ];
+        }
+        if (isset($_attr[ 'properties' ]) && preg_match_all('/[\'](.*?)[\']/', $_attr[ 'properties' ], $match)) {
+            foreach ($match[ 1 ] as $prop) {
+                if (in_array($prop, $this->itemProperties)) {
+                    $itemAttr[ $prop ] = true;
+                } else {
+                    $compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
+                }
+            }
+            if ($this->isNamed) {
+                foreach ($match[ 1 ] as $prop) {
+                    if (in_array($prop, $this->nameProperties)) {
+                        $nameAttr[ $prop ] = true;
+                    } else {
+                        $compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
+                    }
+                }
+            }
+        }
+        if (isset($itemAttr[ 'first' ])) {
+            $itemAttr[ 'index' ] = true;
+        }
+        if (isset($namedAttr[ 'first' ])) {
+            $namedAttr[ 'index' ] = true;
+        }
+        if (isset($namedAttr[ 'last' ])) {
+            $namedAttr[ 'iteration' ] = true;
+            $namedAttr[ 'total' ] = true;
+        }
+        if (isset($itemAttr[ 'last' ])) {
+            $itemAttr[ 'iteration' ] = true;
+            $itemAttr[ 'total' ] = true;
+        }
+        if (isset($namedAttr[ 'show' ])) {
+            $namedAttr[ 'total' ] = true;
+        }
+        if (isset($itemAttr[ 'show' ])) {
+            $itemAttr[ 'total' ] = true;
+        }
+        $keyTerm = '';
+        if (isset($attributes[ 'key' ])) {
+            $keyTerm = "\$_smarty_tpl->tpl_vars['{$key}']->value => ";
+        }
+        if (isset($itemAttr[ 'key' ])) {
+            $keyTerm = "{$itemVar}->key => ";
+        }
+        if ($this->isNamed) {
+            $foreachVar = "\$_smarty_tpl->tpl_vars['__smarty_foreach_{$attributes['name']}']";
+        }
+        $needTotal = isset($itemAttr[ 'total' ]);
+        // Register tag
+        $this->openTag(
+            $compiler,
+            'foreach',
+            array('foreach', $compiler->nocache, $local, $itemVar, empty($itemAttr) ? 1 : 2)
+        );
+        // maybe nocache because of nocache variables
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        // generate output code
+        $output = "<?php\n";
+        $output .= "\$_from = \$_smarty_tpl->smarty->ext->_foreach->init(\$_smarty_tpl, $from, " .
+                   var_export($item, true);
+        if ($name || $needTotal || $key) {
+            $output .= ', ' . var_export($needTotal, true);
+        }
+        if ($name || $key) {
+            $output .= ', ' . var_export($key, true);
+        }
+        if ($name) {
+            $output .= ', ' . var_export($name, true) . ', ' . var_export($namedAttr, true);
+        }
+        $output .= ");\n";
+        if (isset($itemAttr[ 'show' ])) {
+            $output .= "{$itemVar}->show = ({$itemVar}->total > 0);\n";
+        }
+        if (isset($itemAttr[ 'iteration' ])) {
+            $output .= "{$itemVar}->iteration = 0;\n";
+        }
+        if (isset($itemAttr[ 'index' ])) {
+            $output .= "{$itemVar}->index = -1;\n";
+        }
+        $output .= "{$itemVar}->do_else = true;\n";
+        $output .= "if (\$_from !== null) foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
+        $output .= "{$itemVar}->do_else = false;\n";
+        if (isset($attributes[ 'key' ]) && isset($itemAttr[ 'key' ])) {
+            $output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
+        }
+        if (isset($itemAttr[ 'iteration' ])) {
+            $output .= "{$itemVar}->iteration++;\n";
+        }
+        if (isset($itemAttr[ 'index' ])) {
+            $output .= "{$itemVar}->index++;\n";
+        }
+        if (isset($itemAttr[ 'first' ])) {
+            $output .= "{$itemVar}->first = !{$itemVar}->index;\n";
+        }
+        if (isset($itemAttr[ 'last' ])) {
+            $output .= "{$itemVar}->last = {$itemVar}->iteration === {$itemVar}->total;\n";
+        }
+        if (isset($foreachVar)) {
+            if (isset($namedAttr[ 'iteration' ])) {
+                $output .= "{$foreachVar}->value['iteration']++;\n";
+            }
+            if (isset($namedAttr[ 'index' ])) {
+                $output .= "{$foreachVar}->value['index']++;\n";
+            }
+            if (isset($namedAttr[ 'first' ])) {
+                $output .= "{$foreachVar}->value['first'] = !{$foreachVar}->value['index'];\n";
+            }
+            if (isset($namedAttr[ 'last' ])) {
+                $output .= "{$foreachVar}->value['last'] = {$foreachVar}->value['iteration'] === {$foreachVar}->value['total'];\n";
+            }
+        }
+        if (!empty($itemAttr)) {
+            $output .= "{$local}saved = {$itemVar};\n";
+        }
+        $output .= '?>';
+        return $output;
+    }
+
+    /**
+     * Compiles code for to restore saved template variables
+     *
+     * @param int $levels number of levels to restore
+     *
+     * @return string compiled code
+     */
+    public function compileRestore($levels)
+    {
+        return "\$_smarty_tpl->smarty->ext->_foreach->restore(\$_smarty_tpl, {$levels});";
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Foreachelse Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {foreachelse} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        list($openTag, $nocache, $local, $itemVar, $restore) = $this->closeTag($compiler, array('foreach'));
+        $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $local, $itemVar, 0));
+        $output = "<?php\n";
+        if ($restore === 2) {
+            $output .= "{$itemVar} = {$local}saved;\n";
+        }
+        $output .= "}\nif ({$itemVar}->do_else) {\n?>";
+        return $output;
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Foreachclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {/foreach} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $compiler->loopNesting--;
+        // must endblock be nocache?
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+        list(
+            $openTag, $compiler->nocache, $local, $itemVar, $restore
+            ) = $this->closeTag($compiler, array('foreach', 'foreachelse'));
+        $output = "<?php\n";
+        if ($restore === 2) {
+            $output .= "{$itemVar} = {$local}saved;\n";
+        }
+        $output .= "}\n";
+        /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */
+        $foreachCompiler = $compiler->getTagCompiler('foreach');
+        $output .= $foreachCompiler->compileRestore(1);
+        $output .= "?>";
+        return $output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php
new file mode 100644
index 000000000..b05a82b74
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php
@@ -0,0 +1,236 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Function
+ * Compiles the {function} {/function} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Function Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('name');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('name');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Compiles code for the {function} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return bool true
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr[ 'nocache' ] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
+        }
+        unset($_attr[ 'nocache' ]);
+        $_name = trim($_attr[ 'name' ], '\'"');
+
+        if (!preg_match('/^[a-zA-Z0-9_\x80-\xff]+$/', $_name)) {
+	        $compiler->trigger_template_error("Function name contains invalid characters: {$_name}", null, true);
+        }
+
+        $compiler->parent_compiler->tpl_function[ $_name ] = array();
+        $save = array(
+            $_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
+            $compiler->template->caching
+        );
+        $this->openTag($compiler, 'function', $save);
+        // Init temporary context
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        $compiler->template->compiled->has_nocache_code = false;
+        $compiler->saveRequiredPlugins(true);
+        return true;
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Functionclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiler object
+     *
+     * @var object
+     */
+    private $compiler = null;
+
+    /**
+     * Compiles code for the {/function} tag
+     *
+     * @param array                                        $args     array with attributes from parser
+     * @param object|\Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return bool true
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->compiler = $compiler;
+        $saved_data = $this->closeTag($compiler, array('function'));
+        $_attr = $saved_data[ 0 ];
+        $_name = trim($_attr[ 'name' ], '\'"');
+        $compiler->parent_compiler->tpl_function[ $_name ][ 'compiled_filepath' ] =
+            $compiler->parent_compiler->template->compiled->filepath;
+        $compiler->parent_compiler->tpl_function[ $_name ][ 'uid' ] = $compiler->template->source->uid;
+        $_parameter = $_attr;
+        unset($_parameter[ 'name' ]);
+        // default parameter
+        $_paramsArray = array();
+        foreach ($_parameter as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            }
+        }
+        if (!empty($_paramsArray)) {
+            $_params = 'array(' . implode(',', $_paramsArray) . ')';
+            $_paramsCode = "\$params = array_merge($_params, \$params);\n";
+        } else {
+            $_paramsCode = '';
+        }
+        $_functionCode = $compiler->parser->current_buffer;
+        // setup buffer for template function code
+        $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
+        $_funcName = "smarty_template_function_{$_name}_{$compiler->template->compiled->nocache_hash}";
+        $_funcNameCaching = $_funcName . '_nocache';
+        if ($compiler->template->compiled->has_nocache_code) {
+            $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name_caching' ] = $_funcNameCaching;
+            $output = "<?php\n";
+            $output .= $compiler->cStyleComment(" {$_funcNameCaching} ") . "\n";
+            $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
+            $output .= "function {$_funcNameCaching} (Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
+            $output .= "ob_start();\n";
+            $output .= $compiler->compileRequiredPlugins();
+            $output .= "\$_smarty_tpl->compiled->has_nocache_code = true;\n";
+            $output .= $_paramsCode;
+            $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}\n";
+            $output .= "\$params = var_export(\$params, true);\n";
+            $output .= "echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
+            $output .= "\\\$_smarty_tpl->smarty->ext->_tplFunction->saveTemplateVariables(\\\$_smarty_tpl, '{$_name}');\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->tpl_vars[\\\$key] = new Smarty_Variable(\\\$value, \\\$_smarty_tpl->isRenderingCache);\n}\n?>";
+            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";?>";
+            $compiler->parser->current_buffer->append_subtree(
+                $compiler->parser,
+                new Smarty_Internal_ParseTree_Tag(
+                    $compiler->parser,
+                    $output
+                )
+            );
+            $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+            $output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
+            $output .= "\\\$_smarty_tpl->smarty->ext->_tplFunction->restoreTemplateVariables(\\\$_smarty_tpl, '{$_name}');?>\n";
+            $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
+            $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash ?? '', ob_get_clean());\n";
+            $output .= "}\n}\n";
+            $output .= $compiler->cStyleComment("/ {$_funcName}_nocache ") . "\n\n";
+            $output .= "?>\n";
+            $compiler->parser->current_buffer->append_subtree(
+                $compiler->parser,
+                new Smarty_Internal_ParseTree_Tag(
+                    $compiler->parser,
+                    $output
+                )
+            );
+            $_functionCode = new Smarty_Internal_ParseTree_Tag(
+                $compiler->parser,
+                preg_replace_callback(
+                    "/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+                    array($this, 'removeNocache'),
+                    $_functionCode->to_smarty_php($compiler->parser)
+                )
+            );
+        }
+        $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name' ] = $_funcName;
+        $output = "<?php\n";
+        $output .= $compiler->cStyleComment(" {$_funcName} ") . "\n";
+        $output .= "if (!function_exists('{$_funcName}')) {\n";
+        $output .= "function {$_funcName}(Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
+        $output .= $_paramsCode;
+        $output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->tpl_vars[\$key] = new Smarty_Variable(\$value, \$_smarty_tpl->isRenderingCache);\n}\n";
+        $output .= $compiler->compileCheckPlugins(array_merge($compiler->required_plugins[ 'compiled' ],
+            $compiler->required_plugins[ 'nocache' ]));
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree(
+            $compiler->parser,
+            new Smarty_Internal_ParseTree_Tag(
+                $compiler->parser,
+                $output
+            )
+        );
+        $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
+        $output = "<?php\n}}\n";
+        $output .= $compiler->cStyleComment("/ {$_funcName} ") . "\n\n";
+        $output .= "?>\n";
+        $compiler->parser->current_buffer->append_subtree(
+            $compiler->parser,
+            new Smarty_Internal_ParseTree_Tag(
+                $compiler->parser,
+                $output
+            )
+        );
+        $compiler->parent_compiler->blockOrFunctionCode .= $compiler->parser->current_buffer->to_smarty_php($compiler->parser);
+        // restore old buffer
+        $compiler->parser->current_buffer = $saved_data[ 1 ];
+        // restore old status
+        $compiler->restoreRequiredPlugins();
+        $compiler->template->compiled->has_nocache_code = $saved_data[ 2 ];
+        $compiler->template->caching = $saved_data[ 3 ];
+        return true;
+    }
+
+    /**
+     * Remove nocache code
+     *
+     * @param $match
+     *
+     * @return string
+     */
+    public function removeNocache($match)
+    {
+        $code =
+            preg_replace(
+                "/((<\?php )?echo '\/\*%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$this->compiler->template->compiled->nocache_hash}%%\*\/';(\?>\n)?)/",
+                '',
+                $match[ 0 ]
+            );
+        $code = str_replace(array('\\\'', '\\\\\''), array('\'', '\\\''), $code);
+        return $code;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_if.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_if.php
new file mode 100644
index 000000000..df3dc3fad
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_if.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile If
+ * Compiles the {if} {else} {elseif} {/if} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile If Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {if} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $this->openTag($compiler, 'if', array(1, $compiler->nocache));
+        // must whole block be nocache ?
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        if (!isset($parameter[ 'if condition' ])) {
+            $compiler->trigger_template_error('missing if condition', null, true);
+        }
+        if (is_array($parameter[ 'if condition' ])) {
+            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+                $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+            } else {
+                $var = $parameter[ 'if condition' ][ 'var' ];
+            }
+            if ($compiler->nocache) {
+                // create nocache var to make it know for further compiling
+                $compiler->setNocacheInVariable($var);
+            }
+            $prefixVar = $compiler->getNewPrefixVariable();
+            $_output = "<?php {$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]};?>\n";
+            $assignAttr = array();
+            $assignAttr[][ 'value' ] = $prefixVar;
+            $assignCompiler = new Smarty_Internal_Compile_Assign();
+            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+                $_output .= $assignCompiler->compile(
+                    $assignAttr,
+                    $compiler,
+                    array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ])
+                );
+            } else {
+                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
+                $_output .= $assignCompiler->compile($assignAttr, $compiler, array());
+            }
+            $_output .= "<?php if ({$prefixVar}) {?>";
+            return $_output;
+        } else {
+            return "<?php if ({$parameter['if condition']}) {?>";
+        }
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Else Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {else} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
+        $this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache));
+        return '<?php } else { ?>';
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile ElseIf Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {elseif} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
+        if (!isset($parameter[ 'if condition' ])) {
+            $compiler->trigger_template_error('missing elseif condition', null, true);
+        }
+        $assignCode = '';
+        $var = '';
+        if (is_array($parameter[ 'if condition' ])) {
+            $condition_by_assign = true;
+            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+                $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+            } else {
+                $var = $parameter[ 'if condition' ][ 'var' ];
+            }
+            if ($compiler->nocache) {
+                // create nocache var to make it know for further compiling
+                $compiler->setNocacheInVariable($var);
+            }
+            $prefixVar = $compiler->getNewPrefixVariable();
+            $assignCode = "<?php {$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]};?>\n";
+            $assignCompiler = new Smarty_Internal_Compile_Assign();
+            $assignAttr = array();
+            $assignAttr[][ 'value' ] = $prefixVar;
+            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+                $assignCode .= $assignCompiler->compile(
+                    $assignAttr,
+                    $compiler,
+                    array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ])
+                );
+            } else {
+                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
+                $assignCode .= $assignCompiler->compile($assignAttr, $compiler, array());
+            }
+        } else {
+            $condition_by_assign = false;
+        }
+        $prefixCode = $compiler->getPrefixCode();
+        if (empty($prefixCode)) {
+            if ($condition_by_assign) {
+                $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
+                $_output = $compiler->appendCode("<?php } else {\n?>", $assignCode);
+                return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
+            } else {
+                $this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache));
+                return "<?php } elseif ({$parameter['if condition']}) {?>";
+            }
+        } else {
+            $_output = $compiler->appendCode("<?php } else {\n?>", $prefixCode);
+            $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
+            if ($condition_by_assign) {
+                $_output = $compiler->appendCode($_output, $assignCode);
+                return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
+            } else {
+                return $compiler->appendCode($_output, "<?php if ({$parameter['if condition']}) {?>");
+            }
+        }
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Ifclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {/if} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        // must endblock be nocache?
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+        list($nesting, $compiler->nocache) = $this->closeTag($compiler, array('if', 'else', 'elseif'));
+        $tmp = '';
+        for ($i = 0; $i < $nesting; $i++) {
+            $tmp .= '}';
+        }
+        return "<?php {$tmp}?>";
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_include.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_include.php
new file mode 100644
index 000000000..bf62461bc
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_include.php
@@ -0,0 +1,347 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Include
+ * Compiles the {include} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Include Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
+{
+    /**
+     * caching mode to create nocache code but no cache file
+     */
+    const CACHING_NOCACHE_CODE = 9999;
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('file');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('file');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $option_flags = array('nocache', 'inline', 'caching');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Valid scope names
+     *
+     * @var array
+     */
+    public $valid_scopes = array(
+        'parent' => Smarty::SCOPE_PARENT, 'root' => Smarty::SCOPE_ROOT,
+        'global' => Smarty::SCOPE_GLOBAL, 'tpl_root' => Smarty::SCOPE_TPL_ROOT,
+        'smarty' => Smarty::SCOPE_SMARTY
+    );
+
+    /**
+     * Compiles code for the {include} tag
+     *
+     * @param array                                  $args     array with attributes from parser
+     * @param Smarty_Internal_SmartyTemplateCompiler $compiler compiler object
+     *
+     * @return string
+     * @throws \Exception
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler)
+    {
+        $uid = $t_hash = null;
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $fullResourceName = $source_resource = $_attr[ 'file' ];
+        $variable_template = false;
+        $cache_tpl = false;
+        // parse resource_name
+        if (preg_match('/^([\'"])(([A-Za-z0-9_\-]{2,})[:])?(([^$()]+)|(.+))\1$/', $source_resource, $match)) {
+            $type = !empty($match[ 3 ]) ? $match[ 3 ] : $compiler->template->smarty->default_resource_type;
+            $name = !empty($match[ 5 ]) ? $match[ 5 ] : $match[ 6 ];
+            $handler = Smarty_Resource::load($compiler->smarty, $type);
+            if ($handler->recompiled || $handler->uncompiled) {
+                $variable_template = true;
+            }
+            if (!$variable_template) {
+                if ($type !== 'string') {
+                    $fullResourceName = "{$type}:{$name}";
+                    $compiled = $compiler->parent_compiler->template->compiled;
+                    if (isset($compiled->includes[ $fullResourceName ])) {
+                        $compiled->includes[ $fullResourceName ]++;
+                        $cache_tpl = true;
+                    } else {
+                        if ("{$compiler->template->source->type}:{$compiler->template->source->name}" ==
+                            $fullResourceName
+                        ) {
+                            // recursive call of current template
+                            $compiled->includes[ $fullResourceName ] = 2;
+                            $cache_tpl = true;
+                        } else {
+                            $compiled->includes[ $fullResourceName ] = 1;
+                        }
+                    }
+                    $fullResourceName = $match[ 1 ] . $fullResourceName . $match[ 1 ];
+                }
+            }
+            if (empty($match[ 5 ])) {
+                $variable_template = true;
+            }
+        } else {
+            $variable_template = true;
+        }
+        // scope setup
+        $_scope = $compiler->convertScope($_attr, $this->valid_scopes);
+        // set flag to cache subtemplate object when called within loop or template name is variable.
+        if ($cache_tpl || $variable_template || $compiler->loopNesting > 0) {
+            $_cache_tpl = 'true';
+        } else {
+            $_cache_tpl = 'false';
+        }
+        // assume caching is off
+        $_caching = Smarty::CACHING_OFF;
+        $call_nocache = $compiler->tag_nocache || $compiler->nocache;
+        // caching was on and {include} is not in nocache mode
+        if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) {
+            $_caching = self::CACHING_NOCACHE_CODE;
+        }
+        // flag if included template code should be merged into caller
+        $merge_compiled_includes = ($compiler->smarty->merge_compiled_includes || $_attr[ 'inline' ] === true) &&
+                                   !$compiler->template->source->handler->recompiled;
+        if ($merge_compiled_includes) {
+            // variable template name ?
+            if ($variable_template) {
+                $merge_compiled_includes = false;
+            }
+            // variable compile_id?
+            if (isset($_attr[ 'compile_id' ]) && $compiler->isVariable($_attr[ 'compile_id' ])) {
+                $merge_compiled_includes = false;
+            }
+        }
+        /*
+        * if the {include} tag provides individual parameter for caching or compile_id
+        * the subtemplate must not be included into the common cache file and is treated like
+        * a call in nocache mode.
+        *
+        */
+        if ($_attr[ 'nocache' ] !== true && $_attr[ 'caching' ]) {
+            $_caching = $_new_caching = (int)$_attr[ 'caching' ];
+            $call_nocache = true;
+        } else {
+            $_new_caching = Smarty::CACHING_LIFETIME_CURRENT;
+        }
+        if (isset($_attr[ 'cache_lifetime' ])) {
+            $_cache_lifetime = $_attr[ 'cache_lifetime' ];
+            $call_nocache = true;
+            $_caching = $_new_caching;
+        } else {
+            $_cache_lifetime = '$_smarty_tpl->cache_lifetime';
+        }
+        if (isset($_attr[ 'cache_id' ])) {
+            $_cache_id = $_attr[ 'cache_id' ];
+            $call_nocache = true;
+            $_caching = $_new_caching;
+        } else {
+            $_cache_id = '$_smarty_tpl->cache_id';
+        }
+        if (isset($_attr[ 'compile_id' ])) {
+            $_compile_id = $_attr[ 'compile_id' ];
+        } else {
+            $_compile_id = '$_smarty_tpl->compile_id';
+        }
+        // if subtemplate will be called in nocache mode do not merge
+        if ($compiler->template->caching && $call_nocache) {
+            $merge_compiled_includes = false;
+        }
+        // assign attribute
+        if (isset($_attr[ 'assign' ])) {
+            // output will be stored in a smarty variable instead of being displayed
+            if ($_assign = $compiler->getId($_attr[ 'assign' ])) {
+                $_assign = "'{$_assign}'";
+                if ($compiler->tag_nocache || $compiler->nocache || $call_nocache) {
+                    // create nocache var to make it know for further compiling
+                    $compiler->setNocacheInVariable($_attr[ 'assign' ]);
+                }
+            } else {
+                $_assign = $_attr[ 'assign' ];
+            }
+        }
+        $has_compiled_template = false;
+        if ($merge_compiled_includes) {
+            $c_id = isset($_attr[ 'compile_id' ]) ? $_attr[ 'compile_id' ] : $compiler->template->compile_id;
+            // we must observe different compile_id and caching
+            $t_hash = sha1($c_id . ($_caching ? '--caching' : '--nocaching'));
+            $compiler->smarty->allow_ambiguous_resources = true;
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $compiler->smarty->template_class(
+                trim($fullResourceName, '"\''),
+                $compiler->smarty,
+                $compiler->template,
+                $compiler->template->cache_id,
+                $c_id,
+                $_caching
+            );
+            $uid = $tpl->source->type . $tpl->source->uid;
+            if (!isset($compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ])) {
+                $has_compiled_template = $this->compileInlineTemplate($compiler, $tpl, $t_hash);
+            } else {
+                $has_compiled_template = true;
+            }
+            unset($tpl);
+        }
+        // delete {include} standard attributes
+        unset($_attr[ 'file' ], $_attr[ 'assign' ], $_attr[ 'cache_id' ], $_attr[ 'compile_id' ], $_attr[ 'cache_lifetime' ], $_attr[ 'nocache' ], $_attr[ 'caching' ], $_attr[ 'scope' ], $_attr[ 'inline' ]);
+        // remaining attributes must be assigned as smarty variable
+        $_vars = 'array()';
+        if (!empty($_attr)) {
+            $_pairs = array();
+            // create variables
+            foreach ($_attr as $key => $value) {
+                $_pairs[] = "'$key'=>$value";
+            }
+            $_vars = 'array(' . join(',', $_pairs) . ')';
+        }
+        $update_compile_id = $compiler->template->caching && !$compiler->tag_nocache && !$compiler->nocache &&
+                             $_compile_id !== '$_smarty_tpl->compile_id';
+        if ($has_compiled_template && !$call_nocache) {
+            $_output = "<?php\n";
+            if ($update_compile_id) {
+                $_output .= $compiler->makeNocacheCode("\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n");
+            }
+            if (!empty($_attr) && $_caching === 9999 && $compiler->template->caching) {
+                $_vars_nc = "foreach ($_vars as \$ik => \$iv) {\n";
+                $_vars_nc .= "\$_smarty_tpl->tpl_vars[\$ik] =  new Smarty_Variable(\$iv);\n";
+                $_vars_nc .= "}\n";
+                $_output .= substr($compiler->processNocacheCode('<?php ' . $_vars_nc . "?>\n", true), 6, -3);
+            }
+            if (isset($_assign)) {
+                $_output .= "ob_start();\n";
+            }
+            $_output .= "\$_smarty_tpl->_subTemplateRender({$fullResourceName}, {$_cache_id}, {$_compile_id}, {$_caching}, {$_cache_lifetime}, {$_vars}, {$_scope}, {$_cache_tpl}, '{$compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['uid']}', '{$compiler->parent_compiler->mergedSubTemplatesData[$uid][$t_hash]['func']}');\n";
+            if (isset($_assign)) {
+                $_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+            }
+            if ($update_compile_id) {
+                $_output .= $compiler->makeNocacheCode("\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n");
+            }
+            $_output .= "?>";
+            return $_output;
+        }
+        if ($call_nocache) {
+            $compiler->tag_nocache = true;
+        }
+        $_output = "<?php ";
+        if ($update_compile_id) {
+            $_output .= "\$_compile_id_save[] = \$_smarty_tpl->compile_id;\n\$_smarty_tpl->compile_id = {$_compile_id};\n";
+        }
+        // was there an assign attribute
+        if (isset($_assign)) {
+            $_output .= "ob_start();\n";
+        }
+        $_output .= "\$_smarty_tpl->_subTemplateRender({$fullResourceName}, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_scope, {$_cache_tpl});\n";
+        if (isset($_assign)) {
+            $_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+        }
+        if ($update_compile_id) {
+            $_output .= "\$_smarty_tpl->compile_id = array_pop(\$_compile_id_save);\n";
+        }
+        $_output .= "?>";
+        return $_output;
+    }
+
+    /**
+     * Compile inline sub template
+     *
+     * @param \Smarty_Internal_SmartyTemplateCompiler $compiler
+     * @param \Smarty_Internal_Template               $tpl
+     * @param string                                  $t_hash
+     *
+     * @return bool
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function compileInlineTemplate(
+        Smarty_Internal_SmartyTemplateCompiler $compiler,
+        Smarty_Internal_Template $tpl,
+        $t_hash
+    ) {
+        $uid = $tpl->source->type . $tpl->source->uid;
+        if (!($tpl->source->handler->uncompiled) && $tpl->source->exists) {
+            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'uid' ] = $tpl->source->uid;
+            if (isset($compiler->template->inheritance)) {
+                $tpl->inheritance = clone $compiler->template->inheritance;
+            }
+            $tpl->compiled = new Smarty_Template_Compiled();
+            $tpl->compiled->nocache_hash = $compiler->parent_compiler->template->compiled->nocache_hash;
+            $tpl->loadCompiler();
+            // save unique function name
+            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'func' ] =
+            $tpl->compiled->unifunc = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
+            // make sure whole chain gets compiled
+            $tpl->mustCompile = true;
+            $compiler->parent_compiler->mergedSubTemplatesData[ $uid ][ $t_hash ][ 'nocache_hash' ] =
+                $tpl->compiled->nocache_hash;
+            if ($tpl->source->type === 'file') {
+                $sourceInfo = $tpl->source->filepath;
+            } else {
+                $basename = $tpl->source->handler->getBasename($tpl->source);
+                $sourceInfo = $tpl->source->type . ':' .
+                              ($basename ? $basename : $tpl->source->name);
+            }
+            // get compiled code
+            $compiled_code = "<?php\n\n";
+            $compiled_code .= $compiler->cStyleComment(" Start inline template \"{$sourceInfo}\" =============================") . "\n";
+            $compiled_code .= "function {$tpl->compiled->unifunc} (Smarty_Internal_Template \$_smarty_tpl) {\n";
+            $compiled_code .= "?>\n" . $tpl->compiler->compileTemplateSource($tpl, null, $compiler->parent_compiler);
+            $compiled_code .= "<?php\n";
+            $compiled_code .= "}\n?>\n";
+            $compiled_code .= $tpl->compiler->postFilter($tpl->compiler->blockOrFunctionCode);
+            $compiled_code .= "<?php\n\n";
+            $compiled_code .= $compiler->cStyleComment(" End inline template \"{$sourceInfo}\" =============================") . "\n";
+            $compiled_code .= '?>';
+            unset($tpl->compiler);
+            if ($tpl->compiled->has_nocache_code) {
+                // replace nocache_hash
+                $compiled_code =
+                    str_replace(
+                        "{$tpl->compiled->nocache_hash}",
+                        $compiler->template->compiled->nocache_hash,
+                        $compiled_code
+                    );
+                $compiler->template->compiled->has_nocache_code = true;
+            }
+            $compiler->parent_compiler->mergedSubTemplatesCode[ $tpl->compiled->unifunc ] = $compiled_code;
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_insert.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_insert.php
new file mode 100644
index 000000000..29031d910
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_insert.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Insert
+ * Compiles the {insert} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Insert Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('name');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('name');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Compiles code for the {insert} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $nocacheParam = $compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache);
+        if (!$nocacheParam) {
+            // do not compile as nocache code
+            $compiler->suppressNocacheProcessing = true;
+        }
+        $compiler->tag_nocache = true;
+        $_smarty_tpl = $compiler->template;
+        $_name = null;
+        $_script = null;
+        $_output = '<?php ';
+        // save possible attributes
+        eval('$_name = @' . $_attr[ 'name' ] . ';');
+        if (isset($_attr[ 'assign' ])) {
+            // output will be stored in a smarty variable instead of being displayed
+            $_assign = $_attr[ 'assign' ];
+            // create variable to make sure that the compiler knows about its nocache status
+            $var = trim($_attr[ 'assign' ], '\'');
+            if (isset($compiler->template->tpl_vars[ $var ])) {
+                $compiler->template->tpl_vars[ $var ]->nocache = true;
+            } else {
+                $compiler->template->tpl_vars[ $var ] = new Smarty_Variable(null, true);
+            }
+        }
+        if (isset($_attr[ 'script' ])) {
+            // script which must be included
+            $_function = "smarty_insert_{$_name}";
+            $_smarty_tpl = $compiler->template;
+            $_filepath = false;
+            eval('$_script = @' . $_attr[ 'script' ] . ';');
+            if (!isset($compiler->smarty->security_policy) && file_exists($_script)) {
+                $_filepath = $_script;
+            } else {
+                if (isset($compiler->smarty->security_policy)) {
+                    $_dir = $compiler->smarty->security_policy->trusted_dir;
+                } else {
+                    $_dir = null;
+                }
+                if (!empty($_dir)) {
+                    foreach ((array)$_dir as $_script_dir) {
+                        $_script_dir = rtrim($_script_dir ?? '', '/\\') . DIRECTORY_SEPARATOR;
+                        if (file_exists($_script_dir . $_script)) {
+                            $_filepath = $_script_dir . $_script;
+                            break;
+                        }
+                    }
+                }
+            }
+            if ($_filepath === false) {
+                $compiler->trigger_template_error("{insert} missing script file '{$_script}'", null, true);
+            }
+            // code for script file loading
+            $_output .= "require_once '{$_filepath}' ;";
+            include_once $_filepath;
+            if (!is_callable($_function)) {
+                $compiler->trigger_template_error(
+                    " {insert} function '{$_function}' is not callable in script file '{$_script}'",
+                    null,
+                    true
+                );
+            }
+        } else {
+            $_filepath = 'null';
+            $_function = "insert_{$_name}";
+            // function in PHP script ?
+            if (!is_callable($_function)) {
+                // try plugin
+                if (!$_function = $compiler->getPlugin($_name, 'insert')) {
+                    $compiler->trigger_template_error(
+                        "{insert} no function or plugin found for '{$_name}'",
+                        null,
+                        true
+                    );
+                }
+            }
+        }
+        // delete {insert} standard attributes
+        unset($_attr[ 'name' ], $_attr[ 'assign' ], $_attr[ 'script' ], $_attr[ 'nocache' ]);
+        // convert attributes into parameter array string
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            $_paramsArray[] = "'$_key' => $_value";
+        }
+        $_params = 'array(' . implode(", ", $_paramsArray) . ')';
+        // call insert
+        if (isset($_assign)) {
+            if ($_smarty_tpl->caching && !$nocacheParam) {
+                $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}',{$_assign});?>";
+            } else {
+                $_output .= "\$_smarty_tpl->assign({$_assign} , {$_function} ({$_params},\$_smarty_tpl), true);?>";
+            }
+        } else {
+            if ($_smarty_tpl->caching && !$nocacheParam) {
+                $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}');?>";
+            } else {
+                $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
+            }
+        }
+        $compiler->template->compiled->has_nocache_code = true;
+        return $_output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
new file mode 100644
index 000000000..5493d4ecc
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_ldelim.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Ldelim
+ * Compiles the {ldelim} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Ldelim Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {ldelim} tag
+     * This tag does output the left delimiter
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($_attr[ 'nocache' ] === true) {
+            $compiler->trigger_template_error('nocache option not allowed', null, true);
+        }
+        return $compiler->smarty->left_delimiter;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_make_nocache.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_make_nocache.php
new file mode 100644
index 000000000..8a34ccd0a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_make_nocache.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Make_Nocache
+ * Compiles the {make_nocache} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Make_Nocache Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Make_Nocache extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $option_flags = array();
+
+    /**
+     * Array of names of required attribute required by tag
+     *
+     * @var array
+     */
+    public $required_attributes = array('var');
+
+    /**
+     * Shorttag attribute order defined by its names
+     *
+     * @var array
+     */
+    public $shorttag_order = array('var');
+
+    /**
+     * Compiles code for the {make_nocache} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        if ($compiler->template->caching) {
+            $output = "<?php \$_smarty_tpl->smarty->ext->_make_nocache->save(\$_smarty_tpl, {$_attr[ 'var' ]});\n?>\n";
+            $compiler->template->compiled->has_nocache_code = true;
+            $compiler->suppressNocacheProcessing = true;
+            return $output;
+        } else {
+            return true;
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_nocache.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_nocache.php
new file mode 100644
index 000000000..12f64ed2e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_nocache.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Nocache
+ * Compiles the {nocache} {/nocache} tags.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Nocache Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase
+{
+    /**
+     * Array of names of valid option flags
+     *
+     * @var array
+     */
+    public $option_flags = array();
+
+    /**
+     * Compiles code for the {nocache} tag
+     * This tag does not generate compiled output. It only sets a compiler flag.
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return bool
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $_attr = $this->getAttributes($compiler, $args);
+        $this->openTag($compiler, 'nocache', array($compiler->nocache));
+        // enter nocache mode
+        $compiler->nocache = true;
+        // this tag does not return compiled code
+        $compiler->has_code = false;
+        return true;
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Nocacheclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {/nocache} tag
+     * This tag does not generate compiled output. It only sets a compiler flag.
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return bool
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $_attr = $this->getAttributes($compiler, $args);
+        // leave nocache mode
+        list($compiler->nocache) = $this->closeTag($compiler, array('nocache'));
+        // this tag does not return compiled code
+        $compiler->has_code = false;
+        return true;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_parent.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_parent.php
new file mode 100644
index 000000000..ff23edf73
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_parent.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty Internal Plugin Compile Parent Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Compile_Parent extends Smarty_Internal_Compile_Child
+{
+    /**
+     * Tag name
+     *
+     * @var string
+     */
+    public $tag = 'parent';
+
+    /**
+     * Block type
+     *
+     * @var string
+     */
+    public $blockType = 'Parent';
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
new file mode 100644
index 000000000..199a296c8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_block_plugin.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Block Plugin
+ * Compiles code for the execution of block plugin
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Block Plugin Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * nesting level
+     *
+     * @var int
+     */
+    public $nesting = 0;
+
+    /**
+     * Compiles code for the execution of block plugin
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     * @param string                                $tag       name of block plugin
+     * @param string                                $function  PHP function name
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $function = null)
+    {
+        if (!isset($tag[ 5 ]) || substr($tag, -5) !== 'close') {
+            // opening tag of block plugin
+            // check and get attributes
+            $_attr = $this->getAttributes($compiler, $args);
+            $this->nesting++;
+            unset($_attr[ 'nocache' ]);
+            list($callback, $_paramsArray, $callable) = $this->setup($compiler, $_attr, $tag, $function);
+            $_params = 'array(' . implode(',', $_paramsArray) . ')';
+            // compile code
+            $output = "<?php ";
+            if (is_array($callback)) {
+                $output .= "\$_block_plugin{$this->nesting} = isset({$callback[0]}) ? {$callback[0]} : null;\n";
+                $callback = "\$_block_plugin{$this->nesting}{$callback[1]}";
+            }
+            if (isset($callable)) {
+                $output .= "if (!is_callable({$callable})) {\nthrow new SmartyException('block tag \'{$tag}\' not callable or registered');\n}\n";
+            }
+            $output .= "\$_smarty_tpl->smarty->_cache['_tag_stack'][] = array('{$tag}', {$_params});\n";
+            $output .= "\$_block_repeat=true;\necho {$callback}({$_params}, null, \$_smarty_tpl, \$_block_repeat);\nwhile (\$_block_repeat) {\nob_start();?>";
+            $this->openTag($compiler, $tag, array($_params, $compiler->nocache, $callback));
+            // maybe nocache because of nocache variables or nocache plugin
+            $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        } else {
+            // must endblock be nocache?
+            if ($compiler->nocache) {
+                $compiler->tag_nocache = true;
+            }
+            // closing tag of block plugin, restore nocache
+            list($_params, $compiler->nocache, $callback) = $this->closeTag($compiler, substr($tag, 0, -5));
+            // compile code
+            if (!isset($parameter[ 'modifier_list' ])) {
+                $mod_pre = $mod_post = $mod_content = '';
+                $mod_content2 = 'ob_get_clean()';
+            } else {
+                $mod_content2 = "\$_block_content{$this->nesting}";
+                $mod_content = "\$_block_content{$this->nesting} = ob_get_clean();\n";
+                $mod_pre = "ob_start();\n";
+                $mod_post = 'echo ' . $compiler->compileTag(
+                        'private_modifier',
+                        array(),
+                        array(
+                            'modifierlist' => $parameter[ 'modifier_list' ],
+                            'value'        => 'ob_get_clean()'
+                        )
+                    ) . ";\n";
+            }
+            $output =
+                "<?php {$mod_content}\$_block_repeat=false;\n{$mod_pre}echo {$callback}({$_params}, {$mod_content2}, \$_smarty_tpl, \$_block_repeat);\n{$mod_post}}\n";
+            $output .= 'array_pop($_smarty_tpl->smarty->_cache[\'_tag_stack\']);?>';
+        }
+        return $output;
+    }
+
+    /**
+     * Setup callback and parameter array
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param array                                 $_attr attributes
+     * @param string                                $tag
+     * @param string                                $function
+     *
+     * @return array
+     */
+    public function setup(Smarty_Internal_TemplateCompilerBase $compiler, $_attr, $tag, $function)
+    {
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            }
+        }
+        return array($function, $_paramsArray, null);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php
new file mode 100644
index 000000000..246350dc8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_foreachsection.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile ForeachSection
+ * Shared methods for {foreach} {section} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile ForeachSection Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_CompileBase
+{
+    /**
+     * Name of this tag
+     *
+     * @var string
+     */
+    public $tagName = '';
+
+    /**
+     * Valid properties of $smarty.xxx variable
+     *
+     * @var array
+     */
+    public $nameProperties = array();
+
+    /**
+     * {section} tag has no item properties
+     *
+     * @var array
+     */
+    public $itemProperties = null;
+
+    /**
+     * {section} tag has always name attribute
+     *
+     * @var bool
+     */
+    public $isNamed = true;
+
+    /**
+     * @var array
+     */
+    public $matchResults = array();
+
+    /**
+     * Preg search pattern
+     *
+     * @var string
+     */
+    private $propertyPreg = '';
+
+    /**
+     * Offsets in preg match result
+     *
+     * @var array
+     */
+    private $resultOffsets = array();
+
+    /**
+     * Start offset
+     *
+     * @var int
+     */
+    private $startOffset = 0;
+
+    /**
+     * Scan sources for used tag attributes
+     *
+     * @param array                                 $attributes
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     *
+     * @throws \SmartyException
+     */
+    public function scanForProperties($attributes, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->propertyPreg = '~(';
+        $this->startOffset = 1;
+        $this->resultOffsets = array();
+        $this->matchResults = array('named' => array(), 'item' => array());
+        if (isset($attributes[ 'name' ])) {
+            $this->buildPropertyPreg(true, $attributes);
+        }
+        if (isset($this->itemProperties)) {
+            if ($this->isNamed) {
+                $this->propertyPreg .= '|';
+            }
+            $this->buildPropertyPreg(false, $attributes);
+        }
+        $this->propertyPreg .= ')\W~i';
+        // Template source
+        $this->matchTemplateSource($compiler);
+        // Parent template source
+        $this->matchParentTemplateSource($compiler);
+        // {block} source
+        $this->matchBlockSource($compiler);
+    }
+
+    /**
+     * Build property preg string
+     *
+     * @param bool  $named
+     * @param array $attributes
+     */
+    public function buildPropertyPreg($named, $attributes)
+    {
+        if ($named) {
+            $this->resultOffsets[ 'named' ] = $this->startOffset = $this->startOffset + 3;
+            $this->propertyPreg .= "(([\$]smarty[.]{$this->tagName}[.]" .
+                                   ($this->tagName === 'section' ? "|[\[]\s*" : '') .
+                                   "){$attributes['name']}[.](";
+            $properties = $this->nameProperties;
+        } else {
+            $this->resultOffsets[ 'item' ] = $this->startOffset = $this->startOffset + 2;
+            $this->propertyPreg .= "([\$]{$attributes['item']}[@](";
+            $properties = $this->itemProperties;
+        }
+        $propName = reset($properties);
+        while ($propName) {
+            $this->propertyPreg .= "{$propName}";
+            $propName = next($properties);
+            if ($propName) {
+                $this->propertyPreg .= '|';
+            }
+        }
+        $this->propertyPreg .= '))';
+    }
+
+    /**
+     * Find matches in source string
+     *
+     * @param string $source
+     */
+    public function matchProperty($source)
+    {
+        preg_match_all($this->propertyPreg, $source, $match);
+        foreach ($this->resultOffsets as $key => $offset) {
+            foreach ($match[ $offset ] as $m) {
+                if (!empty($m)) {
+                    $this->matchResults[ $key ][ smarty_strtolower_ascii($m) ] = true;
+                }
+            }
+        }
+    }
+
+    /**
+     * Find matches in template source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function matchTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->matchProperty($compiler->parser->lex->data);
+    }
+
+    /**
+     * Find matches in all parent template source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     *
+     * @throws \SmartyException
+     */
+    public function matchParentTemplateSource(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        // search parent compiler template source
+        $nextCompiler = $compiler;
+        while ($nextCompiler !== $nextCompiler->parent_compiler) {
+            $nextCompiler = $nextCompiler->parent_compiler;
+            if ($compiler !== $nextCompiler) {
+                // get template source
+                $_content = $nextCompiler->template->source->getContent();
+                if ($_content !== '') {
+                    // run pre filter if required
+                    if ((isset($nextCompiler->smarty->autoload_filters[ 'pre' ]) ||
+                         isset($nextCompiler->smarty->registered_filters[ 'pre' ]))
+                    ) {
+                        $_content = $nextCompiler->smarty->ext->_filterHandler->runFilter(
+                            'pre',
+                            $_content,
+                            $nextCompiler->template
+                        );
+                    }
+                    $this->matchProperty($_content);
+                }
+            }
+        }
+    }
+
+    /**
+     * Find matches in {block} tag source
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function matchBlockSource(Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+    }
+
+    /**
+     * Compiles code for the {$smarty.foreach.xxx} or {$smarty.section.xxx}tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        $tag = smarty_strtolower_ascii(trim($parameter[ 0 ], '"\''));
+        $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
+        if (!$name) {
+            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
+        }
+        $property = isset($parameter[ 2 ]) ? smarty_strtolower_ascii($compiler->getId($parameter[ 2 ])) : false;
+        if (!$property || !in_array($property, $this->nameProperties)) {
+            $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true);
+        }
+        $tagVar = "'__smarty_{$tag}_{$name}'";
+        return "(isset(\$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}']) ? \$_smarty_tpl->tpl_vars[{$tagVar}]->value['{$property}'] : null)";
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
new file mode 100644
index 000000000..055823423
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_function_plugin.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Function Plugin
+ * Compiles code for the execution of function plugin
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Function Plugin Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array();
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Compiles code for the execution of function plugin
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     * @param string                                $tag       name of function plugin
+     * @param string                                $function  PHP function name
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $function)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        unset($_attr[ 'nocache' ]);
+        // convert attributes into parameter array string
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            }
+        }
+        $_params = 'array(' . implode(',', $_paramsArray) . ')';
+        // compile code
+        $output = "{$function}({$_params},\$_smarty_tpl)";
+        if (!empty($parameter[ 'modifierlist' ])) {
+            $output = $compiler->compileTag(
+                'private_modifier',
+                array(),
+                array(
+                    'modifierlist' => $parameter[ 'modifierlist' ],
+                    'value'        => $output
+                )
+            );
+        }
+        $output = "<?php echo {$output};?>\n";
+        return $output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
new file mode 100644
index 000000000..31fd6e1da
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_modifier.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Modifier
+ * Compiles code for modifier execution
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Modifier Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for modifier execution
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $output = $parameter[ 'value' ];
+        // loop over list of modifiers
+        foreach ($parameter[ 'modifierlist' ] as $single_modifier) {
+            /* @var string $modifier */
+            $modifier = $single_modifier[ 0 ];
+            $single_modifier[ 0 ] = $output;
+            $params = implode(',', $single_modifier);
+            // check if we know already the type of modifier
+            if (isset($compiler->known_modifier_type[ $modifier ])) {
+                $modifier_types = array($compiler->known_modifier_type[ $modifier ]);
+            } else {
+                $modifier_types = array(1, 2, 3, 4, 5, 6);
+            }
+            foreach ($modifier_types as $type) {
+                switch ($type) {
+                    case 1:
+                        // registered modifier
+                        if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ])) {
+                            if (is_callable($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ][ 0 ])) {
+                                $output =
+                                    sprintf(
+                                        'call_user_func_array($_smarty_tpl->registered_plugins[ \'%s\' ][ %s ][ 0 ], array( %s ))',
+                                        Smarty::PLUGIN_MODIFIER,
+                                        var_export($modifier, true),
+                                        $params
+                                    );
+                                $compiler->known_modifier_type[ $modifier ] = $type;
+                                break 2;
+                            }
+                        }
+                        break;
+                    case 2:
+                        // registered modifier compiler
+                        if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIERCOMPILER ][ $modifier ][ 0 ])) {
+                            $output =
+                                call_user_func(
+                                    $compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIERCOMPILER ][ $modifier ][ 0 ],
+                                    $single_modifier,
+                                    $compiler->smarty
+                                );
+                            $compiler->known_modifier_type[ $modifier ] = $type;
+                            break 2;
+                        }
+                        break;
+                    case 3:
+                        // modifiercompiler plugin
+                        if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) {
+                            // check if modifier allowed
+                            if (!is_object($compiler->smarty->security_policy)
+                                || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+                            ) {
+                                $plugin = 'smarty_modifiercompiler_' . $modifier;
+                                $output = $plugin($single_modifier, $compiler);
+                            }
+                            $compiler->known_modifier_type[ $modifier ] = $type;
+                            break 2;
+                        }
+                        break;
+                    case 4:
+                        // modifier plugin
+                        if ($function = $compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) {
+                            // check if modifier allowed
+                            if (!is_object($compiler->smarty->security_policy)
+                                || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+                            ) {
+                                $output = "{$function}({$params})";
+                            }
+                            $compiler->known_modifier_type[ $modifier ] = $type;
+                            break 2;
+                        }
+                        break;
+                    case 5:
+                        // PHP function
+                        if (is_callable($modifier)) {
+                            // check if modifier allowed
+                            if (!is_object($compiler->smarty->security_policy)
+                                || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)
+                            ) {
+                                if (!in_array($modifier, ['time', 'join', 'is_array', 'in_array'])) {
+                                    trigger_error('Using unregistered function "' . $modifier . '" in a template is deprecated and will be ' .
+                                        'removed in a future release. Use Smarty::registerPlugin to explicitly register ' .
+                                        'a custom modifier.', E_USER_DEPRECATED);
+                                }
+                                $output = "{$modifier}({$params})";
+                            }
+                            $compiler->known_modifier_type[ $modifier ] = $type;
+                            break 2;
+                        }
+                        break;
+                    case 6:
+                        // default plugin handler
+                        if (isset($compiler->default_handler_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ])
+                            || (is_callable($compiler->smarty->default_plugin_handler_func)
+                                && $compiler->getPluginFromDefaultHandler($modifier, Smarty::PLUGIN_MODIFIER))
+                        ) {
+                            $function = $compiler->default_handler_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ][ 0 ];
+                            // check if modifier allowed
+                            if (!is_object($compiler->smarty->security_policy)
+                                || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)
+                            ) {
+                                if (!is_array($function)) {
+                                    $output = "{$function}({$params})";
+                                } else {
+                                    if (is_object($function[ 0 ])) {
+                                        $output = $function[ 0 ] . '->' . $function[ 1 ] . '(' . $params . ')';
+                                    } else {
+                                        $output = $function[ 0 ] . '::' . $function[ 1 ] . '(' . $params . ')';
+                                    }
+                                }
+                            }
+                            if (isset($compiler->required_plugins[ 'nocache' ][ $modifier ][ Smarty::PLUGIN_MODIFIER ][ 'file' ])
+                                ||
+                                isset($compiler->required_plugins[ 'compiled' ][ $modifier ][ Smarty::PLUGIN_MODIFIER ][ 'file' ])
+                            ) {
+                                // was a plugin
+                                $compiler->known_modifier_type[ $modifier ] = 4;
+                            } else {
+                                $compiler->known_modifier_type[ $modifier ] = $type;
+                            }
+                            break 2;
+                        }
+                }
+            }
+            if (!isset($compiler->known_modifier_type[ $modifier ])) {
+                $compiler->trigger_template_error("unknown modifier '{$modifier}'", null, true);
+            }
+        }
+        return $output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
new file mode 100644
index 000000000..baac51b28
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_object_block_function.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Object Block Function
+ * Compiles code for registered objects as block function
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Object Block Function Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_Compile_Private_Block_Plugin
+{
+    /**
+     * Setup callback and parameter array
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param array                                 $_attr attributes
+     * @param string                                $tag
+     * @param string                                $method
+     *
+     * @return array
+     */
+    public function setup(Smarty_Internal_TemplateCompilerBase $compiler, $_attr, $tag, $method)
+    {
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            }
+        }
+        $callback = array("\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]", "->{$method}");
+        return array($callback, $_paramsArray, "array(\$_block_plugin{$this->nesting}, '{$method}')");
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
new file mode 100644
index 000000000..2a763c6e3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_object_function.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Object Function
+ * Compiles code for registered objects as function
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Object Function Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Compiles code for the execution of function plugin
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     * @param string                                $tag       name of function
+     * @param string                                $method    name of method to call
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag, $method)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        unset($_attr[ 'nocache' ]);
+        $_assign = null;
+        if (isset($_attr[ 'assign' ])) {
+            $_assign = $_attr[ 'assign' ];
+            unset($_attr[ 'assign' ]);
+        }
+        // method or property ?
+        if (is_callable(array($compiler->smarty->registered_objects[ $tag ][ 0 ], $method))) {
+            // convert attributes into parameter array string
+            if ($compiler->smarty->registered_objects[ $tag ][ 2 ]) {
+                $_paramsArray = array();
+                foreach ($_attr as $_key => $_value) {
+                    if (is_int($_key)) {
+                        $_paramsArray[] = "$_key=>$_value";
+                    } else {
+                        $_paramsArray[] = "'$_key'=>$_value";
+                    }
+                }
+                $_params = 'array(' . implode(',', $_paramsArray) . ')';
+                $output = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)";
+            } else {
+                $_params = implode(',', $_attr);
+                $output = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})";
+            }
+        } else {
+            // object property
+            $output = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}";
+        }
+        if (!empty($parameter[ 'modifierlist' ])) {
+            $output = $compiler->compileTag(
+                'private_modifier',
+                array(),
+                array('modifierlist' => $parameter[ 'modifierlist' ], 'value' => $output)
+            );
+        }
+        if (empty($_assign)) {
+            return "<?php echo {$output};?>\n";
+        } else {
+            return "<?php \$_smarty_tpl->assign({$_assign},{$output});?>\n";
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
new file mode 100644
index 000000000..78f1c0763
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_print_expression.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Print Expression
+ * Compiles any tag which will output an expression or variable
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Print Expression Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('assign');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $option_flags = array('nocache', 'nofilter');
+
+    /**
+     * Compiles code for generating output from any expression
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $output = $parameter[ 'value' ];
+        // tag modifier
+        if (!empty($parameter[ 'modifierlist' ])) {
+            $output = $compiler->compileTag(
+                'private_modifier',
+                array(),
+                array(
+                    'modifierlist' => $parameter[ 'modifierlist' ],
+                    'value'        => $output
+                )
+            );
+        }
+        if (isset($_attr[ 'assign' ])) {
+            // assign output to variable
+            return "<?php \$_smarty_tpl->assign({$_attr['assign']},{$output});?>";
+        } else {
+            // display value
+            if (!$_attr[ 'nofilter' ]) {
+                // default modifier
+                if (!empty($compiler->smarty->default_modifiers)) {
+                    if (empty($compiler->default_modifier_list)) {
+                        $modifierlist = array();
+                        foreach ($compiler->smarty->default_modifiers as $key => $single_default_modifier) {
+                            preg_match_all(
+                                '/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/',
+                                $single_default_modifier,
+                                $mod_array
+                            );
+                            for ($i = 0, $count = count($mod_array[ 0 ]); $i < $count; $i++) {
+                                if ($mod_array[ 0 ][ $i ] !== ':') {
+                                    $modifierlist[ $key ][] = $mod_array[ 0 ][ $i ];
+                                }
+                            }
+                        }
+                        $compiler->default_modifier_list = $modifierlist;
+                    }
+                    $output = $compiler->compileTag(
+                        'private_modifier',
+                        array(),
+                        array(
+                            'modifierlist' => $compiler->default_modifier_list,
+                            'value'        => $output
+                        )
+                    );
+                }
+                // autoescape html
+                if ($compiler->template->smarty->escape_html) {
+                    $output = "htmlspecialchars((string) ({$output}), ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
+                }
+                // loop over registered filters
+                if (!empty($compiler->template->smarty->registered_filters[ Smarty::FILTER_VARIABLE ])) {
+                    foreach ($compiler->template->smarty->registered_filters[ Smarty::FILTER_VARIABLE ] as $key =>
+                        $function) {
+                        if (!is_array($function)) {
+                            $output = "{$function}({$output},\$_smarty_tpl)";
+                        } elseif (is_object($function[ 0 ])) {
+                            $output =
+                                "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE]['{$key}'][0]->{$function[1]}({$output},\$_smarty_tpl)";
+                        } else {
+                            $output = "{$function[0]}::{$function[1]}({$output},\$_smarty_tpl)";
+                        }
+                    }
+                }
+                // auto loaded filters
+                if (isset($compiler->smarty->autoload_filters[ Smarty::FILTER_VARIABLE ])) {
+                    foreach ((array)$compiler->template->smarty->autoload_filters[ Smarty::FILTER_VARIABLE ] as $name) {
+                        $result = $this->compile_variable_filter($compiler, $name, $output);
+                        if ($result !== false) {
+                            $output = $result;
+                        } else {
+                            // not found, throw exception
+                            throw new SmartyException("Unable to load variable filter '{$name}'");
+                        }
+                    }
+                }
+                foreach ($compiler->variable_filters as $filter) {
+                    if (count($filter) === 1
+                        && ($result = $this->compile_variable_filter($compiler, $filter[ 0 ], $output)) !== false
+                    ) {
+                        $output = $result;
+                    } else {
+                        $output = $compiler->compileTag(
+                            'private_modifier',
+                            array(),
+                            array('modifierlist' => array($filter), 'value' => $output)
+                        );
+                    }
+                }
+            }
+            $output = "<?php echo {$output};?>\n";
+        }
+        return $output;
+    }
+
+    /**
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param string                                $name     name of variable filter
+     * @param string                                $output   embedded output
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    private function compile_variable_filter(Smarty_Internal_TemplateCompilerBase $compiler, $name, $output)
+    {
+        $function = $compiler->getPlugin($name, 'variablefilter');
+        if ($function) {
+            return "{$function}({$output},\$_smarty_tpl)";
+        } else {
+            // not found
+            return false;
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
new file mode 100644
index 000000000..0f818d1b3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_block.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Registered Block
+ * Compiles code for the execution of a registered block function
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Registered Block Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_Compile_Private_Block_Plugin
+{
+    /**
+     * Setup callback, parameter array and nocache mode
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param array                                 $_attr attributes
+     * @param string                                $tag
+     * @param null                                  $function
+     *
+     * @return array
+     */
+    public function setup(Smarty_Internal_TemplateCompilerBase $compiler, $_attr, $tag, $function)
+    {
+        if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $tag ])) {
+            $tag_info = $compiler->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $tag ];
+            $callback = $tag_info[ 0 ];
+            if (is_array($callback)) {
+                if (is_object($callback[ 0 ])) {
+                    $callable = "array(\$_block_plugin{$this->nesting}, '{$callback[1]}')";
+                    $callback =
+                        array("\$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]", "->{$callback[1]}");
+                } else {
+                    $callable = "array(\$_block_plugin{$this->nesting}, '{$callback[1]}')";
+                    $callback =
+                        array("\$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]", "::{$callback[1]}");
+                }
+            } else {
+                $callable = "\$_block_plugin{$this->nesting}";
+                $callback = array("\$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0]", '');
+            }
+        } else {
+            $tag_info = $compiler->default_handler_plugins[ Smarty::PLUGIN_BLOCK ][ $tag ];
+            $callback = $tag_info[ 0 ];
+            if (is_array($callback)) {
+                $callable = "array('{$callback[0]}', '{$callback[1]}')";
+                $callback = "{$callback[1]}::{$callback[1]}";
+            } else {
+                $callable = null;
+            }
+        }
+        $compiler->tag_nocache = !$tag_info[ 1 ] | $compiler->tag_nocache;
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } elseif ($compiler->template->caching && in_array($_key, $tag_info[ 2 ])) {
+                $_value = str_replace('\'', "^#^", $_value);
+                $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            }
+        }
+        return array($callback, $_paramsArray, $callable);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
new file mode 100644
index 000000000..2591107d2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_registered_function.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Registered Function
+ * Compiles code for the execution of a registered function
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Registered Function Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Internal_CompileBase
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('_any');
+
+    /**
+     * Compiles code for the execution of a registered function
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     * @param string                                $tag       name of function
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter, $tag)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        unset($_attr[ 'nocache' ]);
+        if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) {
+            $tag_info = $compiler->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ];
+            $is_registered = true;
+        } else {
+            $tag_info = $compiler->default_handler_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ];
+            $is_registered = false;
+        }
+        // not cacheable?
+        $compiler->tag_nocache = $compiler->tag_nocache || !$tag_info[ 1 ];
+        // convert attributes into parameter array string
+        $_paramsArray = array();
+        foreach ($_attr as $_key => $_value) {
+            if (is_int($_key)) {
+                $_paramsArray[] = "$_key=>$_value";
+            } elseif ($compiler->template->caching && in_array($_key, $tag_info[ 2 ])) {
+                $_value = str_replace('\'', "^#^", $_value);
+                $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
+            } else {
+                $_paramsArray[] = "'$_key'=>$_value";
+            }
+        }
+        $_params = 'array(' . implode(',', $_paramsArray) . ')';
+        // compile code
+        if ($is_registered) {
+            $output =
+                "call_user_func_array( \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0], array( {$_params},\$_smarty_tpl ) )";
+        } else {
+            $function = $tag_info[ 0 ];
+            if (!is_array($function)) {
+                $output = "{$function}({$_params},\$_smarty_tpl)";
+            } else {
+                $output = "{$function[0]}::{$function[1]}({$_params},\$_smarty_tpl)";
+            }
+        }
+        if (!empty($parameter[ 'modifierlist' ])) {
+            $output = $compiler->compileTag(
+                'private_modifier',
+                array(),
+                array(
+                    'modifierlist' => $parameter[ 'modifierlist' ],
+                    'value'        => $output
+                )
+            );
+        }
+        $output = "<?php echo {$output};?>\n";
+        return $output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
new file mode 100644
index 000000000..590cba5af
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Special Smarty Variable
+ * Compiles the special $smarty variables
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile special Smarty Variable Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the special $smarty variables
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     * @param                                       $parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        $_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2));
+        $variable = smarty_strtolower_ascii($compiler->getId($_index[ 0 ]));
+        if ($variable === false) {
+            $compiler->trigger_template_error("special \$Smarty variable name index can not be variable", null, true);
+        }
+        if (!isset($compiler->smarty->security_policy)
+            || $compiler->smarty->security_policy->isTrustedSpecialSmartyVar($variable, $compiler)
+        ) {
+            switch ($variable) {
+                case 'foreach':
+                case 'section':
+                    if (!isset(Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ])) {
+                        $class = 'Smarty_Internal_Compile_' . smarty_ucfirst_ascii($variable);
+                        Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ] = new $class;
+                    }
+                    return Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ]->compileSpecialVariable(
+                        array(),
+                        $compiler,
+                        $_index
+                    );
+                case 'capture':
+                    if (class_exists('Smarty_Internal_Compile_Capture')) {
+                        return Smarty_Internal_Compile_Capture::compileSpecialVariable(array(), $compiler, $_index);
+                    }
+                    return '';
+                case 'now':
+                    return 'time()';
+                case 'cookies':
+                    if (isset($compiler->smarty->security_policy)
+                        && !$compiler->smarty->security_policy->allow_super_globals
+                    ) {
+                        $compiler->trigger_template_error("(secure mode) super globals not permitted");
+                        break;
+                    }
+                    $compiled_ref = '$_COOKIE';
+                    break;
+                case 'get':
+                case 'post':
+                case 'env':
+                case 'server':
+                case 'session':
+                case 'request':
+                    if (isset($compiler->smarty->security_policy)
+                        && !$compiler->smarty->security_policy->allow_super_globals
+                    ) {
+                        $compiler->trigger_template_error("(secure mode) super globals not permitted");
+                        break;
+                    }
+                    $compiled_ref = '$_' . smarty_strtoupper_ascii($variable);
+                    break;
+                case 'template':
+                    return 'basename($_smarty_tpl->source->filepath)';
+                case 'template_object':
+                    if (isset($compiler->smarty->security_policy)) {
+                        $compiler->trigger_template_error("(secure mode) template_object not permitted");
+                        break;
+                    }
+                    return '$_smarty_tpl';
+                case 'current_dir':
+                    return 'dirname($_smarty_tpl->source->filepath)';
+                case 'version':
+                    return "Smarty::SMARTY_VERSION";
+                case 'const':
+                    if (isset($compiler->smarty->security_policy)
+                        && !$compiler->smarty->security_policy->allow_constants
+                    ) {
+                        $compiler->trigger_template_error("(secure mode) constants not permitted");
+                        break;
+                    }
+                    if (strpos($_index[ 1 ], '$') === false && strpos($_index[ 1 ], '\'') === false) {
+                        return "(defined('{$_index[1]}') ? constant('{$_index[1]}') : null)";
+                    } else {
+                        return "(defined({$_index[1]}) ? constant({$_index[1]}) : null)";
+                    }
+                // no break
+                case 'config':
+                    if (isset($_index[ 2 ])) {
+                        return "(is_array(\$tmp = \$_smarty_tpl->smarty->ext->configload->_getConfigVariable(\$_smarty_tpl, $_index[1])) ? \$tmp[$_index[2]] : null)";
+                    } else {
+                        return "\$_smarty_tpl->smarty->ext->configload->_getConfigVariable(\$_smarty_tpl, $_index[1])";
+                    }
+                // no break
+                case 'ldelim':
+                    return "\$_smarty_tpl->smarty->left_delimiter";
+                case 'rdelim':
+                    return "\$_smarty_tpl->smarty->right_delimiter";
+                default:
+                    $compiler->trigger_template_error('$smarty.' . trim($_index[ 0 ], "'") . ' is not defined');
+                    break;
+            }
+            if (isset($_index[ 1 ])) {
+                array_shift($_index);
+                foreach ($_index as $_ind) {
+                    $compiled_ref = $compiled_ref . "[$_ind]";
+                }
+            }
+            return $compiled_ref;
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
new file mode 100644
index 000000000..1cc340c18
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_rdelim.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Rdelim
+ * Compiles the {rdelim} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Rdelim Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_Compile_Ldelim
+{
+    /**
+     * Compiles code for the {rdelim} tag
+     * This tag does output the right delimiter.
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        parent::compile($args, $compiler);
+        return $compiler->smarty->right_delimiter;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_section.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_section.php
new file mode 100644
index 000000000..0dee20820
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_section.php
@@ -0,0 +1,462 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Section
+ * Compiles the {section} {sectionelse} {/section} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Section Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_ForeachSection
+{
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $required_attributes = array('name', 'loop');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $shorttag_order = array('name', 'loop');
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see Smarty_Internal_CompileBase
+     */
+    public $optional_attributes = array('start', 'step', 'max', 'show', 'properties');
+
+    /**
+     * counter
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Name of this tag
+     *
+     * @var string
+     */
+    public $tagName = 'section';
+
+    /**
+     * Valid properties of $smarty.section.name.xxx variable
+     *
+     * @var array
+     */
+    public $nameProperties = array(
+        'first', 'last', 'index', 'iteration', 'show', 'total', 'rownum', 'index_prev',
+        'index_next', 'loop'
+    );
+
+    /**
+     * {section} tag has no item properties
+     *
+     * @var array
+     */
+    public $itemProperties = null;
+
+    /**
+     * {section} tag has always name attribute
+     *
+     * @var bool
+     */
+    public $isNamed = true;
+
+    /**
+     * Compiles code for the {section} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     * @throws \SmartyException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $compiler->loopNesting++;
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $attributes = array('name' => $compiler->getId($_attr[ 'name' ]));
+        unset($_attr[ 'name' ]);
+        foreach ($attributes as $a => $v) {
+            if ($v === false) {
+                $compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
+            }
+        }
+        $local = "\$__section_{$attributes['name']}_" . $this->counter++ . '_';
+        $sectionVar = "\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']";
+        $this->openTag($compiler, 'section', array('section', $compiler->nocache, $local, $sectionVar));
+        // maybe nocache because of nocache variables
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        $initLocal = array();
+        $initNamedProperty = array();
+        $initFor = array();
+        $incFor = array();
+        $cmpFor = array();
+        $propValue = array(
+            'index'     => "{$sectionVar}->value['index']", 'show' => 'true', 'step' => 1,
+            'iteration' => "{$local}iteration",
+        );
+        $propType = array('index' => 2, 'iteration' => 2, 'show' => 0, 'step' => 0,);
+        // search for used tag attributes
+        $this->scanForProperties($attributes, $compiler);
+        if (!empty($this->matchResults[ 'named' ])) {
+            $namedAttr = $this->matchResults[ 'named' ];
+        }
+        if (isset($_attr[ 'properties' ]) && preg_match_all("/['](.*?)[']/", $_attr[ 'properties' ], $match)) {
+            foreach ($match[ 1 ] as $prop) {
+                if (in_array($prop, $this->nameProperties)) {
+                    $namedAttr[ $prop ] = true;
+                } else {
+                    $compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
+                }
+            }
+        }
+        $namedAttr[ 'index' ] = true;
+        $output = "<?php\n";
+        foreach ($_attr as $attr_name => $attr_value) {
+            switch ($attr_name) {
+                case 'loop':
+                    if (is_numeric($attr_value)) {
+                        $v = (int)$attr_value;
+                        $t = 0;
+                    } else {
+                        $v = "(is_array(@\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop))";
+                        $t = 1;
+                    }
+                    if ($t === 1) {
+                        $initLocal[ 'loop' ] = $v;
+                        $v = "{$local}loop";
+                    }
+                    break;
+                case 'show':
+                    if (is_bool($attr_value)) {
+                        $v = $attr_value ? 'true' : 'false';
+                        $t = 0;
+                    } else {
+                        $v = "(bool) $attr_value";
+                        $t = 3;
+                    }
+                    break;
+                case 'step':
+                    if (is_numeric($attr_value)) {
+                        $v = (int)$attr_value;
+                        $v = ($v === 0) ? 1 : $v;
+                        $t = 0;
+                        break;
+                    }
+                    $initLocal[ 'step' ] = "((int)@$attr_value) === 0 ? 1 : (int)@$attr_value";
+                    $v = "{$local}step";
+                    $t = 2;
+                    break;
+                case 'max':
+                case 'start':
+                    if (is_numeric($attr_value)) {
+                        $v = (int)$attr_value;
+                        $t = 0;
+                        break;
+                    }
+                    $v = "(int)@$attr_value";
+                    $t = 3;
+                    break;
+            }
+            if ($t === 3 && $compiler->getId($attr_value)) {
+                $t = 1;
+            }
+            $propValue[ $attr_name ] = $v;
+            $propType[ $attr_name ] = $t;
+        }
+        if (isset($namedAttr[ 'step' ])) {
+            $initNamedProperty[ 'step' ] = $propValue[ 'step' ];
+        }
+        if (isset($namedAttr[ 'iteration' ])) {
+            $propValue[ 'iteration' ] = "{$sectionVar}->value['iteration']";
+        }
+        $incFor[ 'iteration' ] = "{$propValue['iteration']}++";
+        $initFor[ 'iteration' ] = "{$propValue['iteration']} = 1";
+        if ($propType[ 'step' ] === 0) {
+            if ($propValue[ 'step' ] === 1) {
+                $incFor[ 'index' ] = "{$sectionVar}->value['index']++";
+            } elseif ($propValue[ 'step' ] > 1) {
+                $incFor[ 'index' ] = "{$sectionVar}->value['index'] += {$propValue['step']}";
+            } else {
+                $incFor[ 'index' ] = "{$sectionVar}->value['index'] -= " . -$propValue[ 'step' ];
+            }
+        } else {
+            $incFor[ 'index' ] = "{$sectionVar}->value['index'] += {$propValue['step']}";
+        }
+        if (!isset($propValue[ 'max' ])) {
+            $propValue[ 'max' ] = $propValue[ 'loop' ];
+            $propType[ 'max' ] = $propType[ 'loop' ];
+        } elseif ($propType[ 'max' ] !== 0) {
+            $propValue[ 'max' ] = "{$propValue['max']} < 0 ? {$propValue['loop']} : {$propValue['max']}";
+            $propType[ 'max' ] = 1;
+        } else {
+            if ($propValue[ 'max' ] < 0) {
+                $propValue[ 'max' ] = $propValue[ 'loop' ];
+                $propType[ 'max' ] = $propType[ 'loop' ];
+            }
+        }
+        if (!isset($propValue[ 'start' ])) {
+            $start_code =
+                array(1 => "{$propValue['step']} > 0 ? ", 2 => '0', 3 => ' : ', 4 => $propValue[ 'loop' ], 5 => ' - 1');
+            if ($propType[ 'loop' ] === 0) {
+                $start_code[ 5 ] = '';
+                $start_code[ 4 ] = $propValue[ 'loop' ] - 1;
+            }
+            if ($propType[ 'step' ] === 0) {
+                if ($propValue[ 'step' ] > 0) {
+                    $start_code = array(1 => '0');
+                    $propType[ 'start' ] = 0;
+                } else {
+                    $start_code[ 1 ] = $start_code[ 2 ] = $start_code[ 3 ] = '';
+                    $propType[ 'start' ] = $propType[ 'loop' ];
+                }
+            } else {
+                $propType[ 'start' ] = 1;
+            }
+            $propValue[ 'start' ] = join('', $start_code);
+        } else {
+            $start_code =
+                array(
+                    1  => "{$propValue['start']} < 0 ? ", 2 => 'max(', 3 => "{$propValue['step']} > 0 ? ", 4 => '0',
+                    5  => ' : ', 6 => '-1', 7 => ', ', 8 => "{$propValue['start']} + {$propValue['loop']}", 10 => ')',
+                    11 => ' : ', 12 => 'min(', 13 => $propValue[ 'start' ], 14 => ', ',
+                    15 => "{$propValue['step']} > 0 ? ", 16 => $propValue[ 'loop' ], 17 => ' : ',
+                    18 => $propType[ 'loop' ] === 0 ? $propValue[ 'loop' ] - 1 : "{$propValue['loop']} - 1",
+                    19 => ')'
+                );
+            if ($propType[ 'step' ] === 0) {
+                $start_code[ 3 ] = $start_code[ 5 ] = $start_code[ 15 ] = $start_code[ 17 ] = '';
+                if ($propValue[ 'step' ] > 0) {
+                    $start_code[ 6 ] = $start_code[ 18 ] = '';
+                } else {
+                    $start_code[ 4 ] = $start_code[ 16 ] = '';
+                }
+            }
+            if ($propType[ 'start' ] === 0) {
+                if ($propType[ 'loop' ] === 0) {
+                    $start_code[ 8 ] = $propValue[ 'start' ] + $propValue[ 'loop' ];
+                }
+                $propType[ 'start' ] = $propType[ 'step' ] + $propType[ 'loop' ];
+                $start_code[ 1 ] = '';
+                if ($propValue[ 'start' ] < 0) {
+                    for ($i = 11; $i <= 19; $i++) {
+                        $start_code[ $i ] = '';
+                    }
+                    if ($propType[ 'start' ] === 0) {
+                        $start_code = array(
+                            max(
+                                $propValue[ 'step' ] > 0 ? 0 : -1,
+                                $propValue[ 'start' ] + $propValue[ 'loop' ]
+                            )
+                        );
+                    }
+                } else {
+                    for ($i = 1; $i <= 11; $i++) {
+                        $start_code[ $i ] = '';
+                    }
+                    if ($propType[ 'start' ] === 0) {
+                        $start_code =
+                            array(
+                                min(
+                                    $propValue[ 'step' ] > 0 ? $propValue[ 'loop' ] : $propValue[ 'loop' ] - 1,
+                                    $propValue[ 'start' ]
+                                )
+                            );
+                    }
+                }
+            }
+            $propValue[ 'start' ] = join('', $start_code);
+        }
+        if ($propType[ 'start' ] !== 0) {
+            $initLocal[ 'start' ] = $propValue[ 'start' ];
+            $propValue[ 'start' ] = "{$local}start";
+        }
+        $initFor[ 'index' ] = "{$sectionVar}->value['index'] = {$propValue['start']}";
+        if (!isset($_attr[ 'start' ]) && !isset($_attr[ 'step' ]) && !isset($_attr[ 'max' ])) {
+            $propValue[ 'total' ] = $propValue[ 'loop' ];
+            $propType[ 'total' ] = $propType[ 'loop' ];
+        } else {
+            $propType[ 'total' ] =
+                $propType[ 'start' ] + $propType[ 'loop' ] + $propType[ 'step' ] + $propType[ 'max' ];
+            if ($propType[ 'total' ] === 0) {
+                $propValue[ 'total' ] =
+                    min(
+                        ceil(
+                            ($propValue[ 'step' ] > 0 ? $propValue[ 'loop' ] - $propValue[ 'start' ] :
+                                (int)$propValue[ 'start' ] + 1) / abs($propValue[ 'step' ])
+                        ),
+                        $propValue[ 'max' ]
+                    );
+            } else {
+                $total_code = array(
+                    1  => 'min(', 2 => 'ceil(', 3 => '(', 4 => "{$propValue['step']} > 0 ? ",
+                    5  => $propValue[ 'loop' ], 6 => ' - ', 7 => $propValue[ 'start' ], 8 => ' : ',
+                    9  => $propValue[ 'start' ], 10 => '+ 1', 11 => ')', 12 => '/ ', 13 => 'abs(',
+                    14 => $propValue[ 'step' ], 15 => ')', 16 => ')', 17 => ", {$propValue['max']})",
+                );
+                if (!isset($propValue[ 'max' ])) {
+                    $total_code[ 1 ] = $total_code[ 17 ] = '';
+                }
+                if ($propType[ 'loop' ] + $propType[ 'start' ] === 0) {
+                    $total_code[ 5 ] = $propValue[ 'loop' ] - $propValue[ 'start' ];
+                    $total_code[ 6 ] = $total_code[ 7 ] = '';
+                }
+                if ($propType[ 'start' ] === 0) {
+                    $total_code[ 9 ] = (int)$propValue[ 'start' ] + 1;
+                    $total_code[ 10 ] = '';
+                }
+                if ($propType[ 'step' ] === 0) {
+                    $total_code[ 13 ] = $total_code[ 15 ] = '';
+                    if ($propValue[ 'step' ] === 1 || $propValue[ 'step' ] === -1) {
+                        $total_code[ 2 ] = $total_code[ 12 ] = $total_code[ 14 ] = $total_code[ 16 ] = '';
+                    } elseif ($propValue[ 'step' ] < 0) {
+                        $total_code[ 14 ] = -$propValue[ 'step' ];
+                    }
+                    $total_code[ 4 ] = '';
+                    if ($propValue[ 'step' ] > 0) {
+                        $total_code[ 8 ] = $total_code[ 9 ] = $total_code[ 10 ] = '';
+                    } else {
+                        $total_code[ 5 ] = $total_code[ 6 ] = $total_code[ 7 ] = $total_code[ 8 ] = '';
+                    }
+                }
+                $propValue[ 'total' ] = join('', $total_code);
+            }
+        }
+        if (isset($namedAttr[ 'loop' ])) {
+            $initNamedProperty[ 'loop' ] = "'loop' => {$propValue['loop']}";
+        }
+        if (isset($namedAttr[ 'total' ])) {
+            $initNamedProperty[ 'total' ] = "'total' => {$propValue['total']}";
+            if ($propType[ 'total' ] > 0) {
+                $propValue[ 'total' ] = "{$sectionVar}->value['total']";
+            }
+        } elseif ($propType[ 'total' ] > 0) {
+            $initLocal[ 'total' ] = $propValue[ 'total' ];
+            $propValue[ 'total' ] = "{$local}total";
+        }
+        $cmpFor[ 'iteration' ] = "{$propValue['iteration']} <= {$propValue['total']}";
+        foreach ($initLocal as $key => $code) {
+            $output .= "{$local}{$key} = {$code};\n";
+        }
+        $_vars = 'array(' . join(', ', $initNamedProperty) . ')';
+        $output .= "{$sectionVar} = new Smarty_Variable({$_vars});\n";
+        $cond_code = "{$propValue['total']} !== 0";
+        if ($propType[ 'total' ] === 0) {
+            if ($propValue[ 'total' ] === 0) {
+                $cond_code = 'false';
+            } else {
+                $cond_code = 'true';
+            }
+        }
+        if ($propType[ 'show' ] > 0) {
+            $output .= "{$local}show = {$propValue['show']} ? {$cond_code} : false;\n";
+            $output .= "if ({$local}show) {\n";
+        } elseif ($propValue[ 'show' ] === 'true') {
+            $output .= "if ({$cond_code}) {\n";
+        } else {
+            $output .= "if (false) {\n";
+        }
+        $jinit = join(', ', $initFor);
+        $jcmp = join(', ', $cmpFor);
+        $jinc = join(', ', $incFor);
+        $output .= "for ({$jinit}; {$jcmp}; {$jinc}){\n";
+        if (isset($namedAttr[ 'rownum' ])) {
+            $output .= "{$sectionVar}->value['rownum'] = {$propValue['iteration']};\n";
+        }
+        if (isset($namedAttr[ 'index_prev' ])) {
+            $output .= "{$sectionVar}->value['index_prev'] = {$propValue['index']} - {$propValue['step']};\n";
+        }
+        if (isset($namedAttr[ 'index_next' ])) {
+            $output .= "{$sectionVar}->value['index_next'] = {$propValue['index']} + {$propValue['step']};\n";
+        }
+        if (isset($namedAttr[ 'first' ])) {
+            $output .= "{$sectionVar}->value['first'] = ({$propValue['iteration']} === 1);\n";
+        }
+        if (isset($namedAttr[ 'last' ])) {
+            $output .= "{$sectionVar}->value['last'] = ({$propValue['iteration']} === {$propValue['total']});\n";
+        }
+        $output .= '?>';
+        return $output;
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Sectionelse Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {sectionelse} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        list($openTag, $nocache, $local, $sectionVar) = $this->closeTag($compiler, array('section'));
+        $this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache, $local, $sectionVar));
+        return "<?php }} else {\n ?>";
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Sectionclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {/section} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $compiler->loopNesting--;
+        // must endblock be nocache?
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+        list($openTag, $compiler->nocache, $local, $sectionVar) =
+            $this->closeTag($compiler, array('section', 'sectionelse'));
+        $output = "<?php\n";
+        if ($openTag === 'sectionelse') {
+            $output .= "}\n";
+        } else {
+            $output .= "}\n}\n";
+        }
+        $output .= '?>';
+        return $output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
new file mode 100644
index 000000000..70e2e2f9f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_setfilter.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Setfilter
+ * Compiles code for setfilter tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Setfilter Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for setfilter tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        $compiler->variable_filter_stack[] = $compiler->variable_filters;
+        $compiler->variable_filters = $parameter[ 'modifier_list' ];
+        // this tag does not return compiled code
+        $compiler->has_code = false;
+        return true;
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Setfilterclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {/setfilter} tag
+     * This tag does not generate compiled output. It resets variable filter.
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $_attr = $this->getAttributes($compiler, $args);
+        // reset variable filter to previous state
+        if (count($compiler->variable_filter_stack)) {
+            $compiler->variable_filters = array_pop($compiler->variable_filter_stack);
+        } else {
+            $compiler->variable_filters = array();
+        }
+        // this tag does not return compiled code
+        $compiler->has_code = false;
+        return true;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php
new file mode 100644
index 000000000..d90262e60
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_shared_inheritance.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Shared Inheritance
+ * Shared methods for {extends} and {block} tags
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Shared Inheritance Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Shared_Inheritance extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compile inheritance initialization code as prefix
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param bool|false                            $initChildSequence if true force child template
+     */
+    public static function postCompile(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+    {
+        $compiler->prefixCompiledCode .= "<?php \$_smarty_tpl->_loadInheritance();\n\$_smarty_tpl->inheritance->init(\$_smarty_tpl, " .
+                                         var_export($initChildSequence, true) . ");\n?>\n";
+    }
+
+    /**
+     * Register post compile callback to compile inheritance initialization code
+     *
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     * @param bool|false                            $initChildSequence if true force child template
+     */
+    public function registerInit(Smarty_Internal_TemplateCompilerBase $compiler, $initChildSequence = false)
+    {
+        if ($initChildSequence || !isset($compiler->_cache[ 'inheritanceInit' ])) {
+            $compiler->registerPostCompileCallback(
+                array('Smarty_Internal_Compile_Shared_Inheritance', 'postCompile'),
+                array($initChildSequence),
+                'inheritanceInit',
+                $initChildSequence
+            );
+            $compiler->_cache[ 'inheritanceInit' ] = true;
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_while.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_while.php
new file mode 100644
index 000000000..5aa3a7330
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_while.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile While
+ * Compiles the {while} tag
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile While Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {while} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \SmartyCompilerException
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
+    {
+        $compiler->loopNesting++;
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+        $this->openTag($compiler, 'while', $compiler->nocache);
+        if (!array_key_exists('if condition', $parameter)) {
+            $compiler->trigger_template_error('missing while condition', null, true);
+        }
+        // maybe nocache because of nocache variables
+        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
+        if (is_array($parameter[ 'if condition' ])) {
+            if ($compiler->nocache) {
+                // create nocache var to make it know for further compiling
+                if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+                    $var = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+                } else {
+                    $var = $parameter[ 'if condition' ][ 'var' ];
+                }
+                $compiler->setNocacheInVariable($var);
+            }
+            $prefixVar = $compiler->getNewPrefixVariable();
+            $assignCompiler = new Smarty_Internal_Compile_Assign();
+            $assignAttr = array();
+            $assignAttr[][ 'value' ] = $prefixVar;
+            if (is_array($parameter[ 'if condition' ][ 'var' ])) {
+                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
+                $_output = "<?php while ({$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]}) {?>";
+                $_output .= $assignCompiler->compile(
+                    $assignAttr,
+                    $compiler,
+                    array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ])
+                );
+            } else {
+                $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
+                $_output = "<?php while ({$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]}) {?>";
+                $_output .= $assignCompiler->compile($assignAttr, $compiler, array());
+            }
+            return $_output;
+        } else {
+            return "<?php\n while ({$parameter['if condition']}) {?>";
+        }
+    }
+}
+
+/**
+ * Smarty Internal Plugin Compile Whileclose Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase
+{
+    /**
+     * Compiles code for the {/while} tag
+     *
+     * @param array                                 $args     array with attributes from parser
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
+     *
+     * @return string compiled code
+     */
+    public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $compiler->loopNesting--;
+        // must endblock be nocache?
+        if ($compiler->nocache) {
+            $compiler->tag_nocache = true;
+        }
+        $compiler->nocache = $this->closeTag($compiler, array('while'));
+        return "<?php }?>\n";
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compilebase.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compilebase.php
new file mode 100644
index 000000000..2a32e4373
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compilebase.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * Smarty Internal Plugin CompileBase
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * This class does extend all internal compile plugins
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+abstract class Smarty_Internal_CompileBase
+{
+    /**
+     * Array of names of required attribute required by tag
+     *
+     * @var array
+     */
+    public $required_attributes = array();
+
+    /**
+     * Array of names of optional attribute required by tag
+     * use array('_any') if there is no restriction of attributes names
+     *
+     * @var array
+     */
+    public $optional_attributes = array();
+
+    /**
+     * Shorttag attribute order defined by its names
+     *
+     * @var array
+     */
+    public $shorttag_order = array();
+
+    /**
+     * Array of names of valid option flags
+     *
+     * @var array
+     */
+    public $option_flags = array('nocache');
+
+    /**
+     * Mapping array for boolean option value
+     *
+     * @var array
+     */
+    public $optionMap = array(1 => true, 0 => false, 'true' => true, 'false' => false);
+
+    /**
+     * Mapping array with attributes as key
+     *
+     * @var array
+     */
+    public $mapCache = array();
+
+    /**
+     * This function checks if the attributes passed are valid
+     * The attributes passed for the tag to compile are checked against the list of required and
+     * optional attributes. Required attributes must be present. Optional attributes are check against
+     * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
+     * as valid
+     *
+     * @param object $compiler   compiler object
+     * @param array  $attributes attributes applied to the tag
+     *
+     * @return array  of mapped attributes for further processing
+     */
+    public function getAttributes($compiler, $attributes)
+    {
+        $_indexed_attr = array();
+        if (!isset($this->mapCache[ 'option' ])) {
+            $this->mapCache[ 'option' ] = array_fill_keys($this->option_flags, true);
+        }
+        foreach ($attributes as $key => $mixed) {
+            // shorthand ?
+            if (!is_array($mixed)) {
+                // option flag ?
+                if (isset($this->mapCache[ 'option' ][ trim($mixed, '\'"') ])) {
+                    $_indexed_attr[ trim($mixed, '\'"') ] = true;
+                    // shorthand attribute ?
+                } elseif (isset($this->shorttag_order[ $key ])) {
+                    $_indexed_attr[ $this->shorttag_order[ $key ] ] = $mixed;
+                } else {
+                    // too many shorthands
+                    $compiler->trigger_template_error('too many shorthand attributes', null, true);
+                }
+                // named attribute
+            } else {
+                foreach ($mixed as $k => $v) {
+                    // option flag?
+                    if (isset($this->mapCache[ 'option' ][ $k ])) {
+                        if (is_bool($v)) {
+                            $_indexed_attr[ $k ] = $v;
+                        } else {
+                            if (is_string($v)) {
+                                $v = trim($v, '\'" ');
+                            }
+                            if (isset($this->optionMap[ $v ])) {
+                                $_indexed_attr[ $k ] = $this->optionMap[ $v ];
+                            } else {
+                                $compiler->trigger_template_error(
+                                    "illegal value '" . var_export($v, true) .
+                                    "' for option flag '{$k}'",
+                                    null,
+                                    true
+                                );
+                            }
+                        }
+                        // must be named attribute
+                    } else {
+                        $_indexed_attr[ $k ] = $v;
+                    }
+                }
+            }
+        }
+        // check if all required attributes present
+        foreach ($this->required_attributes as $attr) {
+            if (!isset($_indexed_attr[ $attr ])) {
+                $compiler->trigger_template_error("missing '{$attr}' attribute", null, true);
+            }
+        }
+        // check for not allowed attributes
+        if ($this->optional_attributes !== array('_any')) {
+            if (!isset($this->mapCache[ 'all' ])) {
+                $this->mapCache[ 'all' ] =
+                    array_fill_keys(
+                        array_merge(
+                            $this->required_attributes,
+                            $this->optional_attributes,
+                            $this->option_flags
+                        ),
+                        true
+                    );
+            }
+            foreach ($_indexed_attr as $key => $dummy) {
+                if (!isset($this->mapCache[ 'all' ][ $key ]) && $key !== 0) {
+                    $compiler->trigger_template_error("unexpected '{$key}' attribute", null, true);
+                }
+            }
+        }
+        // default 'false' for all option flags not set
+        foreach ($this->option_flags as $flag) {
+            if (!isset($_indexed_attr[ $flag ])) {
+                $_indexed_attr[ $flag ] = false;
+            }
+        }
+        if (isset($_indexed_attr[ 'nocache' ]) && $_indexed_attr[ 'nocache' ]) {
+            $compiler->tag_nocache = true;
+        }
+        return $_indexed_attr;
+    }
+
+    /**
+     * Push opening tag name on stack
+     * Optionally additional data can be saved on stack
+     *
+     * @param object $compiler compiler object
+     * @param string $openTag  the opening tag's name
+     * @param mixed  $data     optional data saved
+     */
+    public function openTag($compiler, $openTag, $data = null)
+    {
+        array_push($compiler->_tag_stack, array($openTag, $data));
+    }
+
+    /**
+     * Pop closing tag
+     * Raise an error if this stack-top doesn't match with expected opening tags
+     *
+     * @param object       $compiler    compiler object
+     * @param array|string $expectedTag the expected opening tag names
+     *
+     * @return mixed        any type the opening tag's name or saved data
+     */
+    public function closeTag($compiler, $expectedTag)
+    {
+        if (count($compiler->_tag_stack) > 0) {
+            // get stacked info
+            list($_openTag, $_data) = array_pop($compiler->_tag_stack);
+            // open tag must match with the expected ones
+            if (in_array($_openTag, (array)$expectedTag)) {
+                if (is_null($_data)) {
+                    // return opening tag
+                    return $_openTag;
+                } else {
+                    // return restored data
+                    return $_data;
+                }
+            }
+            // wrong nesting of tags
+            $compiler->trigger_template_error("unclosed '{$compiler->smarty->left_delimiter}{$_openTag}{$compiler->smarty->right_delimiter}' tag");
+            return;
+        }
+        // wrong nesting of tags
+        $compiler->trigger_template_error('unexpected closing tag', null, true);
+        return;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
new file mode 100644
index 000000000..469b9667a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * Smarty Internal Plugin Config File Compiler
+ * This is the config file compiler class. It calls the lexer and parser to
+ * perform the compiling.
+ *
+ * @package    Smarty
+ * @subpackage Config
+ * @author     Uwe Tews
+ */
+
+/**
+ * Main config file compiler class
+ *
+ * @package    Smarty
+ * @subpackage Config
+ */
+class Smarty_Internal_Config_File_Compiler
+{
+    /**
+     * Lexer class name
+     *
+     * @var string
+     */
+    public $lexer_class;
+
+    /**
+     * Parser class name
+     *
+     * @var string
+     */
+    public $parser_class;
+
+    /**
+     * Lexer object
+     *
+     * @var object
+     */
+    public $lex;
+
+    /**
+     * Parser object
+     *
+     * @var object
+     */
+    public $parser;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty object
+     */
+    public $smarty;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty_Internal_Template object
+     */
+    public $template;
+
+    /**
+     * Compiled config data sections and variables
+     *
+     * @var array
+     */
+    public $config_data = array();
+
+    /**
+     * compiled config data must always be written
+     *
+     * @var bool
+     */
+    public $write_compiled_code = true;
+
+    /**
+     * Initialize compiler
+     *
+     * @param string $lexer_class  class name
+     * @param string $parser_class class name
+     * @param Smarty $smarty       global instance
+     */
+    public function __construct($lexer_class, $parser_class, Smarty $smarty)
+    {
+        $this->smarty = $smarty;
+        // get required plugins
+        $this->lexer_class = $lexer_class;
+        $this->parser_class = $parser_class;
+        $this->smarty = $smarty;
+        $this->config_data[ 'sections' ] = array();
+        $this->config_data[ 'vars' ] = array();
+    }
+
+    /**
+     * Method to compile Smarty config source.
+     *
+     * @param Smarty_Internal_Template $template
+     *
+     * @return bool true if compiling succeeded, false if it failed
+     * @throws \SmartyException
+     */
+    public function compileTemplate(Smarty_Internal_Template $template)
+    {
+        $this->template = $template;
+        $this->template->compiled->file_dependency[ $this->template->source->uid ] =
+            array(
+                $this->template->source->filepath,
+                $this->template->source->getTimeStamp(),
+                $this->template->source->type
+            );
+        if ($this->smarty->debugging) {
+            if (!isset($this->smarty->_debug)) {
+                $this->smarty->_debug = new Smarty_Internal_Debug();
+            }
+            $this->smarty->_debug->start_compile($this->template);
+        }
+        // init the lexer/parser to compile the config file
+        /* @var Smarty_Internal_ConfigFileLexer $this->lex */
+        $this->lex = new $this->lexer_class(
+            str_replace(
+                array(
+                    "\r\n",
+                    "\r"
+                ),
+                "\n",
+                $template->source->getContent()
+            ) . "\n",
+            $this
+        );
+        /* @var Smarty_Internal_ConfigFileParser $this->parser */
+        $this->parser = new $this->parser_class($this->lex, $this);
+        if (function_exists('mb_internal_encoding')
+            && function_exists('ini_get')
+            && ((int)ini_get('mbstring.func_overload')) & 2
+        ) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('ASCII');
+        } else {
+            $mbEncoding = null;
+        }
+        if ($this->smarty->_parserdebug) {
+            $this->parser->PrintTrace();
+        }
+        // get tokens from lexer and parse them
+        while ($this->lex->yylex()) {
+            if ($this->smarty->_parserdebug) {
+                echo "<br>Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token {$this->lex->value} Line {$this->lex->line} \n";
+            }
+            $this->parser->doParse($this->lex->token, $this->lex->value);
+        }
+        // finish parsing process
+        $this->parser->doParse(0, 0);
+        if ($mbEncoding) {
+            mb_internal_encoding($mbEncoding);
+        }
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->end_compile($this->template);
+        }
+        // template header code
+        $template_header = sprintf(
+            "<?php /* Smarty version %s, created on %s\n         compiled from '%s' */ ?>\n",
+            Smarty::SMARTY_VERSION,
+            date("Y-m-d H:i:s"),
+            str_replace('*/', '* /' , $this->template->source->filepath)
+        );
+        $code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' .
+                var_export($this->config_data, true) . '); ?>';
+        return $template_header . $this->template->smarty->ext->_codeFrame->create($this->template, $code);
+    }
+
+    /**
+     * display compiler error messages without dying
+     * If parameter $args is empty it is a parser detected syntax error.
+     * In this case the parser is called to obtain information about expected tokens.
+     * If parameter $args contains a string this is used as error message
+     *
+     * @param string $args individual error message or null
+     *
+     * @throws SmartyCompilerException
+     */
+    public function trigger_config_file_error($args = null)
+    {
+        // get config source line which has error
+        $line = $this->lex->line;
+        if (isset($args)) {
+            // $line--;
+        }
+        $match = preg_split("/\n/", $this->lex->data);
+        $error_text =
+            "Syntax error in config file '{$this->template->source->filepath}' on line {$line} '{$match[$line - 1]}' ";
+        if (isset($args)) {
+            // individual error message
+            $error_text .= $args;
+        } else {
+            // expected token from parser
+            foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
+                $exp_token = $this->parser->yyTokenName[ $token ];
+                if (isset($this->lex->smarty_token_names[ $exp_token ])) {
+                    // token type from lexer
+                    $expect[] = '"' . $this->lex->smarty_token_names[ $exp_token ] . '"';
+                } else {
+                    // otherwise internal token name
+                    $expect[] = $this->parser->yyTokenName[ $token ];
+                }
+            }
+            // output parser error message
+            $error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect);
+        }
+        throw new SmartyCompilerException($error_text);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_configfilelexer.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_configfilelexer.php
new file mode 100644
index 000000000..afb3efcb0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_configfilelexer.php
@@ -0,0 +1,739 @@
+<?php
+/**
+ * Smarty Internal Plugin Configfilelexer
+ *
+ * This is the lexer to break the config file source into tokens
+ *
+ * @package    Smarty
+ * @subpackage Config
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty_Internal_Configfilelexer
+ *
+ * This is the config file lexer.
+ * It is generated from the smarty_internal_configfilelexer.plex file
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Configfilelexer
+{
+    const START              = 1;
+    const VALUE              = 2;
+    const NAKED_STRING_VALUE = 3;
+    const COMMENT            = 4;
+    const SECTION            = 5;
+    const TRIPPLE            = 6;
+
+    /**
+     * Source
+     *
+     * @var string
+     */
+    public $data;
+
+    /**
+     * Source length
+     *
+     * @var int
+     */
+    public $dataLength = null;
+
+    /**
+     * byte counter
+     *
+     * @var int
+     */
+    public $counter;
+
+    /**
+     * token number
+     *
+     * @var int
+     */
+    public $token;
+
+    /**
+     * token value
+     *
+     * @var string
+     */
+    public $value;
+
+    /**
+     * current line
+     *
+     * @var int
+     */
+    public $line;
+
+    /**
+     * state number
+     *
+     * @var int
+     */
+    public $state = 1;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(
+        1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE'
+    );
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+    );
+
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_Config_File_Compiler
+     */
+    private $compiler = null;
+
+    /**
+     * copy of config_booleanize
+     *
+     * @var bool
+     */
+    private $configBooleanize = false;
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+
+    private $yy_global_pattern2 = null;
+
+    private $yy_global_pattern3 = null;
+
+    private $yy_global_pattern4 = null;
+
+    private $yy_global_pattern5 = null;
+
+    private $yy_global_pattern6 = null;
+
+    private $_yy_state          = 1;
+
+    private $_yy_stack          = array();
+
+    /**
+     * constructor
+     *
+     * @param   string                             $data template source
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    public function __construct($data, Smarty_Internal_Config_File_Compiler $compiler)
+    {
+        $this->data = $data . "\n"; //now all lines are \n-terminated
+        $this->dataLength = strlen($data);
+        $this->counter = 0;
+        if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
+            $this->counter += strlen($match[ 0 ]);
+        }
+        $this->line = 1;
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        $this->configBooleanize = $this->smarty->config_booleanize;
+    }
+
+    public function replace($input)
+    {
+        return $input;
+    } // end function
+
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+    public function yylex()
+    {
+        return $this->{'yylex' . $this->_yy_state}();
+    }
+
+    public function yypushstate($state)
+    {
+        if ($this->yyTraceFILE) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%sState push %s\n",
+                $this->yyTracePrompt,
+                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
+            );
+        }
+        array_push($this->_yy_stack, $this->_yy_state);
+        $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%snew State %s\n",
+                $this->yyTracePrompt,
+                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
+            );
+        }
+    }
+
+    public function yypopstate()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%sState pop %s\n",
+                $this->yyTracePrompt,
+                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
+            );
+        }
+        $this->_yy_state = array_pop($this->_yy_stack);
+        if ($this->yyTraceFILE) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%snew State %s\n",
+                $this->yyTracePrompt,
+                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
+            );
+        }
+    }
+
+    public function yybegin($state)
+    {
+        $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%sState set %s\n",
+                $this->yyTracePrompt,
+                isset($this->state_name[ $this->_yy_state ]) ? $this->state_name[ $this->_yy_state ] : $this->_yy_state
+            );
+        }
+    }
+
+    public function yylex1()
+    {
+        if (!isset($this->yy_global_pattern1)) {
+            $this->yy_global_pattern1 =
+                $this->replace("/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
+            return false; // end of input
+        }
+        do {
+            if (preg_match($this->yy_global_pattern1, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                                        ' an empty string.  Input "' . substr(
+                                            $this->data,
+                                            $this->counter,
+                                            5
+                                        ) . '... state START');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r1_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                                    ': ' . $this->data[ $this->counter ]);
+            }
+            break;
+        } while (true);
+    }
+
+    public function yy_r1_1()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
+        $this->yypushstate(self::COMMENT);
+    }
+
+    public function yy_r1_2()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
+        $this->yypushstate(self::SECTION);
+    }
+
+    public function yy_r1_3()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
+    }
+
+    public function yy_r1_4()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
+        $this->yypushstate(self::VALUE);
+    } // end function
+
+    public function yy_r1_5()
+    {
+        return false;
+    }
+
+    public function yy_r1_6()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+    }
+
+    public function yy_r1_7()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_ID;
+    }
+
+    public function yy_r1_8()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
+    }
+
+    public function yylex2()
+    {
+        if (!isset($this->yy_global_pattern2)) {
+            $this->yy_global_pattern2 =
+                $this->replace("/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
+            return false; // end of input
+        }
+        do {
+            if (preg_match($this->yy_global_pattern2, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                                        ' an empty string.  Input "' . substr(
+                                            $this->data,
+                                            $this->counter,
+                                            5
+                                        ) . '... state VALUE');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r2_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                                    ': ' . $this->data[ $this->counter ]);
+            }
+            break;
+        } while (true);
+    }
+
+    public function yy_r2_1()
+    {
+        return false;
+    }
+
+    public function yy_r2_2()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
+        $this->yypopstate();
+    }
+
+    public function yy_r2_3()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_INT;
+        $this->yypopstate();
+    }
+
+    public function yy_r2_4()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
+        $this->yypushstate(self::TRIPPLE);
+    }
+
+    public function yy_r2_5()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
+        $this->yypopstate();
+    }
+
+    public function yy_r2_6()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
+        $this->yypopstate();
+    } // end function
+
+    public function yy_r2_7()
+    {
+        if (!$this->configBooleanize ||
+            !in_array(strtolower($this->value), array('true', 'false', 'on', 'off', 'yes', 'no'))) {
+            $this->yypopstate();
+            $this->yypushstate(self::NAKED_STRING_VALUE);
+            return true; //reprocess in new state
+        } else {
+            $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
+            $this->yypopstate();
+        }
+    }
+
+    public function yy_r2_8()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+        $this->yypopstate();
+    }
+
+    public function yy_r2_9()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+        $this->value = '';
+        $this->yypopstate();
+    } // end function
+
+    public function yylex3()
+    {
+        if (!isset($this->yy_global_pattern3)) {
+            $this->yy_global_pattern3 = $this->replace("/\G([^\n]+?(?=[ \t\r]*\n))/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
+            return false; // end of input
+        }
+        do {
+            if (preg_match($this->yy_global_pattern3, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                                        ' an empty string.  Input "' . substr(
+                                            $this->data,
+                                            $this->counter,
+                                            5
+                                        ) . '... state NAKED_STRING_VALUE');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r3_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                                    ': ' . $this->data[ $this->counter ]);
+            }
+            break;
+        } while (true);
+    }
+
+    public function yy_r3_1()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+        $this->yypopstate();
+    }
+
+    public function yylex4()
+    {
+        if (!isset($this->yy_global_pattern4)) {
+            $this->yy_global_pattern4 = $this->replace("/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
+            return false; // end of input
+        }
+        do {
+            if (preg_match($this->yy_global_pattern4, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                                        ' an empty string.  Input "' . substr(
+                                            $this->data,
+                                            $this->counter,
+                                            5
+                                        ) . '... state COMMENT');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r4_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                                    ': ' . $this->data[ $this->counter ]);
+            }
+            break;
+        } while (true);
+    }
+
+    public function yy_r4_1()
+    {
+        return false;
+    }
+
+    public function yy_r4_2()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
+    } // end function
+
+    public function yy_r4_3()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
+        $this->yypopstate();
+    }
+
+    public function yylex5()
+    {
+        if (!isset($this->yy_global_pattern5)) {
+            $this->yy_global_pattern5 = $this->replace("/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
+            return false; // end of input
+        }
+        do {
+            if (preg_match($this->yy_global_pattern5, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                                        ' an empty string.  Input "' . substr(
+                                            $this->data,
+                                            $this->counter,
+                                            5
+                                        ) . '... state SECTION');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r5_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                                    ': ' . $this->data[ $this->counter ]);
+            }
+            break;
+        } while (true);
+    }
+
+    public function yy_r5_1()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
+    }
+
+    public function yy_r5_2()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
+        $this->yypopstate();
+    } // end function
+
+    public function yylex6()
+    {
+        if (!isset($this->yy_global_pattern6)) {
+            $this->yy_global_pattern6 = $this->replace("/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >= $this->dataLength) {
+            return false; // end of input
+        }
+        do {
+            if (preg_match($this->yy_global_pattern6, $this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][ 1 ])) {
+                    $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                                        ' an empty string.  Input "' . substr(
+                                            $this->data,
+                                            $this->counter,
+                                            5
+                                        ) . '... state TRIPPLE');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r6_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >= $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }
+            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                                    ': ' . $this->data[ $this->counter ]);
+            }
+            break;
+        } while (true);
+    }
+
+    public function yy_r6_1()
+    {
+        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
+        $this->yypopstate();
+        $this->yypushstate(self::START);
+    }
+
+    public function yy_r6_2()
+    {
+        $to = strlen($this->data);
+        preg_match("/\"\"\"[ \t\r]*[\n#;]/", $this->data, $match, PREG_OFFSET_CAPTURE, $this->counter);
+        if (isset($match[ 0 ][ 1 ])) {
+            $to = $match[ 0 ][ 1 ];
+        } else {
+            $this->compiler->trigger_config_file_error('missing or misspelled literal closing tag');
+        }
+        $this->value = substr($this->data, $this->counter, $to - $this->counter);
+        $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php
new file mode 100644
index 000000000..36fdb76ee
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php
@@ -0,0 +1,1046 @@
+<?php
+
+class TPC_yyStackEntry
+{
+    public $stateno;       /* The state-number */
+    public $major;         /* The major token value.  This is the code
+                     ** number for the token at this stack level */
+    public $minor; /* The user-supplied minor token value.  This
+                     ** is the value of the token  */
+}
+
+// line 12 "../smarty/lexer/smarty_internal_configfileparser.y"
+
+/**
+ * Smarty Internal Plugin Configfileparse
+ *
+ * This is the config file parser.
+ * It is generated from the smarty_internal_configfileparser.y file
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Configfileparser
+{
+    // line 25 "../smarty/lexer/smarty_internal_configfileparser.y"
+    const TPC_OPENB                = 1;
+    const TPC_SECTION              = 2;
+    const TPC_CLOSEB               = 3;
+    const TPC_DOT                  = 4;
+    const TPC_ID                   = 5;
+    const TPC_EQUAL                = 6;
+    const TPC_FLOAT                = 7;
+    const TPC_INT                  = 8;
+    const TPC_BOOL                 = 9;
+    const TPC_SINGLE_QUOTED_STRING = 10;
+    const TPC_DOUBLE_QUOTED_STRING = 11;
+    const TPC_TRIPPLE_QUOTES       = 12;
+    const TPC_TRIPPLE_TEXT         = 13;
+    const TPC_TRIPPLE_QUOTES_END   = 14;
+    const TPC_NAKED_STRING         = 15;
+    const TPC_OTHER                = 16;
+    const TPC_NEWLINE              = 17;
+    const TPC_COMMENTSTART         = 18;
+    const YY_NO_ACTION             = 60;
+    const YY_ACCEPT_ACTION         = 59;
+    const YY_ERROR_ACTION          = 58;
+    const YY_SZ_ACTTAB             = 38;
+    const YY_SHIFT_USE_DFLT        = -8;
+    const YY_SHIFT_MAX             = 19;
+    const YY_REDUCE_USE_DFLT       = -17;
+    const YY_REDUCE_MAX            = 10;
+    const YYNOCODE                 = 29;
+    const YYSTACKDEPTH             = 100;
+    const YYNSTATE                 = 36;
+    const YYNRULE                  = 22;
+    const YYERRORSYMBOL            = 19;
+    const YYERRSYMDT               = 'yy0';
+    const YYFALLBACK               = 0;
+
+    public static $yy_action        = array(
+        32, 31, 30, 29, 35, 13, 19, 3, 24, 26,
+        59, 9, 14, 1, 16, 25, 11, 28, 25, 11,
+        17, 27, 34, 20, 18, 15, 23, 5, 6, 22,
+        10, 8, 4, 12, 2, 33, 7, 21,
+    );
+
+    public static $yy_lookahead     = array(
+        7, 8, 9, 10, 11, 12, 5, 23, 15, 16,
+        20, 21, 2, 23, 4, 17, 18, 14, 17, 18,
+        13, 14, 25, 26, 15, 2, 17, 3, 3, 17,
+        25, 25, 6, 1, 23, 27, 22, 24,
+    );
+
+    public static $yy_shift_ofst    = array(
+        -8, 1, 1, 1, -7, -2, -2, 32, -8, -8,
+        -8, 9, 10, 7, 25, 24, 23, 3, 12, 26,
+    );
+
+    public static $yy_reduce_ofst   = array(
+        -10, -3, -3, -3, 8, 6, 5, 13, 11, 14,
+        -16,
+    );
+
+    public static $yyExpectedTokens = array(
+        array(),
+        array(5, 17, 18,),
+        array(5, 17, 18,),
+        array(5, 17, 18,),
+        array(7, 8, 9, 10, 11, 12, 15, 16,),
+        array(17, 18,),
+        array(17, 18,),
+        array(1,),
+        array(),
+        array(),
+        array(),
+        array(15, 17,),
+        array(2, 4,),
+        array(13, 14,),
+        array(3,),
+        array(3,),
+        array(2,),
+        array(14,),
+        array(17,),
+        array(6,),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+        array(),
+    );
+
+    public static $yy_default       = array(
+        44, 37, 41, 40, 58, 58, 58, 36, 44, 39,
+        44, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+        43, 38, 57, 56, 53, 55, 54, 52, 51, 49,
+        48, 47, 46, 45, 42, 50,
+    );
+
+    public static $yyFallback       = array();
+
+    public static $yyRuleName       = array(
+        'start ::= global_vars sections',
+        'global_vars ::= var_list',
+        'sections ::= sections section',
+        'sections ::=',
+        'section ::= OPENB SECTION CLOSEB newline var_list',
+        'section ::= OPENB DOT SECTION CLOSEB newline var_list',
+        'var_list ::= var_list newline',
+        'var_list ::= var_list var',
+        'var_list ::=',
+        'var ::= ID EQUAL value',
+        'value ::= FLOAT',
+        'value ::= INT',
+        'value ::= BOOL',
+        'value ::= SINGLE_QUOTED_STRING',
+        'value ::= DOUBLE_QUOTED_STRING',
+        'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END',
+        'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END',
+        'value ::= NAKED_STRING',
+        'value ::= OTHER',
+        'newline ::= NEWLINE',
+        'newline ::= COMMENTSTART NEWLINE',
+        'newline ::= COMMENTSTART NAKED_STRING NEWLINE',
+    );
+
+    public static $yyRuleInfo       = array(
+        array(0 => 20, 1 => 2),
+        array(0 => 21, 1 => 1),
+        array(0 => 22, 1 => 2),
+        array(0 => 22, 1 => 0),
+        array(0 => 24, 1 => 5),
+        array(0 => 24, 1 => 6),
+        array(0 => 23, 1 => 2),
+        array(0 => 23, 1 => 2),
+        array(0 => 23, 1 => 0),
+        array(0 => 26, 1 => 3),
+        array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 3),
+        array(0 => 27, 1 => 2),
+        array(0 => 27, 1 => 1),
+        array(0 => 27, 1 => 1),
+        array(0 => 25, 1 => 1),
+        array(0 => 25, 1 => 2),
+        array(0 => 25, 1 => 3),
+    );
+
+    public static $yyReduceMap      = array(
+        0  => 0,
+        2  => 0,
+        3  => 0,
+        19 => 0,
+        20 => 0,
+        21 => 0,
+        1  => 1,
+        4  => 4,
+        5  => 5,
+        6  => 6,
+        7  => 7,
+        8  => 8,
+        9  => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+        16 => 16,
+        17 => 17,
+        18 => 17,
+    );
+
+    /**
+     * helper map
+     *
+     * @var array
+     */
+    private static $escapes_single = array(
+        '\\' => '\\',
+        '\'' => '\''
+    );
+
+    /**
+     * result status
+     *
+     * @var bool
+     */
+    public $successful = true;
+
+    /**
+     * return value
+     *
+     * @var mixed
+     */
+    public $retvalue = 0;
+
+    /**
+     * @var
+     */
+    public $yymajor;
+
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_Config_File_Compiler
+     */
+    public $compiler = null;
+
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty      = null;
+
+    public $yyTraceFILE;
+
+    public $yyTracePrompt;
+
+    public $yyidx;
+
+    public $yyerrcnt;
+
+    public $yystack     = array();
+
+    public $yyTokenName = array(
+        '$', 'OPENB', 'SECTION', 'CLOSEB',
+        'DOT', 'ID', 'EQUAL', 'FLOAT',
+        'INT', 'BOOL', 'SINGLE_QUOTED_STRING', 'DOUBLE_QUOTED_STRING',
+        'TRIPPLE_QUOTES', 'TRIPPLE_TEXT', 'TRIPPLE_QUOTES_END', 'NAKED_STRING',
+        'OTHER', 'NEWLINE', 'COMMENTSTART', 'error',
+        'start', 'global_vars', 'sections', 'var_list',
+        'section', 'newline', 'var', 'value',
+    );
+
+    /**
+     * lexer object
+     *
+     * @var Smarty_Internal_Configfilelexer
+     */
+    private $lex;
+
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+
+    /**
+     * copy of config_overwrite property
+     *
+     * @var bool
+     */
+    private $configOverwrite = false;
+
+    /**
+     * copy of config_read_hidden property
+     *
+     * @var bool
+     */
+    private $configReadHidden = false;
+
+    private $_retvalue;
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Configfilelexer      $lex
+     * @param Smarty_Internal_Config_File_Compiler $compiler
+     */
+    public function __construct(Smarty_Internal_Configfilelexer $lex, Smarty_Internal_Config_File_Compiler $compiler)
+    {
+        $this->lex = $lex;
+        $this->smarty = $compiler->smarty;
+        $this->compiler = $compiler;
+        $this->configOverwrite = $this->smarty->config_overwrite;
+        $this->configReadHidden = $this->smarty->config_read_hidden;
+    }
+
+    public static function yy_destructor($yymajor, $yypminor)
+    {
+        switch ($yymajor) {
+            default:
+                break;   /* If no destructor action specified: do nothing */
+        }
+    }
+
+    /**
+     * parse single quoted string
+     *  remove outer quotes
+     *  unescape inner quotes
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_single_quoted_string($qstr)
+    {
+        $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
+        $ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $str = '';
+        foreach ($ss as $s) {
+            if (strlen($s) === 2 && $s[ 0 ] === '\\') {
+                if (isset(self::$escapes_single[ $s[ 1 ] ])) {
+                    $s = self::$escapes_single[ $s[ 1 ] ];
+                }
+            }
+            $str .= $s;
+        }
+        return $str;
+    }                    /* Index of top element in stack */
+    /**
+     * parse double quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_double_quoted_string($qstr)
+    {
+        $inner_str = substr($qstr, 1, strlen($qstr) - 2);
+        return stripcslashes($inner_str);
+    }                 /* Shifts left before out of the error */
+    /**
+     * parse triple quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_tripple_double_quoted_string($qstr)
+    {
+        return stripcslashes($qstr);
+    }  /* The parser's stack */
+    public function Trace($TraceFILE, $zTracePrompt)
+    {
+        if (!$TraceFILE) {
+            $zTracePrompt = 0;
+        } elseif (!$zTracePrompt) {
+            $TraceFILE = 0;
+        }
+        $this->yyTraceFILE = $TraceFILE;
+        $this->yyTracePrompt = $zTracePrompt;
+    }
+
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+    public function tokenName($tokenType)
+    {
+        if ($tokenType === 0) {
+            return 'End of Input';
+        }
+        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
+            return $this->yyTokenName[ $tokenType ];
+        } else {
+            return 'Unknown';
+        }
+    }
+
+    public function yy_pop_parser_stack()
+    {
+        if (empty($this->yystack)) {
+            return;
+        }
+        $yytos = array_pop($this->yystack);
+        if ($this->yyTraceFILE && $this->yyidx >= 0) {
+            fwrite(
+                $this->yyTraceFILE,
+                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[ $yytos->major ] .
+                "\n"
+            );
+        }
+        $yymajor = $yytos->major;
+        self::yy_destructor($yymajor, $yytos->minor);
+        $this->yyidx--;
+        return $yymajor;
+    }
+
+    public function __destruct()
+    {
+        while ($this->yystack !== array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
+        }
+    }
+
+    public function yy_get_expected_tokens($token)
+    {
+        static $res3 = array();
+        static $res4 = array();
+        $state = $this->yystack[ $this->yyidx ]->stateno;
+        $expected = self::$yyExpectedTokens[ $state ];
+        if (isset($res3[ $state ][ $token ])) {
+            if ($res3[ $state ][ $token ]) {
+                return $expected;
+            }
+        } else {
+            if ($res3[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+                return $expected;
+            }
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ === 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return array_unique($expected);
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[ $this->yyidx ]->stateno,
+                        self::$yyRuleInfo[ $yyruleno ][ 0 ]
+                    );
+                    if (isset(self::$yyExpectedTokens[ $nextstate ])) {
+                        $expected = array_merge($expected, self::$yyExpectedTokens[ $nextstate ]);
+                        if (isset($res4[ $nextstate ][ $token ])) {
+                            if ($res4[ $nextstate ][ $token ]) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        } else {
+                            if ($res4[ $nextstate ][ $token ] =
+                                in_array($token, self::$yyExpectedTokens[ $nextstate ], true)) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = new TPC_yyStackEntry;
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+                        $this->yystack[ $this->yyidx ] = $x;
+                        continue 2;
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return array_unique($expected);
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return $expected;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+        return array_unique($expected);
+    }
+
+    public function yy_is_expected_token($token)
+    {
+        static $res = array();
+        static $res2 = array();
+        if ($token === 0) {
+            return true; // 0 is not part of this
+        }
+        $state = $this->yystack[ $this->yyidx ]->stateno;
+        if (isset($res[ $state ][ $token ])) {
+            if ($res[ $state ][ $token ]) {
+                return true;
+            }
+        } else {
+            if ($res[ $state ][ $token ] = in_array($token, self::$yyExpectedTokens[ $state ], true)) {
+                return true;
+            }
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ === 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return true;
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[ $yyruleno ][ 1 ];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[ $this->yyidx ]->stateno,
+                        self::$yyRuleInfo[ $yyruleno ][ 0 ]
+                    );
+                    if (isset($res2[ $nextstate ][ $token ])) {
+                        if ($res2[ $nextstate ][ $token ]) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    } else {
+                        if ($res2[ $nextstate ][ $token ] =
+                            (isset(self::$yyExpectedTokens[ $nextstate ]) &&
+                             in_array($token, self::$yyExpectedTokens[ $nextstate ], true))) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = new TPC_yyStackEntry;
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+                        $this->yystack[ $this->yyidx ] = $x;
+                        continue 2;
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        if (!$token) {
+                            // end of input: this is valid
+                            return true;
+                        }
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return false;
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return true;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+        return true;
+    }
+
+    public function yy_find_shift_action($iLookAhead)
+    {
+        $stateno = $this->yystack[ $this->yyidx ]->stateno;
+        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
+        if (!isset(self::$yy_shift_ofst[ $stateno ])) {
+            // no shift actions
+            return self::$yy_default[ $stateno ];
+        }
+        $i = self::$yy_shift_ofst[ $stateno ];
+        if ($i === self::YY_SHIFT_USE_DFLT) {
+            return self::$yy_default[ $stateno ];
+        }
+        if ($iLookAhead === self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+            self::$yy_lookahead[ $i ] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
+                && ($iFallback = self::$yyFallback[ $iLookAhead ]) != 0) {
+                if ($this->yyTraceFILE) {
+                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
+                                               $this->yyTokenName[ $iLookAhead ] . ' => ' .
+                                               $this->yyTokenName[ $iFallback ] . "\n");
+                }
+                return $this->yy_find_shift_action($iFallback);
+            }
+            return self::$yy_default[ $stateno ];
+        } else {
+            return self::$yy_action[ $i ];
+        }
+    }
+
+    public function yy_find_reduce_action($stateno, $iLookAhead)
+    {
+        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
+        if (!isset(self::$yy_reduce_ofst[ $stateno ])) {
+            return self::$yy_default[ $stateno ];
+        }
+        $i = self::$yy_reduce_ofst[ $stateno ];
+        if ($i === self::YY_REDUCE_USE_DFLT) {
+            return self::$yy_default[ $stateno ];
+        }
+        if ($iLookAhead === self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+            self::$yy_lookahead[ $i ] != $iLookAhead) {
+            return self::$yy_default[ $stateno ];
+        } else {
+            return self::$yy_action[ $i ];
+        }
+    }
+
+    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    {
+        $this->yyidx++;
+        if ($this->yyidx >= self::YYSTACKDEPTH) {
+            $this->yyidx--;
+            if ($this->yyTraceFILE) {
+                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
+            }
+            while ($this->yyidx >= 0) {
+                $this->yy_pop_parser_stack();
+            }
+            // line 239 "../smarty/lexer/smarty_internal_configfileparser.y"
+            $this->internalError = true;
+            $this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
+            return;
+        }
+        $yytos = new TPC_yyStackEntry;
+        $yytos->stateno = $yyNewState;
+        $yytos->major = $yyMajor;
+        $yytos->minor = $yypMinor;
+        $this->yystack[] = $yytos;
+        if ($this->yyTraceFILE && $this->yyidx > 0) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%sShift %d\n",
+                $this->yyTracePrompt,
+                $yyNewState
+            );
+            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
+            for ($i = 1; $i <= $this->yyidx; $i++) {
+                fprintf(
+                    $this->yyTraceFILE,
+                    " %s",
+                    $this->yyTokenName[ $this->yystack[ $i ]->major ]
+                );
+            }
+            fwrite($this->yyTraceFILE, "\n");
+        }
+    }
+
+    public function yy_r0()
+    {
+        $this->_retvalue = null;
+    }
+
+    public function yy_r1()
+    {
+        $this->add_global_vars($this->yystack[ $this->yyidx + 0 ]->minor);
+        $this->_retvalue = null;
+    }
+
+    public function yy_r4()
+    {
+        $this->add_section_vars($this->yystack[ $this->yyidx + -3 ]->minor, $this->yystack[ $this->yyidx + 0 ]->minor);
+        $this->_retvalue = null;
+    }
+
+    // line 245 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r5()
+    {
+        if ($this->configReadHidden) {
+            $this->add_section_vars(
+                $this->yystack[ $this->yyidx + -3 ]->minor,
+                $this->yystack[ $this->yyidx + 0 ]->minor
+            );
+        }
+        $this->_retvalue = null;
+    }
+
+    // line 250 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r6()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + -1 ]->minor;
+    }
+
+    // line 264 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r7()
+    {
+        $this->_retvalue =
+            array_merge($this->yystack[ $this->yyidx + -1 ]->minor, array($this->yystack[ $this->yyidx + 0 ]->minor));
+    }
+
+    // line 269 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r8()
+    {
+        $this->_retvalue = array();
+    }
+
+    // line 277 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r9()
+    {
+        $this->_retvalue =
+            array(
+                'key'   => $this->yystack[ $this->yyidx + -2 ]->minor,
+                'value' => $this->yystack[ $this->yyidx + 0 ]->minor
+            );
+    }
+
+    // line 281 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r10()
+    {
+        $this->_retvalue = (float)$this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 285 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r11()
+    {
+        $this->_retvalue = (int)$this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 291 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r12()
+    {
+        $this->_retvalue = $this->parse_bool($this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    // line 296 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r13()
+    {
+        $this->_retvalue = self::parse_single_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    // line 300 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r14()
+    {
+        $this->_retvalue = self::parse_double_quoted_string($this->yystack[ $this->yyidx + 0 ]->minor);
+    }
+
+    // line 304 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r15()
+    {
+        $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[ $this->yyidx + -1 ]->minor);
+    }
+
+    // line 308 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r16()
+    {
+        $this->_retvalue = '';
+    }
+
+    // line 312 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_r17()
+    {
+        $this->_retvalue = $this->yystack[ $this->yyidx + 0 ]->minor;
+    }
+
+    // line 316 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_reduce($yyruleno)
+    {
+        if ($this->yyTraceFILE && $yyruleno >= 0
+            && $yyruleno < count(self::$yyRuleName)) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%sReduce (%d) [%s].\n",
+                $this->yyTracePrompt,
+                $yyruleno,
+                self::$yyRuleName[ $yyruleno ]
+            );
+        }
+        $this->_retvalue = $yy_lefthand_side = null;
+        if (isset(self::$yyReduceMap[ $yyruleno ])) {
+            // call the action
+            $this->_retvalue = null;
+            $this->{'yy_r' . self::$yyReduceMap[ $yyruleno ]}();
+            $yy_lefthand_side = $this->_retvalue;
+        }
+        $yygoto = self::$yyRuleInfo[ $yyruleno ][ 0 ];
+        $yysize = self::$yyRuleInfo[ $yyruleno ][ 1 ];
+        $this->yyidx -= $yysize;
+        for ($i = $yysize; $i; $i--) {
+            // pop all of the right-hand side parameters
+            array_pop($this->yystack);
+        }
+        $yyact = $this->yy_find_reduce_action($this->yystack[ $this->yyidx ]->stateno, $yygoto);
+        if ($yyact < self::YYNSTATE) {
+            if (!$this->yyTraceFILE && $yysize) {
+                $this->yyidx++;
+                $x = new TPC_yyStackEntry;
+                $x->stateno = $yyact;
+                $x->major = $yygoto;
+                $x->minor = $yy_lefthand_side;
+                $this->yystack[ $this->yyidx ] = $x;
+            } else {
+                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
+            }
+        } elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) {
+            $this->yy_accept();
+        }
+    }
+
+    // line 320 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_parse_failed()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
+        }
+        while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+    }
+
+    // line 324 "../smarty/lexer/smarty_internal_configfileparser.y"
+    public function yy_syntax_error($yymajor, $TOKEN)
+    {
+        // line 232 "../smarty/lexer/smarty_internal_configfileparser.y"
+        $this->internalError = true;
+        $this->yymajor = $yymajor;
+        $this->compiler->trigger_config_file_error();
+    }
+
+    public function yy_accept()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
+        }
+        while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+        // line 225 "../smarty/lexer/smarty_internal_configfileparser.y"
+        $this->successful = !$this->internalError;
+        $this->internalError = false;
+        $this->retvalue = $this->_retvalue;
+    }
+
+    public function doParse($yymajor, $yytokenvalue)
+    {
+        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
+        if ($this->yyidx === null || $this->yyidx < 0) {
+            $this->yyidx = 0;
+            $this->yyerrcnt = -1;
+            $x = new TPC_yyStackEntry;
+            $x->stateno = 0;
+            $x->major = 0;
+            $this->yystack = array();
+            $this->yystack[] = $x;
+        }
+        $yyendofinput = ($yymajor == 0);
+        if ($this->yyTraceFILE) {
+            fprintf(
+                $this->yyTraceFILE,
+                "%sInput %s\n",
+                $this->yyTracePrompt,
+                $this->yyTokenName[ $yymajor ]
+            );
+        }
+        do {
+            $yyact = $this->yy_find_shift_action($yymajor);
+            if ($yymajor < self::YYERRORSYMBOL &&
+                !$this->yy_is_expected_token($yymajor)) {
+                // force a syntax error
+                $yyact = self::YY_ERROR_ACTION;
+            }
+            if ($yyact < self::YYNSTATE) {
+                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
+                $this->yyerrcnt--;
+                if ($yyendofinput && $this->yyidx >= 0) {
+                    $yymajor = 0;
+                } else {
+                    $yymajor = self::YYNOCODE;
+                }
+            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
+                $this->yy_reduce($yyact - self::YYNSTATE);
+            } elseif ($yyact === self::YY_ERROR_ACTION) {
+                if ($this->yyTraceFILE) {
+                    fprintf(
+                        $this->yyTraceFILE,
+                        "%sSyntax Error!\n",
+                        $this->yyTracePrompt
+                    );
+                }
+                if (self::YYERRORSYMBOL) {
+                    if ($this->yyerrcnt < 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $yymx = $this->yystack[ $this->yyidx ]->major;
+                    if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
+                        if ($this->yyTraceFILE) {
+                            fprintf(
+                                $this->yyTraceFILE,
+                                "%sDiscard input token %s\n",
+                                $this->yyTracePrompt,
+                                $this->yyTokenName[ $yymajor ]
+                            );
+                        }
+                        $this->yy_destructor($yymajor, $yytokenvalue);
+                        $yymajor = self::YYNOCODE;
+                    } else {
+                        while ($this->yyidx >= 0 &&
+                               $yymx !== self::YYERRORSYMBOL &&
+                               ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+                        ) {
+                            $this->yy_pop_parser_stack();
+                        }
+                        if ($this->yyidx < 0 || $yymajor == 0) {
+                            $this->yy_destructor($yymajor, $yytokenvalue);
+                            $this->yy_parse_failed();
+                            $yymajor = self::YYNOCODE;
+                        } elseif ($yymx !== self::YYERRORSYMBOL) {
+                            $u2 = 0;
+                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
+                        }
+                    }
+                    $this->yyerrcnt = 3;
+                    $yyerrorhit = 1;
+                } else {
+                    if ($this->yyerrcnt <= 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $this->yyerrcnt = 3;
+                    $this->yy_destructor($yymajor, $yytokenvalue);
+                    if ($yyendofinput) {
+                        $this->yy_parse_failed();
+                    }
+                    $yymajor = self::YYNOCODE;
+                }
+            } else {
+                $this->yy_accept();
+                $yymajor = self::YYNOCODE;
+            }
+        } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0);
+    }
+
+    /**
+     * parse optional boolean keywords
+     *
+     * @param string $str
+     *
+     * @return bool
+     */
+    private function parse_bool($str)
+    {
+        $str = strtolower($str);
+        if (in_array($str, array('on', 'yes', 'true'))) {
+            $res = true;
+        } else {
+            $res = false;
+        }
+        return $res;
+    }
+
+    /**
+     * set a config variable in target array
+     *
+     * @param array $var
+     * @param array $target_array
+     */
+    private function set_var(array $var, array &$target_array)
+    {
+        $key = $var[ 'key' ];
+        $value = $var[ 'value' ];
+        if ($this->configOverwrite || !isset($target_array[ 'vars' ][ $key ])) {
+            $target_array[ 'vars' ][ $key ] = $value;
+        } else {
+            settype($target_array[ 'vars' ][ $key ], 'array');
+            $target_array[ 'vars' ][ $key ][] = $value;
+        }
+    }
+
+    /**
+     * add config variable to global vars
+     *
+     * @param array $vars
+     */
+    private function add_global_vars(array $vars)
+    {
+        if (!isset($this->compiler->config_data[ 'vars' ])) {
+            $this->compiler->config_data[ 'vars' ] = array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data);
+        }
+    }
+
+    /**
+     * add config variable to section
+     *
+     * @param string $section_name
+     * @param array  $vars
+     */
+    private function add_section_vars($section_name, array $vars)
+    {
+        if (!isset($this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ])) {
+            $this->compiler->config_data[ 'sections' ][ $section_name ][ 'vars' ] = array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data[ 'sections' ][ $section_name ]);
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_data.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_data.php
new file mode 100644
index 000000000..1b64185b8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_data.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * Smarty Internal Plugin Data
+ * This file contains the basic classes and methods for template and variable creation
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * Base class with template and variable methods
+ *
+ * @package    Smarty
+ * @subpackage Template
+ *
+ * @property int    $scope
+ * @property Smarty $smarty
+ * The following methods will be dynamically loaded by the extension handler when they are called.
+ * They are located in a corresponding Smarty_Internal_Method_xxxx class
+ *
+ * @method mixed _getConfigVariable(string $varName, bool $errorEnable = true)
+ * @method mixed getConfigVariable(string $varName, bool $errorEnable = true)
+ * @method mixed getConfigVars(string $varName = null, bool $searchParents = true)
+ * @method mixed getGlobal(string $varName = null)
+ * @method mixed getStreamVariable(string $variable)
+ * @method Smarty_Internal_Data clearAssign(mixed $tpl_var)
+ * @method Smarty_Internal_Data clearAllAssign()
+ * @method Smarty_Internal_Data clearConfig(string $varName = null)
+ * @method Smarty_Internal_Data configLoad(string $config_file, mixed $sections = null, string $scope = 'local')
+ */
+abstract class Smarty_Internal_Data
+{
+    /**
+     * This object type (Smarty = 1, template = 2, data = 4)
+     *
+     * @var int
+     */
+    public $_objType = 4;
+
+    /**
+     * name of class used for templates
+     *
+     * @var string
+     */
+    public $template_class = 'Smarty_Internal_Template';
+
+    /**
+     * template variables
+     *
+     * @var Smarty_Variable[]
+     */
+    public $tpl_vars = array();
+
+    /**
+     * parent template (if any)
+     *
+     * @var Smarty|Smarty_Internal_Template|Smarty_Data
+     */
+    public $parent = null;
+
+    /**
+     * configuration settings
+     *
+     * @var string[]
+     */
+    public $config_vars = array();
+
+    /**
+     * extension handler
+     *
+     * @var Smarty_Internal_Extension_Handler
+     */
+    public $ext = null;
+
+    /**
+     * Smarty_Internal_Data constructor.
+     *
+     * Install extension handler
+     */
+    public function __construct()
+    {
+        $this->ext = new Smarty_Internal_Extension_Handler();
+        $this->ext->objType = $this->_objType;
+    }
+
+    /**
+     * assigns a Smarty variable
+     *
+     * @param array|string $tpl_var the template variable name(s)
+     * @param mixed        $value   the value to assign
+     * @param boolean      $nocache if true any output of this variable will be not cached
+     *
+     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for
+     *                              chaining
+     */
+    public function assign($tpl_var, $value = null, $nocache = false)
+    {
+        if (is_array($tpl_var)) {
+            foreach ($tpl_var as $_key => $_val) {
+                $this->assign($_key, $_val, $nocache);
+            }
+        } else {
+            if ($tpl_var !== '') {
+                if ($this->_objType === 2) {
+                    /**
+                     *
+                     *
+                     * @var Smarty_Internal_Template $this
+                     */
+                    $this->_assignInScope($tpl_var, $value, $nocache);
+                } else {
+                    $this->tpl_vars[ $tpl_var ] = new Smarty_Variable($value, $nocache);
+                }
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * appends values to template variables
+     *
+     * @api  Smarty::append()
+     * @link https://www.smarty.net/docs/en/api.append.tpl
+     *
+     * @param array|string $tpl_var the template variable name(s)
+     * @param mixed        $value   the value to append
+     * @param bool         $merge   flag if array elements shall be merged
+     * @param bool         $nocache if true any output of this variable will
+     *                              be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function append($tpl_var, $value = null, $merge = false, $nocache = false)
+    {
+        return $this->ext->append->append($this, $tpl_var, $value, $merge, $nocache);
+    }
+
+    /**
+     * assigns a global Smarty variable
+     *
+     * @param string  $varName the global variable name
+     * @param mixed   $value   the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function assignGlobal($varName, $value = null, $nocache = false)
+    {
+        return $this->ext->assignGlobal->assignGlobal($this, $varName, $value, $nocache);
+    }
+
+    /**
+     * appends values to template variables by reference
+     *
+     * @param string  $tpl_var the template variable name
+     * @param mixed   &$value  the referenced value to append
+     * @param boolean $merge   flag if array elements shall be merged
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function appendByRef($tpl_var, &$value, $merge = false)
+    {
+        return $this->ext->appendByRef->appendByRef($this, $tpl_var, $value, $merge);
+    }
+
+    /**
+     * assigns values to template variables by reference
+     *
+     * @param string  $tpl_var the template variable name
+     * @param         $value
+     * @param boolean $nocache if true any output of this variable will be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function assignByRef($tpl_var, &$value, $nocache = false)
+    {
+        return $this->ext->assignByRef->assignByRef($this, $tpl_var, $value, $nocache);
+    }
+
+    /**
+     * Returns a single or all template variables
+     *
+     * @api  Smarty::getTemplateVars()
+     * @link https://www.smarty.net/docs/en/api.get.template.vars.tpl
+     *
+     * @param string                                                  $varName       variable name or null
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
+     * @param bool                                                    $searchParents include parent templates?
+     *
+     * @return mixed variable value or or array of variables
+     */
+    public function getTemplateVars($varName = null, Smarty_Internal_Data $_ptr = null, $searchParents = true)
+    {
+        return $this->ext->getTemplateVars->getTemplateVars($this, $varName, $_ptr, $searchParents);
+    }
+
+    /**
+     * Follow the parent chain an merge template and config variables
+     *
+     * @param \Smarty_Internal_Data|null $data
+     */
+    public function _mergeVars(Smarty_Internal_Data $data = null)
+    {
+        if (isset($data)) {
+            if (!empty($this->tpl_vars)) {
+                $data->tpl_vars = array_merge($this->tpl_vars, $data->tpl_vars);
+            }
+            if (!empty($this->config_vars)) {
+                $data->config_vars = array_merge($this->config_vars, $data->config_vars);
+            }
+        } else {
+            $data = $this;
+        }
+        if (isset($this->parent)) {
+            $this->parent->_mergeVars($data);
+        }
+    }
+
+    /**
+     * Return true if this instance is a Data obj
+     *
+     * @return bool
+     */
+    public function _isDataObj()
+    {
+        return $this->_objType === 4;
+    }
+
+    /**
+     * Return true if this instance is a template obj
+     *
+     * @return bool
+     */
+    public function _isTplObj()
+    {
+        return $this->_objType === 2;
+    }
+
+    /**
+     * Return true if this instance is a Smarty obj
+     *
+     * @return bool
+     */
+    public function _isSmartyObj()
+    {
+        return $this->_objType === 1;
+    }
+
+    /**
+     * Get Smarty object
+     *
+     * @return Smarty
+     */
+    public function _getSmartyObj()
+    {
+        return $this->smarty;
+    }
+
+    /**
+     * Handle unknown class methods
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
+     */
+    public function __call($name, $args)
+    {
+        return $this->ext->_callExternalMethod($this, $name, $args);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_debug.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_debug.php
new file mode 100644
index 000000000..da67904c5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_debug.php
@@ -0,0 +1,428 @@
+<?php
+/**
+ * Smarty Internal Plugin Debug
+ * Class to collect data for the Smarty Debugging Console
+ *
+ * @package    Smarty
+ * @subpackage Debug
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Debug Class
+ *
+ * @package    Smarty
+ * @subpackage Debug
+ */
+class Smarty_Internal_Debug extends Smarty_Internal_Data
+{
+    /**
+     * template data
+     *
+     * @var array
+     */
+    public $template_data = array();
+
+    /**
+     * List of uid's which shall be ignored
+     *
+     * @var array
+     */
+    public $ignore_uid = array();
+
+    /**
+     * Index of display() and fetch() calls
+     *
+     * @var int
+     */
+    public $index = 0;
+
+    /**
+     * Counter for window offset
+     *
+     * @var int
+     */
+    public $offset = 0;
+
+    /**
+     * Start logging template
+     *
+     * @param \Smarty_Internal_Template $template template
+     * @param null                      $mode     true: display   false: fetch  null: subtemplate
+     */
+    public function start_template(Smarty_Internal_Template $template, $mode = null)
+    {
+        if (isset($mode) && !$template->_isSubTpl()) {
+            $this->index++;
+            $this->offset++;
+            $this->template_data[ $this->index ] = null;
+        }
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'start_template_time' ] = microtime(true);
+    }
+
+    /**
+     * End logging of cache time
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function end_template(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'total_time' ] +=
+            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_template_time' ];
+        //$this->template_data[$this->index][$key]['properties'] = $template->properties;
+    }
+
+    /**
+     * Start logging of compile time
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function start_compile(Smarty_Internal_Template $template)
+    {
+        static $_is_stringy = array('string' => true, 'eval' => true);
+        if (!empty($template->compiler->trace_uid)) {
+            $key = $template->compiler->trace_uid;
+            if (!isset($this->template_data[ $this->index ][ $key ])) {
+                if (isset($_is_stringy[ $template->source->type ])) {
+                    $this->template_data[ $this->index ][ $key ][ 'name' ] =
+                        '\'' . substr($template->source->name, 0, 25) . '...\'';
+                } else {
+                    $this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
+                }
+                $this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
+                $this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
+                $this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
+            }
+        } else {
+            if (isset($this->ignore_uid[ $template->source->uid ])) {
+                return;
+            }
+            $key = $this->get_key($template);
+        }
+        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+    }
+
+    /**
+     * End logging of compile time
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function end_compile(Smarty_Internal_Template $template)
+    {
+        if (!empty($template->compiler->trace_uid)) {
+            $key = $template->compiler->trace_uid;
+        } else {
+            if (isset($this->ignore_uid[ $template->source->uid ])) {
+                return;
+            }
+            $key = $this->get_key($template);
+        }
+        $this->template_data[ $this->index ][ $key ][ 'compile_time' ] +=
+            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+    }
+
+    /**
+     * Start logging of render time
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function start_render(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+    }
+
+    /**
+     * End logging of compile time
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function end_render(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'render_time' ] +=
+            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+    }
+
+    /**
+     * Start logging of cache time
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function start_cache(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+    }
+
+    /**
+     * End logging of cache time
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function end_cache(Smarty_Internal_Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'cache_time' ] +=
+            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+    }
+
+    /**
+     * Register template object
+     *
+     * @param \Smarty_Internal_Template $template cached template
+     */
+    public function register_template(Smarty_Internal_Template $template)
+    {
+    }
+
+    /**
+     * Register data object
+     *
+     * @param \Smarty_Data $data data object
+     */
+    public static function register_data(Smarty_Data $data)
+    {
+    }
+
+    /**
+     * Opens a window for the Smarty Debugging Console and display the data
+     *
+     * @param Smarty_Internal_Template|Smarty $obj object to debug
+     * @param bool                            $full
+     *
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function display_debug($obj, $full = false)
+    {
+        if (!$full) {
+            $this->offset++;
+            $savedIndex = $this->index;
+            $this->index = 9999;
+        }
+        $smarty = $obj->_getSmartyObj();
+        // create fresh instance of smarty for displaying the debug console
+        // to avoid problems if the application did overload the Smarty class
+        $debObj = new Smarty();
+        // copy the working dirs from application
+        $debObj->setCompileDir($smarty->getCompileDir());
+        // init properties by hand as user may have edited the original Smarty class
+        $debObj->setPluginsDir(is_dir(__DIR__ . '/../plugins') ? __DIR__ .
+                                                                           '/../plugins' : $smarty->getPluginsDir());
+        $debObj->force_compile = false;
+        $debObj->compile_check = Smarty::COMPILECHECK_ON;
+        $debObj->left_delimiter = '{';
+        $debObj->right_delimiter = '}';
+        $debObj->security_policy = null;
+        $debObj->debugging = false;
+        $debObj->debugging_ctrl = 'NONE';
+        $debObj->error_reporting = E_ALL & ~E_NOTICE;
+        $debObj->debug_tpl =
+            isset($smarty->debug_tpl) ? $smarty->debug_tpl : 'file:' . __DIR__ . '/../debug.tpl';
+        $debObj->registered_plugins = array();
+        $debObj->registered_resources = array();
+        $debObj->registered_filters = array();
+        $debObj->autoload_filters = array();
+        $debObj->default_modifiers = array();
+        $debObj->escape_html = true;
+        $debObj->caching = Smarty::CACHING_OFF;
+        $debObj->compile_id = null;
+        $debObj->cache_id = null;
+        // prepare information of assigned variables
+        $ptr = $this->get_debug_vars($obj);
+        $_assigned_vars = $ptr->tpl_vars;
+        ksort($_assigned_vars);
+        $_config_vars = $ptr->config_vars;
+        ksort($_config_vars);
+        $debugging = $smarty->debugging;
+        $templateName = $obj->source->type . ':' . $obj->source->name;
+        $displayMode = $debugging === 2 || !$full;
+        $offset = $this->offset * 50;
+        $_template = new Smarty_Internal_Template($debObj->debug_tpl, $debObj);
+        if ($obj->_isTplObj()) {
+            $_template->assign('template_name', $templateName);
+        }
+        if ($obj->_objType === 1 || $full) {
+            $_template->assign('template_data', $this->template_data[ $this->index ]);
+        } else {
+            $_template->assign('template_data', null);
+        }
+        $_template->assign('assigned_vars', $_assigned_vars);
+        $_template->assign('config_vars', $_config_vars);
+        $_template->assign('execution_time', microtime(true) - $smarty->start_time);
+        $_template->assign('targetWindow', $displayMode ? md5("$offset$templateName") : '__Smarty__');
+        $_template->assign('offset', $offset);
+        echo $_template->fetch();
+        if (isset($full)) {
+            $this->index--;
+        }
+        if (!$full) {
+            $this->index = $savedIndex;
+        }
+    }
+
+    /**
+     * Recursively gets variables from all template/data scopes
+     *
+     * @param Smarty_Internal_Template|Smarty_Data $obj object to debug
+     *
+     * @return StdClass
+     */
+    public function get_debug_vars($obj)
+    {
+        $config_vars = array();
+        foreach ($obj->config_vars as $key => $var) {
+            $config_vars[ $key ][ 'value' ] = $var;
+            if ($obj->_isTplObj()) {
+                $config_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
+            } elseif ($obj->_isDataObj()) {
+                $tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
+            } else {
+                $config_vars[ $key ][ 'scope' ] = 'Smarty object';
+            }
+        }
+        $tpl_vars = array();
+        foreach ($obj->tpl_vars as $key => $var) {
+            foreach ($var as $varkey => $varvalue) {
+                if ($varkey === 'value') {
+                    $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                } else {
+                    if ($varkey === 'nocache') {
+                        if ($varvalue === true) {
+                            $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                        }
+                    } else {
+                        if ($varkey !== 'scope' || $varvalue !== 0) {
+                            $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
+                        }
+                    }
+                }
+            }
+            if ($obj->_isTplObj()) {
+                $tpl_vars[ $key ][ 'scope' ] = $obj->source->type . ':' . $obj->source->name;
+            } elseif ($obj->_isDataObj()) {
+                $tpl_vars[ $key ][ 'scope' ] = $obj->dataObjectName;
+            } else {
+                $tpl_vars[ $key ][ 'scope' ] = 'Smarty object';
+            }
+        }
+        if (isset($obj->parent)) {
+            $parent = $this->get_debug_vars($obj->parent);
+            foreach ($parent->tpl_vars as $name => $pvar) {
+                if (isset($tpl_vars[ $name ]) && $tpl_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
+                    $tpl_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
+                }
+            }
+            $tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
+            foreach ($parent->config_vars as $name => $pvar) {
+                if (isset($config_vars[ $name ]) && $config_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
+                    $config_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
+                }
+            }
+            $config_vars = array_merge($parent->config_vars, $config_vars);
+        } else {
+            foreach (Smarty::$global_tpl_vars as $key => $var) {
+                if (!array_key_exists($key, $tpl_vars)) {
+                    foreach ($var as $varkey => $varvalue) {
+                        if ($varkey === 'value') {
+                            $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                        } else {
+                            if ($varkey === 'nocache') {
+                                if ($varvalue === true) {
+                                    $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                                }
+                            } else {
+                                if ($varkey !== 'scope' || $varvalue !== 0) {
+                                    $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
+                                }
+                            }
+                        }
+                    }
+                    $tpl_vars[ $key ][ 'scope' ] = 'Global';
+                }
+            }
+        }
+        return (object)array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
+    }
+
+    /**
+     * Return key into $template_data for template
+     *
+     * @param \Smarty_Internal_Template $template template object
+     *
+     * @return string key into $template_data
+     */
+    private function get_key(Smarty_Internal_Template $template)
+    {
+        static $_is_stringy = array('string' => true, 'eval' => true);
+        // calculate Uid if not already done
+        if ($template->source->uid === '') {
+            $template->source->filepath;
+        }
+        $key = $template->source->uid;
+        if (isset($this->template_data[ $this->index ][ $key ])) {
+            return $key;
+        } else {
+            if (isset($_is_stringy[ $template->source->type ])) {
+                $this->template_data[ $this->index ][ $key ][ 'name' ] =
+                    '\'' . substr($template->source->name, 0, 25) . '...\'';
+            } else {
+                $this->template_data[ $this->index ][ $key ][ 'name' ] = $template->source->filepath;
+            }
+            $this->template_data[ $this->index ][ $key ][ 'compile_time' ] = 0;
+            $this->template_data[ $this->index ][ $key ][ 'render_time' ] = 0;
+            $this->template_data[ $this->index ][ $key ][ 'cache_time' ] = 0;
+            $this->template_data[ $this->index ][ $key ][ 'total_time' ] = 0;
+            return $key;
+        }
+    }
+
+    /**
+     * Ignore template
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function ignore(Smarty_Internal_Template $template)
+    {
+        // calculate Uid if not already done
+        if ($template->source->uid === '') {
+            $template->source->filepath;
+        }
+        $this->ignore_uid[ $template->source->uid ] = true;
+    }
+
+    /**
+     * handle 'URL' debugging mode
+     *
+     * @param Smarty $smarty
+     */
+    public function debugUrl(Smarty $smarty)
+    {
+        if (isset($_SERVER[ 'QUERY_STRING' ])) {
+            $_query_string = $_SERVER[ 'QUERY_STRING' ];
+        } else {
+            $_query_string = '';
+        }
+        if (false !== strpos($_query_string, $smarty->smarty_debug_id)) {
+            if (false !== strpos($_query_string, $smarty->smarty_debug_id . '=on')) {
+                // enable debugging for this browser session
+                setcookie('SMARTY_DEBUG', true);
+                $smarty->debugging = true;
+            } elseif (false !== strpos($_query_string, $smarty->smarty_debug_id . '=off')) {
+                // disable debugging for this browser session
+                setcookie('SMARTY_DEBUG', false);
+                $smarty->debugging = false;
+            } else {
+                // enable debugging for this page
+                $smarty->debugging = true;
+            }
+        } else {
+            if (isset($_COOKIE[ 'SMARTY_DEBUG' ])) {
+                $smarty->debugging = true;
+            }
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_errorhandler.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_errorhandler.php
new file mode 100644
index 000000000..4ddcfcd11
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_errorhandler.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * Smarty error handler to fix new error levels in PHP8 for backwards compatibility
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Simon Wisselink
+ *
+ */
+class Smarty_Internal_ErrorHandler
+{
+
+    /**
+     * Allows {$foo} where foo is unset.
+     * @var bool
+     */
+    public $allowUndefinedVars = true;
+
+    /**
+     * Allows {$foo->propName} where propName is undefined.
+     * @var bool
+     */
+    public $allowUndefinedProperties = true;
+
+    /**
+     * Allows {$foo.bar} where bar is unset and {$foo.bar1.bar2} where either bar1 or bar2 is unset.
+     * @var bool
+     */
+    public $allowUndefinedArrayKeys = true;
+
+    /**
+     * Allows {$foo->bar} where bar is not an object (e.g. null or false).
+     * @var bool
+     */
+    public $allowDereferencingNonObjects = true;
+
+    private $previousErrorHandler = null;
+
+    /**
+     * Enable error handler to intercept errors
+     */
+    public function activate() {
+        /*
+            Error muting is done because some people implemented custom error_handlers using
+            https://php.net/set_error_handler and for some reason did not understand the following paragraph:
+
+            It is important to remember that the standard PHP error handler is completely bypassed for the
+            error types specified by error_types unless the callback function returns FALSE.
+            error_reporting() settings will have no effect and your error handler will be called regardless -
+            however you are still able to read the current value of error_reporting and act appropriately.
+            Of particular note is that this value will be 0 if the statement that caused the error was
+            prepended by the @ error-control operator.
+        */
+        $this->previousErrorHandler = set_error_handler([$this, 'handleError']);
+    }
+
+    /**
+     * Disable error handler
+     */
+    public function deactivate() {
+        restore_error_handler();
+        $this->previousErrorHandler = null;
+    }
+
+    /**
+     * Error Handler to mute expected messages
+     *
+     * @link https://php.net/set_error_handler
+     *
+     * @param integer $errno Error level
+     * @param         $errstr
+     * @param         $errfile
+     * @param         $errline
+     * @param         $errcontext
+     *
+     * @return bool
+     */
+    public function handleError($errno, $errstr, $errfile, $errline, $errcontext = [])
+    {
+
+        if ($this->allowUndefinedVars && preg_match(
+                '/^(Attempt to read property "value" on null|Trying to get property (\'value\' )?of non-object)/',
+                $errstr
+            )) {
+            return; // suppresses this error
+        }
+
+        if ($this->allowUndefinedProperties && preg_match(
+                '/^(Undefined property)/',
+                $errstr
+            )) {
+            return; // suppresses this error
+        }
+
+        if ($this->allowUndefinedArrayKeys && preg_match(
+            '/^(Undefined index|Undefined array key|Trying to access array offset on)/',
+            $errstr
+        )) {
+            return; // suppresses this error
+        }
+
+        if ($this->allowDereferencingNonObjects && preg_match(
+                '/^Attempt to read property ".+?" on/',
+                $errstr
+            )) {
+            return; // suppresses this error
+        }
+
+        // pass all other errors through to the previous error handler or to the default PHP error handler
+        return $this->previousErrorHandler ?
+            call_user_func($this->previousErrorHandler, $errno, $errstr, $errfile, $errline, $errcontext) : false;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_extension_handler.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_extension_handler.php
new file mode 100644
index 000000000..3ef040ab1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_extension_handler.php
@@ -0,0 +1,197 @@
+<?php
+
+/**
+ * Smarty Extension handler
+ *
+ * Load extensions dynamically
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ *
+ * Runtime extensions
+ * @property   Smarty_Internal_Runtime_CacheModify       $_cacheModify
+ * @property   Smarty_Internal_Runtime_CacheResourceFile $_cacheResourceFile
+ * @property   Smarty_Internal_Runtime_Capture           $_capture
+ * @property   Smarty_Internal_Runtime_CodeFrame         $_codeFrame
+ * @property   Smarty_Internal_Runtime_FilterHandler     $_filterHandler
+ * @property   Smarty_Internal_Runtime_Foreach           $_foreach
+ * @property   Smarty_Internal_Runtime_GetIncludePath    $_getIncludePath
+ * @property   Smarty_Internal_Runtime_Make_Nocache      $_make_nocache
+ * @property   Smarty_Internal_Runtime_UpdateCache       $_updateCache
+ * @property   Smarty_Internal_Runtime_UpdateScope       $_updateScope
+ * @property   Smarty_Internal_Runtime_TplFunction       $_tplFunction
+ * @property   Smarty_Internal_Runtime_WriteFile         $_writeFile
+ *
+ * Method extensions
+ * @property   Smarty_Internal_Method_GetTemplateVars    $getTemplateVars
+ * @property   Smarty_Internal_Method_Append             $append
+ * @property   Smarty_Internal_Method_AppendByRef        $appendByRef
+ * @property   Smarty_Internal_Method_AssignGlobal       $assignGlobal
+ * @property   Smarty_Internal_Method_AssignByRef        $assignByRef
+ * @property   Smarty_Internal_Method_LoadFilter         $loadFilter
+ * @property   Smarty_Internal_Method_LoadPlugin         $loadPlugin
+ * @property   Smarty_Internal_Method_RegisterFilter     $registerFilter
+ * @property   Smarty_Internal_Method_RegisterObject     $registerObject
+ * @property   Smarty_Internal_Method_RegisterPlugin     $registerPlugin
+ * @property   mixed|\Smarty_Template_Cached             configLoad
+ */
+#[\AllowDynamicProperties]
+class Smarty_Internal_Extension_Handler
+{
+    public $objType = null;
+
+    /**
+     * Cache for property information from generic getter/setter
+     * Preloaded with names which should not use with generic getter/setter
+     *
+     * @var array
+     */
+    private $_property_info     = array(
+        'AutoloadFilters' => 0, 'DefaultModifiers' => 0, 'ConfigVars' => 0,
+        'DebugTemplate'   => 0, 'RegisteredObject' => 0, 'StreamVariable' => 0,
+        'TemplateVars'    => 0, 'Literals' => 'Literals',
+    );//
+
+    private $resolvedProperties = array();
+
+    /**
+     * Call external Method
+     *
+     * @param \Smarty_Internal_Data $data
+     * @param string                $name external method names
+     * @param array                 $args argument array
+     *
+     * @return mixed
+     */
+    public function _callExternalMethod(Smarty_Internal_Data $data, $name, $args)
+    {
+        /* @var Smarty $data ->smarty */
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        if (!isset($smarty->ext->$name)) {
+            if (preg_match('/^((set|get)|(.*?))([A-Z].*)$/', $name, $match)) {
+                $basename = $this->upperCase($match[ 4 ]);
+                if (!isset($smarty->ext->$basename) && isset($this->_property_info[ $basename ])
+                    && is_string($this->_property_info[ $basename ])
+                ) {
+                    $class = 'Smarty_Internal_Method_' . $this->_property_info[ $basename ];
+                    if (class_exists($class)) {
+                        $classObj = new $class();
+                        $methodes = get_class_methods($classObj);
+                        foreach ($methodes as $method) {
+                            $smarty->ext->$method = $classObj;
+                        }
+                    }
+                }
+                if (!empty($match[ 2 ]) && !isset($smarty->ext->$name)) {
+                    $class = 'Smarty_Internal_Method_' . $this->upperCase($name);
+                    if (!class_exists($class)) {
+                        $objType = $data->_objType;
+                        $propertyType = false;
+                        if (!isset($this->resolvedProperties[ $match[ 0 ] ][ $objType ])) {
+                            $property = $this->resolvedProperties['property'][$basename] ??
+                                $this->resolvedProperties['property'][$basename] = smarty_strtolower_ascii(
+                                join(
+                                    '_',
+                                    preg_split(
+                                        '/([A-Z][^A-Z]*)/',
+                                        $basename,
+                                        -1,
+                                        PREG_SPLIT_NO_EMPTY |
+                                        PREG_SPLIT_DELIM_CAPTURE
+                                    )
+                                )
+                            );
+                            if ($property !== false) {
+                                if (property_exists($data, $property)) {
+                                    $propertyType = $this->resolvedProperties[ $match[ 0 ] ][ $objType ] = 1;
+                                } elseif (property_exists($smarty, $property)) {
+                                    $propertyType = $this->resolvedProperties[ $match[ 0 ] ][ $objType ] = 2;
+                                } else {
+                                    $this->resolvedProperties[ 'property' ][ $basename ] = $property = false;
+                                }
+                            }
+                        } else {
+                            $propertyType = $this->resolvedProperties[ $match[ 0 ] ][ $objType ];
+                            $property = $this->resolvedProperties[ 'property' ][ $basename ];
+                        }
+                        if ($propertyType) {
+                            $obj = $propertyType === 1 ? $data : $smarty;
+                            if ($match[ 2 ] === 'get') {
+                                return $obj->$property;
+                            } elseif ($match[ 2 ] === 'set') {
+                                return $obj->$property = $args[ 0 ];
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        $callback = array($smarty->ext->$name, $name);
+        array_unshift($args, $data);
+        if (isset($callback) && $callback[ 0 ]->objMap | $data->_objType) {
+            return call_user_func_array($callback, $args);
+        }
+        return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), $args);
+    }
+
+    /**
+     * Make first character of name parts upper case
+     *
+     * @param string $name
+     *
+     * @return string
+     */
+    public function upperCase($name)
+    {
+        $_name = explode('_', $name);
+        $_name = array_map('smarty_ucfirst_ascii', $_name);
+        return implode('_', $_name);
+    }
+
+    /**
+     * get extension object
+     *
+     * @param string $property_name property name
+     *
+     * @return mixed|Smarty_Template_Cached
+     */
+    public function __get($property_name)
+    {
+        // object properties of runtime template extensions will start with '_'
+        if ($property_name[ 0 ] === '_') {
+            $class = 'Smarty_Internal_Runtime' . $this->upperCase($property_name);
+        } else {
+            $class = 'Smarty_Internal_Method_' . $this->upperCase($property_name);
+        }
+        if (!class_exists($class)) {
+            return $this->$property_name = new Smarty_Internal_Undefined($class);
+        }
+        return $this->$property_name = new $class();
+    }
+
+    /**
+     * set extension property
+     *
+     * @param string $property_name property name
+     * @param mixed  $value         value
+     *
+     */
+    public function __set($property_name, $value)
+    {
+        $this->$property_name = $value;
+    }
+
+    /**
+     * Call error handler for undefined method
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
+     */
+    public function __call($name, $args)
+    {
+        return call_user_func_array(array(new Smarty_Internal_Undefined(), $name), array($this));
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php
new file mode 100644
index 000000000..a05f55a82
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_addautoloadfilters.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Smarty Method AddAutoloadFilters
+ *
+ * Smarty::addAutoloadFilters() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AddAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters
+{
+    /**
+     * Add autoload filters
+     *
+     * @api Smarty::setAutoloadFilters()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param array                                                           $filters filters to load automatically
+     * @param string                                                          $type    "pre", "output", … specify
+     *                                                                                 the filter type to set.
+     *                                                                                 Defaults to none treating
+     *                                                                                 $filters' keys as the
+     *                                                                                 appropriate types
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function addAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if ($type !== null) {
+            $this->_checkFilterType($type);
+            if (!empty($smarty->autoload_filters[ $type ])) {
+                $smarty->autoload_filters[ $type ] = array_merge($smarty->autoload_filters[ $type ], (array)$filters);
+            } else {
+                $smarty->autoload_filters[ $type ] = (array)$filters;
+            }
+        } else {
+            foreach ((array)$filters as $type => $value) {
+                $this->_checkFilterType($type);
+                if (!empty($smarty->autoload_filters[ $type ])) {
+                    $smarty->autoload_filters[ $type ] =
+                        array_merge($smarty->autoload_filters[ $type ], (array)$value);
+                } else {
+                    $smarty->autoload_filters[ $type ] = (array)$value;
+                }
+            }
+        }
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php
new file mode 100644
index 000000000..c3feb3d8b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_adddefaultmodifiers.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method AddDefaultModifiers
+ *
+ * Smarty::addDefaultModifiers() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AddDefaultModifiers
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Add default modifiers
+     *
+     * @api Smarty::addDefaultModifiers()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param array|string                                                    $modifiers modifier or list of modifiers
+     *                                                                                   to add
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function addDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (is_array($modifiers)) {
+            $smarty->default_modifiers = array_merge($smarty->default_modifiers, $modifiers);
+        } else {
+            $smarty->default_modifiers[] = $modifiers;
+        }
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_append.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_append.php
new file mode 100644
index 000000000..e207734e8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_append.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * Smarty Method Append
+ *
+ * Smarty::append() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_Append
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * appends values to template variables
+     *
+     * @api  Smarty::append()
+     * @link https://www.smarty.net/docs/en/api.append.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param array|string                                            $tpl_var the template variable name(s)
+     * @param mixed                                                   $value   the value to append
+     * @param bool                                                    $merge   flag if array elements shall be merged
+     * @param bool                                                    $nocache if true any output of this variable will
+     *                                                                         be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function append(Smarty_Internal_Data $data, $tpl_var, $value = null, $merge = false, $nocache = false)
+    {
+        if (is_array($tpl_var)) {
+            // $tpl_var is an array, ignore $value
+            foreach ($tpl_var as $_key => $_val) {
+                if ($_key !== '') {
+                    $this->append($data, $_key, $_val, $merge, $nocache);
+                }
+            }
+        } else {
+            if ($tpl_var !== '' && isset($value)) {
+                if (!isset($data->tpl_vars[ $tpl_var ])) {
+                    $tpl_var_inst = $data->ext->getTemplateVars->_getVariable($data, $tpl_var, null, true, false);
+                    if ($tpl_var_inst instanceof Smarty_Undefined_Variable) {
+                        $data->tpl_vars[ $tpl_var ] = new Smarty_Variable(null, $nocache);
+                    } else {
+                        $data->tpl_vars[ $tpl_var ] = clone $tpl_var_inst;
+                    }
+                }
+                if (!(is_array($data->tpl_vars[ $tpl_var ]->value)
+                      || $data->tpl_vars[ $tpl_var ]->value instanceof ArrayAccess)
+                ) {
+                    settype($data->tpl_vars[ $tpl_var ]->value, 'array');
+                }
+                if ($merge && is_array($value)) {
+                    foreach ($value as $_mkey => $_mval) {
+                        $data->tpl_vars[ $tpl_var ]->value[ $_mkey ] = $_mval;
+                    }
+                } else {
+                    $data->tpl_vars[ $tpl_var ]->value[] = $value;
+                }
+            }
+            if ($data->_isTplObj() && $data->scope) {
+                $data->ext->_updateScope->_updateScope($data, $tpl_var);
+            }
+        }
+        return $data;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php
new file mode 100644
index 000000000..b5be69b54
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_appendbyref.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Smarty Method AppendByRef
+ *
+ * Smarty::appendByRef() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AppendByRef
+{
+    /**
+     * appends values to template variables by reference
+     *
+     * @api  Smarty::appendByRef()
+     * @link https://www.smarty.net/docs/en/api.append.by.ref.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $tpl_var the template variable name
+     * @param mixed                                                   &$value  the referenced value to append
+     * @param bool                                                    $merge   flag if array elements shall be merged
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public static function appendByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $merge = false)
+    {
+        if ($tpl_var !== '' && isset($value)) {
+            if (!isset($data->tpl_vars[ $tpl_var ])) {
+                $data->tpl_vars[ $tpl_var ] = new Smarty_Variable();
+            }
+            if (!is_array($data->tpl_vars[ $tpl_var ]->value)) {
+                settype($data->tpl_vars[ $tpl_var ]->value, 'array');
+            }
+            if ($merge && is_array($value)) {
+                foreach ($value as $_key => $_val) {
+                    $data->tpl_vars[ $tpl_var ]->value[ $_key ] = &$value[ $_key ];
+                }
+            } else {
+                $data->tpl_vars[ $tpl_var ]->value[] = &$value;
+            }
+            if ($data->_isTplObj() && $data->scope) {
+                $data->ext->_updateScope->_updateScope($data, $tpl_var);
+            }
+        }
+        return $data;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php
new file mode 100644
index 000000000..fa705bb80
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_assignbyref.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Smarty Method AssignByRef
+ *
+ * Smarty::assignByRef() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AssignByRef
+{
+    /**
+     * assigns values to template variables by reference
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $tpl_var the template variable name
+     * @param                                                         $value
+     * @param boolean                                                 $nocache if true any output of this variable will
+     *                                                                         be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function assignByRef(Smarty_Internal_Data $data, $tpl_var, &$value, $nocache)
+    {
+        if ($tpl_var !== '') {
+            $data->tpl_vars[ $tpl_var ] = new Smarty_Variable(null, $nocache);
+            $data->tpl_vars[ $tpl_var ]->value = &$value;
+            if ($data->_isTplObj() && $data->scope) {
+                $data->ext->_updateScope->_updateScope($data, $tpl_var);
+            }
+        }
+        return $data;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php
new file mode 100644
index 000000000..08cfa4693
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_assignglobal.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method AssignGlobal
+ *
+ * Smarty::assignGlobal() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_AssignGlobal
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * assigns a global Smarty variable
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $varName the global variable name
+     * @param mixed                                                   $value   the value to assign
+     * @param boolean                                                 $nocache if true any output of this variable will
+     *                                                                         be not cached
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function assignGlobal(Smarty_Internal_Data $data, $varName, $value = null, $nocache = false)
+    {
+        if ($varName !== '') {
+            Smarty::$global_tpl_vars[ $varName ] = new Smarty_Variable($value, $nocache);
+            $ptr = $data;
+            while ($ptr->_isTplObj()) {
+                $ptr->tpl_vars[ $varName ] = clone Smarty::$global_tpl_vars[ $varName ];
+                $ptr = $ptr->parent;
+            }
+        }
+        return $data;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearallassign.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearallassign.php
new file mode 100644
index 000000000..6fb0c8f3d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearallassign.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Smarty Method ClearAllAssign
+ *
+ * Smarty::clearAllAssign() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearAllAssign
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * clear all the assigned template variables.
+     *
+     * @api  Smarty::clearAllAssign()
+     * @link https://www.smarty.net/docs/en/api.clear.all.assign.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function clearAllAssign(Smarty_Internal_Data $data)
+    {
+        $data->tpl_vars = array();
+        return $data;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php
new file mode 100644
index 000000000..b74d30580
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearallcache.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method ClearAllCache
+ *
+ * Smarty::clearAllCache() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearAllCache
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Empty cache folder
+     *
+     * @api  Smarty::clearAllCache()
+     * @link https://www.smarty.net/docs/en/api.clear.all.cache.tpl
+     *
+     * @param \Smarty $smarty
+     * @param integer $exp_time expiration time
+     * @param string  $type     resource type
+     *
+     * @return int number of cache files deleted
+     * @throws \SmartyException
+     */
+    public function clearAllCache(Smarty $smarty, $exp_time = null, $type = null)
+    {
+        $smarty->_clearTemplateCache();
+        // load cache resource and call clearAll
+        $_cache_resource = Smarty_CacheResource::load($smarty, $type);
+        return $_cache_resource->clearAll($smarty, $exp_time);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearassign.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearassign.php
new file mode 100644
index 000000000..12b755c06
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearassign.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method ClearAssign
+ *
+ * Smarty::clearAssign() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearAssign
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * clear the given assigned template variable(s).
+     *
+     * @api  Smarty::clearAssign()
+     * @link https://www.smarty.net/docs/en/api.clear.assign.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string|array                                            $tpl_var the template variable(s) to clear
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function clearAssign(Smarty_Internal_Data $data, $tpl_var)
+    {
+        if (is_array($tpl_var)) {
+            foreach ($tpl_var as $curr_var) {
+                unset($data->tpl_vars[ $curr_var ]);
+            }
+        } else {
+            unset($data->tpl_vars[ $tpl_var ]);
+        }
+        return $data;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcache.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcache.php
new file mode 100644
index 000000000..df766eee8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcache.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Smarty Method ClearCache
+ *
+ * Smarty::clearCache() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearCache
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @api  Smarty::clearCache()
+     * @link https://www.smarty.net/docs/en/api.clear.cache.tpl
+     *
+     * @param \Smarty $smarty
+     * @param string  $template_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time
+     * @param string  $type          resource type
+     *
+     * @return int number of cache files deleted
+     * @throws \SmartyException
+     */
+    public function clearCache(
+        Smarty $smarty,
+        $template_name,
+        $cache_id = null,
+        $compile_id = null,
+        $exp_time = null,
+        $type = null
+    ) {
+        $smarty->_clearTemplateCache();
+        // load cache resource and call clear
+        $_cache_resource = Smarty_CacheResource::load($smarty, $type);
+        return $_cache_resource->clear($smarty, $template_name, $cache_id, $compile_id, $exp_time);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php
new file mode 100644
index 000000000..db0a49b00
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearcompiledtemplate.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * Smarty Method ClearCompiledTemplate
+ *
+ * Smarty::clearCompiledTemplate() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearCompiledTemplate
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Delete compiled template file
+     *
+     * @api  Smarty::clearCompiledTemplate()
+     * @link https://www.smarty.net/docs/en/api.clear.compiled.template.tpl
+     *
+     * @param \Smarty $smarty
+     * @param string  $resource_name template name
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time
+     *
+     * @return int number of template files deleted
+     * @throws \SmartyException
+     */
+    public function clearCompiledTemplate(Smarty $smarty, $resource_name = null, $compile_id = null, $exp_time = null)
+    {
+        // clear template objects cache
+        $smarty->_clearTemplateCache();
+        $_compile_dir = $smarty->getCompileDir();
+        if ($_compile_dir === '/') { //We should never want to delete this!
+            return 0;
+        }
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+        $_dir_sep = $smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
+        if (isset($resource_name)) {
+            $_save_stat = $smarty->caching;
+            $smarty->caching = Smarty::CACHING_OFF;
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = $smarty->createTemplate($resource_name);
+            $smarty->caching = $_save_stat;
+            if (!$tpl->source->handler->uncompiled && !$tpl->source->handler->recompiled && $tpl->source->exists) {
+                $_resource_part_1 = basename(str_replace('^', DIRECTORY_SEPARATOR, $tpl->compiled->filepath));
+                $_resource_part_1_length = strlen($_resource_part_1);
+            } else {
+                return 0;
+            }
+            $_resource_part_2 = str_replace('.php', '.cache.php', $_resource_part_1);
+            $_resource_part_2_length = strlen($_resource_part_2);
+        }
+        $_dir = $_compile_dir;
+        if ($smarty->use_sub_dirs && isset($_compile_id)) {
+            $_dir .= $_compile_id . $_dir_sep;
+        }
+        if (isset($_compile_id)) {
+            $_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep;
+            $_compile_id_part_length = strlen($_compile_id_part);
+        }
+        $_count = 0;
+        try {
+            $_compileDirs = new RecursiveDirectoryIterator($_dir);
+            // NOTE: UnexpectedValueException thrown for PHP >= 5.3
+        } catch (Exception $e) {
+            return 0;
+        }
+        $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
+        foreach ($_compile as $_file) {
+            if (substr(basename($_file->getPathname()), 0, 1) === '.') {
+                continue;
+            }
+            $_filepath = (string)$_file;
+            if ($_file->isDir()) {
+                if (!$_compile->isDot()) {
+                    // delete folder if empty
+                    @rmdir($_file->getPathname());
+                }
+            } else {
+                // delete only php files
+                if (substr($_filepath, -4) !== '.php') {
+                    continue;
+                }
+                $unlink = false;
+                if ((!isset($_compile_id) ||
+                     (isset($_filepath[ $_compile_id_part_length ]) &&
+                      $a = !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length)))
+                    && (!isset($resource_name) || (isset($_filepath[ $_resource_part_1_length ])
+                                                   && substr_compare(
+                                                          $_filepath,
+                                                          $_resource_part_1,
+                                                          -$_resource_part_1_length,
+                                                          $_resource_part_1_length
+                                                      ) === 0) || (isset($_filepath[ $_resource_part_2_length ])
+                                                                   && substr_compare(
+                                                                          $_filepath,
+                                                                          $_resource_part_2,
+                                                                          -$_resource_part_2_length,
+                                                                          $_resource_part_2_length
+                                                                      ) === 0))
+                ) {
+                    if (isset($exp_time)) {
+                        if (is_file($_filepath) && time() - filemtime($_filepath) >= $exp_time) {
+                            $unlink = true;
+                        }
+                    } else {
+                        $unlink = true;
+                    }
+                }
+                if ($unlink && is_file($_filepath) && @unlink($_filepath)) {
+                    $_count++;
+                    if (function_exists('opcache_invalidate')
+                        && (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api')) < 1)
+                    ) {
+                        opcache_invalidate($_filepath, true);
+                    } elseif (function_exists('apc_delete_file')) {
+                        apc_delete_file($_filepath);
+                    }
+                }
+            }
+        }
+        return $_count;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearconfig.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearconfig.php
new file mode 100644
index 000000000..d1b730322
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_clearconfig.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method ClearConfig
+ *
+ * Smarty::clearConfig() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ClearConfig
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * clear a single or all config variables
+     *
+     * @api  Smarty::clearConfig()
+     * @link https://www.smarty.net/docs/en/api.clear.config.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string|null                                             $name variable name or null
+     *
+     * @return \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty
+     */
+    public function clearConfig(Smarty_Internal_Data $data, $name = null)
+    {
+        if (isset($name)) {
+            unset($data->config_vars[ $name ]);
+        } else {
+            $data->config_vars = array();
+        }
+        return $data;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php
new file mode 100644
index 000000000..3934ca042
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_compileallconfig.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Smarty Method CompileAllConfig
+ *
+ * Smarty::compileAllConfig() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_CompileAllConfig extends Smarty_Internal_Method_CompileAllTemplates
+{
+    /**
+     * Compile all config files
+     *
+     * @api Smarty::compileAllConfig()
+     *
+     * @param \Smarty $smarty        passed smarty object
+     * @param string  $extension     file extension
+     * @param bool    $force_compile force all to recompile
+     * @param int     $time_limit
+     * @param int     $max_errors
+     *
+     * @return int number of template files recompiled
+     */
+    public function compileAllConfig(
+        Smarty $smarty,
+        $extension = '.conf',
+        $force_compile = false,
+        $time_limit = 0,
+        $max_errors = null
+    ) {
+        return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors, true);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php
new file mode 100644
index 000000000..5c046da40
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_compilealltemplates.php
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * Smarty Method CompileAllTemplates
+ *
+ * Smarty::compileAllTemplates() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_CompileAllTemplates
+{
+    /**
+     * Valid for Smarty object
+     *
+     * @var int
+     */
+    public $objMap = 1;
+
+    /**
+     * Compile all template files
+     *
+     * @api Smarty::compileAllTemplates()
+     *
+     * @param \Smarty $smarty        passed smarty object
+     * @param string  $extension     file extension
+     * @param bool    $force_compile force all to recompile
+     * @param int     $time_limit
+     * @param int     $max_errors
+     *
+     * @return integer number of template files recompiled
+     */
+    public function compileAllTemplates(
+        Smarty $smarty,
+        $extension = '.tpl',
+        $force_compile = false,
+        $time_limit = 0,
+        $max_errors = null
+    ) {
+        return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors);
+    }
+
+    /**
+     * Compile all template or config files
+     *
+     * @param \Smarty $smarty
+     * @param string  $extension     template file name extension
+     * @param bool    $force_compile force all to recompile
+     * @param int     $time_limit    set maximum execution time
+     * @param int     $max_errors    set maximum allowed errors
+     * @param bool    $isConfig      flag true if called for config files
+     *
+     * @return int number of template files compiled
+     */
+    protected function compileAll(
+        Smarty $smarty,
+        $extension,
+        $force_compile,
+        $time_limit,
+        $max_errors,
+        $isConfig = false
+    ) {
+        // switch off time limit
+        if (function_exists('set_time_limit')) {
+            @set_time_limit($time_limit);
+        }
+        $_count = 0;
+        $_error_count = 0;
+        $sourceDir = $isConfig ? $smarty->getConfigDir() : $smarty->getTemplateDir();
+        // loop over array of source directories
+        foreach ($sourceDir as $_dir) {
+            $_dir_1 = new RecursiveDirectoryIterator(
+                $_dir,
+                defined('FilesystemIterator::FOLLOW_SYMLINKS') ?
+                    FilesystemIterator::FOLLOW_SYMLINKS : 0
+            );
+            $_dir_2 = new RecursiveIteratorIterator($_dir_1);
+            foreach ($_dir_2 as $_fileinfo) {
+                $_file = $_fileinfo->getFilename();
+                if (substr(basename($_fileinfo->getPathname()), 0, 1) === '.' || strpos($_file, '.svn') !== false) {
+                    continue;
+                }
+                if (substr_compare($_file, $extension, -strlen($extension)) !== 0) {
+                    continue;
+                }
+                if ($_fileinfo->getPath() !== substr($_dir, 0, -1)) {
+                    $_file = substr($_fileinfo->getPath(), strlen($_dir)) . DIRECTORY_SEPARATOR . $_file;
+                }
+                echo "\n<br>", $_dir, '---', $_file;
+                flush();
+                $_start_time = microtime(true);
+                $_smarty = clone $smarty;
+                //
+                $_smarty->_cache = array();
+                $_smarty->ext = new Smarty_Internal_Extension_Handler();
+                $_smarty->ext->objType = $_smarty->_objType;
+                $_smarty->force_compile = $force_compile;
+                try {
+                    /* @var Smarty_Internal_Template $_tpl */
+                    $_tpl = new $smarty->template_class($_file, $_smarty);
+                    $_tpl->caching = Smarty::CACHING_OFF;
+                    $_tpl->source =
+                        $isConfig ? Smarty_Template_Config::load($_tpl) : Smarty_Template_Source::load($_tpl);
+                    if ($_tpl->mustCompile()) {
+                        $_tpl->compileTemplateSource();
+                        $_count++;
+                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
+                        flush();
+                    } else {
+                        echo ' is up to date';
+                        flush();
+                    }
+                } catch (Exception $e) {
+                    echo "\n<br>        ------>Error: ", $e->getMessage(), "<br><br>\n";
+                    $_error_count++;
+                }
+                // free memory
+                unset($_tpl);
+                $_smarty->_clearTemplateCache();
+                if ($max_errors !== null && $_error_count === $max_errors) {
+                    echo "\n<br><br>too many errors\n";
+                    exit(1);
+                }
+            }
+        }
+        echo "\n<br>";
+        return $_count;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_configload.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_configload.php
new file mode 100644
index 000000000..c3174d2d0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_configload.php
@@ -0,0 +1,182 @@
+<?php
+
+/**
+ * Smarty Method ConfigLoad
+ *
+ * Smarty::configLoad() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_ConfigLoad
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * load a config file, optionally load just selected sections
+     *
+     * @api  Smarty::configLoad()
+     * @link https://www.smarty.net/docs/en/api.config.load.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $config_file filename
+     * @param mixed                                                   $sections    array of section names, single
+     *                                                                             section or null
+     *
+     * @return \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template
+     * @throws \Exception
+     */
+    public function configLoad(Smarty_Internal_Data $data, $config_file, $sections = null)
+    {
+        $this->_loadConfigFile($data, $config_file, $sections, null);
+        return $data;
+    }
+
+    /**
+     * load a config file, optionally load just selected sections
+     *
+     * @api  Smarty::configLoad()
+     * @link https://www.smarty.net/docs/en/api.config.load.tpl
+     *
+     * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
+     * @param string                                                  $config_file filename
+     * @param mixed                                                   $sections    array of section names, single
+     *                                                                             section or null
+     * @param int                                                     $scope       scope into which config variables
+     *                                                                             shall be loaded
+     *
+     * @throws \Exception
+     */
+    public function _loadConfigFile(Smarty_Internal_Data $data, $config_file, $sections = null, $scope = 0)
+    {
+        /* @var \Smarty $smarty */
+        $smarty = $data->_getSmartyObj();
+        /* @var \Smarty_Internal_Template $confObj */
+        $confObj = new Smarty_Internal_Template($config_file, $smarty, $data, null, null, null, null, true);
+        $confObj->caching = Smarty::CACHING_OFF;
+        $confObj->source->config_sections = $sections;
+        $confObj->source->scope = $scope;
+        $confObj->compiled = Smarty_Template_Compiled::load($confObj);
+        $confObj->compiled->render($confObj);
+        if ($data->_isTplObj()) {
+            $data->compiled->file_dependency[ $confObj->source->uid ] =
+                array($confObj->source->filepath, $confObj->source->getTimeStamp(), $confObj->source->type);
+        }
+    }
+
+    /**
+     * load config variables into template object
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param array                     $new_config_vars
+     */
+    public function _loadConfigVars(Smarty_Internal_Template $tpl, $new_config_vars)
+    {
+        $this->_assignConfigVars($tpl->parent->config_vars, $tpl, $new_config_vars);
+        $tagScope = $tpl->source->scope;
+        if ($tagScope >= 0) {
+            if ($tagScope === Smarty::SCOPE_LOCAL) {
+                $this->_updateVarStack($tpl, $new_config_vars);
+                $tagScope = 0;
+                if (!$tpl->scope) {
+                    return;
+                }
+            }
+            if ($tpl->parent->_isTplObj() && ($tagScope || $tpl->parent->scope)) {
+                $mergedScope = $tagScope | $tpl->scope;
+                if ($mergedScope) {
+                    // update scopes
+                    /* @var \Smarty_Internal_Template|\Smarty|\Smarty_Internal_Data $ptr */
+                    foreach ($tpl->smarty->ext->_updateScope->_getAffectedScopes($tpl->parent, $mergedScope) as $ptr) {
+                        $this->_assignConfigVars($ptr->config_vars, $tpl, $new_config_vars);
+                        if ($tagScope && $ptr->_isTplObj() && isset($tpl->_cache[ 'varStack' ])) {
+                            $this->_updateVarStack($tpl, $new_config_vars);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Assign all config variables in given scope
+     *
+     * @param array                     $config_vars     config variables in scope
+     * @param \Smarty_Internal_Template $tpl
+     * @param array                     $new_config_vars loaded config variables
+     */
+    public function _assignConfigVars(&$config_vars, Smarty_Internal_Template $tpl, $new_config_vars)
+    {
+        // copy global config vars
+        foreach ($new_config_vars[ 'vars' ] as $variable => $value) {
+            if ($tpl->smarty->config_overwrite || !isset($config_vars[ $variable ])) {
+                $config_vars[ $variable ] = $value;
+            } else {
+                $config_vars[ $variable ] = array_merge((array)$config_vars[ $variable ], (array)$value);
+            }
+        }
+        // scan sections
+        $sections = $tpl->source->config_sections;
+        if (!empty($sections)) {
+            foreach ((array)$sections as $tpl_section) {
+                if (isset($new_config_vars[ 'sections' ][ $tpl_section ])) {
+                    foreach ($new_config_vars[ 'sections' ][ $tpl_section ][ 'vars' ] as $variable => $value) {
+                        if ($tpl->smarty->config_overwrite || !isset($config_vars[ $variable ])) {
+                            $config_vars[ $variable ] = $value;
+                        } else {
+                            $config_vars[ $variable ] = array_merge((array)$config_vars[ $variable ], (array)$value);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Update config variables in template local variable stack
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param array                     $config_vars
+     */
+    public function _updateVarStack(Smarty_Internal_Template $tpl, $config_vars)
+    {
+        $i = 0;
+        while (isset($tpl->_cache[ 'varStack' ][ $i ])) {
+            $this->_assignConfigVars($tpl->_cache[ 'varStack' ][ $i ][ 'config' ], $tpl, $config_vars);
+            $i++;
+        }
+    }
+
+    /**
+     * gets  a config variable value
+     *
+     * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
+     * @param string                                                  $varName the name of the config variable
+     * @param bool                                                    $errorEnable
+     *
+     * @return null|string  the value of the config variable
+     */
+    public function _getConfigVariable(Smarty_Internal_Data $data, $varName, $errorEnable = true)
+    {
+        $_ptr = $data;
+        while ($_ptr !== null) {
+            if (isset($_ptr->config_vars[ $varName ])) {
+                // found it, return it
+                return $_ptr->config_vars[ $varName ];
+            }
+            // not found, try at parent
+            $_ptr = $_ptr->parent;
+        }
+        if ($data->smarty->error_unassigned && $errorEnable) {
+            // force a notice
+            $x = $$varName;
+        }
+        return null;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_createdata.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_createdata.php
new file mode 100644
index 000000000..c684c0870
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_createdata.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method CreateData
+ *
+ * Smarty::createData() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_CreateData
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * creates a data object
+     *
+     * @api  Smarty::createData()
+     * @link https://www.smarty.net/docs/en/api.create.data.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty      $obj
+     * @param \Smarty_Internal_Template|\Smarty_Internal_Data|\Smarty_Data|\Smarty $parent next higher level of Smarty
+     *                                                                                     variables
+     * @param string                                                               $name   optional data block name
+     *
+     * @return \Smarty_Data data object
+     */
+    public function createData(Smarty_Internal_TemplateBase $obj, Smarty_Internal_Data $parent = null, $name = null)
+    {
+        /* @var Smarty $smarty */
+        $smarty = $obj->_getSmartyObj();
+        $dataObj = new Smarty_Data($parent, $smarty, $name);
+        if ($smarty->debugging) {
+            Smarty_Internal_Debug::register_data($dataObj);
+        }
+        return $dataObj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php
new file mode 100644
index 000000000..4145db10b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getautoloadfilters.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Smarty Method GetAutoloadFilters
+ *
+ * Smarty::getAutoloadFilters() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetAutoloadFilters extends Smarty_Internal_Method_SetAutoloadFilters
+{
+    /**
+     * Get autoload filters
+     *
+     * @api Smarty::getAutoloadFilters()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type type of filter to get auto loads
+     *                                                                              for. Defaults to all autoload
+     *                                                                              filters
+     *
+     * @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type
+     *                was specified
+     * @throws \SmartyException
+     */
+    public function getAutoloadFilters(Smarty_Internal_TemplateBase $obj, $type = null)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if ($type !== null) {
+            $this->_checkFilterType($type);
+            return isset($smarty->autoload_filters[ $type ]) ? $smarty->autoload_filters[ $type ] : array();
+        }
+        return $smarty->autoload_filters;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getconfigvariable.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getconfigvariable.php
new file mode 100644
index 000000000..b54815123
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getconfigvariable.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Smarty Method GetConfigVariable
+ *
+ * Smarty::getConfigVariable() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetConfigVariable
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * gets  a config variable value
+     *
+     * @param \Smarty|\Smarty_Internal_Data|\Smarty_Internal_Template $data
+     * @param string                                                  $varName the name of the config variable
+     * @param bool                                                    $errorEnable
+     *
+     * @return null|string  the value of the config variable
+     */
+    public function getConfigVariable(Smarty_Internal_Data $data, $varName = null, $errorEnable = true)
+    {
+        return $data->ext->configLoad->_getConfigVariable($data, $varName, $errorEnable);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php
new file mode 100644
index 000000000..763bdf989
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getconfigvars.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Smarty Method GetConfigVars
+ *
+ * Smarty::getConfigVars() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetConfigVars
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * Returns a single or all config variables
+     *
+     * @api  Smarty::getConfigVars()
+     * @link https://www.smarty.net/docs/en/api.get.config.vars.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $varname        variable name or null
+     * @param bool                                                    $search_parents include parent templates?
+     *
+     * @return mixed variable value or or array of variables
+     */
+    public function getConfigVars(Smarty_Internal_Data $data, $varname = null, $search_parents = true)
+    {
+        $_ptr = $data;
+        $var_array = array();
+        while ($_ptr !== null) {
+            if (isset($varname)) {
+                if (isset($_ptr->config_vars[ $varname ])) {
+                    return $_ptr->config_vars[ $varname ];
+                }
+            } else {
+                $var_array = array_merge($_ptr->config_vars, $var_array);
+            }
+            // not found, try at parent
+            if ($search_parents) {
+                $_ptr = $_ptr->parent;
+            } else {
+                $_ptr = null;
+            }
+        }
+        if (isset($varname)) {
+            return '';
+        } else {
+            return $var_array;
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php
new file mode 100644
index 000000000..77d908c15
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getdebugtemplate.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Smarty Method GetDebugTemplate
+ *
+ * Smarty::getDebugTemplate() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetDebugTemplate
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * return name of debugging template
+     *
+     * @api Smarty::getDebugTemplate()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     *
+     * @return string
+     */
+    public function getDebugTemplate(Smarty_Internal_TemplateBase $obj)
+    {
+        $smarty = $obj->_getSmartyObj();
+        return $smarty->debug_tpl;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php
new file mode 100644
index 000000000..57da85c49
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getdefaultmodifiers.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Smarty Method GetDefaultModifiers
+ *
+ * Smarty::getDefaultModifiers() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetDefaultModifiers
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Get default modifiers
+     *
+     * @api Smarty::getDefaultModifiers()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     *
+     * @return array list of default modifiers
+     */
+    public function getDefaultModifiers(Smarty_Internal_TemplateBase $obj)
+    {
+        $smarty = $obj->_getSmartyObj();
+        return $smarty->default_modifiers;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getglobal.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getglobal.php
new file mode 100644
index 000000000..2be11d7e8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getglobal.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Smarty Method GetGlobal
+ *
+ * Smarty::getGlobal() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetGlobal
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * Returns a single or all global  variables
+     *
+     * @api Smarty::getGlobal()
+     *
+     * @param \Smarty_Internal_Data $data
+     * @param string                $varName variable name or null
+     *
+     * @return string|array variable value or or array of variables
+     */
+    public function getGlobal(Smarty_Internal_Data $data, $varName = null)
+    {
+        if (isset($varName)) {
+            if (isset(Smarty::$global_tpl_vars[ $varName ])) {
+                return Smarty::$global_tpl_vars[ $varName ]->value;
+            } else {
+                return '';
+            }
+        } else {
+            $_result = array();
+            foreach (Smarty::$global_tpl_vars as $key => $var) {
+                $_result[ $key ] = $var->value;
+            }
+            return $_result;
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php
new file mode 100644
index 000000000..0b3a071d3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getregisteredobject.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Smarty Method GetRegisteredObject
+ *
+ * Smarty::getRegisteredObject() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetRegisteredObject
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * return a reference to a registered object
+     *
+     * @api  Smarty::getRegisteredObject()
+     * @link https://www.smarty.net/docs/en/api.get.registered.object.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $object_name object name
+     *
+     * @return object
+     * @throws \SmartyException if no such object is found
+     */
+    public function getRegisteredObject(Smarty_Internal_TemplateBase $obj, $object_name)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (!isset($smarty->registered_objects[ $object_name ])) {
+            throw new SmartyException("'$object_name' is not a registered object");
+        }
+        if (!is_object($smarty->registered_objects[ $object_name ][ 0 ])) {
+            throw new SmartyException("registered '$object_name' is not an object");
+        }
+        return $smarty->registered_objects[ $object_name ][ 0 ];
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php
new file mode 100644
index 000000000..8db39c525
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_getstreamvariable.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Smarty Method GetStreamVariable
+ *
+ * Smarty::getStreamVariable() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetStreamVariable
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * gets  a stream variable
+     *
+     * @api Smarty::getStreamVariable()
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $variable the stream of the variable
+     *
+     * @return mixed
+     * @throws \SmartyException
+     */
+    public function getStreamVariable(Smarty_Internal_Data $data, $variable)
+    {
+        $_result = '';
+        $fp = fopen($variable, 'r+');
+        if ($fp) {
+            while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
+                $_result .= $current_line;
+            }
+            fclose($fp);
+            return $_result;
+        }
+        $smarty = isset($data->smarty) ? $data->smarty : $data;
+        if ($smarty->error_unassigned) {
+            throw new SmartyException('Undefined stream variable "' . $variable . '"');
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_gettags.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_gettags.php
new file mode 100644
index 000000000..0d1335a8d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_gettags.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Smarty Method GetTags
+ *
+ * Smarty::getTags() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetTags
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Return array of tag/attributes of all tags used by an template
+     *
+     * @api  Smarty::getTags()
+     * @link https://www.smarty.net/docs/en/api.get.tags.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param null|string|Smarty_Internal_Template                            $template
+     *
+     * @return array of tag/attributes
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function getTags(Smarty_Internal_TemplateBase $obj, $template = null)
+    {
+        /* @var Smarty $smarty */
+        $smarty = $obj->_getSmartyObj();
+        if ($obj->_isTplObj() && !isset($template)) {
+            $tpl = clone $obj;
+        } elseif (isset($template) && $template->_isTplObj()) {
+            $tpl = clone $template;
+        } elseif (isset($template) && is_string($template)) {
+            /* @var Smarty_Internal_Template $tpl */
+            $tpl = new $smarty->template_class($template, $smarty);
+            // checks if template exists
+            if (!$tpl->source->exists) {
+                throw new SmartyException("Unable to load template {$tpl->source->type} '{$tpl->source->name}'");
+            }
+        }
+        if (isset($tpl)) {
+            $tpl->smarty = clone $tpl->smarty;
+            $tpl->smarty->_cache[ 'get_used_tags' ] = true;
+            $tpl->_cache[ 'used_tags' ] = array();
+            $tpl->smarty->merge_compiled_includes = false;
+            $tpl->smarty->disableSecurity();
+            $tpl->caching = Smarty::CACHING_OFF;
+            $tpl->loadCompiler();
+            $tpl->compiler->compileTemplate($tpl);
+            return $tpl->_cache[ 'used_tags' ];
+        }
+        throw new SmartyException('Missing template specification');
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php
new file mode 100644
index 000000000..0470785b1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_gettemplatevars.php
@@ -0,0 +1,119 @@
+<?php
+
+/**
+ * Smarty Method GetTemplateVars
+ *
+ * Smarty::getTemplateVars() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_GetTemplateVars
+{
+    /**
+     * Valid for all objects
+     *
+     * @var int
+     */
+    public $objMap = 7;
+
+    /**
+     * Returns a single or all template variables
+     *
+     * @api  Smarty::getTemplateVars()
+     * @link https://www.smarty.net/docs/en/api.get.template.vars.tpl
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $varName       variable name or null
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
+     * @param bool                                                    $searchParents include parent templates?
+     *
+     * @return mixed variable value or or array of variables
+     */
+    public function getTemplateVars(
+        Smarty_Internal_Data $data,
+        $varName = null,
+        Smarty_Internal_Data $_ptr = null,
+        $searchParents = true
+    ) {
+        if (isset($varName)) {
+            $_var = $this->_getVariable($data, $varName, $_ptr, $searchParents, false);
+            if (is_object($_var)) {
+                return $_var->value;
+            } else {
+                return null;
+            }
+        } else {
+            $_result = array();
+            if ($_ptr === null) {
+                $_ptr = $data;
+            }
+            while ($_ptr !== null) {
+                foreach ($_ptr->tpl_vars as $key => $var) {
+                    if (!array_key_exists($key, $_result)) {
+                        $_result[ $key ] = $var->value;
+                    }
+                }
+                // not found, try at parent
+                if ($searchParents && isset($_ptr->parent)) {
+                    $_ptr = $_ptr->parent;
+                } else {
+                    $_ptr = null;
+                }
+            }
+            if ($searchParents && isset(Smarty::$global_tpl_vars)) {
+                foreach (Smarty::$global_tpl_vars as $key => $var) {
+                    if (!array_key_exists($key, $_result)) {
+                        $_result[ $key ] = $var->value;
+                    }
+                }
+            }
+            return $_result;
+        }
+    }
+
+    /**
+     * gets the object of a Smarty variable
+     *
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $data
+     * @param string                                                  $varName       the name of the Smarty variable
+     * @param \Smarty_Internal_Data|\Smarty_Internal_Template|\Smarty $_ptr          optional pointer to data object
+     * @param bool                                                    $searchParents search also in parent data
+     * @param bool                                                    $errorEnable
+     *
+     * @return \Smarty_Variable
+     */
+    public function _getVariable(
+        Smarty_Internal_Data $data,
+        $varName,
+        Smarty_Internal_Data $_ptr = null,
+        $searchParents = true,
+        $errorEnable = true
+    ) {
+        if ($_ptr === null) {
+            $_ptr = $data;
+        }
+        while ($_ptr !== null) {
+            if (isset($_ptr->tpl_vars[ $varName ])) {
+                // found it, return it
+                return $_ptr->tpl_vars[ $varName ];
+            }
+            // not found, try at parent
+            if ($searchParents && isset($_ptr->parent)) {
+                $_ptr = $_ptr->parent;
+            } else {
+                $_ptr = null;
+            }
+        }
+        if (isset(Smarty::$global_tpl_vars[ $varName ])) {
+            // found it, return it
+            return Smarty::$global_tpl_vars[ $varName ];
+        }
+        if ($errorEnable && $data->_getSmartyObj()->error_unassigned) {
+            // force a notice
+            $x = $$varName;
+        }
+        return new Smarty_Undefined_Variable;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_literals.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_literals.php
new file mode 100644
index 000000000..bfa3f58ec
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_literals.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Smarty Method GetLiterals
+ *
+ * Smarty::getLiterals() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_Literals
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Get literals
+     *
+     * @api Smarty::getLiterals()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     *
+     * @return array list of literals
+     */
+    public function getLiterals(Smarty_Internal_TemplateBase $obj)
+    {
+        $smarty = $obj->_getSmartyObj();
+        return (array)$smarty->literals;
+    }
+
+    /**
+     * Add literals
+     *
+     * @api Smarty::addLiterals()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param array|string                                                    $literals literal or list of literals
+     *                                                                                  to addto add
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function addLiterals(Smarty_Internal_TemplateBase $obj, $literals = null)
+    {
+        if (isset($literals)) {
+            $this->set($obj->_getSmartyObj(), (array)$literals);
+        }
+        return $obj;
+    }
+
+    /**
+     * Set literals
+     *
+     * @api Smarty::setLiterals()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param array|string                                                    $literals literal or list of literals
+     *                                                                                  to setto set
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function setLiterals(Smarty_Internal_TemplateBase $obj, $literals = null)
+    {
+        $smarty = $obj->_getSmartyObj();
+        $smarty->literals = array();
+        if (!empty($literals)) {
+            $this->set($smarty, (array)$literals);
+        }
+        return $obj;
+    }
+
+    /**
+     * common setter for literals for easier handling of duplicates the
+     * Smarty::$literals array gets filled with identical key values
+     *
+     * @param \Smarty $smarty
+     * @param array   $literals
+     *
+     * @throws \SmartyException
+     */
+    private function set(Smarty $smarty, $literals)
+    {
+        $literals = array_combine($literals, $literals);
+        $error = isset($literals[ $smarty->left_delimiter ]) ? array($smarty->left_delimiter) : array();
+        $error = isset($literals[ $smarty->right_delimiter ]) ? $error[] = $smarty->right_delimiter : $error;
+        if (!empty($error)) {
+            throw new SmartyException(
+                'User defined literal(s) "' . $error .
+                '" may not be identical with left or right delimiter'
+            );
+        }
+        $smarty->literals = array_merge((array)$smarty->literals, (array)$literals);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php
new file mode 100644
index 000000000..af788a24e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_loadfilter.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Smarty Method LoadFilter
+ *
+ * Smarty::loadFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_LoadFilter
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Valid filter types
+     *
+     * @var array
+     */
+    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+
+    /**
+     * load a filter of specified type and name
+     *
+     * @api  Smarty::loadFilter()
+     *
+     * @link https://www.smarty.net/docs/en/api.load.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type filter type
+     * @param string                                                          $name filter name
+     *
+     * @return bool
+     * @throws SmartyException if filter could not be loaded
+     */
+    public function loadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
+    {
+        $smarty = $obj->_getSmartyObj();
+        $this->_checkFilterType($type);
+        $_plugin = "smarty_{$type}filter_{$name}";
+        $_filter_name = $_plugin;
+        if (is_callable($_plugin)) {
+            $smarty->registered_filters[ $type ][ $_filter_name ] = $_plugin;
+            return true;
+        }
+        if ($smarty->loadPlugin($_plugin)) {
+            if (class_exists($_plugin, false)) {
+                $_plugin = array($_plugin, 'execute');
+            }
+            if (is_callable($_plugin)) {
+                $smarty->registered_filters[ $type ][ $_filter_name ] = $_plugin;
+                return true;
+            }
+        }
+        throw new SmartyException("{$type}filter '{$name}' not found or callable");
+    }
+
+    /**
+     * Check if filter type is valid
+     *
+     * @param string $type
+     *
+     * @throws \SmartyException
+     */
+    public function _checkFilterType($type)
+    {
+        if (!isset($this->filterTypes[ $type ])) {
+            throw new SmartyException("Illegal filter type '{$type}'");
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php
new file mode 100644
index 000000000..6ddcaec94
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_loadplugin.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Smarty Extension Loadplugin
+ *
+ * $smarty->loadPlugin() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_LoadPlugin
+{
+    /**
+     * Cache of searched plugin files
+     *
+     * @var array
+     */
+    public $plugin_files = array();
+
+    /**
+     * Takes unknown classes and loads plugin files for them
+     * class name format: Smarty_PluginType_PluginName
+     * plugin filename format: plugintype.pluginname.php
+     *
+     * @param \Smarty $smarty
+     * @param string  $plugin_name class plugin name to load
+     * @param bool    $check       check if already loaded
+     *
+     * @return bool|string
+     * @throws \SmartyException
+     */
+    public function loadPlugin(Smarty $smarty, $plugin_name, $check)
+    {
+        // if function or class exists, exit silently (already loaded)
+        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false))) {
+            return true;
+        }
+        if (!preg_match('#^smarty_((internal)|([^_]+))_(.+)$#i', $plugin_name, $match)) {
+            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
+        }
+        if (!empty($match[ 2 ])) {
+            $file = SMARTY_SYSPLUGINS_DIR . smarty_strtolower_ascii($plugin_name) . '.php';
+            if (isset($this->plugin_files[ $file ])) {
+                if ($this->plugin_files[ $file ] !== false) {
+                    return $this->plugin_files[ $file ];
+                } else {
+                    return false;
+                }
+            } else {
+                if (is_file($file)) {
+                    $this->plugin_files[ $file ] = $file;
+                    include_once $file;
+                    return $file;
+                } else {
+                    $this->plugin_files[ $file ] = false;
+                    return false;
+                }
+            }
+        }
+        // plugin filename is expected to be: [type].[name].php
+        $_plugin_filename = "{$match[1]}.{$match[4]}.php";
+        $_lower_filename = smarty_strtolower_ascii($_plugin_filename);
+        if (isset($this->plugin_files)) {
+            if (isset($this->plugin_files[ 'plugins_dir' ][ $_lower_filename ])) {
+                if (!$smarty->use_include_path || $this->plugin_files[ 'plugins_dir' ][ $_lower_filename ] !== false) {
+                    return $this->plugin_files[ 'plugins_dir' ][ $_lower_filename ];
+                }
+            }
+            if (!$smarty->use_include_path || $smarty->ext->_getIncludePath->isNewIncludePath($smarty)) {
+                unset($this->plugin_files[ 'include_path' ]);
+            } else {
+                if (isset($this->plugin_files[ 'include_path' ][ $_lower_filename ])) {
+                    return $this->plugin_files[ 'include_path' ][ $_lower_filename ];
+                }
+            }
+        }
+        $_file_names = array($_plugin_filename);
+        if ($_lower_filename !== $_plugin_filename) {
+            $_file_names[] = $_lower_filename;
+        }
+        $_p_dirs = $smarty->getPluginsDir();
+        if (!isset($this->plugin_files[ 'plugins_dir' ][ $_lower_filename ])) {
+            // loop through plugin dirs and find the plugin
+            foreach ($_p_dirs as $_plugin_dir) {
+                foreach ($_file_names as $name) {
+                    $file = $_plugin_dir . $name;
+                    if (is_file($file)) {
+                        $this->plugin_files[ 'plugins_dir' ][ $_lower_filename ] = $file;
+                        include_once $file;
+                        return $file;
+                    }
+                    $this->plugin_files[ 'plugins_dir' ][ $_lower_filename ] = false;
+                }
+            }
+        }
+        if ($smarty->use_include_path) {
+            foreach ($_file_names as $_file_name) {
+                // try PHP include_path
+                $file = $smarty->ext->_getIncludePath->getIncludePath($_p_dirs, $_file_name, $smarty);
+                $this->plugin_files[ 'include_path' ][ $_lower_filename ] = $file;
+                if ($file !== false) {
+                    include_once $file;
+                    return $file;
+                }
+            }
+        }
+        // no plugin loaded
+        return false;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php
new file mode 100644
index 000000000..381346c8f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_mustcompile.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Smarty Method MustCompile
+ *
+ * Smarty_Internal_Template::mustCompile() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_MustCompile
+{
+    /**
+     * Valid for template object
+     *
+     * @var int
+     */
+    public $objMap = 2;
+
+    /**
+     * Returns if the current template must be compiled by the Smarty compiler
+     * It does compare the timestamps of template source and the compiled templates and checks the force compile
+     * configuration
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @return bool
+     * @throws \SmartyException
+     */
+    public function mustCompile(Smarty_Internal_Template $_template)
+    {
+        if (!$_template->source->exists) {
+            if ($_template->_isSubTpl()) {
+                $parent_resource = " in '{$_template->parent->template_resource}'";
+            } else {
+                $parent_resource = '';
+            }
+            throw new SmartyException("Unable to load template {$_template->source->type} '{$_template->source->name}'{$parent_resource}");
+        }
+        if ($_template->mustCompile === null) {
+            $_template->mustCompile = (!$_template->source->handler->uncompiled &&
+                                       ($_template->smarty->force_compile || $_template->source->handler->recompiled ||
+                                        !$_template->compiled->exists || ($_template->compile_check &&
+                                                                          $_template->compiled->getTimeStamp() <
+                                                                          $_template->source->getTimeStamp())));
+        }
+        return $_template->mustCompile;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php
new file mode 100644
index 000000000..5608b3fd0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registercacheresource.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method RegisterCacheResource
+ *
+ * Smarty::registerCacheResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterCacheResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::registerCacheResource()
+     * @link https://www.smarty.net/docs/en/api.register.cacheresource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $name name of resource type
+     * @param \Smarty_CacheResource                                           $resource_handler
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function registerCacheResource(
+        Smarty_Internal_TemplateBase $obj,
+        $name,
+        Smarty_CacheResource $resource_handler
+    ) {
+        $smarty = $obj->_getSmartyObj();
+        $smarty->registered_cache_resources[ $name ] = $resource_handler;
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerclass.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerclass.php
new file mode 100644
index 000000000..76a69c6e5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerclass.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Smarty Method RegisterClass
+ *
+ * Smarty::registerClass() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterClass
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers static classes to be used in templates
+     *
+     * @api  Smarty::registerClass()
+     * @link https://www.smarty.net/docs/en/api.register.class.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $class_name
+     * @param string                                                          $class_impl the referenced PHP class to
+     *                                                                                    register
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerClass(Smarty_Internal_TemplateBase $obj, $class_name, $class_impl)
+    {
+        $smarty = $obj->_getSmartyObj();
+        // test if exists
+        if (!class_exists($class_impl)) {
+            throw new SmartyException("Undefined class '$class_impl' in register template class");
+        }
+        // register the class
+        $smarty->registered_classes[ $class_name ] = $class_impl;
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
new file mode 100644
index 000000000..b340f178d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaultconfighandler.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Smarty Method RegisterDefaultConfigHandler
+ *
+ * Smarty::registerDefaultConfigHandler() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterDefaultConfigHandler
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Register config default handler
+     *
+     * @api Smarty::registerDefaultConfigHandler()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param callable                                                        $callback class/method name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              if $callback is not callable
+     */
+    public function registerDefaultConfigHandler(Smarty_Internal_TemplateBase $obj, $callback)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (is_callable($callback)) {
+            $smarty->default_config_handler_func = $callback;
+        } else {
+            throw new SmartyException('Default config handler not callable');
+        }
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
new file mode 100644
index 000000000..4cda5b056
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaultpluginhandler.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method RegisterDefaultPluginHandler
+ *
+ * Smarty::registerDefaultPluginHandler() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterDefaultPluginHandler
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a default plugin handler
+     *
+     * @api  Smarty::registerDefaultPluginHandler()
+     * @link https://www.smarty.net/docs/en/api.register.default.plugin.handler.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param callable                                                        $callback class/method name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              if $callback is not callable
+     */
+    public function registerDefaultPluginHandler(Smarty_Internal_TemplateBase $obj, $callback)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (is_callable($callback)) {
+            $smarty->default_plugin_handler_func = $callback;
+        } else {
+            throw new SmartyException("Default plugin handler '$callback' not callable");
+        }
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
new file mode 100644
index 000000000..cbc133ccd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerdefaulttemplatehandler.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * Smarty Method RegisterDefaultTemplateHandler
+ *
+ * Smarty::registerDefaultTemplateHandler() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterDefaultTemplateHandler
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Register template default handler
+     *
+     * @api Smarty::registerDefaultTemplateHandler()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param callable                                                        $callback class/method name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              if $callback is not callable
+     */
+    public function registerDefaultTemplateHandler(Smarty_Internal_TemplateBase $obj, $callback)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (is_callable($callback)) {
+            $smarty->default_template_handler_func = $callback;
+        } else {
+            throw new SmartyException('Default template handler not callable');
+        }
+        return $obj;
+    }
+
+    /**
+     * get default content from template or config resource handler
+     *
+     * @param Smarty_Template_Source $source
+     *
+     * @throws \SmartyException
+     */
+    public static function _getDefaultTemplate(Smarty_Template_Source $source)
+    {
+        if ($source->isConfig) {
+            $default_handler = $source->smarty->default_config_handler_func;
+        } else {
+            $default_handler = $source->smarty->default_template_handler_func;
+        }
+        $_content = $_timestamp = null;
+        $_return = call_user_func_array(
+            $default_handler,
+            array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty)
+        );
+        if (is_string($_return)) {
+            $source->exists = is_file($_return);
+            if ($source->exists) {
+                $source->timestamp = filemtime($_return);
+            } else {
+                throw new SmartyException(
+                    'Default handler: Unable to load ' .
+                    ($source->isConfig ? 'config' : 'template') .
+                    " default file '{$_return}' for '{$source->type}:{$source->name}'"
+                );
+            }
+            $source->name = $source->filepath = $_return;
+            $source->uid = sha1($source->filepath);
+        } elseif ($_return === true) {
+            $source->content = $_content;
+            $source->exists = true;
+            $source->uid = $source->name = sha1($_content);
+            $source->handler = Smarty_Resource::load($source->smarty, 'eval');
+        } else {
+            $source->exists = false;
+            throw new SmartyException(
+                'Default handler: No ' . ($source->isConfig ? 'config' : 'template') .
+                " default content for '{$source->type}:{$source->name}'"
+            );
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php
new file mode 100644
index 000000000..9719eb2b6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerfilter.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Smarty Method RegisterFilter
+ *
+ * Smarty::registerFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterFilter
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Valid filter types
+     *
+     * @var array
+     */
+    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+
+    /**
+     * Registers a filter function
+     *
+     * @api  Smarty::registerFilter()
+     *
+     * @link https://www.smarty.net/docs/en/api.register.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type filter type
+     * @param callback                                                        $callback
+     * @param string|null                                                     $name optional filter name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerFilter(Smarty_Internal_TemplateBase $obj, $type, $callback, $name = null)
+    {
+        $smarty = $obj->_getSmartyObj();
+        $this->_checkFilterType($type);
+        $name = isset($name) ? $name : $this->_getFilterName($callback);
+        if (!is_callable($callback)) {
+            throw new SmartyException("{$type}filter '{$name}' not callable");
+        }
+        $smarty->registered_filters[ $type ][ $name ] = $callback;
+        return $obj;
+    }
+
+    /**
+     * Return internal filter name
+     *
+     * @param callback $function_name
+     *
+     * @return string   internal filter name
+     */
+    public function _getFilterName($function_name)
+    {
+        if (is_array($function_name)) {
+            $_class_name = (is_object($function_name[ 0 ]) ? get_class($function_name[ 0 ]) : $function_name[ 0 ]);
+            return $_class_name . '_' . $function_name[ 1 ];
+        } elseif (is_string($function_name)) {
+            return $function_name;
+        } else {
+            return 'closure';
+        }
+    }
+
+    /**
+     * Check if filter type is valid
+     *
+     * @param string $type
+     *
+     * @throws \SmartyException
+     */
+    public function _checkFilterType($type)
+    {
+        if (!isset($this->filterTypes[ $type ])) {
+            throw new SmartyException("Illegal filter type '{$type}'");
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerobject.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerobject.php
new file mode 100644
index 000000000..8e6fe0521
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerobject.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * Smarty Method RegisterObject
+ *
+ * Smarty::registerObject() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterObject
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers object to be used in templates
+     *
+     * @api  Smarty::registerObject()
+     * @link https://www.smarty.net/docs/en/api.register.object.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $object_name
+     * @param object                                                          $object                     the
+     *                                                                                                    referenced
+     *                                                                                                    PHP
+     *                                                                                                    object
+     *                                                                                                    to
+     *                                                                                                    register
+     *
+     * @param array                                                           $allowed_methods_properties list of
+     *                                                                                                    allowed
+     *                                                                                                    methods
+     *                                                                                                    (empty
+     *                                                                                                    = all)
+     *
+     * @param bool                                                            $format                     smarty
+     *                                                                                                    argument
+     *                                                                                                    format,
+     *                                                                                                    else
+     *                                                                                                    traditional
+     *
+     * @param array                                                           $block_methods              list of
+     *                                                                                                    block-methods
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerObject(
+        Smarty_Internal_TemplateBase $obj,
+        $object_name,
+        $object,
+        $allowed_methods_properties = array(),
+        $format = true,
+        $block_methods = array()
+    ) {
+        $smarty = $obj->_getSmartyObj();
+        // test if allowed methods callable
+        if (!empty($allowed_methods_properties)) {
+            foreach ((array)$allowed_methods_properties as $method) {
+                if (!is_callable(array($object, $method)) && !property_exists($object, $method)) {
+                    throw new SmartyException("Undefined method or property '$method' in registered object");
+                }
+            }
+        }
+        // test if block methods callable
+        if (!empty($block_methods)) {
+            foreach ((array)$block_methods as $method) {
+                if (!is_callable(array($object, $method))) {
+                    throw new SmartyException("Undefined method '$method' in registered object");
+                }
+            }
+        }
+        // register the object
+        $smarty->registered_objects[ $object_name ] =
+            array($object, (array)$allowed_methods_properties, (boolean)$format, (array)$block_methods);
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php
new file mode 100644
index 000000000..74c0ae908
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerplugin.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Smarty Method RegisterPlugin
+ *
+ * Smarty::registerPlugin() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterPlugin
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::registerPlugin()
+     * @link https://www.smarty.net/docs/en/api.register.plugin.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type       plugin type
+     * @param string                                                          $name       name of template tag
+     * @param callback                                                        $callback   PHP callback to register
+     * @param bool                                                            $cacheable  if true (default) this
+     *                                                                                    function is cache able
+     * @param mixed                                                           $cache_attr caching attributes if any
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException              when the plugin tag is invalid
+     */
+    public function registerPlugin(
+        Smarty_Internal_TemplateBase $obj,
+        $type,
+        $name,
+        $callback,
+        $cacheable = true,
+        $cache_attr = null
+    ) {
+        $smarty = $obj->_getSmartyObj();
+        if (isset($smarty->registered_plugins[ $type ][ $name ])) {
+            throw new SmartyException("Plugin tag '{$name}' already registered");
+        } elseif (!is_callable($callback)) {
+            throw new SmartyException("Plugin '{$name}' not callable");
+        } elseif ($cacheable && $cache_attr) {
+            throw new SmartyException("Cannot set caching attributes for plugin '{$name}' when it is cacheable.");
+        } else {
+            $smarty->registered_plugins[ $type ][ $name ] = array($callback, (bool)$cacheable, (array)$cache_attr);
+        }
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerresource.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerresource.php
new file mode 100644
index 000000000..302657ae0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_registerresource.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Smarty Method RegisterResource
+ *
+ * Smarty::registerResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_RegisterResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::registerResource()
+     * @link https://www.smarty.net/docs/en/api.register.resource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $name             name of resource type
+     * @param Smarty_Resource                                           $resource_handler instance of Smarty_Resource
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function registerResource(Smarty_Internal_TemplateBase $obj, $name, Smarty_Resource $resource_handler)
+    {
+        $smarty = $obj->_getSmartyObj();
+        $smarty->registered_resources[ $name ] = $resource_handler;
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php
new file mode 100644
index 000000000..2972f3ce1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_setautoloadfilters.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Smarty Method SetAutoloadFilters
+ *
+ * Smarty::setAutoloadFilters() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_SetAutoloadFilters
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Valid filter types
+     *
+     * @var array
+     */
+    private $filterTypes = array('pre' => true, 'post' => true, 'output' => true, 'variable' => true);
+
+    /**
+     * Set autoload filters
+     *
+     * @api Smarty::setAutoloadFilters()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param array                                                           $filters filters to load automatically
+     * @param string                                                          $type    "pre", "output", … specify
+     *                                                                                 the filter type to set.
+     *                                                                                 Defaults to none treating
+     *                                                                                 $filters' keys as the
+     *                                                                                 appropriate types
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function setAutoloadFilters(Smarty_Internal_TemplateBase $obj, $filters, $type = null)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if ($type !== null) {
+            $this->_checkFilterType($type);
+            $smarty->autoload_filters[ $type ] = (array)$filters;
+        } else {
+            foreach ((array)$filters as $type => $value) {
+                $this->_checkFilterType($type);
+            }
+            $smarty->autoload_filters = (array)$filters;
+        }
+        return $obj;
+    }
+
+    /**
+     * Check if filter type is valid
+     *
+     * @param string $type
+     *
+     * @throws \SmartyException
+     */
+    public function _checkFilterType($type)
+    {
+        if (!isset($this->filterTypes[ $type ])) {
+            throw new SmartyException("Illegal filter type '{$type}'");
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php
new file mode 100644
index 000000000..cc9d23e2a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_setdebugtemplate.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method SetDebugTemplate
+ *
+ * Smarty::setDebugTemplate() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_SetDebugTemplate
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * set the debug template
+     *
+     * @api Smarty::setDebugTemplate()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $tpl_name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws SmartyException if file is not readable
+     */
+    public function setDebugTemplate(Smarty_Internal_TemplateBase $obj, $tpl_name)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (!is_readable($tpl_name)) {
+            throw new SmartyException("Unknown file '{$tpl_name}'");
+        }
+        $smarty->debug_tpl = $tpl_name;
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php
new file mode 100644
index 000000000..eadc2de1b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_setdefaultmodifiers.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Smarty Method SetDefaultModifiers
+ *
+ * Smarty::setDefaultModifiers() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_SetDefaultModifiers
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Set default modifiers
+     *
+     * @api Smarty::setDefaultModifiers()
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param array|string                                                    $modifiers modifier or list of modifiers
+     *                                                                                   to set
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function setDefaultModifiers(Smarty_Internal_TemplateBase $obj, $modifiers)
+    {
+        $smarty = $obj->_getSmartyObj();
+        $smarty->default_modifiers = (array)$modifiers;
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php
new file mode 100644
index 000000000..e41e8dffc
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unloadfilter.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method UnloadFilter
+ *
+ * Smarty::unloadFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnloadFilter extends Smarty_Internal_Method_LoadFilter
+{
+    /**
+     * load a filter of specified type and name
+     *
+     * @api  Smarty::unloadFilter()
+     *
+     * @link https://www.smarty.net/docs/en/api.unload.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type filter type
+     * @param string                                                          $name filter name
+     *
+     * @return Smarty_Internal_TemplateBase
+     * @throws \SmartyException
+     */
+    public function unloadFilter(Smarty_Internal_TemplateBase $obj, $type, $name)
+    {
+        $smarty = $obj->_getSmartyObj();
+        $this->_checkFilterType($type);
+        if (isset($smarty->registered_filters[ $type ])) {
+            $_filter_name = "smarty_{$type}filter_{$name}";
+            if (isset($smarty->registered_filters[ $type ][ $_filter_name ])) {
+                unset($smarty->registered_filters[ $type ][ $_filter_name ]);
+                if (empty($smarty->registered_filters[ $type ])) {
+                    unset($smarty->registered_filters[ $type ]);
+                }
+            }
+        }
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php
new file mode 100644
index 000000000..377397e97
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregistercacheresource.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method UnregisterCacheResource
+ *
+ * Smarty::unregisterCacheResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterCacheResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::unregisterCacheResource()
+     * @link https://www.smarty.net/docs/en/api.unregister.cacheresource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param                                                                 $name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterCacheResource(Smarty_Internal_TemplateBase $obj, $name)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (isset($smarty->registered_cache_resources[ $name ])) {
+            unset($smarty->registered_cache_resources[ $name ]);
+        }
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php
new file mode 100644
index 000000000..ebc9337d0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterfilter.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Smarty Method UnregisterFilter
+ *
+ * Smarty::unregisterFilter() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterFilter extends Smarty_Internal_Method_RegisterFilter
+{
+    /**
+     * Unregisters a filter function
+     *
+     * @api  Smarty::unregisterFilter()
+     *
+     * @link https://www.smarty.net/docs/en/api.unregister.filter.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type filter type
+     * @param callback|string                                                 $callback
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function unregisterFilter(Smarty_Internal_TemplateBase $obj, $type, $callback)
+    {
+        $smarty = $obj->_getSmartyObj();
+        $this->_checkFilterType($type);
+        if (isset($smarty->registered_filters[ $type ])) {
+            $name = is_string($callback) ? $callback : $this->_getFilterName($callback);
+            if (isset($smarty->registered_filters[ $type ][ $name ])) {
+                unset($smarty->registered_filters[ $type ][ $name ]);
+                if (empty($smarty->registered_filters[ $type ])) {
+                    unset($smarty->registered_filters[ $type ]);
+                }
+            }
+        }
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php
new file mode 100644
index 000000000..77d619637
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterobject.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method UnregisterObject
+ *
+ * Smarty::unregisterObject() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterObject
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::unregisterObject()
+     * @link https://www.smarty.net/docs/en/api.unregister.object.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $object_name name of object
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterObject(Smarty_Internal_TemplateBase $obj, $object_name)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (isset($smarty->registered_objects[ $object_name ])) {
+            unset($smarty->registered_objects[ $object_name ]);
+        }
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php
new file mode 100644
index 000000000..2431d5c23
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterplugin.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Smarty Method UnregisterPlugin
+ *
+ * Smarty::unregisterPlugin() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterPlugin
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::unregisterPlugin()
+     * @link https://www.smarty.net/docs/en/api.unregister.plugin.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type plugin type
+     * @param string                                                          $name name of template tag
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterPlugin(Smarty_Internal_TemplateBase $obj, $type, $name)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (isset($smarty->registered_plugins[ $type ][ $name ])) {
+            unset($smarty->registered_plugins[ $type ][ $name ]);
+        }
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php
new file mode 100644
index 000000000..bbb6a861d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_method_unregisterresource.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Smarty Method UnregisterResource
+ *
+ * Smarty::unregisterResource() method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Method_UnregisterResource
+{
+    /**
+     * Valid for Smarty and template object
+     *
+     * @var int
+     */
+    public $objMap = 3;
+
+    /**
+     * Registers a resource to fetch a template
+     *
+     * @api  Smarty::unregisterResource()
+     * @link https://www.smarty.net/docs/en/api.unregister.resource.tpl
+     *
+     * @param \Smarty_Internal_TemplateBase|\Smarty_Internal_Template|\Smarty $obj
+     * @param string                                                          $type name of resource type
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     */
+    public function unregisterResource(Smarty_Internal_TemplateBase $obj, $type)
+    {
+        $smarty = $obj->_getSmartyObj();
+        if (isset($smarty->registered_resources[ $type ])) {
+            unset($smarty->registered_resources[ $type ]);
+        }
+        return $obj;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_nocache_insert.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_nocache_insert.php
new file mode 100644
index 000000000..88694dcfd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_nocache_insert.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Smarty Internal Plugin Nocache Insert
+ * Compiles the {insert} tag into the cache file
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Insert Class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_Nocache_Insert
+{
+    /**
+     * Compiles code for the {insert} tag into cache file
+     *
+     * @param string                   $_function insert function name
+     * @param array                    $_attr     array with parameter
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $_script   script name to load or 'null'
+     * @param string                   $_assign   optional variable name
+     *
+     * @return string                   compiled code
+     */
+    public static function compile($_function, $_attr, $_template, $_script, $_assign = null)
+    {
+        $_output = '<?php ';
+        if ($_script !== 'null') {
+            // script which must be included
+            // code for script file loading
+            $_output .= "require_once '{$_script}';";
+        }
+        // call insert
+        if (isset($_assign)) {
+            $_output .= "\$_smarty_tpl->assign('{$_assign}' , {$_function} (" . var_export($_attr, true) .
+                        ',\$_smarty_tpl), true);?>';
+        } else {
+            $_output .= "echo {$_function}(" . var_export($_attr, true) . ',$_smarty_tpl);?>';
+        }
+        $_tpl = $_template;
+        while ($_tpl->_isSubTpl()) {
+            $_tpl = $_tpl->parent;
+        }
+        return "/*%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/{$_output}/*/%%SmartyNocache:{$_tpl->compiled->nocache_hash}%%*/";
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree.php
new file mode 100644
index 000000000..9f7678526
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parsetree
+ * These are classes to build parsetree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+abstract class Smarty_Internal_ParseTree
+{
+    /**
+     * Buffer content
+     *
+     * @var mixed
+     */
+    public $data;
+
+    /**
+     * Subtree array
+     *
+     * @var array
+     */
+    public $subtrees = array();
+
+    /**
+     * Return buffer
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string buffer content
+     */
+    abstract public function to_smarty_php(Smarty_Internal_Templateparser $parser);
+
+    /**
+     * Template data object destructor
+     */
+    public function __destruct()
+    {
+        $this->data = null;
+        $this->subtrees = null;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_code.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_code.php
new file mode 100644
index 000000000..7bd0bc45c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_code.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse trees in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Code fragment inside a tag .
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Code extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create parse tree buffer for code fragment
+     *
+     * @param string $data content
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return buffer content in parentheses
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string content
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return sprintf('(%s)', $this->data);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php
new file mode 100644
index 000000000..8655f5869
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_dq.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Double quoted string inside a tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+
+/**
+ * Double quoted string inside a tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Dq extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create parse tree buffer for double quoted string subtrees
+     *
+     * @param object                    $parser  parser object
+     * @param Smarty_Internal_ParseTree $subtree parse tree buffer
+     */
+    public function __construct($parser, Smarty_Internal_ParseTree $subtree)
+    {
+        $this->subtrees[] = $subtree;
+        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+            $parser->block_nesting_level = count($parser->compiler->_tag_stack);
+        }
+    }
+
+    /**
+     * Append buffer to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param Smarty_Internal_ParseTree       $subtree parse tree buffer
+     */
+    public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree)
+    {
+        $last_subtree = count($this->subtrees) - 1;
+        if ($last_subtree >= 0 && $this->subtrees[ $last_subtree ] instanceof Smarty_Internal_ParseTree_Tag
+            && $this->subtrees[ $last_subtree ]->saved_block_nesting < $parser->block_nesting_level
+        ) {
+            if ($subtree instanceof Smarty_Internal_ParseTree_Code) {
+                $this->subtrees[ $last_subtree ]->data =
+                    $parser->compiler->appendCode(
+                        $this->subtrees[ $last_subtree ]->data,
+                        '<?php echo ' . $subtree->data . ';?>'
+                    );
+            } elseif ($subtree instanceof Smarty_Internal_ParseTree_DqContent) {
+                $this->subtrees[ $last_subtree ]->data =
+                    $parser->compiler->appendCode(
+                        $this->subtrees[ $last_subtree ]->data,
+                        '<?php echo "' . $subtree->data . '";?>'
+                    );
+            } else {
+                $this->subtrees[ $last_subtree ]->data =
+                    $parser->compiler->appendCode($this->subtrees[ $last_subtree ]->data, $subtree->data);
+            }
+        } else {
+            $this->subtrees[] = $subtree;
+        }
+        if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+            $parser->block_nesting_level = count($parser->compiler->_tag_stack);
+        }
+    }
+
+    /**
+     * Merge subtree buffer content together
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string compiled template code
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        $code = '';
+        foreach ($this->subtrees as $subtree) {
+            if ($code !== '') {
+                $code .= '.';
+            }
+            if ($subtree instanceof Smarty_Internal_ParseTree_Tag) {
+                $more_php = $subtree->assign_to_var($parser);
+            } else {
+                $more_php = $subtree->to_smarty_php($parser);
+            }
+            $code .= $more_php;
+            if (!$subtree instanceof Smarty_Internal_ParseTree_DqContent) {
+                $parser->compiler->has_variable_string = true;
+            }
+        }
+        return $code;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php
new file mode 100644
index 000000000..a8ca389d9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_dqcontent.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree  in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Raw chars as part of a double quoted string.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_DqContent extends Smarty_Internal_ParseTree
+{
+    /**
+     * Create parse tree buffer with string content
+     *
+     * @param string $data string section
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return content as double quoted string
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string doubled quoted string
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return '"' . $this->data . '"';
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php
new file mode 100644
index 000000000..e6c755604
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_tag.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * A complete smarty tag.
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Tag extends Smarty_Internal_ParseTree
+{
+    /**
+     * Saved block nesting level
+     *
+     * @var int
+     */
+    public $saved_block_nesting;
+
+    /**
+     * Create parse tree buffer for Smarty tag
+     *
+     * @param \Smarty_Internal_Templateparser $parser parser object
+     * @param string                          $data   content
+     */
+    public function __construct(Smarty_Internal_Templateparser $parser, $data)
+    {
+        $this->data = $data;
+        $this->saved_block_nesting = $parser->block_nesting_level;
+    }
+
+    /**
+     * Return buffer content
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string content
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return $this->data;
+    }
+
+    /**
+     * Return complied code that loads the evaluated output of buffer content into a temporary variable
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string template code
+     */
+    public function assign_to_var(Smarty_Internal_Templateparser $parser)
+    {
+        $var = $parser->compiler->getNewPrefixVariable();
+        $tmp = $parser->compiler->appendCode('<?php ob_start();?>', $this->data);
+        $tmp = $parser->compiler->appendCode($tmp, "<?php {$var}=ob_get_clean();?>");
+        $parser->compiler->prefix_code[] = sprintf('%s', $tmp);
+        return $var;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_template.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_template.php
new file mode 100644
index 000000000..829c420fe
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_template.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Template element
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Template extends Smarty_Internal_ParseTree
+{
+    /**
+     * Array of template elements
+     *
+     * @var array
+     */
+    public $subtrees = array();
+
+    /**
+     * Create root of parse tree for template elements
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Append buffer to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param Smarty_Internal_ParseTree       $subtree
+     */
+    public function append_subtree(Smarty_Internal_Templateparser $parser, Smarty_Internal_ParseTree $subtree)
+    {
+        if (!empty($subtree->subtrees)) {
+            $this->subtrees = array_merge($this->subtrees, $subtree->subtrees);
+        } else {
+            if ($subtree->data !== '') {
+                $this->subtrees[] = $subtree;
+            }
+        }
+    }
+
+    /**
+     * Append array to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty_Internal_ParseTree[]    $array
+     */
+    public function append_array(Smarty_Internal_Templateparser $parser, $array = array())
+    {
+        if (!empty($array)) {
+            $this->subtrees = array_merge($this->subtrees, (array)$array);
+        }
+    }
+
+    /**
+     * Prepend array to subtree
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     * @param \Smarty_Internal_ParseTree[]    $array
+     */
+    public function prepend_array(Smarty_Internal_Templateparser $parser, $array = array())
+    {
+        if (!empty($array)) {
+            $this->subtrees = array_merge((array)$array, $this->subtrees);
+        }
+    }
+
+    /**
+     * Sanitize and merge subtree buffers together
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string template code content
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        $code = '';
+
+        foreach ($this->getChunkedSubtrees() as $chunk) {
+            $text = '';
+            switch ($chunk['mode']) {
+                case 'textstripped':
+                    foreach ($chunk['subtrees'] as $subtree) {
+                        $text .= $subtree->to_smarty_php($parser);
+                    }
+                    $code .= preg_replace(
+                        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
+                        "<?php echo '\$1'; ?>\n",
+                        $parser->compiler->processText($text)
+                    );
+                    break;
+                case 'text':
+                    foreach ($chunk['subtrees'] as $subtree) {
+                        $text .= $subtree->to_smarty_php($parser);
+                    }
+                    $code .= preg_replace(
+                        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
+                        "<?php echo '\$1'; ?>\n",
+                        $text
+                    );
+                    break;
+                case 'tag':
+                    foreach ($chunk['subtrees'] as $subtree) {
+                        $text = $parser->compiler->appendCode($text, $subtree->to_smarty_php($parser));
+                    }
+                    $code .= $text;
+                    break;
+                default:
+                    foreach ($chunk['subtrees'] as $subtree) {
+                        $text = $subtree->to_smarty_php($parser);
+                    }
+                    $code .= $text;
+
+            }
+        }
+        return $code;
+    }
+
+    private function getChunkedSubtrees() {
+        $chunks = array();
+        $currentMode = null;
+        $currentChunk = array();
+        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
+
+            if ($this->subtrees[ $key ]->data === '' && in_array($currentMode, array('textstripped', 'text', 'tag'))) {
+                continue;
+            }
+
+            if ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text
+                && $this->subtrees[ $key ]->isToBeStripped()) {
+                $newMode = 'textstripped';
+            } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Text) {
+                $newMode = 'text';
+            } elseif ($this->subtrees[ $key ] instanceof Smarty_Internal_ParseTree_Tag) {
+                $newMode = 'tag';
+            } else {
+                $newMode = 'other';
+            }
+
+            if ($newMode == $currentMode) {
+                $currentChunk[] = $this->subtrees[ $key ];
+            } else {
+                $chunks[] = array(
+                    'mode' => $currentMode,
+                    'subtrees' => $currentChunk
+                );
+                $currentMode = $newMode;
+                $currentChunk = array($this->subtrees[ $key ]);
+            }
+        }
+        if ($currentMode && $currentChunk) {
+            $chunks[] = array(
+                'mode' => $currentMode,
+                'subtrees' => $currentChunk
+            );
+        }
+        return $chunks;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_text.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_text.php
new file mode 100644
index 000000000..58116c811
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_parsetree_text.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ *             *
+ *             template text
+ * @package    Smarty
+ * @subpackage Compiler
+ * @ignore
+ */
+class Smarty_Internal_ParseTree_Text extends Smarty_Internal_ParseTree
+{
+
+    /**
+     * Wether this section should be stripped on output to smarty php
+     * @var bool
+     */
+    private $toBeStripped = false;
+
+    /**
+     * Create template text buffer
+     *
+     * @param string $data text
+     * @param bool $toBeStripped wether this section should be stripped on output to smarty php
+     */
+    public function __construct($data, $toBeStripped = false)
+    {
+        $this->data = $data;
+        $this->toBeStripped = $toBeStripped;
+    }
+
+    /**
+     * Wether this section should be stripped on output to smarty php
+     * @return bool
+     */
+    public function isToBeStripped() {
+        return $this->toBeStripped;
+    }
+
+    /**
+     * Return buffer content
+     *
+     * @param \Smarty_Internal_Templateparser $parser
+     *
+     * @return string text
+     */
+    public function to_smarty_php(Smarty_Internal_Templateparser $parser)
+    {
+        return $this->data;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_eval.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_eval.php
new file mode 100644
index 000000000..3b552a589
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_eval.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource Eval
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+
+/**
+ * Smarty Internal Plugin Resource Eval
+ * Implements the strings as resource for Smarty template
+ * {@internal unlike string-resources the compiled state of eval-resources is NOT saved for subsequent access}}
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ */
+class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled
+{
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    {
+        $source->uid = $source->filepath = sha1($source->name);
+        $source->timestamp = $source->exists = true;
+    }
+
+    /**
+     * Load template's source from $resource_name into current template object
+     *
+     * @uses decode() to decode base64 and urlencoded template_resources
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        return $this->decode($source->name);
+    }
+
+    /**
+     * decode base64 and urlencode
+     *
+     * @param string $string template_resource to decode
+     *
+     * @return string decoded template_resource
+     */
+    protected function decode($string)
+    {
+        // decode if specified
+        if (($pos = strpos($string, ':')) !== false) {
+            if (!strncmp($string, 'base64', 6)) {
+                return base64_decode(substr($string, 7));
+            } elseif (!strncmp($string, 'urlencode', 9)) {
+                return urldecode(substr($string, 10));
+            }
+        }
+        return $string;
+    }
+
+    /**
+     * modify resource_name according to resource handlers specifications
+     *
+     * @param Smarty  $smarty        Smarty instance
+     * @param string  $resource_name resource_name to make unique
+     * @param boolean $isConfig      flag for config resource
+     *
+     * @return string unique resource name
+     */
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
+    {
+        return get_class($this) . '#' . $this->decode($resource_name);
+    }
+
+    /**
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
+     */
+    public function getBasename(Smarty_Template_Source $source)
+    {
+        return '';
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_extends.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_extends.php
new file mode 100644
index 000000000..80946932e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_extends.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource Extends
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+
+/**
+ * Smarty Internal Plugin Resource Extends
+ * Implements the file system as resource for Smarty which {extend}s a chain of template files templates
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ */
+class Smarty_Internal_Resource_Extends extends Smarty_Resource
+{
+    /**
+     * mbstring.overload flag
+     *
+     * @var int
+     */
+    public $mbstring_overload = 0;
+
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @throws SmartyException
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    {
+        $uid = '';
+        $sources = array();
+        $components = explode('|', $source->name);
+        $smarty = &$source->smarty;
+        $exists = true;
+        foreach ($components as $component) {
+            /* @var \Smarty_Template_Source $_s */
+            $_s = Smarty_Template_Source::load(null, $smarty, $component);
+            if ($_s->type === 'php') {
+                throw new SmartyException("Resource type {$_s->type} cannot be used with the extends resource type");
+            }
+            $sources[ $_s->uid ] = $_s;
+            $uid .= $_s->filepath;
+            if ($_template) {
+                $exists = $exists && $_s->exists;
+            }
+        }
+        $source->components = $sources;
+        $source->filepath = $_s->filepath;
+        $source->uid = sha1($uid . $source->smarty->_joined_template_dir);
+        $source->exists = $exists;
+        if ($_template) {
+            $source->timestamp = $_s->timestamp;
+        }
+    }
+
+    /**
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Source $source source object
+     */
+    public function populateTimestamp(Smarty_Template_Source $source)
+    {
+        $source->exists = true;
+        /* @var \Smarty_Template_Source $_s */
+        foreach ($source->components as $_s) {
+            $source->exists = $source->exists && $_s->exists;
+        }
+        $source->timestamp = $source->exists ? $_s->getTimeStamp() : false;
+    }
+
+    /**
+     * Load template's source from files into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string template source
+     * @throws SmartyException if source cannot be loaded
+     */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        if (!$source->exists) {
+            throw new SmartyException("Unable to load template '{$source->type}:{$source->name}'");
+        }
+        $_components = array_reverse($source->components);
+        $_content = '';
+        /* @var \Smarty_Template_Source $_s */
+        foreach ($_components as $_s) {
+            // read content
+            $_content .= $_s->getContent();
+        }
+        return $_content;
+    }
+
+    /**
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string resource's basename
+     */
+    public function getBasename(Smarty_Template_Source $source)
+    {
+        return str_replace(':', '.', basename($source->filepath));
+    }
+
+    /*
+      * Disable timestamp checks for extends resource.
+      * The individual source components will be checked.
+      *
+      * @return bool
+      */
+    /**
+     * @return bool
+     */
+    public function checkTimestamps()
+    {
+        return false;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_file.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_file.php
new file mode 100644
index 000000000..ae2060673
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_file.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource File
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+
+/**
+ * Smarty Internal Plugin Resource File
+ * Implements the file system as resource for Smarty templates
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ */
+class Smarty_Internal_Resource_File extends Smarty_Resource
+{
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @throws \SmartyException
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    {
+        $source->filepath = $this->buildFilepath($source, $_template);
+        if ($source->filepath !== false) {
+            if (isset($source->smarty->security_policy) && is_object($source->smarty->security_policy)) {
+                $source->smarty->security_policy->isTrustedResourceDir($source->filepath, $source->isConfig);
+            }
+            $source->exists = true;
+            $source->uid = sha1(
+                $source->filepath . ($source->isConfig ? $source->smarty->_joined_config_dir :
+                    $source->smarty->_joined_template_dir)
+            );
+            $source->timestamp = filemtime($source->filepath);
+        } else {
+            $source->timestamp = $source->exists = false;
+        }
+    }
+
+    /**
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Source $source source object
+     */
+    public function populateTimestamp(Smarty_Template_Source $source)
+    {
+        if (!$source->exists) {
+            $source->timestamp = $source->exists = is_file($source->filepath);
+        }
+        if ($source->exists) {
+            $source->timestamp = filemtime($source->filepath);
+        }
+    }
+
+    /**
+     * Load template's source from file into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
+     */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        if ($source->exists) {
+            return file_get_contents($source->filepath);
+        }
+        throw new SmartyException(
+            'Unable to read ' . ($source->isConfig ? 'config' : 'template') .
+            " {$source->type} '{$source->name}'"
+        );
+    }
+
+    /**
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
+     */
+    public function getBasename(Smarty_Template_Source $source)
+    {
+        return basename($source->filepath);
+    }
+
+    /**
+     * build template filepath by traversing the template_dir array
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string fully qualified filepath
+     * @throws SmartyException
+     */
+    protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    {
+        $file = $source->name;
+        // absolute file ?
+        if ($file[ 0 ] === '/' || $file[ 1 ] === ':') {
+            $file = $source->smarty->_realpath($file, true);
+            return is_file($file) ? $file : false;
+        }
+        // go relative to a given template?
+        if ($file[ 0 ] === '.' && $_template && $_template->_isSubTpl()
+            && preg_match('#^[.]{1,2}[\\\/]#', $file)
+        ) {
+            if ($_template->parent->source->type !== 'file' && $_template->parent->source->type !== 'extends'
+                && !isset($_template->parent->_cache[ 'allow_relative_path' ])
+            ) {
+                throw new SmartyException("Template '{$file}' cannot be relative to template of resource type '{$_template->parent->source->type}'");
+            }
+            // normalize path
+            $path =
+                $source->smarty->_realpath(dirname($_template->parent->source->filepath) . DIRECTORY_SEPARATOR . $file);
+            // files relative to a template only get one shot
+            return is_file($path) ? $path : false;
+        }
+        // normalize DIRECTORY_SEPARATOR
+        if (strpos($file, DIRECTORY_SEPARATOR === '/' ? '\\' : '/') !== false) {
+            $file = str_replace(DIRECTORY_SEPARATOR === '/' ? '\\' : '/', DIRECTORY_SEPARATOR, $file);
+        }
+        $_directories = $source->smarty->getTemplateDir(null, $source->isConfig);
+        // template_dir index?
+        if ($file[ 0 ] === '[' && preg_match('#^\[([^\]]+)\](.+)$#', $file, $fileMatch)) {
+            $file = $fileMatch[ 2 ];
+            $_indices = explode(',', $fileMatch[ 1 ]);
+            $_index_dirs = array();
+            foreach ($_indices as $index) {
+                $index = trim($index);
+                // try string indexes
+                if (isset($_directories[ $index ])) {
+                    $_index_dirs[] = $_directories[ $index ];
+                } elseif (is_numeric($index)) {
+                    // try numeric index
+                    $index = (int)$index;
+                    if (isset($_directories[ $index ])) {
+                        $_index_dirs[] = $_directories[ $index ];
+                    } else {
+                        // try at location index
+                        $keys = array_keys($_directories);
+                        if (isset($_directories[ $keys[ $index ] ])) {
+                            $_index_dirs[] = $_directories[ $keys[ $index ] ];
+                        }
+                    }
+                }
+            }
+            if (empty($_index_dirs)) {
+                // index not found
+                return false;
+            } else {
+                $_directories = $_index_dirs;
+            }
+        }
+        // relative file name?
+        foreach ($_directories as $_directory) {
+            $path = $_directory . $file;
+            if (is_file($path)) {
+                return (strpos($path, '.' . DIRECTORY_SEPARATOR) !== false) ? $source->smarty->_realpath($path) : $path;
+            }
+        }
+        if (!isset($_index_dirs)) {
+            // Could be relative to cwd
+            $path = $source->smarty->_realpath($file, true);
+            if (is_file($path)) {
+                return $path;
+            }
+        }
+        // Use include path ?
+        if ($source->smarty->use_include_path) {
+            return $source->smarty->ext->_getIncludePath->getIncludePath($_directories, $file, $source->smarty);
+        }
+        return false;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_php.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_php.php
new file mode 100644
index 000000000..9d98ae181
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_php.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * Smarty Internal Plugin Resource PHP
+ * Implements the file system as resource for PHP templates
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+class Smarty_Internal_Resource_Php extends Smarty_Internal_Resource_File
+{
+    /**
+     * Flag that it's an uncompiled resource
+     *
+     * @var bool
+     */
+    public $uncompiled = true;
+
+    /**
+     * Resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
+     */
+    public $hasCompiledHandler = true;
+
+    /**
+     * container for short_open_tag directive's value before executing PHP templates
+     *
+     * @var string
+     */
+    protected $short_open_tag;
+
+    /**
+     * Create a new PHP Resource
+     */
+    public function __construct()
+    {
+        $this->short_open_tag = function_exists('ini_get') ? ini_get('short_open_tag') : 1;
+    }
+
+    /**
+     * Load template's source from file into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
+     */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        if ($source->exists) {
+            return '';
+        }
+        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
+    }
+
+    /**
+     * populate compiled object with compiled filepath
+     *
+     * @param Smarty_Template_Compiled $compiled  compiled object
+     * @param Smarty_Internal_Template $_template template object (is ignored)
+     */
+    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+    {
+        $compiled->filepath = $_template->source->filepath;
+        $compiled->timestamp = $_template->source->timestamp;
+        $compiled->exists = $_template->source->exists;
+        $compiled->file_dependency[ $_template->source->uid ] =
+            array(
+                $compiled->filepath,
+                $compiled->timestamp,
+                $_template->source->type,
+            );
+    }
+
+    /**
+     * Render and output the template (without using the compiler)
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     * @throws SmartyException          if template cannot be loaded or allow_php_templates is disabled
+     */
+    public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template)
+    {
+        if (!$source->smarty->allow_php_templates) {
+            throw new SmartyException('PHP templates are disabled');
+        }
+        if (!$source->exists) {
+            throw new SmartyException(
+                "Unable to load template '{$source->type}:{$source->name}'" .
+                ($_template->_isSubTpl() ? " in '{$_template->parent->template_resource}'" : '')
+            );
+        }
+        // prepare variables
+        extract($_template->getTemplateVars());
+        // include PHP template with short open tags enabled
+        if (function_exists('ini_set')) {
+            ini_set('short_open_tag', '1');
+        }
+        /**
+         *
+         *
+         * @var Smarty_Internal_Template $_smarty_template
+         * used in included file
+         */
+        $_smarty_template = $_template;
+        include $source->filepath;
+        if (function_exists('ini_set')) {
+            ini_set('short_open_tag', $this->short_open_tag);
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_stream.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_stream.php
new file mode 100644
index 000000000..5f0203498
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_stream.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource Stream
+ * Implements the streams as resource for Smarty template
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+
+/**
+ * Smarty Internal Plugin Resource Stream
+ * Implements the streams as resource for Smarty template
+ *
+ * @link       https://php.net/streams
+ * @package    Smarty
+ * @subpackage TemplateResources
+ */
+class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled
+{
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    {
+        if (strpos($source->resource, '://') !== false) {
+            $source->filepath = $source->resource;
+        } else {
+            $source->filepath = str_replace(':', '://', $source->resource);
+        }
+        $source->uid = false;
+        $source->content = $this->getContent($source);
+        $source->timestamp = $source->exists = !!$source->content;
+    }
+
+    /**
+     * Load template's source from stream into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string template source
+     */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        $t = '';
+        // the availability of the stream has already been checked in Smarty_Resource::fetch()
+        $fp = fopen($source->filepath, 'r+');
+        if ($fp) {
+            while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
+                $t .= $current_line;
+            }
+            fclose($fp);
+            return $t;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * modify resource_name according to resource handlers specifications
+     *
+     * @param Smarty  $smarty        Smarty instance
+     * @param string  $resource_name resource_name to make unique
+     * @param boolean $isConfig      flag for config resource
+     *
+     * @return string unique resource name
+     */
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
+    {
+        return get_class($this) . '#' . $resource_name;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_string.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_string.php
new file mode 100644
index 000000000..3fecbb7ef
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_resource_string.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource String
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+
+/**
+ * Smarty Internal Plugin Resource String
+ * Implements the strings as resource for Smarty template
+ * {@internal unlike eval-resources the compiled state of string-resources is saved for subsequent access}}
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ */
+class Smarty_Internal_Resource_String extends Smarty_Resource
+{
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    {
+        $source->uid = $source->filepath = sha1($source->name . $source->smarty->_joined_template_dir);
+        $source->timestamp = $source->exists = true;
+    }
+
+    /**
+     * Load template's source from $resource_name into current template object
+     *
+     * @uses decode() to decode base64 and urlencoded template_resources
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        return $this->decode($source->name);
+    }
+
+    /**
+     * decode base64 and urlencode
+     *
+     * @param string $string template_resource to decode
+     *
+     * @return string decoded template_resource
+     */
+    protected function decode($string)
+    {
+        // decode if specified
+        if (($pos = strpos($string, ':')) !== false) {
+            if (!strncmp($string, 'base64', 6)) {
+                return base64_decode(substr($string, 7));
+            } elseif (!strncmp($string, 'urlencode', 9)) {
+                return urldecode(substr($string, 10));
+            }
+        }
+        return $string;
+    }
+
+    /**
+     * modify resource_name according to resource handlers specifications
+     *
+     * @param Smarty  $smarty        Smarty instance
+     * @param string  $resource_name resource_name to make unique
+     * @param boolean $isConfig      flag for config resource
+     *
+     * @return string unique resource name
+     */
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
+    {
+        return get_class($this) . '#' . $this->decode($resource_name);
+    }
+
+    /**
+     * Determine basename for compiled filename
+     * Always returns an empty string.
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
+     */
+    public function getBasename(Smarty_Template_Source $source)
+    {
+        return '';
+    }
+
+    /*
+        * Disable timestamp checks for string resource.
+        *
+        * @return bool
+        */
+    /**
+     * @return bool
+     */
+    public function checkTimestamps()
+    {
+        return false;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php
new file mode 100644
index 000000000..6e12d2ae1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cachemodify.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * Inline Runtime Methods render, setSourceByUid, setupSubTemplate
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ **/
+class Smarty_Internal_Runtime_CacheModify
+{
+    /**
+     * check client side cache
+     *
+     * @param \Smarty_Template_Cached   $cached
+     * @param \Smarty_Internal_Template $_template
+     * @param string                    $content
+     *
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function cacheModifiedCheck(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+        $_isCached = $_template->isCached() && !$_template->compiled->has_nocache_code;
+        $_last_modified_date =
+            @substr($_SERVER[ 'HTTP_IF_MODIFIED_SINCE' ], 0, strpos($_SERVER[ 'HTTP_IF_MODIFIED_SINCE' ], 'GMT') + 3);
+        if ($_isCached && $cached->timestamp <= strtotime($_last_modified_date)) {
+            switch (PHP_SAPI) {
+                case 'cgi': // php-cgi < 5.3
+                case 'cgi-fcgi': // php-cgi >= 5.3
+                case 'fpm-fcgi': // php-fpm >= 5.3.3
+                    header('Status: 304 Not Modified');
+                    break;
+                case 'cli':
+                    if (/* ^phpunit */
+                    !empty($_SERVER[ 'SMARTY_PHPUNIT_DISABLE_HEADERS' ]) /* phpunit$ */
+                    ) {
+                        $_SERVER[ 'SMARTY_PHPUNIT_HEADERS' ][] = '304 Not Modified';
+                    }
+                    break;
+                default:
+                    if (/* ^phpunit */
+                    !empty($_SERVER[ 'SMARTY_PHPUNIT_DISABLE_HEADERS' ]) /* phpunit$ */
+                    ) {
+                        $_SERVER[ 'SMARTY_PHPUNIT_HEADERS' ][] = '304 Not Modified';
+                    } else {
+                        header($_SERVER[ 'SERVER_PROTOCOL' ] . ' 304 Not Modified');
+                    }
+                    break;
+            }
+        } else {
+            switch (PHP_SAPI) {
+                case 'cli':
+                    if (/* ^phpunit */
+                    !empty($_SERVER[ 'SMARTY_PHPUNIT_DISABLE_HEADERS' ]) /* phpunit$ */
+                    ) {
+                        $_SERVER[ 'SMARTY_PHPUNIT_HEADERS' ][] =
+                            'Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT';
+                    }
+                    break;
+                default:
+                    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT');
+                    break;
+            }
+            echo $content;
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cacheresourcefile.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cacheresourcefile.php
new file mode 100644
index 000000000..287096438
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_cacheresourcefile.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Smarty cache resource file clear method
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Runtime Cache Resource File Class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Runtime_CacheResourceFile
+{
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
+        $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+        $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
+        $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
+        $_dir = $smarty->getCacheDir();
+        if ($_dir === '/') { //We should never want to delete this!
+            return 0;
+        }
+        $_dir_length = strlen($_dir);
+        if (isset($_cache_id)) {
+            $_cache_id_parts = explode('|', $_cache_id);
+            $_cache_id_parts_count = count($_cache_id_parts);
+            if ($smarty->use_sub_dirs) {
+                foreach ($_cache_id_parts as $id_part) {
+                    $_dir .= $id_part . '/';
+                }
+            }
+        }
+        if (isset($resource_name)) {
+            $_save_stat = $smarty->caching;
+            $smarty->caching = Smarty::CACHING_LIFETIME_CURRENT;
+            $tpl = new $smarty->template_class($resource_name, $smarty);
+            $smarty->caching = $_save_stat;
+            // remove from template cache
+            $tpl->source; // have the template registered before unset()
+            if ($tpl->source->exists) {
+                $_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath));
+            } else {
+                return 0;
+            }
+        }
+        $_count = 0;
+        $_time = time();
+        if (file_exists($_dir)) {
+            $_cacheDirs = new RecursiveDirectoryIterator($_dir);
+            $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
+            foreach ($_cache as $_file) {
+                if (substr(basename($_file->getPathname()), 0, 1) === '.') {
+                    continue;
+                }
+                $_filepath = (string)$_file;
+                // directory ?
+                if ($_file->isDir()) {
+                    if (!$_cache->isDot()) {
+                        // delete folder if empty
+                        @rmdir($_file->getPathname());
+                    }
+                } else {
+                    // delete only php files
+                    if (substr($_filepath, -4) !== '.php') {
+                        continue;
+                    }
+                    $_parts = explode($_dir_sep, str_replace('\\', '/', substr($_filepath, $_dir_length)));
+                    $_parts_count = count($_parts);
+                    // check name
+                    if (isset($resource_name)) {
+                        if ($_parts[ $_parts_count - 1 ] !== $_resourcename_parts) {
+                            continue;
+                        }
+                    }
+                    // check compile id
+                    if (isset($_compile_id) && (!isset($_parts[ $_parts_count - 2 - $_compile_id_offset ])
+                                                || $_parts[ $_parts_count - 2 - $_compile_id_offset ] !== $_compile_id)
+                    ) {
+                        continue;
+                    }
+                    // check cache id
+                    if (isset($_cache_id)) {
+                        // count of cache id parts
+                        $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset :
+                            $_parts_count - 1 - $_compile_id_offset;
+                        if ($_parts_count < $_cache_id_parts_count) {
+                            continue;
+                        }
+                        for ($i = 0; $i < $_cache_id_parts_count; $i++) {
+                            if ($_parts[ $i ] !== $_cache_id_parts[ $i ]) {
+                                continue 2;
+                            }
+                        }
+                    }
+                    if (is_file($_filepath)) {
+                        // expired ?
+                        if (isset($exp_time)) {
+                            if ($exp_time < 0) {
+                                preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_filepath), $match);
+                                if ($_time < (filemtime($_filepath) + $match[ 1 ])) {
+                                    continue;
+                                }
+                            } else {
+                                if ($_time - filemtime($_filepath) < $exp_time) {
+                                    continue;
+                                }
+                            }
+                        }
+                        $_count += @unlink($_filepath) ? 1 : 0;
+                        if (function_exists('opcache_invalidate')
+                            && (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
+                        ) {
+                            opcache_invalidate($_filepath, true);
+                        } elseif (function_exists('apc_delete_file')) {
+                            apc_delete_file($_filepath);
+                        }
+                    }
+                }
+            }
+        }
+        return $_count;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_capture.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_capture.php
new file mode 100644
index 000000000..c9dca83d9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_capture.php
@@ -0,0 +1,174 @@
+<?php
+
+/**
+ * Runtime Extension Capture
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Runtime_Capture
+{
+    /**
+     * Flag that this instance  will not be cached
+     *
+     * @var bool
+     */
+    public $isPrivateExtension = true;
+
+    /**
+     * Stack of capture parameter
+     *
+     * @var array
+     */
+    private $captureStack = array();
+
+    /**
+     * Current open capture sections
+     *
+     * @var int
+     */
+    private $captureCount = 0;
+
+    /**
+     * Count stack
+     *
+     * @var int[]
+     */
+    private $countStack = array();
+
+    /**
+     * Named buffer
+     *
+     * @var string[]
+     */
+    private $namedBuffer = array();
+
+    /**
+     * Flag if callbacks are registered
+     *
+     * @var bool
+     */
+    private $isRegistered = false;
+
+    /**
+     * Open capture section
+     *
+     * @param \Smarty_Internal_Template $_template
+     * @param string                    $buffer capture name
+     * @param string                    $assign variable name
+     * @param string                    $append variable name
+     */
+    public function open(Smarty_Internal_Template $_template, $buffer, $assign, $append)
+    {
+        if (!$this->isRegistered) {
+            $this->register($_template);
+        }
+        $this->captureStack[] = array(
+            $buffer,
+            $assign,
+            $append
+        );
+        $this->captureCount++;
+        ob_start();
+    }
+
+    /**
+     * Register callbacks in template class
+     *
+     * @param \Smarty_Internal_Template $_template
+     */
+    private function register(Smarty_Internal_Template $_template)
+    {
+        $_template->startRenderCallbacks[] = array(
+            $this,
+            'startRender'
+        );
+        $_template->endRenderCallbacks[] = array(
+            $this,
+            'endRender'
+        );
+        $this->startRender($_template);
+        $this->isRegistered = true;
+    }
+
+    /**
+     * Start render callback
+     *
+     * @param \Smarty_Internal_Template $_template
+     */
+    public function startRender(Smarty_Internal_Template $_template)
+    {
+        $this->countStack[] = $this->captureCount;
+        $this->captureCount = 0;
+    }
+
+    /**
+     * Close capture section
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @throws \SmartyException
+     */
+    public function close(Smarty_Internal_Template $_template)
+    {
+        if ($this->captureCount) {
+            list($buffer, $assign, $append) = array_pop($this->captureStack);
+            $this->captureCount--;
+            if (isset($assign)) {
+                $_template->assign($assign, ob_get_contents());
+            }
+            if (isset($append)) {
+                $_template->append($append, ob_get_contents());
+            }
+            $this->namedBuffer[ $buffer ] = ob_get_clean();
+        } else {
+            $this->error($_template);
+        }
+    }
+
+    /**
+     * Error exception on not matching {capture}{/capture}
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @throws \SmartyException
+     */
+    public function error(Smarty_Internal_Template $_template)
+    {
+        throw new SmartyException("Not matching {capture}{/capture} in '{$_template->template_resource}'");
+    }
+
+    /**
+     * Return content of named capture buffer by key or as array
+     *
+     * @param \Smarty_Internal_Template $_template
+     * @param string|null               $name
+     *
+     * @return string|string[]|null
+     */
+    public function getBuffer(Smarty_Internal_Template $_template, $name = null)
+    {
+        if (isset($name)) {
+            return isset($this->namedBuffer[ $name ]) ? $this->namedBuffer[ $name ] : null;
+        } else {
+            return $this->namedBuffer;
+        }
+    }
+
+    /**
+     * End render callback
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @throws \SmartyException
+     */
+    public function endRender(Smarty_Internal_Template $_template)
+    {
+        if ($this->captureCount) {
+            $this->error($_template);
+        } else {
+            $this->captureCount = array_pop($this->countStack);
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php
new file mode 100644
index 000000000..d0ca751e2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Smarty Internal Extension
+ * This file contains the Smarty template extension to create a code frame
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * Class Smarty_Internal_Extension_CodeFrame
+ * Create code frame for compiled and cached templates
+ */
+class Smarty_Internal_Runtime_CodeFrame
+{
+    /**
+     * Create code frame for compiled and cached templates
+     *
+     * @param Smarty_Internal_Template              $_template
+     * @param string                                $content   optional template content
+     * @param string                                $functions compiled template function and block code
+     * @param bool                                  $cache     flag for cache file
+     * @param \Smarty_Internal_TemplateCompilerBase $compiler
+     *
+     * @return string
+     */
+    public function create(
+        Smarty_Internal_Template $_template,
+        $content = '',
+        $functions = '',
+        $cache = false,
+        Smarty_Internal_TemplateCompilerBase $compiler = null
+    ) {
+        // build property code
+        $properties[ 'version' ] = Smarty::SMARTY_VERSION;
+        $properties[ 'unifunc' ] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
+        if (!$cache) {
+            $properties[ 'has_nocache_code' ] = $_template->compiled->has_nocache_code;
+            $properties[ 'file_dependency' ] = $_template->compiled->file_dependency;
+            $properties[ 'includes' ] = $_template->compiled->includes;
+        } else {
+            $properties[ 'has_nocache_code' ] = $_template->cached->has_nocache_code;
+            $properties[ 'file_dependency' ] = $_template->cached->file_dependency;
+            $properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
+        }
+        $output = sprintf(
+			"<?php\n/* Smarty version %s, created on %s\n  from '%s' */\n\n",
+            $properties[ 'version' ],
+	        date("Y-m-d H:i:s"),
+	        str_replace('*/', '* /', $_template->source->filepath)
+        );
+        $output .= "/* @var Smarty_Internal_Template \$_smarty_tpl */\n";
+        $dec = "\$_smarty_tpl->_decodeProperties(\$_smarty_tpl, " . var_export($properties, true) . ',' .
+               ($cache ? 'true' : 'false') . ')';
+        $output .= "if ({$dec}) {\n";
+        $output .= "function {$properties['unifunc']} (Smarty_Internal_Template \$_smarty_tpl) {\n";
+        if (!$cache && !empty($compiler->tpl_function)) {
+            $output .= '$_smarty_tpl->smarty->ext->_tplFunction->registerTplFunctions($_smarty_tpl, ';
+            $output .= var_export($compiler->tpl_function, true);
+            $output .= ");\n";
+        }
+        if ($cache && isset($_template->smarty->ext->_tplFunction)) {
+            $output .= "\$_smarty_tpl->smarty->ext->_tplFunction->registerTplFunctions(\$_smarty_tpl, " .
+                       var_export($_template->smarty->ext->_tplFunction->getTplFunction($_template), true) . ");\n";
+        }
+        $output .= "?>";
+        $output .= $content;
+        $output .= "<?php }\n?>";
+        $output .= $functions;
+        $output .= "<?php }\n";
+        // remove unneeded PHP tags
+        if (preg_match('/\s*\?>[\n]?<\?php\s*/', $output)) {
+            $curr_split = preg_split(
+                '/\s*\?>[\n]?<\?php\s*/',
+                $output
+            );
+            preg_match_all(
+                '/\s*\?>[\n]?<\?php\s*/',
+                $output,
+                $curr_parts
+            );
+            $output = '';
+            foreach ($curr_split as $idx => $curr_output) {
+                $output .= $curr_output;
+                if (isset($curr_parts[ 0 ][ $idx ])) {
+                    $output .= "\n";
+                }
+            }
+        }
+        if (preg_match('/\?>\s*$/', $output)) {
+            $curr_split = preg_split(
+                '/\?>\s*$/',
+                $output
+            );
+            $output = '';
+            foreach ($curr_split as $idx => $curr_output) {
+                $output .= $curr_output;
+            }
+        }
+        return $output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php
new file mode 100644
index 000000000..9f868e1a4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_filterhandler.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Smarty Internal Plugin Filter Handler
+ * Smarty filter handler class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+
+/**
+ * Class for filter processing
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Runtime_FilterHandler
+{
+    /**
+     * Run filters over content
+     * The filters will be lazy loaded if required
+     * class name format: Smarty_FilterType_FilterName
+     * plugin filename format: filtertype.filtername.php
+     * Smarty2 filter plugins could be used
+     *
+     * @param string                   $type     the type of filter ('pre','post','output') which shall run
+     * @param string                   $content  the content which shall be processed by the filters
+     * @param Smarty_Internal_Template $template template object
+     *
+     * @throws SmartyException
+     * @return string                   the filtered content
+     */
+    public function runFilter($type, $content, Smarty_Internal_Template $template)
+    {
+        // loop over autoload filters of specified type
+        if (!empty($template->smarty->autoload_filters[ $type ])) {
+            foreach ((array)$template->smarty->autoload_filters[ $type ] as $name) {
+                $plugin_name = "Smarty_{$type}filter_{$name}";
+                if (function_exists($plugin_name)) {
+                    $callback = $plugin_name;
+                } elseif (class_exists($plugin_name, false) && is_callable(array($plugin_name, 'execute'))) {
+                    $callback = array($plugin_name, 'execute');
+                } elseif ($template->smarty->loadPlugin($plugin_name, false)) {
+                    if (function_exists($plugin_name)) {
+                        // use loaded Smarty2 style plugin
+                        $callback = $plugin_name;
+                    } elseif (class_exists($plugin_name, false) && is_callable(array($plugin_name, 'execute'))) {
+                        // loaded class of filter plugin
+                        $callback = array($plugin_name, 'execute');
+                    } else {
+                        throw new SmartyException("Auto load {$type}-filter plugin method '{$plugin_name}::execute' not callable");
+                    }
+                } else {
+                    // nothing found, throw exception
+                    throw new SmartyException("Unable to auto load {$type}-filter plugin '{$plugin_name}'");
+                }
+                $content = call_user_func($callback, $content, $template);
+            }
+        }
+        // loop over registered filters of specified type
+        if (!empty($template->smarty->registered_filters[ $type ])) {
+            foreach ($template->smarty->registered_filters[ $type ] as $key => $name) {
+                $content = call_user_func($template->smarty->registered_filters[ $type ][ $key ], $content, $template);
+            }
+        }
+        // return filtered output
+        return $content;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php
new file mode 100644
index 000000000..badead165
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_foreach.php
@@ -0,0 +1,162 @@
+<?php
+
+/**
+ * Foreach Runtime Methods count(), init(), restore()
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Runtime_Foreach
+{
+    /**
+     * Stack of saved variables
+     *
+     * @var array
+     */
+    private $stack = array();
+
+    /**
+     * Init foreach loop
+     *  - save item and key variables, named foreach property data if defined
+     *  - init item and key variables, named foreach property data if required
+     *  - count total if required
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param mixed                     $from       values to loop over
+     * @param string                    $item       variable name
+     * @param bool                      $needTotal  flag if we need to count values
+     * @param null|string               $key        variable name
+     * @param null|string               $name       of named foreach
+     * @param array                     $properties of named foreach
+     *
+     * @return mixed $from
+     */
+    public function init(
+        Smarty_Internal_Template $tpl,
+        $from,
+        $item,
+        $needTotal = false,
+        $key = null,
+        $name = null,
+        $properties = array()
+    ) {
+        $needTotal = $needTotal || isset($properties[ 'total' ]);
+        $saveVars = array();
+        $total = null;
+        if (!is_array($from)) {
+            if (is_object($from)) {
+                if ($needTotal) {
+                    $total = $this->count($from);
+                }
+            } else {
+                settype($from, 'array');
+            }
+        }
+        if (!isset($total)) {
+            $total = empty($from) ? 0 : ($needTotal ? count($from) : 1);
+        }
+        if (isset($tpl->tpl_vars[ $item ])) {
+            $saveVars[ 'item' ] = array(
+                $item,
+                $tpl->tpl_vars[ $item ]
+            );
+        }
+        $tpl->tpl_vars[ $item ] = new Smarty_Variable(null, $tpl->isRenderingCache);
+        if ($total === 0) {
+            $from = null;
+        } else {
+            if ($key) {
+                if (isset($tpl->tpl_vars[ $key ])) {
+                    $saveVars[ 'key' ] = array(
+                        $key,
+                        $tpl->tpl_vars[ $key ]
+                    );
+                }
+                $tpl->tpl_vars[ $key ] = new Smarty_Variable(null, $tpl->isRenderingCache);
+            }
+        }
+        if ($needTotal) {
+            $tpl->tpl_vars[ $item ]->total = $total;
+        }
+        if ($name) {
+            $namedVar = "__smarty_foreach_{$name}";
+            if (isset($tpl->tpl_vars[ $namedVar ])) {
+                $saveVars[ 'named' ] = array(
+                    $namedVar,
+                    $tpl->tpl_vars[ $namedVar ]
+                );
+            }
+            $namedProp = array();
+            if (isset($properties[ 'total' ])) {
+                $namedProp[ 'total' ] = $total;
+            }
+            if (isset($properties[ 'iteration' ])) {
+                $namedProp[ 'iteration' ] = 0;
+            }
+            if (isset($properties[ 'index' ])) {
+                $namedProp[ 'index' ] = -1;
+            }
+            if (isset($properties[ 'show' ])) {
+                $namedProp[ 'show' ] = ($total > 0);
+            }
+            $tpl->tpl_vars[ $namedVar ] = new Smarty_Variable($namedProp);
+        }
+        $this->stack[] = $saveVars;
+        return $from;
+    }
+
+    /**
+     * [util function] counts an array, arrayAccess/traversable or PDOStatement object
+     *
+     * @param mixed $value
+     *
+     * @return int   the count for arrays and objects that implement countable, 1 for other objects that don't, and 0
+     *               for empty elements
+     */
+    public function count($value)
+    {
+        if ($value instanceof IteratorAggregate) {
+            // Note: getIterator() returns a Traversable, not an Iterator
+            // thus rewind() and valid() methods may not be present
+            return iterator_count($value->getIterator());
+        } elseif ($value instanceof Iterator) {
+            return $value instanceof Generator ? 1 : iterator_count($value);
+        } elseif ($value instanceof Countable) {
+            return count($value);
+        } elseif ($value instanceof PDOStatement) {
+            return $value->rowCount();
+        } elseif ($value instanceof Traversable) {
+            return iterator_count($value);
+        }
+        return count((array)$value);
+    }
+
+    /**
+     * Restore saved variables
+     *
+     * will be called by {break n} or {continue n} for the required number of levels
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param int                       $levels number of levels
+     */
+    public function restore(Smarty_Internal_Template $tpl, $levels = 1)
+    {
+        while ($levels) {
+            $saveVars = array_pop($this->stack);
+            if (!empty($saveVars)) {
+                if (isset($saveVars[ 'item' ])) {
+                    $item = &$saveVars[ 'item' ];
+                    $tpl->tpl_vars[ $item[ 0 ] ]->value = $item[ 1 ]->value;
+                }
+                if (isset($saveVars[ 'key' ])) {
+                    $tpl->tpl_vars[ $saveVars[ 'key' ][ 0 ] ] = $saveVars[ 'key' ][ 1 ];
+                }
+                if (isset($saveVars[ 'named' ])) {
+                    $tpl->tpl_vars[ $saveVars[ 'named' ][ 0 ] ] = $saveVars[ 'named' ][ 1 ];
+                }
+            }
+            $levels--;
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php
new file mode 100644
index 000000000..5ae98304e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_getincludepath.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Smarty read include path plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Monte Ohrt
+ */
+
+/**
+ * Smarty Internal Read Include Path Class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Runtime_GetIncludePath
+{
+    /**
+     * include path cache
+     *
+     * @var string
+     */
+    public $_include_path = '';
+
+    /**
+     * include path directory cache
+     *
+     * @var array
+     */
+    public $_include_dirs = array();
+
+    /**
+     * include path directory cache
+     *
+     * @var array
+     */
+    public $_user_dirs = array();
+
+    /**
+     * stream cache
+     *
+     * @var string[][]
+     */
+    public $isFile = array();
+
+    /**
+     * stream cache
+     *
+     * @var string[]
+     */
+    public $isPath = array();
+
+    /**
+     * stream cache
+     *
+     * @var int[]
+     */
+    public $number = array();
+
+    /**
+     * status cache
+     *
+     * @var bool
+     */
+    public $_has_stream_include = null;
+
+    /**
+     * Number for array index
+     *
+     * @var int
+     */
+    public $counter = 0;
+
+    /**
+     * Check if include path was updated
+     *
+     * @param \Smarty $smarty
+     *
+     * @return bool
+     */
+    public function isNewIncludePath(Smarty $smarty)
+    {
+        $_i_path = get_include_path();
+        if ($this->_include_path !== $_i_path) {
+            $this->_include_dirs = array();
+            $this->_include_path = $_i_path;
+            $_dirs = (array)explode(PATH_SEPARATOR, $_i_path);
+            foreach ($_dirs as $_path) {
+                if (is_dir($_path)) {
+                    $this->_include_dirs[] = $smarty->_realpath($_path . DIRECTORY_SEPARATOR, true);
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * return array with include path directories
+     *
+     * @param \Smarty $smarty
+     *
+     * @return array
+     */
+    public function getIncludePathDirs(Smarty $smarty)
+    {
+        $this->isNewIncludePath($smarty);
+        return $this->_include_dirs;
+    }
+
+    /**
+     * Return full file path from PHP include_path
+     *
+     * @param string[] $dirs
+     * @param string   $file
+     * @param \Smarty  $smarty
+     *
+     * @return bool|string full filepath or false
+     */
+    public function getIncludePath($dirs, $file, Smarty $smarty)
+    {
+        //if (!(isset($this->_has_stream_include) ? $this->_has_stream_include : $this->_has_stream_include = false)) {
+        if (!(isset($this->_has_stream_include) ? $this->_has_stream_include :
+            $this->_has_stream_include = function_exists('stream_resolve_include_path'))
+        ) {
+            $this->isNewIncludePath($smarty);
+        }
+        // try PHP include_path
+        foreach ($dirs as $dir) {
+            $dir_n = isset($this->number[ $dir ]) ? $this->number[ $dir ] : $this->number[ $dir ] = $this->counter++;
+            if (isset($this->isFile[ $dir_n ][ $file ])) {
+                if ($this->isFile[ $dir_n ][ $file ]) {
+                    return $this->isFile[ $dir_n ][ $file ];
+                } else {
+                    continue;
+                }
+            }
+            if (isset($this->_user_dirs[ $dir_n ])) {
+                if (false === $this->_user_dirs[ $dir_n ]) {
+                    continue;
+                } else {
+                    $dir = $this->_user_dirs[ $dir_n ];
+                }
+            } else {
+                if ($dir[ 0 ] === '/' || $dir[ 1 ] === ':') {
+                    $dir = str_ireplace(getcwd(), '.', $dir);
+                    if ($dir[ 0 ] === '/' || $dir[ 1 ] === ':') {
+                        $this->_user_dirs[ $dir_n ] = false;
+                        continue;
+                    }
+                }
+                $dir = substr($dir, 2);
+                $this->_user_dirs[ $dir_n ] = $dir;
+            }
+            if ($this->_has_stream_include) {
+                $path = stream_resolve_include_path($dir . (isset($file) ? $file : ''));
+                if ($path) {
+                    return $this->isFile[ $dir_n ][ $file ] = $path;
+                }
+            } else {
+                foreach ($this->_include_dirs as $key => $_i_path) {
+                    $path = isset($this->isPath[ $key ][ $dir_n ]) ? $this->isPath[ $key ][ $dir_n ] :
+                        $this->isPath[ $key ][ $dir_n ] = is_dir($_dir_path = $_i_path . $dir) ? $_dir_path : false;
+                    if ($path === false) {
+                        continue;
+                    }
+                    if (isset($file)) {
+                        $_file = $this->isFile[ $dir_n ][ $file ] = (is_file($path . $file)) ? $path . $file : false;
+                        if ($_file) {
+                            return $_file;
+                        }
+                    } else {
+                        // no file was given return directory path
+                        return $path;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php
new file mode 100644
index 000000000..8f7f02d59
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_inheritance.php
@@ -0,0 +1,251 @@
+<?php
+
+/**
+ * Inheritance Runtime Methods processBlock, endChild, init
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ **/
+class Smarty_Internal_Runtime_Inheritance
+{
+    /**
+     * State machine
+     * - 0 idle next extends will create a new inheritance tree
+     * - 1 processing child template
+     * - 2 wait for next inheritance template
+     * - 3 assume parent template, if child will loaded goto state 1
+     *     a call to a sub template resets the state to 0
+     *
+     * @var int
+     */
+    public $state = 0;
+
+    /**
+     * Array of root child {block} objects
+     *
+     * @var Smarty_Internal_Block[]
+     */
+    public $childRoot = array();
+
+    /**
+     * inheritance template nesting level
+     *
+     * @var int
+     */
+    public $inheritanceLevel = 0;
+
+    /**
+     * inheritance template index
+     *
+     * @var int
+     */
+    public $tplIndex = -1;
+
+    /**
+     * Array of template source objects
+     *
+     * @var Smarty_Template_Source[]
+     */
+    public $sources = array();
+
+    /**
+     * Stack of source objects while executing block code
+     *
+     * @var Smarty_Template_Source[]
+     */
+    public $sourceStack = array();
+
+    /**
+     * Initialize inheritance
+     *
+     * @param \Smarty_Internal_Template $tpl        template object of caller
+     * @param bool                      $initChild  if true init for child template
+     * @param array                     $blockNames outer level block name
+     */
+    public function init(Smarty_Internal_Template $tpl, $initChild, $blockNames = array())
+    {
+        // if called while executing parent template it must be a sub-template with new inheritance root
+        if ($initChild && $this->state === 3 && (strpos($tpl->template_resource, 'extendsall') === false)) {
+            $tpl->inheritance = new Smarty_Internal_Runtime_Inheritance();
+            $tpl->inheritance->init($tpl, $initChild, $blockNames);
+            return;
+        }
+        ++$this->tplIndex;
+        $this->sources[ $this->tplIndex ] = $tpl->source;
+        // start of child sub template(s)
+        if ($initChild) {
+            $this->state = 1;
+            if (!$this->inheritanceLevel) {
+                //grab any output of child templates
+                ob_start();
+            }
+            ++$this->inheritanceLevel;
+            //           $tpl->startRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateStart');
+            //           $tpl->endRenderCallbacks[ 'inheritance' ] = array($this, 'subTemplateEnd');
+        }
+        // if state was waiting for parent change state to parent
+        if ($this->state === 2) {
+            $this->state = 3;
+        }
+    }
+
+    /**
+     * End of child template(s)
+     * - if outer level is reached flush output buffer and switch to wait for parent template state
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param null|string               $template optional name of inheritance parent template
+     * @param null|string               $uid      uid of inline template
+     * @param null|string               $func     function call name of inline template
+     *
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function endChild(Smarty_Internal_Template $tpl, $template = null, $uid = null, $func = null)
+    {
+        --$this->inheritanceLevel;
+        if (!$this->inheritanceLevel) {
+            ob_end_clean();
+            $this->state = 2;
+        }
+        if (isset($template) && (($tpl->parent->_isTplObj() && $tpl->parent->source->type !== 'extends')
+                                 || $tpl->smarty->extends_recursion)
+        ) {
+            $tpl->_subTemplateRender(
+                $template,
+                $tpl->cache_id,
+                $tpl->compile_id,
+                $tpl->caching ? 9999 : 0,
+                $tpl->cache_lifetime,
+                array(),
+                2,
+                false,
+                $uid,
+                $func
+            );
+        }
+    }
+
+    /**
+     * Smarty_Internal_Block constructor.
+     * - if outer level {block} of child template ($state === 1) save it as child root block
+     * - otherwise process inheritance and render
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param                           $className
+     * @param string                    $name
+     * @param int|null                  $tplIndex index of outer level {block} if nested
+     *
+     * @throws \SmartyException
+     */
+    public function instanceBlock(Smarty_Internal_Template $tpl, $className, $name, $tplIndex = null)
+    {
+        $block = new $className($name, isset($tplIndex) ? $tplIndex : $this->tplIndex);
+        if (isset($this->childRoot[ $name ])) {
+            $block->child = $this->childRoot[ $name ];
+        }
+        if ($this->state === 1) {
+            $this->childRoot[ $name ] = $block;
+            return;
+        }
+        // make sure we got child block of child template of current block
+        while ($block->child && $block->child->child && $block->tplIndex <= $block->child->tplIndex) {
+            $block->child = $block->child->child;
+        }
+        $this->process($tpl, $block);
+    }
+
+    /**
+     * Goto child block or render this
+     *
+     * @param \Smarty_Internal_Template   $tpl
+     * @param \Smarty_Internal_Block      $block
+     * @param \Smarty_Internal_Block|null $parent
+     *
+     * @throws \SmartyException
+     */
+    public function process(
+        Smarty_Internal_Template $tpl,
+        Smarty_Internal_Block $block,
+        Smarty_Internal_Block $parent = null
+    ) {
+        if ($block->hide && !isset($block->child)) {
+            return;
+        }
+        if (isset($block->child) && $block->child->hide && !isset($block->child->child)) {
+            $block->child = null;
+        }
+        $block->parent = $parent;
+        if ($block->append && !$block->prepend && isset($parent)) {
+            $this->callParent($tpl, $block, '\'{block append}\'');
+        }
+        if ($block->callsChild || !isset($block->child) || ($block->child->hide && !isset($block->child->child))) {
+            $this->callBlock($block, $tpl);
+        } else {
+            $this->process($tpl, $block->child, $block);
+        }
+        if ($block->prepend && isset($parent)) {
+            $this->callParent($tpl, $block, '{block prepend}');
+            if ($block->append) {
+                if ($block->callsChild || !isset($block->child)
+                    || ($block->child->hide && !isset($block->child->child))
+                ) {
+                    $this->callBlock($block, $tpl);
+                } else {
+                    $this->process($tpl, $block->child, $block);
+                }
+            }
+        }
+        $block->parent = null;
+    }
+
+    /**
+     * Render child on \$smarty.block.child
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param \Smarty_Internal_Block    $block
+     *
+     * @return null|string block content
+     * @throws \SmartyException
+     */
+    public function callChild(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block)
+    {
+        if (isset($block->child)) {
+            $this->process($tpl, $block->child, $block);
+        }
+    }
+
+    /**
+     * Render parent block on \$smarty.block.parent or {block append/prepend}
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param \Smarty_Internal_Block    $block
+     * @param string                    $tag
+     *
+     * @return null|string  block content
+     * @throws \SmartyException
+     */
+    public function callParent(Smarty_Internal_Template $tpl, Smarty_Internal_Block $block, $tag)
+    {
+        if (isset($block->parent)) {
+            $this->callBlock($block->parent, $tpl);
+        } else {
+            throw new SmartyException("inheritance: illegal '{$tag}' used in child template '{$tpl->inheritance->sources[$block->tplIndex]->filepath}' block '{$block->name}'");
+        }
+    }
+
+    /**
+     * render block
+     *
+     * @param \Smarty_Internal_Block    $block
+     * @param \Smarty_Internal_Template $tpl
+     */
+    public function callBlock(Smarty_Internal_Block $block, Smarty_Internal_Template $tpl)
+    {
+        $this->sourceStack[] = $tpl->source;
+        $tpl->source = $this->sources[ $block->tplIndex ];
+        $block->callBlock($tpl);
+        $tpl->source = array_pop($this->sourceStack);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_make_nocache.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_make_nocache.php
new file mode 100644
index 000000000..7994aa048
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_make_nocache.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * {make_nocache} Runtime Methods save(), store()
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Runtime_Make_Nocache
+{
+    /**
+     * Save current variable value while rendering compiled template and inject nocache code to
+     * assign variable value in cahed template
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param string                    $var variable name
+     *
+     * @throws \SmartyException
+     */
+    public function save(Smarty_Internal_Template $tpl, $var)
+    {
+        if (isset($tpl->tpl_vars[ $var ])) {
+            $export =
+                preg_replace('/^\\\\?Smarty_Variable::__set_state[(]|[)]$/', '', var_export($tpl->tpl_vars[ $var ], true));
+            if (preg_match('/(\w+)::__set_state/', $export, $match)) {
+                throw new SmartyException("{make_nocache \${$var}} in template '{$tpl->source->name}': variable does contain object '{$match[1]}' not implementing method '__set_state'");
+            }
+            echo "/*%%SmartyNocache:{$tpl->compiled->nocache_hash}%%*/<?php " .
+                 addcslashes("\$_smarty_tpl->smarty->ext->_make_nocache->store(\$_smarty_tpl, '{$var}', ", '\\') .
+                 $export . ");?>\n/*/%%SmartyNocache:{$tpl->compiled->nocache_hash}%%*/";
+        }
+    }
+
+    /**
+     * Store variable value saved while rendering compiled template in cached template context
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param string                    $var variable name
+     * @param array                     $properties
+     */
+    public function store(Smarty_Internal_Template $tpl, $var, $properties)
+    {
+        // do not overwrite existing nocache variables
+        if (!isset($tpl->tpl_vars[ $var ]) || !$tpl->tpl_vars[ $var ]->nocache) {
+            $newVar = new Smarty_Variable();
+            unset($properties[ 'nocache' ]);
+            foreach ($properties as $k => $v) {
+                $newVar->$k = $v;
+            }
+            $tpl->tpl_vars[ $var ] = $newVar;
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php
new file mode 100644
index 000000000..e5f8e48f7
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_tplfunction.php
@@ -0,0 +1,177 @@
+<?php
+
+/**
+ * TplFunction Runtime Methods callTemplateFunction
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ **/
+class Smarty_Internal_Runtime_TplFunction
+{
+    /**
+     * Call template function
+     *
+     * @param \Smarty_Internal_Template $tpl     template object
+     * @param string                    $name    template function name
+     * @param array                     $params  parameter array
+     * @param bool                      $nocache true if called nocache
+     *
+     * @throws \SmartyException
+     */
+    public function callTemplateFunction(Smarty_Internal_Template $tpl, $name, $params, $nocache)
+    {
+        $funcParam = isset($tpl->tplFunctions[ $name ]) ? $tpl->tplFunctions[ $name ] :
+            (isset($tpl->smarty->tplFunctions[ $name ]) ? $tpl->smarty->tplFunctions[ $name ] : null);
+        if (isset($funcParam)) {
+            if (!$tpl->caching || ($tpl->caching && $nocache)) {
+                $function = $funcParam[ 'call_name' ];
+            } else {
+                if (isset($funcParam[ 'call_name_caching' ])) {
+                    $function = $funcParam[ 'call_name_caching' ];
+                } else {
+                    $function = $funcParam[ 'call_name' ];
+                }
+            }
+            if (function_exists($function)) {
+                $this->saveTemplateVariables($tpl, $name);
+                $function($tpl, $params);
+                $this->restoreTemplateVariables($tpl, $name);
+                return;
+            }
+            // try to load template function dynamically
+            if ($this->addTplFuncToCache($tpl, $name, $function)) {
+                $this->saveTemplateVariables($tpl, $name);
+                $function($tpl, $params);
+                $this->restoreTemplateVariables($tpl, $name);
+                return;
+            }
+        }
+        throw new SmartyException("Unable to find template function '{$name}'");
+    }
+
+    /**
+     * Register template functions defined by template
+     *
+     * @param \Smarty|\Smarty_Internal_Template|\Smarty_Internal_TemplateBase $obj
+     * @param array                                                           $tplFunctions source information array of
+     *                                                                                      template functions defined
+     *                                                                                      in template
+     * @param bool                                                            $override     if true replace existing
+     *                                                                                      functions with same name
+     */
+    public function registerTplFunctions(Smarty_Internal_TemplateBase $obj, $tplFunctions, $override = true)
+    {
+        $obj->tplFunctions =
+            $override ? array_merge($obj->tplFunctions, $tplFunctions) : array_merge($tplFunctions, $obj->tplFunctions);
+        // make sure that the template functions are known in parent templates
+        if ($obj->_isSubTpl()) {
+            $obj->smarty->ext->_tplFunction->registerTplFunctions($obj->parent, $tplFunctions, false);
+        } else {
+            $obj->smarty->tplFunctions = $override ? array_merge($obj->smarty->tplFunctions, $tplFunctions) :
+                array_merge($tplFunctions, $obj->smarty->tplFunctions);
+        }
+    }
+
+    /**
+     * Return source parameter array for single or all template functions
+     *
+     * @param \Smarty_Internal_Template $tpl  template object
+     * @param null|string               $name template function name
+     *
+     * @return array|bool|mixed
+     */
+    public function getTplFunction(Smarty_Internal_Template $tpl, $name = null)
+    {
+        if (isset($name)) {
+            return isset($tpl->tplFunctions[ $name ]) ? $tpl->tplFunctions[ $name ] :
+                (isset($tpl->smarty->tplFunctions[ $name ]) ? $tpl->smarty->tplFunctions[ $name ] : false);
+        } else {
+            return empty($tpl->tplFunctions) ? $tpl->smarty->tplFunctions : $tpl->tplFunctions;
+        }
+    }
+
+    /**
+     * Add template function to cache file for nocache calls
+     *
+     * @param Smarty_Internal_Template $tpl
+     * @param string                   $_name     template function name
+     * @param string                   $_function PHP function name
+     *
+     * @return bool
+     */
+    public function addTplFuncToCache(Smarty_Internal_Template $tpl, $_name, $_function)
+    {
+        $funcParam = $tpl->tplFunctions[ $_name ];
+        if (is_file($funcParam[ 'compiled_filepath' ])) {
+            // read compiled file
+            $code = file_get_contents($funcParam[ 'compiled_filepath' ]);
+            // grab template function
+            if (preg_match("/\/\* {$_function} \*\/([\S\s]*?)\/\*\/ {$_function} \*\//", $code, $match)) {
+                // grab source info from file dependency
+                preg_match("/\s*'{$funcParam['uid']}'([\S\s]*?)\),/", $code, $match1);
+                unset($code);
+                // make PHP function known
+                eval($match[ 0 ]);
+                if (function_exists($_function)) {
+                    // search cache file template
+                    $tplPtr = $tpl;
+                    while (!isset($tplPtr->cached) && isset($tplPtr->parent)) {
+                        $tplPtr = $tplPtr->parent;
+                    }
+                    // add template function code to cache file
+                    if (isset($tplPtr->cached)) {
+                        $content = $tplPtr->cached->read($tplPtr);
+                        if ($content) {
+                            // check if we must update file dependency
+                            if (!preg_match("/'{$funcParam['uid']}'(.*?)'nocache_hash'/", $content, $match2)) {
+                                $content = preg_replace("/('file_dependency'(.*?)\()/", "\\1{$match1[0]}", $content);
+                            }
+                            $tplPtr->smarty->ext->_updateCache->write(
+                                $tplPtr,
+                                preg_replace('/\s*\?>\s*$/', "\n", $content) .
+                                "\n" . preg_replace(
+                                    array(
+                                        '/^\s*<\?php\s+/',
+                                        '/\s*\?>\s*$/',
+                                    ),
+                                    "\n",
+                                    $match[ 0 ]
+                                )
+                            );
+                        }
+                    }
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Save current template variables on stack
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param string                    $name stack name
+     */
+    public function saveTemplateVariables(Smarty_Internal_Template $tpl, $name)
+    {
+        $tpl->_cache[ 'varStack' ][] =
+            array('tpl' => $tpl->tpl_vars, 'config' => $tpl->config_vars, 'name' => "_tplFunction_{$name}");
+    }
+
+    /**
+     * Restore saved variables into template objects
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param string                    $name stack name
+     */
+    public function restoreTemplateVariables(Smarty_Internal_Template $tpl, $name)
+    {
+        if (isset($tpl->_cache[ 'varStack' ])) {
+            $vars = array_pop($tpl->_cache[ 'varStack' ]);
+            $tpl->tpl_vars = $vars[ 'tpl' ];
+            $tpl->config_vars = $vars[ 'config' ];
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php
new file mode 100644
index 000000000..c1abbb321
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatecache.php
@@ -0,0 +1,183 @@
+<?php
+
+/**
+ * Inline Runtime Methods render, setSourceByUid, setupSubTemplate
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ **/
+class Smarty_Internal_Runtime_UpdateCache
+{
+    /**
+     * check client side cache
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template
+     * @param string                   $content
+     */
+    public function cacheModifiedCheck(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $content)
+    {
+    }
+
+    /**
+     * Cache was invalid , so render from compiled and write to cache
+     *
+     * @param \Smarty_Template_Cached   $cached
+     * @param \Smarty_Internal_Template $_template
+     * @param                           $no_output_filter
+     *
+     * @throws \Exception
+     */
+    public function updateCache(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template, $no_output_filter)
+    {
+        ob_start();
+        if (!isset($_template->compiled)) {
+            $_template->loadCompiled();
+        }
+        $_template->compiled->render($_template);
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->start_cache($_template);
+        }
+        $this->removeNoCacheHash($cached, $_template, $no_output_filter);
+        $compile_check = (int)$_template->compile_check;
+        $_template->compile_check = Smarty::COMPILECHECK_OFF;
+        if ($_template->_isSubTpl()) {
+            $_template->compiled->unifunc = $_template->parent->compiled->unifunc;
+        }
+        if (!$_template->cached->processed) {
+            $_template->cached->process($_template, true);
+        }
+        $_template->compile_check = $compile_check;
+        $cached->getRenderedTemplateCode($_template);
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->end_cache($_template);
+        }
+    }
+
+    /**
+     * Sanitize content and write it to cache resource
+     *
+     * @param \Smarty_Template_Cached  $cached
+     * @param Smarty_Internal_Template $_template
+     * @param bool                     $no_output_filter
+     *
+     * @throws \SmartyException
+     */
+    public function removeNoCacheHash(
+        Smarty_Template_Cached $cached,
+        Smarty_Internal_Template $_template,
+        $no_output_filter
+    ) {
+        $php_pattern = '/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/';
+        $content = ob_get_clean();
+        $hash_array = $cached->hashes;
+        $hash_array[ $_template->compiled->nocache_hash ] = true;
+        $hash_array = array_keys($hash_array);
+        $nocache_hash = '(' . implode('|', $hash_array) . ')';
+        $_template->cached->has_nocache_code = false;
+        // get text between non-cached items
+        $cache_split =
+            preg_split(
+                "!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s",
+                $content
+            );
+        // get non-cached items
+        preg_match_all(
+            "!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s",
+            $content,
+            $cache_parts
+        );
+        $content = '';
+        // loop over items, stitch back together
+        foreach ($cache_split as $curr_idx => $curr_split) {
+            if (preg_match($php_pattern, $curr_split)) {
+                // escape PHP tags in template content
+                $php_split = preg_split(
+                    $php_pattern,
+                    $curr_split
+                );
+                preg_match_all(
+                    $php_pattern,
+                    $curr_split,
+                    $php_parts
+                );
+                foreach ($php_split as $idx_php => $curr_php) {
+                    $content .= $curr_php;
+                    if (isset($php_parts[ 0 ][ $idx_php ])) {
+                        $content .= "<?php echo '{$php_parts[ 1 ][ $idx_php ]}'; ?>\n";
+                    }
+                }
+            } else {
+                $content .= $curr_split;
+            }
+            if (isset($cache_parts[ 0 ][ $curr_idx ])) {
+                $_template->cached->has_nocache_code = true;
+                $content .= $cache_parts[ 2 ][ $curr_idx ];
+            }
+        }
+        if (!$no_output_filter && !$_template->cached->has_nocache_code
+            && (isset($_template->smarty->autoload_filters[ 'output' ])
+                || isset($_template->smarty->registered_filters[ 'output' ]))
+        ) {
+            $content = $_template->smarty->ext->_filterHandler->runFilter('output', $content, $_template);
+        }
+        // write cache file content
+        $this->writeCachedContent($_template, $content);
+    }
+
+    /**
+     * Writes the content to cache resource
+     *
+     * @param Smarty_Internal_Template $_template
+     * @param string                   $content
+     *
+     * @return bool
+     */
+    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
+    {
+        if ($_template->source->handler->recompiled || !$_template->caching
+        ) {
+            // don't write cache file
+            return false;
+        }
+        if (!isset($_template->cached)) {
+            $_template->loadCached();
+        }
+        $content = $_template->smarty->ext->_codeFrame->create($_template, $content, '', true);
+        return $this->write($_template, $content);
+    }
+
+    /**
+     * Write this cache object to handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return bool success
+     */
+    public function write(Smarty_Internal_Template $_template, $content)
+    {
+        if (!$_template->source->handler->recompiled) {
+            $cached = $_template->cached;
+            if ($cached->handler->writeCachedContent($_template, $content)) {
+                $cached->content = null;
+                $cached->timestamp = time();
+                $cached->exists = true;
+                $cached->valid = true;
+                $cached->cache_lifetime = $_template->cache_lifetime;
+                $cached->processed = false;
+                if ($_template->smarty->cache_locking) {
+                    $cached->handler->releaseLock($_template->smarty, $cached);
+                }
+                return true;
+            }
+            $cached->content = null;
+            $cached->timestamp = false;
+            $cached->exists = false;
+            $cached->valid = false;
+            $cached->processed = false;
+        }
+        return false;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php
new file mode 100644
index 000000000..2240f97ca
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_updatescope.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * Runtime Extension updateScope
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ **/
+class Smarty_Internal_Runtime_UpdateScope
+{
+    /**
+     * Update new assigned template or config variable in other effected scopes
+     *
+     * @param Smarty_Internal_Template $tpl      data object
+     * @param string|null              $varName  variable name
+     * @param int                      $tagScope tag scope to which bubble up variable value
+     */
+    public function _updateScope(Smarty_Internal_Template $tpl, $varName, $tagScope = 0)
+    {
+        if ($tagScope) {
+            $this->_updateVarStack($tpl, $varName);
+            $tagScope = $tagScope & ~Smarty::SCOPE_LOCAL;
+            if (!$tpl->scope && !$tagScope) {
+                return;
+            }
+        }
+        $mergedScope = $tagScope | $tpl->scope;
+        if ($mergedScope) {
+            if ($mergedScope & Smarty::SCOPE_GLOBAL && $varName) {
+                Smarty::$global_tpl_vars[ $varName ] = $tpl->tpl_vars[ $varName ];
+            }
+            // update scopes
+            foreach ($this->_getAffectedScopes($tpl, $mergedScope) as $ptr) {
+                $this->_updateVariableInOtherScope($ptr->tpl_vars, $tpl, $varName);
+                if ($tagScope && $ptr->_isTplObj() && isset($tpl->_cache[ 'varStack' ])) {
+                    $this->_updateVarStack($ptr, $varName);
+                }
+            }
+        }
+    }
+
+    /**
+     * Get array of objects which needs to be updated  by given scope value
+     *
+     * @param Smarty_Internal_Template $tpl
+     * @param int                      $mergedScope merged tag and template scope to which bubble up variable value
+     *
+     * @return array
+     */
+    public function _getAffectedScopes(Smarty_Internal_Template $tpl, $mergedScope)
+    {
+        $_stack = array();
+        $ptr = $tpl->parent;
+        if ($mergedScope && isset($ptr) && $ptr->_isTplObj()) {
+            $_stack[] = $ptr;
+            $mergedScope = $mergedScope & ~Smarty::SCOPE_PARENT;
+            if (!$mergedScope) {
+                // only parent was set, we are done
+                return $_stack;
+            }
+            $ptr = $ptr->parent;
+        }
+        while (isset($ptr) && $ptr->_isTplObj()) {
+            $_stack[] = $ptr;
+            $ptr = $ptr->parent;
+        }
+        if ($mergedScope & Smarty::SCOPE_SMARTY) {
+            if (isset($tpl->smarty)) {
+                $_stack[] = $tpl->smarty;
+            }
+        } elseif ($mergedScope & Smarty::SCOPE_ROOT) {
+            while (isset($ptr)) {
+                if (!$ptr->_isTplObj()) {
+                    $_stack[] = $ptr;
+                    break;
+                }
+                $ptr = $ptr->parent;
+            }
+        }
+        return $_stack;
+    }
+
+    /**
+     * Update variable in other scope
+     *
+     * @param array                     $tpl_vars template variable array
+     * @param \Smarty_Internal_Template $from
+     * @param string                    $varName  variable name
+     */
+    public function _updateVariableInOtherScope(&$tpl_vars, Smarty_Internal_Template $from, $varName)
+    {
+        if (!isset($tpl_vars[ $varName ])) {
+            $tpl_vars[ $varName ] = clone $from->tpl_vars[ $varName ];
+        } else {
+            $tpl_vars[ $varName ] = clone $tpl_vars[ $varName ];
+            $tpl_vars[ $varName ]->value = $from->tpl_vars[ $varName ]->value;
+        }
+    }
+
+    /**
+     * Update variable in template local variable stack
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param string|null               $varName variable name or null for config variables
+     */
+    public function _updateVarStack(Smarty_Internal_Template $tpl, $varName)
+    {
+        $i = 0;
+        while (isset($tpl->_cache[ 'varStack' ][ $i ])) {
+            $this->_updateVariableInOtherScope($tpl->_cache[ 'varStack' ][ $i ][ 'tpl' ], $tpl, $varName);
+            $i++;
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php
new file mode 100644
index 000000000..492d5eb25
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_writefile.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Smarty write file plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Monte Ohrt
+ */
+
+/**
+ * Smarty Internal Write File Class
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ */
+class Smarty_Internal_Runtime_WriteFile
+{
+    /**
+     * Writes file in a safe way to disk
+     *
+     * @param string $_filepath complete filepath
+     * @param string $_contents file content
+     * @param Smarty $smarty    smarty instance
+     *
+     * @throws SmartyException
+     * @return boolean true
+     */
+    public function writeFile($_filepath, $_contents, Smarty $smarty)
+    {
+        $_error_reporting = error_reporting();
+        error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
+        $_dirpath = dirname($_filepath);
+        // if subdirs, create dir structure
+        if ($_dirpath !== '.') {
+            $i = 0;
+            // loop if concurrency problem occurs
+            // see https://bugs.php.net/bug.php?id=35326
+            while (!is_dir($_dirpath)) {
+                if (@mkdir($_dirpath, 0777, true)) {
+                    break;
+                }
+                clearstatcache();
+                if (++$i === 3) {
+                    error_reporting($_error_reporting);
+                    throw new SmartyException("unable to create directory {$_dirpath}");
+                }
+                sleep(1);
+            }
+        }
+        // write to tmp file, then move to overt file lock race condition
+        $_tmp_file = $_dirpath . DIRECTORY_SEPARATOR . str_replace(array('.', ','), '_', uniqid('wrt', true));
+        if (!file_put_contents($_tmp_file, $_contents)) {
+            error_reporting($_error_reporting);
+            throw new SmartyException("unable to write file {$_tmp_file}");
+        }
+        /*
+         * Windows' rename() fails if the destination exists,
+         * Linux' rename() properly handles the overwrite.
+         * Simply unlink()ing a file might cause other processes
+         * currently reading that file to fail, but linux' rename()
+         * seems to be smart enough to handle that for us.
+         */
+        if (Smarty::$_IS_WINDOWS) {
+            // remove original file
+            if (is_file($_filepath)) {
+                @unlink($_filepath);
+            }
+            // rename tmp file
+            $success = @rename($_tmp_file, $_filepath);
+        } else {
+            // rename tmp file
+            $success = @rename($_tmp_file, $_filepath);
+            if (!$success) {
+                // remove original file
+                if (is_file($_filepath)) {
+                    @unlink($_filepath);
+                }
+                // rename tmp file
+                $success = @rename($_tmp_file, $_filepath);
+            }
+        }
+        if (!$success) {
+            error_reporting($_error_reporting);
+            throw new SmartyException("unable to write file {$_filepath}");
+        }
+        // set file permissions
+        @chmod($_filepath, 0666 & ~umask());
+        error_reporting($_error_reporting);
+        return true;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
new file mode 100644
index 000000000..21f4e3fdd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_smartytemplatecompiler.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Smarty Internal Plugin Smarty Template Compiler Base
+ * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Class SmartyTemplateCompiler
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ */
+class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase
+{
+    /**
+     * Lexer class name
+     *
+     * @var string
+     */
+    public $lexer_class;
+
+    /**
+     * Parser class name
+     *
+     * @var string
+     */
+    public $parser_class;
+
+    /**
+     * array of vars which can be compiled in local scope
+     *
+     * @var array
+     */
+    public $local_var = array();
+
+    /**
+     * array of callbacks called when the normal compile process of template is finished
+     *
+     * @var array
+     */
+    public $postCompileCallbacks = array();
+
+    /**
+     * prefix code
+     *
+     * @var string
+     */
+    public $prefixCompiledCode = '';
+
+    /**
+     * postfix code
+     *
+     * @var string
+     */
+    public $postfixCompiledCode = '';
+
+    /**
+     * Initialize compiler
+     *
+     * @param string $lexer_class  class name
+     * @param string $parser_class class name
+     * @param Smarty $smarty       global instance
+     */
+    public function __construct($lexer_class, $parser_class, Smarty $smarty)
+    {
+        parent::__construct($smarty);
+        // get required plugins
+        $this->lexer_class = $lexer_class;
+        $this->parser_class = $parser_class;
+    }
+
+    /**
+     * method to compile a Smarty template
+     *
+     * @param mixed $_content template source
+     * @param bool  $isTemplateSource
+     *
+     * @return bool true if compiling succeeded, false if it failed
+     * @throws \SmartyCompilerException
+     */
+    protected function doCompile($_content, $isTemplateSource = false)
+    {
+        /* here is where the compiling takes place. Smarty
+          tags in the templates are replaces with PHP code,
+          then written to compiled files. */
+        // init the lexer/parser to compile the template
+        $this->parser =
+            new $this->parser_class(
+                new $this->lexer_class(
+                    str_replace(
+                        array(
+                            "\r\n",
+                            "\r"
+                        ),
+                        "\n",
+                        $_content
+                    ),
+                    $this
+                ),
+                $this
+            );
+        if ($isTemplateSource && $this->template->caching) {
+            $this->parser->insertPhpCode("<?php\n\$_smarty_tpl->compiled->nocache_hash = '{$this->nocache_hash}';\n?>\n");
+        }
+        if (function_exists('mb_internal_encoding')
+            && function_exists('ini_get')
+            && ((int)ini_get('mbstring.func_overload')) & 2
+        ) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('ASCII');
+        } else {
+            $mbEncoding = null;
+        }
+        if ($this->smarty->_parserdebug) {
+            $this->parser->PrintTrace();
+            $this->parser->lex->PrintTrace();
+        }
+        // get tokens from lexer and parse them
+        while ($this->parser->lex->yylex()) {
+            if ($this->smarty->_parserdebug) {
+                echo "<pre>Line {$this->parser->lex->line} Parsing  {$this->parser->yyTokenName[$this->parser->lex->token]} Token " .
+                     htmlentities($this->parser->lex->value) . "</pre>";
+            }
+            $this->parser->doParse($this->parser->lex->token, $this->parser->lex->value);
+        }
+        // finish parsing process
+        $this->parser->doParse(0, 0);
+        if ($mbEncoding) {
+            mb_internal_encoding($mbEncoding);
+        }
+        // check for unclosed tags
+        if (count($this->_tag_stack) > 0) {
+            // get stacked info
+            list($openTag, $_data) = array_pop($this->_tag_stack);
+            $this->trigger_template_error(
+                "unclosed {$this->smarty->left_delimiter}" . $openTag .
+                "{$this->smarty->right_delimiter} tag"
+            );
+        }
+        // call post compile callbacks
+        foreach ($this->postCompileCallbacks as $cb) {
+            $parameter = $cb;
+            $parameter[ 0 ] = $this;
+            call_user_func_array($cb[ 0 ], $parameter);
+        }
+        // return compiled code
+        return $this->prefixCompiledCode . $this->parser->retvalue . $this->postfixCompiledCode;
+    }
+
+    /**
+     * Register a post compile callback
+     * - when the callback is called after template compiling the compiler object will be inserted as first parameter
+     *
+     * @param callback $callback
+     * @param array    $parameter optional parameter array
+     * @param string   $key       optional key for callback
+     * @param bool     $replace   if true replace existing keyed callback
+     */
+    public function registerPostCompileCallback($callback, $parameter = array(), $key = null, $replace = false)
+    {
+        array_unshift($parameter, $callback);
+        if (isset($key)) {
+            if ($replace || !isset($this->postCompileCallbacks[ $key ])) {
+                $this->postCompileCallbacks[ $key ] = $parameter;
+            }
+        } else {
+            $this->postCompileCallbacks[] = $parameter;
+        }
+    }
+
+    /**
+     * Remove a post compile callback
+     *
+     * @param string $key callback key
+     */
+    public function unregisterPostCompileCallback($key)
+    {
+        unset($this->postCompileCallbacks[ $key ]);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_template.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_template.php
new file mode 100644
index 000000000..72d1d52e0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_template.php
@@ -0,0 +1,741 @@
+<?php
+/**
+ * Smarty Internal Plugin Template
+ * This file contains the Smarty template engine
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * Main class with template data structures and methods
+ *
+ * @package    Smarty
+ * @subpackage Template
+ *
+ * @property Smarty_Template_Compiled             $compiled
+ * @property Smarty_Template_Cached               $cached
+ * @property Smarty_Internal_TemplateCompilerBase $compiler
+ * @property mixed|\Smarty_Template_Cached        registered_plugins
+ *
+ * The following methods will be dynamically loaded by the extension handler when they are called.
+ * They are located in a corresponding Smarty_Internal_Method_xxxx class
+ *
+ * @method bool mustCompile()
+ */
+#[\AllowDynamicProperties]
+class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
+{
+    /**
+     * Template object cache
+     *
+     * @var Smarty_Internal_Template[]
+     */
+    public static $tplObjCache = array();
+
+    /**
+     * Template object cache for Smarty::isCached() === true
+     *
+     * @var Smarty_Internal_Template[]
+     */
+    public static $isCacheTplObj = array();
+
+    /**
+     * Sub template Info Cache
+     * - index name
+     * - value use count
+     *
+     * @var int[]
+     */
+    public static $subTplInfo = array();
+
+    /**
+     * This object type (Smarty = 1, template = 2, data = 4)
+     *
+     * @var int
+     */
+    public $_objType = 2;
+
+    /**
+     * Global smarty instance
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * Source instance
+     *
+     * @var Smarty_Template_Source|Smarty_Template_Config
+     */
+    public $source = null;
+
+    /**
+     * Inheritance runtime extension
+     *
+     * @var Smarty_Internal_Runtime_Inheritance
+     */
+    public $inheritance = null;
+
+    /**
+     * Template resource
+     *
+     * @var string
+     */
+    public $template_resource = null;
+
+    /**
+     * flag if compiled template is invalid and must be (re)compiled
+     *
+     * @var bool
+     */
+    public $mustCompile = null;
+
+    /**
+     * Template Id
+     *
+     * @var null|string
+     */
+    public $templateId = null;
+
+    /**
+     * Scope in which variables shall be assigned
+     *
+     * @var int
+     */
+    public $scope = 0;
+
+    /**
+     * Flag which is set while rending a cache file
+     *
+     * @var bool
+     */
+    public $isRenderingCache = false;
+
+    /**
+     * Callbacks called before rendering template
+     *
+     * @var callback[]
+     */
+    public $startRenderCallbacks = array();
+
+    /**
+     * Callbacks called after rendering template
+     *
+     * @var callback[]
+     */
+    public $endRenderCallbacks = array();
+
+    /**
+     * Create template data object
+     * Some of the global Smarty settings copied to template scope
+     * It load the required template resources and caching plugins
+     *
+     * @param string                                                       $template_resource template resource string
+     * @param Smarty                                                       $smarty            Smarty instance
+     * @param null|\Smarty_Internal_Template|\Smarty|\Smarty_Internal_Data $_parent           back pointer to parent
+     *                                                                                        object with variables or
+     *                                                                                        null
+     * @param mixed                                                        $_cache_id         cache   id or null
+     * @param mixed                                                        $_compile_id       compile id or null
+     * @param bool|int|null                                                $_caching          use caching?
+     * @param int|null                                                     $_cache_lifetime   cache life-time in
+     *                                                                                        seconds
+     * @param bool                                                         $_isConfig
+     *
+     * @throws \SmartyException
+     */
+    public function __construct(
+        $template_resource,
+        Smarty $smarty,
+        Smarty_Internal_Data $_parent = null,
+        $_cache_id = null,
+        $_compile_id = null,
+        $_caching = null,
+        $_cache_lifetime = null,
+        $_isConfig = false
+    ) {
+        $this->smarty = $smarty;
+        // Smarty parameter
+        $this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id;
+        $this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id;
+        $this->caching = (int)($_caching === null ? $this->smarty->caching : $_caching);
+        $this->cache_lifetime = $_cache_lifetime === null ? $this->smarty->cache_lifetime : $_cache_lifetime;
+        $this->compile_check = (int)$smarty->compile_check;
+        $this->parent = $_parent;
+        // Template resource
+        $this->template_resource = $template_resource;
+        $this->source = $_isConfig ? Smarty_Template_Config::load($this) : Smarty_Template_Source::load($this);
+        parent::__construct();
+        if ($smarty->security_policy && method_exists($smarty->security_policy, 'registerCallBacks')) {
+            $smarty->security_policy->registerCallBacks($this);
+        }
+    }
+
+    /**
+     * render template
+     *
+     * @param bool      $no_output_filter if true do not run output filter
+     * @param null|bool $display          true: display, false: fetch null: sub-template
+     *
+     * @return string
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function render($no_output_filter = true, $display = null)
+    {
+        if ($this->smarty->debugging) {
+            if (!isset($this->smarty->_debug)) {
+                $this->smarty->_debug = new Smarty_Internal_Debug();
+            }
+            $this->smarty->_debug->start_template($this, $display);
+        }
+        // checks if template exists
+        if (!$this->source->exists) {
+            throw new SmartyException(
+                "Unable to load template '{$this->source->type}:{$this->source->name}'" .
+                ($this->_isSubTpl() ? " in '{$this->parent->template_resource}'" : '')
+            );
+        }
+        // disable caching for evaluated code
+        if ($this->source->handler->recompiled) {
+            $this->caching = Smarty::CACHING_OFF;
+        }
+        // read from cache or render
+        if ($this->caching === Smarty::CACHING_LIFETIME_CURRENT || $this->caching === Smarty::CACHING_LIFETIME_SAVED) {
+            if (!isset($this->cached) || $this->cached->cache_id !== $this->cache_id
+                || $this->cached->compile_id !== $this->compile_id
+            ) {
+                $this->loadCached(true);
+            }
+            $this->cached->render($this, $no_output_filter);
+        } else {
+            if (!isset($this->compiled) || $this->compiled->compile_id !== $this->compile_id) {
+                $this->loadCompiled(true);
+            }
+            $this->compiled->render($this);
+        }
+        // display or fetch
+        if ($display) {
+            if ($this->caching && $this->smarty->cache_modified_check) {
+                $this->smarty->ext->_cacheModify->cacheModifiedCheck(
+                    $this->cached,
+                    $this,
+                    isset($content) ? $content : ob_get_clean()
+                );
+            } else {
+                if ((!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled)
+                    && !$no_output_filter && (isset($this->smarty->autoload_filters[ 'output' ])
+                                              || isset($this->smarty->registered_filters[ 'output' ]))
+                ) {
+                    echo $this->smarty->ext->_filterHandler->runFilter('output', ob_get_clean(), $this);
+                } else {
+                    echo ob_get_clean();
+                }
+            }
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->end_template($this);
+                // debug output
+                $this->smarty->_debug->display_debug($this, true);
+            }
+            return '';
+        } else {
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->end_template($this);
+                if ($this->smarty->debugging === 2 && $display === false) {
+                    $this->smarty->_debug->display_debug($this, true);
+                }
+            }
+            if (!$no_output_filter
+                && (!$this->caching || $this->cached->has_nocache_code || $this->source->handler->recompiled)
+                && (isset($this->smarty->autoload_filters[ 'output' ])
+                    || isset($this->smarty->registered_filters[ 'output' ]))
+            ) {
+                return $this->smarty->ext->_filterHandler->runFilter('output', ob_get_clean(), $this);
+            }
+            // return cache content
+            return null;
+        }
+    }
+
+    /**
+     * Runtime function to render sub-template
+     *
+     * @param string  $template       template name
+     * @param mixed   $cache_id       cache id
+     * @param mixed   $compile_id     compile id
+     * @param integer $caching        cache mode
+     * @param integer $cache_lifetime life time of cache data
+     * @param array   $data           passed parameter template variables
+     * @param int     $scope          scope in which {include} should execute
+     * @param bool    $forceTplCache  cache template object
+     * @param string  $uid            file dependency uid
+     * @param string  $content_func   function name
+     *
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function _subTemplateRender(
+        $template,
+        $cache_id,
+        $compile_id,
+        $caching,
+        $cache_lifetime,
+        $data,
+        $scope,
+        $forceTplCache,
+        $uid = null,
+        $content_func = null
+    ) {
+        $tpl = clone $this;
+        $tpl->parent = $this;
+        $smarty = &$this->smarty;
+        $_templateId = $smarty->_getTemplateId($template, $cache_id, $compile_id, $caching, $tpl);
+        // recursive call ?
+        if ((isset($tpl->templateId) ? $tpl->templateId : $tpl->_getTemplateId()) !== $_templateId) {
+            // already in template cache?
+            if (isset(self::$tplObjCache[ $_templateId ])) {
+                // copy data from cached object
+                $cachedTpl = &self::$tplObjCache[ $_templateId ];
+                $tpl->templateId = $cachedTpl->templateId;
+                $tpl->template_resource = $cachedTpl->template_resource;
+                $tpl->cache_id = $cachedTpl->cache_id;
+                $tpl->compile_id = $cachedTpl->compile_id;
+                $tpl->source = $cachedTpl->source;
+                if (isset($cachedTpl->compiled)) {
+                    $tpl->compiled = $cachedTpl->compiled;
+                } else {
+                    unset($tpl->compiled);
+                }
+                if ($caching !== 9999 && isset($cachedTpl->cached)) {
+                    $tpl->cached = $cachedTpl->cached;
+                } else {
+                    unset($tpl->cached);
+                }
+            } else {
+                $tpl->templateId = $_templateId;
+                $tpl->template_resource = $template;
+                $tpl->cache_id = $cache_id;
+                $tpl->compile_id = $compile_id;
+                if (isset($uid)) {
+                    // for inline templates we can get all resource information from file dependency
+                    list($filepath, $timestamp, $type) = $tpl->compiled->file_dependency[ $uid ];
+                    $tpl->source = new Smarty_Template_Source($smarty, $filepath, $type, $filepath);
+                    $tpl->source->filepath = $filepath;
+                    $tpl->source->timestamp = $timestamp;
+                    $tpl->source->exists = true;
+                    $tpl->source->uid = $uid;
+                } else {
+                    $tpl->source = Smarty_Template_Source::load($tpl);
+                    unset($tpl->compiled);
+                }
+                if ($caching !== 9999) {
+                    unset($tpl->cached);
+                }
+            }
+        } else {
+            // on recursive calls force caching
+            $forceTplCache = true;
+        }
+        $tpl->caching = $caching;
+        $tpl->cache_lifetime = $cache_lifetime;
+        // set template scope
+        $tpl->scope = $scope;
+        if (!isset(self::$tplObjCache[ $tpl->templateId ]) && !$tpl->source->handler->recompiled) {
+            // check if template object should be cached
+            if ($forceTplCache || (isset(self::$subTplInfo[ $tpl->template_resource ])
+                                   && self::$subTplInfo[ $tpl->template_resource ] > 1)
+                || ($tpl->_isSubTpl() && isset(self::$tplObjCache[ $tpl->parent->templateId ]))
+            ) {
+                self::$tplObjCache[ $tpl->templateId ] = $tpl;
+            }
+        }
+        if (!empty($data)) {
+            // set up variable values
+            foreach ($data as $_key => $_val) {
+                $tpl->tpl_vars[ $_key ] = new Smarty_Variable($_val, $this->isRenderingCache);
+            }
+        }
+        if ($tpl->caching === 9999) {
+            if (!isset($tpl->compiled)) {
+                $tpl->loadCompiled(true);
+            }
+            if ($tpl->compiled->has_nocache_code) {
+                $this->cached->hashes[ $tpl->compiled->nocache_hash ] = true;
+            }
+        }
+        $tpl->_cache = array();
+        if (isset($uid)) {
+            if ($smarty->debugging) {
+                if (!isset($smarty->_debug)) {
+                    $smarty->_debug = new Smarty_Internal_Debug();
+                }
+                $smarty->_debug->start_template($tpl);
+                $smarty->_debug->start_render($tpl);
+            }
+            $tpl->compiled->getRenderedTemplateCode($tpl, $content_func);
+            if ($smarty->debugging) {
+                $smarty->_debug->end_template($tpl);
+                $smarty->_debug->end_render($tpl);
+            }
+        } else {
+            if (isset($tpl->compiled)) {
+                $tpl->compiled->render($tpl);
+            } else {
+                $tpl->render();
+            }
+        }
+    }
+
+    /**
+     * Get called sub-templates and save call count
+     */
+    public function _subTemplateRegister()
+    {
+        foreach ($this->compiled->includes as $name => $count) {
+            if (isset(self::$subTplInfo[ $name ])) {
+                self::$subTplInfo[ $name ] += $count;
+            } else {
+                self::$subTplInfo[ $name ] = $count;
+            }
+        }
+    }
+
+    /**
+     * Check if this is a sub template
+     *
+     * @return bool true is sub template
+     */
+    public function _isSubTpl()
+    {
+        return isset($this->parent) && $this->parent->_isTplObj();
+    }
+
+    /**
+     * Assign variable in scope
+     *
+     * @param string $varName variable name
+     * @param mixed  $value   value
+     * @param bool   $nocache nocache flag
+     * @param int    $scope   scope into which variable shall be assigned
+     */
+    public function _assignInScope($varName, $value, $nocache = false, $scope = 0)
+    {
+        if (isset($this->tpl_vars[ $varName ])) {
+            $this->tpl_vars[ $varName ] = clone $this->tpl_vars[ $varName ];
+            $this->tpl_vars[ $varName ]->value = $value;
+            if ($nocache || $this->isRenderingCache) {
+                $this->tpl_vars[ $varName ]->nocache = true;
+            }
+        } else {
+            $this->tpl_vars[ $varName ] = new Smarty_Variable($value, $nocache || $this->isRenderingCache);
+        }
+        if ($scope >= 0) {
+            if ($scope > 0 || $this->scope > 0) {
+                $this->smarty->ext->_updateScope->_updateScope($this, $varName, $scope);
+            }
+        }
+    }
+
+    /**
+     * Check if plugins are callable require file otherwise
+     *
+     * @param array $plugins required plugins
+     *
+     * @throws \SmartyException
+     */
+    public function _checkPlugins($plugins)
+    {
+        static $checked = array();
+        foreach ($plugins as $plugin) {
+            $name = join('::', (array)$plugin[ 'function' ]);
+            if (!isset($checked[ $name ])) {
+                if (!is_callable($plugin[ 'function' ])) {
+                    if (is_file($plugin[ 'file' ])) {
+                        include_once $plugin[ 'file' ];
+                        if (is_callable($plugin[ 'function' ])) {
+                            $checked[ $name ] = true;
+                        }
+                    }
+                } else {
+                    $checked[ $name ] = true;
+                }
+            }
+            if (!isset($checked[ $name ])) {
+                if (false !== $this->smarty->loadPlugin($name)) {
+                    $checked[ $name ] = true;
+                } else {
+                    throw new SmartyException("Plugin '{$name}' not callable");
+                }
+            }
+        }
+    }
+
+    /**
+     * This function is executed automatically when a compiled or cached template file is included
+     * - Decode saved properties from compiled template and cache files
+     * - Check if compiled or cache file is valid
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param array                     $properties special template properties
+     * @param bool                      $cache      flag if called from cache file
+     *
+     * @return bool flag if compiled or cache file is valid
+     * @throws \SmartyException
+     */
+    public function _decodeProperties(Smarty_Internal_Template $tpl, $properties, $cache = false)
+    {
+        // on cache resources other than file check version stored in cache code
+        if (!isset($properties[ 'version' ]) || Smarty::SMARTY_VERSION !== $properties[ 'version' ]) {
+            if ($cache) {
+                $tpl->smarty->clearAllCache();
+            } else {
+                $tpl->smarty->clearCompiledTemplate();
+            }
+            return false;
+        }
+        $is_valid = true;
+        if (!empty($properties[ 'file_dependency' ])
+            && ((!$cache && $tpl->compile_check) || $tpl->compile_check === Smarty::COMPILECHECK_ON)
+        ) {
+            // check file dependencies at compiled code
+            foreach ($properties[ 'file_dependency' ] as $_file_to_check) {
+                if ($_file_to_check[ 2 ] === 'file' || $_file_to_check[ 2 ] === 'php') {
+                    if ($tpl->source->filepath === $_file_to_check[ 0 ]) {
+                        // do not recheck current template
+                        continue;
+                        //$mtime = $tpl->source->getTimeStamp();
+                    } else {
+                        // file and php types can be checked without loading the respective resource handlers
+                        $mtime = is_file($_file_to_check[ 0 ]) ? filemtime($_file_to_check[ 0 ]) : false;
+                    }
+                } else {
+                    $handler = Smarty_Resource::load($tpl->smarty, $_file_to_check[ 2 ]);
+                    if ($handler->checkTimestamps()) {
+                        $source = Smarty_Template_Source::load($tpl, $tpl->smarty, $_file_to_check[ 0 ]);
+                        $mtime = $source->getTimeStamp();
+                    } else {
+                        continue;
+                    }
+                }
+                if ($mtime === false || $mtime > $_file_to_check[ 1 ]) {
+                    $is_valid = false;
+                    break;
+                }
+            }
+        }
+        if ($cache) {
+            // CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
+            if ($tpl->caching === Smarty::CACHING_LIFETIME_SAVED && $properties[ 'cache_lifetime' ] >= 0
+                && (time() > ($tpl->cached->timestamp + $properties[ 'cache_lifetime' ]))
+            ) {
+                $is_valid = false;
+            }
+            $tpl->cached->cache_lifetime = $properties[ 'cache_lifetime' ];
+            $tpl->cached->valid = $is_valid;
+            $resource = $tpl->cached;
+        } else {
+            $tpl->mustCompile = !$is_valid;
+            $resource = $tpl->compiled;
+            $resource->includes = isset($properties[ 'includes' ]) ? $properties[ 'includes' ] : array();
+        }
+        if ($is_valid) {
+            $resource->unifunc = $properties[ 'unifunc' ];
+            $resource->has_nocache_code = $properties[ 'has_nocache_code' ];
+            //            $tpl->compiled->nocache_hash = $properties['nocache_hash'];
+            $resource->file_dependency = $properties[ 'file_dependency' ];
+        }
+        return $is_valid && !function_exists($properties[ 'unifunc' ]);
+    }
+
+    /**
+     * Compiles the template
+     * If the template is not evaluated the compiled template is saved on disk
+     *
+     * @throws \Exception
+     */
+    public function compileTemplateSource()
+    {
+        return $this->compiled->compileTemplateSource($this);
+    }
+
+    /**
+     * Writes the content to cache resource
+     *
+     * @param string $content
+     *
+     * @return bool
+     */
+    public function writeCachedContent($content)
+    {
+        return $this->smarty->ext->_updateCache->writeCachedContent($this, $content);
+    }
+
+    /**
+     * Get unique template id
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function _getTemplateId()
+    {
+        return isset($this->templateId) ? $this->templateId : $this->templateId =
+            $this->smarty->_getTemplateId($this->template_resource, $this->cache_id, $this->compile_id);
+    }
+
+    /**
+     * runtime error not matching capture tags
+     *
+     * @throws \SmartyException
+     */
+    public function capture_error()
+    {
+        throw new SmartyException("Not matching {capture} open/close in '{$this->template_resource}'");
+    }
+
+    /**
+     * Load compiled object
+     *
+     * @param bool $force force new compiled object
+     */
+    public function loadCompiled($force = false)
+    {
+        if ($force || !isset($this->compiled)) {
+            $this->compiled = Smarty_Template_Compiled::load($this);
+        }
+    }
+
+    /**
+     * Load cached object
+     *
+     * @param bool $force force new cached object
+     */
+    public function loadCached($force = false)
+    {
+        if ($force || !isset($this->cached)) {
+            $this->cached = Smarty_Template_Cached::load($this);
+        }
+    }
+
+    /**
+     * Load inheritance object
+     */
+    public function _loadInheritance()
+    {
+        if (!isset($this->inheritance)) {
+            $this->inheritance = new Smarty_Internal_Runtime_Inheritance();
+        }
+    }
+
+    /**
+     * Unload inheritance object
+     */
+    public function _cleanUp()
+    {
+        $this->startRenderCallbacks = array();
+        $this->endRenderCallbacks = array();
+        $this->inheritance = null;
+    }
+
+    /**
+     * Load compiler object
+     *
+     * @throws \SmartyException
+     */
+    public function loadCompiler()
+    {
+        if (!class_exists($this->source->compiler_class)) {
+            $this->smarty->loadPlugin($this->source->compiler_class);
+        }
+        $this->compiler =
+            new $this->source->compiler_class(
+                $this->source->template_lexer_class,
+                $this->source->template_parser_class,
+                $this->smarty
+            );
+    }
+
+    /**
+     * Handle unknown class methods
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
+     */
+    public function __call($name, $args)
+    {
+        // method of Smarty object?
+        if (method_exists($this->smarty, $name)) {
+            return call_user_func_array(array($this->smarty, $name), $args);
+        }
+        // parent
+        return parent::__call($name, $args);
+    }
+
+    /**
+     * get Smarty property in template context
+     *
+     * @param string $property_name property name
+     *
+     * @return mixed|Smarty_Template_Cached
+     * @throws SmartyException
+     */
+    public function __get($property_name)
+    {
+        switch ($property_name) {
+            case 'compiled':
+                $this->loadCompiled();
+                return $this->compiled;
+            case 'cached':
+                $this->loadCached();
+                return $this->cached;
+            case 'compiler':
+                $this->loadCompiler();
+                return $this->compiler;
+            default:
+                // Smarty property ?
+                if (property_exists($this->smarty, $property_name)) {
+                    return $this->smarty->$property_name;
+                }
+        }
+        throw new SmartyException("template property '$property_name' does not exist.");
+    }
+
+    /**
+     * set Smarty property in template context
+     *
+     * @param string $property_name property name
+     * @param mixed  $value         value
+     *
+     * @throws SmartyException
+     */
+    public function __set($property_name, $value)
+    {
+        switch ($property_name) {
+            case 'compiled':
+            case 'cached':
+            case 'compiler':
+                $this->$property_name = $value;
+                return;
+            default:
+                // Smarty property ?
+                if (property_exists($this->smarty, $property_name)) {
+                    $this->smarty->$property_name = $value;
+                    return;
+                }
+        }
+        throw new SmartyException("invalid template property '$property_name'.");
+    }
+
+    /**
+     * Template data object destructor
+     */
+    public function __destruct()
+    {
+        if ($this->smarty->cache_locking && isset($this->cached) && $this->cached->is_locked) {
+            $this->cached->handler->releaseLock($this->smarty, $this->cached);
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatebase.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatebase.php
new file mode 100644
index 000000000..918362e91
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatebase.php
@@ -0,0 +1,401 @@
+<?php
+/**
+ * Smarty Internal Plugin Smarty Template  Base
+ * This file contains the basic shared methods for template handling
+ *
+ * @package    Smarty
+ * @subpackage Template
+ * @author     Uwe Tews
+ */
+
+/**
+ * Class with shared smarty/template methods
+ *
+ * @package    Smarty
+ * @subpackage Template
+ *
+ * @property int $_objType
+ *
+ * The following methods will be dynamically loaded by the extension handler when they are called.
+ * They are located in a corresponding Smarty_Internal_Method_xxxx class
+ *
+ * @method Smarty_Internal_TemplateBase addAutoloadFilters(mixed $filters, string $type = null)
+ * @method Smarty_Internal_TemplateBase addDefaultModifiers(mixed $modifiers)
+ * @method Smarty_Internal_TemplateBase addLiterals(mixed $literals)
+ * @method Smarty_Internal_TemplateBase createData(Smarty_Internal_Data $parent = null, string $name = null)
+ * @method array getAutoloadFilters(string $type = null)
+ * @method string getDebugTemplate()
+ * @method array getDefaultModifier()
+ * @method array getLiterals()
+ * @method array getTags(mixed $template = null)
+ * @method object getRegisteredObject(string $object_name)
+ * @method Smarty_Internal_TemplateBase registerCacheResource(string $name, Smarty_CacheResource $resource_handler)
+ * @method Smarty_Internal_TemplateBase registerClass(string $class_name, string $class_impl)
+ * @method Smarty_Internal_TemplateBase registerDefaultConfigHandler(callback $callback)
+ * @method Smarty_Internal_TemplateBase registerDefaultPluginHandler(callback $callback)
+ * @method Smarty_Internal_TemplateBase registerDefaultTemplateHandler(callback $callback)
+ * @method Smarty_Internal_TemplateBase registerResource(string $name, mixed $resource_handler)
+ * @method Smarty_Internal_TemplateBase setAutoloadFilters(mixed $filters, string $type = null)
+ * @method Smarty_Internal_TemplateBase setDebugTemplate(string $tpl_name)
+ * @method Smarty_Internal_TemplateBase setDefaultModifiers(mixed $modifiers)
+ * @method Smarty_Internal_TemplateBase setLiterals(mixed $literals)
+ * @method Smarty_Internal_TemplateBase unloadFilter(string $type, string $name)
+ * @method Smarty_Internal_TemplateBase unregisterCacheResource(string $name)
+ * @method Smarty_Internal_TemplateBase unregisterObject(string $object_name)
+ * @method Smarty_Internal_TemplateBase unregisterPlugin(string $type, string $name)
+ * @method Smarty_Internal_TemplateBase unregisterFilter(string $type, mixed $callback)
+ * @method Smarty_Internal_TemplateBase unregisterResource(string $name)
+ */
+abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
+{
+    /**
+     * Set this if you want different sets of cache files for the same
+     * templates.
+     *
+     * @var string
+     */
+    public $cache_id = null;
+
+    /**
+     * Set this if you want different sets of compiled files for the same
+     * templates.
+     *
+     * @var string
+     */
+    public $compile_id = null;
+
+    /**
+     * caching enabled
+     *
+     * @var int
+     */
+    public $caching = Smarty::CACHING_OFF;
+
+    /**
+     * check template for modifications?
+     *
+     * @var int
+     */
+    public $compile_check = Smarty::COMPILECHECK_ON;
+
+    /**
+     * cache lifetime in seconds
+     *
+     * @var integer
+     */
+    public $cache_lifetime = 3600;
+
+    /**
+     * Array of source information for known template functions
+     *
+     * @var array
+     */
+    public $tplFunctions = array();
+
+    /**
+     * universal cache
+     *
+     * @var array()
+     */
+    public $_cache = array();
+
+    /**
+     * fetches a rendered Smarty template
+     *
+     * @param string $template   the resource handle of the template file or template object
+     * @param mixed  $cache_id   cache id to be used with this template
+     * @param mixed  $compile_id compile id to be used with this template
+     * @param object $parent     next higher level of Smarty variables
+     *
+     * @throws Exception
+     * @throws SmartyException
+     * @return string rendered template output
+     */
+    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null)
+    {
+        $result = $this->_execute($template, $cache_id, $compile_id, $parent, 0);
+        return $result === null ? ob_get_clean() : $result;
+    }
+
+    /**
+     * displays a Smarty template
+     *
+     * @param string $template   the resource handle of the template file or template object
+     * @param mixed  $cache_id   cache id to be used with this template
+     * @param mixed  $compile_id compile id to be used with this template
+     * @param object $parent     next higher level of Smarty variables
+     *
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)
+    {
+        // display template
+        $this->_execute($template, $cache_id, $compile_id, $parent, 1);
+    }
+
+    /**
+     * test if cache is valid
+     *
+     * @api  Smarty::isCached()
+     * @link https://www.smarty.net/docs/en/api.is.cached.tpl
+     *
+     * @param null|string|\Smarty_Internal_Template $template   the resource handle of the template file or template
+     *                                                          object
+     * @param mixed                                 $cache_id   cache id to be used with this template
+     * @param mixed                                 $compile_id compile id to be used with this template
+     * @param object                                $parent     next higher level of Smarty variables
+     *
+     * @return bool cache status
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null)
+    {
+        return $this->_execute($template, $cache_id, $compile_id, $parent, 2);
+    }
+
+    /**
+     * fetches a rendered Smarty template
+     *
+     * @param string $template   the resource handle of the template file or template object
+     * @param mixed  $cache_id   cache id to be used with this template
+     * @param mixed  $compile_id compile id to be used with this template
+     * @param object $parent     next higher level of Smarty variables
+     * @param string $function   function type 0 = fetch,  1 = display, 2 = isCache
+     *
+     * @return mixed
+     * @throws \Exception
+     * @throws \SmartyException
+     */
+    private function _execute($template, $cache_id, $compile_id, $parent, $function)
+    {
+        $smarty = $this->_getSmartyObj();
+        $saveVars = true;
+        if ($template === null) {
+            if (!$this->_isTplObj()) {
+                throw new SmartyException($function . '():Missing \'$template\' parameter');
+            } else {
+                $template = $this;
+            }
+        } elseif (is_object($template)) {
+            /* @var Smarty_Internal_Template $template */
+            if (!isset($template->_objType) || !$template->_isTplObj()) {
+                throw new SmartyException($function . '():Template object expected');
+            }
+        } else {
+            // get template object
+            $saveVars = false;
+            $template = $smarty->createTemplate($template, $cache_id, $compile_id, $parent ? $parent : $this, false);
+            if ($this->_objType === 1) {
+                // set caching in template object
+                $template->caching = $this->caching;
+            }
+        }
+        // make sure we have integer values
+        $template->caching = (int)$template->caching;
+        // fetch template content
+        $level = ob_get_level();
+        try {
+            $_smarty_old_error_level =
+                isset($smarty->error_reporting) ? error_reporting($smarty->error_reporting) : null;
+
+            if ($smarty->isMutingUndefinedOrNullWarnings()) {
+                $errorHandler = new Smarty_Internal_ErrorHandler();
+                $errorHandler->activate();
+            }
+
+            if ($this->_objType === 2) {
+                /* @var Smarty_Internal_Template $this */
+                $template->tplFunctions = $this->tplFunctions;
+                $template->inheritance = $this->inheritance;
+            }
+            /* @var Smarty_Internal_Template $parent */
+            if (isset($parent->_objType) && ($parent->_objType === 2) && !empty($parent->tplFunctions)) {
+                $template->tplFunctions = array_merge($parent->tplFunctions, $template->tplFunctions);
+            }
+            if ($function === 2) {
+                if ($template->caching) {
+                    // return cache status of template
+                    if (!isset($template->cached)) {
+                        $template->loadCached();
+                    }
+                    $result = $template->cached->isCached($template);
+                    Smarty_Internal_Template::$isCacheTplObj[ $template->_getTemplateId() ] = $template;
+                } else {
+                    return false;
+                }
+            } else {
+                if ($saveVars) {
+                    $savedTplVars = $template->tpl_vars;
+                    $savedConfigVars = $template->config_vars;
+                }
+                ob_start();
+                $template->_mergeVars();
+                if (!empty(Smarty::$global_tpl_vars)) {
+                    $template->tpl_vars = array_merge(Smarty::$global_tpl_vars, $template->tpl_vars);
+                }
+                $result = $template->render(false, $function);
+                $template->_cleanUp();
+                if ($saveVars) {
+                    $template->tpl_vars = $savedTplVars;
+                    $template->config_vars = $savedConfigVars;
+                } else {
+                    if (!$function && !isset(Smarty_Internal_Template::$tplObjCache[ $template->templateId ])) {
+                        $template->parent = null;
+                        $template->tpl_vars = $template->config_vars = array();
+                        Smarty_Internal_Template::$tplObjCache[ $template->templateId ] = $template;
+                    }
+                }
+            }
+
+            if (isset($errorHandler)) {
+                $errorHandler->deactivate();
+            }
+
+            if (isset($_smarty_old_error_level)) {
+                error_reporting($_smarty_old_error_level);
+            }
+            return $result;
+        } catch (Throwable $e) {
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+            if (isset($errorHandler)) {
+                $errorHandler->deactivate();
+            }
+
+            if (isset($_smarty_old_error_level)) {
+                error_reporting($_smarty_old_error_level);
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * Registers plugin to be used in templates
+     *
+     * @api  Smarty::registerPlugin()
+     * @link https://www.smarty.net/docs/en/api.register.plugin.tpl
+     *
+     * @param string   $type       plugin type
+     * @param string   $name       name of template tag
+     * @param callable $callback   PHP callback to register
+     * @param bool     $cacheable  if true (default) this function is cache able
+     * @param mixed    $cache_attr caching attributes if any
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerPlugin($type, $name, $callback, $cacheable = true, $cache_attr = null)
+    {
+        return $this->ext->registerPlugin->registerPlugin($this, $type, $name, $callback, $cacheable, $cache_attr);
+    }
+
+    /**
+     * load a filter of specified type and name
+     *
+     * @api  Smarty::loadFilter()
+     * @link https://www.smarty.net/docs/en/api.load.filter.tpl
+     *
+     * @param string $type filter type
+     * @param string $name filter name
+     *
+     * @return bool
+     * @throws \SmartyException
+     */
+    public function loadFilter($type, $name)
+    {
+        return $this->ext->loadFilter->loadFilter($this, $type, $name);
+    }
+
+    /**
+     * Registers a filter function
+     *
+     * @api  Smarty::registerFilter()
+     * @link https://www.smarty.net/docs/en/api.register.filter.tpl
+     *
+     * @param string      $type filter type
+     * @param callable    $callback
+     * @param string|null $name optional filter name
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerFilter($type, $callback, $name = null)
+    {
+        return $this->ext->registerFilter->registerFilter($this, $type, $callback, $name);
+    }
+
+    /**
+     * Registers object to be used in templates
+     *
+     * @api  Smarty::registerObject()
+     * @link https://www.smarty.net/docs/en/api.register.object.tpl
+     *
+     * @param string $object_name
+     * @param object $object                     the referenced PHP object to register
+     * @param array  $allowed_methods_properties list of allowed methods (empty = all)
+     * @param bool   $format                     smarty argument format, else traditional
+     * @param array  $block_methods              list of block-methods
+     *
+     * @return \Smarty|\Smarty_Internal_Template
+     * @throws \SmartyException
+     */
+    public function registerObject(
+        $object_name,
+        $object,
+        $allowed_methods_properties = array(),
+        $format = true,
+        $block_methods = array()
+    ) {
+        return $this->ext->registerObject->registerObject(
+            $this,
+            $object_name,
+            $object,
+            $allowed_methods_properties,
+            $format,
+            $block_methods
+        );
+    }
+
+    /**
+     * @param int $compile_check
+     */
+    public function setCompileCheck($compile_check)
+    {
+        $this->compile_check = (int)$compile_check;
+    }
+
+    /**
+     * @param int $caching
+     */
+    public function setCaching($caching)
+    {
+        $this->caching = (int)$caching;
+    }
+
+    /**
+     * @param int $cache_lifetime
+     */
+    public function setCacheLifetime($cache_lifetime)
+    {
+        $this->cache_lifetime = $cache_lifetime;
+    }
+
+    /**
+     * @param string $compile_id
+     */
+    public function setCompileId($compile_id)
+    {
+        $this->compile_id = $compile_id;
+    }
+
+    /**
+     * @param string $cache_id
+     */
+    public function setCacheId($cache_id)
+    {
+        $this->cache_id = $cache_id;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
new file mode 100644
index 000000000..8ff3e0521
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
@@ -0,0 +1,1774 @@
+<?php
+/**
+ * Smarty Internal Plugin Smarty Template Compiler Base
+ * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ * @author     Uwe Tews
+ */
+
+/**
+ * Main abstract compiler class
+ *
+ * @package    Smarty
+ * @subpackage Compiler
+ *
+ * @property Smarty_Internal_SmartyTemplateCompiler $prefixCompiledCode  = ''
+ * @property Smarty_Internal_SmartyTemplateCompiler $postfixCompiledCode = ''
+ * @method   registerPostCompileCallback($callback, $parameter = array(), $key = null, $replace = false)
+ * @method   unregisterPostCompileCallback($key)
+ */
+abstract class Smarty_Internal_TemplateCompilerBase
+{
+    /**
+     * compile tag objects cache
+     *
+     * @var array
+     */
+    public static $_tag_objects = array();
+
+    /**
+     * counter for prefix variable number
+     *
+     * @var int
+     */
+    public static $prefixVariableNumber = 0;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * Parser object
+     *
+     * @var Smarty_Internal_Templateparser
+     */
+    public $parser = null;
+
+    /**
+     * hash for nocache sections
+     *
+     * @var mixed
+     */
+    public $nocache_hash = null;
+
+    /**
+     * suppress generation of nocache code
+     *
+     * @var bool
+     */
+    public $suppressNocacheProcessing = false;
+
+    /**
+     * caching enabled (copied from template object)
+     *
+     * @var int
+     */
+    public $caching = 0;
+
+    /**
+     * tag stack
+     *
+     * @var array
+     */
+    public $_tag_stack = array();
+
+    /**
+     * tag stack count
+     *
+     * @var array
+     */
+    public $_tag_stack_count = array();
+
+    /**
+     * Plugins used by template
+     *
+     * @var array
+     */
+    public $required_plugins = array('compiled' => array(), 'nocache' => array());
+
+    /**
+     * Required plugins stack
+     *
+     * @var array
+     */
+    public $required_plugins_stack = array();
+
+    /**
+     * current template
+     *
+     * @var Smarty_Internal_Template
+     */
+    public $template = null;
+
+    /**
+     * merged included sub template data
+     *
+     * @var array
+     */
+    public $mergedSubTemplatesData = array();
+
+    /**
+     * merged sub template code
+     *
+     * @var array
+     */
+    public $mergedSubTemplatesCode = array();
+
+    /**
+     * collected template properties during compilation
+     *
+     * @var array
+     */
+    public $templateProperties = array();
+
+    /**
+     * source line offset for error messages
+     *
+     * @var int
+     */
+    public $trace_line_offset = 0;
+
+    /**
+     * trace uid
+     *
+     * @var string
+     */
+    public $trace_uid = '';
+
+    /**
+     * trace file path
+     *
+     * @var string
+     */
+    public $trace_filepath = '';
+
+    /**
+     * stack for tracing file and line of nested {block} tags
+     *
+     * @var array
+     */
+    public $trace_stack = array();
+
+    /**
+     * plugins loaded by default plugin handler
+     *
+     * @var array
+     */
+    public $default_handler_plugins = array();
+
+    /**
+     * saved preprocessed modifier list
+     *
+     * @var mixed
+     */
+    public $default_modifier_list = null;
+
+    /**
+     * force compilation of complete template as nocache
+     *
+     * @var boolean
+     */
+    public $forceNocache = false;
+
+    /**
+     * flag if compiled template file shall we written
+     *
+     * @var bool
+     */
+    public $write_compiled_code = true;
+
+    /**
+     * Template functions
+     *
+     * @var array
+     */
+    public $tpl_function = array();
+
+    /**
+     * called sub functions from template function
+     *
+     * @var array
+     */
+    public $called_functions = array();
+
+    /**
+     * compiled template or block function code
+     *
+     * @var string
+     */
+    public $blockOrFunctionCode = '';
+
+    /**
+     * flags for used modifier plugins
+     *
+     * @var array
+     */
+    public $modifier_plugins = array();
+
+    /**
+     * type of already compiled modifier
+     *
+     * @var array
+     */
+    public $known_modifier_type = array();
+
+    /**
+     * parent compiler object for merged subtemplates and template functions
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $parent_compiler = null;
+
+    /**
+     * Flag true when compiling nocache section
+     *
+     * @var bool
+     */
+    public $nocache = false;
+
+    /**
+     * Flag true when tag is compiled as nocache
+     *
+     * @var bool
+     */
+    public $tag_nocache = false;
+
+    /**
+     * Compiled tag prefix code
+     *
+     * @var array
+     */
+    public $prefix_code = array();
+
+    /**
+     * used prefix variables by current compiled tag
+     *
+     * @var array
+     */
+    public $usedPrefixVariables = array();
+
+    /**
+     * Prefix code  stack
+     *
+     * @var array
+     */
+    public $prefixCodeStack = array();
+
+    /**
+     * Tag has compiled code
+     *
+     * @var bool
+     */
+    public $has_code = false;
+
+    /**
+     * A variable string was compiled
+     *
+     * @var bool
+     */
+    public $has_variable_string = false;
+
+    /**
+     * Stack for {setfilter} {/setfilter}
+     *
+     * @var array
+     */
+    public $variable_filter_stack = array();
+
+    /**
+     * variable filters for {setfilter} {/setfilter}
+     *
+     * @var array
+     */
+    public $variable_filters = array();
+
+    /**
+     * Nesting count of looping tags like {foreach}, {for}, {section}, {while}
+     *
+     * @var int
+     */
+    public $loopNesting = 0;
+
+    /**
+     * Strip preg pattern
+     *
+     * @var string
+     */
+    public $stripRegEx = '![\t ]*[\r\n]+[\t ]*!';
+
+    /**
+     * plugin search order
+     *
+     * @var array
+     */
+    public $plugin_search_order = array(
+        'function',
+        'block',
+        'compiler',
+        'class'
+    );
+
+    /**
+     * General storage area for tag compiler plugins
+     *
+     * @var array
+     */
+    public $_cache = array();
+
+    /**
+     * Lexer preg pattern for left delimiter
+     *
+     * @var string
+     */
+    private $ldelPreg = '[{]';
+
+    /**
+     * Lexer preg pattern for right delimiter
+     *
+     * @var string
+     */
+    private $rdelPreg = '[}]';
+
+    /**
+     * Length of right delimiter
+     *
+     * @var int
+     */
+    private $rdelLength = 0;
+
+    /**
+     * Length of left delimiter
+     *
+     * @var int
+     */
+    private $ldelLength = 0;
+
+    /**
+     * Lexer preg pattern for user literals
+     *
+     * @var string
+     */
+    private $literalPreg = '';
+
+    /**
+     * Initialize compiler
+     *
+     * @param Smarty $smarty global instance
+     */
+    public function __construct(Smarty $smarty)
+    {
+        $this->smarty = $smarty;
+        $this->nocache_hash = str_replace(
+            array(
+                '.',
+                ','
+            ),
+            '_',
+            uniqid(mt_rand(), true)
+        );
+    }
+
+    /**
+     * Method to compile a Smarty template
+     *
+     * @param Smarty_Internal_Template                  $template template object to compile
+     * @param bool                                      $nocache  true is shall be compiled in nocache mode
+     * @param null|Smarty_Internal_TemplateCompilerBase $parent_compiler
+     *
+     * @return bool true if compiling succeeded, false if it failed
+     * @throws \Exception
+     */
+    public function compileTemplate(
+        Smarty_Internal_Template $template,
+        $nocache = null,
+        Smarty_Internal_TemplateCompilerBase $parent_compiler = null
+    ) {
+        // get code frame of compiled template
+        $_compiled_code = $template->smarty->ext->_codeFrame->create(
+            $template,
+            $this->compileTemplateSource(
+                $template,
+                $nocache,
+                $parent_compiler
+            ),
+            $this->postFilter($this->blockOrFunctionCode) .
+            join('', $this->mergedSubTemplatesCode),
+            false,
+            $this
+        );
+        return $_compiled_code;
+    }
+
+    /**
+     * Compile template source and run optional post filter
+     *
+     * @param \Smarty_Internal_Template             $template
+     * @param null|bool                             $nocache flag if template must be compiled in nocache mode
+     * @param \Smarty_Internal_TemplateCompilerBase $parent_compiler
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function compileTemplateSource(
+        Smarty_Internal_Template $template,
+        $nocache = null,
+        Smarty_Internal_TemplateCompilerBase $parent_compiler = null
+    ) {
+        try {
+            // save template object in compiler class
+            $this->template = $template;
+            if ($this->smarty->debugging) {
+                if (!isset($this->smarty->_debug)) {
+                    $this->smarty->_debug = new Smarty_Internal_Debug();
+                }
+                $this->smarty->_debug->start_compile($this->template);
+            }
+            $this->parent_compiler = $parent_compiler ? $parent_compiler : $this;
+            $nocache = isset($nocache) ? $nocache : false;
+            if (empty($template->compiled->nocache_hash)) {
+                $template->compiled->nocache_hash = $this->nocache_hash;
+            } else {
+                $this->nocache_hash = $template->compiled->nocache_hash;
+            }
+            $this->caching = $template->caching;
+            // flag for nocache sections
+            $this->nocache = $nocache;
+            $this->tag_nocache = false;
+            // reset has nocache code flag
+            $this->template->compiled->has_nocache_code = false;
+            $this->has_variable_string = false;
+            $this->prefix_code = array();
+            // add file dependency
+            if ($this->smarty->merge_compiled_includes || $this->template->source->handler->checkTimestamps()) {
+                $this->parent_compiler->template->compiled->file_dependency[ $this->template->source->uid ] =
+                    array(
+                        $this->template->source->filepath,
+                        $this->template->source->getTimeStamp(),
+                        $this->template->source->type,
+                    );
+            }
+            $this->smarty->_current_file = $this->template->source->filepath;
+            // get template source
+            if (!empty($this->template->source->components)) {
+				$_compiled_code = '<?php $_smarty_tpl->_loadInheritance(); $_smarty_tpl->inheritance->init($_smarty_tpl, true); ?>';
+
+				$i = 0;
+				$reversed_components = array_reverse($this->template->getSource()->components);
+				foreach ($reversed_components as $source) {
+					$i++;
+					if ($i === count($reversed_components)) {
+						$_compiled_code .= '<?php $_smarty_tpl->inheritance->endChild($_smarty_tpl); ?>';
+					}
+					$_compiled_code .= $this->compileTag(
+						'include',
+						[
+							var_export($source->resource, true),
+							['scope' => 'parent'],
+						]
+					);
+				}
+				$_compiled_code = $this->postFilter($_compiled_code, $this->template);
+            } else {
+                // get template source
+                $_content = $this->template->source->getContent();
+				$_compiled_code = $this->postFilter($this->doCompile($this->preFilter($_content), true));
+            }
+            if (!empty($this->required_plugins[ 'compiled' ]) || !empty($this->required_plugins[ 'nocache' ])) {
+                $_compiled_code = '<?php ' . $this->compileRequiredPlugins() . "?>\n" . $_compiled_code;
+            }
+        } catch (Exception $e) {
+            if ($this->smarty->debugging) {
+                $this->smarty->_debug->end_compile($this->template);
+            }
+            $this->_tag_stack = array();
+            // free memory
+            $this->parent_compiler = null;
+            $this->template = null;
+            $this->parser = null;
+            throw $e;
+        }
+        if ($this->smarty->debugging) {
+            $this->smarty->_debug->end_compile($this->template);
+        }
+        $this->parent_compiler = null;
+        $this->parser = null;
+        return $_compiled_code;
+    }
+
+    /**
+     * Optionally process compiled code by post filter
+     *
+     * @param string $code compiled code
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function postFilter($code)
+    {
+        // run post filter if on code
+        if (!empty($code)
+            && (isset($this->smarty->autoload_filters[ 'post' ]) || isset($this->smarty->registered_filters[ 'post' ]))
+        ) {
+            return $this->smarty->ext->_filterHandler->runFilter('post', $code, $this->template);
+        } else {
+            return $code;
+        }
+    }
+
+    /**
+     * Run optional prefilter
+     *
+     * @param string $_content template source
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function preFilter($_content)
+    {
+        // run pre filter if required
+        if ($_content !== ''
+            && ((isset($this->smarty->autoload_filters[ 'pre' ]) || isset($this->smarty->registered_filters[ 'pre' ])))
+        ) {
+            return $this->smarty->ext->_filterHandler->runFilter('pre', $_content, $this->template);
+        } else {
+            return $_content;
+        }
+    }
+
+    /**
+     * Compile Tag
+     * This is a call back from the lexer/parser
+     *
+     * Save current prefix code
+     * Compile tag
+     * Merge tag prefix code with saved one
+     * (required nested tags in attributes)
+     *
+     * @param string $tag       tag name
+     * @param array  $args      array with tag attributes
+     * @param array  $parameter array with compilation parameter
+     *
+     * @throws SmartyCompilerException
+     * @throws SmartyException
+     * @return string compiled code
+     */
+    public function compileTag($tag, $args, $parameter = array())
+    {
+        $this->prefixCodeStack[] = $this->prefix_code;
+        $this->prefix_code = array();
+        $result = $this->compileTag2($tag, $args, $parameter);
+        $this->prefix_code = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
+        return $result;
+    }
+
+    /**
+     * compile variable
+     *
+     * @param string $variable
+     *
+     * @return string
+     */
+    public function compileVariable($variable)
+    {
+        if (!strpos($variable, '(')) {
+            // not a variable variable
+            $var = trim($variable, '\'');
+            $this->tag_nocache = $this->tag_nocache |
+                                 $this->template->ext->getTemplateVars->_getVariable(
+                                     $this->template,
+                                     $var,
+                                     null,
+                                     true,
+                                     false
+                                 )->nocache;
+            // todo $this->template->compiled->properties['variables'][$var] = $this->tag_nocache | $this->nocache;
+        }
+        return '$_smarty_tpl->tpl_vars[' . $variable . ']->value';
+    }
+
+    /**
+     * compile config variable
+     *
+     * @param string $variable
+     *
+     * @return string
+     */
+    public function compileConfigVariable($variable)
+    {
+        // return '$_smarty_tpl->config_vars[' . $variable . ']';
+        return '$_smarty_tpl->smarty->ext->configLoad->_getConfigVariable($_smarty_tpl, ' . $variable . ')';
+    }
+
+    /**
+     * compile PHP function call
+     *
+     * @param string $name
+     * @param array  $parameter
+     *
+     * @return string
+     * @throws \SmartyCompilerException
+     */
+    public function compilePHPFunctionCall($name, $parameter)
+    {
+        if (!$this->smarty->security_policy || $this->smarty->security_policy->isTrustedPhpFunction($name, $this)) {
+            if (strcasecmp($name, 'isset') === 0 || strcasecmp($name, 'empty') === 0
+                || strcasecmp($name, 'array') === 0 || is_callable($name)
+            ) {
+                $func_name = smarty_strtolower_ascii($name);
+
+                if ($func_name === 'isset') {
+                    if (count($parameter) === 0) {
+                        $this->trigger_template_error('Illegal number of parameter in "isset()"');
+                    }
+
+                    $pa = array();
+                    foreach ($parameter as $p) {
+                        $pa[] = $this->syntaxMatchesVariable($p) ? 'isset(' . $p . ')' : '(' . $p . ' !== null )';
+                    }
+                    return '(' . implode(' && ', $pa) . ')';
+
+                } elseif (in_array(
+                    $func_name,
+                    array(
+                        'empty',
+                        'reset',
+                        'current',
+                        'end',
+                        'prev',
+                        'next'
+                    )
+                )
+                ) {
+                    if (count($parameter) !== 1) {
+                        $this->trigger_template_error("Illegal number of parameter in '{$func_name()}'");
+                    }
+                    if ($func_name === 'empty') {
+                        return $func_name . '(' .
+                               str_replace("')->value", "',null,true,false)->value", $parameter[ 0 ]) . ')';
+                    } else {
+                        return $func_name . '(' . $parameter[ 0 ] . ')';
+                    }
+                } else {
+
+					if (
+						!$this->smarty->loadPlugin('smarty_modifiercompiler_' . $name)
+						&& !isset($this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name])
+						&& !in_array($name, ['time', 'join', 'is_array', 'in_array'])
+					) {
+						trigger_error('Using unregistered function "' . $name . '" in a template is deprecated and will be ' .
+							'removed in a future release. Use Smarty::registerPlugin to explicitly register ' .
+							'a custom modifier.', E_USER_DEPRECATED);
+					}
+
+					return $name . '(' . implode(',', $parameter) . ')';
+                }
+            } else {
+                $this->trigger_template_error("unknown function '{$name}'");
+            }
+        }
+    }
+
+    /**
+     * Determines whether the passed string represents a valid (PHP) variable.
+     * This is important, because `isset()` only works on variables and `empty()` can only be passed
+     * a variable prior to php5.5
+     * @param $string
+     * @return bool
+     */
+    private function syntaxMatchesVariable($string) {
+        static $regex_pattern = '/^\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*((->)[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|\[.*]*\])*$/';
+        return 1 === preg_match($regex_pattern, trim($string));
+    }
+
+    /**
+     * This method is called from parser to process a text content section if strip is enabled
+     * - remove text from inheritance child templates as they may generate output
+     *
+     * @param string $text
+     *
+     * @return string
+     */
+    public function processText($text)
+    {
+
+        if (strpos($text, '<') === false) {
+            return preg_replace($this->stripRegEx, '', $text);
+        }
+
+        $store = array();
+        $_store = 0;
+
+        // capture html elements not to be messed with
+        $_offset = 0;
+        if (preg_match_all(
+            '#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+            $text,
+            $matches,
+            PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+        )
+        ) {
+            foreach ($matches as $match) {
+                $store[] = $match[ 0 ][ 0 ];
+                $_length = strlen($match[ 0 ][ 0 ]);
+                $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+                $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+                $_offset += $_length - strlen($replace);
+                $_store++;
+            }
+        }
+        $expressions = array(// replace multiple spaces between tags by a single space
+                             '#(:SMARTY@!@|>)[\040\011]+(?=@!@SMARTY:|<)#s'                            => '\1 \2',
+                             // remove newline between tags
+                             '#(:SMARTY@!@|>)[\040\011]*[\n]\s*(?=@!@SMARTY:|<)#s'                     => '\1\2',
+                             // remove multiple spaces between attributes (but not in attribute values!)
+                             '#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
+                             '#>[\040\011]+$#Ss'                                                       => '> ',
+                             '#>[\040\011]*[\n]\s*$#Ss'                                                => '>',
+                             $this->stripRegEx                                                         => '',
+        );
+        $text = preg_replace(array_keys($expressions), array_values($expressions), $text);
+        $_offset = 0;
+        if (preg_match_all(
+            '#@!@SMARTY:([0-9]+):SMARTY@!@#is',
+            $text,
+            $matches,
+            PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+        )
+        ) {
+            foreach ($matches as $match) {
+                $_length = strlen($match[ 0 ][ 0 ]);
+                $replace = $store[ $match[ 1 ][ 0 ] ];
+                $text = substr_replace($text, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
+                $_offset += strlen($replace) - $_length;
+                $_store++;
+            }
+        }
+        return $text;
+    }
+
+    /**
+     * lazy loads internal compile plugin for tag and calls the compile method
+     * compile objects cached for reuse.
+     * class name format:  Smarty_Internal_Compile_TagName
+     * plugin filename format: Smarty_Internal_TagName.php
+     *
+     * @param string $tag    tag name
+     * @param array  $args   list of tag attributes
+     * @param mixed  $param1 optional parameter
+     * @param mixed  $param2 optional parameter
+     * @param mixed  $param3 optional parameter
+     *
+     * @return bool|string compiled code or false
+     * @throws \SmartyCompilerException
+     */
+    public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
+    {
+        /* @var Smarty_Internal_CompileBase $tagCompiler */
+        $tagCompiler = $this->getTagCompiler($tag);
+        // compile this tag
+        return $tagCompiler === false ? false : $tagCompiler->compile($args, $this, $param1, $param2, $param3);
+    }
+
+    /**
+     * lazy loads internal compile plugin for tag compile objects cached for reuse.
+     *
+     * class name format:  Smarty_Internal_Compile_TagName
+     * plugin filename format: Smarty_Internal_TagName.php
+     *
+     * @param string $tag tag name
+     *
+     * @return bool|\Smarty_Internal_CompileBase tag compiler object or false if not found
+     */
+    public function getTagCompiler($tag)
+    {
+        // re-use object if already exists
+        if (!isset(self::$_tag_objects[ $tag ])) {
+            // lazy load internal compiler plugin
+            $_tag = explode('_', $tag);
+            $_tag = array_map('smarty_ucfirst_ascii', $_tag);
+            $class_name = 'Smarty_Internal_Compile_' . implode('_', $_tag);
+            if (class_exists($class_name)
+                && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))
+            ) {
+                self::$_tag_objects[ $tag ] = new $class_name;
+            } else {
+                self::$_tag_objects[ $tag ] = false;
+            }
+        }
+        return self::$_tag_objects[ $tag ];
+    }
+
+    /**
+     * Check for plugins and return function name
+     *
+     * @param        $plugin_name
+     * @param string $plugin_type type of plugin
+     *
+     * @return string call name of function
+     * @throws \SmartyException
+     */
+    public function getPlugin($plugin_name, $plugin_type)
+    {
+        $function = null;
+        if ($this->caching && ($this->nocache || $this->tag_nocache)) {
+            if (isset($this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
+                $function =
+                    $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+            } elseif (isset($this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
+                $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ] =
+                    $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ];
+                $function =
+                    $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+            }
+        } else {
+            if (isset($this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ])) {
+                $function =
+                    $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+            } elseif (isset($this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ])) {
+                $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ] =
+                    $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ];
+                $function =
+                    $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ];
+            }
+        }
+        if (isset($function)) {
+            if ($plugin_type === 'modifier') {
+                $this->modifier_plugins[ $plugin_name ] = true;
+            }
+            return $function;
+        }
+        // loop through plugin dirs and find the plugin
+        $function = 'smarty_' . $plugin_type . '_' . $plugin_name;
+        $file = $this->smarty->loadPlugin($function, false);
+        if (is_string($file)) {
+            if ($this->caching && ($this->nocache || $this->tag_nocache)) {
+                $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
+                    $file;
+                $this->required_plugins[ 'nocache' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
+                    $function;
+            } else {
+                $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'file' ] =
+                    $file;
+                $this->required_plugins[ 'compiled' ][ $plugin_name ][ $plugin_type ][ 'function' ] =
+                    $function;
+            }
+            if ($plugin_type === 'modifier') {
+                $this->modifier_plugins[ $plugin_name ] = true;
+            }
+            return $function;
+        }
+        if (is_callable($function)) {
+            // plugin function is defined in the script
+            return $function;
+        }
+        return false;
+    }
+
+    /**
+     * Check for plugins by default plugin handler
+     *
+     * @param string $tag         name of tag
+     * @param string $plugin_type type of plugin
+     *
+     * @return bool true if found
+     * @throws \SmartyCompilerException
+     */
+    public function getPluginFromDefaultHandler($tag, $plugin_type)
+    {
+        $callback = null;
+        $script = null;
+        $cacheable = true;
+        $result = call_user_func_array(
+            $this->smarty->default_plugin_handler_func,
+            array(
+                $tag,
+                $plugin_type,
+                $this->template,
+                &$callback,
+                &$script,
+                &$cacheable,
+            )
+        );
+        if ($result) {
+            $this->tag_nocache = $this->tag_nocache || !$cacheable;
+            if ($script !== null) {
+                if (is_file($script)) {
+                    if ($this->caching && ($this->nocache || $this->tag_nocache)) {
+                        $this->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'file' ] =
+                            $script;
+                        $this->required_plugins[ 'nocache' ][ $tag ][ $plugin_type ][ 'function' ] =
+                            $callback;
+                    } else {
+                        $this->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'file' ] =
+                            $script;
+                        $this->required_plugins[ 'compiled' ][ $tag ][ $plugin_type ][ 'function' ] =
+                            $callback;
+                    }
+                    include_once $script;
+                } else {
+                    $this->trigger_template_error("Default plugin handler: Returned script file '{$script}' for '{$tag}' not found");
+                }
+            }
+            if (is_callable($callback)) {
+                $this->default_handler_plugins[ $plugin_type ][ $tag ] = array(
+                    $callback,
+                    true,
+                    array()
+                );
+                return true;
+            } else {
+                $this->trigger_template_error("Default plugin handler: Returned callback for '{$tag}' not callable");
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Append code segments and remove unneeded ?> <?php transitions
+     *
+     * @param string $left
+     * @param string $right
+     *
+     * @return string
+     */
+    public function appendCode($left, $right)
+    {
+        if (preg_match('/\s*\?>\s?$/D', $left) && preg_match('/^<\?php\s+/', $right)) {
+            $left = preg_replace('/\s*\?>\s?$/D', "\n", $left);
+            $left .= preg_replace('/^<\?php\s+/', '', $right);
+        } else {
+            $left .= $right;
+        }
+        return $left;
+    }
+
+    /**
+     * Inject inline code for nocache template sections
+     * This method gets the content of each template element from the parser.
+     * If the content is compiled code and it should be not cached the code is injected
+     * into the rendered output.
+     *
+     * @param string  $content content of template element
+     * @param boolean $is_code true if content is compiled code
+     *
+     * @return string  content
+     */
+    public function processNocacheCode($content, $is_code)
+    {
+        // If the template is not evaluated and we have a nocache section and or a nocache tag
+        if ($is_code && !empty($content)) {
+            // generate replacement code
+            if ((!($this->template->source->handler->recompiled) || $this->forceNocache) && $this->caching
+                && !$this->suppressNocacheProcessing && ($this->nocache || $this->tag_nocache)
+            ) {
+                $this->template->compiled->has_nocache_code = true;
+                $_output = addcslashes($content, '\'\\');
+                $_output = str_replace('^#^', '\'', $_output);
+                $_output =
+                    "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/{$_output}/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
+                // make sure we include modifier plugins for nocache code
+                foreach ($this->modifier_plugins as $plugin_name => $dummy) {
+                    if (isset($this->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ])) {
+                        $this->required_plugins[ 'nocache' ][ $plugin_name ][ 'modifier' ] =
+                            $this->required_plugins[ 'compiled' ][ $plugin_name ][ 'modifier' ];
+                    }
+                }
+            } else {
+                $_output = $content;
+            }
+        } else {
+            $_output = $content;
+        }
+        $this->modifier_plugins = array();
+        $this->suppressNocacheProcessing = false;
+        $this->tag_nocache = false;
+        return $_output;
+    }
+
+    /**
+     * Get Id
+     *
+     * @param string $input
+     *
+     * @return bool|string
+     */
+    public function getId($input)
+    {
+        if (preg_match('~^([\'"]*)([0-9]*[a-zA-Z_]\w*)\1$~', $input, $match)) {
+            return $match[ 2 ];
+        }
+        return false;
+    }
+
+    /**
+     * Get variable name from string
+     *
+     * @param string $input
+     *
+     * @return bool|string
+     */
+    public function getVariableName($input)
+    {
+        if (preg_match('~^[$]_smarty_tpl->tpl_vars\[[\'"]*([0-9]*[a-zA-Z_]\w*)[\'"]*\]->value$~', $input, $match)) {
+            return $match[ 1 ];
+        }
+        return false;
+    }
+
+    /**
+     * Set nocache flag in variable or create new variable
+     *
+     * @param string $varName
+     */
+    public function setNocacheInVariable($varName)
+    {
+        // create nocache var to make it know for further compiling
+        if ($_var = $this->getId($varName)) {
+            if (isset($this->template->tpl_vars[ $_var ])) {
+                $this->template->tpl_vars[ $_var ] = clone $this->template->tpl_vars[ $_var ];
+                $this->template->tpl_vars[ $_var ]->nocache = true;
+            } else {
+                $this->template->tpl_vars[ $_var ] = new Smarty_Variable(null, true);
+            }
+        }
+    }
+
+    /**
+     * @param array $_attr tag attributes
+     * @param array $validScopes
+     *
+     * @return int|string
+     * @throws \SmartyCompilerException
+     */
+    public function convertScope($_attr, $validScopes)
+    {
+        $_scope = 0;
+        if (isset($_attr[ 'scope' ])) {
+            $_scopeName = trim($_attr[ 'scope' ], '\'"');
+            if (is_numeric($_scopeName) && in_array($_scopeName, $validScopes)) {
+                $_scope = $_scopeName;
+            } elseif (is_string($_scopeName)) {
+                $_scopeName = trim($_scopeName, '\'"');
+                $_scope = isset($validScopes[ $_scopeName ]) ? $validScopes[ $_scopeName ] : false;
+            } else {
+                $_scope = false;
+            }
+            if ($_scope === false) {
+                $err = var_export($_scopeName, true);
+                $this->trigger_template_error("illegal value '{$err}' for \"scope\" attribute", null, true);
+            }
+        }
+        return $_scope;
+    }
+
+    /**
+     * Generate nocache code string
+     *
+     * @param string $code PHP code
+     *
+     * @return string
+     */
+    public function makeNocacheCode($code)
+    {
+        return "echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/<?php " .
+               str_replace('^#^', '\'', addcslashes($code, '\'\\')) .
+               "?>/*/%%SmartyNocache:{$this->nocache_hash}%%*/';\n";
+    }
+
+    /**
+     * display compiler error messages without dying
+     * If parameter $args is empty it is a parser detected syntax error.
+     * In this case the parser is called to obtain information about expected tokens.
+     * If parameter $args contains a string this is used as error message
+     *
+     * @param string    $args    individual error message or null
+     * @param string    $line    line-number
+     * @param null|bool $tagline if true the line number of last tag
+     *
+     * @throws \SmartyCompilerException when an unexpected token is found
+     */
+    public function trigger_template_error($args = null, $line = null, $tagline = null)
+    {
+        $lex = $this->parser->lex;
+        if ($tagline === true) {
+            // get line number of Tag
+            $line = $lex->taglineno;
+        } elseif (!isset($line)) {
+            // get template source line which has error
+            $line = $lex->line;
+        } else {
+            $line = (int)$line;
+        }
+        if (in_array(
+            $this->template->source->type,
+            array(
+                'eval',
+                'string'
+            )
+        )
+        ) {
+            $templateName = $this->template->source->type . ':' . trim(
+                    preg_replace(
+                        '![\t\r\n]+!',
+                        ' ',
+                        strlen($lex->data) > 40 ?
+                            substr($lex->data, 0, 40) .
+                            '...' : $lex->data
+                    )
+                );
+        } else {
+            $templateName = $this->template->source->type . ':' . $this->template->source->filepath;
+        }
+        //        $line += $this->trace_line_offset;
+        $match = preg_split("/\n/", $lex->data);
+        $error_text =
+            'Syntax error in template "' . (empty($this->trace_filepath) ? $templateName : $this->trace_filepath) .
+            '"  on line ' . ($line + $this->trace_line_offset) . ' "' .
+            trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ])) . '" ';
+        if (isset($args)) {
+            // individual error message
+            $error_text .= $args;
+        } else {
+            $expect = array();
+            // expected token from parser
+            $error_text .= ' - Unexpected "' . $lex->value . '"';
+            if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4) {
+                foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
+                    $exp_token = $this->parser->yyTokenName[ $token ];
+                    if (isset($lex->smarty_token_names[ $exp_token ])) {
+                        // token type from lexer
+                        $expect[] = '"' . $lex->smarty_token_names[ $exp_token ] . '"';
+                    } else {
+                        // otherwise internal token name
+                        $expect[] = $this->parser->yyTokenName[ $token ];
+                    }
+                }
+                $error_text .= ', expected one of: ' . implode(' , ', $expect);
+            }
+        }
+        if ($this->smarty->_parserdebug) {
+            $this->parser->errorRunDown();
+            echo ob_get_clean();
+            flush();
+        }
+        $e = new SmartyCompilerException(
+            $error_text,
+            0,
+            $this->template->source->filepath,
+            $line
+        );
+        $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ]));
+        $e->desc = $args;
+        $e->template = $this->template->source->filepath;
+        throw $e;
+    }
+
+    /**
+     * Return var_export() value with all white spaces removed
+     *
+     * @param mixed $value
+     *
+     * @return string
+     */
+    public function getVarExport($value)
+    {
+        return preg_replace('/\s/', '', var_export($value, true));
+    }
+
+    /**
+     *  enter double quoted string
+     *  - save tag stack count
+     */
+    public function enterDoubleQuote()
+    {
+        array_push($this->_tag_stack_count, $this->getTagStackCount());
+    }
+
+    /**
+     * Return tag stack count
+     *
+     * @return int
+     */
+    public function getTagStackCount()
+    {
+        return count($this->_tag_stack);
+    }
+
+    /**
+     * @param $lexerPreg
+     *
+     * @return mixed
+     */
+    public function replaceDelimiter($lexerPreg)
+    {
+        return str_replace(
+            array('SMARTYldel', 'SMARTYliteral', 'SMARTYrdel', 'SMARTYautoliteral', 'SMARTYal'),
+            array(
+                $this->ldelPreg, $this->literalPreg, $this->rdelPreg,
+                $this->smarty->getAutoLiteral() ? '{1,}' : '{9}',
+                $this->smarty->getAutoLiteral() ? '' : '\\s*'
+            ),
+            $lexerPreg
+        );
+    }
+
+    /**
+     * Build lexer regular expressions for left and right delimiter and user defined literals
+     */
+    public function initDelimiterPreg()
+    {
+        $ldel = $this->smarty->getLeftDelimiter();
+        $this->ldelLength = strlen($ldel);
+        $this->ldelPreg = '';
+        foreach (str_split($ldel, 1) as $chr) {
+            $this->ldelPreg .= '[' . preg_quote($chr,'/') . ']';
+        }
+        $rdel = $this->smarty->getRightDelimiter();
+        $this->rdelLength = strlen($rdel);
+        $this->rdelPreg = '';
+        foreach (str_split($rdel, 1) as $chr) {
+            $this->rdelPreg .= '[' . preg_quote($chr,'/') . ']';
+        }
+        $literals = $this->smarty->getLiterals();
+        if (!empty($literals)) {
+            foreach ($literals as $key => $literal) {
+                $literalPreg = '';
+                foreach (str_split($literal, 1) as $chr) {
+                    $literalPreg .= '[' . preg_quote($chr,'/') . ']';
+                }
+                $literals[ $key ] = $literalPreg;
+            }
+            $this->literalPreg = '|' . implode('|', $literals);
+        } else {
+            $this->literalPreg = '';
+        }
+    }
+
+    /**
+     *  leave double quoted string
+     *  - throw exception if block in string was not closed
+     *
+     * @throws \SmartyCompilerException
+     */
+    public function leaveDoubleQuote()
+    {
+        if (array_pop($this->_tag_stack_count) !== $this->getTagStackCount()) {
+            $tag = $this->getOpenBlockTag();
+            $this->trigger_template_error(
+                "unclosed '{{$tag}}' in doubled quoted string",
+                null,
+                true
+            );
+        }
+    }
+
+    /**
+     * Get left delimiter preg
+     *
+     * @return string
+     */
+    public function getLdelPreg()
+    {
+        return $this->ldelPreg;
+    }
+
+    /**
+     * Get right delimiter preg
+     *
+     * @return string
+     */
+    public function getRdelPreg()
+    {
+        return $this->rdelPreg;
+    }
+
+    /**
+     * Get length of left delimiter
+     *
+     * @return int
+     */
+    public function getLdelLength()
+    {
+        return $this->ldelLength;
+    }
+
+    /**
+     * Get length of right delimiter
+     *
+     * @return int
+     */
+    public function getRdelLength()
+    {
+        return $this->rdelLength;
+    }
+
+    /**
+     * Get name of current open block tag
+     *
+     * @return string|boolean
+     */
+    public function getOpenBlockTag()
+    {
+        $tagCount = $this->getTagStackCount();
+        if ($tagCount) {
+            return $this->_tag_stack[ $tagCount - 1 ][ 0 ];
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Check if $value contains variable elements
+     *
+     * @param mixed $value
+     *
+     * @return bool|int
+     */
+    public function isVariable($value)
+    {
+        if (is_string($value)) {
+            return preg_match('/[$(]/', $value);
+        }
+        if (is_bool($value) || is_numeric($value)) {
+            return false;
+        }
+        if (is_array($value)) {
+            foreach ($value as $k => $v) {
+                if ($this->isVariable($k) || $this->isVariable($v)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        return false;
+    }
+
+    /**
+     * Get new prefix variable name
+     *
+     * @return string
+     */
+    public function getNewPrefixVariable()
+    {
+        ++self::$prefixVariableNumber;
+        return $this->getPrefixVariable();
+    }
+
+    /**
+     * Get current prefix variable name
+     *
+     * @return string
+     */
+    public function getPrefixVariable()
+    {
+        return '$_prefixVariable' . self::$prefixVariableNumber;
+    }
+
+    /**
+     * append  code to prefix buffer
+     *
+     * @param string $code
+     */
+    public function appendPrefixCode($code)
+    {
+        $this->prefix_code[] = $code;
+    }
+
+    /**
+     * get prefix code string
+     *
+     * @return string
+     */
+    public function getPrefixCode()
+    {
+        $code = '';
+        $prefixArray = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
+        $this->prefixCodeStack[] = array();
+        foreach ($prefixArray as $c) {
+            $code = $this->appendCode($code, $c);
+        }
+        $this->prefix_code = array();
+        return $code;
+    }
+
+    /**
+     * Save current required plugins
+     *
+     * @param bool $init if true init required plugins
+     */
+    public function saveRequiredPlugins($init = false)
+    {
+        $this->required_plugins_stack[] = $this->required_plugins;
+        if ($init) {
+            $this->required_plugins = array('compiled' => array(), 'nocache' => array());
+        }
+    }
+
+    /**
+     * Restore required plugins
+     */
+    public function restoreRequiredPlugins()
+    {
+        $this->required_plugins = array_pop($this->required_plugins_stack);
+    }
+
+    /**
+     * Compile code to call Smarty_Internal_Template::_checkPlugins()
+     * for required plugins
+     *
+     * @return string
+     */
+    public function compileRequiredPlugins()
+    {
+        $code = $this->compileCheckPlugins($this->required_plugins[ 'compiled' ]);
+        if ($this->caching && !empty($this->required_plugins[ 'nocache' ])) {
+            $code .= $this->makeNocacheCode($this->compileCheckPlugins($this->required_plugins[ 'nocache' ]));
+        }
+        return $code;
+    }
+
+    /**
+     * Compile code to call Smarty_Internal_Template::_checkPlugins
+     *   - checks if plugin is callable require otherwise
+     *
+     * @param $requiredPlugins
+     *
+     * @return string
+     */
+    public function compileCheckPlugins($requiredPlugins)
+    {
+        if (!empty($requiredPlugins)) {
+            $plugins = array();
+            foreach ($requiredPlugins as $plugin) {
+                foreach ($plugin as $data) {
+                    $plugins[] = $data;
+                }
+            }
+            return '$_smarty_tpl->_checkPlugins(' . $this->getVarExport($plugins) . ');' . "\n";
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * method to compile a Smarty template
+     *
+     * @param mixed $_content template source
+     * @param bool  $isTemplateSource
+     *
+     * @return bool true if compiling succeeded, false if it failed
+     */
+    abstract protected function doCompile($_content, $isTemplateSource = false);
+
+    public function cStyleComment($string) {
+        return '/*' . str_replace('*/', '* /' , $string) . '*/';
+    }
+
+    /**
+     * Compile Tag
+     *
+     * @param string $tag       tag name
+     * @param array  $args      array with tag attributes
+     * @param array  $parameter array with compilation parameter
+     *
+     * @throws SmartyCompilerException
+     * @throws SmartyException
+     * @return string compiled code
+     */
+    private function compileTag2($tag, $args, $parameter)
+    {
+        $plugin_type = '';
+        // $args contains the attributes parsed and compiled by the lexer/parser
+        // assume that tag does compile into code, but creates no HTML output
+        $this->has_code = true;
+        // log tag/attributes
+        if (isset($this->smarty->_cache[ 'get_used_tags' ])) {
+            $this->template->_cache[ 'used_tags' ][] = array(
+                $tag,
+                $args
+            );
+        }
+        // check nocache option flag
+        foreach ($args as $arg) {
+            if (!is_array($arg)) {
+                if ($arg === "'nocache'" || $arg === 'nocache') {
+                    $this->tag_nocache = true;
+                }
+            } else {
+                foreach ($arg as $k => $v) {
+                    if (($k === "'nocache'" || $k === 'nocache') && (trim($v, "'\" ") === 'true')) {
+                        $this->tag_nocache = true;
+                    }
+                }
+            }
+        }
+        // compile the smarty tag (required compile classes to compile the tag are auto loaded)
+        if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
+            if (isset($this->parent_compiler->tpl_function[ $tag ])
+                || (isset($this->template->smarty->ext->_tplFunction)
+                    && $this->template->smarty->ext->_tplFunction->getTplFunction($this->template, $tag) !== false)
+            ) {
+                // template defined by {template} tag
+                $args[ '_attr' ][ 'name' ] = "'{$tag}'";
+                $_output = $this->callTagCompiler('call', $args, $parameter);
+            }
+        }
+        if ($_output !== false) {
+            if ($_output !== true) {
+                // did we get compiled code
+                if ($this->has_code) {
+                    // return compiled code
+                    return $_output;
+                }
+            }
+            // tag did not produce compiled code
+            return null;
+        } else {
+            // map_named attributes
+            if (isset($args[ '_attr' ])) {
+                foreach ($args[ '_attr' ] as $key => $attribute) {
+                    if (is_array($attribute)) {
+                        $args = array_merge($args, $attribute);
+                    }
+                }
+            }
+            // not an internal compiler tag
+            if (strlen($tag) < 6 || substr($tag, -5) !== 'close') {
+                // check if tag is a registered object
+                if (isset($this->smarty->registered_objects[ $tag ]) && isset($parameter[ 'object_method' ])) {
+                    $method = $parameter[ 'object_method' ];
+                    if (!in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ])
+                        && (empty($this->smarty->registered_objects[ $tag ][ 1 ])
+                            || in_array($method, $this->smarty->registered_objects[ $tag ][ 1 ]))
+                    ) {
+                        return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $method);
+                    } elseif (in_array($method, $this->smarty->registered_objects[ $tag ][ 3 ])) {
+                        return $this->callTagCompiler(
+                            'private_object_block_function',
+                            $args,
+                            $parameter,
+                            $tag,
+                            $method
+                        );
+                    } else {
+                        // throw exception
+                        $this->trigger_template_error(
+                            'not allowed method "' . $method . '" in registered object "' .
+                            $tag . '"',
+                            null,
+                            true
+                        );
+                    }
+                }
+                // check if tag is registered
+                foreach (array(
+                    Smarty::PLUGIN_COMPILER,
+                    Smarty::PLUGIN_FUNCTION,
+                    Smarty::PLUGIN_BLOCK,
+                ) as $plugin_type) {
+                    if (isset($this->smarty->registered_plugins[ $plugin_type ][ $tag ])) {
+                        // if compiler function plugin call it now
+                        if ($plugin_type === Smarty::PLUGIN_COMPILER) {
+                            $new_args = array();
+                            foreach ($args as $key => $mixed) {
+                                if (is_array($mixed)) {
+                                    $new_args = array_merge($new_args, $mixed);
+                                } else {
+                                    $new_args[ $key ] = $mixed;
+                                }
+                            }
+                            if (!$this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 1 ]) {
+                                $this->tag_nocache = true;
+                            }
+                            return call_user_func_array(
+                                $this->smarty->registered_plugins[ $plugin_type ][ $tag ][ 0 ],
+                                array(
+                                    $new_args,
+                                    $this
+                                )
+                            );
+                        }
+                        // compile registered function or block function
+                        if ($plugin_type === Smarty::PLUGIN_FUNCTION || $plugin_type === Smarty::PLUGIN_BLOCK) {
+                            return $this->callTagCompiler(
+                                'private_registered_' . $plugin_type,
+                                $args,
+                                $parameter,
+                                $tag
+                            );
+                        }
+                    }
+                }
+                // check plugins from plugins folder
+                foreach ($this->plugin_search_order as $plugin_type) {
+                    if ($plugin_type === Smarty::PLUGIN_COMPILER
+                        && $this->smarty->loadPlugin('smarty_compiler_' . $tag)
+                        && (!isset($this->smarty->security_policy)
+                            || $this->smarty->security_policy->isTrustedTag($tag, $this))
+                    ) {
+                        $plugin = 'smarty_compiler_' . $tag;
+                        if (is_callable($plugin)) {
+                            // convert arguments format for old compiler plugins
+                            $new_args = array();
+                            foreach ($args as $key => $mixed) {
+                                if (is_array($mixed)) {
+                                    $new_args = array_merge($new_args, $mixed);
+                                } else {
+                                    $new_args[ $key ] = $mixed;
+                                }
+                            }
+                            return $plugin($new_args, $this->smarty);
+                        }
+                        if (class_exists($plugin, false)) {
+                            $plugin_object = new $plugin;
+                            if (method_exists($plugin_object, 'compile')) {
+                                return $plugin_object->compile($args, $this);
+                            }
+                        }
+                        throw new SmartyException("Plugin '{$tag}' not callable");
+                    } else {
+                        if ($function = $this->getPlugin($tag, $plugin_type)) {
+                            if (!isset($this->smarty->security_policy)
+                                || $this->smarty->security_policy->isTrustedTag($tag, $this)
+                            ) {
+                                return $this->callTagCompiler(
+                                    'private_' . $plugin_type . '_plugin',
+                                    $args,
+                                    $parameter,
+                                    $tag,
+                                    $function
+                                );
+                            }
+                        }
+                    }
+                }
+                if (is_callable($this->smarty->default_plugin_handler_func)) {
+                    $found = false;
+                    // look for already resolved tags
+                    foreach ($this->plugin_search_order as $plugin_type) {
+                        if (isset($this->default_handler_plugins[ $plugin_type ][ $tag ])) {
+                            $found = true;
+                            break;
+                        }
+                    }
+                    if (!$found) {
+                        // call default handler
+                        foreach ($this->plugin_search_order as $plugin_type) {
+                            if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) {
+                                $found = true;
+                                break;
+                            }
+                        }
+                    }
+                    if ($found) {
+                        // if compiler function plugin call it now
+                        if ($plugin_type === Smarty::PLUGIN_COMPILER) {
+                            $new_args = array();
+                            foreach ($args as $key => $mixed) {
+                                if (is_array($mixed)) {
+                                    $new_args = array_merge($new_args, $mixed);
+                                } else {
+                                    $new_args[ $key ] = $mixed;
+                                }
+                            }
+                            return call_user_func_array(
+                                $this->default_handler_plugins[ $plugin_type ][ $tag ][ 0 ],
+                                array(
+                                    $new_args,
+                                    $this
+                                )
+                            );
+                        } else {
+                            return $this->callTagCompiler(
+                                'private_registered_' . $plugin_type,
+                                $args,
+                                $parameter,
+                                $tag
+                            );
+                        }
+                    }
+                }
+            } else {
+                // compile closing tag of block function
+                $base_tag = substr($tag, 0, -5);
+                // check if closing tag is a registered object
+                if (isset($this->smarty->registered_objects[ $base_tag ]) && isset($parameter[ 'object_method' ])) {
+                    $method = $parameter[ 'object_method' ];
+                    if (in_array($method, $this->smarty->registered_objects[ $base_tag ][ 3 ])) {
+                        return $this->callTagCompiler(
+                            'private_object_block_function',
+                            $args,
+                            $parameter,
+                            $tag,
+                            $method
+                        );
+                    } else {
+                        // throw exception
+                        $this->trigger_template_error(
+                            'not allowed closing tag method "' . $method .
+                            '" in registered object "' . $base_tag . '"',
+                            null,
+                            true
+                        );
+                    }
+                }
+                // registered block tag ?
+                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ])
+                    || isset($this->default_handler_plugins[ Smarty::PLUGIN_BLOCK ][ $base_tag ])
+                ) {
+                    return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
+                }
+                // registered function tag ?
+                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_FUNCTION ][ $tag ])) {
+                    return $this->callTagCompiler('private_registered_function', $args, $parameter, $tag);
+                }
+                // block plugin?
+                if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) {
+                    return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function);
+                }
+                // function plugin?
+                if ($function = $this->getPlugin($tag, Smarty::PLUGIN_FUNCTION)) {
+                    if (!isset($this->smarty->security_policy)
+                        || $this->smarty->security_policy->isTrustedTag($tag, $this)
+                    ) {
+                        return $this->callTagCompiler('private_function_plugin', $args, $parameter, $tag, $function);
+                    }
+                }
+                // registered compiler plugin ?
+                if (isset($this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ])) {
+                    // if compiler function plugin call it now
+                    $args = array();
+                    if (!$this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 1 ]) {
+                        $this->tag_nocache = true;
+                    }
+                    return call_user_func_array(
+                        $this->smarty->registered_plugins[ Smarty::PLUGIN_COMPILER ][ $tag ][ 0 ],
+                        array(
+                            $args,
+                            $this
+                        )
+                    );
+                }
+                if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) {
+                    $plugin = 'smarty_compiler_' . $tag;
+                    if (is_callable($plugin)) {
+                        return $plugin($args, $this->smarty);
+                    }
+                    if (class_exists($plugin, false)) {
+                        $plugin_object = new $plugin;
+                        if (method_exists($plugin_object, 'compile')) {
+                            return $plugin_object->compile($args, $this);
+                        }
+                    }
+                    throw new SmartyException("Plugin '{$tag}' not callable");
+                }
+            }
+            $this->trigger_template_error("unknown tag '{$tag}'", null, true);
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatelexer.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatelexer.php
new file mode 100644
index 000000000..5ca482058
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatelexer.php
@@ -0,0 +1,1095 @@
+<?php
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Smarty_Internal_Templatelexer
+ * This is the template file lexer.
+ * It is generated from the smarty_internal_templatelexer.plex file
+ *
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Smarty_Internal_Templatelexer
+{
+    /**
+     * Source
+     *
+     * @var string
+     */
+    public $data;
+
+    /**
+     * Source length
+     *
+     * @var int
+     */
+    public $dataLength = null;
+
+    /**
+     * byte counter
+     *
+     * @var int
+     */
+    public $counter;
+
+    /**
+     * token number
+     *
+     * @var int
+     */
+    public $token;
+
+    /**
+     * token value
+     *
+     * @var string
+     */
+    public $value;
+
+    /**
+     * current line
+     *
+     * @var int
+     */
+    public $line;
+
+    /**
+     * tag start line
+     *
+     * @var
+     */
+    public $taglineno;
+
+    /**
+     * php code type
+     *
+     * @var string
+     */
+    public $phpType = '';
+
+   /**
+     * state number
+     *
+     * @var int
+     */
+    public $state = 1;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $compiler = null;
+
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+
+    /**
+     * XML flag true while processing xml
+     *
+     * @var bool
+     */
+    public $is_xml = false;
+
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',);
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+                                               'NOT'         => '(!,not)',
+                                               'OPENP'       => '(',
+                                               'CLOSEP'      => ')',
+                                               'OPENB'       => '[',
+                                               'CLOSEB'      => ']',
+                                               'PTR'         => '->',
+                                               'APTR'        => '=>',
+                                               'EQUAL'       => '=',
+                                               'NUMBER'      => 'number',
+                                               'UNIMATH'     => '+" , "-',
+                                               'MATH'        => '*" , "/" , "%',
+                                               'INCDEC'      => '++" , "--',
+                                               'SPACE'       => ' ',
+                                               'DOLLAR'      => '$',
+                                               'SEMICOLON'   => ';',
+                                               'COLON'       => ':',
+                                               'DOUBLECOLON' => '::',
+                                               'AT'          => '@',
+                                               'HATCH'       => '#',
+                                               'QUOTE'       => '"',
+                                               'BACKTICK'    => '`',
+                                               'VERT'        => '"|" modifier',
+                                               'DOT'         => '.',
+                                               'COMMA'       => '","',
+                                               'QMARK'       => '"?"',
+                                               'ID'          => 'id, name',
+                                               'TEXT'        => 'text',
+                                               'LDELSLASH'   => '{/..} closing tag',
+                                               'LDEL'        => '{...} Smarty tag',
+                                               'COMMENT'     => 'comment',
+                                               'AS'          => 'as',
+                                               'TO'          => 'to',
+                                               'PHP'         => '"<?php", "<%", "{php}" tag',
+                                               'LOGOP'       => '"<", "==" ... logical operator',
+                                               'TLOGOP'      => '"lt", "eq" ... logical operator; "is div by" ... if condition',
+                                               'SCOND'       => '"is even" ... if condition',
+    );
+
+    /**
+     * literal tag nesting level
+     *
+     * @var int
+     */
+    private $literal_cnt = 0;
+
+    /**
+     * preg token pattern for state TEXT
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+
+    /**
+     * preg token pattern for state TAG
+     *
+     * @var string
+     */
+    private $yy_global_pattern2 = null;
+
+    /**
+     * preg token pattern for state TAGBODY
+     *
+     * @var string
+     */
+    private $yy_global_pattern3 = null;
+
+    /**
+     * preg token pattern for state LITERAL
+     *
+     * @var string
+     */
+    private $yy_global_pattern4 = null;
+
+    /**
+     * preg token pattern for state DOUBLEQUOTEDSTRING
+     *
+     * @var null
+     */
+    private $yy_global_pattern5 = null;
+
+    /**
+     * preg token pattern for text
+     *
+     * @var null
+     */
+    private $yy_global_text = null;
+
+    /**
+     * preg token pattern for literal
+     *
+     * @var null
+     */
+    private $yy_global_literal = null;
+
+    /**
+     * constructor
+     *
+     * @param   string                             $source template source
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function __construct($source, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->data = $source;
+        $this->dataLength = strlen($this->data);
+        $this->counter = 0;
+        if (preg_match('/^\xEF\xBB\xBF/i', $this->data, $match)) {
+            $this->counter += strlen($match[0]);
+        }
+        $this->line = 1;
+        $this->smarty = $compiler->template->smarty;
+        $this->compiler = $compiler;
+        $this->compiler->initDelimiterPreg();
+        $this->smarty_token_names['LDEL'] = $this->smarty->getLeftDelimiter();
+        $this->smarty_token_names['RDEL'] = $this->smarty->getRightDelimiter();
+    }
+
+    /**
+     * open lexer/parser trace file
+     *
+     */
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+   /**
+     * replace placeholders with runtime preg  code
+     *
+     * @param string $preg
+     *
+     * @return string
+     */
+   public function replace($preg)
+   {
+        return $this->compiler->replaceDelimiter($preg);
+   }
+
+    /**
+     * check if current value is an autoliteral left delimiter
+     *
+     * @return bool
+     */
+    public function isAutoLiteral()
+    {
+        return $this->smarty->getAutoLiteral() && isset($this->value[ $this->compiler->getLdelLength() ]) ?
+            strpos(" \n\t\r", $this->value[ $this->compiler->getLdelLength() ]) !== false : false;
+    }
+
+     
+    private $_yy_state = 1;
+    private $_yy_stack = array();
+
+    public function yylex()
+    {
+        return $this->{'yylex' . $this->_yy_state}();
+    }
+
+    public function yypushstate($state)
+    {
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+        array_push($this->_yy_stack, $this->_yy_state);
+        $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+    }
+
+    public function yypopstate()
+    {
+       if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,  isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+       $this->_yy_state = array_pop($this->_yy_stack);
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+
+    }
+
+    public function yybegin($state)
+    {
+       $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+    }
+
+
+     
+    public function yylex1()
+    {
+        if (!isset($this->yy_global_pattern1)) {
+            $this->yy_global_pattern1 = $this->replace("/\G([{][}])|\G((SMARTYldel)SMARTYal[*])|\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern1,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TEXT');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r1_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const TEXT = 1;
+    public function yy_r1_1()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    public function yy_r1_2()
+    {
+
+       $to = $this->dataLength;
+       preg_match("/[*]{$this->compiler->getRdelPreg()}[\n]?/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+        if (isset($match[0][1])) {
+            $to = $match[0][1] + strlen($match[0][0]);
+        } else {
+            $this->compiler->trigger_template_error ("missing or misspelled comment closing tag '{$this->smarty->getRightDelimiter()}'");
+        }
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
+        return false;
+         }
+    public function yy_r1_4()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    public function yy_r1_6()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
+        $this->yypushstate(self::LITERAL);
+         }
+    public function yy_r1_8()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+        $this->yypushstate(self::LITERAL);
+         }
+    public function yy_r1_10()
+    {
+
+        $this->yypushstate(self::TAG);
+        return true;
+         }
+    public function yy_r1_12()
+    {
+
+       if (!isset($this->yy_global_text)) {
+           $this->yy_global_text = $this->replace('/(SMARTYldel)SMARTYal/isS');
+       }
+       $to = $this->dataLength;
+       preg_match($this->yy_global_text, $this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+       if (isset($match[0][1])) {
+         $to = $match[0][1];
+       }
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+
+     
+    public function yylex2()
+    {
+        if (!isset($this->yy_global_pattern2)) {
+            $this->yy_global_pattern2 = $this->replace("/\G((SMARTYldel)SMARTYal(if|elseif|else if|while)\\s+)|\G((SMARTYldel)SMARTYalfor\\s+)|\G((SMARTYldel)SMARTYalforeach(?![^\s]))|\G((SMARTYldel)SMARTYalsetfilter\\s+)|\G((SMARTYldel)SMARTYalmake_nocache\\s+)|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$]smarty\\.block\\.(child|parent)\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/][0-9]*[a-zA-Z_]\\w*\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal)/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern2,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TAG');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r2_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const TAG = 2;
+    public function yy_r2_1()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_4()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_6()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_8()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_10()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LDELMAKENOCACHE;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_12()
+    {
+
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_SIMPLETAG;
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_15()
+    {
+
+         $this->yypopstate();
+         $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILDPARENT;
+         $this->taglineno = $this->line;
+         }
+    public function yy_r2_18()
+    {
+
+        $this->yypopstate();
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSETAG;
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_20()
+    {
+
+        if ($this->_yy_stack[count($this->_yy_stack)-1] === self::TEXT) {
+            $this->yypopstate();
+            $this->token = Smarty_Internal_Templateparser::TP_SIMPELOUTPUT;
+            $this->taglineno = $this->line;
+        } else {
+            $this->value = $this->smarty->getLeftDelimiter();
+            $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+            $this->yybegin(self::TAGBODY);
+            $this->taglineno = $this->line;
+        }
+         }
+    public function yy_r2_23()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_25()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+
+     
+    public function yylex3()
+    {
+        if (!isset($this->yy_global_pattern3)) {
+            $this->yy_global_pattern3 = $this->replace("/\G(\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even|div)\\s+by\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G([!]\\s*|not\\s+)|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G(array\\s*[(]\\s*)|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|][@]?)|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern3,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TAGBODY');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r3_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const TAGBODY = 3;
+    public function yy_r3_1()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_RDEL;
+        $this->yypopstate();
+         }
+    public function yy_r3_2()
+    {
+
+        $this->yypushstate(self::TAG);
+        return true;
+         }
+    public function yy_r3_4()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+        $this->compiler->enterDoubleQuote();
+         }
+    public function yy_r3_5()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
+         }
+    public function yy_r3_6()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+         }
+    public function yy_r3_7()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
+         }
+    public function yy_r3_8()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_ISIN;
+         }
+    public function yy_r3_9()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_AS;
+         }
+    public function yy_r3_10()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TO;
+         }
+    public function yy_r3_11()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_STEP;
+         }
+    public function yy_r3_12()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
+         }
+    public function yy_r3_13()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LOGOP;
+         }
+    public function yy_r3_15()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SLOGOP;
+         }
+    public function yy_r3_17()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TLOGOP;
+         }
+    public function yy_r3_20()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SINGLECOND;
+         }
+    public function yy_r3_23()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_NOT;
+         }
+    public function yy_r3_24()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
+         }
+    public function yy_r3_28()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_OPENP;
+         }
+    public function yy_r3_29()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
+         }
+    public function yy_r3_30()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_OPENB;
+         }
+    public function yy_r3_31()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
+         }
+    public function yy_r3_32()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_PTR;
+         }
+    public function yy_r3_33()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_APTR;
+         }
+    public function yy_r3_34()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
+         }
+    public function yy_r3_35()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
+         }
+    public function yy_r3_37()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
+         }
+    public function yy_r3_39()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_MATH;
+         }
+    public function yy_r3_41()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_AT;
+         }
+    public function yy_r3_42()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_ARRAYOPEN;
+         }
+    public function yy_r3_43()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_HATCH;
+         }
+    public function yy_r3_44()
+    {
+
+        // resolve conflicts with shorttag and right_delimiter starting with '='
+        if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) === $this->smarty->getRightDelimiter()) {
+            preg_match('/\s+/',$this->value,$match);
+            $this->value = $match[0];
+            $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_ATTR;
+        }
+         }
+    public function yy_r3_45()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_NAMESPACE;
+         }
+    public function yy_r3_48()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_ID;
+         }
+    public function yy_r3_49()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
+         }
+    public function yy_r3_50()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->yypopstate();
+         }
+    public function yy_r3_51()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_VERT;
+         }
+    public function yy_r3_52()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOT;
+         }
+    public function yy_r3_53()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_COMMA;
+         }
+    public function yy_r3_54()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
+         }
+    public function yy_r3_55()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
+         }
+    public function yy_r3_56()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_COLON;
+         }
+    public function yy_r3_57()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_QMARK;
+         }
+    public function yy_r3_58()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_HEX;
+         }
+    public function yy_r3_59()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_SPACE;
+         }
+    public function yy_r3_60()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+
+
+     
+    public function yylex4()
+    {
+        if (!isset($this->yy_global_pattern4)) {
+            $this->yy_global_pattern4 = $this->replace("/\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern4,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state LITERAL');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r4_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const LITERAL = 4;
+    public function yy_r4_1()
+    {
+
+        $this->literal_cnt++;
+        $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+         }
+    public function yy_r4_3()
+    {
+
+        if ($this->literal_cnt) {
+             $this->literal_cnt--;
+            $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+        } else {
+            $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
+            $this->yypopstate();
+        }
+         }
+    public function yy_r4_5()
+    {
+
+       if (!isset($this->yy_global_literal)) {
+           $this->yy_global_literal = $this->replace('/(SMARTYldel)SMARTYal[\/]?literalSMARTYrdel/isS');
+       }
+       $to = $this->dataLength;
+       preg_match($this->yy_global_literal, $this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+       if (isset($match[0][1])) {
+         $to = $match[0][1];
+       } else {
+          $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
+       }
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
+         }
+
+     
+    public function yylex5()
+    {
+        if (!isset($this->yy_global_pattern5)) {
+            $this->yy_global_pattern5 = $this->replace("/\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=((SMARTYldel)SMARTYal|\\$|`\\$|\"SMARTYliteral)))|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern5,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r5_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const DOUBLEQUOTEDSTRING = 5;
+    public function yy_r5_1()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    public function yy_r5_3()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    public function yy_r5_5()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    public function yy_r5_7()
+    {
+
+        $this->yypushstate(self::TAG);
+        return true;
+         }
+    public function yy_r5_9()
+    {
+
+        $this->yypushstate(self::TAG);
+        return true;
+         }
+    public function yy_r5_11()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_LDEL;
+        $this->taglineno = $this->line;
+        $this->yypushstate(self::TAGBODY);
+         }
+    public function yy_r5_13()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
+        $this->yypopstate();
+         }
+    public function yy_r5_14()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
+        $this->value = substr($this->value,0,-1);
+        $this->yypushstate(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r5_15()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
+         }
+    public function yy_r5_16()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    public function yy_r5_17()
+    {
+
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+    public function yy_r5_22()
+    {
+
+        $to = $this->dataLength;
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
+        $this->token = Smarty_Internal_Templateparser::TP_TEXT;
+         }
+
+  }
+
+     
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php
new file mode 100644
index 000000000..c37d3c187
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php
@@ -0,0 +1,2929 @@
+<?php
+
+class TP_yyStackEntry
+{
+    public $stateno;       /* The state-number */
+    public $major;         /* The major token value.  This is the code
+                     ** number for the token at this stack level */
+    public $minor; /* The user-supplied minor token value.  This
+                     ** is the value of the token  */
+};
+
+
+// line 11 "../smarty/lexer/smarty_internal_templateparser.y"
+
+/**
+* Smarty Template Parser Class
+*
+* This is the template parser.
+* It is generated from the smarty_internal_templateparser.y file
+* 
+* @author Uwe Tews <uwe.tews@googlemail.com>
+*/
+class Smarty_Internal_Templateparser
+{
+// line 23 "../smarty/lexer/smarty_internal_templateparser.y"
+
+    const ERR1 = 'Security error: Call to private object member not allowed';
+    const ERR2 = 'Security error: Call to dynamic object member not allowed';
+
+    /**
+     * result status
+     *
+     * @var bool
+     */
+    public $successful = true;
+
+    /**
+     * return value
+     *
+     * @var mixed
+     */
+    public $retvalue = 0;
+
+    /**
+     * @var
+     */
+    public $yymajor;
+
+    /**
+     * last index of array variable
+     *
+     * @var mixed
+     */
+    public $last_index;
+
+    /**
+     * last variable name
+     *
+     * @var string
+     */
+    public $last_variable;
+
+    /**
+     * root parse tree buffer
+     *
+     * @var Smarty_Internal_ParseTree_Template
+     */
+    public $root_buffer;
+
+    /**
+     * current parse tree object
+     *
+     * @var Smarty_Internal_ParseTree
+     */
+    public $current_buffer;
+
+    /**
+     * lexer object
+     *
+     * @var Smarty_Internal_Templatelexer
+     */
+    public $lex;
+
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+
+    /**
+     * {strip} status
+     *
+     * @var bool
+     */
+    public $strip = false;
+    /**
+     * compiler object
+     *
+     * @var Smarty_Internal_TemplateCompilerBase
+     */
+    public $compiler = null;
+
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * template object
+     *
+     * @var Smarty_Internal_Template
+     */
+    public $template = null;
+
+    /**
+     * block nesting level
+     *
+     * @var int
+     */
+    public $block_nesting_level = 0;
+
+    /**
+     * security object
+     *
+     * @var Smarty_Security
+     */
+    public $security = null;
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_prefix = array();
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty_Internal_ParseTree[]
+     */
+    public $template_postfix = array();
+
+    /**
+     * constructor
+     *
+     * @param Smarty_Internal_Templatelexer        $lex
+     * @param Smarty_Internal_TemplateCompilerBase $compiler
+     */
+    public function __construct(Smarty_Internal_Templatelexer $lex, Smarty_Internal_TemplateCompilerBase $compiler)
+    {
+        $this->lex = $lex;
+        $this->compiler = $compiler;
+        $this->template = $this->compiler->template;
+        $this->smarty = $this->template->smarty;
+        $this->security = isset($this->smarty->security_policy) ? $this->smarty->security_policy : false;
+        $this->current_buffer = $this->root_buffer = new Smarty_Internal_ParseTree_Template();
+    }
+
+     /**
+     * insert PHP code in current buffer
+     *
+     * @param string $code
+     */
+    public function insertPhpCode($code)
+    {
+        $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Tag($this, $code));
+    }
+
+    /**
+     * error rundown
+     *
+     */
+    public function errorRunDown()
+    {
+        while ($this->yystack !== array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
+        }
+    }
+
+    /**
+     *  merge PHP code with prefix code and return parse tree tag object
+     *
+     * @param string $code
+     *
+     * @return Smarty_Internal_ParseTree_Tag
+     */
+    public function mergePrefixCode($code)
+    {
+        $tmp = '';
+        foreach ($this->compiler->prefix_code as $preCode) {
+            $tmp .= $preCode;
+        }
+        $this->compiler->prefix_code = array();
+        $tmp .= $code;
+        return new Smarty_Internal_ParseTree_Tag($this, $this->compiler->processNocacheCode($tmp, true));
+    }
+
+
+    const TP_VERT                           =  1;
+    const TP_COLON                          =  2;
+    const TP_TEXT                           =  3;
+    const TP_STRIPON                        =  4;
+    const TP_STRIPOFF                       =  5;
+    const TP_LITERALSTART                   =  6;
+    const TP_LITERALEND                     =  7;
+    const TP_LITERAL                        =  8;
+    const TP_SIMPELOUTPUT                   =  9;
+    const TP_SIMPLETAG                      = 10;
+    const TP_SMARTYBLOCKCHILDPARENT         = 11;
+    const TP_LDEL                           = 12;
+    const TP_RDEL                           = 13;
+    const TP_DOLLARID                       = 14;
+    const TP_EQUAL                          = 15;
+    const TP_ID                             = 16;
+    const TP_PTR                            = 17;
+    const TP_LDELMAKENOCACHE                = 18;
+    const TP_LDELIF                         = 19;
+    const TP_LDELFOR                        = 20;
+    const TP_SEMICOLON                      = 21;
+    const TP_INCDEC                         = 22;
+    const TP_TO                             = 23;
+    const TP_STEP                           = 24;
+    const TP_LDELFOREACH                    = 25;
+    const TP_SPACE                          = 26;
+    const TP_AS                             = 27;
+    const TP_APTR                           = 28;
+    const TP_LDELSETFILTER                  = 29;
+    const TP_CLOSETAG                       = 30;
+    const TP_LDELSLASH                      = 31;
+    const TP_ATTR                           = 32;
+    const TP_INTEGER                        = 33;
+    const TP_COMMA                          = 34;
+    const TP_OPENP                          = 35;
+    const TP_CLOSEP                         = 36;
+    const TP_MATH                           = 37;
+    const TP_UNIMATH                        = 38;
+    const TP_ISIN                           = 39;
+    const TP_QMARK                          = 40;
+    const TP_NOT                            = 41;
+    const TP_TYPECAST                       = 42;
+    const TP_HEX                            = 43;
+    const TP_DOT                            = 44;
+    const TP_INSTANCEOF                     = 45;
+    const TP_SINGLEQUOTESTRING              = 46;
+    const TP_DOUBLECOLON                    = 47;
+    const TP_NAMESPACE                      = 48;
+    const TP_AT                             = 49;
+    const TP_HATCH                          = 50;
+    const TP_OPENB                          = 51;
+    const TP_CLOSEB                         = 52;
+    const TP_DOLLAR                         = 53;
+    const TP_LOGOP                          = 54;
+    const TP_SLOGOP                         = 55;
+    const TP_TLOGOP                         = 56;
+    const TP_SINGLECOND                     = 57;
+    const TP_ARRAYOPEN                      = 58;
+    const TP_QUOTE                          = 59;
+    const TP_BACKTICK                       = 60;
+    const YY_NO_ACTION = 514;
+    const YY_ACCEPT_ACTION = 513;
+    const YY_ERROR_ACTION = 512;
+
+    const YY_SZ_ACTTAB = 1997;
+public static $yy_action = array(
+    249,  250,  239,    1,   27,  127,  220,  184,  160,  213,
+     11,   54,  278,   10,  173,   34,  108,  387,  282,  279,
+    223,  321,  221,    8,  194,  387,   18,  387,   85,   41,
+    387,  285,   42,   44,  264,  222,  387,  209,  387,  198,
+    387,   52,    5,  307,  288,  288,  164,  283,  224,    4,
+     50,  249,  250,  239,    1,  232,  131,  381,  189,  205,
+    213,   11,   54,   39,   35,  243,   31,  108,   94,   17,
+    381,  223,  321,  221,  439,  226,  381,   33,   49,  426,
+     41,  439,   89,   42,   44,  264,  222,    9,  235,  163,
+    198,  426,   52,    5,  131,  288,  212,  284,  102,  106,
+      4,   50,  249,  250,  239,    1,  232,  129,  426,  189,
+    347,  213,   11,   54,  175,  324,  347,  208,  108,   22,
+    426,  301,  223,  321,  221,  302,  226,  135,   18,   49,
+     52,   41,   26,  288,   42,   44,  264,  222,   16,  235,
+    294,  198,  204,   52,    5,  170,  288,   32,   90,  267,
+    268,    4,   50,  249,  250,  239,    1,   20,  129,  185,
+    179,  255,  213,   11,   54,  455,  288,  192,  455,  108,
+    175,  167,  455,  223,  321,  221,  439,  226,  256,   18,
+     55,  292,   41,  439,  132,   42,   44,  264,  222,  427,
+    235,   12,  198,  165,   52,    5,  232,  288,  288,  347,
+    153,  427,    4,   50,  249,  250,  239,    1,  232,  129,
+    286,  181,  347,  213,   11,   54,   24,   13,  347,   49,
+    108,  232,  320,  426,  223,  321,  221,  195,  201,  173,
+     18,   49,  139,   41,  296,  426,   42,   44,  264,  222,
+      7,  235,  286,  198,   49,   52,    5,  147,  288,  117,
+    150,  317,  263,    4,   50,  249,  250,  239,    1,   95,
+    130,  173,  189,  155,  213,   11,   54,   22,  244,  271,
+    192,  108,  323,  286,  101,  223,  321,  221,  294,  226,
+    204,   18,  348,  257,   41,  166,  283,   42,   44,  264,
+    222,   28,  235,  300,  198,  348,   52,    5,  247,  288,
+    117,  348,   94,  206,    4,   50,  249,  250,  239,    1,
+     95,  129,   22,  189,  277,  213,   11,   54,   91,  274,
+    224,  426,  108,  323,  216,  156,  223,  321,  221,  132,
+    180,  262,   18,  426,  100,   41,   12,  288,   42,   44,
+    264,  222,   15,  235,  216,  198,  254,   52,    5,  233,
+    288,  210,  190,  192,  100,    4,   50,  249,  250,  239,
+      1,    3,  131,   94,  189,  192,  213,   11,   54,  269,
+     10,  204,  290,  108,  325,  216,  224,  223,  321,  221,
+     23,  226,  211,   33,  315,  100,   45,  513,   92,   42,
+     44,  264,  222,  102,  235,  178,  198,  268,   52,    5,
+    275,  288,  161,  192,   37,   25,    4,   50,  249,  250,
+    239,    1,  286,  129,  172,  187,  305,  213,   11,   54,
+    164,  283,  310,  141,  108,  281,  281,  236,  223,  321,
+    221,  169,  226,  230,   18,  122,  171,   41,  225,  175,
+     42,   44,  264,  222,  144,  235,  303,  198,  134,   52,
+      5,  265,  288,  151,  286,  192,  175,    4,   50,  249,
+    250,  239,    1,  286,  128,   94,  189,  143,  213,   11,
+     54,  219,  152,  207,  193,  108,  149,  281,   31,  223,
+    321,  221,  100,  226,   21,    6,  286,  288,   41,  158,
+     16,   42,   44,  264,  222,  102,  235,  238,  198,  286,
+     52,    5,  157,  288,  281,  122,  168,  283,    4,   50,
+    249,  250,  239,    1,   30,   93,  308,   51,  215,  213,
+     11,   54,   53,  251,  140,  248,  108,  245,  304,  116,
+    223,  321,  221,  111,  226,  176,   18,  270,  266,   41,
+    224,  322,   42,   44,  264,  222,    7,  235,  259,  198,
+    147,   52,    5,  257,  288,   43,   40,   38,   83,    4,
+     50,  241,  214,  204,  319,  280,   88,  107,  138,  182,
+     97,   64,  311,  312,  313,  316,   95,  281,  298,  258,
+    142,  234,   94,  105,  272,  197,  231,  482,  237,  323,
+     37,  133,  324,  241,  214,  204,  319,  314,   88,  107,
+    296,  183,   97,   82,   84,   43,   40,   38,   95,  296,
+    296,  258,  296,  296,  296,  159,  272,  197,  231,  296,
+    237,  323,  311,  312,  313,  316,  241,  296,  204,  296,
+    296,  103,  296,  296,  199,  104,   77,  296,  296,  110,
+    296,   95,  296,  296,  258,  278,  296,  296,   34,  272,
+    197,  231,  279,  237,  323,   43,   40,   38,  296,  296,
+    296,  241,   26,  204,  196,  276,  103,  296,   16,  199,
+    104,   77,  311,  312,  313,  316,   95,  192,  296,  258,
+    146,  296,  296,  296,  272,  197,  231,  296,  237,  323,
+    286,  393,   39,   35,  243,  296,  296,  296,  296,  191,
+    276,  296,   26,  318,  252,  253,  126,  296,   16,  249,
+    250,  239,    1,  296,  296,  131,  296,  261,  213,   11,
+     54,  296,  296,  296,  426,  108,  393,  393,  393,  223,
+    321,  221,  241,  296,  204,  299,  426,  103,  107,  296,
+    183,   97,   82,  393,  393,  393,  393,   95,  296,  260,
+    258,   52,  296,  296,  288,  272,  197,  231,  296,  237,
+    323,  293,  296,  296,  296,  296,  296,  249,  250,  239,
+      2,  296,  295,  296,  296,  296,  213,   11,   54,  296,
+    296,  177,  296,  108,  136,  296,  296,  223,  321,  221,
+    296,  296,  296,  293,   43,   40,   38,  296,  296,  249,
+    250,  239,    2,  296,  295,   43,   40,   38,  213,   11,
+     54,  311,  312,  313,  316,  108,  296,  291,   14,  223,
+    321,  221,  311,  312,  313,  316,  296,  296,  241,  296,
+    204,  296,  192,  103,  296,  296,  199,  104,   77,  296,
+    296,  296,  296,   95,  383,  296,  258,  296,  296,  297,
+     14,  272,  197,  231,  296,  237,  323,  383,  296,  296,
+    241,  296,  204,  383,  296,   99,  296,  287,  199,  120,
+     48,  241,  112,  204,  296,   95,  103,  296,  258,  199,
+    120,   74,  296,  272,  197,  231,   95,  237,  323,  258,
+    455,  296,  296,  455,  272,  197,  231,  455,  237,  323,
+    241,  296,  204,  296,  296,  103,  200,  296,  199,  120,
+     74,  296,  296,  296,  296,   95,  296,  296,  258,  278,
+    296,  296,   34,  272,  197,  231,  279,  237,  323,  241,
+    455,  204,  296,  296,   99,  202,  296,  199,  120,   56,
+    241,  211,  204,  296,   95,  103,  296,  258,  199,  120,
+     74,  296,  272,  197,  231,   95,  237,  323,  258,  227,
+    296,  296,  296,  272,  197,  231,  296,  237,  323,  241,
+    296,  204,  148,  296,  103,  203,   86,  199,  120,   73,
+    296,  296,  286,  296,   95,  296,  296,  258,  278,  296,
+    296,   34,  272,  197,  231,  279,  237,  323,  241,  296,
+    204,  175,  296,  103,  296,  296,  199,  120,   75,  241,
+    296,  204,  296,   95,  103,  296,  258,  199,  120,   63,
+    296,  272,  197,  231,   95,  237,  323,  258,  229,  192,
+    296,  296,  272,  197,  231,  296,  237,  323,  241,  296,
+    204,  380,  296,  103,  296,  296,  199,  120,   58,  296,
+    296,  296,  296,   95,  380,  296,  258,  296,  296,  296,
+    380,  272,  197,  231,  296,  237,  323,  241,  296,  204,
+    296,  296,  103,  296,  296,  199,  120,   71,  241,  296,
+    204,  296,   95,  103,  296,  258,  199,  120,   79,  296,
+    272,  197,  231,   95,  237,  323,  258,  296,  296,  296,
+    154,  272,  197,  231,   87,  237,  323,  241,  296,  204,
+    286,  296,  103,  296,  296,  199,  120,   70,  296,  296,
+    296,  296,   95,  296,  296,  258,  296,  296,  296,  175,
+    272,  197,  231,  296,  237,  323,  241,  296,  204,  296,
+    296,  103,  296,  296,  199,  120,   56,  241,  296,  204,
+    296,   95,  103,  296,  258,  199,  120,   46,  296,  272,
+    197,  231,   95,  237,  323,  258,  296,  296,  296,  296,
+    272,  197,  231,  296,  237,  323,  241,  296,  204,  296,
+    296,  103,  296,  296,  199,  120,   78,  296,  296,  296,
+    296,   95,  296,  296,  258,  296,  296,  296,  296,  272,
+    197,  231,  296,  237,  323,  241,  296,  204,  296,  296,
+    103,  296,  296,  199,  120,   66,  241,  296,  204,  296,
+     95,  103,  296,  258,  199,  120,   59,  296,  272,  197,
+    231,   95,  237,  323,  258,  296,  296,  296,  296,  272,
+    197,  231,  296,  237,  323,  241,  296,  204,  296,  296,
+    103,  296,  296,  186,  109,   57,  296,  296,  296,  296,
+     95,  296,  296,  258,  296,  296,  296,  296,  272,  197,
+    231,  296,  237,  323,  241,  296,  204,  296,  296,  103,
+    296,  296,  188,  120,   67,  241,  296,  204,  296,   95,
+    103,  296,  258,  199,   96,   62,  296,  272,  197,  231,
+     95,  237,  323,  258,  296,  296,  296,  296,  272,  197,
+    231,  296,  237,  323,  241,  296,  204,  296,  296,  103,
+    296,  296,  199,  120,   80,  296,  296,  296,  296,   95,
+    296,  296,  258,  296,  296,  296,  296,  272,  197,  231,
+    296,  237,  323,  241,  296,  204,  296,  296,  103,  296,
+    296,  199,  120,   76,  241,  296,  204,  296,   95,  103,
+    296,  258,  199,  120,   81,  296,  272,  197,  231,   95,
+    237,  323,  258,  296,  296,  296,  296,  272,  197,  231,
+    296,  237,  323,  241,  296,  204,  296,  296,  103,  296,
+    296,  199,  120,   65,  296,  296,  296,  296,   95,  296,
+    296,  258,  296,  296,  296,  296,  272,  197,  231,  296,
+    237,  323,  241,  296,  204,  296,  296,  103,  296,  296,
+    199,   96,   68,  241,  296,  204,  296,   95,  103,  296,
+    258,  199,  120,   61,  296,  272,  197,  231,   95,  237,
+    323,  258,  296,  296,  296,  296,  272,  197,  231,  296,
+    237,  323,  241,  296,  204,  296,  296,  103,  296,  296,
+    199,   98,   69,  296,  296,  296,  296,   95,  296,  296,
+    258,  296,  296,  296,  296,  272,  197,  231,  296,  237,
+    323,  241,  296,  204,  296,  296,  103,  296,  296,  199,
+    120,   72,  241,  296,  204,  296,   95,  103,  296,  258,
+    199,  120,   47,  296,  272,  197,  231,   95,  237,  323,
+    258,  296,  296,  296,  296,  272,  197,  231,  296,  237,
+    323,  241,  192,  204,  296,  296,  103,  296,  296,  199,
+    120,   60,  296,  296,  351,  296,   95,  296,  217,  258,
+    296,  296,  296,  296,  272,  197,  231,   26,  237,  323,
+    241,  296,  204,   16,  296,  103,  426,  296,  199,  125,
+    296,  241,  296,  204,  296,   95,  103,  296,  426,  199,
+    118,  296,  242,  272,  197,  231,   95,  237,  323,  296,
+    296,  296,  296,  246,  272,  197,  231,  296,  237,  323,
+    241,  296,  204,  278,  296,  103,   34,  296,  199,  121,
+    279,  296,  296,  296,  296,   95,  296,  296,  296,  296,
+     26,  296,  162,  272,  197,  231,   16,  237,  323,  241,
+    296,  204,  296,  296,  103,  296,  296,  199,  123,  296,
+    241,  296,  204,  296,   95,  103,  296,  296,  199,  114,
+    296,  296,  272,  197,  231,   95,  237,  323,  296,  296,
+    296,  296,  296,  272,  197,  231,  296,  237,  323,  241,
+    296,  204,  296,  145,  103,  296,  296,  199,  124,  296,
+    296,  296,  296,  286,   95,   39,   35,  243,  296,  296,
+    296,  296,  272,  197,  231,  296,  237,  323,  241,  296,
+    204,  296,  296,  103,  296,  296,  199,  115,  296,  241,
+    296,  204,  296,   95,  103,  296,  296,  199,  113,  296,
+    296,  272,  197,  231,   95,  237,  323,  296,  296,  296,
+    296,  296,  272,  197,  231,  228,  237,  323,  241,  296,
+    204,  296,  455,  103,  296,  455,  199,  119,    3,  455,
+    439,  296,  296,   95,  296,  296,  296,  296,  296,  296,
+    296,  272,  197,  231,  228,  237,  323,  296,  296,  296,
+    296,  455,  296,  296,  455,  296,  296,  439,  455,  439,
+    439,  228,  455,  296,  439,  296,  296,  137,  455,  296,
+    296,  455,  296,  296,   32,  455,  439,  286,  296,   39,
+     35,  243,   29,  296,   26,  296,  439,  296,  296,  439,
+     16,  455,  296,  439,  306,   43,   40,   38,  296,  296,
+    296,  296,  296,  439,  296,  296,  439,  296,  455,  296,
+    439,   26,  311,  312,  313,  316,  296,   16,  228,  296,
+    296,  296,   43,   40,   38,  455,  296,  296,  455,  296,
+    296,  296,  455,  439,  296,  296,   19,  296,  296,  311,
+    312,  313,  316,  455,  296,  296,  455,  296,  296,  296,
+    455,  439,  296,  296,  296,   43,   40,   38,  296,  296,
+    439,  296,  296,  439,  174,  455,  296,  439,  296,  240,
+    309,  296,  311,  312,  313,  316,  296,  289,  439,  296,
+     36,  439,  296,  455,  296,  439,  296,  296,   43,   40,
+     38,  296,  296,   43,   40,   38,  296,  296,  296,  296,
+    296,   43,   40,   38,  296,  311,  312,  313,  316,  296,
+    311,  312,  313,  316,  296,   43,   40,   38,  311,  312,
+    313,  316,  273,   43,   40,   38,  296,  296,  296,  296,
+    296,  296,  311,  312,  313,  316,  296,  296,  296,  296,
+    311,  312,  313,  316,  455,  296,  296,  455,   43,   40,
+     38,  455,  439,  218,   43,   40,   38,  296,  296,  296,
+    296,  296,  296,  296,  296,  311,  312,  313,  316,  296,
+    296,  311,  312,  313,  316,  296,  296,  296,  296,  439,
+    296,  296,  439,  296,  455,  296,  439,
+    );
+    public static $yy_lookahead = array(
+      9,   10,   11,   12,   12,   14,   14,   16,   16,   18,
+     19,   20,    9,   34,  102,   12,   25,   13,   70,   16,
+     29,   30,   31,   35,   33,   21,   35,   23,   95,   38,
+     26,   52,   41,   42,   43,   44,   32,   46,   34,   48,
+     36,   50,   51,   52,   53,   53,   98,   99,   44,   58,
+     59,    9,   10,   11,   12,   22,   14,   13,   16,   15,
+     18,   19,   20,   85,   86,   87,   15,   25,   17,   21,
+     26,   29,   30,   31,   44,   33,   32,   35,   45,   35,
+     38,   51,   34,   41,   42,   43,   44,   35,   46,   77,
+     48,   47,   50,   51,   14,   53,   16,   13,   47,   47,
+     58,   59,    9,   10,   11,   12,   22,   14,   35,   16,
+     26,   18,   19,   20,  102,  103,   32,   44,   25,   34,
+     47,   36,   29,   30,   31,   52,   33,   14,   35,   45,
+     50,   38,   26,   53,   41,   42,   43,   44,   32,   46,
+     66,   48,   68,   50,   51,   77,   53,   15,   35,    7,
+      8,   58,   59,    9,   10,   11,   12,   12,   14,   14,
+     16,   16,   18,   19,   20,    9,   53,    1,   12,   25,
+    102,   82,   16,   29,   30,   31,   44,   33,   33,   35,
+    106,  107,   38,   51,   44,   41,   42,   43,   44,   35,
+     46,   51,   48,   82,   50,   51,   22,   53,   53,   13,
+     73,   47,   58,   59,    9,   10,   11,   12,   22,   14,
+     83,   16,   26,   18,   19,   20,   28,   12,   32,   45,
+     25,   22,   70,   35,   29,   30,   31,   65,   33,  102,
+     35,   45,   73,   38,   60,   47,   41,   42,   43,   44,
+     35,   46,   83,   48,   45,   50,   51,   95,   53,   71,
+     95,   52,   74,   58,   59,    9,   10,   11,   12,   81,
+     14,  102,   16,   73,   18,   19,   20,   34,   90,   36,
+      1,   25,   94,   83,   81,   29,   30,   31,   66,   33,
+     68,   35,   13,   96,   38,   98,   99,   41,   42,   43,
+     44,   15,   46,  100,   48,   26,   50,   51,   14,   53,
+     71,   32,   17,   74,   58,   59,    9,   10,   11,   12,
+     81,   14,   34,   16,   36,   18,   19,   20,   82,  107,
+     44,   35,   25,   94,   71,   95,   29,   30,   31,   44,
+     33,   78,   35,   47,   81,   38,   51,   53,   41,   42,
+     43,   44,   15,   46,   71,   48,   16,   50,   51,   22,
+     53,   78,   79,    1,   81,   58,   59,    9,   10,   11,
+     12,   15,   14,   17,   16,    1,   18,   19,   20,   66,
+     34,   68,   36,   25,   16,   71,   44,   29,   30,   31,
+     28,   33,   78,   35,   52,   81,   38,   62,   63,   41,
+     42,   43,   44,   47,   46,    6,   48,    8,   50,   51,
+     16,   53,   73,    1,    2,   40,   58,   59,    9,   10,
+     11,   12,   83,   14,   77,   16,   52,   18,   19,   20,
+     98,   99,   52,   95,   25,   97,   97,   92,   29,   30,
+     31,   77,   33,   49,   35,  100,   14,   38,   16,  102,
+     41,   42,   43,   44,   73,   46,   14,   48,   14,   50,
+     51,   36,   53,   73,   83,    1,  102,   58,   59,    9,
+     10,   11,   12,   83,   14,   17,   16,   50,   18,   19,
+     20,   17,   71,   64,   65,   25,   73,   97,   15,   29,
+     30,   31,   81,   33,   26,   35,   83,   53,   38,   73,
+     32,   41,   42,   43,   44,   47,   46,   92,   48,   83,
+     50,   51,   95,   53,   97,  100,   98,   99,   58,   59,
+      9,   10,   11,   12,   23,   14,   52,   16,   16,   18,
+     19,   20,   16,    7,   50,   16,   25,   13,   13,   16,
+     29,   30,   31,   16,   33,   16,   35,   33,   33,   38,
+     44,   16,   41,   42,   43,   44,   35,   46,   16,   48,
+     95,   50,   51,   96,   53,   37,   38,   39,   81,   58,
+     59,   66,   67,   68,   69,   83,   71,   72,   95,   74,
+     75,   76,   54,   55,   56,   57,   81,   97,   60,   84,
+     95,   13,   17,   80,   89,   90,   91,    1,   93,   94,
+      2,   81,  103,   66,   67,   68,   69,   99,   71,   72,
+    108,   74,   75,   76,   81,   37,   38,   39,   81,  108,
+    108,   84,  108,  108,  108,   95,   89,   90,   91,  108,
+     93,   94,   54,   55,   56,   57,   66,  108,   68,  108,
+    108,   71,  108,  108,   74,   75,   76,  108,  108,   21,
+    108,   81,  108,  108,   84,    9,  108,  108,   12,   89,
+     90,   91,   16,   93,   94,   37,   38,   39,  108,  108,
+    108,   66,   26,   68,  104,  105,   71,  108,   32,   74,
+     75,   76,   54,   55,   56,   57,   81,    1,  108,   84,
+     73,  108,  108,  108,   89,   90,   91,  108,   93,   94,
+     83,    2,   85,   86,   87,  108,  108,  108,  108,  104,
+    105,  108,   26,    3,    4,    5,    6,  108,   32,    9,
+     10,   11,   12,  108,  108,   14,  108,   16,   18,   19,
+     20,  108,  108,  108,   35,   25,   37,   38,   39,   29,
+     30,   31,   66,  108,   68,   69,   47,   71,   72,  108,
+     74,   75,   76,   54,   55,   56,   57,   81,  108,   48,
+     84,   50,  108,  108,   53,   89,   90,   91,  108,   93,
+     94,    3,  108,  108,  108,  108,  108,    9,   10,   11,
+     12,  108,   14,  108,  108,  108,   18,   19,   20,  108,
+    108,   13,  108,   25,   27,  108,  108,   29,   30,   31,
+    108,  108,  108,    3,   37,   38,   39,  108,  108,    9,
+     10,   11,   12,  108,   14,   37,   38,   39,   18,   19,
+     20,   54,   55,   56,   57,   25,  108,   59,   60,   29,
+     30,   31,   54,   55,   56,   57,  108,  108,   66,  108,
+     68,  108,    1,   71,  108,  108,   74,   75,   76,  108,
+    108,  108,  108,   81,   13,  108,   84,  108,  108,   59,
+     60,   89,   90,   91,  108,   93,   94,   26,  108,  108,
+     66,  108,   68,   32,  108,   71,  108,  105,   74,   75,
+     76,   66,   78,   68,  108,   81,   71,  108,   84,   74,
+     75,   76,  108,   89,   90,   91,   81,   93,   94,   84,
+      9,  108,  108,   12,   89,   90,   91,   16,   93,   94,
+     66,  108,   68,  108,  108,   71,  101,  108,   74,   75,
+     76,  108,  108,  108,  108,   81,  108,  108,   84,    9,
+    108,  108,   12,   89,   90,   91,   16,   93,   94,   66,
+     49,   68,  108,  108,   71,  101,  108,   74,   75,   76,
+     66,   78,   68,  108,   81,   71,  108,   84,   74,   75,
+     76,  108,   89,   90,   91,   81,   93,   94,   84,   49,
+    108,  108,  108,   89,   90,   91,  108,   93,   94,   66,
+    108,   68,   73,  108,   71,  101,   77,   74,   75,   76,
+    108,  108,   83,  108,   81,  108,  108,   84,    9,  108,
+    108,   12,   89,   90,   91,   16,   93,   94,   66,  108,
+     68,  102,  108,   71,  108,  108,   74,   75,   76,   66,
+    108,   68,  108,   81,   71,  108,   84,   74,   75,   76,
+    108,   89,   90,   91,   81,   93,   94,   84,   49,    1,
+    108,  108,   89,   90,   91,  108,   93,   94,   66,  108,
+     68,   13,  108,   71,  108,  108,   74,   75,   76,  108,
+    108,  108,  108,   81,   26,  108,   84,  108,  108,  108,
+     32,   89,   90,   91,  108,   93,   94,   66,  108,   68,
+    108,  108,   71,  108,  108,   74,   75,   76,   66,  108,
+     68,  108,   81,   71,  108,   84,   74,   75,   76,  108,
+     89,   90,   91,   81,   93,   94,   84,  108,  108,  108,
+     73,   89,   90,   91,   77,   93,   94,   66,  108,   68,
+     83,  108,   71,  108,  108,   74,   75,   76,  108,  108,
+    108,  108,   81,  108,  108,   84,  108,  108,  108,  102,
+     89,   90,   91,  108,   93,   94,   66,  108,   68,  108,
+    108,   71,  108,  108,   74,   75,   76,   66,  108,   68,
+    108,   81,   71,  108,   84,   74,   75,   76,  108,   89,
+     90,   91,   81,   93,   94,   84,  108,  108,  108,  108,
+     89,   90,   91,  108,   93,   94,   66,  108,   68,  108,
+    108,   71,  108,  108,   74,   75,   76,  108,  108,  108,
+    108,   81,  108,  108,   84,  108,  108,  108,  108,   89,
+     90,   91,  108,   93,   94,   66,  108,   68,  108,  108,
+     71,  108,  108,   74,   75,   76,   66,  108,   68,  108,
+     81,   71,  108,   84,   74,   75,   76,  108,   89,   90,
+     91,   81,   93,   94,   84,  108,  108,  108,  108,   89,
+     90,   91,  108,   93,   94,   66,  108,   68,  108,  108,
+     71,  108,  108,   74,   75,   76,  108,  108,  108,  108,
+     81,  108,  108,   84,  108,  108,  108,  108,   89,   90,
+     91,  108,   93,   94,   66,  108,   68,  108,  108,   71,
+    108,  108,   74,   75,   76,   66,  108,   68,  108,   81,
+     71,  108,   84,   74,   75,   76,  108,   89,   90,   91,
+     81,   93,   94,   84,  108,  108,  108,  108,   89,   90,
+     91,  108,   93,   94,   66,  108,   68,  108,  108,   71,
+    108,  108,   74,   75,   76,  108,  108,  108,  108,   81,
+    108,  108,   84,  108,  108,  108,  108,   89,   90,   91,
+    108,   93,   94,   66,  108,   68,  108,  108,   71,  108,
+    108,   74,   75,   76,   66,  108,   68,  108,   81,   71,
+    108,   84,   74,   75,   76,  108,   89,   90,   91,   81,
+     93,   94,   84,  108,  108,  108,  108,   89,   90,   91,
+    108,   93,   94,   66,  108,   68,  108,  108,   71,  108,
+    108,   74,   75,   76,  108,  108,  108,  108,   81,  108,
+    108,   84,  108,  108,  108,  108,   89,   90,   91,  108,
+     93,   94,   66,  108,   68,  108,  108,   71,  108,  108,
+     74,   75,   76,   66,  108,   68,  108,   81,   71,  108,
+     84,   74,   75,   76,  108,   89,   90,   91,   81,   93,
+     94,   84,  108,  108,  108,  108,   89,   90,   91,  108,
+     93,   94,   66,  108,   68,  108,  108,   71,  108,  108,
+     74,   75,   76,  108,  108,  108,  108,   81,  108,  108,
+     84,  108,  108,  108,  108,   89,   90,   91,  108,   93,
+     94,   66,  108,   68,  108,  108,   71,  108,  108,   74,
+     75,   76,   66,  108,   68,  108,   81,   71,  108,   84,
+     74,   75,   76,  108,   89,   90,   91,   81,   93,   94,
+     84,  108,  108,  108,  108,   89,   90,   91,  108,   93,
+     94,   66,    1,   68,  108,  108,   71,  108,  108,   74,
+     75,   76,  108,  108,   13,  108,   81,  108,   17,   84,
+    108,  108,  108,  108,   89,   90,   91,   26,   93,   94,
+     66,  108,   68,   32,  108,   71,   35,  108,   74,   75,
+    108,   66,  108,   68,  108,   81,   71,  108,   47,   74,
+     75,  108,   88,   89,   90,   91,   81,   93,   94,  108,
+    108,  108,  108,   88,   89,   90,   91,  108,   93,   94,
+     66,  108,   68,    9,  108,   71,   12,  108,   74,   75,
+     16,  108,  108,  108,  108,   81,  108,  108,  108,  108,
+     26,  108,   28,   89,   90,   91,   32,   93,   94,   66,
+    108,   68,  108,  108,   71,  108,  108,   74,   75,  108,
+     66,  108,   68,  108,   81,   71,  108,  108,   74,   75,
+    108,  108,   89,   90,   91,   81,   93,   94,  108,  108,
+    108,  108,  108,   89,   90,   91,  108,   93,   94,   66,
+    108,   68,  108,   73,   71,  108,  108,   74,   75,  108,
+    108,  108,  108,   83,   81,   85,   86,   87,  108,  108,
+    108,  108,   89,   90,   91,  108,   93,   94,   66,  108,
+     68,  108,  108,   71,  108,  108,   74,   75,  108,   66,
+    108,   68,  108,   81,   71,  108,  108,   74,   75,  108,
+    108,   89,   90,   91,   81,   93,   94,  108,  108,  108,
+    108,  108,   89,   90,   91,    2,   93,   94,   66,  108,
+     68,  108,    9,   71,  108,   12,   74,   75,   15,   16,
+     17,  108,  108,   81,  108,  108,  108,  108,  108,  108,
+    108,   89,   90,   91,    2,   93,   94,  108,  108,  108,
+    108,    9,  108,  108,   12,  108,  108,   44,   16,   17,
+     47,    2,   49,  108,   51,  108,  108,   73,    9,  108,
+    108,   12,  108,  108,   15,   16,   17,   83,  108,   85,
+     86,   87,   24,  108,   26,  108,   44,  108,  108,   47,
+     32,   49,  108,   51,   52,   37,   38,   39,  108,  108,
+    108,  108,  108,   44,  108,  108,   47,  108,   49,  108,
+     51,   26,   54,   55,   56,   57,  108,   32,    2,  108,
+    108,  108,   37,   38,   39,    9,  108,  108,   12,  108,
+    108,  108,   16,   17,  108,  108,    2,  108,  108,   54,
+     55,   56,   57,    9,  108,  108,   12,  108,  108,  108,
+     16,   17,  108,  108,  108,   37,   38,   39,  108,  108,
+     44,  108,  108,   47,   13,   49,  108,   51,  108,   13,
+     52,  108,   54,   55,   56,   57,  108,   13,   44,  108,
+      2,   47,  108,   49,  108,   51,  108,  108,   37,   38,
+     39,  108,  108,   37,   38,   39,  108,  108,  108,  108,
+    108,   37,   38,   39,  108,   54,   55,   56,   57,  108,
+     54,   55,   56,   57,  108,   37,   38,   39,   54,   55,
+     56,   57,   36,   37,   38,   39,  108,  108,  108,  108,
+    108,  108,   54,   55,   56,   57,  108,  108,  108,  108,
+     54,   55,   56,   57,    9,  108,  108,   12,   37,   38,
+     39,   16,   17,   36,   37,   38,   39,  108,  108,  108,
+    108,  108,  108,  108,  108,   54,   55,   56,   57,  108,
+    108,   54,   55,   56,   57,  108,  108,  108,  108,   44,
+    108,  108,   47,  108,   49,  108,   51,
+);
+    const YY_SHIFT_USE_DFLT = -22;
+    const YY_SHIFT_MAX = 230;
+    public static $yy_shift_ofst = array(
+    -22,  501,  501,   93,  399,  399,  450,   93,   93,   93,
+    399,  450,   -9,   93,   93,   93,   93,   93,   93,  144,
+     93,  195,   93,   93,   93,  246,  195,   93,   93,   93,
+     93,   93,  297,   93,   93,   93,   93,  348,   42,   42,
+     42,   42,   42,   42,   42,   42, 1768, 1795, 1795,  701,
+    758, 1521,   80,  676,  113,  790, 1927, 1828, 1896,  568,
+    768, 1861,  757, 1866, 1874, 1888,  618,  518, 1921, 1921,
+   1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921, 1921,
+   1921, 1921, 1921, 1584,  636,  285,  676,  676,  346,  113,
+    113,  402,  700, 1723,   -8,  910,  831,  269, 1028,   51,
+      3,    3,  422,  448,  352,  106,  422,  106,  458,  364,
+    434,  454,  106,  166,  166,  166,  166,  565,  166,  166,
+    166,  586,  565,  166,  166,  -22,  -22, 1752, 1769, 1826,
+   1844, 1945,  145,  979,  156,  132,  284,  106,  140,  106,
+     30,  140,  140,   30,  106,  106,  106,  140,  106,  106,
+    140,  106,  327,  106,  106,  106,  140,  140,  106,  140,
+    205,  106,  284,  166,  565,  588,  565,  588,  565,  166,
+    166,  -12,  166,  -22,  -22,  -22,  -22,  -22,  -22,  689,
+      4,   44,   84,  186,   73,  881,  199,  188,  174,  286,
+     48,  336,  384,  389,  332,  142,  -21,   52,  154,   33,
+     85,  276,  278,  233,  515,  509,  474,  516,  502,  464,
+    491,  415,  417,  432,  514,  370,  463,  506,  365,  513,
+    -12,  517,  504,  519,  505,  511,  496,  525,  532,  330,
+    358,
+);
+    const YY_REDUCE_USE_DFLT = -89;
+    const YY_REDUCE_MAX = 178;
+    public static $yy_reduce_ofst = array(
+    325,  527,  495,  666,  595,  560,  863,  874,  834,  805,
+    762,  794, 1179, 1455, 1208, 1012, 1386, 1139, 1070, 1110,
+   1150, 1219, 1248, 1277, 1288, 1317, 1346, 1357, 1415, 1426,
+   1081, 1041, 1001,  972,  943,  932,  903, 1484, 1495, 1622,
+   1633, 1662, 1593, 1564, 1553, 1524, 1704,  607, 1590,  178,
+     74, 1027,  229,  899,  273,  212,  -22,  -22,  -22,  -22,
+    -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
+    -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
+    -22,  -22,  -22,  380,  329,  187,  159,  127,  -52,  253,
+    304,   12,  303,  152,  193,  328,   68,   68,   68,  322,
+    328,  407,  405,  322,   68,  190,  335,  416,  403,   68,
+    401,  354,  371,   68,   68,   68,  337,  322,   68,   68,
+     68,   68,  408,   68,   68,   68,  409,  455,  455,  455,
+    455,  455,  510,  480,  455,  455,  477,  482,  457,  482,
+    473,  457,  457,  485,  482,  482,  482,  457,  482,  482,
+    457,  482,  503,  482,  482,  482,  457,  457,  482,  457,
+    520,  482,  523,  -88,  498,  489,  498,  489,  498,  -88,
+    -88,  -67,  -88,  111,  155,   89,  236,  230,  162,
+);
+    public static $yyExpectedTokens = array(
+         array(),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 52, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 20, 25, 29, 30, 31, 33, 35, 38, 41, 42, 43, 44, 46, 48, 50, 51, 53, 58, 59, ),
+         array(24, 26, 32, 37, 38, 39, 54, 55, 56, 57, ),
+         array(26, 32, 37, 38, 39, 54, 55, 56, 57, ),
+         array(26, 32, 37, 38, 39, 54, 55, 56, 57, ),
+         array(14, 16, 48, 50, 53, ),
+         array(3, 9, 10, 11, 12, 14, 18, 19, 20, 25, 29, 30, 31, 59, 60, ),
+         array(1, 13, 17, 26, 32, 35, 47, ),
+         array(14, 16, 50, 53, ),
+         array(1, 26, 32, ),
+         array(14, 35, 53, ),
+         array(3, 9, 10, 11, 12, 14, 18, 19, 20, 25, 29, 30, 31, 59, 60, ),
+         array(36, 37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 52, 54, 55, 56, 57, ),
+         array(36, 37, 38, 39, 54, 55, 56, 57, ),
+         array(13, 37, 38, 39, 54, 55, 56, 57, ),
+         array(13, 37, 38, 39, 54, 55, 56, 57, ),
+         array(13, 37, 38, 39, 54, 55, 56, 57, ),
+         array(27, 37, 38, 39, 54, 55, 56, 57, ),
+         array(13, 37, 38, 39, 54, 55, 56, 57, ),
+         array(13, 37, 38, 39, 54, 55, 56, 57, ),
+         array(2, 37, 38, 39, 54, 55, 56, 57, ),
+         array(21, 37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, 60, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(37, 38, 39, 54, 55, 56, 57, ),
+         array(9, 12, 16, 26, 28, 32, ),
+         array(9, 12, 16, 26, 32, ),
+         array(17, 44, 51, ),
+         array(1, 26, 32, ),
+         array(1, 26, 32, ),
+         array(15, 17, 47, ),
+         array(14, 35, 53, ),
+         array(14, 35, 53, ),
+         array(1, 2, ),
+         array(3, 4, 5, 6, 9, 10, 11, 12, 18, 19, 20, 25, 29, 30, 31, ),
+         array(2, 9, 12, 15, 16, 17, 44, 47, 49, 51, ),
+         array(12, 14, 16, 53, ),
+         array(9, 12, 16, 49, ),
+         array(1, 13, 26, 32, ),
+         array(1, 13, 26, 32, ),
+         array(1, 13, 26, 32, ),
+         array(15, 17, 47, ),
+         array(9, 12, 16, ),
+         array(9, 12, 16, ),
+         array(14, 16, ),
+         array(17, 47, ),
+         array(1, 28, ),
+         array(26, 32, ),
+         array(14, 16, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(1, 52, ),
+         array(14, 53, ),
+         array(1, 17, ),
+         array(26, 32, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(17, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(17, ),
+         array(1, ),
+         array(1, ),
+         array(),
+         array(),
+         array(2, 9, 12, 16, 17, 44, 47, 49, 51, 52, ),
+         array(2, 9, 12, 15, 16, 17, 44, 47, 49, 51, ),
+         array(2, 9, 12, 16, 17, 44, 47, 49, 51, ),
+         array(2, 9, 12, 16, 17, 44, 47, 49, 51, ),
+         array(9, 12, 16, 17, 44, 47, 49, 51, ),
+         array(12, 14, 16, 33, 53, ),
+         array(9, 12, 16, 49, ),
+         array(9, 12, 16, ),
+         array(15, 44, 51, ),
+         array(14, 53, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(44, 51, ),
+         array(44, 51, ),
+         array(44, 51, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(26, 32, ),
+         array(15, 22, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(44, 51, ),
+         array(26, 32, ),
+         array(44, 51, ),
+         array(12, 35, ),
+         array(26, 32, ),
+         array(14, 53, ),
+         array(1, ),
+         array(17, ),
+         array(2, ),
+         array(17, ),
+         array(2, ),
+         array(17, ),
+         array(1, ),
+         array(1, ),
+         array(35, ),
+         array(1, ),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(2, 35, 37, 38, 39, 47, 54, 55, 56, 57, ),
+         array(13, 21, 23, 26, 32, 34, 36, 44, ),
+         array(13, 15, 26, 32, 35, 47, ),
+         array(13, 22, 26, 32, 45, ),
+         array(13, 22, 26, 32, 45, ),
+         array(35, 44, 47, 52, ),
+         array(9, 12, 16, 49, ),
+         array(22, 45, 52, ),
+         array(28, 35, 47, ),
+         array(22, 45, 60, ),
+         array(35, 47, ),
+         array(21, 34, ),
+         array(34, 36, ),
+         array(16, 49, ),
+         array(6, 8, ),
+         array(44, 52, ),
+         array(7, 8, ),
+         array(34, 52, ),
+         array(35, 47, ),
+         array(35, 47, ),
+         array(22, 45, ),
+         array(34, 36, ),
+         array(15, 44, ),
+         array(34, 36, ),
+         array(34, 36, ),
+         array(13, ),
+         array(16, ),
+         array(50, ),
+         array(7, ),
+         array(16, ),
+         array(52, ),
+         array(23, ),
+         array(36, ),
+         array(50, ),
+         array(14, ),
+         array(13, ),
+         array(52, ),
+         array(15, ),
+         array(16, ),
+         array(40, ),
+         array(16, ),
+         array(35, ),
+         array(16, ),
+         array(33, ),
+         array(16, ),
+         array(33, ),
+         array(35, ),
+         array(44, ),
+         array(16, ),
+         array(16, ),
+         array(16, ),
+         array(16, ),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+);
+    public static $yy_default = array(
+    336,  512,  512,  512,  497,  497,  512,  474,  474,  474,
+    512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+    512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+    512,  512,  512,  512,  512,  512,  512,  512,  512,  512,
+    512,  512,  512,  512,  512,  512,  377,  377,  356,  512,
+    512,  413,  512,  377,  512,  512,  512,  512,  512,  512,
+    512,  512,  382,  512,  349,  512,  512,  512,  382,  379,
+    389,  388,  384,  402,  473,  397,  498,  500,  401,  361,
+    472,  499,  349,  377,  377,  487,  377,  377,  429,  512,
+    512,  368,  326,  428,  512,  439,  391,  391,  391,  429,
+    439,  439,  512,  429,  391,  377,  512,  377,  377,  391,
+    512,  371,  358,  395,  394,  396,  373,  429,  400,  404,
+    391,  404,  484,  406,  405,  481,  334,  428,  428,  428,
+    428,  428,  512,  441,  439,  455,  512,  363,  435,  354,
+    434,  437,  433,  432,  359,  357,  364,  436,  353,  367,
+    466,  365,  512,  352,  350,  360,  467,  465,  346,  464,
+    439,  366,  512,  369,  461,  475,  488,  476,  485,  372,
+    422,  439,  374,  480,  439,  480,  480,  439,  334,  413,
+    409,  413,  403,  403,  413,  440,  403,  413,  403,  413,
+    512,  512,  512,  332,  409,  512,  512,  512,  423,  403,
+    512,  409,  512,  512,  512,  512,  512,  512,  512,  418,
+    385,  512,  512,  512,  512,  512,  512,  512,  415,  512,
+    455,  512,  512,  512,  411,  486,  409,  512,  512,  512,
+    512,  419,  407,  362,  445,  418,  425,  424,  420,  339,
+    460,  421,  483,  398,  416,  340,  399,  455,  378,  337,
+    338,  330,  328,  329,  442,  443,  444,  438,  392,  393,
+    427,  426,  386,  417,  408,  390,  410,  331,  333,  335,
+    412,  470,  414,  415,  503,  478,  495,  471,  459,  458,
+    375,  457,  344,  462,  508,  493,  376,  496,  456,  509,
+    494,  501,  504,  511,  510,  507,  505,  502,  506,  345,
+    468,  469,  446,  355,  341,  452,  450,  454,  448,  453,
+    447,  489,  490,  491,  463,  449,  492,  451,  327,  342,
+    343,  370,  430,  431,  479,  477,
+);
+    const YYNOCODE = 109;
+    const YYSTACKDEPTH = 500;
+    const YYNSTATE = 326;
+    const YYNRULE = 186;
+    const YYERRORSYMBOL = 61;
+    const YYERRSYMDT = 'yy0';
+    const YYFALLBACK = 0;
+    public static $yyFallback = array(
+    );
+    public function Trace($TraceFILE, $zTracePrompt)
+    {
+        if (!$TraceFILE) {
+            $zTracePrompt = 0;
+        } elseif (!$zTracePrompt) {
+            $TraceFILE = 0;
+        }
+        $this->yyTraceFILE = $TraceFILE;
+        $this->yyTracePrompt = $zTracePrompt;
+    }
+
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+    public $yyTraceFILE;
+    public $yyTracePrompt;
+    public $yyidx;                    /* Index of top element in stack */
+    public $yyerrcnt;                 /* Shifts left before out of the error */
+    public $yystack = array();  /* The parser's stack */
+
+    public $yyTokenName = array(
+  '$',             'VERT',          'COLON',         'TEXT',        
+  'STRIPON',       'STRIPOFF',      'LITERALSTART',  'LITERALEND',  
+  'LITERAL',       'SIMPELOUTPUT',  'SIMPLETAG',     'SMARTYBLOCKCHILDPARENT',
+  'LDEL',          'RDEL',          'DOLLARID',      'EQUAL',       
+  'ID',            'PTR',           'LDELMAKENOCACHE',  'LDELIF',      
+  'LDELFOR',       'SEMICOLON',     'INCDEC',        'TO',          
+  'STEP',          'LDELFOREACH',   'SPACE',         'AS',          
+  'APTR',          'LDELSETFILTER',  'CLOSETAG',      'LDELSLASH',   
+  'ATTR',          'INTEGER',       'COMMA',         'OPENP',       
+  'CLOSEP',        'MATH',          'UNIMATH',       'ISIN',        
+  'QMARK',         'NOT',           'TYPECAST',      'HEX',         
+  'DOT',           'INSTANCEOF',    'SINGLEQUOTESTRING',  'DOUBLECOLON', 
+  'NAMESPACE',     'AT',            'HATCH',         'OPENB',       
+  'CLOSEB',        'DOLLAR',        'LOGOP',         'SLOGOP',      
+  'TLOGOP',        'SINGLECOND',    'ARRAYOPEN',     'QUOTE',       
+  'BACKTICK',      'error',         'start',         'template',    
+  'literal_e2',    'literal_e1',    'smartytag',     'tagbody',     
+  'tag',           'outattr',       'eqoutattr',     'varindexed',  
+  'output',        'attributes',    'variable',      'value',       
+  'expr',          'modifierlist',  'statement',     'statements',  
+  'foraction',     'varvar',        'modparameters',  'attribute',   
+  'ternary',       'tlop',          'lop',           'scond',       
+  'array',         'function',      'ns1',           'doublequoted_with_quotes',
+  'static_class_access',  'arraydef',      'object',        'arrayindex',  
+  'indexdef',      'varvarele',     'objectchain',   'objectelement',
+  'method',        'params',        'modifier',      'modparameter',
+  'arrayelements',  'arrayelement',  'doublequoted',  'doublequotedcontent',
+    );
+
+    public static $yyRuleName = array(
+  'start ::= template',
+  'template ::= template TEXT',
+  'template ::= template STRIPON',
+  'template ::= template STRIPOFF',
+  'template ::= template LITERALSTART literal_e2 LITERALEND',
+  'literal_e2 ::= literal_e1 LITERALSTART literal_e1 LITERALEND',
+  'literal_e2 ::= literal_e1',
+  'literal_e1 ::= literal_e1 LITERAL',
+  'literal_e1 ::=',
+  'template ::= template smartytag',
+  'template ::=',
+  'smartytag ::= SIMPELOUTPUT',
+  'smartytag ::= SIMPLETAG',
+  'smartytag ::= SMARTYBLOCKCHILDPARENT',
+  'smartytag ::= LDEL tagbody RDEL',
+  'smartytag ::= tag RDEL',
+  'tagbody ::= outattr',
+  'tagbody ::= DOLLARID eqoutattr',
+  'tagbody ::= varindexed eqoutattr',
+  'eqoutattr ::= EQUAL outattr',
+  'outattr ::= output attributes',
+  'output ::= variable',
+  'output ::= value',
+  'output ::= expr',
+  'tag ::= LDEL ID attributes',
+  'tag ::= LDEL ID',
+  'tag ::= LDEL ID modifierlist attributes',
+  'tag ::= LDEL ID PTR ID attributes',
+  'tag ::= LDEL ID PTR ID modifierlist attributes',
+  'tag ::= LDELMAKENOCACHE DOLLARID',
+  'tag ::= LDELIF expr',
+  'tag ::= LDELIF expr attributes',
+  'tag ::= LDELIF statement',
+  'tag ::= LDELIF statement attributes',
+  'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes',
+  'foraction ::= EQUAL expr',
+  'foraction ::= INCDEC',
+  'tag ::= LDELFOR statement TO expr attributes',
+  'tag ::= LDELFOR statement TO expr STEP expr attributes',
+  'tag ::= LDELFOREACH SPACE expr AS varvar attributes',
+  'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes',
+  'tag ::= LDELFOREACH attributes',
+  'tag ::= LDELSETFILTER ID modparameters',
+  'tag ::= LDELSETFILTER ID modparameters modifierlist',
+  'smartytag ::= CLOSETAG',
+  'tag ::= LDELSLASH ID',
+  'tag ::= LDELSLASH ID modifierlist',
+  'tag ::= LDELSLASH ID PTR ID',
+  'tag ::= LDELSLASH ID PTR ID modifierlist',
+  'attributes ::= attributes attribute',
+  'attributes ::= attribute',
+  'attributes ::=',
+  'attribute ::= SPACE ID EQUAL ID',
+  'attribute ::= ATTR expr',
+  'attribute ::= ATTR value',
+  'attribute ::= SPACE ID',
+  'attribute ::= SPACE expr',
+  'attribute ::= SPACE value',
+  'attribute ::= SPACE INTEGER EQUAL expr',
+  'statements ::= statement',
+  'statements ::= statements COMMA statement',
+  'statement ::= DOLLARID EQUAL INTEGER',
+  'statement ::= DOLLARID EQUAL expr',
+  'statement ::= varindexed EQUAL expr',
+  'statement ::= OPENP statement CLOSEP',
+  'expr ::= value',
+  'expr ::= ternary',
+  'expr ::= DOLLARID COLON ID',
+  'expr ::= expr MATH value',
+  'expr ::= expr UNIMATH value',
+  'expr ::= expr tlop value',
+  'expr ::= expr lop expr',
+  'expr ::= expr scond',
+  'expr ::= expr ISIN array',
+  'expr ::= expr ISIN value',
+  'ternary ::= OPENP expr CLOSEP QMARK DOLLARID COLON expr',
+  'ternary ::= OPENP expr CLOSEP QMARK expr COLON expr',
+  'value ::= variable',
+  'value ::= UNIMATH value',
+  'value ::= NOT value',
+  'value ::= TYPECAST value',
+  'value ::= variable INCDEC',
+  'value ::= HEX',
+  'value ::= INTEGER',
+  'value ::= INTEGER DOT INTEGER',
+  'value ::= INTEGER DOT',
+  'value ::= DOT INTEGER',
+  'value ::= ID',
+  'value ::= function',
+  'value ::= OPENP expr CLOSEP',
+  'value ::= variable INSTANCEOF ns1',
+  'value ::= variable INSTANCEOF variable',
+  'value ::= SINGLEQUOTESTRING',
+  'value ::= doublequoted_with_quotes',
+  'value ::= varindexed DOUBLECOLON static_class_access',
+  'value ::= smartytag',
+  'value ::= value modifierlist',
+  'value ::= NAMESPACE',
+  'value ::= arraydef',
+  'value ::= ns1 DOUBLECOLON static_class_access',
+  'ns1 ::= ID',
+  'ns1 ::= NAMESPACE',
+  'variable ::= DOLLARID',
+  'variable ::= varindexed',
+  'variable ::= varvar AT ID',
+  'variable ::= object',
+  'variable ::= HATCH ID HATCH',
+  'variable ::= HATCH ID HATCH arrayindex',
+  'variable ::= HATCH variable HATCH',
+  'variable ::= HATCH variable HATCH arrayindex',
+  'varindexed ::= DOLLARID arrayindex',
+  'varindexed ::= varvar arrayindex',
+  'arrayindex ::= arrayindex indexdef',
+  'arrayindex ::=',
+  'indexdef ::= DOT DOLLARID',
+  'indexdef ::= DOT varvar',
+  'indexdef ::= DOT varvar AT ID',
+  'indexdef ::= DOT ID',
+  'indexdef ::= DOT INTEGER',
+  'indexdef ::= DOT LDEL expr RDEL',
+  'indexdef ::= OPENB ID CLOSEB',
+  'indexdef ::= OPENB ID DOT ID CLOSEB',
+  'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB',
+  'indexdef ::= OPENB INTEGER CLOSEB',
+  'indexdef ::= OPENB DOLLARID CLOSEB',
+  'indexdef ::= OPENB variable CLOSEB',
+  'indexdef ::= OPENB value CLOSEB',
+  'indexdef ::= OPENB expr CLOSEB',
+  'indexdef ::= OPENB CLOSEB',
+  'varvar ::= DOLLARID',
+  'varvar ::= DOLLAR',
+  'varvar ::= varvar varvarele',
+  'varvarele ::= ID',
+  'varvarele ::= SIMPELOUTPUT',
+  'varvarele ::= LDEL expr RDEL',
+  'object ::= varindexed objectchain',
+  'objectchain ::= objectelement',
+  'objectchain ::= objectchain objectelement',
+  'objectelement ::= PTR ID arrayindex',
+  'objectelement ::= PTR varvar arrayindex',
+  'objectelement ::= PTR LDEL expr RDEL arrayindex',
+  'objectelement ::= PTR ID LDEL expr RDEL arrayindex',
+  'objectelement ::= PTR method',
+  'function ::= ns1 OPENP params CLOSEP',
+  'method ::= ID OPENP params CLOSEP',
+  'method ::= DOLLARID OPENP params CLOSEP',
+  'params ::= params COMMA expr',
+  'params ::= expr',
+  'params ::=',
+  'modifierlist ::= modifierlist modifier modparameters',
+  'modifierlist ::= modifier modparameters',
+  'modifier ::= VERT AT ID',
+  'modifier ::= VERT ID',
+  'modparameters ::= modparameters modparameter',
+  'modparameters ::=',
+  'modparameter ::= COLON value',
+  'modparameter ::= COLON UNIMATH value',
+  'modparameter ::= COLON array',
+  'static_class_access ::= method',
+  'static_class_access ::= method objectchain',
+  'static_class_access ::= ID',
+  'static_class_access ::= DOLLARID arrayindex',
+  'static_class_access ::= DOLLARID arrayindex objectchain',
+  'lop ::= LOGOP',
+  'lop ::= SLOGOP',
+  'tlop ::= TLOGOP',
+  'scond ::= SINGLECOND',
+  'arraydef ::= OPENB arrayelements CLOSEB',
+  'arraydef ::= ARRAYOPEN arrayelements CLOSEP',
+  'arrayelements ::= arrayelement',
+  'arrayelements ::= arrayelements COMMA arrayelement',
+  'arrayelements ::=',
+  'arrayelement ::= value APTR expr',
+  'arrayelement ::= ID APTR expr',
+  'arrayelement ::= expr',
+  'doublequoted_with_quotes ::= QUOTE QUOTE',
+  'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE',
+  'doublequoted ::= doublequoted doublequotedcontent',
+  'doublequoted ::= doublequotedcontent',
+  'doublequotedcontent ::= BACKTICK variable BACKTICK',
+  'doublequotedcontent ::= BACKTICK expr BACKTICK',
+  'doublequotedcontent ::= DOLLARID',
+  'doublequotedcontent ::= LDEL variable RDEL',
+  'doublequotedcontent ::= LDEL expr RDEL',
+  'doublequotedcontent ::= smartytag',
+  'doublequotedcontent ::= TEXT',
+    );
+
+    public function tokenName($tokenType)
+    {
+        if ($tokenType === 0) {
+            return 'End of Input';
+        }
+        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
+            return $this->yyTokenName[$tokenType];
+        } else {
+            return 'Unknown';
+        }
+    }
+
+    public static function yy_destructor($yymajor, $yypminor)
+    {
+        switch ($yymajor) {
+            default:  break;   /* If no destructor action specified: do nothing */
+        }
+    }
+
+    public function yy_pop_parser_stack()
+    {
+        if (empty($this->yystack)) {
+            return;
+        }
+        $yytos = array_pop($this->yystack);
+        if ($this->yyTraceFILE && $this->yyidx >= 0) {
+            fwrite($this->yyTraceFILE,
+                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
+                    "\n");
+        }
+        $yymajor = $yytos->major;
+        self::yy_destructor($yymajor, $yytos->minor);
+        $this->yyidx--;
+
+        return $yymajor;
+    }
+
+    public function __destruct()
+    {
+        while ($this->yystack !== Array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
+        }
+    }
+
+    public function yy_get_expected_tokens($token)
+    {
+        static $res3 = array();
+        static $res4 = array();
+        $state = $this->yystack[$this->yyidx]->stateno;
+        $expected = self::$yyExpectedTokens[$state];
+        if (isset($res3[$state][$token])) {
+            if ($res3[$state][$token]) {
+                return $expected;
+            }
+        } else {
+            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return $expected;
+            }
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ === 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return array_unique($expected);
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset(self::$yyExpectedTokens[$nextstate])) {
+                $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
+                        if (isset($res4[$nextstate][$token])) {
+                            if ($res4[$nextstate][$token]) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        } else {
+                            if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = new TP_yyStackEntry;
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return array_unique($expected);
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return $expected;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+    $this->yyidx = $yyidx;
+    $this->yystack = $stack;
+
+        return array_unique($expected);
+    }
+
+    public function yy_is_expected_token($token)
+    {
+        static $res = array();
+        static $res2 = array();
+        if ($token === 0) {
+            return true; // 0 is not part of this
+        }
+        $state = $this->yystack[$this->yyidx]->stateno;
+        if (isset($res[$state][$token])) {
+            if ($res[$state][$token]) {
+                return true;
+            }
+        } else {
+            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return true;
+            }
+       }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ === 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return true;
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset($res2[$nextstate][$token])) {
+                        if ($res2[$nextstate][$token]) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    } else {
+                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = new TP_yyStackEntry;
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        if (!$token) {
+                            // end of input: this is valid
+                            return true;
+                        }
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return false;
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return true;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+
+        return true;
+    }
+
+   public function yy_find_shift_action($iLookAhead)
+    {
+        $stateno = $this->yystack[$this->yyidx]->stateno;
+
+        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
+        if (!isset(self::$yy_shift_ofst[$stateno])) {
+            // no shift actions
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_shift_ofst[$stateno];
+        if ($i === self::YY_SHIFT_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead === self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
+                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+                if ($this->yyTraceFILE) {
+                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
+                        $this->yyTokenName[$iLookAhead] . ' => ' .
+                        $this->yyTokenName[$iFallback] . "\n");
+                }
+
+                return $this->yy_find_shift_action($iFallback);
+            }
+
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    public function yy_find_reduce_action($stateno, $iLookAhead)
+    {
+        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
+
+        if (!isset(self::$yy_reduce_ofst[$stateno])) {
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_reduce_ofst[$stateno];
+        if ($i === self::YY_REDUCE_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead === self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    {
+        $this->yyidx++;
+        if ($this->yyidx >= self::YYSTACKDEPTH) {
+            $this->yyidx--;
+            if ($this->yyTraceFILE) {
+                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
+            }
+            while ($this->yyidx >= 0) {
+                $this->yy_pop_parser_stack();
+            }
+// line 220 "../smarty/lexer/smarty_internal_templateparser.y"
+
+    $this->internalError = true;
+    $this->compiler->trigger_template_error('Stack overflow in template parser');
+
+            return;
+        }
+        $yytos = new TP_yyStackEntry;
+        $yytos->stateno = $yyNewState;
+        $yytos->major = $yyMajor;
+        $yytos->minor = $yypMinor;
+        $this->yystack[] = $yytos;
+        if ($this->yyTraceFILE && $this->yyidx > 0) {
+            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
+                $yyNewState);
+            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
+            for ($i = 1; $i <= $this->yyidx; $i++) {
+                fprintf($this->yyTraceFILE, " %s",
+                    $this->yyTokenName[$this->yystack[$i]->major]);
+            }
+            fwrite($this->yyTraceFILE,"\n");
+        }
+    }
+
+    public static $yyRuleInfo = array(
+  array( 0 => 62, 1 => 1 ),
+  array( 0 => 63, 1 => 2 ),
+  array( 0 => 63, 1 => 2 ),
+  array( 0 => 63, 1 => 2 ),
+  array( 0 => 63, 1 => 4 ),
+  array( 0 => 64, 1 => 4 ),
+  array( 0 => 64, 1 => 1 ),
+  array( 0 => 65, 1 => 2 ),
+  array( 0 => 65, 1 => 0 ),
+  array( 0 => 63, 1 => 2 ),
+  array( 0 => 63, 1 => 0 ),
+  array( 0 => 66, 1 => 1 ),
+  array( 0 => 66, 1 => 1 ),
+  array( 0 => 66, 1 => 1 ),
+  array( 0 => 66, 1 => 3 ),
+  array( 0 => 66, 1 => 2 ),
+  array( 0 => 67, 1 => 1 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 70, 1 => 2 ),
+  array( 0 => 69, 1 => 2 ),
+  array( 0 => 72, 1 => 1 ),
+  array( 0 => 72, 1 => 1 ),
+  array( 0 => 72, 1 => 1 ),
+  array( 0 => 68, 1 => 3 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 4 ),
+  array( 0 => 68, 1 => 5 ),
+  array( 0 => 68, 1 => 6 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 3 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 3 ),
+  array( 0 => 68, 1 => 8 ),
+  array( 0 => 80, 1 => 2 ),
+  array( 0 => 80, 1 => 1 ),
+  array( 0 => 68, 1 => 5 ),
+  array( 0 => 68, 1 => 7 ),
+  array( 0 => 68, 1 => 6 ),
+  array( 0 => 68, 1 => 8 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 3 ),
+  array( 0 => 68, 1 => 4 ),
+  array( 0 => 66, 1 => 1 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 68, 1 => 3 ),
+  array( 0 => 68, 1 => 4 ),
+  array( 0 => 68, 1 => 5 ),
+  array( 0 => 73, 1 => 2 ),
+  array( 0 => 73, 1 => 1 ),
+  array( 0 => 73, 1 => 0 ),
+  array( 0 => 83, 1 => 4 ),
+  array( 0 => 83, 1 => 2 ),
+  array( 0 => 83, 1 => 2 ),
+  array( 0 => 83, 1 => 2 ),
+  array( 0 => 83, 1 => 2 ),
+  array( 0 => 83, 1 => 2 ),
+  array( 0 => 83, 1 => 4 ),
+  array( 0 => 79, 1 => 1 ),
+  array( 0 => 79, 1 => 3 ),
+  array( 0 => 78, 1 => 3 ),
+  array( 0 => 78, 1 => 3 ),
+  array( 0 => 78, 1 => 3 ),
+  array( 0 => 78, 1 => 3 ),
+  array( 0 => 76, 1 => 1 ),
+  array( 0 => 76, 1 => 1 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 2 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 84, 1 => 7 ),
+  array( 0 => 84, 1 => 7 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 90, 1 => 1 ),
+  array( 0 => 90, 1 => 1 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 4 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 4 ),
+  array( 0 => 71, 1 => 2 ),
+  array( 0 => 71, 1 => 2 ),
+  array( 0 => 95, 1 => 2 ),
+  array( 0 => 95, 1 => 0 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 96, 1 => 4 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 96, 1 => 4 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 5 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 3 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 81, 1 => 1 ),
+  array( 0 => 81, 1 => 1 ),
+  array( 0 => 81, 1 => 2 ),
+  array( 0 => 97, 1 => 1 ),
+  array( 0 => 97, 1 => 1 ),
+  array( 0 => 97, 1 => 3 ),
+  array( 0 => 94, 1 => 2 ),
+  array( 0 => 98, 1 => 1 ),
+  array( 0 => 98, 1 => 2 ),
+  array( 0 => 99, 1 => 3 ),
+  array( 0 => 99, 1 => 3 ),
+  array( 0 => 99, 1 => 5 ),
+  array( 0 => 99, 1 => 6 ),
+  array( 0 => 99, 1 => 2 ),
+  array( 0 => 89, 1 => 4 ),
+  array( 0 => 100, 1 => 4 ),
+  array( 0 => 100, 1 => 4 ),
+  array( 0 => 101, 1 => 3 ),
+  array( 0 => 101, 1 => 1 ),
+  array( 0 => 101, 1 => 0 ),
+  array( 0 => 77, 1 => 3 ),
+  array( 0 => 77, 1 => 2 ),
+  array( 0 => 102, 1 => 3 ),
+  array( 0 => 102, 1 => 2 ),
+  array( 0 => 82, 1 => 2 ),
+  array( 0 => 82, 1 => 0 ),
+  array( 0 => 103, 1 => 2 ),
+  array( 0 => 103, 1 => 3 ),
+  array( 0 => 103, 1 => 2 ),
+  array( 0 => 92, 1 => 1 ),
+  array( 0 => 92, 1 => 2 ),
+  array( 0 => 92, 1 => 1 ),
+  array( 0 => 92, 1 => 2 ),
+  array( 0 => 92, 1 => 3 ),
+  array( 0 => 86, 1 => 1 ),
+  array( 0 => 86, 1 => 1 ),
+  array( 0 => 85, 1 => 1 ),
+  array( 0 => 87, 1 => 1 ),
+  array( 0 => 93, 1 => 3 ),
+  array( 0 => 93, 1 => 3 ),
+  array( 0 => 104, 1 => 1 ),
+  array( 0 => 104, 1 => 3 ),
+  array( 0 => 104, 1 => 0 ),
+  array( 0 => 105, 1 => 3 ),
+  array( 0 => 105, 1 => 3 ),
+  array( 0 => 105, 1 => 1 ),
+  array( 0 => 91, 1 => 2 ),
+  array( 0 => 91, 1 => 3 ),
+  array( 0 => 106, 1 => 2 ),
+  array( 0 => 106, 1 => 1 ),
+  array( 0 => 107, 1 => 3 ),
+  array( 0 => 107, 1 => 3 ),
+  array( 0 => 107, 1 => 1 ),
+  array( 0 => 107, 1 => 3 ),
+  array( 0 => 107, 1 => 3 ),
+  array( 0 => 107, 1 => 1 ),
+  array( 0 => 107, 1 => 1 ),
+    );
+
+    public static $yyReduceMap = array(
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        21 => 6,
+        22 => 6,
+        23 => 6,
+        36 => 6,
+        56 => 6,
+        57 => 6,
+        65 => 6,
+        66 => 6,
+        77 => 6,
+        82 => 6,
+        83 => 6,
+        88 => 6,
+        92 => 6,
+        93 => 6,
+        97 => 6,
+        98 => 6,
+        100 => 6,
+        105 => 6,
+        169 => 6,
+        174 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+        16 => 16,
+        17 => 17,
+        18 => 18,
+        19 => 19,
+        20 => 20,
+        24 => 24,
+        25 => 25,
+        26 => 26,
+        27 => 27,
+        28 => 28,
+        29 => 29,
+        30 => 30,
+        31 => 31,
+        33 => 31,
+        32 => 32,
+        34 => 34,
+        35 => 35,
+        37 => 37,
+        38 => 38,
+        39 => 39,
+        40 => 40,
+        41 => 41,
+        42 => 42,
+        43 => 43,
+        44 => 44,
+        45 => 45,
+        46 => 46,
+        47 => 47,
+        48 => 48,
+        49 => 49,
+        50 => 50,
+        59 => 50,
+        147 => 50,
+        151 => 50,
+        155 => 50,
+        157 => 50,
+        51 => 51,
+        148 => 51,
+        154 => 51,
+        52 => 52,
+        53 => 53,
+        54 => 53,
+        55 => 55,
+        132 => 55,
+        58 => 58,
+        60 => 60,
+        61 => 61,
+        62 => 61,
+        63 => 63,
+        64 => 64,
+        67 => 67,
+        68 => 68,
+        69 => 68,
+        70 => 70,
+        71 => 71,
+        72 => 72,
+        73 => 73,
+        74 => 74,
+        75 => 75,
+        76 => 76,
+        78 => 78,
+        80 => 78,
+        81 => 78,
+        112 => 78,
+        79 => 79,
+        84 => 84,
+        85 => 85,
+        86 => 86,
+        87 => 87,
+        89 => 89,
+        90 => 90,
+        91 => 90,
+        94 => 94,
+        95 => 95,
+        96 => 96,
+        99 => 99,
+        101 => 101,
+        102 => 102,
+        103 => 103,
+        104 => 104,
+        106 => 106,
+        107 => 107,
+        108 => 108,
+        109 => 109,
+        110 => 110,
+        111 => 111,
+        113 => 113,
+        171 => 113,
+        114 => 114,
+        115 => 115,
+        116 => 116,
+        117 => 117,
+        118 => 118,
+        119 => 119,
+        127 => 119,
+        120 => 120,
+        121 => 121,
+        122 => 122,
+        123 => 122,
+        125 => 122,
+        126 => 122,
+        124 => 124,
+        128 => 128,
+        129 => 129,
+        130 => 130,
+        175 => 130,
+        131 => 131,
+        133 => 133,
+        134 => 134,
+        135 => 135,
+        136 => 136,
+        137 => 137,
+        138 => 138,
+        139 => 139,
+        140 => 140,
+        141 => 141,
+        142 => 142,
+        143 => 143,
+        144 => 144,
+        145 => 145,
+        146 => 146,
+        149 => 149,
+        150 => 150,
+        152 => 152,
+        153 => 153,
+        156 => 156,
+        158 => 158,
+        159 => 159,
+        160 => 160,
+        161 => 161,
+        162 => 162,
+        163 => 163,
+        164 => 164,
+        165 => 165,
+        166 => 166,
+        167 => 167,
+        168 => 167,
+        170 => 170,
+        172 => 172,
+        173 => 173,
+        176 => 176,
+        177 => 177,
+        178 => 178,
+        179 => 179,
+        182 => 179,
+        180 => 180,
+        183 => 180,
+        181 => 181,
+        184 => 184,
+        185 => 185,
+    );
+// line 233 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r0(){
+    $this->root_buffer->prepend_array($this, $this->template_prefix);
+    $this->root_buffer->append_array($this, $this->template_postfix);
+    $this->_retvalue = $this->root_buffer->to_smarty_php($this);
+    }
+// line 240 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r1(){
+         $text = $this->yystack[ $this->yyidx + 0 ]->minor;
+
+         if ((string)$text == '') {
+            $this->current_buffer->append_subtree($this, null);
+         }
+
+         $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text($text, $this->strip));
+    }
+// line 250 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r2(){
+    $this->strip = true;
+    }
+// line 254 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r3(){
+    $this->strip = false;
+    }
+// line 259 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r4(){
+       $this->current_buffer->append_subtree($this, new Smarty_Internal_ParseTree_Text($this->yystack[$this->yyidx + -1]->minor));
+    }
+// line 264 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r5(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.$this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 267 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r6(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 271 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r7(){
+        $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+
+    }
+// line 276 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r8(){
+    $this->_retvalue = '';
+    }
+// line 280 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r9(){
+      if ($this->compiler->has_code) {
+          $this->current_buffer->append_subtree($this, $this->mergePrefixCode($this->yystack[$this->yyidx + 0]->minor));
+      }
+     $this->compiler->has_variable_string = false;
+     $this->block_nesting_level = count($this->compiler->_tag_stack);
+    }
+// line 292 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r11(){
+    $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
+    if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+        $this->_retvalue = $this->compiler->compileTag('private_print_expression',array('nocache'),array('value'=>$this->compiler->compileVariable('\''.$match[1].'\'')));
+    } else {
+        $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->compiler->compileVariable('\''.$var.'\'')));
+    }
+    }
+// line 302 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r12(){
+    $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()));
+    if ($tag == 'strip') {
+        $this->strip = true;
+        $this->_retvalue = null;
+    } else {
+        if (defined($tag)) {
+            if ($this->security) {
+               $this->security->isTrustedConstant($tag, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$tag));
+        } else {
+            if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                $this->_retvalue = $this->compiler->compileTag($match[1],array('\'nocache\''));
+            } else {
+                $this->_retvalue = $this->compiler->compileTag($tag,array());
+            }
+        }
+    }
+    }
+// line 323 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r13(){
+    $j = strrpos($this->yystack[$this->yyidx + 0]->minor,'.');
+    if ($this->yystack[$this->yyidx + 0]->minor[$j+1] == 'c') {
+        // {$smarty.block.child}
+        $this->_retvalue = $this->compiler->compileTag('child',array(),array($this->yystack[$this->yyidx + 0]->minor));
+    } else {
+        // {$smarty.block.parent}
+       $this->_retvalue = $this->compiler->compileTag('parent',array(),array($this->yystack[$this->yyidx + 0]->minor));
+     }
+    }
+// line 334 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r14(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 338 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r15(){
+     $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor;
+     }
+// line 342 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r16(){
+    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + 0]->minor[1],array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]));
+    }
+// line 351 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r17(){
+    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]),array('var'=>'\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'')),$this->yystack[$this->yyidx + 0]->minor[1]));
+    }
+// line 355 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r18(){
+    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]),array('var'=>$this->yystack[$this->yyidx + -1]->minor['var'])),$this->yystack[$this->yyidx + 0]->minor[1]),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']));
+    }
+// line 359 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r19(){
+       $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 363 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r20(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 378 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r24(){
+        if (defined($this->yystack[$this->yyidx + -1]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + -1]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + 0]->minor,array('value'=>$this->yystack[$this->yyidx + -1]->minor));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+        }
+    }
+// line 388 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r25(){
+        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->yystack[$this->yyidx + 0]->minor));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor,array());
+        }
+    }
+// line 401 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r26(){
+        if (defined($this->yystack[$this->yyidx + -2]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + -2]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + 0]->minor,array('value'=>$this->yystack[$this->yyidx + -2]->minor, 'modifierlist'=>$this->yystack[$this->yyidx + -1]->minor));
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + 0]->minor, array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor));
+        }
+    }
+// line 413 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r27(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + 0]->minor,array('object_method'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+// line 418 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r28(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + 0]->minor,array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor, 'object_method'=>$this->yystack[$this->yyidx + -2]->minor));
+    }
+// line 423 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r29(){
+    $this->_retvalue = $this->compiler->compileTag('make_nocache',array(array('var'=>'\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'')));
+    }
+// line 428 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r30(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->compiler->getLdelLength())); 
+    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 433 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r31(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->compiler->getLdelLength()));
+    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + 0]->minor,array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+// line 438 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r32(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->compiler->getLdelLength()));
+    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 449 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r34(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -4]->minor),array('var'=>$this->yystack[$this->yyidx + -2]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),1);
+    }
+// line 453 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r35(){
+    $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 461 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r37(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -3]->minor),array('to'=>$this->yystack[$this->yyidx + -1]->minor))),0);
+    }
+// line 465 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r38(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -5]->minor),array('to'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),0);
+    }
+// line 470 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r39(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -3]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor))));
+    }
+// line 474 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r40(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor),array('key'=>$this->yystack[$this->yyidx + -3]->minor))));
+    }
+// line 477 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r41(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 482 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r42(){
+    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array($this->yystack[$this->yyidx + -1]->minor),$this->yystack[$this->yyidx + 0]->minor))));
+    }
+// line 486 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r43(){
+    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array($this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor)),$this->yystack[$this->yyidx + 0]->minor)));
+    }
+// line 492 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r44(){
+    $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' /');
+    if ($tag === 'strip') {
+        $this->strip = false;
+        $this->_retvalue = null;
+    } else {
+       $this->_retvalue = $this->compiler->compileTag($tag.'close',array());
+    }
+     }
+// line 501 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r45(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor.'close',array());
+    }
+// line 505 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r46(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 510 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r47(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 514 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r48(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + -1]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 522 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r49(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 528 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r50(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 533 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r51(){
+    $this->_retvalue = array();
+    }
+// line 538 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r52(){
+    if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+        if ($this->security) {
+            $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+        }
+        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
+    } else {
+        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'\''.$this->yystack[$this->yyidx + 0]->minor.'\'');
+    }
+    }
+// line 549 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r53(){
+    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor," =\n\r\t")=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 557 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r55(){
+    $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
+    }
+// line 569 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r58(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 582 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r60(){
+    $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor;
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;
+    }
+// line 587 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r61(){
+    $this->_retvalue = array('var' => '\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\'', 'value'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 594 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r63(){
+    $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 598 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r64(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 618 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r67(){
+    $this->_retvalue = '$_smarty_tpl->getStreamVariable(\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'://' . $this->yystack[$this->yyidx + 0]->minor . '\')';
+    }
+// line 623 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r68(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 633 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r70(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor['pre']. $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor['op'].$this->yystack[$this->yyidx + 0]->minor .')';
+    }
+// line 637 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r71(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 641 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r72(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor . $this->yystack[$this->yyidx + -1]->minor . ')';
+    }
+// line 645 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r73(){
+    $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';
+    }
+// line 649 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r74(){
+    $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';
+    }
+// line 657 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r75(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '. $this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\'') . ' : '.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 661 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r76(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 671 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r78(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 676 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r79(){
+    $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 697 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r84(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 701 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r85(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.';
+    }
+// line 705 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r86(){
+    $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 710 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r87(){
+    if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+        if ($this->security) {
+             $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+        }
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    } else {
+        $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
+    }
+    }
+// line 727 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r89(){
+    $this->_retvalue = '('. $this->yystack[$this->yyidx + -1]->minor .')';
+    }
+// line 731 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r90(){
+      $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 749 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r94(){
+	    if ($this->security && $this->security->static_classes !== array()) {
+		    $this->compiler->trigger_template_error('dynamic static class not allowed by security setting');
+	    }
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    if ($this->yystack[$this->yyidx + -2]->minor['var'] === '\'smarty\'') {
+        $this->compiler->appendPrefixCode("<?php {$prefixVar} = ". $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).';?>');
+     } else {
+        $this->compiler->appendPrefixCode("<?php  {$prefixVar} = ". $this->compiler->compileVariable($this->yystack[$this->yyidx + -2]->minor['var']).$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].';?>');
+    }
+    $this->_retvalue = $prefixVar .'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+    }
+// line 760 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r95(){
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    $tmp = $this->compiler->appendCode('<?php ob_start();?>', $this->yystack[$this->yyidx + 0]->minor);
+    $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php {$prefixVar} = ob_get_clean();?>"));
+    $this->_retvalue = $prefixVar;
+    }
+// line 767 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r96(){
+    $this->_retvalue = $this->compiler->compileTag('private_modifier',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor,'modifierlist'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 780 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r99(){
+    if (!in_array(strtolower($this->yystack[$this->yyidx + -2]->minor), array('self', 'parent')) && (!$this->security || $this->security->isTrustedStaticClassAccess($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->compiler))) {
+        if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) {
+            $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+        } else {
+            trigger_error('Using unregistered static method "' . $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor[0] . '" in a template is deprecated and will be ' .
+                'removed in a future release. Use Smarty::registerClass to explicitly register ' .
+                'a class for access.', E_USER_DEPRECATED);
+            $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+        } 
+    } else {
+        $this->compiler->trigger_template_error ('static class \''.$this->yystack[$this->yyidx + -2]->minor.'\' is undefined or not allowed by security setting');
+    }
+    }
+// line 799 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r101(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+        }
+// line 810 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r102(){
+   $this->_retvalue = $this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'');
+    }
+// line 813 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r103(){
+    if ($this->yystack[$this->yyidx + 0]->minor['var'] === '\'smarty\'') {
+        $smarty_var = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
+        $this->_retvalue = $smarty_var;
+    } else {
+        // used for array reset,next,prev,end,current 
+        $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
+        $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+        $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']).$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+    }
+    }
+// line 826 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r104(){
+    $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + -2]->minor .']->'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 836 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r106(){
+    $this->_retvalue = $this->compiler->compileConfigVariable('\'' . $this->yystack[$this->yyidx + -1]->minor . '\'');
+    }
+// line 840 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r107(){
+    $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable('\'' . $this->yystack[$this->yyidx + -2]->minor . '\'') . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' :null)';
+    }
+// line 844 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r108(){
+    $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 848 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r109(){
+    $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -2]->minor) . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' : null)';
+    }
+// line 852 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r110(){
+    $this->_retvalue = array('var'=>'\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'', 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 855 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r111(){
+    $this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 868 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r113(){
+    return;
+    }
+// line 874 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r114(){
+    $this->_retvalue = '['.$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'').']';
+    }
+// line 877 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r115(){
+    $this->_retvalue = '['.$this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor).']';
+    }
+// line 881 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r116(){
+    $this->_retvalue = '['.$this->compiler->compileVariable($this->yystack[$this->yyidx + -2]->minor).'->'.$this->yystack[$this->yyidx + 0]->minor.']';
+    }
+// line 885 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r117(){
+    $this->_retvalue = '[\''. $this->yystack[$this->yyidx + 0]->minor .'\']';
+    }
+// line 889 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r118(){
+    $this->_retvalue = '['. $this->yystack[$this->yyidx + 0]->minor .']';
+    }
+// line 894 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r119(){
+    $this->_retvalue = '['. $this->yystack[$this->yyidx + -1]->minor .']';
+    }
+// line 899 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r120(){
+    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';
+    }
+// line 903 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r121(){
+    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';
+    }
+// line 906 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r122(){
+    $this->_retvalue = '['.$this->yystack[$this->yyidx + -1]->minor.']';
+    }
+// line 912 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r124(){
+    $this->_retvalue = '['.$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'').']';
+    }
+// line 928 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r128(){
+    $this->_retvalue = '[]';
+    }
+// line 938 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r129(){
+    $this->_retvalue = '\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'';
+    }
+// line 942 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r130(){
+    $this->_retvalue = '\'\'';
+    }
+// line 947 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r131(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 955 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r133(){
+    $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
+    $this->_retvalue = $this->compiler->compileVariable('\''.$var.'\'');
+    }
+// line 961 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r134(){
+    $this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';
+    }
+// line 968 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r135(){
+    if ($this->yystack[$this->yyidx + -1]->minor['var'] === '\'smarty\'') {
+        $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;
+    } else {
+        $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + -1]->minor['var']).$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor;
+    }
+    }
+// line 977 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r136(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 982 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r137(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 987 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r138(){
+    if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) === '_') {
+        $this->compiler->trigger_template_error (self::ERR1);
+    }
+    $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 994 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r139(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $this->_retvalue = '->{'.$this->compiler->compileVariable($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+// line 1001 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r140(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+// line 1008 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r141(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+// line 1016 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r142(){
+    $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1024 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r143(){
+    $this->_retvalue = $this->compiler->compilePHPFunctionCall($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 1032 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r144(){
+    if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) === '_') {
+        $this->compiler->trigger_template_error (self::ERR1);
+    }
+    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . '('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
+    }
+// line 1039 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r145(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    $this->compiler->appendPrefixCode("<?php {$prefixVar} = ".$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -3]->minor,1).'\'').';?>');
+    $this->_retvalue = $prefixVar .'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
+    }
+// line 1050 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r146(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 1067 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r149(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)));
+    }
+// line 1071 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r150(){
+    $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 1079 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r152(){
+    $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1087 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r153(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1100 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r156(){
+    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1109 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r158(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '', 'method');
+    }
+// line 1114 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r159(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'method');
+    }
+// line 1119 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r160(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '');
+    }
+// line 1124 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r161(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'property');
+    }
+// line 1129 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r162(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor, 'property');
+    }
+// line 1135 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r163(){
+    $this->_retvalue = ' '. trim($this->yystack[$this->yyidx + 0]->minor) . ' ';
+    }
+// line 1139 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r164(){
+    static $lops = array(
+        'eq' => ' == ',
+        'ne' => ' != ',
+        'neq' => ' != ',
+        'gt' => ' > ',
+        'ge' => ' >= ',
+        'gte' => ' >= ',
+        'lt' =>  ' < ',
+        'le' =>  ' <= ',
+        'lte' => ' <= ',
+        'mod' =>  ' % ',
+        'and' => ' && ',
+        'or' => ' || ',
+        'xor' => ' xor ',
+         );
+    $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
+    $this->_retvalue = $lops[$op];
+    }
+// line 1158 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r165(){
+     static $tlops = array(
+         'isdivby' => array('op' => ' % ', 'pre' => '!('),
+         'isnotdivby' => array('op' => ' % ', 'pre' => '('),
+         'isevenby' => array('op' => ' / ', 'pre' => '!(1 & '),
+         'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
+         'isoddby' => array('op' => ' / ', 'pre' => '(1 & '),
+         'isnotoddby' => array('op' => ' / ', 'pre' => '!(1 & '),
+         );
+     $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
+     $this->_retvalue = $tlops[$op];
+     }
+// line 1171 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r166(){
+        static $scond = array (
+            'iseven' => '!(1 & ',
+            'isnoteven' => '(1 & ',
+            'isodd' => '(1 & ',
+            'isnotodd' => '!(1 & ',
+        );
+   $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
+   $this->_retvalue = $scond[$op];
+    }
+// line 1185 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r167(){
+    $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';
+    }
+// line 1196 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r170(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1204 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r172(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1208 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r173(){ 
+    $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1224 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r176(){
+    $this->compiler->leaveDoubleQuote();
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php($this);
+    }
+// line 1230 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r177(){
+    $this->yystack[$this->yyidx + -1]->minor->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor);
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 1235 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r178(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_Dq($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1239 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r179(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)'.$this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 1243 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r180(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)('.$this->yystack[$this->yyidx + -1]->minor.')');
+    }
+// line 1247 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r181(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_Code('(string)$_smarty_tpl->tpl_vars[\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\']->value');
+    }
+// line 1259 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r184(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_Tag($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1263 "../smarty/lexer/smarty_internal_templateparser.y"
+    public function yy_r185(){
+    $this->_retvalue = new Smarty_Internal_ParseTree_DqContent($this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    private $_retvalue;
+
+    public function yy_reduce($yyruleno)
+    {
+        if ($this->yyTraceFILE && $yyruleno >= 0
+              && $yyruleno < count(self::$yyRuleName)) {
+            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
+                $this->yyTracePrompt, $yyruleno,
+                self::$yyRuleName[$yyruleno]);
+        }
+
+        $this->_retvalue = $yy_lefthand_side = null;
+        if (isset(self::$yyReduceMap[$yyruleno])) {
+            // call the action
+            $this->_retvalue = null;
+            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
+            $yy_lefthand_side = $this->_retvalue;
+        }
+        $yygoto = self::$yyRuleInfo[$yyruleno][0];
+        $yysize = self::$yyRuleInfo[$yyruleno][1];
+        $this->yyidx -= $yysize;
+        for ($i = $yysize; $i; $i--) {
+            // pop all of the right-hand side parameters
+            array_pop($this->yystack);
+        }
+        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
+        if ($yyact < self::YYNSTATE) {
+            if (!$this->yyTraceFILE && $yysize) {
+                $this->yyidx++;
+                $x = new TP_yyStackEntry;
+                $x->stateno = $yyact;
+                $x->major = $yygoto;
+                $x->minor = $yy_lefthand_side;
+                $this->yystack[$this->yyidx] = $x;
+            } else {
+                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
+            }
+        } elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) {
+            $this->yy_accept();
+        }
+    }
+
+    public function yy_parse_failed()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
+        } while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+    }
+
+    public function yy_syntax_error($yymajor, $TOKEN)
+    {
+// line 213 "../smarty/lexer/smarty_internal_templateparser.y"
+
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_template_error();
+    }
+
+    public function yy_accept()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
+        } while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+// line 206 "../smarty/lexer/smarty_internal_templateparser.y"
+
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+    }
+
+    public function doParse($yymajor, $yytokenvalue)
+    {
+        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
+
+        if ($this->yyidx === null || $this->yyidx < 0) {
+            $this->yyidx = 0;
+            $this->yyerrcnt = -1;
+            $x = new TP_yyStackEntry;
+            $x->stateno = 0;
+            $x->major = 0;
+            $this->yystack = array();
+            $this->yystack[] = $x;
+        }
+        $yyendofinput = ($yymajor==0);
+
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sInput %s\n",
+                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+        }
+
+        do {
+            $yyact = $this->yy_find_shift_action($yymajor);
+            if ($yymajor < self::YYERRORSYMBOL &&
+                  !$this->yy_is_expected_token($yymajor)) {
+                // force a syntax error
+                $yyact = self::YY_ERROR_ACTION;
+            }
+            if ($yyact < self::YYNSTATE) {
+                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
+                $this->yyerrcnt--;
+                if ($yyendofinput && $this->yyidx >= 0) {
+                    $yymajor = 0;
+                } else {
+                    $yymajor = self::YYNOCODE;
+                }
+            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
+                $this->yy_reduce($yyact - self::YYNSTATE);
+            } elseif ($yyact === self::YY_ERROR_ACTION) {
+                if ($this->yyTraceFILE) {
+                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
+                        $this->yyTracePrompt);
+                }
+                if (self::YYERRORSYMBOL) {
+                    if ($this->yyerrcnt < 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $yymx = $this->yystack[$this->yyidx]->major;
+                    if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
+                        if ($this->yyTraceFILE) {
+                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
+                                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+                        }
+                        $this->yy_destructor($yymajor, $yytokenvalue);
+                        $yymajor = self::YYNOCODE;
+                    } else {
+                        while ($this->yyidx >= 0 &&
+                                 $yymx !== self::YYERRORSYMBOL &&
+        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+                              ){
+                            $this->yy_pop_parser_stack();
+                        }
+                        if ($this->yyidx < 0 || $yymajor==0) {
+                            $this->yy_destructor($yymajor, $yytokenvalue);
+                            $this->yy_parse_failed();
+                            $yymajor = self::YYNOCODE;
+                        } elseif ($yymx !== self::YYERRORSYMBOL) {
+                            $u2 = 0;
+                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
+                        }
+                    }
+                    $this->yyerrcnt = 3;
+                    $yyerrorhit = 1;
+                } else {
+                    if ($this->yyerrcnt <= 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $this->yyerrcnt = 3;
+                    $this->yy_destructor($yymajor, $yytokenvalue);
+                    if ($yyendofinput) {
+                        $this->yy_parse_failed();
+                    }
+                    $yymajor = self::YYNOCODE;
+                }
+            } else {
+                $this->yy_accept();
+                $yymajor = self::YYNOCODE;
+            }
+        } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0);
+    }
+}
+
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_testinstall.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_testinstall.php
new file mode 100644
index 000000000..c8ffd4cc6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_testinstall.php
@@ -0,0 +1,605 @@
+<?php
+/**
+ * Smarty Internal TestInstall
+ * Test Smarty installation
+ *
+ * @package    Smarty
+ * @subpackage Utilities
+ * @author     Uwe Tews
+ */
+
+/**
+ * TestInstall class
+ *
+ * @package    Smarty
+ * @subpackage Utilities
+ */
+class Smarty_Internal_TestInstall
+{
+    /**
+     * diagnose Smarty setup
+     * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
+     *
+     * @param \Smarty $smarty
+     * @param array   $errors array to push results into rather than outputting them
+     *
+     * @return bool status, true if everything is fine, false else
+     */
+    public static function testInstall(Smarty $smarty, &$errors = null)
+    {
+        $status = true;
+        if ($errors === null) {
+            echo "<PRE>\n";
+            echo "Smarty Installation test...\n";
+            echo "Testing template directory...\n";
+        }
+        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
+        // test if all registered template_dir are accessible
+        foreach ($smarty->getTemplateDir() as $template_dir) {
+            $_template_dir = $template_dir;
+            $template_dir = realpath($template_dir);
+            // resolve include_path or fail existence
+            if (!$template_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
+                    // try PHP include_path
+                    if ($_stream_resolve_include_path) {
+                        $template_dir = stream_resolve_include_path($_template_dir);
+                    } else {
+                        $template_dir = $smarty->ext->_getIncludePath->getIncludePath($_template_dir, null, $smarty);
+                    }
+                    if ($template_dir !== false) {
+                        if ($errors === null) {
+                            echo "$template_dir is OK.\n";
+                        }
+                        continue;
+                    } else {
+                        $status = false;
+                        $message =
+                            "FAILED: $_template_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors[ 'template_dir' ] = $message;
+                        }
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_template_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors[ 'template_dir' ] = $message;
+                    }
+                    continue;
+                }
+            }
+            if (!is_dir($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+            } elseif (!is_readable($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$template_dir is OK.\n";
+                }
+            }
+        }
+        if ($errors === null) {
+            echo "Testing compile directory...\n";
+        }
+        // test if registered compile_dir is accessible
+        $__compile_dir = $smarty->getCompileDir();
+        $_compile_dir = realpath($__compile_dir);
+        if (!$_compile_dir) {
+            $status = false;
+            $message = "FAILED: {$__compile_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_dir($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_readable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_writable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_compile_dir} is OK.\n";
+            }
+        }
+        if ($errors === null) {
+            echo "Testing plugins directory...\n";
+        }
+        // test if all registered plugins_dir are accessible
+        // and if core plugins directory is still registered
+        $_core_plugins_dir = realpath(__DIR__ . '/../plugins');
+        $_core_plugins_available = false;
+        foreach ($smarty->getPluginsDir() as $plugin_dir) {
+            $_plugin_dir = $plugin_dir;
+            $plugin_dir = realpath($plugin_dir);
+            // resolve include_path or fail existence
+            if (!$plugin_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
+                    // try PHP include_path
+                    if ($_stream_resolve_include_path) {
+                        $plugin_dir = stream_resolve_include_path($_plugin_dir);
+                    } else {
+                        $plugin_dir = $smarty->ext->_getIncludePath->getIncludePath($_plugin_dir, null, $smarty);
+                    }
+                    if ($plugin_dir !== false) {
+                        if ($errors === null) {
+                            echo "$plugin_dir is OK.\n";
+                        }
+                        continue;
+                    } else {
+                        $status = false;
+                        $message = "FAILED: $_plugin_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors[ 'plugins_dir' ] = $message;
+                        }
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_plugin_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors[ 'plugins_dir' ] = $message;
+                    }
+                    continue;
+                }
+            }
+            if (!is_dir($plugin_dir)) {
+                $status = false;
+                $message = "FAILED: $plugin_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'plugins_dir' ] = $message;
+                }
+            } elseif (!is_readable($plugin_dir)) {
+                $status = false;
+                $message = "FAILED: $plugin_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'plugins_dir' ] = $message;
+                }
+            } elseif ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
+                $_core_plugins_available = true;
+                if ($errors === null) {
+                    echo "$plugin_dir is OK.\n";
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$plugin_dir is OK.\n";
+                }
+            }
+        }
+        if (!$_core_plugins_available) {
+            $status = false;
+            $message = "WARNING: Smarty's own libs/plugins is not available";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } elseif (!isset($errors[ 'plugins_dir' ])) {
+                $errors[ 'plugins_dir' ] = $message;
+            }
+        }
+        if ($errors === null) {
+            echo "Testing cache directory...\n";
+        }
+        // test if all registered cache_dir is accessible
+        $__cache_dir = $smarty->getCacheDir();
+        $_cache_dir = realpath($__cache_dir);
+        if (!$_cache_dir) {
+            $status = false;
+            $message = "FAILED: {$__cache_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_dir($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_readable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_writable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_cache_dir} is OK.\n";
+            }
+        }
+        if ($errors === null) {
+            echo "Testing configs directory...\n";
+        }
+        // test if all registered config_dir are accessible
+        foreach ($smarty->getConfigDir() as $config_dir) {
+            $_config_dir = $config_dir;
+            // resolve include_path or fail existence
+            if (!$config_dir) {
+                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_config_dir)) {
+                    // try PHP include_path
+                    if ($_stream_resolve_include_path) {
+                        $config_dir = stream_resolve_include_path($_config_dir);
+                    } else {
+                        $config_dir = $smarty->ext->_getIncludePath->getIncludePath($_config_dir, null, $smarty);
+                    }
+                    if ($config_dir !== false) {
+                        if ($errors === null) {
+                            echo "$config_dir is OK.\n";
+                        }
+                        continue;
+                    } else {
+                        $status = false;
+                        $message = "FAILED: $_config_dir does not exist (and couldn't be found in include_path either)";
+                        if ($errors === null) {
+                            echo $message . ".\n";
+                        } else {
+                            $errors[ 'config_dir' ] = $message;
+                        }
+                        continue;
+                    }
+                } else {
+                    $status = false;
+                    $message = "FAILED: $_config_dir does not exist";
+                    if ($errors === null) {
+                        echo $message . ".\n";
+                    } else {
+                        $errors[ 'config_dir' ] = $message;
+                    }
+                    continue;
+                }
+            }
+            if (!is_dir($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+            } elseif (!is_readable($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$config_dir is OK.\n";
+                }
+            }
+        }
+        if ($errors === null) {
+            echo "Testing sysplugin files...\n";
+        }
+        // test if sysplugins are available
+        $source = SMARTY_SYSPLUGINS_DIR;
+        if (is_dir($source)) {
+            $expectedSysplugins = array(
+                'smartycompilerexception.php'                               => true,
+                'smartyexception.php'                                       => true,
+                'smarty_cacheresource.php'                                  => true,
+                'smarty_cacheresource_custom.php'                           => true,
+                'smarty_cacheresource_keyvaluestore.php'                    => true,
+                'smarty_data.php'                                           => true,
+                'smarty_internal_block.php'                                 => true,
+                'smarty_internal_cacheresource_file.php'                    => true,
+                'smarty_internal_compilebase.php'                           => true,
+                'smarty_internal_compile_append.php'                        => true,
+                'smarty_internal_compile_assign.php'                        => true,
+                'smarty_internal_compile_block.php'                         => true,
+                'smarty_internal_compile_block_child.php'                   => true,
+                'smarty_internal_compile_block_parent.php'                  => true,
+                'smarty_internal_compile_child.php'                         => true,
+                'smarty_internal_compile_parent.php'                        => true,
+                'smarty_internal_compile_break.php'                         => true,
+                'smarty_internal_compile_call.php'                          => true,
+                'smarty_internal_compile_capture.php'                       => true,
+                'smarty_internal_compile_config_load.php'                   => true,
+                'smarty_internal_compile_continue.php'                      => true,
+                'smarty_internal_compile_debug.php'                         => true,
+                'smarty_internal_compile_eval.php'                          => true,
+                'smarty_internal_compile_extends.php'                       => true,
+                'smarty_internal_compile_for.php'                           => true,
+                'smarty_internal_compile_foreach.php'                       => true,
+                'smarty_internal_compile_function.php'                      => true,
+                'smarty_internal_compile_if.php'                            => true,
+                'smarty_internal_compile_include.php'                       => true,
+                'smarty_internal_compile_insert.php'                        => true,
+                'smarty_internal_compile_ldelim.php'                        => true,
+                'smarty_internal_compile_make_nocache.php'                  => true,
+                'smarty_internal_compile_nocache.php'                       => true,
+                'smarty_internal_compile_private_block_plugin.php'          => true,
+                'smarty_internal_compile_private_foreachsection.php'        => true,
+                'smarty_internal_compile_private_function_plugin.php'       => true,
+                'smarty_internal_compile_private_modifier.php'              => true,
+                'smarty_internal_compile_private_object_block_function.php' => true,
+                'smarty_internal_compile_private_object_function.php'       => true,
+                'smarty_internal_compile_private_print_expression.php'      => true,
+                'smarty_internal_compile_private_registered_block.php'      => true,
+                'smarty_internal_compile_private_registered_function.php'   => true,
+                'smarty_internal_compile_private_special_variable.php'      => true,
+                'smarty_internal_compile_rdelim.php'                        => true,
+                'smarty_internal_compile_section.php'                       => true,
+                'smarty_internal_compile_setfilter.php'                     => true,
+                'smarty_internal_compile_shared_inheritance.php'            => true,
+                'smarty_internal_compile_while.php'                         => true,
+                'smarty_internal_configfilelexer.php'                       => true,
+                'smarty_internal_configfileparser.php'                      => true,
+                'smarty_internal_config_file_compiler.php'                  => true,
+                'smarty_internal_data.php'                                  => true,
+                'smarty_internal_debug.php'                                 => true,
+                'smarty_internal_extension_handler.php'                     => true,
+                'smarty_internal_method_addautoloadfilters.php'             => true,
+                'smarty_internal_method_adddefaultmodifiers.php'            => true,
+                'smarty_internal_method_append.php'                         => true,
+                'smarty_internal_method_appendbyref.php'                    => true,
+                'smarty_internal_method_assignbyref.php'                    => true,
+                'smarty_internal_method_assignglobal.php'                   => true,
+                'smarty_internal_method_clearallassign.php'                 => true,
+                'smarty_internal_method_clearallcache.php'                  => true,
+                'smarty_internal_method_clearassign.php'                    => true,
+                'smarty_internal_method_clearcache.php'                     => true,
+                'smarty_internal_method_clearcompiledtemplate.php'          => true,
+                'smarty_internal_method_clearconfig.php'                    => true,
+                'smarty_internal_method_compileallconfig.php'               => true,
+                'smarty_internal_method_compilealltemplates.php'            => true,
+                'smarty_internal_method_configload.php'                     => true,
+                'smarty_internal_method_createdata.php'                     => true,
+                'smarty_internal_method_getautoloadfilters.php'             => true,
+                'smarty_internal_method_getconfigvariable.php'              => true,
+                'smarty_internal_method_getconfigvars.php'                  => true,
+                'smarty_internal_method_getdebugtemplate.php'               => true,
+                'smarty_internal_method_getdefaultmodifiers.php'            => true,
+                'smarty_internal_method_getglobal.php'                      => true,
+                'smarty_internal_method_getregisteredobject.php'            => true,
+                'smarty_internal_method_getstreamvariable.php'              => true,
+                'smarty_internal_method_gettags.php'                        => true,
+                'smarty_internal_method_gettemplatevars.php'                => true,
+                'smarty_internal_method_literals.php'                       => true,
+                'smarty_internal_method_loadfilter.php'                     => true,
+                'smarty_internal_method_loadplugin.php'                     => true,
+                'smarty_internal_method_mustcompile.php'                    => true,
+                'smarty_internal_method_registercacheresource.php'          => true,
+                'smarty_internal_method_registerclass.php'                  => true,
+                'smarty_internal_method_registerdefaultconfighandler.php'   => true,
+                'smarty_internal_method_registerdefaultpluginhandler.php'   => true,
+                'smarty_internal_method_registerdefaulttemplatehandler.php' => true,
+                'smarty_internal_method_registerfilter.php'                 => true,
+                'smarty_internal_method_registerobject.php'                 => true,
+                'smarty_internal_method_registerplugin.php'                 => true,
+                'smarty_internal_method_registerresource.php'               => true,
+                'smarty_internal_method_setautoloadfilters.php'             => true,
+                'smarty_internal_method_setdebugtemplate.php'               => true,
+                'smarty_internal_method_setdefaultmodifiers.php'            => true,
+                'smarty_internal_method_unloadfilter.php'                   => true,
+                'smarty_internal_method_unregistercacheresource.php'        => true,
+                'smarty_internal_method_unregisterfilter.php'               => true,
+                'smarty_internal_method_unregisterobject.php'               => true,
+                'smarty_internal_method_unregisterplugin.php'               => true,
+                'smarty_internal_method_unregisterresource.php'             => true,
+                'smarty_internal_nocache_insert.php'                        => true,
+                'smarty_internal_parsetree.php'                             => true,
+                'smarty_internal_parsetree_code.php'                        => true,
+                'smarty_internal_parsetree_dq.php'                          => true,
+                'smarty_internal_parsetree_dqcontent.php'                   => true,
+                'smarty_internal_parsetree_tag.php'                         => true,
+                'smarty_internal_parsetree_template.php'                    => true,
+                'smarty_internal_parsetree_text.php'                        => true,
+                'smarty_internal_resource_eval.php'                         => true,
+                'smarty_internal_resource_extends.php'                      => true,
+                'smarty_internal_resource_file.php'                         => true,
+                'smarty_internal_resource_php.php'                          => true,
+                'smarty_internal_resource_stream.php'                       => true,
+                'smarty_internal_resource_string.php'                       => true,
+                'smarty_internal_runtime_cachemodify.php'                   => true,
+                'smarty_internal_runtime_cacheresourcefile.php'             => true,
+                'smarty_internal_runtime_capture.php'                       => true,
+                'smarty_internal_runtime_codeframe.php'                     => true,
+                'smarty_internal_runtime_filterhandler.php'                 => true,
+                'smarty_internal_runtime_foreach.php'                       => true,
+                'smarty_internal_runtime_getincludepath.php'                => true,
+                'smarty_internal_runtime_inheritance.php'                   => true,
+                'smarty_internal_runtime_make_nocache.php'                  => true,
+                'smarty_internal_runtime_tplfunction.php'                   => true,
+                'smarty_internal_runtime_updatecache.php'                   => true,
+                'smarty_internal_runtime_updatescope.php'                   => true,
+                'smarty_internal_runtime_writefile.php'                     => true,
+                'smarty_internal_smartytemplatecompiler.php'                => true,
+                'smarty_internal_template.php'                              => true,
+                'smarty_internal_templatebase.php'                          => true,
+                'smarty_internal_templatecompilerbase.php'                  => true,
+                'smarty_internal_templatelexer.php'                         => true,
+                'smarty_internal_templateparser.php'                        => true,
+                'smarty_internal_testinstall.php'                           => true,
+                'smarty_internal_undefined.php'                             => true,
+                'smarty_resource.php'                                       => true,
+                'smarty_resource_custom.php'                                => true,
+                'smarty_resource_recompiled.php'                            => true,
+                'smarty_resource_uncompiled.php'                            => true,
+                'smarty_security.php'                                       => true,
+                'smarty_template_cached.php'                                => true,
+                'smarty_template_compiled.php'                              => true,
+                'smarty_template_config.php'                                => true,
+                'smarty_template_resource_base.php'                         => true,
+                'smarty_template_source.php'                                => true,
+                'smarty_undefined_variable.php'                             => true,
+                'smarty_variable.php'                                       => true,
+            );
+            $iterator = new DirectoryIterator($source);
+            foreach ($iterator as $file) {
+                if (!$file->isDot()) {
+                    $filename = $file->getFilename();
+                    if (isset($expectedSysplugins[ $filename ])) {
+                        unset($expectedSysplugins[ $filename ]);
+                    }
+                }
+            }
+            if ($expectedSysplugins) {
+                $status = false;
+                $message = "FAILED: files missing from libs/sysplugins: " . join(', ', array_keys($expectedSysplugins));
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'sysplugins' ] = $message;
+                }
+            } elseif ($errors === null) {
+                echo "... OK\n";
+            }
+        } else {
+            $status = false;
+            $message = "FAILED: " . SMARTY_SYSPLUGINS_DIR . ' is not a directory';
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'sysplugins_dir_constant' ] = $message;
+            }
+        }
+        if ($errors === null) {
+            echo "Testing plugin files...\n";
+        }
+        // test if core plugins are available
+        $source = SMARTY_PLUGINS_DIR;
+        if (is_dir($source)) {
+            $expectedPlugins = array(
+                'block.textformat.php'                  => true,
+                'function.counter.php'                  => true,
+                'function.cycle.php'                    => true,
+                'function.fetch.php'                    => true,
+                'function.html_checkboxes.php'          => true,
+                'function.html_image.php'               => true,
+                'function.html_options.php'             => true,
+                'function.html_radios.php'              => true,
+                'function.html_select_date.php'         => true,
+                'function.html_select_time.php'         => true,
+                'function.html_table.php'               => true,
+                'function.mailto.php'                   => true,
+                'function.math.php'                     => true,
+                'modifier.capitalize.php'               => true,
+                'modifier.date_format.php'              => true,
+                'modifier.debug_print_var.php'          => true,
+                'modifier.escape.php'                   => true,
+                'modifier.mb_wordwrap.php'              => true,
+                'modifier.regex_replace.php'            => true,
+                'modifier.replace.php'                  => true,
+                'modifier.spacify.php'                  => true,
+                'modifier.truncate.php'                 => true,
+                'modifiercompiler.cat.php'              => true,
+                'modifiercompiler.count_characters.php' => true,
+                'modifiercompiler.count_paragraphs.php' => true,
+                'modifiercompiler.count_sentences.php'  => true,
+                'modifiercompiler.count_words.php'      => true,
+                'modifiercompiler.default.php'          => true,
+                'modifiercompiler.escape.php'           => true,
+                'modifiercompiler.from_charset.php'     => true,
+                'modifiercompiler.indent.php'           => true,
+                'modifiercompiler.lower.php'            => true,
+                'modifiercompiler.noprint.php'          => true,
+                'modifiercompiler.string_format.php'    => true,
+                'modifiercompiler.strip.php'            => true,
+                'modifiercompiler.strip_tags.php'       => true,
+                'modifiercompiler.to_charset.php'       => true,
+                'modifiercompiler.unescape.php'         => true,
+                'modifiercompiler.upper.php'            => true,
+                'modifiercompiler.wordwrap.php'         => true,
+                'outputfilter.trimwhitespace.php'       => true,
+                'shared.escape_special_chars.php'       => true,
+                'shared.literal_compiler_param.php'     => true,
+                'shared.make_timestamp.php'             => true,
+                'shared.mb_str_replace.php'             => true,
+                'shared.mb_unicode.php'                 => true,
+                'variablefilter.htmlspecialchars.php'   => true,
+            );
+            $iterator = new DirectoryIterator($source);
+            foreach ($iterator as $file) {
+                if (!$file->isDot()) {
+                    $filename = $file->getFilename();
+                    if (isset($expectedPlugins[ $filename ])) {
+                        unset($expectedPlugins[ $filename ]);
+                    }
+                }
+            }
+            if ($expectedPlugins) {
+                $status = false;
+                $message = "FAILED: files missing from libs/plugins: " . join(', ', array_keys($expectedPlugins));
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'plugins' ] = $message;
+                }
+            } elseif ($errors === null) {
+                echo "... OK\n";
+            }
+        } else {
+            $status = false;
+            $message = "FAILED: " . SMARTY_PLUGINS_DIR . ' is not a directory';
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'plugins_dir_constant' ] = $message;
+            }
+        }
+        if ($errors === null) {
+            echo "Tests complete.\n";
+            echo "</PRE>\n";
+        }
+        return $status;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_undefined.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_undefined.php
new file mode 100644
index 000000000..7df0acc2d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_internal_undefined.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Smarty Internal Undefined
+ *
+ * Class to handle undefined method calls or calls to obsolete runtime extensions
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Undefined
+{
+    /**
+     * Name of undefined extension class
+     *
+     * @var string|null
+     */
+    public $class = null;
+
+    /**
+     * Smarty_Internal_Undefined constructor.
+     *
+     * @param null|string $class name of undefined extension class
+     */
+    public function __construct($class = null)
+    {
+        $this->class = $class;
+    }
+
+    /**
+     * Wrapper for obsolete class Smarty_Internal_Runtime_ValidateCompiled
+     *
+     * @param \Smarty_Internal_Template $tpl
+     * @param array                     $properties special template properties
+     * @param bool                      $cache      flag if called from cache file
+     *
+     * @return bool false
+     */
+    public function decodeProperties(Smarty_Internal_Template $tpl, $properties, $cache = false)
+    {
+        if ($cache) {
+            $tpl->cached->valid = false;
+        } else {
+            $tpl->mustCompile = true;
+        }
+        return false;
+    }
+
+    /**
+     * Call error handler for undefined method
+     *
+     * @param string $name unknown method-name
+     * @param array  $args argument array
+     *
+     * @return mixed
+     * @throws SmartyException
+     */
+    public function __call($name, $args)
+    {
+        if (isset($this->class)) {
+            throw new SmartyException("undefined extension class '{$this->class}'");
+        } else {
+            throw new SmartyException(get_class($args[ 0 ]) . "->{$name}() undefined method");
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_resource.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_resource.php
new file mode 100644
index 000000000..3c43a9f46
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_resource.php
@@ -0,0 +1,260 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+
+/**
+ * Smarty Resource Plugin
+ * Base implementation for resource plugins
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ *
+ * @method renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template)
+ * @method populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+ * @method process(Smarty_Internal_Template $_smarty_tpl)
+ */
+abstract class Smarty_Resource
+{
+    /**
+     * resource types provided by the core
+     *
+     * @var array
+     */
+    public static $sysplugins = array(
+        'file'    => 'smarty_internal_resource_file.php',
+        'string'  => 'smarty_internal_resource_string.php',
+        'extends' => 'smarty_internal_resource_extends.php',
+        'stream'  => 'smarty_internal_resource_stream.php',
+        'eval'    => 'smarty_internal_resource_eval.php',
+        'php'     => 'smarty_internal_resource_php.php'
+    );
+
+    /**
+     * Source is bypassing compiler
+     *
+     * @var boolean
+     */
+    public $uncompiled = false;
+
+    /**
+     * Source must be recompiled on every occasion
+     *
+     * @var boolean
+     */
+    public $recompiled = false;
+
+    /**
+     * Flag if resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
+     */
+    public $hasCompiledHandler = false;
+
+    /**
+     * Load Resource Handler
+     *
+     * @param Smarty $smarty smarty object
+     * @param string $type   name of the resource
+     *
+     * @throws SmartyException
+     * @return Smarty_Resource Resource Handler
+     */
+    public static function load(Smarty $smarty, $type)
+    {
+        // try smarty's cache
+        if (isset($smarty->_cache[ 'resource_handlers' ][ $type ])) {
+            return $smarty->_cache[ 'resource_handlers' ][ $type ];
+        }
+        // try registered resource
+        if (isset($smarty->registered_resources[ $type ])) {
+            return $smarty->_cache[ 'resource_handlers' ][ $type ] = $smarty->registered_resources[ $type ];
+        }
+        // try sysplugins dir
+        if (isset(self::$sysplugins[ $type ])) {
+            $_resource_class = 'Smarty_Internal_Resource_' . smarty_ucfirst_ascii($type);
+            return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
+        }
+        // try plugins dir
+        $_resource_class = 'Smarty_Resource_' . smarty_ucfirst_ascii($type);
+        if ($smarty->loadPlugin($_resource_class)) {
+            if (class_exists($_resource_class, false)) {
+                return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
+            } else {
+                $smarty->registerResource(
+                    $type,
+                    array(
+                        "smarty_resource_{$type}_source", "smarty_resource_{$type}_timestamp",
+                        "smarty_resource_{$type}_secure", "smarty_resource_{$type}_trusted"
+                    )
+                );
+                // give it another try, now that the resource is registered properly
+                return self::load($smarty, $type);
+            }
+        }
+        // try streams
+        $_known_stream = stream_get_wrappers();
+        if (in_array($type, $_known_stream)) {
+            // is known stream
+            if (is_object($smarty->security_policy)) {
+                $smarty->security_policy->isTrustedStream($type);
+            }
+            return $smarty->_cache[ 'resource_handlers' ][ $type ] = new Smarty_Internal_Resource_Stream();
+        }
+        // TODO: try default_(template|config)_handler
+        // give up
+        throw new SmartyException("Unknown resource type '{$type}'");
+    }
+
+    /**
+     * extract resource_type and resource_name from template_resource and config_resource
+     *
+     * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including).
+     *
+     * @param string $resource_name    template_resource or config_resource to parse
+     * @param string $default_resource the default resource_type defined in $smarty
+     *
+     * @return array with parsed resource name and type
+     */
+    public static function parseResourceName($resource_name, $default_resource)
+    {
+        if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]/', $resource_name, $match)) {
+            $type = $match[ 1 ];
+            $name = substr($resource_name, strlen($match[ 0 ]));
+        } else {
+            // no resource given, use default
+            // or single character before the colon is not a resource type, but part of the filepath
+            $type = $default_resource;
+            $name = $resource_name;
+        }
+        return array($name, $type);
+    }
+
+    /**
+     * modify template_resource according to resource handlers specifications
+     *
+     * @param \Smarty_Internal_Template|\Smarty $obj               Smarty instance
+     * @param string                            $template_resource template_resource to extract resource handler and
+     *                                                             name of
+     *
+     * @return string unique resource name
+     * @throws \SmartyException
+     */
+    public static function getUniqueTemplateName($obj, $template_resource)
+    {
+        $smarty = $obj->_getSmartyObj();
+        list($name, $type) = self::parseResourceName($template_resource, $smarty->default_resource_type);
+        // TODO: optimize for Smarty's internal resource types
+        $resource = Smarty_Resource::load($smarty, $type);
+        // go relative to a given template?
+        $_file_is_dotted = $name[ 0 ] === '.' && ($name[ 1 ] === '.' || $name[ 1 ] === '/');
+        if ($obj->_isTplObj() && $_file_is_dotted
+            && ($obj->source->type === 'file' || $obj->parent->source->type === 'extends')
+        ) {
+            $name = $smarty->_realpath(dirname($obj->parent->source->filepath) . DIRECTORY_SEPARATOR . $name);
+        }
+        return $resource->buildUniqueResourceName($smarty, $name);
+    }
+
+    /**
+     * initialize Source Object for given resource
+     * wrapper for backward compatibility to versions < 3.1.22
+     * Either [$_template] or [$smarty, $template_resource] must be specified
+     *
+     * @param Smarty_Internal_Template $_template         template object
+     * @param Smarty                   $smarty            smarty object
+     * @param string                   $template_resource resource identifier
+     *
+     * @return \Smarty_Template_Source Source Object
+     * @throws \SmartyException
+     */
+    public static function source(
+        Smarty_Internal_Template $_template = null,
+        Smarty $smarty = null,
+        $template_resource = null
+    ) {
+        return Smarty_Template_Source::load($_template, $smarty, $template_resource);
+    }
+
+    /**
+     * Load template's source into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
+     */
+    abstract public function getContent(Smarty_Template_Source $source);
+
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     */
+    abstract public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null);
+
+    /**
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Smarty_Template_Source $source source object
+     */
+    public function populateTimestamp(Smarty_Template_Source $source)
+    {
+        // intentionally left blank
+    }
+
+    /**
+     * modify resource_name according to resource handlers specifications
+     *
+     * @param Smarty  $smarty        Smarty instance
+     * @param string  $resource_name resource_name to make unique
+     * @param boolean $isConfig      flag for config resource
+     *
+     * @return string unique resource name
+     */
+    public function buildUniqueResourceName(Smarty $smarty, $resource_name, $isConfig = false)
+    {
+        if ($isConfig) {
+            if (!isset($smarty->_joined_config_dir)) {
+                $smarty->getTemplateDir(null, true);
+            }
+            return get_class($this) . '#' . $smarty->_joined_config_dir . '#' . $resource_name;
+        } else {
+            if (!isset($smarty->_joined_template_dir)) {
+                $smarty->getTemplateDir();
+            }
+            return get_class($this) . '#' . $smarty->_joined_template_dir . '#' . $resource_name;
+        }
+    }
+
+    /*
+     * Check if resource must check time stamps when when loading complied or cached templates.
+     * Resources like 'extends' which use source components my disable timestamp checks on own resource.
+     *
+     * @return bool
+     */
+    /**
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
+     */
+    public function getBasename(Smarty_Template_Source $source)
+    {
+        return basename(preg_replace('![^\w]+!', '_', $source->name));
+    }
+
+    /**
+     * @return bool
+     */
+    public function checkTimestamps()
+    {
+        return true;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_resource_custom.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_resource_custom.php
new file mode 100644
index 000000000..191fa7c90
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_resource_custom.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+
+/**
+ * Smarty Resource Plugin
+ * Wrapper Implementation for custom resource plugins
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ */
+abstract class Smarty_Resource_Custom extends Smarty_Resource
+{
+    /**
+     * fetch template and its modification time from data source
+     *
+     * @param string  $name    template name
+     * @param string  &$source template source
+     * @param integer &$mtime  template modification timestamp (epoch)
+     */
+    abstract protected function fetch($name, &$source, &$mtime);
+
+    /**
+     * Fetch template's modification timestamp from data source
+     * {@internal implementing this method is optional.
+     *  Only implement it if modification times can be accessed faster than loading the complete template source.}}
+     *
+     * @param string $name template name
+     *
+     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+     */
+    protected function fetchTimestamp($name)
+    {
+        return null;
+    }
+
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param Smarty_Template_Source   $source    source object
+     * @param Smarty_Internal_Template $_template template object
+     */
+    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
+    {
+        $source->filepath = $source->type . ':' . $this->generateSafeName($source->name);
+        $source->uid = sha1($source->type . ':' . $source->name);
+        $mtime = $this->fetchTimestamp($source->name);
+        if ($mtime !== null) {
+            $source->timestamp = $mtime;
+        } else {
+            $this->fetch($source->name, $content, $timestamp);
+            $source->timestamp = isset($timestamp) ? $timestamp : false;
+            if (isset($content)) {
+                $source->content = $content;
+            }
+        }
+        $source->exists = !!$source->timestamp;
+    }
+
+    /**
+     * Load template's source into current template object
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 template source
+     * @throws SmartyException        if source cannot be loaded
+     */
+    public function getContent(Smarty_Template_Source $source)
+    {
+        $this->fetch($source->name, $content, $timestamp);
+        if (isset($content)) {
+            return $content;
+        }
+        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
+    }
+
+    /**
+     * Determine basename for compiled filename
+     *
+     * @param Smarty_Template_Source $source source object
+     *
+     * @return string                 resource's basename
+     */
+    public function getBasename(Smarty_Template_Source $source)
+    {
+        return basename($this->generateSafeName($source->name));
+    }
+
+    /**
+     * Removes special characters from $name and limits its length to 127 characters.
+     *
+     * @param $name
+     *
+     * @return string
+     */
+    private function generateSafeName($name): string {
+        return substr(preg_replace('/[^A-Za-z0-9._]/', '', (string) $name), 0, 127);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_resource_recompiled.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_resource_recompiled.php
new file mode 100644
index 000000000..760c4dd33
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_resource_recompiled.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+
+/**
+ * Smarty Resource Plugin
+ * Base implementation for resource plugins that don't compile cache
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ */
+abstract class Smarty_Resource_Recompiled extends Smarty_Resource
+{
+    /**
+     * Flag that it's an recompiled resource
+     *
+     * @var bool
+     */
+    public $recompiled = true;
+
+    /**
+     * Resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
+     */
+    public $hasCompiledHandler = true;
+
+    /**
+     * compile template from source
+     *
+     * @param Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+     *
+     * @throws Exception
+     */
+    public function process(Smarty_Internal_Template $_smarty_tpl)
+    {
+        $compiled = &$_smarty_tpl->compiled;
+        $compiled->file_dependency = array();
+        $compiled->includes = array();
+        $compiled->nocache_hash = null;
+        $compiled->unifunc = null;
+        $level = ob_get_level();
+        ob_start();
+        $_smarty_tpl->loadCompiler();
+        // call compiler
+        try {
+            eval('?>' . $_smarty_tpl->compiler->compileTemplate($_smarty_tpl));
+        } catch (Exception $e) {
+            unset($_smarty_tpl->compiler);
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+            throw $e;
+        }
+        // release compiler object to free memory
+        unset($_smarty_tpl->compiler);
+        ob_get_clean();
+        $compiled->timestamp = time();
+        $compiled->exists = true;
+    }
+
+    /**
+     * populate Compiled Object with compiled filepath
+     *
+     * @param Smarty_Template_Compiled $compiled  compiled object
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return void
+     */
+    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+    {
+        $compiled->filepath = false;
+        $compiled->timestamp = false;
+        $compiled->exists = false;
+    }
+
+    /*
+       * Disable timestamp checks for recompiled resource.
+       *
+       * @return bool
+       */
+    /**
+     * @return bool
+     */
+    public function checkTimestamps()
+    {
+        return false;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_resource_uncompiled.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_resource_uncompiled.php
new file mode 100644
index 000000000..a11e2c14c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_resource_uncompiled.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+
+/**
+ * Smarty Resource Plugin
+ * Base implementation for resource plugins that don't use the compiler
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ */
+abstract class Smarty_Resource_Uncompiled extends Smarty_Resource
+{
+    /**
+     * Flag that it's an uncompiled resource
+     *
+     * @var bool
+     */
+    public $uncompiled = true;
+
+    /**
+     * Resource does implement populateCompiledFilepath() method
+     *
+     * @var bool
+     */
+    public $hasCompiledHandler = true;
+
+    /**
+     * populate compiled object with compiled filepath
+     *
+     * @param Smarty_Template_Compiled $compiled  compiled object
+     * @param Smarty_Internal_Template $_template template object
+     */
+    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
+    {
+        $compiled->filepath = $_template->source->filepath;
+        $compiled->timestamp = $_template->source->timestamp;
+        $compiled->exists = $_template->source->exists;
+        if ($_template->smarty->merge_compiled_includes || $_template->source->handler->checkTimestamps()) {
+            $compiled->file_dependency[ $_template->source->uid ] =
+                array($compiled->filepath, $compiled->timestamp, $_template->source->type,);
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_security.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_security.php
new file mode 100644
index 000000000..49ae2a386
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_security.php
@@ -0,0 +1,680 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage Security
+ * @author     Uwe Tews
+ */
+/**
+ * FIXME: Smarty_Security API
+ *      - getter and setter instead of public properties would allow cultivating an internal cache properly
+ *      - current implementation of isTrustedResourceDir() assumes that Smarty::$template_dir and Smarty::$config_dir
+ *      are immutable the cache is killed every time either of the variables change. That means that two distinct
+ *      Smarty objects with differing
+ *        $template_dir or $config_dir should NOT share the same Smarty_Security instance,
+ *        as this would lead to (severe) performance penalty! how should this be handled?
+ */
+
+/**
+ * This class does contain the security settings
+ */
+#[\AllowDynamicProperties]
+class Smarty_Security
+{
+
+    /**
+     * This is the list of template directories that are considered secure.
+     * $template_dir is in this list implicitly.
+     *
+     * @var array
+     */
+    public $secure_dir = array();
+
+    /**
+     * This is an array of directories where trusted php scripts reside.
+     * {@link $security} is disabled during their inclusion/execution.
+     *
+     * @var array
+     */
+    public $trusted_dir = array();
+
+    /**
+     * List of regular expressions (PCRE) that include trusted URIs
+     *
+     * @var array
+     */
+    public $trusted_uri = array();
+
+    /**
+     * List of trusted constants names
+     *
+     * @var array
+     */
+    public $trusted_constants = array();
+
+    /**
+     * This is an array of trusted static classes.
+     * If empty access to all static classes is allowed.
+     * If set to 'none' none is allowed.
+     *
+     * @var array
+     */
+    public $static_classes = array();
+
+    /**
+     * This is an nested array of trusted classes and static methods.
+     * If empty access to all static classes and methods is allowed.
+     * Format:
+     * array (
+     *         'class_1' => array('method_1', 'method_2'), // allowed methods listed
+     *         'class_2' => array(),                       // all methods of class allowed
+     *       )
+     * If set to null none is allowed.
+     *
+     * @var array
+     */
+    public $trusted_static_methods = array();
+
+    /**
+     * This is an array of trusted static properties.
+     * If empty access to all static classes and properties is allowed.
+     * Format:
+     * array (
+     *         'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
+     *         'class_2' => array(),                   // all properties of class allowed
+     *       )
+     * If set to null none is allowed.
+     *
+     * @var array
+     */
+    public $trusted_static_properties = array();
+
+    /**
+     * This is an array of trusted PHP functions.
+     * If empty all functions are allowed.
+     * To disable all PHP functions set $php_functions = null.
+     *
+     * @var array
+     */
+    public $php_functions = array('isset', 'empty', 'count', 'sizeof', 'in_array', 'is_array', 'time',);
+
+    /**
+     * This is an array of trusted PHP modifiers.
+     * If empty all modifiers are allowed.
+     * To disable all modifier set $php_modifiers = null.
+     *
+     * @var array
+     */
+    public $php_modifiers = array('escape', 'count', 'sizeof', 'nl2br',);
+
+    /**
+     * This is an array of allowed tags.
+     * If empty no restriction by allowed_tags.
+     *
+     * @var array
+     */
+    public $allowed_tags = array();
+
+    /**
+     * This is an array of disabled tags.
+     * If empty no restriction by disabled_tags.
+     *
+     * @var array
+     */
+    public $disabled_tags = array();
+
+    /**
+     * This is an array of allowed modifier plugins.
+     * If empty no restriction by allowed_modifiers.
+     *
+     * @var array
+     */
+    public $allowed_modifiers = array();
+
+    /**
+     * This is an array of disabled modifier plugins.
+     * If empty no restriction by disabled_modifiers.
+     *
+     * @var array
+     */
+    public $disabled_modifiers = array();
+
+    /**
+     * This is an array of disabled special $smarty variables.
+     *
+     * @var array
+     */
+    public $disabled_special_smarty_vars = array();
+
+    /**
+     * This is an array of trusted streams.
+     * If empty all streams are allowed.
+     * To disable all streams set $streams = null.
+     *
+     * @var array
+     */
+    public $streams = array('file');
+
+    /**
+     * + flag if constants can be accessed from template
+     *
+     * @var boolean
+     */
+    public $allow_constants = true;
+
+    /**
+     * + flag if super globals can be accessed from template
+     *
+     * @var boolean
+     */
+    public $allow_super_globals = true;
+
+    /**
+     * max template nesting level
+     *
+     * @var int
+     */
+    public $max_template_nesting = 0;
+
+    /**
+     * current template nesting level
+     *
+     * @var int
+     */
+    private $_current_template_nesting = 0;
+
+    /**
+     * Cache for $resource_dir lookup
+     *
+     * @var array
+     */
+    protected $_resource_dir = array();
+
+    /**
+     * Cache for $template_dir lookup
+     *
+     * @var array
+     */
+    protected $_template_dir = array();
+
+    /**
+     * Cache for $config_dir lookup
+     *
+     * @var array
+     */
+    protected $_config_dir = array();
+
+    /**
+     * Cache for $secure_dir lookup
+     *
+     * @var array
+     */
+    protected $_secure_dir = array();
+
+    /**
+     * Cache for $php_resource_dir lookup
+     *
+     * @var array
+     */
+    protected $_php_resource_dir = null;
+
+    /**
+     * Cache for $trusted_dir lookup
+     *
+     * @var array
+     */
+    protected $_trusted_dir = null;
+
+    /**
+     * Cache for include path status
+     *
+     * @var bool
+     */
+    protected $_include_path_status = false;
+
+    /**
+     * Cache for $_include_array lookup
+     *
+     * @var array
+     */
+    protected $_include_dir = array();
+
+    /**
+     * @param Smarty $smarty
+     */
+    public function __construct($smarty)
+    {
+        $this->smarty = $smarty;
+    }
+
+    /**
+     * Check if PHP function is trusted.
+     *
+     * @param string $function_name
+     * @param object $compiler compiler object
+     * @deprecated
+     * @return boolean                 true if function is trusted
+     */
+    public function isTrustedPhpFunction($function_name, $compiler)
+    {
+        if (isset($this->php_functions)
+            && (empty($this->php_functions) || in_array($function_name, $this->php_functions))
+        ) {
+            return true;
+        }
+        $compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting");
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if static class is trusted.
+     *
+     * @param string $class_name
+     * @param object $compiler compiler object
+     *
+     * @return boolean                 true if class is trusted
+     */
+    public function isTrustedStaticClass($class_name, $compiler)
+    {
+        if (isset($this->static_classes)
+            && (empty($this->static_classes) || in_array($class_name, $this->static_classes))
+        ) {
+            return true;
+        }
+        $compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if static class method/property is trusted.
+     *
+     * @param string $class_name
+     * @param string $params
+     * @param object $compiler compiler object
+     *
+     * @return boolean                 true if class method is trusted
+     */
+    public function isTrustedStaticClassAccess($class_name, $params, $compiler)
+    {
+        if (!isset($params[ 2 ])) {
+            // fall back
+            return $this->isTrustedStaticClass($class_name, $compiler);
+        }
+        if ($params[ 2 ] === 'method') {
+            $allowed = $this->trusted_static_methods;
+            $name = substr($params[ 0 ], 0, strpos($params[ 0 ], '('));
+        } else {
+            $allowed = $this->trusted_static_properties;
+            // strip '$'
+            $name = substr($params[ 0 ], 1);
+        }
+        if (isset($allowed)) {
+            if (empty($allowed)) {
+                // fall back
+                return $this->isTrustedStaticClass($class_name, $compiler);
+            }
+            if (isset($allowed[ $class_name ])
+                && (empty($allowed[ $class_name ]) || in_array($name, $allowed[ $class_name ]))
+            ) {
+                return true;
+            }
+        }
+        $compiler->trigger_template_error("access to static class '{$class_name}' {$params[2]} '{$name}' not allowed by security setting");
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if PHP modifier is trusted.
+     *
+     * @param string $modifier_name
+     * @param object $compiler compiler object
+     * @deprecated
+     * @return boolean                 true if modifier is trusted
+     */
+    public function isTrustedPhpModifier($modifier_name, $compiler)
+    {
+        if (isset($this->php_modifiers)
+            && (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))
+        ) {
+            return true;
+        }
+        $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting");
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if tag is trusted.
+     *
+     * @param string $tag_name
+     * @param object $compiler compiler object
+     *
+     * @return boolean                 true if tag is trusted
+     */
+    public function isTrustedTag($tag_name, $compiler)
+    {
+        // check for internal always required tags
+        if (in_array(
+            $tag_name,
+            array(
+                'assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin',
+                'private_object_block_function', 'private_object_function', 'private_registered_function',
+                'private_registered_block', 'private_special_variable', 'private_print_expression',
+                'private_modifier'
+            )
+        )
+        ) {
+            return true;
+        }
+        // check security settings
+        if (empty($this->allowed_tags)) {
+            if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
+                return true;
+            } else {
+                $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", null, true);
+            }
+        } elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
+            return true;
+        } else {
+            $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", null, true);
+        }
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if special $smarty variable is trusted.
+     *
+     * @param string $var_name
+     * @param object $compiler compiler object
+     *
+     * @return boolean                 true if tag is trusted
+     */
+    public function isTrustedSpecialSmartyVar($var_name, $compiler)
+    {
+        if (!in_array($var_name, $this->disabled_special_smarty_vars)) {
+            return true;
+        } else {
+            $compiler->trigger_template_error(
+                "special variable '\$smarty.{$var_name}' not allowed by security setting",
+                null,
+                true
+            );
+        }
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if modifier plugin is trusted.
+     *
+     * @param string $modifier_name
+     * @param object $compiler compiler object
+     *
+     * @return boolean                 true if tag is trusted
+     */
+    public function isTrustedModifier($modifier_name, $compiler)
+    {
+        // check for internal always allowed modifier
+        if (in_array($modifier_name, array('default'))) {
+            return true;
+        }
+        // check security settings
+        if (empty($this->allowed_modifiers)) {
+            if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
+                return true;
+            } else {
+                $compiler->trigger_template_error(
+                    "modifier '{$modifier_name}' disabled by security setting",
+                    null,
+                    true
+                );
+            }
+        } elseif (in_array($modifier_name, $this->allowed_modifiers)
+                  && !in_array($modifier_name, $this->disabled_modifiers)
+        ) {
+            return true;
+        } else {
+            $compiler->trigger_template_error(
+                "modifier '{$modifier_name}' not allowed by security setting",
+                null,
+                true
+            );
+        }
+        return false; // should not, but who knows what happens to the compiler in the future?
+    }
+
+    /**
+     * Check if constants are enabled or trusted
+     *
+     * @param string $const    constant name
+     * @param object $compiler compiler object
+     *
+     * @return bool
+     */
+    public function isTrustedConstant($const, $compiler)
+    {
+        if (in_array($const, array('true', 'false', 'null'))) {
+            return true;
+        }
+        if (!empty($this->trusted_constants)) {
+            if (!in_array(strtolower($const), $this->trusted_constants)) {
+                $compiler->trigger_template_error("Security: access to constant '{$const}' not permitted");
+                return false;
+            }
+            return true;
+        }
+        if ($this->allow_constants) {
+            return true;
+        }
+        $compiler->trigger_template_error("Security: access to constants not permitted");
+        return false;
+    }
+
+    /**
+     * Check if stream is trusted.
+     *
+     * @param string $stream_name
+     *
+     * @return boolean         true if stream is trusted
+     * @throws SmartyException if stream is not trusted
+     */
+    public function isTrustedStream($stream_name)
+    {
+        if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
+            return true;
+        }
+        throw new SmartyException("stream '{$stream_name}' not allowed by security setting");
+    }
+
+    /**
+     * Check if directory of file resource is trusted.
+     *
+     * @param string    $filepath
+     * @param null|bool $isConfig
+     *
+     * @return bool true if directory is trusted
+     * @throws \SmartyException if directory is not trusted
+     */
+    public function isTrustedResourceDir($filepath, $isConfig = null)
+    {
+        if ($this->_include_path_status !== $this->smarty->use_include_path) {
+            $_dir =
+                $this->smarty->use_include_path ? $this->smarty->ext->_getIncludePath->getIncludePathDirs($this->smarty) : array();
+            if ($this->_include_dir !== $_dir) {
+                $this->_updateResourceDir($this->_include_dir, $_dir);
+                $this->_include_dir = $_dir;
+            }
+            $this->_include_path_status = $this->smarty->use_include_path;
+        }
+        $_dir = $this->smarty->getTemplateDir();
+        if ($this->_template_dir !== $_dir) {
+            $this->_updateResourceDir($this->_template_dir, $_dir);
+            $this->_template_dir = $_dir;
+        }
+        $_dir = $this->smarty->getConfigDir();
+        if ($this->_config_dir !== $_dir) {
+            $this->_updateResourceDir($this->_config_dir, $_dir);
+            $this->_config_dir = $_dir;
+        }
+        if ($this->_secure_dir !== $this->secure_dir) {
+            $this->secure_dir = (array)$this->secure_dir;
+            foreach ($this->secure_dir as $k => $d) {
+                $this->secure_dir[ $k ] = $this->smarty->_realpath($d . DIRECTORY_SEPARATOR, true);
+            }
+            $this->_updateResourceDir($this->_secure_dir, $this->secure_dir);
+            $this->_secure_dir = $this->secure_dir;
+        }
+        $addPath = $this->_checkDir($filepath, $this->_resource_dir);
+        if ($addPath !== false) {
+            $this->_resource_dir = array_merge($this->_resource_dir, $addPath);
+        }
+        return true;
+    }
+
+    /**
+     * Check if URI (e.g. {fetch} or {html_image}) is trusted
+     * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
+     * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
+     * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
+     *
+     * @param string $uri
+     *
+     * @return boolean         true if URI is trusted
+     * @throws SmartyException if URI is not trusted
+     * @uses   $trusted_uri for list of patterns to match against $uri
+     */
+    public function isTrustedUri($uri)
+    {
+        $_uri = parse_url($uri);
+        if (!empty($_uri[ 'scheme' ]) && !empty($_uri[ 'host' ])) {
+            $_uri = $_uri[ 'scheme' ] . '://' . $_uri[ 'host' ];
+            foreach ($this->trusted_uri as $pattern) {
+                if (preg_match($pattern, $_uri)) {
+                    return true;
+                }
+            }
+        }
+        throw new SmartyException("URI '{$uri}' not allowed by security setting");
+    }
+
+    /**
+     * Remove old directories and its sub folders, add new directories
+     *
+     * @param array $oldDir
+     * @param array $newDir
+     */
+    private function _updateResourceDir($oldDir, $newDir)
+    {
+        foreach ($oldDir as $directory) {
+            //           $directory = $this->smarty->_realpath($directory, true);
+            $length = strlen($directory);
+            foreach ($this->_resource_dir as $dir) {
+                if (substr($dir, 0, $length) === $directory) {
+                    unset($this->_resource_dir[ $dir ]);
+                }
+            }
+        }
+        foreach ($newDir as $directory) {
+            //           $directory = $this->smarty->_realpath($directory, true);
+            $this->_resource_dir[ $directory ] = true;
+        }
+    }
+
+    /**
+     * Check if file is inside a valid directory
+     *
+     * @param string $filepath
+     * @param array  $dirs valid directories
+     *
+     * @return array|bool
+     * @throws \SmartyException
+     */
+    private function _checkDir($filepath, $dirs)
+    {
+        $directory = dirname($this->smarty->_realpath($filepath, true)) . DIRECTORY_SEPARATOR;
+        $_directory = array();
+        if (!preg_match('#[\\\\/][.][.][\\\\/]#', $directory)) {
+            while (true) {
+                // test if the directory is trusted
+                if (isset($dirs[ $directory ])) {
+                    return $_directory;
+                }
+                // abort if we've reached root
+                if (!preg_match('#[\\\\/][^\\\\/]+[\\\\/]$#', $directory)) {
+                    // give up
+                    break;
+                }
+                // remember the directory to add it to _resource_dir in case we're successful
+                $_directory[ $directory ] = true;
+                // bubble up one level
+                $directory = preg_replace('#[\\\\/][^\\\\/]+[\\\\/]$#', DIRECTORY_SEPARATOR, $directory);
+            }
+        }
+        // give up
+        throw new SmartyException(sprintf('Smarty Security: not trusted file path \'%s\' ', $filepath));
+    }
+
+    /**
+     * Loads security class and enables security
+     *
+     * @param \Smarty                $smarty
+     * @param string|Smarty_Security $security_class if a string is used, it must be class-name
+     *
+     * @return \Smarty current Smarty instance for chaining
+     * @throws \SmartyException when an invalid class name is provided
+     */
+    public static function enableSecurity(Smarty $smarty, $security_class)
+    {
+        if ($security_class instanceof Smarty_Security) {
+            $smarty->security_policy = $security_class;
+            return $smarty;
+        } elseif (is_object($security_class)) {
+            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
+        }
+        if ($security_class === null) {
+            $security_class = $smarty->security_class;
+        }
+        if (!class_exists($security_class)) {
+            throw new SmartyException("Security class '$security_class' is not defined");
+        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
+            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
+        } else {
+            $smarty->security_policy = new $security_class($smarty);
+        }
+        return $smarty;
+    }
+
+    /**
+     * Start template processing
+     *
+     * @param $template
+     *
+     * @throws SmartyException
+     */
+    public function startTemplate($template)
+    {
+        if ($this->max_template_nesting > 0 && $this->_current_template_nesting++ >= $this->max_template_nesting) {
+            throw new SmartyException("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
+        }
+    }
+
+    /**
+     * Exit template processing
+     */
+    public function endTemplate()
+    {
+        if ($this->max_template_nesting > 0) {
+            $this->_current_template_nesting--;
+        }
+    }
+
+    /**
+     * Register callback functions call at start/end of template rendering
+     *
+     * @param \Smarty_Internal_Template $template
+     */
+    public function registerCallBacks(Smarty_Internal_Template $template)
+    {
+        $template->startRenderCallbacks[] = array($this, 'startTemplate');
+        $template->endRenderCallbacks[] = array($this, 'endTemplate');
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_template_cached.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_template_cached.php
new file mode 100644
index 000000000..508d27f36
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_template_cached.php
@@ -0,0 +1,257 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Uwe Tews
+ * Date: 04.12.2014
+ * Time: 06:08
+ */
+
+/**
+ * Smarty Resource Data Object
+ * Cache Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+class Smarty_Template_Cached extends Smarty_Template_Resource_Base
+{
+    /**
+     * Cache Is Valid
+     *
+     * @var boolean
+     */
+    public $valid = null;
+
+    /**
+     * CacheResource Handler
+     *
+     * @var Smarty_CacheResource
+     */
+    public $handler = null;
+
+    /**
+     * Template Cache Id (Smarty_Internal_Template::$cache_id)
+     *
+     * @var string
+     */
+    public $cache_id = null;
+
+    /**
+     * saved cache lifetime in seconds
+     *
+     * @var integer
+     */
+    public $cache_lifetime = 0;
+
+    /**
+     * Id for cache locking
+     *
+     * @var string
+     */
+    public $lock_id = null;
+
+    /**
+     * flag that cache is locked by this instance
+     *
+     * @var bool
+     */
+    public $is_locked = false;
+
+    /**
+     * Source Object
+     *
+     * @var Smarty_Template_Source
+     */
+    public $source = null;
+
+    /**
+     * Nocache hash codes of processed compiled templates
+     *
+     * @var array
+     */
+    public $hashes = array();
+
+    /**
+     * Flag if this is a cache resource
+     *
+     * @var bool
+     */
+    public $isCache = true;
+
+    /**
+     * create Cached Object container
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @throws \SmartyException
+     */
+    public function __construct(Smarty_Internal_Template $_template)
+    {
+        $this->compile_id = $_template->compile_id;
+        $this->cache_id = $_template->cache_id;
+        $this->source = $_template->source;
+        if (!class_exists('Smarty_CacheResource', false)) {
+            include SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
+        }
+        $this->handler = Smarty_CacheResource::load($_template->smarty);
+    }
+
+    /**
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return Smarty_Template_Cached
+     */
+    public static function load(Smarty_Internal_Template $_template)
+    {
+        $_template->cached = new Smarty_Template_Cached($_template);
+        $_template->cached->handler->populate($_template->cached, $_template);
+        // caching enabled ?
+        if (!$_template->caching || $_template->source->handler->recompiled
+        ) {
+            $_template->cached->valid = false;
+        }
+        return $_template->cached;
+    }
+
+    /**
+     * Render cache template
+     *
+     * @param \Smarty_Internal_Template $_template
+     * @param bool                      $no_output_filter
+     *
+     * @throws \Exception
+     */
+    public function render(Smarty_Internal_Template $_template, $no_output_filter = true)
+    {
+        if ($this->isCached($_template)) {
+            if ($_template->smarty->debugging) {
+                if (!isset($_template->smarty->_debug)) {
+                    $_template->smarty->_debug = new Smarty_Internal_Debug();
+                }
+                $_template->smarty->_debug->start_cache($_template);
+            }
+            if (!$this->processed) {
+                $this->process($_template);
+            }
+            $this->getRenderedTemplateCode($_template);
+            if ($_template->smarty->debugging) {
+                $_template->smarty->_debug->end_cache($_template);
+            }
+            return;
+        } else {
+            $_template->smarty->ext->_updateCache->updateCache($this, $_template, $no_output_filter);
+        }
+    }
+
+    /**
+     * Check if cache is valid, lock cache if required
+     *
+     * @param \Smarty_Internal_Template $_template
+     *
+     * @return bool flag true if cache is valid
+     */
+    public function isCached(Smarty_Internal_Template $_template)
+    {
+        if ($this->valid !== null) {
+            return $this->valid;
+        }
+        while (true) {
+            while (true) {
+                if ($this->exists === false || $_template->smarty->force_compile || $_template->smarty->force_cache) {
+                    $this->valid = false;
+                } else {
+                    $this->valid = true;
+                }
+                if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_CURRENT
+                    && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)
+                ) {
+                    // lifetime expired
+                    $this->valid = false;
+                }
+                if ($this->valid && $_template->compile_check === Smarty::COMPILECHECK_ON
+                    && $_template->source->getTimeStamp() > $this->timestamp
+                ) {
+                    $this->valid = false;
+                }
+                if ($this->valid || !$_template->smarty->cache_locking) {
+                    break;
+                }
+                if (!$this->handler->locked($_template->smarty, $this)) {
+                    $this->handler->acquireLock($_template->smarty, $this);
+                    break 2;
+                }
+                $this->handler->populate($this, $_template);
+            }
+            if ($this->valid) {
+                if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
+                    // load cache file for the following checks
+                    if ($_template->smarty->debugging) {
+                        $_template->smarty->_debug->start_cache($_template);
+                    }
+                    if ($this->handler->process($_template, $this) === false) {
+                        $this->valid = false;
+                    } else {
+                        $this->processed = true;
+                    }
+                    if ($_template->smarty->debugging) {
+                        $_template->smarty->_debug->end_cache($_template);
+                    }
+                } else {
+                    $this->is_locked = true;
+                    continue;
+                }
+            } else {
+                return $this->valid;
+            }
+            if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED
+                && $_template->cached->cache_lifetime >= 0
+                && (time() > ($_template->cached->timestamp + $_template->cached->cache_lifetime))
+            ) {
+                $this->valid = false;
+            }
+            if ($_template->smarty->cache_locking) {
+                if (!$this->valid) {
+                    $this->handler->acquireLock($_template->smarty, $this);
+                } elseif ($this->is_locked) {
+                    $this->handler->releaseLock($_template->smarty, $this);
+                }
+            }
+            return $this->valid;
+        }
+        return $this->valid;
+    }
+
+    /**
+     * Process cached template
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param bool                     $update    flag if called because cache update
+     */
+    public function process(Smarty_Internal_Template $_template, $update = false)
+    {
+        if ($this->handler->process($_template, $this, $update) === false) {
+            $this->valid = false;
+        }
+        if ($this->valid) {
+            $this->processed = true;
+        } else {
+            $this->processed = false;
+        }
+    }
+
+    /**
+     * Read cache content from handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string|false content
+     */
+    public function read(Smarty_Internal_Template $_template)
+    {
+        if (!$_template->source->handler->recompiled) {
+            return $this->handler->readCachedContent($_template);
+        }
+        return false;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_template_compiled.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_template_compiled.php
new file mode 100644
index 000000000..b78a3b600
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_template_compiled.php
@@ -0,0 +1,257 @@
+<?php
+
+/**
+ * Smarty Resource Data Object
+ * Meta Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ * @property   string $content compiled content
+ */
+class Smarty_Template_Compiled extends Smarty_Template_Resource_Base
+{
+    /**
+     * nocache hash
+     *
+     * @var string|null
+     */
+    public $nocache_hash = null;
+
+    /**
+     * get a Compiled Object of this source
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return Smarty_Template_Compiled compiled object
+     */
+    public static function load($_template)
+    {
+        $compiled = new Smarty_Template_Compiled();
+        if ($_template->source->handler->hasCompiledHandler) {
+            $_template->source->handler->populateCompiledFilepath($compiled, $_template);
+        } else {
+            $compiled->populateCompiledFilepath($_template);
+        }
+        return $compiled;
+    }
+
+    /**
+     * populate Compiled Object with compiled filepath
+     *
+     * @param Smarty_Internal_Template $_template template object
+     **/
+    public function populateCompiledFilepath(Smarty_Internal_Template $_template)
+    {
+        $source = &$_template->source;
+        $smarty = &$_template->smarty;
+        $this->filepath = $smarty->getCompileDir();
+        if (isset($_template->compile_id)) {
+            $this->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) .
+                               ($smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^');
+        }
+        // if use_sub_dirs, break file into directories
+        if ($smarty->use_sub_dirs) {
+            $this->filepath .= $source->uid[ 0 ] . $source->uid[ 1 ] . DIRECTORY_SEPARATOR . $source->uid[ 2 ] .
+                               $source->uid[ 3 ] . DIRECTORY_SEPARATOR . $source->uid[ 4 ] . $source->uid[ 5 ] .
+                               DIRECTORY_SEPARATOR;
+        }
+        $this->filepath .= $source->uid . '_';
+        if ($source->isConfig) {
+            $this->filepath .= (int)$smarty->config_read_hidden + (int)$smarty->config_booleanize * 2 +
+                               (int)$smarty->config_overwrite * 4;
+        } else {
+            $this->filepath .= (int)$smarty->merge_compiled_includes + (int)$smarty->escape_html * 2 +
+                               (($smarty->merge_compiled_includes && $source->type === 'extends') ?
+                                   (int)$smarty->extends_recursion * 4 : 0);
+        }
+        $this->filepath .= '.' . $source->type;
+        $basename = $source->handler->getBasename($source);
+        if (!empty($basename)) {
+            $this->filepath .= '.' . $basename;
+        }
+        if ($_template->caching) {
+            $this->filepath .= '.cache';
+        }
+        $this->filepath .= '.php';
+        $this->timestamp = $this->exists = is_file($this->filepath);
+        if ($this->exists) {
+            $this->timestamp = filemtime($this->filepath);
+        }
+    }
+
+    /**
+     * render compiled template code
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @return void
+     * @throws Exception
+     */
+    public function render(Smarty_Internal_Template $_template)
+    {
+        // checks if template exists
+        if (!$_template->source->exists) {
+            $type = $_template->source->isConfig ? 'config' : 'template';
+            throw new SmartyException("Unable to load {$type} '{$_template->source->type}:{$_template->source->name}'");
+        }
+        if ($_template->smarty->debugging) {
+            if (!isset($_template->smarty->_debug)) {
+                $_template->smarty->_debug = new Smarty_Internal_Debug();
+            }
+            $_template->smarty->_debug->start_render($_template);
+        }
+        if (!$this->processed) {
+            $this->process($_template);
+        }
+        if (isset($_template->cached)) {
+            $_template->cached->file_dependency =
+                array_merge($_template->cached->file_dependency, $this->file_dependency);
+        }
+        if ($_template->source->handler->uncompiled) {
+            $_template->source->handler->renderUncompiled($_template->source, $_template);
+        } else {
+            $this->getRenderedTemplateCode($_template);
+        }
+        if ($_template->caching && $this->has_nocache_code) {
+            $_template->cached->hashes[ $this->nocache_hash ] = true;
+        }
+        if ($_template->smarty->debugging) {
+            $_template->smarty->_debug->end_render($_template);
+        }
+    }
+
+    /**
+     * load compiled template or compile from source
+     *
+     * @param Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+     *
+     * @throws Exception
+     */
+    public function process(Smarty_Internal_Template $_smarty_tpl)
+    {
+        $source = &$_smarty_tpl->source;
+        $smarty = &$_smarty_tpl->smarty;
+        if ($source->handler->recompiled) {
+            $source->handler->process($_smarty_tpl);
+        } elseif (!$source->handler->uncompiled) {
+            if (!$this->exists || $smarty->force_compile
+                || ($_smarty_tpl->compile_check && $source->getTimeStamp() > $this->getTimeStamp())
+            ) {
+                $this->compileTemplateSource($_smarty_tpl);
+                $compileCheck = $_smarty_tpl->compile_check;
+                $_smarty_tpl->compile_check = Smarty::COMPILECHECK_OFF;
+                $this->loadCompiledTemplate($_smarty_tpl);
+                $_smarty_tpl->compile_check = $compileCheck;
+            } else {
+                $_smarty_tpl->mustCompile = true;
+                @include $this->filepath;
+                if ($_smarty_tpl->mustCompile) {
+                    $this->compileTemplateSource($_smarty_tpl);
+                    $compileCheck = $_smarty_tpl->compile_check;
+                    $_smarty_tpl->compile_check = Smarty::COMPILECHECK_OFF;
+                    $this->loadCompiledTemplate($_smarty_tpl);
+                    $_smarty_tpl->compile_check = $compileCheck;
+                }
+            }
+            $_smarty_tpl->_subTemplateRegister();
+            $this->processed = true;
+        }
+    }
+
+    /**
+     * compile template from source
+     *
+     * @param Smarty_Internal_Template $_template
+     *
+     * @throws Exception
+     */
+    public function compileTemplateSource(Smarty_Internal_Template $_template)
+    {
+        $this->file_dependency = array();
+        $this->includes = array();
+        $this->nocache_hash = null;
+        $this->unifunc = null;
+        // compile locking
+        if ($saved_timestamp = (!$_template->source->handler->recompiled && is_file($this->filepath))) {
+            $saved_timestamp = $this->getTimeStamp();
+            touch($this->filepath);
+        }
+        // compile locking
+        try {
+            // call compiler
+            $_template->loadCompiler();
+            $this->write($_template, $_template->compiler->compileTemplate($_template));
+        } catch (Exception $e) {
+            // restore old timestamp in case of error
+            if ($saved_timestamp && is_file($this->filepath)) {
+                touch($this->filepath, $saved_timestamp);
+            }
+            unset($_template->compiler);
+            throw $e;
+        }
+        // release compiler object to free memory
+        unset($_template->compiler);
+    }
+
+    /**
+     * Write compiled code by handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     * @param string                   $code      compiled code
+     *
+     * @return bool success
+     * @throws \SmartyException
+     */
+    public function write(Smarty_Internal_Template $_template, $code)
+    {
+        if (!$_template->source->handler->recompiled) {
+            if ($_template->smarty->ext->_writeFile->writeFile($this->filepath, $code, $_template->smarty) === true) {
+                $this->timestamp = $this->exists = is_file($this->filepath);
+                if ($this->exists) {
+                    $this->timestamp = filemtime($this->filepath);
+                    return true;
+                }
+            }
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Read compiled content from handler
+     *
+     * @param Smarty_Internal_Template $_template template object
+     *
+     * @return string content
+     */
+    public function read(Smarty_Internal_Template $_template)
+    {
+        if (!$_template->source->handler->recompiled) {
+            return file_get_contents($this->filepath);
+        }
+        return isset($this->content) ? $this->content : false;
+    }
+
+    /**
+     * Load fresh compiled template by including the PHP file
+     * HHVM requires a work around because of a PHP incompatibility
+     *
+     * @param \Smarty_Internal_Template $_smarty_tpl do not change variable name, is used by compiled template
+     */
+    private function loadCompiledTemplate(Smarty_Internal_Template $_smarty_tpl)
+    {
+        if (function_exists('opcache_invalidate')
+            && (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
+        ) {
+            opcache_invalidate($this->filepath, true);
+        } elseif (function_exists('apc_compile_file')) {
+            apc_compile_file($this->filepath);
+        }
+        if (defined('HHVM_VERSION')) {
+            eval('?>' . file_get_contents($this->filepath));
+        } else {
+            include $this->filepath;
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_template_config.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_template_config.php
new file mode 100644
index 000000000..850ae32e7
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_template_config.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Smarty Config Source Plugin
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Config Resource Data Object
+ * Meta Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Uwe Tews
+ */
+class Smarty_Template_Config extends Smarty_Template_Source
+{
+    /**
+     * array of section names, single section or null
+     *
+     * @var null|string|array
+     */
+    public $config_sections = null;
+
+    /**
+     * scope into which the config variables shall be loaded
+     *
+     * @var int
+     */
+    public $scope = 0;
+
+    /**
+     * Flag that source is a config file
+     *
+     * @var bool
+     */
+    public $isConfig = true;
+
+    /**
+     * Name of the Class to compile this resource's contents with
+     *
+     * @var string
+     */
+    public $compiler_class = 'Smarty_Internal_Config_File_Compiler';
+
+    /**
+     * Name of the Class to tokenize this resource's contents with
+     *
+     * @var string
+     */
+    public $template_lexer_class = 'Smarty_Internal_Configfilelexer';
+
+    /**
+     * Name of the Class to parse this resource's contents with
+     *
+     * @var string
+     */
+    public $template_parser_class = 'Smarty_Internal_Configfileparser';
+
+    /**
+     * initialize Source Object for given resource
+     * Either [$_template] or [$smarty, $template_resource] must be specified
+     *
+     * @param Smarty_Internal_Template $_template         template object
+     * @param Smarty                   $smarty            smarty object
+     * @param string                   $template_resource resource identifier
+     *
+     * @return Smarty_Template_Config Source Object
+     * @throws SmartyException
+     */
+    public static function load(
+        Smarty_Internal_Template $_template = null,
+        Smarty $smarty = null,
+        $template_resource = null
+    ) {
+        static $_incompatible_resources = array('extends' => true, 'php' => true);
+        if ($_template) {
+            $smarty = $_template->smarty;
+            $template_resource = $_template->template_resource;
+        }
+        if (empty($template_resource)) {
+            throw new SmartyException('Source: Missing  name');
+        }
+        // parse resource_name, load resource handler
+        list($name, $type) = Smarty_Resource::parseResourceName($template_resource, $smarty->default_config_type);
+        // make sure configs are not loaded via anything smarty can't handle
+        if (isset($_incompatible_resources[ $type ])) {
+            throw new SmartyException("Unable to use resource '{$type}' for config");
+        }
+        $source = new Smarty_Template_Config($smarty, $template_resource, $type, $name);
+        $source->handler->populate($source, $_template);
+        if (!$source->exists && isset($smarty->default_config_handler_func)) {
+            Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
+            $source->handler->populate($source, $_template);
+        }
+        return $source;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_template_resource_base.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_template_resource_base.php
new file mode 100644
index 000000000..52bfba252
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_template_resource_base.php
@@ -0,0 +1,152 @@
+<?php
+
+/**
+ * Smarty Template Resource Base Object
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+abstract class Smarty_Template_Resource_Base
+{
+    /**
+     * Compiled Filepath
+     *
+     * @var string
+     */
+    public $filepath = null;
+
+    /**
+     * Compiled Timestamp
+     *
+     * @var integer|bool
+     */
+    public $timestamp = false;
+
+    /**
+     * Compiled Existence
+     *
+     * @var boolean
+     */
+    public $exists = false;
+
+    /**
+     * Template Compile Id (Smarty_Internal_Template::$compile_id)
+     *
+     * @var string
+     */
+    public $compile_id = null;
+
+    /**
+     * Compiled Content Loaded
+     *
+     * @var boolean
+     */
+    public $processed = false;
+
+    /**
+     * unique function name for compiled template code
+     *
+     * @var string
+     */
+    public $unifunc = '';
+
+    /**
+     * flag if template does contain nocache code sections
+     *
+     * @var bool
+     */
+    public $has_nocache_code = false;
+
+    /**
+     * resource file dependency
+     *
+     * @var array
+     */
+    public $file_dependency = array();
+
+    /**
+     * Content buffer
+     *
+     * @var string
+     */
+    public $content = null;
+
+    /**
+     * Included sub templates
+     * - index name
+     * - value use count
+     *
+     * @var int[]
+     */
+    public $includes = array();
+
+    /**
+     * Flag if this is a cache resource
+     *
+     * @var bool
+     */
+    public $isCache = false;
+
+    /**
+     * Process resource
+     *
+     * @param Smarty_Internal_Template $_template template object
+     */
+    abstract public function process(Smarty_Internal_Template $_template);
+
+    /**
+     * get rendered template content by calling compiled or cached template code
+     *
+     * @param \Smarty_Internal_Template $_template
+     * @param string                    $unifunc function with template code
+     *
+     * @throws \Exception
+     */
+    public function getRenderedTemplateCode(Smarty_Internal_Template $_template, $unifunc = null)
+    {
+        $smarty = &$_template->smarty;
+        $_template->isRenderingCache = $this->isCache;
+        $level = ob_get_level();
+        try {
+            if (!isset($unifunc)) {
+                $unifunc = $this->unifunc;
+            }
+            if (empty($unifunc) || !function_exists($unifunc)) {
+                throw new SmartyException("Invalid compiled template for '{$_template->template_resource}'");
+            }
+            if ($_template->startRenderCallbacks) {
+                foreach ($_template->startRenderCallbacks as $callback) {
+                    call_user_func($callback, $_template);
+                }
+            }
+            $unifunc($_template);
+            foreach ($_template->endRenderCallbacks as $callback) {
+                call_user_func($callback, $_template);
+            }
+            $_template->isRenderingCache = false;
+        } catch (Exception $e) {
+            $_template->isRenderingCache = false;
+            while (ob_get_level() > $level) {
+                ob_end_clean();
+            }
+            if (isset($smarty->security_policy)) {
+                $smarty->security_policy->endTemplate();
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * Get compiled time stamp
+     *
+     * @return int
+     */
+    public function getTimeStamp()
+    {
+        if ($this->exists && !$this->timestamp) {
+            $this->timestamp = filemtime($this->filepath);
+        }
+        return $this->timestamp;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_template_source.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_template_source.php
new file mode 100644
index 000000000..16b47f23c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_template_source.php
@@ -0,0 +1,213 @@
+<?php
+
+/**
+ * Smarty Resource Data Object
+ * Meta Data Container for Template Files
+ *
+ * @package    Smarty
+ * @subpackage TemplateResources
+ * @author     Rodney Rehm
+ */
+class Smarty_Template_Source
+{
+    /**
+     * Unique Template ID
+     *
+     * @var string
+     */
+    public $uid = null;
+
+    /**
+     * Template Resource (Smarty_Internal_Template::$template_resource)
+     *
+     * @var string
+     */
+    public $resource = null;
+
+    /**
+     * Resource Type
+     *
+     * @var string
+     */
+    public $type = null;
+
+    /**
+     * Resource Name
+     *
+     * @var string
+     */
+    public $name = null;
+
+    /**
+     * Source Filepath
+     *
+     * @var string
+     */
+    public $filepath = null;
+
+    /**
+     * Source Timestamp
+     *
+     * @var integer
+     */
+    public $timestamp = null;
+
+    /**
+     * Source Existence
+     *
+     * @var boolean
+     */
+    public $exists = false;
+
+    /**
+     * Source File Base name
+     *
+     * @var string
+     */
+    public $basename = null;
+
+    /**
+     * The Components an extended template is made of
+     *
+     * @var \Smarty_Template_Source[]
+     */
+    public $components = null;
+
+    /**
+     * Resource Handler
+     *
+     * @var \Smarty_Resource
+     */
+    public $handler = null;
+
+    /**
+     * Smarty instance
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * Resource is source
+     *
+     * @var bool
+     */
+    public $isConfig = false;
+
+    /**
+     * Template source content eventually set by default handler
+     *
+     * @var string
+     */
+    public $content = null;
+
+    /**
+     * Name of the Class to compile this resource's contents with
+     *
+     * @var string
+     */
+    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
+
+    /**
+     * Name of the Class to tokenize this resource's contents with
+     *
+     * @var string
+     */
+    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
+
+    /**
+     * Name of the Class to parse this resource's contents with
+     *
+     * @var string
+     */
+    public $template_parser_class = 'Smarty_Internal_Templateparser';
+
+    /**
+     * create Source Object container
+     *
+     * @param Smarty $smarty   Smarty instance this source object belongs to
+     * @param string $resource full template_resource
+     * @param string $type     type of resource
+     * @param string $name     resource name
+     *
+     * @throws   \SmartyException
+     * @internal param \Smarty_Resource $handler Resource Handler this source object communicates with
+     */
+    public function __construct(Smarty $smarty, $resource, $type, $name)
+    {
+        $this->handler =
+            isset($smarty->_cache[ 'resource_handlers' ][ $type ]) ? $smarty->_cache[ 'resource_handlers' ][ $type ] :
+                Smarty_Resource::load($smarty, $type);
+        $this->smarty = $smarty;
+        $this->resource = $resource;
+        $this->type = $type;
+        $this->name = $name;
+    }
+
+    /**
+     * initialize Source Object for given resource
+     * Either [$_template] or [$smarty, $template_resource] must be specified
+     *
+     * @param Smarty_Internal_Template $_template         template object
+     * @param Smarty                   $smarty            smarty object
+     * @param string                   $template_resource resource identifier
+     *
+     * @return Smarty_Template_Source Source Object
+     * @throws SmartyException
+     */
+    public static function load(
+        Smarty_Internal_Template $_template = null,
+        Smarty $smarty = null,
+        $template_resource = null
+    ) {
+        if ($_template) {
+            $smarty = $_template->smarty;
+            $template_resource = $_template->template_resource;
+        }
+        if (empty($template_resource)) {
+            throw new SmartyException('Source: Missing  name');
+        }
+        // parse resource_name, load resource handler, identify unique resource name
+        if (preg_match('/^([A-Za-z0-9_\-]{2,})[:]([\s\S]*)$/', $template_resource, $match)) {
+            $type = $match[ 1 ];
+            $name = $match[ 2 ];
+        } else {
+            // no resource given, use default
+            // or single character before the colon is not a resource type, but part of the filepath
+            $type = $smarty->default_resource_type;
+            $name = $template_resource;
+        }
+        // create new source  object
+        $source = new Smarty_Template_Source($smarty, $template_resource, $type, $name);
+        $source->handler->populate($source, $_template);
+        if (!$source->exists && isset($_template->smarty->default_template_handler_func)) {
+            Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source);
+            $source->handler->populate($source, $_template);
+        }
+        return $source;
+    }
+
+    /**
+     * Get source time stamp
+     *
+     * @return int
+     */
+    public function getTimeStamp()
+    {
+        if (!isset($this->timestamp)) {
+            $this->handler->populateTimestamp($this);
+        }
+        return $this->timestamp;
+    }
+
+    /**
+     * Get source content
+     *
+     * @return string
+     * @throws \SmartyException
+     */
+    public function getContent()
+    {
+        return isset($this->content) ? $this->content : $this->handler->getContent($this);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_undefined_variable.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_undefined_variable.php
new file mode 100644
index 000000000..6d31a8a05
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_undefined_variable.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * class for undefined variable object
+ * This class defines an object for undefined variable handling
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+class Smarty_Undefined_Variable extends Smarty_Variable
+{
+    /**
+     * Returns null for not existing properties
+     *
+     * @param string $name
+     *
+     * @return null
+     */
+    public function __get($name)
+    {
+        return null;
+    }
+
+    /**
+     * Always returns an empty string.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return '';
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_variable.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_variable.php
new file mode 100644
index 000000000..6a534228b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smarty_variable.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * class for the Smarty variable object
+ * This class defines the Smarty variable object
+ *
+ * @package    Smarty
+ * @subpackage Template
+ */
+#[\AllowDynamicProperties]
+class Smarty_Variable
+{
+    /**
+     * template variable
+     *
+     * @var mixed
+     */
+    public $value = null;
+
+    /**
+     * if true any output of this variable will be not cached
+     *
+     * @var boolean
+     */
+    public $nocache = false;
+
+    /**
+     * create Smarty variable object
+     *
+     * @param mixed   $value   the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     */
+    public function __construct($value = null, $nocache = false)
+    {
+        $this->value = $value;
+        $this->nocache = $nocache;
+    }
+
+    /**
+     * <<magic>> String conversion
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string)$this->value;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smartycompilerexception.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smartycompilerexception.php
new file mode 100644
index 000000000..0a0a32351
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smartycompilerexception.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * Smarty compiler exception class
+ *
+ * @package Smarty
+ */
+class SmartyCompilerException extends SmartyException
+{
+    /**
+     * The constructor of the exception
+     *
+     * @param string         $message  The Exception message to throw.
+     * @param int            $code     The Exception code.
+     * @param string|null    $filename The filename where the exception is thrown.
+     * @param int|null       $line     The line number where the exception is thrown.
+     * @param Throwable|null $previous The previous exception used for the exception chaining.
+     */
+    public function __construct(
+        string $message = "",
+        int $code = 0,
+        ?string $filename = null,
+        ?int $line = null,
+        Throwable $previous = null
+    ) {
+        parent::__construct($message, $code, $previous);
+
+        // These are optional parameters, should be be overridden only when present!
+        if ($filename) {
+            $this->file = $filename;
+        }
+        if ($line) {
+            $this->line = $line;
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
+    }
+
+    /**
+     * @param int $line
+     */
+    public function setLine($line)
+    {
+        $this->line = $line;
+    }
+
+    /**
+     * The template source snippet relating to the error
+     *
+     * @type string|null
+     */
+    public $source = null;
+
+    /**
+     * The raw text of the error message
+     *
+     * @type string|null
+     */
+    public $desc = null;
+
+    /**
+     * The resource identifier or template name
+     *
+     * @type string|null
+     */
+    public $template = null;
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smartyexception.php b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smartyexception.php
new file mode 100644
index 000000000..7f7b9aa43
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/libs/sysplugins/smartyexception.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Smarty exception class
+ *
+ * @package Smarty
+ */
+class SmartyException extends Exception
+{
+    public static $escape = false;
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return ' --> Smarty: ' . (self::$escape ? htmlentities($this->message) : $this->message) . ' <-- ';
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/mkdocs.yml b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/mkdocs.yml
new file mode 100644
index 000000000..66949b809
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/mkdocs.yml
@@ -0,0 +1,125 @@
+site_name: Smarty Documentation
+theme:
+  name: material
+  palette:
+    primary: amber
+  features:
+    - content.code.copy
+    - navigation.tabs
+    - navigation.tabs.sticky
+    - navigation.instant
+    - navigation.tracking
+  icon:
+    logo: material/lightbulb-on
+  favicon: images/favicon.ico
+
+extra:
+  version:
+    provider: mike
+
+markdown_extensions:
+  - pymdownx.highlight:
+      anchor_linenums: true
+  - pymdownx.inlinehilite
+  - pymdownx.snippets
+  - pymdownx.superfences
+
+nav:
+  - Home: 'index.md'
+  - 'Getting started':
+    - Introduction: 'getting-started.md'
+    - 'Upgrading from an older version': 'upgrading.md'
+  - 'Designers':
+    - 'Basic Syntax':
+        - Introduction: 'designers/language-basic-syntax/index.md'
+        - Comments: 'designers/language-basic-syntax/language-syntax-comments.md'
+        - Variables: 'designers/language-basic-syntax/language-syntax-variables.md'
+        - Functions: 'designers/language-basic-syntax/language-syntax-functions.md'
+        - Attributes: 'designers/language-basic-syntax/language-syntax-attributes.md'
+        - Quotes: 'designers/language-basic-syntax/language-syntax-quotes.md'
+        - Math: 'designers/language-basic-syntax/language-math.md'
+        - 'Escaping Smarty parsing': 'designers/language-basic-syntax/language-escaping.md'
+    - 'Variables':
+        - 'Introduction': 'designers/language-variables/index.md'
+        - 'Assigned from PHP': 'designers/language-variables/language-assigned-variables.md'
+        - 'Variable scopes': 'designers/language-variables/language-variable-scopes.md'
+        - 'From config files': 'designers/language-variables/language-config-variables.md'
+        - '{$smarty}': 'designers/language-variables/language-variables-smarty.md'
+    - 'Modifiers':
+        - 'Introduction': 'designers/language-modifiers/index.md'
+        - 'capitalize': 'designers/language-modifiers/language-modifier-capitalize.md'
+        - 'cat': 'designers/language-modifiers/language-modifier-cat.md'
+        - 'count_characters': 'designers/language-modifiers/language-modifier-count-characters.md'
+        - 'count_paragraphs': 'designers/language-modifiers/language-modifier-count-paragraphs.md'
+        - 'count_sentences': 'designers/language-modifiers/language-modifier-count-sentences.md'
+        - 'count_words': 'designers/language-modifiers/language-modifier-count-words.md'
+        - 'date_format': 'designers/language-modifiers/language-modifier-date-format.md'
+        - 'default': 'designers/language-modifiers/language-modifier-default.md'
+        - 'escape': 'designers/language-modifiers/language-modifier-escape.md'
+        - 'from_charset': 'designers/language-modifiers/language-modifier-from-charset.md'
+        - 'indent': 'designers/language-modifiers/language-modifier-indent.md'
+        - 'lower': 'designers/language-modifiers/language-modifier-lower.md'
+        - 'nl2br': 'designers/language-modifiers/language-modifier-nl2br.md'
+        - 'regex_replace': 'designers/language-modifiers/language-modifier-regex-replace.md'
+        - 'replace': 'designers/language-modifiers/language-modifier-replace.md'
+        - 'spacify': 'designers/language-modifiers/language-modifier-spacify.md'
+        - 'string_format': 'designers/language-modifiers/language-modifier-string-format.md'
+        - 'strip': 'designers/language-modifiers/language-modifier-strip.md'
+        - 'strip_tags': 'designers/language-modifiers/language-modifier-strip-tags.md'
+        - 'to_charset': 'designers/language-modifiers/language-modifier-to-charset.md'
+        - 'truncate': 'designers/language-modifiers/language-modifier-truncate.md'
+        - 'unescape': 'designers/language-modifiers/language-modifier-unescape.md'
+        - 'upper': 'designers/language-modifiers/language-modifier-upper.md'
+        - 'wordwrap': 'designers/language-modifiers/language-modifier-wordwrap.md'
+    - 'designers/language-combining-modifiers.md'
+    - 'Builtin Functions':
+        - 'Introduction': 'designers/language-builtin-functions/index.md'
+        - '{append}': 'designers/language-builtin-functions/language-function-append.md'
+        - '{assign}': 'designers/language-builtin-functions/language-function-assign.md'
+        - '{block}': 'designers/language-builtin-functions/language-function-block.md'
+        - '{call}': 'designers/language-builtin-functions/language-function-call.md'
+        - '{capture}': 'designers/language-builtin-functions/language-function-capture.md'
+        - '{config_load}': 'designers/language-builtin-functions/language-function-config-load.md'
+        - '{debug}': 'designers/language-builtin-functions/language-function-debug.md'
+        - '{extends}': 'designers/language-builtin-functions/language-function-extends.md'
+        - '{for}': 'designers/language-builtin-functions/language-function-for.md'
+        - '{foreach}': 'designers/language-builtin-functions/language-function-foreach.md'
+        - '{function}': 'designers/language-builtin-functions/language-function-function.md'
+        - '{if},{elseif},{else}': 'designers/language-builtin-functions/language-function-if.md'
+        - '{include}': 'designers/language-builtin-functions/language-function-include.md'
+        - '{insert}': 'designers/language-builtin-functions/language-function-insert.md'
+        - '{ldelim},{rdelim}': 'designers/language-builtin-functions/language-function-ldelim.md'
+        - '{literal}': 'designers/language-builtin-functions/language-function-literal.md'
+        - '{nocache}': 'designers/language-builtin-functions/language-function-nocache.md'
+        - '{section}': 'designers/language-builtin-functions/language-function-section.md'
+        - '{setfilter}': 'designers/language-builtin-functions/language-function-setfilter.md'
+        - '{strip}': 'designers/language-builtin-functions/language-function-strip.md'
+        - '{while}': 'designers/language-builtin-functions/language-function-while.md'
+    - 'Custom Functions':
+        - 'Introduction': 'designers/language-custom-functions/index.md'
+        - '{counter}': 'designers/language-custom-functions/language-function-counter.md'
+        - '{cycle}': 'designers/language-custom-functions/language-function-cycle.md'
+        - '{debug}': 'designers/language-custom-functions/language-function-debug.md'
+        - '{eval}': 'designers/language-custom-functions/language-function-eval.md'
+        - '{fetch}': 'designers/language-custom-functions/language-function-fetch.md'
+        - '{html_checkboxes}': 'designers/language-custom-functions/language-function-html-checkboxes.md'
+        - '{html_image}': 'designers/language-custom-functions/language-function-html-image.md'
+        - '{html_options}': 'designers/language-custom-functions/language-function-html-options.md'
+        - '{html_radios}': 'designers/language-custom-functions/language-function-html-radios.md'
+        - '{html_select_date}': 'designers/language-custom-functions/language-function-html-select-date.md'
+        - '{html_select_time}': 'designers/language-custom-functions/language-function-html-select-time.md'
+        - '{html_table}': 'designers/language-custom-functions/language-function-html-table.md'
+        - '{mailto}': 'designers/language-custom-functions/language-function-mailto.md'
+        - '{math}': 'designers/language-custom-functions/language-function-math.md'
+        - '{textformat}': 'designers/language-custom-functions/language-function-textformat.md'
+    - 'designers/config-files.md'
+    - 'designers/chapter-debugging-console.md'
+  - 'Programmers':
+      - 'programmers/charset.md'
+      - 'programmers/smarty-constants.md'
+      - 'programmers/api-variables.md'
+      - 'programmers/api-functions.md'
+      - 'programmers/caching.md'
+      - 'programmers/resources.md'
+      - 'programmers/advanced-features.md'
+      - 'programmers/plugins.md'
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/run-tests-for-all-php-versions.sh b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/run-tests-for-all-php-versions.sh
new file mode 100755
index 000000000..23541b519
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/run-tests-for-all-php-versions.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Runs tests for all supported PHP versions
+# Usage examples:
+# - ./run-tests-for-all-php-versions.sh --group 20221124
+# - ./run-tests-for-all-php-versions.sh --exclude-group slow
+
+COMPOSE_CMD="mutagen-compose"
+
+$COMPOSE_CMD run --rm php71 ./run-tests.sh $@ && \
+$COMPOSE_CMD run --rm php72 ./run-tests.sh $@ && \
+$COMPOSE_CMD run --rm php73 ./run-tests.sh $@ && \
+$COMPOSE_CMD run --rm php74 ./run-tests.sh $@ && \
+$COMPOSE_CMD run --rm php80 ./run-tests.sh $@ && \
+$COMPOSE_CMD run --rm php81 ./run-tests.sh $@ && \
+$COMPOSE_CMD run --rm php82 ./run-tests.sh $@ && \
+$COMPOSE_CMD run --rm php83 ./run-tests.sh $@
diff --git a/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/run-tests.sh b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/run-tests.sh
new file mode 100755
index 000000000..1990a07f1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty4/vendor/smarty/smarty/run-tests.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Runs composer update, echoes php version and runs PHPUnit
+# Usage examples:
+# - ./run-tests.sh --group 20221124
+# - ./run-tests.sh --exclude-group slow
+
+composer update --quiet
+#php -r 'echo "\nPHP version " . phpversion() . ". ";'
+php ./vendor/phpunit/phpunit/phpunit $@
diff --git a/www/modules/civicrm/packages/smarty5/Smarty.php b/www/modules/civicrm/packages/smarty5/Smarty.php
new file mode 100644
index 000000000..a35ad58f2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/Smarty.php
@@ -0,0 +1,79 @@
+<?php
+
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
+class Smarty {
+
+  private \Smarty\Smarty $smarty;
+
+  private $registeredPluginDirectories = [];
+
+  public function __construct() {
+    $this->smarty = new Smarty\Smarty();
+  }
+
+  public function __call($name, $arguments) {
+    return call_user_func_array([$this->smarty, $name], $arguments);
+  }
+
+  public function __get($name) {
+    // Quick form accesses these in HTML_QuickForm_Renderer_ArraySmarty->_renderRequired()
+    if ($name === 'left_delimiter') {
+      return $this->smarty->getLeftDelimiter();
+    }
+    if ($name === 'right_delimiter') {
+      return $this->smarty->getRightDelimiter();
+    }
+    return $this->smarty->$name;
+  }
+
+  public function __set($name, $value) {
+    $this->smarty->$name = $value;
+  }
+
+  /**
+   * @throws \Smarty\Exception
+   */
+  public function loadFilter($type, $name) {
+    if ($type === 'pre') {
+      $this->smarty->registerFilter($type, 'smarty_prefilter_' . $name);
+    }
+    else {
+      $this->smarty->loadFilter($type, $name);
+    }
+  }
+
+  /**
+   * @param null|string|array $pluginsDirectory
+   *
+   * @return void
+   * @throws \Smarty\Exception
+   */
+  public function addPluginsDir($pluginsDirectories): void {
+    foreach ((array) $pluginsDirectories as $pluginsDirectory) {
+      if (in_array($pluginsDirectory, $this->registeredPluginDirectories, TRUE)) {
+        continue;
+      }
+      $files = scandir($pluginsDirectory);
+      foreach ($files as $file) {
+        if (str_starts_with($file, '.')) {
+          continue;
+        }
+        $registeredPlugins = $this->smarty->registered_plugins;
+        if (CRM_Utils_File::isIncludable($pluginsDirectory . DIRECTORY_SEPARATOR . $file)) {
+          require_once $pluginsDirectory . DIRECTORY_SEPARATOR . $file;
+          $parts = explode('.', $file);
+          if (!empty($registeredPlugins[$parts[0]][$parts[1]])) {
+            continue;
+          }
+          $this->smarty->registerPlugin($parts[0], $parts[1], 'smarty_' . $parts[0] . '_' . $parts[1]);
+        }
+      }
+      $this->registeredPluginDirectories[] = $pluginsDirectory;
+    }
+  }
+
+  public function getVersion(): ?int {
+    return 5;
+  }
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/composer.json b/www/modules/civicrm/packages/smarty5/composer.json
new file mode 100644
index 000000000..96a6b91c5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "smarty/smarty": "^5"
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/composer.lock b/www/modules/civicrm/packages/smarty5/composer.lock
new file mode 100644
index 000000000..9f7d6a08c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/composer.lock
@@ -0,0 +1,169 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "a4cb83c948020f1527c8984f1c481914",
+    "packages": [
+        {
+            "name": "smarty/smarty",
+            "version": "v5.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/smarty-php/smarty.git",
+                "reference": "cdee97d3f1dff597be8583625adb42710da2c885"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/cdee97d3f1dff597be8583625adb42710da2c885",
+                "reference": "cdee97d3f1dff597be8583625adb42710da2c885",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0",
+                "symfony/polyfill-mbstring": "^1.27"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5 || ^7.5",
+                "smarty/smarty-lexer": "^4.0.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "Smarty\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Monte Ohrt",
+                    "email": "monte@ohrt.com"
+                },
+                {
+                    "name": "Uwe Tews",
+                    "email": "uwe.tews@googlemail.com"
+                },
+                {
+                    "name": "Rodney Rehm",
+                    "email": "rodney.rehm@medialize.de"
+                },
+                {
+                    "name": "Simon Wisselink",
+                    "homepage": "https://www.iwink.nl/"
+                }
+            ],
+            "description": "Smarty - the compiling PHP template engine",
+            "homepage": "https://smarty-php.github.io/smarty/",
+            "keywords": [
+                "templating"
+            ],
+            "support": {
+                "forum": "https://github.com/smarty-php/smarty/discussions",
+                "issues": "https://github.com/smarty-php/smarty/issues",
+                "source": "https://github.com/smarty-php/smarty/tree/v5.2.0"
+            },
+            "time": "2024-05-28T21:45:16+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.29.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "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 polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+            },
+            "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": "2024-01-29T20:11:03+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": [],
+    "plugin-api-version": "2.3.0"
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/autoload.php b/www/modules/civicrm/packages/smarty5/vendor/autoload.php
new file mode 100644
index 000000000..2b6cc3e5a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/autoload.php
@@ -0,0 +1,12 @@
+<?php
+
+// autoload.php @generated by Composer
+
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInit5806e57ddeefa9cb5aaaeceac0cec391::getLoader();
diff --git a/www/modules/civicrm/packages/smarty5/vendor/composer/ClassLoader.php b/www/modules/civicrm/packages/smarty5/vendor/composer/ClassLoader.php
new file mode 100644
index 000000000..afef3fa2a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/composer/ClassLoader.php
@@ -0,0 +1,572 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
+ *
+ *     $loader = new \Composer\Autoload\ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (eg. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
+ */
+class ClassLoader
+{
+    /** @var ?string */
+    private $vendorDir;
+
+    // PSR-4
+    /**
+     * @var array[]
+     * @psalm-var array<string, array<string, int>>
+     */
+    private $prefixLengthsPsr4 = array();
+    /**
+     * @var array[]
+     * @psalm-var array<string, array<int, string>>
+     */
+    private $prefixDirsPsr4 = array();
+    /**
+     * @var array[]
+     * @psalm-var array<string, string>
+     */
+    private $fallbackDirsPsr4 = array();
+
+    // PSR-0
+    /**
+     * @var array[]
+     * @psalm-var array<string, array<string, string[]>>
+     */
+    private $prefixesPsr0 = array();
+    /**
+     * @var array[]
+     * @psalm-var array<string, string>
+     */
+    private $fallbackDirsPsr0 = array();
+
+    /** @var bool */
+    private $useIncludePath = false;
+
+    /**
+     * @var string[]
+     * @psalm-var array<string, string>
+     */
+    private $classMap = array();
+
+    /** @var bool */
+    private $classMapAuthoritative = false;
+
+    /**
+     * @var bool[]
+     * @psalm-var array<string, bool>
+     */
+    private $missingClasses = array();
+
+    /** @var ?string */
+    private $apcuPrefix;
+
+    /**
+     * @var self[]
+     */
+    private static $registeredLoaders = array();
+
+    /**
+     * @param ?string $vendorDir
+     */
+    public function __construct($vendorDir = null)
+    {
+        $this->vendorDir = $vendorDir;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getPrefixes()
+    {
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
+        }
+
+        return array();
+    }
+
+    /**
+     * @return array[]
+     * @psalm-return array<string, array<int, string>>
+     */
+    public function getPrefixesPsr4()
+    {
+        return $this->prefixDirsPsr4;
+    }
+
+    /**
+     * @return array[]
+     * @psalm-return array<string, string>
+     */
+    public function getFallbackDirs()
+    {
+        return $this->fallbackDirsPsr0;
+    }
+
+    /**
+     * @return array[]
+     * @psalm-return array<string, string>
+     */
+    public function getFallbackDirsPsr4()
+    {
+        return $this->fallbackDirsPsr4;
+    }
+
+    /**
+     * @return string[] Array of classname => path
+     * @psalm-return array<string, string>
+     */
+    public function getClassMap()
+    {
+        return $this->classMap;
+    }
+
+    /**
+     * @param string[] $classMap Class to filename map
+     * @psalm-param array<string, string> $classMap
+     *
+     * @return void
+     */
+    public function addClassMap(array $classMap)
+    {
+        if ($this->classMap) {
+            $this->classMap = array_merge($this->classMap, $classMap);
+        } else {
+            $this->classMap = $classMap;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix, either
+     * appending or prepending to the ones previously set for this prefix.
+     *
+     * @param string          $prefix  The prefix
+     * @param string[]|string $paths   The PSR-0 root directories
+     * @param bool            $prepend Whether to prepend the directories
+     *
+     * @return void
+     */
+    public function add($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            if ($prepend) {
+                $this->fallbackDirsPsr0 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr0
+                );
+            } else {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $this->fallbackDirsPsr0,
+                    (array) $paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+            return;
+        }
+        if ($prepend) {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixesPsr0[$first][$prefix]
+            );
+        } else {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $this->prefixesPsr0[$first][$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace, either
+     * appending or prepending to the ones previously set for this namespace.
+     *
+     * @param string          $prefix  The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths   The PSR-4 base directories
+     * @param bool            $prepend Whether to prepend the directories
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return void
+     */
+    public function addPsr4($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                $this->fallbackDirsPsr4 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr4
+                );
+            } else {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $this->fallbackDirsPsr4,
+                    (array) $paths
+                );
+            }
+        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $this->prefixDirsPsr4[$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix,
+     * replacing any others previously set for this prefix.
+     *
+     * @param string          $prefix The prefix
+     * @param string[]|string $paths  The PSR-0 base directories
+     *
+     * @return void
+     */
+    public function set($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr0 = (array) $paths;
+        } else {
+            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace,
+     * replacing any others previously set for this namespace.
+     *
+     * @param string          $prefix The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths  The PSR-4 base directories
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return void
+     */
+    public function setPsr4($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr4 = (array) $paths;
+        } else {
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Turns on searching the include path for class files.
+     *
+     * @param bool $useIncludePath
+     *
+     * @return void
+     */
+    public function setUseIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return bool
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     *
+     * @return void
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     *
+     * @return void
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not
+     *
+     * @return void
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            return;
+        }
+
+        if ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+            self::$registeredLoaders[$this->vendorDir] = $this;
+        }
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     *
+     * @return void
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+        }
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param  string    $class The name of the class
+     * @return true|null True if loaded, null otherwise
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            includeFile($file);
+
+            return true;
+        }
+
+        return null;
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|false The path if found, false otherwise
+     */
+    public function findFile($class)
+    {
+        // class map lookup
+        if (isset($this->classMap[$class])) {
+            return $this->classMap[$class];
+        }
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+            return false;
+        }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
+
+        $file = $this->findFileWithExtension($class, '.php');
+
+        // Search for Hack files if we are running on HHVM
+        if (false === $file && defined('HHVM_VERSION')) {
+            $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
+        if (false === $file) {
+            // Remember that this class does not exist.
+            $this->missingClasses[$class] = true;
+        }
+
+        return $file;
+    }
+
+    /**
+     * Returns the currently registered loaders indexed by their corresponding vendor directories.
+     *
+     * @return self[]
+     */
+    public static function getRegisteredLoaders()
+    {
+        return self::$registeredLoaders;
+    }
+
+    /**
+     * @param  string       $class
+     * @param  string       $ext
+     * @return string|false
+     */
+    private function findFileWithExtension($class, $ext)
+    {
+        // PSR-4 lookup
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+        $first = $class[0];
+        if (isset($this->prefixLengthsPsr4[$first])) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath . '\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        if (file_exists($file = $dir . $pathEnd)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-4 fallback dirs
+        foreach ($this->fallbackDirsPsr4 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 lookup
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+        } else {
+            // PEAR-like class name
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+        }
+
+        if (isset($this->prefixesPsr0[$first])) {
+            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($dirs as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-0 fallback dirs
+        foreach ($this->fallbackDirsPsr0 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 include paths.
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+            return $file;
+        }
+
+        return false;
+    }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ *
+ * @param  string $file
+ * @return void
+ * @private
+ */
+function includeFile($file)
+{
+    include $file;
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/composer/InstalledVersions.php b/www/modules/civicrm/packages/smarty5/vendor/composer/InstalledVersions.php
new file mode 100644
index 000000000..c6b54af7b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/composer/InstalledVersions.php
@@ -0,0 +1,352 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer;
+
+use Composer\Autoload\ClassLoader;
+use Composer\Semver\VersionParser;
+
+/**
+ * This class is copied in every Composer installed project and available to all
+ *
+ * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
+ *
+ * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
+ */
+class InstalledVersions
+{
+    /**
+     * @var mixed[]|null
+     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
+     */
+    private static $installed;
+
+    /**
+     * @var bool|null
+     */
+    private static $canGetVendors;
+
+    /**
+     * @var array[]
+     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    private static $installedByVendor = array();
+
+    /**
+     * Returns a list of all package names which are present, either by being installed, replaced or provided
+     *
+     * @return string[]
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackages()
+    {
+        $packages = array();
+        foreach (self::getInstalled() as $installed) {
+            $packages[] = array_keys($installed['versions']);
+        }
+
+        if (1 === \count($packages)) {
+            return $packages[0];
+        }
+
+        return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
+    }
+
+    /**
+     * Returns a list of all package names with a specific type e.g. 'library'
+     *
+     * @param  string   $type
+     * @return string[]
+     * @psalm-return list<string>
+     */
+    public static function getInstalledPackagesByType($type)
+    {
+        $packagesByType = array();
+
+        foreach (self::getInstalled() as $installed) {
+            foreach ($installed['versions'] as $name => $package) {
+                if (isset($package['type']) && $package['type'] === $type) {
+                    $packagesByType[] = $name;
+                }
+            }
+        }
+
+        return $packagesByType;
+    }
+
+    /**
+     * Checks whether the given package is installed
+     *
+     * This also returns true if the package name is provided or replaced by another package
+     *
+     * @param  string $packageName
+     * @param  bool   $includeDevRequirements
+     * @return bool
+     */
+    public static function isInstalled($packageName, $includeDevRequirements = true)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (isset($installed['versions'][$packageName])) {
+                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks whether the given package satisfies a version constraint
+     *
+     * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call:
+     *
+     *   Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3')
+     *
+     * @param  VersionParser $parser      Install composer/semver to have access to this class and functionality
+     * @param  string        $packageName
+     * @param  string|null   $constraint  A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package
+     * @return bool
+     */
+    public static function satisfies(VersionParser $parser, $packageName, $constraint)
+    {
+        $constraint = $parser->parseConstraints($constraint);
+        $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
+
+        return $provided->matches($constraint);
+    }
+
+    /**
+     * Returns a version constraint representing all the range(s) which are installed for a given package
+     *
+     * It is easier to use this via isInstalled() with the $constraint argument if you need to check
+     * whether a given version of a package is installed, and not just whether it exists
+     *
+     * @param  string $packageName
+     * @return string Version constraint usable with composer/semver
+     */
+    public static function getVersionRanges($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            $ranges = array();
+            if (isset($installed['versions'][$packageName]['pretty_version'])) {
+                $ranges[] = $installed['versions'][$packageName]['pretty_version'];
+            }
+            if (array_key_exists('aliases', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
+            }
+            if (array_key_exists('replaced', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
+            }
+            if (array_key_exists('provided', $installed['versions'][$packageName])) {
+                $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
+            }
+
+            return implode(' || ', $ranges);
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present
+     */
+    public static function getPrettyVersion($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['pretty_version'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['pretty_version'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference
+     */
+    public static function getReference($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            if (!isset($installed['versions'][$packageName]['reference'])) {
+                return null;
+            }
+
+            return $installed['versions'][$packageName]['reference'];
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @param  string      $packageName
+     * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path.
+     */
+    public static function getInstallPath($packageName)
+    {
+        foreach (self::getInstalled() as $installed) {
+            if (!isset($installed['versions'][$packageName])) {
+                continue;
+            }
+
+            return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null;
+        }
+
+        throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+    }
+
+    /**
+     * @return array
+     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
+     */
+    public static function getRootPackage()
+    {
+        $installed = self::getInstalled();
+
+        return $installed[0]['root'];
+    }
+
+    /**
+     * Returns the raw installed.php data for custom implementations
+     *
+     * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
+     * @return array[]
+     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
+     */
+    public static function getRawData()
+    {
+        @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                self::$installed = include __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
+        }
+
+        return self::$installed;
+    }
+
+    /**
+     * Returns the raw data of all installed.php which are currently loaded for custom implementations
+     *
+     * @return array[]
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    public static function getAllRawData()
+    {
+        return self::getInstalled();
+    }
+
+    /**
+     * Lets you reload the static array from another file
+     *
+     * This is only useful for complex integrations in which a project needs to use
+     * this class but then also needs to execute another project's autoloader in process,
+     * and wants to ensure both projects have access to their version of installed.php.
+     *
+     * A typical case would be PHPUnit, where it would need to make sure it reads all
+     * the data it needs from this class, then call reload() with
+     * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure
+     * the project in which it runs can then also use this class safely, without
+     * interference between PHPUnit's dependencies and the project's dependencies.
+     *
+     * @param  array[] $data A vendor/composer/installed.php data set
+     * @return void
+     *
+     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
+     */
+    public static function reload($data)
+    {
+        self::$installed = $data;
+        self::$installedByVendor = array();
+    }
+
+    /**
+     * @return array[]
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
+    private static function getInstalled()
+    {
+        if (null === self::$canGetVendors) {
+            self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
+        }
+
+        $installed = array();
+
+        if (self::$canGetVendors) {
+            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                if (isset(self::$installedByVendor[$vendorDir])) {
+                    $installed[] = self::$installedByVendor[$vendorDir];
+                } elseif (is_file($vendorDir.'/composer/installed.php')) {
+                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
+                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $installed[count($installed) - 1];
+                    }
+                }
+            }
+        }
+
+        if (null === self::$installed) {
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                self::$installed = require __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
+        }
+        $installed[] = self::$installed;
+
+        return $installed;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/composer/LICENSE b/www/modules/civicrm/packages/smarty5/vendor/composer/LICENSE
new file mode 100644
index 000000000..f27399a04
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/composer/LICENSE
@@ -0,0 +1,21 @@
+
+Copyright (c) Nils Adermann, Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_classmap.php b/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_classmap.php
new file mode 100644
index 000000000..0fb0a2c19
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_classmap.php
@@ -0,0 +1,10 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
+);
diff --git a/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_files.php b/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_files.php
new file mode 100644
index 000000000..cc0e3f7b9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_files.php
@@ -0,0 +1,11 @@
+<?php
+
+// autoload_files.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
+    'c15d4a1253e33e055d05e547c61dcb71' => $vendorDir . '/smarty/smarty/src/functions.php',
+);
diff --git a/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_namespaces.php b/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_namespaces.php
new file mode 100644
index 000000000..15a2ff3ad
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_namespaces.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_psr4.php b/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_psr4.php
new file mode 100644
index 000000000..f6267424e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_psr4.php
@@ -0,0 +1,11 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(__DIR__);
+$baseDir = dirname($vendorDir);
+
+return array(
+    'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
+    'Smarty\\' => array($vendorDir . '/smarty/smarty/src'),
+);
diff --git a/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_real.php b/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_real.php
new file mode 100644
index 000000000..a9824d2ac
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_real.php
@@ -0,0 +1,57 @@
+<?php
+
+// autoload_real.php @generated by Composer
+
+class ComposerAutoloaderInit5806e57ddeefa9cb5aaaeceac0cec391
+{
+    private static $loader;
+
+    public static function loadClassLoader($class)
+    {
+        if ('Composer\Autoload\ClassLoader' === $class) {
+            require __DIR__ . '/ClassLoader.php';
+        }
+    }
+
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
+    public static function getLoader()
+    {
+        if (null !== self::$loader) {
+            return self::$loader;
+        }
+
+        require __DIR__ . '/platform_check.php';
+
+        spl_autoload_register(array('ComposerAutoloaderInit5806e57ddeefa9cb5aaaeceac0cec391', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
+        spl_autoload_unregister(array('ComposerAutoloaderInit5806e57ddeefa9cb5aaaeceac0cec391', 'loadClassLoader'));
+
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInit5806e57ddeefa9cb5aaaeceac0cec391::getInitializer($loader));
+
+        $loader->register(true);
+
+        $includeFiles = \Composer\Autoload\ComposerStaticInit5806e57ddeefa9cb5aaaeceac0cec391::$files;
+        foreach ($includeFiles as $fileIdentifier => $file) {
+            composerRequire5806e57ddeefa9cb5aaaeceac0cec391($fileIdentifier, $file);
+        }
+
+        return $loader;
+    }
+}
+
+/**
+ * @param string $fileIdentifier
+ * @param string $file
+ * @return void
+ */
+function composerRequire5806e57ddeefa9cb5aaaeceac0cec391($fileIdentifier, $file)
+{
+    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+
+        require $file;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_static.php b/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_static.php
new file mode 100644
index 000000000..668db201b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/composer/autoload_static.php
@@ -0,0 +1,46 @@
+<?php
+
+// autoload_static.php @generated by Composer
+
+namespace Composer\Autoload;
+
+class ComposerStaticInit5806e57ddeefa9cb5aaaeceac0cec391
+{
+    public static $files = array (
+        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
+        'c15d4a1253e33e055d05e547c61dcb71' => __DIR__ . '/..' . '/smarty/smarty/src/functions.php',
+    );
+
+    public static $prefixLengthsPsr4 = array (
+        'S' => 
+        array (
+            'Symfony\\Polyfill\\Mbstring\\' => 26,
+            'Smarty\\' => 7,
+        ),
+    );
+
+    public static $prefixDirsPsr4 = array (
+        'Symfony\\Polyfill\\Mbstring\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring',
+        ),
+        'Smarty\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/smarty/smarty/src',
+        ),
+    );
+
+    public static $classMap = array (
+        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
+    );
+
+    public static function getInitializer(ClassLoader $loader)
+    {
+        return \Closure::bind(function () use ($loader) {
+            $loader->prefixLengthsPsr4 = ComposerStaticInit5806e57ddeefa9cb5aaaeceac0cec391::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit5806e57ddeefa9cb5aaaeceac0cec391::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit5806e57ddeefa9cb5aaaeceac0cec391::$classMap;
+
+        }, null, ClassLoader::class);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/composer/installed.json b/www/modules/civicrm/packages/smarty5/vendor/composer/installed.json
new file mode 100644
index 000000000..56cb4d328
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/composer/installed.json
@@ -0,0 +1,162 @@
+{
+    "packages": [
+        {
+            "name": "smarty/smarty",
+            "version": "v5.2.0",
+            "version_normalized": "5.2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/smarty-php/smarty.git",
+                "reference": "cdee97d3f1dff597be8583625adb42710da2c885"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/cdee97d3f1dff597be8583625adb42710da2c885",
+                "reference": "cdee97d3f1dff597be8583625adb42710da2c885",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0",
+                "symfony/polyfill-mbstring": "^1.27"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5 || ^7.5",
+                "smarty/smarty-lexer": "^4.0.2"
+            },
+            "time": "2024-05-28T21:45:16+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "Smarty\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Monte Ohrt",
+                    "email": "monte@ohrt.com"
+                },
+                {
+                    "name": "Uwe Tews",
+                    "email": "uwe.tews@googlemail.com"
+                },
+                {
+                    "name": "Rodney Rehm",
+                    "email": "rodney.rehm@medialize.de"
+                },
+                {
+                    "name": "Simon Wisselink",
+                    "homepage": "https://www.iwink.nl/"
+                }
+            ],
+            "description": "Smarty - the compiling PHP template engine",
+            "homepage": "https://smarty-php.github.io/smarty/",
+            "keywords": [
+                "templating"
+            ],
+            "support": {
+                "forum": "https://github.com/smarty-php/smarty/discussions",
+                "issues": "https://github.com/smarty-php/smarty/issues",
+                "source": "https://github.com/smarty-php/smarty/tree/v5.2.0"
+            },
+            "install-path": "../smarty/smarty"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.29.0",
+            "version_normalized": "1.29.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "time": "2024-01-29T20:11:03+00:00",
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "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 polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+            },
+            "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"
+                }
+            ],
+            "install-path": "../symfony/polyfill-mbstring"
+        }
+    ],
+    "dev": true,
+    "dev-package-names": []
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/composer/installed.php b/www/modules/civicrm/packages/smarty5/vendor/composer/installed.php
new file mode 100644
index 000000000..0f3523f38
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/composer/installed.php
@@ -0,0 +1,41 @@
+<?php return array(
+    'root' => array(
+        'name' => '__root__',
+        'pretty_version' => 'dev-master',
+        'version' => 'dev-master',
+        'reference' => 'bfa3c101f9cdda54c10fa607846ea1bafe388fce',
+        'type' => 'library',
+        'install_path' => __DIR__ . '/../../',
+        'aliases' => array(),
+        'dev' => true,
+    ),
+    'versions' => array(
+        '__root__' => array(
+            'pretty_version' => 'dev-master',
+            'version' => 'dev-master',
+            'reference' => 'bfa3c101f9cdda54c10fa607846ea1bafe388fce',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../../',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'smarty/smarty' => array(
+            'pretty_version' => 'v5.2.0',
+            'version' => '5.2.0.0',
+            'reference' => 'cdee97d3f1dff597be8583625adb42710da2c885',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../smarty/smarty',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'symfony/polyfill-mbstring' => array(
+            'pretty_version' => 'v1.29.0',
+            'version' => '1.29.0.0',
+            'reference' => '9773676c8a1bb1f8d4340a62efe641cf76eda7ec',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+    ),
+);
diff --git a/www/modules/civicrm/packages/smarty5/vendor/composer/platform_check.php b/www/modules/civicrm/packages/smarty5/vendor/composer/platform_check.php
new file mode 100644
index 000000000..589e9e770
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/composer/platform_check.php
@@ -0,0 +1,26 @@
+<?php
+
+// platform_check.php @generated by Composer
+
+$issues = array();
+
+if (!(PHP_VERSION_ID >= 70200)) {
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.';
+}
+
+if ($issues) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
+        } elseif (!headers_sent()) {
+            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
+        }
+    }
+    trigger_error(
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
+        E_USER_ERROR
+    );
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/CHANGELOG.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/CHANGELOG.md
new file mode 100644
index 000000000..f359cec2c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/CHANGELOG.md
@@ -0,0 +1,3713 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [5.2.0] - 2024-05-28
+- Fixed a code injection vulnerability in extends-tag. This addresses CVE-2024-35226.
+- Added `$smarty->setCacheModifiedCheck()` setter for cache_modified_check
+- Added a PSR-4 loading script to allow Smarty to be used without Composer [#1017](https://github.com/smarty-php/smarty/pull/1017)
+
+
+## [5.1.0] - 2024-04-22
+- Prevent deprecation notices during compilation in PHP8.3 [#996](https://github.com/smarty-php/smarty/issues/996)
+- Fix that getTemplateVars would return an array of objects instead of the assigned variables values [#994](https://github.com/smarty-php/smarty/issues/994)
+- Fix Smarty::assign() not returning $this when called with an array as first parameter [#972](https://github.com/smarty-php/smarty/pull/972)
+- Documented support for `{if $element is in $array}` syntax [#937](https://github.com/smarty-php/smarty/issues/937)
+- Added support for `{if $element is not in $array}` syntax [#937](https://github.com/smarty-php/smarty/issues/937)
+- Using stream variables in templates now throws a deprecation notice [#933](https://github.com/smarty-php/smarty/pull/933)
+- Internal compiler classes always return a string (the internal has_code flag has been removed for simplicity) [#918](https://github.com/smarty-php/smarty/pull/918)
+- Fix invalid classnames in Runtime code for foreach [#1000](https://github.com/smarty-php/smarty/issues/1000)
+
+
+## [5.0.1] - 2024-03-27
+- Fix error in Smarty\Smarty::compileAllTemplates() by including missing FilesystemIterator class [#966](https://github.com/smarty-php/smarty/issues/966)  
+
+
+## [5.0.0] - 2024-03-25
+- Fixed that scoped variables would overwrite parent scope [#952](https://github.com/smarty-php/smarty/issues/952)
+- Removed publicly accessible `$tpl->_var_stack` variable
+
+
+### Fixed
+- Too many shorthand attributes error when using a modifier as a function with more than 3 parameters in an expression [#949](https://github.com/smarty-php/smarty/issues/949)
+
+### Removed
+- Dropped support for undocumented `{time()}` added in v5.0.0 since we already have the documented `{$smarty.now}`
+
+## [5.0.0-rc3] - 2024-02-26
+
+### Added
+- PHP8.3 support [#925](https://github.com/smarty-php/smarty/issues/925)
+- Backlink to GitHub in docs
+- Explain how to do escaping and set-up auto-escaping in docs [#865](https://github.com/smarty-php/smarty/issues/865)
+- Link to variable scope page in the documentation for the assign tag [#878](https://github.com/smarty-php/smarty/issues/878)
+- Add support for implode, substr and json_encode as modifiers/functions in templates [#939](https://github.com/smarty-php/smarty/issues/939)
+- Add template path to CompilerException to enable rich debug features [#935](https://github.com/smarty-php/smarty/issues/935)
+
+### Fixed
+- The {debug} tag was broken in v5 [#922](https://github.com/smarty-php/smarty/issues/922)
+- Documentation on `{if $x is even by $y}` syntax
+- Fix incorrect compilation of expressions when escape_html=true [#930](https://github.com/smarty-php/smarty/pull/930)
+
+## [5.0.0-rc2] - 2023-11-11
+
+### Fixed
+- Registered output filters wouldn't run [#899](https://github.com/smarty-php/smarty/issues/899)
+- Use of negative numbers in {math} equations [#895](https://github.com/smarty-php/smarty/issues/895)
+- Do not auto-html-escape custom function results [#906](https://github.com/smarty-php/smarty/issues/906)
+- Fix case-sensitive tag names [#907](https://github.com/smarty-php/smarty/issues/907)
+
+### Removed
+- Removed `$smarty->registered_filters` array
+
+## [5.0.0-rc1] - 2023-08-08
+
+### Added
+- Added support for PHP8.2
+- Added a new way to extend Smarty functionality using `Smarty::addExtension()` or `Smarty::setExtensions()`. Please see the docs for more information.
+- Custom tags can accept positional parameters, so you can write a block compiler that support this: `{trans "Jack" "dull boy"}All work and no play makes %s a %s.{/trans}` [#164](https://github.com/smarty-php/smarty/issues/164)
+- Full support for ternary operator: `{$test ? $a : $b}` and `{$var ?: $value_if_falsy}` [#881](https://github.com/smarty-php/smarty/issues/881)
+- Full support for null coalescing operator: `{$var ?? $value_if_null}` [#882](https://github.com/smarty-php/smarty/issues/882)
+
+### Changed
+- All Smarty code is now in the \Smarty namespace. For simple use-cases, you only need to add
+  `use \Smarty\Smarty;` to your script and everything will work. If you extend Smarty or use
+  Smarty plug-ins, please review your code to see if they assume specific class or method names.
+  E.g.: `Smarty_Internal_Template` is now `\Smarty\Template\`, `SmartyException` is now `\Smarty\Exception`.
+- Template variable scope bubbling has been simplified and made more consistent. 
+  The global scope now equals the Smarty scope in order to avoid global state side effects. Please read
+  the documentation for more details.
+- Lexers and Parsers PHP files are reliably generated from sources (.y and .plex) using the make file 
+- Smarty now always runs in multibyte mode, using `symfony/polyfill-mbstring` if required. Please use the
+  multibyte extension for optimal performance.
+- Smarty no longer calls `mb_internal_encoding()` and doesn't check for deprecated `mbstring.func_overload` ini directive [#480](https://github.com/smarty-php/smarty/issues/480)
+- Generated `<script>` tags lo longer have deprecated `type="text/javascript"` or `language="Javascript"` attributes [#815](https://github.com/smarty-php/smarty/issues/815)
+- Smarty will throw a compiler exception instead of silently ignoring a modifier on a function call, like this: `{include|dot:"x-template-id" file="included.dot.tpl"}` [#526](https://github.com/smarty-php/smarty/issues/526) 
+- The documentation was largely rewritten
+
+### Deprecated
+- `$smarty->getPluginsDir()`
+- `$smarty->loadFilter()`
+- `$smarty->setPluginsDir()`
+- `$smarty->assignGlobal()`
+- Using `$smarty->registerFilter()` for registering variable filters will trigger a notice.
+
+### Removed
+- Dropped support for PHP7.1
+- Removed `$smarty->left_delimiter` and `$smarty->right_delimiter`, use `$smarty->getLeftDelimiter()`/`$smarty->setLeftDelimiter()` and `$smarty->getRightDelimiter()`/`$smarty->setRightDelimiter()`
+- Removed support for the `$cache_attrs` parameter for registered plugins
+- Removed support for undocumented `{make_nocache}` tag
+- Removed support for deprecated `{insert}` tag, the 'insert' plugin type and the associated $smarty->trusted_dir variable
+- Removed the undocumented `{block_parent}` and `{parent}` alternatives to `{$smarty.block.parent}`
+- Removed the undocumented `{block_child}` and `{child}` alternatives to `{$smarty.block.child}`
+- Removed support for loading config files into a non-local scope using `{config_load}` from a template 
+- Removed `$smarty->autoload_filters` in favor of `$smarty->registerFilter()`
+- Removed `$smarty->trusted_dir` and `$smarty->allow_php_templates` since support for executing php scripts from templates has been dropped  
+- Removed `$smarty->php_functions` and `$smarty->php_modifiers`. 
+- You can no longer use native PHP-functions or userland functions in your templates without registering them. If you need a function in your templates,
+  register it first.
+- Removed support for `$smarty->getTags()`
+- Removed the abandoned `$smarty->direct_access_security` setting
+- Dropped support for `$smarty->plugins_dir` and `$smarty->use_include_path`. If you must, use `$smarty->addPluginsDir()` instead,
+  but it's better to use Smarty::addExtension() to add an extension or Smarty::registerPlugin to
+  quickly register a plugin using a callback function.
+- Removed constants such as SMARTY_DIR to prevent global side effects.
+- Removed direct access to `$smarty->template_dir`. Use `$smarty->setTemplateDir()`.
+- Removed direct access to `$smarty->cache_dir`. Use `$smarty->setCacheDir()`.
+- Removed direct access to `$smarty->compile_dir`. Use `$smarty->setCompileDir()`.
+- Removed `$smarty->loadPlugin()`, use `$smarty->registerPlugin()` instead.
+- Removed `$smarty->appendByRef()` and `$smarty->assignByRef()`.
+- Removed `$smarty->_current_file`
+- Removed `$smarty->allow_ambiguous_resources` (ambiguous resources handlers should still work)
+
+### Fixed
+- `|strip_tags` does not work if the input is 0 [#890](https://github.com/smarty-php/smarty/issues/890)
+
+## [4.3.2] - 2023-07-19
+
+### Fixed
+- `$smarty->muteUndefinedOrNullWarnings()` now also mutes PHP8 warnings for undefined properties
+
+## [4.3.1] - 2023-03-28
+
+### Security
+- Fixed Cross site scripting vulnerability in Javascript escaping. This addresses CVE-2023-28447.
+
+### Fixed
+- `$smarty->muteUndefinedOrNullWarnings()` now also mutes PHP7 notices for undefined array indexes [#736](https://github.com/smarty-php/smarty/issues/736)
+- `$smarty->muteUndefinedOrNullWarnings()` now treats undefined vars and array access of a null or false variables 
+  equivalent across all supported PHP versions
+- `$smarty->muteUndefinedOrNullWarnings()` now allows dereferencing of non-objects across all supported PHP versions [#831](https://github.com/smarty-php/smarty/issues/831)
+- PHP 8.1 deprecation warnings on null strings in modifiers [#834](https://github.com/smarty-php/smarty/pull/834)
+
+## [4.3.0] - 2022-11-22
+
+### Added
+- PHP8.2 compatibility [#775](https://github.com/smarty-php/smarty/pull/775)
+
+### Changed
+- Include docs and demo in the releases [#799](https://github.com/smarty-php/smarty/issues/799)
+- Using PHP functions as modifiers now triggers a deprecation notice because we will drop support for this in the next major release [#813](https://github.com/smarty-php/smarty/issues/813) 
+- Dropped remaining references to removed PHP-support in Smarty 4 from docs, lexer and security class. [#816](https://github.com/smarty-php/smarty/issues/816)
+- Support umask when writing (template) files and set dir permissions to 777 [#548](https://github.com/smarty-php/smarty/issues/548) [#819](https://github.com/smarty-php/smarty/issues/819) 
+ 
+### Fixed
+- Output buffer is now cleaned for internal PHP errors as well, not just for Exceptions [#514](https://github.com/smarty-php/smarty/issues/514)
+- Fixed recursion and out of memory errors when caching in complicated template set-ups using inheritance and includes [#801](https://github.com/smarty-php/smarty/pull/801)
+- Fixed PHP8.1 deprecation errors in strip_tags 
+- Fix Variable Usage in Exception message when unable to load subtemplate [#808](https://github.com/smarty-php/smarty/pull/808)
+- Fixed PHP8.1 deprecation notices for strftime [#672](https://github.com/smarty-php/smarty/issues/672)
+- Fixed PHP8.1 deprecation errors passing null to parameter in trim [#807](https://github.com/smarty-php/smarty/pull/807)
+- Adapt Smarty upper/lower functions to be codesafe (e.g. for Turkish locale) [#586](https://github.com/smarty-php/smarty/pull/586)
+- Bug fix for underscore and limited length in template name in custom resources [#581](https://github.com/smarty-php/smarty/pull/581)
+
+## [4.2.1] - 2022-09-14
+
+### Security
+- Applied appropriate javascript and html escaping in mailto plugin to counter injection attacks [#454](https://github.com/smarty-php/smarty/issues/454)
+
+### Fixed
+- Fixed PHP8.1 deprecation notices in modifiers (upper, explode, number_format and replace) [#755](https://github.com/smarty-php/smarty/pull/755) and [#788](https://github.com/smarty-php/smarty/pull/788)
+- Fixed PHP8.1 deprecation notices in capitalize modifier [#789](https://github.com/smarty-php/smarty/issues/789)
+- Fixed use of `rand()` without a parameter in math function [#794](https://github.com/smarty-php/smarty/issues/794)
+- Fixed unselected year/month/day not working in html_select_date [#395](https://github.com/smarty-php/smarty/issues/395)
+
+## [4.2.0] - 2022-08-01
+
+### Fixed
+- Fixed problems with smarty_mb_str_replace [#549](https://github.com/smarty-php/smarty/issues/549)
+- Fixed second parameter of unescape modifier not working [#777](https://github.com/smarty-php/smarty/issues/777)
+
+### Changed
+- Updated HTML of the debug template [#599](https://github.com/smarty-php/smarty/pull/599)
+
+## [4.1.1] - 2022-05-17
+
+### Security
+- Prevent PHP injection through malicious block name or include file name. This addresses CVE-2022-29221
+
+### Fixed
+- Exclude docs and demo from export and composer [#751](https://github.com/smarty-php/smarty/pull/751)
+- PHP 8.1 deprecation notices in demo/plugins/cacheresource.pdo.php [#706](https://github.com/smarty-php/smarty/issues/706)
+- PHP 8.1 deprecation notices in truncate modifier [#699](https://github.com/smarty-php/smarty/issues/699)
+- Math equation `max(x, y)` didn't work anymore [#721](https://github.com/smarty-php/smarty/issues/721)
+- Fix PHP 8.1 deprecated warning when calling rtrim [#743](https://github.com/smarty-php/smarty/pull/743)
+- PHP 8.1: fix deprecation in escape modifier [#727](https://github.com/smarty-php/smarty/pull/727)
+
+## [4.1.0] - 2022-02-06
+
+### Added
+- PHP8.1 compatibility [#713](https://github.com/smarty-php/smarty/pull/713)
+
+## [4.0.4] - 2022-01-18
+
+### Fixed
+- Fixed illegal characters bug in math function security check [#702](https://github.com/smarty-php/smarty/issues/702)
+
+## [4.0.3] - 2022-01-10
+
+### Security
+- Prevent evasion of the `static_classes` security policy. This addresses CVE-2021-21408
+
+## [4.0.2] - 2022-01-10
+
+### Security
+- Prevent arbitrary PHP code execution through maliciously crafted expression for the math function. This addresses CVE-2021-29454
+
+## [4.0.1] - 2022-01-09
+
+### Security
+- Rewrote the mailto function to not use `eval` when encoding with javascript
+
+## [4.0.0] - 2021-11-25
+
+## [4.0.0-rc.0] - 2021-10-13
+
+### Added
+- You can now use `$smarty->muteUndefinedOrNullWarnings()` to activate convert warnings about undefined or null template vars to notices when running PHP8
+
+### Changed
+- Switch CI from Travis to Github CI
+- Updated unit tests to avoid skipped and risky test warnings
+
+### Removed
+- Dropped support for PHP7.0 and below, so Smarty now requires PHP >=7.1
+- Dropped support for php asp tags in templates (removed from php since php7.0)
+- Dropped deprecated API calls that where only accessible through SmartyBC
+- Dropped support for {php} and {include_php} tags and embedded PHP in templates. Embedded PHP will now be passed through as is.
+- Removed all PHP_VERSION_ID and compare_version checks and conditional code blocks that are now no longer required
+- Dropped deprecated SMARTY_RESOURCE_CHAR_SET and SMARTY_RESOURCE_DATE_FORMAT constants
+- Dropped deprecated Smarty::muteExpectedErrors and Smarty::unmuteExpectedErrors API methods
+- Dropped deprecated $smarty->getVariable() method. Use $smarty->getTemplateVars() instead.
+- $smarty->registerResource() no longer accepts an array of callback functions
+
+## [3.1.40] - 2021-10-13
+
+### Changed
+- modifier escape now triggers a E_USER_NOTICE when an unsupported escape type is used https://github.com/smarty-php/smarty/pull/649
+
+### Security
+- More advanced javascript escaping to handle https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements thanks to m-haritonov
+
+## [3.1.39] - 2021-02-17
+
+### Security
+- Prevent access to `$smarty.template_object` in sandbox mode. This addresses CVE-2021-26119.
+- Fixed code injection vulnerability by using illegal function names in `{function name='blah'}{/function}`. This addresses CVE-2021-26120.
+
+## [3.1.38] - 2021-01-08
+
+### Fixed
+- Smarty::SMARTY_VERSION wasn't updated https://github.com/smarty-php/smarty/issues/628
+
+## [3.1.37] - 2021-01-07
+
+### Changed
+- Changed error handlers and handling of undefined constants for php8-compatibility (set $errcontext argument optional) https://github.com/smarty-php/smarty/issues/605
+- Changed expected error levels in unit tests for php8-compatibility
+- Travis unit tests now run for all php versions >= 5.3, including php8
+- Travis runs on Xenial where possible
+
+### Fixed
+- PHP5.3 compatibility fixes
+- Brought lexer source functionally up-to-date with compiled version
+
+## [3.1.36] - 2020-04-14
+
+### Fixed
+ - Smarty::SMARTY_VERSION wasn't updated in v3.1.35 https://github.com/smarty-php/smarty/issues/584
+
+## [3.1.35] - 2020-04-14
+ - remove whitespaces after comments https://github.com/smarty-php/smarty/issues/447
+ - fix foreachelse on arrayiterators https://github.com/smarty-php/smarty/issues/506
+ - fix files contained in git export archive for package maintainers https://github.com/smarty-php/smarty/issues/325
+ - throw SmartyException when setting caching attributes for cacheable plugin https://github.com/smarty-php/smarty/issues/457
+ - fix errors that occured where isset was replaced with null check such as https://github.com/smarty-php/smarty/issues/453
+ - unit tests are now in the repository
+
+## 3.1.34 release - 05.11.2019
+13.01.2020
+ - fix typo in exception message (JercSi)
+ - fix typehint warning with callable (bets4breakfast)
+ - add travis badge and compatability info to readme (matks)
+ - fix stdClass cast when compiling foreach (carpii)
+ - fix wrong set/get methods for memcached (IT-Experte)
+ - fix pborm assigning value to object variables in smarty_internal_compile_assign (Hunman)
+ - exclude error_reporting.ini from git export (glensc)
+
+## 3.1.34-dev-6 -
+30.10.2018
+ - bugfix a nested subblock in an inheritance child template was not replace by
+   outer level block with same name in same child template https://github.com/smarty-php/smarty/issues/500
+
+29.10.2018
+ - bugfix Smarty::$php_handling == PHP_PASSTHRU (default) did eat the "\n" (newline) character if it did directly followed
+   a PHP tag like "?>" or other https://github.com/smarty-php/smarty/issues/501
+
+14.10.2018
+ - bugfix autoloader exit shortcut https://github.com/smarty-php/smarty/issues/467
+
+11.10.2018
+ - bugfix {insert} not works when caching is enabled and included template is present
+   https://github.com/smarty-php/smarty/issues/496
+ - bugfix in date-format modifier; NULL at date string or default_date did not produce correct output
+   https://github.com/smarty-php/smarty/pull/458
+
+09.10.2018
+ - bugfix fix of 26.8.2017 https://github.com/smarty-php/smarty/issues/327
+   modifier is applied to sum expression https://github.com/smarty-php/smarty/issues/491
+ - bugfix indexed arrays could not be defined "array(...)""
+
+18.09.2018
+  - bugfix large plain text template sections without a Smarty tag > 700kB could
+    could fail in version 3.1.32 and 3.1.33 because PHP preg_match() restrictions
+    https://github.com/smarty-php/smarty/issues/488
+
+## 3.1.33 release - 12.09.2018
+## 3.1.33-dev-12 -
+03.09.2018
+  - bugfix {foreach} using new style property access like {$item@property} on
+    Smarty 2 style named foreach loop could produce errors https://github.com/smarty-php/smarty/issues/484
+
+31.08.2018
+  - bugfix some custom left and right delimiters like '{^' '^}' did not work
+    https://github.com/smarty-php/smarty/issues/450 https://github.com/smarty-php/smarty/pull/482
+
+  - reformating for PSR-2 coding standards https://github.com/smarty-php/smarty/pull/483
+
+  - bugfix on Windows absolute filepathes did fail if the drive letter was followed by a linux DIRECTORY_SEPARATOR
+    like C:/  at Smarty > 3.1.33-dev-5 https://github.com/smarty-php/smarty/issues/451
+
+  - PSR-2 code style fixes for config and template file Lexer/Parser generated with
+    the Smarty Lexer/Parser generator from https://github.com/smarty-php/smarty-lexer
+    https://github.com/smarty-php/smarty/pull/483
+
+26.08.2018
+  - bugfix/enhancement {capture} allow variable as capture block name in Smarty special variable
+    like $smarty.capture.$foo https://github.com/smarty-php/smarty/issues/478 https://github.com/smarty-php/smarty/pull/481
+
+## 3.1.33-dev-6 -
+19.08.2018
+  - fix PSR-2 coding standards and PHPDoc blocks https://github.com/smarty-php/smarty/pull/452
+    https://github.com/smarty-php/smarty/pull/475
+    https://github.com/smarty-php/smarty/pull/473
+  - bugfix PHP5.2 compatibility https://github.com/smarty-php/smarty/pull/472
+
+## 3.1.33-dev-4 -
+17.05.2018
+ - bugfix strip-block produces different output in Smarty v3.1.32 https://github.com/smarty-php/smarty/issues/436
+ - bugfix Smarty::compileAllTemplates ignores `$extension` parameter https://github.com/smarty-php/smarty/issues/437
+   https://github.com/smarty-php/smarty/pull/438
+ - improvement do not compute total property in {foreach} if not needed https://github.com/smarty-php/smarty/issues/443
+ - bugfix  plugins may not be loaded when setMergeCompiledIncludes is true https://github.com/smarty-php/smarty/issues/435
+
+26.04.2018
+ - bugfix  regarding Security Vulnerability did not solve the problem under Linux.
+   Security issue CVE-2018-16831
+
+## 3.1.32 - (24.04.2018)
+24.04.2018
+ - bugfix  possible Security Vulnerability in Smarty_Security class.
+
+26.03.2018
+ - bugfix plugins may not be loaded if {function} or {block} tags are executed in nocache mode
+   https://github.com/smarty-php/smarty/issues/371
+
+26.03.2018
+ - new feature {parent} =  {$smarty.block.parent} {child} =  {$smarty.block.child}
+
+23.03.2018
+ - bugfix preg_replace could fail on large content resulting in a blank page https://github.com/smarty-php/smarty/issues/417
+
+21.03.2018
+ - bugfix {$smarty.section...} used outside {section}{/section} showed incorrect values if {section}{/section} was called inside
+   another loop https://github.com/smarty-php/smarty/issues/422
+ - bugfix short form of {section} attributes did not work https://github.com/smarty-php/smarty/issues/428
+
+17.03.2018
+ - improvement Smarty::compileAllTemplates() exit with a non-zero status code if max errors is reached https://github.com/smarty-php/smarty/pull/402
+
+16.03.2018
+ - bugfix extends resource did not work with user defined left/right delimiter https://github.com/smarty-php/smarty/issues/419
+
+22.11.2017
+ - bugfix {break} and {continue} could fail if {foreach}{/foreach} did contain other
+   looping tags like {for}, {section} and {while} https://github.com/smarty-php/smarty/issues/323
+
+20.11.2017
+  - bugfix rework of newline spacing between tag code and template text.
+    now again identical with Smarty2 (forum topic 26878)
+  - replacement of " by '
+
+05.11.2017
+  - lexer/parser optimization
+  - code cleanup and optimizations
+  - bugfix {$smarty.section.name.loop} used together with {$smarty.section.name.total} could produce
+    wrong results (forum topic 27041)
+
+26.10.2017
+  - bugfix Smarty version was  not filled in header comment of compiled and cached  files
+  - optimization replace internal Smarty::$ds property by DIRECTORY_SEPARATOR
+  - deprecate functions Smarty::muteExpectedErrors() and Smarty::unmuteExpectedErrors()
+    as Smarty does no longer use error suppression like @filemtime().
+    for backward compatibility code is moved from Smarty class to an external class and still can be
+    called.
+  - correction of PHPDoc blocks
+  - minor code cleanup
+
+21.10.2017
+  - bugfix custom delimiters could fail since modification of  version 3.1.32-dev-23
+    https://github.com/smarty-php/smarty/issues/394
+
+18.10.2017
+  - bugfix fix implementation of unclosed block tag in double quoted string of 12.10.2017
+    https://github.com/smarty-php/smarty/issues/396 https://github.com/smarty-php/smarty/issues/397
+    https://github.com/smarty-php/smarty/issues/391 https://github.com/smarty-php/smarty/issues/392
+
+12.10.2017
+  - bugfix $smarty.block.child and $smarty.block.parent could not be used like any
+    $smarty special variable https://github.com/smarty-php/smarty/issues/393
+  - unclosed block tag in double quoted string must throw compiler exception.
+     https://github.com/smarty-php/smarty/issues/391 https://github.com/smarty-php/smarty/issues/392
+
+07.10.2017
+  - bugfix modification of 9.8.2017 did fail on some recursive
+    tag nesting. https://github.com/smarty-php/smarty/issues/389
+
+26.8.2017
+  - bugfix chained modifier failed when last modifier parameter is a signed value
+    https://github.com/smarty-php/smarty/issues/327
+  - bugfix templates filepath with multibyte characters did not work
+    https://github.com/smarty-php/smarty/issues/385
+  - bugfix {make_nocache} did display code if the template did not contain other nocache code
+    https://github.com/smarty-php/smarty/issues/369
+
+09.8.2017
+  - improvement repeated delimiter like {{ and }} will be treated as literal
+    https://groups.google.com/forum/#!topic/smarty-developers/h9r82Bx4KZw
+
+05.8.2017
+  - bugfix wordwrap modifier could fail if used in nocache code.
+    converted plugin file shared.mb_wordwrap.php into modifier.mb_wordwrap.php
+  - cleanup of _getSmartyObj()
+
+31.7.2017
+  - Call clearstatcache() after mkdir() failure https://github.com/smarty-php/smarty/pull/379
+
+30.7.2017
+  - rewrite mkdir() bugfix to retry automatically see https://github.com/smarty-php/smarty/pull/377
+    https://github.com/smarty-php/smarty/pull/379
+
+21.7.2017
+  - security possible PHP code injection on custom resources at display() or fetch()
+    calls if the resource does not sanitize the template name
+  - bugfix fix 'mkdir(): File exists' error on create directory from parallel
+    processes https://github.com/smarty-php/smarty/pull/377
+  - bugfix solve preg_match() hhvm parameter problem https://github.com/smarty-php/smarty/pull/372
+
+27.5.2017
+  - bugfix change compiled code for registered function and modifiers to called as callable to allow closures
+    https://github.com/smarty-php/smarty/pull/368, https://github.com/smarty-php/smarty/issues/273
+  - bugfix https://github.com/smarty-php/smarty/pull/368 did break the default plugin handler
+  - improvement replace phpversion() by PHP_VERSION constant.
+    https://github.com/smarty-php/smarty/pull/363
+
+21.5.2017
+  - performance store flag for already required shared plugin functions in static variable or
+    Smarty's $_cache to improve performance when plugins are often called
+    https://github.com/smarty-php/smarty/commit/51e0d5cd405d764a4ea257d1bac1fb1205f74528#commitcomment-22280086
+  - bugfix remove special treatment of classes implementing ArrayAccess in {foreach}
+    https://github.com/smarty-php/smarty/issues/332
+  - bugfix remove deleted files by clear_cache() and clear_compiled_template() from
+    ACP cache if present, add some is_file() checks to avoid possible warnings on filemtime()
+    caused by above functions.
+    https://github.com/smarty-php/smarty/issues/341
+  - bugfix version 3.1.31 did fail under PHP 5.2
+    https://github.com/smarty-php/smarty/issues/365
+
+19.5.2017
+  - change properties $accessMap and $obsoleteProperties from private to protected
+    https://github.com/smarty-php/smarty/issues/351
+  - new feature The named capture buffers can now be accessed also as array
+    See NEWS_FEATURES.txt https://github.com/smarty-php/smarty/issues/366
+  - improvement check if ini_get() and ini_set() not disabled
+    https://github.com/smarty-php/smarty/pull/362
+
+24.4.2017
+  - fix spelling https://github.com/smarty-php/smarty/commit/e3eda8a5f5653d8abb960eb1bc47e3eca679b1b4#commitcomment-21803095
+
+17.4.2017
+  - correct generated code on empty() and isset() call, observe change PHP behaviour since PHP 5.5
+    https://github.com/smarty-php/smarty/issues/347
+
+14.4.2017
+  - merge pull requests https://github.com/smarty-php/smarty/pull/349, https://github.com/smarty-php/smarty/pull/322 and    https://github.com/smarty-php/smarty/pull/337 to fix spelling and annotation
+
+13.4.2017
+  - bugfix array_merge() parameter should be checked https://github.com/smarty-php/smarty/issues/350
+
+## 3.1.31 - (14.12.2016)
+  23.11.2016
+   - move template object cache into static variables
+
+  19.11.2016
+  - bugfix inheritance root child templates containing nested {block}{/block} could call sub-bock content from parent
+    template https://github.com/smarty-php/smarty/issues/317
+  - change version checking
+
+ 11.11.2016
+  - bugfix when Smarty is using a cached template object on Smarty::fetch() or Smarty::isCached() the inheritance data
+    must be removed https://github.com/smarty-php/smarty/issues/312
+  - smaller speed optimization
+
+ 08.11.2016
+  - add bootstrap file to load and register Smarty_Autoloader. Change composer.json to make it known to composer
+
+ 07.11.2016
+  - optimization of lexer speed https://github.com/smarty-php/smarty/issues/311
+
+ 27.10.2016
+  - bugfix template function definitions array has not been cached between Smarty::fetch() and Smarty::display() calls
+    https://github.com/smarty-php/smarty/issues/301
+
+ 23.10.2016
+  - improvement/bugfix when Smarty::fetch() is called on a template object the inheritance and tplFunctions property
+    should be copied to the called template object
+
+ 21.10.2016
+  - bugfix for compile locking touched timestamp of old compiled file was not restored on compilation error https://github.com/smarty-php/smarty/issues/308
+
+ 20.10.2016
+  - bugfix nocache code was not removed in cache file when subtemplate did contain PHP short tags in text but no other
+    nocache code https://github.com/smarty-php/smarty/issues/300
+
+ 19.10.2016
+  - bugfix {make_nocache $var} did fail when variable value did contain '\' https://github.com/smarty-php/smarty/issues/305
+  - bugfix {make_nocache $var} remove spaces from variable value https://github.com/smarty-php/smarty/issues/304
+
+ 12.10.2016
+  - bugfix {include} with template names including variable or constants could fail after bugfix from
+     28.09.2016 https://github.com/smarty-php/smarty/issues/302
+
+ 08.10.2016
+  - optimization move runtime extension for template functions into Smarty objects
+
+ 29.09.2016
+  - improvement new Smarty::$extends_recursion property to disable execution of {extends} in templates called by extends resource
+     https://github.com/smarty-php/smarty/issues/296
+
+ 28.09.2016
+  - bugfix the generated code for calling a subtemplate must pass the template resource name in single quotes https://github.com/smarty-php/smarty/issues/299
+  - bugfix nocache hash was not removed for <?xml ?> tags in subtemplates https://github.com/smarty-php/smarty/issues/300
+
+ 27.09.2016
+  - bugfix when Smarty does use an internally cached template object on Smarty::fetch() calls
+           the template and config variables must be cleared https://github.com/smarty-php/smarty/issues/297
+
+ 20.09.2016
+  - bugfix some $smarty special template variables are no longer accessed as real variable.
+    using them on calls like {if isset($smarty.foo)} or {if empty($smarty.foo)} will fail
+    http://www.smarty.net/forums/viewtopic.php?t=26222
+  - temporary fix for https://github.com/smarty-php/smarty/issues/293 main reason still under investigation
+  - improvement new tags {block_parent} {block_child} in template inheritance
+
+ 19.09.2016
+  - optimization clear compiled and cached folder completely on detected version change
+  - cleanup convert cache resource file method clear into runtime extension
+
+ 15.09.2016
+  - bugfix assigning a variable in if condition by function like {if $value = array_shift($array)} the function got called twice https://github.com/smarty-php/smarty/issues/291
+  - bugfix function plugins called with assign attribute like {foo assign='bar'} did not output returned content because
+           because assumption was made that it was assigned to a variable https://github.com/smarty-php/smarty/issues/292
+  - bugfix calling $smarty->isCached() on a not existing cache file with $smarty->cache_locking = true; could cause a 10 second delay http://www.smarty.net/forums/viewtopic.php?t=26282
+  - improvement make Smarty::clearCompiledTemplate() on custom resource independent from changes of templateId computation
+
+ 11.09.2016
+  - improvement {math} misleading E_USER_WARNING messages when parameter value = null https://github.com/smarty-php/smarty/issues/288
+  - improvement move often used code snippets into methods
+  - performance Smarty::configLoad() did load unneeded template source object
+
+ 09.09.2016
+  - bugfix/optimization {foreach} did not execute the {foreachelse} when iterating empty objects https://github.com/smarty-php/smarty/pull/287
+  - bugfix {foreach} must keep the @properties when restoring a saved $item variable as the properties might be used outside {foreach} https://github.com/smarty-php/smarty/issues/267
+  - improvement {foreach} observe {break n} and {continue n} nesting levels when restoring saved $item and $key variables
+
+ 08.09.2016
+  - bugfix implement wrapper for removed method getConfigVariable() https://github.com/smarty-php/smarty/issues/286
+
+ 07.09.2016
+  - bugfix using nocache like attribute with value true like {plugin nocache=true} did not work https://github.com/smarty-php/smarty/issues/285
+  - bugfix uppercase TRUE, FALSE and NULL did not work when security was enabled https://github.com/smarty-php/smarty/issues/282
+  - bugfix when {foreach} was looping over an object the total property like {$item@total} did always return 1 https://github.com/smarty-php/smarty/issues/281
+  - bugfix {capture}{/capture} did add in 3.1.30 unintended additional blank lines https://github.com/smarty-php/smarty/issues/268
+
+ 01.09.2016
+  - performance require_once should be called only once for shared plugins https://github.com/smarty-php/smarty/issues/280
+
+ 26.08.2016
+  - bugfix change of 23.08.2016 failed on linux when use_include_path = true
+
+ 23.08.2016
+  - bugfix remove constant DS as shortcut for DIRECTORY_SEPARATOR as the user may have defined it to something else https://github.com/smarty-php/smarty/issues/277
+
+ 20.08-2016
+  - bugfix {config_load ... scope="global"} shall not throw an arror but fallback to scope="smarty" https://github.com/smarty-php/smarty/issues/274
+  - bugfix {make_nocache} failed when using composer autoloader https://github.com/smarty-php/smarty/issues/275
+
+ 14.08.2016
+  - bugfix $smarty_>debugging = true; did E_NOTICE messages when {eval} tag was used https://github.com/smarty-php/smarty/issues/266
+  - bugfix Class 'Smarty_Internal_Runtime_ValidateCompiled' not found when upgrading from some older Smarty versions with existing
+           compiled or cached template files https://github.com/smarty-php/smarty/issues/269
+  - optimization remove unneeded call to update acopes when {assign} scope and template scope was local (default)
+
+## 3.1.30 - (07.08.2016)
+
+ 07.08.2016
+  - bugfix update of 04.08.2016 was incomplete
+
+ 05.08.2016
+  - bugfix compiling of templates failed when the Smarty delimiter did contain '/' https://github.com/smarty-php/smarty/issues/264
+  - updated error checking at template and config default handler
+
+ 04.08.2016
+  - improvement move template function source parameter into extension
+
+ 26.07.2016
+  - optimization unneeded loading of compiled resource
+
+ 24.07.2016
+  - regression this->addPluginsDir('/abs/path/to/dir') adding absolute path without trailing '/' did fail https://github.com/smarty-php/smarty/issues/260
+
+ 23.07.2016
+  - bugfix setTemplateDir('/') and setTemplateDir('') did create wrong absolute filepath https://github.com/smarty-php/smarty/issues/245
+  - optimization of filepath normalization
+  - improvement remove double function declaration in plugin shared.escape_special_cars.php https://github.com/smarty-php/smarty/issues/229
+
+ 19.07.2016
+  - bugfix multiple {include} with relative filepath within {block}{/block} could fail https://github.com/smarty-php/smarty/issues/246
+  - bugfix {math} shell injection vulnerability patch provided by Tim Weber
+
+ 18.07.2016
+  - bugfix {foreach} if key variable and item@key attribute have been used both the key variable was not updated https://github.com/smarty-php/smarty/issues/254
+  - bugfix modifier on plugins like {plugin|modifier ... } did fail when the plugin does return an array https://github.com/smarty-php/smarty/issues/228
+  - bugfix avoid opcache_invalidate to result in ErrorException when opcache.restrict_api is not empty https://github.com/smarty-php/smarty/pull/244
+  - bugfix multiple {include} with relative filepath within {block}{/block} could fail https://github.com/smarty-php/smarty/issues/246
+
+ 14.07.2016
+  - bugfix wrong parameter on compileAllTemplates() and compileAllConfig() https://github.com/smarty-php/smarty/issues/231
+
+ 13.07.2016
+  - bugfix PHP 7 compatibility on registered compiler plugins https://github.com/smarty-php/smarty/issues/241
+  - update testInstall() https://github.com/smarty-php/smarty/issues/248https://github.com/smarty-php/smarty/issues/248
+  - bugfix enable debugging could fail when template objects did already exists https://github.com/smarty-php/smarty/issues/237
+  - bugfix template function data should be merged when loading subtemplate https://github.com/smarty-php/smarty/issues/240
+  - bugfix wrong parameter on compileAllTemplates() https://github.com/smarty-php/smarty/issues/231
+
+ 12.07.2016
+  - bugfix {foreach} item variable must be created also on empty from array https://github.com/smarty-php/smarty/issues/238 and https://github.com/smarty-php/smarty/issues/239
+  - bugfix enableSecurity() must init cache flags https://github.com/smarty-php/smarty/issues/247
+
+ 27.05.2016
+  - bugfix/improvement of compileAlltemplates() follow symlinks in template folder (PHP >= 5.3.1) https://github.com/smarty-php/smarty/issues/224
+      clear internal cache and expension handler for each template to avoid possible conflicts https://github.com/smarty-php/smarty/issues/231
+
+ 16.05.2016
+  - optimization {foreach} compiler and processing
+  - broken PHP 5.3 and 5.4 compatibility
+
+ 15.05.2016
+  - optimization and cleanup of resource code
+
+ 10.05.2016
+  - optimization of inheritance processing
+
+ 07.05.2016
+  -bugfix Only variables should be assigned by reference https://github.com/smarty-php/smarty/issues/227
+
+ 02.05.2016
+  - enhancement {block} tag names can now be variable https://github.com/smarty-php/smarty/issues/221
+
+ 01.05.2016
+  - bugfix same relative filepath at {include} called from template in different folders could display wrong sub-template
+
+ 29.04.2016
+  - bugfix {strip} remove space on linebreak between html tags https://github.com/smarty-php/smarty/issues/213
+
+ 24.04.2016
+  - bugfix nested {include} with relative file path could fail when called in {block} ... {/block} https://github.com/smarty-php/smarty/issues/218
+
+ 14.04.2016
+  - bugfix special variable {$smarty.capture.name} was not case sensitive on name https://github.com/smarty-php/smarty/issues/210
+  - bugfix the default template handler must calculate the source uid https://github.com/smarty-php/smarty/issues/205
+
+ 13.04.2016
+  - bugfix template inheritance status must be saved when calling sub-templates https://github.com/smarty-php/smarty/issues/215
+
+ 27.03.2016
+  - bugfix change of 11.03.2016 cause again {capture} data could not been seen in other templates with {$smarty.capture.name} https://github.com/smarty-php/smarty/issues/153
+
+ 11.03.2016
+  - optimization of capture and security handling
+  - improvement $smarty->clearCompiledTemplate() should return on recompiled or uncompiled resources
+
+ 10.03.2016
+  - optimization of resource processing
+
+ 09.03.2016
+  - improvement rework of 'scope' attribute handling see see NEW_FEATURES.txt https://github.com/smarty-php/smarty/issues/194
+    https://github.com/smarty-php/smarty/issues/186 https://github.com/smarty-php/smarty/issues/179
+  - bugfix correct Autoloader update of 2.3.2014 https://github.com/smarty-php/smarty/issues/199
+
+ 04.03.2016
+  - bugfix change from 01.03.2016 will cause $smarty->isCached(..) failure if called multiple time for same template
+    (forum topic 25935)
+
+ 02.03.2016
+  - revert autoloader optimizations because of unexplainable warning when using plugins https://github.com/smarty-php/smarty/issues/199
+
+ 01.03.2016
+  - bugfix template objects must be cached on $smarty->fetch('foo.tpl) calls incase the template is fetched
+    multiple times (forum topic 25909)
+
+ 25.02.2016
+  - bugfix wrong _realpath with 4 or more parent-directories https://github.com/smarty-php/smarty/issues/190
+  - optimization of _realpath
+  - bugfix instanceof expression in template code must be treated as value https://github.com/smarty-php/smarty/issues/191
+
+ 20.02.2016
+  - bugfix {strip} must keep space between hmtl tags. Broken by changes of 10.2.2016 https://github.com/smarty-php/smarty/issues/184
+  - new feature/bugfix  {foreach}{section} add 'properties' attribute to force compilation of loop properties
+    see NEW_FEATURES.txt https://github.com/smarty-php/smarty/issues/189
+
+ 19.02.2016
+  - revert output buffer flushing on display, echo content again because possible problems when PHP files had
+    characters (newline} after ?> at file end https://github.com/smarty-php/smarty/issues/187
+
+ 14.02.2016
+  - new tag {make_nocache} read NEW_FEATURES.txt https://github.com/smarty-php/smarty/issues/110
+  - optimization of sub-template processing
+  - bugfix using extendsall as default resource and {include} inside {block} tags could produce unexpected results https://github.com/smarty-php/smarty/issues/183
+  - optimization of tag attribute compiling
+  - optimization make compiler tag object cache static for higher compilation speed
+
+ 11.02.2016
+  - improvement added KnockoutJS comments to trimwhitespace outputfilter https://github.com/smarty-php/smarty/issues/82
+    https://github.com/smarty-php/smarty/pull/181
+
+ 10.02.2016
+  - bugfix {strip} must keep space on output creating smarty tags within html tags https://github.com/smarty-php/smarty/issues/177
+  - bugfix wrong precedence on special if conditions like '$foo is ... by $bar' could cause wrong code https://github.com/smarty-php/smarty/issues/178
+  - improvement because of ambiguities the inline constant support has been removed from the $foo.bar syntax https://github.com/smarty-php/smarty/issues/149
+  - bugfix other {strip} error with output tags between hmtl https://github.com/smarty-php/smarty/issues/180
+
+ 09.02.2016
+  - move some code from parser into compiler
+  - reformat all code for unique style
+  - update/bugfix scope attribute handling reworked. Read the newfeatures.txt file
+
+ 05.02.2016
+  - improvement internal compiler changes
+
+ 01.02.2016
+  - bugfix {foreach} compilation failed when $smarty->merge_compiled_includes = true and pre-filters are used.
+
+ 29.01.2016
+  - bugfix implement replacement code for _tag_stack property https://github.com/smarty-php/smarty/issues/151
+
+ 28.01.2016
+  - bugfix allow windows network filepath or wrapper (forum topic 25876) https://github.com/smarty-php/smarty/issues/170
+  - bugfix if fetch('foo.tpl') is called on a template object the $parent parameter should default to the calling template object https://github.com/smarty-php/smarty/issues/152
+
+ 27.01.2016
+  - revert bugfix compiling {section} did create warning
+  - bugfix {$smarty.section.customer.loop} did throw compiler error https://github.com/smarty-php/smarty/issues/161
+    update of yesterdays fix
+  - bugfix string resource could inject code at {block} or inline subtemplates through PHP comments https://github.com/smarty-php/smarty/issues/157		
+  - bugfix output filters did not observe nocache code flhttps://github.com/smarty-php/smarty/issues/154g https://github.com/smarty-php/smarty/issues/160
+  - bugfix {extends} with relative file path did not work https://github.com/smarty-php/smarty/issues/154
+    https://github.com/smarty-php/smarty/issues/158
+  - bugfix {capture} data could not been seen in other templates with {$smarty.capture.name} https://github.com/smarty-php/smarty/issues/153
+
+ 26.01.2016
+  - improvement observe Smarty::$_CHARSET in debugging console https://github.com/smarty-php/smarty/issues/169
+  - bugfix compiling {section} did create warning
+  - bugfix {$smarty.section.customer.loop} did throw compiler error https://github.com/smarty-php/smarty/issues/161
+
+ 02.01.2016
+  - update scope handling
+  - optimize block plugin compiler
+  - improvement runtime checks if registered block plugins are callable
+
+ 01.01.2016
+  - remove Smarty::$resource_cache_mode property
+
+ 31.12.2015
+  - optimization of {assign}, {if} and {while} compiled code
+
+ 30.12.2015
+  - bugfix plugin names starting with "php" did not compile https://github.com/smarty-php/smarty/issues/147
+
+ 29.12.2015
+  - bugfix Smarty::error_reporting was not observed when display() or fetch() was called on template objects https://github.com/smarty-php/smarty/issues/145
+
+ 28.12.2015
+  - optimization of {foreach} code size and processing
+
+ 27.12.2015
+  - improve inheritance code
+  - update external methods
+  - code fixes
+  - PHPdoc updates
+
+ 25.12.2015
+  - compile {block} tag code and its processing into classes
+  - optimization replace hhvm extension by inline code
+  - new feature If ACP is enabled force an apc_compile_file() when compiled or cached template was updated
+
+ 24.12.2015
+  - new feature Compiler does now observe the template_dir setting and will create separate compiled files if required
+  - bugfix post filter did fail on template inheritance https://github.com/smarty-php/smarty/issues/144
+
+ 23.12.2015
+  - optimization move internal method decodeProperties back into template object
+  - optimization move subtemplate processing back into template object
+  - new feature Caching does now observe the template_dir setting and will create separate cache files if required
+
+ 22.12.2015
+  - change $xxx_dir properties from private to protected in case Smarty class gets extended
+  - code optimizations
+
+ 21.12.2015
+  - bugfix a filepath starting with '/' or '\' on windows should normalize to the root dir
+    of current working drive https://github.com/smarty-php/smarty/issues/134
+  - optimization of filepath normalization
+  - bugfix {strip} must remove all blanks between html tags https://github.com/smarty-php/smarty/issues/136
+
+ - 3.1.29 - (21.12.2015)
+ 21.12.2015
+  - optimization improve speed of filetime checks on extends and extendsall resource
+
+ 20.12.2015
+  - bugfix failure when the default resource type was set to 'extendsall' https://github.com/smarty-php/smarty/issues/123
+  - update compilation of Smarty special variables
+  - bugfix add addition check for OS type on normalization of file path https://github.com/smarty-php/smarty/issues/134
+  - bugfix the source uid of the extendsall resource must contain $template_dir settings https://github.com/smarty-php/smarty/issues/123
+
+ 19.12.2015
+  - bugfix using $smarty.capture.foo in expressions could fail https://github.com/smarty-php/smarty/pull/138
+  - bugfix broken PHP 5.2 compatibility https://github.com/smarty-php/smarty/issues/139
+  - remove no longer used code
+  - improvement make sure that compiled and cache templates never can contain a trailing '?>?
+
+ 18.12.2015
+  - bugfix regression when modifier parameter was followed by math https://github.com/smarty-php/smarty/issues/132
+
+ 17.12.2015
+  - bugfix {$smarty.capture.nameFail} did lowercase capture name https://github.com/smarty-php/smarty/issues/135
+  - bugfix using {block append/prepend} on same block in multiple levels of inheritance templates could fail (forum topic 25827)
+  - bugfix text content consisting of just a single '0' like in {if true}0{/if} was suppressed (forum topic 25834)
+
+ 16.12.2015
+  - bugfix {foreach} did fail if from atrribute is a Generator class https://github.com/smarty-php/smarty/issues/128
+  - bugfix direct access $smarty->template_dir = 'foo'; should call Smarty::setTemplateDir() https://github.com/smarty-php/smarty/issues/121
+
+ 15.12.2015
+  - bugfix  {$smarty.cookies.foo} did return the $_COOKIE array not the 'foo' value https://github.com/smarty-php/smarty/issues/122
+  - bugfix  a call to clearAllCache() and other should clear all internal template object caches (forum topic 25828)
+
+ 14.12.2015
+  - bugfix  {$smarty.config.foo} broken in 3.1.28 https://github.com/smarty-php/smarty/issues/120
+  - bugfix  multiple calls of {section} with same name droped E_NOTICE error https://github.com/smarty-php/smarty/issues/118
+
+ - 3.1.28 - (13.12.2015)
+ 13.12.2015
+  - bugfix {foreach} and {section} with uppercase characters in name attribute did not work (forum topic 25819)
+  - bugfix $smarty->debugging_ctrl = 'URL' did not work (forum topic 25811)
+  - bugfix Debug Console could display incorrect data when using subtemplates
+
+ 09.12.2015
+  - bugfix Smarty did fail under PHP 7.0.0 with use_include_path = true;
+
+ 09.12.2015
+  - bugfix {strip} should exclude some html tags from stripping, related to fix for https://github.com/smarty-php/smarty/issues/111
+
+ 08.12.2015
+  - bugfix internal template function data got stored in wrong compiled file https://github.com/smarty-php/smarty/issues/114
+
+ 05.12.2015
+  -bugfix {strip} should insert a single space https://github.com/smarty-php/smarty/issues/111
+
+ 25.11.2015
+  -bugfix a left delimter like '[%' did fail on [%$var_[%$variable%]%] (forum topic 25798)
+
+ 02.11.2015
+  - bugfix {include} with variable file name like {include file="foo_`$bar`.tpl"} did fail in 3.1.28-dev https://github.com/smarty-php/smarty/issues/102
+
+ 01.11.2015
+  - update config file processing
+
+ 31.10.2015
+  - bugfix add missing $trusted_dir property to SmartyBC class (forum topic 25751)
+
+ 29.10.2015
+  - improve template scope handling
+
+ 24.10.2015
+  - more optimizations of template processing
+  - bugfix Error when using {include} within {capture} https://github.com/smarty-php/smarty/issues/100
+
+ 21.10.2015
+  - move some code into runtime extensions
+
+ 18.10.2015
+  - optimize filepath normalization
+  - rework of template inheritance
+  - speed and size optimizations
+  - bugfix under HHVM temporary cache file must only be created when caches template was updated
+  - fix compiled code for new {block} assign attribute
+  - update code generated by template function call handler
+
+ 18.09.2015
+  - bugfix {if $foo instanceof $bar} failed to compile if 2nd value is a variable https://github.com/smarty-php/smarty/issues/92
+
+ 17.09.2015
+  - bugfix {foreach} first attribute was not correctly reset since commit 05a8fa2 of 02.08.2015 https://github.com/smarty-php/smarty/issues/90
+
+ 16.09.2015
+  - update compiler by moving no longer needed properties, code optimizations and other
+
+ 14.09.2015
+  - optimize autoloader
+  - optimize subtemplate handling
+  - update template inheritance processing
+  - move code of {call} processing back into Smarty_Internal_Template class
+  - improvement invalidate OPCACHE for cleared compiled and cached template files (forum topic 25557)
+  - bugfix unintended multiple debug windows (forum topic 25699)
+
+ 30.08.2015
+  - size optimization move some runtime functions into extension
+  - optimize inline template processing
+  - optimization merge inheritance child and parent templates into one compiled template file
+
+ 29.08.2015
+  - improvement convert template inheritance into runtime processing
+  - bugfix {$smarty.block.parent} did always reference the root parent block https://github.com/smarty-php/smarty/issues/68
+
+ 23.08.2015
+  - introduce Smarty::$resource_cache_mode and cache template object of {include} inside loop
+  - load seldom used Smarty API methods dynamically to reduce memory footprint
+  - cache template object of {include} if same template is included several times
+  - convert debug console processing to object
+  - use output buffers for better performance and less memory usage
+  - optimize nocache hash processing
+  - remove not really needed properties
+  - optimize rendering
+  - move caching to Smarty::_cache
+  - remove properties with redundant content
+  - optimize Smarty::templateExists()
+  - optimize use_include_path processing
+  - relocate properties for size optimization
+  - remove redundant code
+  - bugfix compiling super globals like {$smarty.get.foo} did fail in the master branch https://github.com/smarty-php/smarty/issues/77
+
+ 06.08.2015
+  - avoid possible circular object references caused by parser/lexer objects
+  - rewrite compileAll... utility methods
+  - commit several  internal improvements
+  - bugfix Smarty failed when compile_id did contain "|"
+
+ 03.08.2015
+  - rework clear cache methods
+  - bugfix compileAllConfig() was broken since 3.1.22 because of the changes in config file processing
+  - improve getIncludePath() to return directory if no file was given
+
+ 02.08.2015
+  - optimization and code cleanup of {foreach} and {section} compiler
+  - rework {capture} compiler
+
+ 01.08.2015
+  - update DateTime object can be instance of DateTimeImmutable since PHP5.5 https://github.com/smarty-php/smarty/pull/75
+  - improvement show resource type and start of template source instead of uid on eval: and string: resource (forum topic 25630)
+
+ 31.07.2015
+  - optimize {foreach} and {section} compiler
+
+ 29.07.2015
+  - optimize {section} compiler for speed and size of compiled code
+
+ 28.07.2015
+  - update for PHP 7 compatibility
+
+ 26.07.2015
+  - improvement impement workaround for HHVM PHP incompatibillity https://github.com/facebook/hhvm/issues/4797
+
+ 25.07.2015
+  - bugfix parser did hang on text starting <?something https://github.com/smarty-php/smarty/issues/74
+
+ 20.07.2015
+  - bugfix config files got recompiled on each request
+  - improvement invalidate PHP 5.5 opcache for recompiled and cached templates  https://github.com/smarty-php/smarty/issues/72
+
+ 12.07.2015
+  - optimize {extends} compilation
+
+ 10.07.2015
+  - bugfix force file: resource in demo resource.extendsall.php
+
+ 08.07.2015
+  - bugfix convert each word of class names to ucfirst in in compiler. (forum topic 25588)
+
+ 07.07.2015
+  - improvement allow fetch() or display() called on a template object to get output from other template
+     like $template->fetch('foo.tpl') https://github.com/smarty-php/smarty/issues/70
+  - improvement Added $limit parameter to regex_replace modifier #71
+  - new feature multiple indices on file: resource
+
+ 06.07.2015
+  - optimize {block} compilation
+  - optimization get rid of __get and __set in source object
+
+ 01.07.2015
+  - optimize compile check handling
+  - update {foreach} compiler
+  - bugfix debugging console did not display string values containing \n, \r or \t correctly https://github.com/smarty-php/smarty/issues/66
+  - optimize source resources
+
+ 28.06.2015
+  - move $smarty->enableSecurity() into Smarty_Security class
+  - optimize security isTrustedResourceDir()
+  - move auto load filter methods into extension
+  - move $smarty->getTemplateVars() into extension
+  - move getStreamVariable() into extension
+  - move $smarty->append() and $smarty->appendByRef() into extension
+  - optimize autoloader
+  - optimize file path normalization
+  - bugfix PATH_SEPARATOR was replaced by mistake in autoloader
+  - remove redundant code
+
+ 27.06.2015
+  - bugfix resolve naming conflict between custom Smarty delimiter '<%' and PHP ASP tags https://github.com/smarty-php/smarty/issues/64
+  - update $smarty->_realpath for relative path not starting with './'
+  - update Smarty security with new realpath handling
+  - update {include_php} with new realpath handling
+  - move $smarty->loadPlugin() into extension
+  - minor compiler optimizations
+  - bugfix allow function plugins with name ending with 'close' https://github.com/smarty-php/smarty/issues/52
+  - rework of $smarty->clearCompiledTemplate() and move it to its own extension
+
+ 19.06.2015
+  - improvement allow closures as callback at $smarty->registerFilter() https://github.com/smarty-php/smarty/issues/59
+
+ - 3.1.27- (18.06.2015)
+ 18.06.2015
+  - bugfix another update on file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56
+
+ - 3.1.26- (18.06.2015)
+ 18.06.2015
+  - bugfix file path normalization failed on path containing something like "/.foo/" https://github.com/smarty-php/smarty/issues/56
+
+ 17.06.2015
+  - bugfix calling a plugin with nocache option but no other attributes like {foo nocache} caused call to undefined function https://github.com/smarty-php/smarty/issues/55
+
+ - 3.1.25- (15.06.2015)
+ 15.06.2015
+  - optimization of smarty_cachereource_keyvaluestore.php code
+
+ 14.06.2015
+  - bugfix a relative sub template path could fail if template_dir path did contain /../ https://github.com/smarty-php/smarty/issues/50
+  - optimization rework of path normalization
+  - bugfix an output tag with variable, modifier followed by an operator like {$foo|modifier+1} did fail https://github.com/smarty-php/smarty/issues/53
+
+ 13.06.2015
+  - bugfix a custom cache resource using smarty_cachereource_keyvaluestore.php did fail if php.ini mbstring.func_overload = 2 (forum topic 25568)
+
+ 11.06.2015
+  - bugfix the lexer could hang on very large quoted strings (forum topic 25570)
+
+ 08.06.2015
+  - bugfix using {$foo} as array index like $bar.{$foo} or in double quoted string like "some {$foo} thing" failed https://github.com/smarty-php/smarty/issues/49
+
+ 04.06.2015
+  - bugfix possible error message on unset() while compiling {block} tags https://github.com/smarty-php/smarty/issues/46
+
+ 01.06.2015
+  - bugfix <?xml ... ?> including template variables broken  since 3.1.22 https://github.com/smarty-php/smarty/issues/47
+
+ 27.05.2015
+  - bugfix {include} with variable file name must not create by default individual cache file (since 3.1.22) https://github.com/smarty-php/smarty/issues/43
+
+ 24.05.2015
+  - bugfix if condition string 'neq' broken due to a typo https://github.com/smarty-php/smarty/issues/42
+
+ - 3.1.24- (23.05.2015)
+ 23.05.2015
+  - improvement on php_handling to allow very large PHP sections, better error handling
+  - improvement allow extreme large comment sections (forum 25538)
+
+ 21.05.2015
+  - bugfix broken PHP 5.2 compatibility when compiling <?php tags https://github.com/smarty-php/smarty/issues/40
+  - bugfix named {foreach} comparison like $smarty.foreach.foobar.index > 1 did compile into wrong code https://github.com/smarty-php/smarty/issues/41
+
+ 19.05.2015
+  - bugfix compiler did overwrite existing variable value when setting the nocache attribute https://github.com/smarty-php/smarty/issues/39
+  - bugfix output filter trimwhitespace could run into the pcre.backtrack_limit on large output (code.google issue 220)
+  - bugfix compiler could run into the pcre.backtrack_limit on larger comment or {php} tag sections (forum 25538)
+
+ 18.05.2015
+  - improvement introduce shortcuts in lexer/parser rules for most frequent terms for higher
+    compilation speed
+
+ 16.05.2015
+  - bugfix {php}{/php} did work just for single lines https://github.com/smarty-php/smarty/issues/33
+  - improvement remove not needed ?><?php transitions from compiled code
+  - improvement reduce number of lexer tokens on operators and if conditions
+  - improvement higher compilation speed by modified lexer/parser generator at "smarty/smarty-lexer"
+
+ 13.05.2015
+  - improvement remove not needed ?><?php transitions from compiled code
+  - improvement of debugging:
+      - use fresh Smarty object to display the debug console because of possible problems when the Smarty
+        was extended or Smarty properties had been modified in the class source
+      - display Smarty version number
+      - Truncate lenght of Origin display and extend strin value display to 80 character
+  - bugfix in Smarty_Security  'nl2br' should be a trusted modifier, not PHP function (code.google issue 223)
+
+ 12.05.2015
+  - bugfix {$smarty.constant.TEST} did fail  on undefined constant https://github.com/smarty-php/smarty/issues/28
+  - bugfix access to undefined config variable like {#undef#} did fail https://github.com/smarty-php/smarty/issues/29
+  - bugfix in nested {foreach} saved item attributes got overwritten https://github.com/smarty-php/smarty/issues/33
+
+ - 3.1.23 - (12.05.2015)
+ 12.05.2015
+  - bugfix of smaller performance issue introduce in 3.1.22 when caching is enabled
+  - bugfix missig entry for smarty-temmplate-config in autoloader
+
+ - 3.1.22 - tag was deleted because 3.1.22 did fail caused by the missing entry for smarty-temmplate-config in autoloader
+ 10.05.2015
+  - bugfix custom cache resource did not observe compile_id and cache_id when $cache_locking == true
+  - bugfix cache lock was not handled correctly after timeout when $cache_locking == true
+  - improvement added constants for $debugging
+
+ 07.05.2015
+  - improvement of the debugging console. Read NEW_FEATURES.txt
+  - optimization of resource class loading
+
+ 06.05.2015
+  - bugfix in 3.1.22-dev cache resource must not be loaded for subtemplates
+  - bugfix/improvement in 3.1.22-dev cache locking did not work as expected
+
+ 05.05.2015
+  - optimization on cache update when main template is modified
+  - optimization move <?php ?> handling from parser to new compiler module
+
+ 05.05.2015
+  - bugfix code could be messed up when {tags} are used in multiple attributes https://github.com/smarty-php/smarty/issues/23
+
+ 04.05.2015
+  - bugfix Smarty_Resource::parseResourceName incompatible with Google AppEngine (https://github.com/smarty-php/smarty/issues/22)
+  - improvement use is_file() checks to avoid errors suppressed by @ which could still cause problems (https://github.com/smarty-php/smarty/issues/24)
+
+ 28.04.2015
+  - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508) 2nd fix
+
+ 28.04.2015
+  - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508)
+
+ 23.04.2015
+  - bugfix a nocache template variable used as parameter at {insert} was by mistake cached
+
+ 20.04.2015
+  - bugfix at a template function containing nocache code a parmeter could overwrite a template variable of same name
+
+ 27.03.2015
+  - bugfix Smarty_Security->allow_constants=false; did also disable true, false and null (change of 16.03.2015)
+  - improvement added a whitelist for trusted constants to security Smarty_Security::$trusted_constants (forum topic 25471)
+
+ 20.03.2015
+  - bugfix make sure that function properties get saved only in compiled files containing the fuction definition {forum topic 25452}
+  - bugfix correct update of global variable values on exit of template functions. (reported under Smarty Developers)
+
+ 16.03.2015
+ - bugfix  problems with {function}{/function} and {call} tags in different subtemplate cache files {forum topic 25452}
+ - bugfix  Smarty_Security->allow_constants=false; did not disallow direct usage of defined constants like {SMARTY_DIR} {forum topic 25457}
+ - bugfix  {block}{/block} tags did not work inside double quoted strings https://github.com/smarty-php/smarty/issues/18
+
+
+ 15.03.2015
+ - bugfix  $smarty->compile_check must be restored before rendering of a just updated cache file {forum 25452}
+
+ 14.03.2015
+ - bugfix  {nocache}  {/nocache} tags corrupted code when used within a nocache section caused by a nocache template variable.
+
+ - bugfix  template functions defined with {function} in an included subtemplate could not be called in nocache
+           mode with {call... nocache} if the subtemplate had it's own cache file {forum 25452}
+
+ 10.03.2015
+ - bugfix {include ... nocache} whith variable file or compile_id attribute was not executed in nocache mode.
+
+ 12.02.2015
+ - bugfix multiple Smarty::fetch() of same template when $smarty->merge_compiled_includes = true; could cause function already defined error
+
+ 11.02.2015
+ - bugfix recursive {includes} did create E_NOTICE message when $smarty->merge_compiled_includes = true; (github issue #16)
+
+ 22.01.2015
+ - new feature security can now control access to static methods and properties
+                see also NEW_FEATURES.txt
+
+ 21.01.2015
+ - bugfix clearCompiledTemplates(), clearAll() and clear() could try to delete whole drive at wrong path permissions because realpath() fail (forum 25397)
+ - bugfix 'self::' and 'parent::' was interpreted in template syntax as static class
+
+ 04.01.2015
+ - push last weeks changes to github
+
+ - different optimizations
+ - improvement automatically create different versions of compiled templates and config files depending
+   on property settings.
+ - optimization restructure template processing by moving code into classes it better belongs to
+ - optimization restructure config file processing
+
+ 31.12.2014
+ - bugfix use function_exists('mb_get_info') for setting Smarty::$_MBSTRING.
+   Function mb_split could be overloaded depending on php.ini mbstring.func_overload
+
+
+ 29.12.2014
+ - new feature security can now limit the template nesting level by property $max_template_nesting
+                see also NEW_FEATURES.txt (forum 25370)
+
+ 29.12.2014
+ - new feature security can now disable special $smarty variables listed in property $disabled_special_smarty_vars
+                see also NEW_FEATURES.txt (forum 25370)
+
+ 27.12.2014
+  - bugfix clear internal _is_file_cache when plugins_dir was modified
+
+ 13.12.2014
+  - improvement optimization of lexer and parser resulting in a up to 30% higher compiling speed
+
+ 11.12.2014
+  - bugfix resolve parser ambiguity between constant print tag {CONST} and other smarty tags after change of 09.12.2014
+
+ 09.12.2014
+  - bugfix variables $null, $true and $false did not work after the change of 12.11.2014 (forum 25342)
+  - bugfix call of template function by a variable name did not work after latest changes (forum 25342)
+
+ 23.11.2014
+  - bugfix a plugin with attached modifier could fail if the tag was immediately followed by another Smarty tag (since 3.1.21) (forum 25326)
+
+ 13.11.2014
+  - improvement move autoload code into Autoloader.php. Use Composer autoloader when possible
+
+ 12.11.2014
+ - new feature added support of namespaces to template code
+
+ 08.11.2014 - 10.11.2014
+ - bugfix subtemplate called in nocache mode could be called with wrong compile_id when it did change on one of the calling templates
+ - improvement add code of template functions called in nocache mode dynamically to cache file (related to bugfix of 01.11.2014)
+ - bugfix Debug Console did not include all data from merged compiled subtemplates
+
+ 04.11.2014
+ - new feature $smarty->debugging = true; => overwrite existing Debug Console window (old behaviour)
+               $smarty->debugging = 2; => individual Debug Console window by template name
+
+ 03.11.2014
+ - bugfix Debug Console did not show included subtemplates since 3.1.17 (forum 25301)
+ - bugfix Modifier debug_print_var did not limit recursion or prevent recursive object display at Debug Console
+    (ATTENTION: parameter order has changed to be able to specify maximum recursion)
+ - bugfix Debug consol did not include subtemplate information with $smarty->merge_compiled_includes = true
+ - improvement The template variables are no longer displayed as objects on the Debug Console
+ - improvement $smarty->createData($parent = null, $name = null) new optional name parameter for display at Debug Console
+ - addition of some hooks for future extension of Debug Console
+
+ 01.11.2014
+ - bugfix and enhancement on subtemplate {include} and template {function} tags.
+   * Calling a template which has a nocache section could fail if it was called from a cached and a not cached subtemplate.
+   * Calling the same subtemplate cached and not cached with the $smarty->merge_compiled_includes enabled could cause problems
+   * Many smaller related changes
+
+ 30.10.2014
+ - bugfix access to class constant by object like {$object::CONST} or variable class name {$class::CONST} did not work (forum 25301)
+
+ 26.10.2014
+ - bugfix E_NOTICE message was created during compilation when ASP tags '<%' or '%>' are in template source text
+ - bugfix merge_compiled_includes option failed when caching  enables and same subtemplate was included cached and not cached
+
+ - 3.1.21 - (18.10.2014)
+ 18.10.2014
+  - composer moved to github
+
+ 17.10.2014
+ - bugfix on $php_handling security and optimization of smarty_internal_parsetree (Thue Kristensen)
+
+ 16.10.2014
+ - bugfix composer.json update
+
+ 15.10.2014
+ - bugfix calling a new created cache file with fetch() and Smarty::CACHING_LIFETIME_SAVED multiple times did fail (forum 22350)
+
+ 14.10.2014
+ - bugfix any tag placed within "<script language=php>" will throw a security exception to close all thinkable holes
+ - bugfix classmap in root composer.json should start at "libs/..."
+ - improvement cache is_file(file_exists) results of loadPlugin() to avoid unnecessary calls during compilation (Issue 201}
+
+ 12.10.2014
+ - bugfix a comment like "<script{*foo*} language=php>" bypassed $php_handling checking (Thue Kristensen)
+ - bugfix change of 08.10.2014 could create E_NOTICE meassage when using "<?php" tags
+ - bugfix "<script language=php>" with $php_handling PHP_PASSTHRU was executed in {nocache} sections
+
+ - 3.1.20 - (09.10.2014)
+ 08.10.2014
+ - bugfix security mode of "<script language=php>" must be controlled by $php_handling property (Thue Kristensen)
+
+ 01.10.2014
+ - bugfix template resource of inheritance blocks could get invalid if the default resource type is not 'file'(Issue 202)
+ - bugfix existing child {block} tag must override parent {block} tag append / prepend setting (topic 25259)
+
+ 02.08.2014
+ - bugfix modifier wordwrap did output break string wrong if first word was exceeding length with cut = true (topic 25193)
+
+ 24.07.2014
+ - bugfix cache clear when cache folder does not exist
+
+ 16.07.2014
+ - enhancement remove BOM automatically from template source (topic 25161)
+
+ 04.07.2014
+ - bugfix the bufix of 02.06.2014 broke correct handling of child templates with same name but different template folders in extends resource (issue 194 and topic 25099)
+
+ - 3.1.19 - (30.06.2014)
+ 20.06.2014
+ - bugfix template variables could not be passed as parameter in {include} when the include was in a {nocache} section (topic 25131)
+
+ 17.06.2014
+ - bugfix large template text of some charsets could cause parsing errors (topic 24630)
+
+ 08.06.2014
+ - bugfix registered objects did not work after spelling fixes of 06.06.2014
+ - bugfix {block} tags within {literal} .. {/literal} got not displayed correctly (topic 25024)
+ - bugfix UNC WINDOWS PATH like "\\psf\path\to\dir" did not work as template directory (Issue 192)
+ - bugfix {html_image} security check did fail on files relative to basedir (Issue 191)
+
+ 06.06.2014
+ - fixed PHPUnit outputFilterTrimWhitespaceTests.php assertion of test result
+ - fixed spelling, PHPDoc , minor errors, code cleanup
+
+ 02.06.2014
+ - using multiple cwd with relative template dirs could result in identical compiled file names. (issue 194 and topic 25099)
+
+ 19.04.2014
+ - bugfix calling createTemplate(template, data) with empty data array caused notice of array to string conversion (Issue 189)
+ - bugfix clearCompiledTemplate() did not delete files on WINDOWS when a compile_id was specified
+
+ 18.04.2014
+ - revert bugfix of 5.4.2014 because %-e date format is not supported on all operating systems
+
+ - 3.1.18 - (07.04.2014)
+ 06.04.2014
+ - bugfix template inheritance fail when using custom resource after patch of 8.3.2014 (Issue 187)
+ - bugfix update of composer file (Issue 168 and 184)
+
+ 05.04.2014
+ - bugfix default date format leads to extra spaces when displaying dates with single digit days (Issue 165)
+
+ 26.03.2014
+ - bugfix Smart_Resource_Custom should not lowercase the resource name (Issue 183)
+
+ 24.03.2014
+ - bugfix using a {foreach} property like @iteration could fail when used in inheritance parent templates (Issue 182)
+
+ 20.03.2014
+ - bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899)
+
+ 18.03.2014
+ - revert change of 17.03.2014
+
+17.03.2014
+ - bugfix $smarty->auto_literal and mbsting.func_overload 2, 6 or 7 did fail (forum topic 24899)
+
+ 15.03.2014
+ - bugfix Smarty_CacheResource_Keyvaluestore did use different keys on read/writes and clearCache() calls (Issue 169)
+
+ 13.03.2014
+ - bugfix clearXxx() change of 27.1.2014 did not work when specifing cache_id or compile_id  (forum topic 24868 and 24867)
+
+ - 3.1.17 -
+ 08.03.2014
+ - bugfix relative file path {include} within {block} of child templates did throw exception on first call (Issue 177)
+
+ 17.02.2014
+ - bugfix Smarty failed when executing PHP on HHVM (Hip Hop 2.4) because uniqid('',true) does return string with ',' (forum topic 20343)
+
+ 16.02.2014
+ - bugfix a '//' or '\\' in template_dir path could produce wrong path on relative filepath in {include} (Issue 175)
+
+ 05.02.2014
+ - bugfix shared.literal_compiler_param.php did throw an exception when literal did contain a '-' (smarty-developers group)
+
+ 27.01.2014
+ - bugfix $smarty->debugging = true; did show the variable of the $smarty object not the variables used in display() call (forum topic 24764)
+ - bugfix clearCompiledTemplate(), clearAll() and clear() should use realpath to avoid possible exception from RecursiveDirectoryIterator (Issue 171)
+
+ 26.01.2014
+ - bugfix  undo block nesting checks for {nocache} for reasons like forum topic 23280 (forum topic 24762)
+
+ 18.01.2014
+ - bugfix the compiler did fail when using template inheritance and recursive {include} (smarty-developers group)
+
+ 11.01.2014
+ - bugfix "* }" (spaces before right delimiter) was interpreted by mistake as comment end tag (Issue 170)
+ - internals  content cache should be clear when updating cache file
+
+ 08.01.2014
+ - bugfix Smarty_CacheResource_Custom did not handle template resource type specifications on clearCache() calls (Issue 169)
+ - bugfix SmartyBC.class.php should use require_once to load Smarty.class.php (forum topic 24683)
+
+ - 3.1.16 -
+ 15.12.2013
+ - bugfix {include} with {block} tag handling (forum topic 24599, 24594, 24682) (Issue 161)
+   Read 3.1.16_RELEASE_NOTES for more details
+ - enhancement additional debug output at $smarty->_parserdebug = true;
+
+ 07.11.2013
+ - bugfix too restrictive handling of {include} within {block} tags. 3.1.15 did throw errors where 3.1.14 did not (forum topic 24599)
+ - bugfix compiler could fail if PHP mbstring.func_overload is enabled  (Issue 164)
+
+ 28.10.2013
+ - bugfix variable resource name at custom resource plugin did not work within {block} tags (Issue 163)
+ - bugfix notice "Trying to get property of non-object" removed (Issue 163)
+ - bugfix correction of modifier capitalize fix from 3.10.2013  (issue 159)
+ - bugfix multiple {block}s with same name in parent did not work (forum topic 24631)
+
+ 20.10.2013
+ - bugfix a variable file name at {extends} tag did fail (forum topic 24618)
+
+ 14.10.2013
+ - bugfix yesterdays fix could result in an undefined variable
+
+ 13.10.2013
+ - bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24594) (Issue 161)
+.- bugfix relative includes with same name like {include './foo.tpl'} from different folder failed (forum topic 24590)(Issue 161)
+
+ 04.10.2013
+ - bugfix variable file names at {extends} had been disbabled by mistake with the rewrite of
+   template inheritance of 24.08.2013   (forum topic 24585)
+
+03.10.2013
+ - bugfix loops using modifier capitalize did eat up memory (issue 159)
+
+ - Smarty 3.1.15 -
+01.10.2013
+ - use current delimiters in compiler error messages (issue 157)
+ - improvement on performance when using error handler and multiple template folders (issue 152)
+
+17.09.2013
+ - improvement added patch for additional SmartyCompilerException properties for better access to source information (forum topic 24559)
+
+16.09.2013
+ - bugfix recompiled templates did not show on first request with zend opcache cache (forum topic 24320)
+
+13.09.2013
+ - bugfix html_select_time defaulting error for the Meridian dropdown (forum topic 24549)
+
+09.09.2012
+- bugfix incorrect compiled code with array(object,method) callback at registered Variable Filter (forum topic 24542)
+
+27.08.2013
+- bugfix delimiter followed by linebreak did not work as auto literal after update from 24.08.2013 (forum topic 24518)
+
+24.08.2013
+- bugfix and enhancement
+  Because several recent problems with template inheritance the {block} tag compiler has been rewriten
+   - Error messages shown now the correct child template file and line number
+   - The compiler could fail on some larger UTF-8 text block (forum topic 24455)
+   - The {strip} tag can now be placed outside {block} tags in child templates (forum topic 24289)
+- change SmartyException::$escape  is now false by default
+- change PHP traceback has been remove for SmartyException and SmartyCompilerException
+
+14.08.2013
+- bugfix compiled filepath of config file did not observe different config_dir (forum topic 24493)
+
+13.08.2013
+- bugfix the internal resource cache did not observe config_dir changes (forum topic 24493)
+
+12.08.2013
+- bugfix internal $tmpx variables must be unique over all inheritance templates (Issue 149)
+
+10.08.2013
+- bugfix a newline was eaten when a <?xml ... ?> was passed by a Smarty variable and caching was enabled (forum topic 24482)
+
+29.07.2013
+- bugfix headers already send warning thrown when using 'SMARTY_DEBUG=on' from URL (Issue 148)
+
+27.07.2013
+- enhancement allow access to properties of registered opjects for Smarty2 BC (forum topic 24344)
+
+26.07.2013
+- bugfix template inheritance nesting problem (forum topic 24387)
+
+15.7.2013
+- update code generated by PSR-2 standards fixer which introduced PHP 5.4 incompatibilities of 14.7.2013
+
+14.7.2013
+- bugfix increase of internal maximum parser stacksize to allow more complex tag code {forum topic 24426}
+- update for PHP 5.4 compatibility
+- reformat source to PSR-2 standard
+
+12.7.2013
+- bugfix Do not remove '//' from file path at normalization (Issue 142)
+
+2.7.2013
+- bugfix trimwhitespace would replace captured items in wrong order (forum topic 24387)
+
+## Smarty-3.1.14 -
+27.06.2013
+- bugfix removed PHP 5.5 deprecated preg_replace /e option in modifier capitalize (forum topic 24389)
+
+17.06.2013
+- fixed spelling in sources and documentation (from smarty-developers forum Veres Lajos)
+- enhancement added constant SMARTY::CLEAR_EXPIRED for the change of 26.05.2013 (forum topic 24310)
+- bugfix added smarty_security.php to composer.json (Issue 135)
+
+26.05.2013
+- enhancement an expire_time of -1 in clearCache() and clearAllCache() will delete outdated cache files
+  by their individual cache_lifetime used at creation (forum topic 24310)
+
+21.05.2013
+- bugfix modifier strip_tags:true was compiled into wrong code (Forum Topic 24287)
+- bugfix /n after ?> in Smarty.class.php did start output buffering (Issue 138)
+
+25.04.2013
+- bugfix escape and wordrap modifier could be compiled into wrong code when used in {nocache}{/nocache}
+  section but caching is disabled  (Forum Topic 24260)
+
+05.04.2013
+- bugfix post filter must not run when compiling inheritance child blocks (Forum Topic 24094)
+- bugfix after the fix for Issue #130 compiler exceptions got double escaped (Forum Topic 24199)
+
+28.02.2013
+- bugfix nocache blocks could be lost when using CACHING_LIFETIME_SAVED (Issue #133)
+- bugfix Compile ID gets nulled when compiling child blocks (Issue #134)
+
+
+24.01.2013
+- bugfix wrong tag type in smarty_internal_templatecompilerbase.php could cause wrong plugin search order (Forum Topic 24028)
+
+## Smarty-3.1.13 -
+13.01.2013
+- enhancement allow to disable exception message escaping by SmartyException::$escape = false;  (Issue #130)
+
+09.01.2013
+- bugfix compilation did fail when a prefilter did modify an {extends} tag c
+- bugfix template inheritance could fail if nested {block} tags in childs did contain {$smarty.block.child} (Issue #127)
+- bugfix template inheritance could fail if {block} tags in childs did have similar name as used plugins (Issue #128)
+- added abstract method declaration doCompile() in Smarty_Internal_TemplateCompilerBase (Forum Topic 23969)
+
+06.01.2013
+- Allow '://' URL syntax in template names of stream resources  (Issue #129)
+
+27.11.2012
+- bugfix wrong variable usage in smarty_internal_utility.php (Issue #125)
+
+26.11.2012
+- bugfix global variable assigned within template function are not seen after template function exit (Forum Topic 23800)
+
+24.11.2012
+- made SmartyBC loadable via composer (Issue #124)
+
+20.11.2012
+- bugfix assignGlobal() called from plugins did not work (Forum Topic 23771)
+
+13.11.2012
+- adding attribute "strict" to html_options, html_checkboxes, html_radios to only print disabled/readonly attributes if their values are true or "disabled"/"readonly" (Issue #120)
+
+01.11.2012
+- bugfix muteExcpetedErrors() would screw up for non-readable paths (Issue #118)
+
+## Smarty-3.1.12  -
+14.09.2012
+- bugfix template inheritance failed to compile with delimiters {/ and /} (Forum Topic 23008)
+
+11.09.2012
+- bugfix escape Smarty exception messages to avoid possible script execution
+
+10.09.2012
+- bugfix tag option flags and shorttag attributes did not work when rdel started with '=' (Forum Topic 22979)
+
+31.08.2012
+- bugfix resolving relative paths broke in some circumstances (Issue #114)
+
+22.08.2012
+- bugfix test MBString availability through mb_split, as it could've been compiled without regex support (--enable-mbregex).
+  Either we get MBstring's full package, or we pretend it's not there at all.
+
+21.08.2012
+- bugfix $auto_literal = false did not work with { block} tags in child templates
+  (problem was reintroduced after fix in 3.1.7)(Forum Topic 20581)
+
+17.08.2012
+- bugfix compiled code of nocache sections could contain wrong escaping (Forum Topic 22810)
+
+15.08.2012
+- bugfix template inheritance did produce wrong code if subtemplates with {block} was
+  included several times (from smarty-developers forum)
+
+14.08.2012
+- bugfix PHP5.2 compatibility compromised by SplFileInfo::getBasename() (Issue 110)
+
+01.08.2012
+- bugfix avoid PHP error on $smarty->configLoad(...) with invalid section specification (Forum Topic 22608)
+
+30.07.2012
+-bugfix {assign} in a nocache section should not overwrite existing variable values
+   during compilation (issue 109)
+
+28.07.2012
+- bugfix array access of config variables did not work (Forum Topic 22527)
+
+19.07.2012
+- bugfix the default plugin handler did create wrong compiled code for static class methods
+  from external script files (issue 108)
+
+## Smarty-3.1.11 -
+30.06.2012
+- bugfix {block.. hide} did not work as nested child (Forum Topic 22216)
+
+25.06.2012
+- bugfix the default plugin handler did not allow static class methods for modifier (issue 85)
+
+24.06.2012
+- bugfix escape modifier support for PHP < 5.2.3 (Forum Topic 21176)
+
+11.06.2012
+- bugfix the patch for Topic 21856 did break tabs between tag attributes (Forum Topic 22124)
+
+## Smarty-3.1.10  -
+09.06.2012
+- bugfix the compiler did ignore registered compiler plugins for closing tags (Forum Topic 22094)
+- bugfix the patch for Topic 21856 did break multiline tags (Forum Topic 22124)
+
+## Smarty-3.1.9 -
+07.06.2012
+- bugfix fetch() and display() with relative paths (Issue 104)
+- bugfix treat "0000-00-00" as 0 in modifier.date_format (Issue 103)
+
+24.05.2012
+- bugfix Smarty_Internal_Write_File::writeFile() could cause race-conditions on linux systems (Issue 101)
+- bugfix attribute parameter names of plugins may now contain also "-"  and ":"  (Forum Topic 21856)
+- bugfix add compile_id to cache key of of source (Issue 97)
+
+22.05.2012
+- bugfix recursive {include} within {section} did fail (Smarty developer group)
+
+12.05.2012
+- bugfix {html_options} did not properly escape values (Issue 98)
+
+03.05.2012
+- bugfix make HTTP protocall version variable (issue 96)
+
+02.05.2012
+- bugfix  {nocache}{block}{plugin}... did produce wrong compiled code when caching is disabled (Forum Topic 21572, issue 95)
+
+12.04.2012
+- bugfix Smarty did eat the linebreak after the <?xml...?> closing tag (Issue 93)
+- bugfix concurrent cache updates could create a warning (Forum Topic 21403)
+
+08.04.2012
+- bugfix "\\" was not escaped correctly when generating nocache code (Forum Topic 21364)
+
+30.03.2012
+- bugfix template inheritance did  not throw exception when a parent template was deleted (issue 90)
+
+27.03.2012
+- bugfix prefilter did run multiple times on inline subtemplates compiled into several main templates (Forum Topic 21325)
+- bugfix implement Smarty2's behaviour of variables assigned by reference in SmartyBC. {assign} will affect all references.
+  (issue 88)
+
+21.03.2012
+- bugfix compileAllTemplates() and compileAllConfig() did not return the number of compiled files (Forum Topic 21286)
+
+13.03.2012
+- correction of yesterdays bugfix (Forum Topic 21175 and 21182)
+
+12.03.2012
+- bugfix a double quoted string of "$foo" did not compile into PHP "$foo" (Forum Topic 21175)
+- bugfix template inheritance did set $merge_compiled_includes globally true
+
+03.03.2012
+- optimization of compiling speed when same modifier was used several times
+
+02.03.2012
+- enhancement the default plugin handler can now also resolve undefined modifier (Smarty::PLUGIN_MODIFIER)
+  (Issue 85)
+
+## Smarty-3.1.8  -
+19.02.2012
+- bugfix {include} could result in a fatal error if used in appended or prepended nested {block} tags
+  (reported by mh and Issue 83)
+- enhancement added Smarty special variable $smarty.template_object to return the current template object (Forum Topic 20289)
+
+
+07.02.2012
+- bugfix increase entropy of internal function names in compiled and cached template files (Forum Topic 20996)
+- enhancement cacheable parameter added to default plugin handler, same functionality as in registerPlugin (request by calguy1000)
+
+06.02.2012
+- improvement stream_resolve_include_path() added to Smarty_Internal_Get_Include_Path (Forum Topic 20980)
+- bugfix fetch('extends:foo.tpl') always yielded $source->exists == true (Forum Topic 20980)
+- added modifier unescape:"url", fix (Forum Topic 20980)
+- improvement replaced some calls of preg_replace with str_replace (Issue 73)
+
+30.01.2012
+- bugfix Smarty_Security internal $_resource_dir cache wasn't properly propagated
+
+27.01.2012
+- bugfix Smarty did not a template name of "0" (Forum Topic 20895)
+
+20.01.2012
+- bugfix typo in Smarty_Internal_Get_IncludePath did cause runtime overhead (Issue 74)
+- improvment remove unneeded assigments (Issue 75 and 76)
+- fixed typo in template parser
+- bugfix output filter must not run before writing cache when template does contain nocache code (Issue 71)
+
+02.01.2012
+- bugfix {block foo nocache} did not load plugins within child {block} in nocache mode (Forum Topic 20753)
+
+29.12.2011
+- bugfix enable more entropy in Smarty_Internal_Write_File for "more uniqueness" and Cygwin compatibility (Forum Topic 20724)
+- bugfix embedded quotes in single quoted strings did not compile correctly in {nocache} sections (Forum Topic 20730)
+
+28.12.2011
+- bugfix Smarty's internal header code must be excluded from postfilters (issue 71)
+
+22.12.2011
+- bugfix the new lexer of 17.12.2011 did fail if mbstring.func_overload != 0 (issue 70) (Forum Topic 20680)
+- bugfix template inheritace did fail if mbstring.func_overload != 0 (issue 70) (Forum Topic 20680)
+
+20.12.2011
+- bugfix template inheritance: {$smarty.block.child} in nested child {block} tags did not return
+  content after {$smarty.block.child} (Forum Topic 20564)
+
+## Smarty-3.1.7 -
+18.12.2011
+- bugfix strings ending with " in multiline strings of config files failed to compile (issue #67)
+- added chaining to Smarty_Internal_Templatebase
+- changed unloadFilter() to not return a boolean in favor of chaining and API conformity
+- bugfix unregisterObject() raised notice when object to unregister did not exist
+- changed internals to use Smarty::$_MBSTRING ($_CHARSET, $_DATE_FORMAT) for better unit testing
+- added Smarty::$_UTF8_MODIFIER for proper PCRE charset handling (Forum Topic 20452)
+- added Smarty_Security::isTrustedUri() and Smarty_Security::$trusted_uri to validate
+  remote resource calls through {fetch} and {html_image} (Forum Topic 20627)
+
+17.12.2011
+- improvement of compiling speed by new handling of plain text blocks in the lexer/parser (issue #68)
+
+16.12.2011
+- bugfix the source exits flag and timestamp was not setup when template was in php include path (issue #69)
+
+9.12.2011
+- bugfix {capture} tags around recursive {include} calls did throw exception (Forum Topic 20549)
+- bugfix $auto_literal = false did not work with { block} tags in child templates (Forum Topic 20581)
+- bugfix template inheritance: do not include code of {include} in overloaded {block} into compiled
+  parent template (Issue #66}
+- bugfix template inheritance: {$smarty.block.child} in nested child {block} tags did not return expected
+  result (Forum Topic 20564)
+
+## Smarty-3.1.6  -
+30.11.2011
+- bugfix is_cache() for individual cached subtemplates with $smarty->caching = CACHING_OFF did produce
+  an exception (Forum Topic 20531)
+
+29.11.2011
+- bugfix added exception if the default plugin handler did return a not static callback (Forum Topic 20512)
+
+25.11.2011
+- bugfix {html_select_date} and {html_slecet_time} did not default to current time if "time" was not specified
+  since r4432 (issue 60)
+
+24.11.2011
+- bugfix a subtemplate later used as main template did use old variable values
+
+21.11.2011
+- bugfix cache file could include unneeded modifier plugins under certain condition
+
+18.11.2011
+- bugfix declare all directory properties private to map direct access to getter/setter also on extended Smarty class
+
+16.11.2011
+- bugfix Smarty_Resource::load() did not always return a proper resource handler (Forum Topic 20414)
+- added escape argument to html_checkboxes and html_radios (Forum Topic 20425)
+
+## Smarty-3.1.5  -
+14.11.2011
+- bugfix allow space between function name and open bracket (forum topic 20375)
+
+09.11.2011
+- bugfix different behaviour of uniqid() on cygwin. See https://bugs.php.net/bug.php?id=34908
+  (forum topic 20343)
+
+01.11.2011
+- bugfix {if} and {while} tags without condition did not throw a SmartyCompilerException (Issue #57)
+- bugfix multiline strings in config files could fail on longer strings (reopened Issue #55)
+
+22.10.2011
+- bugfix smarty_mb_from_unicode() would not decode unicode-points properly
+- bugfix use catch Exception instead UnexpectedValueException in
+  clearCompiledTemplate to be PHP 5.2 compatible
+
+21.10.2011
+- bugfix apostrophe in plugins_dir path name failed (forum topic 20199)
+- improvement sha1() for array keys longer than 150 characters
+- add Smarty::$allow_ambiguous_resources to activate unique resource handling (Forum Topic 20128)
+
+20.10.2011
+- @silenced unlink() in Smarty_Internal_Write_File since debuggers go haywire without it.
+- bugfix Smarty::clearCompiledTemplate() threw an Exception if $cache_id was not present in $compile_dir when $use_sub_dirs = true.
+- bugfix {html_select_date} and {html_select_time} did not properly handle empty time arguments (Forum Topic 20190)
+- improvement removed unnecessary sha1()
+
+19.10.2011
+- revert PHP4 constructor message
+- fixed PHP4 constructor message
+
+## Smarty-3.1.4 -
+19.10.2011
+- added exception when using PHP4 style constructor
+
+16.10.2011
+- bugfix testInstall() did not propery check cache_dir and compile_dir
+
+15.10.2011
+- bugfix Smarty_Resource and Smarty_CacheResource runtime caching (Forum Post 75264)
+
+14.10.2011
+- bugfix unique_resource did not properly apply to compiled resources (Forum Topic 20128)
+- add locking to custom resources (Forum Post 75252)
+- add Smarty_Internal_Template::clearCache() to accompany isCached() fetch() etc.
+
+13.10.2011
+- add caching for config files in Smarty_Resource
+- bugfix disable of caching after isCached() call did not work (Forum Topic 20131)
+- add concept unique_resource to combat potentially ambiguous template_resource values when custom resource handlers are used (Forum Topic 20128)
+- bugfix multiline strings in config files could fail on longer strings (Issue #55)
+
+11.10.2011
+- add runtime checks for not matching {capture}/{/capture} calls (Forum Topic 20120)
+
+10.10.2011
+- bugfix variable name typo in {html_options} and {html_checkboxes} (Issue #54)
+- bugfix <?xml> tag did create wrong output when caching enabled and the tag was in included subtemplate
+- bugfix Smarty_CacheResource_mysql example was missing strtotime() calls
+
+## Smarty-3.1.3  -
+07.10.2011
+- improvement removed html comments from {mailto} (Forum Topic 20092)
+- bugfix testInstall() would not show path to internal plugins_dir (Forum Post 74627)
+- improvement testInstall() now showing resolved paths and checking the include_path if necessary
+- bugfix html_options plugin did not handle object values properly (Issue #49, Forum Topic 20049)
+- improvement html_checkboxes and html_radios to accept null- and object values, and label_ids attribute
+- improvement removed some unnecessary count()s
+- bugfix parent pointer was not set when fetch() for other template was called on template object
+
+06.10.2011
+- bugfix switch lexer internals depending on mbstring.func_overload
+- bugfix start_year and end_year of {html_select_date} did not use current year as offset base (Issue #53)
+
+05.10.2011
+- bugfix of problem introduced with r4342 by replacing strlen() with isset()
+- add environment configuration issue with mbstring.func_overload Smarty cannot compensate for (Issue #45)
+- bugfix nofilter tag option did not disable default modifier
+- bugfix html_options plugin did not handle null- and object values properly (Issue #49, Forum Topic 20049)
+
+04.10.2011
+- bugfix assign() in plugins called in subtemplates did change value also in parent template
+- bugfix of problem introduced with r4342 on math plugin
+- bugfix output filter should not run on individually cached subtemplates
+- add unloadFilter() method
+- bugfix has_nocache_code flag was not reset before compilation
+
+## Smarty-3.1.2  -
+03.10.2011
+- improvement add internal $joined_template_dir property instead computing it on the fly several times
+
+01.10.2011
+- improvement replaced most in_array() calls by more efficient isset() on array_flip()ed haystacks
+- improvement replaced some strlen($foo) > 3 calls by isset($foo[3])
+- improvement Smarty_Internal_Utility::clearCompiledTemplate() removed redundant strlen()s
+
+29.09.2011
+- improvement of Smarty_Internal_Config::loadConfigVars() dropped the in_array for index look up
+
+28.09.2011
+- bugfix on template functions called nocache calling other template functions
+
+27.09.2011
+- bugfix possible warning "attempt to modify property of non-object" in {section} (issue #34)
+- added chaining to \Smarty\Data so $smarty->assign('a',1)->assign('b',2); is possible now
+- bugfix remove race condition when a custom resource did change timestamp during compilation
+- bugfix variable property did not work on objects variable in template
+- bugfix smarty_make_timestamp() failed to process DateTime objects properly
+- bugfix wrong resource could be used on compile check of custom resource
+
+26.09.2011
+- bugfix repeated calls to same subtemplate did not make use of cached template object
+
+24.09.2011
+- removed internal muteExpectedErrors() calls in favor of having the implementor call this once from his application
+- optimized muteExpectedErrors() to pass errors to the latest registered error handler, if appliccable
+- added compile_dir and cache_dir to list of muted directories
+- improvment better error message for undefined templates at {include}
+
+23.09.2011
+- remove unused properties
+- optimization use real function instead anonymous function for preg_replace_callback
+- bugfix a relative {include} in child template blocks failed
+- bugfix direct setting of $template_dir, $config_dir, $plugins_dir in __construct() of an
+  extended Smarty class created problems
+- bugfix error muting was not implemented for cache locking
+
+## Smarty 3.1.1  -
+22.09.2011
+- bugfix {foreachelse} does fail if {section} was nested inside {foreach}
+- bugfix debug.tpl did not display correctly when it was compiled with escape_html = true
+
+21.09.2011
+- bugfix look for mixed case plugin file names as in 3.0 if not found try all lowercase
+- added $error_muting to suppress error messages even for badly implemented error_handlers
+- optimized autoloader
+- reverted ./ and ../ handling in fetch() and display() - they're allowed again
+
+20.09.2011
+- bugfix removed debug echo output while compiling template inheritance
+- bugfix relative paths in $template_dir broke relative path resolving in {include "../foo.tpl"}
+- bugfix {include} did not work inside nested {block} tags
+- bugfix {assign} with scope root and global did not work in all cases
+
+19.09.2011
+- bugfix regression in Smarty_CacheReource_KeyValueStore introduced by r4261
+- bugfix output filter shall not run on included subtemplates
+
+18.09.2011
+- bugfix template caching did not care about file.tpl in different template_dir
+- bugfix {include $file} was broken when merge_compiled_incluges = true
+- bugfix {include} was broken when merge_compiled_incluges = true and same indluded template
+  was used in different main templates in one compilation run
+- bugfix for Smarty2 style compiler plugins on unnamed attribute passing like {tag $foo $bar}
+- bugfix debug.tpl did not display correctly when it was compiled with escape_html = true
+
+17.09.2011
+- bugfix lock_id for file resource would create invalid filepath
+- bugfix resource caching did not care about file.tpl in different template_dir
+
+## Smarty 3.1.0  -
+15/09/2011
+- optimization of {foreach}; call internal _count() method only when "total" or "last" {foreach} properties are used
+
+11/09/2011
+- added  unregisterObject() method
+
+06/09/2011
+- bugfix  isset() did not work in templates on config variables
+
+03/09/2011
+- bugfix createTemplate() must default to cache_id and compile_id of Smarty object
+- bugfix Smarty_CacheResource_KeyValueStore must include $source->uid in cache filepath to keep templates with same
+  name but different folders separated
+- added cacheresource.apc.php example in demo folder
+
+02/09/2011
+- bugfix cache lock file must use absolute filepath
+
+01/09/2011
+- update of cache locking
+
+30/08/2011
+- added locking mechanism to CacheResource API (implemented with File and KeyValueStores)
+
+28/08/2011
+- bugfix clearCompileTemplate() did not work for specific template subfolder or resource
+
+27/08/2011
+- bugfix {$foo|bar+1} did create syntax error
+
+26/08/2011
+- bugfix when generating nocache code which contains double \
+- bugfix handle race condition if cache file was deleted between filemtime and include
+
+17/08/2011
+- bugfix CacheResource_Custom bad internal fetch() call
+
+15/08/2011
+- bugfix CacheResource would load content twice for KeyValueStore and Custom handlers
+
+06/08/2011
+- bugfix {include} with scope attribute could execute in wrong scope
+- optimization of compile_check processing
+
+03/08/2011
+- allow comment tags to comment {block} tags out in child templates
+
+26/07/2011
+- bugfix experimental getTags() method did not work
+
+24/07/2011
+- sure opened output buffers are closed on exception
+- bugfix {foreach} did not work on IteratorAggregate
+
+22/07/2011
+- clear internal caches on clearAllCache(), clearCache(), clearCompiledTemplate()
+
+21/07/2011
+- bugfix value changes of variable values assigned to Smarty object could not be seen on repeated $smarty->fetch() calls
+
+17/07/2011
+- bugfix {$smarty.block.child} did drop a notice at undefined child
+
+15/07/2011
+- bugfix individual cache_lifetime of {include} did not work correctly inside {block} tags
+- added caches for Smarty_Internal_TemplateSource and Smarty_Internal_TemplateCompiled to reduce I/O for multiple cache_id rendering
+
+14/07/2011
+- made Smarty::loadPlugin() respect the include_path if required
+
+13/07/2011
+- optimized internal file write functionality
+- bugfix PHP did eat line break on nocache sections
+- fixed typo of Smarty_Security properties $allowed_modifiers and $disabled_modifiers
+
+06/07/2011
+- bugfix variable modifier must run befor gereral filtering/escaping
+
+04/07/2011
+- bugfix use (?P<name>) syntax at preg_match as some pcre libraries failed on (?<name>)
+- some performance improvement when using generic getter/setter on template objects
+
+30/06/2011
+- bugfix generic getter/setter of Smarty properties used on template objects did throw exception
+- removed is_dir and is_readable checks from directory setters for better performance
+
+28/06/2011
+- added back support of php template resource as undocumented feature
+- bugfix automatic recompilation on version change could drop undefined index notice on old 3.0 cache and compiled files
+- update of README_3_1_DEV.txt and moved into the distribution folder
+- improvement show first characters of eval and string templates instead sha1 Uid in debug window
+
+## Smarty 3.1-RC1 -
+25/06/2011
+- revert change of 17/06/2011. $_smarty varibale removed. call loadPlugin() from inside plugin code if required
+- code cleanup, remove no longer used properties and methods
+- update of PHPdoc comments
+
+23/06/2011
+- bugfix {html_select_date} would not respect current time zone
+
+19/06/2011
+- added $errors argument to testInstall() functions to suppress output.
+- added plugin-file checks to testInstall()
+
+18/06/2011
+- bugfix mixed use of same subtemplate inline and not inline in same script could cause a warning during compilation
+
+17/06/2011
+- bugfix/change use $_smarty->loadPlugin() when loading nested depending plugins via loadPlugin
+- bugfix {include ... inline} within {block}...{/block} did fail
+
+16/06/2011
+- bugfix do not overwrite '$smarty' template variable when {include ... scope=parent} is called
+- bugfix complete empty inline subtemplates did fail
+
+15/06/2011
+- bugfix template variables where not accessable within inline subtemplates
+
+12/06/2011
+- bugfix removed unneeded merging of template variable when fetching includled subtemplates
+
+10/06/2011
+- made protected properties $template_dir, $plugins_dir, $cache_dir, $compile_dir, $config_dir accessible via magic methods
+
+09/06/2011
+- fix smarty security_policy issue in plugins {html_image} and {fetch}
+
+05/06/2011
+- update of SMARTY_VERSION
+- bugfix made getTags() working again
+
+04/06/2011
+- allow extends resource in file attribute of {extends} tag
+
+03/06/2011
+- added {setfilter} tag to set filters for variable output
+- added escape_html property to control autoescaping of variable output
+
+27/05/2011
+- added allowed/disabled tags and modifiers in security for sandboxing
+
+23/05/2011
+- added base64: and urlencode: arguments to eval and string resource types
+
+22/05/2011
+- made time-attribute of {html_select_date} and {html_select_time} accept arrays as defined by attributes prefix and field_array
+
+13/05/2011
+- remove setOption / getOption calls from SamrtyBC class
+
+02/05/2011
+- removed experimental setOption() getOption() methods
+- output returned content also on opening tag calls of block plugins
+- rewrite of default plugin handler
+- compile code of variable filters for better performance
+
+20/04/2011
+- allow {php} {include_php} tags and PHP_ALLOW handling only with the SmartyBC class
+- removed support of php template resource
+
+20/04/2011
+- added extendsall resource example
+- optimization of template variable access
+- optimization of subtemplate handling {include}
+- optimization of template class
+
+01/04/2011
+- bugfix quote handling in capitalize modifier
+
+28/03/2011
+- bugfix stripslashes() requried when using PCRE e-modifier
+
+04/03/2011
+- upgrade to new PHP_LexerGenerator version 0.4.0 for better performance
+
+27/02/2011
+- ignore .svn folders when clearing cache and compiled files
+- string resources do not need a modify check
+
+26/02/2011
+- replaced smarty_internal_wrapper by SmartyBC class
+- load utility functions as static methods instead through __call()
+- bugfix in extends resource when subresources are used
+- optimization of modify checks
+
+25/02/2011
+- use $smarty->error_unassigned to control NOTICE handling on unassigned variables
+
+21/02/2011
+- added new new compile_check mode COMPILECHECK_CACHEMISS
+- corrected new cloning behaviour of createTemplate()
+- do no longer store the compiler object as property in the compile_tag classes to avoid possible memory leaks
+  during compilation
+
+19/02/2011
+- optimizations on merge_compiled_includes handling
+- a couple of optimizations and bugfixes related to new resource structure
+
+17/02/2011
+- changed ./ and ../ behaviour
+
+14/02/2011
+- added {block ... hide} option to suppress block if no child is defined
+
+13/02/2011
+- update handling of recursive subtemplate calls
+- bugfix replace $smarty->triggerError() by exception in smarty_internal_resource_extends.php
+
+12/02/2011
+- new class Smarty_Internal_TemplateBase with shared methods of Smarty and Template objects
+- optimizations of template processing
+- made register... methods permanet
+- code for default_plugin_handler
+- add automatic recompilation at version change
+
+04/02/2011
+- change in Smarty_CacheResource_Custom
+- bugfix cache_lifetime did not compile correctly at {include} after last update
+- moved isCached processing into CacheResource class
+- bugfix new CacheResource API did not work with disabled compile_check
+
+03/02/2011
+- handle template content as function to improve speed on multiple calls of same subtemplate and isCached()/display() calls
+- bugfixes and improvents in the new resource API
+- optimizations of template class code
+
+25/01/2011
+- optimized function html_select_time
+
+22/01/2011
+- added Smarty::$use_include_path configuration directive for Resource API
+
+21/01/2011
+- optimized function html_select_date
+
+19/01/2011
+- optimized outputfilter trimwhitespace
+
+18/01/2011
+- bugfix Config to use Smarty_Resource to fetch sources
+- optimized Smarty_Security's isTrustedDir() and isTrustedPHPDir()
+
+17/01/2011
+- bugfix HTTP headers for CGI SAPIs
+
+16/01/2011
+- optimized internals of Smarty_Resource and Smarty_CacheResource
+
+14/01/2011
+- added modifiercompiler escape to improve performance of escaping html, htmlall, url, urlpathinfo, quotes, javascript
+- added support to choose template_dir to load from: [index]filename.tpl
+
+12/01/2011
+- added unencode modifier to revert results of encode modifier
+- added to_charset and from_charset modifier for character encoding
+
+11/01/2011
+- added SMARTY_MBSTRING to generalize MBString detection
+- added argument $lc_rest to modifier.capitalize to lower-case anything but the first character of a word
+- changed strip modifier to consider unicode white-space, too
+- changed wordwrap modifier to accept UTF-8 strings
+- changed count_sentences modifier to consider unicode characters and treat sequences delimited by ? and ! as sentences, too
+- added argument $double_encode to modifier.escape (applies to html and htmlall only)
+- changed escape modifier to be UTF-8 compliant
+- changed textformat block to be UTF-8 compliant
+- optimized performance of mailto function
+- fixed spacify modifier so characters are not prepended and appended, made it unicode compatible
+- fixed truncate modifier to properly use mb_string if possible
+- removed UTF-8 frenzy from count_characters modifier
+- fixed count_words modifier to treat "hello-world" as a single word like str_count_words() does
+- removed UTF-8 frenzy from upper modifier
+- removed UTF-8 frenzy from lower modifier
+
+01/01/2011
+- optimize smarty_modified_escape for hex, hexentity, decentity.
+
+28/12/2010
+- changed $tpl_vars, $config_vars and $parent to belong to \Smarty\Data
+- added Smarty::registerCacheResource() for dynamic cache resource object registration
+
+27/12/2010
+- added Smarty_CacheResource API and refactored existing cache resources accordingly
+- added Smarty_CacheResource_Custom and Smarty_CacheResource_Mysql
+
+26/12/2010
+- added Smarty_Resource API and refactored existing resources accordingly
+- added Smarty_Resource_Custom and Smarty_Resource_Mysql
+- bugfix Smarty::createTemplate() to return properly cloned template instances
+
+24/12/2010
+- optimize smarty_function_escape_special_chars() for PHP >= 5.2.3
+
+## SVN 3.0 trunk  -
+14/05/2011
+- bugfix error handling at stream resources
+
+13/05/2011
+- bugfix condition starting with "-" did fail at {if} and {while} tags
+
+22/04/2011
+- bugfix allow only fixed string as file attribute at {extends} tag
+
+01/04/2011
+- bugfix do not run filters and default modifier when displaying the debug template
+- bugfix of embedded double quotes within multi line strings (""")
+
+29/03/2011
+- bugfix on error message in smarty_internal_compile_block.php
+- bugfix mb handling in strip modifier
+- bugfix for Smarty2 style registered compiler function on unnamed attribute passing like {tag $foo $bar}
+
+17/03/2011
+- bugfix on default {function} parameters when {function} was used in nocache sections
+- bugfix on compiler object destruction. compiler_object property was by mistake unset.
+
+09/03/2011
+-bugfix a variable filter should run before modifiers on an output tag (see change of 23/07/2010)
+
+08/03/2011
+- bugfix loading config file without section should load only defaults
+
+03/03/2011
+- bugfix "smarty" template variable was not recreated when cached templated had expired
+- bugfix internal rendered_content must be cleared after subtemplate was included
+
+01/03/2011
+- bugfix replace modifier did not work in 3.0.7 on systems without multibyte support
+- bugfix {$smarty.template} could return in 3.0.7 parent template name instead of
+         child name when it needed to compile
+
+25/02/2011
+- bugfix for Smarty2 style compiler plugins on unnamed attribute passing like {tag $foo $bar}
+
+24/02/2011
+- bugfix $smarty->clearCache('some.tpl') did by mistake cache the template object
+
+18/02/2011
+- bugfix removed possible race condition when isCached() was called for an individually cached subtemplate
+- bugfix force default debug.tpl to be loaded by the file resource
+
+17/02/2011
+-improvement not to delete files starting with '.' from cache and template_c folders on clearCompiledTemplate() and clearCache()
+
+16/02/2011
+-fixed typo in exception message of Smarty_Internal_Template
+-improvement allow leading spaces on } tag closing if auto_literal is enabled
+
+13/02/2011
+- bufix replace $smarty->triggerError() by exception
+- removed obsolete {popup_init..} plugin from demo templates
+- bugfix replace $smarty->triggerError() by exception in smarty_internal_resource_extends.php
+
+## Smarty 3.0.7  -
+09/02/2011
+- patched vulnerability when using {$smarty.template}
+
+01/02/2011
+- removed assert() from config and template parser
+
+31/01/2011
+- bugfix the lexer/parser did fail on special characters like VT
+
+16/01/2011
+-bugfix of ArrayAccess object handling in internal _count() method
+-bugfix of Iterator object handling in internal _count() method
+
+14/01/2011
+-bugfix removed memory leak while processing compileAllTemplates
+
+12/01/2011
+- bugfix in {if} and {while} tag compiler when using assignments as condition and nocache mode
+
+10/01/2011
+- bugfix when using {$smarty.block.child} and name of {block} was in double quoted string
+- bugfix updateParentVariables() was called twice when leaving {include} processing
+
+- bugfix mb_str_replace in replace and escape modifiers work with utf8
+
+31/12/2010
+- bugfix dynamic configuration of $debugging_crtl did not work
+- bugfix default value of $config_read_hidden changed to false
+- bugfix format of attribute array on compiler plugins
+- bugfix getTemplateVars() could return value from wrong scope
+
+28/12/2010
+- bugfix multiple {append} tags failed to compile.
+
+22/12/2010
+- update do not clone the Smarty object an internal createTemplate() calls to increase performance
+
+21/12/2010
+- update html_options to support class and id attrs
+
+17/12/2010
+- bugfix added missing support of $cache_attrs for registered plugins
+
+15/12/2010
+- bugfix assignment as condition in {while} did drop an E_NOTICE
+
+14/12/2010
+- bugfix when passing an array as default parameter at {function} tag
+
+13/12/2010
+- bugfix {$smarty.template} in child template did not return right content
+- bugfix Smarty3 did not search the PHP include_path for template files
+
+## Smarty 3.0.6  -
+
+12/12/2010
+- bugfix fixed typo regarding yesterdays change to allow streamWrapper
+
+11/12/2010
+- bugfix nested block tags in template inheritance child templates did not work correctly
+- bugfix {$smarty.current_dir} in child template did not point to dir of child template
+- bugfix changed code when writing temporary compiled files to allow stream_wrapper
+
+06/12/2010
+- bugfix getTemplateVars() should return 'null' instead dropping E_NOTICE on an unassigned variable
+
+05/12/2010
+- bugfix missing declaration of $smarty in Smarty class
+- bugfix empty($foo) in {if} did drop a notice when $foo was not assigned
+
+01/12/2010
+- improvement of {debug} tag output
+
+27/11/2010
+-change run output filter before cache file is written. (same as in Smarty2)
+
+24/11/2011
+-bugfix on parser at  !$foo|modifier
+-change parser logic when assignments used as condition in {if] and {while} to allow assign to array element
+
+23/11/2011
+-bugfix allow integer as attribute name in plugin calls
+-change  trimm whitespace from error message, removed long list of expected tokens
+
+22/11/2010
+- bugfix on template inheritance when an {extends} tag was inserted by a prefilter
+- added error message for illegal variable file attributes at {extends...} tags
+
+## Smarty 3.0.5  -
+
+
+19/11/2010
+- bugfix on block plugins with modifiers
+
+18/11/2010
+- change on handling of unassigned template variable -- default will drop E_NOTICE
+- bugfix on Smarty2 wrapper load_filter() did not work
+
+17/11/2010
+- bugfix on {call} with variable function name
+- bugfix on {block} if name did contain '-'
+- bugfix in function.fetch.php , referece to undefined $smarty
+
+16/11/2010
+- bugfix whitespace in front of "<?php" in smarty_internal_compile_private_block_plugin.php
+- bugfix {$smarty.now} did compile incorrectly
+- bugfix on reset(),end(),next(),prev(),current() within templates
+- bugfix on default parameter for {function}
+
+15/11/2010
+- bugfix when using {$smarty.session} as object
+- bugfix scoping problem on $smarty object passed to filters
+- bugfix captured content could not be accessed globally
+- bugfix Smarty2 wrapper functions could not be call from within plugins
+
+## Smarty 3.0.4  -
+
+14/11/2010
+- bugfix isset() did not allow multiple parameter
+- improvment of some error messages
+- bugfix html_image did use removed property $request_use_auto_globals
+- small performace patch in Smarty class
+
+13/11/2010
+- bugfix  overloading problem when $smarty->fetch()/display() have been used in plugins
+				(introduced with 3.0.2)
+- code cleanup
+								
+## Smarty 3.0.3  -
+
+13/11/2010
+- bugfix on {debug}
+- reverted location of loadPlugin() to Smarty class
+- fixed comments in plugins
+- fixed internal_config (removed unwanted code line)
+- improvement  remove last linebreak from {function} definition
+
+## Smarty 3.0.2  -
+
+12/11/2010
+- reactivated $error_reporting property handling
+- fixed typo in compile_continue
+- fixed security in {fetch} plugin
+- changed back plugin parameters to two. second is template object
+  with transparent access to Smarty object
+- fixed {config_load} scoping form compile time to run time
+
+## Smarty 3.0.0  -
+
+
+
+11/11/2010
+- major update including some API changes
+
+10/11/2010
+- observe compile_id also for config files
+
+09/11/2010
+-bugfix on  complex expressions as start value for {for} tag
+request_use_auto_globals
+04/11/2010
+- bugfix do not allow access of dynamic and private object members of assigned objects when
+  security is enabled.
+
+01/11/2010
+- bugfix related to E_NOTICE change.  {if empty($foo)} did fail when $foo contained a string
+
+28/10/2010
+- bugfix on compiling modifiers within $smarty special vars like {$smarty.post.{$foo|lower}}
+
+27/10/2010
+- bugfix default parameter values did not work for template functions included with {include}
+
+25/10/2010
+- bugfix for E_NOTICE change, array elements did not work as modifier parameter
+
+20/10/2010
+- bugfix for the E_NOTICE change
+
+19/10/2010
+- change Smarty does no longer mask out E_NOTICE by default during template processing
+
+13/10/2010
+- bugfix removed ambiguity between ternary and stream variable in template syntax
+- bugfix use caching properties of template instead of smarty object when compiling child {block}
+- bugfix {*block}...{/block*} did throw an exception in template inheritance
+- bugfix on template inheritance using nested eval or string resource in {extends} tags
+- bugfix on output buffer handling in isCached() method
+
+##  RC4 -
+
+01/10/2010
+- added {break} and {continue} tags for flow control of {foreach},{section},{for} and {while} loops
+- change of 'string' resource. It's no longer evaluated and compiled files are now stored
+- new 'eval' resource which evaluates a template without saving the compiled file
+- change in isCached() method to allow multiple calls for the same template
+
+25/09/2010
+- bugfix on some compiling modifiers
+
+24/09/2010
+- bugfix merge_compiled_includes flag was not restored correctly in {block} tag
+
+22/09/2010
+- bugfix on default modifier
+
+18/09/2010
+- bugfix untility compileAllConfig() did not create sha1 code for compiled template file names if template_dir was defined with no trailing DS
+- bugfix on templateExists() for extends resource
+
+17/09/2010
+- bugfix {$smarty.template} and {$smarty.current_dir} did not compile correctly within {block} tags
+- bugfix corrected error message on missing template files in extends resource
+- bugfix untility compileAllTemplates() did not create sha1 code for compiled template file names if template_dir was defined with no trailing DS
+
+16/09/2010
+- bugfix when a doublequoted modifier parameter did contain Smarty tags and ':'
+
+15/09/2010
+- bugfix resolving conflict between '<%'/'%>' as custom Smarty delimiter and ASP tags
+- use ucfirst for resource name on internal resource class names
+
+12/09/2010
+- bugfix for change of 08/09/2010 (final {block} tags in subtemplates did not produce correct results)
+
+10/09/2010
+- bugfix for change of 08/09/2010 (final {block} tags in subtemplates did not produce correct results)
+
+08/09/2010
+- allow multiple template inheritance branches starting in subtemplates
+
+07/09/2010
+- bugfix {counter} and {cycle} plugin assigned result to smarty variable not in local(template) scope
+- bugfix templates containing just {strip} {/strip} tags did produce an error
+
+
+23/08/2010
+- fixed E_STRICT errors for uninitialized variables
+
+22/08/2010
+- added attribute cache_id to {include} tag
+
+13/08/2010
+- remove exception_handler property from Smarty class
+- added Smarty's own exceptions SmartyException and SmartyCompilerException
+
+09/08/2010
+- bugfix on modifier with doublequoted strings as parameter containing embedded tags
+
+06/08/2010
+- bugfix when cascading some modifier like |strip|strip_tags modifier
+
+05/08/2010
+- added plugin type modifiercompiler to produce compiled modifier code
+- changed standard modifier plugins to the compiling versions whenever possible
+- bugfix in nocache sections {include} must not cache the subtemplate
+
+02/08/2010
+- bugfix strip did not work correctly in conjunction with comment lines
+
+31/07/2010
+- bugfix on nocache attribute at {assign} and {append}
+
+30/07/2010
+- bugfix passing scope attributes in doublequoted strings did not work at {include} {assign} and {append}
+
+25/07/2010
+- another bugfix of change from 23/07/2010 when compiling modifier
+
+24/07/2010
+- bugfix of change from 23/07/2010 when compiling modifier
+
+23/07/2010
+- changed execution order. A variable filter does now run before modifiers on output of variables
+- bugfix use always { and } as delimiter for debug.tpl
+
+
+22/07/2010
+- bugfix in templateExists() method
+
+20/07/2010
+- fixed handling of { strip } tag with whitespaces
+
+15/07/2010
+- bufix  {$smarty.template} does include now the relative path, not just filename
+
+##  RC3 -
+
+
+
+
+15/07/2010
+- make the date_format modifier work also on objects of the DateTime class
+- implementation of parsetrees in the parser to close security holes and remove unwanted empty line in HTML output
+
+08/07/2010
+- bugfix on assigning multidimensional arrays within templates
+- corrected bugfix for truncate modifier
+
+07/07/2010
+- bugfix the truncate modifier needs to check if the string is utf-8 encoded or not
+- bugfix support of script files relative to trusted_dir
+
+06/07/2010
+- create exception on recursive {extends} calls
+- fixed reported line number at "unexpected closing tag " exception
+- bugfix on escape:'mail' modifier
+- drop exception if 'item' variable is equal 'from' variable in {foreach} tag
+
+01/07/2010
+- removed call_user_func_array calls for optimization of compiled code when using registered modifiers and plugins
+
+25/06/2010
+- bugfix escaping " when block tags are used within doublequoted strings
+
+24/06/2010
+- replace internal get_time() calls with standard PHP5 microtime(true) calls in Smarty_Internal_Utility
+- added $smarty->register->templateClass() and $smarty->unregister->templateClass() methods for supporting static classes with namespace
+
+
+22/06/2010
+- allow spaces between typecast and value in template syntax
+- bugfix get correct count of traversables in {foreach} tag
+
+21/06/2010
+- removed use of PHP shortags SMARTY_PHP_PASSTHRU mode
+- improved speed of cache->clear() when a compile_id was specified and use_sub_dirs is true
+
+20/06/2010
+- replace internal get_time() calls with standard PHP5 microtime(true) calls
+- closed security hole when php.ini asp_tags = on
+
+18/06/2010
+- added __toString method to the Smarty_Variable class
+
+
+14/06/2010
+- make handling of Smarty comments followed by newline BC to Smarty2
+
+
+##  RC2 -
+
+
+
+13/06/2010
+- bugfix Smarty3 did not handle hexadecimals like 0x0F as numerical value
+- bugifx Smarty3 did not accept numerical constants like .1 or 2. (without a leading or trailing digit)
+
+11/06/2010
+- bugfix the lexer did fail on larger {literal} ... {/literal} sections
+
+03/06/2010
+- bugfix on calling template functions like Smarty tags
+
+01/06/2010
+- bugfix on template functions used with template inheritance
+- removed /* vim: set expandtab: */ comments
+- bugfix of auto literal problem introduce with fix of 31/05/2010
+
+31/05/2010
+- bugfix the parser did not allow some smarty variables with special name like $for, $if, $else and others.
+
+27/05/2010
+- bugfix on object chaining using variable properties
+- make scope of {counter} and {cycle} tags again global as in Smarty2
+
+26/05/2010
+- bugfix removed decrepated register_resource call in smarty_internal_template.php
+
+25/05/2010
+- rewrite of template function handling to improve speed
+- bugfix on file dependency when merge_compiled_includes = true
+
+
+16/05/2010
+- bugfix when passing parameter with numeric name like {foo 1='bar' 2='blar'}
+
+14/05/2010
+- bugfix compile new config files if compile_check and force_compile = false
+- added variable static classes names to template syntax
+
+11/05/2010
+- bugfix  make sure that the cache resource is loaded in all conditions when template methods getCached... are called externally
+- reverted the change 0f 30/04/2010. With the exception of forward references template functions can be again called by a standard tag.
+
+10/05/2010
+- bugfix on {foreach} and {for} optimizations of 27/04/2010
+
+09/05/2010
+- update of template and config file parser because of minor parser generator bugs
+
+07/05/2010
+- bugfix on {insert}
+
+06/05/2010
+- bugfix when merging compiled templates and objects are passed as parameter of the {include} tag
+
+05/05/2010
+- bugfix on {insert} to cache parameter
+- implementation of $smarty->default_modifiers as in Smarty2
+- bugfix on getTemplateVars method
+
+01/05/2010
+- bugfix on handling of variable method names at object chaning
+
+30/04/2010
+- bugfix when comparing timestamps in sysplugins/smarty_internal_config.php
+- work around of a substr_compare bug in older PHP5 versions
+- bugfix on template inheritance for tag names starting with "block"
+- bugfix on {function} tag with name attribute in doublequoted strings
+- fix to make calling of template functions unambiguously by madatory usage of the {call} tag
+
+##  RC1 -
+
+27/04/2010
+- change default of $debugging_ctrl to 'NONE'
+- optimization of compiled code of {foreach} and {for} loops
+- change of compiler for config variables
+
+27/04/2010
+- bugfix in $smarty->cache->clear() method. (do not cache template object)
+
+
+17/04/2010
+- security fix in {math} plugin
+
+
+12/04/2010
+- bugfix in smarty_internal_templatecompilerbase (overloaded property)
+- removed parser restrictions in using true,false and null as ID
+
+07/04/2010
+- bugfix typo in smarty_internal_templatecompilerbase
+
+31/03/2010
+- compile locking by touching old compiled files to avoid concurrent compilations
+
+29/03/2010
+- bugfix allow array definitions as modifier parameter
+- bugfix observe compile_check property when loading config files
+- added the template object as third filter parameter
+
+25/03/2010
+- change of utility->compileAllTemplates() log messages
+- bugfix on nocache code in {function} tags
+- new method utility->compileAllConfig() to compile all config files
+
+24/03/2010
+- bugfix on register->modifier() error messages
+
+23/03/2010
+- bugfix on template inheritance when calling multiple child/parent relations
+- bugfix on caching mode SMARTY_CACHING_LIFETIME_SAVED and cache_lifetime = 0
+
+22/03/2010
+- bugfix make directory separator operating system independend in compileAllTemplates()
+
+21/03/2010
+- removed unused code in compileAllTemplates()
+
+19/03/2010
+- bugfix for multiple {/block} tags on same line
+
+17/03/2010
+- bugfix make $smarty->cache->clear() function independent from caching status
+
+16/03/2010
+- bugfix on assign attribute at registered template objects
+- make handling of modifiers on expression BC to Smarty2
+
+15/03/2010
+- bugfix on block plugin calls
+
+11/03/2010
+- changed parsing of <?php and ?> back to Smarty2 behaviour
+
+08/03/2010
+- bugfix on uninitialized properties in smarty_internal_template
+- bugfix on $smarty->disableSecurity()
+
+04/03/2010
+- bugfix allow uppercase chars in registered resource names
+- bugfix on accessing chained objects of static classes
+
+01/03/2010
+- bugfix on nocache code in {block} tags if child template was included by {include}
+
+27/02/2010
+- allow block tags inside double quoted string
+
+26/02/2010
+- cache modified check implemented
+- support of access to a class constant from an object (since PHP 5.3)
+
+24/02/2010
+- bugfix on expressions in doublequoted string enclosed in backticks
+- added security property $static_classes for static class security
+
+18/02/2010
+- bugfix on parsing Smarty tags inside <?xml ... ?>
+- bugfix on truncate modifier
+
+17/02/2010
+- removed restriction that modifiers did require surrounding parenthesis in some cases
+- added {$smarty.block.child} special variable for template inheritance
+
+16/02/2010
+- bugfix on <?xml ... ?> tags for all php_handling modes
+- bugfix on parameter of variablefilter.htmlspecialchars.php plugin
+
+14/02/2010
+- added missing _plugins property in smarty.class.php
+- bugfix $smarty.const... inside doublequoted strings and backticks was compiled into wrong PHP code
+
+12/02/2010
+- bugfix on nested {block} tags
+- changed Smarty special variable $smarty.parent to $smarty.block.parent
+- added support of nested {bock} tags
+
+10/02/2010
+- avoid possible notice on $smarty->cache->clear(...), $smarty->clear_cache(....)
+- allow Smarty tags inside <? ... ?> tags in SMARTY_PHP_QUOTE and SMARTY_PHP_PASSTHRU mode
+- bugfix at new "for" syntax like {for $x=1 to 10 step 2}
+
+09/02/2010
+- added $smarty->_tag_stack for tracing block tag hierarchy
+
+08/02/2010
+- bugfix  use template fullpath at §smarty->cache->clear(...), $smarty->clear_cache(....)
+- bugfix of cache filename on extended templates when force_compile=true
+
+07/02/2010
+- bugfix on changes of 05/02/2010
+- preserve line endings type form template source
+- API changes (see README file)
+
+05/02/2010
+- bugfix on modifier and block plugins with same name
+
+02/02/2010
+- retaining newlines at registered functions and function plugins
+
+01/25/2010
+- bugfix cache resource was not loaded when caching was globally off but enabled at a template object
+- added test that $_SERVER['SCRIPT_NAME'] does exist in Smarty.class.php
+
+01/22/2010
+- new method $smarty->createData([$parent]) for creating a data object (required for bugfixes below)
+- bugfix config_load() method now works also on a data object
+- bugfix get_config_vars() method now works also on a data and template objects
+- bugfix clear_config() method now works also on a data and template objects
+
+01/19/2010
+- bugfix on plugins if same plugin was called from a nocache section first and later from a cached section
+
+
+###beta 7###
+
+
+01/17/2010
+- bugfix on $smarty.const... in double quoted strings
+
+01/16/2010
+- internal change of config file lexer/parser on handling of section names
+- bugfix on registered objects (format parameter of register_object was not handled correctly)
+
+01/14/2010
+- bugfix on backslash within single quoted strings
+- bugfix allow absolute filepath for config files
+- bugfix on special Smarty variable $smarty.cookies
+- revert handling of newline on no output tags like {if...}
+- allow special characters in config file section names for Smarty2 BC
+
+01/13/2010
+- bugfix on {if} tags
+
+01/12/2010
+- changed back modifier handling in parser. Some restrictions still apply:
+    if modifiers are used in side {if...} expression or in mathematical expressions
+    parentheses must be used.
+- bugfix the {function..} tag did not accept the name attribute in double quotes
+- closed possible security hole at <?php ... ?> tags
+- bugfix of config file parser on large config files
+
+
+###beta 6####
+
+01/11/2010
+- added \n to the compiled code of the {if},{else},{elseif},{/if} tags to get output of newlines as expected by the template source
+- added missing support of insert plugins
+- added optional nocache attribute to {block} tags in parent template
+- updated <?php...?> handling supporting now heredocs and newdocs. (thanks to Thue Jnaus Kristensen)
+
+01/09/2010
+- bugfix on nocache {block} tags in parent templates
+
+01/08/2010
+- bugfix on variable filters. filter/nofilter attributes did not work on output statements
+
+01/07/2010
+- bugfix on file dependency at template inheritance
+- bugfix on nocache code at template inheritance
+
+01/06/2010
+- fixed typo in smarty_internal_resource_registered
+- bugfix for custom delimiter at extends resource and {extends} tag
+
+01/05/2010
+- bugfix sha1() calculations at extends resource and some general improvments on sha1() handling
+
+
+01/03/2010
+- internal change on building cache files
+
+01/02/2010
+- update cached_timestamp at the template object after cache file is written to avoid possible side effects
+- use internally always SMARTY_CACHING_LIFETIME_* constants
+
+01/01/2010
+- bugfix for obtaining plugins which must be included (related to change of 12/30/2009)
+- bugfix for {php} tag (trow an exception if allow_php_tag = false)
+
+12/31/2009
+- optimization of generated code for doublequoted strings containing variables
+- rewrite of {function} tag handling
+  - can now be declared in an external subtemplate
+  - can contain nocache sections (nocache_hash handling)
+  - can be called in noccache sections (nocache_hash handling)
+  - new {call..} tag to call template functions with a variable name {call name=$foo}
+- fixed nocache_hash handling in merged compiled templates
+
+12/30/2009
+- bugfix for plugins defined in the script as smarty_function_foo
+
+12/29/2009
+- use sha1() for filepath encoding
+- updates on nocache_hash handling
+- internal change on merging some data
+- fixed cache filename for custom resources
+
+12/28/2009
+- update for security fixes
+- make modifier plugins always trusted
+- fixed bug loading modifiers in child template at template inheritance
+
+12/27/2009
+--- this is a major update with a couple of internal changes ---
+- new config file lexer/parser (thanks to Thue Jnaus Kristensen)
+- template lexer/parser fixes for PHP and {literal} handing (thanks to Thue Jnaus Kristensen)
+- fix on registered plugins with different type but same name
+- rewrite of plugin handling (optimized execution speed)
+- closed a security hole regarding PHP code injection into cache files
+- fixed bug in clear cache handling
+- Renamed a couple of internal classes
+- code cleanup for merging compiled templates
+- couple of runtime optimizations (still not all done)
+- update of getCachedTimestamp()
+- fixed bug on modifier plugins at nocache output
+
+12/19/2009
+- bugfix on comment lines in config files
+
+12/17/2009
+- bugfix of parent/global variable update at included/merged subtemplates
+- encode final template filepath into filename of compiled and cached files
+- fixed {strip} handling in auto literals
+
+12/16/2009
+- update of changelog
+- added {include file='foo.tpl' inline}  inline option to merge compiled code of subtemplate into the calling template
+
+12/14/2009
+- fixed sideefect of last modification (objects in array index did not work anymore)
+
+12/13/2009
+- allow boolean negation ("!") as operator on variables outside {if} tag
+
+12/12/2009
+- bugfix on single quotes inside {function} tag
+- fix short append/prepend attributes in {block} tags
+
+12/11/2009
+- bugfix on clear_compiled_tpl (avoid possible warning)
+
+12/10/2009
+- bugfix on {function} tags and template inheritance
+
+12/05/2009
+- fixed problem when a cached file was fetched several times
+- removed unneeded lexer code
+
+12/04/2009
+- added max attribute to for loop
+- added security mode allow_super_globals
+
+12/03/2009
+- template inheritance: child templates can now call functions defined by the {function} tag in the parent template
+- added {for $foo = 1 to 5 step 2}  syntax
+- bugfix for {$foo.$x.$y.$z}
+
+12/01/2009
+- fixed parsing of names of special formated tags like if,elseif,while,for,foreach
+- removed direct access to constants in templates because of some syntax problems
+- removed cache resource plugin for mysql from the distribution
+- replaced most hard errors (exceptions) by softerrors(trigger_error) in plugins
+- use $template_class property for template class name when compiling {include},{eval} and {extends} tags
+
+11/30/2009
+- map 'true' to SMARTY_CACHING_LIFETIME_CURRENT for the $smarty->caching parameter
+- allow {function} tags within {block} tags
+
+11/28/2009
+- ignore compile_id at debug template
+- added direct access to constants in templates
+- some lexer/parser optimizations
+
+11/27/2009
+- added cache resource MYSQL plugin
+
+11/26/2009
+- bugfix on nested doublequoted strings
+- correct line number on unknown tag error message
+- changed {include} compiled code
+- fix on checking dynamic varibales with error_unassigned = true
+
+11/25/2009
+- allow the following writing for boolean: true, TRUE, True, false, FALSE, False
+- {strip} tag functionality rewritten
+
+11/24/2009
+- bugfix for $smarty->config_overwrite = false
+
+11/23/2009
+- suppress warnings on unlink caused by race conditions
+- correct line number on unknown tag error message
+
+------- beta 5
+11/23/2009
+- fixed configfile parser for text starting with a numeric char
+- the default_template_handler_func may now return a filepath to a template source
+
+11/20/2009
+- bugfix for empty config files
+- convert timestamps of registered resources to integer
+
+11/19/2009
+- compiled templates are no longer touched with the filemtime of template source
+
+11/18/2009
+- allow integer as attribute name in plugin calls
+
+------- beta 4
+11/18/2009
+- observe umask settings when setting file permissions
+- avoide unneeded cache file creation for subtemplates which did occur in some situations
+- make $smarty->_current_file available during compilation for Smarty2 BC
+
+11/17/2009
+- sanitize compile_id and cache_id (replace illegal chars with _)
+- use _dir_perms and _file_perms properties at file creation
+- new constant SMARTY_RESOURCE_DATE_FORMAT (default '%b %e, %Y') which is used as default format in modifier date_format
+- added {foreach $array as $key=>$value} syntax
+- renamed extend tag and resource to extends: {extends file='foo.tol'} , $smarty->display('extends:foo.tpl|bar.tpl);
+- bugfix cycle plugin
+
+11/15/2009
+- lexer/parser optimizations on quoted strings
+
+11/14/2009
+- bugfix on merging compiled templates when source files got removed or renamed.
+- bugfix modifiers on registered object tags
+- fixed locaion where outputfilters are running
+- fixed config file definitions at EOF
+- fix on merging compiled templates with nocache sections in nocache includes
+- parser could run into a PHP error on wrong file attribute
+
+11/12/2009
+- fixed variable filenames in {include_php} and {insert}
+- added scope to Smarty variables in the {block} tag compiler
+- fix on nocache code in child {block} tags
+
+11/11/2009
+- fixed {foreachelse}, {forelse}, {sectionelse} compiled code at nocache variables
+- removed checking for reserved variables
+- changed debugging handling
+
+11/10/2009
+- fixed preg_qoute on delimiters
+
+11/09/2009
+- lexer/parser bugfix
+- new SMARTY_SPL_AUTOLOAD constant to control the autoloader option
+- bugfix for {function} block tags in included templates
+
+11/08/2009
+- fixed alphanumeric array index
+- bugfix on complex double quoted strings
+
+11/05/2009
+- config_load method can now be called on data and template objects
+
+11/04/2009
+- added typecasting support for template variables
+- bugfix on complex indexed special Smarty variables
+
+11/03/2009
+- fixed parser error on objects with special smarty vars
+- fixed file dependency for {incude} inside {block} tag
+- fixed not compiling on non existing compiled templates when compile_check = false
+- renamed function names of autoloaded Smarty methods to Smarty_Method_....
+- new security_class property (default is Smarty_Security)
+
+11/02/2009
+- added neq,lte,gte,mod as aliases to if conditions
+- throw exception on illegal Smarty() constructor calls
+
+10/31/2009
+- change of filenames in sysplugins folder for internal spl_autoload function
+- lexer/parser changed for increased compilation speed
+
+10/27/2009
+- fixed missing quotes in include_php.php
+
+10/27/2009
+- fixed typo in method.register_resource
+- pass {} through as literal
+
+10/26/2009
+- merge only compiled subtemplates into the compiled code of the main template
+
+10/24/2009
+- fixed nocache vars at internal block tags
+- fixed merging of recursive includes
+
+10/23/2009
+- fixed nocache var problem
+
+10/22/2009
+- fix trimwhitespace outputfilter parameter
+
+10/21/2009
+- added {$foo++}{$foo--} syntax
+- buxfix changed PHP "if (..):" to "if (..){" because of possible bad code when concenating PHP tags
+- autoload Smarty internal classes
+- fixed file dependency for config files
+- some code optimizations
+- fixed function definitions on some autoloaded methods
+- fixed nocache variable inside if condition of {if} tag
+
+10/20/2009
+- check at compile time for variable filter to improve rendering speed if no filter is used
+- fixed bug at combination of {elseif} tag and {...} in double quoted strings of static class parameter
+
+10/19/2009
+- fixed compiled template merging on variable double quoted strings as name
+- fixed bug in caching mode 2 and cache_lifetime -1
+- fixed modifier support on block tags
+
+10/17/2009
+- remove ?>\n<?php and ?><?php sequences from compiled template
+
+10/15/2009
+- buxfix on assigning array elements inside templates
+- parser bugfix on array access
+
+10/15/2009
+- allow bit operator '&' inside {if} tag
+- implementation of ternary operator
+
+10/13/2009
+- do not recompile evaluated templates if reused just with other data
+- recompile config files when config properties did change
+- some lexer/parser otimizations
+
+10/11/2009
+- allow {block} tags inside included templates
+- bugfix for resource plugins in Smarty2 format
+- some optimizations of internal.template.php
+
+10/11/2009
+- fixed bug when template with same name is used with different data objects
+- fixed bug with double quoted name attribute at {insert} tag
+- reenabled assign_by_ref and append_by_ref methods
+
+10/07/2009
+- removed block nesting checks for {capture}
+
+10/05/2009
+- added support of "isinstance" to {if} tag
+
+10/03/2009
+- internal changes to improve performance
+- fix registering of filters for classes
+
+10/01/2009
+- removed default timezone setting
+- reactivated PHP resource for simple PHP templates. Must set allow_php_templates = true to enable
+- {PHP} tag can be enabled by allow_php_tag = true
+
+09/30/2009
+- fixed handling template_exits method for all resource types
+- bugfix for other cache resources than file
+- the methods assign_by_ref is now wrapped to assign, append_by_ref to append
+- allow arrays of variables pass in display, fetch and createTemplate calls
+  $data = array('foo'=>'bar','foo2'=>'blar');
+  $smarty->display('my.tpl',$data);
+
+09/29/2009
+- changed {php} tag handling
+- removed support of Smarty::instance()
+- removed support of PHP resource type
+- improved execution speed of {foreach} tags
+- fixed bug in {section} tag
+
+09/23/2009
+- improvements and bugfix on {include} tag handling
+NOTICE: existing compiled template and cache files must be deleted
+
+09/19/2009
+- replace internal "eval()" calls by "include" during rendering process
+- speed improvment for templates which have included subtemplates
+    the compiled code of included templates is merged into the compiled code of the parent template
+- added logical operator "xor" for {if} tag
+- changed parameter ordering for Smarty2 BC
+    fetch($template, $cache_id = null, $compile_id = null, $parent = null)
+    display($template, $cache_id = null, $compile_id = null, $parent = null)
+    createTemplate($template, $cache_id = null, $compile_id = null, $parent = null)
+- property resource_char_set is now replaced by constant SMARTY_RESOURCE_CHAR_SET
+- fixed handling of classes in registered blocks
+- speed improvement of lexer on text sections
+
+09/01/2009
+- dropped nl2br as plugin
+- added '<>' as comparission operator in {if} tags
+- cached caching_lifetime property to cache_liftime for backward compatibility with Smarty2.
+  {include} optional attribute is also now cache_lifetime
+- fixed trigger_error method (moved into Smarty class)
+- version is now  Beta!!!
+
+
+08/30/2009
+- some speed optimizations on loading internal plugins
+
+
+08/29/2009
+- implemented caching of registered Resources
+- new property 'auto_literal'. if true(default)  '{ ' and ' }' interpreted as literal, not as Smarty delimiter
+
+
+08/28/2009
+- Fix on line breaks inside {if} tags
+
+08/26/2009
+- implemented registered resources as in Smarty2. NOTE: caching does not work yet
+- new property 'force_cache'. if true it forces the creation of a new cache file
+- fixed modifiers on arrays
+- some speed optimization on loading internal classes
+
+
+08/24/2009
+- fixed typo in lexer definition for '!==' operator
+- bugfix - the ouput of plugins was not cached
+- added global variable SCRIPT_NAME
+
+08/21/2009
+- fixed problems whitespace in conjuction with custom delimiters
+- Smarty tags can now be used as value anywhere
+
+08/18/2009
+- definition of template class name moded in internal.templatebase.php
+- whitespace parser changes
+
+08/12/2009
+- fixed parser problems
+
+08/11/2009
+- fixed parser problems with custom delimiter
+
+08/10/2009
+- update of mb support in plugins
+
+
+08/09/2009
+- fixed problems with doublequoted strings at name attribute of {block} tag
+- bugfix at scope attribute of {append} tag
+
+08/08/2009
+- removed all internal calls of Smarty::instance()
+- fixed code in double quoted strings
+
+08/05/2009
+- bugfix mb_string support
+- bugfix of \n.\t etc in double quoted strings
+
+07/29/2009
+- added syntax for variable config vars  like  #$foo#
+
+07/28/2009
+- fixed parsing of $smarty.session vars containing objects
+
+07/22/2009
+- fix of "$" handling in double quoted strings
+
+07/21/2009
+- fix that {$smarty.current_dir} return correct value within {block} tags.
+
+07/20/2009
+- drop error message on unmatched {block} {/block} pairs
+
+07/01/2009
+- fixed smarty_function_html_options call in plugin function.html_select_date.php (missing ,)
+
+06/24/2009
+- fixed smarty_function_html_options call in plugin function.html_select_date.php
+
+06/22/2009
+- fix on \n and spaces inside smarty tags
+- removed request_use_auto_globals propert as it is no longer needed because Smarty 3 will always run under PHP 5
+
+
+06/18/2009
+- fixed compilation of block plugins when caching enabled
+- added $smarty.current_dir  which returns the current working directory
+
+06/14/2009
+- fixed array access on super globals
+- allow smarty tags within xml tags
+
+06/13/2009
+- bugfix at extend resource: create unique files for compiled template and cache for each combination of template files
+- update extend resource to handle appen and prepend block attributes
+- instantiate classes of plugins instead of calling them static
+
+06/03/2009
+- fixed repeat at block plugins
+
+05/25/2009
+- fixed problem with caching of compiler plugins
+
+05/14/2009
+- fixed directory separator handling
+
+05/09/2009
+- syntax change for stream variables
+- fixed bug when using absolute template filepath and caching
+
+05/08/2009
+- fixed bug of {nocache}  tag in included templates
+
+05/06/2009
+- allow that plugins_dir folder names can end without directory separator
+
+05/05/2009
+- fixed E_STRICT incompabilities
+- {function} tag bug fix
+- security policy definitions have been moved from plugins folder to file Security.class.php in libs folder
+- added allow_super_global configuration to security
+
+04/30/2009
+- functions defined with the {function} tag now always have global scope
+
+04/29/2009
+- fixed problem with directory setter methods
+- allow that cache_dir can end without directory separator
+
+04/28/2009
+- the {function} tag can no longer overwrite standard smarty tags
+- inherit functions defined by the {fuction} tag into subtemplates
+- added {while <statement>} sytax to while tag
+
+04/26/2009
+- added trusted stream checking to security
+- internal changes at file dependency check for caching
+
+04/24/2009
+- changed name of {template} tag to {function}
+- added new {template} tag
+
+04/23/2009
+- fixed access of special smarty variables from included template
+
+04/22/2009
+- unified template stream syntax with standard Smarty resource syntax  $smarty->display('mystream:mytemplate')
+
+04/21/2009
+- change of new style syntax for forach. Now:  {foreach $array as $var}  like in PHP
+
+04/20/2009
+- fixed "$foo.bar  ..." variable replacement in double quoted strings
+- fixed error in {include} tag with variable file attribute
+
+04/18/2009
+- added stream resources  ($smarty->display('mystream://mytemplate'))
+- added stream variables  {$mystream:myvar}
+
+04/14/2009
+- fixed compile_id handling on {include} tags
+- fixed append/prepend attributes in {block} tag
+- added  {if  'expression' is in 'array'}  syntax
+- use crc32 as hash for compiled config files.
+
+04/13/2009
+- fixed scope problem with parent variables when appending variables within templates.
+- fixed code for {block} without childs (possible sources for notice errors removed)
+
+04/12/2009
+- added append and prepend attribute to {block} tag
+
+04/11/2009
+- fixed variables in 'file' attribute of {extend} tag
+- fixed problems in modifiers (if mb string functions not present)
+
+04/10/2009
+- check if mb string functions available otherwise fallback to normal string functions
+- added global variable scope SMARTY_GLOBAL_SCOPE
+- enable 'variable' filter by default
+- fixed {$smarty.block.parent.foo}
+- implementation of a 'variable' filter as replacement for default modifier
+
+04/09/2009
+- fixed execution of filters defined by classes
+- compile the always the content of {block} tags to make shure that the filters are running over it
+- syntax corrections on variable object property
+- syntax corrections on array access in dot syntax
+
+04/08/2009
+- allow variable object property
+
+04/07/2009
+- changed variable scopes to SMARTY_LOCAL_SCOPE, SMARTY_PARENT_SCOPE, SMARTY_ROOT_SCOPE to avoid possible conflicts with user constants
+- Smarty variable global attribute replaced with scope attribute
+
+04/06/2009
+- variable scopes LOCAL_SCOPE, PARENT_SCOPE, ROOT_SCOPE
+- more getter/setter methods
+
+04/05/2009
+- replaced new array looping syntax {for $foo in $array} with {foreach $foo in $array} to avoid confusion
+- added append array for short form of assign  {$foo[]='bar'} and allow assignments to nested arrays {$foo['bla']['blue']='bar'}
+
+04/04/2009
+- make output of template default handlers cachable and save compiled source
+- some fixes on yesterdays update
+
+04/03/2006
+- added registerDefaultTemplateHandler method and functionallity
+- added registerDefaultPluginHandler method and functionallity
+- added {append} tag to extend Smarty array variabled
+
+04/02/2009
+- added setter/getter methods
+- added $foo@first and $foo@last properties at {for} tag
+- added $set_timezone (true/false) property to setup optionally the default time zone
+
+03/31/2009
+- bugfix smarty.class and internal.security_handler
+- added compile_check configuration
+- added setter/getter methods
+
+03/30/2009
+- added all major setter/getter methods
+
+03/28/2009
+- {block} tags can be nested now
+- md5 hash function replace with crc32 for speed optimization
+- file order for exted resource inverted
+- clear_compiled_tpl and clear_cache_all will not touch .svn folder any longer
+
+03/27/2009
+- added extend resource
+
+03/26/2009
+- fixed parser not to create error on `word` in double quoted strings
+- allow PHP  array(...)
+- implemented  $smarty.block.name.parent to access parent block content
+- fixed smarty.class
+
+
+03/23/2009
+- fixed {foreachelse} and {forelse} tags
+
+03/22/2009
+- fixed possible sources for notice errors
+- rearrange SVN into distribution and development folders
+
+03/21/2009
+- fixed exceptions in function plugins
+- fixed notice error in Smarty.class.php
+- allow chained objects to span multiple lines
+- fixed error in modifiers
+
+03/20/2009
+- moved /plugins folder into /libs folder
+- added noprint modifier
+- autoappend a directory separator if the xxxxx_dir definition have no trailing one
+
+03/19/2009
+- allow array definition as modifier parameter
+- changed modifier to use multi byte string funktions.
+
+03/17/2009
+- bugfix
+
+03/15/2009
+- added {include_php} tag for BC
+- removed @ error suppression
+- bugfix fetch did always repeat output of first call when calling same template several times
+- PHPunit tests extended
+
+03/13/2009
+- changed block syntax to be Smarty like  {block:titel} -> {block name=titel}
+- compiling of {block} and {extend} tags rewriten for better performance
+- added special Smarty variable block  ($smarty.block.foo} returns the parent definition of block foo
+- optimization of {block} tag compiled code.
+- fixed problem with escaped double quotes in double quoted strings
+
+03/12/2009
+- added support of template inheritance by {extend } and {block } tags.
+- bugfix comments within literals
+- added scope attribuie to {include} tag
+
+03/10/2009
+- couple of bugfixes and improvements
+- PHPunit tests extended
+
+03/09/2009
+- added support for global template vars.  {assign_global...}  $smarty->assign_global(...)
+- added direct_access_security
+- PHPunit tests extended
+- added missing {if} tag conditions like "is div by" etc.
+
+03/08/2009
+- splitted up the Compiler class to make it easier to use a coustom compiler
+- made default plugins_dir relative to Smarty root and not current working directory
+- some changes to make the lexer parser better configurable
+- implemented {section} tag for Smarty2 BC
+
+03/07/2009
+- fixed problem with comment tags
+- fixed problem with #xxxx in double quoted string
+- new {while} tag implemented
+- made lexer and paser class configurable as $smarty property
+- Smarty method get_template_vars implemented
+- Smarty method get_registered_object implemented
+- Smarty method trigger_error implemented
+- PHPunit tests extended
+
+03/06/2009
+- final changes on config variable handling
+- parser change - unquoted strings will by be converted into single quoted strings
+- PHPunit tests extended
+- some code cleanup
+- fixed problem on catenate strings with expression
+- update of count_words modifier
+- bugfix on comment tags
+
+
+03/05/2009
+- bugfix on <?xml...> tag with caching enabled
+- changes on exception handling (by Monte)
+
+03/04/2009
+- added support for config variables
+- bugfix on <?xml...> tag
+
+03/02/2009
+- fixed unqouted strings within modifier parameter
+- bugfix parsing of mofifier parameter
+
+03/01/2009
+- modifier chaining works now as in Smarty2
+
+02/28/2009
+- changed handling of unqouted strings
+
+02/26/2009
+- bugfix
+- changed $smarty.capture.foo to be global for Smarty2 BC.
+
+02/24/2009
+- bugfix {php} {/php} tags for backward compatibility
+- bugfix for expressions on arrays
+- fixed usage of "null" value
+- added $smarty.foreach.foo.first and $smarty.foreach.foo.last
+
+02/06/2009
+- bugfix for request variables without index  for example $smarty.get
+- experimental solution for variable functions in static class
+
+02/05/2009
+- update of popup plugin
+- added config variables to template parser (load config functions still missing)
+- parser bugfix for empty quoted strings
+
+02/03/2009
+- allow array of objects as static class variabales.
+- use htmlentities at source output at template errors.
+
+02/02/2009
+- changed search order on modifiers to look at plugins folder first
+- parser bug fix for modifier on array elements  $foo.bar|modifier
+- parser bug fix on single quoted srings
+- internal: splitted up compiler plugin files
+
+02/01/2009
+- allow method chaining on static classes
+- special Smarty variables  $smarty.... implemented
+- added {PHP} {/PHP} tags for backward compatibility
+
+01/31/2009
+- added {math} plugin for Smarty2 BC
+- added template_exists method
+- changed Smarty3 method enable_security() to enableSecurity() to follow camelCase standards
+
+01/30/2009
+- bugfix in single quoted strings
+- changed syntax for variable property access from $foo:property to $foo@property because of ambiguous syntax at modifiers
+
+01/29/2009
+- syntax for array definition changed from (1,2,3) to [1,2,3] to remove ambiguous syntax
+- allow  {for $foo in [1,2,3]} syntax
+- bugfix in double quoted strings
+- allow <?xml...?> tags in template even if short_tags are enabled
+
+01/28/2009
+- fixed '!==' if condition.
+
+01/28/2009
+- added support of {strip} {/strip} tag.
+
+01/27/2009
+- bug fix on backticks in double quoted strings at objects
+
+01/25/2009
+- Smarty2 modfiers added to SVN
+
+01/25/2009
+- bugfix allow arrays at object properties in Smarty syntax
+- the template object is now passed as additional parameter at plugin calls
+- clear_compiled_tpl method completed
+
+01/20/2009
+- access to class constants implemented  ( class::CONSTANT )
+- access to static class variables implemented ( class::$variable )
+- call of static class methods implemented ( class::method() )
+
+01/16/2009
+- reallow leading _ in variable names  {$_var}
+- allow array of objects  {$array.index->method()} syntax
+- finished work on clear_cache and clear_cache_all methods
+
+01/11/2009
+- added support of {literal} tag
+- added support of {ldelim} and {rdelim} tags
+- make code compatible to run with E_STRICT error setting
+
+01/08/2009
+- moved clear_assign and clear_all_assign to internal.templatebase.php
+- added assign_by_ref, append and append_by_ref methods
+
+01/02/2009
+- added load_filter method
+- fished work on filter handling
+- optimization of plugin loading
+
+12/30/2008
+- added compiler support of registered object
+- added backtick support in doubled quoted strings for backward compatibility
+- some minor bug fixes and improvments
+
+12/23/2008
+- fixed problem of not working "not" operator in if-expressions
+- added handling of compiler function plugins
+- finished work on (un)register_compiler_function method
+- finished work on (un)register_modifier method
+- plugin handling from plugins folder changed for modifier plugins
+  deleted - internal.modifier.php
+- added modifier chaining to parser
+
+12/17/2008
+- finished (un)register_function method
+- finished (un)register_block method
+- added security checking for PHP functions in PHP templates
+- plugin handling from plugins folder rewritten
+  new - internal.plugin_handler.php
+  deleted - internal.block.php
+  deleted - internal.function.php
+- removed plugin checking from security handler
+
+12/16/2008
+
+- new start of this change_log file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/CONTRIBUTING.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/CONTRIBUTING.md
new file mode 100644
index 000000000..8dfdf32b2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/CONTRIBUTING.md
@@ -0,0 +1,119 @@
+# Contributing to Smarty
+
+First off, thanks for taking the time to contribute! ��
+
+> And if you like the project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation, which we would also be very happy about:
+> - Star the project
+> - Tell a friend about it
+> - Refer this project in your project's readme
+> - Mention the project at local meetups and tell your friends/colleagues
+
+## I Have a Question
+
+> If you want to ask a question, we assume that you have read the available [Documentation](https://smarty-php.github.io/smarty).
+
+Before you ask a question, it is best to search for existing [Issues](https://github.com/smarty-php/smarty/issues) that might help you. 
+In case you have found a suitable issue and still need clarification, you can write your question in this issue. 
+It is also advisable to search the internet for answers first.
+
+If you then still feel the need to ask a question and need clarification, we recommend the following:
+
+- [Open an Issue](https://github.com/smarty-php/smarty/issues/new).
+- Provide as much context as you can about what you're running into.
+- Provide Smarty and PHP versions
+
+We will then take care of the issue as soon as possible.
+
+## I Want To Contribute
+
+> ### Legal Notice
+> When contributing to this project, you must agree that you have authored 100% of the content, 
+> that you have the necessary rights to the content and that the content you contribute may be provided under the project license.
+
+### Reporting Bugs
+
+#### Before Submitting a Bug Report
+
+A good bug report shouldn't leave others needing to chase you up for more information. Therefore, we ask you to 
+investigate carefully, collect information and describe the issue in detail in your report. Please complete the 
+following steps in advance to help us fix any potential bug as fast as possible.
+
+- Make sure that you are using the latest version.
+- Determine if your bug is really a bug and not an error on your side. (Make sure that you have read the [documentation](https://smarty-php.github.io/smarty). If you are looking for support, you might want to check [this section](#i-have-a-question)).
+- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](https://github.com/smarty-php/smarty/issues?q=label%3Abug).
+- Also make sure to search the internet (including Stack Overflow) to see if users outside of the GitHub community have discussed the issue.
+- Collect information about the bug:
+  - For an Exception: please provide the Stack trace
+  - OS (Windows, Linux, macOS)
+  - PHP version
+  - Smarty version
+  - A minimal snippet of (your) code that triggers the bug
+  - Expected output versus actual output
+  - Can you reliably reproduce the issue? And can you also reproduce it with older versions?
+
+#### How Do I Submit a Good Bug Report?
+
+> You must never report security related issues, vulnerabilities or bugs including sensitive information to the issue tracker, or elsewhere in public. 
+> For sensitive bugs, please see [SECURITY.md](SECURITY.md).
+
+We use GitHub issues to track bugs and errors. If you run into an issue with the project:
+
+- Open an [Issue](https://github.com/smarty-php/smarty/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
+- Explain the behavior you would expect and the actual behavior.
+- Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own. This usually includes your code. For good bug reports you should isolate the problem and create a reduced test case.
+- Provide the information you collected in the previous section.
+
+Once it's filed:
+
+- The project team will label the issue accordingly.
+- A team member will try to reproduce the issue with your provided steps. If there are no reproduction steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced.
+- If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be implemented by someone.
+
+
+
+### Suggesting Enhancements
+
+This section guides you through submitting an enhancement suggestion for CONTRIBUTING.md, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions.
+
+
+#### Before Submitting an Enhancement
+
+- Make sure that you are using the latest version.
+- Read the [documentation](https://smarty-php.github.io/smarty) carefully and find out if the functionality is already covered, maybe by an individual configuration.
+- Perform a [search](https://github.com/smarty-php/smarty/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
+- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.
+
+
+#### How Do I Submit a Good Enhancement Suggestion?
+
+Enhancement suggestions are tracked as [GitHub issues](https://github.com/smarty-php/smarty/issues).
+
+- Use a **clear and descriptive title** for the issue to identify the suggestion.
+- Provide a **step-by-step description of the suggested enhancement** in as many details as possible.
+- **Describe the current behavior** and **explain which behavior you expected to see instead** and why. At this point you can also tell which alternatives do not work for you.
+- You may want to **include screenshots and animated GIFs** which help you demonstrate the steps or point out the part which the suggestion is related to. You can use [this tool](https://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux.
+- **Explain why this enhancement would be useful** to most CONTRIBUTING.md users. You may also want to point out the other projects that solved it better and which could serve as inspiration.
+
+
+### Improving The Documentation
+
+The [docs](docs/index.md) are written in markdown, configured in [mkdocs.yml](mkdocs.yml) and published 
+to [GitHub pages](https://smarty-php.github.io/smarty) using [mkdocs](https://www.mkdocs.org/) and [mike](https://github.com/jimporter/mike).
+
+To preview the docs while you are writing, run:
+```bash
+mkdocs serve
+```
+This should launch a local web server and give you a link to open in your browser.
+
+When you are finished, commit your changes and provide a [Pull Request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request).
+
+#### Publishing the docs
+If you are a maintainer, you can publish the document using [mike](https://github.com/jimporter/mike). Make sure you provide the correct version.
+
+```bash
+mike deploy 5.x
+```
+
+## Attribution
+This guide is based on the **contributing.md**. [Make your own](https://contributing.md/)!
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/LICENSE b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/LICENSE
new file mode 100644
index 000000000..595e5993d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/LICENSE
@@ -0,0 +1,179 @@
+Smarty: the PHP compiling template engine
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
+
+ This library 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 Lesser General Public License below for more details.
+
+
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 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.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser 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
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/Makefile b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/Makefile
new file mode 100644
index 000000000..38afdbf1b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/Makefile
@@ -0,0 +1,19 @@
+all: lexers parsers
+
+lexers: src/Lexer/ConfigfileLexer.php src/Lexer/TemplateLexer.php
+parsers: src/Parser/ConfigfileParser.php src/Parser/TemplateParser.php
+
+src/Lexer/ConfigfileLexer.php: src/Lexer/ConfigfileLexer.plex
+	php ./utilities/make-lexer.php src/Lexer/ConfigfileLexer.plex src/Lexer/ConfigfileLexer.php
+
+src/Lexer/TemplateLexer.php: src/Lexer/TemplateLexer.plex
+	php ./utilities/make-lexer.php src/Lexer/TemplateLexer.plex src/Lexer/TemplateLexer.php
+
+src/Parser/ConfigfileParser.php: src/Parser/ConfigfileParser.y
+	php ./utilities/make-parser.php src/Parser/ConfigfileParser.y src/Parser/ConfigfileParser.php
+
+src/Parser/TemplateParser.php: src/Parser/TemplateParser.y
+	php ./utilities/make-parser.php src/Parser/TemplateParser.y src/Parser/TemplateParser.php
+
+clean:
+	rm -f src/Lexer/ConfigfileLexer.php src/Lexer/TemplateLexer.php src/Parser/ConfigfileParser.php src/Parser/TemplateParser.php
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/README.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/README.md
new file mode 100644
index 000000000..f73647e59
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/README.md
@@ -0,0 +1,20 @@
+# Smarty template engine
+Smarty is a template engine for PHP, facilitating the separation of presentation (HTML/CSS) from application logic. 
+
+![CI](https://github.com/smarty-php/smarty/workflows/CI/badge.svg)
+
+## Documentation
+Read the [documentation](https://smarty-php.github.io/smarty/) to find out how to use it. 
+
+## Requirements
+Smarty v5 can be run with PHP 7.2 to PHP 8.3.
+
+## Installation
+Smarty versions 3.1.11 or later can be installed with [Composer](https://getcomposer.org/).
+
+To get the latest stable version of Smarty use:
+```bash
+composer require smarty/smarty
+````
+
+More in the [Getting Started](./docs/getting-started.md) section of the docs.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/SECURITY.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/SECURITY.md
new file mode 100644
index 000000000..9685c254f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/SECURITY.md
@@ -0,0 +1,20 @@
+# Security Policy
+
+## Supported Versions
+
+Smarty currently supports the latest minor version of Smarty 4 and Smarty 5.
+
+| Version | Supported          |
+|---------|--------------------|
+| 5.0.x   | :white_check_mark: |
+| 4.3.x   | :white_check_mark: |
+| < 4.3   | :x:                |
+
+## Reporting a Vulnerability
+
+If you have discovered a security issue with Smarty, please contact us at mail [at] simonwisselink.nl. Do not 
+disclose your findings publicly and **PLEASE** do not file an Issue (because that would disclose your findings 
+publicly.)
+ 
+We will try to confirm the vulnerability and develop a fix if appropriate. When we release the fix, we will publish 
+a security release. Please let us know if you want to be credited.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/TODO.txt b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/TODO.txt
new file mode 100644
index 000000000..aabbf6543
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/TODO.txt
@@ -0,0 +1,32 @@
+# @TODO
+
+## CI-building optimization
+- compiled & cached templates should not contain references to local filesystem paths. Add an optional rootpath param
+  to `(add|set)TemplateDir` or as a separate method. Make it default to `getcwd()`. If a relative path is passed to
+  `(add|set)TemplateDir`, prefix it with the rootpath at runtime, but do not store the path.
+
+## Review direct variable property access
+- review ->value{$index} in ForTag
+
+## include inline
+- Re-introduce merge_compiled_includes and the {include inline} attribute?
+
+## Output buffering
+- Fix ob_ output buffering commands being scattered around the codebase
+
+## Review public static vars
+- such as _CHARSET and _IS_WINDOWS
+
+## Block / inheritance
+- Consider phasing out $smarty.block.child as this reverses the inheritance hierarchy and might cause infinite loops
+  when combined with $smarty.block.parent
+
+## Plugin system
+- fix template security checks in one place in compiler
+
+## Beatify output
+- compiled templates could be proper classes, possibly using [nette/php-generator](https://packagist.org/packages/nette/php-generator)
+
+## Unrelated / other
+- review (and avoid) use of 'clone' keyword
+- what is 'user literal support', why are unit tests skipped?
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/changelog/.gitkeep b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/changelog/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/composer.json b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/composer.json
new file mode 100644
index 000000000..87d865d78
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/composer.json
@@ -0,0 +1,53 @@
+{
+    "name": "smarty/smarty",
+    "type": "library",
+    "description": "Smarty - the compiling PHP template engine",
+    "keywords": [
+        "templating"
+    ],
+    "homepage": "https://smarty-php.github.io/smarty/",
+    "license": "LGPL-3.0",
+    "authors": [
+        {
+            "name": "Monte Ohrt",
+            "email": "monte@ohrt.com"
+        },
+        {
+            "name": "Uwe Tews",
+            "email": "uwe.tews@googlemail.com"
+        },
+        {
+            "name": "Rodney Rehm",
+            "email": "rodney.rehm@medialize.de"
+        },
+        {
+            "name": "Simon Wisselink",
+            "homepage": "https://www.iwink.nl/"
+        }
+    ],
+    "support": {
+        "issues": "https://github.com/smarty-php/smarty/issues",
+        "forum": "https://github.com/smarty-php/smarty/discussions"
+    },
+    "require": {
+        "php": "^7.2 || ^8.0",
+        "symfony/polyfill-mbstring": "^1.27"
+    },
+    "autoload": {
+        "psr-4" : {
+            "Smarty\\" : "src/"
+        },
+        "files": [
+            "src/functions.php"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "5.0.x-dev"
+        }
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^8.5 || ^7.5",
+        "smarty/smarty-lexer": "^4.0.2"
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/demo/configs/test.conf b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/demo/configs/test.conf
new file mode 100644
index 000000000..5eac748ec
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/demo/configs/test.conf
@@ -0,0 +1,5 @@
+title = Welcome to Smarty!
+cutoff_size = 40
+
+[setup]
+bold = true
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/demo/index.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/demo/index.php
new file mode 100644
index 000000000..705478ff3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/demo/index.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Example Application
+ *
+
+ */
+
+$smarty = new \Smarty\Smarty;
+
+$smarty->debugging = true;
+$smarty->caching = true;
+$smarty->cache_lifetime = 120;
+$smarty->assign("Name", "Fred Irving Johnathan Bradley Peppergill", true);
+$smarty->assign("FirstName", array("John", "Mary", "James", "Henry"));
+$smarty->assign("LastName", array("Doe", "Smith", "Johnson", "Case"));
+$smarty->assign(
+    "Class",
+    array(
+        array("A", "B", "C", "D"),
+        array("E", "F", "G", "H"),
+        array("I", "J", "K", "L"),
+        array("M", "N", "O", "P")
+    )
+);
+$smarty->assign(
+    "contacts",
+    array(
+        array("phone" => "1", "fax" => "2", "cell" => "3"),
+        array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234")
+    )
+);
+$smarty->assign("option_values", array("NY", "NE", "KS", "IA", "OK", "TX"));
+$smarty->assign("option_output", array("New York", "Nebraska", "Kansas", "Iowa", "Oklahoma", "Texas"));
+$smarty->assign("option_selected", "NE");
+$smarty->display('index.tpl');
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/demo/templates/footer.tpl b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/demo/templates/footer.tpl
new file mode 100644
index 000000000..e04310fdd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/demo/templates/footer.tpl
@@ -0,0 +1,2 @@
+</BODY>
+</HTML>
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/demo/templates/header.tpl b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/demo/templates/header.tpl
new file mode 100644
index 000000000..783210a18
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/demo/templates/header.tpl
@@ -0,0 +1,5 @@
+<HTML>
+<HEAD>
+<TITLE>{$title} - {$Name}</TITLE>
+</HEAD>
+<BODY bgcolor="#ffffff">
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/demo/templates/index.tpl b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/demo/templates/index.tpl
new file mode 100644
index 000000000..1a0f431bb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/demo/templates/index.tpl
@@ -0,0 +1,85 @@
+{config_load file="test.conf" section="setup"}
+{include file="header.tpl" title=foo}
+
+<PRE>
+
+{* bold and title are read from the config file *}
+    {if #bold#}<b>{/if}
+        {* capitalize the first letters of each word of the title *}
+        Title: {#title#|capitalize}
+        {if #bold#}</b>{/if}
+
+    The current date and time is {$smarty.now|date_format:"%Y-%m-%d %H:%M:%S"}
+
+    Example of accessing server environment variable SERVER_NAME: {$smarty.server.SERVER_NAME}
+
+    The value of {ldelim}$Name{rdelim} is <b>{$Name}</b>
+
+variable modifier example of {ldelim}$Name|upper{rdelim}
+
+<b>{$Name|upper}</b>
+
+
+An example of a section loop:
+
+    {section name=outer
+    loop=$FirstName}
+        {if $smarty.section.outer.index is odd by 2}
+            {$smarty.section.outer.rownum} . {$FirstName[outer]} {$LastName[outer]}
+        {else}
+            {$smarty.section.outer.rownum} * {$FirstName[outer]} {$LastName[outer]}
+        {/if}
+        {sectionelse}
+        none
+    {/section}
+
+    An example of section looped key values:
+
+    {section name=sec1 loop=$contacts}
+        phone: {$contacts[sec1].phone}
+        <br>
+
+            fax: {$contacts[sec1].fax}
+        <br>
+
+            cell: {$contacts[sec1].cell}
+        <br>
+    {/section}
+    <p>
+
+        testing strip tags
+        {strip}
+<table border=0>
+    <tr>
+        <td>
+            <A HREF="{$SCRIPT_NAME}">
+                <font color="red">This is a test </font>
+            </A>
+        </td>
+    </tr>
+</table>
+    {/strip}
+
+</PRE>
+
+This is an example of the html_select_date function:
+
+<form>
+    {html_select_date start_year=1998 end_year=2010}
+</form>
+
+This is an example of the html_select_time function:
+
+<form>
+    {html_select_time use_24_hours=false}
+</form>
+
+This is an example of the html_options function:
+
+<form>
+    <select name=states>
+        {html_options values=$option_values selected=$option_selected output=$option_output}
+    </select>
+</form>
+
+{include file="footer.tpl"}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/_config.yml b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/_config.yml
new file mode 100644
index 000000000..2f7efbeab
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-minimal
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/basics.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/basics.md
new file mode 100644
index 000000000..ef5292dab
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/basics.md
@@ -0,0 +1,93 @@
+# Basics
+
+## Installation
+For installation instructies, please see the [getting started section](../getting-started.md).
+
+## Rendering a template
+Here's how you create an instance of Smarty in your PHP scripts:
+```php
+<?php
+
+require 'vendor/autoload.php';
+use Smarty\Smarty;
+$smarty = new Smarty();
+```
+
+You now have a Smarty object that you can use to render templates.
+
+```php
+<?php
+
+require 'vendor/autoload.php';
+use Smarty\Smarty;
+$smarty = new Smarty();
+
+$smarty->display('string:The current smarty version is: {$smarty.version}.');
+// or 
+echo $smarty->fetch('string:The current smarty version is: {$smarty.version}.');
+```
+
+## Using file-based templates
+You probably want to manage your templates as files. Create a subdirectory called 'templates' and
+then configure Smarty to use that:
+
+```php
+<?php
+
+require 'vendor/autoload.php';
+use Smarty\Smarty;
+$smarty = new Smarty();
+
+$smarty->setTemplateDir(__DIR__ . '/templates');
+```
+
+Say you have a template file called 'version.tpl', stored in the 'templates' directory like this:
+```smarty
+<h1>Hi</h1>
+The current smarty version is: {$smarty.version|escape}.
+```
+
+You can now render this, using:
+```php
+<?php
+
+require 'vendor/autoload.php';
+use Smarty\Smarty;
+$smarty = new Smarty();
+
+$smarty->setTemplateDir(__DIR__ . '/templates');
+$smarty->display('version.tpl');
+```
+
+## Assigning variables
+
+Templates start to become really useful once you add variables to the mix.
+
+Create a template called 'footer.tpl' in the 'templates' directory like this:
+```smarty
+<small>Copyright {$companyName|escape}</small>
+```
+
+Now assign a value to the 'companyName' variable and render your template like this:
+
+```php
+<?php
+
+require 'vendor/autoload.php';
+use Smarty\Smarty;
+$smarty = new Smarty();
+
+$smarty->setTemplateDir(__DIR__ . '/templates');
+$smarty->assign('companyName', 'AC & ME Corp.');
+$smarty->display('footer.tpl');
+```
+
+Run this, and you will see:
+
+```html
+<small>Copyright AC &amp; ME Corp.</small>
+```
+
+Note how the [escape modifier](../designers/language-modifiers/language-modifier-escape.md) 
+translated the `&` character into the proper HTML syntax `&amp;`.
+Read more about auto-escaping in the [next section](./configuring.md).
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/caching/basics.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/caching/basics.md
new file mode 100644
index 000000000..19c04c997
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/caching/basics.md
@@ -0,0 +1,184 @@
+# Caching
+
+Caching is used to speed up the rendering of a template by saving and re-using the output. 
+
+If a cached version of the call is available, that is displayed instead of
+regenerating the output. Caching can speed things up tremendously,
+especially templates with longer computation times. 
+
+Since templates can include or extend other templates, one
+cache file could conceivably be made up of several template files,
+config files, etc.
+
+> ** Note **
+> 
+> Since templates are dynamic, it is important to be careful what you are
+> caching and for how long. For instance, if you are displaying the front
+> page of your website that does not change its content very often, it
+> might work well to cache this page for an hour or more. On the other
+> hand, if you are displaying a page with a timetable containing new
+> information by the minute, it would not make sense to cache this page.
+
+## Setting Up Caching
+
+The first thing to do is enable caching by calling `Smarty::setCaching()` with either
+`\Smarty\Smarty::CACHING_LIFETIME_CURRENT` or `\Smarty\Smarty::CACHING_LIFETIME_SAVED`.
+Or with `\Smarty\Smarty::CACHING_OFF` to disable caching again.
+
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty;
+
+// enable caching, using the current lifetime (see below)
+$smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+// enable caching, using the lifetime set when the cache was saved (see below)
+$smarty->setCaching(Smarty::CACHING_LIFETIME_SAVED);
+
+// disable caching
+$smarty->setCaching(Smarty::CACHING_OFF);
+
+$smarty->display('index.tpl');
+```
+
+With caching enabled, the function call to `$smarty->display('index.tpl')` will
+render the template as usual, but also saves a copy of its output. On the
+next call to `$smarty->display('index.tpl')`, the cached copy will be used
+instead of rendering the template again.
+
+> **Note**
+>
+> By default, Smarty saved its caches as files in a dir called `cache` relative to the current 
+> directory. The default directory can be changed using `$smarty->setCacheDir('/some/cache/dir');` 
+> The files are named similar
+> to the template name. Although they end in the `.php` extension, they
+> are not intended to be directly executable. Do not edit these files!
+
+## Cache lifetime
+
+Each cached page has a limited lifetime. The default value is 3600
+seconds, or one hour. After that time expires, the cache is regenerated.
+
+You can change the lifetime as follows:
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty;
+
+$smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT); 
+// or $smarty->setCaching(Smarty::CACHING_LIFETIME_SAVED);
+
+// set the cache_lifetime to 5 minutes
+$smarty->setCacheLifetime(5 * 60);
+```
+
+Setting caching to a value of `\Smarty\Smarty::CACHING_LIFETIME_CURRENT` tells Smarty to use
+the current lifetime to determine if the cache has expired.
+
+A value of `\Smarty\Smarty::CACHING\_LIFETIME\_SAVED` tells Smarty to use the lifetime value at the time the
+cache was generated. This way you can set the just before rendering a template to have granular control over
+when that particular cache expires.
+
+An example:
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty;
+
+// retain current cache lifetime for each specific display call
+$smarty->setCaching(Smarty::CACHING_LIFETIME_SAVED);
+
+// set the cache_lifetime for index.tpl to 5 minutes
+$smarty->setCacheLifetime(300);
+$smarty->display('index.tpl');
+
+// set the cache_lifetime for home.tpl to 1 hour
+$smarty->setCacheLifetime(3600);
+$smarty->display('home.tpl');
+
+// NOTE: the following $cache_lifetime setting will not work when $caching
+// is set to Smarty::CACHING_LIFETIME_SAVED.
+// The cache lifetime for home.tpl has already been set
+// to 1 hour, and will no longer respect the value of $cache_lifetime.
+// The home.tpl cache will still expire after 1 hour.
+$smarty->setCacheLifetime(30); // 30 seconds
+$smarty->display('home.tpl');
+```
+
+## Compile check
+
+By default, every template file and config file that is involved with the cache file
+is checked for modification. If any of the files have been modified
+since the cache was generated, the cache is immediately regenerated.
+
+This is a computational overhead, so for optimum performance, disable this on a production environment:
+
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty;
+
+$smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+$smarty->setCompileCheck(Smarty::COMPILECHECK_OFF);
+
+$smarty->display('index.tpl');
+```
+
+## Checking if a template is cached
+
+Smarty's `isCached() method can be used to test if a
+template has a valid cache or not. If you have a cached template that
+requires something like a database fetch, you can use this to skip that
+process.
+
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty;
+
+$smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+if (!$smarty->isCached('index.tpl')) {
+    // No cache available, do variable assignments here.
+    $smarty->assign('data', do_expensive_database_calls());
+}
+
+$smarty->display('index.tpl');
+```
+
+## Nocache-blocks
+You can keep parts of a page dynamic (disable caching) with the
+[`{nocache}{/nocache}`](../../designers/language-builtin-functions/language-function-nocache.md) block function, 
+or by using the `nocache` parameter for most template functions.
+
+Let's say the whole page can be cached except for a banner that is
+displayed down the side of the page. By using a [`{nocache}{/nocache}`](../../designers/language-builtin-functions/language-function-nocache.md)
+block for the banner, you can
+keep this element dynamic within the cached content.
+
+## Clearing the cache
+You can clear all the cache files with Smarty's `clearAllCache()` method, or individual cache
+files with the `clearCache()` method.
+
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty;
+
+$smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+// clear only cache for index.tpl
+$smarty->clearCache('index.tpl');
+
+// clear out all cache files
+$smarty->clearAllCache();
+
+// clear out all cache files older than one hour
+$smarty->clearAllCache(3600);
+
+// or, clear all expired caches
+$smarty->clearAllCache(Smarty::CLEAR_EXPIRED);
+```
+
+        
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/caching/custom-storage-layers.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/caching/custom-storage-layers.md
new file mode 100644
index 000000000..f43e724e6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/caching/custom-storage-layers.md
@@ -0,0 +1,36 @@
+# Custom cache storage layers
+
+As an alternative to using the default file-based caching mechanism, you
+can specify a custom cache implementation that will be used to read,
+write and clear cached files.
+
+With a custom cache implementation you could replace the slow filesystem by a
+faster storage engine, centralize the cache to be accessible to multiple
+servers.
+
+Smarty requires implementations to extend `\Smarty\Cacheresource\Base`, but encourages you to either extend 
+`\Smarty\Cacheresource\Custom` or `\Smarty\Cacheresource\KeyValueStore`.
+
+- `\Smarty\Cacheresource\Custom` is a simple API directing all read, write,
+clear calls to your implementation. This API allows you to store
+wherever and however you deem fit. 
+- `\Smarty\Cacheresource\KeyValueStore` allows you to turn any 
+KeyValue-Store (like APC or Memcache) into a full-featured
+CacheResource implementation. Everything around deep
+cache-groups like "a|b|c" is being handled for you in a way that
+guarantees clearing the cache-group "a" will clear all nested groups 
+as well - even though KeyValue-Stores don't allow this kind of
+hierarchy by nature.
+
+Custom CacheResources must be registered on
+runtime with `Smarty\Smarty::setCacheResource()`:
+
+```php
+<?php
+
+use Smarty\Smarty;
+$smarty = new Smarty();
+
+$smarty->setCacheResource(new My_CacheResource_Mysql());
+```
+       
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/caching/multiple-caches-per-template.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/caching/multiple-caches-per-template.md
new file mode 100644
index 000000000..c3da9d0a4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/caching/multiple-caches-per-template.md
@@ -0,0 +1,137 @@
+# Multiple caches per template
+
+## Introduction
+
+You can have multiple cache files for a single call to
+`display()` or `fetch()`. 
+
+Let's say that
+a call to `$smarty->display('index.tpl')` may have several different output
+contents depending on some condition, and you want separate caches for
+each one. You can do this by passing a `$cache_id` as the second
+parameter to the function call:
+
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty;
+
+$smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+$my_cache_id = (int) $_GET['article_id'];
+
+$smarty->display('index.tpl', $my_cache_id);
+```
+
+
+Above, we are passing the variable `$my_cache_id` to
+[`display()`](#api.display) as the `$cache_id`. For each unique value of
+`$my_cache_id`, a separate cache will be generated for `index.tpl`. In
+this example, `article_id` was passed in the URL and is used as the
+`$cache_id`.
+
+> **Note**
+>
+> Be very cautious when passing values from a client (web browser) into
+> Smarty or any PHP application. Although the above example of using the
+> article_id from the URL looks handy, it could have bad consequences.
+> The `$cache_id` is used to create a directory on the file system, so
+> if the user decided to write a script that sends random article_id's at a rapid pace,
+> this could possibly cause problems at the server level.
+> Be sure to sanitize any data passed in before using it. In this example, you might want to check if
+> the article_id is a valid ID in the database.
+
+Be sure to pass the same `$cache_id` as the second parameter to
+`isCached()` and `clearCache()`.
+
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty;
+
+$smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+$my_cache_id = (int) $_GET['article_id'];
+
+if (!$smarty->isCached('index.tpl', $my_cache_id)) {
+    // ...
+}
+
+$smarty->display('index.tpl', $my_cache_id);
+```
+
+## Clearing specific caches
+
+You can clear all caches for a particular `$cache_id` by passing NULL as
+the first parameter to `clearCache()`.
+
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty;
+
+$smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+// clear all caches with "sports" as the $cache_id
+$smarty->clearCache(null, 'sports');
+
+$smarty->display('index.tpl', 'sports');
+```
+
+In this manner, you can "group" your caches together by giving them the
+same `$cache_id`.
+
+## Advanced cache grouping
+
+You can do more elaborate grouping by setting up `$cache_id` groups.
+This is accomplished by separating each sub-group with a vertical bar
+`|` in the `$cache_id` value. You can have as many sub-groups as you
+like.
+
+-   You can think of cache groups like a directory hierarchy. For
+    instance, a cache group of `'a|b|c'` could be thought of as the
+    directory structure `'/a/b/c/'`.
+
+-   `clearCache(null, 'a|b|c')` would be like removing the files
+    `'/a/b/c/*'`. `clearCache(null, 'a|b')` would be like removing the
+    files `'/a/b/*'`.
+
+-   If you specify a template name such as
+    `clearCache('foo.tpl', 'a|b|c')` then Smarty will attempt to remove
+    `'/a/b/c/foo.tpl'`.
+
+-   You CANNOT remove a specified template name under multiple cache
+    groups such as `'/a/b/*/foo.tpl'`, the cache grouping works
+    left-to-right ONLY. You will need to group your templates under a
+    single cache group hierarchy to be able to clear them as a group.
+
+Cache grouping should not be confused with your template directory
+hierarchy, the cache grouping has no knowledge of how your templates are
+structured. So for example, if you have a template structure like
+`themes/blue/index.tpl` and you want to be able to clear all the cache
+files for the "blue" theme, you will need to create a cache group
+structure that mimics your template file structure, such as
+`display('themes/blue/index.tpl', 'themes|blue')`, then clear them with
+`clearCache(null, 'themes|blue')`.
+
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty;
+
+$smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+// clear all caches with 'sports|basketball' as the first two cache_id groups
+$smarty->clearCache(null, 'sports|basketball');
+
+// clear all caches with "sports" as the first cache_id group. This would
+// include "sports|basketball", or "sports|(anything)|(anything)|(anything)|..."
+$smarty->clearCache(null, 'sports');
+
+// clear the foo.tpl cache file with "sports|basketball" as the cache_id
+$smarty->clearCache('foo.tpl', 'sports|basketball');
+
+$smarty->display('index.tpl', 'sports|basketball');
+```
+
+          
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/configuring.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/configuring.md
new file mode 100644
index 000000000..4c1c91fa7
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/configuring.md
@@ -0,0 +1,193 @@
+# Configuring Smarty
+
+## Setting the template path
+By default, Smarty looks for templates to render in `./templates`.
+
+You can change this, or even use multiple paths to use when looking for templates.
+
+If you need to change this, you can use `setTemplateDir()` or `addTemplateDir()`.
+Use `getTemplateDir()` to retrieve the configured paths.
+
+```php
+<?php
+
+ // set a single directory where the config files are stored
+$smarty->setTemplateDir('./config');
+
+// set multiple directories where config files are stored
+$smarty->setTemplateDir(['./config', './config_2', './config_3']);
+
+// add directory where config files are stored to the current list of dirs
+$smarty->addTemplateDir('./config_1');
+
+// add multiple directories to the current list of dirs
+$smarty->addTemplateDir([
+    './config_2',
+    './config_3',
+]);
+
+// chaining of method calls
+$smarty->setTemplateDir('./config')
+       ->addTemplateDir('./config_1')
+       ->addTemplateDir('./config_2');
+
+// get all directories where config files are stored
+$template_dirs = $smarty->getTemplateDir();
+var_dump($template_dirs); // array
+
+// get directory identified by key
+$template_dir = $smarty->getTemplateDir(0);
+var_dump($template_dir); // string
+```
+
+## Setting the path for compiled templates
+Smarty compiles templates to native PHP to be as fast as possible.
+The default path where these PHP-files are stored is `./templates_c`.
+
+If you need to change this, you can use `setCompileDir()`.
+Use `getCompileDir()` to retrieve the configured path.
+
+```php
+<?php
+
+// set another path to store compiled templates
+$smarty->setCompileDir('/data/compiled_templates');
+
+// get directory where compiled templates are stored
+$compileDir = $smarty->getCompileDir();
+```
+
+
+## Setting the config path
+Smarty can [load data from config files](./variables/config-files.md).
+By default, Smarty loads the config files from `./configs`.
+
+You can change this, or even use multiple paths to use when looking for config files.
+
+If you need to change this, you can use `setConfigDir()` or `addConfigDir()`.
+Use `getConfigDir()` to retrieve the configured paths.
+
+```php
+<?php
+
+ // set a single directory where the config files are stored
+$smarty->setConfigDir('./config');
+
+// set multiple directories where config files are stored
+$smarty->setConfigDir(['./config', './config_2', './config_3']);
+
+// add directory where config files are stored to the current list of dirs
+$smarty->addConfigDir('./config_1');
+
+// add multiple directories to the current list of dirs
+$smarty->addConfigDir([
+    './config_2',
+    './config_3',
+]);
+
+// chaining of method calls
+$smarty->setConfigDir('./config')
+       ->addConfigDir('./config_1', 'one')
+       ->addConfigDir('./config_2', 'two');
+
+// get all directories where config files are stored
+$config_dirs = $smarty->getConfigDir();
+var_dump($config_dirs); // array
+
+// get directory identified by key
+$config_dir = $smarty->getConfigDir(0);
+var_dump($config_dir); // string
+```
+
+## Setting the path for caches
+Even though Smarty runs templates as native PHP for maximum speed, it still needs to 
+execute the PHP code on each call. If your data doesn't change all that often, you
+may be able to speed up your application even more by using output caching.
+
+Output caching can be a tricky subject, so we devoted an entire [section to caching](./caching/basics.md).
+Be sure to read that if you want to use caching.
+
+By default, Smarty stores caches to PHP-files in a subdirectory named `./cache`.
+
+If you need to change this, you can use `setCacheDir()`.
+Use `getCacheDir()` to retrieve the configured path.
+
+```php
+<?php
+
+// set another path to store caches
+$smarty->setCacheDir('/data/caches');
+
+// get directory where cached templates are stored
+$cacheDir = $smarty->getCacheDir();
+```
+
+## Enabling auto-escaping
+By default, Smarty does not escape anything you render in your templates. If you use
+Smarty to render a HTML-page, this means that you will have to make sure that you do
+not render any characters that have a special meaning in HTML, such as `&`, `<` and `>`,
+or apply the [escape modifier](../designers/language-modifiers/language-modifier-escape.md) 
+to anything you want to render.
+
+If you forget to do so, you may break your HTML page, or even create a vulnerability for 
+attacks known as [XSS or Cross Site Scripting](https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html).
+
+Luckily, you can tell Smarty to automatically apply the escape modifier to any dynamic part of your template.
+It's like Smarty magically adds `|escape` to every variable you use on a web page.
+
+Enable auto-escaping for HTML as follows:
+```php
+$smarty->setEscapeHtml(true);
+```
+
+## Disabling compile check
+By default, Smarty tests to see if the
+current template has changed since the last time
+it was compiled. If it has changed, it recompiles that template. 
+
+Once an application is put into production, this compile-check step 
+is usually no longer needed and the extra checks can significantly hurt performance. 
+Be sure to disable compile checking on production for maximum performance. 
+```php
+<?php
+$smarty->setCompileCheck(\Smarty\Smarty::COMPILECHECK_OFF);
+```
+
+If [`caching`](./caching/basics.md) is enabled and compile-check is
+enabled, then the cache files will get regenerated if an involved
+template file or config file was updated.
+
+## Charset encoding
+
+There are a variety of encodings for textual data, ISO-8859-1 (Latin1)
+and UTF-8 being the most popular. Unless you change `\Smarty\Smarty::$_CHARSET`,
+Smarty recognizes `UTF-8` as the internal charset.
+
+> **Note**
+>
+> `ISO-8859-1` has been PHP\'s default internal charset since the
+> beginning. Unicode has been evolving since 1991. Since then, it has
+> become the one charset to conquer them all, as it is capable of
+> encoding most of the known characters even across different character
+> systems (latin, cyrillic, japanese, ...). `UTF-8` is unicode\'s most
+> used encoding, as it allows referencing the thousands of character
+> with the smallest size overhead possible.
+>
+> Since unicode and UTF-8 are very widespread nowadays, their use is
+> strongly encouraged.
+
+> **Note**
+>
+> Smarty\'s internals and core plugins are truly UTF-8 compatible since
+> Smarty 3.1.
+
+```php
+<?php
+    
+// use japanese character encoding
+mb_internal_charset('EUC-JP');
+
+\Smarty\Smarty::$_CHARSET = 'EUC-JP';
+$smarty = new \Smarty\Smarty();
+```
+     
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/extending/block-tags.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/extending/block-tags.md
new file mode 100644
index 000000000..2ae6e77b0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/extending/block-tags.md
@@ -0,0 +1,59 @@
+# Custom block tags
+
+Block tags are tags of the form: `{func} .. {/func}`. In other
+words, they enclose a template block and operate on the contents of this
+block. 
+
+Block functions take precedence over normal tags of the same name, that is, you
+cannot have both custom tag `{func}` and block tag `{func}..{/func}`.
+
+-   By default, your function implementation is called twice by Smarty:
+    once for the opening tag, and once for the closing tag. (See
+    `$repeat` below on how to change this.)
+
+-   Only the opening tag of the block has attributes. All attributes are contained in the `$params`
+    variable as an associative array. The opening tag attributes are
+    also accessible to your function when processing the closing tag.
+
+-   The value of the `$content` variable depends on whether your
+    function is called for the opening or closing tag. In case of the
+    opening tag, it will be NULL, and in case of the closing tag it will
+    be the contents of the template block. Note that the template block
+    will have already been processed by Smarty, so all you will receive
+    is the template output, not the template source.
+
+-   The parameter `$repeat` is passed by reference to the function
+    implementation and provides a possibility for it to control how many
+    times the block is displayed. By default `$repeat` is TRUE at the
+    first call of the block function (the opening tag) and FALSE on all
+    subsequent calls to the block function (the block's closing tag).
+    Each time the function implementation returns with `$repeat` being
+    TRUE, the contents between `{func}...{/func}` are evaluated and the
+    function implementation is called again with the new block contents
+    in the parameter `$content`.
+
+Example:
+```php
+<?php
+
+function smarty_block_translate($params, $content, \Smarty\Template $template, &$repeat) {
+    // only output on the closing tag
+    if (!$repeat){
+        if (isset($content)) {
+            $lang = $params['lang'];
+            // do some intelligent translation thing here with $content
+            return $translation;
+        }
+    }
+}
+
+$smarty->registerPlugin(Smarty\Smarty::PLUGIN_BLOCK, 'translate', 'smarty_block_translate');
+```
+
+This can now be used in your templates as follows:
+
+```smarty
+{translate lang='nl'}
+    Quia omnis nulla omnis iusto est id et.
+{/translate}
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/extending/extensions.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/extending/extensions.md
new file mode 100644
index 000000000..5c87d4dc6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/extending/extensions.md
@@ -0,0 +1,101 @@
+# Creating an extension
+
+## Default extensions
+
+In order to organize your custom tags and modifiers, you can create an Extension.
+In fact, most of Smarty itself is organized into two extensions:
+
+- the core extension, which provides the basic language tags such as `{if}`, `{for}` and `{assign}`. 
+- the default extension, which provides all default modifiers such as `|escape`,  `|nl2br` and  `|number_format` 
+  and tags such as `{html_image}`, `{mailto}` and `{textformat}` that are enabled by default, but not necessarily universal.
+
+> ** Note **
+> 
+> There is also the 'BCPluginsAdapter' extension, which does not add any new functionality, but
+> wraps calls to deprecated methods such as `Smarty\Smarty::addPluginsDir()` and `Smarty\Smarty::loadFilter()`.
+
+## Writing your own extension
+
+In order to write your own custom extension, you must write a class that implements `Smarty\Extension\ExtensionInterface`.
+However, it is usually easier to extend `Smarty\Extension\Base` which provides empty implementation for each of the methods
+required by `Smarty\Extension\ExtensionInterface`. This allows you to only override the method(s) you need.
+
+Example:
+```php
+<?php
+
+use Smarty\Extension\Base;
+
+class MyExtension extends Base {
+
+    public function getModifierCompiler(string $modifier): ?\Smarty\Compile\Modifier\ModifierCompilerInterface {
+
+		switch ($modifier) {
+			case 'array_escape': return new MyArrayEscapeModifierCompiler();
+			case 'array_unescape': return new MyArrayUnescapeModifierCompiler();
+        }
+
+		return null;
+	}
+}
+
+```
+Another example, that would allow you to use any valid PHP callable as a modifier in your templates:
+
+```php
+<?php
+
+use Smarty\Extension\Base;
+
+class MyCallablePassThroughExtension extends Base {
+
+    public function getModifierCallback(string $modifierName) {
+    
+        if (is_callable($modifierName)) {
+            return $modifierName;
+        }
+    
+		return null;
+	}
+}
+
+```
+
+Writing an extension allows you to add a group of tags, block tags and modifiers to the Smarty language.
+It also allows you to register pre-, post- and output-filters in a structured way. 
+The files in `src/Extension/` in the `smarty/smarty` dir should give you all the information you need to start
+writing your own extension.
+
+## Registering an extension
+
+When you have written your extension, add it to a Smarty instance as follows:
+
+```php
+<?php
+
+use Smarty\Smarty;
+
+$smarty = new Smarty();
+
+$smarty->addExtension(new MyCustomExtension());
+```
+
+This will add `MyCustomExtension` to the end of the extension list, meaning that you cannot override tags or modifiers
+from one of Smarty's default extensions.
+
+Should you wish to insert your extension at the top of the extension list, or create a very limited Smarty version that
+only contains the core extension, you can use `Smarty\Smarty::setExtensions()` to override the list of extensions.
+
+```php
+<?php
+
+use Smarty\Smarty;
+
+$smarty = new Smarty();
+
+$smarty->setExtensions([
+    new Smarty\Extension\CoreExtension(),
+    new MyCustomExtension(),
+    new Smarty\Extension\DefaultExtension(),
+]);
+```
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/extending/introduction.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/extending/introduction.md
new file mode 100644
index 000000000..69cbce2ac
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/extending/introduction.md
@@ -0,0 +1,10 @@
+# Extending Smarty
+
+By default, Smarty is already very complete and powerful. However, you can unlock its real potential by 
+extending Smarty.
+
+There are various ways to extend Smarty for it to suit your needs. You can create custom
+[tags](tags.md), [block tags](block-tags.md) and [modifiers](modifiers.md) by registering a method as a plugin.
+
+If this becomes too messy, you can group your custom tags, modifiers, and more into an [Extension](extensions.md). 
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/extending/modifiers.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/extending/modifiers.md
new file mode 100644
index 000000000..78540cf97
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/extending/modifiers.md
@@ -0,0 +1,27 @@
+# Custom modifiers
+
+Modifiers are little functions that are applied
+to a variable in the template before it is displayed or used in some
+other context. Smarty comes with a bunch of [modifiers](../../designers/language-modifiers/index.md), but you can 
+easily add your own.
+
+In order to do so, you must write a function that accepts as its first parameter the value on which the
+modifier is to operate. The rest of the parameters are optional, depending on what kind of operation is to be performed.
+
+The modifier has to return the result of its processing.
+
+For example:
+```php
+<?php
+
+function smarty_modifier_substr($string, $offset, $length) {
+    return substr($string, $offset, $length);
+}
+
+$smarty->registerPlugin(Smarty\Smarty::PLUGIN_MODIFIER, 'substr', 'smarty_modifier_substr');
+```
+
+You can now use this in your templates as follows:
+```smarty
+{$applicationName|substr:0:20}
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/extending/tags.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/extending/tags.md
new file mode 100644
index 000000000..38cd4e923
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/extending/tags.md
@@ -0,0 +1,84 @@
+# Custom tags
+
+You can add your own tags to the Smarty language. 
+
+## Runtime tags
+
+Usually, you'll add a runtime tag. Adding a runtime tag requires you to provide a callback function that accepts
+two parameters:
+
+- `$params`:  all attributes from the template as an associative array.
+- `$template`: a `Smarty\Template` object representing the template where tag was used.
+
+The output (return value) of the function will be substituted in place
+of the tag in the template.
+
+If the function needs to assign some variables to the template or use
+some other Smarty-provided functionality, it can use the supplied
+`$template` object to do so.
+
+```php
+<?php
+
+function smarty_tag_eightball($params, \Smarty\Template $template): string {
+    $answers = [
+        'Yes',
+        'No',
+        'No way',
+        'Outlook not so good',
+        'Ask again soon',
+        'Maybe in your reality'
+    ];
+
+    $result = array_rand($answers);
+    return $answers[$result];
+}
+
+$smarty->registerPlugin(Smarty\Smarty::PLUGIN_FUNCTION, 'eightball', 'smarty_tag_eightball');
+```
+
+Which can now be used in the template as:
+
+```smarty
+Question: Will we ever have time travel?
+Answer: {eightball}.
+```
+
+## Compiler tags
+
+Compiler tags are called only during compilation of the template.
+
+They are useful for injecting PHP code or time-sensitive static content
+into the template. If there is both a compiler function and a runtime tag registered under the same name,
+the compiler function has precedence.
+
+The compiler function is passed two parameters: the params array which
+contains precompiled strings for the attribute values and the Smarty
+object. It's supposed to return the code to be injected into the
+compiled template including the surrounding PHP tags.
+
+Example:
+```php
+<?php
+
+function smarty_compiler_tplheader($params, Smarty $smarty) {
+    return "<?php\necho '" . $smarty->_current_file . " compiled at " . date('Y-m-d H:M'). "';\n?>";
+}
+
+$smarty->registerPlugin(Smarty\Smarty::PLUGIN_COMPILER, 'tplheader', 'smarty_compiler_tplheader');
+```
+
+This function can be called from the template as:
+
+```smarty
+{* this function gets executed at compile time only *}
+{tplheader}
+```
+
+The resulting PHP code in the compiled template would be something like
+this:
+
+```php
+<?php
+echo 'index.tpl compiled at 2023-02-20 20:02';
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/filters/output-filters.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/filters/output-filters.md
new file mode 100644
index 000000000..9de318924
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/filters/output-filters.md
@@ -0,0 +1,35 @@
+# Output filters
+
+When a template is rendered, its output can be sent through one or more
+output filters.
+
+> **Note**
+> This differs from [`prefilters`](prefilters.md) and 
+> [`postfilters`](postfilters.md) because, pre- and postfilters
+> operate on compiled templates before they are saved to the disk, whereas
+> output filters operate on the template output when it is executed.
+
+Smarty will pass the template output as the first argument, and expect the function
+to return the result of the processing.
+
+Output filters can be either added as part of an [Extension](../extending/extensions.md) or 
+registered as shown below.
+
+This will provide a rudimentary protection against spambots:
+```php
+<?php
+
+function protect_email($tpl_output, \Smarty\Template\ $template)
+{
+    return preg_replace(
+        '!(\S+)@([a-zA-Z0-9\.\-]+\.([a-zA-Z]{2,3}|[0-9]{1,3}))!',
+        '$1%40$2', 
+        $tpl_output
+    );
+}
+
+// register the outputfilter
+$smarty->registerFilter("output", "protect_email");
+$smarty->display("index.tpl');
+
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/filters/postfilters.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/filters/postfilters.md
new file mode 100644
index 000000000..0f4ba9dcc
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/filters/postfilters.md
@@ -0,0 +1,33 @@
+# Postfilters
+
+Template postfilters are PHP functions that your templates are ran
+through *after they are compiled*.
+
+Smarty will
+pass the compiled template code as the first argument, and expect the
+function to return the result of the processing, which must also be valid PHP code.
+
+Prefilters can be either added as part of an [Extension](../extending/extensions.md) or
+registered as shown below.
+
+
+```php
+<?php
+
+function add_header_comment($tpl_source, \Smarty\Template\ $template)
+{
+    return "<?php echo \"<!-- Created by Smarty! -->\n\"; ?>\n".$tpl_source;
+}
+
+// register the postfilter
+$smarty->registerFilter('post', 'add_header_comment');
+$smarty->display('index.tpl');
+```
+
+The postfilter above will make the compiled Smarty template `index.tpl`
+look like:
+
+```smarty
+<!-- Created by Smarty! -->
+{* rest of template content... *}
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/filters/prefilters.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/filters/prefilters.md
new file mode 100644
index 000000000..2d5c19f94
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/filters/prefilters.md
@@ -0,0 +1,26 @@
+# Prefilters
+
+Template prefilters are PHP functions that your templates are ran
+through *before they are compiled*. This is good for preprocessing your
+templates to remove unwanted comments, keeping an eye on what people are
+putting in their templates, etc.
+
+Smarty will pass the template source code as the first argument, and
+expect the function to return the resulting template source code.
+
+Prefilters can be either added as part of an [Extension](../extending/extensions.md) or
+registered as shown below.
+
+This will remove all the html comments in the template source:
+```php
+<?php
+
+function remove_dw_comments($tpl_source, \Smarty\Template\ $template)
+{
+    return preg_replace("/<!--#.*-->/U",'',$tpl_source);
+}
+
+// register the prefilter
+$smarty->registerFilter('pre', 'remove_dw_comments');
+$smarty->display('index.tpl');
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/inheritance.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/inheritance.md
new file mode 100644
index 000000000..f58369e65
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/inheritance.md
@@ -0,0 +1,130 @@
+# Template Inheritance
+
+Inheritance allows you to define base templates that can
+be extended by child templates. Extending means that the child template
+can override all or some of the named block areas in the base template.
+
+When you render the child template, the result will as if you rendered
+the base template, with only the block(s) that you have overridden in the 
+child templates differing.
+
+-   The inheritance tree can be as deep as you want, meaning you can
+    extend a file that extends another one that extends another one and
+    so on.
+
+-   The child templates can not define any content besides what's
+    inside [`{block}`](../designers/language-builtin-functions/language-function-block.md) tags they override.
+    Anything outside of [`{block}`](../designers/language-builtin-functions/language-function-block.md) tags will
+    be removed.
+
+-   Template inheritance is a compile time process which creates a
+    single compiled template file. Compared to corresponding solutions
+    based on subtemplates included with the
+    [`{include}`](../designers/language-builtin-functions/language-function-include.md) tag it does have much
+    better performance when rendering.
+
+## Basic inheritance
+
+First, create a base template with one or more [blocks](../designers/language-builtin-functions/language-function-block.md). 
+Then, create a child template. The child template 
+must have an [{extends} tag](../designers/language-builtin-functions/language-function-extends.md) on its first line.
+
+The child template can redefine one or more blocks defined in the base template.
+
+See below for a simple example.
+
+layout.tpl (base)
+
+```smarty
+<html>
+    <head>
+      <title>{block name=title}Default Page Title{/block}</title>
+      {block name=head}{/block}
+    </head>
+    <body>
+        {block name=body}{/block}
+    </body>
+</html>
+```
+
+
+myproject.tpl (child)
+
+```smarty
+{extends file='layout.tpl'}
+{block name=head}
+  <link href="/css/mypage.css" rel="stylesheet" type="text/css"/>
+  <script src="/js/mypage.js"></script>
+{/block}
+```
+
+mypage.tpl (grandchild)
+
+```smarty
+{extends file='myproject.tpl'}
+{block name=title}My Page Title{/block}
+{block name=head}
+  <link href="/css/mypage.css" rel="stylesheet" type="text/css"/>
+  <script src="/js/mypage.js"></script>
+{/block}
+{block name=body}My HTML Page Body goes here{/block}
+```
+
+
+To render the above, you would use:
+
+```php
+<?php
+$smarty->display('mypage.tpl');
+```
+
+The resulting output is:
+
+```html
+<html>
+    <head>
+      <title>My Page Title</title>
+      <link href="/css/mypage.css" rel="stylesheet" type="text/css"/>
+      <script src="/js/mypage.js"></script>
+    </head>
+    <body>
+     My HTML Page Body goes here
+    </body>
+</html>
+```
+
+> **Note**
+>
+> When [compile-check](./configuring.md#disabling-compile-check) is enabled, all files 
+> in the inheritance tree
+> are checked for modifications upon each invocation. You may want to
+> disable compile-check on production servers for this reason.
+
+> **Note**
+>
+> If you have a subtemplate which is included with
+> [`{include}`](../designers/language-builtin-functions/language-function-include.md) and it contains
+> [`{block}`](../designers/language-builtin-functions/language-function-block.md) areas it works only if the
+> [`{include}`](../designers/language-builtin-functions/language-function-include.md) itself is called from within
+> a surrounding [`{block}`](../designers/language-builtin-functions/language-function-block.md). In the final
+> parent template you may need a dummy
+> [`{block}`](../designers/language-builtin-functions/language-function-block.md) for it.
+
+
+## Using append and prepend
+The content of [`{block}`](../designers/language-builtin-functions/language-function-block.md) tags from child
+and parent templates can be merged by the `append` or `prepend`
+[`{block}`](../designers/language-builtin-functions/language-function-block.md) tag option flags and
+`{$smarty.block.parent}` or `{$smarty.block.child}` placeholders.
+
+## Extends resource type
+Instead of using [`{extends}`](../designers/language-builtin-functions/language-function-extends.md) tags in the
+template files you can define the inheritance tree in your PHP script by
+using the [`extends:` resource](resources.md#the-extends-resource) type.
+
+The code below will return same result as the example above.
+
+```php
+<?php
+$smarty->display('extends:layout.tpl|myproject.tpl|mypage.tpl'); 
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/rendering.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/rendering.md
new file mode 100644
index 000000000..a66b61269
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/rendering.md
@@ -0,0 +1,86 @@
+# Rendering templates
+
+## Fetching or rendering templates directly
+As explained in [basics](basics.md), you can use `$smarty->fetch()` or `$smarty->display()`
+to render a template directly.
+
+```php
+<?php
+
+use Smarty\Smarty;
+$smarty = new Smarty();
+
+$smarty->display('homepage.tpl');
+
+// or
+
+$output = $smarty->fetch('homepage.tpl');
+```
+
+When you use `display()`, Smarty renders the template to the standard output stream.
+`fetch()` returns the output instead of echoing it.
+
+The example above uses simple filenames to load the template. Smarty also supports
+[loading templates from resources](resources.md).
+
+## Creating a template object
+You can also create a template object which later can be prepared first,
+and rendered later. This can be useful, for example if you plan to re-use several 
+templates.
+
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty;
+
+// create template object with its private variable scope
+$tpl = $smarty->createTemplate('index.tpl');
+
+// assign a variable (available only to this template)
+$tpl->assign('title', 'My Homepage!');
+
+// display the template
+$tpl->display();
+```
+
+More on assigning variables in [using data in templates](variables/assigning.md).
+
+
+## Testing if a template exists
+You can use `templateExists()` to check whether a template exists before you attempt to use it.
+
+It accepts either a path to the template on the filesystem or a
+resource string specifying the template.
+
+This example uses `$_GET['page']` to
+[`{include}`](../designers/language-builtin-functions/language-function-include.md) a content template. If the
+template does not exist then an error page is displayed instead. First, 
+the `page_container.tpl`
+
+```smarty
+<html>
+    <head>
+        <title>{$title|escape}</title>
+    </head>
+    <body>
+        {* include middle content page *}
+        {include file=$content_template}
+    </body>
+</html>
+```
+
+And the php script:
+
+```php
+<?php
+
+// set the filename eg index.inc.tpl
+$mid_template = $_GET['page'].'.inc.tpl';
+
+if (!$smarty->templateExists($mid_template)){
+    $mid_template = 'page_not_found.tpl';
+}
+$smarty->assign('content_template', $mid_template);
+
+$smarty->display('page_container.tpl');
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/resources.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/resources.md
new file mode 100644
index 000000000..5ca52b12d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/resources.md
@@ -0,0 +1,322 @@
+# Template resources
+
+## The filesystem resource
+
+So far in our examples, we have used simple filenames or paths when loading a template.
+
+For example, to load a template file called `homepage.tpl`, from the filesystem, you could write:
+```php
+<?php
+
+use Smarty\Smarty;
+$smarty = new Smarty();
+
+$smarty->display('homepage.tpl');
+```
+
+The filesystem is the default resource. Templates, however, may come 
+from a variety of sources. When you render a template, or
+when you include a template from within another template, you supply a
+resource type, followed by `:` and the appropriate path and template name.
+
+If a resource is not explicitly given, the default resource type is assumed.
+The resource type for the filesystem is `file`, which means that the previous example
+can be rewritten as follows:
+```php
+<?php
+
+use Smarty\Smarty;
+$smarty = new Smarty();
+
+$smarty->display('file:homepage.tpl');
+```
+
+The file resource pulls templates source files from the directories
+specified using `Smarty::setTemplateDir()` (see [Configuring Smarty](configuring.md)).
+
+`setTemplateDir` accepts a single path, but can also ben called with an array of paths. 
+In that case, the list of directories is traversed in the order they appear in the array. The
+first template found is the one to process.
+
+### Templates from a specific directory
+
+Smarty 3.1 introduced the bracket-syntax for specifying an element from
+`Smarty::setTemplateDir()`. This allows websites
+employing multiple sets of templates better control over which template
+to access.
+
+The bracket-syntax can be used as follows:
+```php
+<?php
+
+// setup template directories
+$smarty->setTemplateDir([
+    './templates',            // element: 0, index: 0
+    './templates_2',          // element: 1, index: 1
+    '10' => 'templates_10',   // element: 2, index: '10'
+    'foo' => 'templates_foo', // element: 3, index: 'foo'
+]);
+
+/*
+  assume the template structure
+  ./templates/foo.tpl
+  ./templates_2/foo.tpl
+  ./templates_2/bar.tpl
+  ./templates_10/foo.tpl
+  ./templates_10/bar.tpl
+  ./templates_foo/foo.tpl
+*/
+
+// regular access
+$smarty->display('file:foo.tpl'); 
+// will load ./templates/foo.tpl
+
+// using numeric index
+$smarty->display('file:[1]foo.tpl'); 
+// will load ./templates_2/foo.tpl
+
+// using numeric string index
+$smarty->display('file:[10]foo.tpl'); 
+// will load ./templates_10/foo.tpl
+
+// using string index
+$smarty->display('file:[foo]foo.tpl'); 
+// will load ./templates_foo/foo.tpl
+
+// using "unknown" numeric index (using element number)
+$smarty->display('file:[2]foo.tpl'); 
+// will load ./templates_10/foo.tpl
+```
+
+And, from within a Smarty template:
+
+```smarty
+{include file="file:foo.tpl"}
+{* will load ./templates/foo.tpl *}
+
+{include file="file:[1]foo.tpl"}
+{* will load ./templates_2/foo.tpl *}
+
+{include file="file:[foo]foo.tpl"}
+{* will load ./templates_foo/foo.tpl *}
+```
+
+### Using absolute paths
+
+Templates outside the specified template directories 
+require the `file:` template resource type, followed by the absolute
+path to the template (with leading slash).
+
+```php
+<?php
+$smarty->display('file:/export/templates/index.tpl');
+$smarty->display('file:/path/to/my/templates/menu.tpl');
+````
+
+And from within a Smarty template:
+```smarty
+{include file='file:/usr/local/share/templates/navigation.tpl'}
+```
+
+> **Note**
+>
+> With [`Security`](security.md) enabled, access to
+> templates outside of the specified templates directories is
+> not allowed unless you whitelist those directories.
+
+### Windows file paths 
+If you are running on Windows, file paths usually include a drive
+letter (such as `C:`) at the beginning of the pathname. Be sure to use `file:` in
+the path to avoid namespace conflicts and get the desired results.
+```php
+<?php
+$smarty->display('file:C:/export/templates/index.tpl');
+$smarty->display('file:F:/path/to/my/templates/menu.tpl');
+```
+
+And from within Smarty template:
+```smarty
+{include file='file:D:/usr/local/share/templates/navigation.tpl'}
+```
+
+### Handling missing templates
+If the file resource cannot find the requested template, it will check if there is
+a default template handler to call. By default, there is none, and Smarty will return an error,
+but you can register a default template handler calling `Smarty::registerDefaultTemplateHandler`
+with any [callable](https://www.php.net/manual/en/language.types.callable.php).
+
+```php
+<?php
+
+$smarty->registerDefaultTemplateHandler([$this, 'handleMissingTemplate']);
+
+// ...
+
+public function handleMissingTemplate($type, $name, &$content, &$modified, Smarty $smarty) {
+    if (/* ... */) {
+        // return corrected filepath
+        return "/tmp/some/foobar.tpl";
+    } elseif (/* ... */) {
+        // return a template directly
+        $content = "the template source";
+        $modified = time();
+        return true;
+    } else {
+        // tell smarty that we failed
+        return false;
+    }
+}
+
+```
+
+## The string and eval resources
+
+Smarty can render templates from a string by using the `string:` or
+`eval:` resource.
+
+-   The `string:` resource behaves much the same as a template file. The
+    template source is compiled from a string and stores the compiled
+    template code for later reuse. Each unique template string will
+    create a new compiled template file. If your template strings are
+    accessed frequently, this is a good choice. If you have frequently
+    changing template strings (or strings with low reuse value), the
+    `eval:` resource may be a better choice, as it doesn\'t save
+    compiled templates to disk.
+
+-   The `eval:` resource evaluates the template source every time a page
+    is rendered. This is a good choice for strings with low reuse value.
+    If the same string is accessed frequently, the `string:` resource
+    may be a better choice.
+
+> **Note**
+>
+> With a `string:` resource type, each unique string generates a
+> compiled file. Smarty cannot detect a string that has changed, and
+> therefore will generate a new compiled file for each unique string. It
+> is important to choose the correct resource so that you do not fill
+> your disk space with wasted compiled strings.
+
+```php
+<?php
+$smarty->assign('foo', 'value');
+$template_string = 'display {$foo} here';
+$smarty->display('string:' . $template_string); // compiles for later reuse
+$smarty->display('eval:' . $template_string); // compiles every time
+```
+From within a Smarty template:
+```smarty
+{include file="string:$template_string"} {* compiles for later reuse *}
+{include file="eval:$template_string"} {* compiles every time *}
+```
+
+Both `string:` and `eval:` resources may be encoded with
+[`urlencode()`](https://www.php.net/urlencode) or
+[`base64_encode()`](https://www.php.net/urlencode). This is not necessary
+for the usual use of `string:` and `eval:`, but is required when using
+either of them in conjunction with the [`extends resource`](#the-extends-resource).
+
+```php
+ <?php
+ $smarty->assign('foo','value');
+ $template_string_urlencode = urlencode('display {$foo} here');
+ $template_string_base64 = base64_encode('display {$foo} here');
+ $smarty->display('eval:urlencode:' . $template_string_urlencode); // will decode string using urldecode()
+ $smarty->display('eval:base64:' . $template_string_base64); // will decode string using base64_decode()
+```
+
+From within a Smarty template:
+```smarty
+ {include file="string:urlencode:$template_string_urlencode"} {* will decode string using urldecode() *}
+ {include file="eval:base64:$template_string_base64"} {* will decode string using base64_decode() *}
+```
+
+## The extends resource
+
+The `extends:` resource is used to define child/parent relationships. For details see section of
+[Template inheritance](inheritance.md).
+
+> **Note**
+>
+> Using the extends resource is usually not necessary. If you have a choice, it is normally more flexible and
+> intuitive to handle inheritance chains from within the templates using the [{extends} tag](inheritance.md).
+
+When `string:` and `eval:` templates are used, make sure they are properly url or base64 encoded. 
+
+The templates within an inheritance chain are not compiled separately. Only a single compiled template will be generated. 
+(If an `eval:` resource is found within an inheritance chain, its "don't save a compile file" property is superseded by 
+the `extends:` resource.)
+
+Example:
+```php
+<?php
+$smarty->display('extends:parent.tpl|child.tpl|grandchild.tpl'); 
+
+// inheritance from multiple template sources
+$smarty->display('extends:db:parent.tpl|file:child.tpl|grandchild.tpl|eval:{block name="fooBazVar_"}hello world{/block}'); 
+```
+
+## The stream resource
+
+Smarty allow you to use [PHP streams](https://www.php.net/manual/en/function.stream-wrapper-register.php) 
+as a template resource. Smarty will first look for a registered template resource. If nothing is
+found, it will check if a PHP stream is available.  If a stream is available, Smarty will use it 
+to fetch the template.
+
+For example, 
+```php
+<?php
+stream_wrapper_register('myresource', MyResourceStream::class);
+$smarty->display('myresource:bar.tpl');
+```
+
+Or, from within a template:
+```smarty
+ {include file="myresource:bar.tpl"}
+```
+
+## Adding your own resource type
+You can create a class that extends `Smarty\Resource\CustomPlugin` to add your own resource type, 
+for example to load template from a database.
+
+For example:
+```php
+<?php
+class HelloWorldResource extends Smarty\Resource\CustomPlugin {
+
+    protected function fetch($name, &$source, &$mtime) {
+        $source = '{$x="hello world"}{$x}'; // load your template here based on $name
+        $mtime = time();
+    }
+
+}
+
+// ..
+
+$smarty->registerResource('helloworld', new HelloWorldResource());
+```
+
+If a Resource's templates should not be run through the Smarty
+compiler, the Custom Resource may extend `\Smarty\Resource\UncompiledPlugin`.
+The Resource Handler must then implement the function
+`renderUncompiled(\Smarty\Template $_template)`. `$_template` is
+a reference to the current template and contains all assigned variables
+which the implementor can access via
+`$_template->getSmarty()->getTemplateVars()`. These Resources simply echo
+their rendered content to the output stream. The rendered output will be
+output-cached if the Smarty instance was configured accordingly. See
+`src/Resource/PhpPlugin.php` for an example.
+
+If the Resource's compiled templates should not be cached on disk, the
+Custom Resource may extend `\Smarty\Resource\RecompiledPlugin`. These Resources
+are compiled every time they are accessed. This may be an expensive
+overhead. See `src/Resource/StringEval.php` for an
+example.
+
+## Changing the default resource type
+The default resource type is `file`. If you want to change it, use `Smarty::setDefaultResourceType`.
+
+The following example will change the default resource type to `mysql`:
+```php
+<?php
+$smarty->setDefaultResourceType('mysql');
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/security.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/security.md
new file mode 100644
index 000000000..07120afdb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/security.md
@@ -0,0 +1,119 @@
+# Security
+
+Security is good for situations when you have untrusted parties editing
+the templates, and you want to reduce the risk of system
+security compromises through the template language.
+
+The settings of the security policy are defined by overriding public properties of an
+instance of the \Smarty\Security class. These are the possible settings:
+
+- `$secure_dir` is an array of template directories that are
+    considered secure. A directory configured using `$smarty->setTemplateDir()` is
+    considered secure implicitly. The default is an empty array.
+- `$trusted_uri` is an array of regular expressions matching URIs that
+  are considered trusted. This security directive is used by
+  [`{fetch}`](../designers/language-custom-functions/language-function-fetch.md) and
+  [`{html_image}`](../designers/language-custom-functions/language-function-html-image.md). URIs passed to
+  these functions are reduced to `{$PROTOCOL}://{$HOSTNAME}` to allow
+  simple regular expressions (without having to deal with edge cases
+  like authentication-tokens).
+
+  The expression `'#https?://.*smarty.net$#i'` would allow accessing
+  the following URIs:
+
+    -   `http://smarty.net/foo`
+    -   `http://smarty.net/foo`
+    -   `http://www.smarty.net/foo`
+    -   `http://smarty.net/foo`
+    -   `https://foo.bar.www.smarty.net/foo/bla?blubb=1`
+
+  but deny access to these URIs:
+
+    -   `http://smarty.com/foo` (not matching top-level domain \"com\")
+    -   `ftp://www.smarty.net/foo` (not matching protocol \"ftp\")
+    -   `http://www.smarty.net.otherdomain.com/foo` (not matching end of
+        domain \"smarty.net\")
+
+-   `$static_classes` is an array of classes that are considered
+    trusted. The default is an empty array which allows access to all
+    static classes. To disable access to all static classes set
+    $static_classes = null.
+
+-   `$streams` is an array of streams that are considered trusted and
+    can be used from within template. To disable access to all streams
+    set $streams = null. An empty array ( $streams = [] ) will
+    allow all streams. The default is array('file').
+
+-   `$allowed_modifiers` is an array of (registered / autoloaded)
+    modifiers that should be accessible to the template. If this array
+    is non-empty, only the herein listed modifiers may be used. This is
+    a whitelist.
+
+-   `$disabled_modifiers` is an array of (registered / autoloaded)
+    modifiers that may not be accessible to the template.
+
+-   `$allowed_tags` is a boolean flag which controls if constants can
+    function-, block and filter plugins that should be accessible to the
+    template. If this array is non-empty, only the herein listed
+    modifiers may be used. This is a whitelist.
+
+-   `$disabled_tags` is an array of (registered / autoloaded) function-,
+    block and filter plugins that may not be accessible to the template.
+
+-   `$allow_constants` is a boolean flag which controls if constants can
+    be accessed by the template. The default is "true".
+
+-   `$allow_super_globals` is a boolean flag which controls if the PHP
+    super globals can be accessed by the template. The default is
+    "true".
+
+If security is enabled, no private methods, functions or properties of
+static classes or assigned objects can be accessed (beginning with
+'_') by the template.
+
+To customize the security policy settings you can extend the
+\Smarty\Security class or create an instance of it.
+
+```php
+<?php
+
+use Smarty\Smarty;
+
+class My_Security_Policy extends \Smarty\Security {
+  public $allow_constants = false;
+}
+
+$smarty = new Smarty();
+
+$smarty->enableSecurity('My_Security_Policy');
+```
+
+```php
+<?php
+
+use Smarty\Smarty;
+
+$smarty = new Smarty();
+
+$my_security_policy = new \Smarty\Security($smarty);
+$my_security_policy->allow_constants = false;
+
+$smarty->enableSecurity($my_security_policy);
+```
+
+```php
+<?php
+
+use Smarty\Smarty;
+
+$smarty = new Smarty();
+
+// enable default security
+$smarty->enableSecurity();
+```
+
+> **Note**
+>
+> Most security policy settings are only checked when the template gets
+> compiled. For that reason you should delete all cached and compiled
+> template files when you change your security settings.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/variables/assigning.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/variables/assigning.md
new file mode 100644
index 000000000..40a02c13b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/variables/assigning.md
@@ -0,0 +1,139 @@
+# Assigning variables
+
+Templates start to become really useful once you know how to use variables.
+
+## Basic assigning
+Let's revisit the example from the [basics section](../basics.md). The following script assigns a value to 
+the 'companyName' variable and renders the template:
+
+```php
+<?php
+
+use Smarty\Smarty;
+$smarty = new Smarty();
+
+$smarty->assign('companyName', 'AC & ME Corp.');
+
+$smarty->display('footer.tpl');
+```
+
+footer.tpl:
+```smarty
+<small>Copyright {$companyName|escape}</small>
+```
+
+Smarty will apply the [escape modifier](../../designers/language-modifiers/language-modifier-escape.md)
+to the value assigned to the variable
+`companyName` and replace `{$companyName|escape}` with the result.
+
+```html
+<small>Copyright AC &amp; ME Corp.</small>
+```
+
+Using `$smarty->assign()` is the most common way of assigning data to templates, but there are several other methods.
+
+## Appending data to an existing variable
+Using `append()`, you can add data to an existing variable, usually an array.
+
+If you append to a string value, it is converted to an array value and
+then appended to. You can explicitly pass name/value pairs, or
+associative arrays containing the name/value pairs. If you pass the
+optional third parameter of TRUE, the value will be merged with the
+current array instead of appended.
+
+Examples:
+
+```php
+<?php
+// This is effectively the same as assign()
+$smarty->append('foo', 'Fred');
+// After this line, foo will now be seen as an array in the template
+$smarty->append('foo', 'Albert');
+
+$array = [1 => 'one', 2 => 'two'];
+$smarty->append('X', $array);
+$array2 = [3 => 'three', 4 => 'four'];
+// The following line will add a second element to the X array
+$smarty->append('X', $array2);
+
+// passing an associative array
+$smarty->append(['city' => 'Lincoln', 'state' => 'Nebraska']);
+```
+
+## Assigning to template objects
+When you use a template objects, as explained in [rendering a template](../rendering.md#creating-a-template-object),
+you can assign data to the template objects directly instead of assigning it to Smarty. This way, you can use different
+sets of data for different templates.
+
+For example:
+```php
+<?php
+
+use Smarty\Smarty;
+$smarty = new Smarty();
+
+$tplBlue = $smarty->createTemplate('blue.tpl');
+$tplBlue->assign('name', 'The one');
+$tplBlue->display();
+
+$tplRed = $smarty->createTemplate('red.tpl');
+$tplRed->assign('name', 'Neo');
+$tplRed->display();
+```
+
+## Using data objects
+For more complex use cases, Smarty supports the concept of data objects.
+Data objects are containers to hold data. Data objects can be attached to templates when creating them.
+This allows for fine-grained re-use of data.
+
+For example:
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty;
+
+// create a data object
+$data = $smarty->createData();
+
+// assign variable to the data object
+$data->assign('name', 'Neo');
+
+// create template object which will use variables from the data object
+$tpl = $smarty->createTemplate('index.tpl', $data);
+
+// display the template
+$tpl->display();
+```
+
+## Clearing assigned data
+When re-using templates, you may need to clear data assigned in a previous run. Use `clearAllAssign()` to 
+clear the values of all assigned variables on data objects, template objects or the Smarty object.
+
+Examples:
+```php
+<?php
+// assigning data to the Smarty object
+$smarty->assign('Name', 'Fred');
+// ...
+$smarty->clearAllAssign();
+
+// using a data object
+$data = $smarty->createData();
+$data->assign('name', 'Neo');
+// ...
+$data->clearAllAssign();
+
+// using a template
+$tplBlue = $smarty->createTemplate('blue.tpl');
+$tplBlue->assign('name', 'The one');
+// ...
+$tplBlue->clearAllAssign();
+```
+
+Note that there it's only useful to clear assigned data if you:
+
+1. repeatedly re-use templates, and
+2. the variables used may change on each repetition
+
+If your script simply runs once and then ends, or you always assign the same variables, clearing assigned data 
+is of no use.
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/variables/config-files.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/variables/config-files.md
new file mode 100644
index 000000000..107353bb7
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/variables/config-files.md
@@ -0,0 +1,88 @@
+# Loading data from config files
+
+Instead of [assigning data to templates from PHP](assigning.md), you can also
+use a config file.
+
+## Example config file
+Config files are best suited to manage template settings
+from one file. One example is a multi-language application.
+Instead of writing multiple templates to support different languages, 
+you can write a single template file and load your language dependent strings
+from config files.
+
+Example `lang.en.ini`:
+```ini
+# global variables
+pageTitle = "Main Menu"
+
+[Customer]
+pageTitle = "Customer Info"
+
+[Login]
+pageTitle = "Login"
+focus = "username"
+Intro = """This is a value that spans more
+           than one line. you must enclose
+           it in triple quotes."""
+
+```
+
+Values of [config file variables](../../designers/language-variables/language-config-variables.md) can be in
+quotes, but not necessary. You can use either single or double quotes.
+If you have a value that spans more than one line, enclose the entire
+value with triple quotes \("""\). You can put comments into config
+files by any syntax that is not a valid config file syntax. We recommend
+using a `#` (hash) at the beginning of the line.
+
+The example config file above has two sections. Section names are
+enclosed in \[brackets\]. Section names can be arbitrary strings not
+containing `[` or `]` symbols. The variable at the top is a global
+variable. Global variables are always
+loaded from the config file. If a particular section is loaded, then the
+global variables and the variables from that section are also loaded. If
+a variable exists both as a global and in a section, the section
+variable is used.
+
+## Loading a config file
+
+Config files are loaded into templates with the built-in template
+function [`{config_load}`](../../designers/language-builtin-functions/language-function-config-load.md) or by calling
+`configLoad()` from PHP:
+
+```php
+<?php
+$smarty->configLoad('lang.en.ini');
+```
+
+Load a specific section with:
+
+```php
+<?php
+$smarty->configLoad('lang.en.ini', 'Customer');
+```
+
+Note that the global section will always be loaded.
+
+## Retrieving config variables in PHP
+
+
+## Loading from a resource
+Config files (or resources) are loaded by the same resource facilities
+as templates. That means that a config file can also be loaded from a db. See [resources](../resources.md)
+for more information.
+
+## Config overwrite
+If you name two variables the same within a section,
+the last one will be used unless you call:
+```php
+<?php
+$smarty->setConfigOverwrite(false);
+```
+When config overwrite is disabled, Smarty will create arrays of config file variables when it encounters
+multiple entries with the same name.
+
+See also [`{config_load}`](../../designers/language-builtin-functions/language-function-config-load.md),
+[`$default_config_handler_func`](../../programmers/api-variables/variable-default-config-handler-func.md),
+[`getConfigVars()`](../../programmers/api-functions/api-get-config-vars.md),
+[`clearConfig()`](../../programmers/api-functions/api-clear-config.md) and
+[`configLoad()`](../../programmers/api-functions/api-config-load.md)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/variables/objects.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/variables/objects.md
new file mode 100644
index 000000000..9befcb18e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/variables/objects.md
@@ -0,0 +1,106 @@
+# Objects
+
+Smarty allows access to PHP [objects](https://www.php.net/object) through
+the templates.
+
+> **Note**
+>
+> When you assign/register objects to templates, be sure that all
+> properties and methods accessed from the template are for presentation
+> purposes only. It is very easy to inject application logic through
+> objects, and this leads to poor designs that are difficult to manage.
+> See the Best Practices section of the Smarty website.
+
+There are two ways to access them.
+
+## Assign the object
+You can assign objects to a template and access them much like any other assigned variable.
+
+Example:
+```php
+<?php
+// the object
+
+class My_Object {
+    public function meth1($params, $smarty_obj) {
+        return 'this is my meth1';
+    }
+}
+
+// We can also assign objects. assign_by_ref when possible.
+$smarty->assign('myobj', new My_Object());
+
+$smarty->display('index.tpl');
+```
+
+And here's how to access your object in `index.tpl`:
+
+```smarty
+{$myobj->meth1('foo',$bar)}
+```
+
+
+
+## Register the object
+Registerd objects use a different template syntax. Also, a registered object 
+can be restricted to certain methods or
+properties. However, **a registered object cannot be looped over or
+assigned in arrays of objects**, etc.
+
+If security is enabled, no private methods or functions can be accessed
+(beginning with '_'). If a method and property of the same name exist,
+the method will be used.
+
+You can restrict the methods and properties that can be accessed by
+listing them in an array as the third registration parameter.
+
+By default, parameters passed to objects through the templates are
+passed the same way [custom tags](../../designers/language-custom-functions/index.md) get
+them. An associative array is passed as the first parameter, and the
+smarty object as the second. If you want the parameters passed one at a
+time for each argument like traditional object parameter passing, set
+the fourth registration parameter to FALSE.
+
+The optional fifth parameter has only effect with `format` being TRUE
+and contains a list of methods that should be treated as blocks. That
+means these methods have a closing tag in the template
+(`{foobar->meth2}...{/foobar->meth2}`) and the parameters to the methods
+have the same synopsis as the parameters for
+[`block tags`](../extending/block-tags.md): They get the four
+parameters `$params`, `$content`, `$smarty` and `&$repeat` and they also
+behave like block tags.
+
+```php
+<?php
+// the object
+
+class My_Object {
+    function meth1($params, $smarty_obj) {
+        return 'this is my meth1';
+    }
+}
+
+$myobj = new My_Object;
+
+// registering the object
+$smarty->registerObject('foobar', $myobj);
+
+// if we want to restrict access to certain methods or properties, list them
+$smarty->registerObject('foobar', $myobj, array('meth1','meth2','prop1'));
+
+// if you want to use the traditional object parameter format, pass a boolean of false
+$smarty->registerObject('foobar', $myobj, null, false);
+
+$smarty->display('index.tpl');
+```
+
+And here's how to access your objects in `index.tpl`:
+
+```smarty
+{* access our registered object *}
+{foobar->meth1 p1='foo' p2=$bar}
+
+{* you can also assign the output *}
+{foobar->meth1 p1='foo' p2=$bar assign='output'}
+the output was {$output}
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/variables/static-class-methods.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/variables/static-class-methods.md
new file mode 100644
index 000000000..fd3fea4c8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/variables/static-class-methods.md
@@ -0,0 +1,39 @@
+# Static Classes
+
+You can directly access static classes. The syntax is roughly the same as in
+PHP.
+
+> **Note**
+>
+> Direct access to PHP classes is not recommended. This ties the
+> underlying application code structure directly to the presentation,
+> and also complicates template syntax. It is recommended to register
+> plugins which insulate templates from PHP classes/objects. Use at your
+> own discretion.
+
+## Examples
+
+**class constant BAR**
+```smarty
+{assign var=foo value=myclass::BAR}
+```
+
+**method result**
+```smarty
+{assign var=foo value=myclass::method()} 
+```
+
+**method chaining**
+```smarty
+{assign var=foo value=myclass::method1()->method2}
+```
+
+**property bar of class myclass**
+```smarty
+{assign var=foo value=myclass::$bar} 
+```
+
+**using Smarty variable bar as class name**
+```smarty
+{assign var=foo value=$bar::method}
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/variables/streams.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/variables/streams.md
new file mode 100644
index 000000000..c872cf8bb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/api/variables/streams.md
@@ -0,0 +1,16 @@
+# Streams
+
+You can also use streams to call variables. *{$foo:bar}* will use the
+*foo://bar* stream to get the template variable.
+
+Using a PHP stream for a template variable resource from within a
+template.
+
+```smarty
+{$foo:bar}
+```
+
+NB. Support for using streams to call variables is deprecated since Smarty v5.1 and will be removed
+in a future version. 
+
+See also [`Template Resources`](../resources.md)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/appendixes/tips.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/appendixes/tips.md
new file mode 100644
index 000000000..e4e38d4be
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/appendixes/tips.md
@@ -0,0 +1,273 @@
+# Tips & Tricks
+
+## Blank Variable Handling
+
+There may be times when you want to print a default value for an empty
+variable instead of printing nothing, such as printing `&nbsp;` so that
+html table backgrounds work properly. Many would use an
+[`{if}`](../designers/language-builtin-functions/language-function-if.md) statement to handle this, but there is a
+shorthand way with Smarty, using the
+[`default`](../designers/language-modifiers/language-modifier-default.md) variable modifier.
+
+> **Note**
+>
+> "Undefined variable" errors will show an E\_NOTICE if not disabled in
+> PHP's [`error_reporting()`](https://www.php.net/error_reporting) level or
+> Smarty's [`$error_reporting`](../programmers/api-variables/variable-error-reporting.md) property and
+> a variable had not been assigned to Smarty.
+
+```smarty
+
+    {* the long way *}
+    {if $title eq ''}
+       &nbsp;
+    {else}
+       {$title}
+    {/if}
+
+    {* the short way *}
+    {$title|default:'&nbsp;'}
+
+```        
+
+See also [`default`](../designers/language-modifiers/language-modifier-default.md) modifier and [default
+variable handling](#default-variable-handling).
+
+## Default Variable Handling
+
+If a variable is used frequently throughout your templates, applying the
+[`default`](../designers/language-modifiers/language-modifier-default.md) modifier every time it is
+mentioned can get a bit ugly. You can remedy this by assigning the
+variable its default value with the
+[`{assign}`](../designers/language-builtin-functions/language-function-assign.md) function.
+
+
+    {* do this somewhere at the top of your template *}
+    {assign var='title' value=$title|default:'no title'}
+
+    {* if $title was empty, it now contains the value "no title" when you use it *}
+    {$title}
+
+        
+
+See also [`default`](../designers/language-modifiers/language-modifier-default.md) modifier and [blank
+variable handling](#blank-variable-handling).
+
+## Passing variable title to header template
+
+When the majority of your templates use the same headers and footers, it
+is common to split those out into their own templates and
+[`{include}`](../designers/language-builtin-functions/language-function-include.md) them. But what if the header
+needs to have a different title, depending on what page you are coming
+from? You can pass the title to the header as an
+[attribute](../designers/language-basic-syntax/language-syntax-attributes.md) when it is included.
+
+`mainpage.tpl` - When the main page is drawn, the title of "Main Page"
+is passed to the `header.tpl`, and will subsequently be used as the
+title.
+
+```smarty
+
+{include file='header.tpl' title='Main Page'}
+{* template body goes here *}
+{include file='footer.tpl'}
+
+```
+
+`archives.tpl` - When the archives page is drawn, the title will be
+"Archives". Notice in the archive example, we are using a variable from
+the `archives_page.conf` file instead of a hard coded variable.
+
+```smarty
+
+{config_load file='archive_page.conf'}
+
+{include file='header.tpl' title=#archivePageTitle#}
+{* template body goes here *}
+{include file='footer.tpl'}
+
+```
+        
+
+`header.tpl` - Notice that "Smarty News" is printed if the `$title`
+variable is not set, using the [`default`](../designers/language-modifiers/language-modifier-default.md)
+variable modifier.
+
+```smarty
+
+<html>
+    <head>
+        <title>{$title|default:'Smarty News'}</title>
+    </head>
+<body>
+    
+```
+        
+
+`footer.tpl`
+
+```smarty
+
+    </body>
+</html>
+
+```
+        
+
+## Dates
+
+As a rule of thumb, always pass dates to Smarty as
+[timestamps](https://www.php.net/time). This allows template designers to
+use the [`date_format`](../designers/language-modifiers/language-modifier-date-format.md) modifier for
+full control over date formatting, and also makes it easy to compare
+dates if necessary.
+
+```smarty
+{$startDate|date_format}
+```
+        
+
+This will output:
+
+```
+Jan 4, 2009
+```
+
+```smarty
+
+{$startDate|date_format:"%Y/%m/%d"}
+
+```
+        
+
+This will output:
+
+```
+2009/01/04
+```
+
+Dates can be compared in the template by timestamps with:
+
+```smarty
+
+{if $order_date < $invoice_date}
+   ...do something..
+{/if}
+
+```        
+
+When using [`{html_select_date}`](../designers/language-custom-functions/language-function-html-select-date.md)
+in a template, the programmer will most likely want to convert the
+output from the form back into timestamp format. Here is a function to
+help you with that.
+
+```php
+
+<?php
+
+// this assumes your form elements are named
+// startDate_Day, startDate_Month, startDate_Year
+
+$startDate = makeTimeStamp($startDate_Year, $startDate_Month, $startDate_Day);
+
+function makeTimeStamp($year='', $month='', $day='')
+{
+   if(empty($year)) {
+       $year = strftime('%Y');
+   }
+   if(empty($month)) {
+       $month = strftime('%m');
+   }
+   if(empty($day)) {
+       $day = strftime('%d');
+   }
+
+   return mktime(0, 0, 0, $month, $day, $year);
+}
+
+```
+    
+
+See also [`{html_select_date}`](../designers/language-custom-functions/language-function-html-select-date.md),
+[`{html_select_time}`](../designers/language-custom-functions/language-function-html-select-time.md),
+[`date_format`](../designers/language-modifiers/language-modifier-date-format.md) and
+[`$smarty.now`](../designers/language-variables/language-variables-smarty.md#smarty-now),
+
+## Componentized Templates
+
+Traditionally, programming templates into your applications goes as
+follows: First, you accumulate your variables within your PHP
+application, (maybe with database queries.) Then, you instantiate your
+Smarty object, [`assign()`](../programmers/api-functions/api-assign.md) the variables and
+[`display()`](../programmers/api-functions/api-display.md) the template. So lets say for example we
+have a stock ticker on our template. We would collect the stock data in
+our application, then assign these variables in the template and display
+it. Now wouldn't it be nice if you could add this stock ticker to any
+application by merely including the template, and not worry about
+fetching the data up front?
+
+You can do this by writing a custom plugin for fetching the content and
+assigning it to a template variable.
+
+`function.load_ticker.php`
+
+```php
+
+<?php
+
+// setup our function for fetching stock data
+function fetch_ticker($symbol)
+{
+   // put logic here that fetches $ticker_info
+   // from some ticker resource
+   return $ticker_info;
+}
+
+function smarty_function_load_ticker($params, $smarty)
+{
+   // call the function
+   $ticker_info = fetch_ticker($params['symbol']);
+
+   // assign template variable
+   $smarty->assign($params['assign'], $ticker_info);
+}
+
+```
+
+`index.tpl`
+
+```smarty
+
+{load_ticker symbol='SMARTY' assign='ticker'}
+
+Stock Name: {$ticker.name} Stock Price: {$ticker.price}
+
+``` 
+
+See also: [`{include}`](../designers/language-builtin-functions/language-function-include.md).
+
+## Obfuscating E-mail Addresses
+
+Do you ever wonder how your email address gets on so many spam mailing
+lists? One way spammers collect email addresses is from web pages. To
+help combat this problem, you can make your email address show up in
+scrambled javascript in the HTML source, yet it it will look and work
+correctly in the browser. This is done with the
+[`{mailto}`](../designers/language-custom-functions/language-function-mailto.md) plugin.
+
+```smarty
+
+<div id="contact">Send inquiries to
+{mailto address=$EmailAddress encode='javascript' subject='Hello'}
+</div>
+
+```        
+
+> **Note**
+>
+> This method isn\'t 100% foolproof. A spammer could conceivably program
+> his e-mail collector to decode these values, but not likely\....
+> hopefully..yet \... wheres that quantum computer :-?.
+
+See also [`escape`](../designers/language-modifiers/language-modifier-escape.md) modifier and
+[`{mailto}`](../designers/language-custom-functions/language-function-mailto.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/appendixes/troubleshooting.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/appendixes/troubleshooting.md
new file mode 100644
index 000000000..8364534af
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/appendixes/troubleshooting.md
@@ -0,0 +1,104 @@
+# Troubleshooting
+
+## Smarty/PHP errors
+
+Smarty can catch many errors such as missing tag attributes or malformed
+variable names. If this happens, you will see an error similar to the
+following:
+
+```
+Warning: Smarty: [in index.tpl line 4]: syntax error: unknown tag - '%blah'
+       in /path/to/smarty/Smarty.class.php on line 1041
+
+Fatal error: Smarty: [in index.tpl line 28]: syntax error: missing section name
+       in /path/to/smarty/Smarty.class.php on line 1041
+```
+        
+
+Smarty shows you the template name, the line number and the error. After
+that, the error consists of the actual line number in the Smarty class
+that the error occurred.
+
+There are certain errors that Smarty cannot catch, such as missing close
+tags. These types of errors usually end up in PHP compile-time parsing
+errors.
+
+`Parse error: parse error in /path/to/smarty/templates_c/index.tpl.php on line 75`
+    
+When you encounter a PHP parsing error, the error line number will
+correspond to the compiled PHP script, NOT the template itself. Usually
+you can look at the template and spot the syntax error. Here are some
+common things to look for: missing close tags for
+[`{if}{/if}`](../designers/language-builtin-functions/language-function-if.md) or
+[`{section}{/section}`](../designers/language-builtin-functions/language-function-section.md), 
+or syntax of logic within an `{if}` tag. If you can\'t find the error, you might have to
+open the compiled PHP file and go to the line number to figure out where
+the corresponding error is in the template.
+
+```
+Warning: Smarty error: unable to read resource: "index.tpl" in...
+```
+or
+```
+Warning: Smarty error: unable to read resource: "site.conf" in...
+```
+
+-   The [`$template_dir`](../programmers/api-variables/variable-template-dir.md) is incorrect, doesn't
+    exist or the file `index.tpl` is not in the `templates/` directory
+
+-   A [`{config_load}`](../designers/language-builtin-functions/language-function-config-load.md) function is
+    within a template (or [`configLoad()`](../programmers/api-functions/api-config-load.md) has been
+    called) and either [`$config_dir`](../programmers/api-variables/variable-config-dir.md) is
+    incorrect, does not exist or `site.conf` is not in the directory.
+
+```
+Fatal error: Smarty error: the $compile_dir 'templates_c' does not exist,
+or is not a directory...
+```
+
+-   Either the [`$compile_dir`](../programmers/api-variables/variable-compile-dir.md)is incorrectly
+    set, the directory does not exist, or `templates_c` is a file and
+    not a directory.
+
+```
+Fatal error: Smarty error: unable to write to $compile_dir '....
+```
+        
+
+-   The [`$compile_dir`](../programmers/api-variables/variable-compile-dir.md) is not writable by the
+    web server. See the bottom of the [installing
+    smarty](../getting-started.md#installation) page for more about permissions.
+
+```
+Fatal error: Smarty error: the $cache_dir 'cache' does not exist,
+or is not a directory. in /..
+```
+        
+-   This means that [`$caching`](../programmers/api-variables/variable-caching.md) is enabled and
+    either; the [`$cache_dir`](../programmers/api-variables/variable-cache-dir.md) is incorrectly set,
+    the directory does not exist, or `cache/` is a file and not a
+    directory.
+
+```
+Fatal error: Smarty error: unable to write to $cache_dir '/...
+```
+
+-   This means that [`$caching`](../programmers/api-variables/variable-caching.md) is enabled and the
+    [`$cache_dir`](../programmers/api-variables/variable-cache-dir.md) is not writable by the web
+    server. See the bottom of the [installing
+    smarty](../getting-started.md#installation) page for permissions.
+
+```
+Warning: filemtime(): stat failed for /path/to/smarty/cache/3ab50a623e65185c49bf17c63c90cc56070ea85c.one.tpl.php 
+in /path/to/smarty/libs/sysplugins/smarty_resource.php
+```
+
+-   This means that your application registered a custom error handler
+    (using [set_error_handler()](https://www.php.net/set_error_handler))
+    which is not respecting the given `$errno` as it should. If, for
+    whatever reason, this is the desired behaviour of your custom error
+    handler, please call
+    [`muteExpectedErrors()`](../programmers/api-functions/api-mute-expected-errors.md) after you've
+    registered your custom error handler.
+
+See also [debugging](../designers/chapter-debugging-console.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/chapter-debugging-console.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/chapter-debugging-console.md
new file mode 100644
index 000000000..50acd1950
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/chapter-debugging-console.md
@@ -0,0 +1,39 @@
+# Debugging Console
+
+There is a debugging console included with Smarty. The console informs
+you of all the [included](./language-builtin-functions/language-function-include.md) templates,
+[assigned](../programmers/api-functions/api-assign.md) variables and
+[config](./language-variables/language-config-variables.md) file variables for the current
+invocation of the template. A template file named `debug.tpl` is
+included with the distribution of Smarty which controls the formatting
+of the console.
+
+Set [`$debugging`](../programmers/api-variables/variable-debugging.md) to TRUE in Smarty, and if needed
+set [`$debug_tpl`](../programmers/api-variables/variable-debug-template.md) to the template resource
+path to `debug.tpl`. When you load the page, a Javascript console window will pop
+up and give you the names of all the included templates and assigned
+variables for the current page.
+
+To see the available variables for a particular template, see the
+[`{debug}`](./language-builtin-functions/language-function-debug.md) template function. To disable the
+debugging console, set [`$debugging`](../programmers/api-variables/variable-debugging.md) to FALSE. You
+can also temporarily turn on the debugging console by putting
+`SMARTY_DEBUG` in the URL if you enable this option with
+[`$debugging_ctrl`](../programmers/api-variables/variable-debugging-ctrl.md).
+
+> **Note**
+>
+> The debugging console does not work when you use the
+> [`fetch()`](../programmers/api-functions/api-fetch.md) API, only when using
+> [`display()`](../programmers/api-functions/api-display.md). It is a set of javascript statements
+> added to the very bottom of the generated template. If you do not like
+> javascript, you can edit the `debug.tpl` template to format the output
+> however you like. Debug data is not cached and `debug.tpl` info is not
+> included in the output of the debug console.
+
+> **Note**
+>
+> The load times of each template and config file are in seconds, or
+> fractions thereof.
+
+See also [troubleshooting](../appendixes/troubleshooting.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/config-files.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/config-files.md
new file mode 100644
index 000000000..1e1db2d5a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/config-files.md
@@ -0,0 +1,74 @@
+# Config Files
+
+Config files are handy for designers to manage global template variables
+from one file. One example is template colors. Normally if you wanted to
+change the color scheme of an application, you would have to go through
+each and every template file and change the colors. With a config file,
+the colors can be kept in one place, and only one file needs to be
+updated.
+
+```ini
+# global variables
+pageTitle = "Main Menu"
+bodyBgColor = #000000
+tableBgColor = #000000
+rowBgColor = #00ff00
+
+[Customer]
+pageTitle = "Customer Info"
+
+[Login]
+pageTitle = "Login"
+focus = "username"
+Intro = """This is a value that spans more
+           than one line. you must enclose
+           it in triple quotes."""
+
+# hidden section
+[.Database]
+host=my.example.com
+db=ADDRESSBOOK
+user=php-user
+pass=foobar
+```
+      
+
+Values of [config file variables](./language-variables/language-config-variables.md) can be in
+quotes, but not necessary. You can use either single or double quotes.
+If you have a value that spans more than one line, enclose the entire
+value with triple quotes \("""\). You can put comments into config
+files by any syntax that is not a valid config file syntax. We recommend
+using a `#` (hash) at the beginning of the line.
+
+The example config file above has two sections. Section names are
+enclosed in \[brackets\]. Section names can be arbitrary strings not
+containing `[` or `]` symbols. The four variables at the top are global
+variables, or variables not within a section. These variables are always
+loaded from the config file. If a particular section is loaded, then the
+global variables and the variables from that section are also loaded. If
+a variable exists both as a global and in a section, the section
+variable is used. If you name two variables the same within a section,
+the last one will be used unless
+[`$config_overwrite`](../programmers/api-variables/variable-config-overwrite.md) is disabled.
+
+Config files are loaded into templates with the built-in template
+function [`{config_load}`](./language-builtin-functions/language-function-config-load.md) or the API
+[`configLoad()`](../programmers/api-functions/api-config-load.md) function.
+
+You can hide variables or entire sections by prepending the variable
+name or section name with a period(.) eg `[.hidden]`. This is useful if
+your application reads the config files and gets sensitive data from
+them that the template engine does not need. If you have third parties
+doing template editing, you can be certain that they cannot read
+sensitive data from the config file by loading it into the template.
+
+Config files (or resources) are loaded by the same resource facilities
+as templates. That means that a config file can also be loaded from a db
+`$smarty->configLoad("db:my.conf")`.
+
+See also [`{config_load}`](./language-builtin-functions/language-function-config-load.md),
+[`$config_overwrite`](../programmers/api-variables/variable-config-overwrite.md),
+[`$default_config_handler_func`](../programmers/api-variables/variable-default-config-handler-func.md),
+[`getConfigVars()`](../programmers/api-functions/api-get-config-vars.md),
+[`clearConfig()`](../programmers/api-functions/api-clear-config.md) and
+[`configLoad()`](../programmers/api-functions/api-config-load.md)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/index.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/index.md
new file mode 100644
index 000000000..e054d143c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/index.md
@@ -0,0 +1,33 @@
+# Basic Syntax
+
+A simple Smarty template could look like this:
+```smarty
+<h1>{$title|escape}</h1>
+<ul>
+    {foreach $cities as $city}
+        <li>{$city.name|escape} ({$city.population})</li>
+    {foreachelse}
+        <li>no cities found</li>        
+    {/foreach}
+</ul>
+```
+
+All Smarty template tags are enclosed within delimiters. By default
+these are `{` and `}`, but they can be
+[changed](../../designers/language-basic-syntax/language-escaping.md).
+
+For the examples in this manual, we will assume that you are using the
+default delimiters. In Smarty, all content outside of delimiters is
+displayed as static content, or unchanged. When Smarty encounters
+template tags, it attempts to interpret them, and displays the
+appropriate output in their place.
+
+The basic components of the Smarty syntax are:
+
+- [Comments](language-syntax-comments.md)
+- [Variables](language-syntax-variables.md)
+- [Operators](language-syntax-operators.md)
+- [Tags](language-syntax-tags.md)
+- [Attributes](language-syntax-attributes.md)
+- [Quotes](language-syntax-quotes.md)
+- [Escaping](language-escaping.md)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-escaping.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-escaping.md
new file mode 100644
index 000000000..9132b8c02
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-escaping.md
@@ -0,0 +1,78 @@
+# Escaping Smarty parsing
+
+It is sometimes desirable or even necessary to have Smarty ignore
+sections it would otherwise parse. A classic example is embedding
+Javascript or CSS code in a template. The problem arises as those
+languages use the { and } characters which are also the default
+[delimiters](../language-builtin-functions/language-function-ldelim.md) for Smarty.
+
+> **Note**
+>
+> A good practice for avoiding escapement altogether is by separating
+> your Javascript/CSS into their own files and use standard HTML methods
+> to access them. This will also take advantage of browser script
+> caching. When you need to embed Smarty variables/functions into your
+> Javascript/CSS, then the following applies.
+
+In Smarty templates, the { and } braces will be ignored so long as they
+are surrounded by white space. This behavior can be disabled by setting
+the Smarty class variable [`$auto_literal`](../../programmers/api-variables/variable-auto-literal.md) to
+false.
+
+## Examples
+
+```smarty
+<script>
+   // the following braces are ignored by Smarty
+   // since they are surrounded by whitespace
+   function foobar {
+    alert('foobar!');
+   }
+   // this one will need literal escapement
+   {literal}
+    function bazzy {alert('foobar!');}
+   {/literal}
+</script>
+```  
+     
+[`{literal}..{/literal}`](../language-builtin-functions/language-function-literal.md) blocks are used
+for escaping blocks of template logic. You can also escape the braces
+individually with
+[`{ldelim}`, `{rdelim}`](../language-builtin-functions/language-function-ldelim.md) tags or
+[`{$smarty.ldelim}`,`{$smarty.rdelim}`](../language-variables/language-variables-smarty.md#smartyldelim-smartyrdelim-languagevariablessmartyldelim)
+variables.
+
+Smarty's default delimiters { and } cleanly represent presentational
+content. However, if another set of delimiters suit your needs better,
+you can change them with Smarty's
+`setLeftDelimiter()` and `setRightDelimiter()` methods.
+
+> **Note**
+>
+> Changing delimiters affects ALL template syntax and escapement. Be
+> sure to clear out cache and compiled files if you decide to change
+> them.
+
+```php
+<?php
+
+$smarty->setLeftDelimiter('<!--{');
+$smarty->setRightDelimiter('}-->');
+
+$smarty->assign('foo', 'bar');
+$smarty->assign('name', 'Albert');
+$smarty->display('example.tpl');
+```
+
+Where the template is:
+
+```smarty
+Welcome <!--{$name}--> to Smarty
+    <script>
+  var foo = <!--{$foo}-->;
+  function dosomething() {
+    alert("foo is " + foo);
+  }
+  dosomething();
+</script>
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-attributes.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-attributes.md
new file mode 100644
index 000000000..e3c7d58b2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-attributes.md
@@ -0,0 +1,49 @@
+# Attributes
+
+Most of the [tags](./language-syntax-tags.md) take attributes that
+specify or modify their behavior. Attributes to Smarty functions are
+much like HTML attributes. Static values don't have to be enclosed in
+quotes, but it is required for literal strings. Variables with or
+without modifiers may also be used, and should not be in quotes. You can
+even use PHP function results, plugin results and complex expressions.
+
+Some attributes require boolean values (TRUE or FALSE). These can be
+specified as `true` and `false`. If an attribute has no value assigned
+it gets the default boolean value of true.
+
+## Examples
+```smarty
+{include file="header.tpl"}
+
+{include file="header.tpl" nocache}  // is equivalent to nocache=true
+
+{include file="header.tpl" attrib_name="attrib value"}
+
+{include file=$includeFile}
+
+{include file=#includeFile# title="My Title"}
+
+{assign var=foo value={counter}}  // plugin result
+
+{assign var=foo value=substr($bar,2,5)}  // PHP function result
+
+{assign var=foo value=$bar|strlen}  // using modifier
+
+{assign var=foo value=$buh+$bar|strlen}  // more complex expression
+
+{html_select_date display_days=true}
+
+{mailto address="smarty@example.com"}
+
+<select name="company_id">
+  {html_options options=$companies selected=$company_id}
+</select>
+```
+      
+> **Note**
+>
+> Although Smarty can handle some very complex expressions and syntax,
+> it is a good rule of thumb to keep the template syntax minimal and
+> focused on presentation. If you find your template syntax getting too
+> complex, it may be a good idea to move the bits that do not deal
+> explicitly with presentation to PHP by way of plugins or modifiers.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-comments.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-comments.md
new file mode 100644
index 000000000..379418efb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-comments.md
@@ -0,0 +1,69 @@
+# Comments
+
+Template comments are surrounded by asterisks, and that is surrounded by
+the [delimiter](../../designers/language-basic-syntax/language-escaping.md) tags like so:
+
+## Examples
+
+```smarty
+{* this is a comment *}
+```
+
+Smarty comments are NOT displayed in the final output of the template,
+unlike `<!-- HTML comments -->`. These are useful for making internal
+notes in the templates which no one will see ;-)
+
+```smarty
+{* I am a Smarty comment, I don't exist in the compiled output  *}
+<html>
+    <head>
+     <title>{$title}</title>
+    </head>
+<body>
+
+    {* another single line smarty comment  *}
+    <!-- HTML comment that is sent to the browser -->
+
+    {* this multiline smarty
+       comment is
+       not sent to browser
+    *}
+
+    {*********************************************************
+    Multi line comment block with credits block
+      @ author:         bg@example.com
+      @ maintainer:     support@example.com
+      @ para:           var that sets block style
+      @ css:            the style output
+    **********************************************************}
+
+    {* The header file with the main logo and stuff  *}
+    {include file='header.tpl'}
+
+
+    {* Dev note:  the $includeFile var is assigned in foo.php script  *}
+    <!-- Displays main content block -->
+    {include file=$includeFile}
+
+    {* this <select> block is redundant *}
+    {*
+    <select name="company">
+      {html_options options=$vals selected=$selected_id}
+    </select>
+    *}
+
+    <!-- Show header from affiliate is disabled -->
+    {* $affiliate|upper *}
+
+    {* you cannot nest comments *}
+    {*
+    <select name="company">
+      {* <option value="0">-- none -- </option> *}
+      {html_options options=$vals selected=$selected_id}
+    </select>
+    *}
+
+    </body>
+</html>
+```
+      
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-operators.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-operators.md
new file mode 100644
index 000000000..98a56538e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-operators.md
@@ -0,0 +1,88 @@
+# Operators
+
+## Basic
+
+Various basic operators can be applied directly to variable values.
+
+## Examples
+```smarty
+{$foo + 1}
+
+{$foo * $bar}
+
+{$foo->bar - $bar[1] * $baz->foo->bar() -3 * 7}
+
+{if ($foo + $bar.test % $baz * 134232 + 10 + $b + 10)}
+    ...
+{/if}
+
+{$foo = $foo + $bar}
+```
+
+> **Note**
+>
+> Although Smarty can handle some very complex expressions and syntax,
+> it is a good rule of thumb to keep the template syntax minimal and
+> focused on presentation. If you find your template syntax getting too
+> complex, it may be a good idea to move the bits that do not deal
+> explicitly with presentation to PHP by way of plugins or modifiers.
+
+## List
+The following is a list of recognized operators, which must be
+separated from surrounding elements by spaces. Note that items listed in
+\[brackets\] are optional. PHP equivalents are shown where applicable.
+
+| Operator           | Alternates | Syntax Example       | Meaning                        | PHP Equivalent     |
+|--------------------|------------|----------------------|--------------------------------|--------------------|
+| ==                 | eq         | $a eq $b             | equals                         | ==                 |
+| !=                 | ne, neq    | $a neq $b            | not equals                     | !=                 |
+| >                  | gt         | $a gt $b             | greater than                   | >                  |
+| <                  | lt         | $a lt $b             | less than                      | <                  |
+| >=                 | gte, ge    | $a ge $b             | greater than or equal          | >=                 |
+| <=                 | lte, le    | $a le $b             | less than or equal             | <=                 |
+| ===                |            | $a === 0             | check for identity             | ===                |
+| !                  | not        | not $a               | negation (unary)               | !                  |
+| %                  | mod        | $a mod $b            | modulo                         | %                  |
+| is \[not\] div by  |            | $a is not div by 4   | divisible by                   | $a % $b == 0       |
+| is \[not\] even    |            | $a is not even       | \[not\] an even number (unary) | $a % 2 == 0        |
+| is \[not\] even by |            | $a is not even by $b | grouping level \[not\] even    | ($a / $b) % 2 == 0 |
+| is \[not\] odd     |            | $a is not odd        | \[not\] an odd number (unary)  | $a % 2 != 0        |
+| is \[not\] odd by  |            | $a is not odd by $b  | \[not\] an odd grouping        | ($a / $b) % 2 != 0 |
+| is in              |            | $a is in $b          | exists in array                | in_array($a, $b)   |
+| is \[not\] in      |            | $a is not in $b      | does not exist in array        | !in_array($a, $b)  |
+
+## Ternary
+You can use the `?:` (or ternary) operator to test one expression and present the value
+of the second or third expression, based on the result of the test.
+
+In other words:
+```smarty
+{$test ? "OK" : "FAIL"}
+```
+will result in OK if `$test` is set to true, and in FAIL otherwise.
+
+There is also a shorthand `?:` operator:
+```smarty
+{$myVar ?: "empty"}
+```
+will result in 'empty' if `$myVar` is not set or set to something that evaluates to false, such as an empty string.
+If `$myVar` is set to something that evaluates to true, the value of `$myVar` is returned. So, the following will 
+return 'hello':
+```smarty
+{$myVar="hello"}
+{$myVar ?: "empty"}
+```
+
+## Testing for null
+If "something that evaluates to false" is to broad a test for you, you can use the `??` (or null coalescing) operator 
+to trigger only if the tested value is undefined or set to null.
+```smarty
+{$myVar ?? "empty"}
+```
+will result in 'empty' if `$myVar` is not set or set to null.
+If `$myVar` is set to something that evaluates to anything else, the value of `$myVar` is returned. So, the following will
+return an empty string (''):
+```smarty
+{$myVar=""}
+{$myVar ?: "this is not shown"}
+```
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-quotes.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-quotes.md
new file mode 100644
index 000000000..e04e6da76
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-quotes.md
@@ -0,0 +1,54 @@
+# Embedding Vars in Double Quotes
+
+-   Smarty will recognize [assigned](../../programmers/api-functions/api-assign.md)
+    [variables](./language-syntax-variables.md) embedded in "double
+    quotes" so long as the variable name contains only numbers, letters
+    and under_scores. See [naming](https://www.php.net/language.variables)
+    for more detail.
+
+-   With any other characters, for example a period(.) or
+    `$object->reference`, then the variable must be surrounded by `` `backticks` ``.
+
+-   In addition, Smarty does allow embedded Smarty tags in double-quoted
+    strings. This is useful if you want to include variables with
+    modifiers, plugin or PHP function results.
+
+## Examples
+```smarty
+{func var="test $foo test"}              // sees $foo
+{func var="test $foo_bar test"}          // sees $foo_bar
+{func var="test `$foo[0]` test"}         // sees $foo[0]
+{func var="test `$foo[bar]` test"}       // sees $foo[bar]
+{func var="test $foo.bar test"}          // sees $foo (not $foo.bar)
+{func var="test `$foo.bar` test"}        // sees $foo.bar
+{func var="test `$foo.bar` test"|escape} // modifiers outside quotes!
+{func var="test {$foo|escape} test"}     // modifiers inside quotes!
+{func var="test {time()} test"}          // PHP function result
+{func var="test {counter} test"}         // plugin result
+{func var="variable foo is {if !$foo}not {/if} defined"} // Smarty block function
+
+{* will replace $tpl_name with value *}
+{include file="subdir/$tpl_name.tpl"}
+
+{* does NOT replace $tpl_name *}
+{include file='subdir/$tpl_name.tpl'} // vars require double quotes!
+
+{* must have backticks as it contains a dot "." *}
+{cycle values="one,two,`$smarty.config.myval`"}
+
+{* must have backticks as it contains a dot "." *}
+{include file="`$module.contact`.tpl"}
+
+{* can use variable with dot syntax *}
+{include file="`$module.$view`.tpl"}
+```
+      
+> **Note**
+>
+> Although Smarty can handle some very complex expressions and syntax,
+> it is a good rule of thumb to keep the template syntax minimal and
+> focused on presentation. If you find your template syntax getting too
+> complex, it may be a good idea to move the bits that do not deal
+> explicitly with presentation to PHP by way of plugins or modifiers.
+
+See also [`escape`](../language-modifiers/language-modifier-escape.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-tags.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-tags.md
new file mode 100644
index 000000000..7142f0da4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-tags.md
@@ -0,0 +1,39 @@
+# Tags
+
+Every Smarty tag either prints a [variable](./language-syntax-variables.md) or
+invokes some sort of function. These are processed and displayed by
+enclosing the function and its [attributes](./language-syntax-attributes.md)
+within delimiters like so: `{funcname attr1="val1" attr2="val2"}`.
+
+## Examples
+
+```smarty
+{config_load file="colors.conf"}
+
+{include file="header.tpl"}
+
+{if $logged_in}
+    Welcome, <span style="color:{#fontColor#}">{$name}!</span>
+{else}
+    hi, {$name}
+{/if}
+
+{include file="footer.tpl"}
+```
+      
+-   Both [built-in functions](../language-builtin-functions/index.md) and [custom
+    functions](../language-custom-functions/index.md) have the same syntax within
+    templates.
+
+-   Built-in functions are the **inner** workings of Smarty, such as
+    [`{if}`](../language-builtin-functions/language-function-if.md),
+    [`{section}`](../language-builtin-functions/language-function-section.md) and
+    [`{strip}`](../language-builtin-functions/language-function-strip.md). There should be no need to
+    change or modify them.
+
+-   Custom tags are **additional** tags implemented via
+    [plugins](../../api/extending/introduction.md). They can be modified to your liking, or you can
+    create new ones. [`{html_options}`](../language-custom-functions/language-function-html-options.md)
+    is an example of a custom function.
+
+See also [`registerPlugin()`](../../programmers/api-functions/api-register-plugin.md)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-variables.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-variables.md
new file mode 100644
index 000000000..78d309ace
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-variables.md
@@ -0,0 +1,106 @@
+# Variables
+
+Template variables start with the $dollar sign. They can contain
+numbers, letters and underscores, much like a [PHP
+variable](https://www.php.net/language.variables). You can reference arrays
+by index numerically or non-numerically. Also reference object
+properties and methods.
+
+[Config file variables](../language-variables/language-config-variables.md) are an exception to
+the \$dollar syntax and are instead referenced with surrounding
+\#hashmarks\#, or via the [`$smarty.config`](../language-variables/language-variables-smarty.md#smartyconfig-languagevariablessmartyconfig) variable.
+
+## Examples
+
+```smarty
+{$foo}        <-- displaying a simple variable (non array/object)
+{$foo[4]}     <-- display the 5th element of a zero-indexed array
+{$foo.bar}    <-- display the "bar" key value of an array, similar to PHP $foo['bar']
+{$foo.$bar}   <-- display variable key value of an array, similar to PHP $foo[$bar]
+{$foo->bar}   <-- display the object property "bar"
+{$foo->bar()} <-- display the return value of object method "bar"
+{#foo#}       <-- display the config file variable "foo"
+{$smarty.config.foo} <-- synonym for {#foo#}
+{$foo[bar]}   <-- syntax only valid in a section loop, see {section}
+{assign var=foo value='baa'}{$foo} <--  displays "baa", see {assign}
+
+Many other combinations are allowed
+
+{$foo.bar.baz}
+{$foo.$bar.$baz}
+{$foo[4].baz}
+{$foo[4].$baz}
+{$foo.bar.baz[4]}
+{$foo->bar($baz,2,$bar)} <-- passing parameters
+{"foo"}       <-- static values are allowed
+
+{* display the server variable "SERVER_NAME" ($_SERVER['SERVER_NAME'])*}
+{$smarty.server.SERVER_NAME}
+
+Math and embedding tags:
+
+{$x+$y}                             // will output the sum of x and y.
+{assign var=foo value=$x+$y}        // in attributes 
+{$foo[$x+3]}                        // as array index
+{$foo={counter}+3}                  // tags within tags
+{$foo="this is message {counter}"}  // tags within double quoted strings
+
+Defining Arrays:
+
+{assign var=foo value=[1,2,3]}
+{assign var=foo value=['y'=>'yellow','b'=>'blue']}
+{assign var=foo value=[1,[9,8],3]}   // can be nested
+
+Short variable assignment:
+
+{$foo=$bar+2}
+{$foo = strlen($bar)}               // function in assignment
+{$foo = myfunct( ($x+$y)*3 )}       // as function parameter 
+{$foo.bar=1}                        // assign to specific array element
+{$foo.bar.baz=1}                    
+{$foo[]=1}                          // appending to an array
+
+Smarty "dot" syntax (note: embedded {} are used to address ambiguities):
+
+{$foo.a.b.c}        =>  $foo['a']['b']['c'] 
+{$foo.a.$b.c}       =>  $foo['a'][$b]['c']         // with variable index
+{$foo.a.{$b+4}.c}   =>  $foo['a'][$b+4]['c']       // with expression as index
+{$foo.a.{$b.c}}     =>  $foo['a'][$b['c']]         // with nested index
+
+PHP-like syntax, alternative to "dot" syntax:
+
+{$foo[1]}             // normal access
+{$foo['bar']}
+{$foo['bar'][1]}
+{$foo[$x+$x]}         // index may contain any expression
+{$foo[$bar[1]]}       // nested index
+{$foo[section_name]}  // smarty {section} access, not array access!
+
+Variable variables:
+
+$foo                     // normal variable
+$foo_{$bar}              // variable name containing other variable 
+$foo_{$x+$y}             // variable name containing expressions 
+$foo_{$bar}_buh_{$blar}  // variable name with multiple segments
+{$foo_{$x}}              // will output the variable $foo_1 if $x has a value of 1.
+
+Object chaining:
+
+{$object->method1($x)->method2($y)}
+
+```
+
+> **Note**
+>
+> Although Smarty can handle some very complex expressions and syntax,
+> it is a good rule of thumb to keep the template syntax minimal and
+> focused on presentation. If you find your template syntax getting too
+> complex, it may be a good idea to move the bits that do not deal
+> explicitly with presentation to PHP by way of plugins or modifiers.
+
+Request variables such as `$_GET`, `$_SESSION`, etc are available via
+the reserved [`$smarty`](../language-variables/language-variables-smarty.md) variable.
+
+See also [`$smarty`](../language-variables/language-variables-smarty.md), [config
+variables](../language-variables/language-config-variables.md)
+[`{assign}`](../language-builtin-functions/language-function-assign.md) and [`assign()`](../../programmers/api-functions/api-assign.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/index.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/index.md
new file mode 100644
index 000000000..852b392fc
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/index.md
@@ -0,0 +1,35 @@
+# Built-in Functions
+
+Smarty comes with several built-in functions. These built-in functions
+are the integral part of the smarty template engine. They are compiled
+into corresponding inline PHP code for maximum performance.
+
+You cannot create your own [custom tags](../language-custom-functions/index.md) with the same name; and you
+should not need to modify the built-in functions.
+
+A few of these functions have an `assign` attribute which collects the
+result the function to a named template variable instead of being
+output; much like the [`{assign}`](language-function-assign.md) function.
+
+- [{append}](language-function-append.md)
+- [{assign} or {$var=...}](language-function-assign.md)
+- [{block}](language-function-block.md)
+- [{call}](language-function-call.md)
+- [{capture}](language-function-capture.md)
+- [{config_load}](language-function-config-load.md)
+- [{debug}](language-function-debug.md)
+- [{extends}](language-function-extends.md)
+- [{for}](language-function-for.md)
+- [{foreach}, {foreachelse}](language-function-foreach.md)
+- [{function}](language-function-function.md)
+- [{if}, {elseif}, {else}](language-function-if.md)
+- [{include}](language-function-include.md)
+- [{insert}](language-function-insert.md)
+- [{ldelim}, {rdelim}](language-function-ldelim.md)
+- [{literal}](language-function-literal.md)
+- [{nocache}](language-function-nocache.md)
+- [{section}, {sectionelse}](language-function-section.md)
+- [{setfilter}](language-function-setfilter.md)
+- [{strip}](language-function-strip.md)
+- [{while}](language-function-while.md)
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-append.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-append.md
new file mode 100644
index 000000000..37e1b81e9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-append.md
@@ -0,0 +1,49 @@
+# {append}
+
+`{append}` is used for creating or appending template variable arrays
+**during the execution of a template**.
+
+## Attributes
+
+| Attribute | Required   | Description                                                                                        |
+|-----------|------------|----------------------------------------------------------------------------------------------------|
+| var       |            | The name of the variable being assigned                                                            |
+| value     |            | The value being assigned                                                                           |
+| index     | (optional) | The index for the new array element. If not specified the value is append to the end of the array. |
+| scope     | (optional) | The scope of the assigned variable: parent, root or global. Defaults to local if omitted.          |
+
+## Option Flags
+
+| Name    | Description                                         |
+|---------|-----------------------------------------------------|
+| nocache | Assigns the variable with the 'nocache' attribute   | 
+
+> **Note**
+>
+> Assignment of variables in-template is essentially placing application
+> logic into the presentation that may be better handled in PHP. Use at
+> your own discretion.
+
+## Examples
+
+```smarty
+{append var='name' value='Bob' index='first'}
+{append var='name' value='Meyer' index='last'}
+// or 
+{append 'name' 'Bob' index='first'} {* short-hand *}
+{append 'name' 'Meyer' index='last'} {* short-hand *}
+
+The first name is {$name.first}.<br>
+The last name is {$name.last}.
+```
+      
+The above example will output:
+
+
+    The first name is Bob.
+    The last name is Meyer.
+
+      
+
+See also [`append()`](#api.append) and
+[`getTemplateVars()`](#api.get.template.vars).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-assign.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-assign.md
new file mode 100644
index 000000000..abcc8e5a6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-assign.md
@@ -0,0 +1,148 @@
+# {assign}, {$var=...}
+
+`{assign}` or `{$var=...}` is used for assigning template variables **during the
+execution of a template**.
+
+## Attributes of the {assign} syntax
+| Attribute Name | Required   | Description                                                           |
+|----------------|------------|-----------------------------------------------------------------------|
+| var            |            | The name of the variable being assigned                               | 
+| value          |            | The value being assigned                                              |                             
+| scope          | (optional) | The scope of the assigned variable: 'parent','root' or 'global' | 
+
+## Attributes of the {$var=...} syntax
+| Attribute Name | Required   | Description                                                           |
+|----------------|------------|-----------------------------------------------------------------------|
+| scope          | (optional) | The scope of the assigned variable: 'parent','root' or 'global' | 
+
+## Option Flags
+| Name    | Description                                       |
+|---------|---------------------------------------------------|
+| nocache | Assigns the variable with the 'nocache' attribute |
+
+
+> **Note**
+>
+> Assignment of variables in-template is essentially placing application
+> logic into the presentation that may be better handled in PHP. Use at
+> your own discretion.
+
+## Examples
+
+```smarty
+{assign var="name" value="Bob"}  {* or *}
+{assign "name" "Bob"} {* short-hand, or *}
+{$name='Bob'}
+
+The value of $name is {$name}.
+```
+      
+
+The above example will output:
+
+```
+The value of $name is Bob.
+```
+
+
+```smarty
+{assign var="name" value="Bob" nocache}  {* or *}
+{assign "name" "Bob" nocache} {* short-hand, or *}
+{$name='Bob' nocache}
+
+The value of $name is {$name}.
+```
+The above example will output:
+```
+The value of $name is Bob.
+```
+      
+
+```smarty
+{assign var=running_total value=$running_total+$some_array[$row].some_value}  {* or *}
+{$running_total=$running_total+$some_array[row].some_value}
+```
+
+Variables assigned in the included template will be seen in the
+including template.
+
+```smarty
+{include file="sub_template.tpl"}
+
+{* display variable assigned in sub_template *}
+{$foo}<br>
+```
+
+The template above includes the example `sub_template.tpl` below:
+
+```smarty
+
+{* foo will be known also in the including template *}
+{assign var="foo" value="something" scope=parent}
+{$foo="something" scope=parent}
+
+{* bar is assigned only local in the including template *}
+{assign var="bar" value="value"} {* or *}
+{$var="value"}
+
+```
+
+You can assign a variable to root of the current root tree. The variable
+is seen by all templates using the same root tree.
+
+```smarty
+{assign var=foo value="bar" scope="root"}
+```
+      
+A global variable is seen by all templates.
+
+```smarty
+{assign var=foo value="bar" scope="global"} {* or *}
+{assign "foo" "bar" scope="global"} {* short-hand, or *}
+{$foo="bar" scope="global"}
+```
+ 
+For more information on variable scope, please read the page on [variable scopes](../language-variables/language-variable-scopes.md).
+
+To access `{assign}` variables from a php script use
+[`getTemplateVars()`](../../programmers/api-functions/api-get-template-vars.md). 
+Here's the template that creates the variable `$foo`.
+
+```smarty
+{assign var="foo" value="Smarty"} {* or *}
+{$foo="Smarty"}
+```
+
+The template variables are only available after/during template
+execution as in the following script.
+
+```php
+<?php
+
+// this will output nothing as the template has not been executed
+echo $smarty->getTemplateVars('foo');
+
+// fetch the template to a variable
+$whole_page = $smarty->fetch('index.tpl');
+
+// this will output 'smarty' as the template has been executed
+echo $smarty->getTemplateVars('foo');
+
+$smarty->assign('foo','Even smarter');
+
+// this will output 'Even smarter'
+echo $smarty->getTemplateVars('foo');
+```
+
+The following functions can also *optionally* assign template variables: [`{capture}`](#language.function.capture),
+[`{include}`](#language.function.include),
+[`{counter}`](#language.function.counter),
+[`{cycle}`](#language.function.cycle),
+[`{eval}`](#language.function.eval),
+[`{fetch}`](#language.function.fetch),
+[`{math}`](#language.function.math) and
+[`{textformat}`](#language.function.textformat).
+
+See also [`{append}`](./language-function-append.md),
+[`assign()`](#api.assign) and
+[`getTemplateVars()`](#api.get.template.vars).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-block.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-block.md
new file mode 100644
index 000000000..05334e2f6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-block.md
@@ -0,0 +1,201 @@
+# {block}
+
+`{block}` is used to define a named area of template source for template
+inheritance. For details see section of [Template
+Inheritance](../../api/inheritance.md).
+
+The `{block}` template source area of a child template will replace the
+corresponding areas in the parent template(s).
+
+Optionally `{block}` areas of child and parent templates can be merged
+into each other. You can append or prepend the parent `{block}` content
+by using the `append` or `prepend` option flag with the child's `{block}`
+definition. With `{$smarty.block.parent}` the `{block}` content of
+the parent template can be inserted at any location of the child
+`{block}` content. `{$smarty.block.child}` inserts the `{block}` content
+of the child template at any location of the parent `{block}`.
+
+`{blocks}'s` can be nested.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                                                          |
+|----------------|----------|----------------------------------------------------------------------------------------------------------------------|
+| name           | yes      | The name of the template source block                                                                                |
+| assign         | no       | The name of variable to assign the output of the block to. |
+
+> **Note** 
+> 
+> The assign attribute only works on the block that actually gets executed, so you may need 
+> to add it to each child block as well.
+
+
+## Option Flags (in child templates only):
+
+| Name    | Description                                                                             |
+|---------|-----------------------------------------------------------------------------------------|
+| append  | The `{block}` content will be appended to the content of the parent template `{block}`  |
+| prepend | The `{block}` content will be prepended to the content of the parent template `{block}` |
+| hide    | Ignore the block content if no child block of same name is existing.                    |
+| nocache | Disables caching of the `{block}` content                                               |
+
+
+## Examples
+
+parent.tpl
+
+```smarty
+    <html>
+      <head>
+        <title>{block name="title"}Default Title{/block}</title>
+        <title>{block "title"}Default Title{/block}</title>  {* short-hand  *}
+      </head>
+    </html>
+```
+      
+
+child.tpl
+
+```smarty
+    {extends file="parent.tpl"} 
+    {block name="title"}
+    Page Title
+    {/block}
+```
+      
+
+The result would look like
+
+```html
+    <html>
+      <head>
+        <title>Page Title</title>
+      </head>
+    </html>
+```
+
+parent.tpl
+
+```smarty
+    <html>
+      <head>
+        <title>{block name="title"}Title - {/block}</title>
+      </head>
+    </html>
+```
+      
+
+child.tpl
+
+```smarty
+    {extends file="parent.tpl"} 
+    {block name="title" append}
+        Page Title
+    {/block}
+```
+      
+
+The result would look like
+
+```html
+    <html>
+      <head>
+        <title>Title - Page Title</title>
+      </head>
+    </html>
+```
+
+parent.tpl
+
+```smarty
+    <html>
+      <head>
+        <title>{block name="title"} is my title{/block}</title>
+      </head>
+    </html>
+```
+      
+child.tpl
+
+```smarty
+    {extends file="parent.tpl"} 
+    {block name="title" prepend}
+    Page Title
+    {/block}
+```
+      
+
+The result would look like
+
+```html
+    <html>
+      <head>
+        <title>Page title is my titel</title>
+      </head>
+    </html>
+```
+
+parent.tpl
+
+```smarty
+    <html>
+      <head>
+        <title>{block name="title"}The {$smarty.block.child} was inserted here{/block}</title>
+      </head>
+    </html>
+```
+      
+child.tpl
+
+```smarty
+    {extends file="parent.tpl"} 
+    {block name="title"}
+        Child Title
+    {/block}
+```
+     
+The result would look like
+
+```html
+    <html>
+      <head>
+        <title>The Child Title was inserted here</title>
+      </head>
+    </html>
+```
+
+parent.tpl
+
+```smarty
+    <html>
+      <head>
+        <title>{block name="title"}Parent Title{/block}</title>
+      </head>
+    </html>
+```
+      
+
+child.tpl
+
+```smarty
+    {extends file="parent.tpl"} 
+    {block name="title"}
+        You will see now - {$smarty.block.parent} - here
+    {/block}
+```
+     
+The result would look like
+
+```html
+    <html>
+      <head>
+        <title>You will see now - Parent Title - here</title>
+      </head>
+    </html>
+```
+
+See also [Template
+Inheritance](../../api/inheritance.md),
+[`$smarty.block.parent`](../language-variables/language-variables-smarty.md#smartyblockparent-languagevariablessmartyblockparent),
+[`$smarty.block.child`](../language-variables/language-variables-smarty.md#smartyblockchild-languagevariablessmartyblockchild), and
+[`{extends}`](./language-function-extends.md)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-call.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-call.md
new file mode 100644
index 000000000..c07fb49b9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-call.md
@@ -0,0 +1,77 @@
+# {call}
+
+`{call}` is used to call a template function defined by the
+[`{function}`](./language-function-function.md) tag just like a plugin
+function.
+
+> **Note**
+>
+> Template functions are defined global. Since the Smarty compiler is a
+> single-pass compiler, The `{call}` tag must
+> be used to call a template function defined externally from the given
+> template. Otherwise you can directly use the function as
+> `{funcname ...}` in the template.
+
+-   The `{call}` tag must have the `name` attribute which contains the
+    name of the template function.
+
+-   Values for variables can be passed to the template function as
+    [attributes](../language-basic-syntax/language-syntax-attributes.md).
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                              |
+|----------------|----------|------------------------------------------------------------------------------------------|
+| name           | Yes      | The name of the template function                                                        |
+| assign         | No       | The name of the variable that the output of called template function will be assigned to |
+| [var ...]      | No       | variable to pass local to template function                                              |
+
+## Option Flags
+
+| Name    | Description                                |
+|---------|--------------------------------------------|
+| nocache | Call the template function in nocache mode |
+
+
+## Examples
+
+```smarty
+    {* define the function *}
+    {function name=menu level=0}
+      <ul class="level{$level}">
+      {foreach $data as $entry}
+        {if is_array($entry)}
+          <li>{$entry@key}</li>
+          {call name=menu data=$entry level=$level+1}
+        {else}
+          <li>{$entry}</li>
+        {/if}
+      {/foreach}
+      </ul>
+    {/function}
+
+    {* create an array to demonstrate *}
+    {$menu = ['item1','item2','item3' => ['item3-1','item3-2','item3-3' =>
+    ['item3-3-1','item3-3-2']],'item4']}
+
+    {* run the array through the function *}
+    {call name=menu data=$menu}
+    {call menu data=$menu} {* short-hand *}
+```
+     
+
+Will generate the following output
+
+```
+    * item1
+    * item2
+    * item3
+          o item3-1
+          o item3-2
+          o item3-3
+                + item3-3-1
+                + item3-3-2
+    * item4
+```
+
+See also [`{function}`](./language-function-function.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-capture.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-capture.md
new file mode 100644
index 000000000..83f4d02d7
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-capture.md
@@ -0,0 +1,75 @@
+# {capture}
+
+`{capture}` is used to collect the output of the template between the
+tags into a variable instead of displaying it. Any content between
+`{capture name='foo'}` and `{/capture}` is collected into the variable
+specified in the `name` attribute.
+
+The captured content can be used in the template from the variable
+[`$smarty.capture.foo`](../language-variables/language-variables-smarty.md#smartycapture-languagevariablessmartycapture) where "foo"
+is the value passed in the `name` attribute. If you do not supply the
+`name` attribute, then "default" will be used as the name ie
+`$smarty.capture.default`.
+
+`{capture}'s` can be nested.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                          |
+|----------------|----------|----------------------------------------------------------------------|
+| name           | Yes      | The name of the captured block                                       |
+| assign         | No       | The variable name where to assign the captured output to             |
+| append         | No       | The name of an array variable where to append the captured output to |
+
+## Option Flags
+
+| Name    | Description                             |
+|---------|-----------------------------------------|
+| nocache | Disables caching of this captured block |
+
+
+## Examples
+
+```smarty
+{* we don't want to print a div tag unless content is displayed *}
+{capture name="banner"}
+{capture "banner"} {* short-hand *}
+  {include file="get_banner.tpl"}
+{/capture}
+
+{if $smarty.capture.banner ne ""}
+<div id="banner">{$smarty.capture.banner}</div>
+{/if}
+```
+      
+This example demonstrates the capture function.
+```smarty
+
+{capture name=some_content assign=popText}
+{capture some_content assign=popText} {* short-hand *}
+The server is {$my_server_name|upper} at {$my_server_addr}<br>
+Your ip is {$my_ip}.
+{/capture}
+<a href="#">{$popText}</a>
+```
+         
+
+This example also demonstrates how multiple calls of capture can be used
+to create an array with captured content.
+
+```smarty
+{capture append="foo"}hello{/capture}I say just {capture append="foo"}world{/capture}
+{foreach $foo as $text}{$text} {/foreach}
+```
+
+The above example will output:
+
+```
+I say just hello world
+```
+      
+
+See also [`$smarty.capture`](../language-variables/language-variables-smarty.md#smartycapture-languagevariablessmartycapture),
+[`{eval}`](../language-custom-functions/language-function-eval.md),
+[`{fetch}`](../language-custom-functions/language-function-fetch.md), [`fetch()`](../../programmers/api-functions/api-fetch.md) and
+[`{assign}`](./language-function-assign.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-config-load.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-config-load.md
new file mode 100644
index 000000000..1972179d1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-config-load.md
@@ -0,0 +1,87 @@
+# {config_load}
+
+`{config_load}` is used for loading config
+[`#variables#`](#language.config.variables) from a [configuration file](#config.files) into the template.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                                                                                                                                                                                                                                                                     |
+|----------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| file           | Yes      | The name of the config file to include                                                                                                                                                                                                                                                                                          |
+| section        | No       | The name of the section to load                                                                                                                                                                                                                                                                                                 |
+
+
+## Examples
+
+The `example.conf` file.
+
+```ini
+#this is config file comment
+
+# global variables
+pageTitle = "Main Menu"
+bodyBgColor = #000000
+tableBgColor = #000000
+rowBgColor = #00ff00
+
+#customer variables section
+[Customer]
+pageTitle = "Customer Info"
+```
+      
+and the template
+
+```smarty
+{config_load file="example.conf"}
+{config_load "example.conf"}  {* short-hand *}
+
+<html>
+    <title>{#pageTitle#|default:"No title"}</title>
+    <body bgcolor="{#bodyBgColor#}">
+        <table border="{#tableBorderSize#}" bgcolor="{#tableBgColor#}">
+           <tr bgcolor="{#rowBgColor#}">
+              <td>First</td>
+              <td>Last</td>
+              <td>Address</td>
+           </tr>
+        </table>
+    </body>
+</html>
+```
+      
+[Config Files](#config.files) may also contain sections. You can load
+variables from within a section with the added attribute `section`. Note
+that global config variables are always loaded along with section
+variables, and same-named section variables overwrite the globals.
+
+> **Note**
+>
+> Config file *sections* and the built-in template function called
+> [`{section}`](../language-builtin-functions/language-function-section.md) have nothing to do with each
+> other, they just happen to share a common naming convention.
+
+```smarty
+{config_load file='example.conf' section='Customer'}
+{config_load 'example.conf' 'Customer'} {* short-hand *}
+
+<html>
+    <title>{#pageTitle#}</title>
+    <body bgcolor="{#bodyBgColor#}">
+        <table border="{#tableBorderSize#}" bgcolor="{#tableBgColor#}">
+           <tr bgcolor="{#rowBgColor#}">
+              <td>First</td>
+              <td>Last</td>
+              <td>Address</td>
+           </tr>
+        </table>
+    </body>
+</html>
+```
+
+See [`$config_overwrite`](../../programmers/api-variables/variable-config-overwrite.md) to create arrays
+of config file variables.
+
+See also the [config files](../config-files.md) page, [config variables](../language-variables/language-config-variables.md) page,
+[`$config_dir`](../../programmers/api-variables/variable-config-dir.md),
+[`getConfigVars()`](../../programmers/api-functions/api-get-config-vars.md) and
+[`configLoad()`](../../programmers/api-functions/api-config-load.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-debug.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-debug.md
new file mode 100644
index 000000000..29485d549
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-debug.md
@@ -0,0 +1,17 @@
+# {debug}
+
+`{debug}` dumps the debug console to the page. This works regardless of
+the [debug](../chapter-debugging-console.md) settings in the php script.
+Since this gets executed at runtime, this is only able to show the
+[assigned](../../programmers/api-functions/api-assign.md) variables; not the templates that are in use.
+However, you can see all the currently available variables within the
+scope of a template.
+
+If caching is enabled and a page is loaded from cache `{debug}` does
+show only the variables which assigned for the cached page.
+
+In order to see also the variables which have been locally assigned
+within the template it does make sense to place the `{debug}` tag at the
+end of the template.
+
+See also the [debugging console page](../chapter-debugging-console.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-extends.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-extends.md
new file mode 100644
index 000000000..06241d93b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-extends.md
@@ -0,0 +1,37 @@
+# {extends}
+
+`{extends}` tags are used in child templates in template inheritance for
+extending parent templates. For details see section of [Template
+Inheritance](../../api/inheritance.md).
+
+-   The `{extends}` tag must be on the first line of the template.
+
+-   If a child template extends a parent template with the `{extends}`
+    tag it may contain only `{block}` tags. Any other template content
+    is ignored.
+
+-   Use the syntax for [template resources](../../api/resources.md) to extend files
+    outside the [`$template_dir`](../../programmers/api-variables/variable-template-dir.md) directory.
+
+## Attributes
+
+| Attribute | Required | Description                                     |
+|-----------|----------|-------------------------------------------------|
+| file      | Yes      | The name of the template file which is extended |
+
+> **Note**
+>
+> When extending a variable parent like `{extends file=$parent_file}`,
+> make sure you include `$parent_file` in the
+> [`$compile_id`](../../programmers/api-variables/variable-compile-id.md). Otherwise, Smarty cannot
+> distinguish between different `$parent_file`s.
+
+## Examples
+
+```smarty
+{extends file='parent.tpl'}
+{extends 'parent.tpl'}  {* short-hand *}
+```
+
+See also [Template Inheritance](../../api/inheritance.md)
+and [`{block}`](./language-function-block.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-for.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-for.md
new file mode 100644
index 000000000..619b61efe
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-for.md
@@ -0,0 +1,91 @@
+# {for}
+
+The `{for}{forelse}` tag is used to create simple loops. The following different formats are supported:
+
+-   `{for $var=$start to $end}` simple loop with step size of 1.
+
+-   `{for $var=$start to $end step $step}` loop with individual step
+    size.
+
+`{forelse}` is executed when the loop is not iterated.
+
+## Attributes
+
+| Attribute | Required | Description                    |
+|-----------|----------|--------------------------------|
+| max       | No       | Limit the number of iterations |
+
+## Option Flags
+
+| Name    | Description                          |
+|---------|--------------------------------------|
+| nocache | Disables caching of the `{for}` loop |
+
+## Examples
+
+```smarty
+<ul>
+    {for $foo=1 to 3}
+        <li>{$foo}</li>
+    {/for}
+</ul>
+```
+      
+The above example will output:
+
+```html
+<ul>
+    <li>1</li>
+    <li>2</li>
+    <li>3</li>
+</ul>
+```
+      
+```php
+<?php
+$smarty->assign('to',10);
+```
+    
+```smarty
+<ul>
+    {for $foo=3 to $to max=3}
+        <li>{$foo}</li>
+    {/for}
+</ul>
+```
+
+The above example will output:
+
+```html
+<ul>
+    <li>3</li>
+    <li>4</li>
+    <li>5</li>
+</ul>
+```
+
+```php
+<?php
+$smarty->assign('start',10);
+$smarty->assign('to',5);
+```
+
+```smarty
+<ul>
+    {for $foo=$start to $to}
+        <li>{$foo}</li>
+    {forelse}
+      no iteration
+    {/for}
+</ul>
+```
+
+The above example will output:
+
+```
+   no iteration
+```
+      
+See also [`{foreach}`](./language-function-foreach.md),
+[`{section}`](./language-function-section.md) and
+[`{while}`](./language-function-while.md)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-foreach.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-foreach.md
new file mode 100644
index 000000000..38d151169
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-foreach.md
@@ -0,0 +1,389 @@
+# {foreach},{foreachelse}
+
+`{foreach}` is used for looping over arrays of data. `{foreach}` has a
+simpler and cleaner syntax than the
+[`{section}`](./language-function-section.md) loop, and can also loop over
+associative arrays.
+
+## Option Flags
+
+| Name    | Description                              |
+|---------|------------------------------------------|
+| nocache | Disables caching of the `{foreach}` loop |
+
+
+## Examples
+
+```smarty
+
+{foreach $arrayvar as $itemvar}
+  {$itemvar|escape}
+{/foreach}
+
+{foreach $arrayvar as $keyvar=>$itemvar}
+  {$keyvar}: {$itemvar|escape}
+{/foreach}
+
+```
+> **Note**
+>
+> This foreach syntax does not accept any named attributes. This syntax
+> is new to Smarty 3, however the Smarty 2.x syntax
+> `{foreach from=$myarray key="mykey" item="myitem"}` is still
+> supported.
+
+-   `{foreach}` loops can be nested.
+
+-   The `array` variable, usually an array of values, determines the
+    number of times `{foreach}` will loop. You can also pass an integer
+    for arbitrary loops.
+
+-   `{foreachelse}` is executed when there are no values in the `array`
+    variable.
+
+-   `{foreach}` properties are [`@index`](#index),
+    [`@iteration`](#iteration),
+    [`@first`](#first),
+    [`@last`](#last),
+    [`@show`](#show),
+    [`@total`](#total).
+
+-   `{foreach}` constructs are [`{break}`](#break),
+    [`{continue}`](#continue).
+
+-   Instead of specifying the `key` variable you can access the current
+    key of the loop item by `{$item@key}` (see examples below).
+
+> **Note**
+>
+> The `$var@property` syntax is new to Smarty 3, however when using the
+> Smarty 2 `{foreach from=$myarray key="mykey" item="myitem"}` style
+> syntax, the `$smarty.foreach.name.property` syntax is still supported.
+
+> **Note**
+>
+> Although you can retrieve the array key with the syntax
+> `{foreach $myArray as $myKey => $myValue}`, the key is always
+> available as `$myValue@key` within the foreach loop.
+
+```php
+<?php
+$arr = array('red', 'green', 'blue');
+$smarty->assign('myColors', $arr);
+```
+    
+Template to output `$myColors` in an un-ordered list
+
+```smarty
+<ul>
+    {foreach $myColors as $color}
+        <li>{$color}</li>
+    {/foreach}
+</ul>
+```
+      
+The above example will output:
+
+```html
+<ul>
+    <li>red</li>
+    <li>green</li>
+    <li>blue</li>
+</ul>
+```
+
+```php      
+<?php
+$people = array('fname' => 'John', 'lname' => 'Doe', 'email' => 'j.doe@example.com');
+$smarty->assign('myPeople', $people);
+```
+
+Template to output `$myArray` as key/value pairs.
+
+```smarty
+<ul>
+    {foreach $myPeople as $value}
+       <li>{$value@key}: {$value}</li>
+    {/foreach}
+</ul>
+```
+     
+The above example will output:
+
+```html
+<ul>
+    <li>fname: John</li>
+    <li>lname: Doe</li>
+    <li>email: j.doe@example.com</li>
+</ul>
+```
+      
+Assign an array to Smarty, the key contains the key for each looped
+value.
+
+```php
+<?php
+ $smarty->assign(
+    'contacts', 
+    [
+         ['phone' => '555-555-1234', 'fax' => '555-555-5678', 'cell' => '555-555-0357'],
+         ['phone' => '800-555-4444', 'fax' => '800-555-3333', 'cell' => '800-555-2222'],
+     ]
+ );
+```
+
+The template to output `$contact`.
+
+```smarty
+{* key always available as a property *}
+{foreach $contacts as $contact}
+  {foreach $contact as $value}
+    {$value@key}: {$value}
+  {/foreach}
+{/foreach}
+
+{* accessing key the PHP syntax alternate *}
+{foreach $contacts as $contact}
+  {foreach $contact as $key => $value}
+    {$key}: {$value}
+  {/foreach}
+{/foreach}
+```
+      
+Either of the above examples will output:
+
+```
+  phone: 555-555-1234
+  fax: 555-555-5678
+  cell: 555-555-0357
+  phone: 800-555-4444
+  fax: 800-555-3333
+  cell: 800-555-2222
+```
+      
+A database (PDO) example of looping over search results. This example is
+looping over a PHP iterator instead of an array().
+
+```php
+<?php 
+  use Smarty\Smarty;
+
+  $smarty = new Smarty; 
+
+  $dsn = 'mysql:host=localhost;dbname=test'; 
+  $login = 'test'; 
+  $passwd = 'test'; 
+
+  // setting PDO to use buffered queries in mysql is 
+  // important if you plan on using multiple result cursors 
+  // in the template. 
+
+  $db = new PDO($dsn, $login, $passwd, array( 
+     PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true)); 
+
+  $res = $db->prepare("select * from users"); 
+  $res->execute(); 
+  $res->setFetchMode(PDO::FETCH_LAZY); 
+
+  // assign to smarty 
+  $smarty->assign('res',$res); 
+
+  $smarty->display('index.tpl');?>
+```
+
+```smarty
+{foreach $res as $r} 
+  {$r.id} 
+  {$r.name}
+{foreachelse}
+  .. no results .. 
+{/foreach}
+```
+
+The above is assuming the results contain the columns named `id` and
+`name`.
+
+What is the advantage of an iterator vs. looping over a plain old array?
+With an array, all the results are accumulated into memory before being
+looped. With an iterator, each result is loaded/released within the
+loop. This saves processing time and memory, especially for very large
+result sets.
+
+## @index
+
+`index` contains the current array index, starting with zero.
+
+```smarty
+{* output empty row on the 4th iteration (when index is 3) *}
+<table>
+    {foreach $items as $i}
+      {if $i@index eq 3}
+         {* put empty table row *}
+         <tr><td>nbsp;</td></tr>
+      {/if}
+      <tr><td>{$i.label}</td></tr>
+    {/foreach}
+</table>
+```
+      
+
+## @iteration
+
+`iteration` contains the current loop iteration and always starts at
+one, unlike [`index`](#index). It is incremented by one
+on each iteration.
+
+The *"is div by"* operator can be used to detect a specific iteration.
+Here we bold-face the name every 4th iteration.
+
+```smarty
+{foreach $myNames as $name}
+  {if $name@iteration is div by 4}
+    <b>{$name}</b>
+  {/if}
+  {$name}
+{/foreach}
+```
+
+The *"is even by"* and *"is odd by"* operators can be used to
+alternate something every so many iterations. Choosing between even or
+odd rotates which one starts. Here we switch the font color every 3rd
+iteration.
+
+```smarty
+ {foreach $myNames as $name}
+   {if $name@index is even by 3}
+     <span style="color: #000">{$name}</span>
+   {else}
+     <span style="color: #eee">{$name}</span>
+   {/if}
+ {/foreach}
+```
+
+This will output something similar to this:
+
+```html
+<span style="color: #000">...</span>
+<span style="color: #000">...</span>
+<span style="color: #000">...</span>
+<span style="color: #eee">...</span>
+<span style="color: #eee">...</span>
+<span style="color: #eee">...</span>
+<span style="color: #000">...</span>
+<span style="color: #000">...</span>
+<span style="color: #000">...</span>
+<span style="color: #eee">...</span>
+<span style="color: #eee">...</span>
+<span style="color: #eee">...</span>
+...
+```
+       
+## @first
+
+`first` is TRUE if the current `{foreach}` iteration is the initial one.
+Here we display a table header row on the first iteration.
+
+```smarty
+{* show table header at first iteration *}
+<table>
+    {foreach $items as $i}
+      {if $i@first}
+        <tr>
+          <th>key</td>
+          <th>name</td>
+        </tr>
+      {/if}
+      <tr>
+        <td>{$i@key}</td>
+        <td>{$i.name}</td>
+      </tr>
+    {/foreach}
+</table>
+```
+      
+## @last
+
+`last` is set to TRUE if the current `{foreach}` iteration is the final
+one. Here we display a horizontal rule on the last iteration.
+
+```smarty
+{* Add horizontal rule at end of list *}
+{foreach $items as $item}
+  <a href="#{$item.id}">{$item.name}</a>{if $item@last}<hr>{else},{/if}
+{foreachelse}
+  ... no items to loop ...
+{/foreach}
+```
+      
+## @show
+
+The show `show` property can be used after the execution of a
+`{foreach}` loop to detect if data has been displayed or not. `show` is
+a boolean value.
+
+```smarty
+<ul>
+    {foreach $myArray as $name}
+        <li>{$name}</li>
+    {/foreach}
+</ul>
+{if $name@show} do something here if the array contained data {/if}
+```
+
+## @total
+
+`total` contains the number of iterations that this `{foreach}` will
+loop. This can be used inside or after the `{foreach}`.
+
+```smarty
+{* show number of rows at end *}
+{foreach $items as $item}
+  {$item.name}<hr/>
+  {if $item@last}
+    <div id="total">{$item@total} items</div>
+  {/if}
+{foreachelse}
+ ... no items to loop ...
+{/foreach}
+```
+
+See also [`{section}`](./language-function-section.md),
+[`{for}`](./language-function-for.md) and
+[`{while}`](./language-function-while.md)
+
+## {break}
+
+`{break}` aborts the iteration of the array
+
+```smarty     
+  {$data = [1,2,3,4,5]}
+  {foreach $data as $value}
+    {if $value == 3}
+      {* abort iterating the array *}
+      {break}
+    {/if}
+    {$value}
+  {/foreach}
+  {*
+    prints: 1 2
+  *}
+``` 
+       
+## {continue}
+
+`{continue}` leaves the current iteration and begins with the next
+iteration.
+
+```smarty
+  {$data = [1,2,3,4,5]}
+  {foreach $data as $value}
+    {if $value == 3}
+      {* skip this iteration *}
+      {continue}
+    {/if}
+    {$value}
+  {/foreach}
+  {*
+    prints: 1 2 4 5
+  *}
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-function.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-function.md
new file mode 100644
index 000000000..cee6762c8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-function.md
@@ -0,0 +1,89 @@
+# {function}
+
+`{function}` is used to create functions within a template and call them
+just like a plugin function. Instead of writing a plugin that generates
+presentational content, keeping it in the template is often a more
+manageable choice. It also simplifies data traversal, such as deeply
+nested menus.
+
+> **Note**
+>
+> Template functions are defined global. Since the Smarty compiler is a
+> single-pass compiler, The [`{call}`](#language.function.call) tag must
+> be used to call a template function defined externally from the given
+> template. Otherwise, you can directly use the function as
+> `{funcname ...}` in the template.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                   |
+|----------------|----------|---------------------------------------------------------------|
+| name           | Yes      | The name of the template function                             |
+| \[var \...\]   | No       | default variable value to pass local to the template function |
+
+-   The `{function}` tag must have the `name` attribute which contains
+    the name of the template function. A tag with this name can be
+    used to call the template function.
+
+-   Default values for variables can be passed to the template function
+    as [attributes](../language-basic-syntax/language-syntax-attributes.md). Like in PHP function
+    declarations you can only use scalar values as default. The default
+    values can be overwritten when the template function is being
+    called.
+
+-   You can use all variables from the calling template inside the
+    template function. Changes to variables or new created variables
+    inside the template function have local scope and are not visible
+    inside the calling template after the template function is executed.
+
+
+
+> **Note**
+>
+> You can pass any number of parameter to the template function when it
+> is called. The parameter variables must not be declared in the
+> `{funcname ...}` tag unless you what to use default values. Default
+> values must be scalar and can not be variable. Variables must be
+> passed when the template is called.
+
+## Examples
+
+```smarty
+{* define the function *}
+{function name=menu level=0}
+{function menu level=0}          {* short-hand *}
+  <ul class="level{$level}">
+  {foreach $data as $entry}
+    {if is_array($entry)}
+      <li>{$entry@key}</li>
+      {menu data=$entry level=$level+1}
+    {else}
+      <li>{$entry}</li>
+    {/if}
+  {/foreach}
+  </ul>
+{/function}
+
+{* create an array to demonstrate *}
+{$menu = ['item1','item2','item3' => ['item3-1','item3-2','item3-3' =>
+['item3-3-1','item3-3-2']],'item4']}
+
+{* run the array through the function *}
+{menu data=$menu}
+```
+
+Will generate the following output
+
+```
+* item1
+* item2
+* item3
+      o item3-1
+      o item3-2
+      o item3-3
+            + item3-3-1
+            + item3-3-2
+* item4
+```
+      
+See also [`{call}`](./language-function-call.md)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-if.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-if.md
new file mode 100644
index 000000000..eb00cfda3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-if.md
@@ -0,0 +1,92 @@
+# {if},{elseif},{else}
+
+`{if}` statements in Smarty have much the same flexibility as PHP
+[if](https://www.php.net/if) statements, with a few added features for the
+template engine. Every `{if}` must be paired with a matching `{/if}`.
+`{else}` and `{elseif}` are also permitted. All [operators](../language-basic-syntax/language-syntax-operators.md) are recognized, such as *==*,
+*\|\|*, *or*, *&&*, *and*, etc and you can use modifiers as functions, such as *is_array()*.
+
+## Examples
+```smarty
+{if $name eq 'Fred'}
+    Welcome Sir.
+{elseif $name eq 'Wilma'}
+    Welcome Ma'am.
+{else}
+    Welcome, whatever you are.
+{/if}
+
+{* an example with "or" logic *}
+{if $name eq 'Fred' or $name eq 'Wilma'}
+   ...
+{/if}
+
+{* same as above *}
+{if $name == 'Fred' || $name == 'Wilma'}
+   ...
+{/if}
+
+
+{* parenthesis are allowed *}
+{if ( $amount < 0 or $amount > 1000 ) and $volume >= #minVolAmt#}
+   ...
+{/if}
+
+
+{* you can also embed php function calls *}
+{if count($var) gt 0}
+   ...
+{/if}
+
+{* check for array. *}
+{if is_array($foo) }
+   .....
+{/if}
+
+{* check for not null. *}
+{if isset($foo) }
+   .....
+{/if}
+
+
+{* test if values are even or odd *}
+{if $var is even}
+   ...
+{/if}
+{if $var is odd}
+   ...
+{/if}
+{if $var is not odd}
+   ...
+{/if}
+
+
+{* test if var is divisible by 4 *}
+{if $var is div by 4}
+   ...
+{/if}
+
+
+{*
+  test if var is even, grouped by two. i.e.,
+  0=even, 1=even, 2=odd, 3=odd, 4=even, 5=even, etc.
+*}
+{if $var is even by 2}
+   ...
+{/if}
+
+{* 0=even, 1=even, 2=even, 3=odd, 4=odd, 5=odd, etc. *}
+{if $var is even by 3}
+   ...
+{/if}
+ 
+{if isset($name) && $name == 'Blog'}
+     {* do something *}
+{elseif $name == $foo}
+    {* do something *}
+{/if}
+
+{if is_array($foo) && count($foo) > 0}
+    {* do a foreach loop *}
+{/if}
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-include.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-include.md
new file mode 100644
index 000000000..0710db7d8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-include.md
@@ -0,0 +1,187 @@
+# {include}
+
+`{include}` tags are used for including other templates in the current
+template. Any variables available in the current template are also
+available within the included template.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                                |
+|----------------|----------|--------------------------------------------------------------------------------------------|
+| file           | Yes      | The name of the template file to include                                                   |
+| assign         | No       | The name of the variable that the output of include will be assigned to                    |
+| cache_lifetime | No       | Enable caching of this subtemplate with an individual cache lifetime                       |
+| compile_id     | No       | Compile this subtemplate with an individual compile_id                                     |
+| cache_id       | No       | Enable caching of this subtemplate with an individual cache_id                             |
+| scope          | No       | Define the scope of all in the subtemplate assigned variables: 'parent','root' or 'global' |
+| \[var \...\]   | No       | variable to pass local to template                                                         |
+
+
+-   The `{include}` tag must have the `file` attribute which contains
+    the template resource path.
+
+-   Setting the optional `assign` attribute specifies the template
+    variable that the output of `{include}` is assigned to, instead of
+    being displayed. Similar to [`{assign}`](./language-function-assign.md).
+
+-   Variables can be passed to included templates as
+    [attributes](../language-basic-syntax/language-syntax-attributes.md). Any variables explicitly
+    passed to an included template are only available within the scope
+    of the included file. Attribute variables override current template
+    variables, in the case when they are named the same.
+
+-   You can use all variables from the including template inside the
+    included template. But changes to variables or new created variables
+    inside the included template have local scope and are not visible
+    inside the including template after the `{include}` statement. This
+    default behaviour can be changed for all variables assigned in the
+    included template by using the scope attribute at the `{include}`
+    statement or for individual variables by using the scope attribute
+    at the [`{assign}`](./language-function-assign.md) statement. The later
+    is useful to return values from the included template to the
+    including template.
+
+-   Use the syntax for [template resources](../../api/resources.md) to `{include}`
+    files outside of the [`$template_dir`](../../programmers/api-variables/variable-template-dir.md)
+    directory.
+
+## Option Flags
+
+| Name    | Description                                                                          |
+|---------|--------------------------------------------------------------------------------------|
+| nocache | Disables caching of this subtemplate                                                 |
+| caching | Enable caching of this subtemplate                                                   |
+| inline  | If set, merge the compile-code of the subtemplate into the compiled calling template |
+
+## Examples
+```smarty
+<html>
+    <head>
+      <title>{$title}</title>
+    </head>
+    <body>
+    {include file='page_header.tpl'}
+
+    {* body of template goes here, the $tpl_name variable
+       is replaced with a value eg 'contact.tpl'
+    *}
+    {include file="$tpl_name.tpl"}
+
+    {* using shortform file attribute *}
+    {include 'page_footer.tpl'}
+    </body>
+</html>
+```
+
+```smarty
+
+{include 'links.tpl' title='Newest links' links=$link_array}
+{* body of template goes here *}
+{include 'footer.tpl' foo='bar'}
+
+```
+
+The template above includes the example `links.tpl` below
+
+```smarty
+<div id="box">
+    <h3>{$title}</h3>
+    <ul>
+        {foreach from=$links item=l}
+            .. do stuff  ...
+        {/foreach}
+    </ul>
+</div>
+```
+Variables assigned in the included template will be seen in the
+including template.
+
+```smarty
+{include 'sub_template.tpl' scope=parent}
+...
+{* display variables assigned in sub_template *}
+{$foo}<br>
+{$bar}<br>
+...
+```
+      
+The template above includes the example `sub_template.tpl` below
+
+```smarty
+...
+{assign var=foo value='something'}
+{assign var=bar value='value'}
+...
+```
+
+The included template will not be cached.
+
+```smarty
+{include 'sub_template.tpl' nocache}
+...
+```
+      
+In this example included template will be cached with an individual
+cache lifetime of 500 seconds.
+
+```smarty
+{include 'sub_template.tpl' cache_lifetime=500}
+...
+```
+      
+In this example included template will be cached independent of the
+global caching setting.
+
+```smarty
+{include 'sub_template.tpl' caching}
+...
+```
+      
+This example assigns the contents of `nav.tpl` to the `$navbar`
+variable, which is then output at both the top and bottom of the page.
+
+```smarty     
+<body>
+  {include 'nav.tpl' assign=navbar}
+  {include 'header.tpl' title='Smarty is cool'}
+    {$navbar}
+    {* body of template goes here *}
+    {$navbar}
+  {include 'footer.tpl'}
+</body>
+```
+       
+This example includes another template relative to the directory of the
+current template.
+
+```smarty
+{include 'template-in-a-template_dir-directory.tpl'}
+{include './template-in-same-directory.tpl'}
+{include '../template-in-parent-directory.tpl'}
+```
+        
+```smarty
+{* absolute filepath *}
+{include file='/usr/local/include/templates/header.tpl'}
+
+{* absolute filepath (same thing) *}
+{include file='file:/usr/local/include/templates/header.tpl'}
+
+{* windows absolute filepath (MUST use "file:" prefix) *}
+{include file='file:C:/www/pub/templates/header.tpl'}
+
+{* include from template resource named "db" *}
+{include file='db:header.tpl'}
+
+{* include a $variable template - eg $module = 'contacts' *}
+{include file="$module.tpl"}
+
+{* wont work as its single quotes ie no variable substitution *}
+{include file='$module.tpl'}
+
+{* include a multi $variable template - eg amber/links.view.tpl *}
+{include file="$style_dir/$module.$view.tpl"}
+```
+      
+See also [template resources](../../api/resources.md) and
+[componentized templates](../../appendixes/tips.md#componentized-templates).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-insert.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-insert.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-ldelim.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-ldelim.md
new file mode 100644
index 000000000..05bc8ecca
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-ldelim.md
@@ -0,0 +1,51 @@
+# {ldelim}, {rdelim}
+
+`{ldelim}` and `{rdelim}` are used for [escaping](../language-basic-syntax/language-escaping.md)
+template delimiters, by default **{** and **}**. You can also use
+[`{literal}{/literal}`](./language-function-literal.md) to escape blocks of
+text eg Javascript or CSS. See also the complementary
+[`{$smarty.ldelim}`](../../designers/language-basic-syntax/language-escaping.md).
+
+```smarty
+{* this will print literal delimiters out of the template *}
+
+{ldelim}funcname{rdelim} is how functions look in Smarty!
+```
+
+The above example will output:
+
+```
+{funcname} is how functions look in Smarty!
+```
+
+Another example with some Javascript
+
+```smarty
+<script>
+function foo() {ldelim}
+    ... code ...
+{rdelim}
+</script>
+```
+
+will output
+
+```html
+<script>
+function foo() {
+    .... code ...
+}
+</script>
+```
+
+```smarty
+<script>
+    function myJsFunction(){ldelim}
+        alert("The server name\n{$smarty.server.SERVER_NAME|escape:javascript}\n{$smarty.server.SERVER_ADDR|escape:javascript}");
+    {rdelim}
+</script>
+<a href="javascript:myJsFunction()">Click here for Server Info</a>
+```
+
+See also [`{literal}`](./language-function-literal.md) and [escaping Smarty
+parsing](../language-basic-syntax/language-escaping.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-literal.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-literal.md
new file mode 100644
index 000000000..0253f260e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-literal.md
@@ -0,0 +1,34 @@
+# {literal}
+
+`{literal}` tags allow a block of data to be taken literally. This is
+typically used around Javascript or stylesheet blocks where {curly
+braces} would interfere with the template
+[delimiter](../../designers/language-basic-syntax/language-escaping.md) syntax. Anything within
+`{literal}{/literal}` tags is not interpreted, but displayed as-is. If
+you need template tags embedded in a `{literal}` block, consider using
+[`{ldelim}{rdelim}`](./language-function-ldelim.md) to escape the individual
+delimiters instead.
+
+> **Note**
+>
+> `{literal}{/literal}` tags are normally not necessary, as Smarty
+> ignores delimiters that are surrounded by whitespace. Be sure your
+> javascript and CSS curly braces are surrounded by whitespace. This is
+> new behavior to Smarty 3.
+
+```smarty
+<script>
+   // the following braces are ignored by Smarty
+   // since they are surrounded by whitespace
+   function myFoo {
+     alert('Foo!');
+   }
+   // this one will need literal escapement
+   {literal}
+     function myBar {alert('Bar!');}
+   {/literal}
+</script>
+```
+
+See also [`{ldelim} {rdelim}`](./language-function-ldelim.md) and the
+[escaping Smarty parsing](../language-basic-syntax/language-escaping.md) page.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-nocache.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-nocache.md
new file mode 100644
index 000000000..7997ecfb6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-nocache.md
@@ -0,0 +1,20 @@
+# {nocache}
+
+`{nocache}` is used to disable caching of a template section. Every
+`{nocache}` must be paired with a matching `{/nocache}`.
+
+> **Note**
+>
+> Be sure any variables used within a non-cached section are also
+> assigned from PHP when the page is loaded from the cache.
+
+```smarty
+Today's date is
+{nocache}
+{$smarty.now|date_format}
+{/nocache}
+```
+   
+The above code will output the current date on a cached page.
+
+See also the [caching section](../../api/caching/basics.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-section.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-section.md
new file mode 100644
index 000000000..afa6366cd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-section.md
@@ -0,0 +1,610 @@
+# {section}, {sectionelse}
+
+A `{section}` is for looping over **sequentially indexed arrays of
+data**, unlike [`{foreach}`](./language-function-foreach.md) which is used
+to loop over a **single associative array**. Every `{section}` tag must
+be paired with a closing `{/section}` tag.
+
+> **Note**
+>
+> The [`{foreach}`](./language-function-foreach.md) loop can do everything a
+> {section} loop can do, and has a simpler and easier syntax. It is
+> usually preferred over the {section} loop.
+
+> **Note**
+>
+> {section} loops cannot loop over associative arrays, they must be
+> numerically indexed, and sequential (0,1,2,\...). For associative
+> arrays, use the [`{foreach}`](./language-function-foreach.md) loop.
+
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                                                                                                                                                                                                                                                                                                                          |
+|----------------|----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| name           | Yes      | The name of the section                                                                                                                                                                                                                                                                                                                                                              |
+| loop           | Yes      | Value to determine the number of loop iterations                                                                                                                                                                                                                                                                                                                                     |
+| start          | No       | The index position that the section will begin looping. If the value is negative, the start position is calculated from the end of the array. For example, if there are seven values in the loop array and start is -2, the start index is 5. Invalid values (values outside of the length of the loop array) are automatically truncated to the closest valid value. Defaults to 0. |
+| step           | No       | The step value that will be used to traverse the loop array. For example, step=2 will loop on index 0, 2, 4, etc. If step is negative, it will step through the array backwards. Defaults to 1.                                                                                                                                                                                      |
+| max            | No       | Sets the maximum number of times the section will loop.                                                                                                                                                                                                                                                                                                                              |
+| show           | No       | Determines whether to show this section (defaults to true)                                                                                                                                                                                                                                                                                                                           |
+
+## Option Flags
+
+| Name    | Description                              |
+|---------|------------------------------------------|
+| nocache | Disables caching of the `{section}` loop |
+
+-   Required attributes are `name` and `loop`.
+
+-   The `name` of the `{section}` can be anything you like, made up of
+    letters, numbers and underscores, like [PHP
+    variables](https://www.php.net/language.variables).
+
+-   {section}'s can be nested, and the nested `{section}` names must be
+    unique from each other.
+
+-   The `loop` attribute, usually an array of values, determines the
+    number of times the `{section}` will loop. You can also pass an
+    integer as the loop value.
+
+-   When printing a variable within a `{section}`, the `{section}`
+    `name` must be given next to variable name within \[brackets\].
+
+-   `{sectionelse}` is executed when there are no values in the loop
+    variable.
+
+-   A `{section}` also has its own variables that handle `{section}`
+    properties. These properties are accessible as:
+    [`{$smarty.section.name.property}`](../language-variables/language-variables-smarty.md#smartysection-languagevariablessmartyloops)
+    where "name" is the attribute `name`.
+
+-   `{section}` properties are [`index`](#index),
+    [`index_prev`](#index_prev),
+    [`index_next`](#index_next),
+    [`iteration`](#iteration),
+    [`first`](#first),
+    [`last`](#last),
+    [`rownum`](#rownum),
+    [`loop`](#loop), [`show`](#show),
+    [`total`](#total).
+
+[`assign()`](../../programmers/api-functions/api-assign.md) an array to Smarty
+
+## Examples
+
+```php
+<?php
+$data = [1000, 1001, 1002];
+$smarty->assign('custid', $data);
+```
+
+The template that outputs the array
+
+```smarty
+{* this example will print out all the values of the $custid array *}
+{section name=customer loop=$custid}
+{section customer $custid} {* short-hand *}
+  id: {$custid[customer]}<br />
+{/section}
+<hr />
+{*  print out all the values of the $custid array reversed *}
+{section name=foo loop=$custid step=-1}
+{section foo $custid step=-1} {* short-hand *}
+  {$custid[foo]}<br />
+{/section}
+```
+      
+The above example will output:
+
+```html
+id: 1000<br />
+id: 1001<br />
+id: 1002<br />
+<hr />
+id: 1002<br />
+id: 1001<br />
+id: 1000<br />
+```
+      
+```smarty
+{section name=foo start=10 loop=20 step=2}
+  {$smarty.section.foo.index}
+{/section}
+<hr />
+{section name=bar loop=21 max=6 step=-2}
+  {$smarty.section.bar.index}
+{/section}
+```
+
+The above example will output:
+
+```html
+10 12 14 16 18
+<hr />
+20 18 16 14 12 10
+```
+
+The `name` of the `{section}` can be anything you like, see [PHP
+variables](https://www.php.net/language.variables). It is used to reference
+the data within the `{section}`.
+
+```smarty
+{section name=anything loop=$myArray}
+  {$myArray[anything].foo}
+  {$name[anything]}
+  {$address[anything].bar}
+{/section}
+```
+
+This is an example of printing an associative array of data with a
+`{section}`. Following is the php script to assign the `$contacts` array
+to Smarty.
+
+```php
+<?php
+$data = [
+      ['name' => 'John Smith', 'home' => '555-555-5555',
+            'cell' => '666-555-5555', 'email' => 'john@myexample.com'],
+      ['name' => 'Jack Jones', 'home' => '777-555-5555',
+            'cell' => '888-555-5555', 'email' => 'jack@myexample.com'],
+      ['name' => 'Jane Munson', 'home' => '000-555-5555',
+            'cell' => '123456', 'email' => 'jane@myexample.com']
+];
+$smarty->assign('contacts',$data);
+```
+    
+The template to output `$contacts`
+
+```smarty
+{section name=customer loop=$contacts}
+<p>
+  name: {$contacts[customer].name}<br />
+  home: {$contacts[customer].home}<br />
+  cell: {$contacts[customer].cell}<br />
+  e-mail: {$contacts[customer].email}
+</p>
+{/section}
+```
+
+The above example will output:
+
+```html
+<p>
+  name: John Smith<br />
+  home: 555-555-5555<br />
+  cell: 666-555-5555<br />
+  e-mail: john@myexample.com
+</p>
+<p>
+  name: Jack Jones<br />
+  home phone: 777-555-5555<br />
+  cell phone: 888-555-5555<br />
+  e-mail: jack@myexample.com
+</p>
+<p>
+  name: Jane Munson<br />
+  home phone: 000-555-5555<br />
+  cell phone: 123456<br />
+  e-mail: jane@myexample.com
+</p>
+```
+      
+This example assumes that `$custid`, `$name` and `$address` are all
+arrays containing the same number of values. First the php script that
+assign's the arrays to Smarty.
+
+```php
+<?php
+
+$id = [1001,1002,1003];
+$smarty->assign('custid',$id);
+
+$fullnames = ['John Smith','Jack Jones','Jane Munson'];
+$smarty->assign('name',$fullnames);
+
+$addr = ['253 Abbey road', '417 Mulberry ln', '5605 apple st'];
+$smarty->assign('address',$addr);
+```
+
+The `loop` variable only determines the number of times to loop. You can
+access ANY variable from the template within the `{section}`. This is
+useful for looping multiple arrays. You can pass an array which will
+determine the loop count by the array size, or you can pass an integer
+to specify the number of loops.
+
+```smarty
+{section name=customer loop=$custid}
+<p>
+  id: {$custid[customer]}<br />
+  name: {$name[customer]}<br />
+  address: {$address[customer]}
+</p>
+{/section}
+```
+      
+The above example will output:
+
+```html
+<p>
+  id: 1000<br />
+  name: John Smith<br />
+  address: 253 Abbey road
+</p>
+<p>
+  id: 1001<br />
+  name: Jack Jones<br />
+  address: 417 Mulberry ln
+</p>
+<p>
+  id: 1002<br />
+  name: Jane Munson<br />
+  address: 5605 apple st
+</p>
+```
+      
+{section}'s can be nested as deep as you like. With nested
+{section}'s, you can access complex data structures, such as
+multidimensional arrays. This is an example `.php` script that
+assigns the arrays.
+
+```php
+<?php
+
+$id = [1001,1002,1003];
+$smarty->assign('custid',$id);
+
+$fullnames = ['John Smith','Jack Jones','Jane Munson'];
+$smarty->assign('name',$fullnames);
+
+$addr = ['253 N 45th', '417 Mulberry ln', '5605 apple st'];
+$smarty->assign('address',$addr);
+
+$types = [
+           [ 'home phone', 'cell phone', 'e-mail'],
+           [ 'home phone', 'web'],
+           [ 'cell phone']
+         ];
+$smarty->assign('contact_type', $types);
+
+$info = [
+           ['555-555-5555', '666-555-5555', 'john@myexample.com'],
+           [ '123-456-4', 'www.example.com'],
+           [ '0457878']
+        ];
+$smarty->assign('contact_info', $info);
+```
+      
+In this template, *$contact_type\[customer\]* is an array of contact
+types for the current customer.
+
+```smarty
+{section name=customer loop=$custid}
+<hr>
+  id: {$custid[customer]}<br />
+  name: {$name[customer]}<br />
+  address: {$address[customer]}<br />
+  {section name=contact loop=$contact_type[customer]}
+    {$contact_type[customer][contact]}: {$contact_info[customer][contact]}<br />
+  {/section}
+{/section}
+```
+      
+The above example will output:
+
+```html
+<hr>
+  id: 1000<br />
+  name: John Smith<br />
+  address: 253 N 45th<br />
+    home phone: 555-555-5555<br />
+    cell phone: 666-555-5555<br />
+    e-mail: john@myexample.com<br />
+<hr>
+  id: 1001<br />
+  name: Jack Jones<br />
+  address: 417 Mulberry ln<br />
+    home phone: 123-456-4<br />
+    web: www.example.com<br />
+<hr>
+  id: 1002<br />
+  name: Jane Munson<br />
+  address: 5605 apple st<br />
+    cell phone: 0457878<br />
+```
+      
+Results of a database search (eg ADODB or PEAR) are assigned to Smarty
+
+```php      
+<?php
+$sql = 'select id, name, home, cell, email from contacts '
+      ."where name like '$foo%' ";
+$smarty->assign('contacts', $db->getAll($sql));
+```
+
+The template to output the database result in a HTML table
+
+```smarty
+<table>
+    <tr><th>&nbsp;</th><th>Name</th><th>Home</th><th>Cell</th><th>Email</th></tr>
+    {section name=co loop=$contacts}
+      <tr>
+        <td><a href="view.php?id={$contacts[co].id}">view</a></td>
+        <td>{$contacts[co].name}</td>
+        <td>{$contacts[co].home}</td>
+        <td>{$contacts[co].cell}</td>
+        <td>{$contacts[co].email}</td>
+      <tr>
+    {sectionelse}
+      <tr><td colspan="5">No items found</td></tr>
+    {/section}
+</table>
+```
+
+## .index
+`index` contains the current array index, starting with zero or the
+`start` attribute if given. It increments by one or by the `step`
+attribute if given.
+
+> **Note**
+>
+> If the `step` and `start` properties are not modified, then this works
+> the same as the [`iteration`](#iteration) property,
+> except it starts at zero instead of one.
+
+> **Note**
+>
+> `$custid[customer.index]` and `$custid[customer]` are identical.
+
+```smarty
+{section name=customer loop=$custid}
+  {$smarty.section.customer.index} id: {$custid[customer]}<br />
+{/section}
+```
+      
+The above example will output:
+
+```html
+0 id: 1000<br />
+1 id: 1001<br />
+2 id: 1002<br />
+```
+       
+
+## .index_prev
+
+`index_prev` is the previous loop index. On the first loop, this is set to -1.
+
+## .index_next
+
+`index_next` is the next loop index. On the last loop, this is still one
+more than the current index, respecting the setting of the `step`
+attribute, if given.
+
+```php
+<?php
+    $data = [1001,1002,1003,1004,1005];
+    $smarty->assign('rows',$data);
+```
+
+Template to output the above array in a table
+
+```smarty
+{* $rows[row.index] and $rows[row] are identical in meaning *}
+<table>
+  <tr>
+    <th>index</th><th>id</th>
+    <th>index_prev</th><th>prev_id</th>
+    <th>index_next</th><th>next_id</th>
+  </tr>
+{section name=row loop=$rows}
+  <tr>
+    <td>{$smarty.section.row.index}</td><td>{$rows[row]}</td>
+    <td>{$smarty.section.row.index_prev}</td><td>{$rows[row.index_prev]}</td>
+    <td>{$smarty.section.row.index_next}</td><td>{$rows[row.index_next]}</td>
+  </tr>
+{/section}
+</table>
+```
+      
+The above example will output a table containing the following:
+
+```
+    index  id    index_prev prev_id index_next next_id
+    0      1001  -1                 1          1002
+    1      1002  0          1001    2          1003
+    2      1003  1          1002    3          1004
+    3      1004  2          1003    4          1005
+    4      1005  3          1004    5
+```
+       
+## .iteration
+
+`iteration` contains the current loop iteration and starts at one.
+
+> **Note**
+>
+> This is not affected by the `{section}` properties `start`, `step` and
+> `max`, unlike the [`index`](#index) property.
+> `iteration` also starts with one instead of zero unlike `index`.
+> [`rownum`](#rownum) is an alias to `iteration`, they
+> are identical.
+
+```php
+<?php
+// array of 3000 to 3015
+$id = range(3000,3015);
+$smarty->assign('arr', $id);
+```
+
+Template to output every other element of the `$arr` array as `step=2`
+
+```smarty
+{section name=cu loop=$arr start=5 step=2}
+  iteration={$smarty.section.cu.iteration}
+  index={$smarty.section.cu.index}
+  id={$custid[cu]}<br />
+{/section}
+```
+      
+The above example will output:
+
+```html
+iteration=1 index=5 id=3005<br />
+iteration=2 index=7 id=3007<br />
+iteration=3 index=9 id=3009<br />
+iteration=4 index=11 id=3011<br />
+iteration=5 index=13 id=3013<br />
+iteration=6 index=15 id=3015<br />
+```
+
+Another example that uses the `iteration` property to output a table
+header block every five rows.
+
+```smarty
+<table>
+    {section name=co loop=$contacts}
+      {if $smarty.section.co.iteration is div by 5}
+        <tr><th>&nbsp;</th><th>Name</th><th>Home</th><th>Cell</th><th>Email</th></tr>
+      {/if}
+      <tr>
+        <td><a href="view.php?id={$contacts[co].id}">view<a></td>
+        <td>{$contacts[co].name}</td>
+        <td>{$contacts[co].home}</td>
+        <td>{$contacts[co].cell}</td>
+        <td>{$contacts[co].email}</td>
+      <tr>
+    {/section}
+</table>
+```
+
+An example that uses the `index` property to alternate a text color every
+third row.
+
+```smarty
+<table>
+  {section name=co loop=$contacts}
+    {if $smarty.section.co.index is even by 3}
+      <span style="color: #ffffff">{$contacts[co].name}</span>
+    {else}
+      <span style="color: #dddddd">{$contacts[co].name}</span>
+    {/if}
+  {/section}
+</table>
+```
+
+> **Note**
+>
+> The *"is div by"* syntax is a simpler alternative to the PHP mod
+> operator syntax. The mod operator is allowed:
+> `{if $smarty.section.co.iteration % 5 == 1}` will work just the same.
+
+> **Note**
+>
+> You can also use *"is odd by"* to reverse the alternating.
+
+## .first
+
+`first` is set to TRUE if the current `{section}` iteration is the initial one.
+
+## .last
+
+`last` is set to TRUE if the current section iteration is the final one.
+
+This example loops the `$customers` array, outputs a header block on the
+first iteration and on the last outputs the footer block. Also uses the
+[`total`](#total) property.
+
+```smarty
+{section name=customer loop=$customers}
+  {if $smarty.section.customer.first}
+    <table>
+    <tr><th>id</th><th>customer</th></tr>
+  {/if}
+
+  <tr>
+    <td>{$customers[customer].id}}</td>
+    <td>{$customers[customer].name}</td>
+  </tr>
+
+  {if $smarty.section.customer.last}
+    <tr><td></td><td>{$smarty.section.customer.total} customers</td></tr>
+    </table>
+  {/if}
+{/section}
+```
+
+## .rownum
+
+`rownum` contains the current loop iteration, starting with one. It is
+an alias to [`iteration`](#iteration), they work
+identically.
+
+## .loop
+
+`loop` contains the last index number that this {section} looped. This
+can be used inside or after the `{section}`.
+
+```smarty
+{section name=customer loop=$custid}
+  {$smarty.section.customer.index} id: {$custid[customer]}<br />
+{/section}
+There are {$smarty.section.customer.loop} customers shown above.
+```
+
+The above example will output:
+
+```html
+0 id: 1000<br />
+1 id: 1001<br />
+2 id: 1002<br />
+There are 3 customers shown above.
+```
+
+## .show
+
+`show` is used as a parameter to section and is a boolean value. If
+FALSE, the section will not be displayed. If there is a `{sectionelse}`
+present, that will be alternately displayed.
+
+Boolean `$show_customer_info` has been passed from the PHP application,
+to regulate whether this section shows.
+
+```smarty
+{section name=customer loop=$customers show=$show_customer_info}
+  {$smarty.section.customer.rownum} id: {$customers[customer]}<br />
+{/section}
+
+{if $smarty.section.customer.show}
+  the section was shown.
+{else}
+  the section was not shown.
+{/if}
+```
+      
+The above example will output:
+
+```html
+1 id: 1000<br />
+2 id: 1001<br />
+3 id: 1002<br />
+
+the section was shown.
+```
+       
+
+## .total
+
+`total` contains the number of iterations that this `{section}` will
+loop. This can be used inside or after a `{section}`.
+
+```smarty
+{section name=customer loop=$custid step=2}
+  {$smarty.section.customer.index} id: {$custid[customer]}<br />
+{/section}
+   There are {$smarty.section.customer.total} customers shown above.
+```
+      
+See also [`{foreach}`](./language-function-foreach.md),
+[`{for}`](./language-function-for.md), [`{while}`](./language-function-while.md)
+and [`$smarty.section`](../language-variables/language-variables-smarty.md#smartysection-languagevariablessmartyloops).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-setfilter.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-setfilter.md
new file mode 100644
index 000000000..eb11cbf1e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-setfilter.md
@@ -0,0 +1,43 @@
+# {setfilter}
+
+The `{setfilter}...{/setfilter}` block tag allows the definition of
+template instance's variable filters.
+
+SYNTAX: `{setfilter filter1\|filter2\|filter3\....}\...{/setfilter}`
+
+The filter can be:
+
+-   A variable filter plugin specified by it's name.
+
+-   A modifier specified by it's name and optional additional
+    parameter.
+
+`{setfilter}...{/setfilter}` blocks can be nested. The filter definition
+of inner blocks does replace the definition of the outer block.
+
+Template instance filters run in addition to other modifiers and
+filters. They run in the following order: modifier, default_modifier,
+$escape_html, registered variable filters, autoloaded variable
+filters, template instance's variable filters. Everything after
+default_modifier can be disabled with the `nofilter` flag.
+
+> **Note**
+>
+> The setting of template instance filters does not affect the output of
+> included subtemplates.
+
+## Examples
+
+```smarty
+<script>
+    {setfilter filter1}
+      {$foo} {* filter1 runs on output of $foo *}
+      {setfilter filter2|mod:true}
+        {$bar} {* filter2 and modifier mod runs on output of $bar *}
+      {/setfilter}
+      {$buh} {* filter1 runs on output of $buh *}
+    {/setfilter}
+    {$blar} {* no template instance filter runs on output of $blar}
+</script>
+```
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-strip.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-strip.md
new file mode 100644
index 000000000..800de84bf
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-strip.md
@@ -0,0 +1,45 @@
+# {strip}
+
+Many times web designers run into the issue where white space and
+carriage returns affect the output of the rendered HTML (browser
+"features"), so you must run all your tags together in the template to
+get the desired results. This usually ends up in unreadable or
+unmanageable templates.
+
+Anything within `{strip}{/strip}` tags are stripped of the extra spaces
+or carriage returns at the beginnings and ends of the lines before they
+are displayed. This way you can keep your templates readable, and not
+worry about extra white space causing problems.
+
+> **Note**
+>
+> `{strip}{/strip}` does not affect the contents of template variables,
+> see the [strip modifier](../language-modifiers/language-modifier-strip.md) instead.
+
+```smarty
+{* the following will be all run into one line upon output *}
+{strip}
+    <table>
+     <tr>
+      <td>
+       <a href="#">
+        This is a test
+       </a>
+      </td>
+     </tr>
+    </table>
+{/strip}
+```
+      
+The above example will output:
+
+```html
+<table><tr><td><a href="#">This is a test</a></td></tr></table>
+```
+
+Notice that in the above example, all the lines begin and end with HTML
+tags. Be aware that all the lines are run together. If you have plain
+text at the beginning or end of any line, they will be run together, and
+may not be desired results.
+
+See also the [`strip`](../language-modifiers/language-modifier-strip.md) modifier.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-while.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-while.md
new file mode 100644
index 000000000..d0a4b2f3c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-while.md
@@ -0,0 +1,20 @@
+# {while}
+
+`{while}` loops in Smarty have much the same flexibility as PHP
+[while](https://www.php.net/while) statements, with a few added features for
+the template engine. Every `{while}` must be paired with a matching
+`{/while}`. All [operators](../language-basic-syntax/language-syntax-operators.md) are recognized, such as *==*,
+*\|\|*, *or*, *&&*, *and*, etc and you can use modifiers as functions, such as *is_array()*.
+
+## Examples
+```smarty
+{while $foo > 0}
+  {$foo--}
+{/while}
+```
+
+The above example will count down the value of $foo until 1 is reached.
+
+See also [`{foreach}`](./language-function-foreach.md),
+[`{for}`](./language-function-for.md) and
+[`{section}`](./language-function-section.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-combining-modifiers.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-combining-modifiers.md
new file mode 100644
index 000000000..97903c535
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-combining-modifiers.md
@@ -0,0 +1,32 @@
+# Combining Modifiers
+
+You can apply any number of modifiers to a variable. They will be
+applied in the order they are combined, from left to right. They must be
+separated with a `|` (pipe) character.
+
+```php
+<?php
+
+$smarty->assign('articleTitle', 'Smokers are Productive, but Death Cuts Efficiency.');
+```
+
+where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|upper|spacify}
+{$articleTitle|lower|spacify|truncate}
+{$articleTitle|lower|truncate:30|spacify}
+{$articleTitle|lower|spacify|truncate:30:". . ."}
+```
+      
+
+The above example will output:
+
+```
+Smokers are Productive, but Death Cuts Efficiency.
+S M O K E R S   A R ....snip....  H   C U T S   E F F I C I E N C Y .
+s m o k e r s   a r ....snip....  b u t   d e a t h   c u t s...
+s m o k e r s   a r e   p r o d u c t i v e ,   b u t . . .
+s m o k e r s   a r e   p. . .
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/index.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/index.md
new file mode 100644
index 000000000..2c1d9b709
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/index.md
@@ -0,0 +1,19 @@
+# Custom Tags
+
+Smarty comes with several custom plugin functions that you can use in
+the templates.
+
+- [{counter}](language-function-counter.md)
+- [{cycle}](language-function-cycle.md)
+- [{eval}](language-function-eval.md)
+- [{fetch}](language-function-fetch.md)
+- [{html_checkboxes}](language-function-html-checkboxes.md)
+- [{html_image}](language-function-html-image.md)
+- [{html_options}](language-function-html-options.md)
+- [{html_radios}](language-function-html-radios.md)
+- [{html_select_date}](language-function-html-select-date.md)
+- [{html_select_time}](language-function-html-select-time.md)
+- [{html_table}](language-function-html-table.md)
+- [{mailto}](language-function-mailto.md)
+- [{math}](language-function-math.md)
+- [{textformat}](language-function-textformat.md)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-counter.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-counter.md
new file mode 100644
index 000000000..de04c2fee
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-counter.md
@@ -0,0 +1,45 @@
+# {counter}
+
+`{counter}` is used to print out a count. `{counter}` will remember the
+count on each iteration. You can adjust the number, the interval and the
+direction of the count, as well as determine whether to print the
+value. You can run multiple counters concurrently by supplying a unique
+name for each one. If you do not supply a name, the name "default" will
+be used.
+
+## Attributes
+
+| Attribute Name | Required | Description                                               |
+|----------------|----------|-----------------------------------------------------------|
+| name           | No       | The name of the counter                                   |
+| start          | No       | The initial number to start counting from (defaults to 1) |
+| skip           | No       | The interval to count by (defaults to 1)                  |
+| direction      | No       | The direction to count (up/down) (defaults to 'up')       |
+| print          | No       | Whether or not to print the value (defaults to true)      |
+| assign         | No       | the template variable the output will be assigned to      |
+
+If you supply the `assign` attribute, the output of the `{counter}`
+function will be assigned to this template variable instead of being
+output to the template.
+
+## Examples
+
+```smarty
+
+{* initialize the count *}
+{counter start=0 skip=2}<br />
+{counter}<br />
+{counter}<br />
+{counter}<br />
+
+```
+
+this will output:
+
+```html
+0<br />
+2<br />
+4<br />
+6<br />
+```
+      
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-cycle.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-cycle.md
new file mode 100644
index 000000000..661e490dc
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-cycle.md
@@ -0,0 +1,55 @@
+# {cycle}
+
+`{cycle}` is used to alternate a set of values. This makes it easy to
+for example, alternate between two or more colors in a table, or cycle
+through an array of values.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                                                 |
+|----------------|----------|-------------------------------------------------------------------------------------------------------------|
+| name           | No       | The name of the cycle                                                                                       |
+| values         | Yes      | The values to cycle through, either a comma delimited list (see delimiter attribute), or an array of values |
+| print          | No       | Whether to print the value or not (defaults to true)                                                        |
+| advance        | No       | Whether or not to advance to the next value (defaults to true)                                              |
+| delimiter      | No       | The delimiter to use in the values attribute (defaults to ',')                                              |
+| assign         | No       | The template variable the output will be assigned to                                                        |
+| reset          | No       | The cycle will be set to the first value and not advanced (defaults to false)                               |
+
+-   You can `{cycle}` through more than one set of values in a template
+    by supplying a `name` attribute. Give each `{cycle}` a unique
+    `name`.
+
+-   You can force the current value not to print with the `print`
+    attribute set to FALSE. This would be useful for silently skipping a
+    value.
+
+-   The `advance` attribute is used to repeat a value. When set to
+    FALSE, the next call to `{cycle}` will print the same value.
+
+-   If you supply the `assign` attribute, the output of the `{cycle}`
+    function will be assigned to a template variable instead of being
+    output to the template.
+
+## Examples
+```smarty
+{section name=rows loop=$data}
+    <tr class="{cycle values="odd,even"}">
+       <td>{$data[rows]}</td>
+    </tr>
+{/section}
+```
+
+The above template would output:
+
+```html
+    <tr class="odd">
+       <td>1</td>
+    </tr>
+    <tr class="even">
+       <td>2</td>
+    </tr>
+    <tr class="odd">
+       <td>3</td>
+    </tr>
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-debug.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-debug.md
new file mode 100644
index 000000000..788614537
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-debug.md
@@ -0,0 +1,14 @@
+# {debug}
+
+`{debug}` dumps the debug console to the page. This works regardless of
+the [debug](../chapter-debugging-console.md) settings in the php script.
+Since this gets executed at runtime, this is only able to show the
+[assigned](../../programmers/api-functions/api-assign.md) variables; not the templates that are in use.
+However, you can see all the currently available variables within the
+scope of a template.
+
+| Attribute Name | Required | Description                                                |
+|----------------|----------|------------------------------------------------------------|
+| output         | No       | output type, html or javascript (defaults to 'javascript') |
+
+See also the [debugging console page](../chapter-debugging-console.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-eval.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-eval.md
new file mode 100644
index 000000000..e44862c22
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-eval.md
@@ -0,0 +1,81 @@
+# {eval}
+
+`{eval}` is used to evaluate a variable as a template. This can be used
+for things like embedding template tags/variables into variables or
+tags/variables into config file variables.
+
+## Attributes
+
+| Attribute Name | Required | Description                                          |
+|----------------|----------|------------------------------------------------------|
+| var            | Yes      | Variable (or string) to evaluate                     |
+| assign         | No       | The template variable the output will be assigned to |
+
+If you supply the `assign` attribute, the output of the `{eval}`
+function will be assigned to this template variable instead of being
+output to the template.
+
+> **Note**
+>
+> -   Evaluated variables are treated the same as templates. They follow
+>     the same escapement and security features just as if they were
+>     templates.
+>
+> -   Evaluated variables are compiled on every invocation, the compiled
+>     versions are not saved! However, if you have [caching](../../api/caching/basics.md)
+>     enabled, the output will be cached with the rest of the template.
+>
+> -   If the content to evaluate doesn't change often, or is used
+>     repeatedly, consider using
+>     `{include file="string:{$template_code}"}` instead. This may cache
+>     the compiled state and thus doesn't have to run the (comparably
+>     slow) compiler on every invocation.
+
+## Examples
+
+The contents of the config file, `setup.conf`.
+
+```ini
+emphstart = <strong>
+emphend = </strong>
+title = Welcome to {$company}'s home page!
+ErrorCity = You must supply a {#emphstart#}city{#emphend#}.
+ErrorState = You must supply a {#emphstart#}state{#emphend#}.
+```
+
+Where the template is:
+
+```smarty
+{config_load file='setup.conf'}
+
+{eval var=$foo}
+{eval var=#title#}
+{eval var=#ErrorCity#}
+{eval var=#ErrorState# assign='state_error'}
+{$state_error}
+```
+      
+The above template will output:
+
+```html
+This is the contents of foo.
+Welcome to Foobar Pub & Grill's home page!
+You must supply a <strong>city</strong>.
+You must supply a <strong>state</strong>.
+```
+
+This outputs the server name (in uppercase) and IP. The assigned
+variable `$str` could be from a database query.
+
+```php
+<?php
+    $str = 'The server name is {$smarty.server.SERVER_NAME|upper} '
+           .'at {$smarty.server.SERVER_ADDR}';
+    $smarty->assign('foo',$str);
+```
+
+Where the template is:
+
+```smarty
+{eval var=$foo}
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-fetch.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-fetch.md
new file mode 100644
index 000000000..a2f07f3a1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-fetch.md
@@ -0,0 +1,61 @@
+# {fetch}
+
+`{fetch}` is used to retrieve files from the local file system, http, or
+ftp and display the contents.
+
+## Attributes
+| Attribute | Required | Description                                          |
+|-----------|----------|------------------------------------------------------|
+| file      | Yes      | The file, http or ftp site to fetch                  |
+| assign    | No       | The template variable the output will be assigned to |
+
+-   If the file name begins with `http://`, the website page will be
+    fetched and displayed.
+
+    > **Note**
+    >
+    > This will not support http redirects, be sure to include a
+    > trailing slash on your web page fetches where necessary.
+
+-   If the file name begins with `ftp://`, the file will be downloaded
+    from the ftp server and displayed.
+
+-   For local files, either a full system file path must be given, or a
+    path relative to the executed php script.
+
+    > **Note**
+    >
+    > If security is enabled, and you are fetching a file from the local
+    > file system, `{fetch}` will only allow files from within the
+    > `$secure_dir` path of the security policy. See the
+    > [Security](../../api/security.md) section for details.
+
+-   If the `assign` attribute is set, the output of the `{fetch}`
+    function will be assigned to this template variable instead of being
+    output to the template.
+
+## Examples
+
+```smarty
+{* include some javascript in your template *}
+{fetch file='/export/httpd/www.example.com/docs/navbar.js'}
+
+{* embed some weather text in your template from another web site *}
+{fetch file='http://www.myweather.com/68502/'}
+
+{* fetch a news headline file via ftp *}
+{fetch file='ftp://user:password@ftp.example.com/path/to/currentheadlines.txt'}
+{* as above but with variables *}
+{fetch file="ftp://`$user`:`$password`@`$server`/`$path`"}
+
+{* assign the fetched contents to a template variable *}
+{fetch file='http://www.myweather.com/68502/' assign='weather'}
+{if $weather ne ''}
+  <div id="weather">{$weather}</div>
+{/if}
+```
+      
+
+See also [`{capture}`](../language-builtin-functions/language-function-capture.md),
+[`{eval}`](language-function-eval.md),
+[`{assign}`](../language-builtin-functions/language-function-assign.md) and [`fetch()`](../../programmers/api-functions/api-fetch.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-checkboxes.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-checkboxes.md
new file mode 100644
index 000000000..3ab36096a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-checkboxes.md
@@ -0,0 +1,102 @@
+# {html_checkboxes}
+
+`{html_checkboxes}` is a [custom function](index.md)
+that creates an html checkbox group with provided data. It takes care of
+which item(s) are selected by default as well.
+
+## Attributes
+
+| Attribute Name | Required                            | Description                                                                                                                                                                                       |
+|----------------|-------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| name           | No                                  | Name of checkbox list (defaults to 'checkbox')                                                                                                                                                    |
+| values         | Yes, unless using options attribute | An array of values for checkbox buttons                                                                                                                                                           |
+| output         | Yes, unless using options attribute | An array of output for checkbox buttons                                                                                                                                                           |
+| selected       | No                                  | The selected checkbox element(s) as a string or array                                                                                                                                             |
+| options        | Yes, unless using values and output | An associative array of values and output                                                                                                                                                         |
+| separator      | No                                  | String of text to separate each checkbox item                                                                                                                                                     |
+| assign         | No                                  | Assign checkbox tags to an array instead of output                                                                                                                                                |
+| labels         | No                                  | Add <label\>-tags to the output (defaults to true)                                                                                                                                                |
+| label\_ids     | No                                  | Add id-attributes to <label\> and <input\> to the output (defaults to false)                                                                                                                      |
+| escape         | No                                  | Escape the output / content (values are always escaped) (defaults to true)                                                                                                                        |
+| strict         | No                                  | Will make the "extra" attributes *disabled* and *readonly* only be set, if they were supplied with either boolean *TRUE* or string *"disabled"* and *"readonly"* respectively (defaults to false) |
+
+-   Required attributes are `values` and `output`, unless you use `options` instead.
+
+-   All output is XHTML compliant.
+
+-   All parameters that are not in the list above are printed as
+    name/value-pairs inside each of the created <input\>-tags.
+
+## Examples
+```php
+<?php
+
+$smarty->assign('cust_ids', array(1000,1001,1002,1003));
+$smarty->assign('cust_names', array(
+                                'Joe Schmoe',
+                                'Jack Smith',
+                                'Jane Johnson',
+                                'Charlie Brown')
+                              );
+$smarty->assign('customer_id', 1001);
+```
+
+where template is
+
+```smarty
+{html_checkboxes name='id' values=$cust_ids output=$cust_names selected=$customer_id  separator='<br />'}
+```
+
+or where PHP code is:
+
+```php
+<?php
+
+$smarty->assign(
+    'cust_checkboxes', 
+    [
+     1000 => 'Joe Schmoe',
+     1001 => 'Jack Smith',
+     1002 => 'Jane Johnson',
+     1003 => 'Charlie Brown',
+    ]
+);
+$smarty->assign('customer_id', 1001);
+```
+
+and the template is
+
+```smarty
+{html_checkboxes name='id' options=$cust_checkboxes selected=$customer_id separator='<br />'}
+```
+
+both examples will output:
+
+```html
+<label><input type="checkbox" name="id[]" value="1000" />Joe Schmoe</label><br />
+<label><input type="checkbox" name="id[]" value="1001" checked="checked" />Jack Smith</label>
+<br />
+<label><input type="checkbox" name="id[]" value="1002" />Jane Johnson</label><br />
+<label><input type="checkbox" name="id[]" value="1003" />Charlie Brown</label><br />
+```
+      
+
+```php
+<?php
+
+$sql = 'select type_id, types from contact_types order by type';
+$smarty->assign('contact_types',$db->getAssoc($sql));
+
+$sql = 'select contact_id, contact_type_id, contact '
+       .'from contacts where contact_id=12';
+$smarty->assign('contact',$db->getRow($sql));
+```
+
+The results of the database queries above would be output with.
+
+```smarty
+{html_checkboxes name='contact_type_id' options=$contact_types selected=$contact.contact_type_id separator='<br />'}
+```
+
+See also [`{html_radios}`](./language-function-html-radios.md) and
+[`{html_options}`](./language-function-html-options.md)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-image.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-image.md
new file mode 100644
index 000000000..0ae02cae2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-image.md
@@ -0,0 +1,58 @@
+# {html_image}
+
+`{html_image}` is a [custom function](index.md) that
+generates an HTML `<img>` tag. The `height` and `width` are
+automatically calculated from the image file if they are not supplied.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                             |
+|----------------|----------|-------------------------------------------------------------------------|
+| file           | Yes      | name/path to image                                                      |
+| height         | No       | Height to display image (defaults to actual image height)               |
+| width          | No       | Width to display image (defaults to actual image width)                 |
+| basedir        | no       | Directory to base relative paths from (defaults to web server doc root) |
+| alt            | no       | Alternative description of the image                                    |
+| href           | no       | href value to link the image to                                         |
+| path\_prefix   | no       | Prefix for output path                                                  |
+
+-   `basedir` is the base directory that relative image paths are based
+    from. If not given, the web server's document root
+    `$_ENV['DOCUMENT_ROOT']` is used as the base. If security is
+    enabled, then the image must be located in the `$secure_dir` path of
+    the security policy. See the [Security](../../api/security.md)
+    section for details.
+
+-   `href` is the href value to link the image to. If link is supplied,
+    an `<a href="LINKVALUE"><a>` tag is placed around the image tag.
+
+-   `path_prefix` is an optional prefix string you can give the output
+    path. This is useful if you want to supply a different server name
+    for the image.
+
+-   All parameters that are not in the list above are printed as
+    name/value-pairs inside the created `<img>` tag.
+
+> **Note**
+>
+> `{html_image}` requires a hit to the disk to read the image and
+> calculate the height and width. If you don't use template
+> [caching](../../api/caching/basics.md), it is generally better to avoid `{html_image}`
+> and leave image tags static for optimal performance.
+
+## Examples
+
+```smarty
+{html_image file='pumpkin.jpg'}
+{html_image file='/path/from/docroot/pumpkin.jpg'}
+{html_image file='../path/relative/to/currdir/pumpkin.jpg'}
+```
+
+Example output of the above template would be:
+
+```html
+<img src="pumpkin.jpg" alt="" width="44" height="68" />
+<img src="/path/from/docroot/pumpkin.jpg" alt="" width="44" height="68" />
+<img src="../path/relative/to/currdir/pumpkin.jpg" alt="" width="44" height="68" />
+```
+      
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-options.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-options.md
new file mode 100644
index 000000000..a63ccc56b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-options.md
@@ -0,0 +1,146 @@
+# {html_options}
+
+`{html_options}` is a [custom function](index.md) that
+creates the html `<select><option>` group with the assigned data. It
+takes care of which item(s) are selected by default as well.
+
+## Attributes
+
+| Attribute Name | Required                            | Description                                                                                                                                                                                             |
+|----------------|-------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| values         | Yes, unless using options attribute | An array of values for dropdown                                                                                                                                                                         |
+| output         | Yes, unless using options attribute | An array of output for dropdown                                                                                                                                                                         |
+| selected       | No                                  | The selected option element(s) as a string or array                                                                                                                                                     |
+| options        | Yes, unless using values and output | An associative array of values and output                                                                                                                                                               |
+| name           | No                                  | Name of select group                                                                                                                                                                                    |
+| strict         | No                                  | Will make the "extra" attributes *disabled* and *readonly* only be set, if they were supplied with either boolean *TRUE* or string *"disabled"* and *"readonly"* respectively (defaults to false) |
+
+-   Required attributes are `values` and `output`, unless you use the
+    combined `options` instead.
+
+-   If the optional `name` attribute is given, the `<select></select>`
+    tags are created, otherwise ONLY the `<option>` list is generated.
+
+-   If a given value is an array, it will treat it as an html
+    `<optgroup>`, and display the groups. Recursion is supported with
+    `<optgroup>`.
+
+-   All parameters that are not in the list above are printed as
+    name/value-pairs inside the `<select>` tag. They are ignored if the
+    optional `name` is not given.
+
+-   All output is XHTML compliant.
+
+## Examples
+
+```php
+<?php
+$smarty->assign('myOptions', [
+                                1800 => 'Joe Schmoe',
+                                9904 => 'Jack Smith',
+                                2003 => 'Charlie Brown']
+                                );
+$smarty->assign('mySelect', 9904);
+```
+
+The following template will generate a drop-down list. Note the presence
+of the `name` attribute which creates the `<select>` tags.
+
+```smarty
+{html_options name=foo options=$myOptions selected=$mySelect}
+```
+
+Output of the above example would be:
+
+```html
+<select name="foo">
+    <option value="1800">Joe Schmoe</option>
+    <option value="9904" selected="selected">Jack Smith</option>
+    <option value="2003">Charlie Brown</option>
+</select>   
+```
+
+```php
+<?php
+$smarty->assign('cust_ids', [56,92,13]);
+$smarty->assign('cust_names', [
+                              'Joe Schmoe',
+                              'Jane Johnson',
+                              'Charlie Brown']);
+$smarty->assign('customer_id', 92);
+```
+
+The above arrays would be output with the following template (note the
+use of the php [`count()`](https://www.php.net/function.count) function as a
+modifier to set the select size).
+
+```smarty
+<select name="customer_id" size="{$cust_names|@count}">
+   {html_options values=$cust_ids output=$cust_names selected=$customer_id}
+</select>
+```
+
+The above example would output:
+
+```html
+<select name="customer_id" size="3">
+    <option value="56">Joe Schmoe</option>
+    <option value="92" selected="selected">Jane Johnson</option>
+    <option value="13">Charlie Brown</option>
+</select>
+```
+
+```php
+<?php
+
+$sql = 'select type_id, types from contact_types order by type';
+$smarty->assign('contact_types',$db->getAssoc($sql));
+
+$sql = 'select contact_id, name, email, contact_type_id
+        from contacts where contact_id='.$contact_id;
+$smarty->assign('contact',$db->getRow($sql));
+
+```
+
+Where a template could be as follows. Note the use of the
+[`truncate`](../language-modifiers/language-modifier-truncate.md) modifier.
+
+```smarty
+<select name="type_id">
+    <option value='null'>-- none --</option>
+    {html_options options=$contact_types|truncate:20 selected=$contact.type_id}
+</select>
+```
+
+```php
+<?php
+$arr['Sport'] = array(6 => 'Golf', 9 => 'Cricket',7 => 'Swim');
+$arr['Rest']  = array(3 => 'Sauna',1 => 'Massage');
+$smarty->assign('lookups', $arr);
+$smarty->assign('fav', 7);
+```
+
+The script above and the following template
+
+```smarty
+{html_options name=foo options=$lookups selected=$fav}
+```
+
+would output:
+
+```html
+<select name="foo">
+    <optgroup label="Sport">
+        <option value="6">Golf</option>
+        <option value="9">Cricket</option>
+        <option value="7" selected="selected">Swim</option>
+    </optgroup>
+    <optgroup label="Rest">
+        <option value="3">Sauna</option>
+        <option value="1">Massage</option>
+    </optgroup>
+</select>
+```
+
+See also [`{html_checkboxes}`](./language-function-html-checkboxes.md) and
+[`{html_radios}`](./language-function-html-radios.md)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-radios.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-radios.md
new file mode 100644
index 000000000..af8ecda68
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-radios.md
@@ -0,0 +1,104 @@
+# {html_radios}
+
+`{html_radios}` is a [custom function](index.md) that
+creates an HTML radio button group. It also takes care of which item is
+selected by default as well.
+
+## Attributes
+
+| Attribute Name | Required                            | Description                                                                                                                                                                                       |
+|----------------|-------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| name           | No                                  | Name of radio list                                                                                                                                                                                |
+| values         | Yes, unless using options attribute | An array of values for radio buttons                                                                                                                                                              |
+| output         | Yes, unless using options attribute | An array of output for radio buttons                                                                                                                                                              |
+| selected       | No                                  | The selected radio element                                                                                                                                                                        |
+| options        | Yes, unless using values and output | An associative array of values and output                                                                                                                                                         |
+| separator      | No                                  | String of text to separate each radio item                                                                                                                                                        |
+| assign         | No                                  | Assign radio tags to an array instead of output                                                                                                                                                   |
+| labels         | No                                  | Add <label>-tags to the output (defaults to true)                                                                                                                                                 |
+| label\_ids     | No                                  | Add id-attributes to <label\> and <input\> to the output (defaults to false)                                                                                                                      |
+| escape         | No                                  | Escape the output / content (values are always escaped) (defaults to true)                                                                                                                        |
+| strict         | No                                  | Will make the "extra" attributes *disabled* and *readonly* only be set, if they were supplied with either boolean *TRUE* or string *"disabled"* and *"readonly"* respectively (defaults to false) |
+
+-   Required attributes are `values` and `output`, unless you use
+    `options` instead.
+
+-   All output is XHTML compliant.
+
+-   All parameters that are not in the list above are output as
+    name/value-pairs inside each of the created `<input>`-tags.
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('cust_ids', array(1000,1001,1002,1003));
+$smarty->assign('cust_names', array(
+                              'Joe Schmoe',
+                              'Jack Smith',
+                              'Jane Johnson',
+                              'Charlie Brown')
+                              );
+$smarty->assign('customer_id', 1001);
+```
+      
+Where template is:
+
+```smarty
+{html_radios name='id' values=$cust_ids output=$cust_names
+       selected=$customer_id separator='<br />'}
+```
+
+
+```php
+<?php
+$smarty->assign('cust_radios', array(
+                               1000 => 'Joe Schmoe',
+                               1001 => 'Jack Smith',
+                               1002 => 'Jane Johnson',
+                               1003 => 'Charlie Brown'));
+$smarty->assign('customer_id', 1001);
+
+```
+
+Where template is:
+
+```smarty
+
+{html_radios name='id' options=$cust_radios
+     selected=$customer_id separator='<br />'}
+```
+      
+Both examples will output:
+
+```html
+<label><input type="radio" name="id" value="1000" />Joe Schmoe</label><br />
+<label><input type="radio" name="id" value="1001" checked="checked" />Jack Smith</label><br />
+<label><input type="radio" name="id" value="1002" />Jane Johnson</label><br />
+<label><input type="radio" name="id" value="1003" />Charlie Brown</label><br />
+```
+      
+```php
+
+<?php
+
+$sql = 'select type_id, types from contact_types order by type';
+$smarty->assign('contact_types',$db->getAssoc($sql));
+
+$sql = 'select contact_id, name, email, contact_type_id '
+        .'from contacts where contact_id='.$contact_id;
+$smarty->assign('contact',$db->getRow($sql));
+
+```
+
+The variable assigned from the database above would be output with the
+template:
+
+```smarty
+{html_radios name='contact_type_id' options=$contact_types
+     selected=$contact.contact_type_id separator='<br />'}
+```
+
+See also [`{html_checkboxes}`](language-function-html-checkboxes.md) and
+[`{html_options}`](language-function-html-options.md)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-date.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-date.md
new file mode 100644
index 000000000..2a045baf8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-date.md
@@ -0,0 +1,118 @@
+# {html_select_date}
+
+`{html_select_date}` is a [custom function](index.md)
+that creates date dropdowns. It can display any or all of: year, month,
+and day. All parameters that are not in the list below are printed as
+name/value-pairs inside the `<select>` tags of day, month and year.
+
+## Attributes
+
+| Attribute Name     | Default            | Description                                                                                                                                                                                                                                                                                                                                                                                                    |
+|--------------------|--------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| prefix             | Date_              | What to prefix the var name with                                                                                                                                                                                                                                                                                                                                                                               |
+| time               |                    | What date/time to pre-select. Accepts timestamps, DateTime objects or any string parseable by [strtotime()](https://www.php.net/strtotime). If an array is given, the attributes field_array and prefix are used to identify the array elements to extract year, month and day from. Omitting this parameter or supplying a falsy value will select the current date. To prevent date selection, pass in NULL. |
+| start_year         | current year       | The first year in the dropdown, either year number, or relative to current year (+/- N)                                                                                                                                                                                                                                                                                                                        |
+| end_year           | same as start_year | The last year in the dropdown, either year number, or relative to current year (+/- N)                                                                                                                                                                                                                                                                                                                         |
+| display_days       | TRUE               | Whether to display days or not                                                                                                                                                                                                                                                                                                                                                                                 |
+| display_months     | TRUE               | Whether to display months or not                                                                                                                                                                                                                                                                                                                                                                               |
+| display_years      | TRUE               | Whether to display years or not                                                                                                                                                                                                                                                                                                                                                                                |
+| month_names        |                    | List of strings to display for months. array(1 =\> 'Jan', ..., 12 =\> 'Dec')                                                                                                                                                                                                                                                                                                                                   |
+| month_format       | \%B                | What format the month should be in (strftime)                                                                                                                                                                                                                                                                                                                                                                  |
+| day_format         | \%02d              | What format the day output should be in (sprintf)                                                                                                                                                                                                                                                                                                                                                              |
+| day_value_format   | \%d                | What format the day value should be in (sprintf)                                                                                                                                                                                                                                                                                                                                                               |
+| year_as_text       | FALSE              | Whether or not to display the year as text                                                                                                                                                                                                                                                                                                                                                                     |
+| reverse_years      | FALSE              | Display years in reverse order                                                                                                                                                                                                                                                                                                                                                                                 |
+| field_array        |                    | If a name is given, the select boxes will be drawn such that the results will be returned to PHP in the form of name\[Day\], name\[Year\], name\[Month\].                                                                                                                                                                                                                                                      |
+| day_size           |                    | Adds size attribute to select tag if given                                                                                                                                                                                                                                                                                                                                                                     |
+| month_size         |                    | Adds size attribute to select tag if given                                                                                                                                                                                                                                                                                                                                                                     |
+| year_size          |                    | Adds size attribute to select tag if given                                                                                                                                                                                                                                                                                                                                                                     |
+| all_extra          |                    | Adds extra attributes to all select/input tags if given                                                                                                                                                                                                                                                                                                                                                        |
+| day_extra          |                    | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                                            |
+| month_extra        |                    | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                                            |
+| year_extra         |                    | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                                            |
+| all_id             |                    | Adds id-attribute to all select/input tags if given                                                                                                                                                                                                                                                                                                                                                            |
+| day_id             |                    | Adds id-attribute to select/input tags if given                                                                                                                                                                                                                                                                                                                                                                |
+| month_id           |                    | Adds id-attribute to select/input tags if given                                                                                                                                                                                                                                                                                                                                                                |
+| year_id            |                    | Adds id-attribute to select/input tags if given                                                                                                                                                                                                                                                                                                                                                                |
+| field_order        | MDY                | The order in which to display the fields                                                                                                                                                                                                                                                                                                                                                                       |
+| field_separator    | \\n                | String printed between different fields                                                                                                                                                                                                                                                                                                                                                                        |
+| month_value_format | \%m                | strftime() format of the month values, default is %m for month numbers.                                                                                                                                                                                                                                                                                                                                        |
+| all_empty          |                    | If supplied then the first element of any select-box has this value as it's label and "" as it's value. This is useful to make the select-boxes read "Please select" for example.                                                                                                                                                                                                                              |
+| year_empty         |                    | If supplied then the first element of the year's select-box has this value as it's label and "" as it's value. This is useful to make the select-box read "Please select a year" for example. Note that you can use values like "-MM-DD" as time-attribute to indicate an unselected year.                                                                                                                     |
+| month_empty        |                    | If supplied then the first element of the month's select-box has this value as it's label and "" as it's value. . Note that you can use values like "YYYY\--DD" as time-attribute to indicate an unselected month.                                                                                                                                                                                             |
+| day_empty          |                    | If supplied then the first element of the day's select-box has this value as it's label and "" as it's value. Note that you can use values like "YYYY-MM-" as time-attribute to indicate an unselected day.                                                                                                                                                                                                    |
+
+> **Note**
+>
+> There is an useful php function on the [date tips page](../../appendixes/tips.md)
+> for converting `{html_select_date}` form values to a timestamp.
+
+## Exaples
+
+Template code
+
+```smarty
+{html_select_date}
+```
+
+This will output:
+
+```html
+<select name="Date_Month">
+    <option value="1">January</option>
+    <option value="2">February</option>
+    <option value="3">March</option>
+      ..... snipped .....
+    <option value="10">October</option>
+    <option value="11">November</option>
+    <option value="12" selected="selected">December</option>
+</select>
+<select name="Date_Day">
+    <option value="1">01</option>
+    <option value="2">02</option>
+    <option value="3">03</option>
+      ..... snipped .....
+    <option value="11">11</option>
+    <option value="12">12</option>
+    <option value="13" selected="selected">13</option>
+    <option value="14">14</option>
+    <option value="15">15</option>
+      ..... snipped .....
+    <option value="29">29</option>
+    <option value="30">30</option>
+    <option value="31">31</option>
+</select>
+<select name="Date_Year">
+    <option value="2006" selected="selected">2006</option>
+</select>
+```
+      
+```smarty
+{* start and end year can be relative to current year *}
+{html_select_date prefix='StartDate' time=$time start_year='-5'
+       end_year='+1' display_days=false}
+```
+
+With 2000 as the current year the output:
+
+```html
+<select name="StartDateMonth">
+    <option value="1">January</option>
+    <option value="2">February</option>
+    .... snipped ....
+    <option value="11">November</option>
+    <option value="12" selected="selected">December</option>
+</select>
+<select name="StartDateYear">
+    <option value="1995">1995</option>
+    .... snipped ....
+    <option value="1999">1999</option>
+    <option value="2000" selected="selected">2000</option>
+    <option value="2001">2001</option>
+</select>
+```
+      
+See also [`{html_select_time}`](language-function-html-select-time.md),
+[`date_format`](../language-modifiers/language-modifier-date-format.md),
+[`$smarty.now`](../language-variables/language-variables-smarty.md#smartynow-languagevariablessmartynow) and the [date tips
+page](../../appendixes/tips.md#dates).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-time.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-time.md
new file mode 100644
index 000000000..001734523
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-time.md
@@ -0,0 +1,100 @@
+# {html_select_time}
+
+`{html_select_time}` is a [custom function](index.md)
+that creates time dropdowns for you. It can display any or all of: hour,
+minute, second and meridian.
+
+The `time` attribute can have different formats. It can be a unique
+timestamp, a string of the format `YYYYMMDDHHMMSS` or a string that is
+parseable by PHP's [`strtotime()`](https://www.php.net/strtotime).
+
+## Attributes
+
+| Attribute Name        | Default                                                | Description                                                                                                                                                                                                                                                                                                                                                                              |
+|-----------------------|--------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| prefix                | Time\_                                                 | What to prefix the var name with                                                                                                                                                                                                                                                                                                                                                         |
+| time                  | current [timestamp](https://www.php.net/function.time) | What date/time to pre-select. Accepts  [timestamp](https://www.php.net/function.time), [DateTime](https://www.php.net/class.DateTime), mysql timestamp or any string parsable by [`strtotime()`](https://www.php.net/strtotime). If an array is given, the attributes field\_array and prefix are used to identify the array elements to extract hour, minute, second and meridian from. |
+| display\_hours        | TRUE                                                   | Whether or not to display hours                                                                                                                                                                                                                                                                                                                                                          |
+| display\_minutes      | TRUE                                                   | Whether or not to display minutes                                                                                                                                                                                                                                                                                                                                                        |
+| display\_seconds      | TRUE                                                   | Whether or not to display seconds                                                                                                                                                                                                                                                                                                                                                        |
+| display\_meridian     | TRUE                                                   | Whether or not to display meridian (am/pm)                                                                                                                                                                                                                                                                                                                                               |
+| use\_24\_hours        | TRUE                                                   | Whether or not to use 24 hour clock                                                                                                                                                                                                                                                                                                                                                      |
+| minute\_interval      | 1                                                      | Number interval in minute dropdown                                                                                                                                                                                                                                                                                                                                                       |
+| second\_interval      | 1                                                      | Number interval in second dropdown                                                                                                                                                                                                                                                                                                                                                       |
+| hour\_format          | \%02d                                                  | What format the hour label should be in (sprintf)                                                                                                                                                                                                                                                                                                                                        |
+| hour\_value\_format   | \%20d                                                  | What format the hour value should be in (sprintf)                                                                                                                                                                                                                                                                                                                                        |
+| minute\_format        | \%02d                                                  | What format the minute label should be in (sprintf)                                                                                                                                                                                                                                                                                                                                      |
+| minute\_value\_format | \%20d                                                  | What format the minute value should be in (sprintf)                                                                                                                                                                                                                                                                                                                                      |
+| second\_format        | \%02d                                                  | What format the second label should be in (sprintf)                                                                                                                                                                                                                                                                                                                                      |
+| second\_value\_format | \%20d                                                  | What format the second value should be in (sprintf)                                                                                                                                                                                                                                                                                                                                      |
+| field\_array          | n/a                                                    | Outputs values to array of this name                                                                                                                                                                                                                                                                                                                                                     |
+| all\_extra            | null                                                   | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                      |
+| hour\_extra           | null                                                   | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                      |
+| minute\_extra         | null                                                   | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                      |
+| second\_extra         | null                                                   | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                      |
+| meridian\_extra       | null                                                   | Adds extra attributes to select/input tags if given                                                                                                                                                                                                                                                                                                                                      |
+| field\_separator      | \\n                                                    | String printed between different fields                                                                                                                                                                                                                                                                                                                                                  |
+| option\_separator     | \\n                                                    | String printed between different options of a field                                                                                                                                                                                                                                                                                                                                      |
+| all\_id               | null                                                   | Adds id-attribute to all select/input tags if given                                                                                                                                                                                                                                                                                                                                      |
+| hour\_id              | null                                                   | Adds id-attribute to select/input tags if given                                                                                                                                                                                                                                                                                                                                          |
+| minute\_id            | null                                                   | Adds id-attribute to select/input tags if given                                                                                                                                                                                                                                                                                                                                          |
+| second\_id            | null                                                   | Adds id-attribute to select/input tags if given                                                                                                                                                                                                                                                                                                                                          |
+| meridian\_id          | null                                                   | Adds id-attribute to select/input tags if given                                                                                                                                                                                                                                                                                                                                          |
+| all\_empty            | null                                                   | If supplied then the first element of any select-box has this value as it's label and "" as it's value. This is useful to make the select-boxes read "Please select" for example.                                                                                                                                                                                                        |
+| hour\_empty           | null                                                   | If supplied then the first element of the hour's select-box has this value as it's label and "" as it's value. This is useful to make the select-box read "Please select an hour" for example.                                                                                                                                                                                           |
+| minute\_empty         | null                                                   | If supplied then the first element of the minute's select-box has this value as it's label and "" as it's value. This is useful to make the select-box read "Please select an minute" for example.                                                                                                                                                                                       |
+| second\_empty         | null                                                   | If supplied then the first element of the second's select-box has this value as it's label and "" as it's value. This is useful to make the select-box read "Please select an second" for example.                                                                                                                                                                                       |
+| meridian\_empty       | null                                                   | If supplied then the first element of the meridian's select-box has this value as it's label and "" as it's value. This is useful to make the select-box read "Please select an meridian" for example.                                                                                                                                                                                   |
+
+
+## Examples
+
+```smarty
+{html_select_time use_24_hours=true}
+```
+     
+At 9:20 and 23 seconds in the morning the template above would output:
+
+```html
+<select name="Time_Hour">
+    <option value="00">00</option>
+    <option value="01">01</option>
+    ... snipped ....
+    <option value="08">08</option>
+    <option value="09" selected>09</option>
+    <option value="10">10</option>
+    ... snipped ....
+    <option value="22">22</option>
+    <option value="23">23</option>
+</select>
+<select name="Time_Minute">
+    <option value="00">00</option>
+    <option value="01">01</option>
+    ... snipped ....
+    <option value="19">19</option>
+    <option value="20" selected>20</option>
+    <option value="21">21</option>
+    ... snipped ....
+    <option value="58">58</option>
+    <option value="59">59</option>
+</select>
+<select name="Time_Second">
+    <option value="00">00</option>
+    <option value="01">01</option>
+    ... snipped ....
+    <option value="22">22</option>
+    <option value="23" selected>23</option>
+    <option value="24">24</option>
+    ... snipped ....
+    <option value="58">58</option>
+    <option value="59">59</option>
+</select>
+<select name="Time_Meridian">
+    <option value="am" selected>AM</option>
+    <option value="pm">PM</option>
+</select>
+```
+
+See also [`$smarty.now`](../language-variables/language-variables-smarty.md#smartynow-languagevariablessmartynow),
+[`{html_select_date}`](language-function-html-select-date.md) and the
+[date tips page](../../appendixes/tips.md#dates).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-table.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-table.md
new file mode 100644
index 000000000..b0eaf0ddf
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-table.md
@@ -0,0 +1,93 @@
+# {html_table}
+
+`{html_table}` is a [custom function](index.md) that
+dumps an array of data into an HTML `<table>`.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+|----------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| loop           | Yes      | Array of data to loop through                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| cols           | No       | Number of columns in the table or a comma-separated list of column heading names or an array of column heading names.if the cols-attribute is empty, but rows are given, then the number of cols is computed by the number of rows and the number of elements to display to be just enough cols to display all elements. If both, rows and cols, are omitted cols defaults to 3. if given as a list or array, the number of columns is computed from the number of elements in the list or array. |
+| rows           | No       | Number of rows in the table. if the rows-attribute is empty, but cols are given, then the number of rows is computed by the number of cols and the number of elements to display to be just enough rows to display all elements.                                                                                                                                                                                                                                                                  |
+| inner          | No       | Direction of consecutive elements in the loop-array to be rendered. *cols* means elements are displayed col-by-col. *rows* means elements are displayed row-by-row.                                                                                                                                                                                                                                                                                                                               |
+| caption        | No       | Text to be used for the `<caption>` element of the table                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| table\_attr    | No       | Attributes for `<table>` tag (defaults to 'border="1"')                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| th\_attr       | No       | Attributes for `<th>` tag (arrays are cycled)                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| tr\_attr       | No       | attributes for `<tr>` tag (arrays are cycled)                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| td\_attr       | No       | Attributes for `<td>` tag (arrays are cycled)                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| trailpad       | No       | Value to pad the trailing cells on last row with (if any) (defaults to '&nbsp;')                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| hdir           | No       | Direction of each row to be rendered. possible values: *right* (left-to-right), and *left* (right-to-left) (defaults to 'right')                                                                                                                                                                                                                                                                                                                                                                  |
+| vdir           | No       | Direction of each column to be rendered. possible values: *down* (top-to-bottom), *up* (bottom-to-top) (defaults to 'down')                                                                                                                                                                                                                                                                                                                                                                       |
+
+-   The `cols` attribute determines how many columns will be in the
+    table.
+
+-   The `table_attr`, `tr_attr` and `td_attr` values determine the
+    attributes given to the `<table>`, `<tr>` and `<td>` tags.
+
+-   If `tr_attr` or `td_attr` are arrays, they will be cycled through.
+
+-   `trailpad` is the value put into the trailing cells on the last
+    table row if there are any present.
+
+## Examples
+
+```php
+<?php
+$smarty->assign( 'data', array(1,2,3,4,5,6,7,8,9) );
+$smarty->assign( 'tr', array('bgcolor="#eeeeee"','bgcolor="#dddddd"') );
+$smarty->display('index.tpl');
+```
+
+The variables assigned from php could be displayed as these three
+examples demonstrate. Each example shows the template followed by
+output.
+
+** Example 1 **
+```smarty
+{html_table loop=$data}
+```
+```html
+<table border="1">
+    <tbody>
+        <tr><td>1</td><td>2</td><td>3</td></tr>
+        <tr><td>4</td><td>5</td><td>6</td></tr>
+        <tr><td>7</td><td>8</td><td>9</td></tr>
+    </tbody>
+</table>
+```
+
+** Example 2 **
+```smarty
+{html_table loop=$data cols=4 table_attr='border="0"'}
+```
+```html
+<table border="0">
+    <tbody>
+        <tr><td>1</td><td>2</td><td>3</td><td>4</td></tr>
+        <tr><td>5</td><td>6</td><td>7</td><td>8</td></tr>
+        <tr><td>9</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+    </tbody>
+</table>
+```
+
+** Example 3 **
+```smarty
+{html_table loop=$data cols="first,second,third,fourth" tr_attr=$tr}
+```
+```html
+<table border="1">
+    <thead>
+        <tr>
+        <th>first</th><th>second</th><th>third</th><th>fourth</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr bgcolor="#eeeeee"><td>1</td><td>2</td><td>3</td><td>4</td></tr>
+        <tr bgcolor="#dddddd"><td>5</td><td>6</td><td>7</td><td>8</td></tr>
+        <tr bgcolor="#eeeeee"><td>9</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+    </tbody>
+</table>
+```
+      
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-mailto.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-mailto.md
new file mode 100644
index 000000000..c32c23871
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-mailto.md
@@ -0,0 +1,61 @@
+# {mailto}
+
+`{mailto}` automates the creation of a `mailto:` anchor links and
+optionally encodes them. Encoding emails makes it more difficult for web
+spiders to lift email addresses off of a site.
+
+## Attributes
+
+| Attribute Name | Required | Description                                                                                   |
+|----------------|----------|-----------------------------------------------------------------------------------------------|
+| address        | Yes      | The e-mail address                                                                            |
+| text           | No       | The text to display, default is the e-mail address                                            |
+| encode         | No       | How to encode the e-mail. Can be one of `none`, `hex`, `javascript` or `javascript_charcode`. |
+| cc             | No       | Email addresses to carbon copy, separate entries by a comma.                                  |
+| bcc            | No       | Email addresses to blind carbon copy, separate entries by a comma                             |
+| subject        | No       | Email subject                                                                                 |
+| newsgroups     | No       | Newsgroups to post to, separate entries by a comma.                                           |
+| followupto     | No       | Addresses to follow up to, separate entries by a comma.                                       |
+| extra          | No       | Any extra information you want passed to the link, such as style sheet classes                |
+
+> **Note**
+>
+> Javascript is probably the most thorough form of encoding, although
+> you can use hex encoding too.
+
+
+## Examples
+
+```smarty
+{mailto address="me@example.com"}
+<a href="mailto:me@example.com" >me@example.com</a>
+
+{mailto address="me@example.com" text="send me some mail"}
+<a href="mailto:me@example.com" >send me some mail</a>
+
+{mailto address="me@example.com" encode="javascript"}
+    <script>
+   eval(unescape('%64%6f% ... snipped ...%61%3e%27%29%3b'))
+</script>
+
+{mailto address="me@example.com" encode="hex"}
+<a href="mailto:%6d%65.. snipped..3%6f%6d">&#x6d;&..snipped...#x6f;&#x6d;</a>
+
+{mailto address="me@example.com" subject="Hello to you!"}
+<a href="mailto:me@example.com?subject=Hello%20to%20you%21" >me@example.com</a>
+
+{mailto address="me@example.com" cc="you@example.com,they@example.com"}
+<a href="mailto:me@example.com?cc=you@example.com,they@example.com" >me@example.com</a>
+
+{mailto address="me@example.com" extra='class="email"'}
+<a href="mailto:me@example.com" class="email">me@example.com</a>
+
+{mailto address="me@example.com" encode="javascript_charcode"}
+    <script>
+    {document.write(String.fromCharCode(60,97, ... snipped ....60,47,97,62))}
+</script>
+```
+
+See also [`escape`](../language-modifiers/language-modifier-escape.md),
+[`{textformat}`](../language-custom-functions/language-function-textformat.md) and [obfuscating email
+addresses](../../appendixes/tips.md#obfuscating-e-mail-addresses).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-math.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-math.md
new file mode 100644
index 000000000..7b34fccff
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-math.md
@@ -0,0 +1,99 @@
+# {math}
+
+`{math}` allows the template designer to do math equations in the
+template.
+
+## Attributes
+
+| Attribute Name | Required | Description                                      |
+|----------------|----------|--------------------------------------------------|
+| equation       | Yes      | The equation to execute                          |
+| format         | No       | The format of the result (sprintf)               |
+| var            | Yes      | Equation variable value                          |
+| assign         | No       | Template variable the output will be assigned to |
+| \[var \...\]   | Yes      | Equation variable value                          |
+
+-   Any numeric template variables may be used in the equations, and the
+    result is printed in place of the tag.
+
+-   The variables used in the equation are passed as parameters, which
+    can be template variables or static values.
+
+-   +, -, /, \*, abs, ceil, cos, exp, floor, log, log10, max, min, pi,
+    pow, rand, round, sin, sqrt, srans and tan are all valid operators.
+    Check the PHP documentation for further information on these
+    [math](https://www.php.net/eval) functions.
+
+-   If you supply the `assign` attribute, the output of the `{math}`
+    function will be assigned to this template variable instead of being
+    output to the template.
+
+> **Note**
+>
+> `{math}` is an expensive function in performance due to its use of the
+> php [`eval()`](https://www.php.net/eval) function. Doing the math in PHP
+> is much more efficient, so whenever possible do the math calculations
+> in the script and [`assign()`](../../programmers/api-functions/api-assign.md) the results to the
+> template. Definitely avoid repetitive `{math}` function calls, eg
+> within [`{section}`](../language-builtin-functions/language-function-section.md) loops.
+
+## Examples
+
+**Example 1**
+```smarty
+
+{* $height=4, $width=5 *}
+
+{math equation="x + y" x=$height y=$width}
+```
+      
+The above example will output:
+
+```
+9
+```
+
+
+**Example 2**
+
+```smarty
+{* $row_height = 10, $row_width = 20, #col_div# = 2, assigned in template *}
+
+{math equation="height * width / division"
+    height=$row_height
+    width=$row_width
+    division=#col_div#}
+```
+
+The above example will output:
+
+```
+100
+```
+      
+**Example 3**
+
+```smarty
+{* you can use parenthesis *}
+
+{math equation="(( x + y ) / z )" x=2 y=10 z=2}
+```
+
+The above example will output:
+
+```
+6
+```
+
+**Example 4**
+
+```smarty
+{* you can supply a format parameter in sprintf format *}
+
+{math equation="x + y" x=4.4444 y=5.0000 format="%.2f"}
+```     
+      
+The above example will output:
+```
+9.44
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-textformat.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-textformat.md
new file mode 100644
index 000000000..cb2a8d708
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-textformat.md
@@ -0,0 +1,182 @@
+# {textformat}
+
+`{textformat}` is a block tag used to
+format text. It basically cleans up spaces and special characters, and
+formats paragraphs by wrapping at a boundary and indenting lines.
+
+You can set the parameters explicitly, or use a preset style. Currently,
+"email" is the only available style.
+
+## Attributes
+
+| Attribute Name | Default          | Description                                                                            |
+|----------------|------------------|----------------------------------------------------------------------------------------|
+| style          | *n/a*            | Preset style                                                                           |
+| indent         | *0*              | The number of chars to indent every line                                               |
+| indent\_first  | *0*              | The number of chars to indent the first line                                           |
+| indent\_char   | *(single space)* | The character (or string of chars) to indent with                                      |
+| wrap           | *80*             | How many characters to wrap each line to                                               |
+| wrap\_char     | *\\n*            | The character (or string of chars) to break each line with                             |
+| wrap\_cut      | *FALSE*          | If TRUE, wrap will break the line at the exact character instead of at a word boundary |
+| assign         | *n/a*            | The template variable the output will be assigned to                                   |
+
+## Examples
+
+```smarty
+{textformat wrap=40}
+
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+
+This is bar.
+
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+
+{/textformat}
+```
+
+The above example will output:
+
+```
+This is foo. This is foo. This is foo.
+This is foo. This is foo. This is foo.
+
+This is bar.
+
+bar foo bar foo foo. bar foo bar foo
+foo. bar foo bar foo foo. bar foo bar
+foo foo. bar foo bar foo foo. bar foo
+bar foo foo. bar foo bar foo foo.
+```
+
+```smarty
+{textformat wrap=40 indent=4}
+
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+
+This is bar.
+
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+
+{/textformat}
+```
+
+The above example will output:
+
+```
+    This is foo. This is foo. This is
+    foo. This is foo. This is foo. This
+    is foo.
+    
+    This is bar.
+    
+    bar foo bar foo foo. bar foo bar foo
+    foo. bar foo bar foo foo. bar foo
+    bar foo foo. bar foo bar foo foo.
+    bar foo bar foo foo. bar foo bar
+    foo foo.
+```
+
+
+```smarty
+{textformat wrap=40 indent=4 indent_first=4}
+
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+
+This is bar.
+
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+
+{/textformat}
+```
+
+The above example will output:
+
+
+```
+   This is foo. This is foo. This
+   is foo. This is foo. This is foo.
+   This is foo.
+
+   This is bar.
+
+   bar foo bar foo foo. bar foo bar
+   foo foo. bar foo bar foo foo. bar
+   foo bar foo foo. bar foo bar foo
+   foo. bar foo bar foo foo. bar foo
+   bar foo foo.
+```
+      
+
+```smarty
+{textformat style="email"}
+
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+This is foo.
+
+This is bar.
+
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+bar foo bar foo     foo.
+
+{/textformat}
+```
+
+The above example will output:
+
+
+```
+This is foo. This is foo. This is foo. This is foo. This is foo. This is
+foo.
+
+This is bar.
+
+bar foo bar foo foo. bar foo bar foo foo. bar foo bar foo foo. bar foo
+bar foo foo. bar foo bar foo foo. bar foo bar foo foo. bar foo bar foo
+foo.
+```
+     
+
+See also [`{strip}`](../language-builtin-functions/language-function-strip.md) and
+[`wordwrap`](../language-modifiers/language-modifier-wordwrap.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/index.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/index.md
new file mode 100644
index 000000000..3f52c2e77
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/index.md
@@ -0,0 +1,104 @@
+# Variable Modifiers
+
+Variable modifiers can be applied to
+[variables](../language-variables/index.md), [custom tags](../language-custom-functions/index.md)
+or strings. To apply a modifier,
+specify the value followed by a `|` (pipe) and the modifier name. A
+modifier may accept additional parameters that affect its behavior.
+These parameters follow the modifier name and are separated by a `:`
+(colon). 
+
+Modifiers can be applied to any type of variables, including arrays
+and objects.
+
+## Examples
+
+```smarty
+{* apply modifier to a variable *}
+{$title|upper}
+
+{* modifier with parameters *}
+{$title|truncate:40:"..."}
+
+{* apply modifier to a function parameter *}
+{html_table loop=$myvar|upper}
+
+{* with parameters *}
+{html_table loop=$myvar|truncate:40:"..."}
+
+{* apply modifier to literal string *}
+{"foobar"|upper}
+
+{* using date_format to format the current date *}
+{$smarty.now|date_format:"%Y/%m/%d"}
+
+{* apply modifier to a custom function *}
+{mailto|upper address="smarty@example.com"}
+
+{* using  php's str_repeat *}
+{"="|str_repeat:80}
+
+{* php's count *}
+{$myArray|@count}
+
+{* this will uppercase the whole array *}
+<select name="name_id">
+{html_options output=$my_array|upper}
+</select>
+```  
+
+## Combining Modifiers
+
+You can apply any number of modifiers to a variable. They will be
+applied in the order they are combined, from left to right. They must be
+separated with a `|` (pipe) character.
+
+```php
+<?php
+
+$smarty->assign('articleTitle', 'Smokers are Productive, but Death Cuts Efficiency.');
+```
+
+where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|upper|spacify}
+{$articleTitle|lower|spacify|truncate}
+{$articleTitle|lower|truncate:30|spacify}
+{$articleTitle|lower|spacify|truncate:30:". . ."}
+```
+
+
+The above example will output:
+
+```
+Smokers are Productive, but Death Cuts Efficiency.
+S M O K E R S   A R ....snip....  H   C U T S   E F F I C I E N C Y .
+s m o k e r s   a r ....snip....  b u t   d e a t h   c u t s...
+s m o k e r s   a r e   p r o d u c t i v e ,   b u t . . .
+s m o k e r s   a r e   p. . .
+```
+
+## Using modifiers in expressions
+
+Modifiers can also be used in expressions. For example, you can use the [isset modifier](./language-modifier-isset.md)
+to test if a variable holds a value different from null.
+
+```smarty
+{if $varA|isset}
+    <b>variable A is set</b>
+{/if}
+```
+
+You can also use modifiers in expressions in a PHP-style syntax:
+
+```smarty
+{if isset($varA)}
+    <b>variable A is set</b>
+{/if}
+```
+
+See also [`registerPlugin()`](../../programmers/api-functions/api-register-plugin.md), [combining
+modifiers](../language-combining-modifiers.md). and [extending smarty with
+plugins](../../api/extending/introduction.md)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-capitalize.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-capitalize.md
new file mode 100644
index 000000000..0368c7b3b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-capitalize.md
@@ -0,0 +1,49 @@
+# capitalize
+
+This is used to capitalize the first letter of all words in a variable.
+This is similar to the PHP [`ucwords()`](https://www.php.net/ucwords)
+function.
+
+## Basic usage
+```smarty
+{$myVar|capitalize}
+```
+
+## Parameters
+
+| Parameter | Type    | Required | Description                                                                                           |
+|-----------|---------|----------|-------------------------------------------------------------------------------------------------------|
+| 1         | boolean | No       | This determines whether or not words with digits will be uppercased                                   |
+| 2         | boolean | No       | This determines whether or not Capital letters within words should be lowercased, e.g. "aAa" to "Aaa" |
+
+
+## Examples
+
+```php
+<?php
+
+    $smarty->assign('articleTitle', 'next x-men film, x3, delayed.');
+
+```
+       
+
+Where the template is:
+
+```smarty
+    {$articleTitle}
+    {$articleTitle|capitalize}
+    {$articleTitle|capitalize:true}
+```
+       
+
+Will output:
+
+```
+    next x-men film, x3, delayed.
+    Next X-Men Film, x3, Delayed.
+    Next X-Men Film, X3, Delayed.
+```
+       
+
+See also [`lower`](language-modifier-lower.md) and
+[`upper`](language-modifier-upper.md)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-cat.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-cat.md
new file mode 100644
index 000000000..97dda4b37
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-cat.md
@@ -0,0 +1,36 @@
+# cat
+
+This value is concatenated to the given variable.
+
+## Basic usage
+```smarty
+{$myVar|cat:' units'}
+```
+
+## Parameters
+
+| Parameter | Type   | Required | Description                                      |
+|-----------|--------|----------|--------------------------------------------------|
+| 1         | string | No       | This value to concatenate to the given variable. |
+
+## Examples
+
+```php
+<?php
+
+    $smarty->assign('articleTitle', "Psychics predict world didn't end");
+
+```
+
+Where template is:
+
+```smarty
+    {$articleTitle|cat:' yesterday.'}
+```
+
+Will output:
+
+```
+    Psychics predict world didn't end yesterday.
+```
+       
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-characters.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-characters.md
new file mode 100644
index 000000000..8fc37d7a9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-characters.md
@@ -0,0 +1,43 @@
+# count_characters
+
+This is used to count the number of characters in a variable.
+
+## Basic usage
+```smarty
+{$myVar|count_characters}
+```
+
+## Parameters
+
+| Parameter | Type    | Required | Description                                                            |
+|-----------|---------|----------|------------------------------------------------------------------------|
+| 1         | boolean | No       | This determines whether to include whitespace characters in the count. |
+
+## Examples
+
+```php
+<?php
+
+    $smarty->assign('articleTitle', 'Cold Wave Linked to Temperatures.');
+
+```
+
+Where template is:
+
+```smarty
+    {$articleTitle}
+    {$articleTitle|count_characters}
+    {$articleTitle|count_characters:true}
+```
+
+Will output:
+
+```
+    Cold Wave Linked to Temperatures.
+    29
+    33
+```
+       
+See also [`count_words`](language-modifier-count-words.md),
+[`count_sentences`](language-modifier-count-sentences.md) and
+[`count_paragraphs`](language-modifier-count-paragraphs.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-paragraphs.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-paragraphs.md
new file mode 100644
index 000000000..060cb98a5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-paragraphs.md
@@ -0,0 +1,41 @@
+# count_paragraphs
+
+This is used to count the number of paragraphs in a variable.
+
+## Basic usage
+```smarty
+{$myVar|count_paragraphs}
+```
+
+## Examples
+
+```php
+<?php
+
+    $smarty->assign('articleTitle',
+                     "War Dims Hope for Peace. Child's Death Ruins Couple's Holiday.\n\n
+                     Man is Fatally Slain. Death Causes Loneliness, Feeling of Isolation."
+                    );
+
+```
+
+Where template is:
+
+```smarty
+    {$articleTitle}
+    {$articleTitle|count_paragraphs}
+```
+       
+
+Will output:
+
+```
+    War Dims Hope for Peace. Child's Death Ruins Couple's Holiday.
+
+    Man is Fatally Slain. Death Causes Loneliness, Feeling of Isolation.
+    2
+```
+
+See also [`count_characters`](language-modifier-count-characters.md),
+[`count_sentences`](language-modifier-count-sentences.md) and
+[`count_words`](language-modifier-count-words.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-sentences.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-sentences.md
new file mode 100644
index 000000000..dd2f69c61
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-sentences.md
@@ -0,0 +1,39 @@
+# count_sentences
+
+This is used to count the number of sentences in a variable. A sentence
+being delimited by a dot, question- or exclamation-mark (.?!).
+
+## Basic usage
+```smarty
+{$myVar|count_sentences}
+```
+
+## Examples
+
+```php
+<?php
+
+    $smarty->assign('articleTitle',
+                     'Two Soviet Ships Collide - One Dies.
+                     Enraged Cow Injures Farmer with Axe.'
+                     );
+
+```
+
+Where template is:
+
+```smarty
+    {$articleTitle}
+    {$articleTitle|count_sentences}
+```
+
+Will output:
+
+```
+    Two Soviet Ships Collide - One Dies. Enraged Cow Injures Farmer with Axe.
+    2
+```
+       
+See also [`count_characters`](language-modifier-count-characters.md),
+[`count_paragraphs`](language-modifier-count-paragraphs.md) and
+[`count_words`](language-modifier-count-words.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-words.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-words.md
new file mode 100644
index 000000000..1ab0d1d47
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-words.md
@@ -0,0 +1,35 @@
+# count_words
+
+This is used to count the number of words in a variable.
+
+## Basic usage
+```smarty
+{$myVar|count_words}
+```
+
+## Examples
+
+```php
+<?php
+
+    $smarty->assign('articleTitle', 'Dealers Will Hear Car Talk at Noon.');
+
+```
+
+Where template is:
+
+```smarty
+    {$articleTitle}
+    {$articleTitle|count_words}
+```
+
+This will output:
+
+```
+    Dealers Will Hear Car Talk at Noon.
+    7
+```
+
+See also [`count_characters`](language-modifier-count-characters.md),
+[`count_paragraphs`](language-modifier-count-paragraphs.md) and
+[`count_sentences`](language-modifier-count-sentences.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count.md
new file mode 100644
index 000000000..36436a398
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count.md
@@ -0,0 +1,21 @@
+# count
+
+Returns the number of elements in an array (or Countable object). Will return 0 for null.
+Returns 1 for any other type (such as a string).
+
+If the optional mode parameter is set to 1, count() will recursively count the array. 
+This is particularly useful for counting all the elements of a multidimensional array.
+
+## Basic usage
+```smarty
+{if $myVar|count > 3}4 or more{/if}
+{if count($myVar) > 3}4 or more{/if}
+```
+
+
+## Parameters
+
+| Parameter | Type | Required | Description                                            |
+|-----------|------|----------|--------------------------------------------------------|
+| 1         | int  | No       | If set to 1, count() will recursively count the array. |
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-date-format.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-date-format.md
new file mode 100644
index 000000000..620d085b8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-date-format.md
@@ -0,0 +1,145 @@
+# date_format
+
+This formats a date and time into the given
+[`strftime()`](https://www.php.net/strftime) format. Dates can be passed to
+Smarty as unix [timestamps](https://www.php.net/function.time), [DateTime
+objects](https://www.php.net/class.DateTime), mysql timestamps or any string
+made up of month day year, parsable by php\'s
+[`strtotime()`](https://www.php.net/strtotime). Designers can then use
+`date_format` to have complete control of the formatting of the date. If
+the date passed to `date_format` is empty and a second parameter is
+passed, that will be used as the date to format.
+
+## Basic usage
+```smarty
+{$myVar|date_format:"%Y-%m-%d"}
+```
+
+## Parameters
+
+| Parameter Position | Type   | Required | Default   | Description                                     |
+|--------------------|--------|----------|-----------|-------------------------------------------------|
+| 1                  | string | No       | %b %e, %Y | This is the format for the outputted date.      |
+| 2                  | string | No       | n/a       | This is the default date if the input is empty. |
+
+> **Note**
+>
+> Since Smarty-2.6.10 numeric values passed to `date_format` are
+> *always* (except for mysql timestamps, see below) interpreted as a
+> unix timestamp.
+>
+> Before Smarty-2.6.10 numeric strings that where also parsable by
+> `strtotime()` in php (like `YYYYMMDD`) where sometimes (depending on
+> the underlying implementation of `strtotime()`) interpreted as date
+> strings and NOT as timestamps.
+>
+> The only exception are mysql timestamps: They are also numeric only
+> and 14 characters long (`YYYYMMDDHHMMSS`), mysql timestamps have
+> precedence over unix timestamps.
+
+> **Note**
+>
+> `date_format` is essentially a wrapper to PHP's
+> [`strftime()`](https://www.php.net/strftime) function. You may have more
+> or less conversion specifiers available depending on your system's
+> [`strftime()`](https://www.php.net/strftime) function where PHP was
+> compiled. Check your system\'s manpage for a full list of valid
+> specifiers. However, a few of the specifiers are emulated on Windows.
+> These are: %D, %e, %h, %l, %n, %r, %R, %t, %T.
+
+## Examples
+
+```php
+<?php
+
+$config['date'] = '%I:%M %p';
+$config['time'] = '%H:%M:%S';
+$smarty->assign('config', $config);
+$smarty->assign('yesterday', strtotime('-1 day'));
+
+```
+
+This template uses [`$smarty.now`](../language-variables/language-variables-smarty.md#smartynow-languagevariablessmartynow) to
+get the current time:
+
+```smarty
+{$smarty.now|date_format}
+{$smarty.now|date_format:"%D"}
+{$smarty.now|date_format:$config.date}
+{$yesterday|date_format}
+{$yesterday|date_format:"%A, %B %e, %Y"}
+{$yesterday|date_format:$config.time}
+```
+
+This above will output:
+
+```
+Jan 1, 2022
+01/01/22
+02:33 pm
+Dec 31, 2021
+Monday, December 1, 2021
+14:33:00
+```
+       
+## Conversion specifiers
+
+`date_format` conversion specifiers:
+
+-   %a - abbreviated weekday name according to the current locale
+-   %A - full weekday name according to the current locale
+-   %b - abbreviated month name according to the current locale
+-   %B - full month name according to the current locale
+-   %c - preferred date and time representation for the current locale
+-   %C - century number (the year divided by 100 and truncated to an
+    integer, range 00 to 99)
+-   %d - day of the month as a decimal number (range 01 to 31)
+-   %D - same as %m/%d/%y
+-   %e - day of the month as a decimal number, a single digit is
+    preceded by a space (range 1 to 31)
+-   %g - Week-based year within century \[00,99\]
+-   %G - Week-based year, including the century \[0000,9999\]
+-   %h - same as %b
+-   %H - hour as a decimal number using a 24-hour clock (range 00
+    to 23)
+-   %I - hour as a decimal number using a 12-hour clock (range 01
+    to 12)
+-   %j - day of the year as a decimal number (range 001 to 366)
+-   %k - Hour (24-hour clock) single digits are preceded by a blank.
+    (range 0 to 23)
+-   %l - hour as a decimal number using a 12-hour clock, single digits
+    preceded by a space (range 1 to 12)
+-   %m - month as a decimal number (range 01 to 12)
+-   %M - minute as a decimal number
+-   %n - newline character
+-   %p - either 'am' or 'pm' according to the given time value, or
+    the corresponding strings for the current locale
+-   %r - time in a.m. and p.m. notation
+-   %R - time in 24 hour notation
+-   %S - second as a decimal number
+-   %t - tab character
+-   %T - current time, equal to %H:%M:%S
+-   %u - weekday as a decimal number \[1,7\], with 1 representing
+    Monday
+-   %U - week number of the current year as a decimal number, starting
+    with the first Sunday as the first day of the first week
+-   %V - The ISO 8601:1988 week number of the current year as a decimal
+    number, range 01 to 53, where week 1 is the first week that has at
+    least 4 days in the current year, and with Monday as the first day
+    of the week.
+-   %w - day of the week as a decimal, Sunday being 0
+-   %W - week number of the current year as a decimal number, starting
+    with the first Monday as the first day of the first week
+-   %x - preferred date representation for the current locale without
+    the time
+-   %X - preferred time representation for the current locale without
+    the date
+-   %y - year as a decimal number without a century (range 00 to 99)
+-   %Y - year as a decimal number including the century
+-   %Z - time zone or name or abbreviation
+-   %% - a literal '%' character
+
+See also [`$smarty.now`](../language-variables/language-variables-smarty.md#smartynow-languagevariablessmartynow),
+[`strftime()`](https://www.php.net/strftime),
+[`{html_select_date}`](../language-custom-functions/language-function-html-select-date.md) and the
+[date tips](../../appendixes/tips.md#dates) page.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-debug-print-var.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-debug-print-var.md
new file mode 100644
index 000000000..ce3f86a73
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-debug-print-var.md
@@ -0,0 +1,26 @@
+# debug_print_var
+
+
+
+Returns the value of the given variable in a human-readable format in HTML. 
+Used in the [debug console](../chapter-debugging-console.md), but you can also use it in your template
+while developing to see what is going on under the hood.
+
+> **Note**
+>
+> Use for debugging only! Since you may accidentally reveal sensitive information or introduce vulnerabilities such as XSS using this
+method never use it in production.
+
+## Basic usage
+```smarty
+{$myVar|debug_print_var}
+```
+
+
+## Parameters
+
+| Parameter | Type | Required | Description                                                            |
+|-----------|------|----------|------------------------------------------------------------------------|
+| 1         | int  | No       | maximum recursion depth if $var is an array or object (defaults to 10) |
+| 2         | int  | No       | maximum string length if $var is a string (defaults to 40)             |
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-default.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-default.md
new file mode 100644
index 000000000..b8697a0d9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-default.md
@@ -0,0 +1,45 @@
+# default
+
+This is used to set a default value for a variable. If the variable is
+unset or an empty string, the given default value is printed instead.
+Default takes the one argument.
+
+## Basic usage
+```smarty
+{$myVar|default:"(none)"}
+```
+
+## Parameters
+
+| Parameter | Type   | Required | Default | Description                                                   |
+|-----------|--------|----------|---------|---------------------------------------------------------------|
+| 1         | string | No       | *empty* | This is the default value to output if the variable is empty. |
+
+## Examples
+
+```php
+<?php
+
+    $smarty->assign('articleTitle', 'Dealers Will Hear Car Talk at Noon.');
+    $smarty->assign('email', '');
+
+```
+
+Where template is:
+
+```smarty
+{$articleTitle|default:'no title'}
+{$myTitle|default:'no title'}
+{$email|default:'No email address available'}
+```  
+
+Will output:
+
+```
+Dealers Will Hear Car Talk at Noon.
+no title
+No email address available
+```
+
+See also the [default variable handling](../../appendixes/tips.md#default-variable-handling) and
+the [blank variable handling](../../appendixes/tips.md#blank-variable-handling) pages.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-escape.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-escape.md
new file mode 100644
index 000000000..6fd5dd2b4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-escape.md
@@ -0,0 +1,78 @@
+# escape
+
+`escape` is used to encode or escape a variable to `html`, `url`,
+`single quotes`, `hex`, `hexentity`, `javascript` and `mail`. By default
+its `html`.
+
+## Basic usage
+```smarty
+{$myVar|escape}
+```
+
+## Parameters
+
+| Parameter Position | Type    | Required | Possible Values                                                                                                | Default | Description                                                                          |
+|--------------------|---------|----------|----------------------------------------------------------------------------------------------------------------|---------|--------------------------------------------------------------------------------------|
+| 1                  | string  | No       | `html`, `htmlall`, `url`, `urlpathinfo`, `quotes`, `hex`, `hexentity`, `javascript`, `mail`                    | `html`  | This is the escape format to use.                                                    |
+| 2                  | string  | No       | `ISO-8859-1`, `UTF-8`, and any character set supported by [`htmlentities()`](https://www.php.net/htmlentities) | `UTF-8` | The character set encoding passed to htmlentities() et. al.                          |
+| 3                  | boolean | No       | FALSE                                                                                                          | TRUE    | Double encode entities from &amp; to &amp;amp; (applies to `html` and `htmlall` only) |
+
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle',
+                "'Stiff Opposition Expected to Casketless Funeral Plan'"
+                );
+$smarty->assign('EmailAddress','smarty@example.com');
+
+```
+       
+
+These are example `escape` template lines followed by the output
+
+```smarty
+{$articleTitle}
+'Stiff Opposition Expected to Casketless Funeral Plan'
+
+{$articleTitle|escape}
+&#039;Stiff Opposition Expected to Casketless Funeral Plan&#039;
+
+{$articleTitle|escape:'html'}    {* escapes  & " ' < > *}
+&#039;Stiff Opposition Expected to Casketless Funeral Plan&#039;
+
+{$articleTitle|escape:'htmlall'} {* escapes ALL html entities *}
+&#039;Stiff Opposition Expected to Casketless Funeral Plan&#039;
+
+<a href="?title={$articleTitle|escape:'url'}">click here</a>
+<a
+href="?title=%27Stiff%20Opposition%20Expected%20to%20Casketless%20Funeral%20Plan%27">click here</a>
+
+{$articleTitle|escape:'quotes'}
+\'Stiff Opposition Expected to Casketless Funeral Plan\'
+
+<a href="mailto:{$EmailAddress|escape:"hex"}">{$EmailAddress|escape:"hexentity"}</a>
+{$EmailAddress|escape:'mail'}    {* this converts to email to text *}
+<a href="mailto:%62%6f%..snip..%65%74">&#x62;&#x6f;&#x62..snip..&#x65;&#x74;</a>
+
+{'mail@example.com'|escape:'mail'}
+smarty [AT] example [DOT] com
+
+{* the "rewind" parameter registers the current location *}
+<a href="$my_path?page=foo&rewind={$my_uri|escape:url}">click here</a>
+
+```
+
+This snippet is useful for emails, but see also
+[`{mailto}`](../language-custom-functions/language-function-mailto.md)
+
+```smarty
+{* email address mangled *}
+<a href="mailto:{$EmailAddress|escape:'hex'}">{$EmailAddress|escape:'mail'}</a>
+```
+
+See also [escaping smarty parsing](../language-basic-syntax/language-escaping.md),
+[`{mailto}`](../language-custom-functions/language-function-mailto.md) and the [obfuscating email
+addresses](../../appendixes/tips.md#obfuscating-e-mail-addresses) page.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-from-charset.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-from-charset.md
new file mode 100644
index 000000000..25c4d2d9e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-from-charset.md
@@ -0,0 +1,20 @@
+# from_charset
+
+`from_charset` is used to transcode a string from a given charset to the
+internal charset. This is the exact opposite of the [to_charset
+modifier](language-modifier-to-charset.md).
+
+## Parameters
+
+| Parameter Position | Type   | Required | Possible Values                                                                                                              | Default      | Description                                                   |
+|--------------------|--------|----------|------------------------------------------------------------------------------------------------------------------------------|--------------|---------------------------------------------------------------|
+| 1                  | string | No       | `ISO-8859-1`, `UTF-8`, and any character set supported by [`mb_convert_encoding()`](https://www.php.net/mb_convert_encoding) | `ISO-8859-1` | The charset encoding the value is supposed to be decoded from |
+
+> **Note**
+>
+> Charset encoding should be handled by the application itself. This
+> modifier should only be used in cases where the application cannot
+> anticipate that a certain string is required in another encoding.
+
+See also [Configuring Smarty](../../api/configuring.md), [to_charset
+modifier](language-modifier-to-charset.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-indent.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-indent.md
new file mode 100644
index 000000000..9fa3540a3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-indent.md
@@ -0,0 +1,67 @@
+# indent
+
+This indents a string on each line, default is 4. As an optional
+parameter, you can specify the number of characters to indent. As an
+optional second parameter, you can specify the character to use to
+indent with. For example: use `"\t"` for a tab.
+
+## Basic usage
+```smarty
+{$myVar|indent:4}
+```
+
+## Parameters
+
+| Parameter Position | Type    | Required | Default     | Description                                       |
+|--------------------|---------|----------|-------------|---------------------------------------------------|
+| 1                  | integer | No       | 4           | This determines how many characters to indent to. |
+| 2                  | string  | No       | (one space) | This is the character used to indent with.        |
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle',
+                'NJ judge to rule on nude beach.
+Sun or rain expected today, dark tonight.
+Statistics show that teen pregnancy drops off significantly after 25.'
+                );
+```
+
+Where template is:
+
+```smarty
+{$articleTitle}
+
+{$articleTitle|indent}
+
+{$articleTitle|indent:10}
+
+{$articleTitle|indent:1:"\t"}
+```
+       
+Will output:
+
+```
+NJ judge to rule on nude beach.
+Sun or rain expected today, dark tonight.
+Statistics show that teen pregnancy drops off significantly after 25.
+
+    NJ judge to rule on nude beach.
+    Sun or rain expected today, dark tonight.
+    Statistics show that teen pregnancy drops off significantly after 25.
+
+          NJ judge to rule on nude beach.
+          Sun or rain expected today, dark tonight.
+          Statistics show that teen pregnancy drops off significantly after 25.
+
+        NJ judge to rule on nude beach.
+        Sun or rain expected today, dark tonight.
+        Statistics show that teen pregnancy drops off significantly after 25.
+```
+       
+
+See also [`strip`](language-modifier-strip.md),
+[`wordwrap`](language-modifier-wordwrap.md) and
+[`spacify`](language-modifier-spacify.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-is_array.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-is_array.md
new file mode 100644
index 000000000..f6cfffcd1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-is_array.md
@@ -0,0 +1,9 @@
+# is_array
+
+Return true if the variable passed to it is an array.
+
+## Basic usage
+
+```smarty
+{if $myVar|is_array}it's an array{/if}
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-isset.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-isset.md
new file mode 100644
index 000000000..83e31dfa9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-isset.md
@@ -0,0 +1,11 @@
+# isset
+
+Returns true if the variable(s) passed to it are different from null.
+
+If multiple parameters are supplied then isset() will return true only if all of the parameters are 
+not null.
+
+## Basic usage
+```smarty
+{if $myVar|isset}all set!{/if}
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-join.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-join.md
new file mode 100644
index 000000000..9a044714d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-join.md
@@ -0,0 +1,26 @@
+# join
+
+Returns a string containing all the element of the given array 
+with the separator string between each.
+
+## Basic usage
+
+For `$myArray` populated with `['a','b','c']`, the following will return the string `abc`.
+```smarty
+{$myArray|join}
+```
+
+
+## Parameters
+
+| Parameter | Type   | Required | Description                                                 |
+|-----------|--------|----------|-------------------------------------------------------------|
+| 1         | string | No       | glue used between array elements. Defaults to empty string. |
+
+## Examples
+
+
+For `$myArray` populated with `[1,2,3]`, the following will return the string `1-2-3`.
+```smarty
+{$myArray|join:"-"}
+```
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-json-encode.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-json-encode.md
new file mode 100644
index 000000000..4e70f0c26
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-json-encode.md
@@ -0,0 +1,27 @@
+# json_encode
+
+Transforms a value into a valid JSON string.
+
+## Basic usage
+```smarty
+{$user|json_encode}
+```
+Depending on the value of `$user` this would return a string in JSON-format, e.g. `{"username":"my_username","email":"my_username@smarty.net"}`.
+
+
+## Parameters
+
+| Parameter | Type | Required | Description                                                                               |
+|-----------|------|----------|-------------------------------------------------------------------------------------------|
+| 1         | int  | No       | bitmask of flags, directly passed to [PHP's json_encode](https://www.php.net/json_encode) |
+
+
+## Examples
+
+By passing `16` as the second parameter, you can force json_encode to always format the JSON-string as an object.
+Without it, an array `$myArray = ["a","b"]` would be formatted as a javascript array: 
+
+```smarty
+{$myArray|json_encode} # renders: ["a","b"]
+{$myArray|json_encode:16} # renders: {"0":"a","1":"b"}
+```
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-lower.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-lower.md
new file mode 100644
index 000000000..e5e6886f1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-lower.md
@@ -0,0 +1,34 @@
+# lower
+
+This is used to lowercase a variable. This is equivalent to the PHP
+[`strtolower()`](https://www.php.net/strtolower) function.
+
+## Basic usage
+```smarty
+{$myVar|lower}
+```
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle', 'Two Convicts Evade Noose, Jury Hung.');
+```
+
+Where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|lower}
+```
+
+This will output:
+
+```
+Two Convicts Evade Noose, Jury Hung.
+two convicts evade noose, jury hung.
+```
+       
+See also [`upper`](language-modifier-upper.md) and
+[`capitalize`](language-modifier-capitalize.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-nl2br.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-nl2br.md
new file mode 100644
index 000000000..2808716fc
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-nl2br.md
@@ -0,0 +1,37 @@
+# nl2br
+
+All `"\n"` line breaks will be converted to html `<br />` tags in the
+given variable. This is equivalent to the PHP\'s
+[`nl2br()`](https://www.php.net/nl2br) function.
+
+## Basic usage
+```smarty
+{$myVar|nl2br}
+```
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle',
+                "Sun or rain expected\ntoday, dark tonight"
+                );
+
+```
+
+Where the template is:
+
+```smarty
+{$articleTitle|nl2br}
+```
+       
+Will output:
+
+```
+Sun or rain expected<br />today, dark tonight
+```
+
+See also [`word_wrap`](language-modifier-wordwrap.md),
+[`count_paragraphs`](language-modifier-count-paragraphs.md) and
+[`count_sentences`](language-modifier-count-sentences.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-noprint.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-noprint.md
new file mode 100644
index 000000000..5dbfaa30d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-noprint.md
@@ -0,0 +1,9 @@
+# noprint
+
+Always returns an empty string. This can be used to call a function or a method on an object that 
+returns output, and suppress the output.
+
+## Basic usage
+```smarty
+{$controller->sendEmail()|noprint}
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-number-format.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-number-format.md
new file mode 100644
index 000000000..44c3acf44
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-number-format.md
@@ -0,0 +1,32 @@
+# number_format
+
+Allows you to format a number using decimals and a thousands-separator. By default, the number of decimals is 0 
+and the number is rounded.
+
+## Basic usage
+```smarty
+{$num  = 2000.151}
+{$num|number_format} # renders: 2,000
+```
+
+
+## Parameters
+
+| Parameter | Type   | Required | Description                           |
+|-----------|--------|----------|---------------------------------------|
+| 1         | int    | No       | number of decimals (defaults to 0)    |
+| 2         | string | No       | decimal separator (defaults to ".")   |
+| 3         | string | No       | thousands-separator (defaults to ",") |
+
+
+## Examples
+
+```smarty
+{$num  = 2000.151}
+{$num|number_format:2} # renders: 2,000.15
+```
+
+```smarty
+{$num  = 2000.151}
+{$num|number_format:2:".":""} # renders: 2000.15
+```
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-regex-replace.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-regex-replace.md
new file mode 100644
index 000000000..033d2a43d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-regex-replace.md
@@ -0,0 +1,55 @@
+# regex_replace
+
+A regular expression search and replace on a variable. Use the
+[`preg_replace()`](https://www.php.net/preg_replace) syntax from the PHP
+manual.
+
+## Basic usage
+```smarty
+{$myVar|regex_replace:"/foo/":"bar"}
+```
+
+> **Note**
+>
+> Although Smarty supplies this regex convenience modifier, it is
+> usually better to apply regular expressions in PHP, either via custom
+> functions or modifiers. Regular expressions are considered application
+> code and are not part of presentation logic.
+
+## Parameters
+
+| Parameter Position | Type   | Required | Description                                    |
+|--------------------|--------|----------|------------------------------------------------|
+| 1                  | string | Yes      | This is the regular expression to be replaced. |
+| 2                  | string | Yes      | This is the string of text to replace with.    |
+
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle', "Infertility unlikely to\nbe passed on, experts say.");
+
+```
+
+Where template is:
+
+```smarty
+{* replace each carriage return, tab and new line with a space *}
+
+{$articleTitle}
+{$articleTitle|regex_replace:"/[\r\t\n]/":" "}
+```
+       
+Will output:
+
+```
+Infertility unlikely to
+be passed on, experts say.
+Infertility unlikely to be passed on, experts say.
+```
+       
+
+See also [`replace`](language-modifier-replace.md) and
+[`escape`](language-modifier-escape.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-replace.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-replace.md
new file mode 100644
index 000000000..0e01ab46f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-replace.md
@@ -0,0 +1,45 @@
+# replace
+
+A simple search and replace on a variable. This is equivalent to the
+PHP's [`str_replace()`](https://www.php.net/str_replace) function.
+
+## Basic usage
+```smarty
+{$myVar|replace:"foo":"bar"}
+```
+
+## Parameters
+
+| Parameter Position | Type   | Required | Description                                 |
+|--------------------|--------|----------|---------------------------------------------|
+| 1                  | string | Yes      | This is the string of text to be replaced.  |
+| 2                  | string | Yes      | This is the string of text to replace with. |
+
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle', "Child's Stool Great for Use in Garden.");
+
+```
+
+Where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|replace:'Garden':'Vineyard'}
+{$articleTitle|replace:' ':'   '}
+```
+       
+Will output:
+
+```
+Child's Stool Great for Use in Garden.
+Child's Stool Great for Use in Vineyard.
+Child's   Stool   Great   for   Use   in   Garden.
+```
+
+See also [`regex_replace`](language-modifier-regex-replace.md) and
+[`escape`](language-modifier-escape.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-round.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-round.md
new file mode 100644
index 000000000..c05b899a9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-round.md
@@ -0,0 +1,35 @@
+# round
+
+Rounds a number to the specified precision.
+
+## Basic usage
+```smarty
+{3.14|round} # renders: 3
+```
+
+```smarty
+{3.141592|round:2} # renders: 3.14
+```
+
+## Parameters
+
+| Parameter | Type | Required | Description               |
+|-----------|------|----------|---------------------------|
+| 1         | int  | No       | precision (defaults to 0) |
+| 2         | int  | No       | mode (defaults to 1)      |
+
+If 'precision' is negative, the number is rounded to the nearest power of 10. See examples below.
+
+The parameter 'mode' defines how the rounding is done. By default, 2.5 is rounded to 3, whereas 2.45 is rounded to 2.
+You usually don't need to change this. For more details on rounding modes, 
+see [PHP's documentation on round](https://www.php.net/manual/en/function.round).
+
+## Examples
+
+By passing `16` as the second parameter, you can force json_encode to always format the JSON-string as an object.
+Without it, an array `$myArray = ["a","b"]` would be formatted as a javascript array:
+
+```smarty
+{$myArray|json_encode} # renders: ["a","b"]
+{$myArray|json_encode:16} # renders: {"0":"a","1":"b"}
+```
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-spacify.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-spacify.md
new file mode 100644
index 000000000..229e2d22d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-spacify.md
@@ -0,0 +1,44 @@
+# spacify
+
+`spacify` is a way to insert a space between every character of a
+variable. You can optionally pass a different character or string to
+insert.
+
+## Basic usage
+```smarty
+{$myVar|spacify}
+```
+
+## Parameters
+
+| Parameter Position | Type   | Required | Default     | Description                                                     |
+|--------------------|--------|----------|-------------|-----------------------------------------------------------------|
+| 1                  | string | No       | *one space* | This what gets inserted between each character of the variable. |
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle', 'Something Went Wrong in Jet Crash, Experts Say.');
+
+```
+
+Where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|spacify}
+{$articleTitle|spacify:"^^"}
+```
+
+Will output:
+
+```
+Something Went Wrong in Jet Crash, Experts Say.
+S o m e t h i n g   W .... snip ....  s h ,   E x p e r t s   S a y .
+S^^o^^m^^e^^t^^h^^i^^n^^g^^ .... snip .... ^^e^^r^^t^^s^^ ^^S^^a^^y^^.
+```
+
+See also [`wordwrap`](language-modifier-wordwrap.md) and
+[`nl2br`](language-modifier-nl2br.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-split.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-split.md
new file mode 100644
index 000000000..caef884f5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-split.md
@@ -0,0 +1,32 @@
+# split
+
+Splits a string into an array, using the optional second parameter as the separator.
+
+## Basic usage
+
+For `$chars` populated with `'abc'`, the following will produce a html list with 3 elements (a, b and c).
+```smarty
+<ol>
+    {foreach $chars|split as $char}
+        <li>{$char|escape}</li>
+    {/foreach}
+</ol>
+```
+
+## Parameters
+
+| Parameter | Type   | Required | Description                                                                                                                  |
+|-----------|--------|----------|------------------------------------------------------------------------------------------------------------------------------|
+| 1         | string | No       | separator used to split the string on. Defaults to empty string, causing each character in the source string to be separate. |
+
+## Examples
+
+
+For `$ids` populated with `'1,2,3'`, the following will produce a html list with 3 elements (1, 2 and 3).
+```smarty
+<ol>
+    {foreach $ids|split:',' as $id}
+        <li>{$id|escape}</li>
+    {/foreach}
+</ol>
+```
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-str-repeat.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-str-repeat.md
new file mode 100644
index 000000000..1ae1824d6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-str-repeat.md
@@ -0,0 +1,14 @@
+# str_repeat
+
+Repeats the given value n times.
+
+## Basic usage
+```smarty
+{"hi"|str_repeat:2} # renders: hihi
+```
+
+## Parameters
+
+| Parameter | Type | Required | Description           |
+|-----------|------|----------|-----------------------|
+| 1         | int  | yes      | number of repetitions |
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-string-format.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-string-format.md
new file mode 100644
index 000000000..6163a0785
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-string-format.md
@@ -0,0 +1,43 @@
+# string_format
+
+This is a way to format strings, such as decimal numbers and such. Use
+the syntax for [`sprintf()`](https://www.php.net/sprintf) for the
+formatting.
+
+## Basic usage
+```smarty
+{$myVar|string_format:"%d"}
+```
+
+## Parameters
+
+| Parameter Position | Type   | Required | Description                           |
+|--------------------|--------|----------|---------------------------------------|
+| 1                  | string | Yes      | This is what format to use. (sprintf) |
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('number', 23.5787446);
+
+```
+
+Where template is:
+
+```smarty
+{$number}
+{$number|string_format:"%.2f"}
+{$number|string_format:"%d"}
+```
+
+Will output:
+
+```
+23.5787446
+23.58
+23
+```
+
+See also [`date_format`](language-modifier-date-format.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip-tags.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip-tags.md
new file mode 100644
index 000000000..7d94fdd0d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip-tags.md
@@ -0,0 +1,46 @@
+# strip_tags
+
+This strips out HTML markup tags, basically anything between `<` and `>`.
+
+## Basic usage
+```smarty
+{$myVar|strip_tags}
+```
+
+## Parameters
+
+| Parameter Position | Type | Required | Default | Description                                                |
+|--------------------|------|----------|---------|------------------------------------------------------------|
+| 1                  | bool | No       | TRUE    | This determines whether the tags are replaced by ' ' or '' |
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle',
+                "Blind Woman Gets <font face=\"helvetica\">New
+Kidney</font> from Dad she Hasn't Seen in <b>years</b>."
+               );
+
+```
+       
+
+Where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|strip_tags} {* same as {$articleTitle|strip_tags:true} *}
+{$articleTitle|strip_tags:false}
+```
+
+Will output:
+
+```html
+Blind Woman Gets <font face="helvetica">New Kidney</font> from Dad she Hasn't Seen in <b>years</b>.
+Blind Woman Gets  New Kidney  from Dad she Hasn't Seen in  years .
+Blind Woman Gets New Kidney from Dad she Hasn't Seen in years.
+```
+
+See also [`replace`](language-modifier-replace.md) and
+[`regex_replace`](language-modifier-regex-replace.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip.md
new file mode 100644
index 000000000..b7bdc282c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip.md
@@ -0,0 +1,42 @@
+# strip
+
+This replaces all spaces, newlines and tabs with a single space, or with
+the supplied string.
+
+## Basic usage
+```smarty
+{$myVar|strip}
+```
+
+> **Note**
+>
+> If you want to strip blocks of template text, use the built-in
+> [`{strip}`](../language-builtin-functions/language-function-strip.md) function.
+
+## Examples
+
+```php
+<?php
+$smarty->assign('articleTitle', "Grandmother of\neight makes\t    hole in one.");
+$smarty->display('index.tpl');
+```
+
+Where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|strip}
+{$articleTitle|strip:'&nbsp;'}
+```
+
+Will output:
+
+```html
+Grandmother of
+eight makes        hole in one.
+Grandmother of eight makes hole in one.
+Grandmother&nbsp;of&nbsp;eight&nbsp;makes&nbsp;hole&nbsp;in&nbsp;one.
+```
+
+See also [`{strip}`](../language-builtin-functions/language-function-strip.md) and
+[`truncate`](language-modifier-truncate.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strlen.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strlen.md
new file mode 100644
index 000000000..4c1f37ab7
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strlen.md
@@ -0,0 +1,9 @@
+# strlen
+
+Returns the length (number of characters) in the given string, including spaces.
+
+## Basic usage
+```smarty
+{"Smarty"|strlen} # renders: 6
+{156|strlen} # renders: 3
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-substr.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-substr.md
new file mode 100644
index 000000000..a79d8a4d1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-substr.md
@@ -0,0 +1,25 @@
+# substr
+
+Returns a part (substring) of the given string starting at a given offset.
+
+## Basic usage
+```smarty
+{"Smarty"|substr:2} # renders: arty
+{"Smarty"|substr:2:3} # renders: art
+```
+
+## Parameters
+
+| Parameter | Type | Required | Description                                         |
+|-----------|------|----------|-----------------------------------------------------|
+| 1         | int  | yes      | offset (zero based, can be negative)                |
+| 2         | int  | no       | length of substring returned (unlimited of omitted) |
+
+
+## Examples
+
+When used with a negative offset, the substring starts n characters from the end of the string counting backwards.
+```smarty
+{"Smarty"|substr:-2} # renders: ty
+{"Smarty"|substr:-2:1} # renders: t
+```
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-to-charset.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-to-charset.md
new file mode 100644
index 000000000..aa8cfd53f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-to-charset.md
@@ -0,0 +1,20 @@
+# to_charset
+
+`to_charset` is used to transcode a string from the internal charset to
+a given charset. This is the exact opposite of the [from_charset
+modifier](#language.modifier.from_charset).
+
+## Parameters
+
+| Parameter Position | Type   | Required | Possible Values                                                                                                              | Default      | Description                                                 |
+|--------------------|--------|----------|------------------------------------------------------------------------------------------------------------------------------|--------------|-------------------------------------------------------------|
+| 1                  | string | No       | `ISO-8859-1`, `UTF-8`, and any character set supported by [`mb_convert_encoding()`](https://www.php.net/mb_convert_encoding) | `ISO-8859-1` | The charset encoding the value is supposed to be encoded to |
+
+> **Note**
+>
+> Charset encoding should be handled by the application itself. This
+> modifier should only be used in cases where the application cannot
+> anticipate that a certain string is required in another encoding.
+
+See also [Configuring Smarty](../../api/configuring.md), [from_charset
+modifier](language-modifier-from-charset.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-truncate.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-truncate.md
new file mode 100644
index 000000000..1cbb7abcb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-truncate.md
@@ -0,0 +1,57 @@
+# truncate
+
+This truncates a variable to a character length, the default is 80. As
+an optional second parameter, you can specify a string of text to
+display at the end if the variable was truncated. The characters in the
+string are included with the original truncation length. By default,
+`truncate` will attempt to cut off at a word boundary. If you want to
+cut off at the exact character length, pass the optional third parameter
+of TRUE.
+
+## Basic usage
+```smarty
+{$myVar|truncate:40:"..."}
+```
+
+## Parameters
+
+| Parameter Position | Type    | Required | Default | Description                                                                                                                                                                                        |
+|--------------------|---------|----------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 1                  | integer | No       | 80      | This determines how many characters to truncate to.                                                                                                                                                |
+| 2                  | string  | No       | \...    | This is a text string that replaces the truncated text. Its length is included in the truncation length setting.                                                                                   |
+| 3                  | boolean | No       | FALSE   | This determines whether or not to truncate at a word boundary with FALSE, or at the exact character with TRUE.                                                                                     |
+| 4                  | boolean | No       | FALSE   | This determines whether the truncation happens at the end of the string with FALSE, or in the middle of the string with TRUE. Note that if this setting is TRUE, then word boundaries are ignored. |
+
+## Examples
+
+```php
+<?php
+$smarty->assign('articleTitle', 'Two Sisters Reunite after Eighteen Years at Checkout Counter.');
+```
+
+where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|truncate}
+{$articleTitle|truncate:30}
+{$articleTitle|truncate:30:""}
+{$articleTitle|truncate:30:"---"}
+{$articleTitle|truncate:30:"":true}
+{$articleTitle|truncate:30:"...":true}
+{$articleTitle|truncate:30:'..':true:true}
+```
+
+This will output:
+
+```
+Two Sisters Reunite after Eighteen Years at Checkout Counter.
+Two Sisters Reunite after Eighteen Years at Checkout Counter.
+Two Sisters Reunite after...
+Two Sisters Reunite after
+Two Sisters Reunite after---
+Two Sisters Reunite after Eigh
+Two Sisters Reunite after E...
+Two Sisters Re..ckout Counter.
+```
+       
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-unescape.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-unescape.md
new file mode 100644
index 000000000..8e8603053
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-unescape.md
@@ -0,0 +1,43 @@
+# unescape
+
+`unescape` is used to decode `entity`, `html` and `htmlall`. It counters
+the effects of the [escape modifier](language-modifier-escape.md) for the
+given types.
+
+## Basic usage
+```smarty
+{$myVar|unescape}
+```
+
+## Parameters
+
+| Parameter Position | Type   | Required | Possible Values                                                                                                | Default | Description                                                                                                                  |
+|--------------------|--------|----------|----------------------------------------------------------------------------------------------------------------|---------|------------------------------------------------------------------------------------------------------------------------------|
+| 1                  | string | No       | `html`, `htmlall`, `entity`,                                                                                   | `html`  | This is the escape format to use.                                                                                            |
+| 2                  | string | No       | `ISO-8859-1`, `UTF-8`, and any character set supported by [`htmlentities()`](https://www.php.net/htmlentities) | `UTF-8` | The character set encoding passed to html\_entity\_decode() or htmlspecialchars\_decode() or mb\_convert\_encoding() et. al. |
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle',
+                "Germans use &quot;&Uuml;mlauts&quot; and pay in &euro;uro"
+                );
+```
+
+These are example `unescape` template lines followed by the output
+
+```smarty
+{$articleTitle}
+Germans use &quot;&Uuml;mlauts&quot; and pay in &euro;uro
+
+{$articleTitle|unescape:"html"}
+Germans use "&Uuml;mlauts" and pay in &euro;uro
+
+{$articleTitle|unescape:"htmlall"}
+Germans use "Ümlauts" and pay in €uro
+```
+
+See also [escaping smarty parsing](../language-basic-syntax/language-escaping.md), [escape
+modifier](language-modifier-escape.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-upper.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-upper.md
new file mode 100644
index 000000000..edce96381
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-upper.md
@@ -0,0 +1,33 @@
+# upper
+
+This is used to uppercase a variable. This is equivalent to the PHP
+[`strtoupper()`](https://www.php.net/strtoupper) function.
+
+## Basic usage
+```smarty
+{$myVar|upper}
+```
+
+## Examples
+
+```php
+<?php
+$smarty->assign('articleTitle', "If Strike isn't Settled Quickly it may Last a While.");
+```
+
+Where template is:
+
+```smarty
+{$articleTitle}
+{$articleTitle|upper}
+```
+
+Will output:
+
+```
+If Strike isn't Settled Quickly it may Last a While.
+IF STRIKE ISN'T SETTLED QUICKLY IT MAY LAST A WHILE.
+```
+
+See also [`lower`](./language-modifier-lower.md) and
+[`capitalize`](language-modifier-capitalize.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-wordwrap.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-wordwrap.md
new file mode 100644
index 000000000..f3348fd72
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-wordwrap.md
@@ -0,0 +1,73 @@
+# wordwrap
+
+Wraps a string to a column width, the default is 80. As an optional
+second parameter, you can specify a string of text to wrap the text to
+the next line, the default is a carriage return `"\n"`. By default,
+`wordwrap` will attempt to wrap at a word boundary. If you want to cut
+off at the exact character length, pass the optional third parameter as
+TRUE. This is equivalent to the PHP
+[`wordwrap()`](https://www.php.net/wordwrap) function.
+
+## Basic usage
+```smarty
+{$myVar|wordwrap:30}
+```
+
+## Parameters
+
+| Parameter Position | Type    | Required | Default | Description                                                                                   |
+|--------------------|---------|----------|---------|-----------------------------------------------------------------------------------------------|
+| 1                  | integer | No       | 80      | This determines how many columns to wrap to.                                                  |
+| 2                  | string  | No       | \\n     | This is the string used to wrap words with.                                                   |
+| 3                  | boolean | No       | FALSE   | This determines whether to wrap at a word boundary (FALSE), or at the exact character (TRUE). |
+
+## Examples
+
+```php
+<?php
+
+$smarty->assign('articleTitle',
+                "Blind woman gets new kidney from dad she hasn't seen in years."
+               );
+
+```
+
+Where template is
+
+```smarty
+{$articleTitle}
+
+{$articleTitle|wordwrap:30}
+
+{$articleTitle|wordwrap:20}
+
+{$articleTitle|wordwrap:30:"<br />\n"}
+
+{$articleTitle|wordwrap:26:"\n":true}
+```
+
+Will output:
+
+```html
+Blind woman gets new kidney from dad she hasn't seen in years.
+
+Blind woman gets new kidney
+from dad she hasn't seen in
+years.
+
+Blind woman gets new
+kidney from dad she
+hasn't seen in
+years.
+
+Blind woman gets new kidney<br />
+from dad she hasn't seen in<br />
+years.
+
+Blind woman gets new kidn
+ey from dad she hasn't se
+en in years.
+```       
+
+See also [`nl2br`](language-modifier-nl2br.md) and
+[`{textformat}`](../language-custom-functions/language-function-textformat.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-variables/index.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-variables/index.md
new file mode 100644
index 000000000..0278c9170
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-variables/index.md
@@ -0,0 +1,36 @@
+# Variables
+
+Smarty has several types of variables. The type of the
+variable depends on what symbol it is prefixed or enclosed within.
+
+- [Variables assigned from PHP](language-assigned-variables.md)
+- [Variables loaded from config files](language-config-variables.md)
+- [{$smarty} reserved variable](language-variables-smarty.md)
+
+Variables in Smarty can be either displayed directly or used as
+arguments for [tags](../language-basic-syntax/language-syntax-tags.md),
+[attributes](../language-basic-syntax/language-syntax-attributes.md) and
+[modifiers](../language-modifiers/index.md), inside conditional expressions, etc.
+To print a variable, simply enclose it in the
+[delimiters](../../designers/language-basic-syntax/language-escaping.md) so that it is the only thing
+contained between them.
+
+```smarty
+{$Name}
+
+{$product.part_no} <b>{$product.description}</b>
+
+{$Contacts[row].Phone}
+
+<body bgcolor="{#bgcolor#}">
+```
+
+## Scopes
+You can assign variables to specific [variable scopes](language-variable-scopes.md).
+
+      
+> **Note**
+>
+> An easy way to examine assigned Smarty variables is with the
+> [debugging console](../chapter-debugging-console.md).
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-variables/language-assigned-variables.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-variables/language-assigned-variables.md
new file mode 100644
index 000000000..9465a89c5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-variables/language-assigned-variables.md
@@ -0,0 +1,126 @@
+# Variables assigned from PHP
+
+Variables assigned from PHP are referenced by preceding them with a dollar
+(`$`) sign.
+
+## Examples
+
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty();
+
+$smarty->assign('firstname', 'Doug');
+$smarty->assign('lastname', 'Evans');
+$smarty->assign('meetingPlace', 'New York');
+
+$smarty->display('index.tpl');
+
+```
+
+`index.tpl` source:
+
+```smarty
+Hello {$firstname} {$lastname}, glad to see you can make it.
+<br />
+{* this will not work as $variables are case sensitive *}
+This weeks meeting is in {$meetingplace}.
+{* this will work *}
+This weeks meeting is in {$meetingPlace}.
+```
+       
+This above would output:
+
+```html
+Hello Doug Evans, glad to see you can make it.
+<br />
+This weeks meeting is in .
+This weeks meeting is in New York.
+```
+      
+## Associative arrays
+
+You can also reference associative array variables by specifying the key
+after a dot "." symbol.
+
+```php
+<?php
+$smarty->assign('Contacts',
+    array('fax' => '555-222-9876',
+          'email' => 'zaphod@slartibartfast.example.com',
+          'phone' => array('home' => '555-444-3333',
+                           'cell' => '555-111-1234')
+                           )
+         );
+$smarty->display('index.tpl');
+```
+
+`index.tpl` source:
+
+```smarty
+{$Contacts.fax}<br />
+{$Contacts.email}<br />
+{* you can print arrays of arrays as well *}
+{$Contacts.phone.home}<br />
+{$Contacts.phone.cell}<br />
+```
+
+this will output:
+
+```html
+555-222-9876<br />
+zaphod@slartibartfast.example.com<br />
+555-444-3333<br />
+555-111-1234<br />
+```
+
+## Array indexes
+
+You can reference arrays by their index, much like native PHP syntax.
+
+```php
+<?php
+$smarty->assign('Contacts', array(
+                           '555-222-9876',
+                           'zaphod@slartibartfast.example.com',
+                            array('555-444-3333',
+                                  '555-111-1234')
+                            ));
+$smarty->display('index.tpl');
+```
+
+`index.tpl` source:
+
+```smarty
+{$Contacts[0]}<br />
+{$Contacts[1]}<br />
+{* you can print arrays of arrays as well *}
+{$Contacts[2][0]}<br />
+{$Contacts[2][1]}<br />
+```
+
+This will output:
+
+```html
+555-222-9876<br />
+zaphod@slartibartfast.example.com<br />
+555-444-3333<br />
+555-111-1234<br />
+```
+
+## Objects
+
+Properties of [objects](../../api/variables/objects.md) assigned from PHP
+can be referenced by specifying the property name after the `->` symbol.
+
+```smarty
+name:  {$person->name}<br />
+email: {$person->email}<br />
+```
+
+this will output:
+
+```html
+name:  Zaphod Beeblebrox<br />
+email: zaphod@slartibartfast.example.com<br />
+```
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-variables/language-config-variables.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-variables/language-config-variables.md
new file mode 100644
index 000000000..89a90ce11
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-variables/language-config-variables.md
@@ -0,0 +1,79 @@
+# Variables loaded from config files
+
+Variables that are loaded from the [config files](../config-files.md) are
+referenced by enclosing them within `#hash_marks#`, or with the smarty
+variable [`$smarty.config`](language-variables-smarty.md#smartyconfig-languagevariablessmartyconfig). The
+later syntax is useful for embedding into quoted attribute values, or
+accessing variable values such as `$smarty.config.$foo`.
+
+## Examples
+
+Example config file - `foo.conf`:
+```ini
+pageTitle = "This is mine"
+bodyBgColor = '#eeeeee'
+tableBorderSize = 3
+tableBgColor = "#bbbbbb"
+rowBgColor = "#cccccc"
+```
+
+A template demonstrating the `#hash#` method:
+
+```smarty
+{config_load file='foo.conf'}
+<html>
+    <title>{#pageTitle#}</title>
+    <body bgcolor="{#bodyBgColor#}">
+        <table border="{#tableBorderSize#}" bgcolor="{#tableBgColor#}">
+            <tr bgcolor="{#rowBgColor#}">
+                <td>First</td>
+                <td>Last</td>
+                <td>Address</td>
+            </tr>
+        </table>
+    </body>
+</html>
+```
+        
+A template demonstrating the
+[`$smarty.config`](language-variables-smarty.md#smartyconfig-languagevariablessmartyconfig) method:
+
+```smarty
+{config_load file='foo.conf'}
+<html>
+<title>{$smarty.config.pageTitle}</title>
+    <body bgcolor="{$smarty.config.bodyBgColor}">
+        <table border="{$smarty.config.tableBorderSize}" bgcolor="{$smarty.config.tableBgColor}">
+            <tr bgcolor="{$smarty.config.rowBgColor}">
+                <td>First</td>
+                <td>Last</td>
+                <td>Address</td>
+            </tr>
+        </table>
+    </body>
+</html>
+```
+
+Both examples would output:
+
+```html
+<html>
+    <title>This is mine</title>
+    <body bgcolor="#eeeeee">
+        <table border="3" bgcolor="#bbbbbb">
+            <tr bgcolor="#cccccc">
+                <td>First</td>
+                <td>Last</td>
+                <td>Address</td>
+            </tr>
+        </table>
+    </body>
+</html>
+```
+
+Config file variables cannot be used until after they are loaded in from
+a config file. This procedure is explained later in this document under
+[`{config_load}`](../language-builtin-functions/language-function-config-load.md).
+
+See also [variables](../language-basic-syntax/language-syntax-variables.md) and [$smarty reserved
+variables](language-variables-smarty.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-variables/language-variable-scopes.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-variables/language-variable-scopes.md
new file mode 100644
index 000000000..e2b244661
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-variables/language-variable-scopes.md
@@ -0,0 +1,60 @@
+# Variable scopes
+
+You have the choice to assign variables to the scope of the main Smarty
+object, data objects created with [`createData()`](../../programmers/api-functions/api-create-data.md),
+and template objects created with
+[`createTemplate()`](../../programmers/api-functions/api-create-template.md). These objects can be
+chained. A template sees all the variables of its own object and all
+variables assigned to the objects in its chain of parent objects.
+
+By default, templates which are rendered by
+[`$smarty->display(...)`](../../programmers/api-functions/api-display.md) or
+[`$smarty->fetch(...)`](../../programmers/api-functions/api-fetch.md) calls are automatically linked to
+the Smarty object variable scope.
+
+By assigning variables to individual data or template objects you have
+full control which variables can be seen by a template.
+
+```php
+<?php
+// assign variable to Smarty object scope
+$smarty->assign('foo','smarty');
+
+// assign variables to data object scope
+$data = $smarty->createData();
+$data->assign('foo','data');
+$data->assign('bar','bar-data');
+
+// assign variables to other data object scope
+$data2 = $smarty->createData($data);
+$data2->assign('bar','bar-data2');
+
+// assign variable to template object scope
+$tpl = $smarty->createTemplate('index.tpl');
+$tpl->assign('bar','bar-template');
+
+// assign variable to template object scope with link to Smarty object
+$tpl2 = $smarty->createTemplate('index.tpl',$smarty);
+$tpl2->assign('bar','bar-template2');
+
+// This display() does see $foo='smarty' from the $smarty object
+$smarty->display('index.tpl');
+
+// This display() does see $foo='data' and $bar='bar-data' from the data object $data
+$smarty->display('index.tpl',$data);
+
+// This display() does see $foo='data' from the data object $data 
+// and $bar='bar-data2' from the data object $data2
+$smarty->display('index.tpl',$data2);
+
+// This display() does see $bar='bar-template' from the template object $tpl
+$tpl->display();  // or $smarty->display($tpl);
+
+// This display() does see $bar='bar-template2' from the template object $tpl2
+// and $foo='smarty' form the Smarty object $foo
+$tpl2->display();  // or $smarty->display($tpl2);
+```
+
+See also [`assign()`](../../programmers/api-functions/api-assign.md), 
+[`createData()`](../../programmers/api-functions/api-create-data.md)
+and [`createTemplate()`](../../programmers/api-functions/api-create-template.md).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-variables/language-variables-smarty.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-variables/language-variables-smarty.md
new file mode 100644
index 000000000..cbeb66874
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/designers/language-variables/language-variables-smarty.md
@@ -0,0 +1,155 @@
+# {$smarty} reserved variable
+
+The PHP reserved `{$smarty}` variable can be used to access several
+environment and request variables. The full list of them follows.
+
+## Request variables
+
+The [request variables](https://www.php.net/reserved.variables) such as
+`$_GET`, `$_POST`, `$_COOKIE`, `$_SERVER`, `$_ENV` and `$_SESSION` can
+be accessed as demonstrated in the examples below:
+
+```smarty
+{* display value of page from URL ($_GET) http://www.example.com/index.php?page=foo *}
+{$smarty.get.page}
+
+{* display the variable "page" from a form ($_POST['page']) *}
+{$smarty.post.page}
+
+{* display the value of the cookie "username" ($_COOKIE['username']) *}
+{$smarty.cookies.username}
+
+{* display the server variable "SERVER_NAME" ($_SERVER['SERVER_NAME'])*}
+{$smarty.server.SERVER_NAME}
+
+{* display the system environment variable "PATH" *}
+{$smarty.env.PATH}
+
+{* display the php session variable "id" ($_SESSION['id']) *}
+{$smarty.session.id}
+
+{* display the variable "username" from merged get/post/cookies/server/env *}
+{$smarty.request.username}
+```
+
+> **Note**
+>
+> For historical reasons `{$SCRIPT_NAME}` is shorthand for
+> `{$smarty.server.SCRIPT_NAME}`.
+>
+>
+>     <a href="{$SCRIPT_NAME}?page=smarty">click me</a>
+>     <a href="{$smarty.server.SCRIPT_NAME}?page=smarty">click me</a>
+
+> **Note**
+>
+> Although Smarty provides direct access to PHP super globals for
+> convenience, it should be used with caution. Directly accessing super
+> globals mixes underlying application code structure with templates. A
+> good practice is to assign specific needed values to template vars.
+
+## {$smarty.now}
+
+The current [timestamp](https://www.php.net/function.time) can be accessed
+with `{$smarty.now}`. The value reflects the number of seconds passed
+since the so-called Epoch on January 1, 1970, and can be passed directly
+to the [`date_format`](../language-modifiers/language-modifier-date-format.md) modifier for
+display. Note that [`time()`](https://www.php.net/function.time) is called
+on each invocation; eg a script that takes three seconds to execute with
+a call to `$smarty.now` at start and end will show the three-second
+difference.
+
+```smarty
+{* use the date_format modifier to show current date and time *}
+{$smarty.now|date_format:'%Y-%m-%d %H:%M:%S'}
+```
+
+## {$smarty.const}
+
+You can access PHP constant values directly.
+
+```php
+<?php
+// the constant defined in php
+define('MY_CONST_VAL','CHERRIES');
+```
+
+Output the constant in a template with
+
+```smarty
+{$smarty.const.MY_CONST_VAL}
+```
+
+> **Note**
+>
+> Although Smarty provides direct access to PHP constants for
+> convenience, it is typically avoided as this is mixing underlying
+> application code structure into the templates. A good practice is to
+> assign specific needed values to template vars.
+
+## {$smarty.capture}
+
+Template output captured via the built-in
+[`{capture}..{/capture}`](../language-builtin-functions/language-function-capture.md) function can be
+accessed using the `{$smarty.capture}` variable. See the
+[`{capture}`](../language-builtin-functions/language-function-capture.md) page for more information.
+
+## {$smarty.config}
+
+`{$smarty.config}` variable can be used to refer to loaded [config
+variables](language-config-variables.md). `{$smarty.config.foo}` is a
+synonym for `{#foo#}`. See the
+[{config_load}](../language-builtin-functions/language-function-config-load.md) page for more info.
+
+## {$smarty.section}
+
+The `{$smarty.section}` variables can be used to refer to
+[`{section}`](../language-builtin-functions/language-function-section.md) loop properties. These have
+some very useful values such as `.first`, `.index`, etc.
+
+> **Note**
+>
+> The `{$smarty.foreach}` variable is no longer used with the new
+> [`{foreach}`](../language-builtin-functions/language-function-foreach.md) syntax, but is still
+> supported with Smarty 2.x style foreach syntax.
+
+## {$smarty.template}
+
+Returns the name of the current template being processed (without the
+directory).
+
+## {$smarty.template_object}
+
+Returns the template object of the current template being processed.
+
+## {$smarty.current_dir}
+
+Returns the name of the directory for the current template being
+processed if it is loaded from the filesystem (the default).
+
+## {$smarty.version}
+
+Returns the version of Smarty the template was compiled with.
+
+```smarty
+<div id="footer">Powered by Smarty {$smarty.version}</div>
+```
+
+## {$smarty.block.child}
+
+Returns block text from child template. See [Template
+inheritance](../../api/inheritance.md).
+
+## {$smarty.block.parent}
+
+Returns block text from parent template. See [Template
+inheritance](../../api/inheritance.md)
+
+## {$smarty.ldelim}, {$smarty.rdelim}
+
+These variables are used for printing the left-delimiter and
+right-delimiter value literally, the same as
+[`{ldelim},{rdelim}`](../language-builtin-functions/language-function-ldelim.md).
+
+See also [assigned variables](language-assigned-variables.md) and [config
+variables](language-config-variables.md)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/features.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/features.md
new file mode 100644
index 000000000..f9a873be0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/features.md
@@ -0,0 +1,151 @@
+# Features
+
+Some of Smarty's features:
+
+-   It is extremely fast.
+-   It is efficient since the PHP parser does the dirty work.
+-   No template parsing overhead, only compiles once.
+-   It is smart about recompiling only the
+    template files that have changed.
+-   You can easily create your own custom
+    [tags](api/extending/tags.md) and [modifiers](api/extending/modifiers.md), so the template language is
+    extremely extensible.
+-   Configurable template [{delimiter}](designers/language-basic-syntax/language-escaping.md) tag
+    syntax, so you can use `{$foo}`, `{{$foo}}`, `<!--{$foo}-->`, etc.
+-   The [`{if}..{elseif}..{else}..{/if}`](designers/language-builtin-functions/language-function-if.md)
+    constructs are passed to the PHP parser, so the `{if...}` expression
+    syntax can be as simple or as complex an evaluation as you like.
+-   Allows unlimited nesting of
+    [`sections`](designers/language-builtin-functions/language-function-section.md), `if's` etc.
+-   Built-in [caching](api/caching/basics.md) support
+-   Arbitrary [template](api/resources.md) sources
+-   [Template Inheritance](api/inheritance.md) for
+    easy management of template content.
+-   [Plugin](api/extending/introduction.md) architecture
+
+## Separation of presentation from application code
+-   This means templates can certainly contain logic under the condition
+    that it is for presentation only. Things such as
+    [including](designers/language-builtin-functions/language-function-include.md) other templates,
+    [alternating](designers/language-custom-functions/language-function-cycle.md) table row colors,
+    [upper-casing](designers/language-modifiers/language-modifier-upper.md) a variable,
+    [looping](designers/language-builtin-functions/language-function-foreach.md) over an array of data and
+    rendering it are examples of presentation logic.
+-   This does not mean however that Smarty forces a separation of
+    business and presentation logic. Smarty has no knowledge of which is
+    which, so placing business logic in the template is your own doing.
+-   Also, if you desire *no* logic in your templates you certainly can
+    do so by boiling the content down to text and variables only.
+
+## How does it work?
+
+Under the hood, Smarty "compiles" (basically copies and converts) the
+templates into PHP scripts. This happens once when each template is
+first invoked, and then the compiled versions are used from that point
+forward. Smarty takes care of this for you, so the template designer
+just edits the Smarty templates and never has to manage the compiled
+versions. This approach keeps the templates easy to maintain, and yet
+keeps execution times extremely fast since the compiled code is just
+PHP. And of course, all PHP scripts take advantage of PHP op-code caches
+such as APC.
+
+## Template Inheritance
+
+Template inheritance was introduced in Smarty 3. Before template
+inheritance, we managed our templates in
+pieces such as header and footer templates. This organization lends
+itself to many problems that require some hoop-jumping, such as managing
+content within the header/footer on a per-page basis. With template
+inheritance, instead of including other templates we maintain our
+templates as single pages. We can then manipulate blocks of content
+within by inheriting them. This makes templates intuitive, efficient and
+easy to manage. See
+[Template Inheritance](api/inheritance.md)
+for more info.
+
+## Why not use XML/XSLT syntax?
+There are a couple of good reasons. First, Smarty can be used for more
+than just XML/HTML based templates, such as generating emails,
+javascript, CSV, and PDF documents. Second, XML/XSLT syntax is even more
+verbose and fragile than PHP code! It is perfect for computers, but
+horrible for humans. Smarty is about being easy to read, understand and
+maintain.
+
+## Template Security
+Although Smarty insulates you from PHP, you still have the option to use
+it in certain ways if you wish. Template security forces the restriction
+of PHP (and select Smarty functions.) This is useful if you have third
+parties editing templates, and you don't want to unleash the full power
+of PHP or Smarty to them.
+
+## Integration
+Sometimes Smarty gets compared to Model-View-Controller (MVC)
+frameworks. Smarty is not an MVC, it is just the presentation layer,
+much like the View (V) part of an MVC. As a matter of fact, Smarty can
+easily be integrated as the view layer of an MVC. Many of the more
+popular ones have integration instructions for Smarty, or you may find
+some help here in the forums and documentation.
+
+## Other Template Engines
+Smarty is not the only engine following the *"Separate Programming Code
+from Presentation"* philosophy. For instance, Python has template
+engines built around the same principles such as Django Templates and
+CheetahTemplate. *Note: Languages such as Python do not mix with HTML
+natively, which give them the advantage of proper programming code
+separation from the outset. There are libraries available to mix Python
+with HTML, but they are typically avoided.*
+
+## What Smarty is Not
+
+Smarty is not an application development framework. Smarty is not an
+MVC. Smarty is not an alternative to Laravel, Symfony, CodeIgniter,
+or any of the other application development frameworks for PHP.
+
+Smarty is a template engine, and works as the (V)iew component of your
+application. Smarty can easily be coupled to any of the engines listed
+above as the view component. No different than any other software,
+Smarty has a learning curve. Smarty does not guarantee good application
+design or proper separation of presentation, this still needs to be
+addressed by a competent developer and web designer.
+
+## Is Smarty Right for Me?
+
+Smarty is not meant to be a tool for every job. The important thing is
+to identify if Smarty fits your needs. There are some important
+questions to ask yourself:
+
+### Template Syntax
+Are you content with PHP tags mixed with HTML? Are your
+web designers comfortable with PHP? Would your web designers prefer a
+tag-based syntax designed for presentation? Some experience working with
+both Smarty and PHP helps answer these questions.
+
+### The Business Case
+Is there a requirement to insulate the templates from
+PHP? Do you have untrusted parties editing templates that you do not
+wish to unleash the power of PHP to? Do you need to programmatically
+control what is and is not available within the templates? Smarty
+supplies these capabilities by design.
+
+## Feature set
+Does Smarty's features such as caching, template
+inheritance and plugin architecture save development cycles writing code
+that would be needed otherwise? Does the codebase or framework you plan
+on using have the features you need for the presentation component?
+
+## Sites using Smarty
+Many well-known PHP projects make use of Smarty such as XOOPS CMS, CMS Made Simple, 
+Tiki Wiki CMS Groupware and X-Cart to name a few.
+
+## Summary
+Whether you are using Smarty for a small website or massive enterprise
+solution, it can accommodate your needs. There are numerous features
+that make Smarty a great choice:
+
+-   separation of PHP from HTML/CSS just makes sense
+-   readability for organization and management
+-   security for 3rd party template access
+-   feature completeness, and easily extendable to your own needs
+-   massive user base, Smarty is here to stay
+-   LGPL license for commercial use
+-   100% free to use, open source project
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/getting-started.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/getting-started.md
new file mode 100644
index 000000000..3628fd203
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/getting-started.md
@@ -0,0 +1,197 @@
+# Getting started
+
+## Requirements
+Smarty can be run with PHP 7.2 to PHP 8.3.
+
+## Installation
+Smarty can be installed with [Composer](https://getcomposer.org/).
+
+To get the latest stable version of Smarty use:
+```shell
+composer require smarty/smarty
+```
+
+To get the latest, unreleased version, use:
+```shell
+composer require smarty/smarty:dev-master
+```
+
+To get the previous stable version of Smarty, Smarty 4, use:
+```shell
+composer require smarty/smarty:^4
+```
+
+Here's how you create an instance of Smarty in your PHP scripts:
+```php
+<?php
+
+// Instantiated via composer
+require 'vendor/autoload.php';
+use Smarty\Smarty;
+$smarty = new Smarty();
+
+// or ...
+
+// Instantiated directly
+require("/path/to/smarty/libs/Smarty.class.php");
+use Smarty\Smarty;
+$smarty = new Smarty();
+```
+
+Now that the library files are in place, it's time to set up the Smarty
+directories for your application.
+
+Smarty requires four directories which are by default named `templates`, `configs`, `templates_c` and `cache` 
+relative to the current working directory.
+
+The defaults can be changed as follows:
+
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty();
+$smarty->setTemplateDir('/some/template/dir');
+$smarty->setConfigDir('/some/config/dir');
+$smarty->setCompileDir('/some/compile/dir');
+$smarty->setCacheDir('/some/cache/dir');
+```
+
+The compile dir and cache dir need to be writable for the user running the PHP script.
+
+> **Note**
+>
+> This is usually user "nobody" and group "nobody". For OS X users, the
+> default is user "www" and group "www". If you are using Apache, you
+> can look in your `httpd.conf` file to see what user and group are
+> being used.
+
+```bash
+chown nobody:nobody /web/www.example.com/guestbook/templates_c/
+chmod 770 /web/www.example.com/guestbook/templates_c/
+
+chown nobody:nobody /web/www.example.com/guestbook/cache/
+chmod 770 /web/www.example.com/guestbook/cache/
+```
+
+You can verify if your system has the correct access rights for
+    these directories with [`testInstall()`](./programmers/api-functions/api-test-install.md):
+
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty();
+$smarty->setTemplateDir('/some/template/dir');
+$smarty->setConfigDir('/some/config/dir');
+$smarty->setCompileDir('/some/compile/dir');
+$smarty->setCacheDir('/some/cache/dir');
+$smarty->testInstall();
+```
+
+## Basic usage
+
+Now, let's create the `index.tpl` file that Smarty will display. This
+needs to be located in the [`$template_dir`](./programmers/api-variables/variable-template-dir.md).
+
+```smarty
+{* Smarty *}
+<h1>Hello {$name|escape}, welcome to Smarty!</h1>
+```
+
+> **Note**
+>
+> `{* Smarty *}` is a template [comment](./designers/language-basic-syntax/language-syntax-comments.md). It
+> is not required, but it is good practice to start all your template
+> files with this comment. It makes the file easy to recognize
+> regardless of the file extension. For example, text editors could
+> recognize the file and turn on special syntax highlighting.
+
+Now lets edit our php file. We'll create an instance of Smarty,
+[`assign()`](./programmers/api-functions/api-assign.md) a template variable and
+[`display()`](./programmers/api-functions/api-display.md) the `index.tpl` file.
+
+```php
+<?php
+
+require 'vendor/autoload.php';
+
+use Smarty\Smarty;
+$smarty = new Smarty();
+
+$smarty->setTemplateDir('/web/www.example.com/guestbook/templates/');
+$smarty->setCompileDir('/web/www.example.com/guestbook/templates_c/');
+$smarty->setConfigDir('/web/www.example.com/guestbook/configs/');
+$smarty->setCacheDir('/web/www.example.com/guestbook/cache/');
+
+$smarty->assign('name', 'Ned');
+$smarty->display('index.tpl');
+
+```
+
+> **Note**
+>
+> In our example, we are setting absolute paths to all the Smarty
+> directories. If `/web/www.example.com/guestbook/` is within your PHP
+> include\_path, then these settings are not necessary. However, it is
+> more efficient and (from experience) less error-prone to set them to
+> absolute paths. This ensures that Smarty is getting files from the
+> directories you intended.
+
+Now, run your PHP file. You should see *"Hello Ned, welcome to Smarty!"*
+
+You have completed the basic setup for Smarty!
+
+## Escaping
+You may have noticed that the example template above renders the `$name` variable using
+the [escape modifier](./designers/language-modifiers/language-modifier-escape.md).  This 
+modifier makes string 'safe' to use in the context of an HTML page.
+
+If you are primarily using Smarty for HTML-pages, it is recommended to enable automatic
+escaping. This way, you don't have to add `|escape` to every variable you use on a web page. 
+Smarty will handle it automatically for you!
+
+Enable auto-escaping for HTML as follows:
+```php
+$smarty->setEscapeHtml(true);
+```
+
+## Extended Setup
+
+This is a continuation of the [basic installation](#installation), please read that first!
+
+A slightly more flexible way to set up Smarty is to extend the Smarty
+class and initialize your Smarty
+environment. So instead of repeatedly setting directory paths, assigning
+the same vars, etc., we can do that in one place.
+
+```php
+<?php
+
+use Smarty\Smarty;
+
+class My_GuestBook extends Smarty {
+
+   public function __construct()
+   {
+        parent::__construct();
+
+        $this->setTemplateDir('/web/www.example.com/guestbook/templates/');
+        $this->setCompileDir('/web/www.example.com/guestbook/templates_c/');
+        $this->setConfigDir('/web/www.example.com/guestbook/configs/');
+        $this->setCacheDir('/web/www.example.com/guestbook/cache/');
+        
+        $this->setEscapeHtml(true);
+
+        $this->caching = Smarty::CACHING_LIFETIME_CURRENT;
+        $this->assign('app_name', 'Guest Book');
+   }
+
+}
+```
+
+Now, we can use `My_GuestBook` instead of `Smarty` in our scripts:
+```php
+<?php
+$smarty = new My_GuestBook();
+$smarty->assign('name', 'Ned');
+$smarty->display('index.tpl');
+```
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/img/favicon.ico b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/img/favicon.ico
new file mode 100644
index 000000000..aec1d8e3d
Binary files /dev/null and b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/img/favicon.ico differ
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/index.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/index.md
new file mode 100644
index 000000000..5c788f9ba
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/index.md
@@ -0,0 +1,35 @@
+# Smarty Documentation
+Smarty is a template engine for PHP, facilitating the separation of presentation (HTML/CSS) from application logic. 
+
+It allows you to write **templates**, using **variables**, **modifiers**, **functions** and **comments**, like this:
+```smarty
+<h1>{$title|escape}</h1>
+
+<p>
+    The number of pixels is: {math equation="x * y" x=$height y=$width}.
+</p>
+```
+
+When this template is rendered, with the value "Hello world" for the variable $title, 640 for $width, 
+and 480 for $height, the result is:
+```html
+<h1>Hello world</h1>
+
+<p>
+    The number of pixels is: 307200.
+</p>
+```
+
+## Getting Started
+- [Getting Started](./getting-started.md)
+- [Philosophy](./philosophy.md) - or "Why do I need a template engine?"
+- [Features](./features.md) - or "Why do I want Smarty?"
+
+## Help
+- [Search or create an issue](https://github.com/smarty-php/smarty/issues)
+- [Upgrading from an older version](upgrading.md)
+- [Some random tips & tricks](./appendixes/tips.md)
+- [Troubleshooting](./appendixes/troubleshooting.md)
+
+## Source code
+- [Smarty repository at GitHub](https://github.com/smarty-php/smarty)
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/philosophy.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/philosophy.md
new file mode 100644
index 000000000..c5edd3980
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/philosophy.md
@@ -0,0 +1,107 @@
+# Philosophy
+
+## What is Smarty?
+
+Smarty is a template engine for PHP. More specifically, it facilitates a
+manageable way to separate application logic and content from its
+presentation. This is best described in a situation where the
+application programmer and the template designer play different roles,
+or in most cases are not the same person.
+
+For example, let's say you are creating a web page that is displaying a
+newspaper article.
+
+-   The article `$headline`, `$tagline`, `$author` and `$body` are
+    content elements, they contain no information about how they will be
+    presented. They are [passed](getting-started.md#basic-usage) into Smarty by the
+    application.
+
+-   Then the template designer edits the templates and uses a
+    combination of HTML tags and [template tags](designers/language-basic-syntax/language-syntax-tags.md)
+    to format the presentation of these
+    [variables](designers/language-basic-syntax/language-syntax-variables.md) with elements such as
+    tables, div\'s, background colors, font sizes, style sheets, svg
+    etc.
+
+-   One day the programmer needs to change the way the article content
+    is retrieved, ie a change in application logic. This change does not
+    affect the template designer, the content will still arrive in the
+    template exactly the same.
+
+-   Likewise, if the template designer wants to completely redesign the
+    templates, this would require no change to the application logic.
+
+-   Therefore, the programmer can make changes to the application logic
+    without the need to restructure templates, and the template designer
+    can make changes to templates without breaking application logic.
+
+## Goals
+
+The Smarty design was largely driven by these goals:
+-   clean separation of presentation from application code
+-   PHP backend, Smarty template frontend
+-   complement PHP, not replace it
+-   fast development/deployment for programmers and designers
+-   quick and easy to maintain
+-   syntax easy to understand, no PHP knowledge necessary
+-   flexibility for custom development
+-   security: insulation from PHP
+-   free, open source
+
+
+
+## Two camps of thought
+
+When it comes to templating in PHP, there are basically two camps of
+thought. The first camp exclaims that \"PHP is a template engine\". This
+approach simply mixes PHP code with HTML. Although this approach is
+fastest from a pure script-execution point of view, many would argue
+that the PHP syntax is messy and complicated when mixed with tagged
+markup such as HTML.
+
+The second camp exclaims that presentation should be void of all
+programming code, and instead use simple tags to indicate where
+application content is revealed. This approach is common with other
+template engines (even in other programming languages), and is also the
+approach that Smarty takes. The idea is to keep the templates focused
+squarely on presentation, void of application code, and with as little
+overhead as possible.
+
+## Why is separating PHP from templates important?
+
+Two major benefits:
+
+-   SYNTAX: Templates typically consist of semantic markup such as HTML.
+    PHP syntax works well for application code, but quickly degenerates
+    when mixed with HTML. Smarty\'s simple {tag} syntax is designed
+    specifically to express presentation. Smarty focuses your templates
+    on presentation and less on \"code\". This lends to quicker template
+    deployment and easier maintenance. Smarty syntax requires no working
+    knowledge of PHP, and is intuitive for programmers and
+    non-programmers alike.
+
+-   INSULATION: When PHP is mixed with templates, there are no
+    restrictions on what type of logic can be injected into a template.
+    Smarty insulates the templates from PHP, creating a controlled
+    separation of presentation from business logic. Smarty also has
+    security features that can further enforce restrictions on
+    templates.
+
+## Web designers and PHP
+
+A common question: "Web designers have to learn a syntax anyway, why
+not PHP?" Of course web designers can learn PHP, and they may already
+be familiar with it. The issue isn't their ability to learn PHP, it is
+about the consequences of mixing PHP with HTML. If designers use PHP, it
+is too easy to add code into templates that doesn't belong there (you
+just handed them a swiss-army knife when they just needed a knife.) You
+can teach them the rules of application design, but this is probably
+something they don't really need to learn (now they are developers!)
+The PHP manual is also an overwhelming pile of information to sift
+through. It is like handing the owner of a car the factory assembly
+manual when all they need is the owners manual. Smarty gives web
+designers exactly the tools they need, and gives developers fine-grained
+control over those tools. The simplicity of the tag-based syntax is also
+a huge welcome for designers, it helps them streamline the organization
+and management of templates.
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/add-extension.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/add-extension.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-add-plugins-dir.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-add-plugins-dir.md
new file mode 100644
index 000000000..ec9741b6e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-add-plugins-dir.md
@@ -0,0 +1,42 @@
+addPluginsDir()
+
+add a directory to the list of directories where plugins are stored
+
+Description
+===========
+
+Smarty
+
+addPluginsDir
+
+string\|array
+
+plugins\_dir
+
+
+    <?php
+
+    // add directory where plugins are stored
+    $smarty->addPluginsDir('./plugins_1');
+
+    // add multiple directories where plugins are stored
+    $smarty->setPluginsDir(array(
+        './plugins_2',
+        './plugins_3',
+    ));
+
+    // view the plugins dir chain
+    var_dump($smarty->getPluginsDir());
+
+    // chaining of method calls
+    $smarty->setPluginsDir('./plugins')
+           ->addPluginsDir('./plugins_1')
+           ->addPluginsDir('./plugins_2');
+
+    ?>
+
+       
+
+See also [`getPluginsDir()`](#api.get.plugins.dir),
+[`setPluginsDir()`](#api.set.plugins.dir) and
+[`$plugins_dir`](#variable.plugins.dir).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-append.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-append.md
new file mode 100644
index 000000000..d9acff84a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-append.md
@@ -0,0 +1,60 @@
+append()
+
+append an element to an assigned array
+
+Description
+===========
+
+void
+
+append
+
+mixed
+
+var
+
+void
+
+append
+
+string
+
+varname
+
+mixed
+
+var
+
+bool
+
+merge
+
+If you append to a string value, it is converted to an array value and
+then appended to. You can explicitly pass name/value pairs, or
+associative arrays containing the name/value pairs. If you pass the
+optional third parameter of TRUE, the value will be merged with the
+current array instead of appended.
+
+NOTE.PARAMETER.MERGE
+
+
+    <?php
+    // This is effectively the same as assign()
+    $smarty->append('foo', 'Fred');
+    // After this line, foo will now be seen as an array in the template
+    $smarty->append('foo', 'Albert');
+
+    $array = array(1 => 'one', 2 => 'two');
+    $smarty->append('X', $array);
+    $array2 = array(3 => 'three', 4 => 'four');
+    // The following line will add a second element to the X array
+    $smarty->append('X', $array2);
+
+    // passing an associative array
+    $smarty->append(array('city' => 'Lincoln', 'state' => 'Nebraska'));
+    ?>
+
+       
+
+See also [`assign()`](#api.assign) and
+[`getTemplateVars()`](#api.get.template.vars)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-assign.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-assign.md
new file mode 100644
index 000000000..31f6a1508
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-assign.md
@@ -0,0 +1,83 @@
+assign()
+
+assign variables/objects to the templates
+
+Description
+===========
+
+void
+
+assign
+
+mixed
+
+var
+
+void
+
+assign
+
+string
+
+varname
+
+mixed
+
+var
+
+bool
+
+nocache
+
+You can explicitly pass name/value pairs, or associative arrays
+containing the name/value pairs.
+
+If you pass the optional third `nocache` parameter of TRUE, the variable
+is assigned as nocache variable. See
+[`Cacheability of Variables`](#cacheability.variables) for details.
+
+> **Note**
+>
+> When you assign/register objects to templates, be sure that all
+> properties and methods accessed from the template are for presentation
+> purposes only. It is very easy to inject application logic through
+> objects, and this leads to poor designs that are difficult to manage.
+> See the Best Practices section of the Smarty website.
+
+
+    <?php
+    // passing name/value pairs
+    $smarty->assign('Name', 'Fred');
+    $smarty->assign('Address', $address);
+
+    // passing an associative array
+    $smarty->assign(array('city' => 'Lincoln', 'state' => 'Nebraska'));
+
+    // passing an array
+    $myArray = array('no' => 10, 'label' => 'Peanuts');
+    $smarty->assign('foo',$myArray);
+
+    // passing a row from a database (eg adodb)
+    $sql = 'select id, name, email from contacts where contact ='.$id;
+    $smarty->assign('contact', $db->getRow($sql));
+    ?>
+
+These are accessed in the template with
+
+
+    {* note the vars are case sensitive like php *}
+    {$Name}
+    {$Address}
+    {$city}
+    {$state}
+
+    {$foo.no}, {$foo.label}
+    {$contact.id}, {$contact.name},{$contact.email}
+
+To access more complex array assignments see
+[`{foreach}`](#language.function.foreach) and
+[`{section}`](#language.function.section)
+
+See also [`getTemplateVars()`](#api.get.template.vars),
+[`clearAssign()`](#api.clear.assign), [`append()`](#api.append) and
+[`{assign}`](#language.function.assign)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-assign.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-assign.md
new file mode 100644
index 000000000..cc75fad0f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-assign.md
@@ -0,0 +1,34 @@
+clearAllAssign()
+
+clears the values of all assigned variables
+
+Description
+===========
+
+void
+
+clearAllAssign
+
+
+    <?php
+    // passing name/value pairs
+    $smarty->assign('Name', 'Fred');
+    $smarty->assign('Address', $address);
+
+    // will output above
+    print_r( $smarty->getTemplateVars() );
+
+    // clear all assigned variables
+    $smarty->clearAllAssign();
+
+    // will output nothing
+    print_r( $smarty->getTemplateVars() );
+
+    ?>
+
+       
+
+See also [`clearAssign()`](#api.clear.assign),
+[`clearConfig()`](#api.clear.config),
+[`getTemplateVars()`](#api.get.template.vars), [`assign()`](#api.assign)
+and [`append()`](#api.append)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-cache.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-cache.md
new file mode 100644
index 000000000..55cbe5795
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-cache.md
@@ -0,0 +1,37 @@
+clearAllCache()
+
+clears the entire template cache
+
+Description
+===========
+
+void
+
+clearAllCache
+
+int
+
+expire\_time
+
+As an optional parameter, you can supply a minimum age in seconds the
+cache files must be before they will get cleared.
+
+> **Note**
+>
+> Since Smarty version 3.1.14 it is possible to delete cache files by
+> their individual expiration time at creation by passing constant
+> SMARTY::CLEAR\_EXPIRED as `expire_time` parameter.
+
+
+    <?php
+    // clear the entire cache
+    $smarty->clearAllCache();
+
+    // clears all files over one hour old
+    $smarty->clearAllCache(3600);
+    ?>
+
+       
+
+See also [`clearCache()`](#api.clear.cache),
+[`isCached()`](#api.is.cached) and the [caching](#caching) page.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-assign.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-assign.md
new file mode 100644
index 000000000..ac0731e86
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-assign.md
@@ -0,0 +1,32 @@
+clearAssign()
+
+clears the value of an assigned variable
+
+Description
+===========
+
+void
+
+clearAssign
+
+mixed
+
+var
+
+This can be a single value, or an array of values.
+
+
+    <?php
+    // clear a single variable
+    $smarty->clearAssign('Name');
+
+    // clears multiple variables
+    $smarty->clearAssign(array('Name', 'Address', 'Zip'));
+    ?>
+
+       
+
+See also [`clearAllAssign()`](#api.clear.all.assign),
+[`clearConfig()`](#api.clear.config),
+[`getTemplateVars()`](#api.get.template.vars), [`assign()`](#api.assign)
+and [`append()`](#api.append)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-cache.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-cache.md
new file mode 100644
index 000000000..3e17d80c8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-cache.md
@@ -0,0 +1,60 @@
+clearCache()
+
+clears the cache for a specific template
+
+Description
+===========
+
+void
+
+clearCache
+
+string
+
+template
+
+string
+
+cache\_id
+
+string
+
+compile\_id
+
+int
+
+expire\_time
+
+-   If you have [multiple caches](#caching.multiple.caches) for a
+    template, you can clear a specific cache by supplying the `cache_id`
+    as the second parameter.
+
+-   You can also pass a [`$compile_id`](#variable.compile.id) as a third
+    parameter. You can [group templates together](#caching.groups) so
+    they can be removed as a group, see the [caching section](#caching)
+    for more information.
+
+-   As an optional fourth parameter, you can supply a minimum age in
+    seconds the cache file must be before it will get cleared.
+
+    > **Note**
+    >
+    > Since Smarty version 3.1.14 it is possible to delete cache files
+    > by their individual expiration time at creation by passing
+    > constant SMARTY::CLEAR\_EXPIRED as fourth parameter.
+
+<!-- -->
+
+
+    <?php
+    // clear the cache for a template
+    $smarty->clearCache('index.tpl');
+
+    // clear the cache for a particular cache id in an multiple-cache template
+    $smarty->clearCache('index.tpl', 'MY_CACHE_ID');
+    ?>
+
+       
+
+See also [`clearAllCache()`](#api.clear.all.cache) and
+[`caching`](#caching) section.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-compiled-tpl.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-compiled-tpl.md
new file mode 100644
index 000000000..dfa688eb6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-compiled-tpl.md
@@ -0,0 +1,44 @@
+clearCompiledTemplate()
+
+clears the compiled version of the specified template resource
+
+Description
+===========
+
+void
+
+clearCompiledTemplate
+
+string
+
+tpl\_file
+
+string
+
+compile\_id
+
+int
+
+exp\_time
+
+This clears the compiled version of the specified template resource, or
+all compiled template files if one is not specified. If you pass a
+[`$compile_id`](#variable.compile.id) only the compiled template for
+this specific [`$compile_id`](#variable.compile.id) is cleared. If you
+pass an exp\_time, then only compiled templates older than `exp_time`
+seconds are cleared, by default all compiled templates are cleared
+regardless of their age. This function is for advanced use only, not
+normally needed.
+
+
+    <?php
+    // clear a specific template resource
+    $smarty->clearCompiledTemplate('index.tpl');
+
+    // clear entire compile directory
+    $smarty->clearCompiledTemplate();
+    ?>
+
+       
+
+See also [`clearCache()`](#api.clear.cache).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-config.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-config.md
new file mode 100644
index 000000000..43e86be17
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-config.md
@@ -0,0 +1,35 @@
+clearConfig()
+
+clears assigned config variables
+
+Description
+===========
+
+void
+
+clearConfig
+
+string
+
+var
+
+This clears all assigned [config variables](#language.config.variables).
+If a variable name is supplied, only that variable is cleared.
+
+
+    <?php
+    // clear all assigned config variables.
+    $smarty->clearConfig();
+
+    // clear one variable
+    $smarty->clearConfig('foobar');
+    ?>
+
+       
+
+See also [`getConfigVars()`](#api.get.config.vars),
+[`config variables`](#language.config.variables),
+[`config files`](#config.files),
+[`{config_load}`](#language.function.config.load),
+[`configLoad()`](#api.config.load) and
+[`clearAssign()`](#api.clear.assign).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-config.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-config.md
new file mode 100644
index 000000000..35497d9ad
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-config.md
@@ -0,0 +1,61 @@
+compileAllConfig()
+
+compiles all known config files
+
+Description
+===========
+
+string
+
+compileAllConfig
+
+string
+
+extension
+
+boolean
+
+force
+
+integer
+
+timelimit
+
+integer
+
+maxerror
+
+This function compiles config files found in the
+[`$config_dir`](#variable.config.dir) folder. It uses the following
+parameters:
+
+-   `extension` is an optional string which defines the file extension
+    for the config files. The default is \".conf\".
+
+-   `force` is an optional boolean which controls if only modified
+    (false) or all (true) config files shall be compiled. The default is
+    \"false\".
+
+-   `timelimit` is an optional integer to set a runtime limit in seconds
+    for the compilation process. The default is no limit.
+
+-   `maxerror` is an optional integer to set an error limit. If more
+    config files failed to compile the function will be aborted. The
+    default is no limit.
+
+> **Note**
+>
+> This function may not create desired results in all configurations.
+> Use is on own risk.
+
+
+    <?php
+    use Smarty\Smarty;
+    $smarty = new Smarty;
+
+    // force compilation of all config files
+    $smarty->compileAllConfig('.config',true);
+
+    ?>
+
+        
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-templates.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-templates.md
new file mode 100644
index 000000000..2be22eef3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-templates.md
@@ -0,0 +1,71 @@
+compileAllTemplates()
+
+compiles all known templates
+
+Description
+===========
+
+string
+
+compileAllTemplates
+
+string
+
+extension
+
+boolean
+
+force
+
+integer
+
+timelimit
+
+integer
+
+maxerror
+
+This function compiles template files found in the
+[`$template_dir`](#variable.template.dir) folder. It uses the following
+parameters:
+
+-   `extension` is an optional string which defines the file extension
+    for the template files. The default is \".tpl\".
+
+-   `force` is an optional boolean which controls if only modified
+    (false) or all (true) templates shall be compiled. The default is
+    \"false\".
+
+-   `timelimit` is an optional integer to set a runtime limit in seconds
+    for the compilation process. The default is no limit.
+
+-   `maxerror` is an optional integer to set an error limit. If more
+    templates failed to compile the function will be aborted. The
+    default is no limit.
+
+> **Note**
+>
+> This function may not create desired results in all configurations.
+> Use is on own risk.
+
+> **Note**
+>
+> If any template requires registered plugins, filters or objects you
+> must register all of them before running this function.
+
+> **Note**
+>
+> If you are using template inheritance this function will create
+> compiled files of parent templates which will never be used.
+
+
+    <?php
+    use Smarty\Smarty;
+    $smarty = new Smarty;
+
+    // force compilation of all template files
+    $smarty->compileAllTemplates('.tpl',true);
+
+    ?>
+
+        
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-config-load.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-config-load.md
new file mode 100644
index 000000000..bf6001fa4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-config-load.md
@@ -0,0 +1,47 @@
+configLoad()
+
+loads config file data and assigns it to the template
+
+Description
+===========
+
+void
+
+configLoad
+
+string
+
+file
+
+string
+
+section
+
+This loads [config file](#config.files) data and assigns it to the
+template. This works identically to the template
+[`{config_load}`](#language.function.config.load) function.
+
+> **Note**
+>
+> As of Smarty 2.4.0, assigned template variables are kept across
+> invocations of [`fetch()`](#api.fetch) and
+> [`display()`](#api.display). Config vars loaded from `configLoad()`
+> are always global in scope. Config files are also compiled for faster
+> execution, and respect the [`$force_compile`](#variable.force.compile)
+> and [`$compile_check`](#variable.compile.check) settings.
+
+
+    <?php
+    // load config variables and assign them
+    $smarty->configLoad('my.conf');
+
+    // load a section
+    $smarty->configLoad('my.conf', 'foobar');
+    ?>
+
+       
+
+See also [`{config_load}`](#language.function.config.load),
+[`getConfigVars()`](#api.get.config.vars),
+[`clearConfig()`](#api.clear.config), and
+[`config variables`](#language.config.variables)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-create-data.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-create-data.md
new file mode 100644
index 000000000..dc03ad94d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-create-data.md
@@ -0,0 +1,52 @@
+createData()
+
+creates a data object
+
+Description
+===========
+
+string
+
+createData
+
+object
+
+parent
+
+string
+
+createData
+
+This creates a data object which will hold assigned variables. It uses
+the following parameters:
+
+-   `parent` is an optional parameter. It is an uplink to the main
+    Smarty object, a another user-created data object or to user-created
+    template object. These objects can be chained. Templates can access
+    variables assigned to any of the objects in it\'s parent chain.
+
+Data objects are used to create scopes for assigned variables. They can
+be used to control which variables are seen by which templates.
+
+
+    <?php
+    use Smarty\Smarty;
+    $smarty = new Smarty;
+
+    // create data object with its private variable scope
+    $data = $smarty->createData();
+
+    // assign variable to data scope
+    $data->assign('foo','bar');
+
+    // create template object which will use variables from data object
+    $tpl = $smarty->createTemplate('index.tpl',$data);
+
+    // display the template
+    $tpl->display();
+    ?>
+
+        
+
+See also [`display()`](#api.display), and
+[`createTemplate()`](#api.create.template),
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-create-template.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-create-template.md
new file mode 100644
index 000000000..097b7df95
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-create-template.md
@@ -0,0 +1,99 @@
+createTemplate()
+
+returns a template object
+
+Description
+===========
+
+Smarty\_Internal\_Template
+
+createTemplate
+
+string
+
+template
+
+object
+
+parent
+
+Smarty\_Internal\_Template
+
+createTemplate
+
+string
+
+template
+
+array
+
+data
+
+Smarty\_Internal\_Template
+
+createTemplate
+
+string
+
+template
+
+string
+
+cache\_id
+
+string
+
+compile\_id
+
+object
+
+parent
+
+Smarty\_Internal\_Template
+
+createTemplate
+
+string
+
+template
+
+string
+
+cache\_id
+
+string
+
+compile\_id
+
+array
+
+data
+
+This creates a template object which later can be rendered by the
+[display](#api.display) or [fetch](#api.fetch) method. It uses the
+following parameters:
+
+-   `template` must be a valid [template resource](#resources) type and
+    path.
+
+<!-- -->
+
+
+    <?php
+    use Smarty\Smarty;
+    $smarty = new Smarty;
+
+    // create template object with its private variable scope
+    $tpl = $smarty->createTemplate('index.tpl');
+
+    // assign variable to template scope
+    $tpl->assign('foo','bar');
+
+    // display the template
+    $tpl->display();
+    ?>
+
+        
+
+See also [`display()`](#api.display), and
+[`templateExists()`](#api.template.exists).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-disable-security.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-disable-security.md
new file mode 100644
index 000000000..1166828e5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-disable-security.md
@@ -0,0 +1,15 @@
+disableSecurity()
+
+disables template security
+
+Description
+===========
+
+string
+
+disableSecurity
+
+This disables security checking on templates.
+
+See also [`enableSecurity()`](#api.enable.security), and
+[Security](#advanced.features.security).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-display.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-display.md
new file mode 100644
index 000000000..ced7513f1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-display.md
@@ -0,0 +1,84 @@
+display()
+
+displays the template
+
+Description
+===========
+
+void
+
+display
+
+string
+
+template
+
+string
+
+cache\_id
+
+string
+
+compile\_id
+
+This displays the contents of a template. To return the contents of a
+template into a variable, use [`fetch()`](#api.fetch). Supply a valid
+[template resource](#resources) type and path. As an optional second
+parameter, you can pass a `$cache_id`, see the [caching
+section](#caching) for more information.
+
+PARAMETER.COMPILEID
+
+
+    <?php
+
+    use Smarty\Smarty;
+
+    $smarty = new Smarty();
+    $smarty->setCaching(true);
+
+    // only do db calls if cache doesn't exist
+    if(!$smarty->isCached('index.tpl')) {
+
+      // dummy up some data
+      $address = '245 N 50th';
+      $db_data = array(
+                   'City' => 'Lincoln',
+                   'State' => 'Nebraska',
+                   'Zip' => '68502'
+                 );
+
+      $smarty->assign('Name', 'Fred');
+      $smarty->assign('Address', $address);
+      $smarty->assign('data', $db_data);
+
+    }
+
+    // display the output
+    $smarty->display('index.tpl');
+    ?>
+
+       
+
+Use the syntax for [template resources](#resources) to display files
+outside of the [`$template_dir`](#variable.template.dir) directory.
+
+
+    <?php
+    // absolute filepath
+    $smarty->display('/usr/local/include/templates/header.tpl');
+
+    // absolute filepath (same thing)
+    $smarty->display('file:/usr/local/include/templates/header.tpl');
+
+    // windows absolute filepath (MUST use "file:" prefix)
+    $smarty->display('file:C:/www/pub/templates/header.tpl');
+
+    // include from template resource named "db"
+    $smarty->display('db:header.tpl');
+    ?>
+
+       
+
+See also [`fetch()`](#api.fetch) and
+[`templateExists()`](#api.template.exists).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-enable-security.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-enable-security.md
new file mode 100644
index 000000000..72ee38bb9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-enable-security.md
@@ -0,0 +1,41 @@
+enableSecurity()
+
+enables template security
+
+Description
+===========
+
+string
+
+enableSecurity
+
+string
+
+securityclass
+
+string
+
+enableSecurity
+
+object
+
+securityobject
+
+string
+
+enableSecurity
+
+This enables security checking on templates. It uses the following
+parameters:
+
+-   `securityclass` is an optional parameter. It\'s the name of the
+    class with defines the security policy parameters.
+
+-   `securityobject` is an optional parameter. It\'s the object with
+    defines the security policy parameters.
+
+For the details how to setup a security policy see the
+[Security](#advanced.features.security) section.
+
+See also [`disableSecurity()`](#api.disable.security), and
+[Security](#advanced.features.security).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-fetch.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-fetch.md
new file mode 100644
index 000000000..491c28d4d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-fetch.md
@@ -0,0 +1,91 @@
+fetch()
+
+returns the template output
+
+Description
+===========
+
+string
+
+fetch
+
+string
+
+template
+
+string
+
+cache\_id
+
+string
+
+compile\_id
+
+This returns the template output instead of [displaying](#api.display)
+it. Supply a valid [template resource](#resources) type and path. As an
+optional second parameter, you can pass a `$cache id`, see the [caching
+section](#caching) for more information.
+
+PARAMETER.COMPILEID
+
+
+    <?php
+    use Smarty\Smarty;
+    $smarty = new Smarty;
+
+    $smarty->setCaching(true);
+
+    // set a separate cache_id for each unique URL
+    $cache_id = md5($_SERVER['REQUEST_URI']);
+
+    // capture the output
+    $output = $smarty->fetch('index.tpl', $cache_id);
+
+    // do something with $output here
+    echo $output;
+    ?>
+
+        
+
+The `email_body.tpl` template
+
+
+    Dear {$contact_info.name},
+
+    Welcome and thank you for signing up as a member of our user group.
+
+    Click on the link below to login with your user name
+    of '{$contact_info.username}' so you can post in our forums.
+
+    {$login_url}
+
+    List master
+
+    {textformat wrap=40}
+    This is some long-winded disclaimer text that would automatically get wrapped
+    at 40 characters. This helps make the text easier to read in mail programs that
+    do not wrap sentences for you.
+    {/textformat}
+
+        
+
+The php script using the PHP [`mail()`](https://www.php.net/function.mail)
+function
+
+
+    <?php
+
+    // get $contact_info from db or other resource here
+
+    $smarty->assign('contact_info',$contact_info);
+    $smarty->assign('login_url',"http://{$_SERVER['SERVER_NAME']}/login");
+
+    mail($contact_info['email'], 'Thank You', $smarty->fetch('email_body.tpl'));
+
+    ?>
+
+        
+
+See also [`{fetch}`](#language.function.fetch)
+[`display()`](#api.display), [`{eval}`](#language.function.eval), and
+[`templateExists()`](#api.template.exists).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-dir.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-dir.md
new file mode 100644
index 000000000..f41472ca4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-dir.md
@@ -0,0 +1,40 @@
+getConfigDir()
+
+return the directory where config files are stored
+
+Description
+===========
+
+string\|array
+
+getConfigDir
+
+string
+
+key
+
+
+    <?php
+
+    // set some config directories
+    $smarty->setConfigDir(array(
+        'one' => './config',
+        'two' => './config_2',
+        'three' => './config_3',
+    ));
+
+    // get all directories where config files are stored
+    $config_dir = $smarty->getConfigDir();
+    var_dump($config_dir); // array
+
+    // get directory identified by key
+    $config_dir = $smarty->getConfigDir('one');
+    var_dump($config_dir); // string
+
+    ?>
+
+       
+
+See also [`setConfigDir()`](#api.set.config.dir),
+[`addConfigDir()`](#api.add.config.dir) and
+[`$config_dir`](#variable.config.dir).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-vars.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-vars.md
new file mode 100644
index 000000000..f252e8674
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-vars.md
@@ -0,0 +1,37 @@
+getConfigVars()
+
+returns the given loaded config variable value
+
+Description
+===========
+
+array
+
+getConfigVars
+
+string
+
+varname
+
+If no parameter is given, an array of all loaded [config
+variables](#language.config.variables) is returned.
+
+
+    <?php
+
+    // get loaded config template var #foo#
+    $myVar = $smarty->getConfigVars('foo');
+
+    // get all loaded config template vars
+    $all_config_vars = $smarty->getConfigVars();
+
+    // take a look at them
+    print_r($all_config_vars);
+    ?>
+
+       
+
+See also [`clearConfig()`](#api.clear.config),
+[`{config_load}`](#language.function.config.load),
+[`configLoad()`](#api.config.load) and
+[`getTemplateVars()`](#api.get.template.vars).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-get-plugins-dir.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-get-plugins-dir.md
new file mode 100644
index 000000000..aa6035549
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-get-plugins-dir.md
@@ -0,0 +1,31 @@
+getPluginsDir()
+
+return the directory where plugins are stored
+
+Description
+===========
+
+array
+
+getPluginsDir
+
+
+    <?php
+
+    // set some plugins directories
+    $smarty->setPluginsDir(array(
+        './plugins',
+        './plugins_2',
+    ));
+
+    // get all directories where plugins are stored
+    $config_dir = $smarty->getPluginsDir();
+    var_dump($config_dir); // array
+
+    ?>
+
+       
+
+See also [`setPluginsDir()`](#api.set.plugins.dir),
+[`addPluginsDir()`](#api.add.plugins.dir) and
+[`$plugins_dir`](#variable.plugins.dir).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-get-registered-object.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-get-registered-object.md
new file mode 100644
index 000000000..a7c920e14
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-get-registered-object.md
@@ -0,0 +1,36 @@
+getRegisteredObject()
+
+returns a reference to a registered object
+
+Description
+===========
+
+array
+
+getRegisteredObject
+
+string
+
+object\_name
+
+This is useful from within a custom function when you need direct access
+to a [registered object](#api.register.object). See the
+[objects](#advanced.features.objects) page for more info.
+
+
+    <?php
+    function smarty_block_foo($params, $smarty)
+    {
+      if (isset($params['object'])) {
+        // get reference to registered object
+        $obj_ref = $smarty->getRegisteredObject($params['object']);
+        // use $obj_ref is now a reference to the object
+      }
+    }
+    ?>
+
+       
+
+See also [`registerObject()`](#api.register.object),
+[`unregisterObject()`](#api.unregister.object) and [objects
+page](#advanced.features.objects)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-get-template-vars.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-get-template-vars.md
new file mode 100644
index 000000000..27882eef4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-get-template-vars.md
@@ -0,0 +1,37 @@
+getTemplateVars()
+
+returns assigned variable value(s)
+
+Description
+===========
+
+array
+
+getTemplateVars
+
+string
+
+varname
+
+If no parameter is given, an array of all [assigned](#api.assign)
+variables are returned.
+
+
+    <?php
+    // get assigned template var 'foo'
+    $myVar = $smarty->getTemplateVars('foo');
+
+    // get all assigned template vars
+    $all_tpl_vars = $smarty->getTemplateVars();
+
+    // take a look at them
+    print_r($all_tpl_vars);
+    ?>
+
+       
+
+See also [`assign()`](#api.assign),
+[`{assign}`](#language.function.assign), [`append()`](#api.append),
+[`clearAssign()`](#api.clear.assign),
+[`clearAllAssign()`](#api.clear.all.assign) and
+[`getConfigVars()`](#api.get.config.vars)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-is-cached.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-is-cached.md
new file mode 100644
index 000000000..d9d3057fb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-is-cached.md
@@ -0,0 +1,81 @@
+isCached()
+
+returns true if there is a valid cache for this template
+
+Description
+===========
+
+bool
+
+isCached
+
+string
+
+template
+
+string
+
+cache\_id
+
+string
+
+compile\_id
+
+-   This only works if [`$caching`](#variable.caching) is set to one of
+    `\Smarty\Smarty::CACHING_LIFETIME_CURRENT` or
+    `\Smarty\Smarty::CACHING_LIFETIME_SAVED` to enable caching. See the [caching
+    section](#caching) for more info.
+
+-   You can also pass a `$cache_id` as an optional second parameter in
+    case you want [multiple caches](#caching.multiple.caches) for the
+    given template.
+
+-   You can supply a [`$compile id`](#variable.compile.id) as an
+    optional third parameter. If you omit that parameter the persistent
+    [`$compile_id`](#variable.compile.id) is used if its set.
+
+-   If you do not want to pass a `$cache_id` but want to pass a
+    [`$compile_id`](#variable.compile.id) you have to pass NULL as a
+    `$cache_id`.
+
+> **Note**
+>
+> If `isCached()` returns TRUE it actually loads the cached output and
+> stores it internally. Any subsequent call to
+> [`display()`](#api.display) or [`fetch()`](#api.fetch) will return
+> this internally stored output and does not try to reload the cache
+> file. This prevents a race condition that may occur when a second
+> process clears the cache between the calls to `isCached()` and to
+> [`display()`](#api.display) in the example above. This also means
+> calls to [`clearCache()`](#api.clear.cache) and other changes of the
+> cache-settings may have no effect after `isCached()` returned TRUE.
+
+
+    <?php
+    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+    if(!$smarty->isCached('index.tpl')) {
+    // do database calls, assign vars here
+    }
+
+    $smarty->display('index.tpl');
+    ?>
+
+       
+
+
+    <?php
+    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
+
+    if(!$smarty->isCached('index.tpl', 'FrontPage')) {
+      // do database calls, assign vars here
+    }
+
+    $smarty->display('index.tpl', 'FrontPage');
+    ?>
+
+       
+
+See also [`clearCache()`](#api.clear.cache),
+[`clearAllCache()`](#api.clear.all.cache), and [caching
+section](#caching).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-load-filter.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-load-filter.md
new file mode 100644
index 000000000..e2738b0c8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-load-filter.md
@@ -0,0 +1,41 @@
+loadFilter()
+
+load a filter plugin
+
+Description
+===========
+
+void
+
+loadFilter
+
+string
+
+type
+
+string
+
+name
+
+The first argument specifies the type of the filter to load and can be
+one of the following: `variable`, `pre`, `post` or `output`. The second argument
+specifies the `name` of the filter plugin.
+
+
+    <?php
+
+    // load prefilter named 'trim'
+    $smarty->loadFilter('pre', 'trim');
+
+    // load another prefilter named 'datefooter'
+    $smarty->loadFilter('pre', 'datefooter');
+
+    // load output filter named 'compress'
+    $smarty->loadFilter('output', 'compress');
+
+    ?>
+
+       
+
+See also [`registerFilter()`](#api.register.filter) and [advanced
+features](#advanced.features).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-mute-expected-errors.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-mute-expected-errors.md
new file mode 100644
index 000000000..ac84a6435
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-mute-expected-errors.md
@@ -0,0 +1,21 @@
+Smarty::muteExpectedErrors()
+
+mutes expected warnings and notices deliberately generated by Smarty
+
+Description
+===========
+
+string
+
+muteExpectedErrors
+
+muteExpectedErrors() registers a custom error handler using
+[set\_error\_handler()](https://www.php.net/set_error_handler). The error
+handler merely inspects `$errno` and `$errfile` to determine if the
+given error was produced deliberately and must be ignored, or should be
+passed on to the next error handler.
+
+`\Smarty\Smarty::unmuteExpectedErrors()` removes the current error handler.
+Please note, that if you\'ve registered any custom error handlers after
+the muteExpectedErrors() call, the unmute will not remove Smarty\'s
+muting error handler, but the one registered last.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-cacheresource.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-cacheresource.md
new file mode 100644
index 000000000..626091496
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-cacheresource.md
@@ -0,0 +1,40 @@
+registerCacheResource()
+
+dynamically register CacheResources
+
+Description
+===========
+
+void
+
+registerCacheResource
+
+string
+
+name
+
+Smarty\_CacheResource
+
+resource\_handler
+
+Use this to dynamically register a [CacheResource
+plugin](#caching.custom) with Smarty. Pass in the `name` of the
+CacheResource and the object extending Smarty\_CacheResource. See
+[Custom Cache Implementation](#caching.custom) for more information on
+how to create custom CacheResources.
+
+> **Note**
+>
+> In Smarty2 this used to be a callback function called
+> `$cache_handler_func`. Smarty3 replaced this callback by the
+> `Smarty_CacheResource` module.
+
+
+    <?php
+    $smarty->registerCacheResource('mysql', new My_CacheResource_Mysql());
+    ?>
+
+       
+
+See also [`unregisterCacheResource()`](#api.unregister.cacheresource)
+and the [Custom CacheResource Implementation](#caching.custom) section.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-class.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-class.md
new file mode 100644
index 000000000..d0156d512
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-class.md
@@ -0,0 +1,68 @@
+registerClass()
+
+register a class for use in the templates
+
+Description
+===========
+
+void
+
+registerClass
+
+string
+
+class\_name
+
+string
+
+class\_impl
+
+Smarty allows you to access static classes from templates as long as the
+[Security Policy](#advanced.features.security) does not tell it
+otherwise. If security is enabled, classes registered with
+`registerClass()` are accessible to templates.
+
+
+    <?php
+    use Smarty\Smarty;
+
+    class Bar {
+      $property = "hello world";
+    }
+
+    $smarty = new Smarty();
+    $smarty->registerClass("Foo", "Bar");
+
+       
+
+
+    {* Smarty will access this class as long as it's not prohibited by security *}
+    {Bar::$property}
+    {* Foo translates to the real class Bar *}
+    {Foo::$property}
+
+       
+
+
+    <?php
+    use Smarty\Smarty;
+
+    namespace my\php\application {
+      class Bar {
+        $property = "hello world";
+      }
+    }
+   
+    $smarty = new Smarty();
+    $smarty->registerClass("Foo", "\my\php\application\Bar");
+
+       
+
+
+    {* Foo translates to the real class \my\php\application\Bar *}
+    {Foo::$property}
+
+       
+
+See also [`registerObject()`](#api.register.object), and
+[Security](#advanced.features.security).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-default-plugin-handler.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-default-plugin-handler.md
new file mode 100644
index 000000000..61ac47612
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-default-plugin-handler.md
@@ -0,0 +1,93 @@
+registerDefaultPluginHandler()
+
+register a function which gets called on undefined tags
+
+Description
+===========
+
+void
+
+registerDefaultPluginHandler
+
+mixed
+
+callback
+
+Register a default plugin handler which gets called if the compiler can
+not find a definition for a tag otherwise. It uses the following
+parameters:
+
+If during compilation Smarty encounters tag which is not defined
+internal, registered or located in the plugins folder it tries to
+resolve it by calling the registered default plugin handler. The handler
+may be called several times for same undefined tag looping over valid
+plugin types.
+
+
+    <?php
+    use Smarty\Smarty;
+    $smarty = new Smarty();
+    $smarty->registerDefaultPluginHandler('my_plugin_handler');
+
+    /**
+     * Default Plugin Handler
+     *
+     * called when Smarty encounters an undefined tag during compilation
+     * 
+     * @param string                     $name      name of the undefined tag
+     * @param string                     $type     tag type (e.g. Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK, 
+                                                   Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_MODIFIER, Smarty::PLUGIN_MODIFIERCOMPILER)
+     * @param \Smarty\Template\   $template     template object
+     * @param string                     &$callback    returned function name 
+     * @param string                     &$script      optional returned script filepath if function is external
+     * @param bool                       &$cacheable    true by default, set to false if plugin is not cachable (Smarty >= 3.1.8)
+     * @return bool                      true if successfull
+     */
+    function my_plugin_handler ($name, $type, $template, &$callback, &$script, &$cacheable)
+    {
+        switch ($type) {
+            case Smarty::PLUGIN_FUNCTION:
+                switch ($name) {
+                    case 'scriptfunction':
+                        $script = './scripts/script_function_tag.php';
+                        $callback = 'default_script_function_tag';
+                        return true;
+                    case 'localfunction':
+                        $callback = 'default_local_function_tag';
+                        return true;
+                    default:
+                    return false;
+                }
+            case Smarty::PLUGIN_COMPILER:
+                switch ($name) {
+                    case 'scriptcompilerfunction':
+                        $script = './scripts/script_compiler_function_tag.php';
+                        $callback = 'default_script_compiler_function_tag';
+                        return true;
+                    default:
+                    return false;
+                }
+            case Smarty::PLUGIN_BLOCK:
+                switch ($name) {
+                    case 'scriptblock':
+                        $script = './scripts/script_block_tag.php';
+                        $callback = 'default_script_block_tag';
+                        return true;
+                    default:
+                    return false;
+                }
+            default:
+            return false;
+        }
+     }
+
+    ?>
+
+      
+
+> **Note**
+>
+> The return callback must be static; a function name or an array of
+> class and method name.
+>
+> Dynamic callbacks like objects methods are not supported.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-filter.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-filter.md
new file mode 100644
index 000000000..4a2aa4b02
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-filter.md
@@ -0,0 +1,44 @@
+registerFilter()
+
+dynamically register filters
+
+Description
+===========
+
+void
+
+registerFilter
+
+string
+
+type
+
+mixed
+
+callback
+
+Use this to dynamically register filters to operate on a templates. It
+uses the following parameters:
+
+NOTE.PARAMETER.FUNCTION
+
+A [prefilter](#plugins.prefilters.postfilters) runs through the template
+source before it gets compiled. See [template
+prefilters](#advanced.features.prefilters) for more information on how
+to setup a prefiltering function.
+
+A [postfilter](#plugins.prefilters.postfilters) runs through the
+template code after it was compiled to PHP. See [template
+postfilters](#advanced.features.postfilters) for more information on how
+to setup a postfiltering function.
+
+A [outputfilter](#plugins.outputfilters) operates on a template\'s
+output before it is [displayed](#api.display). See [template output
+filters](#advanced.features.outputfilters) for more information on how
+to set up an output filter function.
+
+See also [`unregisterFilter()`](#api.unregister.filter),
+[`loadFilter()`](#api.load.filter), [template pre
+filters](#advanced.features.prefilters) [template post
+filters](#advanced.features.postfilters) [template output
+filters](#advanced.features.outputfilters) section.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-object.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-object.md
new file mode 100644
index 000000000..c310e8c2a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-object.md
@@ -0,0 +1,44 @@
+registerObject()
+
+register an object for use in the templates
+
+Description
+===========
+
+void
+
+registerObject
+
+string
+
+object\_name
+
+object
+
+object
+
+array
+
+allowed\_methods\_properties
+
+boolean
+
+format
+
+array
+
+block\_methods
+
+> **Note**
+>
+> When you register/assign objects to templates, be sure that all
+> properties and methods accessed from the template are for presentation
+> purposes only. It is very easy to inject application logic through
+> objects, and this leads to poor designs that are difficult to manage.
+> See the Best Practices section of the Smarty website.
+
+See the [objects section](#advanced.features.objects) for more
+information.
+
+See also [`getRegisteredObject()`](#api.get.registered.object), and
+[`unregisterObject()`](#api.unregister.object).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-plugin.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-plugin.md
new file mode 100644
index 000000000..51342b8e1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-plugin.md
@@ -0,0 +1,110 @@
+registerPlugin()
+
+dynamically register plugins
+
+Description
+===========
+
+void
+
+registerPlugin
+
+string
+
+type
+
+string
+
+name
+
+mixed
+
+callback
+
+bool
+
+cacheable
+
+mixed
+
+cache\_attrs
+
+This method registers functions or methods defined in your script as
+plugin. It uses the following parameters:
+
+-   `cacheable` can be omitted in most cases. See
+    [controlling cacheability of plugins output](#caching.cacheable) on
+    how to use this properly.
+
+<!-- -->
+
+
+    <?php
+    $smarty->registerPlugin("function","date_now", "print_current_date");
+
+    function print_current_date($params, $smarty)
+    {
+      if(empty($params["format"])) {
+        $format = "%b %e, %Y";
+      } else {
+        $format = $params["format"];
+      }
+      return strftime($format,time());
+    }
+    ?>
+
+       
+
+And in the template
+
+
+    {date_now}
+
+    {* or to format differently *}
+    {date_now format="%Y/%m/%d"}
+
+
+    <?php
+    // function declaration
+    function do_translation ($params, $content, $smarty, &$repeat, $template)
+    {
+      if (isset($content)) {
+        $lang = $params["lang"];
+        // do some translation with $content
+        return $translation;
+      }
+    }
+
+    // register with smarty
+    $smarty->registerPlugin("block","translate", "do_translation");
+    ?>
+
+       
+
+Where the template is:
+
+
+    {translate lang="br"}Hello, world!{/translate}
+
+       
+
+
+    <?php
+
+    // let's map PHP's stripslashes function to a Smarty modifier.
+    $smarty->registerPlugin("modifier","ss", "stripslashes");
+
+    ?>
+
+In the template, use `ss` to strip slashes.
+
+
+    <?php
+    {$var|ss}
+    ?>
+
+See also [`unregisterPlugin()`](#api.unregister.plugin), [plugin
+functions](#plugins.functions), [plugin block
+functions](#plugins.block.functions), [plugin compiler
+functions](#plugins.compiler.functions), and the [creating plugin
+modifiers](#plugins.modifiers) section.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-resource.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-resource.md
new file mode 100644
index 000000000..774452bff
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-register-resource.md
@@ -0,0 +1,46 @@
+registerResource()
+
+dynamically register resources
+
+Description
+===========
+
+void
+
+registerResource
+
+string
+
+name
+
+Smarty\_resource
+
+resource\_handler
+
+Use this to dynamically register a [Resource plugin](#resources) with
+Smarty. Pass in the `name` of the Resource and the object extending
+Smarty\_Resource. See [template resources](#resources) for more
+information on how to setup a function for fetching templates.
+
+> **Note**
+>
+> A resource name must be at least two characters in length. One
+> character resource names will be ignored and used as part of the file
+> path, such as `$smarty->display('c:/path/to/index.tpl');`
+
+> **Note**
+>
+> Prior to Smarty 3.1 `registerResource()` accepted an array of callback
+> functions. While this is still possible for backward compatibility
+> reasons, it is strongly discouraged as callback functions have been
+> deprecated as of Smarty 3.1.
+
+
+    <?php
+    $smarty->registerResource('mysql', new My_Resource_Mysql());
+    ?>
+
+       
+
+See also [`unregisterResource()`](#api.unregister.resource) and the
+[template resources](#resources) section.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-set-plugins-dir.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-set-plugins-dir.md
new file mode 100644
index 000000000..25b0567b1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-set-plugins-dir.md
@@ -0,0 +1,46 @@
+setPluginsDir()
+
+set the directories where plugins are stored
+
+Description
+===========
+
+Smarty
+
+setPluginsDir
+
+string\|array
+
+plugins\_dir
+
+
+    <?php
+
+    // set a single directory where the plugins are stored
+    $smarty->setPluginsDir('./plugins');
+
+    // view the plugins dir chain
+    var_dump($smarty->getPluginsDir());
+
+    // set multiple directoríes where plugins are stored
+    $smarty->setPluginsDir(array(
+        './plugins',
+        './plugins_2',
+    ));
+
+    // view the plugins dir chain
+    var_dump($smarty->getPluginsDir());
+
+    // chaining of method calls
+    $smarty->setTemplateDir('./templates')
+           ->setPluginsDir('./plugins')
+           ->setCompileDir('./templates_c')
+           ->setCacheDir('./cache');
+
+    ?>
+
+       
+
+See also [`getPluginsDir()`](#api.get.plugins.dir),
+[`addPluginsDir()`](#api.add.plugins.dir) and
+[`$plugins_dir`](#variable.plugins.dir).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-test-install.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-test-install.md
new file mode 100644
index 000000000..bba64a19c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-test-install.md
@@ -0,0 +1,22 @@
+testInstall()
+
+checks Smarty installation
+
+Description
+===========
+
+void
+
+testInstall
+
+This function verifies that all required working folders of the Smarty
+installation can be accessed. It does output a corresponding protocol.
+
+
+    <?php
+    use Smarty\Smarty;
+    $smarty  = new Smarty();
+    $smarty->testInstall();
+    ?>
+
+       
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-cacheresource.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-cacheresource.md
new file mode 100644
index 000000000..d097519db
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-cacheresource.md
@@ -0,0 +1,28 @@
+unregisterCacheResource()
+
+dynamically unregister a CacheResource plugin
+
+Description
+===========
+
+void
+
+unregisterCacheResource
+
+string
+
+name
+
+Pass in the `name` of the CacheResource.
+
+
+    <?php
+
+    $smarty->unregisterCacheResource('mysql');
+
+    ?>
+
+       
+
+See also [`registerCacheResource()`](#api.register.cacheresource) and
+the [Custom CacheResource Implementation](#caching.custom) section.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-filter.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-filter.md
new file mode 100644
index 000000000..44020eb40
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-filter.md
@@ -0,0 +1,23 @@
+unregisterFilter()
+
+dynamically unregister a filter
+
+Description
+===========
+
+void
+
+unregisterFilter
+
+string
+
+type
+
+string\|array
+
+callback
+
+Use this to dynamically unregister filters. It uses the following
+parameters:
+
+See also [`registerFilter()`](#api.register.filter).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-object.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-object.md
new file mode 100644
index 000000000..c012581f9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-object.md
@@ -0,0 +1,17 @@
+unregisterObject()
+
+dynamically unregister an object
+
+Description
+===========
+
+void
+
+unregisterObject
+
+string
+
+object\_name
+
+See also [`registerObject()`](#api.register.object) and [objects
+section](#advanced.features.objects)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-plugin.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-plugin.md
new file mode 100644
index 000000000..c692ac60f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-plugin.md
@@ -0,0 +1,36 @@
+unregisterPlugin
+
+dynamically unregister plugins
+
+Description
+===========
+
+void
+
+unregisterPlugin
+
+string
+
+type
+
+string
+
+name
+
+This method unregisters plugins which previously have been registered by
+[registerPlugin()](#api.register.plugin), It uses the following
+parameters:
+
+<!-- -->
+
+
+    <?php
+
+    // we don't want template designers to have access to function plugin "date_now" 
+    $smarty->unregisterPlugin("function","date_now");
+
+    ?>
+
+       
+
+See also [`registerPlugin()`](#api.register.plugin).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-resource.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-resource.md
new file mode 100644
index 000000000..1a6067bd2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-resource.md
@@ -0,0 +1,28 @@
+unregisterResource()
+
+dynamically unregister a resource plugin
+
+Description
+===========
+
+void
+
+unregisterResource
+
+string
+
+name
+
+Pass in the `name` of the resource.
+
+
+    <?php
+
+    $smarty->unregisterResource('db');
+
+    ?>
+
+       
+
+See also [`registerResource()`](#api.register.resource) and [template
+resources](#resources)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-auto-literal.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-auto-literal.md
new file mode 100644
index 000000000..8d0685025
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-auto-literal.md
@@ -0,0 +1,17 @@
+\$auto\_literal {#variable.auto.literal}
+===============
+
+The Smarty delimiter tags { and } will be ignored so long as they are
+surrounded by white space. This behavior can be disabled by setting
+auto\_literal to false.
+
+::: {.informalexample}
+
+    <?php
+    $smarty->auto_literal = false;
+    ?>
+
+            
+:::
+
+See also [Escaping Smarty parsing](#language.escaping),
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-dir.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-dir.md
new file mode 100644
index 000000000..6cb2b5559
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-dir.md
@@ -0,0 +1,35 @@
+\$cache\_dir {#variable.cache.dir}
+============
+
+This is the name of the directory where template caches are stored. By
+default this is `./cache`, meaning that Smarty will look for the
+`cache/` directory in the same directory as the executing php script.
+**This directory must be writeable by the web server**, [see
+install](#installing.smarty.basic) for more info.
+
+You can also use your own [custom cache implementation](#caching.custom)
+to control cache files, which will ignore this setting. See also
+[`$use_sub_dirs`](#variable.use.sub.dirs).
+
+> **Note**
+>
+> This setting must be either a relative or absolute path. include\_path
+> is not used for writing files.
+
+> **Note**
+>
+> It is not recommended to put this directory under the web server
+> document root.
+
+> **Note**
+>
+> As of Smarty 3.1 the attribute \$cache\_dir is no longer accessible
+> directly. Use [`getCacheDir()`](#api.get.cache.dir) and
+> [`setCacheDir()`](#api.set.cache.dir) instead.
+
+See also [`getCacheDir()`](#api.get.cache.dir),
+[`setCacheDir()`](#api.set.cache.dir), [`$caching`](#variable.caching),
+[`$use_sub_dirs`](#variable.use.sub.dirs),
+[`$cache_lifetime`](#variable.cache.lifetime),
+[`$cache_modified_check`](#variable.cache.modified.check) and the
+[caching section](#caching).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-id.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-id.md
new file mode 100644
index 000000000..c27fae921
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-id.md
@@ -0,0 +1,11 @@
+\$cache\_id {#variable.cache.id}
+===========
+
+Persistent cache\_id identifier. As an alternative to passing the same
+`$cache_id` to each and every function call, you can set this
+`$cache_id` and it will be used implicitly thereafter.
+
+With a `$cache_id` you can have multiple cache files for a single call
+to [`display()`](#api.display) or [`fetch()`](#api.fetch) depending for
+example from different content of the same template. See the [caching
+section](#caching) for more information.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-lifetime.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-lifetime.md
new file mode 100644
index 000000000..481fbee8e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-lifetime.md
@@ -0,0 +1,30 @@
+\$cache\_lifetime {#variable.cache.lifetime}
+=================
+
+This is the length of time in seconds that a template cache is valid.
+Once this time has expired, the cache will be regenerated.
+
+-   `$caching` must be turned on (either
+    \Smarty\Smarty::CACHING\_LIFETIME\_CURRENT or
+    \Smarty\Smarty::CACHING\_LIFETIME\_SAVED) for `$cache_lifetime` to have any
+    purpose.
+
+-   A `$cache_lifetime` value of -1 will force the cache to never
+    expire.
+
+-   A value of 0 will cause the cache to always regenerate (good for
+    testing only, to disable caching a more efficient method is to set
+    [`$caching`](#variable.caching) = \Smarty\Smarty::CACHING\_OFF).
+
+-   If you want to give certain templates their own cache lifetime, you
+    could do this by setting [`$caching`](#variable.caching) =
+    \Smarty\Smarty::CACHING\_LIFETIME\_SAVED, then set `$cache_lifetime` to a
+    unique value just before calling [`display()`](#api.display) or
+    [`fetch()`](#api.fetch).
+
+If [`$force_compile`](#variable.force.compile) is enabled, the cache
+files will be regenerated every time, effectively disabling caching. You
+can clear all the cache files with the
+[`clear_all_cache()`](#api.clear.all.cache) function, or individual
+cache files (or groups) with the [`clear_cache()`](#api.clear.cache)
+function.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-locking.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-locking.md
new file mode 100644
index 000000000..6dca30c7b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-locking.md
@@ -0,0 +1,11 @@
+\$cache\_locking {#variable.cache.locking}
+================
+
+Cache locking avoids concurrent cache generation. This means resource
+intensive pages can be generated only once, even if they\'ve been
+requested multiple times in the same moment.
+
+Cache locking is disabled by default. To enable it set `$cache_locking`
+to TRUE.
+
+See also [`$locking_timeout`](#variable.locking.timeout)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-modified-check.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-modified-check.md
new file mode 100644
index 000000000..815be2556
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-modified-check.md
@@ -0,0 +1,11 @@
+\$cache\_modified\_check {#variable.cache.modified.check}
+========================
+
+If set to TRUE, Smarty will respect the If-Modified-Since header sent
+from the client. If the cached file timestamp has not changed since the
+last visit, then a `'304: Not Modified'` header will be sent instead of
+the content.
+
+See also [`$caching`](#variable.caching),
+[`$cache_lifetime`](#variable.cache.lifetime), and the [caching
+section](#caching).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching-type.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching-type.md
new file mode 100644
index 000000000..22b88cf6a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching-type.md
@@ -0,0 +1,9 @@
+\$caching\_type {#variable.caching.type}
+===============
+
+This property specifies the name of the caching handler to use. It
+defaults to `file`, enabling the internal filesystem based cache
+handler.
+
+See [Custom Cache Implementation](#caching.custom) for pointers on
+setting up your own cache handler.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching.md
new file mode 100644
index 000000000..7304e41d6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching.md
@@ -0,0 +1,38 @@
+\$caching {#variable.caching}
+=========
+
+This tells Smarty whether or not to cache the output of the templates to
+the [`$cache_dir`](#variable.cache.dir). By default this is set to the
+constant \Smarty\Smarty::CACHING\_OFF. If your templates consistently generate
+the same content, it is advisable to turn on `$caching`, as this may
+result in significant performance gains.
+
+You can also have [multiple](#caching.multiple.caches) caches for the
+same template.
+
+-   A constant value of \Smarty\Smarty::CACHING\_LIFETIME\_CURRENT or
+    \Smarty\Smarty ::CACHING\_LIFETIME\_SAVED enables caching.
+
+-   A value of \Smarty\Smarty::CACHING\_LIFETIME\_CURRENT tells Smarty to use
+    the current [`$cache_lifetime`](#variable.cache.lifetime) variable
+    to determine if the cache has expired.
+
+-   A value of \Smarty\Smarty::CACHING\_LIFETIME\_SAVED tells Smarty to use the
+    [`$cache_lifetime`](#variable.cache.lifetime) value at the time the
+    cache was generated. This way you can set the
+    [`$cache_lifetime`](#variable.cache.lifetime) just before
+    [fetching](#api.fetch) the template to have granular control over
+    when that particular cache expires. See also
+    [`isCached()`](#api.is.cached).
+
+-   If [`$compile_check`](#variable.compile.check) is enabled, the
+    cached content will be regenerated if any of the templates or config
+    files that are part of this cache are changed.
+
+-   If [`$force_compile`](#variable.force.compile) is enabled, the
+    cached content will always be regenerated.
+
+See also [`$cache_dir`](#variable.cache.dir),
+[`$cache_lifetime`](#variable.cache.lifetime),
+[`$cache_modified_check`](#variable.cache.modified.check),
+[`is_cached()`](#api.is.cached) and the [caching section](#caching).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-dir.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-dir.md
new file mode 100644
index 000000000..c18c9acba
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-dir.md
@@ -0,0 +1,29 @@
+\$compile\_dir {#variable.compile.dir}
+==============
+
+This is the name of the directory where compiled templates are located.
+By default this is `./templates_c`, meaning that Smarty will look for
+the `templates_c/` directory in the same directory as the executing php
+script. **This directory must be writeable by the web server**, [see
+install](#installing.smarty.basic) for more info.
+
+> **Note**
+>
+> This setting must be either a relative or absolute path. include\_path
+> is not used for writing files.
+
+> **Note**
+>
+> It is not recommended to put this directory under the web server
+> document root.
+
+> **Note**
+>
+> As of Smarty 3.1 the attribute \$compile\_dir is no longer accessible
+> directly. Use [`getCompileDir()`](#api.get.compile.dir) and
+> [`setCompileDir()`](#api.set.compile.dir) instead.
+
+See also [`getCompileDir()`](#api.get.compile.dir),
+[`setCompileDir()`](#api.set.compile.dir),
+[`$compile_id`](#variable.compile.id) and
+[`$use_sub_dirs`](#variable.use.sub.dirs).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-id.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-id.md
new file mode 100644
index 000000000..ca2b08fb5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-id.md
@@ -0,0 +1,44 @@
+\$compile\_id {#variable.compile.id}
+=============
+
+Persistent compile identifier. As an alternative to passing the same
+`$compile_id` to each and every function call, you can set this
+`$compile_id` and it will be used implicitly thereafter.
+
+If you use the same template with different [pre- and/or
+post-filters](#plugins.prefilters.postfilters) you must use a unique
+`$compile_id` to keep the compiled template files separated.
+
+For example a [prefilter](#plugins.prefilters.postfilters) that
+localizes your templates (that is: translates language dependent parts)
+at compile time, then you could use the current language as
+`$compile_id` and you will get a set of compiled templates for each
+language you use.
+
+
+    <?php
+    $smarty->compile_id = 'en';
+    ?>
+
+      
+
+Another application would be to use the same compile directory across
+multiple domains / multiple virtual hosts.
+
+
+    <?php
+
+    $smarty->compile_id = $_SERVER['SERVER_NAME'];
+    $smarty->compile_dir = '/path/to/shared_compile_dir';
+
+    ?>
+
+      
+
+> **Note**
+>
+> In Smarty 3 a `$compile_id` is no longer required to keep templates
+> with same name in different [`$template_dir`
+> folders](#variable.template.dir) separated. The [`$template_dir` file
+> path](#variable.template.dir) is encoded in the file name of compiled
+> and cached template files.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-locking.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-locking.md
new file mode 100644
index 000000000..ff7a66f3a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-locking.md
@@ -0,0 +1,7 @@
+\$compile\_locking {#variable.compile.locking}
+==================
+
+Compile locking avoids concurrent compilation of the same template.
+
+Compile locking is enabled by default. To disable it set
+`$compile_locking` to FALSE.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-compiler-class.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-compiler-class.md
new file mode 100644
index 000000000..32ea982d6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-compiler-class.md
@@ -0,0 +1,6 @@
+\$compiler\_class {#variable.compiler.class}
+=================
+
+Specifies the name of the compiler class that Smarty will use to compile
+the templates. The default is \'Smarty\_Compiler\'. For advanced users
+only.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-booleanize.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-booleanize.md
new file mode 100644
index 000000000..4ba555f84
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-booleanize.md
@@ -0,0 +1,8 @@
+\$config\_booleanize {#variable.config.booleanize}
+====================
+
+If set to TRUE, [config files](#config.files) values of `on/true/yes`
+and `off/false/no` get converted to boolean values automatically. This
+way you can use the values in the template like so:
+`{if #foobar#}...{/if}`. If foobar was `on`, `true` or `yes`, the `{if}`
+statement will execute. Defaults to TRUE.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-dir.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-dir.md
new file mode 100644
index 000000000..d73f3274f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-dir.md
@@ -0,0 +1,23 @@
+\$config\_dir {#variable.config.dir}
+=============
+
+This is the directory used to store [config files](#config.files) used
+in the templates. Default is `./configs`, meaning that Smarty will look
+for the `configs/` directory in the same directory as the executing php
+script.
+
+> **Note**
+>
+> It is not recommended to put this directory under the web server
+> document root.
+
+> **Note**
+>
+> As of Smarty 3.1 the attribute \$config\_dir is no longer accessible
+> directly. Use [`getConfigDir()`](#api.get.config.dir),
+> [`setConfigDir()`](#api.set.config.dir) and
+> [`addConfigDir()`](#api.add.config.dir) instead.
+
+See also [`getConfigDir()`](#api.get.config.dir),
+[`setConfigDir()`](#api.set.config.dir) and
+[`addConfigDir()`](#api.add.config.dir).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-overwrite.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-overwrite.md
new file mode 100644
index 000000000..0b8968374
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-overwrite.md
@@ -0,0 +1,40 @@
+\$config\_overwrite {#variable.config.overwrite}
+===================
+
+If set to TRUE, the default then variables read in from [config
+files](#config.files) will overwrite each other. Otherwise, the
+variables will be pushed onto an array. This is helpful if you want to
+store arrays of data in config files, just list each element multiple
+times.
+
+This examples uses [`{cycle}`](#language.function.cycle) to output a
+table with alternating red/green/blue row colors with
+`$config_overwrite` = FALSE.
+
+The config file.
+
+
+    # row colors
+    rowColors = #FF0000
+    rowColors = #00FF00
+    rowColors = #0000FF
+
+        
+
+The template with a [`{section}`](#language.function.section) loop.
+
+
+    <table>
+      {section name=r loop=$rows}
+      <tr bgcolor="{cycle values=#rowColors#}">
+        <td> ....etc.... </td>
+      </tr>
+      {/section}
+    </table>
+
+        
+
+See also [`{config_load}`](#language.function.config.load),
+[`getConfigVars()`](#api.get.config.vars),
+[`clearConfig()`](#api.clear.config), [`configLoad()`](#api.config.load)
+and the [config files section](#config.files).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-read-hidden.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-read-hidden.md
new file mode 100644
index 000000000..19cde68bd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-read-hidden.md
@@ -0,0 +1,8 @@
+\$config\_read\_hidden {#variable.config.read.hidden}
+======================
+
+If set to TRUE, hidden sections ie section names beginning with a
+period(.) in [config files](#config.files) can be read from templates.
+Typically you would leave this FALSE, that way you can store sensitive
+data in the config files such as database parameters and not worry about
+the template loading them. FALSE by default.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-debug-template.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-debug-template.md
new file mode 100644
index 000000000..11a805292
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-debug-template.md
@@ -0,0 +1,8 @@
+\$debug\_tpl {#variable.debug_template}
+============
+
+This is the name of the template file used for the debugging console. By
+default, it is named `debug.tpl` and is located in `src/debug.tpl`.
+
+See also [`$debugging`](#variable.debugging) and the [debugging
+console](#chapter.debugging.console) section.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging-ctrl.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging-ctrl.md
new file mode 100644
index 000000000..a9355c0a2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging-ctrl.md
@@ -0,0 +1,20 @@
+\$debugging\_ctrl {#variable.debugging.ctrl}
+=================
+
+This allows alternate ways to enable debugging. `NONE` means no
+alternate methods are allowed. `URL` means when the keyword
+`SMARTY_DEBUG` is found in the `QUERY_STRING`, debugging is enabled for
+that invocation of the script. If [`$debugging`](#variable.debugging) is
+TRUE, this value is ignored.
+
+
+    <?php
+    // shows debug console only on localhost ie
+    // http://localhost/script.php?foo=bar&SMARTY_DEBUG
+    $smarty->debugging = false; // the default
+    $smarty->debugging_ctrl = ($_SERVER['SERVER_NAME'] == 'localhost') ? 'URL' : 'NONE';
+    ?>
+
+See also [debugging console](#chapter.debugging.console) section,
+[`$debugging`](#variable.debugging) and
+[`$smarty_debug_id`](#variable.smarty.debug.id).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging.md
new file mode 100644
index 000000000..4473e0c8d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging.md
@@ -0,0 +1,17 @@
+\$debugging {#variable.debugging}
+===========
+
+This enables the [debugging console](#chapter.debugging.console). The
+console is a javascript popup window that informs you of the
+[included](#language.function.include) templates, variables
+[assigned](#api.assign) from php and [config file
+variables](#language.config.variables) for the current script. It does
+not show variables assigned within a template with the
+[`{assign}`](#language.function.assign) function.
+
+The console can also be enabled from the url with
+[`$debugging_ctrl`](#variable.debugging.ctrl).
+
+See also [`{debug}`](#language.function.debug),
+[`$debug_tpl`](#variable.debug_template), and
+[`$debugging_ctrl`](#variable.debugging.ctrl).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-handler-func.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-handler-func.md
new file mode 100644
index 000000000..50eb65bb5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-handler-func.md
@@ -0,0 +1,50 @@
+\$default\_config\_handler\_func {#variable.default.config.handler.func}
+================================
+
+This function is called when a config file cannot be obtained from its
+resource.
+
+> **Note**
+>
+> The default handler is currently only invoked for file resources. It
+> is not triggered when the resource itself cannot be found, in which
+> case a \Smarty\Exception is thrown.
+
+
+    <?php
+    use Smarty\Smarty;
+    $smarty = new Smarty();
+    $smarty->default_config_handler_func = 'my_default_config_handler_func';
+
+    /**
+     * Default Config Handler
+     *
+     * called when Smarty's file: resource is unable to load a requested file
+     * 
+     * @param string   $type     resource type (e.g. "file", "string", "eval", "resource")
+     * @param string   $name     resource name (e.g. "foo/bar.tpl")
+     * @param string  &$content  config's content
+     * @param integer &$modified config's modification time
+     * @param Smarty   $smarty   Smarty instance
+     * @return string|boolean   path to file or boolean true if $content and $modified 
+     *                          have been filled, boolean false if no default config 
+     *                          could be loaded
+     */
+    function my_default_config_handler_func($type, $name, &$content, &$modified, Smarty $smarty) {
+        if (false) {
+            // return corrected filepath
+            return "/tmp/some/foobar.tpl";
+        } elseif (false) {
+            // return a config directly
+            $content = 'someVar = "the config source"';
+            $modified = time();
+            return true;
+        } else {
+            // tell smarty that we failed
+            return false;
+        }
+    }
+
+    ?>
+
+      
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-type.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-type.md
new file mode 100644
index 000000000..60bf9f1ea
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-type.md
@@ -0,0 +1,7 @@
+\$default\_config\_type {#variable.default.config.type}
+=======================
+
+This tells smarty what resource type to use for config files. The
+default value is `file`, meaning that `$smarty->configLoad('test.conf')`
+and `$smarty->configLoad('file:test.conf')` are identical in meaning.
+See the [resource](#resources) chapter for more details.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-modifiers.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-modifiers.md
new file mode 100644
index 000000000..c6b73eb12
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-modifiers.md
@@ -0,0 +1,8 @@
+\$default\_modifiers {#variable.default.modifiers}
+====================
+
+This is an array of modifiers to implicitly apply to every variable in a
+template. For example, to HTML-escape every variable by default, use
+`array('escape:"htmlall"')`. To make a variable exempt from default
+modifiers, add the \'nofilter\' attribute to the output tag such as
+`{$var nofilter}`.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-resource-type.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-resource-type.md
new file mode 100644
index 000000000..e8a803178
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-resource-type.md
@@ -0,0 +1,7 @@
+\$default\_resource\_type {#variable.default.resource.type}
+=========================
+
+This tells smarty what resource type to use implicitly. The default
+value is `file`, meaning that `$smarty->display('index.tpl')` and
+`$smarty->display('file:index.tpl')` are identical in meaning. See the
+[resource](#resources) chapter for more details.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-template-handler-func.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-template-handler-func.md
new file mode 100644
index 000000000..96c8190d7
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-template-handler-func.md
@@ -0,0 +1,50 @@
+\$default\_template\_handler\_func {#variable.default.template.handler.func}
+==================================
+
+This function is called when a template cannot be obtained from its
+resource.
+
+> **Note**
+>
+> The default handler is currently only invoked for file resources. It
+> is not triggered when the resource itself cannot be found, in which
+> case a \Smarty\Exception is thrown.
+
+
+    <?php
+    use Smarty\Smarty;
+    $smarty = new Smarty();
+    $smarty->default_template_handler_func = 'my_default_template_handler_func';
+
+    /**
+     * Default Template Handler
+     *
+     * called when Smarty's file: resource is unable to load a requested file
+     * 
+     * @param string   $type     resource type (e.g. "file", "string", "eval", "resource")
+     * @param string   $name     resource name (e.g. "foo/bar.tpl")
+     * @param string  &$content  template's content
+     * @param integer &$modified template's modification time
+     * @param Smarty   $smarty   Smarty instance
+     * @return string|boolean   path to file or boolean true if $content and $modified 
+     *                          have been filled, boolean false if no default template 
+     *                          could be loaded
+     */
+    function my_default_template_handler_func($type, $name, &$content, &$modified, Smarty $smarty) {
+        if (false) {
+            // return corrected filepath
+            return "/tmp/some/foobar.tpl";
+        } elseif (false) {
+            // return a template directly
+            $content = "the template source";
+            $modified = time();
+            return true;
+        } else {
+            // tell smarty that we failed
+            return false;
+        }
+    }
+
+    ?>
+
+      
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-error-reporting.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-error-reporting.md
new file mode 100644
index 000000000..ee28d47ab
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-error-reporting.md
@@ -0,0 +1,17 @@
+\$error\_reporting {#variable.error.reporting}
+==================
+
+When this value is set to a non-null-value it\'s value is used as php\'s
+[`error_reporting`](https://www.php.net/error_reporting) level inside of
+[`display()`](#api.display) and [`fetch()`](#api.fetch).
+
+Smarty 3.1.2 introduced the
+[`muteExpectedErrors()`](#api.mute.expected.errors) function. Calling
+`\Smarty\Smarty::muteExpectedErrors();` after setting up custom error handling
+will ensure that warnings and notices (deliberately) produced by Smarty
+will not be passed to other custom error handlers. If your error logs
+are filling up with warnings regarding `filemtime()` or `unlink()`
+calls, please enable Smarty\'s error muting.
+
+See also [debugging](#chapter.debugging.console) and
+[troubleshooting](#troubleshooting).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-escape-html.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-escape-html.md
new file mode 100644
index 000000000..87c7b9672
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-escape-html.md
@@ -0,0 +1,21 @@
+\$escape\_html {#variable.escape.html}
+==============
+
+Setting `$escape_html` to TRUE will escape all template variable output
+by wrapping it in
+`htmlspecialchars({$output}, ENT_QUOTES, $char_set);`,
+which is the same as `{$variable|escape:"html"}`.
+
+Template designers can choose to selectively disable this feature by
+adding the `nofilter` flag: `{$variable nofilter}`.
+
+Modifiers and Filters are run in the following order: modifier,
+default\_modifier, \$escape\_html, registered variable filters,
+autoloaded variable filters, template instance\'s variable filters.
+Everything except the individual modifier can be disabled with the
+`nofilter` flag.
+
+> **Note**
+>
+> This is a compile time option. If you change the setting you must make
+> sure that the templates get recompiled.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-cache.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-cache.md
new file mode 100644
index 000000000..de0c0c15a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-cache.md
@@ -0,0 +1,6 @@
+\$force\_cache {#variable.force.cache}
+==============
+
+This forces Smarty to (re)cache templates on every invocation. It does
+not override the [`$caching`](#variable.caching) level, but merely
+pretends the template has never been cached before.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-compile.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-compile.md
new file mode 100644
index 000000000..73f1e792d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-compile.md
@@ -0,0 +1,9 @@
+\$force\_compile {#variable.force.compile}
+================
+
+This forces Smarty to (re)compile templates on every invocation. This
+setting overrides [`$compile_check`](#variable.compile.check). By
+default this is FALSE. This is handy for development and
+[debugging](#chapter.debugging.console). It should never be used in a
+production environment. If [`$caching`](#variable.caching) is enabled,
+the cache file(s) will be regenerated every time.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-locking-timeout.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-locking-timeout.md
new file mode 100644
index 000000000..82fd0568a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-locking-timeout.md
@@ -0,0 +1,7 @@
+\$locking\_timeout {#variable.locking.timeout}
+==================
+
+This is maximum time in seconds a cache lock is valid to avoid dead
+locks. The default value is 10 seconds.
+
+See also [`$cache_locking`](#variable.cache.locking)
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-merge-compiled-includes.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-merge-compiled-includes.md
new file mode 100644
index 000000000..8220c442b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-merge-compiled-includes.md
@@ -0,0 +1,27 @@
+\$merge\_compiled\_includes {#variable.merge.compiled.includes}
+===========================
+
+By setting `$merge_compiled_includes` to TRUE Smarty will merge the
+compiled template code of subtemplates into the compiled code of the
+main template. This increases rendering speed of templates using a many
+different sub-templates.
+
+Individual sub-templates can be merged by setting the `inline` option
+flag within the `{include}` tag. `$merge_compiled_includes` does not
+have to be enabled for the `inline` merge.
+
+::: {.informalexample}
+
+    <?php
+    $smarty->merge_compiled_includes = true;
+    ?>
+
+            
+:::
+
+> **Note**
+>
+> This is a compile time option. If you change the setting you must make
+> sure that the templates get recompiled.
+
+See also [`{include}`](#language.function.include) tag
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-smarty-debug-id.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-smarty-debug-id.md
new file mode 100644
index 000000000..0733ed518
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-smarty-debug-id.md
@@ -0,0 +1,9 @@
+\$smarty\_debug\_id {#variable.smarty.debug.id}
+===================
+
+The value of `$smarty_debug_id` defines the URL keyword to enable
+debugging at browser level. The default value is `SMARTY_DEBUG`.
+
+See also [debugging console](#chapter.debugging.console) section,
+[`$debugging`](#variable.debugging) and
+[`$debugging_ctrl`](#variable.debugging.ctrl).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-template-dir.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-template-dir.md
new file mode 100644
index 000000000..eb91d2c24
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-template-dir.md
@@ -0,0 +1,26 @@
+\$template\_dir {#variable.template.dir}
+===============
+
+This is the name of the default template directory. If you do not supply
+a resource type when including files, they will be found here. By
+default this is `./templates`, meaning that Smarty will look for the
+`templates/` directory in the same directory as the executing php
+script. \$template\_dir can also be an array of directory paths: Smarty
+will traverse the directories and stop on the first matching template
+found.
+
+> **Note**
+>
+> It is not recommended to put this directory under the web server
+> document root.
+
+> **Note**
+> As of Smarty 3.1 the attribute \$template\_dir is no longer accessible
+> directly. Use [`getTemplateDir()`](#api.get.template.dir),
+> [`setTemplateDir()`](#api.set.template.dir) and
+> [`addTemplateDir()`](#api.add.template.dir) instead.
+
+See also [`Template Resources`](#resources),
+[`getTemplateDir()`](#api.get.template.dir),
+[`setTemplateDir()`](#api.set.template.dir) and
+[`addTemplateDir()`](#api.add.template.dir).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-include-path.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-include-path.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-sub-dirs.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-sub-dirs.md
new file mode 100644
index 000000000..dcda3f2d6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-sub-dirs.md
@@ -0,0 +1,31 @@
+\$use\_sub\_dirs {#variable.use.sub.dirs}
+================
+
+Smarty will create subdirectories under the [compiled
+templates](#variable.compile.dir) and [cache](#variable.cache.dir)
+directories if `$use_sub_dirs` is set to TRUE, default is FALSE. In an
+environment where there are potentially tens of thousands of files
+created, this may help the filesystem speed. On the other hand, some
+environments do not allow PHP processes to create directories, so this
+must be disabled which is the default.
+
+Sub directories are more efficient, so use them if you can.
+Theoretically you get much better performance on a filesystem with 10
+directories each having 100 files, than with 1 directory having 1000
+files. This was certainly the case with Solaris 7 (UFS)\... with newer
+filesystems such as ext3 and especially reiserfs, the difference is
+almost nothing.
+
+> **Note**
+>
+> -   `$use_sub_dirs=true` doesn\'t work with
+>     [safe\_mode=On](https://www.php.net/features.safe-mode), that\'s why
+>     it\'s switchable and why it\'s off by default.
+>
+> -   `$use_sub_dirs=true` on Windows can cause problems.
+>
+> -   Safe\_mode is being deprecated in PHP6.
+>
+See also [`$compile_id`](#variable.compile.id),
+[`$cache_dir`](#variable.cache.dir), and
+[`$compile_dir`](#variable.compile.dir).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/upgrading.md b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/upgrading.md
new file mode 100644
index 000000000..ef9cc4c99
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/docs/upgrading.md
@@ -0,0 +1,157 @@
+# Upgrading from an older version
+
+## Upgrading from v4 to v5
+
+Smarty 5 adds support for PHP8.2 and drops support for PHP7.1. Smarty also adds support for new features
+such as the ternary operator (`{$test ? $a : $b}` and `{$var ?: $value_if_falsy}`), the null coalescing operator (`{$var ?? $value_if_null}`) 
+and positional parameters for custom tags.
+Smarty 5 also has a brand-new extension architecture that allows you to write neat extension packs.
+
+### Namespaces
+All Smarty code has been moved into the `\Smarty` namespace. This reduces
+the chance of conflicts with other (your) code.
+
+For simple use-cases, you only need to add `use Smarty\Smarty;` to your script and everything will work. 
+
+```php
+<?php
+use Smarty\Smarty;
+$smarty = new Smarty();
+
+$smarty->display('homepage.tpl');
+```
+For more information, see [getting started](getting-started.md).
+
+If you extend Smarty or use Smarty plug-ins, please review your code to see if they assume specific class or method names.
+E.g.: `Smarty_Internal_Template` is now `\Smarty\Template\`, `SmartyException` is now `\Smarty\Exception`.
+
+### Variable scope bubbling
+Template variable scope bubbling has been simplified and made more consistent. The global scope now equals the Smarty 
+scope in order to avoid global state side effects. Please read the [documentation on language variable scope](designers/language-variables/language-variable-scopes.md)
+for more details.
+
+Also, `{config_load}` no longer has a `scope` parameter, which means you can no longer load config
+from inside your template into the global scope (again, to avoid global state side effects). If you 
+need to set global config, use the [configLoad API method](api/variables/config-files.md) from your PHP code.
+
+### Using native PHP-functions or userland functions in your templates
+You can no longer use native PHP-functions or userland functions in your templates without registering them. 
+If you need a function in your templates, register it first.
+
+The easiest way to do so is as follows:
+```php
+// native PHP functions used as modifiers need to be registered
+$smarty->registerPlugin('modifier', 'substr', 'substr');
+
+// userland PHP functions used as modifiers need to be registered
+$smarty->registerPlugin('modifier', 'my_special_func', 'my_special_func');
+```
+
+But you may want to consider writing a proper [extension](api/extending/extensions.md).
+
+### Removed undocumented tags
+
+Smarty 4 still supported some tags that have been carried over from previous version, but have never been documented.
+
+- `{block_parent}` should be replaced with `{$smarty.block.parent}`
+- `{parent}` should be replaced with `{$smarty.block.parent}`
+- `{block_child}` should be replaced with `{$smarty.block.child}`
+- `{child}` should be replaced with `{$smarty.block.child}`
+
+- `{make_nocache}` is no longer supported
+- `{insert}` is no longer supported
+
+### Removed Smarty API properties
+
+In Smarty 4, you could make many configuration changes by directly accessing public properties on the Smarty object in PHP.
+In many cases, these properties have been made private, and you should now use the appropriate setter method:
+
+- `$smarty->left_delimiter` should be replaced with `$smarty->getLeftDelimiter()`/`$smarty->setLeftDelimiter()`
+- `$smarty->right_delimiter` should be replaced with `$smarty->getRightDelimiter()`/`$smarty->setRightDelimiter()`
+- `$smarty->autoload_filters` should be replaced with `$smarty->registerFilter()`
+- `$smarty->template_dir` should be replaced with `$smarty->setTemplateDir()`
+- `$smarty->cache_dir` should be replaced with `$smarty->setCacheDir()`
+- `$smarty->compile_dir` should be replaced with `$smarty->setCompileDir()`
+
+Other public properties have been removed altogether, and you should no longer access them:
+
+- `$smarty->_current_file`
+- `$smarty->allow_ambiguous_resources` (ambiguous resources handlers should still work)
+- `$smarty->registered_filters`
+- `$smarty->direct_access_security`
+- `$smarty->trusted_dir`
+- `$smarty->allow_php_templates`
+- `$smarty->php_functions`
+- `$smarty->php_modifiers`
+
+### Backwards incompatible changes to custom plugins
+
+We have dropped support for `$smarty->plugins_dir` and `$smarty->use_include_path`.
+Use `$smarty->addPluginsDir()` or consider writing a proper [extension](api/extending/extensions.md).
+
+The 'insert' plugin type is no longer supported.
+
+The `$cache_attrs` parameter for registered plugins is no longer supported.
+
+### Removed Smarty API methods
+
+Search your code for the following changes:
+
+- `$smarty->getTags()` is no longer supported
+- `$smarty->appendByRef()` should be replaced with `$smarty->append()`
+- `$smarty->assignByRef()` should be replaced with `$smarty->assign()`
+- `$smarty->loadPlugin()` should be replaced with `$smarty->registerPlugin()`
+
+### Removed PHP constants
+
+The following constants have been removed to prevent global side effects.
+
+- `SMARTY_DIR`
+- `SMARTY_SYSPLUGINS_DIR`
+- `SMARTY_PLUGINS_DIR`
+- `SMARTY_MBSTRING`
+- `SMARTY_HELPER_FUNCTIONS_LOADED`
+
+### Other changes
+
+- Smarty now always runs in multibyte mode. Make sure you use the [PHP multibyte extension](https://www.php.net/manual/en/book.mbstring.php) in production for optimal performance.
+- Generated `<script>` tags lo longer have deprecated `type="text/javascript"` or `language="Javascript"` attributes
+- Smarty will throw a compiler exception instead of silently ignoring a modifier on a function call, like this: `{include|dot:"x-template-id" file="included.dot.tpl"}`
+- The ::getFile() method of a CompilerException will now return the full path of the template being compiled, if possible. This used to be 'file:relative_dir/filename.tpl'.
+
+## Upgrading from v3 to v4
+
+Smarty 4 is mostly identical to Smarty 3. Most notably, it adds support for PHP8 and drops support for PHP7.0 and below.
+Additionally, some deprecated features that have long been discouraged have been dropped from the language.
+
+### Muting PHP8 warnings
+If you simultaneously upgrade Smarty to v4 van PHP to v8, you may notice your error logs filling up with warnings about undefined or null template vars 
+due to a change in how PHP handles these. This may be helpful to spot errors, but if you find this annoying, you can use
+`$smarty->muteUndefinedOrNullWarnings()` to make Smarty convert these warnings into notices.
+
+### ASP tags
+You can no longer user ASP-style tags like `<% %>` and `<%= %>` in your templates.
+Replace them with `{...}` tags.
+
+### SmartyBC
+Check your codebase for `SmartyBC`.
+We have dropped deprecated API calls that where only accessible through the SmartyBC class.
+
+### No more embedded PHP
+We have completely dropped support for `{php}` and `{include_php}` tags and embedded PHP in templates.
+Check your templates for this, and rewrite any embedded PHP blocks, by moving logic to your PHP files or by
+creating a [custom tag](./api/extending/tags.md). 
+
+### Other changes
+
+Search your code for the following changes: 
+
+- `SMARTY_RESOURCE_CHAR_SET` and `SMARTY_RESOURCE_DATE_FORMAT` constants have been removed
+- `Smarty::muteExpectedErrors` and `Smarty::unmuteExpectedErrors` API methods have been removed
+- `Smarty::getVariable` method has been removed. Use [Smarty::getTemplateVars](designers/language-builtin-functions/language-function-assign.md) instead.
+- [Smarty::registerResource](api/resources.md) no longer accepts an array of callback functions
+
+
+
+
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/libs/Smarty.class.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/libs/Smarty.class.php
new file mode 100644
index 000000000..459fe2cfb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/libs/Smarty.class.php
@@ -0,0 +1,42 @@
+<?php
+
+/////////////////////////////////////////////////////////////////////
+// This is a stub PSR-4 loading script that gets all the pieces of //
+// Smarty 5.x loaded without requiring the use of composer. It's   //
+// not really a 'class' file, but the name is used so we're        //
+// backwards compatible with previous versions of Smarty.          //
+//                                                                 //
+// Example:                                                        //
+// require_once("/path/to/smarty/libs/Smarty.class.php");          //
+//                                                                 //
+// $smarty = new Smarty\Smarty;                                    //
+// $smarty->testInstall();                                         //
+/////////////////////////////////////////////////////////////////////
+
+define('__SMARTY_DIR', __DIR__ . '/../src/');
+
+// Global function declarations
+require_once(__SMARTY_DIR . "/functions.php");
+
+spl_autoload_register(function ($class) {
+	// Class prefix
+	$prefix = 'Smarty\\';
+
+	// Does the class use the namespace prefix?
+	$len = strlen($prefix);
+	if (strncmp($prefix, $class, $len) !== 0) {
+		// If not, move to the next registered autoloader
+		return;
+	}
+
+	// Hack off the prefix part
+	$relative_class = substr($class, $len);
+
+	// Build a path to the include file
+	$file = __SMARTY_DIR . str_replace('\\', '/', $relative_class) . '.php';
+
+	// If the file exists, require it
+	if (file_exists($file)) {
+		require_once($file);
+	}
+});
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/mkdocs.yml b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/mkdocs.yml
new file mode 100644
index 000000000..74ad349ca
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/mkdocs.yml
@@ -0,0 +1,156 @@
+site_name: Smarty Documentation
+theme:
+  name: material
+  palette:
+    primary: amber
+  features:
+    - content.code.copy
+    - navigation.tabs
+    - navigation.tabs.sticky
+    - navigation.instant
+    - navigation.tracking
+  icon:
+    logo: material/lightbulb-on
+  favicon: img/favicon.ico
+
+extra:
+  version:
+    provider: mike
+
+markdown_extensions:
+  - pymdownx.highlight:
+      anchor_linenums: true
+  - pymdownx.inlinehilite
+  - pymdownx.snippets
+  - pymdownx.superfences
+
+nav:
+  - Home: 'index.md'
+  - 'Getting started':
+    - Introduction: 'getting-started.md'
+    - 'Upgrading from an older version': 'upgrading.md'
+  - 'Language reference':
+    - 'Basic Syntax':
+        - Introduction: 'designers/language-basic-syntax/index.md'
+        - Comments: 'designers/language-basic-syntax/language-syntax-comments.md'
+        - Variables: 'designers/language-basic-syntax/language-syntax-variables.md'
+        - Operators: 'designers/language-basic-syntax/language-syntax-operators.md'
+        - Tags: 'designers/language-basic-syntax/language-syntax-tags.md'
+        - Attributes: 'designers/language-basic-syntax/language-syntax-attributes.md'
+        - Quotes: 'designers/language-basic-syntax/language-syntax-quotes.md'
+        - 'Escaping Smarty parsing': 'designers/language-basic-syntax/language-escaping.md'
+    - 'Variables':
+        - 'Introduction': 'designers/language-variables/index.md'
+        - 'Assigned from PHP': 'designers/language-variables/language-assigned-variables.md'
+        - 'Variable scopes': 'designers/language-variables/language-variable-scopes.md'
+        - 'From config files': 'designers/language-variables/language-config-variables.md'
+        - '{$smarty}': 'designers/language-variables/language-variables-smarty.md'
+    - 'Modifiers':
+        - 'Introduction': 'designers/language-modifiers/index.md'
+        - 'capitalize': 'designers/language-modifiers/language-modifier-capitalize.md'
+        - 'cat': 'designers/language-modifiers/language-modifier-cat.md'
+        - 'count': 'designers/language-modifiers/language-modifier-count.md'
+        - 'count_characters': 'designers/language-modifiers/language-modifier-count-characters.md'
+        - 'count_paragraphs': 'designers/language-modifiers/language-modifier-count-paragraphs.md'
+        - 'count_sentences': 'designers/language-modifiers/language-modifier-count-sentences.md'
+        - 'count_words': 'designers/language-modifiers/language-modifier-count-words.md'
+        - 'date_format': 'designers/language-modifiers/language-modifier-date-format.md'
+        - 'debug_print_var': 'designers/language-modifiers/language-modifier-debug-print-var.md'
+        - 'default': 'designers/language-modifiers/language-modifier-default.md'
+        - 'escape': 'designers/language-modifiers/language-modifier-escape.md'
+        - 'from_charset': 'designers/language-modifiers/language-modifier-from-charset.md'
+        - 'indent': 'designers/language-modifiers/language-modifier-indent.md'
+        - 'is_array': 'designers/language-modifiers/language-modifier-is_array.md'
+        - 'isset': 'designers/language-modifiers/language-modifier-isset.md'
+        - 'join': 'designers/language-modifiers/language-modifier-join.md'
+        - 'json_encode': 'designers/language-modifiers/language-modifier-json-encode.md'
+        - 'lower': 'designers/language-modifiers/language-modifier-lower.md'
+        - 'noprint': 'designers/language-modifiers/language-modifier-noprint.md'
+        - 'number_format': 'designers/language-modifiers/language-modifier-number-format.md'
+        - 'nl2br': 'designers/language-modifiers/language-modifier-nl2br.md'
+        - 'regex_replace': 'designers/language-modifiers/language-modifier-regex-replace.md'
+        - 'replace': 'designers/language-modifiers/language-modifier-replace.md'
+        - 'round': 'designers/language-modifiers/language-modifier-round.md'
+        - 'spacify': 'designers/language-modifiers/language-modifier-spacify.md'
+        - 'split': 'designers/language-modifiers/language-modifier-split.md'
+        - 'str_repeat': 'designers/language-modifiers/language-modifier-str-repeat.md'
+        - 'string_format': 'designers/language-modifiers/language-modifier-string-format.md'
+        - 'strip': 'designers/language-modifiers/language-modifier-strip.md'
+        - 'strip_tags': 'designers/language-modifiers/language-modifier-strip-tags.md'
+        - 'strlen': 'designers/language-modifiers/language-modifier-strlen.md'
+        - 'substr': 'designers/language-modifiers/language-modifier-substr.md'
+        - 'to_charset': 'designers/language-modifiers/language-modifier-to-charset.md'
+        - 'truncate': 'designers/language-modifiers/language-modifier-truncate.md'
+        - 'unescape': 'designers/language-modifiers/language-modifier-unescape.md'
+        - 'upper': 'designers/language-modifiers/language-modifier-upper.md'
+        - 'wordwrap': 'designers/language-modifiers/language-modifier-wordwrap.md'
+    - 'Builtin Tags':
+        - 'Introduction': 'designers/language-builtin-functions/index.md'
+        - '{append}': 'designers/language-builtin-functions/language-function-append.md'
+        - '{assign}': 'designers/language-builtin-functions/language-function-assign.md'
+        - '{block}': 'designers/language-builtin-functions/language-function-block.md'
+        - '{call}': 'designers/language-builtin-functions/language-function-call.md'
+        - '{capture}': 'designers/language-builtin-functions/language-function-capture.md'
+        - '{config_load}': 'designers/language-builtin-functions/language-function-config-load.md'
+        - '{debug}': 'designers/language-builtin-functions/language-function-debug.md'
+        - '{extends}': 'designers/language-builtin-functions/language-function-extends.md'
+        - '{for}': 'designers/language-builtin-functions/language-function-for.md'
+        - '{foreach}': 'designers/language-builtin-functions/language-function-foreach.md'
+        - '{function}': 'designers/language-builtin-functions/language-function-function.md'
+        - '{if},{elseif},{else}': 'designers/language-builtin-functions/language-function-if.md'
+        - '{include}': 'designers/language-builtin-functions/language-function-include.md'
+        - '{insert}': 'designers/language-builtin-functions/language-function-insert.md'
+        - '{ldelim},{rdelim}': 'designers/language-builtin-functions/language-function-ldelim.md'
+        - '{literal}': 'designers/language-builtin-functions/language-function-literal.md'
+        - '{nocache}': 'designers/language-builtin-functions/language-function-nocache.md'
+        - '{section}': 'designers/language-builtin-functions/language-function-section.md'
+        - '{setfilter}': 'designers/language-builtin-functions/language-function-setfilter.md'
+        - '{strip}': 'designers/language-builtin-functions/language-function-strip.md'
+        - '{while}': 'designers/language-builtin-functions/language-function-while.md'
+    - 'Custom Tags':
+        - 'Introduction': 'designers/language-custom-functions/index.md'
+        - '{counter}': 'designers/language-custom-functions/language-function-counter.md'
+        - '{cycle}': 'designers/language-custom-functions/language-function-cycle.md'
+        - '{debug}': 'designers/language-custom-functions/language-function-debug.md'
+        - '{eval}': 'designers/language-custom-functions/language-function-eval.md'
+        - '{fetch}': 'designers/language-custom-functions/language-function-fetch.md'
+        - '{html_checkboxes}': 'designers/language-custom-functions/language-function-html-checkboxes.md'
+        - '{html_image}': 'designers/language-custom-functions/language-function-html-image.md'
+        - '{html_options}': 'designers/language-custom-functions/language-function-html-options.md'
+        - '{html_radios}': 'designers/language-custom-functions/language-function-html-radios.md'
+        - '{html_select_date}': 'designers/language-custom-functions/language-function-html-select-date.md'
+        - '{html_select_time}': 'designers/language-custom-functions/language-function-html-select-time.md'
+        - '{html_table}': 'designers/language-custom-functions/language-function-html-table.md'
+        - '{mailto}': 'designers/language-custom-functions/language-function-mailto.md'
+        - '{math}': 'designers/language-custom-functions/language-function-math.md'
+        - '{textformat}': 'designers/language-custom-functions/language-function-textformat.md'
+    - 'designers/config-files.md'
+    - 'designers/chapter-debugging-console.md'
+  - 'API':
+      - 'Basics': 'api/basics.md'
+      - 'Configuring Smarty': 'api/configuring.md'
+      - 'Rendering a template': 'api/rendering.md'
+      - 'Using data in templates':
+          - 'Assigning variables': 'api/variables/assigning.md'
+          - 'Config files': 'api/variables/config-files.md'
+          - 'Using streams': 'api/variables/streams.md'
+          - 'Objects': 'api/variables/objects.md'
+          - 'Static class methods': 'api/variables/static-class-methods.md'
+      - 'Template inheritance': 'api/inheritance.md'
+      - 'Filters':
+          - 'Output filters': 'api/filters/output-filters.md'
+          - 'Prefilters': 'api/filters/prefilters.md'
+          - 'Postfilters': 'api/filters/postfilters.md'
+      - 'Template resources': 'api/resources.md'
+      - 'Caching':
+        - 'Basics': 'api/caching/basics.md'
+        - 'Multiple caches per template': 'api/caching/multiple-caches-per-template.md'
+        - 'Custom cache storage layers': 'api/caching/custom-storage-layers.md'
+      - 'Extending Smarty':
+          - 'Introduction': 'api/extending/introduction.md'
+          - 'Custom tags': 'api/extending/tags.md'
+          - 'Custom block tags': 'api/extending/block-tags.md'
+          - 'Custom modifiers': 'api/extending/modifiers.md'
+          - 'Creating an extension': 'api/extending/extensions.md'
+      - 'Security': 'api/security.md'
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/run-tests-for-all-php-versions.sh b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/run-tests-for-all-php-versions.sh
new file mode 100755
index 000000000..494b127b5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/run-tests-for-all-php-versions.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Runs tests for all supported PHP versions
+# Usage examples:
+# - ./run-tests-for-all-php-versions.sh --group 20221124
+# - ./run-tests-for-all-php-versions.sh --exclude-group slow
+
+COMPOSE_CMD="mutagen-compose"
+
+$COMPOSE_CMD run --rm php72 ./run-tests.sh $@ && \
+$COMPOSE_CMD run --rm php73 ./run-tests.sh $@ && \
+$COMPOSE_CMD run --rm php74 ./run-tests.sh $@ && \
+$COMPOSE_CMD run --rm php80 ./run-tests.sh $@ && \
+$COMPOSE_CMD run --rm php81 ./run-tests.sh $@ && \
+$COMPOSE_CMD run --rm php82 ./run-tests.sh $@
+$COMPOSE_CMD run --rm php83 ./run-tests.sh $@
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/run-tests.sh b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/run-tests.sh
new file mode 100755
index 000000000..1990a07f1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/run-tests.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Runs composer update, echoes php version and runs PHPUnit
+# Usage examples:
+# - ./run-tests.sh --group 20221124
+# - ./run-tests.sh --exclude-group slow
+
+composer update --quiet
+#php -r 'echo "\nPHP version " . phpversion() . ". ";'
+php ./vendor/phpunit/phpunit/phpunit $@
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/BlockHandler/Base.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/BlockHandler/Base.php
new file mode 100644
index 000000000..e194f67b6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/BlockHandler/Base.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Smarty\BlockHandler;
+
+use Smarty\Template;
+
+abstract class Base implements BlockHandlerInterface {
+
+	/**
+	 * @var bool
+	 */
+	protected $cacheable = true;
+
+	abstract public function handle($params, $content, Template $template, &$repeat);
+
+	public function isCacheable(): bool {
+		return $this->cacheable;
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/BlockHandler/BlockHandlerInterface.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/BlockHandler/BlockHandlerInterface.php
new file mode 100644
index 000000000..9aa744ec7
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/BlockHandler/BlockHandlerInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Smarty\BlockHandler;
+
+use Smarty\Template;
+
+interface BlockHandlerInterface {
+	public function handle($params, $content, Template $template, &$repeat);
+	public function isCacheable(): bool;
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/BlockHandler/BlockPluginWrapper.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/BlockHandler/BlockPluginWrapper.php
new file mode 100644
index 000000000..470059456
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/BlockHandler/BlockPluginWrapper.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Smarty\BlockHandler;
+
+use Smarty\Template;
+
+class BlockPluginWrapper extends Base {
+
+	private $callback;
+
+	public function __construct($callback, bool $cacheable = true) {
+		$this->callback = $callback;
+		$this->cacheable = $cacheable;
+	}
+
+	public function handle($params, $content, Template $template, &$repeat) {
+		return call_user_func_array($this->callback, [$params, $content, &$template, &$repeat]);
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/BlockHandler/TextFormat.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/BlockHandler/TextFormat.php
new file mode 100644
index 000000000..b4fa5acd4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/BlockHandler/TextFormat.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Smarty\BlockHandler;
+
+use Smarty\Smarty;
+use Smarty\Template;
+
+/**
+ * Smarty {textformat}{/textformat} block plugin
+ * Type:     block function
+ * Name:     textformat
+ * Purpose:  format text a certain way with preset styles
+ *           or custom wrap/indent settings
+ * Params:
+ *
+ * - style         - string (email)
+ * - indent        - integer (0)
+ * - wrap          - integer (80)
+ * - wrap_char     - string ("\n")
+ * - indent_char   - string (" ")
+ * - wrap_boundary - boolean (true)
+ *
+ * @param array                    $params   parameters
+ * @param string                   $content  contents of the block
+ * @param Template $template template object
+ * @param boolean                  &$repeat  repeat flag
+ *
+ * @return string content re-formatted
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @throws \Smarty\Exception
+ */
+class TextFormat implements BlockHandlerInterface {
+
+	public function handle($params, $content, Template $template, &$repeat) {
+		if (is_null($content)) {
+			return;
+		}
+		$style = null;
+		$indent = 0;
+		$indent_first = 0;
+		$indent_char = ' ';
+		$wrap = 80;
+		$wrap_char = "\n";
+		$wrap_cut = false;
+		$assign = null;
+		foreach ($params as $_key => $_val) {
+			switch ($_key) {
+				case 'style':
+				case 'indent_char':
+				case 'wrap_char':
+				case 'assign':
+					$$_key = (string)$_val;
+					break;
+				case 'indent':
+				case 'indent_first':
+				case 'wrap':
+					$$_key = (int)$_val;
+					break;
+				case 'wrap_cut':
+					$$_key = (bool)$_val;
+					break;
+				default:
+					trigger_error("textformat: unknown attribute '{$_key}'");
+			}
+		}
+		if ($style === 'email') {
+			$wrap = 72;
+		}
+		// split into paragraphs
+		$_paragraphs = preg_split('![\r\n]{2}!', $content);
+		foreach ($_paragraphs as &$_paragraph) {
+			if (!$_paragraph) {
+				continue;
+			}
+			// convert mult. spaces & special chars to single space
+			$_paragraph =
+				preg_replace(
+					array(
+						'!\s+!' . Smarty::$_UTF8_MODIFIER,
+						'!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER
+					),
+					array(
+						' ',
+						''
+					),
+					$_paragraph
+				);
+			// indent first line
+			if ($indent_first > 0) {
+				$_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph;
+			}
+			// wordwrap sentences
+			$_paragraph = smarty_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
+			// indent lines
+			if ($indent > 0) {
+				$_paragraph = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraph);
+			}
+		}
+		$_output = implode($wrap_char . $wrap_char, $_paragraphs);
+		if ($assign) {
+			$template->assign($assign, $_output);
+		} else {
+			return $_output;
+		}
+	}
+
+	public function isCacheable(): bool {
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Cacheresource/Base.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Cacheresource/Base.php
new file mode 100644
index 000000000..54a141921
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Cacheresource/Base.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace Smarty\Cacheresource;
+
+use Smarty\Exception;
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Cached;
+
+/**
+ * Cache Handler API
+ * @author     Rodney Rehm
+ */
+abstract class Base
+{
+
+    /**
+     * populate Cached Object with metadata from Resource
+     *
+     * @param Cached  $cached    cached object
+     * @param Template $_template template object
+     *
+     * @return void
+     */
+    abstract public function populate(Cached $cached, Template $_template);
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Cached $cached
+     *
+     * @return void
+     */
+    abstract public function populateTimestamp(Cached $cached);
+
+	/**
+	 * Read the cached template and process header
+	 *
+	 * @param Template $_template template object
+	 * @param Cached|null $cached cached object
+	 * @param boolean $update flag if called because cache update
+	 *
+	 * @return boolean true or false if the cached content does not exist
+	 */
+    abstract public function process(
+	    Template $_template,
+	    Cached   $cached = null,
+	             $update = false
+    );
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return boolean success
+     */
+    abstract public function storeCachedContent(Template $_template, $content);
+
+    /**
+     * Read cached template from cache
+     *
+     * @param Template $_template template object
+     *
+     * @return string  content
+     */
+    abstract public function retrieveCachedContent(Template $_template);
+
+    /**
+     * Empty cache
+     *
+     * @param Smarty  $smarty   Smarty object
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    abstract public function clearAll(Smarty $smarty, $exp_time = null);
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty        Smarty object
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    abstract public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time);
+
+    /**
+     * @param Smarty                 $smarty
+     * @param Cached $cached
+     *
+     * @return bool|null
+     */
+    public function locked(Smarty $smarty, Cached $cached)
+    {
+        // theoretically locking_timeout should be checked against time_limit (max_execution_time)
+        $start = microtime(true);
+        $hadLock = null;
+        while ($this->hasLock($smarty, $cached)) {
+            $hadLock = true;
+            if (microtime(true) - $start > $smarty->locking_timeout) {
+                // abort waiting for lock release
+                return false;
+            }
+            sleep(1);
+        }
+        return $hadLock;
+    }
+
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Cached $cached
+     *
+     * @return bool
+     */
+    public function hasLock(Smarty $smarty, Cached $cached)
+    {
+        // check if lock exists
+        return false;
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Cached $cached
+     *
+     * @return bool
+     */
+    public function acquireLock(Smarty $smarty, Cached $cached)
+    {
+        // create lock
+        return true;
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty
+     * @param Cached $cached
+     *
+     * @return bool
+     */
+    public function releaseLock(Smarty $smarty, Cached $cached)
+    {
+        // release lock
+        return true;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Cacheresource/Custom.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Cacheresource/Custom.php
new file mode 100644
index 000000000..c049246c8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Cacheresource/Custom.php
@@ -0,0 +1,303 @@
+<?php
+
+namespace Smarty\Cacheresource;
+
+/**
+ * Smarty Internal Plugin
+ *
+
+
+ */
+
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Cached;
+
+/**
+ * Cache Handler API
+ *
+
+
+ * @author     Rodney Rehm
+ */
+abstract class Custom extends Base
+{
+    /**
+     * fetch cached content and its modification time from data source
+     *
+     * @param string  $id         unique cache content identifier
+     * @param string  $name       template name
+     * @param string  $cache_id   cache id
+     * @param string  $compile_id compile id
+     * @param string  $content    cached content
+     * @param integer $mtime      cache modification timestamp (epoch)
+     *
+     * @return void
+     */
+    abstract protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime);
+
+    /**
+     * Fetch cached content's modification timestamp from data source
+     * {@internal implementing this method is optional.
+     *  Only implement it if modification times can be accessed faster than loading the complete cached content.}}
+     *
+     * @param string $id         unique cache content identifier
+     * @param string $name       template name
+     * @param string $cache_id   cache id
+     * @param string $compile_id compile id
+     *
+     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+     */
+    protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
+    {
+        return false;
+    }
+
+    /**
+     * Save content to cache
+     *
+     * @param string       $id         unique cache content identifier
+     * @param string       $name       template name
+     * @param string       $cache_id   cache id
+     * @param string       $compile_id compile id
+     * @param integer|null $exp_time   seconds till expiration or null
+     * @param string       $content    content to cache
+     *
+     * @return boolean      success
+     */
+    abstract protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content);
+
+    /**
+     * Delete content from cache
+     *
+     * @param string|null  $name       template name
+     * @param string|null  $cache_id   cache id
+     * @param string|null  $compile_id compile id
+     * @param integer|null $exp_time   seconds till expiration time in seconds or null
+     *
+     * @return integer      number of deleted caches
+     */
+    abstract protected function delete($name, $cache_id, $compile_id, $exp_time);
+
+    /**
+     * populate Cached Object with metadata from Resource
+     *
+     * @param \Smarty\Template\Cached   $cached    cached object
+     * @param Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(\Smarty\Template\Cached $cached, Template $_template)
+    {
+        $_cache_id = isset($cached->cache_id) ? preg_replace('![^\w\|]+!', '_', $cached->cache_id) : null;
+        $_compile_id = isset($cached->compile_id) ? preg_replace('![^\w]+!', '_', $cached->compile_id) : null;
+        $path = $cached->getSource()->uid . $_cache_id . $_compile_id;
+        $cached->filepath = sha1($path);
+        if ($_template->getSmarty()->cache_locking) {
+            $cached->lock_id = sha1('lock.' . $path);
+        }
+        $this->populateTimestamp($cached);
+    }
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param \Smarty\Template\Cached $cached
+     *
+     * @return void
+     */
+    public function populateTimestamp(\Smarty\Template\Cached $cached)
+    {
+        $mtime =
+            $this->fetchTimestamp($cached->filepath, $cached->getSource()->name, $cached->cache_id, $cached->compile_id);
+        if ($mtime !== null) {
+            $cached->timestamp = $mtime;
+            $cached->exists = !!$cached->timestamp;
+            return;
+        }
+        $timestamp = null;
+        $this->fetch(
+            $cached->filepath,
+            $cached->getSource()->name,
+            $cached->cache_id,
+            $cached->compile_id,
+            $cached->content,
+            $timestamp
+        );
+        $cached->timestamp = isset($timestamp) ? $timestamp : false;
+        $cached->exists = !!$cached->timestamp;
+    }
+
+	/**
+	 * Read the cached template and process the header
+	 *
+	 * @param Template $_smarty_tpl do not change variable name, is used by compiled template
+	 * @param Cached|null $cached cached object
+	 * @param boolean $update flag if called because cache update
+	 *
+	 * @return boolean                 true or false if the cached content does not exist
+	 */
+    public function process(
+	    Template               $_smarty_tpl,
+	    \Smarty\Template\Cached $cached = null,
+	                           $update = false
+    ) {
+        if (!$cached) {
+            $cached = $_smarty_tpl->getCached();
+        }
+        $content = $cached->content ? $cached->content : null;
+        $timestamp = $cached->timestamp ? $cached->timestamp : null;
+        if ($content === null || !$timestamp) {
+            $this->fetch(
+                $_smarty_tpl->getCached()->filepath,
+                $_smarty_tpl->getSource()->name,
+                $_smarty_tpl->cache_id,
+                $_smarty_tpl->compile_id,
+                $content,
+                $timestamp
+            );
+        }
+        if (isset($content)) {
+            eval('?>' . $content);
+            $cached->content = null;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return boolean                  success
+     */
+    public function storeCachedContent(Template $_template, $content)
+    {
+        return $this->save(
+            $_template->getCached()->filepath,
+            $_template->getSource()->name,
+            $_template->cache_id,
+            $_template->compile_id,
+            $_template->cache_lifetime,
+            $content
+        );
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param Template $_template template object
+     *
+     * @return string|boolean  content
+     */
+    public function retrieveCachedContent(Template $_template)
+    {
+        $content = $_template->getCached()->content ?: null;
+	    if ($content === null) {
+            $timestamp = null;
+            $this->fetch(
+                $_template->getCached()->filepath,
+                $_template->getSource()->name,
+                $_template->cache_id,
+                $_template->compile_id,
+                $content,
+                $timestamp
+            );
+        }
+        if (isset($content)) {
+            return $content;
+        }
+        return false;
+    }
+
+	/**
+	 * Empty cache
+	 *
+	 * @param \Smarty\Smarty $smarty Smarty object
+	 * @param null $exp_time expiration time (number of seconds, not timestamp)
+	 *
+	 * @return integer number of cache files deleted
+	 */
+    public function clearAll(\Smarty\Smarty $smarty, $exp_time = null)
+    {
+        return $this->delete(null, null, null, $exp_time);
+    }
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @param \Smarty\Smarty  $smarty        Smarty object
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return int number of cache files deleted
+     * @throws \Smarty\Exception
+     */
+    public function clear(\Smarty\Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        $cache_name = null;
+        if (isset($resource_name)) {
+            $source = \Smarty\Template\Source::load(null, $smarty, $resource_name);
+            if ($source->exists) {
+                $cache_name = $source->name;
+            } else {
+                return 0;
+            }
+        }
+        return $this->delete($cache_name, $cache_id, $compile_id, $exp_time);
+    }
+
+	/**
+	 * Check is cache is locked for this template
+	 *
+	 * @param Smarty $smarty Smarty object
+	 * @param Cached $cached cached object
+	 *
+	 * @return boolean               true or false if cache is locked
+	 */
+    public function hasLock(\Smarty\Smarty $smarty, \Smarty\Template\Cached $cached)
+    {
+        $id = $cached->lock_id;
+        $name = $cached->getSource()->name . '.lock';
+        $mtime = $this->fetchTimestamp($id, $name, $cached->cache_id, $cached->compile_id);
+        if ($mtime === null) {
+            $this->fetch($id, $name, $cached->cache_id, $cached->compile_id, $content, $mtime);
+        }
+        return $mtime && ($t = time()) - $mtime < $smarty->locking_timeout;
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param \Smarty\Smarty                 $smarty Smarty object
+     * @param \Smarty\Template\Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function acquireLock(\Smarty\Smarty $smarty, \Smarty\Template\Cached $cached)
+    {
+        $cached->is_locked = true;
+        $id = $cached->lock_id;
+        $name = $cached->getSource()->name . '.lock';
+        $this->save($id, $name, $cached->cache_id, $cached->compile_id, $smarty->locking_timeout, '');
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param \Smarty\Smarty                 $smarty Smarty object
+     * @param \Smarty\Template\Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function releaseLock(\Smarty\Smarty $smarty, \Smarty\Template\Cached $cached)
+    {
+        $cached->is_locked = false;
+        $name = $cached->getSource()->name . '.lock';
+        $this->delete($name, $cached->cache_id, $cached->compile_id, null);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Cacheresource/File.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Cacheresource/File.php
new file mode 100644
index 000000000..538f01034
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Cacheresource/File.php
@@ -0,0 +1,338 @@
+<?php
+
+namespace Smarty\Cacheresource;
+
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Cached;
+
+/**
+ * Smarty Internal Plugin CacheResource File
+ *
+
+
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+
+/**
+ * This class does contain all necessary methods for the HTML cache on file system
+ * Implements the file system as resource for the HTML cache Version using nocache inserts.
+ */
+class File extends Base
+{
+    /**
+     * populate Cached Object with metadata from Resource
+     *
+     * @param Cached   $cached    cached object
+     * @param Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(Cached $cached, Template $_template)
+    {
+        $source = $_template->getSource();
+        $smarty = $_template->getSmarty();
+        $_compile_dir_sep = $smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
+        $_filepath = $source->uid;
+        $cached->filepath = $smarty->getCacheDir();
+        if (isset($_template->cache_id)) {
+            $cached->filepath .= preg_replace(
+                                     array(
+                                         '![^\w|]+!',
+                                         '![|]+!'
+                                     ),
+                                     array(
+                                         '_',
+                                         $_compile_dir_sep
+                                     ),
+                                     $_template->cache_id
+                                 ) . $_compile_dir_sep;
+        }
+        if (isset($_template->compile_id)) {
+            $cached->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) . $_compile_dir_sep;
+        }
+        // if use_sub_dirs, break file into directories
+        if ($smarty->use_sub_dirs) {
+            $cached->filepath .= $_filepath[ 0 ] . $_filepath[ 1 ] . DIRECTORY_SEPARATOR . $_filepath[ 2 ] .
+                                 $_filepath[ 3 ] .
+                                 DIRECTORY_SEPARATOR .
+                                 $_filepath[ 4 ] . $_filepath[ 5 ] . DIRECTORY_SEPARATOR;
+        }
+        $cached->filepath .= $_filepath . '_' . $source->getBasename();
+
+        if ($smarty->cache_locking) {
+            $cached->lock_id = $cached->filepath . '.lock';
+        }
+        $cached->filepath .= '.php';
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
+        }
+    }
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Cached $cached cached object
+     *
+     * @return void
+     */
+    public function populateTimestamp(Cached $cached)
+    {
+        $cached->timestamp = $cached->exists = is_file($cached->filepath);
+        if ($cached->exists) {
+            $cached->timestamp = filemtime($cached->filepath);
+        }
+    }
+
+	/**
+	 * Read the cached template and process its header
+	 *
+	 * @param Template $_smarty_tpl do not change variable name, is used by compiled template
+	 * @param Cached|null $cached cached object
+	 * @param bool $update flag if called because cache update
+	 *
+	 * @return boolean true or false if the cached content does not exist
+	 */
+    public function process(
+	    Template $_smarty_tpl,
+	    Cached   $cached = null,
+	             $update = false
+    ) {
+        $_smarty_tpl->getCached()->setValid(false);
+        if ($update && defined('HHVM_VERSION')) {
+            eval('?>' . file_get_contents($_smarty_tpl->getCached()->filepath));
+            return true;
+        } else {
+            return @include $_smarty_tpl->getCached()->filepath;
+        }
+    }
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return bool success
+     * @throws \Smarty\Exception
+     */
+    public function storeCachedContent(Template $_template, $content)
+    {
+        if ($_template->getSmarty()->writeFile($_template->getCached()->filepath, $content) === true) {
+            if (function_exists('opcache_invalidate')
+                && (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api'))) < 1
+            ) {
+                opcache_invalidate($_template->getCached()->filepath, true);
+            } elseif (function_exists('apc_compile_file')) {
+                apc_compile_file($_template->getCached()->filepath);
+            }
+            $cached = $_template->getCached();
+            $cached->timestamp = $cached->exists = is_file($cached->filepath);
+            if ($cached->exists) {
+                $cached->timestamp = filemtime($cached->filepath);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param Template $_template template object
+     *
+     * @return string  content
+     */
+    public function retrieveCachedContent(Template $_template)
+    {
+        if (is_file($_template->getCached()->filepath)) {
+            return file_get_contents($_template->getCached()->filepath);
+        }
+        return false;
+    }
+
+    /**
+     * Empty cache
+     *
+     * @param Smarty  $smarty
+     * @param integer $exp_time expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clearAll(Smarty $smarty, $exp_time = null)
+    {
+        return $this->clear($smarty, null, null, null, $exp_time);
+    }
+
+    /**
+     * Empty cache for a specific template
+     *
+     * @param Smarty  $smarty
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
+     *
+     * @return integer number of cache files deleted
+     */
+    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+	    $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
+	    $_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+	    $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
+	    $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
+	    $_dir = $smarty->getCacheDir();
+	    if ($_dir === '/') { //We should never want to delete this!
+		    return 0;
+	    }
+	    $_dir_length = strlen($_dir);
+	    if (isset($_cache_id)) {
+		    $_cache_id_parts = explode('|', $_cache_id);
+		    $_cache_id_parts_count = count($_cache_id_parts);
+		    if ($smarty->use_sub_dirs) {
+			    foreach ($_cache_id_parts as $id_part) {
+				    $_dir .= $id_part . '/';
+			    }
+		    }
+	    }
+	    if (isset($resource_name)) {
+		    $_save_stat = $smarty->caching;
+		    $smarty->caching = \Smarty\Smarty::CACHING_LIFETIME_CURRENT;
+		    $tpl = $smarty->doCreateTemplate($resource_name);
+		    $smarty->caching = $_save_stat;
+		    // remove from template cache
+		    if ($tpl->getSource()->exists) {
+			    $_resourcename_parts = basename(str_replace('^', '/', $tpl->getCached()->filepath));
+		    } else {
+			    return 0;
+		    }
+	    }
+	    $_count = 0;
+	    $_time = time();
+	    if (file_exists($_dir)) {
+		    $_cacheDirs = new RecursiveDirectoryIterator($_dir);
+		    $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
+		    foreach ($_cache as $_file) {
+			    if (substr(basename($_file->getPathname()), 0, 1) === '.') {
+				    continue;
+			    }
+			    $_filepath = (string)$_file;
+			    // directory ?
+			    if ($_file->isDir()) {
+				    if (!$_cache->isDot()) {
+					    // delete folder if empty
+					    @rmdir($_file->getPathname());
+				    }
+			    } else {
+				    // delete only php files
+				    if (substr($_filepath, -4) !== '.php') {
+					    continue;
+				    }
+				    $_parts = explode($_dir_sep, str_replace('\\', '/', substr($_filepath, $_dir_length)));
+				    $_parts_count = count($_parts);
+				    // check name
+				    if (isset($resource_name)) {
+					    if ($_parts[ $_parts_count - 1 ] !== $_resourcename_parts) {
+						    continue;
+					    }
+				    }
+				    // check compile id
+				    if (isset($_compile_id) && (!isset($_parts[ $_parts_count - 2 - $_compile_id_offset ])
+						    || $_parts[ $_parts_count - 2 - $_compile_id_offset ] !== $_compile_id)
+				    ) {
+					    continue;
+				    }
+				    // check cache id
+				    if (isset($_cache_id)) {
+					    // count of cache id parts
+					    $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset :
+						    $_parts_count - 1 - $_compile_id_offset;
+					    if ($_parts_count < $_cache_id_parts_count) {
+						    continue;
+					    }
+					    for ($i = 0; $i < $_cache_id_parts_count; $i++) {
+						    if ($_parts[ $i ] !== $_cache_id_parts[ $i ]) {
+							    continue 2;
+						    }
+					    }
+				    }
+				    if (is_file($_filepath)) {
+					    // expired ?
+					    if (isset($exp_time)) {
+						    if ($exp_time < 0) {
+							    preg_match('#\'cache_lifetime\' =>\s*(\d*)#', file_get_contents($_filepath), $match);
+							    if ($_time < (filemtime($_filepath) + $match[ 1 ])) {
+								    continue;
+							    }
+						    } else {
+							    if ($_time - filemtime($_filepath) < $exp_time) {
+								    continue;
+							    }
+						    }
+					    }
+					    $_count += @unlink($_filepath) ? 1 : 0;
+					    if (function_exists('opcache_invalidate')
+						    && (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
+					    ) {
+						    opcache_invalidate($_filepath, true);
+					    } elseif (function_exists('apc_delete_file')) {
+						    apc_delete_file($_filepath);
+					    }
+				    }
+			    }
+		    }
+	    }
+	    return $_count;
+    }
+
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Cached $cached cached object
+     *
+     * @return boolean true or false if cache is locked
+     */
+    public function hasLock(Smarty $smarty, Cached $cached)
+    {
+        clearstatcache(true, $cached->lock_id ?? '');
+        if (null !== $cached->lock_id && is_file($cached->lock_id)) {
+            $t = filemtime($cached->lock_id);
+            return $t && (time() - $t < $smarty->locking_timeout);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Cached $cached cached object
+     *
+     * @return void
+     */
+    public function acquireLock(Smarty $smarty, Cached $cached)
+    {
+        $cached->is_locked = true;
+        touch($cached->lock_id);
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Cached $cached cached object
+     *
+     * @return void
+     */
+    public function releaseLock(Smarty $smarty, Cached $cached)
+    {
+        $cached->is_locked = false;
+        @unlink($cached->lock_id);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Cacheresource/KeyValueStore.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Cacheresource/KeyValueStore.php
new file mode 100644
index 000000000..733d27765
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Cacheresource/KeyValueStore.php
@@ -0,0 +1,541 @@
+<?php
+
+namespace Smarty\Cacheresource;
+
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Cached;
+
+/**
+ * Smarty Internal Plugin
+ *
+
+
+ */
+
+/**
+ * Smarty Cache Handler Base for Key/Value Storage Implementations
+ * This class implements the functionality required to use simple key/value stores
+ * for hierarchical cache groups. key/value stores like memcache or APC do not support
+ * wildcards in keys, therefore a cache group cannot be cleared like "a|*" - which
+ * is no problem to filesystem and RDBMS implementations.
+ * This implementation is based on the concept of invalidation. While one specific cache
+ * can be identified and cleared, any range of caches cannot be identified. For this reason
+ * each level of the cache group hierarchy can have its own value in the store. These values
+ * are nothing but microtimes, telling us when a particular cache group was cleared for the
+ * last time. These keys are evaluated for every cache read to determine if the cache has
+ * been invalidated since it was created and should hence be treated as inexistent.
+ * Although deep hierarchies are possible, they are not recommended. Try to keep your
+ * cache groups as shallow as possible. Anything up 3-5 parents should be ok. So
+ * »a|b|c« is a good depth where »a|b|c|d|e|f|g|h|i|j|k« isn't. Try to join correlating
+ * cache groups: if your cache groups look somewhat like »a|b|$page|$items|$whatever«
+ * consider using »a|b|c|$page-$items-$whatever« instead.
+ *
+
+
+ * @author     Rodney Rehm
+ */
+abstract class KeyValueStore extends Base
+{
+    /**
+     * cache for contents
+     *
+     * @var array
+     */
+    protected $contents = array();
+
+    /**
+     * cache for timestamps
+     *
+     * @var array
+     */
+    protected $timestamps = array();
+
+    /**
+     * populate Cached Object with meta data from Resource
+     *
+     * @param Cached   $cached    cached object
+     * @param Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(Cached $cached, Template $_template)
+    {
+        $cached->filepath = $_template->getSource()->uid . '#' . $this->sanitize($cached->getSource()->resource) . '#' .
+                            $this->sanitize($cached->cache_id) . '#' . $this->sanitize($cached->compile_id);
+        $this->populateTimestamp($cached);
+    }
+
+    /**
+     * populate Cached Object with timestamp and exists from Resource
+     *
+     * @param Cached $cached cached object
+     *
+     * @return void
+     */
+    public function populateTimestamp(Cached $cached)
+    {
+        if (!$this->fetch(
+            $cached->filepath,
+            $cached->getSource()->name,
+            $cached->cache_id,
+            $cached->compile_id,
+            $content,
+            $timestamp,
+            $cached->getSource()->uid
+        )
+        ) {
+            return;
+        }
+        $cached->content = $content;
+        $cached->timestamp = (int)$timestamp;
+        $cached->exists = !!$cached->timestamp;
+    }
+
+	/**
+	 * Read the cached template and process the header
+	 *
+	 * @param Template $_smarty_tpl do not change variable name, is used by compiled template
+	 * @param Cached|null $cached cached object
+	 * @param boolean $update flag if called because cache update
+	 *
+	 * @return boolean                 true or false if the cached content does not exist
+	 */
+    public function process(
+	    Template $_smarty_tpl,
+	    Cached   $cached = null,
+	             $update = false
+    ) {
+        if (!$cached) {
+            $cached = $_smarty_tpl->getCached();
+        }
+        $content = $cached->content ?: null;
+        $timestamp = $cached->timestamp ?: null;
+        if ($content === null || !$timestamp) {
+            if (!$this->fetch(
+                $_smarty_tpl->getCached()->filepath,
+                $_smarty_tpl->getSource()->name,
+                $_smarty_tpl->cache_id,
+                $_smarty_tpl->compile_id,
+                $content,
+                $timestamp,
+                $_smarty_tpl->getSource()->uid
+            )
+            ) {
+                return false;
+            }
+        }
+        if (isset($content)) {
+            eval('?>' . $content);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Write the rendered template output to cache
+     *
+     * @param Template $_template template object
+     * @param string                   $content   content to cache
+     *
+     * @return boolean                  success
+     */
+    public function storeCachedContent(Template $_template, $content)
+    {
+        $this->addMetaTimestamp($content);
+        return $this->write(array($_template->getCached()->filepath => $content), $_template->cache_lifetime);
+    }
+
+    /**
+     * Read cached template from cache
+     *
+     * @param Template $_template template object
+     *
+     * @return string|false  content
+     */
+    public function retrieveCachedContent(Template $_template)
+    {
+        $content = $_template->getCached()->content ?: null;
+        $timestamp = null;
+        if ($content === null) {
+            if (!$this->fetch(
+                $_template->getCached()->filepath,
+                $_template->getSource()->name,
+                $_template->cache_id,
+                $_template->compile_id,
+                $content,
+                $timestamp,
+                $_template->getSource()->uid
+            )
+            ) {
+                return false;
+            }
+        }
+        if (isset($content)) {
+            return $content;
+        }
+        return false;
+    }
+
+    /**
+     * Empty cache
+     * {@internal the $exp_time argument is ignored altogether }}
+     *
+     * @param Smarty  $smarty   Smarty object
+     * @param integer $exp_time expiration time [being ignored]
+     *
+     * @return integer number of cache files deleted [always -1]
+     * @uses   purge() to clear the whole store
+     * @uses   invalidate() to mark everything outdated if purge() is inapplicable
+     */
+    public function clearAll(Smarty $smarty, $exp_time = null)
+    {
+        if (!$this->purge()) {
+            $this->invalidate(null);
+        }
+        return -1;
+    }
+
+    /**
+     * Empty cache for a specific template
+     * {@internal the $exp_time argument is ignored altogether}}
+     *
+     * @param Smarty  $smarty        Smarty object
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param integer $exp_time      expiration time [being ignored]
+     *
+     * @return int number of cache files deleted [always -1]
+     * @throws \Smarty\Exception
+     * @uses   buildCachedFilepath() to generate the CacheID
+     * @uses   invalidate() to mark CacheIDs parent chain as outdated
+     * @uses   delete() to remove CacheID from cache
+     */
+    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
+    {
+        $uid = $this->getTemplateUid($smarty, $resource_name);
+        $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' .
+               $this->sanitize($compile_id);
+        $this->delete(array($cid));
+        $this->invalidate($cid, $resource_name, $cache_id, $compile_id, $uid);
+        return -1;
+    }
+
+    /**
+     * Get template's unique ID
+     *
+     * @param Smarty $smarty        Smarty object
+     * @param string $resource_name template name
+     *
+     * @return string filepath of cache file
+     * @throws \Smarty\Exception
+     */
+    protected function getTemplateUid(Smarty $smarty, $resource_name)
+    {
+        if (isset($resource_name)) {
+            $source = \Smarty\Template\Source::load(null, $smarty, $resource_name);
+            if ($source->exists) {
+                return $source->uid;
+            }
+        }
+        return '';
+    }
+
+    /**
+     * Sanitize CacheID components
+     *
+     * @param string $string CacheID component to sanitize
+     *
+     * @return string sanitized CacheID component
+     */
+    protected function sanitize($string)
+    {
+        $string = trim((string)$string, '|');
+        if (!$string) {
+            return '';
+        }
+        return preg_replace('#[^\w\|]+#S', '_', $string);
+    }
+
+    /**
+     * Fetch and prepare a cache object.
+     *
+     * @param string  $cid           CacheID to fetch
+     * @param string  $resource_name template name
+     * @param string  $cache_id      cache id
+     * @param string  $compile_id    compile id
+     * @param string  $content       cached content
+     * @param integer &$timestamp    cached timestamp (epoch)
+     * @param string  $resource_uid  resource's uid
+     *
+     * @return boolean success
+     */
+    protected function fetch(
+        $cid,
+        $resource_name = null,
+        $cache_id = null,
+        $compile_id = null,
+        &$content = null,
+        &$timestamp = null,
+        $resource_uid = null
+    ) {
+        $t = $this->read(array($cid));
+        $content = !empty($t[ $cid ]) ? $t[ $cid ] : null;
+        $timestamp = null;
+        if ($content && ($timestamp = $this->getMetaTimestamp($content))) {
+            $invalidated =
+                $this->getLatestInvalidationTimestamp($cid, $resource_name, $cache_id, $compile_id, $resource_uid);
+            if ($invalidated > $timestamp) {
+                $timestamp = null;
+                $content = null;
+            }
+        }
+        return !!$content;
+    }
+
+    /**
+     * Add current microtime to the beginning of $cache_content
+     * {@internal the header uses 8 Bytes, the first 4 Bytes are the seconds, the second 4 Bytes are the microseconds}}
+     *
+     * @param string &$content the content to be cached
+     */
+    protected function addMetaTimestamp(&$content)
+    {
+        $mt = explode(' ', microtime());
+        $ts = pack('NN', $mt[ 1 ], (int)($mt[ 0 ] * 100000000));
+        $content = $ts . $content;
+    }
+
+    /**
+     * Extract the timestamp the $content was cached
+     *
+     * @param string &$content the cached content
+     *
+     * @return float  the microtime the content was cached
+     */
+    protected function getMetaTimestamp(&$content)
+    {
+        extract(unpack('N1s/N1m/a*content', $content));
+        /**
+         * @var  int $s
+         * @var  int $m
+         */
+        return $s + ($m / 100000000);
+    }
+
+    /**
+     * Invalidate CacheID
+     *
+     * @param string $cid           CacheID
+     * @param string $resource_name template name
+     * @param string $cache_id      cache id
+     * @param string $compile_id    compile id
+     * @param string $resource_uid  source's uid
+     *
+     * @return void
+     */
+    protected function invalidate(
+        $cid = null,
+        $resource_name = null,
+        $cache_id = null,
+        $compile_id = null,
+        $resource_uid = null
+    ) {
+        $now = microtime(true);
+        $key = null;
+        // invalidate everything
+        if (!$resource_name && !$cache_id && !$compile_id) {
+            $key = 'IVK#ALL';
+        } // invalidate all caches by template
+        else {
+            if ($resource_name && !$cache_id && !$compile_id) {
+                $key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name);
+            } // invalidate all caches by cache group
+            else {
+                if (!$resource_name && $cache_id && !$compile_id) {
+                    $key = 'IVK#CACHE#' . $this->sanitize($cache_id);
+                } // invalidate all caches by compile id
+                else {
+                    if (!$resource_name && !$cache_id && $compile_id) {
+                        $key = 'IVK#COMPILE#' . $this->sanitize($compile_id);
+                    } // invalidate by combination
+                    else {
+                        $key = 'IVK#CID#' . $cid;
+                    }
+                }
+            }
+        }
+        $this->write(array($key => $now));
+    }
+
+    /**
+     * Determine the latest timestamp known to the invalidation chain
+     *
+     * @param string $cid           CacheID to determine latest invalidation timestamp of
+     * @param string $resource_name template name
+     * @param string $cache_id      cache id
+     * @param string $compile_id    compile id
+     * @param string $resource_uid  source's filepath
+     *
+     * @return float  the microtime the CacheID was invalidated
+     */
+    protected function getLatestInvalidationTimestamp(
+        $cid,
+        $resource_name = null,
+        $cache_id = null,
+        $compile_id = null,
+        $resource_uid = null
+    ) {
+	    // abort if there are no InvalidationKeys to check
+        if (!($_cid = $this->listInvalidationKeys($cid, $resource_name, $cache_id, $compile_id, $resource_uid))) {
+            return 0;
+        }
+        // there are no InValidationKeys
+        if (!($values = $this->read($_cid))) {
+            return 0;
+        }
+        // make sure we're dealing with floats
+        $values = array_map('floatval', $values);
+        return max($values);
+    }
+
+    /**
+     * Translate a CacheID into the list of applicable InvalidationKeys.
+     * Splits 'some|chain|into|an|array' into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... )
+     *
+     * @param string $cid           CacheID to translate
+     * @param string $resource_name template name
+     * @param string $cache_id      cache id
+     * @param string $compile_id    compile id
+     * @param string $resource_uid  source's filepath
+     *
+     * @return array  list of InvalidationKeys
+     * @uses   $invalidationKeyPrefix to prepend to each InvalidationKey
+     */
+    protected function listInvalidationKeys(
+        $cid,
+        $resource_name = null,
+        $cache_id = null,
+        $compile_id = null,
+        $resource_uid = null
+    ) {
+        $t = array('IVK#ALL');
+        $_name = $_compile = '#';
+        if ($resource_name) {
+            $_name .= $resource_uid . '#' . $this->sanitize($resource_name);
+            $t[] = 'IVK#TEMPLATE' . $_name;
+        }
+        if ($compile_id) {
+            $_compile .= $this->sanitize($compile_id);
+            $t[] = 'IVK#COMPILE' . $_compile;
+        }
+        $_name .= '#';
+        $cid = trim((string)$cache_id, '|');
+        if (!$cid) {
+            return $t;
+        }
+        $i = 0;
+        while (true) {
+            // determine next delimiter position
+            $i = strpos($cid, '|', $i);
+            // add complete CacheID if there are no more delimiters
+            if ($i === false) {
+                $t[] = 'IVK#CACHE#' . $cid;
+                $t[] = 'IVK#CID' . $_name . $cid . $_compile;
+                $t[] = 'IVK#CID' . $_name . $_compile;
+                break;
+            }
+            $part = substr($cid, 0, $i);
+            // add slice to list
+            $t[] = 'IVK#CACHE#' . $part;
+            $t[] = 'IVK#CID' . $_name . $part . $_compile;
+            // skip past delimiter position
+            $i++;
+        }
+        return $t;
+    }
+
+    /**
+     * Check is cache is locked for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Cached $cached cached object
+     *
+     * @return boolean               true or false if cache is locked
+     */
+    public function hasLock(Smarty $smarty, Cached $cached)
+    {
+        $key = 'LOCK#' . $cached->filepath;
+        $data = $this->read(array($key));
+        return $data && time() - $data[ $key ] < $smarty->locking_timeout;
+    }
+
+    /**
+     * Lock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Cached $cached cached object
+     *
+     * @return bool|void
+     */
+    public function acquireLock(Smarty $smarty, Cached $cached)
+    {
+        $cached->is_locked = true;
+        $key = 'LOCK#' . $cached->filepath;
+        $this->write(array($key => time()), $smarty->locking_timeout);
+    }
+
+    /**
+     * Unlock cache for this template
+     *
+     * @param Smarty                 $smarty Smarty object
+     * @param Cached $cached cached object
+     *
+     * @return void
+     */
+    public function releaseLock(Smarty $smarty, Cached $cached)
+    {
+        $cached->is_locked = false;
+        $key = 'LOCK#' . $cached->filepath;
+        $this->delete(array($key));
+    }
+
+    /**
+     * Read values for a set of keys from cache
+     *
+     * @param array $keys list of keys to fetch
+     *
+     * @return array list of values with the given keys used as indexes
+     */
+    abstract protected function read(array $keys);
+
+    /**
+     * Save values for a set of keys to cache
+     *
+     * @param array $keys   list of values to save
+     * @param int   $expire expiration time
+     *
+     * @return boolean true on success, false on failure
+     */
+    abstract protected function write(array $keys, $expire = null);
+
+    /**
+     * Remove values from cache
+     *
+     * @param array $keys list of keys to delete
+     *
+     * @return boolean true on success, false on failure
+     */
+    abstract protected function delete(array $keys);
+
+    /**
+     * Remove *all* values from cache
+     *
+     * @return boolean true on success, false on failure
+     */
+    protected function purge()
+    {
+        return false;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Base.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Base.php
new file mode 100644
index 000000000..2d5c0c0ef
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Base.php
@@ -0,0 +1,233 @@
+<?php
+/**
+ * Smarty Internal Compile Plugin Base
+ * @author     Uwe Tews
+ */
+namespace Smarty\Compile;
+
+use Smarty\Compiler\Template;
+use Smarty\Data;
+use Smarty\Exception;
+
+/**
+ * This class does extend all internal compile plugins
+ *
+
+
+ */
+abstract class Base implements CompilerInterface {
+
+	/**
+	 * Array of names of required attribute required by tag
+	 *
+	 * @var array
+	 */
+	protected $required_attributes = [];
+
+	/**
+	 * Array of names of optional attribute required by tag
+	 * use array('_any') if there is no restriction of attributes names
+	 *
+	 * @var array
+	 */
+	protected $optional_attributes = [];
+
+	/**
+	 * Shorttag attribute order defined by its names
+	 *
+	 * @var array
+	 */
+	protected $shorttag_order = [];
+
+	/**
+	 * Array of names of valid option flags
+	 *
+	 * @var array
+	 */
+	protected $option_flags = ['nocache'];
+	/**
+	 * @var bool
+	 */
+	protected $cacheable = true;
+
+	public function isCacheable(): bool {
+		return $this->cacheable;
+	}
+
+	/**
+	 * Converts attributes into parameter array strings
+	 *
+	 * @param array $_attr
+	 *
+	 * @return array
+	 */
+	protected function formatParamsArray(array $_attr): array {
+		$_paramsArray = [];
+		foreach ($_attr as $_key => $_value) {
+			$_paramsArray[] = var_export($_key, true) . "=>" . $_value;
+		}
+		return $_paramsArray;
+	}
+
+	/**
+	 * This function checks if the attributes passed are valid
+	 * The attributes passed for the tag to compile are checked against the list of required and
+	 * optional attributes. Required attributes must be present. Optional attributes are check against
+	 * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
+	 * as valid
+	 *
+	 * @param object $compiler compiler object
+	 * @param array $attributes attributes applied to the tag
+	 *
+	 * @return array  of mapped attributes for further processing
+	 */
+	protected function getAttributes($compiler, $attributes) {
+		$_indexed_attr = [];
+		$options = array_fill_keys($this->option_flags, true);
+		foreach ($attributes as $key => $mixed) {
+			// shorthand ?
+			if (!is_array($mixed)) {
+				// options flag ?
+				if (isset($options[trim($mixed, '\'"')])) {
+					$_indexed_attr[trim($mixed, '\'"')] = true;
+					// shorthand attribute ?
+				} elseif (isset($this->shorttag_order[$key])) {
+					$_indexed_attr[$this->shorttag_order[$key]] = $mixed;
+				} else {
+					// too many shorthands
+					$compiler->trigger_template_error('too many shorthand attributes', null, true);
+				}
+				// named attribute
+			} else {
+				foreach ($mixed as $k => $v) {
+					// options flag?
+					if (isset($options[$k])) {
+						if (is_bool($v)) {
+							$_indexed_attr[$k] = $v;
+						} else {
+							if (is_string($v)) {
+								$v = trim($v, '\'" ');
+							}
+
+							// Mapping array for boolean option value
+							static $optionMap = [1 => true, 0 => false, 'true' => true, 'false' => false];
+
+							if (isset($optionMap[$v])) {
+								$_indexed_attr[$k] = $optionMap[$v];
+							} else {
+								$compiler->trigger_template_error(
+									"illegal value '" . var_export($v, true) .
+									"' for options flag '{$k}'",
+									null,
+									true
+								);
+							}
+						}
+						// must be named attribute
+					} else {
+						$_indexed_attr[$k] = $v;
+					}
+				}
+			}
+		}
+		// check if all required attributes present
+		foreach ($this->required_attributes as $attr) {
+			if (!isset($_indexed_attr[$attr])) {
+				$compiler->trigger_template_error("missing '{$attr}' attribute", null, true);
+			}
+		}
+		// check for not allowed attributes
+		if ($this->optional_attributes !== ['_any']) {
+			$allowedAttributes = array_fill_keys(
+				array_merge(
+					$this->required_attributes,
+					$this->optional_attributes,
+					$this->option_flags
+				),
+				true
+			);
+			foreach ($_indexed_attr as $key => $dummy) {
+				if (!isset($allowedAttributes[$key]) && $key !== 0) {
+					$compiler->trigger_template_error("unexpected '{$key}' attribute", null, true);
+				}
+			}
+		}
+		// default 'false' for all options flags not set
+		foreach ($this->option_flags as $flag) {
+			if (!isset($_indexed_attr[$flag])) {
+				$_indexed_attr[$flag] = false;
+			}
+		}
+
+		return $_indexed_attr;
+	}
+
+	/**
+	 * Push opening tag name on stack
+	 * Optionally additional data can be saved on stack
+	 *
+	 * @param Template $compiler compiler object
+	 * @param string $openTag the opening tag's name
+	 * @param mixed $data optional data saved
+	 */
+	protected function openTag(Template $compiler, $openTag, $data = null) {
+		$compiler->openTag($openTag, $data);
+	}
+
+	/**
+	 * Pop closing tag
+	 * Raise an error if this stack-top doesn't match with expected opening tags
+	 *
+	 * @param Template $compiler compiler object
+	 * @param array|string $expectedTag the expected opening tag names
+	 *
+	 * @return mixed        any type the opening tag's name or saved data
+	 */
+	protected function closeTag(Template $compiler, $expectedTag) {
+		return $compiler->closeTag($expectedTag);
+	}
+
+	/**
+	 * @param mixed $scope
+	 * @param array $invalidScopes
+	 *
+	 * @return int
+	 * @throws Exception
+	 */
+	protected function convertScope($scope): int {
+
+		static $scopes = [
+			'local'    => Data::SCOPE_LOCAL,    // current scope
+			'parent' => Data::SCOPE_PARENT,     // parent scope (definition unclear)
+			'tpl_root' => Data::SCOPE_TPL_ROOT, // highest template (keep going up until parent is not a template)
+			'root'     => Data::SCOPE_ROOT,     // highest scope (definition unclear)
+			'global' => Data::SCOPE_GLOBAL,     // smarty object
+
+			'smarty' => Data::SCOPE_SMARTY,     // @deprecated alias of 'global'
+		];
+
+		$_scopeName = trim($scope, '\'"');
+		if (is_numeric($_scopeName) && in_array($_scopeName, $scopes)) {
+			return (int) $_scopeName;
+		}
+
+		if (isset($scopes[$_scopeName])) {
+			return $scopes[$_scopeName];
+		}
+
+		$err = var_export($_scopeName, true);
+		throw new Exception("illegal value '{$err}' for \"scope\" attribute");
+	}
+
+	/**
+	 * Compiles code for the tag
+	 *
+	 * @param array                                 $args      array with attributes from parser
+	 * @param Template $compiler  compiler object
+	 * @param array                                 $parameter array with compilation parameter
+	 *
+	 * @return string compiled code as a string
+	 * @throws \Smarty\CompilerException
+	 */
+	abstract public function compile($args, Template $compiler, $parameter = array(), $tag = null, $function = null): string;
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/BlockCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/BlockCompiler.php
new file mode 100644
index 000000000..e7a8f310e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/BlockCompiler.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Block Plugin
+ * Compiles code for the execution of block plugin
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile;
+
+use Smarty\Compiler\Template;
+use Smarty\CompilerException;
+use Smarty\Exception;
+use Smarty\Smarty;
+
+/**
+ * Smarty Internal Plugin Compile Block Plugin Class
+ *
+ */
+class BlockCompiler extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $optional_attributes = ['_any'];
+
+	/**
+	 * nesting level
+	 *
+	 * @var int
+	 */
+	private $nesting = 0;
+
+
+	/**
+	 * Compiles code for the execution of block plugin
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 * @param string $tag name of block plugin
+	 * @param string $function PHP function name
+	 *
+	 * @return string compiled code
+	 * @throws CompilerException
+	 * @throws Exception
+	 */
+	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		if (!isset($tag[5]) || substr($tag, -5) !== 'close') {
+			$output = $this->compileOpeningTag($compiler, $args, $tag, $function);
+		} else {
+			$output = $this->compileClosingTag($compiler, $tag, $parameter, $function);
+		}
+		return $output;
+	}
+
+	/**
+	 * Compiles code for the {$smarty.block.child} property
+	 *
+	 * @param Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws CompilerException
+	 */
+	public function compileChild(\Smarty\Compiler\Template $compiler) {
+
+		if (!isset($compiler->_cache['blockNesting'])) {
+			$compiler->trigger_template_error(
+				"'{\$smarty.block.child}' used outside {block} tags ",
+				$compiler->getParser()->lex->taglineno
+			);
+		}
+		$compiler->_cache['blockParams'][$compiler->_cache['blockNesting']]['callsChild'] = true;
+		$compiler->suppressNocacheProcessing = true;
+
+		$output = "<?php \n";
+		$output .= '$_smarty_tpl->getInheritance()->callChild($_smarty_tpl, $this' . ");\n";
+		$output .= "?>\n";
+		return $output;
+	}
+
+	/**
+	 * Compiles code for the {$smarty.block.parent} property
+	 *
+	 * @param Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws CompilerException
+	 */
+	public function compileParent(\Smarty\Compiler\Template $compiler) {
+
+		if (!isset($compiler->_cache['blockNesting'])) {
+			$compiler->trigger_template_error(
+				"'{\$smarty.block.parent}' used outside {block} tags ",
+				$compiler->getParser()->lex->taglineno
+			);
+		}
+		$compiler->suppressNocacheProcessing = true;
+
+		$output = "<?php \n";
+		$output .= '$_smarty_tpl->getInheritance()->callParent($_smarty_tpl, $this' . ");\n";
+		$output .= "?>\n";
+		return $output;
+	}
+
+	/**
+	 * Returns true if this block is cacheable.
+	 *
+	 * @param Smarty $smarty
+	 * @param $function
+	 *
+	 * @return bool
+	 */
+	protected function blockIsCacheable(\Smarty\Smarty $smarty, $function): bool {
+		return $smarty->getBlockHandler($function)->isCacheable();
+	}
+
+	/**
+	 * Returns the code used for the isset check
+	 *
+	 * @param string $tag tag name
+	 * @param string $function base tag or method name
+	 *
+	 * @return string
+	 */
+	protected function getIsCallableCode($tag, $function): string {
+		return "\$_smarty_tpl->getSmarty()->getBlockHandler(" . var_export($function, true) . ")";
+	}
+
+	/**
+	 * Returns the full code used to call the callback
+	 *
+	 * @param string $tag tag name
+	 * @param string $function base tag or method name
+	 *
+	 * @return string
+	 */
+	protected function getFullCallbackCode($tag, $function): string {
+		return "\$_smarty_tpl->getSmarty()->getBlockHandler(" . var_export($function, true) . ")->handle";
+	}
+
+	/**
+	 * @param Template $compiler
+	 * @param array $args
+	 * @param string|null $tag
+	 * @param string|null $function
+	 *
+	 * @return string
+	 */
+	private function compileOpeningTag(Template $compiler, array $args, ?string $tag, ?string $function): string {
+
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$this->nesting++;
+		unset($_attr['nocache']);
+		$_params = 'array(' . implode(',', $this->formatParamsArray($_attr)) . ')';
+
+		if (!$this->blockIsCacheable($compiler->getSmarty(), $function)) {
+			$compiler->tag_nocache = true;
+		}
+
+		if ($compiler->tag_nocache) {
+			// push a {nocache} tag onto the stack to prevent caching of this block
+			$this->openTag($compiler, 'nocache');
+		}
+
+		$this->openTag($compiler, $tag, [$_params, $compiler->tag_nocache]);
+
+		// compile code
+		$output = "<?php \$_block_repeat=true;
+if (!" . $this->getIsCallableCode($tag, $function) .") {\nthrow new \\Smarty\\Exception('block tag \'{$tag}\' not callable or registered');\n}\n
+echo " . $this->getFullCallbackCode($tag, $function) . "({$_params}, null, \$_smarty_tpl, \$_block_repeat);
+while (\$_block_repeat) {
+  ob_start();
+?>";
+
+		return $output;
+	}
+
+	/**
+	 * @param Template $compiler
+	 * @param string $tag
+	 * @param array $parameter
+	 * @param string|null $function
+	 *
+	 * @return string
+	 * @throws CompilerException
+	 * @throws Exception
+	 */
+	private function compileClosingTag(Template $compiler, string $tag, array $parameter, ?string $function): string {
+
+		// closing tag of block plugin, restore nocache
+		$base_tag = substr($tag, 0, -5);
+		[$_params, $nocache_pushed] = $this->closeTag($compiler, $base_tag);
+
+		// compile code
+		if (!isset($parameter['modifier_list'])) {
+			$mod_pre = $mod_post = $mod_content = '';
+			$mod_content2 = 'ob_get_clean()';
+		} else {
+			$mod_content2 = "\$_block_content{$this->nesting}";
+			$mod_content = "\$_block_content{$this->nesting} = ob_get_clean();\n";
+			$mod_pre = "ob_start();\n";
+			$mod_post = 'echo ' . $compiler->compileModifier($parameter['modifier_list'], 'ob_get_clean()')
+				. ";\n";
+		}
+		$output = "<?php {$mod_content}\$_block_repeat=false;\n{$mod_pre}";
+		$callback = $this->getFullCallbackCode($base_tag, $function);
+		$output .= "echo {$callback}({$_params}, {$mod_content2}, \$_smarty_tpl, \$_block_repeat);\n";
+		$output .= "{$mod_post}}\n?>";
+
+		if ($nocache_pushed) {
+			// pop the pushed virtual nocache tag
+			$this->closeTag($compiler, 'nocache');
+			$compiler->tag_nocache = true;
+		}
+
+		return $output;
+	}
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/CompilerInterface.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/CompilerInterface.php
new file mode 100644
index 000000000..5f2cc7ccc
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/CompilerInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Smarty\Compile;
+
+/**
+ * This class does extend all internal compile plugins
+ *
+
+
+ */
+interface CompilerInterface {
+
+	/**
+	 * Compiles code for the tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code as a string
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string;
+
+	public function isCacheable(): bool;
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/DefaultHandlerBlockCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/DefaultHandlerBlockCompiler.php
new file mode 100644
index 000000000..394a6e76d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/DefaultHandlerBlockCompiler.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Smarty\Compile;
+
+class DefaultHandlerBlockCompiler extends BlockCompiler {
+	/**
+	 * @inheritDoc
+	 */
+	protected function getIsCallableCode($tag, $function): string {
+		return "\$_smarty_tpl->getSmarty()->getRuntime('DefaultPluginHandler')->hasPlugin(" .
+			var_export($function, true) . ", 'block')";
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function getFullCallbackCode($tag, $function): string {
+		return "\$_smarty_tpl->getSmarty()->getRuntime('DefaultPluginHandler')->getCallback(" .
+			var_export($function, true) . ", 'block')";
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function blockIsCacheable(\Smarty\Smarty $smarty, $function): bool {
+		return true;
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/DefaultHandlerFunctionCallCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/DefaultHandlerFunctionCallCompiler.php
new file mode 100644
index 000000000..e6d11384e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/DefaultHandlerFunctionCallCompiler.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Smarty\Compile;
+
+use Smarty\Compiler\Template;
+
+class DefaultHandlerFunctionCallCompiler extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	public $optional_attributes = ['_any'];
+
+	/**
+	 * Compiles code for the execution of a registered function
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 * @param string $tag name of tag
+	 * @param string $function name of function
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		unset($_attr['nocache']);
+
+		$_paramsArray = $this->formatParamsArray($_attr);
+		$_params = 'array(' . implode(',', $_paramsArray) . ')';
+
+		$output = "\$_smarty_tpl->getSmarty()->getRuntime('DefaultPluginHandler')->getCallback(" . var_export($function, true) .
+			",'function')($_params, \$_smarty_tpl)";
+
+		if (!empty($parameter['modifierlist'])) {
+			$output = $compiler->compileModifier($parameter['modifierlist'], $output);
+		}
+		return "<?php echo {$output};?>\n";
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/FunctionCallCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/FunctionCallCompiler.php
new file mode 100644
index 000000000..107dd98bb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/FunctionCallCompiler.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Registered Function
+ * Compiles code for the execution of a registered function
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile;
+
+use Smarty\Compiler\Template;
+use Smarty\CompilerException;
+
+/**
+ * Smarty Internal Plugin Compile Registered Function Class
+ *
+
+
+ */
+class FunctionCallCompiler extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	public $optional_attributes = ['_any'];
+
+	/**
+	 * Shorttag attribute order defined by its names
+	 *
+	 * @var array
+	 */
+	protected $shorttag_order = [];
+
+	/**
+	 * Compiles code for the execution of a registered function
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 * @param string $tag name of tag
+	 * @param string $function name of function
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		unset($_attr['nocache']);
+
+		$_paramsArray = $this->formatParamsArray($_attr);
+		$_params = 'array(' . implode(',', $_paramsArray) . ')';
+
+
+		if ($functionHandler = $compiler->getSmarty()->getFunctionHandler($function)) {
+
+			// not cacheable?
+			$compiler->tag_nocache = $compiler->tag_nocache || !$functionHandler->isCacheable();
+			$output = "\$_smarty_tpl->getSmarty()->getFunctionHandler(" . var_export($function, true) . ")";
+			$output .= "->handle($_params, \$_smarty_tpl)";
+		} else {
+			$compiler->trigger_template_error("unknown function '{$function}'", null, true);
+		}
+
+		if (!empty($parameter['modifierlist'])) {
+			$output = $compiler->compileModifier($parameter['modifierlist'], $output);
+		}
+
+		return $output;
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/BCPluginWrapper.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/BCPluginWrapper.php
new file mode 100644
index 000000000..0147651fd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/BCPluginWrapper.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+
+class BCPluginWrapper extends Base {
+
+	private $callback;
+
+	public function __construct($callback) {
+		$this->callback = $callback;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return call_user_func($this->callback, $params, $compiler);
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/Base.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/Base.php
new file mode 100644
index 000000000..2ae572287
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/Base.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+
+use Smarty\Exception;
+
+abstract class Base implements ModifierCompilerInterface {
+
+	/**
+	 * Compiles code for the modifier
+	 *
+	 * @param array                                 $params      array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler  compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	abstract public function compile($params, \Smarty\Compiler\Template $compiler);
+
+	/**
+	 * evaluate compiler parameter
+	 *
+	 * @param array   $params  parameter array as given to the compiler function
+	 * @param integer $index   array index of the parameter to convert
+	 * @param mixed   $default value to be returned if the parameter is not present
+	 *
+	 * @return mixed evaluated value of parameter or $default
+	 * @throws Exception if parameter is not a literal (but an expression, variable, …)
+	 * @author Rodney Rehm
+	 */
+	protected function literal_compiler_param($params, $index, $default = null)
+	{
+		// not set, go default
+		if (!isset($params[ $index ])) {
+			return $default;
+		}
+		// test if param is a literal
+		if (!preg_match('/^([\'"]?)[a-zA-Z0-9-]+(\\1)$/', $params[ $index ])) {
+			throw new Exception(
+				'$param[' . $index .
+				'] is not a literal and is thus not evaluatable at compile time'
+			);
+		}
+		$t = null;
+		eval("\$t = " . $params[ $index ] . ";");
+		return $t;
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/CatModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/CatModifierCompiler.php
new file mode 100644
index 000000000..21005d5be
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/CatModifierCompiler.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+
+/**
+ * Smarty cat modifier plugin
+ * Type:     modifier
+ * Name:     cat
+ * Date:     Feb 24, 2003
+ * Purpose:  catenate a value to a variable
+ * Input:    string to catenate
+ * Example:  {$var|cat:"foo"}
+ *
+ * @author Uwe Tews
+ */
+
+class CatModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return '(' . implode(').(', $params) . ')';
+	}
+
+}
+
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/CountCharactersModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/CountCharactersModifierCompiler.php
new file mode 100644
index 000000000..fb5f5ca33
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/CountCharactersModifierCompiler.php
@@ -0,0 +1,21 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty count_characters modifier plugin
+ * Type:     modifier
+ * Name:     count_characters
+ * Purpose:  count the number of characters in a text
+ *
+ * @author Uwe Tews
+ */
+
+class CountCharactersModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ]) || $params[ 1 ] !== 'true') {
+			return 'preg_match_all(\'/[^\s]/' . \Smarty\Smarty::$_UTF8_MODIFIER . '\',' . $params[ 0 ] . ', $tmp)';
+		}
+		return 'mb_strlen((string) ' . $params[ 0 ] . ', \'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\')';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/CountParagraphsModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/CountParagraphsModifierCompiler.php
new file mode 100644
index 000000000..76552e073
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/CountParagraphsModifierCompiler.php
@@ -0,0 +1,19 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty count_paragraphs modifier plugin
+ * Type:     modifier
+ * Name:     count_paragraphs
+ * Purpose:  count the number of paragraphs in a text
+ *
+ * @author Uwe Tews
+ */
+
+class CountParagraphsModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		// count \r or \n characters
+		return '(preg_match_all(\'#[\r\n]+#\', ' . $params[ 0 ] . ', $tmp)+1)';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/CountSentencesModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/CountSentencesModifierCompiler.php
new file mode 100644
index 000000000..bc7c43e1c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/CountSentencesModifierCompiler.php
@@ -0,0 +1,19 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty count_sentences modifier plugin
+ * Type:     modifier
+ * Name:     count_sentences
+ * Purpose:  count the number of sentences in a text
+ *
+ * @author Uwe Tews
+ */
+
+class CountSentencesModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		// find periods, question marks, exclamation marks with a word before but not after.
+		return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . \Smarty\Smarty::$_UTF8_MODIFIER . '", ' . $params[ 0 ] . ', $tmp)';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/CountWordsModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/CountWordsModifierCompiler.php
new file mode 100644
index 000000000..c11d546d4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/CountWordsModifierCompiler.php
@@ -0,0 +1,20 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty count_words modifier plugin
+ * Type:     modifier
+ * Name:     count_words
+ * Purpose:  count the number of words in a text
+ *
+ * @author Uwe Tews
+ */
+
+class CountWordsModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		// expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
+		return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . \Smarty\Smarty::$_UTF8_MODIFIER . '\', ' .
+			$params[ 0 ] . ', $tmp)';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/DefaultModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/DefaultModifierCompiler.php
new file mode 100644
index 000000000..3d82aa70c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/DefaultModifierCompiler.php
@@ -0,0 +1,26 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty default modifier plugin
+ * Type:     modifier
+ * Name:     default
+ * Purpose:  designate default value for empty variables
+ *
+ * @author Uwe Tews
+ */
+
+class DefaultModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		$output = $params[ 0 ];
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = "''";
+		}
+		array_shift($params);
+		foreach ($params as $param) {
+			$output = '(($tmp = ' . $output . ' ?? null)===null||$tmp===\'\' ? ' . $param . ' ?? null : $tmp)';
+		}
+		return $output;
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/EmptyModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/EmptyModifierCompiler.php
new file mode 100644
index 000000000..6bb6c11c4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/EmptyModifierCompiler.php
@@ -0,0 +1,19 @@
+<?php
+namespace Smarty\Compile\Modifier;
+use Smarty\CompilerException;
+
+/**
+ * Smarty empty modifier plugin
+ */
+class EmptyModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+
+		if (count($params) !== 1) {
+			throw new CompilerException("Invalid number of arguments for empty. empty expects exactly 1 parameter.");
+		}
+
+		return 'empty(' . $params[0] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/EscapeModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/EscapeModifierCompiler.php
new file mode 100644
index 000000000..b600e08c8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/EscapeModifierCompiler.php
@@ -0,0 +1,56 @@
+<?php
+namespace Smarty\Compile\Modifier;
+
+use Smarty\Exception;
+
+/**
+ * Smarty escape modifier plugin
+ * Type:     modifier
+ * Name:     escape
+ * Purpose:  escape string for output
+ *
+ * @author Rodney Rehm
+ */
+
+class EscapeModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		try {
+			$esc_type = $this->literal_compiler_param($params, 1, 'html');
+			$char_set = $this->literal_compiler_param($params, 2, \Smarty\Smarty::$_CHARSET);
+			$double_encode = $this->literal_compiler_param($params, 3, true);
+			if (!$char_set) {
+				$char_set = \Smarty\Smarty::$_CHARSET;
+			}
+			switch ($esc_type) {
+				case 'html':
+					return 'htmlspecialchars((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+						var_export($double_encode, true) . ')';
+				// no break
+				case 'htmlall':
+					return 'htmlentities(mb_convert_encoding((string)' . $params[ 0 ] . ', \'UTF-8\', ' .
+						var_export($char_set, true) . '), ENT_QUOTES, \'UTF-8\', ' .
+						var_export($double_encode, true) . ')';
+				// no break
+				case 'url':
+					return 'rawurlencode((string)' . $params[ 0 ] . ')';
+				case 'urlpathinfo':
+					return 'str_replace("%2F", "/", rawurlencode((string)' . $params[ 0 ] . '))';
+				case 'quotes':
+					// escape unescaped single quotes
+					return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'", (string)' . $params[ 0 ] . ')';
+				case 'javascript':
+					// escape quotes and backslashes, newlines, etc.
+					// see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
+					return 'strtr((string)' .
+						$params[ 0 ] .
+						', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", 
+						"\\n" => "\\\n", "</" => "<\/", "<!--" => "<\!--", "<s" => "<\s", "<S" => "<\S",
+						"`" => "\\\\`", "\${" => "\\\\\\$\\{"))';
+			}
+		} catch (Exception $e) {
+			// pass through to regular plugin fallback
+		}
+		return '$_smarty_tpl->getSmarty()->getModifierCallback(\'escape\')(' . join(', ', $params) . ')';
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/FromCharsetModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/FromCharsetModifierCompiler.php
new file mode 100644
index 000000000..606fedf94
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/FromCharsetModifierCompiler.php
@@ -0,0 +1,21 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty from_charset modifier plugin
+ * Type:     modifier
+ * Name:     from_charset
+ * Purpose:  convert character encoding from $charset to internal encoding
+ *
+ * @author Rodney Rehm
+ */
+
+class FromCharsetModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = '"ISO-8859-1"';
+		}
+		return 'mb_convert_encoding(' . $params[ 0 ] . ', "' . addslashes(\Smarty\Smarty::$_CHARSET) . '", ' . $params[ 1 ] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/IndentModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/IndentModifierCompiler.php
new file mode 100644
index 000000000..353e757f0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/IndentModifierCompiler.php
@@ -0,0 +1,24 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty indent modifier plugin
+ * Type:     modifier
+ * Name:     indent
+ * Purpose:  indent lines of text
+ *
+ * @author Uwe Tews
+ */
+
+class IndentModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = 4;
+		}
+		if (!isset($params[ 2 ])) {
+			$params[ 2 ] = "' '";
+		}
+		return 'preg_replace(\'!^!m\',str_repeat(' . $params[ 2 ] . ',' . $params[ 1 ] . '),' . $params[ 0 ] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/IsArrayModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/IsArrayModifierCompiler.php
new file mode 100644
index 000000000..0e66bb521
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/IsArrayModifierCompiler.php
@@ -0,0 +1,19 @@
+<?php
+namespace Smarty\Compile\Modifier;
+use Smarty\CompilerException;
+
+/**
+ * Smarty is_array modifier plugin
+ */
+class IsArrayModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+
+		if (count($params) !== 1) {
+			throw new CompilerException("Invalid number of arguments for is_array. is_array expects exactly 1 parameter.");
+		}
+
+		return 'is_array(' . $params[0] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/IssetModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/IssetModifierCompiler.php
new file mode 100644
index 000000000..0962fbfa3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/IssetModifierCompiler.php
@@ -0,0 +1,25 @@
+<?php
+namespace Smarty\Compile\Modifier;
+use Smarty\CompilerException;
+
+/**
+ * Smarty isset modifier plugin
+ */
+class IssetModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+
+		$params = array_filter($params, function($v) { return !empty($v); });
+
+		if (count($params) < 1) {
+			throw new CompilerException("Invalid number of arguments for isset. isset expects at least one parameter.");
+		}
+
+		$tests = [];
+		foreach ($params as $param) {
+			$tests[] = 'null !== (' . $param . ' ?? null)';
+		}
+		return '(' . implode(' && ', $tests) . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/JsonEncodeModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/JsonEncodeModifierCompiler.php
new file mode 100644
index 000000000..4f191a31f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/JsonEncodeModifierCompiler.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+
+/**
+ * Smarty json_encode modifier plugin
+ */
+class JsonEncodeModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'json_encode(' . $params[0] . (isset($params[1]) ? ', (int) ' . $params[1] : '') . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/LowerModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/LowerModifierCompiler.php
new file mode 100644
index 000000000..62fc87e90
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/LowerModifierCompiler.php
@@ -0,0 +1,19 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty lower modifier plugin
+ * Type:     modifier
+ * Name:     lower
+ * Purpose:  convert string to lowercase
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Uwe Tews
+ */
+
+class LowerModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'mb_strtolower((string) ' . $params[ 0 ] . ', \'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\')';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/ModifierCompilerInterface.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/ModifierCompilerInterface.php
new file mode 100644
index 000000000..0a39b819a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/ModifierCompilerInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+
+interface ModifierCompilerInterface {
+
+	/**
+	 * Compiles code for the modifier
+	 *
+	 * @param array $params array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($params, \Smarty\Compiler\Template $compiler);
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/Nl2brModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/Nl2brModifierCompiler.php
new file mode 100644
index 000000000..c3b1aa533
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/Nl2brModifierCompiler.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty nl2br modifier plugin
+ * Type:     modifier
+ * Name:     nl2br
+ * Purpose:  insert HTML line breaks before all newlines in a string
+ *
+ */
+
+class Nl2brModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'nl2br((string) ' . $params[0] . ', (bool) ' . ($params[1] ?? true) . ')';
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/NoPrintModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/NoPrintModifierCompiler.php
new file mode 100644
index 000000000..c9401cfe0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/NoPrintModifierCompiler.php
@@ -0,0 +1,18 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty noprint modifier plugin
+ * Type:     modifier
+ * Name:     noprint
+ * Purpose:  return an empty string
+ *
+ * @author Uwe Tews
+ */
+
+class NoPrintModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return "''";
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/RoundModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/RoundModifierCompiler.php
new file mode 100644
index 000000000..82476833e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/RoundModifierCompiler.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty round modifier plugin
+ * Type:     modifier
+ * Name:     round
+ * Purpose:  Returns the rounded value of num to specified precision (number of digits after the decimal point)
+ *
+ */
+
+class RoundModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'round((float) ' . $params[0] . ', (int) ' . ($params[1] ?? 0) . ', (int) ' . ($params[2] ?? PHP_ROUND_HALF_UP) . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/StrRepeatModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/StrRepeatModifierCompiler.php
new file mode 100644
index 000000000..c33af3299
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/StrRepeatModifierCompiler.php
@@ -0,0 +1,17 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty str_repeat modifier plugin
+ * Type:     modifier
+ * Name:     str_repeat
+ * Purpose:  returns string repeated times times
+ *
+ */
+
+class StrRepeatModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'str_repeat((string) ' . $params[0] . ', (int) ' . $params[1] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/StringFormatModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/StringFormatModifierCompiler.php
new file mode 100644
index 000000000..e662f0164
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/StringFormatModifierCompiler.php
@@ -0,0 +1,18 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty string_format modifier plugin
+ * Type:     modifier
+ * Name:     string_format
+ * Purpose:  format strings via sprintf
+ *
+ * @author Uwe Tews
+ */
+
+class StringFormatModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'sprintf(' . $params[ 1 ] . ',' . $params[ 0 ] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/StripModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/StripModifierCompiler.php
new file mode 100644
index 000000000..d85f83df3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/StripModifierCompiler.php
@@ -0,0 +1,24 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty strip modifier plugin
+ * Type:     modifier
+ * Name:     strip
+ * Purpose:  Replace all repeated spaces, newlines, tabs
+ *              with a single space or supplied replacement string.
+ * Example:  {$var|strip} {$var|strip:"&nbsp;"}
+ * Date:     September 25th, 2002
+ *
+ * @author Uwe Tews
+ */
+
+class StripModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = "' '";
+		}
+		return "preg_replace('!\s+!" . \Smarty\Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/StripTagsModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/StripTagsModifierCompiler.php
new file mode 100644
index 000000000..dfd09437a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/StripTagsModifierCompiler.php
@@ -0,0 +1,22 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty strip_tags modifier plugin
+ * Type:     modifier
+ * Name:     strip_tags
+ * Purpose:  strip html tags from text
+ *
+ * @author Uwe Tews
+ */
+
+class StripTagsModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ]) || $params[ 1 ] === true || trim($params[ 1 ], '"') === 'true') {
+			return "preg_replace('!<[^>]*?>!', ' ', (string) {$params[0]})";
+		} else {
+			return 'strip_tags((string) ' . $params[ 0 ] . ')';
+		}
+	}
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/StrlenModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/StrlenModifierCompiler.php
new file mode 100644
index 000000000..5cc666fd5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/StrlenModifierCompiler.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty strlen modifier plugin
+ * Type:     modifier
+ * Name:     strlen
+ * Purpose:  return the length of the given string
+ *
+ */
+
+class StrlenModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'strlen((string) ' . $params[0] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/SubstrModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/SubstrModifierCompiler.php
new file mode 100644
index 000000000..8fb33ed77
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/SubstrModifierCompiler.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Smarty\Compile\Modifier;
+
+/**
+ * Smarty substr modifier plugin
+ */
+class SubstrModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'substr((string) ' . $params[0] . ', (int) ' . $params[1] .
+			(isset($params[2]) ? ', (int) ' . $params[2] : '') . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/ToCharsetModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/ToCharsetModifierCompiler.php
new file mode 100644
index 000000000..67a5709d9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/ToCharsetModifierCompiler.php
@@ -0,0 +1,21 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty to_charset modifier plugin
+ * Type:     modifier
+ * Name:     to_charset
+ * Purpose:  convert character encoding from internal encoding to $charset
+ *
+ * @author Rodney Rehm
+ */
+
+class ToCharsetModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = '"ISO-8859-1"';
+		}
+		return 'mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 1 ] . ', "' . addslashes(\Smarty\Smarty::$_CHARSET) . '")';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/UnescapeModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/UnescapeModifierCompiler.php
new file mode 100644
index 000000000..1844ceb95
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/UnescapeModifierCompiler.php
@@ -0,0 +1,34 @@
+<?php
+namespace Smarty\Compile\Modifier;
+
+/**
+ * Smarty unescape modifier plugin
+ * Type:     modifier
+ * Name:     unescape
+ * Purpose:  unescape html entities
+ *
+ * @author Rodney Rehm
+ */
+
+class UnescapeModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		$esc_type = $this->literal_compiler_param($params, 1, 'html');
+
+		if (!isset($params[ 2 ])) {
+			$params[ 2 ] = '\'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\'';
+		}
+
+		switch ($esc_type) {
+			case 'entity':
+			case 'htmlall':
+				return 'html_entity_decode(mb_convert_encoding(' . $params[ 0 ] . ', ' . $params[ 2 ] . ', \'UTF-8\'), ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, ' . $params[ 2 ] . ')';
+			case 'html':
+				return 'htmlspecialchars_decode(' . $params[ 0 ] . ', ENT_QUOTES)';
+			case 'url':
+				return 'rawurldecode(' . $params[ 0 ] . ')';
+			default:
+				return $params[ 0 ];
+		}
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/UpperModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/UpperModifierCompiler.php
new file mode 100644
index 000000000..74e9a7024
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/UpperModifierCompiler.php
@@ -0,0 +1,18 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty upper modifier plugin
+ * Type:     modifier
+ * Name:     lower
+ * Purpose:  convert string to uppercase
+ *
+ * @author Uwe Tews
+ */
+
+class UpperModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		return 'mb_strtoupper((string) ' . $params[ 0 ] . ' ?? \'\', \'' . addslashes(\Smarty\Smarty::$_CHARSET) . '\')';
+	}
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/WordWrapModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/WordWrapModifierCompiler.php
new file mode 100644
index 000000000..092b95a80
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Modifier/WordWrapModifierCompiler.php
@@ -0,0 +1,27 @@
+<?php
+namespace Smarty\Compile\Modifier;
+/**
+ * Smarty wordwrap modifier plugin
+ * Type:     modifier
+ * Name:     wordwrap
+ * Purpose:  wrap a string of text at a given length
+ *
+ * @author Uwe Tews
+ */
+
+class WordWrapModifierCompiler extends Base {
+
+	public function compile($params, \Smarty\Compiler\Template $compiler) {
+		if (!isset($params[ 1 ])) {
+			$params[ 1 ] = 80;
+		}
+		if (!isset($params[ 2 ])) {
+			$params[ 2 ] = '"\n"';
+		}
+		if (!isset($params[ 3 ])) {
+			$params[ 3 ] = 'false';
+		}
+		return 'smarty_mb_wordwrap(' . $params[ 0 ] . ',' . $params[ 1 ] . ',' . $params[ 2 ] . ',' . $params[ 3 ] . ')';
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/ModifierCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/ModifierCompiler.php
new file mode 100644
index 000000000..4e6232244
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/ModifierCompiler.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Modifier
+ * Compiles code for modifier execution
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile;
+
+use Smarty\Compile\Base;
+use Smarty\Compiler\Template;
+use Smarty\CompilerException;
+
+/**
+ * Smarty Internal Plugin Compile Modifier Class
+ *
+
+
+ */
+class ModifierCompiler extends Base {
+
+	/**
+	 * Compiles code for modifier execution
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		$output = $parameter['value'];
+
+		// loop over list of modifiers
+		foreach ($parameter['modifierlist'] as $single_modifier) {
+			/* @var string $modifier */
+			$modifier = $single_modifier[0];
+
+
+			$modifier_params = array_values($single_modifier);
+
+			$modifier_params[0] = $output;
+			$params = implode(',', $modifier_params);
+
+			if (!is_object($compiler->getSmarty()->security_policy)
+				|| $compiler->getSmarty()->security_policy->isTrustedModifier($modifier, $compiler)
+			) {
+
+				if ($handler = $compiler->getModifierCompiler($modifier)) {
+					$output = $handler->compile($modifier_params, $compiler);
+				} elseif ($compiler->getSmarty()->getModifierCallback($modifier)) {
+					$output = sprintf(
+							'$_smarty_tpl->getSmarty()->getModifierCallback(%s)(%s)',
+							var_export($modifier, true),
+							$params
+						);
+				} elseif ($callback = $compiler->getPluginFromDefaultHandler($modifier, \Smarty\Smarty::PLUGIN_MODIFIERCOMPILER)) {
+					$output = (new \Smarty\Compile\Modifier\BCPluginWrapper($callback))->compile($modifier_params, $compiler);
+				} elseif ($function = $compiler->getPluginFromDefaultHandler($modifier, \Smarty\Smarty::PLUGIN_MODIFIER)) {
+					if (!is_array($function)) {
+						$output = "{$function}({$params})";
+					} else {
+						$operator = is_object($function[0]) ? '->' : '::';
+						$output =  $function[0] . $operator . $function[1] . '(' . $params . ')';
+					}
+				}  else {
+					$compiler->trigger_template_error("unknown modifier '{$modifier}'", null, true);
+				}
+			}
+		}
+		return $output;
+	}
+
+	/**
+	 * Wether this class will be able to compile the given modifier.
+	 * @param string $modifier
+	 * @param Template $compiler
+	 *
+	 * @return bool
+	 * @throws CompilerException
+	 */
+	public function canCompileForModifier(string $modifier, \Smarty\Compiler\Template $compiler): bool {
+		return $compiler->getModifierCompiler($modifier)
+			|| $compiler->getSmarty()->getModifierCallback($modifier)
+			|| $compiler->getPluginFromDefaultHandler($modifier, \Smarty\Smarty::PLUGIN_MODIFIERCOMPILER)
+			|| $compiler->getPluginFromDefaultHandler($modifier, \Smarty\Smarty::PLUGIN_MODIFIER);
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/ObjectMethodBlockCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/ObjectMethodBlockCompiler.php
new file mode 100644
index 000000000..6c05c4220
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/ObjectMethodBlockCompiler.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Object Block Function
+ * Compiles code for registered objects as block function
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile;
+
+/**
+ * Smarty Internal Plugin Compile Object Block Function Class
+ *
+
+
+ */
+class ObjectMethodBlockCompiler extends BlockCompiler {
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function getIsCallableCode($tag, $function): string {
+		$callbackObject = "\$_smarty_tpl->getSmarty()->registered_objects['{$tag}'][0]";
+		return "(isset({$callbackObject}) && is_callable(array({$callbackObject}, '{$function}')))";
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function getFullCallbackCode($tag, $function): string {
+		$callbackObject = "\$_smarty_tpl->getSmarty()->registered_objects['{$tag}'][0]";
+		return "{$callbackObject}->{$function}";
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function blockIsCacheable(\Smarty\Smarty $smarty, $function): bool {
+		return true;
+	}
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/ObjectMethodCallCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/ObjectMethodCallCompiler.php
new file mode 100644
index 000000000..70855cfc8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/ObjectMethodCallCompiler.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Object Function
+ * Compiles code for registered objects as function
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile;
+
+/**
+ * Smarty Internal Plugin Compile Object Function Class
+ *
+
+
+ */
+class ObjectMethodCallCompiler extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $optional_attributes = ['_any'];
+
+	/**
+	 * Compiles code for the execution of function plugin
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 * @param string $tag name of function
+	 * @param string $function name of method to call
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		unset($_attr['nocache']);
+		$_assign = null;
+		if (isset($_attr['assign'])) {
+			$_assign = $_attr['assign'];
+			unset($_attr['assign']);
+		}
+		// method or property ?
+		if (is_callable([$compiler->getSmarty()->registered_objects[$tag][0], $function])) {
+			// convert attributes into parameter array string
+			if ($compiler->getSmarty()->registered_objects[$tag][2]) {
+				$_paramsArray = $this->formatParamsArray($_attr);
+				$_params = 'array(' . implode(',', $_paramsArray) . ')';
+				$output = "\$_smarty_tpl->getSmarty()->registered_objects['{$tag}'][0]->{$function}({$_params},\$_smarty_tpl)";
+			} else {
+				$_params = implode(',', $_attr);
+				$output = "\$_smarty_tpl->getSmarty()->registered_objects['{$tag}'][0]->{$function}({$_params})";
+			}
+		} else {
+			// object property
+			$output = "\$_smarty_tpl->getSmarty()->registered_objects['{$tag}'][0]->{$function}";
+		}
+		if (!empty($parameter['modifierlist'])) {
+			$output = $compiler->compileModifier($parameter['modifierlist'], $output);
+		}
+		if (empty($_assign)) {
+			return "<?php echo {$output};?>\n";
+		} else {
+			return "<?php \$_smarty_tpl->assign({$_assign},{$output});?>\n";
+		}
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/PrintExpressionCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/PrintExpressionCompiler.php
new file mode 100644
index 000000000..3302254f9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/PrintExpressionCompiler.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Print Expression
+ * Compiles any tag which will output an expression or variable
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile;
+
+use Smarty\Compile\Base;
+use Smarty\Compiler\BaseCompiler;
+
+/**
+ * Smarty Internal Plugin Compile Print Expression Class
+ *
+
+
+ */
+class PrintExpressionCompiler extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	public $optional_attributes = ['assign'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	protected $option_flags = ['nocache', 'nofilter'];
+
+	/**
+	 * Compiles code for generating output from any expression
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$output = $parameter['value'];
+		// tag modifier
+		if (!empty($parameter['modifierlist'])) {
+			$output = $compiler->compileModifier($parameter['modifierlist'], $output);
+		}
+		if (isset($_attr['assign'])) {
+			// assign output to variable
+			return "<?php \$_smarty_tpl->assign({$_attr['assign']},{$output});?>";
+		} else {
+			// display value
+			if (!$_attr['nofilter']) {
+				// default modifier
+				if ($compiler->getSmarty()->getDefaultModifiers()) {
+					$modifierlist = [];
+					foreach ($compiler->getSmarty()->getDefaultModifiers() as $key => $single_default_modifier) {
+						preg_match_all(
+							'/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/',
+							$single_default_modifier,
+							$mod_array
+						);
+						for ($i = 0, $count = count($mod_array[0]); $i < $count; $i++) {
+							if ($mod_array[0][$i] !== ':') {
+								$modifierlist[$key][] = $mod_array[0][$i];
+							}
+						}
+					}
+
+					$output = $compiler->compileModifier($modifierlist, $output);
+				}
+
+				if ($compiler->getTemplate()->getSmarty()->escape_html) {
+					$output = "htmlspecialchars((string) ({$output}), ENT_QUOTES, '" . addslashes(\Smarty\Smarty::$_CHARSET) . "')";
+				}
+
+			}
+			$output = "<?php echo {$output};?>\n";
+		}
+		return $output;
+	}
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/SpecialVariableCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/SpecialVariableCompiler.php
new file mode 100644
index 000000000..2b6cf4330
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/SpecialVariableCompiler.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Special Smarty Variable
+ * Compiles the special $smarty variables
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile;
+
+use Smarty\Compile\Base;
+use Smarty\Compile\Tag\Capture;
+use Smarty\Compile\Tag\ForeachTag;
+use Smarty\Compile\Tag\Section;
+use Smarty\Compiler\Template;
+use Smarty\CompilerException;
+
+/**
+ * Smarty Internal Plugin Compile special Smarty Variable Class
+ *
+
+
+ */
+class SpecialVariableCompiler extends Base {
+
+	/**
+	 * Compiles code for the special $smarty variables
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param Template $compiler compiler object
+	 * @param array $parameter
+	 * @param null $tag
+	 * @param null $function
+	 *
+	 * @return string compiled code
+	 * @throws CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		$_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2));
+		$variable = smarty_strtolower_ascii($compiler->getId($_index[0]));
+		if ($variable === false) {
+			$compiler->trigger_template_error("special \$Smarty variable name index can not be variable", null, true);
+		}
+		if (!isset($compiler->getSmarty()->security_policy)
+			|| $compiler->getSmarty()->security_policy->isTrustedSpecialSmartyVar($variable, $compiler)
+		) {
+			switch ($variable) {
+				case 'foreach':
+					return (new ForeachTag())->compileSpecialVariable($compiler, $_index);
+				case 'section':
+					return (new Section())->compileSpecialVariable($compiler, $_index);
+				case 'capture':
+					return (new Capture())->compileSpecialVariable($compiler, $_index);
+				case 'now':
+					return 'time()';
+				case 'cookies':
+					if (isset($compiler->getSmarty()->security_policy)
+						&& !$compiler->getSmarty()->security_policy->allow_super_globals
+					) {
+						$compiler->trigger_template_error("(secure mode) super globals not permitted");
+						break;
+					}
+					$compiled_ref = '$_COOKIE';
+					break;
+				case 'get':
+				case 'post':
+				case 'env':
+				case 'server':
+				case 'session':
+				case 'request':
+					if (isset($compiler->getSmarty()->security_policy)
+						&& !$compiler->getSmarty()->security_policy->allow_super_globals
+					) {
+						$compiler->trigger_template_error("(secure mode) super globals not permitted");
+						break;
+					}
+					$compiled_ref = '$_' . smarty_strtoupper_ascii($variable);
+					break;
+				case 'template':
+					return '$_smarty_tpl->template_resource';
+				case 'template_object':
+					if (isset($compiler->getSmarty()->security_policy)) {
+						$compiler->trigger_template_error("(secure mode) template_object not permitted");
+						break;
+					}
+					return '$_smarty_tpl';
+				case 'current_dir':
+					return '$_smarty_current_dir';
+				case 'version':
+					return "\\Smarty\\Smarty::SMARTY_VERSION";
+				case 'const':
+					if (isset($compiler->getSmarty()->security_policy)
+						&& !$compiler->getSmarty()->security_policy->allow_constants
+					) {
+						$compiler->trigger_template_error("(secure mode) constants not permitted");
+						break;
+					}
+					if (strpos($_index[1], '$') === false && strpos($_index[1], '\'') === false) {
+						return "(defined('{$_index[1]}') ? constant('{$_index[1]}') : null)";
+					} else {
+						return "(defined({$_index[1]}) ? constant({$_index[1]}) : null)";
+					}
+				// no break
+				case 'config':
+					if (isset($_index[2])) {
+						return "(is_array(\$tmp = \$_smarty_tpl->getConfigVariable($_index[1])) ? \$tmp[$_index[2]] : null)";
+					} else {
+						return "\$_smarty_tpl->getConfigVariable($_index[1])";
+					}
+				// no break
+				case 'ldelim':
+					return "\$_smarty_tpl->getLeftDelimiter()";
+				case 'rdelim':
+					return "\$_smarty_tpl->getRightDelimiter()";
+				default:
+					$compiler->trigger_template_error('$smarty.' . trim($_index[0], "'") . ' is not defined');
+					break;
+			}
+			if (isset($_index[1])) {
+				array_shift($_index);
+				foreach ($_index as $_ind) {
+					$compiled_ref = $compiled_ref . "[$_ind]";
+				}
+			}
+			return $compiled_ref;
+		}
+
+		return '';
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Append.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Append.php
new file mode 100644
index 000000000..171f69600
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Append.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+/**
+ * Smarty Internal Plugin Compile Append
+ * Compiles the {append} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Append Class
+ *
+
+
+ */
+class Append extends Assign
+{
+
+	/**
+	 * @inheritdoc
+	 */
+	protected $optional_attributes = ['scope', 'index'];
+
+    /**
+     * Compiles code for the {append} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty\Compiler\Template $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \Smarty\CompilerException
+     */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
+	{
+
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        // map to compile assign attributes
+        if (isset($_attr[ 'index' ])) {
+            $_params[ 'smarty_internal_index' ] = '[' . $_attr[ 'index' ] . ']';
+            unset($_attr[ 'index' ]);
+        } else {
+            $_params[ 'smarty_internal_index' ] = '[]';
+        }
+        $_new_attr = array();
+        foreach ($_attr as $key => $value) {
+            $_new_attr[] = array($key => $value);
+        }
+        // call compile assign
+        return parent::compile($_new_attr, $compiler, $_params);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Assign.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Assign.php
new file mode 100644
index 000000000..8433a97e1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Assign.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+use Smarty\Smarty;
+
+/**
+ * Smarty Internal Plugin Compile Assign
+ * Compiles the {assign} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Assign Class
+ *
+
+
+ */
+class Assign extends Base
+{
+	/**
+	 * @inheritdoc
+	 */
+	protected $required_attributes = ['var', 'value'];
+
+	/**
+	 * @inheritdoc
+	 */
+	protected $optional_attributes = ['scope'];
+
+	/**
+	 * @inheritdoc
+	 */
+	protected $shorttag_order = ['var', 'value'];
+
+    /**
+     * Attribute definition: Overwrites base class.
+     *
+     * @var array
+     * @see BasePlugin
+     */
+    protected $option_flags = array('nocache', 'noscope');
+
+    /**
+     * Compiles code for the {assign} tag
+     *
+     * @param array                                 $args      array with attributes from parser
+     * @param \Smarty\Compiler\Template $compiler  compiler object
+     * @param array                                 $parameter array with compilation parameter
+     *
+     * @return string compiled code
+     * @throws \Smarty\CompilerException
+     */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
+	{
+
+        $_nocache = false;
+        // check and get attributes
+        $_attr = $this->getAttributes($compiler, $args);
+
+        if ($_var = $compiler->getId($_attr[ 'var' ])) {
+            $_var = "'{$_var}'";
+        } else {
+            $_var = $_attr[ 'var' ];
+        }
+        if ($compiler->tag_nocache || $compiler->isNocacheActive()) {
+            $_nocache = true;
+            // create nocache var to make it know for further compiling
+            $compiler->setNocacheInVariable($_attr[ 'var' ]);
+        }
+        // scope setup
+        if ($_attr[ 'noscope' ]) {
+            $_scope = -1;
+        } else {
+            $_scope = isset($_attr['scope']) ? $this->convertScope($_attr['scope']) : null;
+        }
+
+        if (isset($parameter[ 'smarty_internal_index' ])) {
+            $output =
+                "<?php \$_tmp_array = \$_smarty_tpl->getValue({$_var}) ?? [];\n";
+            $output .= "if (!(is_array(\$_tmp_array) || \$_tmp_array instanceof ArrayAccess)) {\n";
+            $output .= "settype(\$_tmp_array, 'array');\n";
+            $output .= "}\n";
+            $output .= "\$_tmp_array{$parameter['smarty_internal_index']} = {$_attr['value']};\n";
+            $output .= "\$_smarty_tpl->assign({$_var}, \$_tmp_array, " . var_export($_nocache, true) . ", " . var_export($_scope, true) . ");?>";
+        } else {
+            $output = "<?php \$_smarty_tpl->assign({$_var}, {$_attr['value']}, " . var_export($_nocache, true) . ", " . var_export($_scope, true) . ");?>";
+        }
+        return $output;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/BCPluginWrapper.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/BCPluginWrapper.php
new file mode 100644
index 000000000..abd89f78f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/BCPluginWrapper.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+class BCPluginWrapper extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see Smarty_Internal_CompileBase
+	 */
+	public $optional_attributes = array('_any');
+
+	private $callback;
+
+	public function __construct($callback, bool $cacheable = true) {
+		$this->callback = $callback;
+		$this->cacheable = $cacheable;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		return call_user_func($this->callback, $this->getAttributes($compiler, $args), $compiler->getSmarty());
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Block.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Block.php
new file mode 100644
index 000000000..d8b301006
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Block.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\ParseTree\Template;
+
+/**
+ * Smarty Internal Plugin Compile Block Class
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class Block extends Inheritance {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	public $required_attributes = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	public $shorttag_order = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $option_flags = ['hide', 'nocache'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	public $optional_attributes = ['assign'];
+
+	/**
+	 * Compiles code for the {block} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
+	{
+		if (!isset($compiler->_cache['blockNesting'])) {
+			$compiler->_cache['blockNesting'] = 0;
+		}
+		if ($compiler->_cache['blockNesting'] === 0) {
+			// make sure that inheritance gets initialized in template code
+			$this->registerInit($compiler);
+			$this->option_flags = ['hide', 'nocache', 'append', 'prepend'];
+		} else {
+			$this->option_flags = ['hide', 'nocache'];
+		}
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		++$compiler->_cache['blockNesting'];
+		$_className = 'Block_' . preg_replace('![^\w]+!', '_', uniqid(mt_rand(), true));
+
+		$this->openTag(
+			$compiler,
+			'block',
+			[
+				$_attr, $compiler->tag_nocache, $compiler->getParser()->current_buffer,
+				$compiler->getTemplate()->getCompiled()->getNocacheCode(), $_className
+			]
+		);
+
+		$compiler->getParser()->current_buffer = new Template();
+		$compiler->getTemplate()->getCompiled()->setNocacheCode(false);
+		$compiler->suppressNocacheProcessing = true;
+		return '';
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/BlockClose.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/BlockClose.php
new file mode 100644
index 000000000..586c7c050
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/BlockClose.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\ParseTree\Template;
+
+/**
+ * Smarty Internal Plugin Compile BlockClose Class
+ */
+class BlockClose extends Inheritance {
+
+	/**
+	 * Compiles code for the {/block} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return bool true
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
+	{
+		[$_attr, $_nocache, $_buffer, $_has_nocache_code, $_className] = $this->closeTag($compiler, ['block']);
+
+		$_block = [];
+		if (isset($compiler->_cache['blockParams'])) {
+			$_block = $compiler->_cache['blockParams'][$compiler->_cache['blockNesting']] ?? [];
+			unset($compiler->_cache['blockParams'][$compiler->_cache['blockNesting']]);
+		}
+
+		$_name = $_attr['name'];
+		$_assign = $_attr['assign'] ?? null;
+		unset($_attr[ 'assign' ], $_attr[ 'name' ]);
+
+		foreach ($_attr as $name => $stat) {
+			if ((is_bool($stat) && $stat !== false) || (!is_bool($stat) && $stat !== 'false')) {
+				$_block[ $name ] = 'true';
+			}
+		}
+
+		// get compiled block code
+		$_functionCode = $compiler->getParser()->current_buffer;
+		// setup buffer for template function code
+		$compiler->getParser()->current_buffer = new Template();
+		$output = "<?php\n";
+		$output .= $compiler->cStyleComment(" {block {$_name}} ") . "\n";
+		$output .= "class {$_className} extends \\Smarty\\Runtime\\Block\n";
+		$output .= "{\n";
+		foreach ($_block as $property => $value) {
+			$output .= "public \${$property} = " . var_export($value, true) . ";\n";
+		}
+		$output .= "public function callBlock(\\Smarty\\Template \$_smarty_tpl) {\n";
+
+		$output .= (new \Smarty\Compiler\CodeFrame($compiler->getTemplate()))->insertLocalVariables();
+
+		if ($compiler->getTemplate()->getCompiled()->getNocacheCode()) {
+			$output .= "\$_smarty_tpl->getCached()->hashes['{$compiler->getTemplate()->getCompiled()->nocache_hash}'] = true;\n";
+		}
+		if (isset($_assign)) {
+			$output .= "ob_start();\n";
+		}
+		$output .= "?>\n";
+		$compiler->getParser()->current_buffer->append_subtree(
+			$compiler->getParser(),
+			new \Smarty\ParseTree\Tag(
+				$compiler->getParser(),
+				$output
+			)
+		);
+		$compiler->getParser()->current_buffer->append_subtree($compiler->getParser(), $_functionCode);
+		$output = "<?php\n";
+		if (isset($_assign)) {
+			$output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
+		}
+		$output .= "}\n";
+		$output .= "}\n";
+		$output .= $compiler->cStyleComment(" {/block {$_name}} ") . "\n\n";
+		$output .= "?>\n";
+		$compiler->getParser()->current_buffer->append_subtree(
+			$compiler->getParser(),
+			new \Smarty\ParseTree\Tag(
+				$compiler->getParser(),
+				$output
+			)
+		);
+		$compiler->blockOrFunctionCode .= $compiler->getParser()->current_buffer->to_smarty_php($compiler->getParser());
+
+		$compiler->getParser()->current_buffer = new Template();
+
+		// restore old status
+		$compiler->getTemplate()->getCompiled()->setNocacheCode($_has_nocache_code);
+		$compiler->tag_nocache = $_nocache;
+
+		$compiler->getParser()->current_buffer = $_buffer;
+		$output = "<?php \n";
+		if ($compiler->_cache['blockNesting'] === 1) {
+			$output .= "\$_smarty_tpl->getInheritance()->instanceBlock(\$_smarty_tpl, '$_className', $_name);\n";
+		} else {
+			$output .= "\$_smarty_tpl->getInheritance()->instanceBlock(\$_smarty_tpl, '$_className', $_name, \$this->tplIndex);\n";
+		}
+		$output .= "?>\n";
+		--$compiler->_cache['blockNesting'];
+		if ($compiler->_cache['blockNesting'] === 0) {
+			unset($compiler->_cache['blockNesting']);
+		}
+		$compiler->suppressNocacheProcessing = true;
+		return $output;
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/BreakTag.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/BreakTag.php
new file mode 100644
index 000000000..b8b554f3b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/BreakTag.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Break
+ * Compiles the {break} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Break Class
+ *
+
+
+ */
+class BreakTag extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $optional_attributes = ['levels'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $shorttag_order = ['levels'];
+
+	/**
+	 * Tag name may be overloaded by ContinueTag
+	 *
+	 * @var string
+	 */
+	protected $tag = 'break';
+
+	/**
+	 * Compiles code for the {break} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
+	{
+		[$levels, $foreachLevels] = $this->checkLevels($args, $compiler);
+		$output = "<?php ";
+		if ($foreachLevels > 0 && $this->tag === 'continue') {
+			$foreachLevels--;
+		}
+		if ($foreachLevels > 0) {
+			/* @var ForeachTag $foreachCompiler */
+			$foreachCompiler = $compiler->getTagCompiler('foreach');
+			$output .= $foreachCompiler->compileRestore($foreachLevels);
+		}
+		$output .= "{$this->tag} {$levels};?>";
+		return $output;
+	}
+
+	/**
+	 * check attributes and return array of break and foreach levels
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return array
+	 * @throws \Smarty\CompilerException
+	 */
+	public function checkLevels($args, \Smarty\Compiler\Template $compiler) {
+		static $_is_loopy = ['for' => true, 'foreach' => true, 'while' => true, 'section' => true];
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		if ($_attr['nocache'] === true) {
+			$compiler->trigger_template_error('nocache option not allowed', null, true);
+		}
+		if (isset($_attr['levels'])) {
+			if (!is_numeric($_attr['levels'])) {
+				$compiler->trigger_template_error('level attribute must be a numeric constant', null, true);
+			}
+			$levels = $_attr['levels'];
+		} else {
+			$levels = 1;
+		}
+		$level_count = $levels;
+
+		$tagStack = $compiler->getTagStack();
+		$stack_count = count($tagStack) - 1;
+
+		$foreachLevels = 0;
+		$lastTag = '';
+		while ($level_count > 0 && $stack_count >= 0) {
+			if (isset($_is_loopy[$tagStack[$stack_count][0]])) {
+				$lastTag = $tagStack[$stack_count][0];
+				if ($level_count === 0) {
+					break;
+				}
+				$level_count--;
+				if ($tagStack[$stack_count][0] === 'foreach') {
+					$foreachLevels++;
+				}
+			}
+			$stack_count--;
+		}
+		if ($level_count !== 0) {
+			$compiler->trigger_template_error("cannot {$this->tag} {$levels} level(s)", null, true);
+		}
+		if ($lastTag === 'foreach' && $this->tag === 'break' && $foreachLevels > 0) {
+			$foreachLevels--;
+		}
+		return [$levels, $foreachLevels];
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Call.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Call.php
new file mode 100644
index 000000000..04f07a14a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Call.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Function_Call
+ * Compiles the calls of user defined tags defined by {function}
+ *
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Function_Call Class
+ */
+class Call extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	public $required_attributes = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	public $shorttag_order = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	public $optional_attributes = ['_any'];
+
+	/**
+	 * Compiles the calls of user defined tags defined by {function}
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param object $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		// save possible attributes
+		if (isset($_attr['assign'])) {
+			// output will be stored in a smarty variable instead of being displayed
+			$_assign = $_attr['assign'];
+		}
+		//$_name = trim($_attr['name'], "''");
+		$_name = $_attr['name'];
+		unset($_attr['name'], $_attr['assign'], $_attr['nocache']);
+		// set flag (compiled code of {function} must be included in cache file
+		if (!$compiler->getTemplate()->caching || $compiler->isNocacheActive() || $compiler->tag_nocache) {
+			$_nocache = 'true';
+		} else {
+			$_nocache = 'false';
+		}
+		$_paramsArray = $this->formatParamsArray($_attr);
+		$_params = 'array(' . implode(',', $_paramsArray) . ')';
+		//$compiler->suppressNocacheProcessing = true;
+		// was there an assign attribute
+		if (isset($_assign)) {
+			$_output =
+				"<?php ob_start();\n\$_smarty_tpl->getSmarty()->getRuntime('TplFunction')->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});\n\$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
+		} else {
+			$_output =
+				"<?php \$_smarty_tpl->getSmarty()->getRuntime('TplFunction')->callTemplateFunction(\$_smarty_tpl, {$_name}, {$_params}, {$_nocache});?>\n";
+		}
+		return $_output;
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Capture.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Capture.php
new file mode 100644
index 000000000..7b7362f9e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Capture.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Capture Class
+ *
+
+
+ */
+class Capture extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	public $shorttag_order = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	public $optional_attributes = ['name', 'assign', 'append'];
+
+	/**
+	 * Compiles code for the {$smarty.capture.xxx}
+	 *
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public static function compileSpecialVariable(
+		\Smarty\Compiler\Template $compiler,
+		                                     $parameter = null
+	) {
+		return '$_smarty_tpl->getSmarty()->getRuntime(\'Capture\')->getBuffer($_smarty_tpl' .
+			(isset($parameter[1]) ? ", {$parameter[ 1 ]})" : ')');
+	}
+
+	/**
+	 * Compiles code for the {capture} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param null $parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$buffer = $_attr['name'] ?? "'default'";
+		$assign = $_attr['assign'] ?? 'null';
+		$append = $_attr['append'] ?? 'null';
+
+		$compiler->_cache['capture_stack'][] = $compiler->tag_nocache;
+		if ($compiler->tag_nocache) {
+			// push a virtual {nocache} tag onto the stack.
+			$compiler->openTag('nocache');
+		}
+
+		return "<?php \$_smarty_tpl->getSmarty()->getRuntime('Capture')->open(\$_smarty_tpl, $buffer, $assign, $append);?>";
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/CaptureClose.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/CaptureClose.php
new file mode 100644
index 000000000..c0d779692
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/CaptureClose.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Capture
+ * Compiles the {capture} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Captureclose Class
+ *
+
+
+ */
+class CaptureClose extends Base {
+
+	/**
+	 * Compiles code for the {/capture} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param null $parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		if (array_pop($compiler->_cache['capture_stack'])) {
+			// pop the virtual {nocache} tag from the stack.
+			$compiler->closeTag('nocache');
+			$compiler->tag_nocache = true;
+		}
+
+		return "<?php \$_smarty_tpl->getSmarty()->getRuntime('Capture')->close(\$_smarty_tpl);?>";
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ConfigLoad.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ConfigLoad.php
new file mode 100644
index 000000000..8b4cf46d2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ConfigLoad.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Config Load
+ * Compiles the {config load} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+use Smarty\Smarty;
+
+/**
+ * Smarty Internal Plugin Compile Config Load Class
+ *
+
+
+ */
+class ConfigLoad extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $required_attributes = ['file'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $shorttag_order = ['file', 'section'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $optional_attributes = ['section'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $option_flags = [];
+
+	/**
+	 * Compiles code for the {config_load} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+
+		// save possible attributes
+		$conf_file = $_attr['file'];
+		$section = $_attr['section'] ?? 'null';
+
+		// create config object
+		return "<?php\n\$_smarty_tpl->configLoad({$conf_file}, {$section});\n?>\n";
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ContinueTag.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ContinueTag.php
new file mode 100644
index 000000000..82abe6cea
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ContinueTag.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Continue
+ * Compiles the {continue} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+/**
+ * Smarty Internal Plugin Compile Continue Class
+ *
+
+
+ */
+class ContinueTag extends BreakTag {
+
+	/**
+	 * Tag name
+	 *
+	 * @var string
+	 */
+	protected $tag = 'continue';
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Debug.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Debug.php
new file mode 100644
index 000000000..4542bd3cd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Debug.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Debug
+ * Compiles the {debug} tag.
+ * It opens a window the the Smarty Debugging Console.
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Debug Class
+ *
+
+
+ */
+class Debug extends Base {
+
+	/**
+	 * Compiles code for the {debug} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param object $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes, may trigger errors
+		$this->getAttributes($compiler, $args);
+
+		// compile always as nocache
+		$compiler->tag_nocache = true;
+		// display debug template
+		$_output =
+			"<?php \$_smarty_debug = new \\Smarty\\Debug;\n \$_smarty_debug->display_debug(\$_smarty_tpl);\n";
+		$_output .= "unset(\$_smarty_debug);\n?>";
+		return $_output;
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ElseIfTag.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ElseIfTag.php
new file mode 100644
index 000000000..8e59c3413
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ElseIfTag.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile ElseIf Class
+ *
+
+
+ */
+class ElseIfTag extends Base {
+
+	/**
+	 * Compiles code for the {elseif} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		[$nesting, $nocache_pushed] = $this->closeTag($compiler, ['if', 'elseif']);
+
+		if (!isset($parameter['if condition'])) {
+			$compiler->trigger_template_error('missing elseif condition', null, true);
+		}
+		$assignCode = '';
+		$var = '';
+		if (is_array($parameter['if condition'])) {
+			$condition_by_assign = true;
+			if (is_array($parameter['if condition']['var'])) {
+				$var = $parameter['if condition']['var']['var'];
+			} else {
+				$var = $parameter['if condition']['var'];
+			}
+			if ($compiler->isNocacheActive()) {
+				// create nocache var to make it know for further compiling
+				$compiler->setNocacheInVariable($var);
+			}
+			$prefixVar = $compiler->getNewPrefixVariable();
+			$assignCode = "<?php {$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]};?>\n";
+			$assignCompiler = new Assign();
+			$assignAttr = [];
+			$assignAttr[]['value'] = $prefixVar;
+			if (is_array($parameter['if condition']['var'])) {
+				$assignAttr[]['var'] = $parameter['if condition']['var']['var'];
+				$assignCode .= $assignCompiler->compile(
+					$assignAttr,
+					$compiler,
+					['smarty_internal_index' => $parameter['if condition']['var']['smarty_internal_index']]
+				);
+			} else {
+				$assignAttr[]['var'] = $parameter['if condition']['var'];
+				$assignCode .= $assignCompiler->compile($assignAttr, $compiler, []);
+			}
+		} else {
+			$condition_by_assign = false;
+		}
+		$prefixCode = $compiler->getPrefixCode();
+		if (empty($prefixCode)) {
+			if ($condition_by_assign) {
+				$this->openTag($compiler, 'elseif', [$nesting + 1, $compiler->tag_nocache]);
+				$_output = $compiler->appendCode("<?php } else {\n?>", $assignCode);
+				return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
+			} else {
+				$this->openTag($compiler, 'elseif', [$nesting, $nocache_pushed]);
+				return "<?php } elseif ({$parameter['if condition']}) {?>";
+			}
+		} else {
+			$_output = $compiler->appendCode("<?php } else {\n?>", $prefixCode);
+			$this->openTag($compiler, 'elseif', [$nesting + 1, $nocache_pushed]);
+			if ($condition_by_assign) {
+				$_output = $compiler->appendCode($_output, $assignCode);
+				return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
+			} else {
+				return $compiler->appendCode($_output, "<?php if ({$parameter['if condition']}) {?>");
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ElseTag.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ElseTag.php
new file mode 100644
index 000000000..a7025da72
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ElseTag.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Else Class
+ *
+
+
+ */
+class ElseTag extends Base {
+
+	/**
+	 * Compiles code for the {else} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		[$nesting, $compiler->tag_nocache] = $this->closeTag($compiler, ['if', 'elseif']);
+		$this->openTag($compiler, 'else', [$nesting, $compiler->tag_nocache]);
+		return '<?php } else { ?>';
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/EvalTag.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/EvalTag.php
new file mode 100644
index 000000000..8396fd097
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/EvalTag.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Eval
+ * Compiles the {eval} tag.
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Eval Class
+ *
+
+
+ */
+class EvalTag extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	public $required_attributes = ['var'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	public $optional_attributes = ['assign'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	public $shorttag_order = ['var', 'assign'];
+
+	/**
+	 * Compiles code for the {eval} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param object $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		if (isset($_attr['assign'])) {
+			// output will be stored in a smarty variable instead of being displayed
+			$_assign = $_attr['assign'];
+		}
+		// create template object
+		$_output =
+			"\$_template = new \\Smarty\\Template('eval:'.{$_attr[ 'var' ]}, \$_smarty_tpl->getSmarty(), \$_smarty_tpl);";
+		//was there an assign attribute?
+		if (isset($_assign)) {
+			$_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());";
+		} else {
+			$_output .= 'echo $_template->fetch();';
+		}
+		return "<?php $_output ?>";
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ExtendsTag.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ExtendsTag.php
new file mode 100644
index 000000000..0ec2cf2ba
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ExtendsTag.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile extend
+ * Compiles the {extends} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+/**
+ * Smarty Internal Plugin Compile extend Class
+ *
+
+
+ */
+class ExtendsTag extends Inheritance {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $required_attributes = ['file'];
+
+	/**
+	 * Array of names of optional attribute required by tag
+	 * use array('_any') if there is no restriction of attributes names
+	 *
+	 * @var array
+	 */
+	protected $optional_attributes = [];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $shorttag_order = ['file'];
+
+	/**
+	 * Compiles code for the {extends} tag extends: resource
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		if ($_attr['nocache'] === true) {
+			$compiler->trigger_template_error('nocache option not allowed', $compiler->getParser()->lex->line - 1);
+		}
+		if (strpos($_attr['file'], '$_tmp') !== false) {
+			$compiler->trigger_template_error('illegal value for file attribute', $compiler->getParser()->lex->line - 1);
+		}
+		// add code to initialize inheritance
+		$this->registerInit($compiler, true);
+		$this->compileEndChild($compiler, $_attr['file']);
+		return '';
+	}
+
+	/**
+	 * Add code for inheritance endChild() method to end of template
+	 *
+	 * @param \Smarty\Compiler\Template $compiler
+	 * @param null|string $template optional inheritance parent template
+	 *
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	private function compileEndChild(\Smarty\Compiler\Template $compiler, $template = null) {
+		$compiler->getParser()->template_postfix[] = new \Smarty\ParseTree\Tag(
+			$compiler->getParser(),
+			'<?php $_smarty_tpl->getInheritance()->endChild($_smarty_tpl' .
+			(isset($template) ?	", {$template}, \$_smarty_current_dir" : '') . ");\n?>"
+		);
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForClose.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForClose.php
new file mode 100644
index 000000000..189bcfd93
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForClose.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile For
+ * Compiles the {for} {forelse} {/for} tags
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Forclose Class
+ *
+
+
+ */
+class ForClose extends Base {
+
+	/**
+	 * Compiles code for the {/for} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param object $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting--;
+
+		[$openTag, $nocache_pushed] = $this->closeTag($compiler, ['for', 'forelse']);
+		$output = "<?php }\n";
+		if ($openTag !== 'forelse') {
+			$output .= "}\n";
+		}
+		$output .= "?>";
+
+		if ($nocache_pushed) {
+			// pop the pushed virtual nocache tag
+			$this->closeTag($compiler, 'nocache');
+			$compiler->tag_nocache = true;
+		}
+
+		return $output;
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForElse.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForElse.php
new file mode 100644
index 000000000..d939a72ab
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForElse.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Forelse Class
+ *
+
+
+ */
+class ForElse extends Base {
+
+	/**
+	 * Compiles code for the {forelse} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param object $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		[$tagName, $nocache_pushed] = $this->closeTag($compiler, ['for']);
+		$this->openTag($compiler, 'forelse', ['forelse', $nocache_pushed]);
+		return "<?php }} else { ?>";
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForTag.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForTag.php
new file mode 100644
index 000000000..fdf71b681
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForTag.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile For Class
+ *
+
+
+ */
+class ForTag extends Base {
+
+	/**
+	 * Compiles code for the {for} tag
+	 * Smarty supports two different syntax's:
+	 * - {for $var in $array}
+	 * For looping over arrays or iterators
+	 * - {for $x=0; $x<$y; $x++}
+	 * For general loops
+	 * The parser is generating different sets of attribute by which this compiler can
+	 * determine which syntax is used.
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param object $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting++;
+		if ($parameter === 0) {
+			$this->required_attributes = ['start', 'to'];
+			$this->optional_attributes = ['max', 'step'];
+		} else {
+			$this->required_attributes = ['start', 'ifexp', 'var', 'step'];
+			$this->optional_attributes = [];
+		}
+
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$output = "<?php\n";
+		if ($parameter === 1) {
+			foreach ($_attr['start'] as $_statement) {
+				if (is_array($_statement['var'])) {
+					$var = $_statement['var']['var'];
+					$index = $_statement['var']['smarty_internal_index'];
+				} else {
+					$var = $_statement['var'];
+					$index = '';
+				}
+				$output .= "\$_smarty_tpl->assign($var, null);\n";
+				$output .= "\$_smarty_tpl->tpl_vars[$var]->value{$index} = {$_statement['value']};\n";
+			}
+			if (is_array($_attr['var'])) {
+				$var = $_attr['var']['var'];
+				$index = $_attr['var']['smarty_internal_index'];
+			} else {
+				$var = $_attr['var'];
+				$index = '';
+			}
+			$output .= "if ($_attr[ifexp]) {\nfor (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$var]->value{$index}$_attr[step]) {\n";
+		} else {
+			$_statement = $_attr['start'];
+			if (is_array($_statement['var'])) {
+				$var = $_statement['var']['var'];
+				$index = $_statement['var']['smarty_internal_index'];
+			} else {
+				$var = $_statement['var'];
+				$index = '';
+			}
+			$output .= "\$_smarty_tpl->assign($var, null);";
+			if (isset($_attr['step'])) {
+				$output .= "\$_smarty_tpl->tpl_vars[$var]->step = $_attr[step];";
+			} else {
+				$output .= "\$_smarty_tpl->tpl_vars[$var]->step = 1;";
+			}
+			if (isset($_attr['max'])) {
+				$output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) min(ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step)),$_attr[max]);\n";
+			} else {
+				$output .= "\$_smarty_tpl->tpl_vars[$var]->total = (int) ceil((\$_smarty_tpl->tpl_vars[$var]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$var]->step));\n";
+			}
+			$output .= "if (\$_smarty_tpl->tpl_vars[$var]->total > 0) {\n";
+			$output .= "for (\$_smarty_tpl->tpl_vars[$var]->value{$index} = $_statement[value], \$_smarty_tpl->tpl_vars[$var]->iteration = 1;\$_smarty_tpl->tpl_vars[$var]->iteration <= \$_smarty_tpl->tpl_vars[$var]->total;\$_smarty_tpl->tpl_vars[$var]->value{$index} += \$_smarty_tpl->tpl_vars[$var]->step, \$_smarty_tpl->tpl_vars[$var]->iteration++) {\n";
+			$output .= "\$_smarty_tpl->tpl_vars[$var]->first = \$_smarty_tpl->tpl_vars[$var]->iteration === 1;";
+			$output .= "\$_smarty_tpl->tpl_vars[$var]->last = \$_smarty_tpl->tpl_vars[$var]->iteration === \$_smarty_tpl->tpl_vars[$var]->total;";
+		}
+		$output .= '?>';
+
+		if ($compiler->tag_nocache) {
+			// push a {nocache} tag onto the stack to prevent caching of this for loop
+			$this->openTag($compiler, 'nocache');
+		}
+
+		$this->openTag($compiler, 'for', ['for', $compiler->tag_nocache]);
+
+		return $output;
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForeachClose.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForeachClose.php
new file mode 100644
index 000000000..e657c1d84
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForeachClose.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Foreach
+ * Compiles the {foreach} {foreachelse} {/foreach} tags
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Foreachclose Class
+ *
+
+
+ */
+class ForeachClose extends Base {
+
+	/**
+	 * Compiles code for the {/foreach} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting--;
+
+		[$openTag, $nocache_pushed, $localVariablePrefix, $item, $restore] = $this->closeTag($compiler, ['foreach', 'foreachelse']);
+
+		if ($nocache_pushed) {
+			// pop the pushed virtual nocache tag
+			$this->closeTag($compiler, 'nocache');
+			$compiler->tag_nocache = true;
+		}
+
+		$output = "<?php\n";
+		if ($restore) {
+			$output .= "\$_smarty_tpl->setVariable('{$item}', {$localVariablePrefix}Backup);\n";
+		}
+		$output .= "}\n";
+		/* @var \Smarty\Compile\Tag\ForeachTag $foreachCompiler */
+		$foreachCompiler = $compiler->getTagCompiler('foreach');
+		$output .= $foreachCompiler->compileRestore(1);
+		$output .= "?>";
+		return $output;
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForeachElse.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForeachElse.php
new file mode 100644
index 000000000..d48898473
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForeachElse.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Foreachelse Class
+ *
+
+
+ */
+class ForeachElse extends Base {
+
+	/**
+	 * Compiles code for the {foreachelse} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		[$openTag, $nocache_pushed, $localVariablePrefix, $item, $restore] = $this->closeTag($compiler, ['foreach']);
+		$this->openTag($compiler, 'foreachelse', ['foreachelse', $nocache_pushed, $localVariablePrefix, $item, false]);
+		$output = "<?php\n";
+		if ($restore) {
+			$output .= "\$_smarty_tpl->setVariable('{$item}', {$localVariablePrefix}Backup);\n";
+		}
+		$output .= "}\nif ({$localVariablePrefix}DoElse) {\n?>";
+		return $output;
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForeachSection.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForeachSection.php
new file mode 100644
index 000000000..dd2574011
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForeachSection.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile ForeachSection
+ * Shared methods for {foreach} {section} tags
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile ForeachSection Class
+ *
+
+
+ */
+abstract class ForeachSection extends Base {
+
+	/**
+	 * Name of this tag
+	 *
+	 * @var string
+	 */
+	protected $tagName = '';
+
+	/**
+	 * Valid properties of $smarty.xxx variable
+	 *
+	 * @var array
+	 */
+	protected $nameProperties = [];
+
+	/**
+	 * {section} tag has no item properties
+	 *
+	 * @var array
+	 */
+	protected $itemProperties = null;
+
+	/**
+	 * {section} tag has always name attribute
+	 *
+	 * @var bool
+	 */
+	protected $isNamed = true;
+
+	/**
+	 * @var array
+	 */
+	protected $matchResults = [];
+
+	/**
+	 * Preg search pattern
+	 *
+	 * @var string
+	 */
+	private $propertyPreg = '';
+
+	/**
+	 * Offsets in preg match result
+	 *
+	 * @var array
+	 */
+	private $resultOffsets = [];
+
+	/**
+	 * Start offset
+	 *
+	 * @var int
+	 */
+	private $startOffset = 0;
+
+	/**
+	 * Scan sources for used tag attributes
+	 *
+	 * @param array $attributes
+	 * @param \Smarty\Compiler\Template $compiler
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	protected function scanForProperties($attributes, \Smarty\Compiler\Template $compiler) {
+		$this->propertyPreg = '~(';
+		$this->startOffset = 1;
+		$this->resultOffsets = [];
+		$this->matchResults = ['named' => [], 'item' => []];
+		if (isset($attributes['name'])) {
+			$this->buildPropertyPreg(true, $attributes);
+		}
+		if (isset($this->itemProperties)) {
+			if ($this->isNamed) {
+				$this->propertyPreg .= '|';
+			}
+			$this->buildPropertyPreg(false, $attributes);
+		}
+		$this->propertyPreg .= ')\W~i';
+		// Template source
+		$this->matchTemplateSource($compiler);
+		// Parent template source
+		$this->matchParentTemplateSource($compiler);
+	}
+
+	/**
+	 * Build property preg string
+	 *
+	 * @param bool $named
+	 * @param array $attributes
+	 */
+	private function buildPropertyPreg($named, $attributes) {
+		if ($named) {
+			$this->resultOffsets['named'] = $this->startOffset = $this->startOffset + 3;
+			$this->propertyPreg .= "(([\$]smarty[.]{$this->tagName}[.]" .
+				($this->tagName === 'section' ? "|[\[]\s*" : '') .
+				"){$attributes['name']}[.](";
+			$properties = $this->nameProperties;
+		} else {
+			$this->resultOffsets['item'] = $this->startOffset = $this->startOffset + 2;
+			$this->propertyPreg .= "([\$]{$attributes['item']}[@](";
+			$properties = $this->itemProperties;
+		}
+		$propName = reset($properties);
+		while ($propName) {
+			$this->propertyPreg .= "{$propName}";
+			$propName = next($properties);
+			if ($propName) {
+				$this->propertyPreg .= '|';
+			}
+		}
+		$this->propertyPreg .= '))';
+	}
+
+	/**
+	 * Find matches in source string
+	 *
+	 * @param string $source
+	 */
+	private function matchProperty($source) {
+		preg_match_all($this->propertyPreg, $source, $match);
+		foreach ($this->resultOffsets as $key => $offset) {
+			foreach ($match[$offset] as $m) {
+				if (!empty($m)) {
+					$this->matchResults[$key][smarty_strtolower_ascii($m)] = true;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Find matches in template source
+	 *
+	 * @param \Smarty\Compiler\Template $compiler
+	 */
+	private function matchTemplateSource(\Smarty\Compiler\Template $compiler) {
+		$this->matchProperty($compiler->getParser()->lex->data);
+	}
+
+	/**
+	 * Find matches in all parent template source
+	 *
+	 * @param \Smarty\Compiler\Template $compiler
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	private function matchParentTemplateSource(\Smarty\Compiler\Template $compiler) {
+		// search parent compiler template source
+		$nextCompiler = $compiler;
+		while ($nextCompiler !== $nextCompiler->getParentCompiler()) {
+			$nextCompiler = $nextCompiler->getParentCompiler();
+			if ($compiler !== $nextCompiler) {
+				// get template source
+				$_content = $nextCompiler->getTemplate()->getSource()->getContent();
+				if ($_content !== '') {
+					// run pre filter if required
+					$_content = $nextCompiler->getSmarty()->runPreFilters($_content,	$nextCompiler->getTemplate());
+					$this->matchProperty($_content);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Compiles code for the {$smarty.foreach.xxx} or {$smarty.section.xxx}tag
+	 *
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compileSpecialVariable(\Smarty\Compiler\Template $compiler, $parameter) {
+		$tag = smarty_strtolower_ascii(trim($parameter[0], '"\''));
+		$name = isset($parameter[1]) ? $compiler->getId($parameter[1]) : false;
+		if (!$name) {
+			$compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
+		}
+		$property = isset($parameter[2]) ? smarty_strtolower_ascii($compiler->getId($parameter[2])) : false;
+		if (!$property || !in_array($property, $this->nameProperties)) {
+			$compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true);
+		}
+		$tagVar = "'__smarty_{$tag}_{$name}'";
+		return "(\$_smarty_tpl->getValue({$tagVar})['{$property}'] ?? null)";
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForeachTag.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForeachTag.php
new file mode 100644
index 000000000..9f765af58
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/ForeachTag.php
@@ -0,0 +1,286 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+/**
+ * Smarty Internal Plugin Compile Foreach Class
+ *
+
+
+ */
+class ForeachTag extends ForeachSection {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $required_attributes = ['from', 'item'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $optional_attributes = ['name', 'key', 'properties'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $shorttag_order = ['from', 'item', 'key', 'name'];
+
+	/**
+	 * counter
+	 *
+	 * @var int
+	 */
+	private static $counter = 0;
+
+	/**
+	 * Name of this tag
+	 *
+	 * @var string
+	 */
+	protected $tagName = 'foreach';
+
+	/**
+	 * Valid properties of $smarty.foreach.name.xxx variable
+	 *
+	 * @var array
+	 */
+	protected $nameProperties = ['first', 'last', 'index', 'iteration', 'show', 'total'];
+
+	/**
+	 * Valid properties of $item@xxx variable
+	 *
+	 * @var array
+	 */
+	protected $itemProperties = ['first', 'last', 'index', 'iteration', 'show', 'total', 'key'];
+
+	/**
+	 * Flag if tag had name attribute
+	 *
+	 * @var bool
+	 */
+	protected $isNamed = false;
+
+	/**
+	 * Compiles code for the {foreach} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting++;
+		// init
+		$this->isNamed = false;
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$from = $_attr['from'];
+		$item = $compiler->getId($_attr['item']);
+		if ($item === false) {
+			$item = $this->getVariableName($_attr['item']);
+		}
+		$key = $name = null;
+		$attributes = ['item' => $item];
+		if (isset($_attr['key'])) {
+			$key = $compiler->getId($_attr['key']);
+			if ($key === false) {
+				$key = $this->getVariableName($_attr['key']);
+			}
+			$attributes['key'] = $key;
+		}
+		if (isset($_attr['name'])) {
+			$this->isNamed = true;
+			$name = $attributes['name'] = $compiler->getId($_attr['name']);
+		}
+		foreach ($attributes as $a => $v) {
+			if ($v === false) {
+				$compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
+			}
+		}
+		$fromName = $this->getVariableName($_attr['from']);
+		if ($fromName) {
+			foreach (['item', 'key'] as $a) {
+				if (isset($attributes[$a]) && $attributes[$a] === $fromName) {
+					$compiler->trigger_template_error(
+						"'{$a}' and 'from' may not have same variable name '{$fromName}'",
+						null,
+						true
+					);
+				}
+			}
+		}
+
+		$itemVar = "\$_smarty_tpl->getVariable('{$item}')";
+		$localVariablePrefix = '$foreach' . self::$counter++;
+
+		// search for used tag attributes
+		$itemAttr = [];
+		$namedAttr = [];
+		$this->scanForProperties($attributes, $compiler);
+		if (!empty($this->matchResults['item'])) {
+			$itemAttr = $this->matchResults['item'];
+		}
+		if (!empty($this->matchResults['named'])) {
+			$namedAttr = $this->matchResults['named'];
+		}
+		if (isset($_attr['properties']) && preg_match_all('/[\'](.*?)[\']/', $_attr['properties'], $match)) {
+			foreach ($match[1] as $prop) {
+				if (in_array($prop, $this->itemProperties)) {
+					$itemAttr[$prop] = true;
+				} else {
+					$compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
+				}
+			}
+			if ($this->isNamed) {
+				foreach ($match[1] as $prop) {
+					if (in_array($prop, $this->nameProperties)) {
+						$nameAttr[$prop] = true;
+					} else {
+						$compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
+					}
+				}
+			}
+		}
+		if (isset($itemAttr['first'])) {
+			$itemAttr['index'] = true;
+		}
+		if (isset($namedAttr['first'])) {
+			$namedAttr['index'] = true;
+		}
+		if (isset($namedAttr['last'])) {
+			$namedAttr['iteration'] = true;
+			$namedAttr['total'] = true;
+		}
+		if (isset($itemAttr['last'])) {
+			$itemAttr['iteration'] = true;
+			$itemAttr['total'] = true;
+		}
+		if (isset($namedAttr['show'])) {
+			$namedAttr['total'] = true;
+		}
+		if (isset($itemAttr['show'])) {
+			$itemAttr['total'] = true;
+		}
+		$keyTerm = '';
+		if (isset($attributes['key'])) {
+			$keyTerm = "\$_smarty_tpl->getVariable('{$key}')->value => ";
+		}
+		if (isset($itemAttr['key'])) {
+			$keyTerm = "{$itemVar}->key => ";
+		}
+		if ($this->isNamed) {
+			$foreachVar = "\$_smarty_tpl->tpl_vars['__smarty_foreach_{$attributes['name']}']";
+		}
+		$needTotal = isset($itemAttr['total']);
+
+		if ($compiler->tag_nocache) {
+			// push a {nocache} tag onto the stack to prevent caching of this block
+			$this->openTag($compiler, 'nocache');
+		}
+
+		// Register tag
+		$this->openTag(
+			$compiler,
+			'foreach',
+			['foreach', $compiler->tag_nocache, $localVariablePrefix, $item, !empty($itemAttr)]
+		);
+
+		// generate output code
+		$output = "<?php\n";
+		$output .= "\$_from = \$_smarty_tpl->getSmarty()->getRuntime('Foreach')->init(\$_smarty_tpl, $from, " .
+			var_export($item, true);
+		if ($name || $needTotal || $key) {
+			$output .= ', ' . var_export($needTotal, true);
+		}
+		if ($name || $key) {
+			$output .= ', ' . var_export($key, true);
+		}
+		if ($name) {
+			$output .= ', ' . var_export($name, true) . ', ' . var_export($namedAttr, true);
+		}
+		$output .= ");\n";
+		if (isset($itemAttr['show'])) {
+			$output .= "{$itemVar}->show = ({$itemVar}->total > 0);\n";
+		}
+		if (isset($itemAttr['iteration'])) {
+			$output .= "{$itemVar}->iteration = 0;\n";
+		}
+		if (isset($itemAttr['index'])) {
+			$output .= "{$itemVar}->index = -1;\n";
+		}
+		$output .= "{$localVariablePrefix}DoElse = true;\n";
+		$output .= "foreach (\$_from ?? [] as {$keyTerm}{$itemVar}->value) {\n";
+		$output .= "{$localVariablePrefix}DoElse = false;\n";
+		if (isset($attributes['key']) && isset($itemAttr['key'])) {
+			$output .= "\$_smarty_tpl->assign('{$key}', {$itemVar}->key);\n";
+		}
+		if (isset($itemAttr['iteration'])) {
+			$output .= "{$itemVar}->iteration++;\n";
+		}
+		if (isset($itemAttr['index'])) {
+			$output .= "{$itemVar}->index++;\n";
+		}
+		if (isset($itemAttr['first'])) {
+			$output .= "{$itemVar}->first = !{$itemVar}->index;\n";
+		}
+		if (isset($itemAttr['last'])) {
+			$output .= "{$itemVar}->last = {$itemVar}->iteration === {$itemVar}->total;\n";
+		}
+		if (isset($foreachVar)) {
+			if (isset($namedAttr['iteration'])) {
+				$output .= "{$foreachVar}->value['iteration']++;\n";
+			}
+			if (isset($namedAttr['index'])) {
+				$output .= "{$foreachVar}->value['index']++;\n";
+			}
+			if (isset($namedAttr['first'])) {
+				$output .= "{$foreachVar}->value['first'] = !{$foreachVar}->value['index'];\n";
+			}
+			if (isset($namedAttr['last'])) {
+				$output .= "{$foreachVar}->value['last'] = {$foreachVar}->value['iteration'] === {$foreachVar}->value['total'];\n";
+			}
+		}
+		if (!empty($itemAttr)) {
+			$output .= "{$localVariablePrefix}Backup = clone \$_smarty_tpl->getVariable('{$item}');\n";
+		}
+		$output .= '?>';
+		return $output;
+	}
+
+	/**
+	 * Get variable name from string
+	 *
+	 * @param string $input
+	 *
+	 * @return bool|string
+	 */
+	private function getVariableName($input) {
+		if (preg_match('~^[$]_smarty_tpl->getValue\([\'"]*([0-9]*[a-zA-Z_]\w*)[\'"]*\]\)$~', $input, $match)) {
+			return $match[1];
+		}
+		return false;
+	}
+
+	/**
+	 * Compiles code for to restore saved template variables
+	 *
+	 * @param int $levels number of levels to restore
+	 *
+	 * @return string compiled code
+	 */
+	public function compileRestore($levels) {
+		return "\$_smarty_tpl->getSmarty()->getRuntime('Foreach')->restore(\$_smarty_tpl, {$levels});";
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/FunctionClose.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/FunctionClose.php
new file mode 100644
index 000000000..aff6dc658
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/FunctionClose.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Function
+ * Compiles the {function} {/function} tags
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Functionclose Class
+ *
+
+
+ */
+class FunctionClose extends Base {
+
+	/**
+	 * Compiler object
+	 *
+	 * @var object
+	 */
+	private $compiler = null;
+
+	/**
+	 * Compiles code for the {/function} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param object|\Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$this->compiler = $compiler;
+		$saved_data = $this->closeTag($compiler, ['function']);
+		$_attr = $saved_data[0];
+		$_name = trim($_attr['name'], '\'"');
+		$parentCompiler = $compiler->getParentCompiler();
+		$parentCompiler->tpl_function[$_name]['compiled_filepath'] =
+			$parentCompiler->getTemplate()->getCompiled()->filepath;
+		$parentCompiler->tpl_function[$_name]['uid'] = $compiler->getTemplate()->getSource()->uid;
+		$_parameter = $_attr;
+		unset($_parameter['name']);
+		// default parameter
+		$_paramsArray = $this->formatParamsArray($_attr);
+
+		$_paramsCode = (new \Smarty\Compiler\CodeFrame($compiler->getTemplate()))->insertLocalVariables();
+
+		if (!empty($_paramsArray)) {
+			$_params = 'array(' . implode(',', $_paramsArray) . ')';
+			$_paramsCode .= "\$params = array_merge($_params, \$params);\n";
+		}
+		$_functionCode = $compiler->getParser()->current_buffer;
+		// setup buffer for template function code
+		$compiler->getParser()->current_buffer = new \Smarty\ParseTree\Template();
+
+		$_funcName = "smarty_template_function_{$_name}_{$compiler->getTemplate()->getCompiled()->nocache_hash}";
+		$_funcNameCaching = $_funcName . '_nocache';
+
+		if ($compiler->getTemplate()->getCompiled()->getNocacheCode()) {
+			$parentCompiler->tpl_function[$_name]['call_name_caching'] = $_funcNameCaching;
+			$output = "<?php\n";
+			$output .= $compiler->cStyleComment(" {$_funcNameCaching} ") . "\n";
+			$output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
+			$output .= "function {$_funcNameCaching} (\\Smarty\\Template \$_smarty_tpl,\$params) {\n";
+
+			$output .= "ob_start();\n";
+			$output .= "\$_smarty_tpl->getCompiled()->setNocacheCode(true);\n";
+			$output .= $_paramsCode;
+			$output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->assign(\$key, \$value);\n}\n";
+			$output .= "\$params = var_export(\$params, true);\n";
+			$output .= "echo \"/*%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%*/<?php ";
+			$output .= "\\\$_smarty_tpl->pushStack();\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->assign(\\\$key, \\\$value);\n}\n?>";
+			$output .= "/*/%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%*/\";?>";
+			$compiler->getParser()->current_buffer->append_subtree(
+				$compiler->getParser(),
+				new \Smarty\ParseTree\Tag(
+					$compiler->getParser(),
+					$output
+				)
+			);
+			$compiler->getParser()->current_buffer->append_subtree($compiler->getParser(), $_functionCode);
+			$output = "<?php echo \"/*%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%*/<?php ";
+			$output .= "\\\$_smarty_tpl->popStack();?>\n";
+			$output .= "/*/%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%*/\";\n?>";
+			$output .= "<?php echo str_replace('{$compiler->getTemplate()->getCompiled()->nocache_hash}', \$_smarty_tpl->getCompiled()->nocache_hash ?? '', ob_get_clean());\n";
+			$output .= "}\n}\n";
+			$output .= $compiler->cStyleComment("/ {$_funcName}_nocache ") . "\n\n";
+			$output .= "?>\n";
+			$compiler->getParser()->current_buffer->append_subtree(
+				$compiler->getParser(),
+				new \Smarty\ParseTree\Tag(
+					$compiler->getParser(),
+					$output
+				)
+			);
+			$_functionCode = new \Smarty\ParseTree\Tag(
+				$compiler->getParser(),
+				preg_replace_callback(
+					"/((<\?php )?echo '\/\*%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%\*\/([\S\s]*?)\/\*\/%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%\*\/';(\?>\n)?)/",
+					[$this, 'removeNocache'],
+					$_functionCode->to_smarty_php($compiler->getParser())
+				)
+			);
+		}
+		$parentCompiler->tpl_function[$_name]['call_name'] = $_funcName;
+		$output = "<?php\n";
+		$output .= $compiler->cStyleComment(" {$_funcName} ") . "\n";
+		$output .= "if (!function_exists('{$_funcName}')) {\n";
+		$output .= "function {$_funcName}(\\Smarty\\Template \$_smarty_tpl,\$params) {\n";
+		$output .= $_paramsCode;
+		$output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->assign(\$key, \$value);\n}\n";
+		$output .= "?>\n";
+		$compiler->getParser()->current_buffer->append_subtree(
+			$compiler->getParser(),
+			new \Smarty\ParseTree\Tag(
+				$compiler->getParser(),
+				$output
+			)
+		);
+		$compiler->getParser()->current_buffer->append_subtree($compiler->getParser(), $_functionCode);
+		$output = "<?php\n}}\n";
+		$output .= $compiler->cStyleComment("/ {$_funcName} ") . "\n\n";
+		$output .= "?>\n";
+		$compiler->getParser()->current_buffer->append_subtree(
+			$compiler->getParser(),
+			new \Smarty\ParseTree\Tag(
+				$compiler->getParser(),
+				$output
+			)
+		);
+		$parentCompiler->blockOrFunctionCode .= $compiler->getParser()->current_buffer->to_smarty_php($compiler->getParser());
+		// restore old buffer
+		$compiler->getParser()->current_buffer = $saved_data[1];
+		// restore old status
+		$compiler->getTemplate()->getCompiled()->setNocacheCode($saved_data[2]);
+		$compiler->getTemplate()->caching = $saved_data[3];
+		return '';
+	}
+
+	/**
+	 * Remove nocache code
+	 *
+	 * @param $match
+	 *
+	 * @return string
+	 */
+	public function removeNocache($match) {
+		$hash = $this->compiler->getTemplate()->getCompiled()->nocache_hash;
+		$code =
+			preg_replace(
+				"/((<\?php )?echo '\/\*%%SmartyNocache:{$hash}%%\*\/)|(\/\*\/%%SmartyNocache:{$hash}%%\*\/';(\?>\n)?)/",
+				'',
+				$match[0]
+			);
+		return str_replace(['\\\'', '\\\\\''], ['\'', '\\\''], $code);
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/FunctionTag.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/FunctionTag.php
new file mode 100644
index 000000000..c291c3dee
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/FunctionTag.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Function Class
+ *
+
+
+ */
+class FunctionTag extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $required_attributes = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $shorttag_order = ['name'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $optional_attributes = ['_any'];
+
+	/**
+	 * Compiles code for the {function} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		if ($_attr['nocache'] === true) {
+			$compiler->trigger_template_error('nocache option not allowed', null, true);
+		}
+		unset($_attr['nocache']);
+		$_name = trim($_attr['name'], '\'"');
+
+		if (!preg_match('/^[a-zA-Z0-9_\x80-\xff]+$/', $_name)) {
+			$compiler->trigger_template_error("Function name contains invalid characters: {$_name}", null, true);
+		}
+
+		$compiler->getParentCompiler()->tpl_function[$_name] = [];
+		$save = [
+			$_attr, $compiler->getParser()->current_buffer, $compiler->getTemplate()->getCompiled()->getNocacheCode(),
+			$compiler->getTemplate()->caching,
+		];
+		$this->openTag($compiler, 'function', $save);
+		// Init temporary context
+		$compiler->getParser()->current_buffer = new \Smarty\ParseTree\Template();
+		$compiler->getTemplate()->getCompiled()->setNocacheCode(false);
+		return '';
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/IfClose.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/IfClose.php
new file mode 100644
index 000000000..df15094f1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/IfClose.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile If
+ * Compiles the {if} {else} {elseif} {/if} tags
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Ifclose Class
+ *
+
+
+ */
+class IfClose extends Base {
+
+	/**
+	 * Compiles code for the {/if} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		[$nesting, $nocache_pushed] = $this->closeTag($compiler, ['if', 'else', 'elseif']);
+
+		if ($nocache_pushed) {
+			// pop the pushed virtual nocache tag
+			$this->closeTag($compiler, 'nocache');
+			$compiler->tag_nocache = true;
+		}
+
+		$tmp = '';
+		for ($i = 0; $i < $nesting; $i++) {
+			$tmp .= '}';
+		}
+		return "<?php {$tmp}?>";
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/IfTag.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/IfTag.php
new file mode 100644
index 000000000..7790859b1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/IfTag.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile If Class
+ *
+
+
+ */
+class IfTag extends Base {
+
+	/**
+	 * Compiles code for the {if} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+
+		if ($compiler->tag_nocache) {
+			// push a {nocache} tag onto the stack to prevent caching of this block
+			$this->openTag($compiler, 'nocache');
+		}
+
+		$this->openTag($compiler, 'if', [1, $compiler->tag_nocache]);
+
+		if (!isset($parameter['if condition'])) {
+			$compiler->trigger_template_error('missing if condition', null, true);
+		}
+		if (is_array($parameter['if condition'])) {
+			if (is_array($parameter['if condition']['var'])) {
+				$var = $parameter['if condition']['var']['var'];
+			} else {
+				$var = $parameter['if condition']['var'];
+			}
+			if ($compiler->isNocacheActive()) {
+				// create nocache var to make it know for further compiling
+				$compiler->setNocacheInVariable($var);
+			}
+			$prefixVar = $compiler->getNewPrefixVariable();
+			$_output = "<?php {$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]};?>\n";
+			$assignAttr = [];
+			$assignAttr[]['value'] = $prefixVar;
+			$assignCompiler = new Assign();
+			if (is_array($parameter['if condition']['var'])) {
+				$assignAttr[]['var'] = $parameter['if condition']['var']['var'];
+				$_output .= $assignCompiler->compile(
+					$assignAttr,
+					$compiler,
+					['smarty_internal_index' => $parameter['if condition']['var']['smarty_internal_index']]
+				);
+			} else {
+				$assignAttr[]['var'] = $parameter['if condition']['var'];
+				$_output .= $assignCompiler->compile($assignAttr, $compiler, []);
+			}
+			$_output .= "<?php if ({$prefixVar}) {?>";
+			return $_output;
+		} else {
+			return "<?php if ({$parameter['if condition']}) {?>";
+		}
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/IncludeTag.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/IncludeTag.php
new file mode 100644
index 000000000..8e775811e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/IncludeTag.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Include
+ * Compiles the {include} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+use Smarty\Compiler\Template;
+use Smarty\Data;
+use Smarty\Smarty;
+use Smarty\Template\Compiled;
+
+/**
+ * Smarty Internal Plugin Compile Include Class
+ *
+
+
+ */
+class IncludeTag extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	protected $required_attributes = ['file'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	protected $shorttag_order = ['file'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	protected $option_flags = ['nocache', 'inline', 'caching'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BaseCompiler
+	 */
+	protected $optional_attributes = ['_any'];
+
+	/**
+	 * Compiles code for the {include} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param Template $compiler compiler object
+	 *
+	 * @return string
+	 * @throws \Exception
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$uid = $t_hash = null;
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$fullResourceName = $source_resource = $_attr['file'];
+		$variable_template = false;
+		// parse resource_name
+		if (preg_match('/^([\'"])(([A-Za-z0-9_\-]{2,})[:])?(([^$()]+)|(.+))\1$/', $source_resource, $match)) {
+			$type = !empty($match[3]) ? $match[3] : $compiler->getTemplate()->getSmarty()->default_resource_type;
+			$name = !empty($match[5]) ? $match[5] : $match[6];
+			$handler = \Smarty\Resource\BasePlugin::load($compiler->getSmarty(), $type);
+			if ($handler->recompiled) {
+				$variable_template = true;
+			}
+			if (!$variable_template) {
+				if ($type !== 'string') {
+					$fullResourceName = "{$type}:{$name}";
+					$compiled = $compiler->getParentCompiler()->getTemplate()->getCompiled();
+					if (isset($compiled->includes[$fullResourceName])) {
+						$compiled->includes[$fullResourceName]++;
+					} else {
+						if ("{$compiler->getTemplate()->getSource()->type}:{$compiler->getTemplate()->getSource()->name}" ==
+							$fullResourceName
+						) {
+							// recursive call of current template
+							$compiled->includes[$fullResourceName] = 2;
+						} else {
+							$compiled->includes[$fullResourceName] = 1;
+						}
+					}
+					$fullResourceName = $match[1] . $fullResourceName . $match[1];
+				}
+			}
+		}
+		// scope setup
+		$_scope = isset($_attr['scope']) ? $this->convertScope($_attr['scope']) : 0;
+
+		// assume caching is off
+		$_caching = Smarty::CACHING_OFF;
+
+		// caching was on and {include} is not in nocache mode
+		if ($compiler->getTemplate()->caching && !$compiler->isNocacheActive()) {
+			$_caching = \Smarty\Template::CACHING_NOCACHE_CODE;
+		}
+
+		/*
+		* if the {include} tag provides individual parameter for caching or compile_id
+		* the subtemplate must not be included into the common cache file and is treated like
+		* a call in nocache mode.
+		*
+		*/
+
+		$call_nocache = $compiler->isNocacheActive();
+		if ($_attr['nocache'] !== true && $_attr['caching']) {
+			$_caching = $_new_caching = (int)$_attr['caching'];
+			$call_nocache = true;
+		} else {
+			$_new_caching = Smarty::CACHING_LIFETIME_CURRENT;
+		}
+		if (isset($_attr['cache_lifetime'])) {
+			$_cache_lifetime = $_attr['cache_lifetime'];
+			$call_nocache = true;
+			$_caching = $_new_caching;
+		} else {
+			$_cache_lifetime = '$_smarty_tpl->cache_lifetime';
+		}
+		if (isset($_attr['cache_id'])) {
+			$_cache_id = $_attr['cache_id'];
+			$call_nocache = true;
+			$_caching = $_new_caching;
+		} else {
+			$_cache_id = '$_smarty_tpl->cache_id';
+		}
+
+		// assign attribute
+		if (isset($_attr['assign'])) {
+			// output will be stored in a smarty variable instead of being displayed
+			if ($_assign = $compiler->getId($_attr['assign'])) {
+				$_assign = "'{$_assign}'";
+				if ($call_nocache) {
+					// create nocache var to make it know for further compiling
+					$compiler->setNocacheInVariable($_attr['assign']);
+				}
+			} else {
+				$_assign = $_attr['assign'];
+			}
+		}
+		$has_compiled_template = false;
+
+		// delete {include} standard attributes
+		unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
+		// remaining attributes must be assigned as smarty variable
+		$_vars = 'array()';
+		if (!empty($_attr)) {
+			$_pairs = [];
+			// create variables
+			foreach ($_attr as $key => $value) {
+				$_pairs[] = "'$key'=>$value";
+			}
+			$_vars = 'array(' . join(',', $_pairs) . ')';
+		}
+		if ($call_nocache) {
+			$compiler->tag_nocache = true;
+		}
+		$_output = "<?php ";
+		// was there an assign attribute
+		if (isset($_assign)) {
+			$_output .= "ob_start();\n";
+		}
+		$_output .= "\$_smarty_tpl->renderSubTemplate({$fullResourceName}, $_cache_id, \$_smarty_tpl->compile_id, " .
+			"$_caching, $_cache_lifetime, $_vars, (int) {$_scope}, \$_smarty_current_dir);\n";
+		if (isset($_assign)) {
+			$_output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean(), false, {$_scope});\n";
+		}
+		$_output .= "?>";
+		return $_output;
+	}
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Inheritance.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Inheritance.php
new file mode 100644
index 000000000..6764651a1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Inheritance.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Shared Inheritance
+ * Shared methods for {extends} and {block} tags
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+/**
+ * Smarty Internal Plugin Compile Shared Inheritance Class
+ *
+
+
+ */
+abstract class Inheritance extends Base
+{
+    /**
+     * Compile inheritance initialization code as prefix
+     *
+     * @param \Smarty\Compiler\Template $compiler
+     * @param bool|false                            $initChildSequence if true force child template
+     */
+    public static function postCompile(\Smarty\Compiler\Template $compiler, $initChildSequence = false)
+    {
+        $compiler->prefixCompiledCode .= "<?php \$_smarty_tpl->getInheritance()->init(\$_smarty_tpl, " .
+                                         var_export($initChildSequence, true) . ");\n?>\n";
+    }
+
+    /**
+     * Register post compile callback to compile inheritance initialization code
+     *
+     * @param \Smarty\Compiler\Template $compiler
+     * @param bool|false                            $initChildSequence if true force child template
+     */
+    public function registerInit(\Smarty\Compiler\Template $compiler, $initChildSequence = false)
+    {
+        if ($initChildSequence || !isset($compiler->_cache[ 'inheritanceInit' ])) {
+            $compiler->registerPostCompileCallback(
+                array(self::class, 'postCompile'),
+                array($initChildSequence),
+                'inheritanceInit',
+                $initChildSequence
+            );
+            $compiler->_cache[ 'inheritanceInit' ] = true;
+        }
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Ldelim.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Ldelim.php
new file mode 100644
index 000000000..a265fa70c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Ldelim.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Ldelim
+ * Compiles the {ldelim} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Ldelim Class
+ *
+
+
+ */
+class Ldelim extends Base {
+
+	/**
+	 * Compiles code for the {ldelim} tag
+	 * This tag does output the left delimiter
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$_attr = $this->getAttributes($compiler, $args);
+		if ($_attr['nocache'] === true) {
+			$compiler->trigger_template_error('nocache option not allowed', null, true);
+		}
+		return $compiler->getTemplate()->getLeftDelimiter();
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Nocache.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Nocache.php
new file mode 100644
index 000000000..dd30f8937
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Nocache.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Nocache Class
+ *
+
+
+ */
+class Nocache extends Base {
+
+	/**
+	 * Array of names of valid option flags
+	 *
+	 * @var array
+	 */
+	protected $option_flags = [];
+
+	/**
+	 * Compiles code for the {nocache} tag
+	 * This tag does not generate compiled output. It only sets a compiler flag.
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$this->openTag($compiler, 'nocache');
+		return '';
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/NocacheClose.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/NocacheClose.php
new file mode 100644
index 000000000..75edd9982
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/NocacheClose.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Nocache
+ * Compiles the {nocache} {/nocache} tags.
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Nocacheclose Class
+ *
+
+
+ */
+class NocacheClose extends Base {
+
+	/**
+	 * Compiles code for the {/nocache} tag
+	 * This tag does not generate compiled output. It only sets a compiler flag.
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$this->closeTag($compiler, ['nocache']);
+		return '';
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Rdelim.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Rdelim.php
new file mode 100644
index 000000000..60e7a23d1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Rdelim.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Rdelim
+ * Compiles the {rdelim} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+/**
+ * Smarty Internal Plugin Compile Rdelim Class
+ *
+
+
+ */
+class Rdelim extends Ldelim {
+
+	/**
+	 * Compiles code for the {rdelim} tag
+	 * This tag does output the right delimiter.
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		parent::compile($args, $compiler);
+		return $compiler->getTemplate()->getRightDelimiter();
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Section.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Section.php
new file mode 100644
index 000000000..f82ac4211
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Section.php
@@ -0,0 +1,399 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+/**
+ * Smarty Internal Plugin Compile Section Class
+ *
+
+
+ */
+class Section extends ForeachSection {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $required_attributes = ['name', 'loop'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $shorttag_order = ['name', 'loop'];
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	protected $optional_attributes = ['start', 'step', 'max', 'show', 'properties'];
+
+	/**
+	 * counter
+	 *
+	 * @var int
+	 */
+	protected $counter = 0;
+
+	/**
+	 * Name of this tag
+	 *
+	 * @var string
+	 */
+	protected $tagName = 'section';
+
+	/**
+	 * Valid properties of $smarty.section.name.xxx variable
+	 *
+	 * @var array
+	 */
+	protected $nameProperties = [
+		'first', 'last', 'index', 'iteration', 'show', 'total', 'rownum', 'index_prev',
+		'index_next', 'loop',
+	];
+
+	/**
+	 * {section} tag has no item properties
+	 *
+	 * @var array
+	 */
+	protected $itemProperties = null;
+
+	/**
+	 * {section} tag has always name attribute
+	 *
+	 * @var bool
+	 */
+	protected $isNamed = true;
+
+	/**
+	 * Compiles code for the {section} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting++;
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		$attributes = ['name' => $compiler->getId($_attr['name'])];
+		unset($_attr['name']);
+		foreach ($attributes as $a => $v) {
+			if ($v === false) {
+				$compiler->trigger_template_error("'{$a}' attribute/variable has illegal value", null, true);
+			}
+		}
+		$local = "\$__section_{$attributes['name']}_" . $this->counter++ . '_';
+		$sectionVar = "\$_smarty_tpl->tpl_vars['__smarty_section_{$attributes['name']}']";
+
+		if ($compiler->tag_nocache) {
+			// push a {nocache} tag onto the stack to prevent caching of this block
+			$this->openTag('nocache');
+		}
+
+		$this->openTag($compiler, 'section', ['section', $compiler->tag_nocache]);
+
+		$initLocal = [];
+		$initNamedProperty = [];
+		$initFor = [];
+		$incFor = [];
+		$cmpFor = [];
+		$propValue = [
+			'index' => "{$sectionVar}->value['index']", 'show' => 'true', 'step' => 1,
+			'iteration' => "{$local}iteration",
+		];
+		$propType = ['index' => 2, 'iteration' => 2, 'show' => 0, 'step' => 0,];
+		// search for used tag attributes
+		$this->scanForProperties($attributes, $compiler);
+		if (!empty($this->matchResults['named'])) {
+			$namedAttr = $this->matchResults['named'];
+		}
+		if (isset($_attr['properties']) && preg_match_all("/['](.*?)[']/", $_attr['properties'], $match)) {
+			foreach ($match[1] as $prop) {
+				if (in_array($prop, $this->nameProperties)) {
+					$namedAttr[$prop] = true;
+				} else {
+					$compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
+				}
+			}
+		}
+		$namedAttr['index'] = true;
+		$output = "<?php\n";
+		foreach ($_attr as $attr_name => $attr_value) {
+			switch ($attr_name) {
+				case 'loop':
+					if (is_numeric($attr_value)) {
+						$v = (int)$attr_value;
+						$t = 0;
+					} else {
+						$v = "(is_array(@\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop))";
+						$t = 1;
+					}
+					if ($t === 1) {
+						$initLocal['loop'] = $v;
+						$v = "{$local}loop";
+					}
+					break;
+				case 'show':
+					if (is_bool($attr_value)) {
+						$v = $attr_value ? 'true' : 'false';
+						$t = 0;
+					} else {
+						$v = "(bool) $attr_value";
+						$t = 3;
+					}
+					break;
+				case 'step':
+					if (is_numeric($attr_value)) {
+						$v = (int)$attr_value;
+						$v = ($v === 0) ? 1 : $v;
+						$t = 0;
+						break;
+					}
+					$initLocal['step'] = "((int)@$attr_value) === 0 ? 1 : (int)@$attr_value";
+					$v = "{$local}step";
+					$t = 2;
+					break;
+				case 'max':
+				case 'start':
+					if (is_numeric($attr_value)) {
+						$v = (int)$attr_value;
+						$t = 0;
+						break;
+					}
+					$v = "(int)@$attr_value";
+					$t = 3;
+					break;
+			}
+			if ($t === 3 && $compiler->getId($attr_value)) {
+				$t = 1;
+			}
+			$propValue[$attr_name] = $v;
+			$propType[$attr_name] = $t;
+		}
+		if (isset($namedAttr['step'])) {
+			$initNamedProperty['step'] = $propValue['step'];
+		}
+		if (isset($namedAttr['iteration'])) {
+			$propValue['iteration'] = "{$sectionVar}->value['iteration']";
+		}
+		$incFor['iteration'] = "{$propValue['iteration']}++";
+		$initFor['iteration'] = "{$propValue['iteration']} = 1";
+		if ($propType['step'] === 0) {
+			if ($propValue['step'] === 1) {
+				$incFor['index'] = "{$sectionVar}->value['index']++";
+			} elseif ($propValue['step'] > 1) {
+				$incFor['index'] = "{$sectionVar}->value['index'] += {$propValue['step']}";
+			} else {
+				$incFor['index'] = "{$sectionVar}->value['index'] -= " . -$propValue['step'];
+			}
+		} else {
+			$incFor['index'] = "{$sectionVar}->value['index'] += {$propValue['step']}";
+		}
+		if (!isset($propValue['max'])) {
+			$propValue['max'] = $propValue['loop'];
+			$propType['max'] = $propType['loop'];
+		} elseif ($propType['max'] !== 0) {
+			$propValue['max'] = "{$propValue['max']} < 0 ? {$propValue['loop']} : {$propValue['max']}";
+			$propType['max'] = 1;
+		} else {
+			if ($propValue['max'] < 0) {
+				$propValue['max'] = $propValue['loop'];
+				$propType['max'] = $propType['loop'];
+			}
+		}
+		if (!isset($propValue['start'])) {
+			$start_code =
+				[1 => "{$propValue['step']} > 0 ? ", 2 => '0', 3 => ' : ', 4 => $propValue['loop'], 5 => ' - 1'];
+			if ($propType['loop'] === 0) {
+				$start_code[5] = '';
+				$start_code[4] = $propValue['loop'] - 1;
+			}
+			if ($propType['step'] === 0) {
+				if ($propValue['step'] > 0) {
+					$start_code = [1 => '0'];
+					$propType['start'] = 0;
+				} else {
+					$start_code[1] = $start_code[2] = $start_code[3] = '';
+					$propType['start'] = $propType['loop'];
+				}
+			} else {
+				$propType['start'] = 1;
+			}
+			$propValue['start'] = join('', $start_code);
+		} else {
+			$start_code =
+				[
+					1 => "{$propValue['start']} < 0 ? ", 2 => 'max(', 3 => "{$propValue['step']} > 0 ? ", 4 => '0',
+					5 => ' : ', 6 => '-1', 7 => ', ', 8 => "{$propValue['start']} + {$propValue['loop']}", 10 => ')',
+					11 => ' : ', 12 => 'min(', 13 => $propValue['start'], 14 => ', ',
+					15 => "{$propValue['step']} > 0 ? ", 16 => $propValue['loop'], 17 => ' : ',
+					18 => $propType['loop'] === 0 ? $propValue['loop'] - 1 : "{$propValue['loop']} - 1",
+					19 => ')',
+				];
+			if ($propType['step'] === 0) {
+				$start_code[3] = $start_code[5] = $start_code[15] = $start_code[17] = '';
+				if ($propValue['step'] > 0) {
+					$start_code[6] = $start_code[18] = '';
+				} else {
+					$start_code[4] = $start_code[16] = '';
+				}
+			}
+			if ($propType['start'] === 0) {
+				if ($propType['loop'] === 0) {
+					$start_code[8] = $propValue['start'] + $propValue['loop'];
+				}
+				$propType['start'] = $propType['step'] + $propType['loop'];
+				$start_code[1] = '';
+				if ($propValue['start'] < 0) {
+					for ($i = 11; $i <= 19; $i++) {
+						$start_code[$i] = '';
+					}
+					if ($propType['start'] === 0) {
+						$start_code = [
+							max(
+								$propValue['step'] > 0 ? 0 : -1,
+								$propValue['start'] + $propValue['loop']
+							),
+						];
+					}
+				} else {
+					for ($i = 1; $i <= 11; $i++) {
+						$start_code[$i] = '';
+					}
+					if ($propType['start'] === 0) {
+						$start_code =
+							[
+								min(
+									$propValue['step'] > 0 ? $propValue['loop'] : $propValue['loop'] - 1,
+									$propValue['start']
+								),
+							];
+					}
+				}
+			}
+			$propValue['start'] = join('', $start_code);
+		}
+		if ($propType['start'] !== 0) {
+			$initLocal['start'] = $propValue['start'];
+			$propValue['start'] = "{$local}start";
+		}
+		$initFor['index'] = "{$sectionVar}->value['index'] = {$propValue['start']}";
+		if (!isset($_attr['start']) && !isset($_attr['step']) && !isset($_attr['max'])) {
+			$propValue['total'] = $propValue['loop'];
+			$propType['total'] = $propType['loop'];
+		} else {
+			$propType['total'] =
+				$propType['start'] + $propType['loop'] + $propType['step'] + $propType['max'];
+			if ($propType['total'] === 0) {
+				$propValue['total'] =
+					min(
+						ceil(
+							($propValue['step'] > 0 ? $propValue['loop'] - $propValue['start'] :
+								(int)$propValue['start'] + 1) / abs($propValue['step'])
+						),
+						$propValue['max']
+					);
+			} else {
+				$total_code = [
+					1 => 'min(', 2 => 'ceil(', 3 => '(', 4 => "{$propValue['step']} > 0 ? ",
+					5 => $propValue['loop'], 6 => ' - ', 7 => $propValue['start'], 8 => ' : ',
+					9 => $propValue['start'], 10 => '+ 1', 11 => ')', 12 => '/ ', 13 => 'abs(',
+					14 => $propValue['step'], 15 => ')', 16 => ')', 17 => ", {$propValue['max']})",
+				];
+				if (!isset($propValue['max'])) {
+					$total_code[1] = $total_code[17] = '';
+				}
+				if ($propType['loop'] + $propType['start'] === 0) {
+					$total_code[5] = $propValue['loop'] - $propValue['start'];
+					$total_code[6] = $total_code[7] = '';
+				}
+				if ($propType['start'] === 0) {
+					$total_code[9] = (int)$propValue['start'] + 1;
+					$total_code[10] = '';
+				}
+				if ($propType['step'] === 0) {
+					$total_code[13] = $total_code[15] = '';
+					if ($propValue['step'] === 1 || $propValue['step'] === -1) {
+						$total_code[2] = $total_code[12] = $total_code[14] = $total_code[16] = '';
+					} elseif ($propValue['step'] < 0) {
+						$total_code[14] = -$propValue['step'];
+					}
+					$total_code[4] = '';
+					if ($propValue['step'] > 0) {
+						$total_code[8] = $total_code[9] = $total_code[10] = '';
+					} else {
+						$total_code[5] = $total_code[6] = $total_code[7] = $total_code[8] = '';
+					}
+				}
+				$propValue['total'] = join('', $total_code);
+			}
+		}
+		if (isset($namedAttr['loop'])) {
+			$initNamedProperty['loop'] = "'loop' => {$propValue['loop']}";
+		}
+		if (isset($namedAttr['total'])) {
+			$initNamedProperty['total'] = "'total' => {$propValue['total']}";
+			if ($propType['total'] > 0) {
+				$propValue['total'] = "{$sectionVar}->value['total']";
+			}
+		} elseif ($propType['total'] > 0) {
+			$initLocal['total'] = $propValue['total'];
+			$propValue['total'] = "{$local}total";
+		}
+		$cmpFor['iteration'] = "{$propValue['iteration']} <= {$propValue['total']}";
+		foreach ($initLocal as $key => $code) {
+			$output .= "{$local}{$key} = {$code};\n";
+		}
+		$_vars = 'array(' . join(', ', $initNamedProperty) . ')';
+		$output .= "{$sectionVar} = new \\Smarty\\Variable({$_vars});\n";
+		$cond_code = "{$propValue['total']} !== 0";
+		if ($propType['total'] === 0) {
+			if ($propValue['total'] === 0) {
+				$cond_code = 'false';
+			} else {
+				$cond_code = 'true';
+			}
+		}
+		if ($propType['show'] > 0) {
+			$output .= "{$local}show = {$propValue['show']} ? {$cond_code} : false;\n";
+			$output .= "if ({$local}show) {\n";
+		} elseif ($propValue['show'] === 'true') {
+			$output .= "if ({$cond_code}) {\n";
+		} else {
+			$output .= "if (false) {\n";
+		}
+		$jinit = join(', ', $initFor);
+		$jcmp = join(', ', $cmpFor);
+		$jinc = join(', ', $incFor);
+		$output .= "for ({$jinit}; {$jcmp}; {$jinc}){\n";
+		if (isset($namedAttr['rownum'])) {
+			$output .= "{$sectionVar}->value['rownum'] = {$propValue['iteration']};\n";
+		}
+		if (isset($namedAttr['index_prev'])) {
+			$output .= "{$sectionVar}->value['index_prev'] = {$propValue['index']} - {$propValue['step']};\n";
+		}
+		if (isset($namedAttr['index_next'])) {
+			$output .= "{$sectionVar}->value['index_next'] = {$propValue['index']} + {$propValue['step']};\n";
+		}
+		if (isset($namedAttr['first'])) {
+			$output .= "{$sectionVar}->value['first'] = ({$propValue['iteration']} === 1);\n";
+		}
+		if (isset($namedAttr['last'])) {
+			$output .= "{$sectionVar}->value['last'] = ({$propValue['iteration']} === {$propValue['total']});\n";
+		}
+		$output .= '?>';
+		return $output;
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/SectionClose.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/SectionClose.php
new file mode 100644
index 000000000..efab60975
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/SectionClose.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Section
+ * Compiles the {section} {sectionelse} {/section} tags
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Sectionclose Class
+ */
+class SectionClose extends Base {
+
+	/**
+	 * Compiles code for the {/section} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting--;
+
+		[$openTag, $nocache_pushed] = $this->closeTag($compiler, ['section', 'sectionelse']);
+
+		if ($nocache_pushed) {
+			// pop the pushed virtual nocache tag
+			$this->closeTag('nocache');
+		}
+
+		$output = "<?php\n";
+		if ($openTag === 'sectionelse') {
+			$output .= "}\n";
+		} else {
+			$output .= "}\n}\n";
+		}
+		$output .= '?>';
+		return $output;
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/SectionElse.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/SectionElse.php
new file mode 100644
index 000000000..b9ea56366
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/SectionElse.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Sectionelse Class
+ *
+
+
+ */
+class SectionElse extends Base {
+
+	/**
+	 * Compiles code for the {sectionelse} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		[$openTag, $nocache_pushed] = $this->closeTag($compiler, ['section']);
+		$this->openTag($compiler, 'sectionelse', ['sectionelse', $nocache_pushed]);
+		return "<?php }} else {\n ?>";
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Setfilter.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Setfilter.php
new file mode 100644
index 000000000..9da2f969c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/Setfilter.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Setfilter Class
+ *
+
+
+ */
+class Setfilter extends Base {
+
+	/**
+	 * Compiles code for setfilter tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->variable_filter_stack[] = $compiler->getSmarty()->getDefaultModifiers();
+
+		// The modifier_list is passed as an array of array's. The inner arrays have the modifier at index 0,
+		// and, possibly, parameters at subsequent indexes, e.g. [ ['escape','"mail"'] ]
+		// We will collapse them so the syntax is OK for ::setDefaultModifiers() as follows: [ 'escape:"mail"' ]
+		$newList = [];
+		foreach($parameter['modifier_list'] as $modifier) {
+			$newList[] = implode(':', $modifier);
+		}
+
+		$compiler->getSmarty()->setDefaultModifiers($newList);
+
+		return '';
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/SetfilterClose.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/SetfilterClose.php
new file mode 100644
index 000000000..2814f641d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/SetfilterClose.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile Setfilter
+ * Compiles code for setfilter tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Setfilterclose Class
+ *
+
+
+ */
+class SetfilterClose extends Base {
+
+	/**
+	 * Compiles code for the {/setfilter} tag
+	 * This tag does not generate compiled output. It resets variable filter.
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$this->getAttributes($compiler, $args);
+
+		// reset variable filter to previous state
+		$compiler->getSmarty()->setDefaultModifiers(
+			count($compiler->variable_filter_stack) ? array_pop($compiler->variable_filter_stack) : []
+		);
+
+		return '';
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/WhileClose.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/WhileClose.php
new file mode 100644
index 000000000..5adb3a49b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/WhileClose.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Smarty Internal Plugin Compile While
+ * Compiles the {while} tag
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile Whileclose Class
+ *
+
+
+ */
+class WhileClose extends Base {
+
+	/**
+	 * Compiles code for the {/while} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 *
+	 * @return string compiled code
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting--;
+
+		$nocache_pushed = $this->closeTag($compiler, ['while']);
+
+		if ($nocache_pushed) {
+			// pop the pushed virtual nocache tag
+			$this->closeTag($compiler, 'nocache');
+			$compiler->tag_nocache = true;
+		}
+
+		return "<?php }?>\n";
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/WhileTag.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/WhileTag.php
new file mode 100644
index 000000000..3300b5075
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compile/Tag/WhileTag.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Smarty\Compile\Tag;
+
+use Smarty\Compile\Base;
+
+/**
+ * Smarty Internal Plugin Compile While Class
+ *
+
+
+ */
+class WhileTag extends Base {
+
+	/**
+	 * Compiles code for the {while} tag
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param \Smarty\Compiler\Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 */
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
+	{
+		$compiler->loopNesting++;
+
+		if ($compiler->tag_nocache) {
+			// push a {nocache} tag onto the stack to prevent caching of this block
+			$this->openTag($compiler, 'nocache');
+		}
+
+		$this->openTag($compiler, 'while', $compiler->tag_nocache);
+
+		if (!array_key_exists('if condition', $parameter)) {
+			$compiler->trigger_template_error('missing while condition', null, true);
+		}
+
+		if (is_array($parameter['if condition'])) {
+			if ($compiler->isNocacheActive()) {
+				// create nocache var to make it know for further compiling
+				if (is_array($parameter['if condition']['var'])) {
+					$var = $parameter['if condition']['var']['var'];
+				} else {
+					$var = $parameter['if condition']['var'];
+				}
+				$compiler->setNocacheInVariable($var);
+			}
+			$prefixVar = $compiler->getNewPrefixVariable();
+			$assignCompiler = new Assign();
+			$assignAttr = [];
+			$assignAttr[]['value'] = $prefixVar;
+			if (is_array($parameter['if condition']['var'])) {
+				$assignAttr[]['var'] = $parameter['if condition']['var']['var'];
+				$_output = "<?php while ({$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]}) {?>";
+				$_output .= $assignCompiler->compile(
+					$assignAttr,
+					$compiler,
+					['smarty_internal_index' => $parameter['if condition']['var']['smarty_internal_index']]
+				);
+			} else {
+				$assignAttr[]['var'] = $parameter['if condition']['var'];
+				$_output = "<?php while ({$prefixVar} = {$parameter[ 'if condition' ][ 'value' ]}) {?>";
+				$_output .= $assignCompiler->compile($assignAttr, $compiler, []);
+			}
+			return $_output;
+		} else {
+			return "<?php\n while ({$parameter['if condition']}) {?>";
+		}
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compiler/BaseCompiler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compiler/BaseCompiler.php
new file mode 100644
index 000000000..78c35a697
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compiler/BaseCompiler.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Smarty\Compiler;
+
+use Smarty\Smarty;
+
+abstract class BaseCompiler {
+
+	/**
+	 * Smarty object
+	 *
+	 * @var Smarty
+	 */
+	protected $smarty = null;
+
+	/**
+	 * @return Smarty|null
+	 */
+	public function getSmarty(): Smarty {
+		return $this->smarty;
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compiler/CodeFrame.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compiler/CodeFrame.php
new file mode 100644
index 000000000..5e7821509
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compiler/CodeFrame.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace Smarty\Compiler;
+
+use Smarty\Exception;
+
+/**
+ * Smarty Internal Extension
+ * This file contains the Smarty template extension to create a code frame
+ *
+ * @author     Uwe Tews
+ */
+
+/**
+ * Create code frame for compiled and cached templates
+ */
+class CodeFrame
+{
+
+	/**
+	 * @var \Smarty\Template
+	 */
+	private $_template;
+
+	public function __construct(\Smarty\Template $_template) {
+		$this->_template = $_template;
+	}
+
+	/**
+	 * Create code frame for compiled and cached templates
+	 *
+	 * @param string $content optional template content
+	 * @param string $functions compiled template function and block code
+	 * @param bool $cache flag for cache file
+	 * @param Template|null $compiler
+	 *
+	 * @return string
+	 * @throws Exception
+*/
+    public function create(
+        $content = '',
+        $functions = '',
+        $cache = false,
+        \Smarty\Compiler\Template $compiler = null
+    ) {
+        // build property code
+        $properties[ 'version' ] = \Smarty\Smarty::SMARTY_VERSION;
+        $properties[ 'unifunc' ] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
+        if (!$cache) {
+            $properties[ 'has_nocache_code' ] = $this->_template->getCompiled()->getNocacheCode();
+            $properties[ 'file_dependency' ] = $this->_template->getCompiled()->file_dependency;
+            $properties[ 'includes' ] = $this->_template->getCompiled()->includes;
+        } else {
+            $properties[ 'has_nocache_code' ] = $this->_template->getCached()->getNocacheCode();
+            $properties[ 'file_dependency' ] = $this->_template->getCached()->file_dependency;
+            $properties[ 'cache_lifetime' ] = $this->_template->cache_lifetime;
+        }
+        $output = sprintf(
+			"<?php\n/* Smarty version %s, created on %s\n  from '%s' */\n\n",
+            $properties[ 'version' ],
+	        date("Y-m-d H:i:s"),
+	        str_replace('*/', '* /', $this->_template->getSource()->getFullResourceName())
+        );
+        $output .= "/* @var \\Smarty\\Template \$_smarty_tpl */\n";
+        $dec = "\$_smarty_tpl->" . ($cache ? "getCached()" : "getCompiled()");
+		$dec .= "->isFresh(\$_smarty_tpl, " . var_export($properties, true) . ')';
+        $output .= "if ({$dec}) {\n";
+        $output .= "function {$properties['unifunc']} (\\Smarty\\Template \$_smarty_tpl) {\n";
+
+		$output .= $this->insertLocalVariables();
+
+        if (!$cache && !empty($compiler->tpl_function)) {
+            $output .= '$_smarty_tpl->getSmarty()->getRuntime(\'TplFunction\')->registerTplFunctions($_smarty_tpl, ';
+            $output .= var_export($compiler->tpl_function, true);
+            $output .= ");\n";
+        }
+        if ($cache && $this->_template->getSmarty()->hasRuntime('TplFunction')) {
+			if ($tplfunctions = $this->_template->getSmarty()->getRuntime('TplFunction')->getTplFunction($this->_template)) {
+				$output .= "\$_smarty_tpl->getSmarty()->getRuntime('TplFunction')->registerTplFunctions(\$_smarty_tpl, " .
+					var_export($tplfunctions, true) . ");\n";
+			}
+        }
+        $output .= "?>";
+        $output .= $content;
+        $output .= "<?php }\n?>";
+        $output .= $functions;
+        $output .= "<?php }\n";
+        // remove unneeded PHP tags
+        if (preg_match('/\s*\?>[\n]?<\?php\s*/', $output)) {
+            $curr_split = preg_split(
+                '/\s*\?>[\n]?<\?php\s*/',
+                $output
+            );
+            preg_match_all(
+                '/\s*\?>[\n]?<\?php\s*/',
+                $output,
+                $curr_parts
+            );
+            $output = '';
+            foreach ($curr_split as $idx => $curr_output) {
+                $output .= $curr_output;
+                if (isset($curr_parts[ 0 ][ $idx ])) {
+                    $output .= "\n";
+                }
+            }
+        }
+        if (preg_match('/\?>\s*$/', $output)) {
+            $curr_split = preg_split(
+                '/\?>\s*$/',
+                $output
+            );
+            $output = '';
+            foreach ($curr_split as $idx => $curr_output) {
+                $output .= $curr_output;
+            }
+        }
+        return $output;
+    }
+
+	/**
+	 * @return string
+	 */
+	public function insertLocalVariables(): string {
+		return '$_smarty_current_dir = ' . var_export(dirname($this->_template->getSource()->getFilepath() ?? '.'), true) . ";\n";
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compiler/Configfile.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compiler/Configfile.php
new file mode 100644
index 000000000..84c14f9e7
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compiler/Configfile.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * Smarty Internal Plugin Config File Compiler
+ * This is the config file compiler class. It calls the lexer and parser to
+ * perform the compiling.
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compiler;
+use Smarty\Lexer\ConfigfileLexer;
+use Smarty\Parser\ConfigfileParser;
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\CompilerException;
+
+/**
+ * Main config file compiler class
+ *
+
+
+ */
+class Configfile extends BaseCompiler {
+
+	/**
+	 * Lexer object
+	 *
+	 * @var ConfigfileLexer
+	 */
+	public $lex;
+
+	/**
+	 * Parser object
+	 *
+	 * @var ConfigfileParser
+	 */
+	public $parser;
+
+	/**
+	 * Smarty object
+	 *
+	 * @var Smarty object
+	 */
+	public $smarty;
+
+	/**
+	 * Smarty object
+	 *
+	 * @var Template object
+	 */
+	public $template;
+
+	/**
+	 * Compiled config data sections and variables
+	 *
+	 * @var array
+	 */
+	public $config_data = [];
+
+	/**
+	 * Initialize compiler
+	 *
+	 * @param Smarty $smarty global instance
+	 */
+	public function __construct(Smarty $smarty) {
+		$this->smarty = $smarty;
+		$this->config_data['sections'] = [];
+		$this->config_data['vars'] = [];
+	}
+
+	/**
+	 * Method to compile Smarty config source.
+	 *
+	 * @param Template $template
+	 *
+	 * @return bool true if compiling succeeded, false if it failed
+	 * @throws \Smarty\Exception
+	 */
+	public function compileTemplate(Template $template) {
+		$this->template = $template;
+		$this->template->getCompiled()->file_dependency[$this->template->getSource()->uid] =
+			[
+				$this->template->getSource()->getResourceName(),
+				$this->template->getSource()->getTimeStamp(),
+				$this->template->getSource()->type,
+			];
+		if ($this->smarty->debugging) {
+			$this->smarty->getDebug()->start_compile($this->template);
+		}
+		// init the lexer/parser to compile the config file
+		/* @var ConfigfileLexer $this->lex */
+		$this->lex = new ConfigfileLexer(
+			str_replace(
+				[
+					"\r\n",
+					"\r",
+				],
+				"\n",
+				$template->getSource()->getContent()
+			) . "\n",
+			$this
+		);
+
+		$this->parser = new ConfigfileParser($this->lex, $this);
+		if ($this->smarty->_parserdebug) {
+			$this->parser->PrintTrace();
+		}
+		// get tokens from lexer and parse them
+		while ($this->lex->yylex()) {
+			if ($this->smarty->_parserdebug) {
+				echo "Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token {$this->lex->value} Line {$this->lex->line} \n";
+			}
+			$this->parser->doParse($this->lex->token, $this->lex->value);
+		}
+		// finish parsing process
+		$this->parser->doParse(0, 0);
+		if ($this->smarty->debugging) {
+			$this->smarty->getDebug()->end_compile($this->template);
+		}
+		// template header code
+		$template_header = sprintf(
+			"<?php /* Smarty version %s, created on %s\n         compiled from '%s' */ ?>\n",
+			\Smarty\Smarty::SMARTY_VERSION,
+			date("Y-m-d H:i:s"),
+			str_replace('*/', '* /', $this->template->getSource()->getFullResourceName())
+		);
+		$code = '<?php $_smarty_tpl->parent->assignConfigVars(' .
+			var_export($this->config_data, true) . ', $_smarty_tpl->getValue("sections")); ?>';
+		return $template_header . $this->template->createCodeFrame($code);
+	}
+
+	/**
+	 * display compiler error messages without dying
+	 * If parameter $args is empty it is a parser detected syntax error.
+	 * In this case the parser is called to obtain information about expected tokens.
+	 * If parameter $args contains a string this is used as error message
+	 *
+	 * @param string $args individual error message or null
+	 *
+	 * @throws CompilerException
+	 */
+	public function trigger_config_file_error($args = null) {
+		// get config source line which has error
+		$line = $this->lex->line;
+		if (isset($args)) {
+			// $line--;
+		}
+		$match = preg_split("/\n/", $this->lex->data);
+		$error_text =
+			"Syntax error in config file '{$this->template->getSource()->getFullResourceName()}' on line {$line} '{$match[$line - 1]}' ";
+		if (isset($args)) {
+			// individual error message
+			$error_text .= $args;
+		} else {
+			// expected token from parser
+			foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
+				$exp_token = $this->parser->yyTokenName[$token];
+				if (isset($this->lex->smarty_token_names[$exp_token])) {
+					// token type from lexer
+					$expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
+				} else {
+					// otherwise internal token name
+					$expect[] = $this->parser->yyTokenName[$token];
+				}
+			}
+			// output parser error message
+			$error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect);
+		}
+		throw new CompilerException($error_text);
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compiler/Template.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compiler/Template.php
new file mode 100644
index 000000000..1d4aa2447
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Compiler/Template.php
@@ -0,0 +1,1489 @@
+<?php
+/**
+ * Smarty Internal Plugin Smarty Template Compiler Base
+ * This file contains the basic classes and methods for compiling Smarty templates with lexer/parser
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty\Compiler;
+
+use Smarty\Compile\BlockCompiler;
+use Smarty\Compile\DefaultHandlerBlockCompiler;
+use Smarty\Compile\DefaultHandlerFunctionCallCompiler;
+use Smarty\Compile\ModifierCompiler;
+use Smarty\Compile\ObjectMethodBlockCompiler;
+use Smarty\Compile\ObjectMethodCallCompiler;
+use Smarty\Compile\FunctionCallCompiler;
+use Smarty\Compile\PrintExpressionCompiler;
+use Smarty\Lexer\TemplateLexer;
+use Smarty\Parser\TemplateParser;
+use Smarty\Smarty;
+use Smarty\Compile\Tag\ExtendsTag;
+use Smarty\CompilerException;
+use Smarty\Exception;
+use function array_merge;
+use function is_array;
+use function strlen;
+use function substr;
+
+/**
+ * Class SmartyTemplateCompiler
+ *
+
+
+ */
+class Template extends BaseCompiler {
+
+	/**
+	 * counter for prefix variable number
+	 *
+	 * @var int
+	 */
+	public static $prefixVariableNumber = 0;
+
+	/**
+	 * Parser object
+	 *
+	 * @var \Smarty\Parser\TemplateParser
+	 */
+	private $parser = null;
+
+	/**
+	 * hash for nocache sections
+	 *
+	 * @var mixed
+	 */
+	public $nocache_hash = null;
+
+	/**
+	 * suppress generation of nocache code
+	 *
+	 * @var bool
+	 */
+	public $suppressNocacheProcessing = false;
+
+	/**
+	 * caching enabled (copied from template object)
+	 *
+	 * @var int
+	 */
+	public $caching = 0;
+
+	/**
+	 * tag stack
+	 *
+	 * @var array
+	 */
+	private $_tag_stack = [];
+
+	/**
+	 * tag stack count
+	 *
+	 * @var array
+	 */
+	private $_tag_stack_count = [];
+
+	/**
+	 * current template
+	 *
+	 * @var \Smarty\Template
+	 */
+	private $template = null;
+
+	/**
+	 * merged included sub template data
+	 *
+	 * @var array
+	 */
+	public $mergedSubTemplatesData = [];
+
+	/**
+	 * merged sub template code
+	 *
+	 * @var array
+	 */
+	public $mergedSubTemplatesCode = [];
+
+	/**
+	 * source line offset for error messages
+	 *
+	 * @var int
+	 */
+	public $trace_line_offset = 0;
+
+	/**
+	 * trace uid
+	 *
+	 * @var string
+	 */
+	public $trace_uid = '';
+
+	/**
+	 * trace file path
+	 *
+	 * @var string
+	 */
+	public $trace_filepath = '';
+
+	/**
+	 * Template functions
+	 *
+	 * @var array
+	 */
+	public $tpl_function = [];
+
+	/**
+	 * compiled template or block function code
+	 *
+	 * @var string
+	 */
+	public $blockOrFunctionCode = '';
+
+	/**
+	 * flags for used modifier plugins
+	 *
+	 * @var array
+	 */
+	public $modifier_plugins = [];
+
+	/**
+	 * parent compiler object for merged subtemplates and template functions
+	 *
+	 * @var \Smarty\Compiler\Template
+	 */
+	private $parent_compiler = null;
+
+	/**
+	 * Flag true when compiling nocache section
+	 *
+	 * @var bool
+	 */
+	public $nocache = false;
+
+	/**
+	 * Flag true when tag is compiled as nocache
+	 *
+	 * @var bool
+	 */
+	public $tag_nocache = false;
+
+	/**
+	 * Compiled tag prefix code
+	 *
+	 * @var array
+	 */
+	public $prefix_code = [];
+
+	/**
+	 * Prefix code  stack
+	 *
+	 * @var array
+	 */
+	public $prefixCodeStack = [];
+
+	/**
+	 * A variable string was compiled
+	 *
+	 * @var bool
+	 */
+	public $has_variable_string = false;
+
+	/**
+	 * Stack for {setfilter} {/setfilter}
+	 *
+	 * @var array
+	 */
+	public $variable_filter_stack = [];
+
+	/**
+	 * Nesting count of looping tags like {foreach}, {for}, {section}, {while}
+	 *
+	 * @var int
+	 */
+	public $loopNesting = 0;
+
+	/**
+	 * Strip preg pattern
+	 *
+	 * @var string
+	 */
+	public $stripRegEx = '![\t ]*[\r\n]+[\t ]*!';
+
+	/**
+	 * General storage area for tag compiler plugins
+	 *
+	 * @var array
+	 */
+	public $_cache = array();
+
+	/**
+	 * Lexer preg pattern for left delimiter
+	 *
+	 * @var string
+	 */
+	private $ldelPreg = '[{]';
+
+	/**
+	 * Lexer preg pattern for right delimiter
+	 *
+	 * @var string
+	 */
+	private $rdelPreg = '[}]';
+
+	/**
+	 * Length of right delimiter
+	 *
+	 * @var int
+	 */
+	private $rdelLength = 0;
+
+	/**
+	 * Length of left delimiter
+	 *
+	 * @var int
+	 */
+	private $ldelLength = 0;
+
+	/**
+	 * Lexer preg pattern for user literals
+	 *
+	 * @var string
+	 */
+	private $literalPreg = '';
+
+	/**
+	 * array of callbacks called when the normal compile process of template is finished
+	 *
+	 * @var array
+	 */
+	public $postCompileCallbacks = [];
+
+	/**
+	 * prefix code
+	 *
+	 * @var string
+	 */
+	public $prefixCompiledCode = '';
+
+	/**
+	 * postfix code
+	 *
+	 * @var string
+	 */
+	public $postfixCompiledCode = '';
+	/**
+	 * @var ObjectMethodBlockCompiler
+	 */
+	private $objectMethodBlockCompiler;
+	/**
+	 * @var DefaultHandlerBlockCompiler
+	 */
+	private $defaultHandlerBlockCompiler;
+	/**
+	 * @var BlockCompiler
+	 */
+	private $blockCompiler;
+	/**
+	 * @var DefaultHandlerFunctionCallCompiler
+	 */
+	private $defaultHandlerFunctionCallCompiler;
+	/**
+	 * @var FunctionCallCompiler
+	 */
+	private $functionCallCompiler;
+	/**
+	 * @var ObjectMethodCallCompiler
+	 */
+	private $objectMethodCallCompiler;
+	/**
+	 * @var ModifierCompiler
+	 */
+	private $modifierCompiler;
+	/**
+	 * @var PrintExpressionCompiler
+	 */
+	private $printExpressionCompiler;
+
+	/**
+	 * Depth of nested {nocache}{/nocache} blocks. If outside, this is 0. If inside, this is 1 or higher (if nested).
+	 * @var int
+	 */
+	private $noCacheStackDepth = 0;
+
+
+	/**
+	 * Initialize compiler
+	 *
+	 * @param Smarty $smarty global instance
+	 */
+	public function __construct(Smarty $smarty) {
+		$this->smarty = $smarty;
+		$this->nocache_hash = str_replace(
+			[
+				'.',
+				',',
+			],
+			'_',
+			uniqid(mt_rand(), true)
+		);
+
+		$this->modifierCompiler = new ModifierCompiler();
+		$this->functionCallCompiler = new FunctionCallCompiler();
+		$this->defaultHandlerFunctionCallCompiler = new DefaultHandlerFunctionCallCompiler();
+		$this->blockCompiler = new BlockCompiler();
+		$this->defaultHandlerBlockCompiler = new DefaultHandlerBlockCompiler();
+		$this->objectMethodBlockCompiler = new ObjectMethodBlockCompiler();
+		$this->objectMethodCallCompiler = new ObjectMethodCallCompiler();
+		$this->printExpressionCompiler = new PrintExpressionCompiler();
+	}
+
+	/**
+	 * Method to compile a Smarty template
+	 *
+	 * @param \Smarty\Template $template template object to compile
+	 *
+	 * @return string code
+	 * @throws Exception
+	 */
+	public function compileTemplate(\Smarty\Template $template) {
+		return $template->createCodeFrame(
+			$this->compileTemplateSource($template),
+			$this->smarty->runPostFilters($this->blockOrFunctionCode, $this->template) .
+			join('', $this->mergedSubTemplatesCode),
+			false,
+			$this
+		);
+	}
+
+	/**
+	 * Compile template source and run optional post filter
+	 *
+	 * @param \Smarty\Template $template
+	 * @param Template|null $parent_compiler
+	 *
+	 * @return string
+	 * @throws CompilerException
+	 * @throws Exception
+	 */
+	public function compileTemplateSource(\Smarty\Template $template, \Smarty\Compiler\Template $parent_compiler = null) {
+		try {
+			// save template object in compiler class
+			$this->template = $template;
+			if ($this->smarty->debugging) {
+				$this->smarty->getDebug()->start_compile($this->template);
+			}
+			$this->parent_compiler = $parent_compiler ? $parent_compiler : $this;
+
+			if (empty($template->getCompiled()->nocache_hash)) {
+				$template->getCompiled()->nocache_hash = $this->nocache_hash;
+			} else {
+				$this->nocache_hash = $template->getCompiled()->nocache_hash;
+			}
+			$this->caching = $template->caching;
+
+			// flag for nocache sections
+			$this->nocache = false;
+			$this->tag_nocache = false;
+			// reset has nocache code flag
+			$this->template->getCompiled()->setNocacheCode(false);
+
+			$this->has_variable_string = false;
+			$this->prefix_code = [];
+			// add file dependency
+			if ($this->template->getSource()->handler->checkTimestamps()) {
+				$this->parent_compiler->getTemplate()->getCompiled()->file_dependency[$this->template->getSource()->uid] =
+					[
+						$this->template->getSource()->getResourceName(),
+						$this->template->getSource()->getTimeStamp(),
+						$this->template->getSource()->type,
+					];
+			}
+			// get template source
+			if (!empty($this->template->getSource()->components)) {
+
+				$_compiled_code = '<?php $_smarty_tpl->getInheritance()->init($_smarty_tpl, true); ?>';
+
+				$i = 0;
+				$reversed_components = array_reverse($this->template->getSource()->components);
+				foreach ($reversed_components as $source) {
+					$i++;
+					if ($i === count($reversed_components)) {
+						$_compiled_code .= '<?php $_smarty_tpl->getInheritance()->endChild($_smarty_tpl); ?>';
+					}
+					$_compiled_code .= $this->compileTag(
+						'include',
+						[
+							var_export($source->resource, true),
+							['scope' => 'parent'],
+						]
+					);
+				}
+				$_compiled_code = $this->smarty->runPostFilters($_compiled_code, $this->template);
+			} else {
+				// get template source
+				$_content = $this->template->getSource()->getContent();
+				$_compiled_code = $this->smarty->runPostFilters(
+					$this->doCompile(
+						$this->smarty->runPreFilters($_content, $this->template),
+						true
+					),
+					$this->template
+				);
+			}
+
+		} catch (\Exception $e) {
+			if ($this->smarty->debugging) {
+				$this->smarty->getDebug()->end_compile($this->template);
+			}
+			$this->_tag_stack = [];
+			// free memory
+			$this->parent_compiler = null;
+			$this->template = null;
+			$this->parser = null;
+			throw $e;
+		}
+		if ($this->smarty->debugging) {
+			$this->smarty->getDebug()->end_compile($this->template);
+		}
+		$this->parent_compiler = null;
+		$this->parser = null;
+		return $_compiled_code;
+	}
+
+	/**
+	 * Compile Tag
+	 * This is a call back from the lexer/parser
+	 *
+	 * Save current prefix code
+	 * Compile tag
+	 * Merge tag prefix code with saved one
+	 * (required nested tags in attributes)
+	 *
+	 * @param string $tag tag name
+	 * @param array $args array with tag attributes
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws Exception
+	 * @throws CompilerException
+	 */
+	public function compileTag($tag, $args, $parameter = []) {
+		$this->prefixCodeStack[] = $this->prefix_code;
+		$this->prefix_code = [];
+		$result = $this->compileTag2($tag, $args, $parameter);
+		$this->prefix_code = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
+		return $result;
+	}
+
+	/**
+	 * Compiles code for modifier execution
+	 *
+	 * @param $modifierlist
+	 * @param $value
+	 *
+	 * @return string compiled code
+	 * @throws CompilerException
+	 * @throws Exception
+	 */
+	public function compileModifier($modifierlist, $value) {
+		return $this->modifierCompiler->compile([], $this, ['modifierlist' => $modifierlist, 'value' => $value]);
+	}
+
+	/**
+	 * compile variable
+	 *
+	 * @param string $variable
+	 *
+	 * @return string
+	 */
+	public function compileVariable($variable) {
+		if (!strpos($variable, '(')) {
+			// not a variable variable
+			$var = trim($variable, '\'');
+			$this->tag_nocache = $this->tag_nocache |
+				$this->template->getVariable(
+					$var,
+					true,
+					false
+				)->isNocache();
+		}
+		return '$_smarty_tpl->getValue(' . $variable . ')';
+	}
+
+	/**
+	 * compile config variable
+	 *
+	 * @param string $variable
+	 *
+	 * @return string
+	 */
+	public function compileConfigVariable($variable) {
+		// return '$_smarty_tpl->config_vars[' . $variable . ']';
+		return '$_smarty_tpl->getConfigVariable(' . $variable . ')';
+	}
+
+	/**
+	 * This method is called from parser to process a text content section if strip is enabled
+	 * - remove text from inheritance child templates as they may generate output
+	 *
+	 * @param string $text
+	 *
+	 * @return string
+	 */
+	public function processText($text) {
+
+		if (strpos($text, '<') === false) {
+			return preg_replace($this->stripRegEx, '', $text);
+		}
+
+		$store = [];
+		$_store = 0;
+
+		// capture html elements not to be messed with
+		$_offset = 0;
+		if (preg_match_all(
+			'#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+			$text,
+			$matches,
+			PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+		)
+		) {
+			foreach ($matches as $match) {
+				$store[] = $match[0][0];
+				$_length = strlen($match[0][0]);
+				$replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+				$text = substr_replace($text, $replace, $match[0][1] - $_offset, $_length);
+				$_offset += $_length - strlen($replace);
+				$_store++;
+			}
+		}
+		$expressions = [// replace multiple spaces between tags by a single space
+			'#(:SMARTY@!@|>)[\040\011]+(?=@!@SMARTY:|<)#s' => '\1 \2',
+			// remove newline between tags
+			'#(:SMARTY@!@|>)[\040\011]*[\n]\s*(?=@!@SMARTY:|<)#s' => '\1\2',
+			// remove multiple spaces between attributes (but not in attribute values!)
+			'#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
+			'#>[\040\011]+$#Ss' => '> ',
+			'#>[\040\011]*[\n]\s*$#Ss' => '>',
+			$this->stripRegEx => '',
+		];
+		$text = preg_replace(array_keys($expressions), array_values($expressions), $text);
+		$_offset = 0;
+		if (preg_match_all(
+			'#@!@SMARTY:([0-9]+):SMARTY@!@#is',
+			$text,
+			$matches,
+			PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+		)
+		) {
+			foreach ($matches as $match) {
+				$_length = strlen($match[0][0]);
+				$replace = $store[$match[1][0]];
+				$text = substr_replace($text, $replace, $match[0][1] + $_offset, $_length);
+				$_offset += strlen($replace) - $_length;
+				$_store++;
+			}
+		}
+		return $text;
+	}
+
+	/**
+	 * lazy loads internal compile plugin for tag compile objects cached for reuse.
+	 *
+	 * class name format:  \Smarty\Compile\TagName
+	 *
+	 * @param string $tag tag name
+	 *
+	 * @return ?\Smarty\Compile\CompilerInterface tag compiler object or null if not found or untrusted by security policy
+	 */
+	public function getTagCompiler($tag): ?\Smarty\Compile\CompilerInterface {
+        $tag = strtolower($tag);
+
+		if (isset($this->smarty->security_policy) && !$this->smarty->security_policy->isTrustedTag($tag, $this)) {
+			return null;
+		}
+
+		foreach ($this->smarty->getExtensions() as $extension) {
+			if ($compiler = $extension->getTagCompiler($tag)) {
+				return $compiler;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * lazy loads internal compile plugin for modifier compile objects cached for reuse.
+	 *
+	 * @param string $modifier tag name
+	 *
+	 * @return bool|\Smarty\Compile\Modifier\ModifierCompilerInterface tag compiler object or false if not found or untrusted by security policy
+	 */
+	public function getModifierCompiler($modifier) {
+
+		if (isset($this->smarty->security_policy) && !$this->smarty->security_policy->isTrustedModifier($modifier, $this)) {
+			return false;
+		}
+
+		foreach ($this->smarty->getExtensions() as $extension) {
+			if ($modifierCompiler = $extension->getModifierCompiler($modifier)) {
+				return $modifierCompiler;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check for plugins by default plugin handler
+	 *
+	 * @param string $tag name of tag
+	 * @param string $plugin_type type of plugin
+	 *
+	 * @return callback|null
+	 * @throws \Smarty\CompilerException
+	 */
+	public function getPluginFromDefaultHandler($tag, $plugin_type) {
+
+		$defaultPluginHandlerFunc = $this->smarty->getDefaultPluginHandlerFunc();
+
+		if (!is_callable($defaultPluginHandlerFunc)) {
+			return null;
+		}
+
+
+		$callback = null;
+		$script = null;
+		$cacheable = true;
+
+		$result = call_user_func_array(
+			$defaultPluginHandlerFunc,
+			[
+				$tag,
+				$plugin_type,
+				null, // This used to pass $this->template, but this parameter has been removed in 5.0
+				&$callback,
+				&$script,
+				&$cacheable,
+			]
+		);
+		if ($result) {
+			$this->tag_nocache = $this->tag_nocache || !$cacheable;
+			if ($script !== null) {
+				if (is_file($script)) {
+					include_once $script;
+				} else {
+					$this->trigger_template_error("Default plugin handler: Returned script file '{$script}' for '{$tag}' not found");
+				}
+			}
+			if (is_callable($callback)) {
+				return $callback;
+			} else {
+				$this->trigger_template_error("Default plugin handler: Returned callback for '{$tag}' not callable");
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Append code segments and remove unneeded ?> <?php transitions
+	 *
+	 * @param string $left
+	 * @param string $right
+	 *
+	 * @return string
+	 */
+	public function appendCode(string $left, string $right): string
+	{
+		if (preg_match('/\s*\?>\s?$/D', $left) && preg_match('/^<\?php\s+/', $right)) {
+			$left = preg_replace('/\s*\?>\s?$/D', "\n", $left);
+			$left .= preg_replace('/^<\?php\s+/', '', $right);
+		} else {
+			$left .= $right;
+		}
+		return $left;
+	}
+
+	/**
+	 * Inject inline code for nocache template sections
+	 * This method gets the content of each template element from the parser.
+	 * If the content is compiled code, and it should be not be cached the code is injected
+	 * into the rendered output.
+	 *
+	 * @param string $content content of template element
+	 *
+	 * @return string  content
+	 */
+	public function processNocacheCode($content) {
+
+		// If the template is not evaluated, and we have a nocache section and/or a nocache tag
+		// generate replacement code
+		if (!empty($content)
+			&& !($this->template->getSource()->handler->recompiled)
+			&& $this->caching
+			&& $this->isNocacheActive()
+		) {
+			$this->template->getCompiled()->setNocacheCode(true);
+			$_output = addcslashes($content, '\'\\');
+			$_output =
+				"<?php echo '" . $this->getNocacheBlockStartMarker() . $_output . $this->getNocacheBlockEndMarker() . "';?>\n";
+		} else {
+			$_output = $content;
+		}
+
+		$this->modifier_plugins = [];
+		$this->suppressNocacheProcessing = false;
+		$this->tag_nocache = false;
+		return $_output;
+	}
+
+
+	private function getNocacheBlockStartMarker(): string {
+		return "/*%%SmartyNocache:{$this->nocache_hash}%%*/";
+	}
+
+	private function getNocacheBlockEndMarker(): string {
+		return "/*/%%SmartyNocache:{$this->nocache_hash}%%*/";
+	}
+
+
+	/**
+	 * Get Id
+	 *
+	 * @param string $input
+	 *
+	 * @return bool|string
+	 */
+	public function getId($input) {
+		if (preg_match('~^([\'"]*)([0-9]*[a-zA-Z_]\w*)\1$~', $input, $match)) {
+			return $match[2];
+		}
+		return false;
+	}
+
+	/**
+	 * Set nocache flag in variable or create new variable
+	 *
+	 * @param string $varName
+	 */
+	public function setNocacheInVariable($varName) {
+		// create nocache var to make it know for further compiling
+		if ($_var = $this->getId($varName)) {
+			if ($this->template->hasVariable($_var)) {
+				$this->template->getVariable($_var)->setNocache(true);
+			} else {
+				$this->template->assign($_var, null, true);
+			}
+		}
+	}
+
+	/**
+	 * display compiler error messages without dying
+	 * If parameter $args is empty it is a parser detected syntax error.
+	 * In this case the parser is called to obtain information about expected tokens.
+	 * If parameter $args contains a string this is used as error message
+	 *
+	 * @param string $args individual error message or null
+	 * @param string $line line-number
+	 * @param null|bool $tagline if true the line number of last tag
+	 *
+	 * @throws \Smarty\CompilerException when an unexpected token is found
+	 */
+	public function trigger_template_error($args = null, $line = null, $tagline = null) {
+		$lex = $this->parser->lex;
+		if ($tagline === true) {
+			// get line number of Tag
+			$line = $lex->taglineno;
+		} elseif (!isset($line)) {
+			// get template source line which has error
+			$line = $lex->line;
+		} else {
+			$line = (int)$line;
+		}
+		if (in_array(
+			$this->template->getSource()->type,
+			[
+				'eval',
+				'string',
+			]
+		)
+		) {
+			$templateName = $this->template->getSource()->type . ':' . trim(
+					preg_replace(
+						'![\t\r\n]+!',
+						' ',
+						strlen($lex->data) > 40 ?
+							substr($lex->data, 0, 40) .
+							'...' : $lex->data
+					)
+				);
+		} else {
+			$templateName = $this->template->getSource()->getFullResourceName();
+		}
+		//        $line += $this->trace_line_offset;
+		$match = preg_split("/\n/", $lex->data);
+		$error_text =
+			'Syntax error in template "' . (empty($this->trace_filepath) ? $templateName : $this->trace_filepath) .
+			'"  on line ' . ($line + $this->trace_line_offset) . ' "' .
+			trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1])) . '" ';
+		if (isset($args)) {
+			// individual error message
+			$error_text .= $args;
+		} else {
+			$expect = [];
+			// expected token from parser
+			$error_text .= ' - Unexpected "' . $lex->value . '"';
+			if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4) {
+				foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
+					$exp_token = $this->parser->yyTokenName[$token];
+					if (isset($lex->smarty_token_names[$exp_token])) {
+						// token type from lexer
+						$expect[] = '"' . $lex->smarty_token_names[$exp_token] . '"';
+					} else {
+						// otherwise internal token name
+						$expect[] = $this->parser->yyTokenName[$token];
+					}
+				}
+				$error_text .= ', expected one of: ' . implode(' , ', $expect);
+			}
+		}
+		if ($this->smarty->_parserdebug) {
+			$this->parser->errorRunDown();
+			echo ob_get_clean();
+			flush();
+		}
+		$e = new CompilerException(
+			$error_text,
+			0,
+			$this->template->getSource()->getFilepath() ?? $this->template->getSource()->getFullResourceName(),
+			$line
+		);
+		$e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1]));
+		$e->desc = $args;
+		$e->template = $this->template->getSource()->getFullResourceName();
+		throw $e;
+	}
+
+	/**
+	 * Return var_export() value with all white spaces removed
+	 *
+	 * @param mixed $value
+	 *
+	 * @return string
+	 */
+	public function getVarExport($value) {
+		return preg_replace('/\s/', '', var_export($value, true));
+	}
+
+	/**
+	 *  enter double quoted string
+	 *  - save tag stack count
+	 */
+	public function enterDoubleQuote() {
+		array_push($this->_tag_stack_count, $this->getTagStackCount());
+	}
+
+	/**
+	 * Return tag stack count
+	 *
+	 * @return int
+	 */
+	public function getTagStackCount() {
+		return count($this->_tag_stack);
+	}
+
+	/**
+	 * @param $lexerPreg
+	 *
+	 * @return mixed
+	 */
+	public function replaceDelimiter($lexerPreg) {
+		return str_replace(
+			['SMARTYldel', 'SMARTYliteral', 'SMARTYrdel', 'SMARTYautoliteral', 'SMARTYal'],
+			[
+				$this->ldelPreg, $this->literalPreg, $this->rdelPreg,
+				$this->smarty->getAutoLiteral() ? '{1,}' : '{9}',
+				$this->smarty->getAutoLiteral() ? '' : '\\s*',
+			],
+			$lexerPreg
+		);
+	}
+
+	/**
+	 * Build lexer regular expressions for left and right delimiter and user defined literals
+	 */
+	public function initDelimiterPreg() {
+		$ldel = $this->smarty->getLeftDelimiter();
+		$this->ldelLength = strlen($ldel);
+		$this->ldelPreg = '';
+		foreach (str_split($ldel, 1) as $chr) {
+			$this->ldelPreg .= '[' . preg_quote($chr, '/') . ']';
+		}
+		$rdel = $this->smarty->getRightDelimiter();
+		$this->rdelLength = strlen($rdel);
+		$this->rdelPreg = '';
+		foreach (str_split($rdel, 1) as $chr) {
+			$this->rdelPreg .= '[' . preg_quote($chr, '/') . ']';
+		}
+		$literals = $this->smarty->getLiterals();
+		if (!empty($literals)) {
+			foreach ($literals as $key => $literal) {
+				$literalPreg = '';
+				foreach (str_split($literal, 1) as $chr) {
+					$literalPreg .= '[' . preg_quote($chr, '/') . ']';
+				}
+				$literals[$key] = $literalPreg;
+			}
+			$this->literalPreg = '|' . implode('|', $literals);
+		} else {
+			$this->literalPreg = '';
+		}
+	}
+
+	/**
+	 *  leave double quoted string
+	 *  - throw exception if block in string was not closed
+	 *
+	 * @throws \Smarty\CompilerException
+	 */
+	public function leaveDoubleQuote() {
+		if (array_pop($this->_tag_stack_count) !== $this->getTagStackCount()) {
+			$tag = $this->getOpenBlockTag();
+			$this->trigger_template_error(
+				"unclosed '{{$tag}}' in doubled quoted string",
+				null,
+				true
+			);
+		}
+	}
+
+	/**
+	 * Get left delimiter preg
+	 *
+	 * @return string
+	 */
+	public function getLdelPreg() {
+		return $this->ldelPreg;
+	}
+
+	/**
+	 * Get right delimiter preg
+	 *
+	 * @return string
+	 */
+	public function getRdelPreg() {
+		return $this->rdelPreg;
+	}
+
+	/**
+	 * Get length of left delimiter
+	 *
+	 * @return int
+	 */
+	public function getLdelLength() {
+		return $this->ldelLength;
+	}
+
+	/**
+	 * Get length of right delimiter
+	 *
+	 * @return int
+	 */
+	public function getRdelLength() {
+		return $this->rdelLength;
+	}
+
+	/**
+	 * Get name of current open block tag
+	 *
+	 * @return string|boolean
+	 */
+	public function getOpenBlockTag() {
+		$tagCount = $this->getTagStackCount();
+		if ($tagCount) {
+			return $this->_tag_stack[$tagCount - 1][0];
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Check if $value contains variable elements
+	 *
+	 * @param mixed $value
+	 *
+	 * @return bool|int
+	 */
+	public function isVariable($value) {
+		if (is_string($value)) {
+			return preg_match('/[$(]/', $value);
+		}
+		if (is_bool($value) || is_numeric($value)) {
+			return false;
+		}
+		if (is_array($value)) {
+			foreach ($value as $k => $v) {
+				if ($this->isVariable($k) || $this->isVariable($v)) {
+					return true;
+				}
+			}
+			return false;
+		}
+		return false;
+	}
+
+	/**
+	 * Get new prefix variable name
+	 *
+	 * @return string
+	 */
+	public function getNewPrefixVariable() {
+		++self::$prefixVariableNumber;
+		return $this->getPrefixVariable();
+	}
+
+	/**
+	 * Get current prefix variable name
+	 *
+	 * @return string
+	 */
+	public function getPrefixVariable() {
+		return '$_prefixVariable' . self::$prefixVariableNumber;
+	}
+
+	/**
+	 * append  code to prefix buffer
+	 *
+	 * @param string $code
+	 */
+	public function appendPrefixCode($code) {
+		$this->prefix_code[] = $code;
+	}
+
+	/**
+	 * get prefix code string
+	 *
+	 * @return string
+	 */
+	public function getPrefixCode() {
+		$code = '';
+		$prefixArray = array_merge($this->prefix_code, array_pop($this->prefixCodeStack));
+		$this->prefixCodeStack[] = [];
+		foreach ($prefixArray as $c) {
+			$code = $this->appendCode($code, (string) $c);
+		}
+		$this->prefix_code = [];
+		return $code;
+	}
+
+	public function cStyleComment($string) {
+		return '/*' . str_replace('*/', '* /', $string) . '*/';
+	}
+
+	public function compileChildBlock() {
+		return $this->blockCompiler->compileChild($this);
+	}
+
+	public function compileParentBlock() {
+		return $this->blockCompiler->compileParent($this);
+	}
+
+	/**
+	 * Compile Tag
+	 *
+	 * @param string $tag tag name
+	 * @param array $args array with tag attributes
+	 * @param array $parameter array with compilation parameter
+	 *
+	 * @return string compiled code
+	 * @throws Exception
+	 * @throws CompilerException
+	 */
+	private function compileTag2($tag, $args, $parameter) {
+		// $args contains the attributes parsed and compiled by the lexer/parser
+
+		$this->handleNocacheFlag($args);
+
+		// compile built-in tags
+		if ($tagCompiler = $this->getTagCompiler($tag)) {
+			if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
+				$this->tag_nocache = $this->tag_nocache | !$tagCompiler->isCacheable();
+				$_output = $tagCompiler->compile($args, $this, $parameter);
+				if (!empty($parameter['modifierlist'])) {
+					throw new CompilerException('No modifiers allowed on ' . $tag);
+				}
+				return $_output;
+			}
+		}
+
+		// call to function previously defined by {function} tag
+		if ($this->canCompileTemplateFunctionCall($tag)) {
+
+			if (!empty($parameter['modifierlist'])) {
+				throw new CompilerException('No modifiers allowed on ' . $tag);
+			}
+
+			$args['_attr']['name'] = "'{$tag}'";
+			$tagCompiler = $this->getTagCompiler('call');
+			return $tagCompiler === null ? false : $tagCompiler->compile($args, $this, $parameter);
+		}
+
+		// remaining tastes: (object-)function, (object-function-)block, custom-compiler
+		// opening and closing tags for these are handled with the same handler
+		$base_tag = $this->getBaseTag($tag);
+
+		// check if tag is a registered object
+		if (isset($this->smarty->registered_objects[$base_tag]) && isset($parameter['object_method'])) {
+			return $this->compileRegisteredObjectMethodCall($base_tag, $args, $parameter, $tag);
+		}
+
+		// check if tag is a function
+		if ($this->smarty->getFunctionHandler($base_tag)) {
+			if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($base_tag, $this)) {
+				return (new \Smarty\Compile\PrintExpressionCompiler())->compile(
+					['nofilter'], // functions are never auto-escaped
+					$this,
+					['value' =>	$this->compileFunctionCall($base_tag, $args, $parameter)]
+				);
+			}
+		}
+
+		// check if tag is a block
+		if ($this->smarty->getBlockHandler($base_tag)) {
+			if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($base_tag, $this)) {
+				return $this->blockCompiler->compile($args, $this, $parameter, $tag, $base_tag);
+			}
+		}
+
+		// the default plugin handler is a handler of last resort, it may also handle not specifically registered tags.
+		if ($callback = $this->getPluginFromDefaultHandler($base_tag, Smarty::PLUGIN_COMPILER)) {
+			if (!empty($parameter['modifierlist'])) {
+				throw new CompilerException('No modifiers allowed on ' . $base_tag);
+			}
+			$tagCompiler = new \Smarty\Compile\Tag\BCPluginWrapper($callback);
+			return $tagCompiler->compile($args, $this, $parameter);
+		}
+
+		if ($this->getPluginFromDefaultHandler($base_tag, Smarty::PLUGIN_FUNCTION)) {
+			return $this->defaultHandlerFunctionCallCompiler->compile($args, $this, $parameter, $tag, $base_tag);
+		}
+
+		if ($this->getPluginFromDefaultHandler($base_tag, Smarty::PLUGIN_BLOCK)) {
+			return $this->defaultHandlerBlockCompiler->compile($args, $this, $parameter, $tag, $base_tag);
+		}
+
+		$this->trigger_template_error("unknown tag '{$tag}'", null, true);
+	}
+
+	/**
+	 * Sets $this->tag_nocache if attributes contain the 'nocache' flag.
+	 *
+	 * @param array $attributes
+	 *
+	 * @return void
+	 */
+	private function handleNocacheFlag(array $attributes) {
+		foreach ($attributes as $value) {
+			if (is_string($value) && trim($value, '\'" ') == 'nocache') {
+				$this->tag_nocache = true;
+			}
+		}
+	}
+
+	private function getBaseTag($tag) {
+		if (strlen($tag) < 6 || substr($tag, -5) !== 'close') {
+			return $tag;
+		} else {
+			return substr($tag, 0, -5);
+		}
+	}
+
+	/**
+	 * Compiles the output of a variable or expression.
+	 *
+	 * @param $value
+	 * @param $attributes
+	 * @param $modifiers
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function compilePrintExpression($value, $attributes = [], $modifiers = null) {
+		$this->handleNocacheFlag($attributes);
+		return $this->printExpressionCompiler->compile($attributes, $this, [
+			'value'=> $value,
+			'modifierlist' => $modifiers,
+		]);
+	}
+
+	/**
+	 * method to compile a Smarty template
+	 *
+	 * @param mixed $_content template source
+	 * @param bool $isTemplateSource
+	 *
+	 * @return bool true if compiling succeeded, false if it failed
+	 * @throws \Smarty\CompilerException
+	 */
+	protected function doCompile($_content, $isTemplateSource = false) {
+		/* here is where the compiling takes place. Smarty
+		  tags in the templates are replaces with PHP code,
+		  then written to compiled files. */
+		// init the lexer/parser to compile the template
+		$this->parser = new TemplateParser(
+				new TemplateLexer(
+					str_replace(
+						[
+							"\r\n",
+							"\r",
+						],
+						"\n",
+						$_content
+					),
+					$this
+				),
+				$this
+			);
+		if ($isTemplateSource && $this->template->caching) {
+			$this->parser->insertPhpCode("<?php\n\$_smarty_tpl->getCompiled()->nocache_hash = '{$this->nocache_hash}';\n?>\n");
+		}
+		if ($this->smarty->_parserdebug) {
+			$this->parser->PrintTrace();
+			$this->parser->lex->PrintTrace();
+		}
+		// get tokens from lexer and parse them
+		while ($this->parser->lex->yylex()) {
+			if ($this->smarty->_parserdebug) {
+				echo "Line {$this->parser->lex->line} Parsing  {$this->parser->yyTokenName[$this->parser->lex->token]} Token " .
+					$this->parser->lex->value;
+			}
+			$this->parser->doParse($this->parser->lex->token, $this->parser->lex->value);
+		}
+		// finish parsing process
+		$this->parser->doParse(0, 0);
+		// check for unclosed tags
+		if ($this->getTagStackCount() > 0) {
+			// get stacked info
+			[$openTag, $_data] = array_pop($this->_tag_stack);
+			$this->trigger_template_error(
+				"unclosed " . $this->smarty->getLeftDelimiter() . $openTag .
+				$this->smarty->getRightDelimiter() . " tag"
+			);
+		}
+		// call post compile callbacks
+		foreach ($this->postCompileCallbacks as $cb) {
+			$parameter = $cb;
+			$parameter[0] = $this;
+			call_user_func_array($cb[0], $parameter);
+		}
+		// return compiled code
+		return $this->prefixCompiledCode . $this->parser->retvalue . $this->postfixCompiledCode;
+	}
+
+	/**
+	 * Register a post compile callback
+	 * - when the callback is called after template compiling the compiler object will be inserted as first parameter
+	 *
+	 * @param callback $callback
+	 * @param array $parameter optional parameter array
+	 * @param string $key optional key for callback
+	 * @param bool $replace if true replace existing keyed callback
+	 */
+	public function registerPostCompileCallback($callback, $parameter = [], $key = null, $replace = false) {
+		array_unshift($parameter, $callback);
+		if (isset($key)) {
+			if ($replace || !isset($this->postCompileCallbacks[$key])) {
+				$this->postCompileCallbacks[$key] = $parameter;
+			}
+		} else {
+			$this->postCompileCallbacks[] = $parameter;
+		}
+	}
+
+	/**
+	 * Remove a post compile callback
+	 *
+	 * @param string $key callback key
+	 */
+	public function unregisterPostCompileCallback($key) {
+		unset($this->postCompileCallbacks[$key]);
+	}
+
+	/**
+	 * @param string $tag
+	 *
+	 * @return bool
+	 * @throws Exception
+	 */
+	private function canCompileTemplateFunctionCall(string $tag): bool {
+		return
+			isset($this->parent_compiler->tpl_function[$tag])
+			|| (
+				$this->template->getSmarty()->hasRuntime('TplFunction')
+				&& ($this->template->getSmarty()->getRuntime('TplFunction')->getTplFunction($this->template, $tag) !== false)
+			);
+	}
+
+	/**
+	 * @throws CompilerException
+	 */
+	private function compileRegisteredObjectMethodCall(string $base_tag, array $args, array $parameter, string $tag) {
+
+		$method = $parameter['object_method'];
+		$allowedAsBlockFunction = in_array($method, $this->smarty->registered_objects[$base_tag][3]);
+
+		if ($base_tag === $tag) {
+			// opening tag
+
+			$allowedAsNormalFunction = empty($this->smarty->registered_objects[$base_tag][1])
+				|| in_array($method, $this->smarty->registered_objects[$base_tag][1]);
+
+			if ($allowedAsBlockFunction) {
+				return $this->objectMethodBlockCompiler->compile($args, $this, $parameter, $tag, $method);
+			} elseif ($allowedAsNormalFunction) {
+				return $this->objectMethodCallCompiler->compile($args, $this, $parameter, $tag, $method);
+			}
+
+			$this->trigger_template_error(
+				'not allowed method "' . $method . '" in registered object "' .
+				$tag . '"',
+				null,
+				true
+			);
+		}
+
+		// closing tag
+		if ($allowedAsBlockFunction) {
+			return $this->objectMethodBlockCompiler->compile($args, $this, $parameter, $tag, $method);
+		}
+
+		$this->trigger_template_error(
+			'not allowed closing tag method "' . $method .
+			'" in registered object "' . $base_tag . '"',
+			null,
+			true
+		);
+	}
+
+	public function compileFunctionCall(string $base_tag, array $args, array $parameter = []) {
+		return $this->functionCallCompiler->compile($args, $this, $parameter, $base_tag, $base_tag);
+	}
+
+	public function compileModifierInExpression(string $function, array $_attr) {
+		$value = array_shift($_attr);
+		return $this->compileModifier([array_merge([$function], $_attr)], $value);
+	}
+
+	/**
+	 * @return TemplateParser|null
+	 */
+	public function getParser(): ?TemplateParser {
+		return $this->parser;
+	}
+
+	/**
+	 * @param TemplateParser|null $parser
+	 */
+	public function setParser(?TemplateParser $parser): void {
+		$this->parser = $parser;
+	}
+
+	/**
+	 * @return \Smarty\Template|null
+	 */
+	public function getTemplate(): ?\Smarty\Template {
+		return $this->template;
+	}
+
+	/**
+	 * @param \Smarty\Template|null $template
+	 */
+	public function setTemplate(?\Smarty\Template $template): void {
+		$this->template = $template;
+	}
+
+	/**
+	 * @return Template|null
+	 */
+	public function getParentCompiler(): ?Template {
+		return $this->parent_compiler;
+	}
+
+	/**
+	 * @param Template|null $parent_compiler
+	 */
+	public function setParentCompiler(?Template $parent_compiler): void {
+		$this->parent_compiler = $parent_compiler;
+	}
+
+
+	/**
+	 * Push opening tag name on stack
+	 * Optionally additional data can be saved on stack
+	 *
+	 * @param string $openTag the opening tag's name
+	 * @param mixed $data optional data saved
+	 */
+	public function openTag($openTag, $data = null) {
+		$this->_tag_stack[] = [$openTag, $data];
+		if ($openTag == 'nocache') {
+			$this->noCacheStackDepth++;
+		}
+	}
+
+	/**
+	 * Pop closing tag
+	 * Raise an error if this stack-top doesn't match with expected opening tags
+	 *
+	 * @param array|string $expectedTag the expected opening tag names
+	 *
+	 * @return mixed        any type the opening tag's name or saved data
+	 * @throws CompilerException
+	 */
+	public function closeTag($expectedTag) {
+		if ($this->getTagStackCount() > 0) {
+			// get stacked info
+			[$_openTag, $_data] = array_pop($this->_tag_stack);
+			// open tag must match with the expected ones
+			if (in_array($_openTag, (array)$expectedTag)) {
+
+				if ($_openTag == 'nocache') {
+					$this->noCacheStackDepth--;
+				}
+
+				if (is_null($_data)) {
+					// return opening tag
+					return $_openTag;
+				} else {
+					// return restored data
+					return $_data;
+				}
+			}
+			// wrong nesting of tags
+			$this->trigger_template_error("unclosed '" . $this->getTemplate()->getLeftDelimiter() . "{$_openTag}" .
+				$this->getTemplate()->getRightDelimiter() . "' tag");
+			return;
+		}
+		// wrong nesting of tags
+		$this->trigger_template_error('unexpected closing tag', null, true);
+	}
+
+	/**
+	 * Returns true if we are in a {nocache}...{/nocache} block, but false if inside {block} tag inside a {nocache} block...
+	 * @return bool
+	 */
+	public function isNocacheActive(): bool {
+		return !$this->suppressNocacheProcessing && ($this->noCacheStackDepth > 0 || $this->tag_nocache);
+	}
+
+	/**
+	 * Returns the full tag stack, used in the compiler for {break}
+	 * @return array
+	 */
+	public function getTagStack(): array {
+		return $this->_tag_stack;
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/CompilerException.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/CompilerException.php
new file mode 100644
index 000000000..e3d67b46c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/CompilerException.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Smarty;
+
+/**
+ * Smarty compiler exception class
+ *
+
+ */
+class CompilerException extends Exception {
+
+	/**
+	 * The constructor of the exception
+	 *
+	 * @param string $message The Exception message to throw.
+	 * @param int $code The Exception code.
+	 * @param string|null $filename The filename where the exception is thrown.
+	 * @param int|null $line The line number where the exception is thrown.
+	 * @param Throwable|null $previous The previous exception used for the exception chaining.
+	 */
+	public function __construct(
+		string    $message = "",
+		int       $code = 0,
+		?string   $filename = null,
+		?int      $line = null,
+		Throwable $previous = null
+	) {
+		parent::__construct($message, $code, $previous);
+
+		// These are optional parameters, should be be overridden only when present!
+		if ($filename) {
+			$this->file = $filename;
+		}
+		if ($line) {
+			$this->line = $line;
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function __toString() {
+		return ' --> Smarty Compiler: ' . $this->message . ' <-- ';
+	}
+
+	/**
+	 * @param int $line
+	 */
+	public function setLine($line) {
+		$this->line = $line;
+	}
+
+	/**
+	 * The template source snippet relating to the error
+	 *
+	 * @type string|null
+	 */
+	public $source = null;
+
+	/**
+	 * The raw text of the error message
+	 *
+	 * @type string|null
+	 */
+	public $desc = null;
+
+	/**
+	 * The resource identifier or template name
+	 *
+	 * @type string|null
+	 */
+	public $template = null;
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Data.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Data.php
new file mode 100644
index 000000000..f8abe0f6d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Data.php
@@ -0,0 +1,521 @@
+<?php
+
+namespace Smarty;
+
+/**
+ * Smarty Internal Plugin Data
+ * This file contains the basic properties and methods for holding config and template variables
+ */
+class Data
+{
+
+	/**
+	 * define variable scopes
+	 */
+	const SCOPE_LOCAL    = 1;
+	const SCOPE_PARENT   = 2;
+	const SCOPE_TPL_ROOT = 4;
+	const SCOPE_ROOT     = 8;
+	const SCOPE_SMARTY   = 16;
+	const SCOPE_GLOBAL   = 32;
+
+	/**
+	 * Global smarty instance
+	 *
+	 * @var Smarty
+	 */
+	protected $smarty = null;
+
+    /**
+     * template variables
+     *
+     * @var Variable[]
+     */
+    public $tpl_vars = array();
+
+    /**
+     * parent data container (if any)
+     *
+     * @var Data
+     */
+    public $parent = null;
+
+    /**
+     * configuration settings
+     *
+     * @var string[]
+     */
+    public $config_vars = array();
+
+	/**
+	 * This variable will hold a stack of template variables.
+	 *
+	 * @var null|array
+	 */
+	private $_var_stack = [];
+
+	/**
+	 * This variable will hold a stack of config variables.
+	 *
+	 * @var null|array
+	 */
+	private $_config_stack = [];
+
+	/**
+	 * Default scope for new variables
+	 * @var int
+	 */
+	protected $defaultScope = self::SCOPE_LOCAL;
+
+	/**
+	 * create Smarty data object
+	 *
+	 * @param Smarty|array $_parent parent template
+	 * @param Smarty|Template $smarty global smarty instance
+	 * @param string $name optional data block name
+	 *
+	 * @throws Exception
+	 */
+	public function __construct($_parent = null, $smarty = null, $name = null) {
+
+		$this->smarty = $smarty;
+		if (is_object($_parent)) {
+			// when object set up back pointer
+			$this->parent = $_parent;
+		} elseif (is_array($_parent)) {
+			// set up variable values
+			foreach ($_parent as $_key => $_val) {
+				$this->assign($_key, $_val);
+			}
+		} elseif ($_parent !== null) {
+			throw new Exception('Wrong type for template variables');
+		}
+	}
+
+	/**
+	 * assigns a Smarty variable
+	 *
+	 * @param array|string $tpl_var the template variable name(s)
+	 * @param mixed $value the value to assign
+	 * @param boolean $nocache if true any output of this variable will be not cached
+	 * @param int $scope one of self::SCOPE_* constants
+	 *
+	 * @return Data current Data (or Smarty or \Smarty\Template) instance for
+	 *                              chaining
+	 */
+    public function assign($tpl_var, $value = null, $nocache = false, $scope = null)
+    {
+        if (is_array($tpl_var)) {
+            foreach ($tpl_var as $_key => $_val) {
+                $this->assign($_key, $_val, $nocache, $scope);
+            }
+			return $this;
+        }
+		switch ($scope ?? $this->getDefaultScope()) {
+			case self::SCOPE_GLOBAL:
+			case self::SCOPE_SMARTY:
+				$this->getSmarty()->assign($tpl_var, $value);
+				break;
+			case self::SCOPE_TPL_ROOT:
+				$ptr = $this;
+				while (isset($ptr->parent) && ($ptr->parent instanceof Template)) {
+					$ptr = $ptr->parent;
+				}
+				$ptr->assign($tpl_var, $value);
+				break;
+			case self::SCOPE_ROOT:
+				$ptr = $this;
+				while (isset($ptr->parent) && !($ptr->parent instanceof Smarty)) {
+					$ptr = $ptr->parent;
+				}
+				$ptr->assign($tpl_var, $value);
+				break;
+			case self::SCOPE_PARENT:
+				if ($this->parent) {
+					$this->parent->assign($tpl_var, $value);
+				} else {
+					// assign local as fallback
+					$this->assign($tpl_var, $value);
+				}
+				break;
+			case self::SCOPE_LOCAL:
+			default:
+				if (isset($this->tpl_vars[$tpl_var])) {
+					$this->tpl_vars[$tpl_var]->setValue($value);
+					if ($nocache) {
+						$this->tpl_vars[$tpl_var]->setNocache(true);
+					}
+				} else {
+					$this->tpl_vars[$tpl_var] = new Variable($value, $nocache);
+				}
+		}
+
+        return $this;
+    }
+
+    /**
+     * appends values to template variables
+     *
+     * @param array|string $tpl_var the template variable name(s)
+     * @param mixed        $value   the value to append
+     * @param bool         $merge   flag if array elements shall be merged
+     * @param bool         $nocache if true any output of this variable will
+     *                              be not cached
+     *
+     * @return Data
+     * @api  Smarty::append()
+     */
+	public function append($tpl_var, $value = null, $merge = false, $nocache = false)
+	{
+		if (is_array($tpl_var)) {
+			foreach ($tpl_var as $_key => $_val) {
+				$this->append($_key, $_val, $merge, $nocache);
+			}
+		} else {
+
+			$newValue = $this->getValue($tpl_var) ?? [];
+			if (!is_array($newValue)) {
+				$newValue = (array) $newValue;
+			}
+
+			if ($merge && is_array($value)) {
+				foreach ($value as $_mkey => $_mval) {
+					$newValue[$_mkey] = $_mval;
+				}
+			} else {
+				$newValue[] = $value;
+			}
+
+			$this->assign($tpl_var, $newValue, $nocache);
+		}
+		return $this;
+	}
+
+    /**
+     * assigns a global Smarty variable
+     *
+     * @param string  $varName the global variable name
+     * @param mixed   $value   the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     *
+     * @return Data
+     * @deprecated since 5.0
+     */
+    public function assignGlobal($varName, $value = null, $nocache = false)
+    {
+		trigger_error(__METHOD__ . " is deprecated. Use \\Smarty\\Smarty::assign() to assign a variable " .
+		" at the Smarty level.", E_USER_DEPRECATED);
+	    return $this->getSmarty()->assign($varName, $value, $nocache);
+    }
+
+    /**
+     * Returns a single or all template variables
+     *
+     * @param string                                                  $varName       variable name or null
+     * @param bool $searchParents include parent templates?
+     *
+     * @return mixed variable value or or array of variables
+     * @api  Smarty::getTemplateVars()
+     *
+     */
+    public function getTemplateVars($varName = null, $searchParents = true)
+    {
+	    if (isset($varName)) {
+			return $this->getValue($varName, $searchParents);
+	    }
+
+		return array_merge(
+			$this->parent && $searchParents ? $this->parent->getTemplateVars() : [],
+			array_map(function(Variable $var) { return $var->getValue(); }, $this->tpl_vars)
+		);
+    }
+
+	/**
+	 * Wrapper for ::getVariable()
+	 *
+	 * @deprecated since 5.0
+	 *
+	 * @param $varName
+	 * @param $searchParents
+	 * @param $errorEnable
+	 *
+	 * @return void
+	 */
+	public function _getVariable($varName, $searchParents = true, $errorEnable = true) {
+		trigger_error('Using ::_getVariable() to is deprecated and will be ' .
+			'removed in a future release. Use getVariable() instead.', E_USER_DEPRECATED);
+		return $this->getVariable($varName, $searchParents, $errorEnable);
+	}
+
+	/**
+	 * Gets the object of a Smarty variable
+	 *
+	 * @param string $varName the name of the Smarty variable
+	 * @param bool $searchParents search also in parent data
+	 * @param bool $errorEnable
+	 *
+	 * @return Variable
+	 */
+	public function getVariable($varName, $searchParents = true, $errorEnable = true) {
+		if (isset($this->tpl_vars[$varName])) {
+			return $this->tpl_vars[$varName];
+		}
+
+		if ($searchParents && $this->parent) {
+			return $this->parent->getVariable($varName, $searchParents, $errorEnable);
+		}
+
+		if ($errorEnable && $this->getSmarty()->error_unassigned) {
+			// force a notice
+			$x = $$varName;
+		}
+		return new UndefinedVariable();
+	}
+
+	/**
+	 * Directly sets a complete Variable object in the variable with the given name.
+	 * @param $varName
+	 * @param Variable $variableObject
+	 *
+	 * @return void
+	 */
+	public function setVariable($varName, Variable $variableObject) {
+		$this->tpl_vars[$varName] = $variableObject;
+	}
+
+	/**
+	 * Indicates if given variable has been set.
+	 * @param $varName
+	 *
+	 * @return bool
+	 */
+	public function hasVariable($varName): bool {
+		return !($this->getVariable($varName) instanceof UndefinedVariable);
+	}
+
+	/**
+	 * Returns the value of the Smarty\Variable given by $varName, or null if the variable does not exist.
+	 *
+	 * @param $varName
+	 * @param bool $searchParents
+	 *
+	 * @return mixed|null
+	 */
+	public function getValue($varName, $searchParents = true) {
+		$variable = $this->getVariable($varName, $searchParents);
+		return isset($variable) ? $variable->getValue() : null;
+	}
+
+	/**
+	 * load config variables into template object
+	 *
+	 * @param array $new_config_vars
+	 */
+	public function assignConfigVars($new_config_vars, array $sections = []) {
+
+		// copy global config vars
+		foreach ($new_config_vars['vars'] as $variable => $value) {
+			if ($this->getSmarty()->config_overwrite || !isset($this->config_vars[$variable])) {
+				$this->config_vars[$variable] = $value;
+			} else {
+				$this->config_vars[$variable] = array_merge((array)$this->config_vars[$variable], (array)$value);
+			}
+		}
+
+		foreach ($sections as $tpl_section) {
+			if (isset($new_config_vars['sections'][$tpl_section])) {
+				foreach ($new_config_vars['sections'][$tpl_section]['vars'] as $variable => $value) {
+					if ($this->getSmarty()->config_overwrite || !isset($this->config_vars[$variable])) {
+						$this->config_vars[$variable] = $value;
+					} else {
+						$this->config_vars[$variable] = array_merge((array)$this->config_vars[$variable], (array)$value);
+					}
+				}
+			}
+		}
+	}
+
+    /**
+     * Get Smarty object
+     *
+     * @return Smarty
+     */
+    public function getSmarty()
+    {
+        return $this->smarty;
+    }
+
+	/**
+	 * clear the given assigned template variable(s).
+	 *
+	 * @param string|array $tpl_var the template variable(s) to clear
+	 *
+	 * @return Data
+	 *
+	 * @api  Smarty::clearAssign()
+	 */
+	public function clearAssign($tpl_var)
+	{
+		if (is_array($tpl_var)) {
+			foreach ($tpl_var as $curr_var) {
+				unset($this->tpl_vars[ $curr_var ]);
+			}
+		} else {
+			unset($this->tpl_vars[ $tpl_var ]);
+		}
+		return $this;
+	}
+
+	/**
+	 * clear all the assigned template variables.
+	 *
+	 * @return Data
+	 *
+	 * @api  Smarty::clearAllAssign()
+	 */
+	public function clearAllAssign()
+	{
+		$this->tpl_vars = array();
+		return $this;
+	}
+
+	/**
+	 * clear a single or all config variables
+	 *
+	 * @param string|null $name variable name or null
+	 *
+	 * @return Data
+	 *
+	 * @api  Smarty::clearConfig()
+	 */
+	public function clearConfig($name = null)
+	{
+		if (isset($name)) {
+			unset($this->config_vars[ $name ]);
+		} else {
+			$this->config_vars = array();
+		}
+		return $this;
+	}
+
+	/**
+	 * Gets a config variable value
+	 *
+	 * @param string $varName the name of the config variable
+	 *
+	 * @return mixed  the value of the config variable
+	 * @throws Exception
+	 */
+	public function getConfigVariable($varName)
+	{
+
+		if (isset($this->config_vars[$varName])) {
+			return $this->config_vars[$varName];
+		}
+
+		$returnValue = $this->parent ? $this->parent->getConfigVariable($varName) : null;
+
+		if ($returnValue === null && $this->getSmarty()->error_unassigned) {
+			throw new Exception("Undefined variable $varName");
+		}
+
+		return $returnValue;
+	}
+
+	public function hasConfigVariable($varName): bool {
+		try {
+			return $this->getConfigVariable($varName) !== null;
+		} catch (Exception $e) {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns a single or all config variables
+	 *
+	 * @param string $varname variable name or null
+	 *
+	 * @return mixed variable value or or array of variables
+	 * @throws Exception
+	 *
+	 * @api  Smarty::getConfigVars()
+	 */
+	public function getConfigVars($varname = null)
+	{
+		if (isset($varname)) {
+			return $this->getConfigVariable($varname);
+		}
+
+		return array_merge($this->parent ? $this->parent->getConfigVars() : [], $this->config_vars);
+	}
+
+	/**
+	 * load a config file, optionally load just selected sections
+	 *
+	 * @param string $config_file filename
+	 * @param mixed                                                   $sections    array of section names, single
+	 *                                                                             section or null
+
+	 * @returns $this
+	 * @throws \Exception
+	 *
+	 * @api  Smarty::configLoad()
+	 */
+	public function configLoad($config_file, $sections = null)
+	{
+		$template = $this->getSmarty()->doCreateTemplate($config_file, null, null, $this, null, null, true);
+		$template->caching = Smarty::CACHING_OFF;
+		$template->assign('sections', (array) $sections ?? []);
+		// trigger a call to $this->assignConfigVars
+		$template->fetch();
+		return $this;
+	}
+
+	/**
+	 * Sets the default scope for new variables assigned in this template.
+	 * @param int $scope
+	 *
+	 * @return void
+	 */
+	protected function setDefaultScope(int $scope) {
+		$this->defaultScope = $scope;
+	}
+
+	/**
+	 * Returns the default scope for new variables assigned in this template.
+	 * @return int
+	 */
+	public function getDefaultScope(): int {
+		return $this->defaultScope;
+	}
+
+	/**
+	 * @return Data|Smarty|null
+	 */
+	public function getParent() {
+		return $this->parent;
+	}
+
+	/**
+	 * @param Data|Smarty|null $parent
+	 */
+	public function setParent($parent): void {
+		$this->parent = $parent;
+	}
+
+	public function pushStack(): void {
+		$stackList = [];
+		foreach ($this->tpl_vars as $name => $variable) {
+			$stackList[$name] = clone $variable; // variables are stored in Variable objects
+		}
+		$this->_var_stack[] = $this->tpl_vars;
+		$this->tpl_vars = $stackList;
+
+		$this->_config_stack[] = $this->config_vars;
+	}
+
+	public function popStack(): void {
+		$this->tpl_vars = array_pop($this->_var_stack);
+		$this->config_vars = array_pop($this->_config_stack);
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Debug.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Debug.php
new file mode 100644
index 000000000..ab1a88779
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Debug.php
@@ -0,0 +1,370 @@
+<?php
+
+namespace Smarty;
+
+/**
+ * Smarty Internal Plugin Debug
+ * Class to collect data for the Smarty Debugging Console
+ *
+ * @author     Uwe Tews
+ */
+class Debug extends Data
+{
+    /**
+     * template data
+     *
+     * @var array
+     */
+    public $template_data = [];
+
+    /**
+     * List of uid's which shall be ignored
+     *
+     * @var array
+     */
+    public $ignore_uid = [];
+
+    /**
+     * Index of display() and fetch() calls
+     *
+     * @var int
+     */
+    public $index = 0;
+
+    /**
+     * Counter for window offset
+     *
+     * @var int
+     */
+    public $offset = 0;
+
+    /**
+     * Start logging template
+     *
+     * @param Template $template template
+     * @param null                      $mode     true: display   false: fetch  null: subtemplate
+     */
+    public function start_template(Template $template, $mode = null)
+    {
+        if (isset($mode) && !$template->_isSubTpl()) {
+            $this->index++;
+            $this->offset++;
+            $this->template_data[ $this->index ] = null;
+        }
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'start_template_time' ] = microtime(true);
+    }
+
+    /**
+     * End logging of cache time
+     *
+     * @param Template $template cached template
+     */
+    public function end_template(Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'total_time' ] +=
+            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_template_time' ];
+    }
+
+    /**
+     * Start logging of compile time
+     *
+     * @param Template $template
+     */
+    public function start_compile(Template $template)
+    {
+        static $_is_stringy = array('string' => true, 'eval' => true);
+        if (!empty($template->getCompiler()->trace_uid)) {
+            $key = $template->getCompiler()->trace_uid;
+            if (!isset($this->template_data[ $this->index ][ $key ])) {
+                $this->saveTemplateData($_is_stringy, $template, $key);
+            }
+        } else {
+            if (isset($this->ignore_uid[ $template->getSource()->uid ])) {
+                return;
+            }
+            $key = $this->get_key($template);
+        }
+        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+    }
+
+    /**
+     * End logging of compile time
+     *
+     * @param Template $template
+     */
+    public function end_compile(Template $template)
+    {
+        if (!empty($template->getCompiler()->trace_uid)) {
+            $key = $template->getCompiler()->trace_uid;
+        } else {
+            if (isset($this->ignore_uid[ $template->getSource()->uid ])) {
+                return;
+            }
+            $key = $this->get_key($template);
+        }
+        $this->template_data[ $this->index ][ $key ][ 'compile_time' ] +=
+            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+    }
+
+    /**
+     * Start logging of render time
+     *
+     * @param Template $template
+     */
+    public function start_render(Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+    }
+
+    /**
+     * End logging of compile time
+     *
+     * @param Template $template
+     */
+    public function end_render(Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'render_time' ] +=
+            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+    }
+
+    /**
+     * Start logging of cache time
+     *
+     * @param Template $template cached template
+     */
+    public function start_cache(Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'start_time' ] = microtime(true);
+    }
+
+    /**
+     * End logging of cache time
+     *
+     * @param Template $template cached template
+     */
+    public function end_cache(Template $template)
+    {
+        $key = $this->get_key($template);
+        $this->template_data[ $this->index ][ $key ][ 'cache_time' ] +=
+            microtime(true) - $this->template_data[ $this->index ][ $key ][ 'start_time' ];
+    }
+
+    /**
+     * Register template object
+     *
+     * @param Template $template cached template
+     */
+    public function register_template(Template $template)
+    {
+    }
+
+    /**
+     * Register data object
+     *
+     * @param Data $data data object
+     */
+    public static function register_data(Data $data)
+    {
+    }
+
+    /**
+     * Opens a window for the Smarty Debugging Console and display the data
+     *
+     * @param Template|Smarty $obj object to debug
+     * @param bool                            $full
+     *
+     * @throws \Exception
+     * @throws Exception
+     */
+    public function display_debug($obj, bool $full = false)
+    {
+        if (!$full) {
+            $this->offset++;
+            $savedIndex = $this->index;
+            $this->index = 9999;
+        }
+        $smarty = $obj->getSmarty();
+        // create fresh instance of smarty for displaying the debug console
+        // to avoid problems if the application did overload the Smarty class
+        $debObj = new Smarty();
+        // copy the working dirs from application
+        $debObj->setCompileDir($smarty->getCompileDir());
+        $debObj->compile_check = Smarty::COMPILECHECK_ON;
+        $debObj->security_policy = null;
+        $debObj->debugging = false;
+        $debObj->debugging_ctrl = 'NONE';
+        $debObj->error_reporting = E_ALL & ~E_NOTICE;
+        $debObj->debug_tpl = $smarty->debug_tpl ?? 'file:' . __DIR__ . '/debug.tpl';
+        $debObj->registered_resources = array();
+        $debObj->escape_html = true;
+        $debObj->caching = Smarty::CACHING_OFF;
+        // prepare information of assigned variables
+        $ptr = $this->get_debug_vars($obj);
+        $_assigned_vars = $ptr->tpl_vars;
+        ksort($_assigned_vars);
+        $_config_vars = $ptr->config_vars;
+        ksort($_config_vars);
+        $debugging = $smarty->debugging;
+        $templateName = $obj->getSource()->type . ':' . $obj->getSource()->name;
+        $displayMode = $debugging === 2 || !$full;
+        $offset = $this->offset * 50;
+        $_template = $debObj->doCreateTemplate($debObj->debug_tpl);
+        if ($obj instanceof Template) {
+            $_template->assign('template_name', $templateName);
+        } elseif ($obj instanceof Smarty || $full) {
+            $_template->assign('template_data', $this->template_data[$this->index]);
+        } else {
+            $_template->assign('template_data', null);
+        }
+        $_template->assign('assigned_vars', $_assigned_vars);
+        $_template->assign('config_vars', $_config_vars);
+        $_template->assign('execution_time', microtime(true) - $smarty->start_time);
+        $_template->assign('targetWindow', $displayMode ? md5("$offset$templateName") : '__Smarty__');
+        $_template->assign('offset', $offset);
+        echo $_template->fetch();
+        if (isset($full)) {
+            $this->index--;
+        }
+        if (!$full) {
+            $this->index = $savedIndex;
+        }
+    }
+
+    /**
+     * Recursively gets variables from all template/data scopes
+     *
+     * @param \Smarty\Data $obj object to debug
+     *
+     * @return \StdClass
+     */
+    private function get_debug_vars($obj)
+    {
+        $config_vars = array();
+        foreach ($obj->config_vars as $key => $var) {
+            $config_vars[$key]['value'] = $var;
+	        $config_vars[$key]['scope'] = get_class($obj) . ':' . spl_object_id($obj);
+        }
+        $tpl_vars = array();
+        foreach ($obj->tpl_vars as $key => $var) {
+            foreach ($var as $varkey => $varvalue) {
+                if ($varkey === 'value') {
+                    $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                } else {
+                    if ($varkey === 'nocache') {
+                        if ($varvalue === true) {
+                            $tpl_vars[ $key ][ $varkey ] = $varvalue;
+                        }
+                    } else {
+                        if ($varkey !== 'scope' || $varvalue !== 0) {
+                            $tpl_vars[ $key ][ 'attributes' ][ $varkey ] = $varvalue;
+                        }
+                    }
+                }
+            }
+	        $tpl_vars[$key]['scope'] = get_class($obj) . ':' . spl_object_id($obj);
+        }
+        if (isset($obj->parent)) {
+            $parent = $this->get_debug_vars($obj->parent);
+            foreach ($parent->tpl_vars as $name => $pvar) {
+                if (isset($tpl_vars[ $name ]) && $tpl_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
+                    $tpl_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
+                }
+            }
+            $tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
+            foreach ($parent->config_vars as $name => $pvar) {
+                if (isset($config_vars[ $name ]) && $config_vars[ $name ][ 'value' ] === $pvar[ 'value' ]) {
+                    $config_vars[ $name ][ 'scope' ] = $pvar[ 'scope' ];
+                }
+            }
+            $config_vars = array_merge($parent->config_vars, $config_vars);
+        }
+        return (object)array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
+    }
+
+    /**
+     * Return key into $template_data for template
+     *
+     * @param Template $template template object
+     *
+     * @return string key into $template_data
+     */
+    private function get_key(Template $template)
+    {
+        static $_is_stringy = array('string' => true, 'eval' => true);
+
+        $key = $template->getSource()->uid;
+        if (isset($this->template_data[ $this->index ][ $key ])) {
+            return $key;
+        } else {
+	        $this->saveTemplateData($_is_stringy, $template, $key);
+	        $this->template_data[ $this->index ][ $key ][ 'total_time' ] = 0;
+            return $key;
+        }
+    }
+
+    /**
+     * Ignore template
+     *
+     * @param Template $template
+     */
+    public function ignore(Template $template)
+    {
+        $this->ignore_uid[$template->getSource()->uid] = true;
+    }
+
+    /**
+     * handle 'URL' debugging mode
+     *
+     * @param Smarty $smarty
+     */
+    public function debugUrl(Smarty $smarty)
+    {
+        if (isset($_SERVER[ 'QUERY_STRING' ])) {
+            $_query_string = $_SERVER[ 'QUERY_STRING' ];
+        } else {
+            $_query_string = '';
+        }
+        if (false !== strpos($_query_string, $smarty->smarty_debug_id)) {
+            if (false !== strpos($_query_string, $smarty->smarty_debug_id . '=on')) {
+                // enable debugging for this browser session
+                setcookie('SMARTY_DEBUG', true);
+                $smarty->debugging = true;
+            } elseif (false !== strpos($_query_string, $smarty->smarty_debug_id . '=off')) {
+                // disable debugging for this browser session
+                setcookie('SMARTY_DEBUG', false);
+                $smarty->debugging = false;
+            } else {
+                // enable debugging for this page
+                $smarty->debugging = true;
+            }
+        } else {
+            if (isset($_COOKIE[ 'SMARTY_DEBUG' ])) {
+                $smarty->debugging = true;
+            }
+        }
+    }
+
+	/**
+	 * @param array $_is_stringy
+	 * @param Template $template
+	 * @param string $key
+	 *
+	 * @return void
+	 */
+	private function saveTemplateData(array $_is_stringy, Template $template, string $key): void {
+		if (isset($_is_stringy[$template->getSource()->type])) {
+			$this->template_data[$this->index][$key]['name'] =
+				'\'' . substr($template->getSource()->name, 0, 25) . '...\'';
+		} else {
+			$this->template_data[$this->index][$key]['name'] = $template->getSource()->getResourceName();
+		}
+		$this->template_data[$this->index][$key]['compile_time'] = 0;
+		$this->template_data[$this->index][$key]['render_time'] = 0;
+		$this->template_data[$this->index][$key]['cache_time'] = 0;
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ErrorHandler.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ErrorHandler.php
new file mode 100644
index 000000000..05b1cb3e6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ErrorHandler.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Smarty;
+
+/**
+ * Smarty error handler to fix new error levels in PHP8 for backwards compatibility
+ * @author     Simon Wisselink
+ */
+class ErrorHandler
+{
+    /**
+     * Allows {$foo->propName} where propName is undefined.
+     * @var bool
+     */
+    public $allowUndefinedProperties = true;
+
+    /**
+     * Allows {$foo.bar} where bar is unset and {$foo.bar1.bar2} where either bar1 or bar2 is unset.
+     * @var bool
+     */
+    public $allowUndefinedArrayKeys = true;
+
+    /**
+     * Allows {$foo->bar} where bar is not an object (e.g. null or false).
+     * @var bool
+     */
+    public $allowDereferencingNonObjects = true;
+
+    private $previousErrorHandler = null;
+
+    /**
+     * Enable error handler to intercept errors
+     */
+    public function activate() {
+        /*
+            Error muting is done because some people implemented custom error_handlers using
+            https://php.net/set_error_handler and for some reason did not understand the following paragraph:
+
+            It is important to remember that the standard PHP error handler is completely bypassed for the
+            error types specified by error_types unless the callback function returns FALSE.
+            error_reporting() settings will have no effect and your error handler will be called regardless -
+            however you are still able to read the current value of error_reporting and act appropriately.
+            Of particular note is that this value will be 0 if the statement that caused the error was
+            prepended by the @ error-control operator.
+        */
+        $this->previousErrorHandler = set_error_handler([$this, 'handleError']);
+    }
+
+    /**
+     * Disable error handler
+     */
+    public function deactivate() {
+        restore_error_handler();
+        $this->previousErrorHandler = null;
+    }
+
+    /**
+     * Error Handler to mute expected messages
+     *
+     * @link https://php.net/set_error_handler
+     *
+     * @param integer $errno Error level
+     * @param         $errstr
+     * @param         $errfile
+     * @param         $errline
+     * @param         $errcontext
+     *
+     * @return bool
+     */
+    public function handleError($errno, $errstr, $errfile, $errline, $errcontext = [])
+    {
+        if ($this->allowUndefinedProperties && preg_match(
+                '/^(Undefined property)/',
+                $errstr
+            )) {
+            return; // suppresses this error
+        }
+
+        if ($this->allowUndefinedArrayKeys && preg_match(
+            '/^(Undefined index|Undefined array key|Trying to access array offset on)/',
+            $errstr
+        )) {
+            return; // suppresses this error
+        }
+
+        if ($this->allowDereferencingNonObjects && preg_match(
+                '/^Attempt to read property ".+?" on/',
+                $errstr
+            )) {
+            return; // suppresses this error
+        }
+
+        // pass all other errors through to the previous error handler or to the default PHP error handler
+        return $this->previousErrorHandler ?
+            call_user_func($this->previousErrorHandler, $errno, $errstr, $errfile, $errline, $errcontext) : false;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Exception.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Exception.php
new file mode 100644
index 000000000..0f75f5685
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Exception.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Smarty;
+
+/**
+ * Smarty exception class
+ */
+class Exception extends \Exception {
+
+	/**
+	 * @return string
+	 */
+	public function __toString() {
+		return ' --> Smarty: ' . $this->message . ' <-- ';
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/BCPluginsAdapter.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/BCPluginsAdapter.php
new file mode 100644
index 000000000..aa0eefe20
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/BCPluginsAdapter.php
@@ -0,0 +1,229 @@
+<?php
+
+namespace Smarty\Extension;
+
+use Smarty\BlockHandler\BlockPluginWrapper;
+use Smarty\Compile\CompilerInterface;
+use Smarty\Compile\Modifier\BCPluginWrapper as ModifierCompilerPluginWrapper;
+use Smarty\Compile\Tag\BCPluginWrapper as TagPluginWrapper;
+use Smarty\Filter\FilterPluginWrapper;
+use Smarty\FunctionHandler\BCPluginWrapper as FunctionPluginWrapper;
+
+class BCPluginsAdapter extends Base {
+
+	/**
+	 * @var \Smarty\Smarty
+	 */
+	private $smarty;
+
+	public function __construct(\Smarty\Smarty $smarty) {
+		$this->smarty = $smarty;
+	}
+
+	private function findPlugin($type, $name): ?array {
+		if (null !== $plugin = $this->smarty->getRegisteredPlugin($type, $name)) {
+			return $plugin;
+		}
+
+		return null;
+	}
+
+	public function getTagCompiler(string $tag): ?\Smarty\Compile\CompilerInterface {
+
+		$plugin = $this->findPlugin(\Smarty\Smarty::PLUGIN_COMPILER, $tag);
+		if ($plugin === null) {
+			return null;
+		}
+
+		if (is_callable($plugin[0])) {
+			$callback = $plugin[0];
+			$cacheable = (bool) $plugin[1] ?? true;
+			return new TagPluginWrapper($callback, $cacheable);
+		} elseif (class_exists($plugin[0])) {
+			$compiler = new $plugin[0];
+			if ($compiler instanceof CompilerInterface) {
+				return $compiler;
+			}
+		}
+
+		return null;
+	}
+
+	public function getFunctionHandler(string $functionName): ?\Smarty\FunctionHandler\FunctionHandlerInterface {
+		$plugin = $this->findPlugin(\Smarty\Smarty::PLUGIN_FUNCTION, $functionName);
+		if ($plugin === null) {
+			return null;
+		}
+		$callback = $plugin[0];
+		$cacheable = (bool) $plugin[1] ?? true;
+
+		return new FunctionPluginWrapper($callback, $cacheable);
+
+	}
+
+	public function getBlockHandler(string $blockTagName): ?\Smarty\BlockHandler\BlockHandlerInterface {
+		$plugin = $this->findPlugin(\Smarty\Smarty::PLUGIN_BLOCK, $blockTagName);
+		if ($plugin === null) {
+			return null;
+		}
+		$callback = $plugin[0];
+		$cacheable = (bool) $plugin[1] ?? true;
+
+		return new BlockPluginWrapper($callback, $cacheable);
+	}
+
+	public function getModifierCallback(string $modifierName) {
+
+		$plugin = $this->findPlugin(\Smarty\Smarty::PLUGIN_MODIFIER, $modifierName);
+		if ($plugin === null) {
+			return null;
+		}
+		return $plugin[0];
+	}
+
+	public function getModifierCompiler(string $modifier): ?\Smarty\Compile\Modifier\ModifierCompilerInterface {
+		$plugin = $this->findPlugin(\Smarty\Smarty::PLUGIN_MODIFIERCOMPILER, $modifier);
+		if ($plugin === null) {
+			return null;
+		}
+		$callback = $plugin[0];
+
+		return new ModifierCompilerPluginWrapper($callback);
+	}
+
+	/**
+	 * @var array
+	 */
+	private $preFilters = [];
+
+	public function getPreFilters(): array {
+		return $this->preFilters;
+	}
+
+	public function addPreFilter(\Smarty\Filter\FilterInterface $filter) {
+		$this->preFilters[] = $filter;
+	}
+
+	public function addCallableAsPreFilter(callable $callable, ?string $name = null) {
+		if ($name === null) {
+			$this->preFilters[] = new FilterPluginWrapper($callable);
+		} else {
+			$this->preFilters[$name] = new FilterPluginWrapper($callable);
+		}
+	}
+
+	public function removePrefilter(string $name) {
+		unset($this->preFilters[$name]);
+	}
+
+	/**
+	 * @var array
+	 */
+	private $postFilters = [];
+
+	public function getPostFilters(): array {
+		return $this->postFilters;
+	}
+
+	public function addPostFilter(\Smarty\Filter\FilterInterface $filter) {
+		$this->postFilters[] = $filter;
+	}
+
+	public function addCallableAsPostFilter(callable $callable, ?string $name = null) {
+		if ($name === null) {
+			$this->postFilters[] = new FilterPluginWrapper($callable);
+		} else {
+			$this->postFilters[$name] = new FilterPluginWrapper($callable);
+		}
+	}
+
+	public function removePostFilter(string $name) {
+		unset($this->postFilters[$name]);
+	}
+
+
+	/**
+	 * @var array
+	 */
+	private $outputFilters = [];
+
+	public function getOutputFilters(): array {
+		return $this->outputFilters;
+	}
+
+	public function addOutputFilter(\Smarty\Filter\FilterInterface $filter) {
+		$this->outputFilters[] = $filter;
+	}
+
+	public function addCallableAsOutputFilter(callable $callable, ?string $name = null) {
+		if ($name === null) {
+			$this->outputFilters[] = new FilterPluginWrapper($callable);
+		} else {
+			$this->outputFilters[$name] = new FilterPluginWrapper($callable);
+		}
+	}
+
+	public function removeOutputFilter(string $name) {
+		unset($this->outputFilters[$name]);
+	}
+
+	public function loadPluginsFromDir(string $path) {
+
+		foreach([
+			'function',
+			'modifier',
+		    'block',
+		    'compiler',
+		    'prefilter',
+		    'postfilter',
+		    'outputfilter',
+		] as $type) {
+			foreach (glob($path  . $type . '.?*.php') as $filename) {
+				$pluginName = $this->getPluginNameFromFilename($filename);
+				if ($pluginName !== null) {
+					require_once $filename;
+					$functionOrClassName = 'smarty_' . $type . '_' . $pluginName;
+					if (function_exists($functionOrClassName) || class_exists($functionOrClassName)) {
+						$this->smarty->registerPlugin($type, $pluginName, $functionOrClassName, true, []);
+					}
+				}
+			}
+		}
+
+		$type = 'resource';
+		foreach (glob($path  . $type . '.?*.php') as $filename) {
+			$pluginName = $this->getPluginNameFromFilename($filename);
+			if ($pluginName !== null) {
+				require_once $filename;
+				if (class_exists($className = 'smarty_' . $type . '_' . $pluginName)) {
+					$this->smarty->registerResource($pluginName, new $className());
+				}
+			}
+		}
+
+		$type = 'cacheresource';
+		foreach (glob($path  . $type . '.?*.php') as $filename) {
+			$pluginName = $this->getPluginNameFromFilename($filename);
+			if ($pluginName !== null) {
+				require_once $filename;
+				if (class_exists($className = 'smarty_' . $type . '_' . $pluginName)) {
+					$this->smarty->registerCacheResource($pluginName, new $className());
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * @param $filename
+	 *
+	 * @return string|null
+	 */
+	private function getPluginNameFromFilename($filename) {
+		if (!preg_match('/.*\.([a-z_A-Z0-9]+)\.php$/',$filename,$matches)) {
+			return null;
+		}
+		return $matches[1];
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/Base.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/Base.php
new file mode 100644
index 000000000..b37b6acd0
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/Base.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Smarty\Extension;
+
+use Smarty\FunctionHandler\FunctionHandlerInterface;
+
+class Base implements ExtensionInterface {
+
+	public function getTagCompiler(string $tag): ?\Smarty\Compile\CompilerInterface {
+		return null;
+	}
+
+	public function getModifierCompiler(string $modifier): ?\Smarty\Compile\Modifier\ModifierCompilerInterface {
+		return null;
+	}
+
+	public function getFunctionHandler(string $functionName): ?\Smarty\FunctionHandler\FunctionHandlerInterface {
+		return null;
+	}
+
+	public function getBlockHandler(string $blockTagName): ?\Smarty\BlockHandler\BlockHandlerInterface {
+		return null;
+	}
+
+	public function getModifierCallback(string $modifierName) {
+		return null;
+	}
+
+	public function getPreFilters(): array {
+		return [];
+	}
+
+	public function getPostFilters(): array {
+		return [];
+	}
+
+	public function getOutputFilters(): array {
+		return [];
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/CallbackWrapper.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/CallbackWrapper.php
new file mode 100644
index 000000000..827dd78b8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/CallbackWrapper.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Smarty\Extension;
+
+use Smarty\Exception;
+
+class CallbackWrapper {
+
+	/**
+	 * @var callback
+	 */
+	private $callback;
+	/**
+	 * @var string
+	 */
+	private $modifierName;
+
+	/**
+	 * @param string $modifierName
+	 * @param callback $callback
+	 */
+	public function __construct(string $modifierName, $callback) {
+		$this->callback = $callback;
+		$this->modifierName = $modifierName;
+	}
+
+	public function handle(...$params) {
+		try {
+			return call_user_func_array($this->callback, $params);
+		} catch (\ArgumentCountError $e) {
+			throw new Exception("Invalid number of arguments to modifier " . $this->modifierName);
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/CoreExtension.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/CoreExtension.php
new file mode 100644
index 000000000..a7c658d34
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/CoreExtension.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Smarty\Extension;
+
+class CoreExtension extends Base {
+	public function getTagCompiler(string $tag): ?\Smarty\Compile\CompilerInterface {
+		switch ($tag) {
+			case 'append': return new \Smarty\Compile\Tag\Append();
+			case 'assign': return new \Smarty\Compile\Tag\Assign();
+			case 'block': return new \Smarty\Compile\Tag\Block();
+			case 'blockclose': return new \Smarty\Compile\Tag\BlockClose();
+			case 'break': return new \Smarty\Compile\Tag\BreakTag();
+			case 'call': return new \Smarty\Compile\Tag\Call();
+			case 'capture': return new \Smarty\Compile\Tag\Capture();
+			case 'captureclose': return new \Smarty\Compile\Tag\CaptureClose();
+			case 'config_load': return new \Smarty\Compile\Tag\ConfigLoad();
+			case 'continue': return new \Smarty\Compile\Tag\ContinueTag();
+			case 'debug': return new \Smarty\Compile\Tag\Debug();
+			case 'eval': return new \Smarty\Compile\Tag\EvalTag();
+			case 'extends': return new \Smarty\Compile\Tag\ExtendsTag();
+			case 'for': return new \Smarty\Compile\Tag\ForTag();
+			case 'foreach': return new \Smarty\Compile\Tag\ForeachTag();
+			case 'foreachelse': return new \Smarty\Compile\Tag\ForeachElse();
+			case 'foreachclose': return new \Smarty\Compile\Tag\ForeachClose();
+			case 'forelse': return new \Smarty\Compile\Tag\ForElse();
+			case 'forclose': return new \Smarty\Compile\Tag\ForClose();
+			case 'function': return new \Smarty\Compile\Tag\FunctionTag();
+			case 'functionclose': return new \Smarty\Compile\Tag\FunctionClose();
+			case 'if': return new \Smarty\Compile\Tag\IfTag();
+			case 'else': return new \Smarty\Compile\Tag\ElseTag();
+			case 'elseif': return new \Smarty\Compile\Tag\ElseIfTag();
+			case 'ifclose': return new \Smarty\Compile\Tag\IfClose();
+			case 'include': return new \Smarty\Compile\Tag\IncludeTag();
+			case 'ldelim': return new \Smarty\Compile\Tag\Ldelim();
+			case 'rdelim': return new \Smarty\Compile\Tag\Rdelim();
+			case 'nocache': return new \Smarty\Compile\Tag\Nocache();
+			case 'nocacheclose': return new \Smarty\Compile\Tag\NocacheClose();
+			case 'section': return new \Smarty\Compile\Tag\Section();
+			case 'sectionelse': return new \Smarty\Compile\Tag\SectionElse();
+			case 'sectionclose': return new \Smarty\Compile\Tag\SectionClose();
+			case 'setfilter': return new \Smarty\Compile\Tag\Setfilter();
+			case 'setfilterclose': return new \Smarty\Compile\Tag\SetfilterClose();
+			case 'while': return new \Smarty\Compile\Tag\WhileTag();
+			case 'whileclose': return new \Smarty\Compile\Tag\WhileClose();
+		}
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/DefaultExtension.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/DefaultExtension.php
new file mode 100644
index 000000000..cecc4a46f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/DefaultExtension.php
@@ -0,0 +1,756 @@
+<?php
+
+namespace Smarty\Extension;
+
+use Smarty\Exception;
+
+class DefaultExtension extends Base {
+
+	private $modifiers = [];
+
+	private $functionHandlers = [];
+
+	private $blockHandlers = [];
+
+	public function getModifierCompiler(string $modifier): ?\Smarty\Compile\Modifier\ModifierCompilerInterface {
+
+		if (isset($this->modifiers[$modifier])) {
+			return $this->modifiers[$modifier];
+		}
+
+		switch ($modifier) {
+			case 'cat': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\CatModifierCompiler(); break;
+			case 'count_characters': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\CountCharactersModifierCompiler(); break;
+			case 'count_paragraphs': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\CountParagraphsModifierCompiler(); break;
+			case 'count_sentences': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\CountSentencesModifierCompiler(); break;
+			case 'count_words': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\CountWordsModifierCompiler(); break;
+			case 'default': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\DefaultModifierCompiler(); break;
+			case 'empty': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\EmptyModifierCompiler(); break;
+			case 'escape': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\EscapeModifierCompiler(); break;
+			case 'from_charset': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\FromCharsetModifierCompiler(); break;
+			case 'indent': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\IndentModifierCompiler(); break;
+			case 'is_array': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\IsArrayModifierCompiler(); break;
+			case 'isset': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\IssetModifierCompiler(); break;
+			case 'json_encode': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\JsonEncodeModifierCompiler(); break;
+			case 'lower': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\LowerModifierCompiler(); break;
+			case 'nl2br': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\Nl2brModifierCompiler(); break;
+			case 'noprint': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\NoPrintModifierCompiler(); break;
+			case 'round': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\RoundModifierCompiler(); break;
+			case 'str_repeat': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\StrRepeatModifierCompiler(); break;
+			case 'string_format': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\StringFormatModifierCompiler(); break;
+			case 'strip': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\StripModifierCompiler(); break;
+			case 'strip_tags': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\StripTagsModifierCompiler(); break;
+			case 'strlen': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\StrlenModifierCompiler(); break;
+			case 'substr': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\SubstrModifierCompiler(); break;
+			case 'to_charset': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\ToCharsetModifierCompiler(); break;
+			case 'unescape': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\UnescapeModifierCompiler(); break;
+			case 'upper': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\UpperModifierCompiler(); break;
+			case 'wordwrap': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\WordWrapModifierCompiler(); break;
+		}
+
+		return $this->modifiers[$modifier] ?? null;
+	}
+
+	public function getModifierCallback(string $modifierName) {
+		switch ($modifierName) {
+			case 'capitalize': return [$this, 'smarty_modifier_capitalize'];
+			case 'count': return [$this, 'smarty_modifier_count'];
+			case 'date_format': return [$this, 'smarty_modifier_date_format'];
+			case 'debug_print_var': return [$this, 'smarty_modifier_debug_print_var'];
+			case 'escape': return [$this, 'smarty_modifier_escape'];
+			case 'explode': return [$this, 'smarty_modifier_explode'];
+			case 'implode': return [$this, 'smarty_modifier_implode'];
+			case 'in_array': return [$this, 'smarty_modifier_in_array'];
+			case 'join': return [$this, 'smarty_modifier_join'];
+			case 'mb_wordwrap': return [$this, 'smarty_modifier_mb_wordwrap'];
+			case 'number_format': return [$this, 'smarty_modifier_number_format'];
+			case 'regex_replace': return [$this, 'smarty_modifier_regex_replace'];
+			case 'replace': return [$this, 'smarty_modifier_replace'];
+			case 'spacify': return [$this, 'smarty_modifier_spacify'];
+			case 'split': return [$this, 'smarty_modifier_split'];
+			case 'truncate': return [$this, 'smarty_modifier_truncate'];
+		}
+		return null;
+	}
+
+	public function getFunctionHandler(string $functionName): ?\Smarty\FunctionHandler\FunctionHandlerInterface {
+
+		if (isset($this->functionHandlers[$functionName])) {
+			return $this->functionHandlers[$functionName];
+		}
+
+		switch ($functionName) {
+			case 'count': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Count(); break;
+			case 'counter': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Counter(); break;
+			case 'cycle': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Cycle(); break;
+			case 'fetch': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Fetch(); break;
+			case 'html_checkboxes': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlCheckboxes(); break;
+			case 'html_image': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlImage(); break;
+			case 'html_options': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlOptions(); break;
+			case 'html_radios': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlRadios(); break;
+			case 'html_select_date': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlSelectDate(); break;
+			case 'html_select_time': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlSelectTime(); break;
+			case 'html_table': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlTable(); break;
+			case 'mailto': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Mailto(); break;
+			case 'math': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Math(); break;
+		}
+
+		return $this->functionHandlers[$functionName] ?? null;
+	}
+
+	public function getBlockHandler(string $blockTagName): ?\Smarty\BlockHandler\BlockHandlerInterface {
+
+		switch ($blockTagName) {
+			case 'textformat': $this->blockHandlers[$blockTagName] = new \Smarty\BlockHandler\TextFormat(); break;
+		}
+
+		return $this->blockHandlers[$blockTagName] ?? null;
+	}
+
+	/**
+	 * Smarty spacify modifier plugin
+	 * Type:     modifier
+	 * Name:     spacify
+	 * Purpose:  add spaces between characters in a string
+	 *
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 *
+	 * @param string $string       input string
+	 * @param string $spacify_char string to insert between characters.
+	 *
+	 * @return string
+	 */
+	public function smarty_modifier_spacify($string, $spacify_char = ' ')
+	{
+		// well… what about charsets besides latin and UTF-8?
+		return implode($spacify_char, preg_split('//' . \Smarty\Smarty::$_UTF8_MODIFIER, $string, -1, PREG_SPLIT_NO_EMPTY));
+	}
+
+	/**
+	 * Smarty capitalize modifier plugin
+	 * Type:     modifier
+	 * Name:     capitalize
+	 * Purpose:  capitalize words in the string
+	 * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
+	 *
+	 * @param string  $string    string to capitalize
+	 * @param boolean $uc_digits also capitalize "x123" to "X123"
+	 * @param boolean $lc_rest   capitalize first letters, lowercase all following letters "aAa" to "Aaa"
+	 *
+	 * @return string capitalized string
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 * @author Rodney Rehm
+	 */
+	public function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
+	{
+		$string = (string) $string;
+
+		if ($lc_rest) {
+			// uppercase (including hyphenated words)
+			$upper_string = mb_convert_case($string, MB_CASE_TITLE, \Smarty\Smarty::$_CHARSET);
+		} else {
+			// uppercase word breaks
+			$upper_string = preg_replace_callback(
+				"!(^|[^\p{L}'])([\p{Ll}])!S" . \Smarty\Smarty::$_UTF8_MODIFIER,
+				function ($matches)	{
+					return stripslashes($matches[1]) .
+						mb_convert_case(stripslashes($matches[2]), MB_CASE_UPPER, \Smarty\Smarty::$_CHARSET);
+				},
+				$string
+			);
+		}
+		// check uc_digits case
+		if (!$uc_digits) {
+			if (preg_match_all(
+				"!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . \Smarty\Smarty::$_UTF8_MODIFIER,
+				$string,
+				$matches,
+				PREG_OFFSET_CAPTURE
+			)
+			) {
+				foreach ($matches[ 1 ] as $match) {
+					$upper_string =
+						substr_replace(
+							$upper_string,
+							mb_strtolower($match[ 0 ], \Smarty\Smarty::$_CHARSET),
+							$match[ 1 ],
+							strlen($match[ 0 ])
+						);
+				}
+			}
+		}
+		$upper_string =
+			preg_replace_callback(
+				"!((^|\s)['\"])(\w)!" . \Smarty\Smarty::$_UTF8_MODIFIER,
+				function ($matches) {
+					return stripslashes(
+						$matches[ 1 ]) . mb_convert_case(stripslashes($matches[ 3 ]),
+						MB_CASE_UPPER,
+						\Smarty\Smarty::$_CHARSET
+					);
+				},
+				$upper_string
+			);
+		return $upper_string;
+	}
+
+	/**
+	 * Smarty count modifier plugin
+	 * Type:     modifier
+	 * Name:     count
+	 * Purpose:  counts all elements in an array or in a Countable object
+	 * Input:
+	 *          - Countable|array: array or object to count
+	 *          - mode: int defaults to 0 for normal count mode, if set to 1 counts recursive
+	 *
+	 * @param mixed $arrayOrObject  input array/object
+	 * @param int $mode       count mode
+	 *
+	 * @return int
+	 */
+	public function smarty_modifier_count($arrayOrObject, $mode = 0) {
+		/*
+		 * @see https://www.php.net/count
+		 * > Prior to PHP 8.0.0, if the parameter was neither an array nor an object that implements the Countable interface,
+		 * > 1 would be returned, unless value was null, in which case 0 would be returned.
+		 */
+
+		if ($arrayOrObject instanceof \Countable || is_array($arrayOrObject)) {
+			return count($arrayOrObject, (int) $mode);
+		} elseif ($arrayOrObject === null) {
+			return 0;
+		}
+		return 1;
+	}
+
+	/**
+	 * Smarty date_format modifier plugin
+	 * Type:     modifier
+	 * Name:     date_format
+	 * Purpose:  format datestamps via strftime
+	 * Input:
+	 *          - string: input date string
+	 *          - format: strftime format for output
+	 *          - default_date: default date if $string is empty
+	 *
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 *
+	 * @param string $string       input date string
+	 * @param string $format       strftime format for output
+	 * @param string $default_date default date if $string is empty
+	 * @param string $formatter    either 'strftime' or 'auto'
+	 *
+	 * @return string |void
+	 * @uses   smarty_make_timestamp()
+	 */
+	public function smarty_modifier_date_format($string, $format = null, $default_date = '', $formatter = 'auto')
+	{
+		if ($format === null) {
+			$format = \Smarty\Smarty::$_DATE_FORMAT;
+		}
+
+		if (!empty($string) && $string !== '0000-00-00' && $string !== '0000-00-00 00:00:00') {
+			$timestamp = smarty_make_timestamp($string);
+		} elseif (!empty($default_date)) {
+			$timestamp = smarty_make_timestamp($default_date);
+		} else {
+			return;
+		}
+		if ($formatter === 'strftime' || ($formatter === 'auto' && strpos($format, '%') !== false)) {
+			if (\Smarty\Smarty::$_IS_WINDOWS) {
+				$_win_from = array(
+					'%D',
+					'%h',
+					'%n',
+					'%r',
+					'%R',
+					'%t',
+					'%T'
+				);
+				$_win_to = array(
+					'%m/%d/%y',
+					'%b',
+					"\n",
+					'%I:%M:%S %p',
+					'%H:%M',
+					"\t",
+					'%H:%M:%S'
+				);
+				if (strpos($format, '%e') !== false) {
+					$_win_from[] = '%e';
+					$_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
+				}
+				if (strpos($format, '%l') !== false) {
+					$_win_from[] = '%l';
+					$_win_to[] = sprintf('%\' 2d', date('h', $timestamp));
+				}
+				$format = str_replace($_win_from, $_win_to, $format);
+			}
+			// @ to suppress deprecation errors when running in PHP8.1 or higher.
+			return @strftime($format, $timestamp);
+		} else {
+			return date($format, $timestamp);
+		}
+	}
+
+	/**
+	 * Smarty debug_print_var modifier plugin
+	 * Type:     modifier
+	 * Name:     debug_print_var
+	 * Purpose:  formats variable contents for display in the console
+	 *
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 *
+	 * @param array|object $var     variable to be formatted
+	 * @param int          $max     maximum recursion depth if $var is an array or object
+	 * @param int          $length  maximum string length if $var is a string
+	 * @param int          $depth   actual recursion depth
+	 * @param array        $objects processed objects in actual depth to prevent recursive object processing
+	 *
+	 * @return string
+	 */
+	public function smarty_modifier_debug_print_var($var, $max = 10, $length = 40, $depth = 0, $objects = array())
+	{
+		$_replace = array("\n" => '\n', "\r" => '\r', "\t" => '\t');
+		switch (gettype($var)) {
+			case 'array':
+				$results = '<b>Array (' . count($var) . ')</b>';
+				if ($depth === $max) {
+					break;
+				}
+				foreach ($var as $curr_key => $curr_val) {
+					$results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b>' . strtr($curr_key, $_replace) .
+						'</b> =&gt; ' .
+						$this->smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects);
+					$depth--;
+				}
+				break;
+			case 'object':
+				$object_vars = get_object_vars($var);
+				$results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
+				if (in_array($var, $objects)) {
+					$results .= ' called recursive';
+					break;
+				}
+				if ($depth === $max) {
+					break;
+				}
+				$objects[] = $var;
+				foreach ($object_vars as $curr_key => $curr_val) {
+					$results .= '<br>' . str_repeat('&nbsp;', $depth * 2) . '<b> -&gt;' . strtr($curr_key, $_replace) .
+						'</b> = ' . $this->smarty_modifier_debug_print_var($curr_val, $max, $length, ++$depth, $objects);
+					$depth--;
+				}
+				break;
+			case 'boolean':
+			case 'NULL':
+			case 'resource':
+				if (true === $var) {
+					$results = 'true';
+				} elseif (false === $var) {
+					$results = 'false';
+				} elseif (null === $var) {
+					$results = 'null';
+				} else {
+					$results = htmlspecialchars((string)$var);
+				}
+				$results = '<i>' . $results . '</i>';
+				break;
+			case 'integer':
+			case 'float':
+				$results = htmlspecialchars((string)$var);
+				break;
+			case 'string':
+				$results = strtr($var, $_replace);
+				if (mb_strlen($var, \Smarty\Smarty::$_CHARSET) > $length) {
+					$results = mb_substr($var, 0, $length - 3, \Smarty\Smarty::$_CHARSET) . '...';
+				}
+				$results = htmlspecialchars('"' . $results . '"', ENT_QUOTES, \Smarty\Smarty::$_CHARSET);
+				break;
+			case 'unknown type':
+			default:
+				$results = strtr((string)$var, $_replace);
+				if (mb_strlen($results, \Smarty\Smarty::$_CHARSET) > $length) {
+					$results = mb_substr($results, 0, $length - 3, \Smarty\Smarty::$_CHARSET) . '...';
+				}
+				$results = htmlspecialchars($results, ENT_QUOTES, \Smarty\Smarty::$_CHARSET);
+		}
+		return $results;
+	}
+
+	/**
+	 * Smarty escape modifier plugin
+	 * Type:     modifier
+	 * Name:     escape
+	 * Purpose:  escape string for output
+	 *
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 *
+	 * @param string  $string        input string
+	 * @param string  $esc_type      escape type
+	 * @param string  $char_set      character set, used for htmlspecialchars() or htmlentities()
+	 * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
+	 *
+	 * @return string escaped input string
+	 */
+	public function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
+	{
+		if (!$char_set) {
+			$char_set = \Smarty\Smarty::$_CHARSET;
+		}
+
+		$string = (string)$string;
+
+		switch ($esc_type) {
+			case 'html':
+				return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
+			// no break
+			case 'htmlall':
+				$string = mb_convert_encoding($string, 'UTF-8', $char_set);
+				return htmlentities($string, ENT_QUOTES, 'UTF-8', $double_encode);
+			// no break
+			case 'url':
+				return rawurlencode($string);
+			case 'urlpathinfo':
+				return str_replace('%2F', '/', rawurlencode($string));
+			case 'quotes':
+				// escape unescaped single quotes
+				return preg_replace("%(?<!\\\\)'%", "\\'", $string);
+			case 'hex':
+				// escape every byte into hex
+				// Note that the UTF-8 encoded character ä will be represented as %c3%a4
+				$return = '';
+				$_length = strlen($string);
+				for ($x = 0; $x < $_length; $x++) {
+					$return .= '%' . bin2hex($string[ $x ]);
+				}
+				return $return;
+			case 'hexentity':
+				$return = '';
+				foreach ($this->mb_to_unicode($string, \Smarty\Smarty::$_CHARSET) as $unicode) {
+					$return .= '&#x' . strtoupper(dechex($unicode)) . ';';
+				}
+				return $return;
+			case 'decentity':
+				$return = '';
+				foreach ($this->mb_to_unicode($string, \Smarty\Smarty::$_CHARSET) as $unicode) {
+					$return .= '&#' . $unicode . ';';
+				}
+				return $return;
+			case 'javascript':
+				// escape quotes and backslashes, newlines, etc.
+				return strtr(
+					$string,
+					array(
+						'\\' => '\\\\',
+						"'"  => "\\'",
+						'"'  => '\\"',
+						"\r" => '\\r',
+						"\n" => '\\n',
+						'</' => '<\/',
+						// see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
+						'<!--' => '<\!--',
+						'<s'   => '<\s',
+						'<S'   => '<\S',
+						"`" => "\\\\`",
+						"\${" => "\\\\\\$\\{"
+					)
+				);
+			case 'mail':
+				return smarty_mb_str_replace(
+					array(
+						'@',
+						'.'
+					),
+					array(
+						' [AT] ',
+						' [DOT] '
+					),
+					$string
+				);
+			case 'nonstd':
+				// escape non-standard chars, such as ms document quotes
+				$return = '';
+				foreach ($this->mb_to_unicode($string, \Smarty\Smarty::$_CHARSET) as $unicode) {
+					if ($unicode >= 126) {
+						$return .= '&#' . $unicode . ';';
+					} else {
+						$return .= chr($unicode);
+					}
+				}
+				return $return;
+			default:
+				trigger_error("escape: unsupported type: $esc_type - returning unmodified string", E_USER_NOTICE);
+				return $string;
+		}
+	}
+
+
+	/**
+	 * convert characters to their decimal unicode equivalents
+	 *
+	 * @link   http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
+	 *
+	 * @param string $string   characters to calculate unicode of
+	 * @param string $encoding encoding of $string
+	 *
+	 * @return array sequence of unicodes
+	 * @author Rodney Rehm
+	 */
+	private function mb_to_unicode($string, $encoding = null) {
+		if ($encoding) {
+			$expanded = mb_convert_encoding($string, 'UTF-32BE', $encoding);
+		} else {
+			$expanded = mb_convert_encoding($string, 'UTF-32BE');
+		}
+		return unpack('N*', $expanded);
+	}
+
+	/**
+	 * Smarty explode modifier plugin
+	 * Type:     modifier
+	 * Name:     explode
+	 * Purpose:  split a string by a string
+	 *
+	 * @param string   $separator
+	 * @param string   $string
+	 * @param int|null $limit
+	 *
+	 * @return array
+	 */
+	public function smarty_modifier_explode($separator, $string, ?int $limit = null)
+	{
+		trigger_error("Using explode is deprecated. " .
+			"Use split, using the array first, separator second.", E_USER_DEPRECATED);
+		// provide $string default to prevent deprecation errors in PHP >=8.1
+		return explode($separator, $string ?? '', $limit ?? PHP_INT_MAX);
+	}
+
+	/**
+	 * Smarty split modifier plugin
+	 * Type:     modifier
+	 * Name:     split
+	 * Purpose:  split a string by a string
+	 *
+	 * @param string $string
+	 * @param string   $separator
+	 * @param int|null $limit
+	 *
+	 * @return array
+	 */
+	public function smarty_modifier_split($string, $separator, ?int $limit = null)
+	{
+		// provide $string default to prevent deprecation errors in PHP >=8.1
+		return explode($separator, $string ?? '', $limit ?? PHP_INT_MAX);
+	}
+
+	/**
+	 * Smarty implode modifier plugin
+	 * Type:     modifier
+	 * Name:     implode
+	 * Purpose:  join an array of values into a single string
+	 *
+	 * @param array   $values
+	 * @param string   $separator
+	 *
+	 * @return string
+	 */
+	public function smarty_modifier_implode($values, $separator = '')
+	{
+
+		trigger_error("Using implode is deprecated. " .
+			"Use join using the array first, separator second.", E_USER_DEPRECATED);
+
+		if (is_array($separator)) {
+			return implode((string) ($values ?? ''), (array) $separator);
+		}
+		return implode((string) ($separator ?? ''), (array) $values);
+	}
+
+	/**
+	 * Smarty in_array modifier plugin
+	 * Type:     modifier
+	 * Name:     in_array
+	 * Purpose:  test if value is contained in an array
+	 *
+	 * @param mixed   $needle
+	 * @param array   $array
+	 * @param bool   $strict
+	 *
+	 * @return bool
+	 */
+	public function smarty_modifier_in_array($needle, $array, $strict = false)
+	{
+		return in_array($needle, (array) $array, (bool) $strict);
+	}
+
+	/**
+	 * Smarty join modifier plugin
+	 * Type:     modifier
+	 * Name:     join
+	 * Purpose:  join an array of values into a single string
+	 *
+	 * @param array   $values
+	 * @param string   $separator
+	 *
+	 * @return string
+	 */
+	public function smarty_modifier_join($values, $separator = '')
+	{
+		if (is_array($separator)) {
+			trigger_error("Using join with the separator first is deprecated. " .
+				"Call join using the array first, separator second.", E_USER_DEPRECATED);
+			return implode((string) ($values ?? ''), (array) $separator);
+		}
+		return implode((string) ($separator ?? ''), (array) $values);
+	}
+
+	/**
+	 * Smarty wordwrap modifier plugin
+	 * Type:     modifier
+	 * Name:     mb_wordwrap
+	 * Purpose:  Wrap a string to a given number of characters
+	 *
+	 * @link   https://php.net/manual/en/function.wordwrap.php for similarity
+	 *
+	 * @param string  $str   the string to wrap
+	 * @param int     $width the width of the output
+	 * @param string  $break the character used to break the line
+	 * @param boolean $cut   ignored parameter, just for the sake of
+	 *
+	 * @return string  wrapped string
+	 * @author Rodney Rehm
+	 */
+	public function smarty_modifier_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
+	{
+		return smarty_mb_wordwrap($str, $width, $break, $cut);
+	}
+
+	/**
+	 * Smarty number_format modifier plugin
+	 * Type:     modifier
+	 * Name:     number_format
+	 * Purpose:  Format a number with grouped thousands
+	 *
+	 * @param float|null  $num
+	 * @param int         $decimals
+	 * @param string|null $decimal_separator
+	 * @param string|null $thousands_separator
+	 *
+	 * @return string
+	 */
+	public function smarty_modifier_number_format(?float $num, int $decimals = 0, ?string $decimal_separator = ".", ?string $thousands_separator = ",")
+	{
+		// provide $num default to prevent deprecation errors in PHP >=8.1
+		return number_format($num ?? 0.0, $decimals, $decimal_separator, $thousands_separator);
+	}
+
+	/**
+	 * Smarty regex_replace modifier plugin
+	 * Type:     modifier
+	 * Name:     regex_replace
+	 * Purpose:  regular expression search/replace
+	 *
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 *
+	 * @param string       $string  input string
+	 * @param string|array $search  regular expression(s) to search for
+	 * @param string|array $replace string(s) that should be replaced
+	 * @param int          $limit   the maximum number of replacements
+	 *
+	 * @return string
+	 */
+	public function smarty_modifier_regex_replace($string, $search, $replace, $limit = -1)
+	{
+		if (is_array($search)) {
+			foreach ($search as $idx => $s) {
+				$search[ $idx ] = $this->regex_replace_check($s);
+			}
+		} else {
+			$search = $this->regex_replace_check($search);
+		}
+		return preg_replace($search, $replace, $string, $limit);
+	}
+
+	/**
+	 * @param  string $search string(s) that should be replaced
+	 *
+	 * @return string
+	 * @ignore
+	 */
+	private function regex_replace_check($search)
+	{
+		// null-byte injection detection
+		// anything behind the first null-byte is ignored
+		if (($pos = strpos($search, "\0")) !== false) {
+			$search = substr($search, 0, $pos);
+		}
+		// remove eval-modifier from $search
+		if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[ 1 ], 'e') !== false)) {
+			$search = substr($search, 0, -strlen($match[ 1 ])) . preg_replace('![e\s]+!', '', $match[ 1 ]);
+		}
+		return $search;
+	}
+
+	/**
+	 * Smarty replace modifier plugin
+	 * Type:     modifier
+	 * Name:     replace
+	 * Purpose:  simple search/replace
+	 *
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 * @author Uwe Tews
+	 *
+	 * @param string $string  input string
+	 * @param string $search  text to search for
+	 * @param string $replace replacement text
+	 *
+	 * @return string
+	 */
+	public function smarty_modifier_replace($string, $search, $replace)
+	{
+		return smarty_mb_str_replace($search, $replace, $string);
+	}
+
+	/**
+	 * Smarty truncate modifier plugin
+	 * Type:     modifier
+	 * Name:     truncate
+	 * Purpose:  Truncate a string to a certain length if necessary,
+	 *               optionally splitting in the middle of a word, and
+	 *               appending the $etc string or inserting $etc into the middle.
+	 *
+	 * @author Monte Ohrt <monte at ohrt dot com>
+	 *
+	 * @param string  $string      input string
+	 * @param integer $length      length of truncated text
+	 * @param string  $etc         end string
+	 * @param boolean $break_words truncate at word boundary
+	 * @param boolean $middle      truncate in the middle of text
+	 *
+	 * @return string truncated string
+	 */
+	public function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false)
+	{
+		if ($length === 0 || $string === null) {
+			return '';
+		}
+		if (mb_strlen($string, \Smarty\Smarty::$_CHARSET) > $length) {
+			$length -= min($length, mb_strlen($etc, \Smarty\Smarty::$_CHARSET));
+			if (!$break_words && !$middle) {
+				$string = preg_replace(
+					'/\s+?(\S+)?$/' . \Smarty\Smarty::$_UTF8_MODIFIER,
+					'',
+					mb_substr($string, 0, $length + 1, \Smarty\Smarty::$_CHARSET)
+				);
+			}
+			if (!$middle) {
+				return mb_substr($string, 0, $length, \Smarty\Smarty::$_CHARSET) . $etc;
+			}
+			return mb_substr($string, 0, intval($length / 2), \Smarty\Smarty::$_CHARSET) . $etc .
+				mb_substr($string, -intval($length / 2), $length, \Smarty\Smarty::$_CHARSET);
+		}
+		return $string;
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/ExtensionInterface.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/ExtensionInterface.php
new file mode 100644
index 000000000..72e358ee5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Extension/ExtensionInterface.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Smarty\Extension;
+
+use Smarty\BlockHandler\BlockHandlerInterface;
+use Smarty\Compile\CompilerInterface;
+use Smarty\Compile\Modifier\ModifierCompilerInterface;
+use Smarty\FunctionHandler\FunctionHandlerInterface;
+
+interface ExtensionInterface {
+
+	/**
+	 * Either return \Smarty\Compile\CompilerInterface that will compile the given $tag or
+	 * return null to indicate that you do not know how to handle this $tag. (Another Extension might.)
+	 *
+	 * @param string $tag
+	 * @return CompilerInterface|null
+	 */
+	public function getTagCompiler(string $tag): ?CompilerInterface;
+
+	/**
+	 * Either return \Smarty\Compile\Modifier\ModifierCompilerInterface that will compile the given $modifier or
+	 * return null to indicate that you do not know how to handle this $modifier. (Another Extension might.)
+	 *
+	 * @param string $modifier
+	 * @return ModifierCompilerInterface|null
+	 */
+	public function getModifierCompiler(string $modifier): ?ModifierCompilerInterface;
+
+	/**
+	 * Either return \Smarty\FunctionHandler\FunctionHandlerInterface that will handle the given $functionName or
+	 * return null to indicate that you do not know how to handle this $functionName. (Another Extension might.)
+	 *
+	 * @param string $functionName
+	 * @return FunctionHandlerInterface|null
+	 */
+	public function getFunctionHandler(string $functionName): ?FunctionHandlerInterface;
+
+	/**
+	 * Either return \Smarty\BlockHandler\BlockHandlerInterface that will handle the given $blockTagName or return null
+	 * to indicate that you do not know how to handle this $blockTagName. (Another Extension might.)
+	 *
+	 * @param string $blockTagName
+	 * @return BlockHandlerInterface|null
+	 */
+	public function getBlockHandler(string $blockTagName): ?BlockHandlerInterface;
+
+	/**
+	 * Either return a callable that takes at least 1 parameter (a string) and returns a modified string or return null
+	 * to indicate that you do not know how to handle this $modifierName. (Another Extension might.)
+	 *
+	 * The callable can accept additional optional parameters.
+	 *
+	 * @param string $modifierName
+	 * @return callable|null
+	 */
+	public function getModifierCallback(string $modifierName);
+
+	/**
+	 * Return a list of prefilters that will all be applied, in sequence.
+	 * Template prefilters can be used to preprocess templates before they are compiled.
+	 *
+	 * @return \Smarty\Filter\FilterInterface[]
+	 */
+	public function getPreFilters(): array;
+
+	/**
+	 * Return a list of postfilters that will all be applied, in sequence.
+	 * Template postfilters can be used to process compiled template code (so, after the compilation).
+	 *
+	 * @return \Smarty\Filter\FilterInterface[]
+	 */
+	public function getPostFilters(): array;
+
+	/**
+	 * Return a list of outputfilters that will all be applied, in sequence.
+	 * Template outputfilters can be used to change template output just before it is rendered.
+	 *
+	 * @return \Smarty\Filter\FilterInterface[]
+	 */
+	public function getOutputFilters(): array;
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Filter/FilterInterface.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Filter/FilterInterface.php
new file mode 100644
index 000000000..42280e25b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Filter/FilterInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Smarty\Filter;
+
+interface FilterInterface {
+
+	public function filter($code, \Smarty\Template $template);
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Filter/FilterPluginWrapper.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Filter/FilterPluginWrapper.php
new file mode 100644
index 000000000..665ee385c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Filter/FilterPluginWrapper.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Smarty\Filter;
+
+class FilterPluginWrapper implements FilterInterface {
+
+	private $callback;
+
+	public function __construct($callback) {
+		$this->callback = $callback;
+	}
+	public function filter($code, \Smarty\Template $template) {
+		return call_user_func($this->callback, $code, $template);
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Filter/Output/TrimWhitespace.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Filter/Output/TrimWhitespace.php
new file mode 100644
index 000000000..5803725ee
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Filter/Output/TrimWhitespace.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Smarty\Filter\Output;
+
+/**
+ * Smarty trimwhitespace outputfilter plugin
+ * Trim unnecessary whitespace from HTML markup.
+ *
+ * @author Rodney Rehm
+ *
+ * @param string $source input string
+ *
+ * @return string filtered output
+ */
+class TrimWhitespace implements \Smarty\Filter\FilterInterface {
+
+	public function filter($code, \Smarty\Template $template) {
+
+		$source = $code;
+
+		$store = array();
+		$_store = 0;
+		$_offset = 0;
+		// Unify Line-Breaks to \n
+		$source = preg_replace('/\015\012|\015|\012/', "\n", $source);
+		// capture Internet Explorer and KnockoutJS Conditional Comments
+		if (preg_match_all(
+			'#<!--((\[[^\]]+\]>.*?<!\[[^\]]+\])|(\s*/?ko\s+.+))-->#is',
+			$source,
+			$matches,
+			PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+		)
+		) {
+			foreach ($matches as $match) {
+				$store[] = $match[ 0 ][ 0 ];
+				$_length = strlen($match[ 0 ][ 0 ]);
+				$replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+				$source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+				$_offset += $_length - strlen($replace);
+				$_store++;
+			}
+		}
+		// Strip all HTML-Comments
+		// yes, even the ones in <script> - see https://stackoverflow.com/a/808850/515124
+		$source = preg_replace('#<!--.*?-->#ms', '', $source);
+		// capture html elements not to be messed with
+		$_offset = 0;
+		if (preg_match_all(
+			'#(<script[^>]*>.*?</script[^>]*>)|(<textarea[^>]*>.*?</textarea[^>]*>)|(<pre[^>]*>.*?</pre[^>]*>)#is',
+			$source,
+			$matches,
+			PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+		)
+		) {
+			foreach ($matches as $match) {
+				$store[] = $match[ 0 ][ 0 ];
+				$_length = strlen($match[ 0 ][ 0 ]);
+				$replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
+				$source = substr_replace($source, $replace, $match[ 0 ][ 1 ] - $_offset, $_length);
+				$_offset += $_length - strlen($replace);
+				$_store++;
+			}
+		}
+		$expressions = array(// replace multiple spaces between tags by a single space
+			// can't remove them entirely, because that might break poorly implemented CSS display:inline-block elements
+			'#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s'                                    => '\1 \2',
+			// remove spaces between attributes (but not in attribute values!)
+			'#(([a-z0-9]\s*=\s*("[^"]*?")|(\'[^\']*?\'))|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \5',
+			// note: for some very weird reason trim() seems to remove spaces inside attributes.
+			// maybe a \0 byte or something is interfering?
+			'#^\s+<#Ss'                                                               => '<',
+			'#>\s+$#Ss'                                                               => '>',
+		);
+		$source = preg_replace(array_keys($expressions), array_values($expressions), $source);
+		// note: for some very weird reason trim() seems to remove spaces inside attributes.
+		// maybe a \0 byte or something is interfering?
+		// $source = trim( $source );
+		$_offset = 0;
+		if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+			foreach ($matches as $match) {
+				$_length = strlen($match[ 0 ][ 0 ]);
+				$replace = $store[ $match[ 1 ][ 0 ] ];
+				$source = substr_replace($source, $replace, $match[ 0 ][ 1 ] + $_offset, $_length);
+				$_offset += strlen($replace) - $_length;
+				$_store++;
+			}
+		}
+		return $source;
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/BCPluginWrapper.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/BCPluginWrapper.php
new file mode 100644
index 000000000..04af07ed8
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/BCPluginWrapper.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+class BCPluginWrapper extends Base {
+
+	private $callback;
+
+	public function __construct($callback, bool $cacheable = true) {
+		$this->callback = $callback;
+		$this->cacheable = $cacheable;
+	}
+
+	public function handle($params, Template $template) {
+		$func = $this->callback;
+		return $func($params, $template);
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Base.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Base.php
new file mode 100644
index 000000000..7cf196372
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Base.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+class Base implements FunctionHandlerInterface {
+
+	/**
+	 * @var bool
+	 */
+	protected $cacheable = true;
+
+	public function isCacheable(): bool {
+		return $this->cacheable;
+	}
+
+	public function handle($params, Template $template) {
+		// TODO: Implement handle() method.
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Count.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Count.php
new file mode 100644
index 000000000..768d809b5
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Count.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Exception;
+use Smarty\Template;
+
+/**
+ * count(Countable|array $value, int $mode = COUNT_NORMAL): int
+ * If the optional mode parameter is set to COUNT_RECURSIVE (or 1), count() will recursively count the array.
+ * This is particularly useful for counting all the elements of a multidimensional array.
+ *
+ * Returns the number of elements in value. Prior to PHP 8.0.0, if the parameter was neither an array nor an object that
+ * implements the Countable interface, 1 would be returned, unless value was null, in which case 0 would be returned.
+ */
+class Count extends Base {
+
+	public function handle($params, Template $template) {
+
+		$params = array_values($params ?? []);
+
+		if (count($params) < 1 || count($params) > 2) {
+			throw new Exception("Invalid number of arguments for count. count expects 1 or 2 parameters.");
+		}
+
+		$value = $params[0];
+
+		if ($value instanceof \Countable) {
+			return $value->count();
+		}
+
+		$mode = count($params) == 2 ? (int) $params[1] : COUNT_NORMAL;
+		return count((array) $value, $mode);
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Counter.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Counter.php
new file mode 100644
index 000000000..b447caf1f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Counter.php
@@ -0,0 +1,61 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {counter} function plugin
+ * Type:     function
+ * Name:     counter
+ * Purpose:  print out a counter value
+ *
+ * @param array                    $params   parameters
+ * @param Template $template template object
+ *
+ * @return string|null
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ */
+class Counter extends Base {
+
+	private $counters = [];
+
+	public function handle($params, Template $template) {
+		$name = (isset($params['name'])) ? $params['name'] : 'default';
+		if (!isset($this->counters[$name])) {
+			$this->counters[$name] = ['start' => 1, 'skip' => 1, 'direction' => 'up', 'count' => 1];
+		}
+		$counter =& $this->counters[$name];
+		if (isset($params['start'])) {
+			$counter['start'] = $counter['count'] = (int)$params['start'];
+		}
+		if (!empty($params['assign'])) {
+			$counter['assign'] = $params['assign'];
+		}
+		if (isset($counter['assign'])) {
+			$template->assign($counter['assign'], $counter['count']);
+		}
+		if (isset($params['print'])) {
+			$print = (bool)$params['print'];
+		} else {
+			$print = empty($counter['assign']);
+		}
+		if ($print) {
+			$retval = $counter['count'];
+		} else {
+			$retval = null;
+		}
+		if (isset($params['skip'])) {
+			$counter['skip'] = $params['skip'];
+		}
+		if (isset($params['direction'])) {
+			$counter['direction'] = $params['direction'];
+		}
+		if ($counter['direction'] === 'down') {
+			$counter['count'] -= $counter['skip'];
+		} else {
+			$counter['count'] += $counter['skip'];
+		}
+		return $retval;
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Cycle.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Cycle.php
new file mode 100644
index 000000000..909a688b6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Cycle.php
@@ -0,0 +1,90 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {cycle} function plugin
+ * Type:     function
+ * Name:     cycle
+ * Date:     May 3, 2002
+ * Purpose:  cycle through given values
+ * Params:
+ *
+ * - name      - name of cycle (optional)
+ * - values    - comma separated list of values to cycle, or an array of values to cycle
+ *               (this can be left out for subsequent calls)
+ * - reset     - boolean - resets given var to true
+ * - print     - boolean - print var or not. default is true
+ * - advance   - boolean - whether to advance the cycle
+ * - delimiter - the value delimiter, default is ","
+ * - assign    - boolean, assigns to template var instead of printed.
+ *
+ * Examples:
+ *
+ * {cycle values="#eeeeee,#d0d0d0d"}
+ * {cycle name=row values="one,two,three" reset=true}
+ * {cycle name=row}
+ *
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credit to Mark Priatel <mpriatel@rogers.com>
+ * @author  credit to Gerard <gerard@interfold.com>
+ * @author  credit to Jason Sweat <jsweat_php@yahoo.com>
+ * @version 1.3
+ *
+ * @param array                    $params   parameters
+ * @param Template $template template object
+ *
+ * @return string|null
+ */
+class Cycle extends Base {
+
+	public function handle($params, Template $template) {
+		static $cycle_vars;
+		$name = (empty($params['name'])) ? 'default' : $params['name'];
+		$print = !(isset($params['print'])) || (bool)$params['print'];
+		$advance = !(isset($params['advance'])) || (bool)$params['advance'];
+		$reset = isset($params['reset']) && (bool)$params['reset'];
+		if (!isset($params['values'])) {
+			if (!isset($cycle_vars[$name]['values'])) {
+				trigger_error('cycle: missing \'values\' parameter');
+				return;
+			}
+		} else {
+			if (isset($cycle_vars[$name]['values']) && $cycle_vars[$name]['values'] !== $params['values']) {
+				$cycle_vars[$name]['index'] = 0;
+			}
+			$cycle_vars[$name]['values'] = $params['values'];
+		}
+		if (isset($params['delimiter'])) {
+			$cycle_vars[$name]['delimiter'] = $params['delimiter'];
+		} elseif (!isset($cycle_vars[$name]['delimiter'])) {
+			$cycle_vars[$name]['delimiter'] = ',';
+		}
+		if (is_array($cycle_vars[$name]['values'])) {
+			$cycle_array = $cycle_vars[$name]['values'];
+		} else {
+			$cycle_array = explode($cycle_vars[$name]['delimiter'], $cycle_vars[$name]['values']);
+		}
+		if (!isset($cycle_vars[$name]['index']) || $reset) {
+			$cycle_vars[$name]['index'] = 0;
+		}
+		if (isset($params['assign'])) {
+			$print = false;
+			$template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
+		}
+		if ($print) {
+			$retval = $cycle_array[$cycle_vars[$name]['index']];
+		} else {
+			$retval = null;
+		}
+		if ($advance) {
+			if ($cycle_vars[$name]['index'] >= count($cycle_array) - 1) {
+				$cycle_vars[$name]['index'] = 0;
+			} else {
+				$cycle_vars[$name]['index']++;
+			}
+		}
+		return $retval;
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Fetch.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Fetch.php
new file mode 100644
index 000000000..d10ef668f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Fetch.php
@@ -0,0 +1,203 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Exception;
+use Smarty\Template;
+
+/**
+ * Smarty {fetch} plugin
+ * Type:     function
+ * Name:     fetch
+ * Purpose:  fetch file, web or ftp data and display results
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param array                    $params   parameters
+ * @param Template $template template object
+ *
+ * @throws Exception
+ * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable
+ */
+class Fetch extends Base {
+
+	public function handle($params, Template $template) {
+		if (empty($params['file'])) {
+			trigger_error('[plugin] fetch parameter \'file\' cannot be empty', E_USER_NOTICE);
+			return;
+		}
+		// strip file protocol
+		if (stripos($params['file'], 'file://') === 0) {
+			$params['file'] = substr($params['file'], 7);
+		}
+		$protocol = strpos($params['file'], '://');
+		if ($protocol !== false) {
+			$protocol = strtolower(substr($params['file'], 0, $protocol));
+		}
+		if (isset($template->getSmarty()->security_policy)) {
+			if ($protocol) {
+				// remote resource (or php stream, …)
+				if (!$template->getSmarty()->security_policy->isTrustedUri($params['file'])) {
+					return;
+				}
+			} else {
+				// local file
+				if (!$template->getSmarty()->security_policy->isTrustedResourceDir($params['file'])) {
+					return;
+				}
+			}
+		}
+		$content = '';
+		if ($protocol === 'http') {
+			// http fetch
+			if ($uri_parts = parse_url($params['file'])) {
+				// set defaults
+				$host = $server_name = $uri_parts['host'];
+				$timeout = 30;
+				$accept = 'image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*';
+				$agent = 'Smarty Template Engine ' . \Smarty\Smarty::SMARTY_VERSION;
+				$referer = '';
+				$uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/';
+				$uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : '';
+				$_is_proxy = false;
+				if (empty($uri_parts['port'])) {
+					$port = 80;
+				} else {
+					$port = $uri_parts['port'];
+				}
+				if (!empty($uri_parts['user'])) {
+					$user = $uri_parts['user'];
+				}
+				if (!empty($uri_parts['pass'])) {
+					$pass = $uri_parts['pass'];
+				}
+				// loop through parameters, setup headers
+				foreach ($params as $param_key => $param_value) {
+					switch ($param_key) {
+						case 'file':
+						case 'assign':
+						case 'assign_headers':
+							break;
+						case 'user':
+							if (!empty($param_value)) {
+								$user = $param_value;
+							}
+							break;
+						case 'pass':
+							if (!empty($param_value)) {
+								$pass = $param_value;
+							}
+							break;
+						case 'accept':
+							if (!empty($param_value)) {
+								$accept = $param_value;
+							}
+							break;
+						case 'header':
+							if (!empty($param_value)) {
+								if (!preg_match('![\w\d-]+: .+!', $param_value)) {
+									trigger_error("[plugin] invalid header format '{$param_value}'", E_USER_NOTICE);
+									return;
+								} else {
+									$extra_headers[] = $param_value;
+								}
+							}
+							break;
+						case 'proxy_host':
+							if (!empty($param_value)) {
+								$proxy_host = $param_value;
+							}
+							break;
+						case 'proxy_port':
+							if (!preg_match('!\D!', $param_value)) {
+								$proxy_port = (int)$param_value;
+							} else {
+								trigger_error("[plugin] invalid value for attribute '{$param_key }'", E_USER_NOTICE);
+								return;
+							}
+							break;
+						case 'agent':
+							if (!empty($param_value)) {
+								$agent = $param_value;
+							}
+							break;
+						case 'referer':
+							if (!empty($param_value)) {
+								$referer = $param_value;
+							}
+							break;
+						case 'timeout':
+							if (!preg_match('!\D!', $param_value)) {
+								$timeout = (int)$param_value;
+							} else {
+								trigger_error("[plugin] invalid value for attribute '{$param_key}'", E_USER_NOTICE);
+								return;
+							}
+							break;
+						default:
+							trigger_error("[plugin] unrecognized attribute '{$param_key}'", E_USER_NOTICE);
+							return;
+					}
+				}
+				if (!empty($proxy_host) && !empty($proxy_port)) {
+					$_is_proxy = true;
+					$fp = fsockopen($proxy_host, $proxy_port, $errno, $errstr, $timeout);
+				} else {
+					$fp = fsockopen($server_name, $port, $errno, $errstr, $timeout);
+				}
+				if (!$fp) {
+					trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE);
+					return;
+				} else {
+					if ($_is_proxy) {
+						fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n");
+					} else {
+						fputs($fp, "GET $uri HTTP/1.0\r\n");
+					}
+					if (!empty($host)) {
+						fputs($fp, "Host: $host\r\n");
+					}
+					if (!empty($accept)) {
+						fputs($fp, "Accept: $accept\r\n");
+					}
+					if (!empty($agent)) {
+						fputs($fp, "User-Agent: $agent\r\n");
+					}
+					if (!empty($referer)) {
+						fputs($fp, "Referer: $referer\r\n");
+					}
+					if (isset($extra_headers) && is_array($extra_headers)) {
+						foreach ($extra_headers as $curr_header) {
+							fputs($fp, $curr_header . "\r\n");
+						}
+					}
+					if (!empty($user) && !empty($pass)) {
+						fputs($fp, 'Authorization: BASIC ' . base64_encode("$user:$pass") . "\r\n");
+					}
+					fputs($fp, "\r\n");
+					while (!feof($fp)) {
+						$content .= fgets($fp, 4096);
+					}
+					fclose($fp);
+					$csplit = preg_split("!\r\n\r\n!", $content, 2);
+					$content = $csplit[1];
+					if (!empty($params['assign_headers'])) {
+						$template->assign($params['assign_headers'], preg_split("!\r\n!", $csplit[0]));
+					}
+				}
+			} else {
+				trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE);
+				return;
+			}
+		} else {
+			$content = @file_get_contents($params['file']);
+			if ($content === false) {
+				throw new Exception("{fetch} cannot read resource '" . $params['file'] . "'");
+			}
+		}
+		if (!empty($params['assign'])) {
+			$template->assign($params['assign'], $content);
+		} else {
+			return $content;
+		}
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/FunctionHandlerInterface.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/FunctionHandlerInterface.php
new file mode 100644
index 000000000..ce77e13d2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/FunctionHandlerInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+interface FunctionHandlerInterface {
+	public function handle($params, Template $template);
+	public function isCacheable(): bool;
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlBase.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlBase.php
new file mode 100644
index 000000000..99f8e6c77
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlBase.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+class HtmlBase extends Base {
+
+	/**
+	 * @param $inputType
+	 * @param      $name
+	 * @param      $value
+	 * @param      $output
+	 * @param $ismultiselect
+	 * @param      $selected
+	 * @param      $extra
+	 * @param      $separator
+	 * @param      $labels
+	 * @param      $label_ids
+	 * @param bool $escape
+	 *
+	 * @return string
+	 */
+	protected function getHtmlForInput(
+		$inputType,
+		$name,
+		$value,
+		$output,
+		$ismultiselect,
+		$selected,
+		$extra,
+		$separator,
+		$labels,
+		$label_ids,
+		$escape = true
+	) {
+
+		$_output = '';
+		if (is_object($value)) {
+			if (method_exists($value, '__toString')) {
+				$value = (string)$value->__toString();
+			} else {
+				trigger_error(
+					'value is an object of class \'' . get_class($value) .
+					'\' without __toString() method',
+					E_USER_NOTICE
+				);
+				return '';
+			}
+		} else {
+			$value = (string)$value;
+		}
+		if (is_object($output)) {
+			if (method_exists($output, '__toString')) {
+				$output = (string)$output->__toString();
+			} else {
+				trigger_error(
+					'output is an object of class \'' . get_class($output) .
+					'\' without __toString() method',
+					E_USER_NOTICE
+				);
+				return '';
+			}
+		} else {
+			$output = (string)$output;
+		}
+		if ($labels) {
+			if ($label_ids) {
+				$_id = smarty_function_escape_special_chars(
+					preg_replace(
+						'![^\w\-\.]!' . \Smarty\Smarty::$_UTF8_MODIFIER,
+						'_',
+						$name . '_' . $value
+					)
+				);
+				$_output .= '<label for="' . $_id . '">';
+			} else {
+				$_output .= '<label>';
+			}
+		}
+		$name = smarty_function_escape_special_chars($name);
+		$value = smarty_function_escape_special_chars($value);
+		if ($escape) {
+			$output = smarty_function_escape_special_chars($output);
+		}
+		$_output .= '<input type="' . $inputType . '" name="' . $name;
+		if ($ismultiselect) {
+			$_output .= '[]';
+		}
+		$_output .= '" value="' . $value . '"';
+		if ($labels && $label_ids) {
+			$_output .= ' id="' . $_id . '"';
+		}
+		if ($ismultiselect && is_array($selected)) {
+			if (isset($selected[ $value ])) {
+				$_output .= ' checked="checked"';
+			}
+		} elseif ($value === $selected) {
+			$_output .= ' checked="checked"';
+		}
+		$_output .= $extra . ' />' . $output;
+		if ($labels) {
+			$_output .= '</label>';
+		}
+		$_output .= $separator;
+		return $_output;
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlCheckboxes.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlCheckboxes.php
new file mode 100644
index 000000000..45ecc40a1
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlCheckboxes.php
@@ -0,0 +1,189 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {html_checkboxes} function plugin
+ * File:       HtmlCheckboxes.php
+ * Type:       function
+ * Name:       html_checkboxes
+ * Date:       24.Feb.2003
+ * Purpose:    Prints out a list of checkbox input types
+ * Examples:
+ *
+ * {html_checkboxes values=$ids output=$names}
+ * {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
+ * {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
+ *
+ * Params:
+ *
+ * - name       (optional) - string default "checkbox"
+ * - values     (required) - array
+ * - options    (optional) - associative array
+ * - checked    (optional) - array default not set
+ * - separator  (optional) - ie <br> or &nbsp;
+ * - output     (optional) - the output next to each checkbox
+ * - assign     (optional) - assign the output as an array to this variable
+ * - escape     (optional) - escape the content (not value), defaults to true
+ *
+ * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
+ * @author  credits to Monte Ohrt <monte at ohrt dot com>
+ * @version 1.0
+ *
+ * @param array                    $params   parameters
+ * @param Template $template template object
+ *
+ * @return string
+ * @uses    smarty_function_escape_special_chars()
+ * @throws \Smarty\Exception
+ */
+class HtmlCheckboxes extends HtmlBase {
+
+	public function handle($params, Template $template) {
+		$name = 'checkbox';
+		$values = null;
+		$options = null;
+		$selected = [];
+		$separator = '';
+		$escape = true;
+		$labels = true;
+		$label_ids = false;
+		$output = null;
+		$extra = '';
+		foreach ($params as $_key => $_val) {
+			switch ($_key) {
+				case 'name':
+				case 'separator':
+					$$_key = (string)$_val;
+					break;
+				case 'escape':
+				case 'labels':
+				case 'label_ids':
+					$$_key = (bool)$_val;
+					break;
+				case 'options':
+					$$_key = (array)$_val;
+					break;
+				case 'values':
+				case 'output':
+					$$_key = array_values((array)$_val);
+					break;
+				case 'checked':
+				case 'selected':
+					if (is_array($_val)) {
+						$selected = [];
+						foreach ($_val as $_sel) {
+							if (is_object($_sel)) {
+								if (method_exists($_sel, '__toString')) {
+									$_sel = smarty_function_escape_special_chars((string)$_sel->__toString());
+								} else {
+									trigger_error(
+										'html_checkboxes: selected attribute contains an object of class \'' .
+										get_class($_sel) . '\' without __toString() method',
+										E_USER_NOTICE
+									);
+									continue;
+								}
+							} else {
+								$_sel = smarty_function_escape_special_chars((string)$_sel);
+							}
+							$selected[$_sel] = true;
+						}
+					} elseif (is_object($_val)) {
+						if (method_exists($_val, '__toString')) {
+							$selected = smarty_function_escape_special_chars((string)$_val->__toString());
+						} else {
+							trigger_error(
+								'html_checkboxes: selected attribute is an object of class \'' . get_class($_val) .
+								'\' without __toString() method',
+								E_USER_NOTICE
+							);
+						}
+					} else {
+						$selected = smarty_function_escape_special_chars((string)$_val);
+					}
+					break;
+				case 'checkboxes':
+					trigger_error(
+						'html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead',
+						E_USER_WARNING
+					);
+					$options = (array)$_val;
+					break;
+				case 'strict':
+				case 'assign':
+					break;
+				case 'disabled':
+				case 'readonly':
+					if (!empty($params['strict'])) {
+						if (!is_scalar($_val)) {
+							trigger_error(
+								"html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
+								E_USER_NOTICE
+							);
+						}
+						if ($_val === true || $_val === $_key) {
+							$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+						}
+						break;
+					}
+				// omit break; to fall through!
+				// no break
+				default:
+					if (!is_array($_val)) {
+						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+					} else {
+						trigger_error("html_checkboxes: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+					}
+					break;
+			}
+		}
+		if (!isset($options) && !isset($values)) {
+			return '';
+		} /* raise error here? */
+		$_html_result = [];
+		if (isset($options)) {
+			foreach ($options as $_key => $_val) {
+				$_html_result[] =
+					$this->getHtmlForInput(
+						'checkbox',
+						$name,
+						$_key,
+						$_val,
+						true,
+						$selected,
+						$extra,
+						$separator,
+						$labels,
+						$label_ids,
+						$escape
+					);
+			}
+		} else {
+			foreach ($values as $_i => $_key) {
+				$_val = isset($output[$_i]) ? $output[$_i] : '';
+				$_html_result[] =
+					$this->getHtmlForInput(
+						'checkbox',
+						$name,
+						$_key,
+						$_val,
+						true,
+						$selected,
+						$extra,
+						$separator,
+						$labels,
+						$label_ids,
+						$escape
+					);
+			}
+		}
+		if (!empty($params['assign'])) {
+			$template->assign($params['assign'], $_html_result);
+		} else {
+			return implode("\n", $_html_result);
+		}
+	}
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlImage.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlImage.php
new file mode 100644
index 000000000..9cb087456
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlImage.php
@@ -0,0 +1,149 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Exception;
+use Smarty\Template;
+
+/**
+ * Smarty {html_image} function plugin
+ * Type:     function
+ * Name:     html_image
+ * Date:     Feb 24, 2003
+ * Purpose:  format HTML tags for the image
+ * Examples: {html_image file="/images/masthead.gif"}
+ * Output:   <img src="/images/masthead.gif" width=400 height=23>
+ * Params:
+ *
+ * - file        - (required) - file (and path) of image
+ * - height      - (optional) - image height (default actual height)
+ * - width       - (optional) - image width (default actual width)
+ * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
+ * - path_prefix - prefix for path output (optional, default empty)
+ *
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credits to Duda <duda@big.hu>
+ * @version 1.0
+ *
+ * @param array                    $params   parameters
+ * @param Template $template template object
+ *
+ * @throws Exception
+ * @return string
+ * @uses    smarty_function_escape_special_chars()
+ */
+class HtmlImage extends Base {
+
+	public function handle($params, Template $template) {
+		$alt = '';
+		$file = '';
+		$height = '';
+		$width = '';
+		$extra = '';
+		$prefix = '';
+		$suffix = '';
+		$path_prefix = '';
+		$basedir = $_SERVER['DOCUMENT_ROOT'] ?? '';
+		foreach ($params as $_key => $_val) {
+			switch ($_key) {
+				case 'file':
+				case 'height':
+				case 'width':
+				case 'dpi':
+				case 'path_prefix':
+				case 'basedir':
+					$$_key = $_val;
+					break;
+				case 'alt':
+					if (!is_array($_val)) {
+						$$_key = smarty_function_escape_special_chars($_val);
+					} else {
+						throw new Exception(
+							"html_image: extra attribute '{$_key}' cannot be an array",
+							E_USER_NOTICE
+						);
+					}
+					break;
+				case 'link':
+				case 'href':
+					$prefix = '<a href="' . $_val . '">';
+					$suffix = '</a>';
+					break;
+				default:
+					if (!is_array($_val)) {
+						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+					} else {
+						throw new Exception(
+							"html_image: extra attribute '{$_key}' cannot be an array",
+							E_USER_NOTICE
+						);
+					}
+					break;
+			}
+		}
+		if (empty($file)) {
+			trigger_error('html_image: missing \'file\' parameter', E_USER_NOTICE);
+			return;
+		}
+		if ($file[0] === '/') {
+			$_image_path = $basedir . $file;
+		} else {
+			$_image_path = $file;
+		}
+		// strip file protocol
+		if (stripos($params['file'], 'file://') === 0) {
+			$params['file'] = substr($params['file'], 7);
+		}
+		$protocol = strpos($params['file'], '://');
+		if ($protocol !== false) {
+			$protocol = strtolower(substr($params['file'], 0, $protocol));
+		}
+		if (isset($template->getSmarty()->security_policy)) {
+			if ($protocol) {
+				// remote resource (or php stream, …)
+				if (!$template->getSmarty()->security_policy->isTrustedUri($params['file'])) {
+					return;
+				}
+			} else {
+				// local file
+				if (!$template->getSmarty()->security_policy->isTrustedResourceDir($_image_path)) {
+					return;
+				}
+			}
+		}
+		if (!isset($params['width']) || !isset($params['height'])) {
+			// FIXME: (rodneyrehm) getimagesize() loads the complete file off a remote resource, use custom [jpg,png,gif]header reader!
+			if (!$_image_data = @getimagesize($_image_path)) {
+				if (!file_exists($_image_path)) {
+					trigger_error("html_image: unable to find '{$_image_path}'", E_USER_NOTICE);
+					return;
+				} elseif (!is_readable($_image_path)) {
+					trigger_error("html_image: unable to read '{$_image_path}'", E_USER_NOTICE);
+					return;
+				} else {
+					trigger_error("html_image: '{$_image_path}' is not a valid image file", E_USER_NOTICE);
+					return;
+				}
+			}
+			if (!isset($params['width'])) {
+				$width = $_image_data[0];
+			}
+			if (!isset($params['height'])) {
+				$height = $_image_data[1];
+			}
+		}
+		if (isset($params['dpi'])) {
+			if (strstr($_SERVER['HTTP_USER_AGENT'], 'Mac')) {
+				// FIXME: (rodneyrehm) wrong dpi assumption
+				// don't know who thought this up… even if it was true in 1998, it's definitely wrong in 2011.
+				$dpi_default = 72;
+			} else {
+				$dpi_default = 96;
+			}
+			$_resize = $dpi_default / $params['dpi'];
+			$width = round($width * $_resize);
+			$height = round($height * $_resize);
+		}
+		return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' .
+			$height . '"' . $extra . ' />' . $suffix;
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlOptions.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlOptions.php
new file mode 100644
index 000000000..5346738b6
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlOptions.php
@@ -0,0 +1,223 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {html_options} function plugin
+ * Type:     function
+ * Name:     html_options
+ * Purpose:  Prints the list of <option> tags generated from
+ *           the passed parameters
+ * Params:
+ *
+ * - name       (optional) - string default "select"
+ * - values     (required) - if no options supplied) - array
+ * - options    (required) - if no values supplied) - associative array
+ * - selected   (optional) - string default not set
+ * - output     (required) - if not options supplied) - array
+ * - id         (optional) - string default not set
+ * - class      (optional) - string default not set
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
+ *
+ * @param array                     $params parameters
+ *
+ * @param \Smarty\Template $template
+ *
+ * @return string
+ * @uses   smarty_function_escape_special_chars()
+ * @throws \Smarty\Exception
+ */
+class HtmlOptions extends Base {
+
+	public function handle($params, Template $template) {
+		$name = null;
+		$values = null;
+		$options = null;
+		$selected = null;
+		$output = null;
+		$id = null;
+		$class = null;
+		$extra = '';
+		foreach ($params as $_key => $_val) {
+			switch ($_key) {
+				case 'name':
+				case 'class':
+				case 'id':
+					$$_key = (string)$_val;
+					break;
+				case 'options':
+					$options = (array)$_val;
+					break;
+				case 'values':
+				case 'output':
+					$$_key = array_values((array)$_val);
+					break;
+				case 'selected':
+					if (is_array($_val)) {
+						$selected = [];
+						foreach ($_val as $_sel) {
+							if (is_object($_sel)) {
+								if (method_exists($_sel, '__toString')) {
+									$_sel = smarty_function_escape_special_chars((string)$_sel->__toString());
+								} else {
+									trigger_error(
+										'html_options: selected attribute contains an object of class \'' .
+										get_class($_sel) . '\' without __toString() method',
+										E_USER_NOTICE
+									);
+									continue;
+								}
+							} else {
+								$_sel = smarty_function_escape_special_chars((string)$_sel);
+							}
+							$selected[$_sel] = true;
+						}
+					} elseif (is_object($_val)) {
+						if (method_exists($_val, '__toString')) {
+							$selected = smarty_function_escape_special_chars((string)$_val->__toString());
+						} else {
+							trigger_error(
+								'html_options: selected attribute is an object of class \'' . get_class($_val) .
+								'\' without __toString() method',
+								E_USER_NOTICE
+							);
+						}
+					} else {
+						$selected = smarty_function_escape_special_chars((string)$_val);
+					}
+					break;
+				case 'strict':
+					break;
+				case 'disabled':
+				case 'readonly':
+					if (!empty($params['strict'])) {
+						if (!is_scalar($_val)) {
+							trigger_error(
+								"html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute",
+								E_USER_NOTICE
+							);
+						}
+						if ($_val === true || $_val === $_key) {
+							$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+						}
+						break;
+					}
+				// omit break; to fall through!
+				// no break
+				default:
+					if (!is_array($_val)) {
+						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+					} else {
+						trigger_error("html_options: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+					}
+					break;
+			}
+		}
+		if (!isset($options) && !isset($values)) {
+			/* raise error here? */
+			return '';
+		}
+		$_html_result = '';
+		$_idx = 0;
+		if (isset($options)) {
+			foreach ($options as $_key => $_val) {
+				$_html_result .= $this->output($_key, $_val, $selected, $id, $class, $_idx);
+			}
+		} else {
+			foreach ($values as $_i => $_key) {
+				$_val = $output[$_i] ?? '';
+				$_html_result .= $this->output($_key, $_val, $selected, $id, $class, $_idx);
+			}
+		}
+		if (!empty($name)) {
+			$_html_class = !empty($class) ? ' class="' . $class . '"' : '';
+			$_html_id = !empty($id) ? ' id="' . $id . '"' : '';
+			$_html_result =
+				'<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result .
+				'</select>' . "\n";
+		}
+		return $_html_result;
+	}
+
+
+	/**
+	 * @param $key
+	 * @param $value
+	 * @param $selected
+	 * @param $id
+	 * @param $class
+	 * @param $idx
+	 *
+	 * @return string
+	 */
+	private function output($key, $value, $selected, $id, $class, &$idx)
+	{
+		if (!is_array($value)) {
+			$_key = smarty_function_escape_special_chars($key);
+			$_html_result = '<option value="' . $_key . '"';
+			if (is_array($selected)) {
+				if (isset($selected[ $_key ])) {
+					$_html_result .= ' selected="selected"';
+				}
+			} elseif ($_key === $selected) {
+				$_html_result .= ' selected="selected"';
+			}
+			$_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
+			$_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
+			if (is_object($value)) {
+				if (method_exists($value, '__toString')) {
+					$value = smarty_function_escape_special_chars((string)$value->__toString());
+				} else {
+					trigger_error(
+						'html_options: value is an object of class \'' . get_class($value) .
+						'\' without __toString() method',
+						E_USER_NOTICE
+					);
+					return '';
+				}
+			} else {
+				$value = smarty_function_escape_special_chars((string)$value);
+			}
+			$_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
+			$idx++;
+		} else {
+			$_idx = 0;
+			$_html_result =
+				$this->getHtmlForOptGroup(
+					$key,
+					$value,
+					$selected,
+					!empty($id) ? ($id . '-' . $idx) : null,
+					$class,
+					$_idx
+				);
+			$idx++;
+		}
+		return $_html_result;
+	}
+
+	/**
+	 * @param $key
+	 * @param $values
+	 * @param $selected
+	 * @param $id
+	 * @param $class
+	 * @param $idx
+	 *
+	 * @return string
+	 */
+	private function getHtmlForOptGroup($key, $values, $selected, $id, $class, &$idx)
+	{
+		$optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
+		foreach ($values as $key => $value) {
+			$optgroup_html .= $this->output($key, $value, $selected, $id, $class, $idx);
+		}
+		$optgroup_html .= "</optgroup>\n";
+		return $optgroup_html;
+	}
+
+}
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlRadios.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlRadios.php
new file mode 100644
index 000000000..544c5c7d4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlRadios.php
@@ -0,0 +1,174 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {html_radios} function plugin
+ * File:       HtmlRadios.php
+ * Type:       function
+ * Name:       html_radios
+ * Date:       24.Feb.2003
+ * Purpose:    Prints out a list of radio input types
+ * Params:
+ *
+ * - name       (optional) - string default "radio"
+ * - values     (required) - array
+ * - options    (required) - associative array
+ * - checked    (optional) - array default not set
+ * - separator  (optional) - ie <br> or &nbsp;
+ * - output     (optional) - the output next to each radio button
+ * - assign     (optional) - assign the output as an array to this variable
+ * - escape     (optional) - escape the content (not value), defaults to true
+ *
+ * Examples:
+ *
+ * {html_radios values=$ids output=$names}
+ * {html_radios values=$ids name='box' separator='<br>' output=$names}
+ * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
+ *
+ * @author  Christopher Kvarme <christopher.kvarme@flashjab.com>
+ * @author  credits to Monte Ohrt <monte at ohrt dot com>
+ * @version 1.0
+ *
+ * @param array                    $params   parameters
+ * @param Template $template template object
+ *
+ * @return string
+ * @uses    smarty_function_escape_special_chars()
+ * @throws \Smarty\Exception
+ */
+class HtmlRadios extends HtmlBase {
+
+	public function handle($params, Template $template) {
+		$name = 'radio';
+		$values = null;
+		$options = null;
+		$selected = null;
+		$separator = '';
+		$escape = true;
+		$labels = true;
+		$label_ids = false;
+		$output = null;
+		$extra = '';
+		foreach ($params as $_key => $_val) {
+			switch ($_key) {
+				case 'name':
+				case 'separator':
+					$$_key = (string)$_val;
+					break;
+				case 'checked':
+				case 'selected':
+					if (is_array($_val)) {
+						trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
+					} elseif (is_object($_val)) {
+						if (method_exists($_val, '__toString')) {
+							$selected = smarty_function_escape_special_chars((string)$_val->__toString());
+						} else {
+							trigger_error(
+								'html_radios: selected attribute is an object of class \'' . get_class($_val) .
+								'\' without __toString() method',
+								E_USER_NOTICE
+							);
+						}
+					} else {
+						$selected = (string)$_val;
+					}
+					break;
+				case 'escape':
+				case 'labels':
+				case 'label_ids':
+					$$_key = (bool)$_val;
+					break;
+				case 'options':
+					$$_key = (array)$_val;
+					break;
+				case 'values':
+				case 'output':
+					$$_key = array_values((array)$_val);
+					break;
+				case 'radios':
+					trigger_error(
+						'html_radios: the use of the "radios" attribute is deprecated, use "options" instead',
+						E_USER_WARNING
+					);
+					$options = (array)$_val;
+					break;
+				case 'strict':
+				case 'assign':
+					break;
+				case 'disabled':
+				case 'readonly':
+					if (!empty($params['strict'])) {
+						if (!is_scalar($_val)) {
+							trigger_error(
+								"html_options: {$_key} attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
+								E_USER_NOTICE
+							);
+						}
+						if ($_val === true || $_val === $_key) {
+							$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+						}
+						break;
+					}
+				// omit break; to fall through!
+				// no break
+				default:
+					if (!is_array($_val)) {
+						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+					} else {
+						trigger_error("html_radios: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+					}
+					break;
+			}
+		}
+		if (!isset($options) && !isset($values)) {
+			/* raise error here? */
+			return '';
+		}
+		$_html_result = [];
+		if (isset($options)) {
+			foreach ($options as $_key => $_val) {
+				$_html_result[] =
+					$this->getHtmlForInput(
+						'radio',
+						$name,
+						$_key,
+						$_val,
+						false,
+						$selected,
+						$extra,
+						$separator,
+						$labels,
+						$label_ids,
+						$escape
+					);
+			}
+		} else {
+			foreach ($values as $_i => $_key) {
+				$_val = $output[$_i] ?? '';
+				$_html_result[] =
+					$this->getHtmlForInput(
+						'radio',
+						$name,
+						$_key,
+						$_val,
+						false,
+						$selected,
+						$extra,
+						$separator,
+						$labels,
+						$label_ids,
+						$escape
+					);
+			}
+		}
+		if (!empty($params['assign'])) {
+			$template->assign($params['assign'], $_html_result);
+		} else {
+			return implode("\n", $_html_result);
+		}
+	}
+
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlSelectDate.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlSelectDate.php
new file mode 100644
index 000000000..a6acfb7bd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlSelectDate.php
@@ -0,0 +1,381 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {html_select_date} plugin
+ * Type:     function
+ * Name:     html_select_date
+ * Purpose:  Prints the dropdowns for date selection.
+ * ChangeLog:
+ *
+ *            - 1.0 initial release
+ *            - 1.1 added support for +/- N syntax for begin
+ *              and end year values. (Monte)
+ *            - 1.2 added support for yyyy-mm-dd syntax for
+ *              time value. (Jan Rosier)
+ *            - 1.3 added support for choosing format for
+ *              month values (Gary Loescher)
+ *            - 1.3.1 added support for choosing format for
+ *              day values (Marcus Bointon)
+ *            - 1.3.2 support negative timestamps, force year
+ *              dropdown to include given date unless explicitly set (Monte)
+ *            - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
+ *              of 0000-00-00 dates (cybot, boots)
+ *            - 2.0 complete rewrite for performance,
+ *              added attributes month_names, *_id
+ *
+ * @version 2.0
+ * @author  Andrei Zmievski
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  Rodney Rehm
+ *
+ * @param array                     $params parameters
+ *
+ * @param \Smarty\Template $template
+ *
+ * @return string
+ * @throws \Smarty\Exception
+ */
+class HtmlSelectDate extends Base {
+
+	public function handle($params, Template $template) {
+		// generate timestamps used for month names only
+		static $_month_timestamps = null;
+		static $_current_year = null;
+		if ($_month_timestamps === null) {
+			$_current_year = date('Y');
+			$_month_timestamps = [];
+			for ($i = 1; $i <= 12; $i++) {
+				$_month_timestamps[$i] = mktime(0, 0, 0, $i, 1, 2000);
+			}
+		}
+		/* Default values. */
+		$prefix = 'Date_';
+		$start_year = null;
+		$end_year = null;
+		$display_days = true;
+		$display_months = true;
+		$display_years = true;
+		$month_format = '%B';
+		/* Write months as numbers by default  GL */
+		$month_value_format = '%m';
+		$day_format = '%02d';
+		/* Write day values using this format MB */
+		$day_value_format = '%d';
+		$year_as_text = false;
+		/* Display years in reverse order? Ie. 2000,1999,.... */
+		$reverse_years = false;
+		/* Should the select boxes be part of an array when returned from PHP?
+		   e.g. setting it to "birthday", would create "birthday[Day]",
+		   "birthday[Month]" & "birthday[Year]". Can be combined with prefix */
+		$field_array = null;
+		/* <select size>'s of the different <select> tags.
+		   If not set, uses default dropdown. */
+		$day_size = null;
+		$month_size = null;
+		$year_size = null;
+		/* Unparsed attributes common to *ALL* the <select>/<input> tags.
+		   An example might be in the template: all_extra ='class ="foo"'. */
+		$all_extra = null;
+		/* Separate attributes for the tags. */
+		$day_extra = null;
+		$month_extra = null;
+		$year_extra = null;
+		/* Order in which to display the fields.
+		   "D" -> day, "M" -> month, "Y" -> year. */
+		$field_order = 'MDY';
+		/* String printed between the different fields. */
+		$field_separator = "\n";
+		$option_separator = "\n";
+		$time = null;
+
+		// $all_empty = null;
+		// $day_empty = null;
+		// $month_empty = null;
+		// $year_empty = null;
+		$extra_attrs = '';
+		$all_id = null;
+		$day_id = null;
+		$month_id = null;
+		$year_id = null;
+		foreach ($params as $_key => $_value) {
+			switch ($_key) {
+				case 'time':
+					$$_key = $_value; // we'll handle conversion below
+					break;
+				case 'month_names':
+					if (is_array($_value) && count($_value) === 12) {
+						$$_key = $_value;
+					} else {
+						trigger_error('html_select_date: month_names must be an array of 12 strings', E_USER_NOTICE);
+					}
+					break;
+				case 'prefix':
+				case 'field_array':
+				case 'start_year':
+				case 'end_year':
+				case 'day_format':
+				case 'day_value_format':
+				case 'month_format':
+				case 'month_value_format':
+				case 'day_size':
+				case 'month_size':
+				case 'year_size':
+				case 'all_extra':
+				case 'day_extra':
+				case 'month_extra':
+				case 'year_extra':
+				case 'field_order':
+				case 'field_separator':
+				case 'option_separator':
+				case 'all_empty':
+				case 'month_empty':
+				case 'day_empty':
+				case 'year_empty':
+				case 'all_id':
+				case 'month_id':
+				case 'day_id':
+				case 'year_id':
+					$$_key = (string)$_value;
+					break;
+				case 'display_days':
+				case 'display_months':
+				case 'display_years':
+				case 'year_as_text':
+				case 'reverse_years':
+					$$_key = (bool)$_value;
+					break;
+				default:
+					if (!is_array($_value)) {
+						$extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
+					} else {
+						trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+					}
+					break;
+			}
+		}
+		// Note: date() is faster than strftime()
+		// Note: explode(date()) is faster than date() date() date()
+
+		if (isset($time) && is_array($time)) {
+			if (isset($time[$prefix . 'Year'])) {
+				// $_REQUEST[$field_array] given
+				foreach ([
+					         'Y' => 'Year',
+					         'm' => 'Month',
+					         'd' => 'Day'
+				         ] as $_elementKey => $_elementName) {
+					$_variableName = '_' . strtolower($_elementName);
+					$$_variableName =
+						$time[$prefix . $_elementName] ?? date($_elementKey);
+				}
+			} elseif (isset($time[$field_array][$prefix . 'Year'])) {
+				// $_REQUEST given
+				foreach ([
+					         'Y' => 'Year',
+					         'm' => 'Month',
+					         'd' => 'Day'
+				         ] as $_elementKey => $_elementName) {
+					$_variableName = '_' . strtolower($_elementName);
+					$$_variableName = $time[$field_array][$prefix . $_elementName] ?? date($_elementKey);
+				}
+			} else {
+				// no date found, use NOW
+				[$_year, $_month, $_day] = explode('-', date('Y-m-d'));
+			}
+		} elseif (isset($time) && preg_match("/(\d*)-(\d*)-(\d*)/", $time, $matches)) {
+			$_year = $_month = $_day = null;
+			if ($matches[1] > '') {
+				$_year = (int)$matches[1];
+			}
+			if ($matches[2] > '') {
+				$_month = (int)$matches[2];
+			}
+			if ($matches[3] > '') {
+				$_day = (int)$matches[3];
+			}
+		} elseif ($time === null) {
+			if (array_key_exists('time', $params)) {
+				$_year = $_month = $_day = null;
+			} else {
+				[$_year, $_month, $_day] = explode('-', date('Y-m-d'));
+			}
+		} else {
+			$time = smarty_make_timestamp($time);
+			[$_year, $_month, $_day] = explode('-', date('Y-m-d', $time));
+		}
+
+		// make syntax "+N" or "-N" work with $start_year and $end_year
+		// Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
+		foreach ([
+			         'start',
+			         'end'
+		         ] as $key) {
+			$key .= '_year';
+			$t = $$key;
+			if ($t === null) {
+				$$key = (int)$_current_year;
+			} elseif ($t[0] === '+') {
+				$$key = (int)($_current_year + (int)trim(substr($t, 1)));
+			} elseif ($t[0] === '-') {
+				$$key = (int)($_current_year - (int)trim(substr($t, 1)));
+			} else {
+				$$key = (int)$$key;
+			}
+		}
+		// flip for ascending or descending
+		if (($start_year > $end_year && !$reverse_years) || ($start_year < $end_year && $reverse_years)) {
+			$t = $end_year;
+			$end_year = $start_year;
+			$start_year = $t;
+		}
+		// generate year <select> or <input>
+		if ($display_years) {
+			$_extra = '';
+			$_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
+			if ($all_extra) {
+				$_extra .= ' ' . $all_extra;
+			}
+			if ($year_extra) {
+				$_extra .= ' ' . $year_extra;
+			}
+			if ($year_as_text) {
+				$_html_years =
+					'<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra .
+					$extra_attrs . ' />';
+			} else {
+				$_html_years = '<select name="' . $_name . '"';
+				if ($year_id !== null || $all_id !== null) {
+					$_html_years .= ' id="' . smarty_function_escape_special_chars(
+							$year_id !== null ?
+								($year_id ? $year_id : $_name) :
+								($all_id ? ($all_id . $_name) :
+									$_name)
+						) . '"';
+				}
+				if ($year_size) {
+					$_html_years .= ' size="' . $year_size . '"';
+				}
+				$_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
+				if (isset($year_empty) || isset($all_empty)) {
+					$_html_years .= '<option value="">' . (isset($year_empty) ? $year_empty : $all_empty) . '</option>' .
+						$option_separator;
+				}
+				$op = $start_year > $end_year ? -1 : 1;
+				for ($i = $start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
+					$_html_years .= '<option value="' . $i . '"' . ($_year == $i ? ' selected="selected"' : '') . '>' . $i .
+						'</option>' . $option_separator;
+				}
+				$_html_years .= '</select>';
+			}
+		}
+		// generate month <select> or <input>
+		if ($display_months) {
+			$_extra = '';
+			$_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
+			if ($all_extra) {
+				$_extra .= ' ' . $all_extra;
+			}
+			if ($month_extra) {
+				$_extra .= ' ' . $month_extra;
+			}
+			$_html_months = '<select name="' . $_name . '"';
+			if ($month_id !== null || $all_id !== null) {
+				$_html_months .= ' id="' . smarty_function_escape_special_chars(
+						$month_id !== null ?
+							($month_id ? $month_id : $_name) :
+							($all_id ? ($all_id . $_name) :
+								$_name)
+					) . '"';
+			}
+			if ($month_size) {
+				$_html_months .= ' size="' . $month_size . '"';
+			}
+			$_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
+			if (isset($month_empty) || isset($all_empty)) {
+				$_html_months .= '<option value="">' . (isset($month_empty) ? $month_empty : $all_empty) . '</option>' .
+					$option_separator;
+			}
+			for ($i = 1; $i <= 12; $i++) {
+				$_val = sprintf('%02d', $i);
+				$_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[$i]) :
+					($month_format === '%m' ? $_val : @strftime($month_format, $_month_timestamps[$i]));
+				$_value = $month_value_format === '%m' ? $_val : @strftime($month_value_format, $_month_timestamps[$i]);
+				$_html_months .= '<option value="' . $_value . '"' . ($_val == $_month ? ' selected="selected"' : '') .
+					'>' . $_text . '</option>' . $option_separator;
+			}
+			$_html_months .= '</select>';
+		}
+		// generate day <select> or <input>
+		if ($display_days) {
+			$_extra = '';
+			$_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
+			if ($all_extra) {
+				$_extra .= ' ' . $all_extra;
+			}
+			if ($day_extra) {
+				$_extra .= ' ' . $day_extra;
+			}
+			$_html_days = '<select name="' . $_name . '"';
+			if ($day_id !== null || $all_id !== null) {
+				$_html_days .= ' id="' .
+					smarty_function_escape_special_chars(
+						$day_id !== null ? ($day_id ? $day_id : $_name) :
+							($all_id ? ($all_id . $_name) : $_name)
+					) . '"';
+			}
+			if ($day_size) {
+				$_html_days .= ' size="' . $day_size . '"';
+			}
+			$_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
+			if (isset($day_empty) || isset($all_empty)) {
+				$_html_days .= '<option value="">' . (isset($day_empty) ? $day_empty : $all_empty) . '</option>' .
+					$option_separator;
+			}
+			for ($i = 1; $i <= 31; $i++) {
+				$_val = sprintf('%02d', $i);
+				$_text = $day_format === '%02d' ? $_val : sprintf($day_format, $i);
+				$_value = $day_value_format === '%02d' ? $_val : sprintf($day_value_format, $i);
+				$_html_days .= '<option value="' . $_value . '"' . ($_val == $_day ? ' selected="selected"' : '') . '>' .
+					$_text . '</option>' . $option_separator;
+			}
+			$_html_days .= '</select>';
+		}
+		// order the fields for output
+		$_html = '';
+		for ($i = 0; $i <= 2; $i++) {
+			switch ($field_order[$i]) {
+				case 'Y':
+				case 'y':
+					if (isset($_html_years)) {
+						if ($_html) {
+							$_html .= $field_separator;
+						}
+						$_html .= $_html_years;
+					}
+					break;
+				case 'm':
+				case 'M':
+					if (isset($_html_months)) {
+						if ($_html) {
+							$_html .= $field_separator;
+						}
+						$_html .= $_html_months;
+					}
+					break;
+				case 'd':
+				case 'D':
+					if (isset($_html_days)) {
+						if ($_html) {
+							$_html .= $field_separator;
+						}
+						$_html .= $_html_days;
+					}
+					break;
+			}
+		}
+		return $_html;
+	}
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlSelectTime.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlSelectTime.php
new file mode 100644
index 000000000..40679c10c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlSelectTime.php
@@ -0,0 +1,334 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {html_select_time} function plugin
+ * Type:     function
+ * Name:     html_select_time
+ * Purpose:  Prints the dropdowns for time selection
+ *
+ * @author Roberto Berto <roberto@berto.net>
+ * @author Monte Ohrt <monte AT ohrt DOT com>
+ *
+ * @param array                     $params parameters
+ *
+ * @param \Smarty\Template $template
+ *
+ * @return string
+ * @uses   smarty_make_timestamp()
+ * @throws \Smarty\Exception
+ */
+class HtmlSelectTime extends Base {
+
+	public function handle($params, Template $template) {
+		$prefix = 'Time_';
+		$field_array = null;
+		$field_separator = "\n";
+		$option_separator = "\n";
+		$time = null;
+		$display_hours = true;
+		$display_minutes = true;
+		$display_seconds = true;
+		$display_meridian = true;
+		$hour_format = '%02d';
+		$hour_value_format = '%02d';
+		$minute_format = '%02d';
+		$minute_value_format = '%02d';
+		$second_format = '%02d';
+		$second_value_format = '%02d';
+		$hour_size = null;
+		$minute_size = null;
+		$second_size = null;
+		$meridian_size = null;
+		$all_empty = null;
+		$hour_empty = null;
+		$minute_empty = null;
+		$second_empty = null;
+		$meridian_empty = null;
+		$all_id = null;
+		$hour_id = null;
+		$minute_id = null;
+		$second_id = null;
+		$meridian_id = null;
+		$use_24_hours = true;
+		$minute_interval = 1;
+		$second_interval = 1;
+		$extra_attrs = '';
+		$all_extra = null;
+		$hour_extra = null;
+		$minute_extra = null;
+		$second_extra = null;
+		$meridian_extra = null;
+		foreach ($params as $_key => $_value) {
+			switch ($_key) {
+				case 'time':
+					if (!is_array($_value) && $_value !== null) {
+						$time = smarty_make_timestamp($_value);
+					}
+					break;
+				case 'prefix':
+				case 'field_array':
+				case 'field_separator':
+				case 'option_separator':
+				case 'all_extra':
+				case 'hour_extra':
+				case 'minute_extra':
+				case 'second_extra':
+				case 'meridian_extra':
+				case 'all_empty':
+				case 'hour_empty':
+				case 'minute_empty':
+				case 'second_empty':
+				case 'meridian_empty':
+				case 'all_id':
+				case 'hour_id':
+				case 'minute_id':
+				case 'second_id':
+				case 'meridian_id':
+				case 'hour_format':
+				case 'hour_value_format':
+				case 'minute_format':
+				case 'minute_value_format':
+				case 'second_format':
+				case 'second_value_format':
+					$$_key = (string)$_value;
+					break;
+				case 'display_hours':
+				case 'display_minutes':
+				case 'display_seconds':
+				case 'display_meridian':
+				case 'use_24_hours':
+					$$_key = (bool)$_value;
+					break;
+				case 'minute_interval':
+				case 'second_interval':
+				case 'hour_size':
+				case 'minute_size':
+				case 'second_size':
+				case 'meridian_size':
+					$$_key = (int)$_value;
+					break;
+				default:
+					if (!is_array($_value)) {
+						$extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
+					} else {
+						trigger_error("html_select_date: extra attribute '{$_key}' cannot be an array", E_USER_NOTICE);
+					}
+					break;
+			}
+		}
+		if (isset($params['time']) && is_array($params['time'])) {
+			if (isset($params['time'][$prefix . 'Hour'])) {
+				// $_REQUEST[$field_array] given
+				foreach ([
+					         'H' => 'Hour',
+					         'i' => 'Minute',
+					         's' => 'Second'
+				         ] as $_elementKey => $_elementName) {
+					$_variableName = '_' . strtolower($_elementName);
+					$$_variableName =
+						$params['time'][$prefix . $_elementName] ?? date($_elementKey);
+				}
+				$_meridian =
+					isset($params['time'][$prefix . 'Meridian']) ? (' ' . $params['time'][$prefix . 'Meridian']) :
+						'';
+				$time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
+				[$_hour, $_minute, $_second] = $time = explode('-', date('H-i-s', $time));
+			} elseif (isset($params['time'][$field_array][$prefix . 'Hour'])) {
+				// $_REQUEST given
+				foreach ([
+					         'H' => 'Hour',
+					         'i' => 'Minute',
+					         's' => 'Second'
+				         ] as $_elementKey => $_elementName) {
+					$_variableName = '_' . strtolower($_elementName);
+					$$_variableName = $params['time'][$field_array][$prefix . $_elementName] ?? date($_elementKey);
+				}
+				$_meridian = isset($params['time'][$field_array][$prefix . 'Meridian']) ?
+					(' ' . $params['time'][$field_array][$prefix . 'Meridian']) : '';
+				$time = strtotime($_hour . ':' . $_minute . ':' . $_second . $_meridian);
+				[$_hour, $_minute, $_second] = $time = explode('-', date('H-i-s', $time));
+			} else {
+				// no date found, use NOW
+				[$_year, $_month, $_day] = $time = explode('-', date('Y-m-d'));
+			}
+		} elseif ($time === null) {
+			if (array_key_exists('time', $params)) {
+				$_hour = $_minute = $_second = $time = null;
+			} else {
+				[$_hour, $_minute, $_second] = $time = explode('-', date('H-i-s'));
+			}
+		} else {
+			[$_hour, $_minute, $_second] = $time = explode('-', date('H-i-s', $time));
+		}
+		// generate hour <select>
+		if ($display_hours) {
+			$_html_hours = '';
+			$_extra = '';
+			$_name = $field_array ? ($field_array . '[' . $prefix . 'Hour]') : ($prefix . 'Hour');
+			if ($all_extra) {
+				$_extra .= ' ' . $all_extra;
+			}
+			if ($hour_extra) {
+				$_extra .= ' ' . $hour_extra;
+			}
+			$_html_hours = '<select name="' . $_name . '"';
+			if ($hour_id !== null || $all_id !== null) {
+				$_html_hours .= ' id="' .
+					smarty_function_escape_special_chars(
+						$hour_id !== null ? ($hour_id ? $hour_id : $_name) :
+							($all_id ? ($all_id . $_name) : $_name)
+					) . '"';
+			}
+			if ($hour_size) {
+				$_html_hours .= ' size="' . $hour_size . '"';
+			}
+			$_html_hours .= $_extra . $extra_attrs . '>' . $option_separator;
+			if (isset($hour_empty) || isset($all_empty)) {
+				$_html_hours .= '<option value="">' . (isset($hour_empty) ? $hour_empty : $all_empty) . '</option>' .
+					$option_separator;
+			}
+			$start = $use_24_hours ? 0 : 1;
+			$end = $use_24_hours ? 23 : 12;
+			for ($i = $start; $i <= $end; $i++) {
+				$_val = sprintf('%02d', $i);
+				$_text = $hour_format === '%02d' ? $_val : sprintf($hour_format, $i);
+				$_value = $hour_value_format === '%02d' ? $_val : sprintf($hour_value_format, $i);
+				if (!$use_24_hours) {
+					$_hour12 = $_hour == 0 ? 12 : ($_hour <= 12 ? $_hour : $_hour - 12);
+				}
+				$selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
+				$_html_hours .= '<option value="' . $_value . '"' . ($selected ? ' selected="selected"' : '') . '>' .
+					$_text . '</option>' . $option_separator;
+			}
+			$_html_hours .= '</select>';
+		}
+		// generate minute <select>
+		if ($display_minutes) {
+			$_html_minutes = '';
+			$_extra = '';
+			$_name = $field_array ? ($field_array . '[' . $prefix . 'Minute]') : ($prefix . 'Minute');
+			if ($all_extra) {
+				$_extra .= ' ' . $all_extra;
+			}
+			if ($minute_extra) {
+				$_extra .= ' ' . $minute_extra;
+			}
+			$_html_minutes = '<select name="' . $_name . '"';
+			if ($minute_id !== null || $all_id !== null) {
+				$_html_minutes .= ' id="' . smarty_function_escape_special_chars(
+						$minute_id !== null ?
+							($minute_id ? $minute_id : $_name) :
+							($all_id ? ($all_id . $_name) :
+								$_name)
+					) . '"';
+			}
+			if ($minute_size) {
+				$_html_minutes .= ' size="' . $minute_size . '"';
+			}
+			$_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator;
+			if (isset($minute_empty) || isset($all_empty)) {
+				$_html_minutes .= '<option value="">' . (isset($minute_empty) ? $minute_empty : $all_empty) . '</option>' .
+					$option_separator;
+			}
+			$selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
+			for ($i = 0; $i <= 59; $i += $minute_interval) {
+				$_val = sprintf('%02d', $i);
+				$_text = $minute_format === '%02d' ? $_val : sprintf($minute_format, $i);
+				$_value = $minute_value_format === '%02d' ? $_val : sprintf($minute_value_format, $i);
+				$_html_minutes .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
+					'>' . $_text . '</option>' . $option_separator;
+			}
+			$_html_minutes .= '</select>';
+		}
+		// generate second <select>
+		if ($display_seconds) {
+			$_html_seconds = '';
+			$_extra = '';
+			$_name = $field_array ? ($field_array . '[' . $prefix . 'Second]') : ($prefix . 'Second');
+			if ($all_extra) {
+				$_extra .= ' ' . $all_extra;
+			}
+			if ($second_extra) {
+				$_extra .= ' ' . $second_extra;
+			}
+			$_html_seconds = '<select name="' . $_name . '"';
+			if ($second_id !== null || $all_id !== null) {
+				$_html_seconds .= ' id="' . smarty_function_escape_special_chars(
+						$second_id !== null ?
+							($second_id ? $second_id : $_name) :
+							($all_id ? ($all_id . $_name) :
+								$_name)
+					) . '"';
+			}
+			if ($second_size) {
+				$_html_seconds .= ' size="' . $second_size . '"';
+			}
+			$_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator;
+			if (isset($second_empty) || isset($all_empty)) {
+				$_html_seconds .= '<option value="">' . (isset($second_empty) ? $second_empty : $all_empty) . '</option>' .
+					$option_separator;
+			}
+			$selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
+			for ($i = 0; $i <= 59; $i += $second_interval) {
+				$_val = sprintf('%02d', $i);
+				$_text = $second_format === '%02d' ? $_val : sprintf($second_format, $i);
+				$_value = $second_value_format === '%02d' ? $_val : sprintf($second_value_format, $i);
+				$_html_seconds .= '<option value="' . $_value . '"' . ($selected === $i ? ' selected="selected"' : '') .
+					'>' . $_text . '</option>' . $option_separator;
+			}
+			$_html_seconds .= '</select>';
+		}
+		// generate meridian <select>
+		if ($display_meridian && !$use_24_hours) {
+			$_html_meridian = '';
+			$_extra = '';
+			$_name = $field_array ? ($field_array . '[' . $prefix . 'Meridian]') : ($prefix . 'Meridian');
+			if ($all_extra) {
+				$_extra .= ' ' . $all_extra;
+			}
+			if ($meridian_extra) {
+				$_extra .= ' ' . $meridian_extra;
+			}
+			$_html_meridian = '<select name="' . $_name . '"';
+			if ($meridian_id !== null || $all_id !== null) {
+				$_html_meridian .= ' id="' . smarty_function_escape_special_chars(
+						$meridian_id !== null ?
+							($meridian_id ? $meridian_id :
+								$_name) :
+							($all_id ? ($all_id . $_name) :
+								$_name)
+					) . '"';
+			}
+			if ($meridian_size) {
+				$_html_meridian .= ' size="' . $meridian_size . '"';
+			}
+			$_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator;
+			if (isset($meridian_empty) || isset($all_empty)) {
+				$_html_meridian .= '<option value="">' . (isset($meridian_empty) ? $meridian_empty : $all_empty) .
+					'</option>' . $option_separator;
+			}
+			$_html_meridian .= '<option value="am"' . ($_hour > 0 && $_hour < 12 ? ' selected="selected"' : '') .
+				'>AM</option>' . $option_separator . '<option value="pm"' .
+				($_hour < 12 ? '' : ' selected="selected"') . '>PM</option>' . $option_separator .
+				'</select>';
+		}
+		$_html = '';
+		foreach ([
+			         '_html_hours',
+			         '_html_minutes',
+			         '_html_seconds',
+			         '_html_meridian'
+		         ] as $k) {
+			if (isset($$k)) {
+				if ($_html) {
+					$_html .= $field_separator;
+				}
+				$_html .= $$k;
+			}
+		}
+		return $_html;
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlTable.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlTable.php
new file mode 100644
index 000000000..d5d147053
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/HtmlTable.php
@@ -0,0 +1,161 @@
+<?php
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {html_table} function plugin
+ * Type:     function
+ * Name:     html_table
+ * Date:     Feb 17, 2003
+ * Purpose:  make an html table from an array of data
+ * Params:
+ *
+ * - loop       - array to loop through
+ * - cols       - number of columns, comma separated list of column names
+ *                or array of column names
+ * - rows       - number of rows
+ * - table_attr - table attributes
+ * - th_attr    - table heading attributes (arrays are cycled)
+ * - tr_attr    - table row attributes (arrays are cycled)
+ * - td_attr    - table cell attributes (arrays are cycled)
+ * - trailpad   - value to pad trailing cells with
+ * - caption    - text for caption element
+ * - vdir       - vertical direction (default: "down", means top-to-bottom)
+ * - hdir       - horizontal direction (default: "right", means left-to-right)
+ * - inner      - inner loop (default "cols": print $loop line by line,
+ *                $loop will be printed column by column otherwise)
+ *
+ * Examples:
+ *
+ * {table loop=$data}
+ * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
+ * {table loop=$data cols="first,second,third" tr_attr=$colors}
+ *
+ * @param array $params parameters
+ *
+ * @return string
+ *@author  credit to boots <boots dot smarty at yahoo dot com>
+ * @version 1.1
+ *
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credit to Messju Mohr <messju at lammfellpuschen dot de>
+ */
+class HtmlTable extends Base {
+
+	public function handle($params, Template $template) {
+		$table_attr = 'border="1"';
+		$tr_attr = '';
+		$th_attr = '';
+		$td_attr = '';
+		$cols = $cols_count = 3;
+		$rows = 3;
+		$trailpad = '&nbsp;';
+		$vdir = 'down';
+		$hdir = 'right';
+		$inner = 'cols';
+		$caption = '';
+		$loop = null;
+		if (!isset($params['loop'])) {
+			trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
+			return;
+		}
+		foreach ($params as $_key => $_value) {
+			switch ($_key) {
+				case 'loop':
+					$$_key = (array)$_value;
+					break;
+				case 'cols':
+					if (is_array($_value) && !empty($_value)) {
+						$cols = $_value;
+						$cols_count = count($_value);
+					} elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
+						$cols = explode(',', $_value);
+						$cols_count = count($cols);
+					} elseif (!empty($_value)) {
+						$cols_count = (int)$_value;
+					} else {
+						$cols_count = $cols;
+					}
+					break;
+				case 'rows':
+					$$_key = (int)$_value;
+					break;
+				case 'table_attr':
+				case 'trailpad':
+				case 'hdir':
+				case 'vdir':
+				case 'inner':
+				case 'caption':
+					$$_key = (string)$_value;
+					break;
+				case 'tr_attr':
+				case 'td_attr':
+				case 'th_attr':
+					$$_key = $_value;
+					break;
+			}
+		}
+		$loop_count = count($loop);
+		if (empty($params['rows'])) {
+			/* no rows specified */
+			$rows = ceil($loop_count / $cols_count);
+		} elseif (empty($params['cols'])) {
+			if (!empty($params['rows'])) {
+				/* no cols specified, but rows */
+				$cols_count = ceil($loop_count / $rows);
+			}
+		}
+		$output = "<table $table_attr>\n";
+		if (!empty($caption)) {
+			$output .= '<caption>' . $caption . "</caption>\n";
+		}
+		if (is_array($cols)) {
+			$cols = ($hdir === 'right') ? $cols : array_reverse($cols);
+			$output .= "<thead><tr>\n";
+			for ($r = 0; $r < $cols_count; $r++) {
+				$output .= '<th' . $this->cycle('th', $th_attr, $r) . '>';
+				$output .= $cols[$r];
+				$output .= "</th>\n";
+			}
+			$output .= "</tr></thead>\n";
+		}
+		$output .= "<tbody>\n";
+		for ($r = 0; $r < $rows; $r++) {
+			$output .= "<tr" . $this->cycle('tr', $tr_attr, $r) . ">\n";
+			$rx = ($vdir === 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
+			for ($c = 0; $c < $cols_count; $c++) {
+				$x = ($hdir === 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
+				if ($inner !== 'cols') {
+					/* shuffle x to loop over rows*/
+					$x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
+				}
+				if ($x < $loop_count) {
+					$output .= "<td" . $this->cycle('td', $td_attr, $c) . ">" . $loop[$x] . "</td>\n";
+				} else {
+					$output .= "<td" . $this->cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
+				}
+			}
+			$output .= "</tr>\n";
+		}
+		$output .= "</tbody>\n";
+		$output .= "</table>\n";
+		return $output;
+	}
+
+	/**
+	 * @param $name
+	 * @param $var
+	 * @param $no
+	 *
+	 * @return string
+	 */
+	private function cycle($name, $var, $no) {
+		if (!is_array($var)) {
+			$ret = $var;
+		} else {
+			$ret = $var[$no % count($var)];
+		}
+		return ($ret) ? ' ' . $ret : '';
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Mailto.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Mailto.php
new file mode 100644
index 000000000..eb35c48eb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Mailto.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {mailto} function plugin
+ * Type:     function
+ * Name:     mailto
+ * Date:     May 21, 2002
+ * Purpose:  automate mailto address link creation, and optionally encode them.
+ * Params:
+ *
+ * - address    - (required) - e-mail address
+ * - text       - (optional) - text to display, default is address
+ * - encode     - (optional) - can be one of:
+ *                             * none : no encoding (default)
+ *                             * javascript : encode with javascript
+ *                             * javascript_charcode : encode with javascript charcode
+ *                             * hex : encode with hexadecimal (no javascript)
+ * - cc         - (optional) - address(es) to carbon copy
+ * - bcc        - (optional) - address(es) to blind carbon copy
+ * - subject    - (optional) - e-mail subject
+ * - newsgroups - (optional) - newsgroup(s) to post to
+ * - followupto - (optional) - address(es) to follow up to
+ * - extra      - (optional) - extra tags for the href link
+ *
+ * Examples:
+ *
+ * {mailto address="me@domain.com"}
+ * {mailto address="me@domain.com" encode="javascript"}
+ * {mailto address="me@domain.com" encode="hex"}
+ * {mailto address="me@domain.com" subject="Hello to you!"}
+ * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
+ * {mailto address="me@domain.com" extra='class="mailto"'}
+ *
+ * @version 1.2
+ * @author  Monte Ohrt <monte at ohrt dot com>
+ * @author  credits to Jason Sweat (added cc, bcc and subject functionality)
+ *
+ * @param array $params parameters
+ *
+ * @return string
+ */
+class Mailto extends Base {
+
+	public function handle($params, Template $template) {
+		static $_allowed_encoding = [
+			'javascript' => true,
+			'javascript_charcode' => true,
+			'hex' => true,
+			'none' => true
+		];
+
+		$extra = '';
+		if (empty($params['address'])) {
+			trigger_error("mailto: missing 'address' parameter", E_USER_WARNING);
+			return;
+		} else {
+			$address = $params['address'];
+		}
+
+		$text = $address;
+
+		// netscape and mozilla do not decode %40 (@) in BCC field (bug?)
+		// so, don't encode it.
+		$mail_parms = [];
+		foreach ($params as $var => $value) {
+			switch ($var) {
+				case 'cc':
+				case 'bcc':
+				case 'followupto':
+					if (!empty($value)) {
+						$mail_parms[] = $var . '=' . str_replace(['%40', '%2C'], ['@', ','], rawurlencode($value));
+					}
+					break;
+				case 'subject':
+				case 'newsgroups':
+					$mail_parms[] = $var . '=' . rawurlencode($value);
+					break;
+				case 'extra':
+				case 'text':
+					$$var = $value;
+				// no break
+				default:
+			}
+		}
+
+		if ($mail_parms) {
+			$address .= '?' . join('&', $mail_parms);
+		}
+		$encode = (empty($params['encode'])) ? 'none' : $params['encode'];
+		if (!isset($_allowed_encoding[$encode])) {
+			trigger_error(
+				"mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex",
+				E_USER_WARNING
+			);
+			return;
+		}
+
+		$string = '<a href="mailto:' . htmlspecialchars($address, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, \Smarty\Smarty::$_CHARSET) .
+			'" ' . $extra . '>' . htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, \Smarty\Smarty::$_CHARSET) . '</a>';
+
+		if ($encode === 'javascript') {
+			$js_encode = '';
+			for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
+				$js_encode .= '%' . bin2hex($string[$x]);
+			}
+			return '<script>document.write(unescape(\'' . $js_encode . '\'))</script>';
+		} elseif ($encode === 'javascript_charcode') {
+			for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
+				$ord[] = ord($string[$x]);
+			}
+			return '<script>document.write(String.fromCharCode(' . implode(',', $ord) . '))</script>';
+		} elseif ($encode === 'hex') {
+			preg_match('!^(.*)(\?.*)$!', $address, $match);
+			if (!empty($match[2])) {
+				trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.", E_USER_WARNING);
+				return;
+			}
+			$address_encode = '';
+			for ($x = 0, $_length = strlen($address); $x < $_length; $x++) {
+				if (preg_match('!\w!' . \Smarty\Smarty::$_UTF8_MODIFIER, $address[$x])) {
+					$address_encode .= '%' . bin2hex($address[$x]);
+				} else {
+					$address_encode .= $address[$x];
+				}
+			}
+			$text_encode = '';
+			for ($x = 0, $_length = strlen($text); $x < $_length; $x++) {
+				$text_encode .= '&#x' . bin2hex($text[$x]) . ';';
+			}
+			$mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
+			return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
+		} else {
+			// no encoding
+			return $string;
+		}
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Math.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Math.php
new file mode 100644
index 000000000..23ef9253d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/FunctionHandler/Math.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Template;
+
+/**
+ * Smarty {math} function plugin
+ * Type:     function
+ * Name:     math
+ * Purpose:  handle math computations in template
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param array                    $params   parameters
+ * @param Template $template template object
+ *
+ * @return string|null
+ */
+class Math extends Base {
+
+	public function handle($params, Template $template) {
+		static $_allowed_funcs =
+			[
+				'int' => true,
+				'abs' => true,
+				'ceil' => true,
+				'acos' => true,
+				'acosh' => true,
+				'cos' => true,
+				'cosh' => true,
+				'deg2rad' => true,
+				'rad2deg' => true,
+				'exp' => true,
+				'floor' => true,
+				'log' => true,
+				'log10' => true,
+				'max' => true,
+				'min' => true,
+				'pi' => true,
+				'pow' => true,
+				'rand' => true,
+				'round' => true,
+				'asin' => true,
+				'asinh' => true,
+				'sin' => true,
+				'sinh' => true,
+				'sqrt' => true,
+				'srand' => true,
+				'atan' => true,
+				'atanh' => true,
+				'tan' => true,
+				'tanh' => true
+			];
+
+		// be sure equation parameter is present
+		if (empty($params['equation'])) {
+			trigger_error("math: missing equation parameter", E_USER_WARNING);
+			return;
+		}
+		$equation = $params['equation'];
+
+		// Remove whitespaces
+		$equation = preg_replace('/\s+/', '', $equation);
+
+		// Adapted from https://www.php.net/manual/en/function.eval.php#107377
+		$number = '-?(?:\d+(?:[,.]\d+)?|pi|Ï€)'; // What is a number
+		$functionsOrVars = '((?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))';
+		$operators = '[,+\/*\^%-]'; // Allowed math operators
+		$regexp = '/^((' . $number . '|' . $functionsOrVars . '|(' . $functionsOrVars . '\s*\((?1)*\)|\((?1)*\)))(?:' . $operators . '(?1))?)+$/';
+
+		if (!preg_match($regexp, $equation)) {
+			trigger_error("math: illegal characters", E_USER_WARNING);
+			return;
+		}
+
+		// make sure parenthesis are balanced
+		if (substr_count($equation, '(') !== substr_count($equation, ')')) {
+			trigger_error("math: unbalanced parenthesis", E_USER_WARNING);
+			return;
+		}
+
+		// disallow backticks
+		if (strpos($equation, '`') !== false) {
+			trigger_error("math: backtick character not allowed in equation", E_USER_WARNING);
+			return;
+		}
+
+		// also disallow dollar signs
+		if (strpos($equation, '$') !== false) {
+			trigger_error("math: dollar signs not allowed in equation", E_USER_WARNING);
+			return;
+		}
+		foreach ($params as $key => $val) {
+			if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
+				// make sure value is not empty
+				if (strlen($val) === 0) {
+					trigger_error("math: parameter '{$key}' is empty", E_USER_WARNING);
+					return;
+				}
+				if (!is_numeric($val)) {
+					trigger_error("math: parameter '{$key}' is not numeric", E_USER_WARNING);
+					return;
+				}
+			}
+		}
+		// match all vars in equation, make sure all are passed
+		preg_match_all('!(?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)!', $equation, $match);
+		foreach ($match[1] as $curr_var) {
+			if ($curr_var && !isset($params[$curr_var]) && !isset($_allowed_funcs[$curr_var])) {
+				trigger_error(
+					"math: function call '{$curr_var}' not allowed, or missing parameter '{$curr_var}'",
+					E_USER_WARNING
+				);
+				return;
+			}
+		}
+		foreach ($params as $key => $val) {
+			if ($key !== 'equation' && $key !== 'format' && $key !== 'assign') {
+				$equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
+			}
+		}
+		$smarty_math_result = null;
+		eval("\$smarty_math_result = " . $equation . ";");
+
+		if (empty($params['format'])) {
+			if (empty($params['assign'])) {
+				return $smarty_math_result;
+			} else {
+				$template->assign($params['assign'], $smarty_math_result);
+			}
+		} else {
+			if (empty($params['assign'])) {
+				printf($params['format'], $smarty_math_result);
+			} else {
+				$template->assign($params['assign'], sprintf($params['format'], $smarty_math_result));
+			}
+		}
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Lexer/ConfigfileLexer.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Lexer/ConfigfileLexer.php
new file mode 100644
index 000000000..d592c8238
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Lexer/ConfigfileLexer.php
@@ -0,0 +1,707 @@
+<?php
+
+namespace Smarty\Lexer;
+
+/**
+* Smarty Internal Plugin ConfigfileLexer
+*
+* This is the lexer to break the config file source into tokens 
+* @package Smarty
+* @subpackage Config
+* @author Uwe Tews 
+*/
+/**
+* ConfigfileLexer
+*
+* This is the config file lexer.
+* It is generated from the ConfigfileLexer.plex file
+*
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+class ConfigfileLexer
+{
+    /**
+     * Source
+     *
+     * @var string
+     */
+    public $data;
+      /**
+      * Source length
+      *
+      * @var int
+      */
+     public $dataLength = null;
+   /**
+     * byte counter
+     *
+     * @var int
+     */
+    public $counter;
+    /**
+     * token number
+     *
+     * @var int
+     */
+    public $token;
+    /**
+     * token value
+     *
+     * @var string
+     */
+    public $value;
+    /**
+     * current line
+     *
+     * @var int
+     */
+    public $line;
+    /**
+     * state number
+     *
+     * @var int
+     */
+    public $state = 1;
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+    /**
+     * compiler object
+     *
+     * @var \Smarty\Compiler\Configfile
+     */
+    private $compiler = null;
+    /**
+     * copy of config_booleanize
+     *
+     * @var bool
+     */
+    private $configBooleanize = false;
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE');
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+    private $yy_global_pattern2 = null;
+    private $yy_global_pattern3 = null;
+    private $yy_global_pattern4 = null;
+    private $yy_global_pattern5 = null;
+    private $yy_global_pattern6 = null;
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+    );
+
+    /**
+     * constructor
+     *
+     * @param   string                             $data template source
+     * @param \Smarty\Compiler\Configfile $compiler
+     */
+    public function __construct($data, \Smarty\Compiler\Configfile $compiler)
+    {
+        $this->data = $data . "\n"; //now all lines are \n-terminated
+        $this->dataLength = strlen($data);
+        $this->counter = 0;
+        if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
+            $this->counter += strlen($match[0]);
+        }
+        $this->line = 1;
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        $this->configBooleanize = $this->smarty->config_booleanize;
+    }
+
+   public function replace ($input) {
+        return $input;
+   }
+
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+
+
+    private $_yy_state = 1;
+    private $_yy_stack = array();
+
+    public function yylex()
+    {
+        return $this->{'yylex' . $this->_yy_state}();
+    }
+
+    public function yypushstate($state)
+    {
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+        array_push($this->_yy_stack, $this->_yy_state);
+        $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+    }
+
+    public function yypopstate()
+    {
+       if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,  isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+       $this->_yy_state = array_pop($this->_yy_stack);
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+
+    }
+
+    public function yybegin($state)
+    {
+       $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+    }
+
+
+
+
+    public function yylex1()
+    {
+        if (!isset($this->yy_global_pattern1)) {
+            $this->yy_global_pattern1 = $this->replace("/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern1,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state START');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r1_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const START = 1;
+    public function yy_r1_1()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_COMMENTSTART;
+    $this->yypushstate(self::COMMENT);
+    }
+    public function yy_r1_2()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_OPENB;
+    $this->yypushstate(self::SECTION);
+    }
+    public function yy_r1_3()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_CLOSEB;
+    }
+    public function yy_r1_4()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_EQUAL;
+    $this->yypushstate(self::VALUE);
+    }
+    public function yy_r1_5()
+    {
+
+    return false;
+    }
+    public function yy_r1_6()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE;
+    }
+    public function yy_r1_7()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_ID;
+    }
+    public function yy_r1_8()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_OTHER;
+    }
+
+
+
+    public function yylex2()
+    {
+        if (!isset($this->yy_global_pattern2)) {
+            $this->yy_global_pattern2 = $this->replace("/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern2,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state VALUE');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r2_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const VALUE = 2;
+    public function yy_r2_1()
+    {
+
+    return false;
+    }
+    public function yy_r2_2()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_FLOAT;
+    $this->yypopstate();
+    }
+    public function yy_r2_3()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_INT;
+    $this->yypopstate();
+    }
+    public function yy_r2_4()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES;
+    $this->yypushstate(self::TRIPPLE);
+    }
+    public function yy_r2_5()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_SINGLE_QUOTED_STRING;
+    $this->yypopstate();
+    }
+    public function yy_r2_6()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_DOUBLE_QUOTED_STRING;
+    $this->yypopstate();
+    }
+    public function yy_r2_7()
+    {
+
+    if (!$this->configBooleanize || !in_array(strtolower($this->value), array('true', 'false', 'on', 'off', 'yes', 'no')) ) {
+        $this->yypopstate();
+        $this->yypushstate(self::NAKED_STRING_VALUE);
+        return true; //reprocess in new state
+    } else {
+        $this->token = \Smarty\Parser\ConfigfileParser::TPC_BOOL;
+        $this->yypopstate();
+    }
+    }
+    public function yy_r2_8()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+    $this->yypopstate();
+    }
+    public function yy_r2_9()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+    $this->value = '';
+    $this->yypopstate();
+    }
+
+
+
+    public function yylex3()
+    {
+        if (!isset($this->yy_global_pattern3)) {
+            $this->yy_global_pattern3 = $this->replace("/\G([^\n]+?(?=[ \t\r]*\n))/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern3,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state NAKED_STRING_VALUE');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r3_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const NAKED_STRING_VALUE = 3;
+    public function yy_r3_1()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+    $this->yypopstate();
+    }
+
+
+
+    public function yylex4()
+    {
+        if (!isset($this->yy_global_pattern4)) {
+            $this->yy_global_pattern4 = $this->replace("/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern4,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state COMMENT');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r4_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const COMMENT = 4;
+    public function yy_r4_1()
+    {
+
+    return false;
+    }
+    public function yy_r4_2()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+    }
+    public function yy_r4_3()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE;
+    $this->yypopstate();
+    }
+
+
+
+    public function yylex5()
+    {
+        if (!isset($this->yy_global_pattern5)) {
+            $this->yy_global_pattern5 = $this->replace("/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern5,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state SECTION');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r5_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const SECTION = 5;
+    public function yy_r5_1()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_DOT;
+    }
+    public function yy_r5_2()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_SECTION;
+    $this->yypopstate();
+    }
+
+
+    public function yylex6()
+    {
+        if (!isset($this->yy_global_pattern6)) {
+            $this->yy_global_pattern6 = $this->replace("/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern6,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TRIPPLE');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r6_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const TRIPPLE = 6;
+    public function yy_r6_1()
+    {
+
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES_END;
+    $this->yypopstate();
+    $this->yypushstate(self::START);
+    }
+    public function yy_r6_2()
+    {
+
+  $to = strlen($this->data);
+  preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+  if (isset($match[0][1])) {
+    $to = $match[0][1];
+  } else {
+    $this->compiler->trigger_config_file_error ('missing or misspelled literal closing tag');
+  }  
+  $this->value = substr($this->data,$this->counter,$to-$this->counter);
+  $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_TEXT;
+    }
+
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Lexer/ConfigfileLexer.plex b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Lexer/ConfigfileLexer.plex
new file mode 100644
index 000000000..a895050c4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Lexer/ConfigfileLexer.plex
@@ -0,0 +1,321 @@
+<?php
+
+namespace Smarty\Lexer;
+
+/**
+* Smarty Internal Plugin ConfigfileLexer
+*
+* This is the lexer to break the config file source into tokens 
+* @package Smarty
+* @subpackage Config
+* @author Uwe Tews 
+*/
+/**
+* ConfigfileLexer
+*
+* This is the config file lexer.
+* It is generated from the ConfigfileLexer.plex file
+*
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+class ConfigfileLexer
+{
+    /**
+     * Source
+     *
+     * @var string
+     */
+    public $data;
+      /**
+      * Source length
+      *
+      * @var int
+      */
+     public $dataLength = null;
+   /**
+     * byte counter
+     *
+     * @var int
+     */
+    public $counter;
+    /**
+     * token number
+     *
+     * @var int
+     */
+    public $token;
+    /**
+     * token value
+     *
+     * @var string
+     */
+    public $value;
+    /**
+     * current line
+     *
+     * @var int
+     */
+    public $line;
+    /**
+     * state number
+     *
+     * @var int
+     */
+    public $state = 1;
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+    /**
+     * compiler object
+     *
+     * @var \Smarty\Compiler\Configfile
+     */
+    private $compiler = null;
+    /**
+     * copy of config_booleanize
+     *
+     * @var bool
+     */
+    private $configBooleanize = false;
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'START', 2 => 'VALUE', 3 => 'NAKED_STRING_VALUE', 4 => 'COMMENT', 5 => 'SECTION', 6 => 'TRIPPLE');
+
+    /**
+     * storage for assembled token patterns
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+    private $yy_global_pattern2 = null;
+    private $yy_global_pattern3 = null;
+    private $yy_global_pattern4 = null;
+    private $yy_global_pattern5 = null;
+    private $yy_global_pattern6 = null;
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+    );
+
+    /**
+     * constructor
+     *
+     * @param   string                             $data template source
+     * @param \Smarty\Compiler\Configfile $compiler
+     */
+    public function __construct($data, \Smarty\Compiler\Configfile $compiler)
+    {
+        $this->data = $data . "\n"; //now all lines are \n-terminated
+        $this->dataLength = strlen($data);
+        $this->counter = 0;
+        if (preg_match('/^\xEF\xBB\xBF/', $this->data, $match)) {
+            $this->counter += strlen($match[0]);
+        }
+        $this->line = 1;
+        $this->compiler = $compiler;
+        $this->smarty = $compiler->smarty;
+        $this->configBooleanize = $this->smarty->config_booleanize;
+    }
+
+   public function replace ($input) {
+        return $input;
+   }
+
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+
+/*!lex2php
+%input $this->data
+%counter $this->counter
+%token $this->token
+%value $this->value
+%line $this->line
+commentstart = /#|;/
+openB = /\[/
+closeB = /\]/
+section = /.*?(?=[\.=\[\]\r\n])/
+equal = /=/
+whitespace = /[ \t\r]+/
+dot = /\./
+id = /[0-9]*[a-zA-Z_]\w*/
+newline = /\n/
+single_quoted_string = /'[^'\\]*(?:\\.[^'\\]*)*'(?=[ \t\r]*[\n#;])/
+double_quoted_string = /"[^"\\]*(?:\\.[^"\\]*)*"(?=[ \t\r]*[\n#;])/
+tripple_quotes = /"""/
+tripple_quotes_end = /"""(?=[ \t\r]*[\n#;])/
+text = /[\S\s]/
+float = /\d+\.\d+(?=[ \t\r]*[\n#;])/
+int = /\d+(?=[ \t\r]*[\n#;])/
+maybe_bool = /[a-zA-Z]+(?=[ \t\r]*[\n#;])/
+naked_string = /[^\n]+?(?=[ \t\r]*\n)/
+*/
+
+/*!lex2php
+%statename START
+
+commentstart {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_COMMENTSTART;
+    $this->yypushstate(self::COMMENT);
+}
+openB {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_OPENB;
+    $this->yypushstate(self::SECTION);
+}
+closeB {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_CLOSEB;
+}
+equal {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_EQUAL;
+    $this->yypushstate(self::VALUE);
+}
+whitespace {
+    return false;
+}
+newline {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE;
+}
+id {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_ID;
+}
+text {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_OTHER;
+}
+
+*/
+
+/*!lex2php
+%statename VALUE
+
+whitespace {
+    return false;
+}
+float {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_FLOAT;
+    $this->yypopstate();
+}
+int {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_INT;
+    $this->yypopstate();
+}
+tripple_quotes {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES;
+    $this->yypushstate(self::TRIPPLE);
+}
+single_quoted_string {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_SINGLE_QUOTED_STRING;
+    $this->yypopstate();
+}
+double_quoted_string {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_DOUBLE_QUOTED_STRING;
+    $this->yypopstate();
+}
+maybe_bool {
+    if (!$this->configBooleanize || !in_array(strtolower($this->value), array('true', 'false', 'on', 'off', 'yes', 'no')) ) {
+        $this->yypopstate();
+        $this->yypushstate(self::NAKED_STRING_VALUE);
+        return true; //reprocess in new state
+    } else {
+        $this->token = \Smarty\Parser\ConfigfileParser::TPC_BOOL;
+        $this->yypopstate();
+    }
+}
+naked_string {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+    $this->yypopstate();
+}
+newline {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+    $this->value = '';
+    $this->yypopstate();
+}
+
+*/
+
+/*!lex2php
+%statename NAKED_STRING_VALUE
+
+naked_string {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+    $this->yypopstate();
+}
+
+*/
+
+/*!lex2php
+%statename COMMENT
+
+whitespace {
+    return false;
+}
+naked_string {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NAKED_STRING;
+}
+newline {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_NEWLINE;
+    $this->yypopstate();
+}
+
+*/
+
+/*!lex2php
+%statename SECTION
+
+dot {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_DOT;
+}
+section {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_SECTION;
+    $this->yypopstate();
+}
+
+*/
+/*!lex2php
+%statename TRIPPLE
+
+tripple_quotes_end {
+    $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_QUOTES_END;
+    $this->yypopstate();
+    $this->yypushstate(self::START);
+}
+text {
+  $to = strlen($this->data);
+  preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+  if (isset($match[0][1])) {
+    $to = $match[0][1];
+  } else {
+    $this->compiler->trigger_config_file_error ('missing or misspelled literal closing tag');
+  }  
+  $this->value = substr($this->data,$this->counter,$to-$this->counter);
+  $this->token = \Smarty\Parser\ConfigfileParser::TPC_TRIPPLE_TEXT;
+}
+*/
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Lexer/TemplateLexer.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Lexer/TemplateLexer.php
new file mode 100644
index 000000000..2e7f33055
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Lexer/TemplateLexer.php
@@ -0,0 +1,1083 @@
+<?php
+
+namespace Smarty\Lexer;
+
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * TemplateLexer
+ * This is the template file lexer.
+ * It is generated from the TemplateLexer.plex file
+ *
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class TemplateLexer
+{
+    /**
+     * Source
+     *
+     * @var string
+     */
+    public $data;
+
+    /**
+     * Source length
+     *
+     * @var int
+     */
+    public $dataLength = null;
+
+    /**
+     * byte counter
+     *
+     * @var int
+     */
+    public $counter;
+
+    /**
+     * token number
+     *
+     * @var int
+     */
+    public $token;
+
+    /**
+     * token value
+     *
+     * @var string
+     */
+    public $value;
+
+    /**
+     * current line
+     *
+     * @var int
+     */
+    public $line;
+
+    /**
+     * tag start line
+     *
+     * @var
+     */
+    public $taglineno;
+
+   /**
+     * state number
+     *
+     * @var int
+     */
+    public $state = 1;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * compiler object
+     *
+     * @var \Smarty\Compiler\Template
+     */
+    public $compiler = null;
+
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+
+    /**
+     * XML flag true while processing xml
+     *
+     * @var bool
+     */
+    public $is_xml = false;
+
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',);
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+                                               'NOT'         => '(!,not)',
+                                               'OPENP'       => '(',
+                                               'CLOSEP'      => ')',
+                                               'OPENB'       => '[',
+                                               'CLOSEB'      => ']',
+                                               'PTR'         => '->',
+                                               'APTR'        => '=>',
+                                               'EQUAL'       => '=',
+                                               'NUMBER'      => 'number',
+                                               'UNIMATH'     => '+" , "-',
+                                               'MATH'        => '*" , "/" , "%',
+                                               'INCDEC'      => '++" , "--',
+                                               'SPACE'       => ' ',
+                                               'DOLLAR'      => '$',
+                                               'SEMICOLON'   => ';',
+                                               'COLON'       => ':',
+                                               'DOUBLECOLON' => '::',
+                                               'AT'          => '@',
+                                               'HATCH'       => '#',
+                                               'QUOTE'       => '"',
+                                               'BACKTICK'    => '`',
+                                               'VERT'        => '"|" modifier',
+                                               'DOT'         => '.',
+                                               'COMMA'       => '","',
+                                               'QMARK'       => '"?"',
+                                               'ID'          => 'id, name',
+                                               'TEXT'        => 'text',
+                                               'LDELSLASH'   => '{/..} closing tag',
+                                               'LDEL'        => '{...} Smarty tag',
+                                               'COMMENT'     => 'comment',
+                                               'AS'          => 'as',
+                                               'TO'          => 'to',
+                                               'LOGOP'       => '"<", "==" ... logical operator',
+                                               'TLOGOP'      => '"lt", "eq" ... logical operator; "is div by" ... if condition',
+                                               'SCOND'       => '"is even" ... if condition',
+    );
+
+    /**
+     * literal tag nesting level
+     *
+     * @var int
+     */
+    private $literal_cnt = 0;
+
+    /**
+     * preg token pattern for state TEXT
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+
+    /**
+     * preg token pattern for state TAG
+     *
+     * @var string
+     */
+    private $yy_global_pattern2 = null;
+
+    /**
+     * preg token pattern for state TAGBODY
+     *
+     * @var string
+     */
+    private $yy_global_pattern3 = null;
+
+    /**
+     * preg token pattern for state LITERAL
+     *
+     * @var string
+     */
+    private $yy_global_pattern4 = null;
+
+    /**
+     * preg token pattern for state DOUBLEQUOTEDSTRING
+     *
+     * @var null
+     */
+    private $yy_global_pattern5 = null;
+
+    /**
+     * preg token pattern for text
+     *
+     * @var null
+     */
+    private $yy_global_text = null;
+
+    /**
+     * preg token pattern for literal
+     *
+     * @var null
+     */
+    private $yy_global_literal = null;
+
+    /**
+     * constructor
+     *
+     * @param   string                             $source template source
+     * @param \Smarty\Compiler\Template $compiler
+     */
+    public function __construct($source, \Smarty\Compiler\Template $compiler)
+    {
+        $this->data = $source;
+        $this->dataLength = strlen($this->data);
+        $this->counter = 0;
+        if (preg_match('/^\xEF\xBB\xBF/i', $this->data, $match)) {
+            $this->counter += strlen($match[0]);
+        }
+        $this->line = 1;
+        $this->smarty = $compiler->getTemplate()->getSmarty();
+        $this->compiler = $compiler;
+        $this->compiler->initDelimiterPreg();
+        $this->smarty_token_names['LDEL'] = $this->smarty->getLeftDelimiter();
+        $this->smarty_token_names['RDEL'] = $this->smarty->getRightDelimiter();
+    }
+
+    /**
+     * open lexer/parser trace file
+     *
+     */
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+   /**
+     * replace placeholders with runtime preg  code
+     *
+     * @param string $preg
+     *
+     * @return string
+     */
+   public function replace($preg)
+   {
+        return $this->compiler->replaceDelimiter($preg);
+   }
+
+    /**
+     * check if current value is an autoliteral left delimiter
+     *
+     * @return bool
+     */
+    public function isAutoLiteral()
+    {
+        return $this->smarty->getAutoLiteral() && isset($this->value[ $this->compiler->getLdelLength() ]) ?
+            strpos(" \n\t\r", $this->value[ $this->compiler->getLdelLength() ]) !== false : false;
+    }
+
+     
+    private $_yy_state = 1;
+    private $_yy_stack = array();
+
+    public function yylex()
+    {
+        return $this->{'yylex' . $this->_yy_state}();
+    }
+
+    public function yypushstate($state)
+    {
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%sState push %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+        array_push($this->_yy_stack, $this->_yy_state);
+        $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+    }
+
+    public function yypopstate()
+    {
+       if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%sState pop %s\n", $this->yyTracePrompt,  isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+       $this->_yy_state = array_pop($this->_yy_stack);
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%snew State %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+
+    }
+
+    public function yybegin($state)
+    {
+       $this->_yy_state = $state;
+        if ($this->yyTraceFILE) {
+             fprintf($this->yyTraceFILE, "%sState set %s\n", $this->yyTracePrompt, isset($this->state_name[$this->_yy_state]) ? $this->state_name[$this->_yy_state] : $this->_yy_state);
+        }
+    }
+
+
+     
+    public function yylex1()
+    {
+        if (!isset($this->yy_global_pattern1)) {
+            $this->yy_global_pattern1 = $this->replace("/\G([{][}])|\G((SMARTYldel)SMARTYal[*])|\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern1,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TEXT');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r1_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const TEXT = 1;
+    public function yy_r1_1()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+         }
+    public function yy_r1_2()
+    {
+
+       $to = $this->dataLength;
+       preg_match("/[*]{$this->compiler->getRdelPreg()}[\n]?/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+        if (isset($match[0][1])) {
+            $to = $match[0][1] + strlen($match[0][0]);
+        } else {
+            $this->compiler->trigger_template_error ("missing or misspelled comment closing tag '{$this->smarty->getRightDelimiter()}'");
+        }
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
+        return false;
+         }
+    public function yy_r1_4()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+         }
+    public function yy_r1_6()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_LITERALSTART;
+        $this->yypushstate(self::LITERAL);
+         }
+    public function yy_r1_8()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_LITERALEND;
+        $this->yypushstate(self::LITERAL);
+         }
+    public function yy_r1_10()
+    {
+
+        $this->yypushstate(self::TAG);
+        return true;
+         }
+    public function yy_r1_12()
+    {
+
+       if (!isset($this->yy_global_text)) {
+           $this->yy_global_text = $this->replace('/(SMARTYldel)SMARTYal/isS');
+       }
+       $to = $this->dataLength;
+       preg_match($this->yy_global_text, $this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+       if (isset($match[0][1])) {
+         $to = $match[0][1];
+       }
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+         }
+
+     
+    public function yylex2()
+    {
+        if (!isset($this->yy_global_pattern2)) {
+            $this->yy_global_pattern2 = $this->replace("/\G((SMARTYldel)SMARTYal(if|elseif|else if|while)\\s+)|\G((SMARTYldel)SMARTYalfor\\s+)|\G((SMARTYldel)SMARTYalforeach(?![^\s]))|\G((SMARTYldel)SMARTYalsetfilter\\s+)|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$]smarty\\.block\\.(child|parent)\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/][0-9]*[a-zA-Z_]\\w*\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[$][0-9]*[a-zA-Z_]\\w*(\\s+nocache)?\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal)/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern2,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TAG');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r2_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const TAG = 2;
+    public function yy_r2_1()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELIF;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_4()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELFOR;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_6()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELFOREACH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_8()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELSETFILTER;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_10()
+    {
+
+        $this->yypopstate();
+        $this->token = \Smarty\Parser\TemplateParser::TP_SIMPLETAG;
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_13()
+    {
+
+         $this->yypopstate();
+         $this->token = \Smarty\Parser\TemplateParser::TP_SMARTYBLOCKCHILDPARENT;
+         $this->taglineno = $this->line;
+         }
+    public function yy_r2_16()
+    {
+
+        $this->yypopstate();
+        $this->token = \Smarty\Parser\TemplateParser::TP_CLOSETAG;
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_18()
+    {
+
+        if ($this->_yy_stack[count($this->_yy_stack)-1] === self::TEXT) {
+            $this->yypopstate();
+            $this->token = \Smarty\Parser\TemplateParser::TP_SIMPELOUTPUT;
+            $this->taglineno = $this->line;
+        } else {
+            $this->value = $this->smarty->getLeftDelimiter();
+            $this->token = \Smarty\Parser\TemplateParser::TP_LDEL;
+            $this->yybegin(self::TAGBODY);
+            $this->taglineno = $this->line;
+        }
+         }
+    public function yy_r2_21()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELSLASH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r2_23()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDEL;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+
+     
+    public function yylex3()
+    {
+        if (!isset($this->yy_global_pattern3)) {
+            $this->yy_global_pattern3 = $this->replace("/\G(\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+(not\\s+)?in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even|div)\\s+by\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G([!]\\s*|not\\s+)|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G(array\\s*[(]\\s*)|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|][@]?)|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern3,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state TAGBODY');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r3_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const TAGBODY = 3;
+    public function yy_r3_1()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_RDEL;
+        $this->yypopstate();
+         }
+    public function yy_r3_2()
+    {
+
+        $this->yypushstate(self::TAG);
+        return true;
+         }
+    public function yy_r3_4()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_QUOTE;
+        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+        $this->compiler->enterDoubleQuote();
+         }
+    public function yy_r3_5()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_SINGLEQUOTESTRING;
+         }
+    public function yy_r3_6()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOLLARID;
+         }
+    public function yy_r3_7()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOLLAR;
+         }
+    public function yy_r3_8()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_ISIN;
+         }
+    public function yy_r3_10()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_AS;
+         }
+    public function yy_r3_11()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_TO;
+         }
+    public function yy_r3_12()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_STEP;
+         }
+    public function yy_r3_13()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_INSTANCEOF;
+         }
+    public function yy_r3_14()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_LOGOP;
+         }
+    public function yy_r3_16()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_SLOGOP;
+         }
+    public function yy_r3_18()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_TLOGOP;
+         }
+    public function yy_r3_21()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_SINGLECOND;
+         }
+    public function yy_r3_24()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_NOT;
+         }
+    public function yy_r3_25()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_TYPECAST;
+         }
+    public function yy_r3_29()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_OPENP;
+         }
+    public function yy_r3_30()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_CLOSEP;
+         }
+    public function yy_r3_31()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_OPENB;
+         }
+    public function yy_r3_32()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_CLOSEB;
+         }
+    public function yy_r3_33()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_PTR;
+         }
+    public function yy_r3_34()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_APTR;
+         }
+    public function yy_r3_35()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_EQUAL;
+         }
+    public function yy_r3_36()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_INCDEC;
+         }
+    public function yy_r3_38()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_UNIMATH;
+         }
+    public function yy_r3_40()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_MATH;
+         }
+    public function yy_r3_42()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_AT;
+         }
+    public function yy_r3_43()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_ARRAYOPEN;
+         }
+    public function yy_r3_44()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_HATCH;
+         }
+    public function yy_r3_45()
+    {
+
+        // resolve conflicts with shorttag and right_delimiter starting with '='
+        if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) === $this->smarty->getRightDelimiter()) {
+            preg_match('/\s+/',$this->value,$match);
+            $this->value = $match[0];
+            $this->token = \Smarty\Parser\TemplateParser::TP_SPACE;
+        } else {
+            $this->token = \Smarty\Parser\TemplateParser::TP_ATTR;
+        }
+         }
+    public function yy_r3_46()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_NAMESPACE;
+         }
+    public function yy_r3_49()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_ID;
+         }
+    public function yy_r3_50()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_INTEGER;
+         }
+    public function yy_r3_51()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_BACKTICK;
+        $this->yypopstate();
+         }
+    public function yy_r3_52()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_VERT;
+         }
+    public function yy_r3_53()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOT;
+         }
+    public function yy_r3_54()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_COMMA;
+         }
+    public function yy_r3_55()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_SEMICOLON;
+         }
+    public function yy_r3_56()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOUBLECOLON;
+         }
+    public function yy_r3_57()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_COLON;
+         }
+    public function yy_r3_58()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_QMARK;
+         }
+    public function yy_r3_59()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_HEX;
+         }
+    public function yy_r3_60()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_SPACE;
+         }
+    public function yy_r3_61()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+         }
+
+
+     
+    public function yylex4()
+    {
+        if (!isset($this->yy_global_pattern4)) {
+            $this->yy_global_pattern4 = $this->replace("/\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern4,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state LITERAL');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r4_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const LITERAL = 4;
+    public function yy_r4_1()
+    {
+
+        $this->literal_cnt++;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL;
+         }
+    public function yy_r4_3()
+    {
+
+        if ($this->literal_cnt) {
+             $this->literal_cnt--;
+            $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL;
+        } else {
+            $this->token = \Smarty\Parser\TemplateParser::TP_LITERALEND;
+            $this->yypopstate();
+        }
+         }
+    public function yy_r4_5()
+    {
+
+       if (!isset($this->yy_global_literal)) {
+           $this->yy_global_literal = $this->replace('/(SMARTYldel)SMARTYal[\/]?literalSMARTYrdel/isS');
+       }
+       $to = $this->dataLength;
+       preg_match($this->yy_global_literal, $this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+       if (isset($match[0][1])) {
+         $to = $match[0][1];
+       } else {
+          $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
+       }
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL;
+         }
+
+     
+    public function yylex5()
+    {
+        if (!isset($this->yy_global_pattern5)) {
+            $this->yy_global_pattern5 = $this->replace("/\G((SMARTYldel)SMARTYautoliteral\\s+SMARTYliteral)|\G((SMARTYldel)SMARTYalliteral\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/]literal\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal[\/])|\G((SMARTYldel)SMARTYal[0-9]*[a-zA-Z_]\\w*)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G([`][$])|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=((SMARTYldel)SMARTYal|\\$|`\\$|\"SMARTYliteral)))|\G([\S\s])/isS");
+        }
+        if (!isset($this->dataLength)) {
+            $this->dataLength = strlen($this->data);
+        }
+        if ($this->counter >=  $this->dataLength) {
+            return false; // end of input
+        }
+        
+        do {
+            if (preg_match($this->yy_global_pattern5,$this->data, $yymatches, 0, $this->counter)) {
+                if (!isset($yymatches[ 0 ][1])) {
+                   $yymatches = preg_grep("/(.|\s)+/", $yymatches);
+                } else {
+                    $yymatches = array_filter($yymatches);
+                }
+                if (empty($yymatches)) {
+                    throw new Exception('Error: lexing failed because a rule matched' .
+                        ' an empty string.  Input "' . substr($this->data,
+                        $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
+                }
+                next($yymatches); // skip global match
+                $this->token = key($yymatches); // token number
+                $this->value = current($yymatches); // token value
+                $r = $this->{'yy_r5_' . $this->token}();
+                if ($r === null) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    // accept this token
+                    return true;
+                } elseif ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } elseif ($r === false) {
+                    $this->counter += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    if ($this->counter >=  $this->dataLength) {
+                        return false; // end of input
+                    }
+                    // skip this token
+                    continue;
+                }            } else {
+                throw new Exception('Unexpected input at line' . $this->line .
+                    ': ' . $this->data[$this->counter]);
+            }
+            break;
+        } while (true);
+
+    } // end function
+
+
+    const DOUBLEQUOTEDSTRING = 5;
+    public function yy_r5_1()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+         }
+    public function yy_r5_3()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+         }
+    public function yy_r5_5()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+         }
+    public function yy_r5_7()
+    {
+
+        $this->yypushstate(self::TAG);
+        return true;
+         }
+    public function yy_r5_9()
+    {
+
+        $this->yypushstate(self::TAG);
+        return true;
+         }
+    public function yy_r5_11()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDEL;
+        $this->taglineno = $this->line;
+        $this->yypushstate(self::TAGBODY);
+         }
+    public function yy_r5_13()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_QUOTE;
+        $this->yypopstate();
+         }
+    public function yy_r5_14()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_BACKTICK;
+        $this->value = substr($this->value,0,-1);
+        $this->yypushstate(self::TAGBODY);
+        $this->taglineno = $this->line;
+         }
+    public function yy_r5_15()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOLLARID;
+         }
+    public function yy_r5_16()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+         }
+    public function yy_r5_17()
+    {
+
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+         }
+    public function yy_r5_22()
+    {
+
+        $to = $this->dataLength;
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+         }
+
+  }
+
+     
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Lexer/TemplateLexer.plex b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Lexer/TemplateLexer.plex
new file mode 100644
index 000000000..282a99cf9
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Lexer/TemplateLexer.plex
@@ -0,0 +1,677 @@
+<?php
+
+namespace Smarty\Lexer;
+
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * TemplateLexer
+ * This is the template file lexer.
+ * It is generated from the TemplateLexer.plex file
+ *
+ *
+ * @author Uwe Tews <uwe.tews@googlemail.com>
+ */
+class TemplateLexer
+{
+    /**
+     * Source
+     *
+     * @var string
+     */
+    public $data;
+
+    /**
+     * Source length
+     *
+     * @var int
+     */
+    public $dataLength = null;
+
+    /**
+     * byte counter
+     *
+     * @var int
+     */
+    public $counter;
+
+    /**
+     * token number
+     *
+     * @var int
+     */
+    public $token;
+
+    /**
+     * token value
+     *
+     * @var string
+     */
+    public $value;
+
+    /**
+     * current line
+     *
+     * @var int
+     */
+    public $line;
+
+    /**
+     * tag start line
+     *
+     * @var
+     */
+    public $taglineno;
+
+   /**
+     * state number
+     *
+     * @var int
+     */
+    public $state = 1;
+
+    /**
+     * Smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * compiler object
+     *
+     * @var \Smarty\Compiler\Template
+     */
+    public $compiler = null;
+
+    /**
+     * trace file
+     *
+     * @var resource
+     */
+    public $yyTraceFILE;
+
+    /**
+     * trace prompt
+     *
+     * @var string
+     */
+    public $yyTracePrompt;
+
+    /**
+     * XML flag true while processing xml
+     *
+     * @var bool
+     */
+    public $is_xml = false;
+
+    /**
+     * state names
+     *
+     * @var array
+     */
+    public $state_name = array(1 => 'TEXT', 2 => 'TAG', 3 => 'TAGBODY', 4 => 'LITERAL', 5 => 'DOUBLEQUOTEDSTRING',);
+
+    /**
+     * token names
+     *
+     * @var array
+     */
+    public $smarty_token_names = array(        // Text for parser error messages
+                                               'NOT'         => '(!,not)',
+                                               'OPENP'       => '(',
+                                               'CLOSEP'      => ')',
+                                               'OPENB'       => '[',
+                                               'CLOSEB'      => ']',
+                                               'PTR'         => '->',
+                                               'APTR'        => '=>',
+                                               'EQUAL'       => '=',
+                                               'NUMBER'      => 'number',
+                                               'UNIMATH'     => '+" , "-',
+                                               'MATH'        => '*" , "/" , "%',
+                                               'INCDEC'      => '++" , "--',
+                                               'SPACE'       => ' ',
+                                               'DOLLAR'      => '$',
+                                               'SEMICOLON'   => ';',
+                                               'COLON'       => ':',
+                                               'DOUBLECOLON' => '::',
+                                               'AT'          => '@',
+                                               'HATCH'       => '#',
+                                               'QUOTE'       => '"',
+                                               'BACKTICK'    => '`',
+                                               'VERT'        => '"|" modifier',
+                                               'DOT'         => '.',
+                                               'COMMA'       => '","',
+                                               'QMARK'       => '"?"',
+                                               'ID'          => 'id, name',
+                                               'TEXT'        => 'text',
+                                               'LDELSLASH'   => '{/..} closing tag',
+                                               'LDEL'        => '{...} Smarty tag',
+                                               'COMMENT'     => 'comment',
+                                               'AS'          => 'as',
+                                               'TO'          => 'to',
+                                               'LOGOP'       => '"<", "==" ... logical operator',
+                                               'TLOGOP'      => '"lt", "eq" ... logical operator; "is div by" ... if condition',
+                                               'SCOND'       => '"is even" ... if condition',
+    );
+
+    /**
+     * literal tag nesting level
+     *
+     * @var int
+     */
+    private $literal_cnt = 0;
+
+    /**
+     * preg token pattern for state TEXT
+     *
+     * @var string
+     */
+    private $yy_global_pattern1 = null;
+
+    /**
+     * preg token pattern for state TAG
+     *
+     * @var string
+     */
+    private $yy_global_pattern2 = null;
+
+    /**
+     * preg token pattern for state TAGBODY
+     *
+     * @var string
+     */
+    private $yy_global_pattern3 = null;
+
+    /**
+     * preg token pattern for state LITERAL
+     *
+     * @var string
+     */
+    private $yy_global_pattern4 = null;
+
+    /**
+     * preg token pattern for state DOUBLEQUOTEDSTRING
+     *
+     * @var null
+     */
+    private $yy_global_pattern5 = null;
+
+    /**
+     * preg token pattern for text
+     *
+     * @var null
+     */
+    private $yy_global_text = null;
+
+    /**
+     * preg token pattern for literal
+     *
+     * @var null
+     */
+    private $yy_global_literal = null;
+
+    /**
+     * constructor
+     *
+     * @param   string                             $source template source
+     * @param \Smarty\Compiler\Template $compiler
+     */
+    public function __construct($source, \Smarty\Compiler\Template $compiler)
+    {
+        $this->data = $source;
+        $this->dataLength = strlen($this->data);
+        $this->counter = 0;
+        if (preg_match('/^\xEF\xBB\xBF/i', $this->data, $match)) {
+            $this->counter += strlen($match[0]);
+        }
+        $this->line = 1;
+        $this->smarty = $compiler->getTemplate()->getSmarty();
+        $this->compiler = $compiler;
+        $this->compiler->initDelimiterPreg();
+        $this->smarty_token_names['LDEL'] = $this->smarty->getLeftDelimiter();
+        $this->smarty_token_names['RDEL'] = $this->smarty->getRightDelimiter();
+    }
+
+    /**
+     * open lexer/parser trace file
+     *
+     */
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+   /**
+     * replace placeholders with runtime preg  code
+     *
+     * @param string $preg
+     *
+     * @return string
+     */
+   public function replace($preg)
+   {
+        return $this->compiler->replaceDelimiter($preg);
+   }
+
+    /**
+     * check if current value is an autoliteral left delimiter
+     *
+     * @return bool
+     */
+    public function isAutoLiteral()
+    {
+        return $this->smarty->getAutoLiteral() && isset($this->value[ $this->compiler->getLdelLength() ]) ?
+            strpos(" \n\t\r", $this->value[ $this->compiler->getLdelLength() ]) !== false : false;
+    }
+
+     /*!lex2php
+     %input $this->data
+     %counter $this->counter
+     %token $this->token
+     %value $this->value
+     %line $this->line
+     userliteral = ~(SMARTYldel)SMARTYautoliteral\s+SMARTYliteral~
+     char = ~[\S\s]~
+     textdoublequoted = ~([^"\\]*?)((?:\\.[^"\\]*?)*?)(?=((SMARTYldel)SMARTYal|\$|`\$|"SMARTYliteral))~
+     namespace = ~([0-9]*[a-zA-Z_]\w*)?(\\[0-9]*[a-zA-Z_]\w*)+~
+     emptyjava = ~[{][}]~
+     slash = ~[/]~
+     ldel = ~(SMARTYldel)SMARTYal~
+     rdel = ~\s*SMARTYrdel~
+     nocacherdel = ~(\s+nocache)?\s*SMARTYrdel~
+     smartyblockchildparent = ~[\$]smarty\.block\.(child|parent)~
+     integer = ~\d+~
+     hex =  ~0[xX][0-9a-fA-F]+~
+     math = ~\s*([*]{1,2}|[%/^&]|[<>]{2})\s*~
+     comment = ~(SMARTYldel)SMARTYal[*]~
+     incdec = ~([+]|[-]){2}~
+     unimath = ~\s*([+]|[-])\s*~
+     openP = ~\s*[(]\s*~
+     closeP = ~\s*[)]~
+     openB = ~\[\s*~
+     closeB = ~\s*\]~
+     dollar = ~[$]~
+     dot = ~[.]~
+     comma = ~\s*[,]\s*~
+     doublecolon = ~[:]{2}~
+     colon = ~\s*[:]\s*~
+     at = ~[@]~
+     hatch = ~[#]~
+     semicolon = ~\s*[;]\s*~
+     equal = ~\s*[=]\s*~
+     space = ~\s+~
+     ptr = ~\s*[-][>]\s*~
+     aptr = ~\s*[=][>]\s*~
+     singlequotestring = ~'[^'\\]*(?:\\.[^'\\]*)*'~
+     backtick = ~[`]~
+     vert = ~[|][@]?~
+     qmark = ~\s*[?]\s*~
+     constant = ~[_]+[A-Z0-9][0-9A-Z_]*|[A-Z][0-9A-Z_]*(?![0-9A-Z_]*[a-z])~
+     attr = ~\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\s*[=]\s*~
+     id = ~[0-9]*[a-zA-Z_]\w*~
+     literal = ~literal~
+     strip = ~strip~
+     lop = ~\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\s*~
+     slop = ~\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\s+~
+     tlop = ~\s+is\s+(not\s+)?(odd|even|div)\s+by\s+~
+     scond = ~\s+is\s+(not\s+)?(odd|even)~
+     isin = ~\s+is\s+(not\s+)?in\s+~
+     as = ~\s+as\s+~
+     to = ~\s+to\s+~
+     step = ~\s+step\s+~
+     if = ~(if|elseif|else if|while)\s+~
+     for = ~for\s+~
+     array = ~array~
+     foreach = ~foreach(?![^\s])~
+     setfilter = ~setfilter\s+~
+     instanceof = ~\s+instanceof\s+~
+     not = ~[!]\s*|not\s+~
+     typecast = ~[(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\s*~
+     double_quote = ~["]~
+     */
+     /*!lex2php
+     %statename TEXT
+     emptyjava {
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+     }
+     comment {
+       $to = $this->dataLength;
+       preg_match("/[*]{$this->compiler->getRdelPreg()}[\n]?/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+        if (isset($match[0][1])) {
+            $to = $match[0][1] + strlen($match[0][0]);
+        } else {
+            $this->compiler->trigger_template_error ("missing or misspelled comment closing tag '{$this->smarty->getRightDelimiter()}'");
+        }
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
+        return false;
+     }
+     userliteral {
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+     }
+     ldel literal rdel {
+        $this->token = \Smarty\Parser\TemplateParser::TP_LITERALSTART;
+        $this->yypushstate(self::LITERAL);
+     }
+     ldel slash literal rdel {
+        $this->token = \Smarty\Parser\TemplateParser::TP_LITERALEND;
+        $this->yypushstate(self::LITERAL);
+     }
+     ldel {
+        $this->yypushstate(self::TAG);
+        return true;
+     }
+     char {
+       if (!isset($this->yy_global_text)) {
+           $this->yy_global_text = $this->replace('/(SMARTYldel)SMARTYal/isS');
+       }
+       $to = $this->dataLength;
+       preg_match($this->yy_global_text, $this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+       if (isset($match[0][1])) {
+         $to = $match[0][1];
+       }
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+     }
+     */
+     /*!lex2php
+     %statename TAG
+     ldel if {
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELIF;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel for {
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELFOR;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel foreach {
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELFOREACH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel setfilter {
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELSETFILTER;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel id nocacherdel {
+        $this->yypopstate();
+        $this->token = \Smarty\Parser\TemplateParser::TP_SIMPLETAG;
+        $this->taglineno = $this->line;
+     }
+     ldel smartyblockchildparent rdel {
+         $this->yypopstate();
+         $this->token = \Smarty\Parser\TemplateParser::TP_SMARTYBLOCKCHILDPARENT;
+         $this->taglineno = $this->line;
+     }
+     ldel slash id rdel {
+        $this->yypopstate();
+        $this->token = \Smarty\Parser\TemplateParser::TP_CLOSETAG;
+        $this->taglineno = $this->line;
+     }
+     ldel dollar id nocacherdel {
+        if ($this->_yy_stack[count($this->_yy_stack)-1] === self::TEXT) {
+            $this->yypopstate();
+            $this->token = \Smarty\Parser\TemplateParser::TP_SIMPELOUTPUT;
+            $this->taglineno = $this->line;
+        } else {
+            $this->value = $this->smarty->getLeftDelimiter();
+            $this->token = \Smarty\Parser\TemplateParser::TP_LDEL;
+            $this->yybegin(self::TAGBODY);
+            $this->taglineno = $this->line;
+        }
+     }
+     ldel slash {
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDELSLASH;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     ldel {
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDEL;
+        $this->yybegin(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     */
+     /*!lex2php
+     %statename TAGBODY
+     rdel {
+        $this->token = \Smarty\Parser\TemplateParser::TP_RDEL;
+        $this->yypopstate();
+     }
+     ldel {
+        $this->yypushstate(self::TAG);
+        return true;
+     }
+     double_quote {
+        $this->token = \Smarty\Parser\TemplateParser::TP_QUOTE;
+        $this->yypushstate(self::DOUBLEQUOTEDSTRING);
+        $this->compiler->enterDoubleQuote();
+     }
+     singlequotestring {
+        $this->token = \Smarty\Parser\TemplateParser::TP_SINGLEQUOTESTRING;
+     }
+     dollar id {
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOLLARID;
+     }
+     dollar {
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOLLAR;
+     }
+     isin {
+        $this->token = \Smarty\Parser\TemplateParser::TP_ISIN;
+     }
+     as {
+        $this->token = \Smarty\Parser\TemplateParser::TP_AS;
+     }
+     to {
+        $this->token = \Smarty\Parser\TemplateParser::TP_TO;
+     }
+     step {
+        $this->token = \Smarty\Parser\TemplateParser::TP_STEP;
+     }
+     instanceof {
+        $this->token = \Smarty\Parser\TemplateParser::TP_INSTANCEOF;
+     }
+     lop {
+        $this->token = \Smarty\Parser\TemplateParser::TP_LOGOP;
+     }
+     slop {
+        $this->token = \Smarty\Parser\TemplateParser::TP_SLOGOP;
+     }
+     tlop {
+        $this->token = \Smarty\Parser\TemplateParser::TP_TLOGOP;
+     }
+     scond {
+        $this->token = \Smarty\Parser\TemplateParser::TP_SINGLECOND;
+     }
+     not{
+        $this->token = \Smarty\Parser\TemplateParser::TP_NOT;
+     }
+     typecast {
+        $this->token = \Smarty\Parser\TemplateParser::TP_TYPECAST;
+     }
+     openP {
+        $this->token = \Smarty\Parser\TemplateParser::TP_OPENP;
+     }
+     closeP {
+        $this->token = \Smarty\Parser\TemplateParser::TP_CLOSEP;
+     }
+     openB {
+        $this->token = \Smarty\Parser\TemplateParser::TP_OPENB;
+     }
+     closeB {
+        $this->token = \Smarty\Parser\TemplateParser::TP_CLOSEB;
+     }
+     ptr {
+        $this->token = \Smarty\Parser\TemplateParser::TP_PTR;
+     }
+     aptr {
+        $this->token = \Smarty\Parser\TemplateParser::TP_APTR;
+     }
+     equal {
+        $this->token = \Smarty\Parser\TemplateParser::TP_EQUAL;
+     }
+     incdec {
+        $this->token = \Smarty\Parser\TemplateParser::TP_INCDEC;
+     }
+     unimath {
+        $this->token = \Smarty\Parser\TemplateParser::TP_UNIMATH;
+     }
+     math {
+        $this->token = \Smarty\Parser\TemplateParser::TP_MATH;
+     }
+     at {
+        $this->token = \Smarty\Parser\TemplateParser::TP_AT;
+     }
+     array openP {
+        $this->token = \Smarty\Parser\TemplateParser::TP_ARRAYOPEN;
+     }
+     hatch {
+        $this->token = \Smarty\Parser\TemplateParser::TP_HATCH;
+     }
+     attr {
+        // resolve conflicts with shorttag and right_delimiter starting with '='
+        if (substr($this->data, $this->counter + strlen($this->value) - 1, $this->compiler->getRdelLength()) === $this->smarty->getRightDelimiter()) {
+            preg_match('/\s+/',$this->value,$match);
+            $this->value = $match[0];
+            $this->token = \Smarty\Parser\TemplateParser::TP_SPACE;
+        } else {
+            $this->token = \Smarty\Parser\TemplateParser::TP_ATTR;
+        }
+     }
+     namespace {
+        $this->token = \Smarty\Parser\TemplateParser::TP_NAMESPACE;
+     }
+     id {
+        $this->token = \Smarty\Parser\TemplateParser::TP_ID;
+     }
+     integer {
+        $this->token = \Smarty\Parser\TemplateParser::TP_INTEGER;
+     }
+     backtick {
+        $this->token = \Smarty\Parser\TemplateParser::TP_BACKTICK;
+        $this->yypopstate();
+     }
+     vert {
+        $this->token = \Smarty\Parser\TemplateParser::TP_VERT;
+     }
+     dot {
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOT;
+     }
+     comma {
+        $this->token = \Smarty\Parser\TemplateParser::TP_COMMA;
+     }
+     semicolon {
+        $this->token = \Smarty\Parser\TemplateParser::TP_SEMICOLON;
+     }
+     doublecolon {
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOUBLECOLON;
+     }
+     colon {
+        $this->token = \Smarty\Parser\TemplateParser::TP_COLON;
+     }
+     qmark {
+        $this->token = \Smarty\Parser\TemplateParser::TP_QMARK;
+     }
+     hex {
+        $this->token = \Smarty\Parser\TemplateParser::TP_HEX;
+     }
+     space {
+        $this->token = \Smarty\Parser\TemplateParser::TP_SPACE;
+     }
+     char {
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+     }
+     */
+
+     /*!lex2php
+     %statename LITERAL
+     ldel literal rdel {
+        $this->literal_cnt++;
+        $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL;
+     }
+     ldel slash literal rdel {
+        if ($this->literal_cnt) {
+             $this->literal_cnt--;
+            $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL;
+        } else {
+            $this->token = \Smarty\Parser\TemplateParser::TP_LITERALEND;
+            $this->yypopstate();
+        }
+     }
+     char {
+       if (!isset($this->yy_global_literal)) {
+           $this->yy_global_literal = $this->replace('/(SMARTYldel)SMARTYal[\/]?literalSMARTYrdel/isS');
+       }
+       $to = $this->dataLength;
+       preg_match($this->yy_global_literal, $this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
+       if (isset($match[0][1])) {
+         $to = $match[0][1];
+       } else {
+          $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
+       }
+       $this->value = substr($this->data,$this->counter,$to-$this->counter);
+       $this->token = \Smarty\Parser\TemplateParser::TP_LITERAL;
+     }
+     */
+     /*!lex2php
+     %statename DOUBLEQUOTEDSTRING
+     userliteral {
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+     }
+     ldel literal rdel {
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+     }
+     ldel slash literal rdel {
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+     }
+     ldel slash {
+        $this->yypushstate(self::TAG);
+        return true;
+     }
+     ldel id {
+        $this->yypushstate(self::TAG);
+        return true;
+     }
+     ldel {
+        $this->token = \Smarty\Parser\TemplateParser::TP_LDEL;
+        $this->taglineno = $this->line;
+        $this->yypushstate(self::TAGBODY);
+     }
+     double_quote {
+        $this->token = \Smarty\Parser\TemplateParser::TP_QUOTE;
+        $this->yypopstate();
+     }
+     backtick dollar {
+        $this->token = \Smarty\Parser\TemplateParser::TP_BACKTICK;
+        $this->value = substr($this->value,0,-1);
+        $this->yypushstate(self::TAGBODY);
+        $this->taglineno = $this->line;
+     }
+     dollar id {
+        $this->token = \Smarty\Parser\TemplateParser::TP_DOLLARID;
+     }
+     dollar {
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+     }
+     textdoublequoted {
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+     }
+     char {
+        $to = $this->dataLength;
+        $this->value = substr($this->data,$this->counter,$to-$this->counter);
+        $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;
+     }
+    */
+  }
+
+     
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Base.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Base.php
new file mode 100644
index 000000000..e1140c15e
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Base.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Smarty\ParseTree;
+
+/**
+ * Smarty Internal Plugin Templateparser ParseTree
+ * These are classes to build parsetree in the template parser
+ *
+
+
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+
+
+ * @ignore
+ */
+abstract class Base
+{
+    /**
+     * Buffer content
+     *
+     * @var mixed
+     */
+    public $data;
+
+    /**
+     * Subtree array
+     *
+     * @var array
+     */
+    public $subtrees = array();
+
+    /**
+     * Return buffer
+     *
+     * @param \Smarty\Parser\TemplateParser $parser
+     *
+     * @return string buffer content
+     */
+    abstract public function to_smarty_php(\Smarty\Parser\TemplateParser $parser);
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Code.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Code.php
new file mode 100644
index 000000000..b39f22c8b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Code.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Smarty\ParseTree;
+
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse trees in the template parser
+ *
+
+
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Code fragment inside a tag .
+ *
+
+
+ * @ignore
+ */
+class Code extends Base
+{
+    /**
+     * Create parse tree buffer for code fragment
+     *
+     * @param string $data content
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return buffer content in parentheses
+     *
+     * @param \Smarty\Parser\TemplateParser $parser
+     *
+     * @return string content
+     */
+    public function to_smarty_php(\Smarty\Parser\TemplateParser $parser)
+    {
+        return sprintf('(%s)', $this->data);
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Dq.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Dq.php
new file mode 100644
index 000000000..b5fca3b40
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Dq.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Smarty\ParseTree;
+/**
+ * Double-quoted string inside a tag.
+ *
+
+
+ * @ignore
+ */
+
+/**
+ * Double quoted string inside a tag.
+ *
+
+
+ * @ignore
+ */
+class Dq extends Base
+{
+    /**
+     * Create parse tree buffer for double-quoted string subtrees
+     *
+     * @param object                    $parser  parser object
+     * @param Base $subtree parse tree buffer
+     */
+    public function __construct($parser, Base $subtree)
+    {
+        $this->subtrees[] = $subtree;
+        if ($subtree instanceof Tag) {
+            $parser->block_nesting_level = $parser->compiler->getTagStackCount();
+        }
+    }
+
+    /**
+     * Append buffer to subtree
+     *
+     * @param \Smarty\Parser\TemplateParser $parser
+     * @param Base $subtree parse tree buffer
+     */
+    public function append_subtree(\Smarty\Parser\TemplateParser $parser, Base $subtree)
+    {
+        $last_subtree = count($this->subtrees) - 1;
+        if ($last_subtree >= 0 && $this->subtrees[ $last_subtree ] instanceof Tag
+            && $this->subtrees[ $last_subtree ]->saved_block_nesting < $parser->block_nesting_level
+        ) {
+            if ($subtree instanceof Code) {
+                $this->subtrees[ $last_subtree ]->data =
+                    $parser->compiler->appendCode(
+                        (string) $this->subtrees[ $last_subtree ]->data,
+                        '<?php echo ' . $subtree->data . ';?>'
+                    );
+            } elseif ($subtree instanceof DqContent) {
+                $this->subtrees[ $last_subtree ]->data =
+                    $parser->compiler->appendCode(
+                        (string) $this->subtrees[ $last_subtree ]->data,
+                        '<?php echo "' . $subtree->data . '";?>'
+                    );
+            } else {
+                $this->subtrees[ $last_subtree ]->data =
+                    $parser->compiler->appendCode((string) $this->subtrees[ $last_subtree ]->data, (string) $subtree->data);
+            }
+        } else {
+            $this->subtrees[] = $subtree;
+        }
+        if ($subtree instanceof Tag) {
+            $parser->block_nesting_level = $parser->compiler->getTagStackCount();
+        }
+    }
+
+    /**
+     * Merge subtree buffer content together
+     *
+     * @param \Smarty\Parser\TemplateParser $parser
+     *
+     * @return string compiled template code
+     */
+    public function to_smarty_php(\Smarty\Parser\TemplateParser $parser)
+    {
+        $code = '';
+        foreach ($this->subtrees as $subtree) {
+            if ($code !== '') {
+                $code .= '.';
+            }
+            if ($subtree instanceof Tag) {
+                $more_php = $subtree->assign_to_var($parser);
+            } else {
+                $more_php = $subtree->to_smarty_php($parser);
+            }
+            $code .= $more_php;
+            if (!$subtree instanceof DqContent) {
+                $parser->compiler->has_variable_string = true;
+            }
+        }
+        return $code;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/DqContent.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/DqContent.php
new file mode 100644
index 000000000..f0a4b0697
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/DqContent.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Smarty\ParseTree;
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree  in the template parser
+ *
+
+
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Raw chars as part of a double-quoted string.
+ *
+
+
+ * @ignore
+ */
+class DqContent extends Base
+{
+    /**
+     * Create parse tree buffer with string content
+     *
+     * @param string $data string section
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Return content as double-quoted string
+     *
+     * @param \Smarty\Parser\TemplateParser $parser
+     *
+     * @return string doubled quoted string
+     */
+    public function to_smarty_php(\Smarty\Parser\TemplateParser $parser)
+    {
+        return '"' . $this->data . '"';
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Tag.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Tag.php
new file mode 100644
index 000000000..05237f2de
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Tag.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Smarty\ParseTree;
+
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+
+
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * A complete smarty tag.
+ *
+
+
+ * @ignore
+ */
+class Tag extends Base
+{
+    /**
+     * Saved block nesting level
+     *
+     * @var int
+     */
+    public $saved_block_nesting;
+
+    /**
+     * Create parse tree buffer for Smarty tag
+     *
+     * @param \Smarty\Parser\TemplateParser $parser parser object
+     * @param string                          $data   content
+     */
+    public function __construct(\Smarty\Parser\TemplateParser $parser, $data)
+    {
+        $this->data = $data;
+        $this->saved_block_nesting = $parser->block_nesting_level;
+    }
+
+    /**
+     * Return buffer content
+     *
+     * @param \Smarty\Parser\TemplateParser $parser
+     *
+     * @return string content
+     */
+    public function to_smarty_php(\Smarty\Parser\TemplateParser $parser)
+    {
+        return $this->data;
+    }
+
+    /**
+     * Return complied code that loads the evaluated output of buffer content into a temporary variable
+     *
+     * @param \Smarty\Parser\TemplateParser $parser
+     *
+     * @return string template code
+     */
+    public function assign_to_var(\Smarty\Parser\TemplateParser $parser)
+    {
+        $var = $parser->compiler->getNewPrefixVariable();
+        $tmp = $parser->compiler->appendCode('<?php ob_start();?>', (string) $this->data);
+        $tmp = $parser->compiler->appendCode($tmp, "<?php {$var}=ob_get_clean();?>");
+        $parser->compiler->appendPrefixCode($tmp);
+        return $var;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Template.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Template.php
new file mode 100644
index 000000000..ce802a0f4
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Template.php
@@ -0,0 +1,172 @@
+<?php
+
+namespace Smarty\ParseTree;
+
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+
+
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ */
+
+/**
+ * Template element
+ *
+
+
+ * @ignore
+ */
+class Template extends Base
+{
+    /**
+     * Array of template elements
+     *
+     * @var array
+     */
+    public $subtrees = array();
+
+    /**
+     * Create root of parse tree for template elements
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Append buffer to subtree
+     *
+     * @param \Smarty\Parser\TemplateParser $parser
+     * @param Base $subtree
+     */
+    public function append_subtree(\Smarty\Parser\TemplateParser $parser, Base $subtree)
+    {
+        if (!empty($subtree->subtrees)) {
+            $this->subtrees = array_merge($this->subtrees, $subtree->subtrees);
+        } else {
+            if ($subtree->data !== '') {
+                $this->subtrees[] = $subtree;
+            }
+        }
+    }
+
+    /**
+     * Append array to subtree
+     *
+     * @param \Smarty\Parser\TemplateParser $parser
+     * @param Base[] $array
+     */
+    public function append_array(\Smarty\Parser\TemplateParser $parser, $array = array())
+    {
+        if (!empty($array)) {
+            $this->subtrees = array_merge($this->subtrees, (array)$array);
+        }
+    }
+
+    /**
+     * Prepend array to subtree
+     *
+     * @param \Smarty\Parser\TemplateParser $parser
+     * @param Base[] $array
+     */
+    public function prepend_array(\Smarty\Parser\TemplateParser $parser, $array = array())
+    {
+        if (!empty($array)) {
+            $this->subtrees = array_merge((array)$array, $this->subtrees);
+        }
+    }
+
+    /**
+     * Sanitize and merge subtree buffers together
+     *
+     * @param \Smarty\Parser\TemplateParser $parser
+     *
+     * @return string template code content
+     */
+    public function to_smarty_php(\Smarty\Parser\TemplateParser $parser)
+    {
+        $code = '';
+
+        foreach ($this->getChunkedSubtrees() as $chunk) {
+            $text = '';
+            switch ($chunk['mode']) {
+                case 'textstripped':
+                    foreach ($chunk['subtrees'] as $subtree) {
+                        $text .= $subtree->to_smarty_php($parser);
+                    }
+                    $code .= preg_replace(
+                        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
+                        "<?php echo '\$1'; ?>\n",
+                        $parser->compiler->processText($text)
+                    );
+                    break;
+                case 'text':
+                    foreach ($chunk['subtrees'] as $subtree) {
+                        $text .= $subtree->to_smarty_php($parser);
+                    }
+                    $code .= preg_replace(
+                        '/((<%)|(%>)|(<\?php)|(<\?)|(\?>)|(<\/?script))/',
+                        "<?php echo '\$1'; ?>\n",
+                        $text
+                    );
+                    break;
+                case 'tag':
+                    foreach ($chunk['subtrees'] as $subtree) {
+                        $text = $parser->compiler->appendCode($text, (string) $subtree->to_smarty_php($parser));
+                    }
+                    $code .= $text;
+                    break;
+                default:
+                    foreach ($chunk['subtrees'] as $subtree) {
+                        $text = $subtree->to_smarty_php($parser);
+                    }
+                    $code .= $text;
+
+            }
+        }
+        return $code;
+    }
+
+    private function getChunkedSubtrees() {
+        $chunks = array();
+        $currentMode = null;
+        $currentChunk = array();
+        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
+
+            if ($this->subtrees[ $key ]->data === '' && in_array($currentMode, array('textstripped', 'text', 'tag'))) {
+                continue;
+            }
+
+            if ($this->subtrees[ $key ] instanceof Text
+                && $this->subtrees[ $key ]->isToBeStripped()) {
+                $newMode = 'textstripped';
+            } elseif ($this->subtrees[ $key ] instanceof Text) {
+                $newMode = 'text';
+            } elseif ($this->subtrees[ $key ] instanceof Tag) {
+                $newMode = 'tag';
+            } else {
+                $newMode = 'other';
+            }
+
+            if ($newMode == $currentMode) {
+                $currentChunk[] = $this->subtrees[ $key ];
+            } else {
+                $chunks[] = array(
+                    'mode' => $currentMode,
+                    'subtrees' => $currentChunk
+                );
+                $currentMode = $newMode;
+                $currentChunk = array($this->subtrees[ $key ]);
+            }
+        }
+        if ($currentMode && $currentChunk) {
+            $chunks[] = array(
+                'mode' => $currentMode,
+                'subtrees' => $currentChunk
+            );
+        }
+        return $chunks;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Text.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Text.php
new file mode 100644
index 000000000..e6131407c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/ParseTree/Text.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Smarty\ParseTree;
+
+/**
+ * Smarty Internal Plugin Templateparser Parse Tree
+ * These are classes to build parse tree in the template parser
+ *
+
+
+ * @author     Thue Kristensen
+ * @author     Uwe Tews
+ *             *
+ *             template text
+
+
+ * @ignore
+ */
+class Text extends Base
+{
+
+    /**
+     * Wether this section should be stripped on output to smarty php
+     * @var bool
+     */
+    private $toBeStripped = false;
+
+    /**
+     * Create template text buffer
+     *
+     * @param string $data text
+     * @param bool $toBeStripped wether this section should be stripped on output to smarty php
+     */
+    public function __construct($data, $toBeStripped = false)
+    {
+        $this->data = $data;
+        $this->toBeStripped = $toBeStripped;
+    }
+
+    /**
+     * Wether this section should be stripped on output to smarty php
+     * @return bool
+     */
+    public function isToBeStripped() {
+        return $this->toBeStripped;
+    }
+
+    /**
+     * Return buffer content
+     *
+     * @param \Smarty\Parser\TemplateParser $parser
+     *
+     * @return string text
+     */
+    public function to_smarty_php(\Smarty\Parser\TemplateParser $parser)
+    {
+        return $this->data;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Parser/ConfigfileParser.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Parser/ConfigfileParser.php
new file mode 100644
index 000000000..7997a0981
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Parser/ConfigfileParser.php
@@ -0,0 +1,972 @@
+<?php
+
+// line 12 "src/Parser/ConfigfileParser.y"
+
+
+namespace Smarty\Parser;
+
+use \Smarty\Lexer\ConfigfileLexer as Lexer;
+use \Smarty\Compiler\Configfile as Configfile;
+
+/**
+* Smarty Internal Plugin Configfileparse
+*
+* This is the config file parser.
+* It is generated from the ConfigfileParser.y file
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+class ConfigfileParser
+{
+// line 31 "src/Parser/ConfigfileParser.y"
+
+    /**
+     * result status
+     *
+     * @var bool
+     */
+    public $successful = true;
+    /**
+     * return value
+     *
+     * @var mixed
+     */
+    public $retvalue = 0;
+    /**
+     * @var
+     */
+    public $yymajor;
+    /**
+     * lexer object
+     *
+     * @var Lexer
+     */
+    private $lex;
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+    /**
+     * compiler object
+     *
+     * @var Configfile
+     */
+    public $compiler = null;
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+    /**
+     * copy of config_overwrite property
+     *
+     * @var bool
+     */
+    private $configOverwrite = false;
+    /**
+     * copy of config_read_hidden property
+     *
+     * @var bool
+     */
+    private $configReadHidden = false;
+    /**
+     * helper map
+     *
+     * @var array
+     */
+    private static $escapes_single = array('\\' => '\\',
+                                           '\'' => '\'');
+
+    /**
+     * constructor
+     *
+     * @param Lexer      $lex
+     * @param Configfile $compiler
+     */
+    public function __construct(Lexer $lex, Configfile $compiler)
+    {
+        $this->lex = $lex;
+        $this->smarty = $compiler->getSmarty();
+        $this->compiler = $compiler;
+        $this->configOverwrite = $this->smarty->config_overwrite;
+        $this->configReadHidden = $this->smarty->config_read_hidden;
+    }
+
+    /**
+     * parse optional boolean keywords
+     *
+     * @param string $str
+     *
+     * @return bool
+     */
+    private function parse_bool($str)
+    {
+        $str = strtolower($str);
+        if (in_array($str, array('on', 'yes', 'true'))) {
+            $res = true;
+        } else {
+            $res = false;
+        }
+        return $res;
+    }
+
+    /**
+     * parse single quoted string
+     *  remove outer quotes
+     *  unescape inner quotes
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_single_quoted_string($qstr)
+    {
+        $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
+
+        $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
+
+        $str = '';
+        foreach ($ss as $s) {
+            if (strlen($s) === 2 && $s[0] === '\\') {
+                if (isset(self::$escapes_single[$s[1]])) {
+                    $s = self::$escapes_single[$s[1]];
+                }
+            }
+            $str .= $s;
+        }
+        return $str;
+    }
+
+    /**
+     * parse double quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_double_quoted_string($qstr)
+    {
+        $inner_str = substr($qstr, 1, strlen($qstr) - 2);
+        return stripcslashes($inner_str);
+    }
+
+    /**
+     * parse triple quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_tripple_double_quoted_string($qstr)
+    {
+        return stripcslashes($qstr);
+    }
+
+    /**
+     * set a config variable in target array
+     *
+     * @param array $var
+     * @param array $target_array
+     */
+    private function set_var(array $var, array &$target_array)
+    {
+        $key = $var['key'];
+        $value = $var['value'];
+
+        if ($this->configOverwrite || !isset($target_array['vars'][$key])) {
+            $target_array['vars'][$key] = $value;
+        } else {
+            settype($target_array['vars'][$key], 'array');
+            $target_array['vars'][$key][] = $value;
+        }
+    }
+
+    /**
+     * add config variable to global vars
+     *
+     * @param array $vars
+     */
+    private function add_global_vars(array $vars)
+    {
+        if (!isset($this->compiler->config_data['vars'])) {
+            $this->compiler->config_data['vars'] = array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data);
+        }
+    }
+
+    /**
+     * add config variable to section
+     *
+     * @param string $section_name
+     * @param array  $vars
+     */
+    private function add_section_vars($section_name, array $vars)
+    {
+        if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
+            $this->compiler->config_data['sections'][$section_name]['vars'] = array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
+        }
+    }
+
+    const TPC_OPENB                          =  1;
+    const TPC_SECTION                        =  2;
+    const TPC_CLOSEB                         =  3;
+    const TPC_DOT                            =  4;
+    const TPC_ID                             =  5;
+    const TPC_EQUAL                          =  6;
+    const TPC_FLOAT                          =  7;
+    const TPC_INT                            =  8;
+    const TPC_BOOL                           =  9;
+    const TPC_SINGLE_QUOTED_STRING           = 10;
+    const TPC_DOUBLE_QUOTED_STRING           = 11;
+    const TPC_TRIPPLE_QUOTES                 = 12;
+    const TPC_TRIPPLE_TEXT                   = 13;
+    const TPC_TRIPPLE_QUOTES_END             = 14;
+    const TPC_NAKED_STRING                   = 15;
+    const TPC_OTHER                          = 16;
+    const TPC_NEWLINE                        = 17;
+    const TPC_COMMENTSTART                   = 18;
+    const YY_NO_ACTION = 60;
+    const YY_ACCEPT_ACTION = 59;
+    const YY_ERROR_ACTION = 58;
+
+    const YY_SZ_ACTTAB = 39;
+public static $yy_action = array(
+     24,   25,   26,   27,   28,   12,   15,   23,   31,   32,
+     59,    8,    9,    3,   21,   22,   33,   13,   33,   13,
+     14,   10,   18,   16,   30,   11,   17,   20,   34,    7,
+      5,    1,    2,   29,    4,   19,   52,   35,    6,
+    );
+    public static $yy_lookahead = array(
+      7,    8,    9,   10,   11,   12,    5,   27,   15,   16,
+     20,   21,   25,   23,   25,   26,   17,   18,   17,   18,
+      2,   25,    4,   13,   14,    1,   15,   24,   17,   22,
+      3,   23,   23,   14,    6,    2,   28,   17,    3,
+);
+    const YY_SHIFT_USE_DFLT = -8;
+    const YY_SHIFT_MAX = 19;
+    public static $yy_shift_ofst = array(
+     -8,    1,    1,    1,   -7,   -1,   -1,   24,   -8,   -8,
+     -8,   18,   10,   11,   27,   28,   19,   20,   33,   35,
+);
+    const YY_REDUCE_USE_DFLT = -21;
+    const YY_REDUCE_MAX = 10;
+    public static $yy_reduce_ofst = array(
+    -10,  -11,  -11,  -11,  -20,  -13,   -4,    3,    7,    8,
+      9,
+);
+    public static $yyExpectedTokens = array(
+         array(),
+         array(5, 17, 18, ),
+         array(5, 17, 18, ),
+         array(5, 17, 18, ),
+         array(7, 8, 9, 10, 11, 12, 15, 16, ),
+         array(17, 18, ),
+         array(17, 18, ),
+         array(1, ),
+         array(),
+         array(),
+         array(),
+         array(2, 4, ),
+         array(13, 14, ),
+         array(15, 17, ),
+         array(3, ),
+         array(6, ),
+         array(14, ),
+         array(17, ),
+         array(2, ),
+         array(3, ),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+);
+    public static $yy_default = array(
+     44,   40,   41,   37,   58,   58,   58,   36,   39,   44,
+     44,   58,   58,   58,   58,   58,   58,   58,   58,   58,
+     38,   42,   43,   45,   46,   47,   48,   49,   50,   51,
+     52,   53,   54,   55,   56,   57,
+);
+    const YYNOCODE = 29;
+    const YYSTACKDEPTH = 100;
+    const YYNSTATE = 36;
+    const YYNRULE = 22;
+    const YYERRORSYMBOL = 19;
+    const YYERRSYMDT = 'yy0';
+    const YYFALLBACK = 0;
+    public static $yyFallback = array(
+    );
+    public function Trace($TraceFILE, $zTracePrompt)
+    {
+        if (!$TraceFILE) {
+            $zTracePrompt = 0;
+        } elseif (!$zTracePrompt) {
+            $TraceFILE = 0;
+        }
+        $this->yyTraceFILE = $TraceFILE;
+        $this->yyTracePrompt = $zTracePrompt;
+    }
+
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+    public $yyTraceFILE;
+    public $yyTracePrompt;
+    public $yyidx;                    /* Index of top element in stack */
+    public $yyerrcnt;                 /* Shifts left before out of the error */
+    public $yystack = array();  /* The parser's stack */
+
+    public $yyTokenName = array(
+  '$',             'OPENB',         'SECTION',       'CLOSEB',      
+  'DOT',           'ID',            'EQUAL',         'FLOAT',       
+  'INT',           'BOOL',          'SINGLE_QUOTED_STRING',  'DOUBLE_QUOTED_STRING',
+  'TRIPPLE_QUOTES',  'TRIPPLE_TEXT',  'TRIPPLE_QUOTES_END',  'NAKED_STRING',
+  'OTHER',         'NEWLINE',       'COMMENTSTART',  'error',       
+  'start',         'global_vars',   'sections',      'var_list',    
+  'section',       'newline',       'var',           'value',       
+    );
+
+    public static $yyRuleName = array(
+  'start ::= global_vars sections',
+  'global_vars ::= var_list',
+  'sections ::= sections section',
+  'sections ::=',
+  'section ::= OPENB SECTION CLOSEB newline var_list',
+  'section ::= OPENB DOT SECTION CLOSEB newline var_list',
+  'var_list ::= var_list newline',
+  'var_list ::= var_list var',
+  'var_list ::=',
+  'var ::= ID EQUAL value',
+  'value ::= FLOAT',
+  'value ::= INT',
+  'value ::= BOOL',
+  'value ::= SINGLE_QUOTED_STRING',
+  'value ::= DOUBLE_QUOTED_STRING',
+  'value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END',
+  'value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END',
+  'value ::= NAKED_STRING',
+  'value ::= OTHER',
+  'newline ::= NEWLINE',
+  'newline ::= COMMENTSTART NEWLINE',
+  'newline ::= COMMENTSTART NAKED_STRING NEWLINE',
+    );
+
+    public function tokenName($tokenType)
+    {
+        if ($tokenType === 0) {
+            return 'End of Input';
+        }
+        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
+            return $this->yyTokenName[$tokenType];
+        } else {
+            return 'Unknown';
+        }
+    }
+
+    public static function yy_destructor($yymajor, $yypminor)
+    {
+        switch ($yymajor) {
+            default:  break;   /* If no destructor action specified: do nothing */
+        }
+    }
+
+    public function yy_pop_parser_stack()
+    {
+        if (empty($this->yystack)) {
+            return;
+        }
+        $yytos = array_pop($this->yystack);
+        if ($this->yyTraceFILE && $this->yyidx >= 0) {
+            fwrite($this->yyTraceFILE,
+                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
+                    "\n");
+        }
+        $yymajor = $yytos->major;
+        self::yy_destructor($yymajor, $yytos->minor);
+        $this->yyidx--;
+
+        return $yymajor;
+    }
+
+    public function __destruct()
+    {
+        while ($this->yystack !== Array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
+        }
+    }
+
+    public function yy_get_expected_tokens($token)
+    {
+        static $res3 = array();
+        static $res4 = array();
+        $state = $this->yystack[$this->yyidx]->stateno;
+        $expected = self::$yyExpectedTokens[$state];
+        if (isset($res3[$state][$token])) {
+            if ($res3[$state][$token]) {
+                return $expected;
+            }
+        } else {
+            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return $expected;
+            }
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ === 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return array_unique($expected);
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset(self::$yyExpectedTokens[$nextstate])) {
+                        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
+                        if (isset($res4[$nextstate][$token])) {
+                            if ($res4[$nextstate][$token]) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        } else {
+                            if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return array_unique($expected);
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return $expected;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+
+        return array_unique($expected);
+    }
+
+    public function yy_is_expected_token($token)
+    {
+        static $res = array();
+        static $res2 = array();
+        if ($token === 0) {
+            return true; // 0 is not part of this
+        }
+        $state = $this->yystack[$this->yyidx]->stateno;
+        if (isset($res[$state][$token])) {
+            if ($res[$state][$token]) {
+                return true;
+            }
+        } else {
+            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return true;
+            }
+       }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ === 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return true;
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset($res2[$nextstate][$token])) {
+                        if ($res2[$nextstate][$token]) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    } else {
+                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        if (!$token) {
+                            // end of input: this is valid
+                            return true;
+                        }
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return false;
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return true;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+
+        return true;
+    }
+
+   public function yy_find_shift_action($iLookAhead)
+    {
+        $stateno = $this->yystack[$this->yyidx]->stateno;
+
+        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
+        if (!isset(self::$yy_shift_ofst[$stateno])) {
+            // no shift actions
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_shift_ofst[$stateno];
+        if ($i === self::YY_SHIFT_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead === self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
+                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+                if ($this->yyTraceFILE) {
+                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
+                        $this->yyTokenName[$iLookAhead] . ' => ' .
+                        $this->yyTokenName[$iFallback] . "\n");
+                }
+
+                return $this->yy_find_shift_action($iFallback);
+            }
+
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    public function yy_find_reduce_action($stateno, $iLookAhead)
+    {
+        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
+
+        if (!isset(self::$yy_reduce_ofst[$stateno])) {
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_reduce_ofst[$stateno];
+        if ($i === self::YY_REDUCE_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead === self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    {
+        $this->yyidx++;
+        if ($this->yyidx >= self::YYSTACKDEPTH) {
+            $this->yyidx--;
+            if ($this->yyTraceFILE) {
+                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
+            }
+            while ($this->yyidx >= 0) {
+                $this->yy_pop_parser_stack();
+            }
+// line 245 "src/Parser/ConfigfileParser.y"
+
+            $this->internalError = true;
+            $this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
+
+            return;
+        }
+        $yytos = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+        $yytos->stateno = $yyNewState;
+        $yytos->major = $yyMajor;
+        $yytos->minor = $yypMinor;
+        $this->yystack[] = $yytos;
+        if ($this->yyTraceFILE && $this->yyidx > 0) {
+            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
+                $yyNewState);
+            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
+            for ($i = 1; $i <= $this->yyidx; $i++) {
+                fprintf($this->yyTraceFILE, " %s",
+                    $this->yyTokenName[$this->yystack[$i]->major]);
+            }
+            fwrite($this->yyTraceFILE,"\n");
+        }
+    }
+
+    public static $yyRuleInfo = array(
+  array( 0 => 20, 1 => 2 ),
+  array( 0 => 21, 1 => 1 ),
+  array( 0 => 22, 1 => 2 ),
+  array( 0 => 22, 1 => 0 ),
+  array( 0 => 24, 1 => 5 ),
+  array( 0 => 24, 1 => 6 ),
+  array( 0 => 23, 1 => 2 ),
+  array( 0 => 23, 1 => 2 ),
+  array( 0 => 23, 1 => 0 ),
+  array( 0 => 26, 1 => 3 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 3 ),
+  array( 0 => 27, 1 => 2 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 27, 1 => 1 ),
+  array( 0 => 25, 1 => 1 ),
+  array( 0 => 25, 1 => 2 ),
+  array( 0 => 25, 1 => 3 ),
+    );
+
+    public static $yyReduceMap = array(
+        0 => 0,
+        2 => 0,
+        3 => 0,
+        19 => 0,
+        20 => 0,
+        21 => 0,
+        1 => 1,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        10 => 10,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+        16 => 16,
+        17 => 17,
+        18 => 17,
+    );
+// line 251 "src/Parser/ConfigfileParser.y"
+    public function yy_r0(){
+    $this->_retvalue = null;
+    }
+// line 256 "src/Parser/ConfigfileParser.y"
+    public function yy_r1(){
+    $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor);
+    $this->_retvalue = null;
+    }
+// line 270 "src/Parser/ConfigfileParser.y"
+    public function yy_r4(){
+    $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
+    $this->_retvalue = null;
+    }
+// line 275 "src/Parser/ConfigfileParser.y"
+    public function yy_r5(){
+    if ($this->configReadHidden) {
+        $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
+    }
+    $this->_retvalue = null;
+    }
+// line 283 "src/Parser/ConfigfileParser.y"
+    public function yy_r6(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 287 "src/Parser/ConfigfileParser.y"
+    public function yy_r7(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, array($this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 291 "src/Parser/ConfigfileParser.y"
+    public function yy_r8(){
+    $this->_retvalue = array();
+    }
+// line 297 "src/Parser/ConfigfileParser.y"
+    public function yy_r9(){
+    $this->_retvalue = array('key' => $this->yystack[$this->yyidx + -2]->minor, 'value' => $this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 302 "src/Parser/ConfigfileParser.y"
+    public function yy_r10(){
+    $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 306 "src/Parser/ConfigfileParser.y"
+    public function yy_r11(){
+    $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 310 "src/Parser/ConfigfileParser.y"
+    public function yy_r12(){
+    $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 314 "src/Parser/ConfigfileParser.y"
+    public function yy_r13(){
+    $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 318 "src/Parser/ConfigfileParser.y"
+    public function yy_r14(){
+    $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 322 "src/Parser/ConfigfileParser.y"
+    public function yy_r15(){
+    $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 326 "src/Parser/ConfigfileParser.y"
+    public function yy_r16(){
+    $this->_retvalue = '';
+    }
+// line 330 "src/Parser/ConfigfileParser.y"
+    public function yy_r17(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+
+    private $_retvalue;
+
+    public function yy_reduce($yyruleno)
+    {
+        if ($this->yyTraceFILE && $yyruleno >= 0
+              && $yyruleno < count(self::$yyRuleName)) {
+            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
+                $this->yyTracePrompt, $yyruleno,
+                self::$yyRuleName[$yyruleno]);
+        }
+
+        $this->_retvalue = $yy_lefthand_side = null;
+        if (isset(self::$yyReduceMap[$yyruleno])) {
+            // call the action
+            $this->_retvalue = null;
+            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
+            $yy_lefthand_side = $this->_retvalue;
+        }
+        $yygoto = self::$yyRuleInfo[$yyruleno][0];
+        $yysize = self::$yyRuleInfo[$yyruleno][1];
+        $this->yyidx -= $yysize;
+        for ($i = $yysize; $i; $i--) {
+            // pop all of the right-hand side parameters
+            array_pop($this->yystack);
+        }
+        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
+        if ($yyact < self::YYNSTATE) {
+            if (!$this->yyTraceFILE && $yysize) {
+                $this->yyidx++;
+                $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+                $x->stateno = $yyact;
+                $x->major = $yygoto;
+                $x->minor = $yy_lefthand_side;
+                $this->yystack[$this->yyidx] = $x;
+            } else {
+                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
+            }
+        } elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) {
+            $this->yy_accept();
+        }
+    }
+
+    public function yy_parse_failed()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
+        } while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+    }
+
+    public function yy_syntax_error($yymajor, $TOKEN)
+    {
+// line 238 "src/Parser/ConfigfileParser.y"
+
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_config_file_error();
+    }
+
+    public function yy_accept()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
+        } while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+// line 231 "src/Parser/ConfigfileParser.y"
+
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+    }
+
+    public function doParse($yymajor, $yytokenvalue)
+    {
+        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
+
+        if ($this->yyidx === null || $this->yyidx < 0) {
+            $this->yyidx = 0;
+            $this->yyerrcnt = -1;
+            $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+            $x->stateno = 0;
+            $x->major = 0;
+            $this->yystack = array();
+            $this->yystack[] = $x;
+        }
+        $yyendofinput = ($yymajor==0);
+
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sInput %s\n",
+                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+        }
+
+        do {
+            $yyact = $this->yy_find_shift_action($yymajor);
+            if ($yymajor < self::YYERRORSYMBOL &&
+                  !$this->yy_is_expected_token($yymajor)) {
+                // force a syntax error
+                $yyact = self::YY_ERROR_ACTION;
+            }
+            if ($yyact < self::YYNSTATE) {
+                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
+                $this->yyerrcnt--;
+                if ($yyendofinput && $this->yyidx >= 0) {
+                    $yymajor = 0;
+                } else {
+                    $yymajor = self::YYNOCODE;
+                }
+            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
+                $this->yy_reduce($yyact - self::YYNSTATE);
+            } elseif ($yyact === self::YY_ERROR_ACTION) {
+                if ($this->yyTraceFILE) {
+                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
+                        $this->yyTracePrompt);
+                }
+                if (self::YYERRORSYMBOL) {
+                    if ($this->yyerrcnt < 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $yymx = $this->yystack[$this->yyidx]->major;
+                    if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
+                        if ($this->yyTraceFILE) {
+                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
+                                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+                        }
+                        $this->yy_destructor($yymajor, $yytokenvalue);
+                        $yymajor = self::YYNOCODE;
+                    } else {
+                        while ($this->yyidx >= 0 &&
+                                 $yymx !== self::YYERRORSYMBOL &&
+        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+                              ){
+                            $this->yy_pop_parser_stack();
+                        }
+                        if ($this->yyidx < 0 || $yymajor==0) {
+                            $this->yy_destructor($yymajor, $yytokenvalue);
+                            $this->yy_parse_failed();
+                            $yymajor = self::YYNOCODE;
+                        } elseif ($yymx !== self::YYERRORSYMBOL) {
+                            $u2 = 0;
+                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
+                        }
+                    }
+                    $this->yyerrcnt = 3;
+                    $yyerrorhit = 1;
+                } else {
+                    if ($this->yyerrcnt <= 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $this->yyerrcnt = 3;
+                    $this->yy_destructor($yymajor, $yytokenvalue);
+                    if ($yyendofinput) {
+                        $this->yy_parse_failed();
+                    }
+                    $yymajor = self::YYNOCODE;
+                }
+            } else {
+                $this->yy_accept();
+                $yymajor = self::YYNOCODE;
+            }
+        } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0);
+    }
+}
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Parser/ConfigfileParser.y b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Parser/ConfigfileParser.y
new file mode 100644
index 000000000..23afc2d8f
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Parser/ConfigfileParser.y
@@ -0,0 +1,352 @@
+/**
+* ConfigfileParser
+*
+* This is the config file parser
+* 
+* 
+* @package Smarty
+* @subpackage Config
+* @author Uwe Tews
+*/
+%name TPC_
+%declare_class {
+
+namespace Smarty\Parser;
+
+use \Smarty\Lexer\ConfigfileLexer as Lexer;
+use \Smarty\Compiler\Configfile as Configfile;
+
+/**
+* Smarty Internal Plugin Configfileparse
+*
+* This is the config file parser.
+* It is generated from the ConfigfileParser.y file
+* @package Smarty
+* @subpackage Compiler
+* @author Uwe Tews
+*/
+class ConfigfileParser
+}
+%include_class
+{
+    /**
+     * result status
+     *
+     * @var bool
+     */
+    public $successful = true;
+    /**
+     * return value
+     *
+     * @var mixed
+     */
+    public $retvalue = 0;
+    /**
+     * @var
+     */
+    public $yymajor;
+    /**
+     * lexer object
+     *
+     * @var Lexer
+     */
+    private $lex;
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+    /**
+     * compiler object
+     *
+     * @var Configfile
+     */
+    public $compiler = null;
+    /**
+     * smarty object
+     *
+     * @var Smarty
+     */
+    public $smarty = null;
+    /**
+     * copy of config_overwrite property
+     *
+     * @var bool
+     */
+    private $configOverwrite = false;
+    /**
+     * copy of config_read_hidden property
+     *
+     * @var bool
+     */
+    private $configReadHidden = false;
+    /**
+     * helper map
+     *
+     * @var array
+     */
+    private static $escapes_single = array('\\' => '\\',
+                                           '\'' => '\'');
+
+    /**
+     * constructor
+     *
+     * @param Lexer      $lex
+     * @param Configfile $compiler
+     */
+    public function __construct(Lexer $lex, Configfile $compiler)
+    {
+        $this->lex = $lex;
+        $this->smarty = $compiler->getSmarty();
+        $this->compiler = $compiler;
+        $this->configOverwrite = $this->smarty->config_overwrite;
+        $this->configReadHidden = $this->smarty->config_read_hidden;
+    }
+
+    /**
+     * parse optional boolean keywords
+     *
+     * @param string $str
+     *
+     * @return bool
+     */
+    private function parse_bool($str)
+    {
+        $str = strtolower($str);
+        if (in_array($str, array('on', 'yes', 'true'))) {
+            $res = true;
+        } else {
+            $res = false;
+        }
+        return $res;
+    }
+
+    /**
+     * parse single quoted string
+     *  remove outer quotes
+     *  unescape inner quotes
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_single_quoted_string($qstr)
+    {
+        $escaped_string = substr($qstr, 1, strlen($qstr) - 2); //remove outer quotes
+
+        $ss = preg_split('/(\\\\.)/', $escaped_string, - 1, PREG_SPLIT_DELIM_CAPTURE);
+
+        $str = '';
+        foreach ($ss as $s) {
+            if (strlen($s) === 2 && $s[0] === '\\') {
+                if (isset(self::$escapes_single[$s[1]])) {
+                    $s = self::$escapes_single[$s[1]];
+                }
+            }
+            $str .= $s;
+        }
+        return $str;
+    }
+
+    /**
+     * parse double quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_double_quoted_string($qstr)
+    {
+        $inner_str = substr($qstr, 1, strlen($qstr) - 2);
+        return stripcslashes($inner_str);
+    }
+
+    /**
+     * parse triple quoted string
+     *
+     * @param string $qstr
+     *
+     * @return string
+     */
+    private static function parse_tripple_double_quoted_string($qstr)
+    {
+        return stripcslashes($qstr);
+    }
+
+    /**
+     * set a config variable in target array
+     *
+     * @param array $var
+     * @param array $target_array
+     */
+    private function set_var(array $var, array &$target_array)
+    {
+        $key = $var['key'];
+        $value = $var['value'];
+
+        if ($this->configOverwrite || !isset($target_array['vars'][$key])) {
+            $target_array['vars'][$key] = $value;
+        } else {
+            settype($target_array['vars'][$key], 'array');
+            $target_array['vars'][$key][] = $value;
+        }
+    }
+
+    /**
+     * add config variable to global vars
+     *
+     * @param array $vars
+     */
+    private function add_global_vars(array $vars)
+    {
+        if (!isset($this->compiler->config_data['vars'])) {
+            $this->compiler->config_data['vars'] = array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data);
+        }
+    }
+
+    /**
+     * add config variable to section
+     *
+     * @param string $section_name
+     * @param array  $vars
+     */
+    private function add_section_vars($section_name, array $vars)
+    {
+        if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
+            $this->compiler->config_data['sections'][$section_name]['vars'] = array();
+        }
+        foreach ($vars as $var) {
+            $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
+        }
+    }
+}
+
+%token_prefix TPC_
+
+%parse_accept
+{
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+}
+
+%syntax_error
+{
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_config_file_error();
+}
+
+%stack_overflow
+{
+            $this->internalError = true;
+            $this->compiler->trigger_config_file_error('Stack overflow in configfile parser');
+}
+
+// Complete config file
+start(res) ::= global_vars sections. {
+    res = null;
+}
+
+// Global vars
+global_vars(res) ::= var_list(vl). {
+    $this->add_global_vars(vl);
+    res = null;
+}
+
+// Sections
+sections(res) ::= sections section. {
+    res = null;
+}
+
+sections(res) ::= . {
+    res = null;
+}
+
+section(res) ::= OPENB SECTION(i) CLOSEB newline var_list(vars). {
+    $this->add_section_vars(i, vars);
+    res = null;
+}
+
+section(res) ::= OPENB DOT SECTION(i) CLOSEB newline var_list(vars). {
+    if ($this->configReadHidden) {
+        $this->add_section_vars(i, vars);
+    }
+    res = null;
+}
+
+// Var list
+var_list(res) ::= var_list(vl) newline. {
+    res = vl;
+}
+
+var_list(res) ::= var_list(vl) var(v). {
+    res = array_merge(vl, array(v));
+}
+
+var_list(res) ::= . {
+    res = array();
+}
+
+
+// Var
+var(res) ::= ID(id) EQUAL value(v). {
+    res = array('key' => id, 'value' => v);
+}
+
+
+value(res) ::= FLOAT(i). {
+    res = (float) i;
+}
+
+value(res) ::= INT(i). {
+    res = (int) i;
+}
+
+value(res) ::= BOOL(i). {
+    res = $this->parse_bool(i);
+}
+
+value(res) ::= SINGLE_QUOTED_STRING(i). {
+    res = self::parse_single_quoted_string(i);
+}
+
+value(res) ::= DOUBLE_QUOTED_STRING(i). {
+    res = self::parse_double_quoted_string(i);
+}
+
+value(res) ::= TRIPPLE_QUOTES(i) TRIPPLE_TEXT(c) TRIPPLE_QUOTES_END(ii). {
+    res = self::parse_tripple_double_quoted_string(c);
+}
+
+value(res) ::= TRIPPLE_QUOTES(i) TRIPPLE_QUOTES_END(ii). {
+    res = '';
+}
+
+value(res) ::= NAKED_STRING(i). {
+    res = i;
+}
+
+// NOTE: this is not a valid rule
+// It is added hier to produce a usefull error message on a missing '=';
+value(res) ::= OTHER(i). {
+    res = i;
+}
+
+
+// Newline and comments
+newline(res) ::= NEWLINE. {
+    res = null;
+}
+
+newline(res) ::= COMMENTSTART NEWLINE. {
+    res = null;
+}
+
+newline(res) ::= COMMENTSTART NAKED_STRING NEWLINE. {
+    res = null;
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Parser/TemplateParser.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Parser/TemplateParser.php
new file mode 100644
index 000000000..1e087c555
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Parser/TemplateParser.php
@@ -0,0 +1,3051 @@
+<?php
+
+// line 11 "src/Parser/TemplateParser.y"
+
+
+namespace Smarty\Parser;
+
+use \Smarty\Lexer\TemplateLexer as Lexer;
+use \Smarty\ParseTree\Template as TemplateParseTree;
+use \Smarty\Compiler\Template as TemplateCompiler;
+use \Smarty\ParseTree\Code;
+use \Smarty\ParseTree\Dq;
+use \Smarty\ParseTree\DqContent;
+use \Smarty\ParseTree\Tag;
+
+
+/**
+* Smarty Template Parser Class
+*
+* This is the template parser.
+* It is generated from the TemplateParser.y file
+* 
+* @author Uwe Tews <uwe.tews@googlemail.com>
+*/
+class TemplateParser
+{
+// line 35 "src/Parser/TemplateParser.y"
+
+    const ERR1 = 'Security error: Call to private object member not allowed';
+    const ERR2 = 'Security error: Call to dynamic object member not allowed';
+
+    /**
+     * result status
+     *
+     * @var bool
+     */
+    public $successful = true;
+
+    /**
+     * return value
+     *
+     * @var mixed
+     */
+    public $retvalue = 0;
+
+    /**
+     * @var
+     */
+    public $yymajor;
+
+    /**
+     * last index of array variable
+     *
+     * @var mixed
+     */
+    public $last_index;
+
+    /**
+     * last variable name
+     *
+     * @var string
+     */
+    public $last_variable;
+
+    /**
+     * root parse tree buffer
+     *
+     * @var TemplateParseTree
+     */
+    public $root_buffer;
+
+    /**
+     * current parse tree object
+     *
+     * @var \Smarty\ParseTree\Base
+     */
+    public $current_buffer;
+
+    /**
+     * lexer object
+     *
+     * @var Lexer
+     */
+    public $lex;
+
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+
+    /**
+     * {strip} status
+     *
+     * @var bool
+     */
+    public $strip = false;
+    /**
+     * compiler object
+     *
+     * @var TemplateCompiler
+     */
+    public $compiler = null;
+
+    /**
+     * smarty object
+     *
+     * @var \Smarty\Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * template object
+     *
+     * @var \Smarty\Template
+     */
+    public $template = null;
+
+    /**
+     * block nesting level
+     *
+     * @var int
+     */
+    public $block_nesting_level = 0;
+
+    /**
+     * security object
+     *
+     * @var \Smarty\Security
+     */
+    public $security = null;
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty\ParseTree\Base[]
+     */
+    public $template_prefix = array();
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty\ParseTree\Base[]
+     */
+    public $template_postfix = array();
+
+    /**
+     * constructor
+     *
+     * @param Lexer        $lex
+     * @param TemplateCompiler $compiler
+     */
+    public function __construct(Lexer $lex, TemplateCompiler $compiler)
+    {
+        $this->lex = $lex;
+        $this->compiler = $compiler;
+        $this->template = $this->compiler->getTemplate();
+        $this->smarty = $this->template->getSmarty();
+        $this->security = $this->smarty->security_policy ?? false;
+        $this->current_buffer = $this->root_buffer = new TemplateParseTree();
+    }
+
+     /**
+     * insert PHP code in current buffer
+     *
+     * @param string $code
+     */
+    public function insertPhpCode($code)
+    {
+        $this->current_buffer->append_subtree($this, new Tag($this, $code));
+    }
+
+    /**
+     * error rundown
+     *
+     */
+    public function errorRunDown()
+    {
+        while ($this->yystack !== array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
+        }
+    }
+
+    /**
+     *  merge PHP code with prefix code and return parse tree tag object
+     *
+     * @param string $code
+     *
+     * @return Tag
+     */
+    private function mergePrefixCode($code)
+    {
+        $tmp = '';
+        foreach ($this->compiler->prefix_code as $preCode) {
+            $tmp .= $preCode;
+        }
+        $this->compiler->prefix_code = array();
+        $tmp .= $code;
+        return new Tag($this, $this->compiler->processNocacheCode($tmp));
+    }
+
+
+    const TP_VERT                           =  1;
+    const TP_COLON                          =  2;
+    const TP_TEXT                           =  3;
+    const TP_STRIPON                        =  4;
+    const TP_STRIPOFF                       =  5;
+    const TP_LITERALSTART                   =  6;
+    const TP_LITERALEND                     =  7;
+    const TP_LITERAL                        =  8;
+    const TP_SIMPELOUTPUT                   =  9;
+    const TP_SIMPLETAG                      = 10;
+    const TP_SMARTYBLOCKCHILDPARENT         = 11;
+    const TP_LDEL                           = 12;
+    const TP_RDEL                           = 13;
+    const TP_DOLLARID                       = 14;
+    const TP_EQUAL                          = 15;
+    const TP_ID                             = 16;
+    const TP_PTR                            = 17;
+    const TP_LDELIF                         = 18;
+    const TP_LDELFOR                        = 19;
+    const TP_SEMICOLON                      = 20;
+    const TP_INCDEC                         = 21;
+    const TP_TO                             = 22;
+    const TP_STEP                           = 23;
+    const TP_LDELFOREACH                    = 24;
+    const TP_SPACE                          = 25;
+    const TP_AS                             = 26;
+    const TP_APTR                           = 27;
+    const TP_LDELSETFILTER                  = 28;
+    const TP_CLOSETAG                       = 29;
+    const TP_LDELSLASH                      = 30;
+    const TP_ATTR                           = 31;
+    const TP_INTEGER                        = 32;
+    const TP_COMMA                          = 33;
+    const TP_OPENP                          = 34;
+    const TP_CLOSEP                         = 35;
+    const TP_MATH                           = 36;
+    const TP_UNIMATH                        = 37;
+    const TP_ISIN                           = 38;
+    const TP_QMARK                          = 39;
+    const TP_NOT                            = 40;
+    const TP_TYPECAST                       = 41;
+    const TP_HEX                            = 42;
+    const TP_DOT                            = 43;
+    const TP_INSTANCEOF                     = 44;
+    const TP_SINGLEQUOTESTRING              = 45;
+    const TP_DOUBLECOLON                    = 46;
+    const TP_NAMESPACE                      = 47;
+    const TP_AT                             = 48;
+    const TP_HATCH                          = 49;
+    const TP_OPENB                          = 50;
+    const TP_CLOSEB                         = 51;
+    const TP_DOLLAR                         = 52;
+    const TP_LOGOP                          = 53;
+    const TP_SLOGOP                         = 54;
+    const TP_TLOGOP                         = 55;
+    const TP_SINGLECOND                     = 56;
+    const TP_ARRAYOPEN                      = 57;
+    const TP_QUOTE                          = 58;
+    const TP_BACKTICK                       = 59;
+    const YY_NO_ACTION = 527;
+    const YY_ACCEPT_ACTION = 526;
+    const YY_ERROR_ACTION = 525;
+
+    const YY_SZ_ACTTAB = 2372;
+public static $yy_action = array(
+     33,  197,  264,  299,  176,  298,  259,  242,  243,  244,
+      1,  259,  135,  232,  199,  354,    6,   84,  495,  217,
+    331,  354,  109,  104,  393,  248,  212,  256,  213,   51,
+    219,  393,   21,  393,   51,   43,  393,   32,   44,   45,
+    273,  221,  393,  277,  393,  200,  393,   83,    4,  136,
+    295,  226,  149,   99,  220,    5,   52,  242,  243,  244,
+      1,  307,  132,  211,  190,    9,    6,   84,  241,  217,
+    211,  126,  109,  150,  261,  252,  212,  256,  213,  137,
+    205,   98,   21,  313,   83,   43,   13,  295,   44,   45,
+    273,  221,  260,  230,  197,  200,  293,   83,    4,  321,
+    295,   35,  149,   86,  309,    5,   52,  242,  243,  244,
+      1,  146,   97,  387,   82,  231,    6,   84,   14,  217,
+    138,  251,  109,  148,   15,  387,  212,  256,  213,  452,
+    219,  387,   21,  251,  439,   43,  452,  252,   44,   45,
+    273,  221,    3,  277,   99,  200,  439,   83,    4,  252,
+    295,  259,  526,   96,  252,    5,   52,  242,  243,  244,
+      1,  136,  134,  262,  199,  103,    6,   84,  155,  217,
+    252,  279,  109,  112,   51,  439,  212,  256,  213,  127,
+    219,  316,   21,   99,  228,   43,  314,  439,   44,   45,
+    273,  221,  318,  277,  263,  200,   83,   83,    4,  295,
+    295,   46,   22,  280,   40,    5,   52,  242,  243,  244,
+      1,   20,  134,  189,  191,  266,    6,   84,  254,  217,
+    250,   19,  109,  152,  141,  253,  212,  256,  213,  197,
+    219,  267,   21,  251,  251,   43,  175,  298,   44,   45,
+    273,  221,  151,  277,  108,  200,   91,   83,    4,   87,
+    295,  295,  251,  354,  180,    5,   52,  242,  243,  244,
+      1,  259,  133,  140,  199,  354,    6,   84,  307,  217,
+    211,  354,  109,  181,  197,   39,  212,  256,  213,  286,
+    219,   14,   11,   94,   51,   43,   88,   15,   44,   45,
+    273,  221,  153,  277,  143,  200,   92,   83,    4,  139,
+    295,  295,  251,  154,  104,    5,   52,  242,  243,  244,
+      1,  303,  134,  251,  186,  173,    6,   84,   36,  217,
+     99,  126,  109,  181,  227,  285,  212,  256,  213,  137,
+    208,   98,   21,  127,  180,   43,   13,  295,   44,   45,
+    273,  221,  181,  277,  232,  200,  293,   83,    4,  112,
+    295,  234,  196,  297,  104,    5,   52,  242,  243,  244,
+      1,   29,  134,  224,  184,  156,    6,   84,  468,  217,
+    197,  468,  109,  197,   23,  468,  212,  256,  213,  264,
+    219,   18,   21,  175,  298,   43,  215,   15,   44,   45,
+    273,  221,  232,  277,  170,  200,  168,   83,    4,  233,
+    295,  295,  104,  144,   99,    5,   52,  242,  243,  244,
+      1,  259,  134,  251,  199,  157,    6,   84,   26,  217,
+    161,  181,  109,  181,  255,  439,  212,  256,  213,  178,
+    185,  240,   21,  112,   51,   43,  164,  439,   44,   45,
+    273,  221,  174,  277,  222,  200,  251,   83,    4,  305,
+    295,   41,   42,  281,   12,    5,   52,  242,  243,  244,
+      1,  197,  136,  163,  199,  167,    6,   84,  288,  289,
+    290,  291,  109,   17,  304,  251,  212,  256,  213,  330,
+    219,   16,   21,  258,  171,   47,  180,   25,   44,   45,
+    273,  221,   39,  277,   93,  200,  255,   83,    4,  328,
+    295,   41,   42,  281,   12,    5,   52,  242,  243,  244,
+      1,  181,  136,  439,  199,  214,    6,   84,  288,  289,
+    290,  291,  109,  177,  298,  439,  212,  256,  213,   28,
+    219,    8,   21,  209,  194,   43,   89,  295,   44,   45,
+    273,  221,  452,  277,   24,  200,  296,   83,    4,  452,
+    295,    7,  440,  239,  240,    5,   52,  283,  210,  211,
+    247,   95,   90,  106,  440,  188,  100,   81,   10,    9,
+    254,  310,   98,   19,  294,  268,  269,  253,  195,  158,
+    113,  169,  276,  201,  278,  172,  284,  293,  283,  210,
+    211,  247,  197,   90,  106,  238,  187,  100,   58,   24,
+     34,  322,  220,   98,  358,  159,  268,  269,  225,  223,
+    317,  245,  179,  276,  201,  278,   14,  284,  293,  246,
+    110,  283,   15,  211,  249,  439,  111,  106,  220,  188,
+    100,   81,   24,  257,  323,  254,   98,  439,   19,  268,
+    269,  118,  253,  265,  270,  272,  276,  201,  278,    7,
+    284,  293,  283,  220,  211,  274,  292,  111,   85,  229,
+    198,  116,   70,  275,  319,  160,  329,   98,  162,  320,
+    268,  269,   36,  145,  216,   37,  332,  276,  201,  278,
+    303,  284,  293,   41,   42,  281,   12,  303,  303,  283,
+    303,  211,  204,  312,  111,  303,  303,  198,  116,   70,
+    288,  289,  290,  291,   98,  303,  303,  268,  269,  303,
+    303,  303,  303,  303,  276,  201,  278,  303,  284,  293,
+    303,  303,  303,  283,  303,  211,  303,  303,  105,  203,
+    312,  198,  119,   49,  303,  117,  303,  303,   98,  303,
+    254,  268,  269,   19,  303,  303,  303,  253,  276,  201,
+    278,  303,  284,  293,  303,  283,   14,  211,  147,  303,
+    111,  303,   15,  198,  119,   65,  197,  303,  303,  303,
+     98,  303,  468,  268,  269,  468,  197,  303,  355,  468,
+    276,  201,  278,  303,  284,  293,  303,  303,  389,  283,
+    355,  211,  207,  303,  111,  303,  355,  198,  119,   65,
+    389,  303,  303,  303,   98,  303,  389,  268,  269,  303,
+    197,  468,  303,  303,  276,  201,  278,  303,  284,  293,
+    303,  303,  386,  283,  303,  211,  202,  303,  111,  303,
+    303,  198,  116,   70,  386,  303,  303,  303,   98,  303,
+    386,  268,  269,  303,  303,  303,  303,  303,  276,  201,
+    278,  303,  284,  293,  303,  303,  303,  283,  303,  211,
+    303,  303,  111,  303,  311,  198,  119,   65,  303,  303,
+    303,  303,   98,  303,  303,  268,  269,  303,  303,  303,
+    303,  303,  276,  201,  278,  303,  284,  293,  303,  303,
+    303,  283,  303,  211,  206,  303,  105,  303,  303,  198,
+    119,   56,  303,  233,  303,  303,   98,  303,  303,  268,
+    269,  303,  303,  303,  303,  303,  276,  201,  278,  303,
+    284,  293,  303,  283,  303,  211,  303,  303,  111,  303,
+    303,  198,  115,   62,  303,  303,  303,  303,   98,  303,
+    303,  268,  269,  303,  303,  303,  303,  303,  276,  201,
+    278,  303,  284,  293,  303,  303,  303,  283,  303,  211,
+    303,  303,  111,  303,  303,  193,  114,   57,  303,  303,
+    303,  303,   98,  303,  303,  268,  269,  303,  303,  303,
+    303,  303,  276,  201,  278,  303,  284,  293,  303,  283,
+    303,  211,  303,  303,  111,  303,  303,  198,  101,   80,
+    303,  303,  303,  303,   98,  303,  303,  268,  269,  303,
+    303,  303,  303,  303,  276,  201,  278,  303,  284,  293,
+    303,  303,  303,  283,  303,  211,  303,  303,  111,  303,
+    303,  198,  102,   79,  303,  303,  303,  303,   98,  303,
+    303,  268,  269,  303,  303,  303,  303,  303,  276,  201,
+    278,  303,  284,  293,  303,  283,  303,  211,  303,  303,
+    111,  303,  303,  198,  119,   53,  303,  303,  303,  303,
+     98,  303,  303,  268,  269,  303,  303,  303,  303,  303,
+    276,  201,  278,  303,  284,  293,  303,  303,  303,  283,
+    303,  211,  303,  303,  111,  303,  303,  198,  119,   64,
+    303,  303,  303,  303,   98,  303,  303,  268,  269,  303,
+    303,  303,  303,  303,  276,  201,  278,  303,  284,  293,
+    303,  283,  303,  211,  303,  303,  111,  303,  303,  198,
+    101,   54,  303,  303,  303,  303,   98,  303,  303,  268,
+    269,  303,  303,  303,  303,  303,  276,  201,  278,  303,
+    284,  293,  303,  303,  303,  283,  303,  211,  303,  303,
+    111,  303,  303,  198,  119,   63,  303,  303,  303,  303,
+     98,  303,  303,  268,  269,  303,  303,  303,  303,  303,
+    276,  201,  278,  303,  284,  293,  303,  283,  303,  211,
+    303,  303,  111,  303,  303,  198,  119,   55,  303,  303,
+    303,  303,   98,  303,  303,  268,  269,  303,  303,  303,
+    303,  303,  276,  201,  278,  303,  284,  293,  303,  303,
+    303,  283,  303,  211,  303,  303,  111,  303,  303,  198,
+    119,   56,  303,  303,  303,  303,   98,  303,  303,  268,
+    269,  303,  303,  303,  303,  303,  276,  201,  278,  303,
+    284,  293,  303,  283,  303,  211,  303,  303,  111,  303,
+    303,  198,  119,   66,  303,  303,  303,  303,   98,  303,
+    303,  268,  269,  303,  303,  303,  303,  303,  276,  201,
+    278,  303,  284,  293,  303,  303,  303,  283,  303,  211,
+    303,  303,  111,  303,  303,  198,  119,   67,  303,  303,
+    303,  303,   98,  303,  303,  268,  269,  303,  303,  303,
+    303,  303,  276,  201,  278,  303,  284,  293,  303,  283,
+    303,  211,  303,  303,  111,  303,  303,  198,  119,   68,
+    303,  303,  303,  303,   98,  303,  303,  268,  269,  303,
+    303,  303,  303,  303,  276,  201,  278,  303,  284,  293,
+    303,  303,  303,  283,  303,  211,  303,  303,  111,  303,
+    303,  198,  119,   69,  303,  303,  303,  303,   98,  303,
+    303,  268,  269,  303,  303,  303,  303,  303,  276,  201,
+    278,  303,  284,  293,  303,  283,  303,  211,  303,  303,
+    111,  303,  303,  198,  119,   71,  303,  303,  303,  303,
+     98,  303,  303,  268,  269,  303,  303,  303,  303,  303,
+    276,  201,  278,  303,  284,  293,  303,  303,  303,  283,
+    303,  211,  303,  303,  111,  303,  303,  192,  119,   59,
+    303,  303,  303,  303,   98,  303,  303,  268,  269,  303,
+    303,  303,  303,  303,  276,  201,  278,  303,  284,  293,
+    303,  283,  303,  211,  303,  303,  111,  303,  303,  198,
+    119,   60,  303,  303,  303,  303,   98,  303,  303,  268,
+    269,  303,  303,  303,  303,  303,  276,  201,  278,  303,
+    284,  293,  303,  303,  303,  283,  303,  211,  303,  303,
+    111,  303,  303,  198,  119,   61,  303,  303,  303,  303,
+     98,  303,  303,  268,  269,  303,  303,  303,  303,  303,
+    276,  201,  278,  303,  284,  293,  303,  283,  303,  211,
+    303,  303,  111,  303,  303,  198,  119,   72,  303,  303,
+    303,  303,   98,  303,  303,  268,  269,  303,  303,  303,
+    303,  303,  276,  201,  278,  303,  284,  293,  303,  303,
+    303,  283,  303,  211,  303,  303,  111,  303,  303,  198,
+    119,   73,  303,  303,  303,  303,   98,  303,  303,  268,
+    269,  303,  303,  303,  303,  303,  276,  201,  278,  303,
+    284,  293,  303,  283,  303,  211,  303,  303,  111,  303,
+    303,  198,  119,   74,  303,  303,  303,  303,   98,  303,
+    303,  268,  269,  303,  303,  303,  303,  303,  276,  201,
+    278,  303,  284,  293,  303,  303,  303,  283,  303,  211,
+    303,  303,  111,  303,  303,  198,  119,   75,  303,  303,
+    303,  303,   98,  303,  303,  268,  269,  303,  303,  303,
+    303,  303,  276,  201,  278,  303,  284,  293,  303,  283,
+    303,  211,  303,  303,  111,  303,  303,  198,  119,   76,
+    303,  303,  303,  303,   98,  303,  303,  268,  269,  303,
+    303,  303,  303,  303,  276,  201,  278,  303,  284,  293,
+    303,  303,  303,  283,  303,  211,  303,  303,  111,  303,
+    303,  198,  119,   77,  303,  303,  303,  303,   98,  303,
+    303,  268,  269,  303,  303,  303,  303,  303,  276,  201,
+    278,  303,  284,  293,  303,  283,  303,  211,  303,  303,
+    111,  303,  303,  198,  119,   78,  303,  303,  303,  303,
+     98,  303,  303,  268,  269,  303,  303,  303,  303,  303,
+    276,  201,  278,  303,  284,  293,  303,  303,  303,  283,
+    303,  211,  303,  303,  111,  303,  303,  198,  119,   48,
+    303,  303,  303,  303,   98,  303,  303,  268,  269,  303,
+    303,  303,  303,  303,  276,  201,  278,  303,  284,  293,
+    303,  283,  303,  211,  303,  303,  111,  303,  303,  198,
+    119,   50,  303,  303,  303,  303,   98,  303,  303,  268,
+    269,  303,  303,  303,  303,  303,  276,  201,  278,  303,
+    284,  293,  308,  303,  303,  303,  303,  303,  242,  243,
+    244,    2,  303,  306,  303,  303,  303,    6,   84,  254,
+    303,  303,   19,  109,  303,  303,  253,  212,  256,  213,
+    303,  303,   38,  303,   14,   14,  303,  303,  303,  165,
+     15,   15,  303,  303,  303,   41,   42,  281,   12,  251,
+    303,  303,   46,   22,  280,   40,  303,  301,   27,  303,
+    303,  308,  288,  289,  290,  291,  303,  242,  243,  244,
+      2,  303,  306,  303,  303,  303,    6,   84,  303,  303,
+    303,  303,  109,  303,   14,  303,  212,  256,  213,  303,
+     15,  142,  303,  303,  303,   41,   42,  281,   12,  303,
+    303,  251,  303,  303,   46,   22,  280,   40,  303,  303,
+    303,  303,  288,  289,  290,  291,  302,   27,  303,  303,
+    235,  236,  237,  130,  303,  303,  242,  243,  244,    1,
+    468,  303,  303,  468,  303,    6,   84,  468,  452,  303,
+    303,  109,  303,  303,  303,  212,  256,  213,  283,  303,
+    211,  303,  303,  111,  303,  303,  198,  131,  303,  303,
+    303,  303,  303,   98,  452,  303,  303,  452,  303,  468,
+    303,  452,  326,  276,  201,  278,  303,  284,  293,  303,
+    218,  303,  303,  283,  303,  211,  303,  468,  111,  303,
+    468,  198,  125,    3,  468,  452,  303,  303,   98,  271,
+    303,  303,  303,  303,  303,  303,  303,  282,  276,  201,
+    278,  303,  284,  293,  283,  303,  211,  303,  303,  111,
+    166,  452,  198,  129,  452,  303,  468,  303,  452,   98,
+    251,  303,  303,   46,   22,  280,   40,  303,  303,  276,
+    201,  278,  303,  284,  293,  303,  218,  303,  303,  283,
+    303,  211,  303,  468,  111,  303,  468,  198,  120,   35,
+    468,  452,  303,  303,   98,  271,  303,  303,  303,  303,
+    303,  303,  303,  303,  276,  201,  278,  303,  284,  293,
+    283,  303,  211,  303,  303,  111,  303,  452,  198,  121,
+    452,  303,  468,  303,  452,   98,  303,  303,  303,  303,
+    303,  303,  303,  303,  303,  276,  201,  278,  303,  284,
+    293,  303,  218,  303,  303,  283,  303,  211,  303,  468,
+    111,  303,  468,  198,  122,  303,  468,  452,  303,  303,
+     98,  271,  303,  303,  303,  303,  303,  303,  303,  303,
+    276,  201,  278,  303,  284,  293,  283,  303,  211,  303,
+    303,  111,  303,  452,  198,  123,  452,  303,  468,  303,
+    452,   98,  303,  303,  303,  303,  303,  303,  303,  303,
+    303,  276,  201,  278,  303,  284,  293,  303,   30,  303,
+    303,  283,  303,  211,  218,  468,  111,  303,  468,  198,
+    124,  468,  468,  452,  468,  303,   98,  271,  468,  452,
+    303,  303,  303,  271,  303,  303,  276,  201,  278,  303,
+    284,  293,  283,  402,  211,  303,  303,  111,  303,  452,
+    198,  128,  452,  303,  468,  452,  452,   98,  452,  303,
+    468,  303,  452,  287,  303,  107,  325,  276,  201,  278,
+    303,  284,  293,  303,  303,  439,  303,  402,  402,  402,
+    402,   41,   42,  281,   12,  303,  303,  439,  303,   41,
+     42,  281,   12,  303,  402,  402,  402,  402,  288,  289,
+    290,  291,   41,   42,  281,   12,  288,  289,  290,  291,
+    300,  324,   41,   42,  281,   12,  182,  315,  303,  288,
+    289,  290,  291,  183,  303,  303,  303,  303,  303,  288,
+    289,  290,  291,   41,   42,  281,   12,   31,  303,   41,
+     42,  281,   12,  303,  327,  303,   41,   42,  281,   12,
+    288,  289,  290,  291,  303,  303,  288,  289,  290,  291,
+    303,  303,  303,  288,  289,  290,  291,   41,   42,  281,
+     12,   41,   42,  281,   12,  303,  303,  303,  303,  303,
+    303,  303,  303,  303,  288,  289,  290,  291,  288,  289,
+    290,  291,
+    );
+    public static $yy_lookahead = array(
+      2,    1,   97,   13,   99,  100,   21,    9,   10,   11,
+     12,   21,   14,   70,   16,   25,   18,   19,    1,   21,
+     77,   31,   24,   80,   13,   69,   28,   29,   30,   44,
+     32,   20,   34,   22,   44,   37,   25,   39,   40,   41,
+     42,   43,   31,   45,   33,   47,   35,   49,   50,   14,
+     52,   16,   96,   17,   43,   57,   58,    9,   10,   11,
+     12,   65,   14,   67,   16,   33,   18,   19,   65,   21,
+     67,   70,   24,   96,   73,   98,   28,   29,   30,   43,
+     32,   80,   34,   51,   49,   37,   50,   52,   40,   41,
+     42,   43,   91,   45,    1,   47,   95,   49,   50,   51,
+     52,   15,   96,  107,  108,   57,   58,    9,   10,   11,
+     12,   72,   14,   13,   16,   15,   18,   19,   25,   21,
+     80,   82,   24,   72,   31,   25,   28,   29,   30,   43,
+     32,   31,   34,   82,   34,   37,   50,   98,   40,   41,
+     42,   43,   15,   45,   17,   47,   46,   49,   50,   98,
+     52,   21,   61,   62,   98,   57,   58,    9,   10,   11,
+     12,   14,   14,   16,   16,   80,   18,   19,   96,   21,
+     98,   93,   24,   46,   44,   34,   28,   29,   30,  101,
+     32,   51,   34,   17,   43,   37,  101,   46,   40,   41,
+     42,   43,   51,   45,   47,   47,   49,   49,   50,   52,
+     52,   85,   86,   87,   88,   57,   58,    9,   10,   11,
+     12,   12,   14,   14,   16,   16,   18,   19,    9,   21,
+     82,   12,   24,   72,   72,   16,   28,   29,   30,    1,
+     32,   32,   34,   82,   82,   37,   99,  100,   40,   41,
+     42,   43,   72,   45,   79,   47,   76,   49,   50,   80,
+     52,   52,   82,   13,  103,   57,   58,    9,   10,   11,
+     12,   21,   14,   14,   16,   25,   18,   19,   65,   21,
+     67,   31,   24,  103,    1,    2,   28,   29,   30,   51,
+     32,   25,   34,   34,   44,   37,   80,   31,   40,   41,
+     42,   43,   72,   45,   70,   47,   76,   49,   50,   14,
+     52,   52,   82,   72,   80,   57,   58,    9,   10,   11,
+     12,  108,   14,   82,   16,   76,   18,   19,   15,   21,
+     17,   70,   24,  103,   73,   93,   28,   29,   30,   43,
+     32,   80,   34,  101,  103,   37,   50,   52,   40,   41,
+     42,   43,  103,   45,   70,   47,   95,   49,   50,   46,
+     52,   77,   78,   69,   80,   57,   58,    9,   10,   11,
+     12,   12,   14,   14,   16,   16,   18,   19,    9,   21,
+      1,   12,   24,    1,    2,   16,   28,   29,   30,   97,
+     32,   25,   34,   99,  100,   37,   17,   31,   40,   41,
+     42,   43,   70,   45,   76,   47,   76,   49,   50,   77,
+     52,   52,   80,   72,   17,   57,   58,    9,   10,   11,
+     12,   21,   14,   82,   16,   96,   18,   19,   27,   21,
+     96,  103,   24,  103,  104,   34,   28,   29,   30,    6,
+     32,    8,   34,   46,   44,   37,   72,   46,   40,   41,
+     42,   43,   14,   45,   16,   47,   82,   49,   50,   59,
+     52,   36,   37,   38,   39,   57,   58,    9,   10,   11,
+     12,    1,   14,   96,   16,   72,   18,   19,   53,   54,
+     55,   56,   24,   15,   59,   82,   28,   29,   30,   21,
+     32,   20,   34,   16,   76,   37,  103,   27,   40,   41,
+     42,   43,    2,   45,   33,   47,  104,   49,   50,   14,
+     52,   36,   37,   38,   39,   57,   58,    9,   10,   11,
+     12,  103,   14,   34,   16,   48,   18,   19,   53,   54,
+     55,   56,   24,   99,  100,   46,   28,   29,   30,   12,
+     32,   34,   34,   63,   64,   37,   96,   52,   40,   41,
+     42,   43,   43,   45,   33,   47,   35,   49,   50,   50,
+     52,   34,   34,    7,    8,   57,   58,   65,   66,   67,
+     68,   81,   70,   71,   46,   73,   74,   75,   34,   33,
+      9,   35,   80,   12,  100,   83,   84,   16,   64,   96,
+     46,   81,   90,   91,   92,   81,   94,   95,   65,   66,
+     67,   68,    1,   70,   71,    7,   73,   74,   75,   33,
+     15,   35,   43,   80,   13,   96,   83,   84,   17,   48,
+     51,   13,   16,   90,   91,   92,   25,   94,   95,   13,
+     16,   65,   31,   67,   68,   34,   70,   71,   43,   73,
+     74,   75,   33,   16,   35,    9,   80,   46,   12,   83,
+     84,   16,   16,   16,   14,   16,   90,   91,   92,   34,
+     94,   95,   65,   43,   67,   32,   16,   70,   16,   16,
+     73,   74,   75,   32,   51,   49,   16,   80,   49,   51,
+     83,   84,   15,   26,   48,   22,   35,   90,   91,   92,
+    109,   94,   95,   36,   37,   38,   39,  109,  109,   65,
+    109,   67,  105,  106,   70,  109,  109,   73,   74,   75,
+     53,   54,   55,   56,   80,  109,  109,   83,   84,  109,
+    109,  109,  109,  109,   90,   91,   92,  109,   94,   95,
+    109,  109,  109,   65,  109,   67,  109,  109,   70,  105,
+    106,   73,   74,   75,  109,   77,  109,  109,   80,  109,
+      9,   83,   84,   12,  109,  109,  109,   16,   90,   91,
+     92,  109,   94,   95,  109,   65,   25,   67,   27,  109,
+     70,  109,   31,   73,   74,   75,    1,  109,  109,  109,
+     80,  109,    9,   83,   84,   12,    1,  109,   13,   16,
+     90,   91,   92,  109,   94,   95,  109,  109,   13,   65,
+     25,   67,  102,  109,   70,  109,   31,   73,   74,   75,
+     25,  109,  109,  109,   80,  109,   31,   83,   84,  109,
+      1,   48,  109,  109,   90,   91,   92,  109,   94,   95,
+    109,  109,   13,   65,  109,   67,  102,  109,   70,  109,
+    109,   73,   74,   75,   25,  109,  109,  109,   80,  109,
+     31,   83,   84,  109,  109,  109,  109,  109,   90,   91,
+     92,  109,   94,   95,  109,  109,  109,   65,  109,   67,
+    109,  109,   70,  109,  106,   73,   74,   75,  109,  109,
+    109,  109,   80,  109,  109,   83,   84,  109,  109,  109,
+    109,  109,   90,   91,   92,  109,   94,   95,  109,  109,
+    109,   65,  109,   67,  102,  109,   70,  109,  109,   73,
+     74,   75,  109,   77,  109,  109,   80,  109,  109,   83,
+     84,  109,  109,  109,  109,  109,   90,   91,   92,  109,
+     94,   95,  109,   65,  109,   67,  109,  109,   70,  109,
+    109,   73,   74,   75,  109,  109,  109,  109,   80,  109,
+    109,   83,   84,  109,  109,  109,  109,  109,   90,   91,
+     92,  109,   94,   95,  109,  109,  109,   65,  109,   67,
+    109,  109,   70,  109,  109,   73,   74,   75,  109,  109,
+    109,  109,   80,  109,  109,   83,   84,  109,  109,  109,
+    109,  109,   90,   91,   92,  109,   94,   95,  109,   65,
+    109,   67,  109,  109,   70,  109,  109,   73,   74,   75,
+    109,  109,  109,  109,   80,  109,  109,   83,   84,  109,
+    109,  109,  109,  109,   90,   91,   92,  109,   94,   95,
+    109,  109,  109,   65,  109,   67,  109,  109,   70,  109,
+    109,   73,   74,   75,  109,  109,  109,  109,   80,  109,
+    109,   83,   84,  109,  109,  109,  109,  109,   90,   91,
+     92,  109,   94,   95,  109,   65,  109,   67,  109,  109,
+     70,  109,  109,   73,   74,   75,  109,  109,  109,  109,
+     80,  109,  109,   83,   84,  109,  109,  109,  109,  109,
+     90,   91,   92,  109,   94,   95,  109,  109,  109,   65,
+    109,   67,  109,  109,   70,  109,  109,   73,   74,   75,
+    109,  109,  109,  109,   80,  109,  109,   83,   84,  109,
+    109,  109,  109,  109,   90,   91,   92,  109,   94,   95,
+    109,   65,  109,   67,  109,  109,   70,  109,  109,   73,
+     74,   75,  109,  109,  109,  109,   80,  109,  109,   83,
+     84,  109,  109,  109,  109,  109,   90,   91,   92,  109,
+     94,   95,  109,  109,  109,   65,  109,   67,  109,  109,
+     70,  109,  109,   73,   74,   75,  109,  109,  109,  109,
+     80,  109,  109,   83,   84,  109,  109,  109,  109,  109,
+     90,   91,   92,  109,   94,   95,  109,   65,  109,   67,
+    109,  109,   70,  109,  109,   73,   74,   75,  109,  109,
+    109,  109,   80,  109,  109,   83,   84,  109,  109,  109,
+    109,  109,   90,   91,   92,  109,   94,   95,  109,  109,
+    109,   65,  109,   67,  109,  109,   70,  109,  109,   73,
+     74,   75,  109,  109,  109,  109,   80,  109,  109,   83,
+     84,  109,  109,  109,  109,  109,   90,   91,   92,  109,
+     94,   95,  109,   65,  109,   67,  109,  109,   70,  109,
+    109,   73,   74,   75,  109,  109,  109,  109,   80,  109,
+    109,   83,   84,  109,  109,  109,  109,  109,   90,   91,
+     92,  109,   94,   95,  109,  109,  109,   65,  109,   67,
+    109,  109,   70,  109,  109,   73,   74,   75,  109,  109,
+    109,  109,   80,  109,  109,   83,   84,  109,  109,  109,
+    109,  109,   90,   91,   92,  109,   94,   95,  109,   65,
+    109,   67,  109,  109,   70,  109,  109,   73,   74,   75,
+    109,  109,  109,  109,   80,  109,  109,   83,   84,  109,
+    109,  109,  109,  109,   90,   91,   92,  109,   94,   95,
+    109,  109,  109,   65,  109,   67,  109,  109,   70,  109,
+    109,   73,   74,   75,  109,  109,  109,  109,   80,  109,
+    109,   83,   84,  109,  109,  109,  109,  109,   90,   91,
+     92,  109,   94,   95,  109,   65,  109,   67,  109,  109,
+     70,  109,  109,   73,   74,   75,  109,  109,  109,  109,
+     80,  109,  109,   83,   84,  109,  109,  109,  109,  109,
+     90,   91,   92,  109,   94,   95,  109,  109,  109,   65,
+    109,   67,  109,  109,   70,  109,  109,   73,   74,   75,
+    109,  109,  109,  109,   80,  109,  109,   83,   84,  109,
+    109,  109,  109,  109,   90,   91,   92,  109,   94,   95,
+    109,   65,  109,   67,  109,  109,   70,  109,  109,   73,
+     74,   75,  109,  109,  109,  109,   80,  109,  109,   83,
+     84,  109,  109,  109,  109,  109,   90,   91,   92,  109,
+     94,   95,  109,  109,  109,   65,  109,   67,  109,  109,
+     70,  109,  109,   73,   74,   75,  109,  109,  109,  109,
+     80,  109,  109,   83,   84,  109,  109,  109,  109,  109,
+     90,   91,   92,  109,   94,   95,  109,   65,  109,   67,
+    109,  109,   70,  109,  109,   73,   74,   75,  109,  109,
+    109,  109,   80,  109,  109,   83,   84,  109,  109,  109,
+    109,  109,   90,   91,   92,  109,   94,   95,  109,  109,
+    109,   65,  109,   67,  109,  109,   70,  109,  109,   73,
+     74,   75,  109,  109,  109,  109,   80,  109,  109,   83,
+     84,  109,  109,  109,  109,  109,   90,   91,   92,  109,
+     94,   95,  109,   65,  109,   67,  109,  109,   70,  109,
+    109,   73,   74,   75,  109,  109,  109,  109,   80,  109,
+    109,   83,   84,  109,  109,  109,  109,  109,   90,   91,
+     92,  109,   94,   95,  109,  109,  109,   65,  109,   67,
+    109,  109,   70,  109,  109,   73,   74,   75,  109,  109,
+    109,  109,   80,  109,  109,   83,   84,  109,  109,  109,
+    109,  109,   90,   91,   92,  109,   94,   95,  109,   65,
+    109,   67,  109,  109,   70,  109,  109,   73,   74,   75,
+    109,  109,  109,  109,   80,  109,  109,   83,   84,  109,
+    109,  109,  109,  109,   90,   91,   92,  109,   94,   95,
+    109,  109,  109,   65,  109,   67,  109,  109,   70,  109,
+    109,   73,   74,   75,  109,  109,  109,  109,   80,  109,
+    109,   83,   84,  109,  109,  109,  109,  109,   90,   91,
+     92,  109,   94,   95,  109,   65,  109,   67,  109,  109,
+     70,  109,  109,   73,   74,   75,  109,  109,  109,  109,
+     80,  109,  109,   83,   84,  109,  109,  109,  109,  109,
+     90,   91,   92,  109,   94,   95,  109,  109,  109,   65,
+    109,   67,  109,  109,   70,  109,  109,   73,   74,   75,
+    109,  109,  109,  109,   80,  109,  109,   83,   84,  109,
+    109,  109,  109,  109,   90,   91,   92,  109,   94,   95,
+    109,   65,  109,   67,  109,  109,   70,  109,  109,   73,
+     74,   75,  109,  109,  109,  109,   80,  109,  109,   83,
+     84,  109,  109,  109,  109,  109,   90,   91,   92,  109,
+     94,   95,    3,  109,  109,  109,  109,  109,    9,   10,
+     11,   12,  109,   14,  109,  109,  109,   18,   19,    9,
+    109,  109,   12,   24,  109,  109,   16,   28,   29,   30,
+    109,  109,   23,  109,   25,   25,  109,  109,  109,   72,
+     31,   31,  109,  109,  109,   36,   37,   38,   39,   82,
+    109,  109,   85,   86,   87,   88,  109,   58,   59,  109,
+    109,    3,   53,   54,   55,   56,  109,    9,   10,   11,
+     12,  109,   14,  109,  109,  109,   18,   19,  109,  109,
+    109,  109,   24,  109,   25,  109,   28,   29,   30,  109,
+     31,   72,  109,  109,  109,   36,   37,   38,   39,  109,
+    109,   82,  109,  109,   85,   86,   87,   88,  109,  109,
+    109,  109,   53,   54,   55,   56,   58,   59,  109,  109,
+      3,    4,    5,    6,  109,  109,    9,   10,   11,   12,
+      9,  109,  109,   12,  109,   18,   19,   16,   17,  109,
+    109,   24,  109,  109,  109,   28,   29,   30,   65,  109,
+     67,  109,  109,   70,  109,  109,   73,   74,  109,  109,
+    109,  109,  109,   80,   43,  109,  109,   46,  109,   48,
+    109,   50,   89,   90,   91,   92,  109,   94,   95,  109,
+      2,  109,  109,   65,  109,   67,  109,    9,   70,  109,
+     12,   73,   74,   15,   16,   17,  109,  109,   80,   21,
+    109,  109,  109,  109,  109,  109,  109,   89,   90,   91,
+     92,  109,   94,   95,   65,  109,   67,  109,  109,   70,
+     72,   43,   73,   74,   46,  109,   48,  109,   50,   80,
+     82,  109,  109,   85,   86,   87,   88,  109,  109,   90,
+     91,   92,  109,   94,   95,  109,    2,  109,  109,   65,
+    109,   67,  109,    9,   70,  109,   12,   73,   74,   15,
+     16,   17,  109,  109,   80,   21,  109,  109,  109,  109,
+    109,  109,  109,  109,   90,   91,   92,  109,   94,   95,
+     65,  109,   67,  109,  109,   70,  109,   43,   73,   74,
+     46,  109,   48,  109,   50,   80,  109,  109,  109,  109,
+    109,  109,  109,  109,  109,   90,   91,   92,  109,   94,
+     95,  109,    2,  109,  109,   65,  109,   67,  109,    9,
+     70,  109,   12,   73,   74,  109,   16,   17,  109,  109,
+     80,   21,  109,  109,  109,  109,  109,  109,  109,  109,
+     90,   91,   92,  109,   94,   95,   65,  109,   67,  109,
+    109,   70,  109,   43,   73,   74,   46,  109,   48,  109,
+     50,   80,  109,  109,  109,  109,  109,  109,  109,  109,
+    109,   90,   91,   92,  109,   94,   95,  109,    2,  109,
+    109,   65,  109,   67,    2,    9,   70,  109,   12,   73,
+     74,    9,   16,   17,   12,  109,   80,   21,   16,   17,
+    109,  109,  109,   21,  109,  109,   90,   91,   92,  109,
+     94,   95,   65,    2,   67,  109,  109,   70,  109,   43,
+     73,   74,   46,  109,   48,   43,   50,   80,   46,  109,
+     48,  109,   50,   51,  109,   20,   13,   90,   91,   92,
+    109,   94,   95,  109,  109,   34,  109,   36,   37,   38,
+     39,   36,   37,   38,   39,  109,  109,   46,  109,   36,
+     37,   38,   39,  109,   53,   54,   55,   56,   53,   54,
+     55,   56,   36,   37,   38,   39,   53,   54,   55,   56,
+     13,   35,   36,   37,   38,   39,   13,   51,  109,   53,
+     54,   55,   56,   13,  109,  109,  109,  109,  109,   53,
+     54,   55,   56,   36,   37,   38,   39,    2,  109,   36,
+     37,   38,   39,  109,   13,  109,   36,   37,   38,   39,
+     53,   54,   55,   56,  109,  109,   53,   54,   55,   56,
+    109,  109,  109,   53,   54,   55,   56,   36,   37,   38,
+     39,   36,   37,   38,   39,  109,  109,  109,  109,  109,
+    109,  109,  109,  109,   53,   54,   55,   56,   53,   54,
+     55,   56,
+);
+    const YY_SHIFT_USE_DFLT = -16;
+    const YY_SHIFT_MAX = 234;
+    public static $yy_shift_ofst = array(
+    -16,   98,   98,  148,  198,  198,  248,  148,  148,  198,
+    148,  248,   -2,   48,  298,  148,  148,  148,  298,  148,
+    148,  148,  148,  148,  148,  148,  148,  148,  148,  148,
+    348,  148,  148,  148,  148,  398,  148,  148,  148,  448,
+    498,  498,  498,  498,  498,  498,  498,  498, 1819, 1869,
+   1869,  147, 1809, 2225,  647, 2233, 2256, 2246, 2277,  415,
+   2283, 2290, 2315, 2311,  465,  465,  465,  465,  465,  465,
+    465,  465,  465,  465,  465,  465,  465,  465,  465,  465,
+    465,  465,  591,   35,  249,   93, 1868,  731, 1820,   36,
+    127,   93,   93,  249,  249,  273, 1927, 1988,  561,  349,
+    765,  775,  809,  209,  209,  303,  256,  285,  256,  356,
+    369,  387,  428,  428,  228,  372,  460,  256,    0,    0,
+      0,    0,    0,    0,    0,    0,  166,  166,   17,    0,
+    -16,  -16, 2192, 2054, 2120, 2186, 1931,  199,  626,  359,
+     86,  256,  256,  458,  256,  485,  256,  485,  256,  286,
+    286,  256,  256,  256,  256,  286,  517,  286,  286,  286,
+    499,  286,  499,  286,  256,  256,  256,  256,    0,  490,
+      0,    0,  490,    0,  497,  166,  166,  166,  -16,  -16,
+    -16,  -16,  -16,  -16, 2221,   11,  100,  -10,  240,  763,
+    141,  391,  390,  130,  423,  546,  461,  467,  -15,  479,
+    518,  534,  511,  536,   32,  559,  566,  599,  585,  588,
+    598,  606,  596,  604,  617,  625,  627,  630,  629,  610,
+    623,  631,  615,  640,  497,  642,  616,  619,  643,  613,
+    618,  650,  657,  641,  653,
+);
+    const YY_REDUCE_USE_DFLT = -96;
+    const YY_REDUCE_MAX = 183;
+    public static $yy_reduce_ofst = array(
+     91,  492,  523,  556,  587,  624,  658,  690,  724,  758,
+    792,  826,  858,  892,  924,  958,  990, 1024, 1056, 1090,
+   1122, 1156, 1188, 1222, 1254, 1288, 1320, 1354, 1386, 1420,
+   1452, 1486, 1518, 1552, 1584, 1618, 1650, 1684, 1716, 1893,
+   1928, 1959, 1994, 2025, 2060, 2091, 2126, 2157, 1777, 1829,
+   1958,    1,   -4,  116,  116,  116,  116,  116,  116,  116,
+    116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+    116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+    116,  116,  170,  251,  274,  220,  203,   39,   51,  -95,
+    284,  151,  231,  -57,  322,  320,    3,  -44,  -23,   85,
+    239,  239,  239,   72,  -23,  137,  152,  224,  331,  364,
+    318,  137,   78,  232,  239,  239,  239,  393,  408,  239,
+    239,  239,  239,  239,  239,  239,  137,  424,  239,  239,
+    470,  239,    6,    6,    6,    6,    6,   40,   56,    6,
+      6,  138,  138,  165,  138,  169,  138,  206,  138,  282,
+    282,  138,  138,  138,  138,  282,  319,  282,  282,  282,
+    324,  282,  367,  282,  138,  138,  138,  138,  383,  392,
+    383,  383,  392,  383,  440,  474,  474,  474,  514,  480,
+    500,  504,  483,  509,
+);
+    public static $yyExpectedTokens = array(
+         array(),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(2, 9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 39, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 51, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 21, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(9, 10, 11, 12, 14, 16, 18, 19, 24, 28, 29, 30, 32, 34, 37, 40, 41, 42, 43, 45, 47, 49, 50, 52, 57, 58, ),
+         array(23, 25, 31, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(25, 31, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(25, 31, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(14, 16, 47, 49, 52, ),
+         array(3, 9, 10, 11, 12, 14, 18, 19, 24, 28, 29, 30, 58, 59, ),
+         array(20, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(26, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(13, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(35, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 51, 53, 54, 55, 56, ),
+         array(13, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, 59, ),
+         array(13, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(13, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(2, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(13, 36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(36, 37, 38, 39, 53, 54, 55, 56, ),
+         array(1, 13, 17, 25, 31, 34, 46, ),
+         array(14, 16, 49, 52, ),
+         array(14, 34, 52, ),
+         array(1, 25, 31, ),
+         array(3, 9, 10, 11, 12, 14, 18, 19, 24, 28, 29, 30, 58, 59, ),
+         array(9, 12, 16, 25, 27, 31, ),
+         array(9, 12, 16, 25, 31, ),
+         array(17, 43, 50, ),
+         array(15, 17, 46, ),
+         array(1, 25, 31, ),
+         array(1, 25, 31, ),
+         array(14, 34, 52, ),
+         array(14, 34, 52, ),
+         array(1, 2, ),
+         array(3, 4, 5, 6, 9, 10, 11, 12, 18, 19, 24, 28, 29, 30, ),
+         array(2, 9, 12, 15, 16, 17, 21, 43, 46, 48, 50, ),
+         array(9, 12, 16, 48, ),
+         array(12, 14, 16, 52, ),
+         array(1, 13, 25, 31, ),
+         array(1, 13, 25, 31, ),
+         array(1, 13, 25, 31, ),
+         array(9, 12, 16, ),
+         array(9, 12, 16, ),
+         array(15, 17, 46, ),
+         array(25, 31, ),
+         array(14, 52, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(1, 17, ),
+         array(17, 46, ),
+         array(14, 16, ),
+         array(14, 16, ),
+         array(1, 51, ),
+         array(1, 2, ),
+         array(1, 27, ),
+         array(25, 31, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(1, ),
+         array(17, ),
+         array(17, ),
+         array(1, ),
+         array(1, ),
+         array(),
+         array(),
+         array(2, 9, 12, 16, 17, 21, 43, 46, 48, 50, 51, ),
+         array(2, 9, 12, 15, 16, 17, 21, 43, 46, 48, 50, ),
+         array(2, 9, 12, 16, 17, 21, 43, 46, 48, 50, ),
+         array(2, 9, 12, 16, 17, 21, 43, 46, 48, 50, ),
+         array(9, 12, 16, 17, 43, 46, 48, 50, ),
+         array(12, 14, 16, 32, 52, ),
+         array(9, 12, 16, 48, ),
+         array(9, 12, 16, ),
+         array(15, 43, 50, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(15, 21, ),
+         array(25, 31, ),
+         array(14, 52, ),
+         array(25, 31, ),
+         array(14, 52, ),
+         array(25, 31, ),
+         array(43, 50, ),
+         array(43, 50, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(43, 50, ),
+         array(12, 34, ),
+         array(43, 50, ),
+         array(43, 50, ),
+         array(43, 50, ),
+         array(43, 50, ),
+         array(43, 50, ),
+         array(43, 50, ),
+         array(43, 50, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(25, 31, ),
+         array(1, ),
+         array(2, ),
+         array(1, ),
+         array(1, ),
+         array(2, ),
+         array(1, ),
+         array(34, ),
+         array(17, ),
+         array(17, ),
+         array(17, ),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(2, 34, 36, 37, 38, 39, 46, 53, 54, 55, 56, ),
+         array(13, 20, 22, 25, 31, 33, 35, 43, ),
+         array(13, 15, 25, 31, 34, 46, ),
+         array(13, 21, 25, 31, 44, ),
+         array(13, 21, 25, 31, 44, ),
+         array(9, 12, 16, 48, ),
+         array(34, 43, 46, 51, ),
+         array(27, 34, 46, ),
+         array(21, 44, 59, ),
+         array(21, 44, 51, ),
+         array(6, 8, ),
+         array(7, 8, ),
+         array(20, 33, ),
+         array(16, 48, ),
+         array(21, 44, ),
+         array(34, 46, ),
+         array(34, 46, ),
+         array(34, 46, ),
+         array(33, 35, ),
+         array(33, 35, ),
+         array(33, 51, ),
+         array(43, 51, ),
+         array(33, 35, ),
+         array(33, 35, ),
+         array(15, 43, ),
+         array(7, ),
+         array(13, ),
+         array(13, ),
+         array(16, ),
+         array(16, ),
+         array(16, ),
+         array(16, ),
+         array(16, ),
+         array(14, ),
+         array(16, ),
+         array(43, ),
+         array(32, ),
+         array(32, ),
+         array(34, ),
+         array(16, ),
+         array(34, ),
+         array(16, ),
+         array(49, ),
+         array(49, ),
+         array(16, ),
+         array(51, ),
+         array(51, ),
+         array(16, ),
+         array(15, ),
+         array(35, ),
+         array(22, ),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+         array(),
+);
+    public static $yy_default = array(
+    343,  525,  525,  525,  510,  510,  525,  487,  487,  525,
+    487,  525,  525,  525,  525,  525,  525,  525,  525,  525,
+    525,  525,  525,  525,  525,  525,  525,  525,  525,  525,
+    525,  525,  525,  525,  525,  525,  525,  525,  525,  525,
+    525,  525,  525,  525,  525,  525,  525,  525,  383,  362,
+    383,  525,  525,  525,  388,  525,  525,  525,  356,  525,
+    525,  525,  525,  525,  367,  486,  406,  413,  485,  511,
+    513,  512,  412,  414,  411,  415,  390,  394,  395,  385,
+    388,  356,  426,  525,  525,  383,  525,  383,  383,  500,
+    442,  383,  383,  525,  525,  374,  333,  441,  452,  525,
+    397,  397,  397,  452,  452,  442,  383,  525,  383,  383,
+    377,  442,  525,  525,  397,  397,  397,  364,  379,  397,
+    404,  417,  418,  419,  405,  410,  442,  497,  417,  403,
+    341,  494,  441,  441,  441,  441,  441,  525,  454,  452,
+    468,  353,  363,  525,  366,  525,  371,  525,  372,  449,
+    450,  357,  359,  360,  361,  478,  452,  477,  480,  479,
+    445,  446,  447,  448,  373,  369,  370,  365,  375,  488,
+    378,  380,  489,  435,  452,  474,  501,  498,  341,  493,
+    493,  493,  452,  452,  426,  422,  426,  416,  416,  453,
+    426,  426,  416,  416,  339,  525,  525,  525,  416,  426,
+    436,  525,  525,  525,  525,  422,  525,  525,  422,  525,
+    525,  525,  525,  525,  525,  525,  525,  525,  525,  422,
+    424,  525,  499,  525,  468,  525,  525,  525,  525,  525,
+    431,  525,  525,  525,  391,  334,  335,  336,  337,  338,
+    340,  342,  344,  345,  346,  347,  348,  349,  350,  352,
+    381,  382,  470,  471,  472,  492,  376,  490,  491,  420,
+    429,  430,  439,  440,  451,  455,  456,  457,  398,  399,
+    400,  401,  402,  421,  423,  425,  427,  431,  432,  433,
+    407,  408,  409,  434,  437,  438,  465,  463,  502,  503,
+    504,  505,  443,  444,  476,  469,  484,  351,  475,  521,
+    522,  514,  515,  516,  519,  518,  520,  523,  524,  517,
+    507,  509,  508,  506,  481,  466,  464,  462,  459,  460,
+    461,  467,  482,  483,  428,  458,  496,  473,  468,  384,
+    368,  392,  396,
+);
+    const YYNOCODE = 110;
+    const YYSTACKDEPTH = 500;
+    const YYNSTATE = 333;
+    const YYNRULE = 192;
+    const YYERRORSYMBOL = 60;
+    const YYERRSYMDT = 'yy0';
+    const YYFALLBACK = 0;
+    public static $yyFallback = array(
+    );
+    public function Trace($TraceFILE, $zTracePrompt)
+    {
+        if (!$TraceFILE) {
+            $zTracePrompt = 0;
+        } elseif (!$zTracePrompt) {
+            $TraceFILE = 0;
+        }
+        $this->yyTraceFILE = $TraceFILE;
+        $this->yyTracePrompt = $zTracePrompt;
+    }
+
+    public function PrintTrace()
+    {
+        $this->yyTraceFILE = fopen('php://output', 'w');
+        $this->yyTracePrompt = '<br>';
+    }
+
+    public $yyTraceFILE;
+    public $yyTracePrompt;
+    public $yyidx;                    /* Index of top element in stack */
+    public $yyerrcnt;                 /* Shifts left before out of the error */
+    public $yystack = array();  /* The parser's stack */
+
+    public $yyTokenName = array(
+  '$',             'VERT',          'COLON',         'TEXT',        
+  'STRIPON',       'STRIPOFF',      'LITERALSTART',  'LITERALEND',  
+  'LITERAL',       'SIMPELOUTPUT',  'SIMPLETAG',     'SMARTYBLOCKCHILDPARENT',
+  'LDEL',          'RDEL',          'DOLLARID',      'EQUAL',       
+  'ID',            'PTR',           'LDELIF',        'LDELFOR',     
+  'SEMICOLON',     'INCDEC',        'TO',            'STEP',        
+  'LDELFOREACH',   'SPACE',         'AS',            'APTR',        
+  'LDELSETFILTER',  'CLOSETAG',      'LDELSLASH',     'ATTR',        
+  'INTEGER',       'COMMA',         'OPENP',         'CLOSEP',      
+  'MATH',          'UNIMATH',       'ISIN',          'QMARK',       
+  'NOT',           'TYPECAST',      'HEX',           'DOT',         
+  'INSTANCEOF',    'SINGLEQUOTESTRING',  'DOUBLECOLON',   'NAMESPACE',   
+  'AT',            'HATCH',         'OPENB',         'CLOSEB',      
+  'DOLLAR',        'LOGOP',         'SLOGOP',        'TLOGOP',      
+  'SINGLECOND',    'ARRAYOPEN',     'QUOTE',         'BACKTICK',    
+  'error',         'start',         'template',      'literal_e2',  
+  'literal_e1',    'smartytag',     'tagbody',       'tag',         
+  'outattr',       'eqoutattr',     'varindexed',    'output',      
+  'attributes',    'variable',      'value',         'expr',        
+  'modifierlist',  'statement',     'statements',    'foraction',   
+  'varvar',        'modparameters',  'attribute',     'nullcoalescing',
+  'ternary',       'tlop',          'lop',           'scond',       
+  'isin',          'array',         'function',      'ns1',         
+  'doublequoted_with_quotes',  'static_class_access',  'arraydef',      'object',      
+  'arrayindex',    'indexdef',      'varvarele',     'objectchain', 
+  'objectelement',  'method',        'params',        'modifier',    
+  'modparameter',  'arrayelements',  'arrayelement',  'doublequoted',
+  'doublequotedcontent',
+    );
+
+    public static $yyRuleName = array(
+  'start ::= template',
+  'template ::= template TEXT',
+  'template ::= template STRIPON',
+  'template ::= template STRIPOFF',
+  'template ::= template LITERALSTART literal_e2 LITERALEND',
+  'literal_e2 ::= literal_e1 LITERALSTART literal_e1 LITERALEND',
+  'literal_e2 ::= literal_e1',
+  'literal_e1 ::= literal_e1 LITERAL',
+  'literal_e1 ::=',
+  'template ::= template smartytag',
+  'template ::=',
+  'smartytag ::= SIMPELOUTPUT',
+  'smartytag ::= SIMPLETAG',
+  'smartytag ::= SMARTYBLOCKCHILDPARENT',
+  'smartytag ::= LDEL tagbody RDEL',
+  'smartytag ::= tag RDEL',
+  'tagbody ::= outattr',
+  'tagbody ::= DOLLARID eqoutattr',
+  'tagbody ::= varindexed eqoutattr',
+  'eqoutattr ::= EQUAL outattr',
+  'outattr ::= output attributes',
+  'output ::= variable',
+  'output ::= value',
+  'output ::= expr',
+  'tag ::= LDEL ID attributes',
+  'tag ::= LDEL ID',
+  'tag ::= LDEL ID modifierlist attributes',
+  'tag ::= LDEL ID PTR ID attributes',
+  'tag ::= LDEL ID PTR ID modifierlist attributes',
+  'tag ::= LDELIF expr',
+  'tag ::= LDELIF expr attributes',
+  'tag ::= LDELIF statement',
+  'tag ::= LDELIF statement attributes',
+  'tag ::= LDELFOR statements SEMICOLON expr SEMICOLON varindexed foraction attributes',
+  'foraction ::= EQUAL expr',
+  'foraction ::= INCDEC',
+  'tag ::= LDELFOR statement TO expr attributes',
+  'tag ::= LDELFOR statement TO expr STEP expr attributes',
+  'tag ::= LDELFOREACH SPACE expr AS varvar attributes',
+  'tag ::= LDELFOREACH SPACE expr AS varvar APTR varvar attributes',
+  'tag ::= LDELFOREACH attributes',
+  'tag ::= LDELSETFILTER ID modparameters',
+  'tag ::= LDELSETFILTER ID modparameters modifierlist',
+  'smartytag ::= CLOSETAG',
+  'tag ::= LDELSLASH ID',
+  'tag ::= LDELSLASH ID modifierlist',
+  'tag ::= LDELSLASH ID PTR ID',
+  'tag ::= LDELSLASH ID PTR ID modifierlist',
+  'attributes ::= attributes attribute',
+  'attributes ::= attribute',
+  'attributes ::=',
+  'attribute ::= SPACE ID EQUAL ID',
+  'attribute ::= ATTR expr',
+  'attribute ::= ATTR value',
+  'attribute ::= SPACE ID',
+  'attribute ::= SPACE expr',
+  'attribute ::= SPACE value',
+  'attribute ::= SPACE INTEGER EQUAL expr',
+  'statements ::= statement',
+  'statements ::= statements COMMA statement',
+  'statement ::= DOLLARID EQUAL INTEGER',
+  'statement ::= DOLLARID EQUAL expr',
+  'statement ::= varindexed EQUAL expr',
+  'statement ::= OPENP statement CLOSEP',
+  'expr ::= value',
+  'expr ::= nullcoalescing',
+  'expr ::= ternary',
+  'expr ::= INCDEC DOLLARID',
+  'expr ::= DOLLARID INCDEC',
+  'expr ::= DOLLARID COLON ID',
+  'expr ::= expr MATH value',
+  'expr ::= expr UNIMATH value',
+  'expr ::= expr tlop value',
+  'expr ::= expr lop expr',
+  'expr ::= expr scond',
+  'isin ::= ISIN',
+  'expr ::= expr isin array',
+  'expr ::= expr isin value',
+  'nullcoalescing ::= expr QMARK QMARK expr',
+  'ternary ::= expr QMARK DOLLARID COLON expr',
+  'ternary ::= expr QMARK value COLON expr',
+  'ternary ::= expr QMARK expr COLON expr',
+  'ternary ::= expr QMARK COLON expr',
+  'value ::= variable',
+  'value ::= UNIMATH value',
+  'value ::= NOT value',
+  'value ::= TYPECAST value',
+  'value ::= variable INCDEC',
+  'value ::= HEX',
+  'value ::= INTEGER',
+  'value ::= INTEGER DOT INTEGER',
+  'value ::= INTEGER DOT',
+  'value ::= DOT INTEGER',
+  'value ::= ID',
+  'value ::= function',
+  'value ::= OPENP expr CLOSEP',
+  'value ::= variable INSTANCEOF ns1',
+  'value ::= variable INSTANCEOF variable',
+  'value ::= SINGLEQUOTESTRING',
+  'value ::= doublequoted_with_quotes',
+  'value ::= varindexed DOUBLECOLON static_class_access',
+  'value ::= smartytag',
+  'value ::= value modifierlist',
+  'value ::= NAMESPACE',
+  'value ::= arraydef',
+  'value ::= ns1 DOUBLECOLON static_class_access',
+  'ns1 ::= ID',
+  'ns1 ::= NAMESPACE',
+  'variable ::= DOLLARID',
+  'variable ::= varindexed',
+  'variable ::= varvar AT ID',
+  'variable ::= object',
+  'variable ::= HATCH ID HATCH',
+  'variable ::= HATCH ID HATCH arrayindex',
+  'variable ::= HATCH variable HATCH',
+  'variable ::= HATCH variable HATCH arrayindex',
+  'varindexed ::= DOLLARID arrayindex',
+  'varindexed ::= varvar arrayindex',
+  'arrayindex ::= arrayindex indexdef',
+  'arrayindex ::=',
+  'indexdef ::= DOT DOLLARID',
+  'indexdef ::= DOT varvar',
+  'indexdef ::= DOT varvar AT ID',
+  'indexdef ::= DOT ID',
+  'indexdef ::= DOT INTEGER',
+  'indexdef ::= DOT LDEL expr RDEL',
+  'indexdef ::= OPENB ID CLOSEB',
+  'indexdef ::= OPENB ID DOT ID CLOSEB',
+  'indexdef ::= OPENB SINGLEQUOTESTRING CLOSEB',
+  'indexdef ::= OPENB INTEGER CLOSEB',
+  'indexdef ::= OPENB DOLLARID CLOSEB',
+  'indexdef ::= OPENB variable CLOSEB',
+  'indexdef ::= OPENB value CLOSEB',
+  'indexdef ::= OPENB expr CLOSEB',
+  'indexdef ::= OPENB CLOSEB',
+  'varvar ::= DOLLARID',
+  'varvar ::= DOLLAR',
+  'varvar ::= varvar varvarele',
+  'varvarele ::= ID',
+  'varvarele ::= SIMPELOUTPUT',
+  'varvarele ::= LDEL expr RDEL',
+  'object ::= varindexed objectchain',
+  'objectchain ::= objectelement',
+  'objectchain ::= objectchain objectelement',
+  'objectelement ::= PTR ID arrayindex',
+  'objectelement ::= PTR varvar arrayindex',
+  'objectelement ::= PTR LDEL expr RDEL arrayindex',
+  'objectelement ::= PTR ID LDEL expr RDEL arrayindex',
+  'objectelement ::= PTR method',
+  'function ::= ns1 OPENP params CLOSEP',
+  'method ::= ID OPENP params CLOSEP',
+  'method ::= DOLLARID OPENP params CLOSEP',
+  'params ::= params COMMA expr',
+  'params ::= expr',
+  'params ::=',
+  'modifierlist ::= modifierlist modifier modparameters',
+  'modifierlist ::= modifier modparameters',
+  'modifier ::= VERT AT ID',
+  'modifier ::= VERT ID',
+  'modparameters ::= modparameters modparameter',
+  'modparameters ::=',
+  'modparameter ::= COLON value',
+  'modparameter ::= COLON UNIMATH value',
+  'modparameter ::= COLON array',
+  'static_class_access ::= method',
+  'static_class_access ::= method objectchain',
+  'static_class_access ::= ID',
+  'static_class_access ::= DOLLARID arrayindex',
+  'static_class_access ::= DOLLARID arrayindex objectchain',
+  'lop ::= LOGOP',
+  'lop ::= SLOGOP',
+  'tlop ::= TLOGOP',
+  'scond ::= SINGLECOND',
+  'arraydef ::= OPENB arrayelements CLOSEB',
+  'arraydef ::= ARRAYOPEN arrayelements CLOSEP',
+  'arrayelements ::= arrayelement',
+  'arrayelements ::= arrayelements COMMA arrayelement',
+  'arrayelements ::=',
+  'arrayelement ::= value APTR expr',
+  'arrayelement ::= ID APTR expr',
+  'arrayelement ::= expr',
+  'doublequoted_with_quotes ::= QUOTE QUOTE',
+  'doublequoted_with_quotes ::= QUOTE doublequoted QUOTE',
+  'doublequoted ::= doublequoted doublequotedcontent',
+  'doublequoted ::= doublequotedcontent',
+  'doublequotedcontent ::= BACKTICK variable BACKTICK',
+  'doublequotedcontent ::= BACKTICK expr BACKTICK',
+  'doublequotedcontent ::= DOLLARID',
+  'doublequotedcontent ::= LDEL variable RDEL',
+  'doublequotedcontent ::= LDEL expr RDEL',
+  'doublequotedcontent ::= smartytag',
+  'doublequotedcontent ::= TEXT',
+    );
+
+    public function tokenName($tokenType)
+    {
+        if ($tokenType === 0) {
+            return 'End of Input';
+        }
+        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
+            return $this->yyTokenName[$tokenType];
+        } else {
+            return 'Unknown';
+        }
+    }
+
+    public static function yy_destructor($yymajor, $yypminor)
+    {
+        switch ($yymajor) {
+            default:  break;   /* If no destructor action specified: do nothing */
+        }
+    }
+
+    public function yy_pop_parser_stack()
+    {
+        if (empty($this->yystack)) {
+            return;
+        }
+        $yytos = array_pop($this->yystack);
+        if ($this->yyTraceFILE && $this->yyidx >= 0) {
+            fwrite($this->yyTraceFILE,
+                $this->yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
+                    "\n");
+        }
+        $yymajor = $yytos->major;
+        self::yy_destructor($yymajor, $yytos->minor);
+        $this->yyidx--;
+
+        return $yymajor;
+    }
+
+    public function __destruct()
+    {
+        while ($this->yystack !== Array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
+        }
+    }
+
+    public function yy_get_expected_tokens($token)
+    {
+        static $res3 = array();
+        static $res4 = array();
+        $state = $this->yystack[$this->yyidx]->stateno;
+        $expected = self::$yyExpectedTokens[$state];
+        if (isset($res3[$state][$token])) {
+            if ($res3[$state][$token]) {
+                return $expected;
+            }
+        } else {
+            if ($res3[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return $expected;
+            }
+        }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ === 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return array_unique($expected);
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset(self::$yyExpectedTokens[$nextstate])) {
+                        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
+                        if (isset($res4[$nextstate][$token])) {
+                            if ($res4[$nextstate][$token]) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        } else {
+                            if ($res4[$nextstate][$token] = in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
+                                $this->yyidx = $yyidx;
+                                $this->yystack = $stack;
+                                return array_unique($expected);
+                            }
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return array_unique($expected);
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return $expected;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+
+        return array_unique($expected);
+    }
+
+    public function yy_is_expected_token($token)
+    {
+        static $res = array();
+        static $res2 = array();
+        if ($token === 0) {
+            return true; // 0 is not part of this
+        }
+        $state = $this->yystack[$this->yyidx]->stateno;
+        if (isset($res[$state][$token])) {
+            if ($res[$state][$token]) {
+                return true;
+            }
+        } else {
+            if ($res[$state][$token] = in_array($token, self::$yyExpectedTokens[$state], true)) {
+                return true;
+            }
+       }
+        $stack = $this->yystack;
+        $yyidx = $this->yyidx;
+        do {
+            $yyact = $this->yy_find_shift_action($token);
+            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
+                // reduce action
+                $done = 0;
+                do {
+                    if ($done++ === 100) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // too much recursion prevents proper detection
+                        // so give up
+                        return true;
+                    }
+                    $yyruleno = $yyact - self::YYNSTATE;
+                    $this->yyidx -= self::$yyRuleInfo[$yyruleno][1];
+                    $nextstate = $this->yy_find_reduce_action(
+                        $this->yystack[$this->yyidx]->stateno,
+                        self::$yyRuleInfo[$yyruleno][0]);
+                    if (isset($res2[$nextstate][$token])) {
+                        if ($res2[$nextstate][$token]) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    } else {
+                        if ($res2[$nextstate][$token] = (isset(self::$yyExpectedTokens[$nextstate]) && in_array($token, self::$yyExpectedTokens[$nextstate], true))) {
+                            $this->yyidx = $yyidx;
+                            $this->yystack = $stack;
+                            return true;
+                        }
+                    }
+                    if ($nextstate < self::YYNSTATE) {
+                        // we need to shift a non-terminal
+                        $this->yyidx++;
+                        $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+                        $x->stateno = $nextstate;
+                        $x->major = self::$yyRuleInfo[$yyruleno][0];
+                        $this->yystack[$this->yyidx] = $x;
+                        continue 2;
+                    } elseif ($nextstate === self::YYNSTATE + self::YYNRULE + 1) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        if (!$token) {
+                            // end of input: this is valid
+                            return true;
+                        }
+                        // the last token was just ignored, we can't accept
+                        // by ignoring input, this is in essence ignoring a
+                        // syntax error!
+                        return false;
+                    } elseif ($nextstate === self::YY_NO_ACTION) {
+                        $this->yyidx = $yyidx;
+                        $this->yystack = $stack;
+                        // input accepted, but not shifted (I guess)
+                        return true;
+                    } else {
+                        $yyact = $nextstate;
+                    }
+                } while (true);
+            }
+            break;
+        } while (true);
+        $this->yyidx = $yyidx;
+        $this->yystack = $stack;
+
+        return true;
+    }
+
+   public function yy_find_shift_action($iLookAhead)
+    {
+        $stateno = $this->yystack[$this->yyidx]->stateno;
+
+        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
+        if (!isset(self::$yy_shift_ofst[$stateno])) {
+            // no shift actions
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_shift_ofst[$stateno];
+        if ($i === self::YY_SHIFT_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead === self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
+                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
+                if ($this->yyTraceFILE) {
+                    fwrite($this->yyTraceFILE, $this->yyTracePrompt . 'FALLBACK ' .
+                        $this->yyTokenName[$iLookAhead] . ' => ' .
+                        $this->yyTokenName[$iFallback] . "\n");
+                }
+
+                return $this->yy_find_shift_action($iFallback);
+            }
+
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    public function yy_find_reduce_action($stateno, $iLookAhead)
+    {
+        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
+
+        if (!isset(self::$yy_reduce_ofst[$stateno])) {
+            return self::$yy_default[$stateno];
+        }
+        $i = self::$yy_reduce_ofst[$stateno];
+        if ($i === self::YY_REDUCE_USE_DFLT) {
+            return self::$yy_default[$stateno];
+        }
+        if ($iLookAhead === self::YYNOCODE) {
+            return self::YY_NO_ACTION;
+        }
+        $i += $iLookAhead;
+        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
+              self::$yy_lookahead[$i] != $iLookAhead) {
+            return self::$yy_default[$stateno];
+        } else {
+            return self::$yy_action[$i];
+        }
+    }
+
+    public function yy_shift($yyNewState, $yyMajor, $yypMinor)
+    {
+        $this->yyidx++;
+        if ($this->yyidx >= self::YYSTACKDEPTH) {
+            $this->yyidx--;
+            if ($this->yyTraceFILE) {
+                fprintf($this->yyTraceFILE, "%sStack Overflow!\n", $this->yyTracePrompt);
+            }
+            while ($this->yyidx >= 0) {
+                $this->yy_pop_parser_stack();
+            }
+// line 232 "src/Parser/TemplateParser.y"
+
+    $this->internalError = true;
+    $this->compiler->trigger_template_error('Stack overflow in template parser');
+
+            return;
+        }
+        $yytos = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+        $yytos->stateno = $yyNewState;
+        $yytos->major = $yyMajor;
+        $yytos->minor = $yypMinor;
+        $this->yystack[] = $yytos;
+        if ($this->yyTraceFILE && $this->yyidx > 0) {
+            fprintf($this->yyTraceFILE, "%sShift %d\n", $this->yyTracePrompt,
+                $yyNewState);
+            fprintf($this->yyTraceFILE, "%sStack:", $this->yyTracePrompt);
+            for ($i = 1; $i <= $this->yyidx; $i++) {
+                fprintf($this->yyTraceFILE, " %s",
+                    $this->yyTokenName[$this->yystack[$i]->major]);
+            }
+            fwrite($this->yyTraceFILE,"\n");
+        }
+    }
+
+    public static $yyRuleInfo = array(
+  array( 0 => 61, 1 => 1 ),
+  array( 0 => 62, 1 => 2 ),
+  array( 0 => 62, 1 => 2 ),
+  array( 0 => 62, 1 => 2 ),
+  array( 0 => 62, 1 => 4 ),
+  array( 0 => 63, 1 => 4 ),
+  array( 0 => 63, 1 => 1 ),
+  array( 0 => 64, 1 => 2 ),
+  array( 0 => 64, 1 => 0 ),
+  array( 0 => 62, 1 => 2 ),
+  array( 0 => 62, 1 => 0 ),
+  array( 0 => 65, 1 => 1 ),
+  array( 0 => 65, 1 => 1 ),
+  array( 0 => 65, 1 => 1 ),
+  array( 0 => 65, 1 => 3 ),
+  array( 0 => 65, 1 => 2 ),
+  array( 0 => 66, 1 => 1 ),
+  array( 0 => 66, 1 => 2 ),
+  array( 0 => 66, 1 => 2 ),
+  array( 0 => 69, 1 => 2 ),
+  array( 0 => 68, 1 => 2 ),
+  array( 0 => 71, 1 => 1 ),
+  array( 0 => 71, 1 => 1 ),
+  array( 0 => 71, 1 => 1 ),
+  array( 0 => 67, 1 => 3 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 67, 1 => 4 ),
+  array( 0 => 67, 1 => 5 ),
+  array( 0 => 67, 1 => 6 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 67, 1 => 3 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 67, 1 => 3 ),
+  array( 0 => 67, 1 => 8 ),
+  array( 0 => 79, 1 => 2 ),
+  array( 0 => 79, 1 => 1 ),
+  array( 0 => 67, 1 => 5 ),
+  array( 0 => 67, 1 => 7 ),
+  array( 0 => 67, 1 => 6 ),
+  array( 0 => 67, 1 => 8 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 67, 1 => 3 ),
+  array( 0 => 67, 1 => 4 ),
+  array( 0 => 65, 1 => 1 ),
+  array( 0 => 67, 1 => 2 ),
+  array( 0 => 67, 1 => 3 ),
+  array( 0 => 67, 1 => 4 ),
+  array( 0 => 67, 1 => 5 ),
+  array( 0 => 72, 1 => 2 ),
+  array( 0 => 72, 1 => 1 ),
+  array( 0 => 72, 1 => 0 ),
+  array( 0 => 82, 1 => 4 ),
+  array( 0 => 82, 1 => 2 ),
+  array( 0 => 82, 1 => 2 ),
+  array( 0 => 82, 1 => 2 ),
+  array( 0 => 82, 1 => 2 ),
+  array( 0 => 82, 1 => 2 ),
+  array( 0 => 82, 1 => 4 ),
+  array( 0 => 78, 1 => 1 ),
+  array( 0 => 78, 1 => 3 ),
+  array( 0 => 77, 1 => 3 ),
+  array( 0 => 77, 1 => 3 ),
+  array( 0 => 77, 1 => 3 ),
+  array( 0 => 77, 1 => 3 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 1 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 2 ),
+  array( 0 => 88, 1 => 1 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 75, 1 => 3 ),
+  array( 0 => 83, 1 => 4 ),
+  array( 0 => 84, 1 => 5 ),
+  array( 0 => 84, 1 => 5 ),
+  array( 0 => 84, 1 => 5 ),
+  array( 0 => 84, 1 => 4 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 2 ),
+  array( 0 => 74, 1 => 2 ),
+  array( 0 => 74, 1 => 2 ),
+  array( 0 => 74, 1 => 2 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 2 ),
+  array( 0 => 74, 1 => 2 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 2 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 1 ),
+  array( 0 => 74, 1 => 3 ),
+  array( 0 => 91, 1 => 1 ),
+  array( 0 => 91, 1 => 1 ),
+  array( 0 => 73, 1 => 1 ),
+  array( 0 => 73, 1 => 1 ),
+  array( 0 => 73, 1 => 3 ),
+  array( 0 => 73, 1 => 1 ),
+  array( 0 => 73, 1 => 3 ),
+  array( 0 => 73, 1 => 4 ),
+  array( 0 => 73, 1 => 3 ),
+  array( 0 => 73, 1 => 4 ),
+  array( 0 => 70, 1 => 2 ),
+  array( 0 => 70, 1 => 2 ),
+  array( 0 => 96, 1 => 2 ),
+  array( 0 => 96, 1 => 0 ),
+  array( 0 => 97, 1 => 2 ),
+  array( 0 => 97, 1 => 2 ),
+  array( 0 => 97, 1 => 4 ),
+  array( 0 => 97, 1 => 2 ),
+  array( 0 => 97, 1 => 2 ),
+  array( 0 => 97, 1 => 4 ),
+  array( 0 => 97, 1 => 3 ),
+  array( 0 => 97, 1 => 5 ),
+  array( 0 => 97, 1 => 3 ),
+  array( 0 => 97, 1 => 3 ),
+  array( 0 => 97, 1 => 3 ),
+  array( 0 => 97, 1 => 3 ),
+  array( 0 => 97, 1 => 3 ),
+  array( 0 => 97, 1 => 3 ),
+  array( 0 => 97, 1 => 2 ),
+  array( 0 => 80, 1 => 1 ),
+  array( 0 => 80, 1 => 1 ),
+  array( 0 => 80, 1 => 2 ),
+  array( 0 => 98, 1 => 1 ),
+  array( 0 => 98, 1 => 1 ),
+  array( 0 => 98, 1 => 3 ),
+  array( 0 => 95, 1 => 2 ),
+  array( 0 => 99, 1 => 1 ),
+  array( 0 => 99, 1 => 2 ),
+  array( 0 => 100, 1 => 3 ),
+  array( 0 => 100, 1 => 3 ),
+  array( 0 => 100, 1 => 5 ),
+  array( 0 => 100, 1 => 6 ),
+  array( 0 => 100, 1 => 2 ),
+  array( 0 => 90, 1 => 4 ),
+  array( 0 => 101, 1 => 4 ),
+  array( 0 => 101, 1 => 4 ),
+  array( 0 => 102, 1 => 3 ),
+  array( 0 => 102, 1 => 1 ),
+  array( 0 => 102, 1 => 0 ),
+  array( 0 => 76, 1 => 3 ),
+  array( 0 => 76, 1 => 2 ),
+  array( 0 => 103, 1 => 3 ),
+  array( 0 => 103, 1 => 2 ),
+  array( 0 => 81, 1 => 2 ),
+  array( 0 => 81, 1 => 0 ),
+  array( 0 => 104, 1 => 2 ),
+  array( 0 => 104, 1 => 3 ),
+  array( 0 => 104, 1 => 2 ),
+  array( 0 => 93, 1 => 1 ),
+  array( 0 => 93, 1 => 2 ),
+  array( 0 => 93, 1 => 1 ),
+  array( 0 => 93, 1 => 2 ),
+  array( 0 => 93, 1 => 3 ),
+  array( 0 => 86, 1 => 1 ),
+  array( 0 => 86, 1 => 1 ),
+  array( 0 => 85, 1 => 1 ),
+  array( 0 => 87, 1 => 1 ),
+  array( 0 => 94, 1 => 3 ),
+  array( 0 => 94, 1 => 3 ),
+  array( 0 => 105, 1 => 1 ),
+  array( 0 => 105, 1 => 3 ),
+  array( 0 => 105, 1 => 0 ),
+  array( 0 => 106, 1 => 3 ),
+  array( 0 => 106, 1 => 3 ),
+  array( 0 => 106, 1 => 1 ),
+  array( 0 => 92, 1 => 2 ),
+  array( 0 => 92, 1 => 3 ),
+  array( 0 => 107, 1 => 2 ),
+  array( 0 => 107, 1 => 1 ),
+  array( 0 => 108, 1 => 3 ),
+  array( 0 => 108, 1 => 3 ),
+  array( 0 => 108, 1 => 1 ),
+  array( 0 => 108, 1 => 3 ),
+  array( 0 => 108, 1 => 3 ),
+  array( 0 => 108, 1 => 1 ),
+  array( 0 => 108, 1 => 1 ),
+    );
+
+    public static $yyReduceMap = array(
+        0 => 0,
+        1 => 1,
+        2 => 2,
+        3 => 3,
+        4 => 4,
+        5 => 5,
+        6 => 6,
+        21 => 6,
+        22 => 6,
+        23 => 6,
+        35 => 6,
+        55 => 6,
+        56 => 6,
+        64 => 6,
+        65 => 6,
+        66 => 6,
+        83 => 6,
+        88 => 6,
+        89 => 6,
+        94 => 6,
+        98 => 6,
+        99 => 6,
+        103 => 6,
+        104 => 6,
+        106 => 6,
+        111 => 6,
+        175 => 6,
+        180 => 6,
+        7 => 7,
+        8 => 8,
+        9 => 9,
+        11 => 11,
+        12 => 12,
+        13 => 13,
+        14 => 14,
+        15 => 15,
+        16 => 16,
+        17 => 17,
+        18 => 18,
+        19 => 19,
+        20 => 20,
+        24 => 24,
+        25 => 25,
+        26 => 26,
+        27 => 27,
+        28 => 28,
+        29 => 29,
+        30 => 30,
+        32 => 30,
+        31 => 31,
+        33 => 33,
+        34 => 34,
+        36 => 36,
+        37 => 37,
+        38 => 38,
+        39 => 39,
+        40 => 40,
+        41 => 41,
+        42 => 42,
+        43 => 43,
+        44 => 44,
+        45 => 45,
+        46 => 46,
+        47 => 47,
+        48 => 48,
+        49 => 49,
+        58 => 49,
+        153 => 49,
+        157 => 49,
+        161 => 49,
+        163 => 49,
+        50 => 50,
+        154 => 50,
+        160 => 50,
+        51 => 51,
+        52 => 52,
+        53 => 52,
+        54 => 54,
+        138 => 54,
+        57 => 57,
+        59 => 59,
+        60 => 60,
+        61 => 60,
+        62 => 62,
+        63 => 63,
+        67 => 67,
+        68 => 68,
+        69 => 69,
+        70 => 70,
+        71 => 70,
+        72 => 72,
+        73 => 73,
+        74 => 74,
+        75 => 75,
+        76 => 76,
+        77 => 77,
+        78 => 78,
+        79 => 79,
+        80 => 80,
+        81 => 80,
+        82 => 82,
+        84 => 84,
+        86 => 84,
+        87 => 84,
+        118 => 84,
+        85 => 85,
+        90 => 90,
+        91 => 91,
+        92 => 92,
+        93 => 93,
+        95 => 95,
+        96 => 96,
+        97 => 96,
+        100 => 100,
+        101 => 101,
+        102 => 102,
+        105 => 105,
+        107 => 107,
+        108 => 108,
+        109 => 109,
+        110 => 110,
+        112 => 112,
+        113 => 113,
+        114 => 114,
+        115 => 115,
+        116 => 116,
+        117 => 117,
+        119 => 119,
+        177 => 119,
+        120 => 120,
+        121 => 121,
+        122 => 122,
+        123 => 123,
+        124 => 124,
+        125 => 125,
+        133 => 125,
+        126 => 126,
+        127 => 127,
+        128 => 128,
+        129 => 128,
+        131 => 128,
+        132 => 128,
+        130 => 130,
+        134 => 134,
+        135 => 135,
+        136 => 136,
+        181 => 136,
+        137 => 137,
+        139 => 139,
+        140 => 140,
+        141 => 141,
+        142 => 142,
+        143 => 143,
+        144 => 144,
+        145 => 145,
+        146 => 146,
+        147 => 147,
+        148 => 148,
+        149 => 149,
+        150 => 150,
+        151 => 151,
+        152 => 152,
+        155 => 155,
+        156 => 156,
+        158 => 158,
+        159 => 159,
+        162 => 162,
+        164 => 164,
+        165 => 165,
+        166 => 166,
+        167 => 167,
+        168 => 168,
+        169 => 169,
+        170 => 170,
+        171 => 171,
+        172 => 172,
+        173 => 173,
+        174 => 173,
+        176 => 176,
+        178 => 178,
+        179 => 179,
+        182 => 182,
+        183 => 183,
+        184 => 184,
+        185 => 185,
+        188 => 185,
+        186 => 186,
+        189 => 186,
+        187 => 187,
+        190 => 190,
+        191 => 191,
+    );
+// line 245 "src/Parser/TemplateParser.y"
+    public function yy_r0(){
+    $this->root_buffer->prepend_array($this, $this->template_prefix);
+    $this->root_buffer->append_array($this, $this->template_postfix);
+    $this->_retvalue = $this->root_buffer->to_smarty_php($this);
+    }
+// line 252 "src/Parser/TemplateParser.y"
+    public function yy_r1(){
+         $text = $this->yystack[ $this->yyidx + 0 ]->minor;
+
+         if ((string)$text == '') {
+            $this->current_buffer->append_subtree($this, null);
+         }
+
+         $this->current_buffer->append_subtree($this, new \Smarty\ParseTree\Text($text, $this->strip));
+    }
+// line 262 "src/Parser/TemplateParser.y"
+    public function yy_r2(){
+    $this->strip = true;
+    }
+// line 266 "src/Parser/TemplateParser.y"
+    public function yy_r3(){
+    $this->strip = false;
+    }
+// line 271 "src/Parser/TemplateParser.y"
+    public function yy_r4(){
+       $this->current_buffer->append_subtree($this, new \Smarty\ParseTree\Text($this->yystack[$this->yyidx + -1]->minor));
+    }
+// line 276 "src/Parser/TemplateParser.y"
+    public function yy_r5(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.$this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 279 "src/Parser/TemplateParser.y"
+    public function yy_r6(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 283 "src/Parser/TemplateParser.y"
+    public function yy_r7(){
+        $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+
+    }
+// line 288 "src/Parser/TemplateParser.y"
+    public function yy_r8(){
+    $this->_retvalue = '';
+    }
+// line 292 "src/Parser/TemplateParser.y"
+    public function yy_r9(){
+     $this->current_buffer->append_subtree($this, $this->mergePrefixCode($this->yystack[$this->yyidx + 0]->minor));
+     $this->compiler->has_variable_string = false;
+     $this->block_nesting_level = $this->compiler->getTagStackCount();
+    }
+// line 302 "src/Parser/TemplateParser.y"
+    public function yy_r11(){
+    $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
+    $attributes = [];
+    if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+        $attributes[] = 'nocache';
+        $var = $match[1];
+    }
+    $this->_retvalue = $this->compiler->compilePrintExpression($this->compiler->compileVariable('\''.$var.'\''), $attributes);
+    }
+// line 313 "src/Parser/TemplateParser.y"
+    public function yy_r12(){
+    $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()));
+    if ($tag == 'strip') {
+        $this->strip = true;
+        $this->_retvalue = null;
+    } else {
+        if (defined($tag)) {
+            if ($this->security) {
+               $this->security->isTrustedConstant($tag, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compilePrintExpression($tag);
+        } else {
+            if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                $this->_retvalue = $this->compiler->compileTag($match[1],array('\'nocache\''));
+            } else {
+                $this->_retvalue = $this->compiler->compileTag($tag,array());
+            }
+        }
+    }
+    }
+// line 334 "src/Parser/TemplateParser.y"
+    public function yy_r13(){
+    $j = strrpos($this->yystack[$this->yyidx + 0]->minor,'.');
+    if ($this->yystack[$this->yyidx + 0]->minor[$j+1] == 'c') {
+        // {$smarty.block.child}
+        $this->_retvalue = $this->compiler->compileChildBlock();
+    } else {
+        // {$smarty.block.parent}
+       $this->_retvalue = $this->compiler->compileParentBlock();
+     }
+    }
+// line 345 "src/Parser/TemplateParser.y"
+    public function yy_r14(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 349 "src/Parser/TemplateParser.y"
+    public function yy_r15(){
+     $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor;
+     }
+// line 353 "src/Parser/TemplateParser.y"
+    public function yy_r16(){
+    $this->_retvalue = $this->compiler->compilePrintExpression($this->yystack[$this->yyidx + 0]->minor[0], $this->yystack[$this->yyidx + 0]->minor[1]);
+    }
+// line 362 "src/Parser/TemplateParser.y"
+    public function yy_r17(){
+    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]),array('var'=>'\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'')),$this->yystack[$this->yyidx + 0]->minor[1]));
+    }
+// line 366 "src/Parser/TemplateParser.y"
+    public function yy_r18(){
+    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + 0]->minor[0]),array('var'=>$this->yystack[$this->yyidx + -1]->minor['var'])),$this->yystack[$this->yyidx + 0]->minor[1]),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']));
+    }
+// line 370 "src/Parser/TemplateParser.y"
+    public function yy_r19(){
+       $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 374 "src/Parser/TemplateParser.y"
+    public function yy_r20(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 389 "src/Parser/TemplateParser.y"
+    public function yy_r24(){
+        if (defined($this->yystack[$this->yyidx + -1]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + -1]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compilePrintExpression($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor);
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+        }
+    }
+// line 399 "src/Parser/TemplateParser.y"
+    public function yy_r25(){
+        if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compilePrintExpression($this->yystack[$this->yyidx + 0]->minor);
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor,array());
+        }
+    }
+// line 412 "src/Parser/TemplateParser.y"
+    public function yy_r26(){
+        if (defined($this->yystack[$this->yyidx + -2]->minor)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant($this->yystack[$this->yyidx + -2]->minor, $this->compiler);
+            }
+            $this->_retvalue = $this->compiler->compilePrintExpression($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -1]->minor);
+        } else {
+            $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + 0]->minor, array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor));
+        }
+    }
+// line 424 "src/Parser/TemplateParser.y"
+    public function yy_r27(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + 0]->minor,array('object_method'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+// line 429 "src/Parser/TemplateParser.y"
+    public function yy_r28(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + 0]->minor,array('modifierlist'=>$this->yystack[$this->yyidx + -1]->minor, 'object_method'=>$this->yystack[$this->yyidx + -2]->minor));
+    }
+// line 434 "src/Parser/TemplateParser.y"
+    public function yy_r29(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->compiler->getLdelLength())); 
+    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 439 "src/Parser/TemplateParser.y"
+    public function yy_r30(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->compiler->getLdelLength()));
+    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + 0]->minor,array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));
+    }
+// line 444 "src/Parser/TemplateParser.y"
+    public function yy_r31(){
+    $tag = trim(substr($this->yystack[$this->yyidx + -1]->minor,$this->compiler->getLdelLength()));
+    $this->_retvalue = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 455 "src/Parser/TemplateParser.y"
+    public function yy_r33(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -4]->minor),array('var'=>$this->yystack[$this->yyidx + -2]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),1);
+    }
+// line 459 "src/Parser/TemplateParser.y"
+    public function yy_r34(){
+    $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 467 "src/Parser/TemplateParser.y"
+    public function yy_r36(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -3]->minor),array('to'=>$this->yystack[$this->yyidx + -1]->minor))),0);
+    }
+// line 471 "src/Parser/TemplateParser.y"
+    public function yy_r37(){
+    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('start'=>$this->yystack[$this->yyidx + -5]->minor),array('to'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -1]->minor))),0);
+    }
+// line 476 "src/Parser/TemplateParser.y"
+    public function yy_r38(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -3]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor))));
+    }
+// line 480 "src/Parser/TemplateParser.y"
+    public function yy_r39(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + 0]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -1]->minor),array('key'=>$this->yystack[$this->yyidx + -3]->minor))));
+    }
+// line 483 "src/Parser/TemplateParser.y"
+    public function yy_r40(){
+    $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 488 "src/Parser/TemplateParser.y"
+    public function yy_r41(){
+    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array($this->yystack[$this->yyidx + -1]->minor),$this->yystack[$this->yyidx + 0]->minor))));
+    }
+// line 492 "src/Parser/TemplateParser.y"
+    public function yy_r42(){
+    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array($this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor)),$this->yystack[$this->yyidx + 0]->minor)));
+    }
+// line 498 "src/Parser/TemplateParser.y"
+    public function yy_r43(){
+    $tag = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' /');
+    if ($tag === 'strip') {
+        $this->strip = false;
+        $this->_retvalue = null;
+    } else {
+       $this->_retvalue = $this->compiler->compileTag($tag.'close',array());
+    }
+     }
+// line 507 "src/Parser/TemplateParser.y"
+    public function yy_r44(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + 0]->minor.'close',array());
+    }
+// line 511 "src/Parser/TemplateParser.y"
+    public function yy_r45(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 516 "src/Parser/TemplateParser.y"
+    public function yy_r46(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 520 "src/Parser/TemplateParser.y"
+    public function yy_r47(){
+    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_method'=>$this->yystack[$this->yyidx + -1]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 528 "src/Parser/TemplateParser.y"
+    public function yy_r48(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 534 "src/Parser/TemplateParser.y"
+    public function yy_r49(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 539 "src/Parser/TemplateParser.y"
+    public function yy_r50(){
+    $this->_retvalue = array();
+    }
+// line 544 "src/Parser/TemplateParser.y"
+    public function yy_r51(){
+    if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+        if ($this->security) {
+            $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+        }
+        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
+    } else {
+        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'\''.$this->yystack[$this->yyidx + 0]->minor.'\'');
+    }
+    }
+// line 555 "src/Parser/TemplateParser.y"
+    public function yy_r52(){
+    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor," =\n\r\t")=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 563 "src/Parser/TemplateParser.y"
+    public function yy_r54(){
+    $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
+    }
+// line 575 "src/Parser/TemplateParser.y"
+    public function yy_r57(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 588 "src/Parser/TemplateParser.y"
+    public function yy_r59(){
+    $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor;
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;
+    }
+// line 593 "src/Parser/TemplateParser.y"
+    public function yy_r60(){
+    $this->_retvalue = array('var' => '\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\'', 'value'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 600 "src/Parser/TemplateParser.y"
+    public function yy_r62(){
+    $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 604 "src/Parser/TemplateParser.y"
+    public function yy_r63(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 629 "src/Parser/TemplateParser.y"
+    public function yy_r67(){
+	$this->_retvalue = '$_smarty_tpl->getVariable(\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\')->preIncDec(\'' . $this->yystack[$this->yyidx + -1]->minor . '\')';
+    }
+// line 634 "src/Parser/TemplateParser.y"
+    public function yy_r68(){
+	$this->_retvalue = '$_smarty_tpl->getVariable(\''. substr($this->yystack[$this->yyidx + -1]->minor,1) .'\')->postIncDec(\'' . $this->yystack[$this->yyidx + 0]->minor . '\')';
+    }
+// line 639 "src/Parser/TemplateParser.y"
+    public function yy_r69(){
+    $this->_retvalue = '$_smarty_tpl->getStreamVariable(\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'://' . $this->yystack[$this->yyidx + 0]->minor . '\')';
+    }
+// line 644 "src/Parser/TemplateParser.y"
+    public function yy_r70(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 654 "src/Parser/TemplateParser.y"
+    public function yy_r72(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor['pre']. $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor['op'].$this->yystack[$this->yyidx + 0]->minor .')';
+    }
+// line 658 "src/Parser/TemplateParser.y"
+    public function yy_r73(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 662 "src/Parser/TemplateParser.y"
+    public function yy_r74(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor . $this->yystack[$this->yyidx + -1]->minor . ')';
+    }
+// line 666 "src/Parser/TemplateParser.y"
+    public function yy_r75(){
+    static $isin = [
+        'isin' => 'in_array(',
+        'isnotin' => '!in_array(',
+    ];
+   $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
+   $this->_retvalue = $isin[$op];
+    }
+// line 675 "src/Parser/TemplateParser.y"
+    public function yy_r76(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor . $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';
+    }
+// line 679 "src/Parser/TemplateParser.y"
+    public function yy_r77(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor . $this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';
+    }
+// line 684 "src/Parser/TemplateParser.y"
+    public function yy_r78(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.' ?? '.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 691 "src/Parser/TemplateParser.y"
+    public function yy_r79(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -4]->minor.' ? '. $this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -2]->minor,1).'\'') . ' : '.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 695 "src/Parser/TemplateParser.y"
+    public function yy_r80(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -4]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 704 "src/Parser/TemplateParser.y"
+    public function yy_r82(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor.' ?: '.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 714 "src/Parser/TemplateParser.y"
+    public function yy_r84(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 719 "src/Parser/TemplateParser.y"
+    public function yy_r85(){
+    $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 740 "src/Parser/TemplateParser.y"
+    public function yy_r90(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 744 "src/Parser/TemplateParser.y"
+    public function yy_r91(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.';
+    }
+// line 748 "src/Parser/TemplateParser.y"
+    public function yy_r92(){
+    $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 753 "src/Parser/TemplateParser.y"
+    public function yy_r93(){
+    if (defined($this->yystack[$this->yyidx + 0]->minor)) {
+        if ($this->security) {
+             $this->security->isTrustedConstant($this->yystack[$this->yyidx + 0]->minor, $this->compiler);
+        }
+        $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+    } else {
+        $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
+    }
+    }
+// line 770 "src/Parser/TemplateParser.y"
+    public function yy_r95(){
+    $this->_retvalue = '('. $this->yystack[$this->yyidx + -1]->minor .')';
+    }
+// line 774 "src/Parser/TemplateParser.y"
+    public function yy_r96(){
+      $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 792 "src/Parser/TemplateParser.y"
+    public function yy_r100(){
+    if ($this->security && $this->security->static_classes !== array()) {
+        $this->compiler->trigger_template_error('dynamic static class not allowed by security setting');
+    }
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    if ($this->yystack[$this->yyidx + -2]->minor['var'] === '\'smarty\'') {
+        $this->compiler->appendPrefixCode("<?php {$prefixVar} = ". (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).';?>');
+     } else {
+        $this->compiler->appendPrefixCode("<?php  {$prefixVar} = ". $this->compiler->compileVariable($this->yystack[$this->yyidx + -2]->minor['var']).$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].';?>');
+    }
+    $this->_retvalue = $prefixVar .'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+    }
+// line 806 "src/Parser/TemplateParser.y"
+    public function yy_r101(){
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    $tmp = $this->compiler->appendCode('<?php ob_start();?>', (string) $this->yystack[$this->yyidx + 0]->minor);
+    $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php {$prefixVar} = ob_get_clean();?>"));
+    $this->_retvalue = $prefixVar;
+    }
+// line 813 "src/Parser/TemplateParser.y"
+    public function yy_r102(){
+    $this->_retvalue = $this->compiler->compileModifier($this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 826 "src/Parser/TemplateParser.y"
+    public function yy_r105(){
+    if (!in_array(strtolower($this->yystack[$this->yyidx + -2]->minor), array('self', 'parent')) && (!$this->security || $this->security->isTrustedStaticClassAccess($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + 0]->minor, $this->compiler))) {
+        if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) {
+            $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+        } else {
+            $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
+        } 
+    } else {
+        $this->compiler->trigger_template_error ('static class \''.$this->yystack[$this->yyidx + -2]->minor.'\' is undefined or not allowed by security setting');
+    }
+    }
+// line 845 "src/Parser/TemplateParser.y"
+    public function yy_r107(){
+    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
+        }
+// line 856 "src/Parser/TemplateParser.y"
+    public function yy_r108(){
+   $this->_retvalue = $this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'');
+    }
+// line 859 "src/Parser/TemplateParser.y"
+    public function yy_r109(){
+    if ($this->yystack[$this->yyidx + 0]->minor['var'] === '\'smarty\'') {
+        $smarty_var = (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
+        $this->_retvalue = $smarty_var;
+    } else {
+        // used for array reset,next,prev,end,current 
+        $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
+        $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+        $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']).$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
+    }
+    }
+// line 872 "src/Parser/TemplateParser.y"
+    public function yy_r110(){
+    $this->_retvalue = '$_smarty_tpl->getVariable('. $this->yystack[$this->yyidx + -2]->minor .')->'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 882 "src/Parser/TemplateParser.y"
+    public function yy_r112(){
+    $this->_retvalue = $this->compiler->compileConfigVariable('\'' . $this->yystack[$this->yyidx + -1]->minor . '\'');
+    }
+// line 886 "src/Parser/TemplateParser.y"
+    public function yy_r113(){
+    $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable('\'' . $this->yystack[$this->yyidx + -2]->minor . '\'') . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' :null)';
+    }
+// line 890 "src/Parser/TemplateParser.y"
+    public function yy_r114(){
+    $this->_retvalue = $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 894 "src/Parser/TemplateParser.y"
+    public function yy_r115(){
+    $this->_retvalue = '(is_array($tmp = ' . $this->compiler->compileConfigVariable($this->yystack[$this->yyidx + -2]->minor) . ') ? $tmp'.$this->yystack[$this->yyidx + 0]->minor.' : null)';
+    }
+// line 898 "src/Parser/TemplateParser.y"
+    public function yy_r116(){
+    $this->_retvalue = array('var'=>'\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'', 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 901 "src/Parser/TemplateParser.y"
+    public function yy_r117(){
+    $this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 914 "src/Parser/TemplateParser.y"
+    public function yy_r119(){
+    return;
+    }
+// line 920 "src/Parser/TemplateParser.y"
+    public function yy_r120(){
+    $this->_retvalue = '['.$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'').']';
+    }
+// line 923 "src/Parser/TemplateParser.y"
+    public function yy_r121(){
+    $this->_retvalue = '['.$this->compiler->compileVariable($this->yystack[$this->yyidx + 0]->minor).']';
+    }
+// line 927 "src/Parser/TemplateParser.y"
+    public function yy_r122(){
+    $this->_retvalue = '['.$this->compiler->compileVariable($this->yystack[$this->yyidx + -2]->minor).'->'.$this->yystack[$this->yyidx + 0]->minor.']';
+    }
+// line 931 "src/Parser/TemplateParser.y"
+    public function yy_r123(){
+    $this->_retvalue = '[\''. $this->yystack[$this->yyidx + 0]->minor .'\']';
+    }
+// line 935 "src/Parser/TemplateParser.y"
+    public function yy_r124(){
+    $this->_retvalue = '['. $this->yystack[$this->yyidx + 0]->minor .']';
+    }
+// line 940 "src/Parser/TemplateParser.y"
+    public function yy_r125(){
+    $this->_retvalue = '['. $this->yystack[$this->yyidx + -1]->minor .']';
+    }
+// line 945 "src/Parser/TemplateParser.y"
+    public function yy_r126(){
+    $this->_retvalue = '['.(new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';
+    }
+// line 949 "src/Parser/TemplateParser.y"
+    public function yy_r127(){
+    $this->_retvalue = '['.(new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';
+    }
+// line 952 "src/Parser/TemplateParser.y"
+    public function yy_r128(){
+    $this->_retvalue = '['.$this->yystack[$this->yyidx + -1]->minor.']';
+    }
+// line 958 "src/Parser/TemplateParser.y"
+    public function yy_r130(){
+    $this->_retvalue = '['.$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -1]->minor,1).'\'').']';
+    }
+// line 974 "src/Parser/TemplateParser.y"
+    public function yy_r134(){
+    $this->_retvalue = '[]';
+    }
+// line 984 "src/Parser/TemplateParser.y"
+    public function yy_r135(){
+    $this->_retvalue = '\''.substr($this->yystack[$this->yyidx + 0]->minor,1).'\'';
+    }
+// line 988 "src/Parser/TemplateParser.y"
+    public function yy_r136(){
+    $this->_retvalue = '\'\'';
+    }
+// line 993 "src/Parser/TemplateParser.y"
+    public function yy_r137(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1001 "src/Parser/TemplateParser.y"
+    public function yy_r139(){
+    $var = trim(substr($this->yystack[$this->yyidx + 0]->minor, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
+    $this->_retvalue = $this->compiler->compileVariable('\''.$var.'\'');
+    }
+// line 1007 "src/Parser/TemplateParser.y"
+    public function yy_r140(){
+    $this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';
+    }
+// line 1014 "src/Parser/TemplateParser.y"
+    public function yy_r141(){
+    if ($this->yystack[$this->yyidx + -1]->minor['var'] === '\'smarty\'') {
+        $this->_retvalue = (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;
+    } else {
+        $this->_retvalue = $this->compiler->compileVariable($this->yystack[$this->yyidx + -1]->minor['var']).$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor;
+    }
+    }
+// line 1023 "src/Parser/TemplateParser.y"
+    public function yy_r142(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1028 "src/Parser/TemplateParser.y"
+    public function yy_r143(){
+    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1033 "src/Parser/TemplateParser.y"
+    public function yy_r144(){
+    if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) === '_') {
+        $this->compiler->trigger_template_error (self::ERR1);
+    }
+    $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1040 "src/Parser/TemplateParser.y"
+    public function yy_r145(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $this->_retvalue = '->{'.$this->compiler->compileVariable($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+// line 1047 "src/Parser/TemplateParser.y"
+    public function yy_r146(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+// line 1054 "src/Parser/TemplateParser.y"
+    public function yy_r147(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
+    }
+// line 1062 "src/Parser/TemplateParser.y"
+    public function yy_r148(){
+    $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1070 "src/Parser/TemplateParser.y"
+    public function yy_r149(){
+    $this->_retvalue = $this->compiler->compileModifierInExpression($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 1078 "src/Parser/TemplateParser.y"
+    public function yy_r150(){
+    if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) === '_') {
+        $this->compiler->trigger_template_error (self::ERR1);
+    }
+    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . '('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
+    }
+// line 1085 "src/Parser/TemplateParser.y"
+    public function yy_r151(){
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    $this->compiler->appendPrefixCode("<?php {$prefixVar} = ".$this->compiler->compileVariable('\''.substr($this->yystack[$this->yyidx + -3]->minor,1).'\'').';?>');
+    $this->_retvalue = $prefixVar .'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
+    }
+// line 1096 "src/Parser/TemplateParser.y"
+    public function yy_r152(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 1113 "src/Parser/TemplateParser.y"
+    public function yy_r155(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)));
+    }
+// line 1117 "src/Parser/TemplateParser.y"
+    public function yy_r156(){
+    $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor));
+    }
+// line 1125 "src/Parser/TemplateParser.y"
+    public function yy_r158(){
+    $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1133 "src/Parser/TemplateParser.y"
+    public function yy_r159(){
+    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1146 "src/Parser/TemplateParser.y"
+    public function yy_r162(){
+    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1155 "src/Parser/TemplateParser.y"
+    public function yy_r164(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '', 'method');
+    }
+// line 1160 "src/Parser/TemplateParser.y"
+    public function yy_r165(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'method');
+    }
+// line 1165 "src/Parser/TemplateParser.y"
+    public function yy_r166(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor, '');
+    }
+// line 1170 "src/Parser/TemplateParser.y"
+    public function yy_r167(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor, 'property');
+    }
+// line 1175 "src/Parser/TemplateParser.y"
+    public function yy_r168(){
+    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor, $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor, 'property');
+    }
+// line 1181 "src/Parser/TemplateParser.y"
+    public function yy_r169(){
+    $this->_retvalue = ' '. trim($this->yystack[$this->yyidx + 0]->minor) . ' ';
+    }
+// line 1185 "src/Parser/TemplateParser.y"
+    public function yy_r170(){
+    static $lops = array(
+        'eq' => ' == ',
+        'ne' => ' != ',
+        'neq' => ' != ',
+        'gt' => ' > ',
+        'ge' => ' >= ',
+        'gte' => ' >= ',
+        'lt' =>  ' < ',
+        'le' =>  ' <= ',
+        'lte' => ' <= ',
+        'mod' =>  ' % ',
+        'and' => ' && ',
+        'or' => ' || ',
+        'xor' => ' xor ',
+         );
+    $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
+    $this->_retvalue = $lops[$op];
+    }
+// line 1204 "src/Parser/TemplateParser.y"
+    public function yy_r171(){
+     static $tlops = array(
+         'isdivby' => array('op' => ' % ', 'pre' => '!('),
+         'isnotdivby' => array('op' => ' % ', 'pre' => '('),
+         'isevenby' => array('op' => ' / ', 'pre' => '!(1 & '),
+         'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
+         'isoddby' => array('op' => ' / ', 'pre' => '(1 & '),
+         'isnotoddby' => array('op' => ' / ', 'pre' => '!(1 & '),
+         );
+     $op = strtolower(preg_replace('/\s*/', '', $this->yystack[$this->yyidx + 0]->minor));
+     $this->_retvalue = $tlops[$op];
+     }
+// line 1217 "src/Parser/TemplateParser.y"
+    public function yy_r172(){
+        static $scond = array (
+            'iseven' => '!(1 & ',
+            'isnoteven' => '(1 & ',
+            'isodd' => '(1 & ',
+            'isnotodd' => '!(1 & ',
+        );
+   $op = strtolower(str_replace(' ', '', $this->yystack[$this->yyidx + 0]->minor));
+   $this->_retvalue = $scond[$op];
+    }
+// line 1231 "src/Parser/TemplateParser.y"
+    public function yy_r173(){
+    $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';
+    }
+// line 1242 "src/Parser/TemplateParser.y"
+    public function yy_r176(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1250 "src/Parser/TemplateParser.y"
+    public function yy_r178(){
+    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1254 "src/Parser/TemplateParser.y"
+    public function yy_r179(){ 
+    $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;
+    }
+// line 1270 "src/Parser/TemplateParser.y"
+    public function yy_r182(){
+    $this->compiler->leaveDoubleQuote();
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php($this);
+    }
+// line 1276 "src/Parser/TemplateParser.y"
+    public function yy_r183(){
+    $this->yystack[$this->yyidx + -1]->minor->append_subtree($this, $this->yystack[$this->yyidx + 0]->minor);
+    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
+    }
+// line 1281 "src/Parser/TemplateParser.y"
+    public function yy_r184(){
+    $this->_retvalue = new Dq($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1285 "src/Parser/TemplateParser.y"
+    public function yy_r185(){
+    $this->_retvalue = new Code('(string)'.$this->yystack[$this->yyidx + -1]->minor);
+    }
+// line 1289 "src/Parser/TemplateParser.y"
+    public function yy_r186(){
+    $this->_retvalue = new Code('(string)('.$this->yystack[$this->yyidx + -1]->minor.')');
+    }
+// line 1293 "src/Parser/TemplateParser.y"
+    public function yy_r187(){
+    $this->_retvalue = new Code('(string)$_smarty_tpl->getValue(\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\')');
+    }
+// line 1305 "src/Parser/TemplateParser.y"
+    public function yy_r190(){
+    $this->_retvalue = new Tag($this, $this->yystack[$this->yyidx + 0]->minor);
+    }
+// line 1309 "src/Parser/TemplateParser.y"
+    public function yy_r191(){
+    $this->_retvalue = new DqContent($this->yystack[$this->yyidx + 0]->minor);
+    }
+
+    private $_retvalue;
+
+    public function yy_reduce($yyruleno)
+    {
+        if ($this->yyTraceFILE && $yyruleno >= 0
+              && $yyruleno < count(self::$yyRuleName)) {
+            fprintf($this->yyTraceFILE, "%sReduce (%d) [%s].\n",
+                $this->yyTracePrompt, $yyruleno,
+                self::$yyRuleName[$yyruleno]);
+        }
+
+        $this->_retvalue = $yy_lefthand_side = null;
+        if (isset(self::$yyReduceMap[$yyruleno])) {
+            // call the action
+            $this->_retvalue = null;
+            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
+            $yy_lefthand_side = $this->_retvalue;
+        }
+        $yygoto = self::$yyRuleInfo[$yyruleno][0];
+        $yysize = self::$yyRuleInfo[$yyruleno][1];
+        $this->yyidx -= $yysize;
+        for ($i = $yysize; $i; $i--) {
+            // pop all of the right-hand side parameters
+            array_pop($this->yystack);
+        }
+        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
+        if ($yyact < self::YYNSTATE) {
+            if (!$this->yyTraceFILE && $yysize) {
+                $this->yyidx++;
+                $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+                $x->stateno = $yyact;
+                $x->major = $yygoto;
+                $x->minor = $yy_lefthand_side;
+                $this->yystack[$this->yyidx] = $x;
+            } else {
+                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
+            }
+        } elseif ($yyact === self::YYNSTATE + self::YYNRULE + 1) {
+            $this->yy_accept();
+        }
+    }
+
+    public function yy_parse_failed()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sFail!\n", $this->yyTracePrompt);
+        } while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+    }
+
+    public function yy_syntax_error($yymajor, $TOKEN)
+    {
+// line 225 "src/Parser/TemplateParser.y"
+
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_template_error();
+    }
+
+    public function yy_accept()
+    {
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sAccept!\n", $this->yyTracePrompt);
+        } while ($this->yyidx >= 0) {
+            $this->yy_pop_parser_stack();
+        }
+// line 218 "src/Parser/TemplateParser.y"
+
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+    }
+
+    public function doParse($yymajor, $yytokenvalue)
+    {
+        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
+
+        if ($this->yyidx === null || $this->yyidx < 0) {
+            $this->yyidx = 0;
+            $this->yyerrcnt = -1;
+            $x = (object) ['stateno' => null, 'major' => null, 'minor' => null];
+            $x->stateno = 0;
+            $x->major = 0;
+            $this->yystack = array();
+            $this->yystack[] = $x;
+        }
+        $yyendofinput = ($yymajor==0);
+
+        if ($this->yyTraceFILE) {
+            fprintf($this->yyTraceFILE, "%sInput %s\n",
+                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+        }
+
+        do {
+            $yyact = $this->yy_find_shift_action($yymajor);
+            if ($yymajor < self::YYERRORSYMBOL &&
+                  !$this->yy_is_expected_token($yymajor)) {
+                // force a syntax error
+                $yyact = self::YY_ERROR_ACTION;
+            }
+            if ($yyact < self::YYNSTATE) {
+                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
+                $this->yyerrcnt--;
+                if ($yyendofinput && $this->yyidx >= 0) {
+                    $yymajor = 0;
+                } else {
+                    $yymajor = self::YYNOCODE;
+                }
+            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
+                $this->yy_reduce($yyact - self::YYNSTATE);
+            } elseif ($yyact === self::YY_ERROR_ACTION) {
+                if ($this->yyTraceFILE) {
+                    fprintf($this->yyTraceFILE, "%sSyntax Error!\n",
+                        $this->yyTracePrompt);
+                }
+                if (self::YYERRORSYMBOL) {
+                    if ($this->yyerrcnt < 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $yymx = $this->yystack[$this->yyidx]->major;
+                    if ($yymx === self::YYERRORSYMBOL || $yyerrorhit) {
+                        if ($this->yyTraceFILE) {
+                            fprintf($this->yyTraceFILE, "%sDiscard input token %s\n",
+                                $this->yyTracePrompt, $this->yyTokenName[$yymajor]);
+                        }
+                        $this->yy_destructor($yymajor, $yytokenvalue);
+                        $yymajor = self::YYNOCODE;
+                    } else {
+                        while ($this->yyidx >= 0 &&
+                                 $yymx !== self::YYERRORSYMBOL &&
+        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
+                              ){
+                            $this->yy_pop_parser_stack();
+                        }
+                        if ($this->yyidx < 0 || $yymajor==0) {
+                            $this->yy_destructor($yymajor, $yytokenvalue);
+                            $this->yy_parse_failed();
+                            $yymajor = self::YYNOCODE;
+                        } elseif ($yymx !== self::YYERRORSYMBOL) {
+                            $u2 = 0;
+                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
+                        }
+                    }
+                    $this->yyerrcnt = 3;
+                    $yyerrorhit = 1;
+                } else {
+                    if ($this->yyerrcnt <= 0) {
+                        $this->yy_syntax_error($yymajor, $yytokenvalue);
+                    }
+                    $this->yyerrcnt = 3;
+                    $this->yy_destructor($yymajor, $yytokenvalue);
+                    if ($yyendofinput) {
+                        $this->yy_parse_failed();
+                    }
+                    $yymajor = self::YYNOCODE;
+                }
+            } else {
+                $this->yy_accept();
+                $yymajor = self::YYNOCODE;
+            }
+        } while ($yymajor !== self::YYNOCODE && $this->yyidx >= 0);
+    }
+}
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Parser/TemplateParser.y b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Parser/TemplateParser.y
new file mode 100644
index 000000000..f1e3c35ef
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Parser/TemplateParser.y
@@ -0,0 +1,1312 @@
+/*
+ * This file is part of Smarty.
+ *
+ * (c) 2015 Uwe Tews
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+%stack_size 500
+%name TP_
+%declare_class {
+
+namespace Smarty\Parser;
+
+use \Smarty\Lexer\TemplateLexer as Lexer;
+use \Smarty\ParseTree\Template as TemplateParseTree;
+use \Smarty\Compiler\Template as TemplateCompiler;
+use \Smarty\ParseTree\Code;
+use \Smarty\ParseTree\Dq;
+use \Smarty\ParseTree\DqContent;
+use \Smarty\ParseTree\Tag;
+
+
+/**
+* Smarty Template Parser Class
+*
+* This is the template parser.
+* It is generated from the TemplateParser.y file
+* 
+* @author Uwe Tews <uwe.tews@googlemail.com>
+*/
+class TemplateParser
+}
+%include_class
+{
+    const ERR1 = 'Security error: Call to private object member not allowed';
+    const ERR2 = 'Security error: Call to dynamic object member not allowed';
+
+    /**
+     * result status
+     *
+     * @var bool
+     */
+    public $successful = true;
+
+    /**
+     * return value
+     *
+     * @var mixed
+     */
+    public $retvalue = 0;
+
+    /**
+     * @var
+     */
+    public $yymajor;
+
+    /**
+     * last index of array variable
+     *
+     * @var mixed
+     */
+    public $last_index;
+
+    /**
+     * last variable name
+     *
+     * @var string
+     */
+    public $last_variable;
+
+    /**
+     * root parse tree buffer
+     *
+     * @var TemplateParseTree
+     */
+    public $root_buffer;
+
+    /**
+     * current parse tree object
+     *
+     * @var \Smarty\ParseTree\Base
+     */
+    public $current_buffer;
+
+    /**
+     * lexer object
+     *
+     * @var Lexer
+     */
+    public $lex;
+
+    /**
+     * internal error flag
+     *
+     * @var bool
+     */
+    private $internalError = false;
+
+    /**
+     * {strip} status
+     *
+     * @var bool
+     */
+    public $strip = false;
+    /**
+     * compiler object
+     *
+     * @var TemplateCompiler
+     */
+    public $compiler = null;
+
+    /**
+     * smarty object
+     *
+     * @var \Smarty\Smarty
+     */
+    public $smarty = null;
+
+    /**
+     * template object
+     *
+     * @var \Smarty\Template
+     */
+    public $template = null;
+
+    /**
+     * block nesting level
+     *
+     * @var int
+     */
+    public $block_nesting_level = 0;
+
+    /**
+     * security object
+     *
+     * @var \Smarty\Security
+     */
+    public $security = null;
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty\ParseTree\Base[]
+     */
+    public $template_prefix = array();
+
+    /**
+     * template prefix array
+     *
+     * @var \Smarty\ParseTree\Base[]
+     */
+    public $template_postfix = array();
+
+    /**
+     * constructor
+     *
+     * @param Lexer        $lex
+     * @param TemplateCompiler $compiler
+     */
+    public function __construct(Lexer $lex, TemplateCompiler $compiler)
+    {
+        $this->lex = $lex;
+        $this->compiler = $compiler;
+        $this->template = $this->compiler->getTemplate();
+        $this->smarty = $this->template->getSmarty();
+        $this->security = $this->smarty->security_policy ?? false;
+        $this->current_buffer = $this->root_buffer = new TemplateParseTree();
+    }
+
+     /**
+     * insert PHP code in current buffer
+     *
+     * @param string $code
+     */
+    public function insertPhpCode($code)
+    {
+        $this->current_buffer->append_subtree($this, new Tag($this, $code));
+    }
+
+    /**
+     * error rundown
+     *
+     */
+    public function errorRunDown()
+    {
+        while ($this->yystack !== array()) {
+            $this->yy_pop_parser_stack();
+        }
+        if (is_resource($this->yyTraceFILE)) {
+            fclose($this->yyTraceFILE);
+        }
+    }
+
+    /**
+     *  merge PHP code with prefix code and return parse tree tag object
+     *
+     * @param string $code
+     *
+     * @return Tag
+     */
+    private function mergePrefixCode($code)
+    {
+        $tmp = '';
+        foreach ($this->compiler->prefix_code as $preCode) {
+            $tmp .= $preCode;
+        }
+        $this->compiler->prefix_code = array();
+        $tmp .= $code;
+        return new Tag($this, $this->compiler->processNocacheCode($tmp));
+    }
+
+}
+
+%token_prefix TP_
+
+%parse_accept
+{
+    $this->successful = !$this->internalError;
+    $this->internalError = false;
+    $this->retvalue = $this->_retvalue;
+}
+
+%syntax_error
+{
+    $this->internalError = true;
+    $this->yymajor = $yymajor;
+    $this->compiler->trigger_template_error();
+}
+
+%stack_overflow
+{
+    $this->internalError = true;
+    $this->compiler->trigger_template_error('Stack overflow in template parser');
+}
+
+
+%right VERT.
+%left COLON.
+
+
+    //
+    // complete template
+    //
+start(res)       ::= template. {
+    $this->root_buffer->prepend_array($this, $this->template_prefix);
+    $this->root_buffer->append_array($this, $this->template_postfix);
+    res = $this->root_buffer->to_smarty_php($this);
+}
+
+                      // template text
+template       ::= template  TEXT(B). {
+         $text = $this->yystack[ $this->yyidx + 0 ]->minor;
+
+         if ((string)$text == '') {
+            $this->current_buffer->append_subtree($this, null);
+         }
+
+         $this->current_buffer->append_subtree($this, new \Smarty\ParseTree\Text($text, $this->strip));
+}
+                      // strip on
+template       ::= template  STRIPON. {
+    $this->strip = true;
+}
+                      // strip off
+template       ::= template STRIPOFF. {
+    $this->strip = false;
+}
+
+                     // Literal
+template       ::= template LITERALSTART literal_e2(B) LITERALEND. {
+       $this->current_buffer->append_subtree($this, new \Smarty\ParseTree\Text(B));
+}
+
+
+literal_e2(A) ::= literal_e1(B) LITERALSTART literal_e1(C) LITERALEND. {
+    A = B.C;
+}
+literal_e2(A) ::= literal_e1(B). {
+    A = B;
+}
+
+literal_e1(A) ::= literal_e1(B) LITERAL(C). {
+        A = B.C;
+
+}
+
+literal_e1(A) ::= . {
+    A = '';
+}
+                      // Smarty tag
+template       ::= template smartytag(B). {
+     $this->current_buffer->append_subtree($this, $this->mergePrefixCode(B));
+     $this->compiler->has_variable_string = false;
+     $this->block_nesting_level = $this->compiler->getTagStackCount();
+}
+
+
+                      // empty template
+template       ::= .
+
+smartytag(A)   ::= SIMPELOUTPUT(B). {
+    $var = trim(substr(B, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
+    $attributes = [];
+    if (preg_match('/^(.*)(\s+nocache)$/', $var, $match)) {
+        $attributes[] = 'nocache';
+        $var = $match[1];
+    }
+    A = $this->compiler->compilePrintExpression($this->compiler->compileVariable('\''.$var.'\''), $attributes);
+}
+
+// simple tag like {name}
+smartytag(A)::= SIMPLETAG(B). {
+    $tag = trim(substr(B, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()));
+    if ($tag == 'strip') {
+        $this->strip = true;
+        A = null;
+    } else {
+        if (defined($tag)) {
+            if ($this->security) {
+               $this->security->isTrustedConstant($tag, $this->compiler);
+            }
+            A = $this->compiler->compilePrintExpression($tag);
+        } else {
+            if (preg_match('/^(.*)(\s+nocache)$/', $tag, $match)) {
+                A = $this->compiler->compileTag($match[1],array('\'nocache\''));
+            } else {
+                A = $this->compiler->compileTag($tag,array());
+            }
+        }
+    }
+}
+                  // {$smarty.block.child} or {$smarty.block.parent}
+smartytag(A)   ::= SMARTYBLOCKCHILDPARENT(i). {
+    $j = strrpos(i,'.');
+    if (i[$j+1] == 'c') {
+        // {$smarty.block.child}
+        A = $this->compiler->compileChildBlock();
+    } else {
+        // {$smarty.block.parent}
+       A = $this->compiler->compileParentBlock();
+     }
+}
+
+smartytag(A)   ::= LDEL tagbody(B) RDEL. {
+    A  = B;
+}
+
+ smartytag(A)   ::=  tag(B) RDEL. {
+     A  = B;
+ }
+                  // output with optional attributes
+tagbody(A) ::= outattr(B). {
+    A = $this->compiler->compilePrintExpression(B[0], B[1]);
+}
+
+//
+// Smarty tags start here
+//
+
+                  // assign new style
+tagbody(A) ::= DOLLARID(B) eqoutattr(C). {
+    A = $this->compiler->compileTag('assign',array_merge(array(array('value'=>C[0]),array('var'=>'\''.substr(B,1).'\'')),C[1]));
+}
+
+tagbody(A) ::= varindexed(B) eqoutattr(C). {
+    A = $this->compiler->compileTag('assign',array_merge(array(array('value'=>C[0]),array('var'=>B['var'])),C[1]),array('smarty_internal_index'=>B['smarty_internal_index']));
+}
+
+eqoutattr(A) ::= EQUAL outattr(B). {
+       A = B;
+}
+
+outattr(A) ::= output(B) attributes(C). {
+    A = array(B,C);
+}
+
+output(A) ::= variable(B). {
+    A = B;
+}
+output(A) ::= value(B). {
+    A = B;
+}
+output(A) ::= expr(B). {
+    A = B;
+}
+
+                  // tag with optional Smarty2 style attributes
+tag(res)   ::= LDEL ID(i) attributes(a). {
+        if (defined(i)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant(i, $this->compiler);
+            }
+            res = $this->compiler->compilePrintExpression(i, a);
+        } else {
+            res = $this->compiler->compileTag(i,a);
+        }
+}
+tag(res)   ::= LDEL ID(i). {
+        if (defined(i)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant(i, $this->compiler);
+            }
+            res = $this->compiler->compilePrintExpression(i);
+        } else {
+            res = $this->compiler->compileTag(i,array());
+        }
+}
+
+
+                  // tag with modifier and optional Smarty2 style attributes
+tag(res)   ::= LDEL ID(i) modifierlist(l)attributes(a). {
+        if (defined(i)) {
+            if ($this->security) {
+                $this->security->isTrustedConstant(i, $this->compiler);
+            }
+            res = $this->compiler->compilePrintExpression(i, a, l);
+        } else {
+            res = $this->compiler->compileTag(i,a, array('modifierlist'=>l));
+        }
+}
+
+                  // registered object tag
+tag(res)   ::= LDEL ID(i) PTR ID(m) attributes(a). {
+    res = $this->compiler->compileTag(i,a,array('object_method'=>m));
+}
+
+                  // registered object tag with modifiers
+tag(res)   ::= LDEL ID(i) PTR ID(me) modifierlist(l) attributes(a). {
+    res = $this->compiler->compileTag(i,a,array('modifierlist'=>l, 'object_method'=>me));
+}
+
+                  // {if}, {elseif} and {while} tag
+tag(res)   ::= LDELIF(i) expr(ie). {
+    $tag = trim(substr(i,$this->compiler->getLdelLength())); 
+    res = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>ie));
+}
+
+tag(res)   ::= LDELIF(i) expr(ie) attributes(a). {
+    $tag = trim(substr(i,$this->compiler->getLdelLength()));
+    res = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,a,array('if condition'=>ie));
+}
+
+tag(res)   ::= LDELIF(i) statement(ie). {
+    $tag = trim(substr(i,$this->compiler->getLdelLength()));
+    res = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,array(),array('if condition'=>ie));
+}
+
+tag(res)   ::= LDELIF(i) statement(ie)  attributes(a). {
+    $tag = trim(substr(i,$this->compiler->getLdelLength()));
+    res = $this->compiler->compileTag(($tag === 'else if')? 'elseif' : $tag,a,array('if condition'=>ie));
+}
+
+                  // {for} tag
+tag(res)   ::= LDELFOR statements(st) SEMICOLON expr(ie) SEMICOLON varindexed(v2) foraction(e2) attributes(a). {
+    res = $this->compiler->compileTag('for',array_merge(a,array(array('start'=>st),array('ifexp'=>ie),array('var'=>v2),array('step'=>e2))),1);
+}
+
+  foraction(res)   ::= EQUAL expr(e). {
+    res = '='.e;
+}
+
+  foraction(res)   ::= INCDEC(e). {
+    res = e;
+}
+
+tag(res)   ::= LDELFOR statement(st) TO expr(v) attributes(a). {
+    res = $this->compiler->compileTag('for',array_merge(a,array(array('start'=>st),array('to'=>v))),0);
+}
+
+tag(res)   ::= LDELFOR statement(st) TO expr(v) STEP expr(v2) attributes(a). {
+    res = $this->compiler->compileTag('for',array_merge(a,array(array('start'=>st),array('to'=>v),array('step'=>v2))),0);
+}
+
+                  // {foreach} tag
+tag(res)   ::= LDELFOREACH SPACE expr(e) AS varvar(v0) attributes(a). {
+    res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>e),array('item'=>v0))));
+}
+
+tag(res)   ::= LDELFOREACH SPACE expr(e) AS varvar(v1) APTR varvar(v0) attributes(a). {
+    res = $this->compiler->compileTag('foreach',array_merge(a,array(array('from'=>e),array('item'=>v0),array('key'=>v1))));
+}
+tag(res)   ::= LDELFOREACH attributes(a). {
+    res = $this->compiler->compileTag('foreach',a);
+}
+
+                  // {setfilter}
+tag(res)   ::= LDELSETFILTER ID(m) modparameters(p). {
+    res = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array(m),p))));
+}
+
+tag(res)   ::= LDELSETFILTER ID(m) modparameters(p) modifierlist(l). {
+    res = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array(m),p)),l)));
+}
+
+                  
+                  // end of block tag  {/....}                  
+smartytag(res)::= CLOSETAG(t). {
+    $tag = trim(substr(t, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' /');
+    if ($tag === 'strip') {
+        $this->strip = false;
+        res = null;
+    } else {
+       res = $this->compiler->compileTag($tag.'close',array());
+    }
+ }
+tag(res)   ::= LDELSLASH ID(i). {
+    res = $this->compiler->compileTag(i.'close',array());
+}
+
+tag(res)   ::= LDELSLASH ID(i) modifierlist(l). {
+    res = $this->compiler->compileTag(i.'close',array(),array('modifier_list'=>l));
+}
+
+                  // end of block object tag  {/....}                 
+tag(res)   ::= LDELSLASH ID(i) PTR ID(m). {
+    res = $this->compiler->compileTag(i.'close',array(),array('object_method'=>m));
+}
+
+tag(res)   ::= LDELSLASH ID(i) PTR ID(m) modifierlist(l). {
+    res = $this->compiler->compileTag(i.'close',array(),array('object_method'=>m, 'modifier_list'=>l));
+}
+
+//
+//Attributes of Smarty tags 
+//
+                  // list of attributes
+attributes(res)  ::= attributes(a1) attribute(a2). {
+    res = a1;
+    res[] = a2;
+}
+
+                  // single attribute
+attributes(res)  ::= attribute(a). {
+    res = array(a);
+}
+
+                  // no attributes
+attributes(res)  ::= . {
+    res = array();
+}
+                  
+                  // attribute
+attribute(res)   ::= SPACE ID(v) EQUAL ID(id). {
+    if (defined(id)) {
+        if ($this->security) {
+            $this->security->isTrustedConstant(id, $this->compiler);
+        }
+        res = array(v=>id);
+    } else {
+        res = array(v=>'\''.id.'\'');
+    }
+}
+
+attribute(res)   ::= ATTR(v) expr(e). {
+    res = array(trim(v," =\n\r\t")=>e);
+}
+
+attribute(res)   ::= ATTR(v) value(e). {
+    res = array(trim(v," =\n\r\t")=>e);
+}
+
+attribute(res)   ::= SPACE ID(v). {
+    res = '\''.v.'\'';
+}
+
+attribute(res)   ::= SPACE expr(e). {
+    res = e;
+}
+
+attribute(res)   ::= SPACE value(v). {
+    res = v;
+}
+
+attribute(res)   ::= SPACE INTEGER(i) EQUAL expr(e). {
+    res = array(i=>e);
+}
+
+                  
+
+//
+// statement
+//
+statements(res)   ::= statement(s). {
+    res = array(s);
+}
+
+statements(res)   ::= statements(s1) COMMA statement(s). {
+    s1[]=s;
+    res = s1;
+}
+
+statement(res)    ::= DOLLARID(i) EQUAL INTEGER(e). {
+    res = array('var' => '\''.substr(i,1).'\'', 'value'=>e);
+}
+statement(res)    ::= DOLLARID(i) EQUAL expr(e). {
+    res = array('var' => '\''.substr(i,1).'\'', 'value'=>e);
+}
+
+statement(res)    ::= varindexed(vi) EQUAL expr(e). {
+    res = array('var' => vi, 'value'=>e);
+}
+
+statement(res)    ::= OPENP statement(st) CLOSEP. {
+    res = st;
+}
+
+
+//
+// expressions
+//
+
+                  // single value
+expr(res)        ::= value(v). {
+    res = v;
+}
+
+                 // nullcoalescing
+expr(res)        ::= nullcoalescing(v). {
+    res = v;
+}
+
+                 // ternary
+expr(res)        ::= ternary(v). {
+    res = v;
+}
+
+		// ++$a / --$a
+expr(res)	::= INCDEC(i2) DOLLARID(i). {
+	res = '$_smarty_tpl->getVariable(\''. substr(i,1) .'\')->preIncDec(\'' . i2 . '\')';
+}
+
+		// $a++ / $a--
+expr(res)	::= DOLLARID(i) INCDEC(i2). {
+	res = '$_smarty_tpl->getVariable(\''. substr(i,1) .'\')->postIncDec(\'' . i2 . '\')';
+}
+
+                 // resources/streams
+expr(res)        ::= DOLLARID(i) COLON ID(i2). {
+    res = '$_smarty_tpl->getStreamVariable(\''.substr(i,1).'://' . i2 . '\')';
+}
+
+                  // arithmetic expression
+expr(res)        ::= expr(e) MATH(m) value(v). {
+    res = e . trim(m) . v;
+}
+
+expr(res)        ::= expr(e) UNIMATH(m) value(v). {
+    res = e . trim(m) . v;
+}
+
+// if expression
+                    // special conditions
+expr(res)        ::= expr(e1) tlop(c) value(e2). {
+    res = c['pre']. e1.c['op'].e2 .')';
+}
+                    // simple expression
+expr(res)        ::= expr(e1) lop(c) expr(e2). {
+    res = e1.c.e2;
+}
+
+expr(res)        ::= expr(e1) scond(c). {
+    res = c . e1 . ')';
+}
+
+isin(res)  ::= ISIN(o). {
+    static $isin = [
+        'isin' => 'in_array(',
+        'isnotin' => '!in_array(',
+    ];
+   $op = strtolower(str_replace(' ', '', o));
+   res = $isin[$op];
+}
+
+expr(res)        ::= expr(e1) isin(c) array(a).  {
+    res = c . e1.','.a.')';
+}
+
+expr(res)        ::= expr(e1) isin(c) value(v).  {
+    res = c . e1.',(array)'.v.')';
+}
+
+// null coalescing
+nullcoalescing(res)        ::= expr(v) QMARK QMARK expr(e2). {
+    res = v.' ?? '.e2;
+}
+
+//
+// ternary
+//
+ternary(res)        ::= expr(v) QMARK DOLLARID(e1) COLON  expr(e2). {
+    res = v.' ? '. $this->compiler->compileVariable('\''.substr(e1,1).'\'') . ' : '.e2;
+}
+
+ternary(res)        ::= expr(v) QMARK value(e1) COLON expr(e2). {
+    res = v.' ? '.e1.' : '.e2;
+}
+
+ternary(res)        ::= expr(v) QMARK expr(e1) COLON expr(e2). {
+    res = v.' ? '.e1.' : '.e2;
+}
+
+// shorthand ternary
+ternary(res)        ::= expr(v) QMARK COLON expr(e2). {
+    res = v.' ?: '.e2;
+}
+
+                 // value
+value(res)       ::= variable(v). {
+    res = v;
+}
+
+                  // +/- value
+value(res)        ::= UNIMATH(m) value(v). {
+    res = m.v;
+}
+
+                  // logical negation
+value(res)       ::= NOT value(v). {
+    res = '!'.v;
+}
+
+value(res)       ::= TYPECAST(t) value(v). {
+    res = t.v;
+}
+
+value(res)       ::= variable(v) INCDEC(o). {
+    res = v.o;
+}
+
+                 // numeric
+value(res)       ::= HEX(n). {
+    res = n;
+}
+
+value(res)       ::= INTEGER(n). {
+    res = n;
+}
+
+value(res)       ::= INTEGER(n1) DOT INTEGER(n2). {
+    res = n1.'.'.n2;
+}
+
+value(res)       ::= INTEGER(n1) DOT. {
+    res = n1.'.';
+}
+
+value(res)       ::= DOT INTEGER(n1). {
+    res = '.'.n1;
+}
+
+                 // ID, true, false, null
+value(res)       ::= ID(id). {
+    if (defined(id)) {
+        if ($this->security) {
+             $this->security->isTrustedConstant(id, $this->compiler);
+        }
+        res = id;
+    } else {
+        res = '\''.id.'\'';
+    }
+}
+
+                  // function call
+value(res)       ::= function(f). {
+    res = f;
+}
+
+                  // expression
+value(res)       ::= OPENP expr(e) CLOSEP. {
+    res = '('. e .')';
+}
+
+value(res)        ::= variable(v1) INSTANCEOF(i) ns1(v2). {
+      res = v1.i.v2;
+}
+value(res)        ::= variable(v1) INSTANCEOF(i) variable(v2). {
+      res = v1.i.v2;
+}
+
+                  // singele quoted string
+value(res)       ::= SINGLEQUOTESTRING(t). {
+    res = t;
+}
+
+                  // double quoted string
+value(res)       ::= doublequoted_with_quotes(s). {
+    res = s;
+}
+
+
+value(res)    ::= varindexed(vi) DOUBLECOLON static_class_access(r). {
+    if ($this->security && $this->security->static_classes !== array()) {
+        $this->compiler->trigger_template_error('dynamic static class not allowed by security setting');
+    }
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    if (vi['var'] === '\'smarty\'') {
+        $this->compiler->appendPrefixCode("<?php {$prefixVar} = ". (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,vi['smarty_internal_index']).';?>');
+     } else {
+        $this->compiler->appendPrefixCode("<?php  {$prefixVar} = ". $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'].';?>');
+    }
+    res = $prefixVar .'::'.r[0].r[1];
+}
+
+                  // Smarty tag
+value(res)       ::= smartytag(st). {
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    $tmp = $this->compiler->appendCode('<?php ob_start();?>', (string) st);
+    $this->compiler->appendPrefixCode($this->compiler->appendCode($tmp, "<?php {$prefixVar} = ob_get_clean();?>"));
+    res = $prefixVar;
+}
+
+value(res)       ::= value(v) modifierlist(l). {
+    res = $this->compiler->compileModifier(l, v);
+}
+                  // name space constant
+value(res)       ::= NAMESPACE(c). {
+    res = c;
+}
+
+                  // array
+value(res)       ::= arraydef(a). {
+    res = a;
+}
+                  // static class access
+value(res)       ::= ns1(c)DOUBLECOLON static_class_access(s). {
+    if (!in_array(strtolower(c), array('self', 'parent')) && (!$this->security || $this->security->isTrustedStaticClassAccess(c, s, $this->compiler))) {
+        if (isset($this->smarty->registered_classes[c])) {
+            res = $this->smarty->registered_classes[c].'::'.s[0].s[1];
+        } else {
+            res = c.'::'.s[0].s[1];
+        } 
+    } else {
+        $this->compiler->trigger_template_error ('static class \''.c.'\' is undefined or not allowed by security setting');
+    }
+}
+//
+// namespace stuff
+//
+
+ns1(res)           ::= ID(i). {
+    res = i;
+}
+
+ns1(res)           ::= NAMESPACE(i). {
+    res = i;
+    }
+
+
+
+
+//
+// variables 
+//
+                  // Smarty variable (optional array)
+variable(res)    ::= DOLLARID(i). {
+   res = $this->compiler->compileVariable('\''.substr(i,1).'\'');
+}
+variable(res)    ::= varindexed(vi). {
+    if (vi['var'] === '\'smarty\'') {
+        $smarty_var = (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,vi['smarty_internal_index']);
+        res = $smarty_var;
+    } else {
+        // used for array reset,next,prev,end,current 
+        $this->last_variable = vi['var'];
+        $this->last_index = vi['smarty_internal_index'];
+        res = $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'];
+    }
+}
+
+                  // variable with property
+variable(res)    ::= varvar(v) AT ID(p). {
+    res = '$_smarty_tpl->getVariable('. v .')->'.p;
+}
+
+                  // object
+variable(res)    ::= object(o). {
+    res = o;
+}
+
+                  // config variable
+variable(res)    ::= HATCH ID(i) HATCH. {
+    res = $this->compiler->compileConfigVariable('\'' . i . '\'');
+}
+
+variable(res)    ::= HATCH ID(i) HATCH arrayindex(a). {
+    res = '(is_array($tmp = ' . $this->compiler->compileConfigVariable('\'' . i . '\'') . ') ? $tmp'.a.' :null)';
+}
+
+variable(res)    ::= HATCH variable(v) HATCH. {
+    res = $this->compiler->compileConfigVariable(v);
+}
+
+variable(res)    ::= HATCH variable(v) HATCH arrayindex(a). {
+    res = '(is_array($tmp = ' . $this->compiler->compileConfigVariable(v) . ') ? $tmp'.a.' : null)';
+}
+
+varindexed(res)  ::= DOLLARID(i) arrayindex(a). {
+    res = array('var'=>'\''.substr(i,1).'\'', 'smarty_internal_index'=>a);
+}
+varindexed(res)  ::= varvar(v) arrayindex(a). {
+    res = array('var'=>v, 'smarty_internal_index'=>a);
+}
+
+//
+// array index
+//
+                    // multiple array index
+arrayindex(res)  ::= arrayindex(a1) indexdef(a2). {
+    res = a1.a2;
+}
+
+                    // no array index
+arrayindex        ::= . {
+    return;
+}
+
+// single index definition
+                    // Smarty2 style index 
+indexdef(res)    ::= DOT DOLLARID(i).  {
+    res = '['.$this->compiler->compileVariable('\''.substr(i,1).'\'').']';
+}
+indexdef(res)    ::= DOT varvar(v).  {
+    res = '['.$this->compiler->compileVariable(v).']';
+}
+
+indexdef(res)    ::= DOT varvar(v) AT ID(p). {
+    res = '['.$this->compiler->compileVariable(v).'->'.p.']';
+}
+
+indexdef(res)   ::= DOT ID(i). {
+    res = '[\''. i .'\']';
+}
+
+indexdef(res)   ::= DOT INTEGER(n). {
+    res = '['. n .']';
+}
+
+
+indexdef(res)   ::= DOT LDEL expr(e) RDEL. {
+    res = '['. e .']';
+}
+
+                    // section tag index
+indexdef(res)   ::= OPENB ID(i)CLOSEB. {
+    res = '['.(new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,'[\'section\'][\''.i.'\'][\'index\']').']';
+}
+
+indexdef(res)   ::= OPENB ID(i) DOT ID(i2) CLOSEB. {
+    res = '['.(new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,'[\'section\'][\''.i.'\'][\''.i2.'\']').']';
+}
+indexdef(res)   ::= OPENB SINGLEQUOTESTRING(s) CLOSEB. {
+    res = '['.s.']';
+}
+indexdef(res)   ::= OPENB INTEGER(n) CLOSEB. {
+    res = '['.n.']';
+}
+indexdef(res)   ::= OPENB DOLLARID(i) CLOSEB. {
+    res = '['.$this->compiler->compileVariable('\''.substr(i,1).'\'').']';
+}
+indexdef(res)   ::= OPENB variable(v) CLOSEB. {
+    res = '['.v.']';
+}
+indexdef(res)   ::= OPENB value(v) CLOSEB. {
+    res = '['.v.']';
+}
+
+                    // PHP style index
+indexdef(res)   ::= OPENB expr(e) CLOSEB. {
+    res = '['. e .']';
+}
+
+                    // for assign append array
+indexdef(res)  ::= OPENB CLOSEB. {
+    res = '[]';
+}
+
+
+//
+// variable variable names
+//
+
+                    // singel identifier element
+varvar(res)      ::= DOLLARID(i). {
+    res = '\''.substr(i,1).'\'';
+}
+                    // single $
+varvar(res)      ::= DOLLAR. {
+    res = '\'\'';
+}
+
+                    // sequence of identifier elements
+varvar(res)      ::= varvar(v1) varvarele(v2). {
+    res = v1.'.'.v2;
+}
+
+                    // fix sections of element
+varvarele(res)   ::= ID(s). {
+    res = '\''.s.'\'';
+}
+varvarele(res)   ::= SIMPELOUTPUT(i). {
+    $var = trim(substr(i, $this->compiler->getLdelLength(), -$this->compiler->getRdelLength()), ' $');
+    res = $this->compiler->compileVariable('\''.$var.'\'');
+}
+
+                    // variable sections of element
+varvarele(res)   ::= LDEL expr(e) RDEL. {
+    res = '('.e.')';
+}
+
+//
+// objects
+//
+object(res)    ::= varindexed(vi) objectchain(oc). {
+    if (vi['var'] === '\'smarty\'') {
+        res = (new \Smarty\Compile\SpecialVariableCompiler())->compile(array(),$this->compiler,vi['smarty_internal_index']).oc;
+    } else {
+        res = $this->compiler->compileVariable(vi['var']).vi['smarty_internal_index'].oc;
+    }
+}
+
+                    // single element
+objectchain(res) ::= objectelement(oe). {
+    res  = oe;
+}
+
+                    // chain of elements 
+objectchain(res) ::= objectchain(oc) objectelement(oe). {
+    res  = oc.oe;
+}
+
+                    // variable
+objectelement(res)::= PTR ID(i) arrayindex(a). {
+    if ($this->security && substr(i,0,1) === '_') {
+        $this->compiler->trigger_template_error (self::ERR1);
+    }
+    res = '->'.i.a;
+}
+
+objectelement(res)::= PTR varvar(v) arrayindex(a). {
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    res = '->{'.$this->compiler->compileVariable(v).a.'}';
+}
+
+objectelement(res)::= PTR LDEL expr(e) RDEL arrayindex(a). {
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    res = '->{'.e.a.'}';
+}
+
+objectelement(res)::= PTR ID(ii) LDEL expr(e) RDEL arrayindex(a). {
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    res = '->{\''.ii.'\'.'.e.a.'}';
+}
+
+                    // method
+objectelement(res)::= PTR method(f).  {
+    res = '->'.f;
+}
+
+
+//
+// function
+//
+function(res)     ::= ns1(f) OPENP params(p) CLOSEP. {
+    res = $this->compiler->compileModifierInExpression(f, p);
+}
+
+
+//
+// method
+//
+method(res)     ::= ID(f) OPENP params(p) CLOSEP. {
+    if ($this->security && substr(f,0,1) === '_') {
+        $this->compiler->trigger_template_error (self::ERR1);
+    }
+    res = f . '('. implode(',',p) .')';
+}
+
+method(res)     ::= DOLLARID(f) OPENP params(p) CLOSEP.  {
+    if ($this->security) {
+        $this->compiler->trigger_template_error (self::ERR2);
+    }
+    $prefixVar = $this->compiler->getNewPrefixVariable();
+    $this->compiler->appendPrefixCode("<?php {$prefixVar} = ".$this->compiler->compileVariable('\''.substr(f,1).'\'').';?>');
+    res = $prefixVar .'('. implode(',',p) .')';
+}
+
+// function/method parameter
+                    // multiple parameters
+params(res)       ::= params(p) COMMA expr(e). {
+    res = array_merge(p,array(e));
+}
+
+                    // single parameter
+params(res)       ::= expr(e). {
+    res = array(e);
+}
+
+                    // no parameter
+params(res)       ::= . {
+    res = array();
+}
+
+//
+// modifier
+// 
+modifierlist(res) ::= modifierlist(l) modifier(m) modparameters(p). {
+    res = array_merge(l,array(array_merge(m,p)));
+}
+
+modifierlist(res) ::= modifier(m) modparameters(p). {
+    res = array(array_merge(m,p));
+}
+ 
+modifier(res)    ::= VERT AT ID(m). {
+    res = array(m);
+}
+
+modifier(res)    ::= VERT ID(m). {
+    res =  array(m);
+}
+
+//
+// modifier parameter
+//
+                    // multiple parameter
+modparameters(res) ::= modparameters(mps) modparameter(mp). {
+    res = array_merge(mps,mp);
+}
+
+                    // no parameter
+modparameters(res)      ::= . {
+    res = array();
+}
+
+                    // parameter expression
+modparameter(res) ::= COLON value(mp). {
+    res = array(mp);
+}
+modparameter(res) ::= COLON UNIMATH(m) value(mp). {
+    res = array(trim(m).mp);
+}
+
+modparameter(res) ::= COLON array(mp). {
+    res = array(mp);
+}
+
+                  // static class methode call
+static_class_access(res)       ::= method(m). {
+    res = array(m, '', 'method');
+}
+
+                  // static class methode call with object chainig
+static_class_access(res)       ::= method(m) objectchain(oc). {
+    res = array(m, oc, 'method');
+}
+
+                  // static class constant
+static_class_access(res)       ::= ID(v). {
+    res = array(v, '');
+}
+
+                  // static class variables
+static_class_access(res)       ::=  DOLLARID(v) arrayindex(a). {
+    res = array(v, a, 'property');
+}
+
+                  // static class variables with object chain
+static_class_access(res)       ::= DOLLARID(v) arrayindex(a) objectchain(oc). {
+    res = array(v, a.oc, 'property');
+}
+
+
+// if conditions and operators
+lop(res)        ::= LOGOP(o). {
+    res = ' '. trim(o) . ' ';
+}
+
+lop(res)        ::= SLOGOP(o). {
+    static $lops = array(
+        'eq' => ' == ',
+        'ne' => ' != ',
+        'neq' => ' != ',
+        'gt' => ' > ',
+        'ge' => ' >= ',
+        'gte' => ' >= ',
+        'lt' =>  ' < ',
+        'le' =>  ' <= ',
+        'lte' => ' <= ',
+        'mod' =>  ' % ',
+        'and' => ' && ',
+        'or' => ' || ',
+        'xor' => ' xor ',
+         );
+    $op = strtolower(preg_replace('/\s*/', '', o));
+    res = $lops[$op];
+}
+tlop(res)        ::= TLOGOP(o). {
+     static $tlops = array(
+         'isdivby' => array('op' => ' % ', 'pre' => '!('),
+         'isnotdivby' => array('op' => ' % ', 'pre' => '('),
+         'isevenby' => array('op' => ' / ', 'pre' => '!(1 & '),
+         'isnotevenby' => array('op' => ' / ', 'pre' => '(1 & '),
+         'isoddby' => array('op' => ' / ', 'pre' => '(1 & '),
+         'isnotoddby' => array('op' => ' / ', 'pre' => '!(1 & '),
+         );
+     $op = strtolower(preg_replace('/\s*/', '', o));
+     res = $tlops[$op];
+ }
+
+scond(res)  ::= SINGLECOND(o). {
+        static $scond = array (
+            'iseven' => '!(1 & ',
+            'isnoteven' => '(1 & ',
+            'isodd' => '(1 & ',
+            'isnotodd' => '!(1 & ',
+        );
+   $op = strtolower(str_replace(' ', '', o));
+   res = $scond[$op];
+}
+
+//
+// ARRAY element assignment
+//
+arraydef(res)           ::=  OPENB arrayelements(a) CLOSEB.  {
+    res = 'array('.a.')';
+}
+arraydef(res)           ::=  ARRAYOPEN arrayelements(a) CLOSEP.  {
+    res = 'array('.a.')';
+}
+
+arrayelements(res)   ::=  arrayelement(a).  {
+    res = a;
+}
+
+arrayelements(res)   ::=  arrayelements(a1) COMMA arrayelement(a).  {
+    res = a1.','.a;
+}
+
+arrayelements        ::=  .  {
+    return;
+}
+
+arrayelement(res)    ::=  value(e1) APTR expr(e2). {
+    res = e1.'=>'.e2;
+}
+
+arrayelement(res)    ::=  ID(i) APTR expr(e2). { 
+    res = '\''.i.'\'=>'.e2;
+}
+
+arrayelement(res)    ::=  expr(e). {
+    res = e;
+}
+
+
+//
+// double quoted strings
+//
+doublequoted_with_quotes(res) ::= QUOTE QUOTE. {
+    res = '\'\'';
+}
+
+doublequoted_with_quotes(res) ::= QUOTE doublequoted(s) QUOTE. {
+    $this->compiler->leaveDoubleQuote();
+    res = s->to_smarty_php($this);
+}
+
+
+doublequoted(res)          ::= doublequoted(o1) doublequotedcontent(o2). {
+    o1->append_subtree($this, o2);
+    res = o1;
+}
+
+doublequoted(res)          ::= doublequotedcontent(o). {
+    res = new Dq($this, o);
+}
+
+doublequotedcontent(res)           ::=  BACKTICK variable(v) BACKTICK. {
+    res = new Code('(string)'.v);
+}
+
+doublequotedcontent(res)           ::=  BACKTICK expr(e) BACKTICK. {
+    res = new Code('(string)('.e.')');
+}
+
+doublequotedcontent(res)           ::=  DOLLARID(i). {
+    res = new Code('(string)$_smarty_tpl->getValue(\''. substr(i,1) .'\')');
+}
+
+doublequotedcontent(res)           ::=  LDEL variable(v) RDEL. {
+    res = new Code('(string)'.v);
+}
+
+doublequotedcontent(res)           ::=  LDEL expr(e) RDEL. {
+    res = new Code('(string)('.e.')');
+}
+
+doublequotedcontent(res)     ::=  smartytag(st). {
+    res = new Tag($this, st);
+}
+
+doublequotedcontent(res)           ::=  TEXT(o). {
+    res = new DqContent(o);
+}
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/BasePlugin.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/BasePlugin.php
new file mode 100644
index 000000000..56f7dfa05
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/BasePlugin.php
@@ -0,0 +1,145 @@
+<?php
+
+namespace Smarty\Resource;
+
+use Smarty\Exception;
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Source;
+
+/**
+ * Smarty Resource Plugin
+ * Base implementation for resource plugins
+ * @author     Rodney Rehm
+ */
+abstract class BasePlugin
+{
+    /**
+     * resource types provided by the core
+     *
+     * @var array
+     */
+    public static $sysplugins = [
+        'file'    => FilePlugin::class,
+        'string'  => StringPlugin::class,
+        'extends' => ExtendsPlugin::class,
+        'stream'  => StreamPlugin::class,
+        'eval'    => StringEval::class,
+    ];
+
+    /**
+     * Source must be recompiled on every occasion
+     *
+     * @var boolean
+     */
+    public $recompiled = false;
+
+    /**
+     * Flag if resource does allow compilation
+     *
+     * @return bool
+     */
+    public function supportsCompiledTemplates(): bool {
+		return true;
+    }
+
+	/**
+	 * Check if resource must check time stamps when loading compiled or cached templates.
+	 * Resources like 'extends' which use source components my disable timestamp checks on own resource.
+	 * @return bool
+	 */
+	public function checkTimestamps()
+	{
+		return true;
+	}
+
+	/**
+	 * Load Resource Handler
+	 *
+	 * @param Smarty $smarty smarty object
+	 * @param string $type name of the resource
+	 *
+	 * @return BasePlugin Resource Handler
+	 * @throws Exception
+	 */
+    public static function load(Smarty $smarty, $type)
+    {
+        // try smarty's cache
+        if (isset($smarty->_resource_handlers[ $type ])) {
+            return $smarty->_resource_handlers[ $type ];
+        }
+        // try registered resource
+        if (isset($smarty->registered_resources[ $type ])) {
+            return $smarty->_resource_handlers[ $type ] = $smarty->registered_resources[ $type ];
+        }
+        // try sysplugins dir
+        if (isset(self::$sysplugins[ $type ])) {
+            $_resource_class = self::$sysplugins[ $type ];
+            return $smarty->_resource_handlers[ $type ] = new $_resource_class();
+        }
+        // try plugins dir
+        $_resource_class = 'Smarty_Resource_' . \smarty_ucfirst_ascii($type);
+        if (class_exists($_resource_class, false)) {
+            return $smarty->_resource_handlers[ $type ] = new $_resource_class();
+        }
+        // try streams
+        $_known_stream = stream_get_wrappers();
+        if (in_array($type, $_known_stream)) {
+            // is known stream
+            if (is_object($smarty->security_policy)) {
+                $smarty->security_policy->isTrustedStream($type);
+            }
+            return $smarty->_resource_handlers[ $type ] = new StreamPlugin();
+        }
+        // TODO: try default_(template|config)_handler
+        // give up
+        throw new \Smarty\Exception("Unknown resource type '{$type}'");
+    }
+
+    /**
+     * Load template's source into current template object
+     *
+     * @param Source $source source object
+     *
+     * @return string                 template source
+     * @throws \Smarty\Exception        if source cannot be loaded
+     */
+    abstract public function getContent(Source $source);
+
+	/**
+	 * populate Source Object with metadata from Resource
+	 *
+	 * @param Source $source source object
+	 * @param Template|null $_template template object
+	 */
+    abstract public function populate(Source $source, \Smarty\Template $_template = null);
+
+    /**
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Source $source source object
+     */
+    public function populateTimestamp(Source $source)
+    {
+        // intentionally left blank
+    }
+
+	/*
+ * Check if resource must check time stamps when when loading complied or cached templates.
+ * Resources like 'extends' which use source components my disable timestamp checks on own resource.
+ *
+ * @return bool
+ */
+	/**
+	 * Determine basename for compiled filename
+	 *
+	 * @param \Smarty\Template\Source $source source object
+	 *
+	 * @return string                 resource's basename
+	 */
+	public function getBasename(\Smarty\Template\Source $source)
+	{
+		return basename(preg_replace('![^\w]+!', '_', $source->name));
+	}
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/CustomPlugin.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/CustomPlugin.php
new file mode 100644
index 000000000..b50ef7aaf
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/CustomPlugin.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+
+
+ * @author     Rodney Rehm
+ */
+
+namespace Smarty\Resource;
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Source;
+use Smarty\Exception;
+
+/**
+ * Smarty Resource Plugin
+ * Wrapper Implementation for custom resource plugins
+ *
+
+
+ */
+abstract class CustomPlugin extends BasePlugin {
+
+	/**
+	 * fetch template and its modification time from data source
+	 *
+	 * @param string $name template name
+	 * @param string  &$source template source
+	 * @param integer &$mtime template modification timestamp (epoch)
+	 */
+	abstract protected function fetch($name, &$source, &$mtime);
+
+	/**
+	 * Fetch template's modification timestamp from data source
+	 * {@internal implementing this method is optional.
+	 *  Only implement it if modification times can be accessed faster than loading the complete template source.}}
+	 *
+	 * @param string $name template name
+	 *
+	 * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
+	 */
+	protected function fetchTimestamp($name) {
+		return null;
+	}
+
+	/**
+	 * populate Source Object with metadata from Resource
+	 *
+	 * @param Source $source source object
+	 * @param Template|null $_template template object
+	 */
+	public function populate(Source $source, Template $_template = null) {
+		$source->uid = sha1($source->type . ':' . $source->name);
+		$mtime = $this->fetchTimestamp($source->name);
+		if ($mtime !== null) {
+			$source->timestamp = $mtime;
+		} else {
+			$this->fetch($source->name, $content, $timestamp);
+			$source->timestamp = $timestamp ?? false;
+			if (isset($content)) {
+				$source->content = $content;
+			}
+		}
+		$source->exists = !!$source->timestamp;
+	}
+
+	/**
+	 * Load template's source into current template object
+	 *
+	 * @param Source $source source object
+	 *
+	 * @return string                 template source
+	 * @throws Exception        if source cannot be loaded
+	 */
+	public function getContent(Source $source) {
+		$this->fetch($source->name, $content, $timestamp);
+		if (isset($content)) {
+			return $content;
+		}
+		throw new Exception("Unable to read template {$source->type} '{$source->name}'");
+	}
+
+	/**
+	 * Determine basename for compiled filename
+	 *
+	 * @param Source $source source object
+	 *
+	 * @return string                 resource's basename
+	 */
+	public function getBasename(Source $source) {
+		return basename($this->generateSafeName($source->name));
+	}
+
+	/**
+	 * Removes special characters from $name and limits its length to 127 characters.
+	 *
+	 * @param $name
+	 *
+	 * @return string
+	 */
+	private function generateSafeName($name): string {
+		return substr(preg_replace('/[^A-Za-z0-9._]/', '', (string)$name), 0, 127);
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/ExtendsPlugin.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/ExtendsPlugin.php
new file mode 100644
index 000000000..acce54e2a
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/ExtendsPlugin.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace Smarty\Resource;
+
+use Smarty\Exception;
+use Smarty\Template;
+use Smarty\Template\Source;
+
+/**
+ * Smarty Internal Plugin Resource Extends
+ * Implements the file system as resource for Smarty which {extend}s a chain of template files templates
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+class ExtendsPlugin extends BasePlugin
+{
+
+    /**
+     * populate Source Object with metadata from Resource
+     *
+     * @param Source $source source object
+     * @param Template|null $_template template object
+     *
+     * @throws Exception
+     */
+    public function populate(Source $source, Template $_template = null)
+    {
+        $uid = '';
+        $sources = array();
+        $components = explode('|', $source->name);
+        $smarty = $source->getSmarty();
+        $exists = true;
+        foreach ($components as $component) {
+            $_s = Source::load(null, $smarty, $component);
+            $sources[ $_s->uid ] = $_s;
+            $uid .= $_s->uid;
+            if ($_template) {
+                $exists = $exists && $_s->exists;
+            }
+        }
+        $source->components = $sources;
+        $source->uid = sha1($uid . $source->getSmarty()->_joined_template_dir);
+        $source->exists = $exists;
+        if ($_template) {
+            $source->timestamp = $_s->timestamp;
+        }
+    }
+
+    /**
+     * populate Source Object with timestamp and exists from Resource
+     *
+     * @param Source $source source object
+     */
+    public function populateTimestamp(Source $source)
+    {
+        $source->exists = true;
+        /* @var Source $_s */
+        foreach ($source->components as $_s) {
+            $source->exists = $source->exists && $_s->exists;
+        }
+        $source->timestamp = $source->exists ? $_s->getTimeStamp() : false;
+    }
+
+    /**
+     * Load template's source from files into current template object
+     *
+     * @param Source $source source object
+     *
+     * @return string template source
+     * @throws \Smarty\Exception if source cannot be loaded
+     */
+    public function getContent(Source $source)
+    {
+        if (!$source->exists) {
+            throw new \Smarty\Exception("Unable to load  '{$source->type}:{$source->name}'");
+        }
+        $_components = array_reverse($source->components);
+        $_content = '';
+        /* @var Source $_s */
+        foreach ($_components as $_s) {
+            // read content
+            $_content .= $_s->getContent();
+        }
+        return $_content;
+    }
+
+    /**
+     * Determine basename for compiled filename
+     *
+     * @param Source $source source object
+     *
+     * @return string resource's basename
+     */
+    public function getBasename(Source $source)
+    {
+        return str_replace(':', '.', basename($source->getResourceName()));
+    }
+
+    /*
+      * Disable timestamp checks for extends resource.
+      * The individual source components will be checked.
+      *
+      * @return bool
+      */
+    /**
+     * @return bool
+     */
+    public function checkTimestamps()
+    {
+        return false;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/FilePlugin.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/FilePlugin.php
new file mode 100644
index 000000000..7fd8667d3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/FilePlugin.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource File
+ *
+
+
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+
+namespace Smarty\Resource;
+
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Source;
+use Smarty\Exception;
+
+/**
+ * Smarty Internal Plugin Resource File
+ * Implements the file system as resource for Smarty templates
+ *
+
+
+ */
+class FilePlugin extends BasePlugin {
+
+	/**
+	 * populate Source Object with metadata from Resource
+	 *
+	 * @param Source $source source object
+	 * @param Template|null $_template template object
+	 *
+	 * @throws Exception
+	 */
+	public function populate(Source $source, Template $_template = null) {
+
+		$source->uid = sha1(
+			$source->name . ($source->isConfig ? $source->getSmarty()->_joined_config_dir :
+				$source->getSmarty()->_joined_template_dir)
+		);
+
+		if ($path = $this->getFilePath($source->name, $source->getSmarty(), $source->isConfig)) {
+			if (isset($source->getSmarty()->security_policy) && is_object($source->getSmarty()->security_policy)) {
+				$source->getSmarty()->security_policy->isTrustedResourceDir($path, $source->isConfig);
+			}
+			$source->exists = true;
+			$source->timestamp = filemtime($path);
+		} else {
+			$source->timestamp = $source->exists = false;
+		}
+	}
+
+	/**
+	 * populate Source Object with timestamp and exists from Resource
+	 *
+	 * @param Source $source source object
+	 */
+	public function populateTimestamp(Source $source) {
+		if (!$source->exists && $path = $this->getFilePath($source->name, $source->getSmarty(), $source->isConfig)) {
+			$source->timestamp = $source->exists = is_file($path);
+		}
+		if ($source->exists && $path) {
+			$source->timestamp = filemtime($path);
+		}
+	}
+
+	/**
+	 * Load template's source from file into current template object
+	 *
+	 * @param Source $source source object
+	 *
+	 * @return string                 template source
+	 * @throws Exception        if source cannot be loaded
+	 */
+	public function getContent(Source $source) {
+		if ($source->exists) {
+			return file_get_contents($this->getFilePath($source->getResourceName(), $source->getSmarty(), $source->isConfig()));
+		}
+		throw new Exception(
+			'Unable to read ' . ($source->isConfig ? 'config' : 'template') .
+			" {$source->type} '{$source->name}'"
+		);
+	}
+
+	/**
+	 * Determine basename for compiled filename
+	 *
+	 * @param Source $source source object
+	 *
+	 * @return string                 resource's basename
+	 */
+	public function getBasename(Source $source) {
+		return basename($source->getResourceName());
+	}
+
+	/**
+	 * build template filepath by traversing the template_dir array
+	 *
+	 * @param $file
+	 * @param Smarty $smarty
+	 * @param bool $isConfig
+	 *
+	 * @return string fully qualified filepath
+	 */
+	public function getFilePath($file, \Smarty\Smarty $smarty, bool $isConfig = false) {
+		// absolute file ?
+		if ($file[0] === '/' || $file[1] === ':') {
+			$file = $smarty->_realpath($file, true);
+			return is_file($file) ? $file : false;
+		}
+
+		// normalize DIRECTORY_SEPARATOR
+		if (strpos($file, DIRECTORY_SEPARATOR === '/' ? '\\' : '/') !== false) {
+			$file = str_replace(DIRECTORY_SEPARATOR === '/' ? '\\' : '/', DIRECTORY_SEPARATOR, $file);
+		}
+		$_directories = $smarty->getTemplateDir(null, $isConfig);
+		// template_dir index?
+		if ($file[0] === '[' && preg_match('#^\[([^\]]+)\](.+)$#', $file, $fileMatch)) {
+			$file = $fileMatch[2];
+			$_indices = explode(',', $fileMatch[1]);
+			$_index_dirs = [];
+			foreach ($_indices as $index) {
+				$index = trim($index);
+				// try string indexes
+				if (isset($_directories[$index])) {
+					$_index_dirs[] = $_directories[$index];
+				} elseif (is_numeric($index)) {
+					// try numeric index
+					$index = (int)$index;
+					if (isset($_directories[$index])) {
+						$_index_dirs[] = $_directories[$index];
+					} else {
+						// try at location index
+						$keys = array_keys($_directories);
+						if (isset($_directories[$keys[$index]])) {
+							$_index_dirs[] = $_directories[$keys[$index]];
+						}
+					}
+				}
+			}
+			if (empty($_index_dirs)) {
+				// index not found
+				return false;
+			} else {
+				$_directories = $_index_dirs;
+			}
+		}
+		// relative file name?
+		foreach ($_directories as $_directory) {
+			$path = $_directory . $file;
+			if (is_file($path)) {
+				return (strpos($path, '.' . DIRECTORY_SEPARATOR) !== false) ? $smarty->_realpath($path) : $path;
+			}
+		}
+		if (!isset($_index_dirs)) {
+			// Could be relative to cwd
+			$path = $smarty->_realpath($file, true);
+			if (is_file($path)) {
+				return $path;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Returns the timestamp of the resource indicated by $resourceName, or false if it doesn't exist.
+	 *
+	 * @param string $resourceName
+	 * @param Smarty $smarty
+	 * @param bool $isConfig
+	 *
+	 * @return false|int
+	 */
+	public function getResourceNameTimestamp(string $resourceName, \Smarty\Smarty $smarty, bool $isConfig = false) {
+		if ($path = $this->getFilePath($resourceName, $smarty, $isConfig)) {
+			return filemtime($path);
+		}
+		return false;
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/RecompiledPlugin.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/RecompiledPlugin.php
new file mode 100644
index 000000000..f1c64bc78
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/RecompiledPlugin.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Smarty Resource Plugin
+ *
+
+
+ * @author     Rodney Rehm
+ */
+
+namespace Smarty\Resource;
+
+use Smarty\Template;
+
+/**
+ * Smarty Resource Plugin
+ * Base implementation for resource plugins that don't compile cache
+ *
+
+
+ */
+abstract class RecompiledPlugin extends BasePlugin {
+
+	/**
+	 * Flag that it's an recompiled resource
+	 *
+	 * @var bool
+	 */
+	public $recompiled = true;
+
+	/**
+	 * Flag if resource does allow compilation
+	 *
+	 * @return bool
+	 */
+	public function supportsCompiledTemplates(): bool {
+		return false;
+	}
+
+	/*
+	   * Disable timestamp checks for recompiled resource.
+	   *
+	   * @return bool
+	   */
+	/**
+	 * @return bool
+	 */
+	public function checkTimestamps() {
+		return false;
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/StreamPlugin.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/StreamPlugin.php
new file mode 100644
index 000000000..91afffdcd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/StreamPlugin.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource Stream
+ * Implements the streams as resource for Smarty template
+ *
+
+
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+
+namespace Smarty\Resource;
+
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Source;
+
+/**
+ * Smarty Internal Plugin Resource Stream
+ * Implements the streams as resource for Smarty template
+ *
+ * @link       https://php.net/streams
+
+
+ */
+class StreamPlugin extends RecompiledPlugin {
+
+	/**
+	 * populate Source Object with meta data from Resource
+	 *
+	 * @param Source $source source object
+	 * @param Template $_template template object
+	 *
+	 * @return void
+	 */
+	public function populate(Source $source, Template $_template = null) {
+		$source->uid = false;
+		$source->content = $this->getContent($source);
+		$source->timestamp = $source->exists = !!$source->content;
+	}
+
+	/**
+	 * Load template's source from stream into current template object
+	 *
+	 * @param Source $source source object
+	 *
+	 * @return string template source
+	 */
+	public function getContent(Source $source) {
+
+		if (strpos($source->getResourceName(), '://') !== false) {
+			$filepath = $source->getResourceName();
+		} else {
+			$filepath = str_replace(':', '://', $source->getFullResourceName());
+		}
+
+		$t = '';
+		// the availability of the stream has already been checked in Smarty\Resource\Base::fetch()
+		$fp = fopen($filepath, 'r+');
+		if ($fp) {
+			while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
+				$t .= $current_line;
+			}
+			fclose($fp);
+			return $t;
+		} else {
+			return false;
+		}
+	}
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/StringEval.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/StringEval.php
new file mode 100644
index 000000000..5c35e7437
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/StringEval.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Smarty\Resource;
+
+use Smarty\Smarty;
+
+/**
+ * Smarty Internal Plugin Resource Eval
+ *
+
+
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+
+/**
+ * Smarty Internal Plugin Resource Eval
+ * Implements the strings as resource for Smarty template
+ * {@internal unlike string-resources the compiled state of eval-resources is NOT saved for subsequent access}}
+ *
+
+
+ */
+class StringEval extends RecompiledPlugin
+{
+    /**
+     * populate Source Object with meta data from Resource
+     *
+     * @param \Smarty\Template\Source   $source    source object
+     * @param \Smarty\Template $_template template object
+     *
+     * @return void
+     */
+    public function populate(\Smarty\Template\Source $source, \Smarty\Template $_template = null)
+    {
+        $source->uid = sha1($source->name);
+        $source->timestamp = $source->exists = true;
+    }
+
+    /**
+     * Load template's source from $resource_name into current template object
+     *
+     * @param \Smarty\Template\Source $source source object
+     *
+     * @return string                 template source
+     *@uses decode() to decode base64 and urlencoded template_resources
+     *
+     */
+    public function getContent(\Smarty\Template\Source $source)
+    {
+        return $this->decode($source->name);
+    }
+
+    /**
+     * decode base64 and urlencode
+     *
+     * @param string $string template_resource to decode
+     *
+     * @return string decoded template_resource
+     */
+    protected function decode($string)
+    {
+        // decode if specified
+        if (($pos = strpos($string, ':')) !== false) {
+            if (!strncmp($string, 'base64', 6)) {
+                return base64_decode(substr($string, 7));
+            } elseif (!strncmp($string, 'urlencode', 9)) {
+                return urldecode(substr($string, 10));
+            }
+        }
+        return $string;
+    }
+
+    /**
+     * Determine basename for compiled filename
+     *
+     * @param \Smarty\Template\Source $source source object
+     *
+     * @return string                 resource's basename
+     */
+    public function getBasename(\Smarty\Template\Source $source)
+    {
+        return '';
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/StringPlugin.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/StringPlugin.php
new file mode 100644
index 000000000..6b5bee4dd
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Resource/StringPlugin.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Smarty Internal Plugin Resource String
+ *
+
+
+ * @author     Uwe Tews
+ * @author     Rodney Rehm
+ */
+
+namespace Smarty\Resource;
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Template\Source;
+
+/**
+ * Smarty Internal Plugin Resource String
+ * Implements the strings as resource for Smarty template
+ * {@internal unlike eval-resources the compiled state of string-resources is saved for subsequent access}}
+ *
+
+
+ */
+class StringPlugin extends BasePlugin {
+
+	/**
+	 * populate Source Object with metadata from Resource
+	 *
+	 * @param Source $source source object
+	 * @param Template $_template template object
+	 *
+	 * @return void
+	 */
+	public function populate(Source $source, Template $_template = null) {
+		$source->uid = sha1($source->name);
+		$source->timestamp = $source->exists = true;
+	}
+
+	/**
+	 * Load template's source from $resource_name into current template object
+	 *
+	 * @param Source $source source object
+	 *
+	 * @return string                 template source
+	 * @uses decode() to decode base64 and urlencoded template_resources
+	 *
+	 */
+	public function getContent(Source $source) {
+		return $this->decode($source->name);
+	}
+
+	/**
+	 * decode base64 and urlencode
+	 *
+	 * @param string $string template_resource to decode
+	 *
+	 * @return string decoded template_resource
+	 */
+	protected function decode($string) {
+		// decode if specified
+		if (($pos = strpos($string, ':')) !== false) {
+			if (!strncmp($string, 'base64', 6)) {
+				return base64_decode(substr($string, 7));
+			} elseif (!strncmp($string, 'urlencode', 9)) {
+				return urldecode(substr($string, 10));
+			}
+		}
+		return $string;
+	}
+
+	/**
+	 * Determine basename for compiled filename
+	 * Always returns an empty string.
+	 *
+	 * @param Source $source source object
+	 *
+	 * @return string                 resource's basename
+	 */
+	public function getBasename(Source $source) {
+		return '';
+	}
+
+	/*
+		* Disable timestamp checks for string resource.
+		*
+		* @return bool
+		*/
+	/**
+	 * @return bool
+	 */
+	public function checkTimestamps() {
+		return false;
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/Block.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/Block.php
new file mode 100644
index 000000000..90eab9cbb
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/Block.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Smarty\Runtime;
+
+/**
+ * Smarty {block} tag class
+ *
+
+
+ * @author     Uwe Tews
+ */
+class Block
+{
+    /**
+     * Block name
+     *
+     * @var string
+     */
+    public $name = '';
+
+    /**
+     * Hide attribute
+     *
+     * @var bool
+     */
+    public $hide = false;
+
+    /**
+     * Append attribute
+     *
+     * @var bool
+     */
+    public $append = false;
+
+    /**
+     * prepend attribute
+     *
+     * @var bool
+     */
+    public $prepend = false;
+
+    /**
+     * Block calls $smarty.block.child
+     *
+     * @var bool
+     */
+    public $callsChild = false;
+
+    /**
+     * Inheritance child block
+     *
+     * @var Block|null
+     */
+    public $child = null;
+
+    /**
+     * Inheritance calling parent block
+     *
+     * @var Block|null
+     */
+    public $parent = null;
+
+    /**
+     * Inheritance Template index
+     *
+     * @var int
+     */
+    public $tplIndex = 0;
+
+    /**
+     * Block constructor.
+     * - if outer level {block} of child template ($state === 1) save it as child root block
+     * - otherwise process inheritance and render
+     *
+     * @param string   $name     block name
+     * @param int|null $tplIndex index of outer level {block} if nested
+     */
+    public function __construct($name, $tplIndex)
+    {
+        $this->name = $name;
+        $this->tplIndex = $tplIndex;
+    }
+
+    /**
+     * Compiled block code overloaded by {block} class
+     *
+     * @param \Smarty\Template $tpl
+     */
+    public function callBlock(\Smarty\Template $tpl)
+    {
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/CaptureRuntime.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/CaptureRuntime.php
new file mode 100644
index 000000000..3f37c59fc
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/CaptureRuntime.php
@@ -0,0 +1,163 @@
+<?php
+
+namespace Smarty\Runtime;
+use Smarty\Template;
+
+/**
+ * Runtime Extension Capture
+ *
+
+
+ * @author     Uwe Tews
+ */
+class CaptureRuntime {
+
+	/**
+	 * Stack of capture parameter
+	 *
+	 * @var array
+	 */
+	private $captureStack = [];
+
+	/**
+	 * Current open capture sections
+	 *
+	 * @var int
+	 */
+	private $captureCount = 0;
+
+	/**
+	 * Count stack
+	 *
+	 * @var int[]
+	 */
+	private $countStack = [];
+
+	/**
+	 * Named buffer
+	 *
+	 * @var string[]
+	 */
+	private $namedBuffer = [];
+
+	/**
+	 * Open capture section
+	 *
+	 * @param \Smarty\Template $_template
+	 * @param string $buffer capture name
+	 * @param string $assign variable name
+	 * @param string $append variable name
+	 */
+	public function open(Template $_template, $buffer, $assign, $append) {
+
+		$this->registerCallbacks($_template);
+
+		$this->captureStack[] = [
+			$buffer,
+			$assign,
+			$append,
+		];
+		$this->captureCount++;
+		ob_start();
+	}
+
+	/**
+	 * Register callbacks in template class
+	 *
+	 * @param \Smarty\Template $_template
+	 */
+	private function registerCallbacks(Template $_template) {
+
+		foreach ($_template->startRenderCallbacks as $callback) {
+			if (is_array($callback) && get_class($callback[0]) == self::class) {
+				// already registered
+				return;
+			}
+		}
+
+		$_template->startRenderCallbacks[] = [
+			$this,
+			'startRender',
+		];
+		$_template->endRenderCallbacks[] = [
+			$this,
+			'endRender',
+		];
+		$this->startRender($_template);
+	}
+
+	/**
+	 * Start render callback
+	 *
+	 * @param \Smarty\Template $_template
+	 */
+	public function startRender(Template $_template) {
+		$this->countStack[] = $this->captureCount;
+		$this->captureCount = 0;
+	}
+
+	/**
+	 * Close capture section
+	 *
+	 * @param \Smarty\Template $_template
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function close(Template $_template) {
+		if ($this->captureCount) {
+			[$buffer, $assign, $append] = array_pop($this->captureStack);
+			$this->captureCount--;
+			if (isset($assign)) {
+				$_template->assign($assign, ob_get_contents());
+			}
+			if (isset($append)) {
+				$_template->append($append, ob_get_contents());
+			}
+			$this->namedBuffer[$buffer] = ob_get_clean();
+		} else {
+			$this->error($_template);
+		}
+	}
+
+	/**
+	 * Error exception on not matching {capture}{/capture}
+	 *
+	 * @param \Smarty\Template $_template
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function error(Template $_template) {
+		throw new \Smarty\Exception("Not matching {capture}{/capture} in '{$_template->template_resource}'");
+	}
+
+	/**
+	 * Return content of named capture buffer by key or as array
+	 *
+	 * @param \Smarty\Template $_template
+	 * @param string|null $name
+	 *
+	 * @return string|string[]|null
+	 */
+	public function getBuffer(Template $_template, $name = null) {
+		if (isset($name)) {
+			return $this->namedBuffer[$name] ?? null;
+		} else {
+			return $this->namedBuffer;
+		}
+	}
+
+	/**
+	 * End render callback
+	 *
+	 * @param \Smarty\Template $_template
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function endRender(Template $_template) {
+		if ($this->captureCount) {
+			$this->error($_template);
+		} else {
+			$this->captureCount = array_pop($this->countStack);
+		}
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/DefaultPluginHandlerRuntime.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/DefaultPluginHandlerRuntime.php
new file mode 100644
index 000000000..ad6ed74d3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/DefaultPluginHandlerRuntime.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Smarty\Runtime;
+
+use Smarty\Exception;
+
+class DefaultPluginHandlerRuntime {
+
+	/**
+	 * @var callable
+	 */
+	private $defaultPluginHandler;
+
+	public function __construct(?callable $defaultPluginHandler = null) {
+		$this->defaultPluginHandler = $defaultPluginHandler;
+	}
+
+	public function hasPlugin($tag, $plugin_type): bool {
+		if ($this->defaultPluginHandler === null) {
+			return false;
+		}
+
+		$callback = null;
+
+		// these are not used here
+		$script = null;
+		$cacheable = null;
+
+		return (call_user_func_array(
+				$this->defaultPluginHandler,
+				[
+					$tag,
+					$plugin_type,
+					null, // This used to pass $this->template, but this parameter has been removed in 5.0
+					&$callback,
+					&$script,
+					&$cacheable,
+				]
+			) && $callback);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function getCallback($tag, $plugin_type) {
+
+		if ($this->defaultPluginHandler === null) {
+			return false;
+		}
+
+		$callback = null;
+
+		// these are not used here
+		$script = null;
+		$cacheable = null;
+
+		if (call_user_func_array(
+				$this->defaultPluginHandler,
+				[
+					$tag,
+					$plugin_type,
+					null, // This used to pass $this->template, but this parameter has been removed in 5.0
+					&$callback,
+					&$script,
+					&$cacheable,
+				]
+			) && $callback) {
+			return $callback;
+		}
+		throw new Exception("Default plugin handler: Returned callback for '{$tag}' not callable at runtime");
+	}
+
+}
\ No newline at end of file
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/ForeachRuntime.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/ForeachRuntime.php
new file mode 100644
index 000000000..06da7d546
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/ForeachRuntime.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace Smarty\Runtime;
+use Smarty\Template;
+
+/**
+ * Foreach Runtime Methods count(), init(), restore()
+ *
+
+
+ * @author     Uwe Tews
+ */
+class ForeachRuntime {
+
+	/**
+	 * Stack of saved variables
+	 *
+	 * @var array
+	 */
+	private $stack = [];
+
+	/**
+	 * Init foreach loop
+	 *  - save item and key variables, named foreach property data if defined
+	 *  - init item and key variables, named foreach property data if required
+	 *  - count total if required
+	 *
+	 * @param \Smarty\Template $tpl
+	 * @param mixed $from values to loop over
+	 * @param string $item variable name
+	 * @param bool $needTotal flag if we need to count values
+	 * @param null|string $key variable name
+	 * @param null|string $name of named foreach
+	 * @param array $properties of named foreach
+	 *
+	 * @return mixed $from
+	 */
+	public function init(
+		Template $tpl,
+		         $from,
+		         $item,
+		         $needTotal = false,
+		         $key = null,
+		         $name = null,
+		         $properties = []
+	) {
+		$needTotal = $needTotal || isset($properties['total']);
+		$saveVars = [];
+		$total = null;
+		if (!is_array($from)) {
+			if (is_object($from)) {
+				if ($needTotal) {
+					$total = $this->count($from);
+				}
+			} else {
+				settype($from, 'array');
+			}
+		}
+		if (!isset($total)) {
+			$total = empty($from) ? 0 : ($needTotal ? count($from) : 1);
+		}
+		if ($tpl->hasVariable($item)) {
+			$saveVars['item'] = [
+				$item,
+				$tpl->getVariable($item)->getValue(),
+			];
+		}
+		$tpl->assign($item,null);
+		if ($total === 0) {
+			$from = null;
+		} else {
+			if ($key) {
+				if ($tpl->hasVariable($key)) {
+					$saveVars['key'] = [
+						$key,
+						clone $tpl->getVariable($key),
+					];
+				}
+				$tpl->assign($key, null);
+			}
+		}
+		if ($needTotal) {
+			$tpl->getVariable($item)->total = $total;
+		}
+		if ($name) {
+			$namedVar = "__smarty_foreach_{$name}";
+			if ($tpl->hasVariable($namedVar)) {
+				$saveVars['named'] = [
+					$namedVar,
+					clone $tpl->getVariable($namedVar),
+				];
+			}
+			$namedProp = [];
+			if (isset($properties['total'])) {
+				$namedProp['total'] = $total;
+			}
+			if (isset($properties['iteration'])) {
+				$namedProp['iteration'] = 0;
+			}
+			if (isset($properties['index'])) {
+				$namedProp['index'] = -1;
+			}
+			if (isset($properties['show'])) {
+				$namedProp['show'] = ($total > 0);
+			}
+			$tpl->assign($namedVar, $namedProp);
+		}
+		$this->stack[] = $saveVars;
+		return $from;
+	}
+
+	/**
+	 * [util function] counts an array, arrayAccess/traversable or PDOStatement object
+	 *
+	 * @param mixed $value
+	 *
+	 * @return int   the count for arrays and objects that implement countable, 1 for other objects that don't, and 0
+	 *               for empty elements
+	 * @throws \Exception
+	 */
+	public function count($value): int
+	{
+		if ($value instanceof \IteratorAggregate) {
+			// Note: getIterator() returns a Traversable, not an Iterator
+			// thus rewind() and valid() methods may not be present
+			return iterator_count($value->getIterator());
+		} elseif ($value instanceof \Iterator) {
+			return $value instanceof \Generator ? 1 : iterator_count($value);
+		} elseif ($value instanceof \Countable) {
+			return count($value);
+		}
+		return count((array) $value);
+	}
+
+	/**
+	 * Restore saved variables
+	 *
+	 * will be called by {break n} or {continue n} for the required number of levels
+	 *
+	 * @param \Smarty\Template $tpl
+	 * @param int $levels number of levels
+	 */
+	public function restore(Template $tpl, $levels = 1) {
+		while ($levels) {
+			$saveVars = array_pop($this->stack);
+			if (!empty($saveVars)) {
+				if (isset($saveVars['item'])) {
+					$tpl->getVariable($saveVars['item'][0])->setValue($saveVars['item'][1]);
+				}
+				if (isset($saveVars['key'])) {
+					$tpl->setVariable($saveVars['key'][0], $saveVars['key'][1]);
+				}
+				if (isset($saveVars['named'])) {
+					$tpl->setVariable($saveVars['named'][0], $saveVars['named'][1]);
+				}
+			}
+			$levels--;
+		}
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/InheritanceRuntime.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/InheritanceRuntime.php
new file mode 100644
index 000000000..ffd7aae66
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/InheritanceRuntime.php
@@ -0,0 +1,243 @@
+<?php
+
+namespace Smarty\Runtime;
+use Smarty\Template;
+use Smarty\Template\Source;
+use Smarty\Exception;
+
+/**
+ * Inheritance Runtime Methods processBlock, endChild, init
+ *
+
+
+ * @author     Uwe Tews
+ **/
+class InheritanceRuntime {
+
+	/**
+	 * State machine
+	 * - 0 idle next extends will create a new inheritance tree
+	 * - 1 processing child template
+	 * - 2 wait for next inheritance template
+	 * - 3 assume parent template, if child will loaded goto state 1
+	 *     a call to a sub template resets the state to 0
+	 *
+	 * @var int
+	 */
+	private $state = 0;
+
+	/**
+	 * Array of root child {block} objects
+	 *
+	 * @var \Smarty\Runtime\Block[]
+	 */
+	private $childRoot = [];
+
+	/**
+	 * inheritance template nesting level
+	 *
+	 * @var int
+	 */
+	private $inheritanceLevel = 0;
+
+	/**
+	 * inheritance template index
+	 *
+	 * @var int
+	 */
+	private $tplIndex = -1;
+
+	/**
+	 * Array of template source objects
+	 *
+	 * @var Source[]
+	 */
+	private $sources = [];
+
+	/**
+	 * Stack of source objects while executing block code
+	 *
+	 * @var Source[]
+	 */
+	private $sourceStack = [];
+
+	/**
+	 * Initialize inheritance
+	 *
+	 * @param \Smarty\Template $tpl template object of caller
+	 * @param bool $initChild if true init for child template
+	 * @param array $blockNames outer level block name
+	 */
+	public function init(Template $tpl, $initChild, $blockNames = []) {
+		// if called while executing parent template it must be a sub-template with new inheritance root
+		if ($initChild && $this->state === 3 && (strpos($tpl->template_resource, 'extendsall') === false)) {
+			$tpl->setInheritance(clone $tpl->getSmarty()->getRuntime('Inheritance'));
+			$tpl->getInheritance()->init($tpl, $initChild, $blockNames);
+			return;
+		}
+		++$this->tplIndex;
+		$this->sources[$this->tplIndex] = $tpl->getSource();
+		// start of child sub template(s)
+		if ($initChild) {
+			$this->state = 1;
+			if (!$this->inheritanceLevel) {
+				//grab any output of child templates
+				ob_start();
+			}
+			++$this->inheritanceLevel;
+		}
+		// if state was waiting for parent change state to parent
+		if ($this->state === 2) {
+			$this->state = 3;
+		}
+	}
+
+	/**
+	 * End of child template(s)
+	 * - if outer level is reached flush output buffer and switch to wait for parent template state
+	 *
+	 * @param \Smarty\Template $tpl
+	 * @param null|string $template optional name of inheritance parent template
+	 *
+	 * @throws \Exception
+	 * @throws \Smarty\Exception
+	 */
+	public function endChild(Template $tpl, $template = null, ?string $currentDir = null) {
+		--$this->inheritanceLevel;
+		if (!$this->inheritanceLevel) {
+			ob_end_clean();
+			$this->state = 2;
+		}
+		if (isset($template)) {
+			$tpl->renderSubTemplate(
+				$template,
+				$tpl->cache_id,
+				$tpl->compile_id,
+				$tpl->caching ? \Smarty\Template::CACHING_NOCACHE_CODE : 0,
+				$tpl->cache_lifetime,
+				[],
+				null,
+				$currentDir
+			);
+		}
+	}
+
+	/**
+	 * \Smarty\Runtime\Block constructor.
+	 * - if outer level {block} of child template ($state === 1) save it as child root block
+	 * - otherwise process inheritance and render
+	 *
+	 * @param \Smarty\Template $tpl
+	 * @param                           $className
+	 * @param string $name
+	 * @param int|null $tplIndex index of outer level {block} if nested
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function instanceBlock(Template $tpl, $className, $name, $tplIndex = null) {
+		$block = new $className($name, isset($tplIndex) ? $tplIndex : $this->tplIndex);
+		if (isset($this->childRoot[$name])) {
+			$block->child = $this->childRoot[$name];
+		}
+		if ($this->state === 1) {
+			$this->childRoot[$name] = $block;
+			return;
+		}
+		// make sure we got child block of child template of current block
+		while ($block->child && $block->child->child && $block->tplIndex <= $block->child->tplIndex) {
+			$block->child = $block->child->child;
+		}
+		$this->processBlock($tpl, $block);
+	}
+
+	/**
+	 * Goto child block or render this
+	 *
+	 * @param Template $tpl
+	 * @param \Smarty\Runtime\Block $block
+	 * @param \Smarty\Runtime\Block|null $parent
+	 *
+	 * @throws Exception
+	 */
+	private function processBlock(
+		Template              $tpl,
+		\Smarty\Runtime\Block $block,
+		\Smarty\Runtime\Block $parent = null
+	) {
+		if ($block->hide && !isset($block->child)) {
+			return;
+		}
+		if (isset($block->child) && $block->child->hide && !isset($block->child->child)) {
+			$block->child = null;
+		}
+		$block->parent = $parent;
+		if ($block->append && !$block->prepend && isset($parent)) {
+			$this->callParent($tpl, $block, '\'{block append}\'');
+		}
+		if ($block->callsChild || !isset($block->child) || ($block->child->hide && !isset($block->child->child))) {
+			$this->callBlock($block, $tpl);
+		} else {
+			$this->processBlock($tpl, $block->child, $block);
+		}
+		if ($block->prepend && isset($parent)) {
+			$this->callParent($tpl, $block, '{block prepend}');
+			if ($block->append) {
+				if ($block->callsChild || !isset($block->child)
+					|| ($block->child->hide && !isset($block->child->child))
+				) {
+					$this->callBlock($block, $tpl);
+				} else {
+					$this->processBlock($tpl, $block->child, $block);
+				}
+			}
+		}
+		$block->parent = null;
+	}
+
+	/**
+	 * Render child on \$smarty.block.child
+	 *
+	 * @param Template $tpl
+	 * @param \Smarty\Runtime\Block $block
+	 *
+	 * @return null|string block content
+	 * @throws Exception
+	 */
+	public function callChild(Template $tpl, \Smarty\Runtime\Block $block) {
+		if (isset($block->child)) {
+			$this->processBlock($tpl, $block->child, $block);
+		}
+	}
+
+	/**
+	 * Render parent block on \$smarty.block.parent or {block append/prepend}
+	 *
+	 * @param Template $tpl
+	 * @param \Smarty\Runtime\Block $block
+	 * @param string $tag
+	 *
+	 * @return null|string  block content
+	 * @throws Exception
+	 */
+	public function callParent(Template $tpl, \Smarty\Runtime\Block $block) {
+		if (isset($block->parent)) {
+			$this->callBlock($block->parent, $tpl);
+		} else {
+			throw new Exception("inheritance: illegal '{\$smarty.block.parent}' used in child template '" .
+				"{$tpl->getInheritance()->sources[$block->tplIndex]->getResourceName()}' block '{$block->name}'");
+		}
+	}
+
+	/**
+	 * render block
+	 *
+	 * @param \Smarty\Runtime\Block $block
+	 * @param Template $tpl
+	 */
+	public function callBlock(\Smarty\Runtime\Block $block, Template $tpl) {
+		$this->sourceStack[] = $tpl->getSource();
+		$tpl->setSource($this->sources[$block->tplIndex]);
+		$block->callBlock($tpl);
+		$tpl->setSource(array_pop($this->sourceStack));
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/TplFunctionRuntime.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/TplFunctionRuntime.php
new file mode 100644
index 000000000..6c4b93d73
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Runtime/TplFunctionRuntime.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace Smarty\Runtime;
+use Smarty\Exception;
+use Smarty\Template;
+use Smarty\TemplateBase;
+
+/**
+ * TplFunction Runtime Methods callTemplateFunction
+ *
+
+
+ * @author     Uwe Tews
+ **/
+class TplFunctionRuntime {
+
+	/**
+	 * Call template function
+	 *
+	 * @param \Smarty\Template $tpl template object
+	 * @param string $name template function name
+	 * @param array $params parameter array
+	 * @param bool $nocache true if called nocache
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function callTemplateFunction(Template $tpl, $name, $params, $nocache) {
+		$funcParam = $tpl->tplFunctions[$name] ?? ($tpl->getSmarty()->tplFunctions[$name] ?? null);
+		if (!isset($funcParam)) {
+			throw new \Smarty\Exception("Unable to find template function '{$name}'");
+		}
+
+		if (!$tpl->caching || ($tpl->caching && $nocache)) {
+			$function = $funcParam['call_name'];
+		} else {
+			if (isset($funcParam['call_name_caching'])) {
+				$function = $funcParam['call_name_caching'];
+			} else {
+				$function = $funcParam['call_name'];
+			}
+		}
+		if (!function_exists($function) && !$this->addTplFuncToCache($tpl, $name, $function)) {
+			throw new \Smarty\Exception("Unable to find template function '{$name}'");
+		}
+
+		$tpl->pushStack();
+		$function($tpl, $params);
+		$tpl->popStack();
+	}
+
+	/**
+	 * Register template functions defined by template
+	 *
+	 * @param \Smarty|\Smarty\Template|\Smarty\TemplateBase $obj
+	 * @param array $tplFunctions source information array of
+	 *                                                                                      template functions defined
+	 *                                                                                      in template
+	 * @param bool $override if true replace existing
+	 *                                                                                      functions with same name
+	 */
+	public function registerTplFunctions(TemplateBase $obj, $tplFunctions, $override = true) {
+		$obj->tplFunctions =
+			$override ? array_merge($obj->tplFunctions, $tplFunctions) : array_merge($tplFunctions, $obj->tplFunctions);
+		// make sure that the template functions are known in parent templates
+		if ($obj->_isSubTpl()) {
+			$this->registerTplFunctions($obj->parent, $tplFunctions, false);
+		} else {
+			$obj->getSmarty()->tplFunctions = $override ? array_merge($obj->getSmarty()->tplFunctions, $tplFunctions) :
+				array_merge($tplFunctions, $obj->getSmarty()->tplFunctions);
+		}
+	}
+
+	/**
+	 * Return source parameter array for single or all template functions
+	 *
+	 * @param \Smarty\Template $tpl template object
+	 * @param null|string $name template function name
+	 *
+	 * @return array|bool|mixed
+	 */
+	public function getTplFunction(Template $tpl, $name = null) {
+		if (isset($name)) {
+			return $tpl->tplFunctions[$name] ?? ($tpl->getSmarty()->tplFunctions[$name] ?? false);
+		} else {
+			return empty($tpl->tplFunctions) ? $tpl->getSmarty()->tplFunctions : $tpl->tplFunctions;
+		}
+	}
+
+	/**
+	 * Add template function to cache file for nocache calls
+	 *
+	 * @param Template $tpl
+	 * @param string $_name template function name
+	 * @param string $_function PHP function name
+	 *
+	 * @return bool
+	 * @throws Exception
+	 */
+	private function addTplFuncToCache(Template $tpl, $_name, $_function) {
+		$funcParam = $tpl->tplFunctions[$_name];
+		if (is_file($funcParam['compiled_filepath'])) {
+			// read compiled file
+			$code = file_get_contents($funcParam['compiled_filepath']);
+			// grab template function
+			if (preg_match("/\/\* {$_function} \*\/([\S\s]*?)\/\*\/ {$_function} \*\//", $code, $match)) {
+				// grab source info from file dependency
+				preg_match("/\s*'{$funcParam['uid']}'([\S\s]*?)\),/", $code, $match1);
+				unset($code);
+				// make PHP function known
+				eval($match[0]);
+				if (function_exists($_function)) {
+
+					// Some magic code existed here, testing if the cached property had been set
+					// and then bubbling up until it found a parent template that had the cached property.
+					// This is no longer possible, so somehow this might break.
+
+					// add template function code to cache file
+					$content = $tpl->getCached()->readCache($tpl);
+					if ($content) {
+						// check if we must update file dependency
+						if (!preg_match("/'{$funcParam['uid']}'(.*?)'nocache_hash'/", $content, $match2)) {
+							$content = preg_replace("/('file_dependency'(.*?)\()/", "\\1{$match1[0]}", $content);
+						}
+						$tpl->getCached()->writeCache(
+							$tpl,
+							preg_replace('/\s*\?>\s*$/', "\n", $content) .
+							"\n" . preg_replace(
+								[
+									'/^\s*<\?php\s+/',
+									'/\s*\?>\s*$/',
+								],
+								"\n",
+								$match[0]
+							)
+						);
+					}
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Security.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Security.php
new file mode 100644
index 000000000..250b3bca7
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Security.php
@@ -0,0 +1,560 @@
+<?php
+/**
+ * Smarty plugin
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+/**
+ * FIXME: \Smarty\Security API
+ *      - getter and setter instead of public properties would allow cultivating an internal cache properly
+ *      - current implementation of isTrustedResourceDir() assumes that Smarty::$template_dir and Smarty::$config_dir
+ *      are immutable the cache is killed every time either of the variables change. That means that two distinct
+ *      Smarty objects with differing
+ *        $template_dir or $config_dir should NOT share the same \Smarty\Security instance,
+ *        as this would lead to (severe) performance penalty! how should this be handled?
+ */
+
+namespace Smarty;
+
+use Smarty\Exception;
+
+/**
+ * This class does contain the security settings
+ */
+#[\AllowDynamicProperties]
+class Security {
+
+	/**
+	 * This is the list of template directories that are considered secure.
+	 * $template_dir is in this list implicitly.
+	 *
+	 * @var array
+	 */
+	public $secure_dir = [];
+
+	/**
+	 * List of regular expressions (PCRE) that include trusted URIs
+	 *
+	 * @var array
+	 */
+	public $trusted_uri = [];
+
+	/**
+	 * List of trusted constants names
+	 *
+	 * @var array
+	 */
+	public $trusted_constants = [];
+
+	/**
+	 * This is an array of trusted static classes.
+	 * If empty access to all static classes is allowed.
+	 * If set to 'none' none is allowed.
+	 *
+	 * @var array
+	 */
+	public $static_classes = [];
+
+	/**
+	 * This is an nested array of trusted classes and static methods.
+	 * If empty access to all static classes and methods is allowed.
+	 * Format:
+	 * array (
+	 *         'class_1' => array('method_1', 'method_2'), // allowed methods listed
+	 *         'class_2' => array(),                       // all methods of class allowed
+	 *       )
+	 * If set to null none is allowed.
+	 *
+	 * @var array
+	 */
+	public $trusted_static_methods = [];
+
+	/**
+	 * This is an array of trusted static properties.
+	 * If empty access to all static classes and properties is allowed.
+	 * Format:
+	 * array (
+	 *         'class_1' => array('prop_1', 'prop_2'), // allowed properties listed
+	 *         'class_2' => array(),                   // all properties of class allowed
+	 *       )
+	 * If set to null none is allowed.
+	 *
+	 * @var array
+	 */
+	public $trusted_static_properties = [];
+
+	/**
+	 * This is an array of allowed tags.
+	 * If empty no restriction by allowed_tags.
+	 *
+	 * @var array
+	 */
+	public $allowed_tags = [];
+
+	/**
+	 * This is an array of disabled tags.
+	 * If empty no restriction by disabled_tags.
+	 *
+	 * @var array
+	 */
+	public $disabled_tags = [];
+
+	/**
+	 * This is an array of allowed modifier plugins.
+	 * If empty no restriction by allowed_modifiers.
+	 *
+	 * @var array
+	 */
+	public $allowed_modifiers = [];
+
+	/**
+	 * This is an array of disabled modifier plugins.
+	 * If empty no restriction by disabled_modifiers.
+	 *
+	 * @var array
+	 */
+	public $disabled_modifiers = [];
+
+	/**
+	 * This is an array of disabled special $smarty variables.
+	 *
+	 * @var array
+	 */
+	public $disabled_special_smarty_vars = [];
+
+	/**
+	 * This is an array of trusted streams.
+	 * If empty all streams are allowed.
+	 * To disable all streams set $streams = null.
+	 *
+	 * @var array
+	 */
+	public $streams = ['file'];
+
+	/**
+	 * + flag if constants can be accessed from template
+	 *
+	 * @var boolean
+	 */
+	public $allow_constants = true;
+
+	/**
+	 * + flag if super globals can be accessed from template
+	 *
+	 * @var boolean
+	 */
+	public $allow_super_globals = true;
+
+	/**
+	 * max template nesting level
+	 *
+	 * @var int
+	 */
+	public $max_template_nesting = 0;
+
+	/**
+	 * current template nesting level
+	 *
+	 * @var int
+	 */
+	private $_current_template_nesting = 0;
+
+	/**
+	 * Cache for $resource_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_resource_dir = [];
+
+	/**
+	 * Cache for $template_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_template_dir = [];
+
+	/**
+	 * Cache for $config_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_config_dir = [];
+
+	/**
+	 * Cache for $secure_dir lookup
+	 *
+	 * @var array
+	 */
+	protected $_secure_dir = [];
+
+	/**
+	 * @param Smarty $smarty
+	 */
+	public function __construct(Smarty $smarty) {
+		$this->smarty = $smarty;
+	}
+
+	/**
+	 * Check if static class is trusted.
+	 *
+	 * @param string $class_name
+	 * @param object $compiler compiler object
+	 *
+	 * @return boolean                 true if class is trusted
+	 */
+	public function isTrustedStaticClass($class_name, $compiler) {
+		if (isset($this->static_classes)
+			&& (empty($this->static_classes) || in_array($class_name, $this->static_classes))
+		) {
+			return true;
+		}
+		$compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if static class method/property is trusted.
+	 *
+	 * @param string $class_name
+	 * @param string $params
+	 * @param object $compiler compiler object
+	 *
+	 * @return boolean                 true if class method is trusted
+	 */
+	public function isTrustedStaticClassAccess($class_name, $params, $compiler) {
+		if (!isset($params[2])) {
+			// fall back
+			return $this->isTrustedStaticClass($class_name, $compiler);
+		}
+		if ($params[2] === 'method') {
+			$allowed = $this->trusted_static_methods;
+			$name = substr($params[0], 0, strpos($params[0], '('));
+		} else {
+			$allowed = $this->trusted_static_properties;
+			// strip '$'
+			$name = substr($params[0], 1);
+		}
+		if (isset($allowed)) {
+			if (empty($allowed)) {
+				// fall back
+				return $this->isTrustedStaticClass($class_name, $compiler);
+			}
+			if (isset($allowed[$class_name])
+				&& (empty($allowed[$class_name]) || in_array($name, $allowed[$class_name]))
+			) {
+				return true;
+			}
+		}
+		$compiler->trigger_template_error("access to static class '{$class_name}' {$params[2]} '{$name}' not allowed by security setting");
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if tag is trusted.
+	 *
+	 * @param string $tag_name
+	 * @param object $compiler compiler object
+	 *
+	 * @return boolean                 true if tag is trusted
+	 */
+	public function isTrustedTag($tag_name, $compiler) {
+		$tag_name = strtolower($tag_name);
+
+		// check for internal always required tags
+		if (in_array($tag_name,	['assign', 'call'])) {
+			return true;
+		}
+		// check security settings
+		if (empty($this->allowed_tags)) {
+			if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
+				return true;
+			} else {
+				$compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", null, true);
+			}
+		} elseif (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
+			return true;
+		} else {
+			$compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", null, true);
+		}
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if special $smarty variable is trusted.
+	 *
+	 * @param string $var_name
+	 * @param object $compiler compiler object
+	 *
+	 * @return boolean                 true if tag is trusted
+	 */
+	public function isTrustedSpecialSmartyVar($var_name, $compiler) {
+		if (!in_array($var_name, $this->disabled_special_smarty_vars)) {
+			return true;
+		} else {
+			$compiler->trigger_template_error(
+				"special variable '\$smarty.{$var_name}' not allowed by security setting",
+				null,
+				true
+			);
+		}
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if modifier plugin is trusted.
+	 *
+	 * @param string $modifier_name
+	 * @param object $compiler compiler object
+	 *
+	 * @return boolean                 true if tag is trusted
+	 */
+	public function isTrustedModifier($modifier_name, $compiler) {
+		// check for internal always allowed modifier
+		if (in_array($modifier_name, ['default'])) {
+			return true;
+		}
+		// check security settings
+		if (empty($this->allowed_modifiers)) {
+			if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
+				return true;
+			} else {
+				$compiler->trigger_template_error(
+					"modifier '{$modifier_name}' disabled by security setting",
+					null,
+					true
+				);
+			}
+		} elseif (in_array($modifier_name, $this->allowed_modifiers)
+			&& !in_array($modifier_name, $this->disabled_modifiers)
+		) {
+			return true;
+		} else {
+			$compiler->trigger_template_error(
+				"modifier '{$modifier_name}' not allowed by security setting",
+				null,
+				true
+			);
+		}
+		return false; // should not, but who knows what happens to the compiler in the future?
+	}
+
+	/**
+	 * Check if constants are enabled or trusted
+	 *
+	 * @param string $const constant name
+	 * @param object $compiler compiler object
+	 *
+	 * @return bool
+	 */
+	public function isTrustedConstant($const, $compiler) {
+		if (in_array($const, ['true', 'false', 'null'])) {
+			return true;
+		}
+		if (!empty($this->trusted_constants)) {
+			if (!in_array(strtolower($const), $this->trusted_constants)) {
+				$compiler->trigger_template_error("Security: access to constant '{$const}' not permitted");
+				return false;
+			}
+			return true;
+		}
+		if ($this->allow_constants) {
+			return true;
+		}
+		$compiler->trigger_template_error("Security: access to constants not permitted");
+		return false;
+	}
+
+	/**
+	 * Check if stream is trusted.
+	 *
+	 * @param string $stream_name
+	 *
+	 * @return boolean         true if stream is trusted
+	 * @throws Exception if stream is not trusted
+	 */
+	public function isTrustedStream($stream_name) {
+		if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
+			return true;
+		}
+		throw new Exception("stream '{$stream_name}' not allowed by security setting");
+	}
+
+	/**
+	 * Check if directory of file resource is trusted.
+	 *
+	 * @param string $filepath
+	 * @param null|bool $isConfig
+	 *
+	 * @return bool true if directory is trusted
+	 * @throws \Smarty\Exception if directory is not trusted
+	 */
+	public function isTrustedResourceDir($filepath, $isConfig = null) {
+		$_dir = $this->smarty->getTemplateDir();
+		if ($this->_template_dir !== $_dir) {
+			$this->_updateResourceDir($this->_template_dir, $_dir);
+			$this->_template_dir = $_dir;
+		}
+		$_dir = $this->smarty->getConfigDir();
+		if ($this->_config_dir !== $_dir) {
+			$this->_updateResourceDir($this->_config_dir, $_dir);
+			$this->_config_dir = $_dir;
+		}
+		if ($this->_secure_dir !== $this->secure_dir) {
+			$this->secure_dir = (array)$this->secure_dir;
+			foreach ($this->secure_dir as $k => $d) {
+				$this->secure_dir[$k] = $this->smarty->_realpath($d . DIRECTORY_SEPARATOR, true);
+			}
+			$this->_updateResourceDir($this->_secure_dir, $this->secure_dir);
+			$this->_secure_dir = $this->secure_dir;
+		}
+		$addPath = $this->_checkDir($filepath, $this->_resource_dir);
+		if ($addPath !== false) {
+			$this->_resource_dir = array_merge($this->_resource_dir, $addPath);
+		}
+		return true;
+	}
+
+	/**
+	 * Check if URI (e.g. {fetch} or {html_image}) is trusted
+	 * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
+	 * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
+	 * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
+	 *
+	 * @param string $uri
+	 *
+	 * @return boolean         true if URI is trusted
+	 * @throws Exception if URI is not trusted
+	 * @uses   $trusted_uri for list of patterns to match against $uri
+	 */
+	public function isTrustedUri($uri) {
+		$_uri = parse_url($uri);
+		if (!empty($_uri['scheme']) && !empty($_uri['host'])) {
+			$_uri = $_uri['scheme'] . '://' . $_uri['host'];
+			foreach ($this->trusted_uri as $pattern) {
+				if (preg_match($pattern, $_uri)) {
+					return true;
+				}
+			}
+		}
+		throw new Exception("URI '{$uri}' not allowed by security setting");
+	}
+
+	/**
+	 * Remove old directories and its sub folders, add new directories
+	 *
+	 * @param array $oldDir
+	 * @param array $newDir
+	 */
+	private function _updateResourceDir($oldDir, $newDir) {
+		foreach ($oldDir as $directory) {
+			//           $directory = $this->smarty->_realpath($directory, true);
+			$length = strlen($directory);
+			foreach ($this->_resource_dir as $dir) {
+				if (substr($dir, 0, $length) === $directory) {
+					unset($this->_resource_dir[$dir]);
+				}
+			}
+		}
+		foreach ($newDir as $directory) {
+			//           $directory = $this->smarty->_realpath($directory, true);
+			$this->_resource_dir[$directory] = true;
+		}
+	}
+
+	/**
+	 * Check if file is inside a valid directory
+	 *
+	 * @param string $filepath
+	 * @param array $dirs valid directories
+	 *
+	 * @return array|bool
+	 * @throws \Smarty\Exception
+	 */
+	private function _checkDir($filepath, $dirs) {
+		$directory = dirname($this->smarty->_realpath($filepath, true)) . DIRECTORY_SEPARATOR;
+		$_directory = [];
+		if (!preg_match('#[\\\\/][.][.][\\\\/]#', $directory)) {
+			while (true) {
+				// test if the directory is trusted
+				if (isset($dirs[$directory])) {
+					return $_directory;
+				}
+				// abort if we've reached root
+				if (!preg_match('#[\\\\/][^\\\\/]+[\\\\/]$#', $directory)) {
+					// give up
+					break;
+				}
+				// remember the directory to add it to _resource_dir in case we're successful
+				$_directory[$directory] = true;
+				// bubble up one level
+				$directory = preg_replace('#[\\\\/][^\\\\/]+[\\\\/]$#', DIRECTORY_SEPARATOR, $directory);
+			}
+		}
+		// give up
+		throw new Exception(sprintf('Smarty Security: not trusted file path \'%s\' ', $filepath));
+	}
+
+	/**
+	 * Loads security class and enables security
+	 *
+	 * @param \Smarty $smarty
+	 * @param string|Security $security_class if a string is used, it must be class-name
+	 *
+	 * @return \Smarty current Smarty instance for chaining
+	 * @throws \Smarty\Exception when an invalid class name is provided
+	 */
+	public static function enableSecurity(Smarty $smarty, $security_class) {
+		if ($security_class instanceof Security) {
+			$smarty->security_policy = $security_class;
+			return $smarty;
+		} elseif (is_object($security_class)) {
+			throw new Exception("Class '" . get_class($security_class) . "' must extend \\Smarty\\Security.");
+		}
+		if ($security_class === null) {
+			$security_class = $smarty->security_class;
+		}
+		if (!class_exists($security_class)) {
+			throw new Exception("Security class '$security_class' is not defined");
+		} elseif ($security_class !== Security::class && !is_subclass_of($security_class, Security::class)) {
+			throw new Exception("Class '$security_class' must extend " . Security::class . ".");
+		} else {
+			$smarty->security_policy = new $security_class($smarty);
+		}
+		return $smarty;
+	}
+
+	/**
+	 * Start template processing
+	 *
+	 * @param $template
+	 *
+	 * @throws Exception
+	 */
+	public function startTemplate($template) {
+		if ($this->max_template_nesting > 0 && $this->_current_template_nesting++ >= $this->max_template_nesting) {
+			throw new Exception("maximum template nesting level of '{$this->max_template_nesting}' exceeded when calling '{$template->template_resource}'");
+		}
+	}
+
+	/**
+	 * Exit template processing
+	 */
+	public function endTemplate() {
+		if ($this->max_template_nesting > 0) {
+			$this->_current_template_nesting--;
+		}
+	}
+
+	/**
+	 * Register callback functions call at start/end of template rendering
+	 *
+	 * @param \Smarty\Template $template
+	 */
+	public function registerCallBacks(Template $template) {
+		$template->startRenderCallbacks[] = [$this, 'startTemplate'];
+		$template->endRenderCallbacks[] = [$this, 'endTemplate'];
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Smarty.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Smarty.php
new file mode 100644
index 000000000..5af9c9b36
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Smarty.php
@@ -0,0 +1,2224 @@
+<?php
+
+namespace Smarty;
+
+use FilesystemIterator;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use Smarty\Cacheresource\File;
+use Smarty\Extension\Base;
+use Smarty\Extension\BCPluginsAdapter;
+use Smarty\Extension\CallbackWrapper;
+use Smarty\Extension\CoreExtension;
+use Smarty\Extension\DefaultExtension;
+use Smarty\Extension\ExtensionInterface;
+use Smarty\Filter\Output\TrimWhitespace;
+use Smarty\Runtime\CaptureRuntime;
+use Smarty\Runtime\DefaultPluginHandlerRuntime;
+use Smarty\Runtime\ForeachRuntime;
+use Smarty\Runtime\InheritanceRuntime;
+use Smarty\Runtime\TplFunctionRuntime;
+
+
+/**
+ * Project:     Smarty: the PHP compiling template engine
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * For questions, help, comments, discussion, etc., please join the
+ * Smarty mailing list. Send a blank e-mail to
+ * smarty-discussion-subscribe@googlegroups.com
+ *
+ * @author    Monte Ohrt <monte at ohrt dot com>
+ * @author    Uwe Tews   <uwe dot tews at gmail dot com>
+ * @author    Rodney Rehm
+ * @author    Simon Wisselink
+ */
+
+/**
+ * This is the main Smarty class
+ */
+class Smarty extends \Smarty\TemplateBase {
+
+	/**
+	 * smarty version
+	 */
+	const SMARTY_VERSION = '5.2.0';
+
+	/**
+	 * define caching modes
+	 */
+	const CACHING_OFF = 0;
+	const CACHING_LIFETIME_CURRENT = 1;
+	const CACHING_LIFETIME_SAVED = 2;
+	/**
+	 * define constant for clearing cache files be saved expiration dates
+	 */
+	const CLEAR_EXPIRED = -1;
+	/**
+	 * define compile check modes
+	 */
+	const COMPILECHECK_OFF = 0;
+	const COMPILECHECK_ON = 1;
+	/**
+	 * filter types
+	 */
+	const FILTER_POST = 'post';
+	const FILTER_PRE = 'pre';
+	const FILTER_OUTPUT = 'output';
+	const FILTER_VARIABLE = 'variable';
+	/**
+	 * plugin types
+	 */
+	const PLUGIN_FUNCTION = 'function';
+	const PLUGIN_BLOCK = 'block';
+	const PLUGIN_COMPILER = 'compiler';
+	const PLUGIN_MODIFIER = 'modifier';
+	const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
+
+	/**
+	 * The character set to adhere to (defaults to "UTF-8")
+	 */
+	public static $_CHARSET = 'UTF-8';
+
+	/**
+	 * The date format to be used internally
+	 * (accepts date() and strftime())
+	 */
+	public static $_DATE_FORMAT = '%b %e, %Y';
+
+	/**
+	 * Flag denoting if PCRE should run in UTF-8 mode
+	 */
+	public static $_UTF8_MODIFIER = 'u';
+
+	/**
+	 * Flag denoting if operating system is windows
+	 */
+	public static $_IS_WINDOWS = false;
+
+	/**
+	 * auto literal on delimiters with whitespace
+	 *
+	 * @var boolean
+	 */
+	public $auto_literal = true;
+
+	/**
+	 * display error on not assigned variables
+	 *
+	 * @var boolean
+	 */
+	public $error_unassigned = false;
+
+	/**
+	 * flag if template_dir is normalized
+	 *
+	 * @var bool
+	 */
+	public $_templateDirNormalized = false;
+
+	/**
+	 * joined template directory string used in cache keys
+	 *
+	 * @var string
+	 */
+	public $_joined_template_dir = null;
+
+	/**
+	 * flag if config_dir is normalized
+	 *
+	 * @var bool
+	 */
+	public $_configDirNormalized = false;
+
+	/**
+	 * joined config directory string used in cache keys
+	 *
+	 * @var string
+	 */
+	public $_joined_config_dir = null;
+
+	/**
+	 * default template handler
+	 *
+	 * @var callable
+	 */
+	public $default_template_handler_func = null;
+
+	/**
+	 * default config handler
+	 *
+	 * @var callable
+	 */
+	public $default_config_handler_func = null;
+
+	/**
+	 * default plugin handler
+	 *
+	 * @var callable
+	 */
+	private $default_plugin_handler_func = null;
+
+	/**
+	 * flag if template_dir is normalized
+	 *
+	 * @var bool
+	 */
+	public $_compileDirNormalized = false;
+
+	/**
+	 * flag if template_dir is normalized
+	 *
+	 * @var bool
+	 */
+	public $_cacheDirNormalized = false;
+
+	/**
+	 * force template compiling?
+	 *
+	 * @var boolean
+	 */
+	public $force_compile = false;
+
+	/**
+	 * use sub dirs for compiled/cached files?
+	 *
+	 * @var boolean
+	 */
+	public $use_sub_dirs = false;
+
+	/**
+	 * merge compiled includes
+	 *
+	 * @var boolean
+	 */
+	public $merge_compiled_includes = false;
+
+	/**
+	 * force cache file creation
+	 *
+	 * @var boolean
+	 */
+	public $force_cache = false;
+
+	/**
+	 * template left-delimiter
+	 *
+	 * @var string
+	 */
+	private $left_delimiter = "{";
+
+	/**
+	 * template right-delimiter
+	 *
+	 * @var string
+	 */
+	private $right_delimiter = "}";
+
+	/**
+	 * array of strings which shall be treated as literal by compiler
+	 *
+	 * @var array string
+	 */
+	public $literals = [];
+
+	/**
+	 * class name
+	 * This should be instance of \Smarty\Security.
+	 *
+	 * @var string
+	 * @see \Smarty\Security
+	 */
+	public $security_class = \Smarty\Security::class;
+
+	/**
+	 * implementation of security class
+	 *
+	 * @var \Smarty\Security
+	 */
+	public $security_policy = null;
+
+	/**
+	 * debug mode
+	 * Setting this to true enables the debug-console. Setting it to 2 enables individual Debug Console window by
+	 * template name.
+	 *
+	 * @var boolean|int
+	 */
+	public $debugging = false;
+
+	/**
+	 * This determines if debugging is enable-able from the browser.
+	 * <ul>
+	 *  <li>NONE => no debugging control allowed</li>
+	 *  <li>URL => enable debugging when SMARTY_DEBUG is found in the URL.</li>
+	 * </ul>
+	 *
+	 * @var string
+	 */
+	public $debugging_ctrl = 'NONE';
+
+	/**
+	 * Name of debugging URL-param.
+	 * Only used when $debugging_ctrl is set to 'URL'.
+	 * The name of the URL-parameter that activates debugging.
+	 *
+	 * @var string
+	 */
+	public $smarty_debug_id = 'SMARTY_DEBUG';
+
+	/**
+	 * Path of debug template.
+	 *
+	 * @var string
+	 */
+	public $debug_tpl = null;
+
+	/**
+	 * When set, smarty uses this value as error_reporting-level.
+	 *
+	 * @var int
+	 */
+	public $error_reporting = null;
+
+	/**
+	 * Controls whether variables with the same name overwrite each other.
+	 *
+	 * @var boolean
+	 */
+	public $config_overwrite = true;
+
+	/**
+	 * Controls whether config values of on/true/yes and off/false/no get converted to boolean.
+	 *
+	 * @var boolean
+	 */
+	public $config_booleanize = true;
+
+	/**
+	 * Controls whether hidden config sections/vars are read from the file.
+	 *
+	 * @var boolean
+	 */
+	public $config_read_hidden = false;
+
+	/**
+	 * locking concurrent compiles
+	 *
+	 * @var boolean
+	 */
+	public $compile_locking = true;
+
+	/**
+	 * Controls whether cache resources should use locking mechanism
+	 *
+	 * @var boolean
+	 */
+	public $cache_locking = false;
+
+	/**
+	 * seconds to wait for acquiring a lock before ignoring the write lock
+	 *
+	 * @var float
+	 */
+	public $locking_timeout = 10;
+
+	/**
+	 * resource type used if none given
+	 * Must be a valid key of $registered_resources.
+	 *
+	 * @var string
+	 */
+	public $default_resource_type = 'file';
+
+	/**
+	 * cache resource
+	 * Must be a subclass of \Smarty\Cacheresource\Base
+	 *
+	 * @var \Smarty\Cacheresource\Base
+	 */
+	private $cacheResource;
+
+	/**
+	 * config type
+	 *
+	 * @var string
+	 */
+	public $default_config_type = 'file';
+
+	/**
+	 * check If-Modified-Since headers
+	 *
+	 * @var boolean
+	 */
+	public $cache_modified_check = false;
+
+	/**
+	 * registered plugins
+	 *
+	 * @var array
+	 */
+	public $registered_plugins = [];
+
+	/**
+	 * registered objects
+	 *
+	 * @var array
+	 */
+	public $registered_objects = [];
+
+	/**
+	 * registered classes
+	 *
+	 * @var array
+	 */
+	public $registered_classes = [];
+
+	/**
+	 * registered resources
+	 *
+	 * @var array
+	 */
+	public $registered_resources = [];
+
+	/**
+	 * registered cache resources
+	 *
+	 * @var array
+	 * @deprecated since 5.0
+	 */
+	private $registered_cache_resources = [];
+
+	/**
+	 * default modifier
+	 *
+	 * @var array
+	 */
+	public $default_modifiers = [];
+
+	/**
+	 * autoescape variable output
+	 *
+	 * @var boolean
+	 */
+	public $escape_html = false;
+
+	/**
+	 * start time for execution time calculation
+	 *
+	 * @var int
+	 */
+	public $start_time = 0;
+
+	/**
+	 * internal flag to enable parser debugging
+	 *
+	 * @var bool
+	 */
+	public $_parserdebug = false;
+
+	/**
+	 * Debug object
+	 *
+	 * @var \Smarty\Debug
+	 */
+	public $_debug = null;
+
+	/**
+	 * template directory
+	 *
+	 * @var array
+	 */
+	protected $template_dir = ['./templates/'];
+
+	/**
+	 * flags for normalized template directory entries
+	 *
+	 * @var array
+	 */
+	protected $_processedTemplateDir = [];
+
+	/**
+	 * config directory
+	 *
+	 * @var array
+	 */
+	protected $config_dir = ['./configs/'];
+
+	/**
+	 * flags for normalized template directory entries
+	 *
+	 * @var array
+	 */
+	protected $_processedConfigDir = [];
+
+	/**
+	 * compile directory
+	 *
+	 * @var string
+	 */
+	protected $compile_dir = './templates_c/';
+
+	/**
+	 * cache directory
+	 *
+	 * @var string
+	 */
+	protected $cache_dir = './cache/';
+
+	/**
+	 * PHP7 Compatibility mode
+	 *
+	 * @var bool
+	 */
+	private $isMutingUndefinedOrNullWarnings = false;
+
+	/**
+	 * Cache of loaded resource handlers.
+	 *
+	 * @var array
+	 */
+	public $_resource_handlers = [];
+
+	/**
+	 * Cache of loaded cacheresource handlers.
+	 *
+	 * @var array
+	 */
+	public $_cacheresource_handlers = [];
+
+	/**
+	 * List of extensions
+	 *
+	 * @var ExtensionInterface[]
+	 */
+	private $extensions = [];
+	/**
+	 * @var BCPluginsAdapter
+	 */
+	private $BCPluginsAdapter;
+
+	/**
+	 * Initialize new Smarty object
+	 */
+	public function __construct() {
+
+		$this->start_time = microtime(true);
+		// Check if we're running on Windows
+		\Smarty\Smarty::$_IS_WINDOWS = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
+		// let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
+		if (\Smarty\Smarty::$_CHARSET !== 'UTF-8') {
+			\Smarty\Smarty::$_UTF8_MODIFIER = '';
+		}
+
+		$this->BCPluginsAdapter = new BCPluginsAdapter($this);
+
+		$this->extensions[] = new CoreExtension();
+		$this->extensions[] = new DefaultExtension();
+		$this->extensions[] = $this->BCPluginsAdapter;
+
+		$this->cacheResource = new File();
+	}
+
+	/**
+	 * Load an additional extension.
+	 *
+	 * @return void
+	 */
+	public function addExtension(ExtensionInterface $extension) {
+		$this->extensions[] = $extension;
+	}
+
+	/**
+	 * Returns all loaded extensions
+	 *
+	 * @return array|ExtensionInterface[]
+	 */
+	public function getExtensions(): array {
+		return $this->extensions;
+	}
+
+	/**
+	 * Replace the entire list extensions, allowing you to determine the exact order of the extensions.
+	 *
+	 * @param ExtensionInterface[] $extensions
+	 *
+	 * @return void
+	 */
+	public function setExtensions(array $extensions): void {
+		$this->extensions = $extensions;
+	}
+
+	/**
+	 * Check if a template resource exists
+	 *
+	 * @param string $resource_name template name
+	 *
+	 * @return bool status
+	 * @throws \Smarty\Exception
+	 */
+	public function templateExists($resource_name) {
+		// create source object
+		$source = Template\Source::load(null, $this, $resource_name);
+		return $source->exists;
+	}
+
+	/**
+	 * Loads security class and enables security
+	 *
+	 * @param string|\Smarty\Security $security_class if a string is used, it must be class-name
+	 *
+	 * @return static                 current Smarty instance for chaining
+	 * @throws \Smarty\Exception
+	 */
+	public function enableSecurity($security_class = null) {
+		\Smarty\Security::enableSecurity($this, $security_class);
+		return $this;
+	}
+
+	/**
+	 * Disable security
+	 *
+	 * @return static current Smarty instance for chaining
+	 */
+	public function disableSecurity() {
+		$this->security_policy = null;
+		return $this;
+	}
+
+	/**
+	 * Add template directory(s)
+	 *
+	 * @param string|array $template_dir directory(s) of template sources
+	 * @param string $key of the array element to assign the template dir to
+	 * @param bool $isConfig true for config_dir
+	 *
+	 * @return static current Smarty instance for chaining
+	 */
+	public function addTemplateDir($template_dir, $key = null, $isConfig = false) {
+		if ($isConfig) {
+			$processed = &$this->_processedConfigDir;
+			$dir = &$this->config_dir;
+			$this->_configDirNormalized = false;
+		} else {
+			$processed = &$this->_processedTemplateDir;
+			$dir = &$this->template_dir;
+			$this->_templateDirNormalized = false;
+		}
+		if (is_array($template_dir)) {
+			foreach ($template_dir as $k => $v) {
+				if (is_int($k)) {
+					// indexes are not merged but appended
+					$dir[] = $v;
+				} else {
+					// string indexes are overridden
+					$dir[$k] = $v;
+					unset($processed[$key]);
+				}
+			}
+		} else {
+			if ($key !== null) {
+				// override directory at specified index
+				$dir[$key] = $template_dir;
+				unset($processed[$key]);
+			} else {
+				// append new directory
+				$dir[] = $template_dir;
+			}
+		}
+		return $this;
+	}
+
+	/**
+	 * Get template directories
+	 *
+	 * @param mixed $index index of directory to get, null to get all
+	 * @param bool $isConfig true for config_dir
+	 *
+	 * @return array|string list of template directories, or directory of $index
+	 */
+	public function getTemplateDir($index = null, $isConfig = false) {
+		if ($isConfig) {
+			$dir = &$this->config_dir;
+		} else {
+			$dir = &$this->template_dir;
+		}
+		if ($isConfig ? !$this->_configDirNormalized : !$this->_templateDirNormalized) {
+			$this->_normalizeTemplateConfig($isConfig);
+		}
+		if ($index !== null) {
+			return isset($dir[$index]) ? $dir[$index] : null;
+		}
+		return $dir;
+	}
+
+	/**
+	 * Set template directory
+	 *
+	 * @param string|array $template_dir directory(s) of template sources
+	 * @param bool $isConfig true for config_dir
+	 *
+	 * @return static current Smarty instance for chaining
+	 */
+	public function setTemplateDir($template_dir, $isConfig = false) {
+		if ($isConfig) {
+			$this->config_dir = [];
+			$this->_processedConfigDir = [];
+		} else {
+			$this->template_dir = [];
+			$this->_processedTemplateDir = [];
+		}
+		$this->addTemplateDir($template_dir, null, $isConfig);
+		return $this;
+	}
+
+	/**
+	 * Add config directory(s)
+	 *
+	 * @param string|array $config_dir directory(s) of config sources
+	 * @param mixed $key key of the array element to assign the config dir to
+	 *
+	 * @return static current Smarty instance for chaining
+	 */
+	public function addConfigDir($config_dir, $key = null) {
+		return $this->addTemplateDir($config_dir, $key, true);
+	}
+
+	/**
+	 * Get config directory
+	 *
+	 * @param mixed $index index of directory to get, null to get all
+	 *
+	 * @return array configuration directory
+	 */
+	public function getConfigDir($index = null) {
+		return $this->getTemplateDir($index, true);
+	}
+
+	/**
+	 * Set config directory
+	 *
+	 * @param $config_dir
+	 *
+	 * @return static current Smarty instance for chaining
+	 */
+	public function setConfigDir($config_dir) {
+		return $this->setTemplateDir($config_dir, true);
+	}
+
+	/**
+	 * Registers plugin to be used in templates
+	 *
+	 * @param string $type plugin type
+	 * @param string $name name of template tag
+	 * @param callable $callback PHP callback to register
+	 * @param bool $cacheable if true (default) this function is cache able
+	 *
+	 * @return $this
+	 * @throws \Smarty\Exception
+	 *
+	 * @api  Smarty::registerPlugin()
+	 */
+	public function registerPlugin($type, $name, $callback, $cacheable = true) {
+		if (isset($this->registered_plugins[$type][$name])) {
+			throw new Exception("Plugin tag '{$name}' already registered");
+		} elseif (!is_callable($callback) && !class_exists($callback)) {
+			throw new Exception("Plugin '{$name}' not callable");
+		} else {
+			$this->registered_plugins[$type][$name] = [$callback, (bool)$cacheable];
+		}
+		return $this;
+	}
+
+	/**
+	 * Returns plugin previously registered using ::registerPlugin as a numerical array as follows or null if not found:
+	 * [
+	 *  0 => the callback
+	 *  1 => (bool) $cacheable
+	 *  2 => (array) $cache_attr
+	 * ]
+	 *
+	 * @param string $type plugin type
+	 * @param string $name name of template tag
+	 *
+	 * @return array|null
+	 *
+	 * @api  Smarty::unregisterPlugin()
+	 */
+	public function getRegisteredPlugin($type, $name): ?array {
+		if (isset($this->registered_plugins[$type][$name])) {
+			return $this->registered_plugins[$type][$name];
+		}
+		return null;
+	}
+
+	/**
+	 * Unregisters plugin previously registered using ::registerPlugin
+	 *
+	 * @param string $type plugin type
+	 * @param string $name name of template tag
+	 *
+	 * @return $this
+	 *
+	 * @api  Smarty::unregisterPlugin()
+	 */
+	public function unregisterPlugin($type, $name) {
+		if (isset($this->registered_plugins[$type][$name])) {
+			unset($this->registered_plugins[$type][$name]);
+		}
+		return $this;
+	}
+
+	/**
+	 * Adds directory of plugin files
+	 *
+	 * @param null|array|string $plugins_dir
+	 *
+	 * @return static current Smarty instance for chaining
+	 * @deprecated since 5.0
+	 */
+	public function addPluginsDir($plugins_dir) {
+		trigger_error('Using Smarty::addPluginsDir() to load plugins is deprecated and will be ' .
+			'removed in a future release. Use Smarty::addExtension() to add an extension or Smarty::registerPlugin to ' .
+			'quickly register a plugin using a callback function.', E_USER_DEPRECATED);
+
+		foreach ((array)$plugins_dir as $v) {
+			$path = $this->_realpath(rtrim($v ?? '', '/\\') . DIRECTORY_SEPARATOR, true);
+			$this->BCPluginsAdapter->loadPluginsFromDir($path);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get plugin directories
+	 *
+	 * @return array list of plugin directories
+	 * @deprecated since 5.0
+	 */
+	public function getPluginsDir() {
+		trigger_error('Using Smarty::getPluginsDir() is deprecated and will be ' .
+			'removed in a future release. It will always return an empty array.', E_USER_DEPRECATED);
+		return [];
+	}
+
+	/**
+	 * Set plugins directory
+	 *
+	 * @param string|array $plugins_dir directory(s) of plugins
+	 *
+	 * @return static current Smarty instance for chaining
+	 * @deprecated since 5.0
+	 */
+	public function setPluginsDir($plugins_dir) {
+		trigger_error('Using Smarty::getPluginsDir() is deprecated and will be ' .
+			'removed in a future release. For now, it will remove the DefaultExtension from the extensions list and ' .
+			'proceed to call Smartyy::addPluginsDir..', E_USER_DEPRECATED);
+
+		$this->extensions = array_filter(
+			$this->extensions,
+			function ($extension) {
+				return !($extension instanceof DefaultExtension);
+			}
+		);
+
+		return $this->addPluginsDir($plugins_dir);
+	}
+
+	/**
+	 * Registers a default plugin handler
+	 *
+	 * @param callable $callback class/method name
+	 *
+	 * @return $this
+	 * @throws Exception              if $callback is not callable
+	 *
+	 * @api  Smarty::registerDefaultPluginHandler()
+	 *
+	 * @deprecated since 5.0
+	 */
+	public function registerDefaultPluginHandler($callback) {
+
+		trigger_error('Using Smarty::registerDefaultPluginHandler() is deprecated and will be ' .
+			'removed in a future release. Please rewrite your plugin handler as an extension.',
+			E_USER_DEPRECATED);
+
+		if (is_callable($callback)) {
+			$this->default_plugin_handler_func = $callback;
+		} else {
+			throw new Exception("Default plugin handler '$callback' not callable");
+		}
+		return $this;
+	}
+
+	/**
+	 * Get compiled directory
+	 *
+	 * @return string path to compiled templates
+	 */
+	public function getCompileDir() {
+		if (!$this->_compileDirNormalized) {
+			$this->_normalizeDir('compile_dir', $this->compile_dir);
+			$this->_compileDirNormalized = true;
+		}
+		return $this->compile_dir;
+	}
+
+	/**
+	 *
+	 * @param string $compile_dir directory to store compiled templates in
+	 *
+	 * @return static current Smarty instance for chaining
+	 */
+	public function setCompileDir($compile_dir) {
+		$this->_normalizeDir('compile_dir', $compile_dir);
+		$this->_compileDirNormalized = true;
+		return $this;
+	}
+
+	/**
+	 * Get cache directory
+	 *
+	 * @return string path of cache directory
+	 */
+	public function getCacheDir() {
+		if (!$this->_cacheDirNormalized) {
+			$this->_normalizeDir('cache_dir', $this->cache_dir);
+			$this->_cacheDirNormalized = true;
+		}
+		return $this->cache_dir;
+	}
+
+	/**
+	 * Set cache directory
+	 *
+	 * @param string $cache_dir directory to store cached templates in
+	 *
+	 * @return static current Smarty instance for chaining
+	 */
+	public function setCacheDir($cache_dir) {
+		$this->_normalizeDir('cache_dir', $cache_dir);
+		$this->_cacheDirNormalized = true;
+		return $this;
+	}
+
+	private $templates = [];
+
+	/**
+	 * Creates a template object
+	 *
+	 * @param string $template_name
+	 * @param mixed $cache_id cache id to be used with this template
+	 * @param mixed $compile_id compile id to be used with this template
+	 * @param null $parent next higher level of Smarty variables
+	 *
+	 * @return Template template object
+	 * @throws Exception
+	 */
+	public function createTemplate($template_name, $cache_id = null, $compile_id = null, $parent = null): Template {
+
+		$data = [];
+
+		// Shuffle params for backward compatibility: if 2nd param is an object, it's the parent
+		if (is_object($cache_id)) {
+			$parent = $cache_id;
+			$cache_id = null;
+		}
+
+		// Shuffle params for backward compatibility: if 2nd param is an array, it's data
+		if (is_array($cache_id)) {
+			$data = $cache_id;
+			$cache_id = null;
+		}
+
+		return $this->doCreateTemplate($template_name, $cache_id, $compile_id, $parent, null, null, false, $data);
+	}
+
+	/**
+	 * Get unique template id
+	 *
+	 * @param string $resource_name
+	 * @param null|mixed $cache_id
+	 * @param null|mixed $compile_id
+	 * @param null $caching
+	 *
+	 * @return string
+	 */
+	private function generateUniqueTemplateId(
+		$resource_name,
+		$cache_id = null,
+		$compile_id = null,
+		$caching = null
+	): string {
+		// defaults for optional params
+		$cache_id = $cache_id ?? $this->cache_id;
+		$compile_id = $compile_id ?? $this->compile_id;
+		$caching = (int)$caching ?? $this->caching;
+
+		// Add default resource type to resource name if it is missing
+		if (strpos($resource_name, ':') === false) {
+			$resource_name = "{$this->default_resource_type}:{$resource_name}";
+		}
+
+		$_templateId = $resource_name . '#' . $cache_id . '#' . $compile_id . '#' . $caching;
+
+		// hash very long IDs to prevent problems with filename length
+		// do not hash shorter IDs, so they remain recognizable
+		if (strlen($_templateId) > 150) {
+			$_templateId = sha1($_templateId);
+		}
+
+		return $_templateId;
+	}
+
+	/**
+	 * Normalize path
+	 *  - remove /./ and /../
+	 *  - make it absolute if required
+	 *
+	 * @param string $path file path
+	 * @param bool $realpath if true - convert to absolute
+	 *                         false - convert to relative
+	 *                         null - keep as it is but
+	 *                         remove /./ /../
+	 *
+	 * @return string
+	 */
+	public function _realpath($path, $realpath = null) {
+		$nds = ['/' => '\\', '\\' => '/'];
+		preg_match(
+			'%^(?<root>(?:[[:alpha:]]:[\\\\/]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?<path>(.*))$%u',
+			$path,
+			$parts
+		);
+		$path = $parts['path'];
+		if ($parts['root'] === '\\') {
+			$parts['root'] = substr(getcwd(), 0, 2) . $parts['root'];
+		} else {
+			if ($realpath !== null && !$parts['root']) {
+				$path = getcwd() . DIRECTORY_SEPARATOR . $path;
+			}
+		}
+		// normalize DIRECTORY_SEPARATOR
+		$path = str_replace($nds[DIRECTORY_SEPARATOR], DIRECTORY_SEPARATOR, $path);
+		$parts['root'] = str_replace($nds[DIRECTORY_SEPARATOR], DIRECTORY_SEPARATOR, $parts['root']);
+		do {
+			$path = preg_replace(
+				['#[\\\\/]{2}#', '#[\\\\/][.][\\\\/]#', '#[\\\\/]([^\\\\/.]+)[\\\\/][.][.][\\\\/]#'],
+				DIRECTORY_SEPARATOR,
+				$path,
+				-1,
+				$count
+			);
+		} while ($count > 0);
+		return $realpath !== false ? $parts['root'] . $path : str_ireplace(getcwd(), '.', $parts['root'] . $path);
+	}
+
+	/**
+	 * @param boolean $use_sub_dirs
+	 */
+	public function setUseSubDirs($use_sub_dirs) {
+		$this->use_sub_dirs = $use_sub_dirs;
+	}
+
+	/**
+	 * @param int $error_reporting
+	 */
+	public function setErrorReporting($error_reporting) {
+		$this->error_reporting = $error_reporting;
+	}
+
+	/**
+	 * @param boolean $escape_html
+	 */
+	public function setEscapeHtml($escape_html) {
+		$this->escape_html = $escape_html;
+	}
+
+	/**
+	 * Return auto_literal flag
+	 *
+	 * @return boolean
+	 */
+	public function getAutoLiteral() {
+		return $this->auto_literal;
+	}
+
+	/**
+	 * Set auto_literal flag
+	 *
+	 * @param boolean $auto_literal
+	 */
+	public function setAutoLiteral($auto_literal = true) {
+		$this->auto_literal = $auto_literal;
+	}
+
+	/**
+	 * @param boolean $force_compile
+	 */
+	public function setForceCompile($force_compile) {
+		$this->force_compile = $force_compile;
+	}
+
+	/**
+	 * @param boolean $merge_compiled_includes
+	 */
+	public function setMergeCompiledIncludes($merge_compiled_includes) {
+		$this->merge_compiled_includes = $merge_compiled_includes;
+	}
+
+	/**
+	 * Get left delimiter
+	 *
+	 * @return string
+	 */
+	public function getLeftDelimiter() {
+		return $this->left_delimiter;
+	}
+
+	/**
+	 * Set left delimiter
+	 *
+	 * @param string $left_delimiter
+	 */
+	public function setLeftDelimiter($left_delimiter) {
+		$this->left_delimiter = $left_delimiter;
+	}
+
+	/**
+	 * Get right delimiter
+	 *
+	 * @return string $right_delimiter
+	 */
+	public function getRightDelimiter() {
+		return $this->right_delimiter;
+	}
+
+	/**
+	 * Set right delimiter
+	 *
+	 * @param string
+	 */
+	public function setRightDelimiter($right_delimiter) {
+		$this->right_delimiter = $right_delimiter;
+	}
+
+	/**
+	 * @param boolean $debugging
+	 */
+	public function setDebugging($debugging) {
+		$this->debugging = $debugging;
+	}
+
+	/**
+	 * @param boolean $config_overwrite
+	 */
+	public function setConfigOverwrite($config_overwrite) {
+		$this->config_overwrite = $config_overwrite;
+	}
+
+	/**
+	 * @param boolean $config_booleanize
+	 */
+	public function setConfigBooleanize($config_booleanize) {
+		$this->config_booleanize = $config_booleanize;
+	}
+
+	/**
+	 * @param boolean $config_read_hidden
+	 */
+	public function setConfigReadHidden($config_read_hidden) {
+		$this->config_read_hidden = $config_read_hidden;
+	}
+
+	/**
+	 * @param boolean $compile_locking
+	 */
+	public function setCompileLocking($compile_locking) {
+		$this->compile_locking = $compile_locking;
+	}
+
+	/**
+	 * @param string $default_resource_type
+	 */
+	public function setDefaultResourceType($default_resource_type) {
+		$this->default_resource_type = $default_resource_type;
+	}
+
+	/**
+	 * Test install
+	 *
+	 * @param null $errors
+	 */
+	public function testInstall(&$errors = null) {
+		\Smarty\TestInstall::testInstall($this, $errors);
+	}
+
+	/**
+	 * Get Smarty object
+	 *
+	 * @return static
+	 */
+	public function getSmarty() {
+		return $this;
+	}
+
+	/**
+	 * Normalize and set directory string
+	 *
+	 * @param string $dirName cache_dir or compile_dir
+	 * @param string $dir filepath of folder
+	 */
+	private function _normalizeDir($dirName, $dir) {
+		$this->{$dirName} = $this->_realpath(rtrim($dir ?? '', "/\\") . DIRECTORY_SEPARATOR, true);
+	}
+
+	/**
+	 * Normalize template_dir or config_dir
+	 *
+	 * @param bool $isConfig true for config_dir
+	 */
+	private function _normalizeTemplateConfig($isConfig) {
+		if ($isConfig) {
+			$processed = &$this->_processedConfigDir;
+			$dir = &$this->config_dir;
+		} else {
+			$processed = &$this->_processedTemplateDir;
+			$dir = &$this->template_dir;
+		}
+		if (!is_array($dir)) {
+			$dir = (array)$dir;
+		}
+		foreach ($dir as $k => $v) {
+			if (!isset($processed[$k])) {
+				$dir[$k] = $this->_realpath(rtrim($v ?? '', "/\\") . DIRECTORY_SEPARATOR, true);
+				$processed[$k] = true;
+			}
+		}
+
+		if ($isConfig) {
+			$this->_configDirNormalized = true;
+			$this->_joined_config_dir = join('#', $this->config_dir);
+		} else {
+			$this->_templateDirNormalized = true;
+			$this->_joined_template_dir = join('#', $this->template_dir);
+		}
+
+	}
+
+	/**
+	 * Mutes errors for "undefined index", "undefined array key" and "trying to read property of null".
+	 *
+	 * @void
+	 */
+	public function muteUndefinedOrNullWarnings(): void {
+		$this->isMutingUndefinedOrNullWarnings = true;
+	}
+
+	/**
+	 * Indicates if Smarty will mute errors for "undefined index", "undefined array key" and "trying to read property of null".
+	 *
+	 * @return bool
+	 */
+	public function isMutingUndefinedOrNullWarnings(): bool {
+		return $this->isMutingUndefinedOrNullWarnings;
+	}
+
+	/**
+	 * Empty cache for a specific template
+	 *
+	 * @param string $template_name template name
+	 * @param string $cache_id cache id
+	 * @param string $compile_id compile id
+	 * @param integer $exp_time expiration time
+	 * @param string $type resource type
+	 *
+	 * @return int number of cache files deleted
+	 * @throws \Smarty\Exception
+	 *
+	 * @api  Smarty::clearCache()
+	 */
+	public function clearCache(
+		$template_name,
+		$cache_id = null,
+		$compile_id = null,
+		$exp_time = null
+	) {
+		return $this->getCacheResource()->clear($this, $template_name, $cache_id, $compile_id, $exp_time);
+	}
+
+	/**
+	 * Empty cache folder
+	 *
+	 * @param integer $exp_time expiration time
+	 * @param string $type resource type
+	 *
+	 * @return int number of cache files deleted
+	 *
+	 * @api  Smarty::clearAllCache()
+	 */
+	public function clearAllCache($exp_time = null) {
+		return $this->getCacheResource()->clearAll($this, $exp_time);
+	}
+
+	/**
+	 * Delete compiled template file
+	 *
+	 * @param string $resource_name template name
+	 * @param string $compile_id compile id
+	 * @param integer $exp_time expiration time
+	 *
+	 * @return int number of template files deleted
+	 * @throws \Smarty\Exception
+	 *
+	 * @api  Smarty::clearCompiledTemplate()
+	 */
+	public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null) {
+		$_compile_dir = $this->getCompileDir();
+		if ($_compile_dir === '/') { //We should never want to delete this!
+			return 0;
+		}
+		$_compile_id = isset($compile_id) ? preg_replace('![^\w]+!', '_', $compile_id) : null;
+		$_dir_sep = $this->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
+		if (isset($resource_name)) {
+			$_save_stat = $this->caching;
+			$this->caching = \Smarty\Smarty::CACHING_OFF;
+			/* @var Template $tpl */
+			$tpl = $this->doCreateTemplate($resource_name);
+			$this->caching = $_save_stat;
+			if (!$tpl->getSource()->handler->recompiled && $tpl->getSource()->exists) {
+				$_resource_part_1 = basename(str_replace('^', DIRECTORY_SEPARATOR, $tpl->getCompiled()->filepath));
+				$_resource_part_1_length = strlen($_resource_part_1);
+			} else {
+				return 0;
+			}
+			$_resource_part_2 = str_replace('.php', '.cache.php', $_resource_part_1);
+			$_resource_part_2_length = strlen($_resource_part_2);
+		}
+		$_dir = $_compile_dir;
+		if ($this->use_sub_dirs && isset($_compile_id)) {
+			$_dir .= $_compile_id . $_dir_sep;
+		}
+		if (isset($_compile_id)) {
+			$_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep;
+			$_compile_id_part_length = strlen($_compile_id_part);
+		}
+		$_count = 0;
+		try {
+			$_compileDirs = new RecursiveDirectoryIterator($_dir);
+		} catch (\UnexpectedValueException $e) {
+			// path not found / not a dir
+			return 0;
+		}
+		$_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
+		foreach ($_compile as $_file) {
+			if (substr(basename($_file->getPathname()), 0, 1) === '.') {
+				continue;
+			}
+			$_filepath = (string)$_file;
+			if ($_file->isDir()) {
+				if (!$_compile->isDot()) {
+					// delete folder if empty
+					@rmdir($_file->getPathname());
+				}
+			} else {
+				// delete only php files
+				if (substr($_filepath, -4) !== '.php') {
+					continue;
+				}
+				$unlink = false;
+				if ((!isset($_compile_id) ||
+						(isset($_filepath[$_compile_id_part_length]) &&
+							$a = !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length)))
+					&& (!isset($resource_name) || (isset($_filepath[$_resource_part_1_length])
+							&& substr_compare(
+								$_filepath,
+								$_resource_part_1,
+								-$_resource_part_1_length,
+								$_resource_part_1_length
+							) === 0) || (isset($_filepath[$_resource_part_2_length])
+							&& substr_compare(
+								$_filepath,
+								$_resource_part_2,
+								-$_resource_part_2_length,
+								$_resource_part_2_length
+							) === 0))
+				) {
+					if (isset($exp_time)) {
+						if (is_file($_filepath) && time() - filemtime($_filepath) >= $exp_time) {
+							$unlink = true;
+						}
+					} else {
+						$unlink = true;
+					}
+				}
+				if ($unlink && is_file($_filepath) && @unlink($_filepath)) {
+					$_count++;
+					if (function_exists('opcache_invalidate')
+						&& (!function_exists('ini_get') || strlen(ini_get('opcache.restrict_api')) < 1)
+					) {
+						opcache_invalidate($_filepath, true);
+					} elseif (function_exists('apc_delete_file')) {
+						apc_delete_file($_filepath);
+					}
+				}
+			}
+		}
+		return $_count;
+	}
+
+	/**
+	 * Compile all template files
+	 *
+	 * @param string $extension file extension
+	 * @param bool $force_compile force all to recompile
+	 * @param int $time_limit
+	 * @param int $max_errors
+	 *
+	 * @return integer number of template files recompiled
+	 * @api Smarty::compileAllTemplates()
+	 *
+	 */
+	public function compileAllTemplates(
+		$extension = '.tpl',
+		$force_compile = false,
+		$time_limit = 0,
+		$max_errors = null
+	) {
+		return $this->compileAll($extension, $force_compile, $time_limit, $max_errors);
+	}
+
+	/**
+	 * Compile all config files
+	 *
+	 * @param string $extension file extension
+	 * @param bool $force_compile force all to recompile
+	 * @param int $time_limit
+	 * @param int $max_errors
+	 *
+	 * @return int number of template files recompiled
+	 * @api Smarty::compileAllConfig()
+	 *
+	 */
+	public function compileAllConfig(
+		$extension = '.conf',
+		$force_compile = false,
+		$time_limit = 0,
+		$max_errors = null
+	) {
+		return $this->compileAll($extension, $force_compile, $time_limit, $max_errors, true);
+	}
+
+	/**
+	 * Compile all template or config files
+	 *
+	 * @param string $extension template file name extension
+	 * @param bool $force_compile force all to recompile
+	 * @param int $time_limit set maximum execution time
+	 * @param int $max_errors set maximum allowed errors
+	 * @param bool $isConfig flag true if called for config files
+	 *
+	 * @return int number of template files compiled
+	 */
+	protected function compileAll(
+		$extension,
+		$force_compile,
+		$time_limit,
+		$max_errors,
+		$isConfig = false
+	) {
+		// switch off time limit
+		if (function_exists('set_time_limit')) {
+			@set_time_limit($time_limit);
+		}
+		$_count = 0;
+		$_error_count = 0;
+		$sourceDir = $isConfig ? $this->getConfigDir() : $this->getTemplateDir();
+		// loop over array of source directories
+		foreach ($sourceDir as $_dir) {
+			$_dir_1 = new RecursiveDirectoryIterator(
+				$_dir,
+				defined('FilesystemIterator::FOLLOW_SYMLINKS') ?
+					FilesystemIterator::FOLLOW_SYMLINKS : 0
+			);
+			$_dir_2 = new RecursiveIteratorIterator($_dir_1);
+			foreach ($_dir_2 as $_fileinfo) {
+				$_file = $_fileinfo->getFilename();
+				if (substr(basename($_fileinfo->getPathname()), 0, 1) === '.' || strpos($_file, '.svn') !== false) {
+					continue;
+				}
+				if (substr_compare($_file, $extension, -strlen($extension)) !== 0) {
+					continue;
+				}
+				if ($_fileinfo->getPath() !== substr($_dir, 0, -1)) {
+					$_file = substr($_fileinfo->getPath(), strlen($_dir)) . DIRECTORY_SEPARATOR . $_file;
+				}
+				echo "\n", $_dir, '---', $_file;
+				flush();
+				$_start_time = microtime(true);
+				$_smarty = clone $this;
+				//
+				$_smarty->force_compile = $force_compile;
+				try {
+					$_tpl = $this->doCreateTemplate($_file);
+					$_tpl->caching = self::CACHING_OFF;
+					$_tpl->setSource(
+						$isConfig ? \Smarty\Template\Config::load($_tpl) : \Smarty\Template\Source::load($_tpl)
+					);
+					if ($_tpl->mustCompile()) {
+						$_tpl->compileTemplateSource();
+						$_count++;
+						echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
+						flush();
+					} else {
+						echo ' is up to date';
+						flush();
+					}
+				} catch (\Exception $e) {
+					echo "\n        ------>Error: ", $e->getMessage(), "\n";
+					$_error_count++;
+				}
+				// free memory
+				unset($_tpl);
+				if ($max_errors !== null && $_error_count === $max_errors) {
+					echo "\ntoo many errors\n";
+					exit(1);
+				}
+			}
+		}
+		echo "\n";
+		return $_count;
+	}
+
+	/**
+	 * check client side cache
+	 *
+	 * @param \Smarty\Template\Cached $cached
+	 * @param Template $_template
+	 * @param string $content
+	 *
+	 * @throws \Exception
+	 * @throws \Smarty\Exception
+	 */
+	public function cacheModifiedCheck(Template\Cached $cached, Template $_template, $content) {
+		$_isCached = $_template->isCached() && !$_template->getCompiled()->getNocacheCode();
+		$_last_modified_date =
+			@substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
+		if ($_isCached && $cached->timestamp <= strtotime($_last_modified_date)) {
+			switch (PHP_SAPI) {
+				case 'cgi': // php-cgi < 5.3
+				case 'cgi-fcgi': // php-cgi >= 5.3
+				case 'fpm-fcgi': // php-fpm >= 5.3.3
+					header('Status: 304 Not Modified');
+					break;
+				case 'cli':
+					if (/* ^phpunit */
+					!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
+					) {
+						$_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
+					}
+					break;
+				default:
+					if (/* ^phpunit */
+					!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
+					) {
+						$_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
+					} else {
+						header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified');
+					}
+					break;
+			}
+		} else {
+			switch (PHP_SAPI) {
+				case 'cli':
+					if (/* ^phpunit */
+					!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS']) /* phpunit$ */
+					) {
+						$_SERVER['SMARTY_PHPUNIT_HEADERS'][] =
+							'Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT';
+					}
+					break;
+				default:
+					header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $cached->timestamp) . ' GMT');
+					break;
+			}
+			echo $content;
+		}
+	}
+
+	public function getModifierCallback(string $modifierName) {
+		foreach ($this->getExtensions() as $extension) {
+			if ($callback = $extension->getModifierCallback($modifierName)) {
+				return [new CallbackWrapper($modifierName, $callback), 'handle'];
+			}
+		}
+		return null;
+	}
+
+	public function getFunctionHandler(string $functionName): ?\Smarty\FunctionHandler\FunctionHandlerInterface {
+		foreach ($this->getExtensions() as $extension) {
+			if ($handler = $extension->getFunctionHandler($functionName)) {
+				return $handler;
+			}
+		}
+		return null;
+	}
+
+	public function getBlockHandler(string $blockTagName): ?\Smarty\BlockHandler\BlockHandlerInterface {
+		foreach ($this->getExtensions() as $extension) {
+			if ($handler = $extension->getBlockHandler($blockTagName)) {
+				return $handler;
+			}
+		}
+		return null;
+	}
+
+	public function getModifierCompiler(string $modifier): ?\Smarty\Compile\Modifier\ModifierCompilerInterface {
+		foreach ($this->getExtensions() as $extension) {
+			if ($handler = $extension->getModifierCompiler($modifier)) {
+				return $handler;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Run pre-filters over template source
+	 *
+	 * @param string $source the content which shall be processed by the filters
+	 * @param Template $template template object
+	 *
+	 * @return string                   the filtered source
+	 */
+	public function runPreFilters($source, Template $template) {
+
+		foreach ($this->getExtensions() as $extension) {
+			/** @var \Smarty\Filter\FilterInterface $filter */
+			foreach ($extension->getPreFilters() as $filter) {
+				$source = $filter->filter($source, $template);
+			}
+		}
+
+		// return filtered output
+		return $source;
+	}
+
+	/**
+	 * Run post-filters over template's compiled code
+	 *
+	 * @param string $code the content which shall be processed by the filters
+	 * @param Template $template template object
+	 *
+	 * @return string                   the filtered code
+	 */
+	public function runPostFilters($code, Template $template) {
+
+		foreach ($this->getExtensions() as $extension) {
+			/** @var \Smarty\Filter\FilterInterface $filter */
+			foreach ($extension->getPostFilters() as $filter) {
+				$code = $filter->filter($code, $template);
+			}
+		}
+
+		// return filtered output
+		return $code;
+	}
+
+	/**
+	 * Run filters over template output
+	 *
+	 * @param string $content the content which shall be processed by the filters
+	 * @param Template $template template object
+	 *
+	 * @return string                   the filtered (modified) output
+	 */
+	public function runOutputFilters($content, Template $template) {
+
+		foreach ($this->getExtensions() as $extension) {
+			/** @var \Smarty\Filter\FilterInterface $filter */
+			foreach ($extension->getOutputFilters() as $filter) {
+				$content = $filter->filter($content, $template);
+			}
+		}
+
+		// return filtered output
+		return $content;
+	}
+
+	/**
+	 * Writes file in a safe way to disk
+	 *
+	 * @param string $_filepath complete filepath
+	 * @param string $_contents file content
+	 *
+	 * @return boolean true
+	 * @throws Exception
+	 */
+	public function writeFile($_filepath, $_contents) {
+		$_error_reporting = error_reporting();
+		error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
+		$_dirpath = dirname($_filepath);
+		// if subdirs, create dir structure
+		if ($_dirpath !== '.') {
+			$i = 0;
+			// loop if concurrency problem occurs
+			// see https://bugs.php.net/bug.php?id=35326
+			while (!is_dir($_dirpath)) {
+				if (@mkdir($_dirpath, 0777, true)) {
+					break;
+				}
+				clearstatcache();
+				if (++$i === 3) {
+					error_reporting($_error_reporting);
+					throw new Exception("unable to create directory {$_dirpath}");
+				}
+				sleep(1);
+			}
+		}
+		// write to tmp file, then move to overt file lock race condition
+		$_tmp_file = $_dirpath . DIRECTORY_SEPARATOR . str_replace(['.', ','], '_', uniqid('wrt', true));
+		if (!file_put_contents($_tmp_file, $_contents)) {
+			error_reporting($_error_reporting);
+			throw new Exception("unable to write file {$_tmp_file}");
+		}
+		/*
+		 * Windows' rename() fails if the destination exists,
+		 * Linux' rename() properly handles the overwrite.
+		 * Simply unlink()ing a file might cause other processes
+		 * currently reading that file to fail, but linux' rename()
+		 * seems to be smart enough to handle that for us.
+		 */
+		if (\Smarty\Smarty::$_IS_WINDOWS) {
+			// remove original file
+			if (is_file($_filepath)) {
+				@unlink($_filepath);
+			}
+			// rename tmp file
+			$success = @rename($_tmp_file, $_filepath);
+		} else {
+			// rename tmp file
+			$success = @rename($_tmp_file, $_filepath);
+			if (!$success) {
+				// remove original file
+				if (is_file($_filepath)) {
+					@unlink($_filepath);
+				}
+				// rename tmp file
+				$success = @rename($_tmp_file, $_filepath);
+			}
+		}
+		if (!$success) {
+			error_reporting($_error_reporting);
+			throw new Exception("unable to write file {$_filepath}");
+		}
+		// set file permissions
+		@chmod($_filepath, 0666 & ~umask());
+		error_reporting($_error_reporting);
+		return true;
+	}
+
+	private $runtimes = [];
+
+	/**
+	 * Loads and returns a runtime extension or null if not found
+	 *
+	 * @param string $type
+	 *
+	 * @return object|null
+	 */
+	public function getRuntime(string $type) {
+
+		if (isset($this->runtimes[$type])) {
+			return $this->runtimes[$type];
+		}
+
+		// Lazy load runtimes when/if needed
+		switch ($type) {
+			case 'Capture':
+				return $this->runtimes[$type] = new CaptureRuntime();
+			case 'Foreach':
+				return $this->runtimes[$type] = new ForeachRuntime();
+			case 'Inheritance':
+				return $this->runtimes[$type] = new InheritanceRuntime();
+			case 'TplFunction':
+				return $this->runtimes[$type] = new TplFunctionRuntime();
+			case 'DefaultPluginHandler':
+				return $this->runtimes[$type] = new DefaultPluginHandlerRuntime(
+					$this->getDefaultPluginHandlerFunc()
+				);
+		}
+
+		throw new \Smarty\Exception('Trying to load invalid runtime ' . $type);
+	}
+
+	/**
+	 * Indicates if a runtime is available.
+	 *
+	 * @param string $type
+	 *
+	 * @return bool
+	 */
+	public function hasRuntime(string $type): bool {
+		try {
+			$this->getRuntime($type);
+			return true;
+		} catch (\Smarty\Exception $e) {
+			return false;
+		}
+	}
+
+	/**
+	 * @return callable|null
+	 */
+	public function getDefaultPluginHandlerFunc(): ?callable {
+		return $this->default_plugin_handler_func;
+	}
+
+	/**
+	 * load a filter of specified type and name
+	 *
+	 * @param string $type filter type
+	 * @param string $name filter name
+	 *
+	 * @return bool
+	 * @throws \Smarty\Exception
+	 * @api  Smarty::loadFilter()
+	 *
+	 * @deprecated since 5.0
+	 */
+	public function loadFilter($type, $name) {
+
+		if ($type == \Smarty\Smarty::FILTER_VARIABLE) {
+			foreach ($this->getExtensions() as $extension) {
+				if ($extension->getModifierCallback($name)) {
+
+					trigger_error('Using Smarty::loadFilter() to load variable filters is deprecated and will ' .
+						'be removed in a future release. Use Smarty::addDefaultModifiers() to add a modifier.',
+						E_USER_DEPRECATED);
+
+					$this->addDefaultModifiers([$name]);
+					return true;
+				}
+			}
+		}
+
+		trigger_error('Using Smarty::loadFilter() to load filters is deprecated and will be ' .
+			'removed in a future release. Use Smarty::addExtension() to add an extension or Smarty::registerFilter to ' .
+			'quickly register a filter using a callback function.', E_USER_DEPRECATED);
+
+		if ($type == \Smarty\Smarty::FILTER_OUTPUT && $name == 'trimwhitespace') {
+			$this->BCPluginsAdapter->addOutputFilter(new TrimWhitespace());
+			return true;
+		}
+
+		$_plugin = "smarty_{$type}filter_{$name}";
+		if (!is_callable($_plugin) && class_exists($_plugin, false)) {
+			$_plugin = [$_plugin, 'execute'];
+		}
+
+		if (is_callable($_plugin)) {
+			$this->registerFilter($type, $_plugin, $name);
+			return true;
+		}
+
+		throw new Exception("{$type}filter '{$name}' not found or callable");
+	}
+
+	/**
+	 * load a filter of specified type and name
+	 *
+	 * @param string $type filter type
+	 * @param string $name filter name
+	 *
+	 * @return static
+	 * @throws \Smarty\Exception
+	 * @api  Smarty::unloadFilter()
+	 *
+	 *
+	 * @deprecated since 5.0
+	 */
+	public function unloadFilter($type, $name) {
+		trigger_error('Using Smarty::unloadFilter() to unload filters is deprecated and will be ' .
+			'removed in a future release. Use Smarty::addExtension() to add an extension or Smarty::(un)registerFilter to ' .
+			'quickly (un)register a filter using a callback function.', E_USER_DEPRECATED);
+
+		return $this->unregisterFilter($type, $name);
+	}
+
+	private $_caching_type = 'file';
+
+	/**
+	 * @param $type
+	 *
+	 * @return void
+	 * @deprecated since 5.0
+	 */
+	public function setCachingType($type) {
+		trigger_error('Using Smarty::setCachingType() is deprecated and will be ' .
+			'removed in a future release. Use Smarty::setCacheResource() instead.', E_USER_DEPRECATED);
+		$this->_caching_type = $type;
+		$this->activateBCCacheResource();
+	}
+
+	/**
+	 * @return string
+	 * @deprecated since 5.0
+	 */
+	public function getCachingType(): string {
+		trigger_error('Using Smarty::getCachingType() is deprecated and will be ' .
+			'removed in a future release.', E_USER_DEPRECATED);
+		return $this->_caching_type;
+	}
+
+	/**
+	 * Registers a resource to fetch a template
+	 *
+	 * @param string $name name of resource type
+	 * @param Base $resource_handler
+	 *
+	 * @return static
+	 *
+	 * @api  Smarty::registerCacheResource()
+	 *
+	 * @deprecated since 5.0
+	 */
+	public function registerCacheResource($name, \Smarty\Cacheresource\Base $resource_handler) {
+
+		trigger_error('Using Smarty::registerCacheResource() is deprecated and will be ' .
+			'removed in a future release. Use Smarty::setCacheResource() instead.', E_USER_DEPRECATED);
+
+		$this->registered_cache_resources[$name] = $resource_handler;
+		$this->activateBCCacheResource();
+		return $this;
+	}
+
+	/**
+	 * Unregisters a resource to fetch a template
+	 *
+	 * @param                                                                 $name
+	 *
+	 * @return static
+	 * @api  Smarty::unregisterCacheResource()
+	 *
+	 * @deprecated since 5.0
+	 *
+	 */
+	public function unregisterCacheResource($name) {
+
+		trigger_error('Using Smarty::unregisterCacheResource() is deprecated and will be ' .
+			'removed in a future release.', E_USER_DEPRECATED);
+
+		if (isset($this->registered_cache_resources[$name])) {
+			unset($this->registered_cache_resources[$name]);
+		}
+		return $this;
+	}
+
+	private function activateBCCacheResource() {
+		if ($this->_caching_type == 'file') {
+			$this->setCacheResource(new File());
+		}
+		if (isset($this->registered_cache_resources[$this->_caching_type])) {
+			$this->setCacheResource($this->registered_cache_resources[$this->_caching_type]);
+		}
+	}
+
+	/**
+	 * Registers a filter function
+	 *
+	 * @param string $type filter type
+	 * @param callable $callback
+	 * @param string|null $name optional filter name
+	 *
+	 * @return static
+	 * @throws \Smarty\Exception
+	 *
+	 * @api  Smarty::registerFilter()
+	 */
+	public function registerFilter($type, $callback, $name = null) {
+		$name = $name ?? $this->_getFilterName($callback);
+		if (!is_callable($callback)) {
+			throw new Exception("{$type}filter '{$name}' not callable");
+		}
+		switch ($type) {
+			case 'variable':
+				$this->registerPlugin(self::PLUGIN_MODIFIER, $name, $callback);
+				trigger_error('Using Smarty::registerFilter() to register variable filters is deprecated and ' .
+					'will be removed in a future release. Use Smarty::addDefaultModifiers() to add a modifier.',
+					E_USER_DEPRECATED);
+
+				$this->addDefaultModifiers([$name]);
+				break;
+			case 'output':
+				$this->BCPluginsAdapter->addCallableAsOutputFilter($callback, $name);
+				break;
+			case 'pre':
+				$this->BCPluginsAdapter->addCallableAsPreFilter($callback, $name);
+				break;
+			case 'post':
+				$this->BCPluginsAdapter->addCallableAsPostFilter($callback, $name);
+				break;
+			default:
+				throw new Exception("Illegal filter type '{$type}'");
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Return internal filter name
+	 *
+	 * @param callback $callable
+	 *
+	 * @return string|null   internal filter name or null if callable cannot be serialized
+	 */
+	private function _getFilterName($callable) {
+		if (is_array($callable)) {
+			$_class_name = is_object($callable[0]) ? get_class($callable[0]) : $callable[0];
+			return $_class_name . '_' . $callable[1];
+		} elseif (is_string($callable)) {
+			return $callable;
+		}
+		return null;
+	}
+
+	/**
+	 * Unregisters a filter function. Smarty cannot unregister closures/anonymous functions if
+	 * no name was given in ::registerFilter.
+	 *
+	 * @param string $type filter type
+	 * @param callback|string $name the name previously used in ::registerFilter
+	 *
+	 * @return static
+	 * @throws \Smarty\Exception
+	 * @api  Smarty::unregisterFilter()
+	 *
+	 *
+	 */
+	public function unregisterFilter($type, $name) {
+
+		if (!is_string($name)) {
+			$name = $this->_getFilterName($name);
+		}
+
+		if ($name) {
+			switch ($type) {
+				case 'output':
+					$this->BCPluginsAdapter->removeOutputFilter($name);
+					break;
+				case 'pre':
+					$this->BCPluginsAdapter->removePreFilter($name);
+					break;
+				case 'post':
+					$this->BCPluginsAdapter->removePostFilter($name);
+					break;
+				default:
+					throw new Exception("Illegal filter type '{$type}'");
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add default modifiers
+	 *
+	 * @param array|string $modifiers modifier or list of modifiers
+	 *                                                                                   to add
+	 *
+	 * @return static
+	 * @api Smarty::addDefaultModifiers()
+	 *
+	 */
+	public function addDefaultModifiers($modifiers) {
+		if (is_array($modifiers)) {
+			$this->default_modifiers = array_merge($this->default_modifiers, $modifiers);
+		} else {
+			$this->default_modifiers[] = $modifiers;
+		}
+		return $this;
+	}
+
+	/**
+	 * Get default modifiers
+	 *
+	 * @return array list of default modifiers
+	 * @api Smarty::getDefaultModifiers()
+	 *
+	 */
+	public function getDefaultModifiers() {
+		return $this->default_modifiers;
+	}
+
+	/**
+	 * Set default modifiers
+	 *
+	 * @param array|string $modifiers modifier or list of modifiers
+	 *                                                                                   to set
+	 *
+	 * @return static
+	 * @api Smarty::setDefaultModifiers()
+	 *
+	 */
+	public function setDefaultModifiers($modifiers) {
+		$this->default_modifiers = (array)$modifiers;
+		return $this;
+	}
+
+	/**
+	 * @return Cacheresource\Base
+	 */
+	public function getCacheResource(): Cacheresource\Base {
+		return $this->cacheResource;
+	}
+
+	/**
+	 * @param Cacheresource\Base $cacheResource
+	 */
+	public function setCacheResource(Cacheresource\Base $cacheResource): void {
+		$this->cacheResource = $cacheResource;
+	}
+
+	/**
+	 * fetches a rendered Smarty template
+	 *
+	 * @param string $template the resource handle of the template file or template object
+	 * @param mixed $cache_id cache id to be used with this template
+	 * @param mixed $compile_id compile id to be used with this template
+	 *
+	 * @return string rendered template output
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	public function fetch($template = null, $cache_id = null, $compile_id = null) {
+		return $this->returnOrCreateTemplate($template, $cache_id, $compile_id)->fetch();
+	}
+
+	/**
+	 * displays a Smarty template
+	 *
+	 * @param string $template the resource handle of the template file or template object
+	 * @param mixed $cache_id cache id to be used with this template
+	 * @param mixed $compile_id compile id to be used with this template
+	 *
+	 * @throws \Exception
+	 * @throws \Smarty\Exception
+	 */
+	public function display($template = null, $cache_id = null, $compile_id = null) {
+		$this->returnOrCreateTemplate($template, $cache_id, $compile_id)->display();
+	}
+
+	/**
+	 * @param $resource_name
+	 * @param $cache_id
+	 * @param $compile_id
+	 * @param $parent
+	 * @param $caching
+	 * @param $cache_lifetime
+	 * @param bool $isConfig
+	 * @param array $data
+	 *
+	 * @return Template
+	 * @throws Exception
+	 */
+	public function doCreateTemplate(
+		$resource_name,
+		$cache_id = null,
+		$compile_id = null,
+		$parent = null,
+		$caching = null,
+		$cache_lifetime = null,
+		bool $isConfig = false,
+		array $data = []): Template {
+
+		if (!$this->_templateDirNormalized) {
+			$this->_normalizeTemplateConfig(false);
+		}
+
+		$_templateId = $this->generateUniqueTemplateId($resource_name, $cache_id, $compile_id, $caching);
+
+		if (!isset($this->templates[$_templateId])) {
+			$newTemplate = new Template($resource_name, $this, $parent ?: $this, $cache_id, $compile_id, $caching, $isConfig);
+			$newTemplate->templateId = $_templateId; // @TODO this could go in constructor ^?
+			$this->templates[$_templateId] = $newTemplate;
+		}
+
+		$tpl = clone $this->templates[$_templateId];
+
+		$tpl->setParent($parent ?: $this);
+
+		if ($cache_lifetime) {
+			$tpl->setCacheLifetime($cache_lifetime);
+		}
+
+		// fill data if present
+		foreach ($data as $_key => $_val) {
+			$tpl->assign($_key, $_val);
+		}
+
+		$tpl->tplFunctions = array_merge($parent->tplFunctions ?? [], $tpl->tplFunctions ?? []);
+
+		if (!$this->debugging && $this->debugging_ctrl === 'URL') {
+			$tpl->getSmarty()->getDebug()->debugUrl($tpl->getSmarty());
+		}
+		return $tpl;
+	}
+
+	/**
+	 * test if cache is valid
+	 *
+	 * @param null|string|Template $template the resource handle of the template file or template
+	 *                                                          object
+	 * @param mixed $cache_id cache id to be used with this template
+	 * @param mixed $compile_id compile id to be used with this template
+	 *
+	 * @return bool cache status
+	 * @throws \Exception
+	 * @throws \Smarty\Exception
+	 *
+	 * @api  Smarty::isCached()
+	 */
+	public function isCached($template = null, $cache_id = null, $compile_id = null) {
+		return $this->returnOrCreateTemplate($template, $cache_id, $compile_id)->isCached();
+	}
+
+	/**
+	 * @param $template
+	 * @param $cache_id
+	 * @param $compile_id
+	 * @param $parent
+	 *
+	 * @return Template
+	 * @throws Exception
+	 */
+	private function returnOrCreateTemplate($template, $cache_id = null, $compile_id = null) {
+		if (!($template instanceof Template)) {
+			$template = $this->createTemplate($template, $cache_id, $compile_id, $this);
+			$template->caching = $this->caching;
+		}
+		return $template;
+	}
+
+	/**
+	 * Sets if Smarty should check If-Modified-Since headers to determine cache validity.
+	 * @param bool $cache_modified_check
+	 * @return void
+	 */
+	public function setCacheModifiedCheck($cache_modified_check): void {
+		$this->cache_modified_check = (bool) $cache_modified_check;
+	}
+
+}
+
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template.php
new file mode 100644
index 000000000..fcb0f58d2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template.php
@@ -0,0 +1,732 @@
+<?php
+/**
+ * Smarty Internal Plugin Template
+ * This file contains the Smarty template engine
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty;
+
+use Smarty\Resource\BasePlugin;
+use Smarty\Runtime\InheritanceRuntime;
+use Smarty\Template\Source;
+use Smarty\Template\Cached;
+use Smarty\Template\Compiled;
+use Smarty\Template\Config;
+
+/**
+ * Main class with template data structures and methods
+ */
+#[\AllowDynamicProperties]
+class Template extends TemplateBase {
+
+	/**
+	 * caching mode to create nocache code but no cache file
+	 */
+	public const CACHING_NOCACHE_CODE = 9999;
+
+	/**
+	 * @var Compiled
+	 */
+	private $compiled = null;
+
+	/**
+	 * @var Cached
+	 */
+	private $cached = null;
+
+	/**
+	 * @var \Smarty\Compiler\Template
+	 */
+	private $compiler = null;
+
+	/**
+	 * Source instance
+	 *
+	 * @var Source|Config
+	 */
+	private $source = null;
+
+	/**
+	 * Template resource
+	 *
+	 * @var string
+	 */
+	public $template_resource = null;
+
+	/**
+	 * Template ID
+	 *
+	 * @var null|string
+	 */
+	public $templateId = null;
+
+	/**
+	 * Callbacks called before rendering template
+	 *
+	 * @var callback[]
+	 */
+	public $startRenderCallbacks = [];
+
+	/**
+	 * Callbacks called after rendering template
+	 *
+	 * @var callback[]
+	 */
+	public $endRenderCallbacks = [];
+
+	/**
+	 * Template left-delimiter. If null, defaults to $this->getSmarty()-getLeftDelimiter().
+	 *
+	 * @var string
+	 */
+	private $left_delimiter = null;
+
+	/**
+	 * Template right-delimiter. If null, defaults to $this->getSmarty()-getRightDelimiter().
+	 *
+	 * @var string
+	 */
+	private $right_delimiter = null;
+
+	/**
+	 * @var InheritanceRuntime|null
+	 */
+	private $inheritance;
+
+	/**
+	 * Create template data object
+	 * Some of the global Smarty settings copied to template scope
+	 * It load the required template resources and caching plugins
+	 *
+	 * @param string $template_resource template resource string
+	 * @param Smarty $smarty Smarty instance
+	 * @param \Smarty\Data|null $_parent back pointer to parent object with variables or null
+	 * @param mixed $_cache_id cache   id or null
+	 * @param mixed $_compile_id compile id or null
+	 * @param bool|int|null $_caching use caching?
+	 * @param bool $_isConfig
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function __construct(
+		$template_resource,
+		Smarty $smarty,
+		\Smarty\Data $_parent = null,
+		$_cache_id = null,
+		$_compile_id = null,
+		$_caching = null,
+		$_isConfig = false
+	) {
+		$this->smarty = $smarty;
+		// Smarty parameter
+		$this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id;
+		$this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id;
+		$this->caching = (int)($_caching === null ? $this->smarty->caching : $_caching);
+		$this->cache_lifetime = $this->smarty->cache_lifetime;
+		$this->compile_check = (int)$smarty->compile_check;
+		$this->parent = $_parent;
+		// Template resource
+		$this->template_resource = $template_resource;
+
+		$this->source = $_isConfig ? Config::load($this) : Source::load($this);
+		$this->compiled = Compiled::load($this);
+
+		if ($smarty->security_policy) {
+			$smarty->security_policy->registerCallBacks($this);
+		}
+	}
+
+	/**
+	 * render template
+	 *
+	 * @param bool $no_output_filter if true do not run output filter
+	 * @param null|bool $display true: display, false: fetch null: sub-template
+	 *
+	 * @return string
+	 * @throws \Exception
+	 * @throws \Smarty\Exception
+	 */
+	private function render($no_output_filter = true, $display = null) {
+		if ($this->smarty->debugging) {
+			$this->smarty->getDebug()->start_template($this, $display);
+		}
+		// checks if template exists
+		if ($this->compile_check && !$this->getSource()->exists) {
+			throw new Exception(
+				"Unable to load '{$this->getSource()->type}:{$this->getSource()->name}'" .
+				($this->_isSubTpl() ? " in '{$this->parent->template_resource}'" : '')
+			);
+		}
+
+		// disable caching for evaluated code
+		if ($this->getSource()->handler->recompiled) {
+			$this->caching = \Smarty\Smarty::CACHING_OFF;
+		}
+
+		foreach ($this->startRenderCallbacks as $callback) {
+			call_user_func($callback, $this);
+		}
+
+		try {
+
+			// read from cache or render
+			if ($this->caching === \Smarty\Smarty::CACHING_LIFETIME_CURRENT || $this->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED) {
+				$this->getCached()->render($this, $no_output_filter);
+			} else {
+				$this->getCompiled()->render($this);
+			}
+
+		} finally {
+			foreach ($this->endRenderCallbacks as $callback) {
+				call_user_func($callback, $this);
+			}
+		}
+
+		// display or fetch
+		if ($display) {
+			if ($this->caching && $this->smarty->cache_modified_check) {
+				$this->smarty->cacheModifiedCheck(
+					$this->getCached(),
+					$this,
+					isset($content) ? $content : ob_get_clean()
+				);
+			} else {
+				if ((!$this->caching || $this->getCached()->getNocacheCode() || $this->getSource()->handler->recompiled)
+					&& !$no_output_filter
+				) {
+					echo $this->smarty->runOutputFilters(ob_get_clean(), $this);
+				} else {
+					echo ob_get_clean();
+				}
+			}
+			if ($this->smarty->debugging) {
+				$this->smarty->getDebug()->end_template($this);
+				// debug output
+				$this->smarty->getDebug()->display_debug($this, true);
+			}
+			return '';
+		} else {
+			if ($this->smarty->debugging) {
+				$this->smarty->getDebug()->end_template($this);
+				if ($this->smarty->debugging === 2 && $display === false) {
+					$this->smarty->getDebug()->display_debug($this, true);
+				}
+			}
+			if (
+				!$no_output_filter
+				&& (!$this->caching || $this->getCached()->getNocacheCode() || $this->getSource()->handler->recompiled)
+			) {
+
+				return $this->smarty->runOutputFilters(ob_get_clean(), $this);
+			}
+			// return cache content
+			return null;
+		}
+	}
+
+	/**
+	 * Runtime function to render sub-template
+	 *
+	 * @param string $template_name template name
+	 * @param mixed $cache_id cache id
+	 * @param mixed $compile_id compile id
+	 * @param integer $caching cache mode
+	 * @param integer $cache_lifetime lifetime of cache data
+	 * @param array $extra_vars passed parameter template variables
+	 * @param int|null $scope
+	 *
+	 * @throws Exception
+	 */
+	public function renderSubTemplate(
+		$template_name,
+		$cache_id,
+		$compile_id,
+		$caching,
+		$cache_lifetime,
+		array $extra_vars = [],
+		int $scope = null,
+		?string $currentDir = null
+	) {
+
+		$name = $this->parseResourceName($template_name);
+		if ($currentDir && preg_match('/^\.{1,2}\//', $name)) {
+			// relative template resource name, append it to current template name
+			$template_name = $currentDir . DIRECTORY_SEPARATOR . $name;
+		}
+
+		$tpl = $this->smarty->doCreateTemplate($template_name, $cache_id, $compile_id, $this, $caching, $cache_lifetime);
+
+		$tpl->inheritance = $this->getInheritance(); // re-use the same Inheritance object inside the inheritance tree
+
+		if ($scope) {
+			$tpl->defaultScope = $scope;
+		}
+
+		if ($caching) {
+			if ($tpl->templateId !== $this->templateId && $caching !== \Smarty\Template::CACHING_NOCACHE_CODE) {
+				$tpl->getCached(true);
+			} else {
+				// re-use the same Cache object across subtemplates to gather hashes and file dependencies.
+				$tpl->setCached($this->getCached());
+			}
+		}
+
+		foreach ($extra_vars as $_key => $_val) {
+			$tpl->assign($_key, $_val);
+		}
+		if ($tpl->caching === \Smarty\Template::CACHING_NOCACHE_CODE) {
+			if ($tpl->getCompiled()->getNocacheCode()) {
+				$this->getCached()->hashes[$tpl->getCompiled()->nocache_hash] = true;
+			}
+		}
+
+		$tpl->render();
+	}
+
+	/**
+	 * Remove type indicator from resource name if present.
+	 * E.g. $this->parseResourceName('file:template.tpl') returns 'template.tpl'
+	 *
+	 * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including).
+	 *
+	 * @param string $resource_name    template_resource or config_resource to parse
+	 *
+	 * @return string
+	 */
+	private function parseResourceName($resource_name): string {
+		if (preg_match('/^([A-Za-z0-9_\-]{2,}):/', $resource_name, $match)) {
+			return substr($resource_name, strlen($match[0]));
+		}
+		return $resource_name;
+	}
+
+	/**
+	 * Check if this is a sub template
+	 *
+	 * @return bool true is sub template
+	 */
+	public function _isSubTpl() {
+		return isset($this->parent) && $this->parent instanceof Template;
+	}
+
+	public function assign($tpl_var, $value = null, $nocache = false, $scope = null) {
+		return parent::assign($tpl_var, $value, $nocache, $scope);
+	}
+
+	/**
+	 * Compiles the template
+	 * If the template is not evaluated the compiled template is saved on disk
+	 *
+	 * @TODO only used in compileAll and 1 unit test: can we move this and make compileAndWrite private?
+	 *
+	 * @throws \Exception
+	 */
+	public function compileTemplateSource() {
+		return $this->getCompiled()->compileAndWrite($this);
+	}
+
+	/**
+	 * Return cached content
+	 *
+	 * @return null|string
+	 * @throws Exception
+	 */
+	public function getCachedContent() {
+		return $this->getCached()->getContent($this);
+	}
+
+	/**
+	 * Writes the content to cache resource
+	 *
+	 * @param string $content
+	 *
+	 * @return bool
+	 *
+	 * @TODO this method is only used in unit tests that (mostly) try to test CacheResources.
+	 */
+	public function writeCachedContent($content) {
+		if ($this->getSource()->handler->recompiled || !$this->caching
+		) {
+			// don't write cache file
+			return false;
+		}
+		$codeframe = $this->createCodeFrame($content, '', true);
+		return $this->getCached()->writeCache($this, $codeframe);
+	}
+
+	/**
+	 * Get unique template id
+	 *
+	 * @return string
+	 */
+	public function getTemplateId() {
+		return $this->templateId;
+	}
+
+	/**
+	 * runtime error not matching capture tags
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function capture_error() {
+		throw new Exception("Not matching {capture} open/close in '{$this->template_resource}'");
+	}
+
+	/**
+	 * Return Compiled object
+	 *
+	 * @param bool $forceNew force new compiled object
+	 */
+	public function getCompiled($forceNew = false) {
+		if ($forceNew || !isset($this->compiled)) {
+			$this->compiled = Compiled::load($this);
+		}
+		return $this->compiled;
+	}
+
+	/**
+	 * Return Cached object
+	 *
+	 * @param bool $forceNew force new cached object
+	 *
+	 * @throws Exception
+	 */
+	public function getCached($forceNew = false): Cached {
+		if ($forceNew || !isset($this->cached)) {
+			$cacheResource = $this->smarty->getCacheResource();
+			$this->cached = new Cached(
+				$this->source,
+				$cacheResource,
+				$this->compile_id,
+				$this->cache_id
+			);
+			if ($this->isCachingEnabled()) {
+				$cacheResource->populate($this->cached, $this);
+			} else {
+				$this->cached->setValid(false);
+			}
+		}
+		return $this->cached;
+	}
+
+	private function isCachingEnabled(): bool {
+		return $this->caching && !$this->getSource()->handler->recompiled;
+	}
+
+	/**
+	 * Helper function for InheritanceRuntime object
+	 *
+	 * @return InheritanceRuntime
+	 * @throws Exception
+	 */
+	public function getInheritance(): InheritanceRuntime {
+		if (is_null($this->inheritance)) {
+			$this->inheritance = clone $this->getSmarty()->getRuntime('Inheritance');
+		}
+		return $this->inheritance;
+	}
+
+	/**
+	 * Sets a new InheritanceRuntime object.
+	 *
+	 * @param InheritanceRuntime $inheritanceRuntime
+	 *
+	 * @return void
+	 */
+	public function setInheritance(InheritanceRuntime $inheritanceRuntime) {
+		$this->inheritance = $inheritanceRuntime;
+	}
+
+	/**
+	 * Return Compiler object
+	 */
+	public function getCompiler() {
+		if (!isset($this->compiler)) {
+			$this->compiler = $this->getSource()->createCompiler();
+		}
+		return $this->compiler;
+	}
+
+	/**
+	 * Create code frame for compiled and cached templates
+	 *
+	 * @param string $content optional template content
+	 * @param string $functions compiled template function and block code
+	 * @param bool $cache flag for cache file
+	 * @param Compiler\Template|null $compiler
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function createCodeFrame($content = '', $functions = '', $cache = false, \Smarty\Compiler\Template $compiler = null) {
+		return $this->getCodeFrameCompiler()->create($content, $functions, $cache, $compiler);
+	}
+
+	/**
+	 * Template data object destructor
+	 */
+	public function __destruct() {
+		if ($this->smarty->cache_locking && $this->getCached()->is_locked) {
+			$this->getCached()->handler->releaseLock($this->smarty, $this->getCached());
+		}
+	}
+
+	/**
+	 * Returns if the current template must be compiled by the Smarty compiler
+	 * It does compare the timestamps of template source and the compiled templates and checks the force compile
+	 * configuration
+	 *
+	 * @return bool
+	 * @throws \Smarty\Exception
+	 */
+	public function mustCompile(): bool {
+		if (!$this->getSource()->exists) {
+			if ($this->_isSubTpl()) {
+				$parent_resource = " in '{$this->parent->template_resource}'";
+			} else {
+				$parent_resource = '';
+			}
+			throw new Exception("Unable to load {$this->getSource()->type} '{$this->getSource()->name}'{$parent_resource}");
+		}
+
+		// @TODO move this logic to Compiled
+		return $this->smarty->force_compile
+			|| $this->getSource()->handler->recompiled
+			|| !$this->getCompiled()->exists
+			|| ($this->compile_check &&	$this->getCompiled()->getTimeStamp() < $this->getSource()->getTimeStamp());
+	}
+
+	private function getCodeFrameCompiler(): Compiler\CodeFrame {
+		return new \Smarty\Compiler\CodeFrame($this);
+	}
+
+	/**
+	 * Get left delimiter
+	 *
+	 * @return string
+	 */
+	public function getLeftDelimiter()
+	{
+		return $this->left_delimiter ?? $this->getSmarty()->getLeftDelimiter();
+	}
+
+	/**
+	 * Set left delimiter
+	 *
+	 * @param string $left_delimiter
+	 */
+	public function setLeftDelimiter($left_delimiter)
+	{
+		$this->left_delimiter = $left_delimiter;
+	}
+
+	/**
+	 * Get right delimiter
+	 *
+	 * @return string $right_delimiter
+	 */
+	public function getRightDelimiter()
+	{
+		return $this->right_delimiter ?? $this->getSmarty()->getRightDelimiter();;
+	}
+
+	/**
+	 * Set right delimiter
+	 *
+	 * @param string
+	 */
+	public function setRightDelimiter($right_delimiter)
+	{
+		$this->right_delimiter = $right_delimiter;
+	}
+
+	/**
+	 * gets  a stream variable
+	 *
+	 * @param string                                                  $variable the stream of the variable
+	 *
+	 * @return mixed
+	 * @throws \Smarty\Exception
+	 *
+	 */
+	public function getStreamVariable($variable)
+	{
+
+		trigger_error("Using stream variables (\`\{\$foo:bar\}\`)is deprecated.", E_USER_DEPRECATED);
+
+		$_result = '';
+		$fp = fopen($variable, 'r+');
+		if ($fp) {
+			while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
+				$_result .= $current_line;
+			}
+			fclose($fp);
+			return $_result;
+		}
+		if ($this->getSmarty()->error_unassigned) {
+			throw new Exception('Undefined stream variable "' . $variable . '"');
+		}
+		return null;
+	}
+	/**
+	 * @inheritdoc
+	 */
+	public function configLoad($config_file, $sections = null)
+	{
+		$confObj = parent::configLoad($config_file, $sections);
+
+		$this->getCompiled()->file_dependency[ $confObj->getSource()->uid ] =
+			array($confObj->getSource()->getResourceName(), $confObj->getSource()->getTimeStamp(), $confObj->getSource()->type);
+
+		return $confObj;
+	}
+
+	public function fetch() {
+		$result = $this->_execute(0);
+		return $result === null ? ob_get_clean() : $result;
+	}
+
+	public function display() {
+		$this->_execute(1);
+	}
+
+	/**
+	 * test if cache is valid
+	 *
+	 * @param mixed $cache_id cache id to be used with this template
+	 * @param mixed $compile_id compile id to be used with this template
+	 * @param object $parent next higher level of Smarty variables
+	 *
+	 * @return bool cache status
+	 * @throws \Exception
+	 * @throws \Smarty\Exception
+	 *
+	 * @api  Smarty::isCached()
+	 */
+	public function isCached(): bool {
+		return (bool) $this->_execute(2);
+	}
+
+	/**
+	 * fetches a rendered Smarty template
+	 *
+	 * @param string $function function type 0 = fetch,  1 = display, 2 = isCache
+	 *
+	 * @return mixed
+	 * @throws Exception
+	 * @throws \Throwable
+	 */
+	private function _execute($function) {
+
+		$smarty = $this->getSmarty();
+
+		// make sure we have integer values
+		$this->caching = (int)$this->caching;
+		// fetch template content
+		$level = ob_get_level();
+		try {
+			$_smarty_old_error_level =
+				isset($smarty->error_reporting) ? error_reporting($smarty->error_reporting) : null;
+
+			if ($smarty->isMutingUndefinedOrNullWarnings()) {
+				$errorHandler = new \Smarty\ErrorHandler();
+				$errorHandler->activate();
+			}
+
+			if ($function === 2) {
+				if ($this->caching) {
+					// return cache status of template
+					$result = $this->getCached()->isCached($this);
+				} else {
+					return false;
+				}
+			} else {
+
+				// After rendering a template, the tpl/config variables are reset, so the template can be re-used.
+				$this->pushStack();
+
+				// Start output-buffering.
+				ob_start();
+
+				$result = $this->render(false, $function);
+
+				// Restore the template to its previous state
+				$this->popStack();
+			}
+
+			if (isset($errorHandler)) {
+				$errorHandler->deactivate();
+			}
+
+			if (isset($_smarty_old_error_level)) {
+				error_reporting($_smarty_old_error_level);
+			}
+			return $result;
+		} catch (\Throwable $e) {
+			while (ob_get_level() > $level) {
+				ob_end_clean();
+			}
+			if (isset($errorHandler)) {
+				$errorHandler->deactivate();
+			}
+
+			if (isset($_smarty_old_error_level)) {
+				error_reporting($_smarty_old_error_level);
+			}
+			throw $e;
+		}
+	}
+
+	/**
+	 * @return Config|Source|null
+	 */
+	public function getSource() {
+		return $this->source;
+	}
+
+	/**
+	 * @param Config|Source|null $source
+	 */
+	public function setSource($source): void {
+		$this->source = $source;
+	}
+
+	/**
+	 * Sets the Cached object, so subtemplates can share one Cached object to gather meta-data.
+	 *
+	 * @param Cached $cached
+	 *
+	 * @return void
+	 */
+	private function setCached(Cached $cached) {
+		$this->cached = $cached;
+	}
+
+	/**
+	 * @param string $compile_id
+	 *
+	 * @throws Exception
+	 */
+	public function setCompileId($compile_id) {
+		parent::setCompileId($compile_id);
+		$this->getCompiled(true);
+		if ($this->caching) {
+			$this->getCached(true);
+		}
+	}
+
+	/**
+	 * @param string $cache_id
+	 *
+	 * @throws Exception
+	 */
+	public function setCacheId($cache_id) {
+		parent::setCacheId($cache_id);
+		$this->getCached(true);
+	}
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template/Cached.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template/Cached.php
new file mode 100644
index 000000000..78635db06
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template/Cached.php
@@ -0,0 +1,428 @@
+<?php
+
+namespace Smarty\Template;
+
+use Smarty\Exception;
+use Smarty\Template;
+use Smarty\Template\Cacheresource\Base;
+use Smarty\Template\Compiler\CodeFrame;
+
+/**
+ * Represents a cached version of a template or config file.
+ * @author     Rodney Rehm
+ */
+class Cached extends GeneratedPhpFile {
+
+	/**
+	 * Cache Is Valid
+	 *
+	 * @var boolean
+	 */
+	private $valid = null;
+
+	/**
+	 * @param bool|null $valid
+	 */
+	public function setValid(?bool $valid): void {
+		$this->valid = $valid;
+	}
+
+	/**
+	 * CacheResource Handler
+	 *
+	 * @var \Smarty\Cacheresource\Base
+	 */
+	public $handler = null;
+
+	/**
+	 * Template Cache Id (\Smarty\Template::$cache_id)
+	 *
+	 * @var string
+	 */
+	public $cache_id = null;
+
+	/**
+	 * saved cache lifetime in seconds
+	 *
+	 * @var int
+	 */
+	public $cache_lifetime = 0;
+
+	/**
+	 * Id for cache locking
+	 *
+	 * @var string
+	 */
+	public $lock_id = null;
+
+	/**
+	 * flag that cache is locked by this instance
+	 *
+	 * @var bool
+	 */
+	public $is_locked = false;
+
+	/**
+	 * Source Object
+	 *
+	 * @var Source
+	 */
+	public $source = null;
+
+	/**
+	 * Nocache hash codes of processed compiled templates
+	 *
+	 * @var array
+	 */
+	public $hashes = [];
+
+	/**
+	 * Content buffer
+	 *
+	 * @var string
+	 */
+	public $content = null;
+
+	/**
+	 * create Cached Object container
+	 *
+	 * @param Source $source
+	 * @param \Smarty\Cacheresource\Base $handler
+	 * @param $compile_id
+	 * @param $cache_id
+	 */
+	public function __construct(Source $source, \Smarty\Cacheresource\Base $handler, $compile_id, $cache_id) {
+		$this->compile_id = $compile_id;
+		$this->cache_id = $cache_id;
+		$this->source = $source;
+		$this->handler = $handler;
+	}
+
+	/**
+	 * Render cache template
+	 *
+	 * @param \Smarty\Template $_template
+	 * @param bool $no_output_filter
+	 *
+	 * @throws \Exception
+	 */
+	public function render(Template $_template, $no_output_filter = true) {
+
+		if (!$this->isCached($_template)) {
+			$this->updateCache($_template, $no_output_filter);
+		} else {
+			if (!$this->processed) {
+				$this->process($_template);
+			}
+		}
+
+		if ($_template->getSmarty()->debugging) {
+			$_template->getSmarty()->getDebug()->start_cache($_template);
+		}
+
+		$this->getRenderedTemplateCode($_template, $this->unifunc);
+
+		if ($_template->getSmarty()->debugging) {
+			$_template->getSmarty()->getDebug()->end_cache($_template);
+		}
+
+	}
+
+	/**
+	 * Check if cache is valid, lock cache if required
+	 *
+	 * @param Template $_template
+	 *
+	 * @return bool flag true if cache is valid
+	 * @throws Exception
+	 */
+	public function isCached(Template $_template) {
+		if ($this->valid !== null) {
+			return $this->valid;
+		}
+		while (true) {
+			while (true) {
+				if ($this->exists === false || $_template->getSmarty()->force_compile || $_template->getSmarty()->force_cache) {
+					$this->valid = false;
+				} else {
+					$this->valid = true;
+				}
+				if ($this->valid && $_template->caching === \Smarty\Smarty::CACHING_LIFETIME_CURRENT
+					&& $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)
+				) {
+					// lifetime expired
+					$this->valid = false;
+				}
+				if ($this->valid && $_template->compile_check === \Smarty\Smarty::COMPILECHECK_ON
+					&& $_template->getSource()->getTimeStamp() > $this->timestamp
+				) {
+					$this->valid = false;
+				}
+				if ($this->valid || !$_template->getSmarty()->cache_locking) {
+					break;
+				}
+				if (!$this->handler->locked($_template->getSmarty(), $this)) {
+					$this->handler->acquireLock($_template->getSmarty(), $this);
+					break 2;
+				}
+				$this->handler->populate($this, $_template);
+			}
+			if ($this->valid) {
+				if (!$_template->getSmarty()->cache_locking || $this->handler->locked($_template->getSmarty(), $this) === null) {
+					// load cache file for the following checks
+					if ($_template->getSmarty()->debugging) {
+						$_template->getSmarty()->getDebug()->start_cache($_template);
+					}
+					if ($this->handler->process($_template, $this) === false) {
+						$this->valid = false;
+					} else {
+						$this->processed = true;
+					}
+					if ($_template->getSmarty()->debugging) {
+						$_template->getSmarty()->getDebug()->end_cache($_template);
+					}
+				} else {
+					$this->is_locked = true;
+					continue;
+				}
+			} else {
+				return $this->valid;
+			}
+			if ($this->valid && $_template->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED
+				&& $_template->getCached()->cache_lifetime >= 0
+				&& (time() > ($_template->getCached()->timestamp + $_template->getCached()->cache_lifetime))
+			) {
+				$this->valid = false;
+			}
+			if ($_template->getSmarty()->cache_locking) {
+				if (!$this->valid) {
+					$this->handler->acquireLock($_template->getSmarty(), $this);
+				} elseif ($this->is_locked) {
+					$this->handler->releaseLock($_template->getSmarty(), $this);
+				}
+			}
+			return $this->valid;
+		}
+		return $this->valid;
+	}
+
+	/**
+	 * Process cached template
+	 *
+	 * @param Template $_template template object
+	 */
+	private function process(Template $_template) {
+		if ($this->handler->process($_template, $this) === false) {
+			$this->valid = false;
+		}
+		$this->processed = $this->valid;
+	}
+
+	/**
+	 * Read cache content from handler
+	 *
+	 * @param Template $_template template object
+	 *
+	 * @return string|false content
+	 */
+	public function readCache(Template $_template) {
+		if (!$_template->getSource()->handler->recompiled) {
+			return $this->handler->retrieveCachedContent($_template);
+		}
+		return false;
+	}
+
+	/**
+	 * Write this cache object to handler
+	 *
+	 * @param string $content content to cache
+	 *
+	 * @return bool success
+	 */
+	public function writeCache(Template $_template, $content) {
+		if (!$_template->getSource()->handler->recompiled) {
+			if ($this->handler->storeCachedContent($_template, $content)) {
+				$this->content = null;
+				$this->timestamp = time();
+				$this->exists = true;
+				$this->valid = true;
+				$this->cache_lifetime = $_template->cache_lifetime;
+				$this->processed = false;
+				if ($_template->getSmarty()->cache_locking) {
+					$this->handler->releaseLock($_template->getSmarty(), $this);
+				}
+				return true;
+			}
+			$this->content = null;
+			$this->timestamp = false;
+			$this->exists = false;
+			$this->valid = false;
+			$this->processed = false;
+		}
+		return false;
+	}
+
+	/**
+	 * Cache was invalid , so render from compiled and write to cache
+	 *
+	 * @param Template $_template
+	 * @param bool $no_output_filter
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	private function updateCache(Template $_template, $no_output_filter) {
+
+		ob_start();
+
+		$_template->getCompiled()->render($_template);
+
+		if ($_template->getSmarty()->debugging) {
+			$_template->getSmarty()->getDebug()->start_cache($_template);
+		}
+
+		$this->removeNoCacheHash($_template, $no_output_filter);
+		$this->process($_template);
+
+		if ($_template->getSmarty()->debugging) {
+			$_template->getSmarty()->getDebug()->end_cache($_template);
+		}
+	}
+
+	/**
+	 * Sanitize content and write it to cache resource
+	 *
+	 * @param Template $_template
+	 * @param bool $no_output_filter
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	private function removeNoCacheHash(Template $_template, $no_output_filter) {
+		$php_pattern = '/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/';
+		$content = ob_get_clean();
+		$hash_array = $this->hashes;
+		$hash_array[$_template->getCompiled()->nocache_hash] = true;
+		$hash_array = array_keys($hash_array);
+		$nocache_hash = '(' . implode('|', $hash_array) . ')';
+		$_template->getCached()->setNocacheCode(false);
+		// get text between non-cached items
+		$cache_split =
+			preg_split(
+				"!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s",
+				$content
+			);
+		// get non-cached items
+		preg_match_all(
+			"!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s",
+			$content,
+			$cache_parts
+		);
+		$content = '';
+		// loop over items, stitch back together
+		foreach ($cache_split as $curr_idx => $curr_split) {
+			if (preg_match($php_pattern, $curr_split)) {
+				// escape PHP tags in template content
+				$php_split = preg_split(
+					$php_pattern,
+					$curr_split
+				);
+				preg_match_all(
+					$php_pattern,
+					$curr_split,
+					$php_parts
+				);
+				foreach ($php_split as $idx_php => $curr_php) {
+					$content .= $curr_php;
+					if (isset($php_parts[0][$idx_php])) {
+						$content .= "<?php echo '{$php_parts[ 1 ][ $idx_php ]}'; ?>\n";
+					}
+				}
+			} else {
+				$content .= $curr_split;
+			}
+			if (isset($cache_parts[0][$curr_idx])) {
+				$_template->getCached()->setNocacheCode(true);
+				$content .= $cache_parts[2][$curr_idx];
+			}
+		}
+		if (
+			!$no_output_filter
+			&& !$_template->getCached()->getNocacheCode()
+		) {
+			$content = $_template->getSmarty()->runOutputFilters($content, $_template);
+		}
+
+		$codeframe = (new \Smarty\Compiler\CodeFrame($_template))->create($content, '', true);
+		$this->writeCache($_template, $codeframe);
+	}
+
+	/**
+	 * @return Source|null
+	 */
+	public function getSource(): ?Source {
+		return $this->source;
+	}
+
+	/**
+	 * @param Source|null $source
+	 */
+	public function setSource(?Source $source): void {
+		$this->source = $source;
+	}
+
+	/**
+	 * Returns the generated content
+	 *
+	 * @param Template $template
+	 *
+	 * @return string|null
+	 * @throws \Exception
+	 */
+	public function getContent(Template $template) {
+		ob_start();
+		$this->render($template);
+		return ob_get_clean();
+	}
+
+	/**
+	 * This function is executed automatically when a generated file is included
+	 * - Decode saved properties
+	 * - Check if file is valid
+	 *
+	 * @param Template $_template
+	 * @param array $properties special template properties
+	 *
+	 * @return bool flag if compiled or cache file is valid
+	 * @throws Exception
+	 */
+	public function isFresh(Template $_template, array $properties): bool {
+
+		// on cache resources other than file check version stored in cache code
+		if (\Smarty\Smarty::SMARTY_VERSION !== $properties['version']) {
+			return false;
+		}
+
+		$is_valid = true;
+
+		if (!empty($properties['file_dependency']) && ($_template->compile_check === \Smarty\Smarty::COMPILECHECK_ON)) {
+			$is_valid = $this->checkFileDependencies($properties['file_dependency'], $_template);
+		}
+
+		// CACHING_LIFETIME_SAVED cache expiry has to be validated here since otherwise we'd define the unifunc
+		if ($_template->caching === \Smarty\Smarty::CACHING_LIFETIME_SAVED && $properties['cache_lifetime'] >= 0
+			&& (time() > ($this->timestamp + $properties['cache_lifetime']))
+		) {
+			$is_valid = false;
+		}
+
+		$this->cache_lifetime = $properties['cache_lifetime'];
+		$this->setValid($is_valid);
+
+		if ($is_valid) {
+			$this->unifunc = $properties['unifunc'];
+			$this->setNocacheCode($properties['has_nocache_code']);
+			$this->file_dependency = $properties['file_dependency'];
+		}
+		return $is_valid && !function_exists($properties['unifunc']);
+	}
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template/Compiled.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template/Compiled.php
new file mode 100644
index 000000000..caee87f32
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template/Compiled.php
@@ -0,0 +1,302 @@
+<?php
+
+namespace Smarty\Template;
+
+use Smarty\Exception;
+use Smarty\Template;
+
+/**
+ * Represents a compiled version of a template or config file.
+ * @author     Rodney Rehm
+ */
+class Compiled extends GeneratedPhpFile {
+
+	/**
+	 * nocache hash
+	 *
+	 * @var string|null
+	 */
+	public $nocache_hash = null;
+
+	/**
+	 * Included sub templates
+	 * - index name
+	 * - value use count
+	 *
+	 * @var int[]
+	 */
+	public $includes = [];
+	/**
+	 * @var bool
+	 */
+	private $isValid = false;
+
+	/**
+	 * get a Compiled Object of this source
+	 *
+	 * @param Template $_template template object
+	 *
+	 * @return Compiled compiled object
+	 */
+	public static function load($_template) {
+		$compiled = new Compiled();
+		if ($_template->getSource()->handler->supportsCompiledTemplates()) {
+			$compiled->populateCompiledFilepath($_template);
+		}
+		return $compiled;
+	}
+
+	/**
+	 * populate Compiled Object with compiled filepath
+	 *
+	 * @param Template $_template template object
+	 **/
+	private function populateCompiledFilepath(Template $_template) {
+		$source = $_template->getSource();
+		$smarty = $_template->getSmarty();
+		$this->filepath = $smarty->getCompileDir();
+		if (isset($_template->compile_id)) {
+			$this->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) .
+				($smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^');
+		}
+		// if use_sub_dirs, break file into directories
+		if ($smarty->use_sub_dirs) {
+			$this->filepath .= $source->uid[0] . $source->uid[1] . DIRECTORY_SEPARATOR . $source->uid[2] .
+				$source->uid[3] . DIRECTORY_SEPARATOR . $source->uid[4] . $source->uid[5] .
+				DIRECTORY_SEPARATOR;
+		}
+		$this->filepath .= $source->uid . '_';
+		if ($source->isConfig) {
+			$this->filepath .= (int)$smarty->config_read_hidden + (int)$smarty->config_booleanize * 2 +
+				(int)$smarty->config_overwrite * 4;
+		} else {
+			$this->filepath .= (int)$smarty->escape_html * 2;
+		}
+		$this->filepath .= '.' . $source->type . '_' . $source->getBasename();
+
+		if ($_template->caching) {
+			$this->filepath .= '.cache';
+		}
+		$this->filepath .= '.php';
+		$this->timestamp = $this->exists = is_file($this->filepath);
+		if ($this->exists) {
+			$this->timestamp = filemtime($this->filepath);
+		}
+	}
+
+	/**
+	 * render compiled template code
+	 *
+	 * @param Template $_template
+	 *
+	 * @return string
+	 * @throws \Smarty\Exception
+	 */
+	public function render(Template $_template) {
+
+		if ($_template->getSmarty()->debugging) {
+			$_template->getSmarty()->getDebug()->start_render($_template);
+		}
+		if (!$this->processed) {
+			$this->compileAndLoad($_template);
+		}
+
+		// @TODO Can't Cached handle this? Maybe introduce an event to decouple.
+		if ($_template->caching) {
+			$_template->getCached()->file_dependency =
+				array_merge($_template->getCached()->file_dependency, $this->file_dependency);
+		}
+
+		$this->getRenderedTemplateCode($_template, $this->unifunc);
+
+		// @TODO Can't Cached handle this? Maybe introduce an event to decouple and remove the $_template->caching property.
+		if ($_template->caching && $this->getNocacheCode()) {
+			$_template->getCached()->hashes[$this->nocache_hash] = true;
+		}
+
+		if ($_template->getSmarty()->debugging) {
+			$_template->getSmarty()->getDebug()->end_render($_template);
+		}
+	}
+
+	/**
+	 * load compiled template or compile from source
+	 *
+	 * @param Template $_smarty_tpl do not change variable name, is used by compiled template
+	 *
+	 * @throws Exception
+	 */
+	private function compileAndLoad(Template $_smarty_tpl) {
+
+		if ($_smarty_tpl->getSource()->handler->recompiled) {
+			$this->recompile($_smarty_tpl);
+			return;
+		}
+
+		if ($this->exists && !$_smarty_tpl->getSmarty()->force_compile
+			&& !($_smarty_tpl->compile_check && $_smarty_tpl->getSource()->getTimeStamp() > $this->getTimeStamp())
+		) {
+			$this->loadCompiledTemplate($_smarty_tpl);
+		}
+
+		if (!$this->isValid) {
+			$this->compileAndWrite($_smarty_tpl);
+			$this->loadCompiledTemplate($_smarty_tpl);
+		}
+
+		$this->processed = true;
+	}
+
+	/**
+	 * compile template from source
+	 *
+	 * @param Template $_smarty_tpl do not change variable name, is used by compiled template
+	 *
+	 * @throws Exception
+	 */
+	private function recompile(Template $_smarty_tpl) {
+		$level = ob_get_level();
+		ob_start();
+		// call compiler
+		try {
+			eval('?>' . $this->doCompile($_smarty_tpl));
+		} catch (\Exception $e) {
+			while (ob_get_level() > $level) {
+				ob_end_clean();
+			}
+			throw $e;
+		}
+		ob_get_clean();
+		$this->timestamp = time();
+		$this->exists = true;
+	}
+
+	/**
+	 * compile template from source
+	 *
+	 * @param Template $_template
+	 *
+	 * @throws Exception
+	 */
+	public function compileAndWrite(Template $_template) {
+		// compile locking
+		if ($saved_timestamp = (!$_template->getSource()->handler->recompiled && is_file($this->filepath))) {
+			$saved_timestamp = $this->getTimeStamp();
+			touch($this->filepath);
+		}
+		// compile locking
+		try {
+			// call compiler
+			$this->write($_template, $this->doCompile($_template));
+		} catch (\Exception $e) {
+			// restore old timestamp in case of error
+			if ($saved_timestamp && is_file($this->filepath)) {
+				touch($this->filepath, $saved_timestamp);
+			}
+			throw $e;
+		}
+	}
+
+	/**
+	 * Do the actual compiling.
+	 *
+	 * @param Template $_smarty_tpl
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	private function doCompile(Template $_smarty_tpl): string {
+		$this->file_dependency = [];
+		$this->includes = [];
+		$this->nocache_hash = null;
+		$this->unifunc = null;
+		return $_smarty_tpl->getCompiler()->compileTemplate($_smarty_tpl);
+	}
+
+	/**
+	 * Write compiled code by handler
+	 *
+	 * @param Template $_template template object
+	 * @param string $code compiled code
+	 *
+	 * @return bool success
+	 * @throws \Smarty\Exception
+	 */
+	private function write(Template $_template, $code) {
+		if (!$_template->getSource()->handler->recompiled) {
+			if ($_template->getSmarty()->writeFile($this->filepath, $code) === true) {
+				$this->timestamp = $this->exists = is_file($this->filepath);
+				if ($this->exists) {
+					$this->timestamp = filemtime($this->filepath);
+					return true;
+				}
+			}
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Load fresh compiled template by including the PHP file
+	 * HHVM requires a workaround because of a PHP incompatibility
+	 *
+	 * @param Template $_smarty_tpl do not change/remove variable name, is used by compiled template
+	 *
+	 */
+	private function loadCompiledTemplate(Template $_smarty_tpl) {
+
+		if (function_exists('opcache_invalidate')
+			&& (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api")) < 1)
+		) {
+			opcache_invalidate($this->filepath, true);
+		} elseif (function_exists('apc_compile_file')) {
+			apc_compile_file($this->filepath);
+		}
+		if (defined('HHVM_VERSION')) {
+			eval('?>' . file_get_contents($this->filepath));
+		} else {
+			include $this->filepath;
+		}
+
+	}
+
+	/**
+	 * This function is executed automatically when a compiled or cached template file is included
+	 * - Decode saved properties from compiled template and cache files
+	 * - Check if compiled or cache file is valid
+	 *
+	 * @param Template $_template
+	 * @param array $properties special template properties
+	 *
+	 * @return bool flag if compiled or cache file is valid
+	 * @throws Exception
+	 */
+	public function isFresh(Template $_template, array $properties): bool {
+
+		// on cache resources other than file check version stored in cache code
+		if (\Smarty\Smarty::SMARTY_VERSION !== $properties['version']) {
+			return false;
+		}
+
+		$is_valid = true;
+		if (!empty($properties['file_dependency']) && $_template->compile_check) {
+			$is_valid = $this->checkFileDependencies($properties['file_dependency'], $_template);
+		}
+
+		$this->isValid = $is_valid;
+		$this->includes = $properties['includes'] ?? [];
+
+		if ($is_valid) {
+			$this->unifunc = $properties['unifunc'];
+			$this->setNocacheCode($properties['has_nocache_code']);
+			$this->file_dependency = $properties['file_dependency'];
+		}
+		return $is_valid && !function_exists($properties['unifunc']);
+	}
+
+	/**
+	 * This method is here only to fix an issue when upgrading from Smarty v4 to v5.
+	 */
+	public function _decodeProperties($a, $b, $c = false): bool { return false; }
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template/Config.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template/Config.php
new file mode 100644
index 000000000..b2fcbf813
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template/Config.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Smarty\Template;
+
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Exception;
+
+/**
+ * Smarty Config Resource Data Object
+ * Metadata Container for Config Files
+ *
+ * @author     Uwe Tews
+ */
+class Config extends Source {
+
+	/**
+	 * Flag that source is a config file
+	 *
+	 * @var bool
+	 */
+	public $isConfig = true;
+
+	/**
+	 * @var array
+	 */
+	static protected $_incompatible_resources = ['extends' => true];
+
+	public function createCompiler(): \Smarty\Compiler\BaseCompiler {
+		return new \Smarty\Compiler\Configfile($this->smarty);
+	}
+
+	protected static function getDefaultHandlerFunc(Smarty $smarty) {
+		return $smarty->default_config_handler_func;
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template/GeneratedPhpFile.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template/GeneratedPhpFile.php
new file mode 100644
index 000000000..f436e9769
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template/GeneratedPhpFile.php
@@ -0,0 +1,159 @@
+<?php
+
+namespace Smarty\Template;
+
+use Smarty\Exception;
+use Smarty\Resource\FilePlugin;
+use Smarty\Template;
+
+/**
+ * Base class for generated PHP files, such as compiled and cached versions of templates and config files.
+ *
+ * @author     Rodney Rehm
+ */
+abstract class GeneratedPhpFile {
+
+	/**
+	 * Compiled Filepath
+	 *
+	 * @var string
+	 */
+	public $filepath = null;
+
+	/**
+	 * Compiled Timestamp
+	 *
+	 * @var int|bool
+	 */
+	public $timestamp = false;
+
+	/**
+	 * Compiled Existence
+	 *
+	 * @var boolean
+	 */
+	public $exists = false;
+
+	/**
+	 * Template Compile Id (\Smarty\Template::$compile_id)
+	 *
+	 * @var string
+	 */
+	public $compile_id = null;
+
+	/**
+	 * Compiled Content Loaded
+	 *
+	 * @var boolean
+	 */
+	protected $processed = false;
+
+	/**
+	 * unique function name for compiled template code
+	 *
+	 * @var string
+	 */
+	public $unifunc = '';
+
+	/**
+	 * flag if template does contain nocache code sections
+	 *
+	 * @var bool
+	 */
+	private $has_nocache_code = false;
+
+	/**
+	 * resource file dependency
+	 *
+	 * @var array
+	 */
+	public $file_dependency = [];
+
+	/**
+	 * Get compiled time stamp
+	 *
+	 * @return int
+	 */
+	public function getTimeStamp() {
+		if ($this->exists && !$this->timestamp) {
+			$this->timestamp = filemtime($this->filepath);
+		}
+		return $this->timestamp;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getNocacheCode(): bool {
+		return $this->has_nocache_code;
+	}
+
+	/**
+	 * @param bool $has_nocache_code
+	 */
+	public function setNocacheCode(bool $has_nocache_code): void {
+		$this->has_nocache_code = $has_nocache_code;
+	}
+
+	/**
+	 * get rendered template content by calling compiled or cached template code
+	 *
+	 * @param string $unifunc function with template code
+	 *
+	 * @throws \Exception
+	 */
+	protected function getRenderedTemplateCode(\Smarty\Template $_template, $unifunc) {
+		$level = ob_get_level();
+		try {
+			if (empty($unifunc) || !function_exists($unifunc)) {
+				throw new \Smarty\Exception("Invalid compiled template for '{$this->filepath}'");
+			}
+			$unifunc($_template);
+		} catch (\Exception $e) {
+			while (ob_get_level() > $level) {
+				ob_end_clean();
+			}
+
+			throw $e;
+		}
+	}
+
+	/**
+	 * @param $file_dependency
+	 * @param Template $_template
+	 *
+	 * @return bool
+	 * @throws Exception
+	 */
+	protected function checkFileDependencies($file_dependency, Template $_template): bool {
+			// check file dependencies at compiled code
+		foreach ($file_dependency as $_file_to_check) {
+
+			$handler = \Smarty\Resource\BasePlugin::load($_template->getSmarty(), $_file_to_check[2]);
+
+			if ($handler instanceof FilePlugin) {
+				if ($_template->getSource()->getResourceName() === $_file_to_check[0]) {
+					// do not recheck current template
+					continue;
+				}
+				$mtime = $handler->getResourceNameTimestamp($_file_to_check[0], $_template->getSmarty(), $_template->getSource()->isConfig);
+			} else {
+
+				if ($handler->checkTimestamps()) {
+					// @TODO this doesn't actually check any dependencies, but only the main source file
+					// and that might to be irrelevant, as the comment "do not recheck current template" above suggests
+					$source = Source::load($_template, $_template->getSmarty());
+					$mtime = $source->getTimeStamp();
+				} else {
+					continue;
+				}
+			}
+
+			if ($mtime === false || $mtime > $_file_to_check[1]) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template/Source.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template/Source.php
new file mode 100644
index 000000000..382e710a7
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Template/Source.php
@@ -0,0 +1,285 @@
+<?php
+
+namespace Smarty\Template;
+
+use Smarty\Resource\FilePlugin;
+use Smarty\Smarty;
+use Smarty\Template;
+use Smarty\Exception;
+
+/**
+ * Meta-data Container for Template source files
+ * @author     Rodney Rehm
+ */
+class Source {
+
+	/**
+	 * Unique Template ID
+	 *
+	 * @var string|null
+	 */
+	public $uid = null;
+
+	/**
+	 * Template Resource (\Smarty\Template::$template_resource)
+	 *
+	 * @var string
+	 */
+	public $resource = null;
+
+	/**
+	 * Resource Type
+	 *
+	 * @var string
+	 */
+	public $type = null;
+
+	/**
+	 * Resource Name
+	 *
+	 * @var string
+	 */
+	public $name = null;
+
+	/**
+	 * Source Timestamp
+	 *
+	 * @var int
+	 */
+	public $timestamp = null;
+
+	/**
+	 * Source Existence
+	 *
+	 * @var boolean
+	 */
+	public $exists = false;
+
+	/**
+	 * Source File Base name
+	 *
+	 * @var string
+	 */
+	public $basename = null;
+
+	/**
+	 * The Components an extended template is made of
+	 *
+	 * @var \Smarty\Template\Source[]
+	 */
+	public $components = null;
+
+	/**
+	 * Resource Handler
+	 *
+	 * @var \Smarty\Resource\BasePlugin
+	 */
+	public $handler = null;
+
+	/**
+	 * Smarty instance
+	 *
+	 * @var Smarty
+	 */
+	protected $smarty = null;
+
+	/**
+	 * Resource is source
+	 *
+	 * @var bool
+	 */
+	public $isConfig = false;
+
+	/**
+	 * Template source content eventually set by default handler
+	 *
+	 * @var string
+	 */
+	public $content = null;
+
+	/**
+	 * @var array
+	 */
+	static protected $_incompatible_resources = [];
+
+	/**
+	 * create Source Object container
+	 *
+	 * @param Smarty $smarty Smarty instance this source object belongs to
+	 * @param string $resource full template_resource
+	 * @param string $type type of resource
+	 * @param string $name resource name
+	 *
+	 * @throws   \Smarty\Exception
+	 * @internal param \Smarty\Resource\Base $handler Resource Handler this source object communicates with
+	 */
+	public function __construct(Smarty $smarty, $type, $name) {
+		$this->handler = \Smarty\Resource\BasePlugin::load($smarty, $type);
+
+		$this->smarty = $smarty;
+		$this->resource = $type . ':' . $name;
+		$this->type = $type;
+		$this->name = $name;
+	}
+
+	/**
+	 * initialize Source Object for given resource
+	 * Either [$_template] or [$smarty, $template_resource] must be specified
+	 *
+	 * @param Template|null $_template template object
+	 * @param Smarty|null $smarty smarty object
+	 * @param null $template_resource resource identifier
+	 *
+	 * @return Source Source Object
+	 * @throws Exception
+	 */
+	public static function load(
+		Template $_template = null,
+		Smarty   $smarty = null,
+		         $template_resource = null
+	) {
+		if ($_template) {
+			$smarty = $_template->getSmarty();
+			$template_resource = $_template->template_resource;
+		}
+		if (empty($template_resource)) {
+			throw new Exception('Source: Missing  name');
+		}
+		// parse resource_name, load resource handler, identify unique resource name
+		if (preg_match('/^([A-Za-z0-9_\-]{2,}):([\s\S]*)$/', $template_resource, $match)) {
+			$type = $match[1];
+			$name = $match[2];
+		} else {
+			// no resource given, use default
+			// or single character before the colon is not a resource type, but part of the filepath
+			$type = $smarty->default_resource_type;
+			$name = $template_resource;
+		}
+
+		if (isset(self::$_incompatible_resources[$type])) {
+			throw new Exception("Unable to use resource '{$type}' for " . __METHOD__);
+		}
+
+		// create new source object
+		$source = new static($smarty, $type, $name);
+		$source->handler->populate($source, $_template);
+		if (!$source->exists && static::getDefaultHandlerFunc($smarty)) {
+			$source->_getDefaultTemplate(static::getDefaultHandlerFunc($smarty));
+			$source->handler->populate($source, $_template);
+		}
+		return $source;
+	}
+
+	protected static function getDefaultHandlerFunc(Smarty $smarty) {
+		return $smarty->default_template_handler_func;
+	}
+
+	/**
+	 * Get source time stamp
+	 *
+	 * @return int
+	 */
+	public function getTimeStamp() {
+		if (!isset($this->timestamp)) {
+			$this->handler->populateTimestamp($this);
+		}
+		return $this->timestamp;
+	}
+
+	/**
+	 * Get source content
+	 *
+	 * @return string
+	 * @throws \Smarty\Exception
+	 */
+	public function getContent() {
+		return $this->content ?? $this->handler->getContent($this);
+	}
+
+	/**
+	 * get default content from template or config resource handler
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	public function _getDefaultTemplate($default_handler) {
+		$_content = $_timestamp = null;
+		$_return = call_user_func_array(
+			$default_handler,
+			[$this->type, $this->name, &$_content, &$_timestamp, $this->smarty]
+		);
+		if (is_string($_return)) {
+			$this->exists = is_file($_return);
+			if ($this->exists) {
+				$this->timestamp = filemtime($_return);
+			} else {
+				throw new Exception(
+					'Default handler: Unable to load ' .
+					"default file '{$_return}' for '{$this->type}:{$this->name}'"
+				);
+			}
+			$this->name = $_return;
+			$this->uid = sha1($_return);
+		} elseif ($_return === true) {
+			$this->content = $_content;
+			$this->exists = true;
+			$this->uid = $this->name = sha1($_content);
+			$this->handler = \Smarty\Resource\BasePlugin::load($this->smarty, 'eval');
+		} else {
+			$this->exists = false;
+			throw new Exception(
+				'Default handler: No ' . ($this->isConfig ? 'config' : 'template') .
+				" default content for '{$this->type}:{$this->name}'"
+			);
+		}
+	}
+
+	public function createCompiler(): \Smarty\Compiler\BaseCompiler {
+		return new \Smarty\Compiler\Template($this->smarty);
+	}
+
+	public function getSmarty() {
+		return $this->smarty;
+	}
+
+	/**
+	 * Determine basename for compiled filename
+	 *
+	 * @return string                 resource's basename
+	 */
+	public function getBasename()
+	{
+		return $this->handler->getBasename($this);
+	}
+
+	/**
+	 * Return source name
+	 * e.g.: 'sub/index.tpl'
+	 *
+	 * @return string
+	 */
+	public function getResourceName(): string {
+		return (string) $this->name;
+	}
+
+	/**
+	 * Return source name, including the type prefix.
+	 * e.g.: 'file:sub/index.tpl'
+	 *
+	 * @return string
+	 */
+	public function getFullResourceName(): string {
+		return $this->type . ':' . $this->name;
+	}
+
+	public function getFilepath(): ?string {
+		if ($this->handler instanceof FilePlugin) {
+			return $this->handler->getFilePath($this->name, $this->smarty, $this->isConfig);
+		}
+		return null;
+	}
+
+	public function isConfig(): bool {
+		return $this->isConfig;
+	}
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/TemplateBase.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/TemplateBase.php
new file mode 100644
index 000000000..3674edf7c
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/TemplateBase.php
@@ -0,0 +1,425 @@
+<?php
+/**
+ * Smarty Internal Plugin Smarty Template  Base
+ * This file contains the basic shared methods for template handling
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+namespace Smarty;
+
+/**
+ * Class with shared smarty/template methods
+ */
+abstract class TemplateBase extends Data {
+
+	/**
+	 * Set this if you want different sets of cache files for the same
+	 * templates.
+	 *
+	 * @var string
+	 */
+	public $cache_id = null;
+
+	/**
+	 * Set this if you want different sets of compiled files for the same
+	 * templates.
+	 *
+	 * @var string
+	 */
+	public $compile_id = null;
+
+	/**
+	 * caching enabled
+	 *
+	 * @var int
+	 */
+	public $caching = \Smarty\Smarty::CACHING_OFF;
+
+	/**
+	 * check template for modifications?
+	 *
+	 * @var int
+	 */
+	public $compile_check = \Smarty\Smarty::COMPILECHECK_ON;
+
+	/**
+	 * cache lifetime in seconds
+	 *
+	 * @var int
+	 */
+	public $cache_lifetime = 3600;
+
+	/**
+	 * Array of source information for known template functions
+	 *
+	 * @var array
+	 */
+	public $tplFunctions = [];
+
+	/**
+	 * @var Debug
+	 */
+	private $debug;
+
+	/**
+	 * Registers object to be used in templates
+	 *
+	 * @param string $object_name
+	 * @param object $object the referenced PHP object to register
+	 * @param array $allowed_methods_properties list of allowed methods (empty = all)
+	 * @param bool $format smarty argument format, else traditional
+	 * @param array $block_methods list of block-methods
+	 *
+	 * @return static
+	 * @throws \Smarty\Exception
+	 *
+	 * @api  Smarty::registerObject()
+	 */
+	public function registerObject(
+		$object_name,
+		$object,
+		$allowed_methods_properties = [],
+		$format = true,
+		$block_methods = []
+	) {
+		$smarty = $this->getSmarty();
+		// test if allowed methods callable
+		if (!empty($allowed_methods_properties)) {
+			foreach ((array)$allowed_methods_properties as $method) {
+				if (!is_callable([$object, $method]) && !property_exists($object, $method)) {
+					throw new Exception("Undefined method or property '$method' in registered object");
+				}
+			}
+		}
+		// test if block methods callable
+		if (!empty($block_methods)) {
+			foreach ((array)$block_methods as $method) {
+				if (!is_callable([$object, $method])) {
+					throw new Exception("Undefined method '$method' in registered object");
+				}
+			}
+		}
+		// register the object
+		$smarty->registered_objects[$object_name] =
+			[$object, (array)$allowed_methods_properties, (boolean)$format, (array)$block_methods];
+		return $this;
+	}
+
+	/**
+	 * Registers plugin to be used in templates
+	 *
+	 * @param string $object_name name of object
+	 *
+	 * @return static
+	 * @api  Smarty::unregisterObject()
+	 *
+	 */
+	public function unregisterObject($object_name) {
+		$smarty = $this->getSmarty();
+		if (isset($smarty->registered_objects[$object_name])) {
+			unset($smarty->registered_objects[$object_name]);
+		}
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getCompileCheck(): int {
+		return $this->compile_check;
+	}
+
+	/**
+	 * @param int $compile_check
+	 */
+	public function setCompileCheck($compile_check) {
+		$this->compile_check = (int)$compile_check;
+	}
+
+	/**
+	 * @param int $caching
+	 */
+	public function setCaching($caching) {
+		$this->caching = (int)$caching;
+	}
+
+	/**
+	 * @param int $cache_lifetime
+	 */
+	public function setCacheLifetime($cache_lifetime) {
+		$this->cache_lifetime = $cache_lifetime;
+	}
+
+	/**
+	 * @param string $compile_id
+	 */
+	public function setCompileId($compile_id) {
+		$this->compile_id = $compile_id;
+	}
+
+	/**
+	 * @param string $cache_id
+	 */
+	public function setCacheId($cache_id) {
+		$this->cache_id = $cache_id;
+	}
+
+	/**
+	 * creates a data object
+	 *
+	 * @param Data|null $parent next higher level of Smarty
+	 *                                                                                     variables
+	 * @param null $name optional data block name
+	 *
+	 * @return Data data object
+	 * @throws Exception
+	 * @api  Smarty::createData()
+	 *
+	 */
+	public function createData(Data $parent = null, $name = null) {
+		/* @var Smarty $smarty */
+		$smarty = $this->getSmarty();
+		$dataObj = new Data($parent, $smarty, $name);
+		if ($smarty->debugging) {
+			$smarty->getDebug()->register_data($dataObj);
+		}
+		return $dataObj;
+	}
+
+	/**
+	 * return name of debugging template
+	 *
+	 * @return string
+	 * @api Smarty::getDebugTemplate()
+	 *
+	 */
+	public function getDebugTemplate() {
+		$smarty = $this->getSmarty();
+		return $smarty->debug_tpl;
+	}
+
+	/**
+	 * @return Debug
+	 */
+	public function getDebug(): Debug {
+		if (!isset($this->debug)) {
+			$this->debug = new \Smarty\Debug();
+		}
+		return $this->debug;
+	}
+
+
+	/**
+	 * return a reference to a registered object
+	 *
+	 * @param string $object_name object name
+	 *
+	 * @return object
+	 * @throws \Smarty\Exception if no such object is found
+	 *
+	 * @api  Smarty::getRegisteredObject()
+	 */
+	public function getRegisteredObject($object_name) {
+		$smarty = $this->getSmarty();
+		if (!isset($smarty->registered_objects[$object_name])) {
+			throw new Exception("'$object_name' is not a registered object");
+		}
+		if (!is_object($smarty->registered_objects[$object_name][0])) {
+			throw new Exception("registered '$object_name' is not an object");
+		}
+		return $smarty->registered_objects[$object_name][0];
+	}
+
+	/**
+	 * Get literals
+	 *
+	 * @return array list of literals
+	 * @api Smarty::getLiterals()
+	 *
+	 */
+	public function getLiterals() {
+		$smarty = $this->getSmarty();
+		return (array)$smarty->literals;
+	}
+
+	/**
+	 * Add literals
+	 *
+	 * @param array|string $literals literal or list of literals
+	 *                                                                                  to addto add
+	 *
+	 * @return static
+	 * @throws \Smarty\Exception
+	 * @api Smarty::addLiterals()
+	 *
+	 */
+	public function addLiterals($literals = null) {
+		if (isset($literals)) {
+			$this->_setLiterals($this->getSmarty(), (array)$literals);
+		}
+		return $this;
+	}
+
+	/**
+	 * Set literals
+	 *
+	 * @param array|string $literals literal or list of literals
+	 *                                                                                  to setto set
+	 *
+	 * @return static
+	 * @throws \Smarty\Exception
+	 * @api Smarty::setLiterals()
+	 *
+	 */
+	public function setLiterals($literals = null) {
+		$smarty = $this->getSmarty();
+		$smarty->literals = [];
+		if (!empty($literals)) {
+			$this->_setLiterals($smarty, (array)$literals);
+		}
+		return $this;
+	}
+
+	/**
+	 * common setter for literals for easier handling of duplicates the
+	 * Smarty::$literals array gets filled with identical key values
+	 *
+	 * @param Smarty $smarty
+	 * @param array $literals
+	 *
+	 * @throws \Smarty\Exception
+	 */
+	private function _setLiterals(Smarty $smarty, $literals) {
+		$literals = array_combine($literals, $literals);
+		$error = isset($literals[$smarty->getLeftDelimiter()]) ? [$smarty->getLeftDelimiter()] : [];
+		$error = isset($literals[$smarty->getRightDelimiter()]) ? $error[] = $smarty->getRightDelimiter() : $error;
+		if (!empty($error)) {
+			throw new Exception(
+				'User defined literal(s) "' . $error .
+				'" may not be identical with left or right delimiter'
+			);
+		}
+		$smarty->literals = array_merge((array)$smarty->literals, (array)$literals);
+	}
+
+	/**
+	 * Registers static classes to be used in templates
+	 *
+	 * @param string $class_name
+	 * @param string $class_impl the referenced PHP class to
+	 *                                                                                    register
+	 *
+	 * @return static
+	 * @throws \Smarty\Exception
+	 * @api  Smarty::registerClass()
+	 *
+	 */
+	public function registerClass($class_name, $class_impl) {
+		$smarty = $this->getSmarty();
+		// test if exists
+		if (!class_exists($class_impl)) {
+			throw new Exception("Undefined class '$class_impl' in register template class");
+		}
+		// register the class
+		$smarty->registered_classes[$class_name] = $class_impl;
+		return $this;
+	}
+
+	/**
+	 * Register config default handler
+	 *
+	 * @param callable $callback class/method name
+	 *
+	 * @return static
+	 * @throws Exception              if $callback is not callable
+	 * @api Smarty::registerDefaultConfigHandler()
+	 *
+	 */
+	public function registerDefaultConfigHandler($callback) {
+		$smarty = $this->getSmarty();
+		if (is_callable($callback)) {
+			$smarty->default_config_handler_func = $callback;
+		} else {
+			throw new Exception('Default config handler not callable');
+		}
+		return $this;
+	}
+
+	/**
+	 * Register template default handler
+	 *
+	 * @param callable $callback class/method name
+	 *
+	 * @return static
+	 * @throws Exception              if $callback is not callable
+	 * @api Smarty::registerDefaultTemplateHandler()
+	 *
+	 */
+	public function registerDefaultTemplateHandler($callback) {
+		$smarty = $this->getSmarty();
+		if (is_callable($callback)) {
+			$smarty->default_template_handler_func = $callback;
+		} else {
+			throw new Exception('Default template handler not callable');
+		}
+		return $this;
+	}
+
+	/**
+	 * Registers a resource to fetch a template
+	 *
+	 * @param string $name name of resource type
+	 * @param \Smarty\Resource\BasePlugin $resource_handler instance of Smarty\Resource\BasePlugin
+	 *
+	 * @return static
+	 *
+	 * @api  Smarty::registerResource()
+	 */
+	public function registerResource($name, \Smarty\Resource\BasePlugin $resource_handler) {
+		$smarty = $this->getSmarty();
+		$smarty->registered_resources[$name] = $resource_handler;
+		return $this;
+	}
+
+	/**
+	 * Unregisters a resource to fetch a template
+	 *
+	 * @param string $type name of resource type
+	 *
+	 * @return static
+	 * @api  Smarty::unregisterResource()
+	 *
+	 */
+	public function unregisterResource($type) {
+		$smarty = $this->getSmarty();
+		if (isset($smarty->registered_resources[$type])) {
+			unset($smarty->registered_resources[$type]);
+		}
+		return $this;
+	}
+
+	/**
+	 * set the debug template
+	 *
+	 * @param string $tpl_name
+	 *
+	 * @return static
+	 * @throws Exception if file is not readable
+	 * @api Smarty::setDebugTemplate()
+	 *
+	 */
+	public function setDebugTemplate($tpl_name) {
+		$smarty = $this->getSmarty();
+		if (!is_readable($tpl_name)) {
+			throw new Exception("Unknown file '{$tpl_name}'");
+		}
+		$smarty->debug_tpl = $tpl_name;
+		return $this;
+	}
+
+
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/TestInstall.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/TestInstall.php
new file mode 100644
index 000000000..e24c39848
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/TestInstall.php
@@ -0,0 +1,211 @@
+<?php
+
+namespace Smarty;
+
+/**
+ * Smarty Internal TestInstall
+ * Test Smarty installation
+ *
+
+
+ * @author     Uwe Tews
+ */
+
+/**
+ * TestInstall class
+ *
+
+
+ */
+class TestInstall
+{
+    /**
+     * diagnose Smarty setup
+     * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
+     *
+     * @param \Smarty $smarty
+     * @param array   $errors array to push results into rather than outputting them
+     *
+     * @return bool status, true if everything is fine, false else
+     */
+    public static function testInstall(Smarty $smarty, &$errors = null)
+    {
+        $status = true;
+        if ($errors === null) {
+            echo "<PRE>\n";
+            echo "Smarty Installation test...\n";
+            echo "Testing template directory...\n";
+        }
+        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
+        // test if all registered template_dir are accessible
+        foreach ($smarty->getTemplateDir() as $template_dir) {
+            $_template_dir = $template_dir;
+            $template_dir = realpath($template_dir);
+            // resolve include_path or fail existence
+            if (!$template_dir) {
+                $status = false;
+                $message = "FAILED: $_template_dir does not exist";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+                continue;
+            }
+            if (!is_dir($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+            } elseif (!is_readable($template_dir)) {
+                $status = false;
+                $message = "FAILED: $template_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'template_dir' ] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$template_dir is OK.\n";
+                }
+            }
+        }
+        if ($errors === null) {
+            echo "Testing compile directory...\n";
+        }
+        // test if registered compile_dir is accessible
+        $__compile_dir = $smarty->getCompileDir();
+        $_compile_dir = realpath($__compile_dir);
+        if (!$_compile_dir) {
+            $status = false;
+            $message = "FAILED: {$__compile_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_dir($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_readable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } elseif (!is_writable($_compile_dir)) {
+            $status = false;
+            $message = "FAILED: {$_compile_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'compile_dir' ] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_compile_dir} is OK.\n";
+            }
+        }
+        if ($errors === null) {
+            echo "Testing plugins directory...\n";
+        }
+        if ($errors === null) {
+            echo "Testing cache directory...\n";
+        }
+        // test if all registered cache_dir is accessible
+        $__cache_dir = $smarty->getCacheDir();
+        $_cache_dir = realpath($__cache_dir);
+        if (!$_cache_dir) {
+            $status = false;
+            $message = "FAILED: {$__cache_dir} does not exist";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_dir($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not a directory";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_readable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not readable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } elseif (!is_writable($_cache_dir)) {
+            $status = false;
+            $message = "FAILED: {$_cache_dir} is not writable";
+            if ($errors === null) {
+                echo $message . ".\n";
+            } else {
+                $errors[ 'cache_dir' ] = $message;
+            }
+        } else {
+            if ($errors === null) {
+                echo "{$_cache_dir} is OK.\n";
+            }
+        }
+        if ($errors === null) {
+            echo "Testing configs directory...\n";
+        }
+        // test if all registered config_dir are accessible
+        foreach ($smarty->getConfigDir() as $config_dir) {
+            $_config_dir = $config_dir;
+            // resolve include_path or fail existence
+            if (!$config_dir) {
+                $status = false;
+                $message = "FAILED: $_config_dir does not exist";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+                continue;
+            }
+            if (!is_dir($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not a directory";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+            } elseif (!is_readable($config_dir)) {
+                $status = false;
+                $message = "FAILED: $config_dir is not readable";
+                if ($errors === null) {
+                    echo $message . ".\n";
+                } else {
+                    $errors[ 'config_dir' ] = $message;
+                }
+            } else {
+                if ($errors === null) {
+                    echo "$config_dir is OK.\n";
+                }
+            }
+        }
+        if ($errors === null) {
+            echo "Tests complete.\n";
+            echo "</PRE>\n";
+        }
+        return $status;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/UndefinedVariable.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/UndefinedVariable.php
new file mode 100644
index 000000000..53f13f416
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/UndefinedVariable.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Smarty;
+
+/**
+ * class for undefined variable object
+ * This class defines an object for undefined variable handling
+ */
+class UndefinedVariable extends Variable {
+
+	/**
+	 * Always returns an empty string.
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+		return '';
+	}
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Variable.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Variable.php
new file mode 100644
index 000000000..0e38d1257
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/Variable.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace Smarty;
+
+/**
+ * class for the Smarty variable object
+ * This class defines the Smarty variable object
+ *
+
+
+ */
+#[\AllowDynamicProperties]
+class Variable
+{
+    /**
+     * template variable
+     *
+     * @var mixed
+     */
+    public $value = null;
+
+	/**
+	 * Other r/w properties for foreach, for, while, etc.
+	 */
+	public $step, $total, $first, $last, $key, $show, $iteration, $index = null;
+
+	/**
+	 * @param mixed|null $value
+	 */
+	public function setValue($value): void {
+		$this->value = $value;
+	}
+
+    /**
+     * if true any output of this variable will be not cached
+     *
+     * @var boolean
+     */
+    private $nocache = false;
+
+	/**
+	 * @param bool $nocache
+	 */
+	public function setNocache(bool $nocache): void {
+		$this->nocache = $nocache;
+	}
+
+    /**
+     * create Smarty variable object
+     *
+     * @param mixed   $value   the value to assign
+     * @param boolean $nocache if true any output of this variable will be not cached
+     */
+    public function __construct($value = null, $nocache = false)
+    {
+        $this->value = $value;
+        $this->nocache = $nocache;
+    }
+
+	public function getValue() {
+		return $this->value;
+	}
+
+    /**
+     * <<magic>> String conversion
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string)$this->value;
+    }
+
+	/**
+	 * Handles ++$a and --$a in templates.
+	 *
+	 * @param $operator '++' or '--', defaults to '++'
+	 *
+	 * @return int|mixed
+	 * @throws Exception
+	 */
+	public function preIncDec($operator = '++') {
+		if ($operator == '--') {
+			return --$this->value;
+		} elseif ($operator == '++') {
+			return ++$this->value;
+		} else {
+			throw new Exception("Invalid incdec operator. Use '--' or '++'.");
+		}
+		return $this->value;
+	}
+
+	/**
+	 * Handles $a++ and $a-- in templates.
+	 *
+	 * @param $operator '++' or '--', defaults to '++'
+	 *
+	 * @return int|mixed
+	 * @throws Exception
+	 */
+	public function postIncDec($operator = '++') {
+		if ($operator == '--') {
+			return $this->value--;
+		} elseif ($operator == '++') {
+			return $this->value++;
+		} else {
+			throw new Exception("Invalid incdec operator. Use '--' or '++'.");
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isNocache(): bool {
+		return $this->nocache;
+	}
+
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/debug.tpl b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/debug.tpl
new file mode 100644
index 000000000..07b8e38ed
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/debug.tpl
@@ -0,0 +1,173 @@
+{capture name='_smarty_debug' assign='debug_output'}
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <title>Smarty Debug Console</title>
+        <style>
+            {literal}
+            body, h1, h2, h3, td, th, p {
+                font-family: sans-serif;
+                font-weight: normal;
+                font-size: 0.9em;
+                margin: 1px;
+                padding: 0;
+            }
+
+            h1 {
+                margin: 0;
+                text-align: left;
+                padding: 2px;
+                background-color: #f0c040;
+                color: black;
+                font-weight: bold;
+                font-size: 1.2em;
+            }
+
+            h2 {
+                background-color: #9B410E;
+                color: white;
+                text-align: left;
+                font-weight: bold;
+                padding: 2px;
+                border-top: 1px solid black;
+            }
+
+            h3 {
+                text-align: left;
+                font-weight: bold;
+                color: black;
+                font-size: 0.7em;
+                padding: 2px;
+            }
+
+            body {
+                background: black;
+            }
+
+            p, table, div {
+                background: #f0ead8;
+            }
+
+            p {
+                margin: 0;
+                font-style: italic;
+                text-align: center;
+            }
+
+            table {
+                width: 100%;
+            }
+
+            th, td {
+                font-family: monospace;
+                vertical-align: top;
+                text-align: left;
+            }
+
+            td {
+                color: green;
+            }
+
+            tr:nth-child(odd) {
+                background-color: #eeeeee;
+            }
+
+            tr:nth-child(even) {
+                background-color: #fafafa;
+            }
+
+            .exectime {
+                font-size: 0.8em;
+                font-style: italic;
+            }
+
+            #bold div {
+                color: black;
+                font-weight: bold;
+            }
+
+            #blue h3 {
+                color: blue;
+            }
+
+            #normal div {
+                color: black;
+                font-weight: normal;
+            }
+
+            #table_assigned_vars th {
+                color: blue;
+                font-weight: bold;
+            }
+
+            #table_config_vars th {
+                color: maroon;
+            }
+            {/literal}
+        </style>
+    </head>
+    <body>
+
+    <h1>Smarty {\Smarty\Smarty::SMARTY_VERSION} Debug Console
+        -  {if isset($template_name)}{$template_name|debug_print_var nofilter} {/if}{if !empty($template_data)}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
+
+    {if !empty($template_data)}
+        <h2>included templates &amp; config files (load time in seconds)</h2>
+        <div>
+            {foreach $template_data as $template}
+                <span style="color: brown;">{$template.name}</span>
+                <br>&nbsp;&nbsp;<span class="exectime">
+                (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
+                 </span>
+                <br>
+            {/foreach}
+        </div>
+    {/if}
+
+    <h2>assigned template variables</h2>
+
+    <table id="table_assigned_vars">
+        {foreach $assigned_vars as $vars}
+            <tr>
+                <td>
+                    <h3 style="color: blue;">${$vars@key}</h3>
+                    {if isset($vars['nocache'])}<strong>Nocache</strong><br>{/if}
+                    {if isset($vars['scope'])}<strong>Origin:</strong> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td>
+                    <h3>Value</h3>
+                    {$vars['value']|debug_print_var:10:80 nofilter}
+                </td>
+                <td>
+                    {if isset($vars['attributes'])}
+                        <h3>Attributes</h3>
+                        {$vars['attributes']|debug_print_var nofilter}
+                    {/if}
+                </td>
+         {/foreach}
+    </table>
+
+    <h2>assigned config file variables</h2>
+
+    <table id="table_config_vars">
+        {foreach $config_vars as $vars}
+            <tr>
+                <td>
+                    <h3 style="color: blue;">#{$vars@key}#</h3>
+                    {if isset($vars['scope'])}<strong>Origin:</strong> {$vars['scope']|debug_print_var nofilter}{/if}
+                </td>
+                <td>
+                    {$vars['value']|debug_print_var:10:80 nofilter}
+                </td>
+            </tr>
+        {/foreach}
+
+    </table>
+    </body>
+    </html>
+{/capture}
+<script>
+    _smarty_console = window.open("", "console{$targetWindow}", "width=1024,height=600,left={$offset},top={$offset},resizable,scrollbars=yes");
+    _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
+    _smarty_console.document.close();
+</script>
diff --git a/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/functions.php b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/functions.php
new file mode 100644
index 000000000..590789ba3
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/smarty/smarty/src/functions.php
@@ -0,0 +1,253 @@
+<?php
+/**
+ * This file is part of the Smarty package.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Smarty\Exception;
+
+/**
+ * Converts the first characters in $string to uppercase (A-Z) if it is an ASCII lowercase character (a-z).
+ *
+ * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
+ *
+ * @param $string
+ *
+ * @return string
+ */
+function smarty_ucfirst_ascii($string): string {
+    return smarty_strtoupper_ascii(substr($string, 0, 1)) . substr($string, 1);
+}
+
+/**
+ * Converts all uppercase ASCII characters (A-Z) in $string to lowercase (a-z).
+ *
+ * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
+ *
+ * @param $string
+ *
+ * @return string
+ */
+function smarty_strtolower_ascii($string): string {
+    return strtr($string, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
+}
+
+/**
+ * Converts all lowercase ASCII characters (a-z) in $string to uppercase (A-Z).
+ *
+ * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
+ *
+ * @param $string
+ *
+ * @return string
+ */
+function smarty_strtoupper_ascii($string): string {
+    return strtr($string, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
+}
+
+/**
+ * Function: smarty_make_timestamp
+ * Purpose:  used by other smarty functions to make a timestamp from a string.
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime()
+ *
+ * @return int
+ */
+function smarty_make_timestamp($string)
+{
+	if (empty($string)) {
+		// use "now":
+		return time();
+	} elseif ($string instanceof DateTime
+		|| (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface)
+	) {
+		return (int)$string->format('U'); // PHP 5.2 BC
+	} elseif (strlen($string) === 14 && ctype_digit((string)$string)) {
+		// it is mysql timestamp format of YYYYMMDDHHMMSS?
+		return mktime(
+			substr($string, 8, 2),
+			substr($string, 10, 2),
+			substr($string, 12, 2),
+			substr($string, 4, 2),
+			substr($string, 6, 2),
+			substr($string, 0, 4)
+		);
+	} elseif (is_numeric($string)) {
+		// it is a numeric string, we handle it as timestamp
+		return (int)$string;
+	} else {
+		// strtotime should handle it
+		$time = strtotime($string);
+		if ($time === -1 || $time === false) {
+			// strtotime() was not able to parse $string, use "now":
+			return time();
+		}
+		return $time;
+	}
+}
+
+/**
+ * Multibyte string replace
+ *
+ * @param string|string[] $search  the string to be searched
+ * @param string|string[] $replace the replacement string
+ * @param string          $subject the source string
+ * @param int             &$count  number of matches found
+ *
+ * @return string replaced string
+ * @author Rodney Rehm
+ */
+function smarty_mb_str_replace($search, $replace, $subject, &$count = 0)
+{
+	if (!is_array($search) && is_array($replace)) {
+		return false;
+	}
+	if (is_array($subject)) {
+		// call mb_replace for each single string in $subject
+		foreach ($subject as &$string) {
+			$string = smarty_mb_str_replace($search, $replace, $string, $c);
+			$count += $c;
+		}
+	} elseif (is_array($search)) {
+		if (!is_array($replace)) {
+			foreach ($search as &$string) {
+				$subject = smarty_mb_str_replace($string, $replace, $subject, $c);
+				$count += $c;
+			}
+		} else {
+			$n = max(count($search), count($replace));
+			while ($n--) {
+				$subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
+				$count += $c;
+				next($search);
+				next($replace);
+			}
+		}
+	} else {
+		$mb_reg_charset = mb_regex_encoding();
+		// Check if mbstring regex is using UTF-8
+		$reg_is_unicode = !strcasecmp($mb_reg_charset, "UTF-8");
+		if(!$reg_is_unicode) {
+			// ...and set to UTF-8 if not
+			mb_regex_encoding("UTF-8");
+		}
+
+		// See if charset used by Smarty is matching one used by regex...
+		$current_charset = mb_regex_encoding();
+		$convert_result = (bool)strcasecmp(\Smarty\Smarty::$_CHARSET, $current_charset);
+		if($convert_result) {
+			// ...convert to it if not.
+			$subject = mb_convert_encoding($subject, $current_charset, \Smarty\Smarty::$_CHARSET);
+			$search = mb_convert_encoding($search, $current_charset, \Smarty\Smarty::$_CHARSET);
+			$replace = mb_convert_encoding($replace, $current_charset, \Smarty\Smarty::$_CHARSET);
+		}
+
+		$parts = mb_split(preg_quote($search), $subject ?? "") ?: array();
+		// If original regex encoding was not unicode...
+		if(!$reg_is_unicode) {
+			// ...restore original regex encoding to avoid breaking the system.
+			mb_regex_encoding($mb_reg_charset);
+		}
+		if($parts === false) {
+			// This exception is thrown if call to mb_split failed.
+			// Usually it happens, when $search or $replace are not valid for given mb_regex_encoding().
+			// There may be other cases for it to fail, please file an issue if you find a reproducible one.
+			throw new Exception("Source string is not a valid $current_charset sequence (probably)");
+		}
+
+		$count = count($parts) - 1;
+		$subject = implode($replace, $parts);
+		// Convert results back to charset used by Smarty, if needed.
+		if($convert_result) {
+			$subject = mb_convert_encoding($subject, \Smarty\Smarty::$_CHARSET, $current_charset);
+		}
+	}
+	return $subject;
+}
+/**
+ * escape_special_chars common function
+ * Function: smarty_function_escape_special_chars
+ * Purpose:  used by other smarty functions to escape
+ *           special chars except for already escaped ones
+ *
+ * @author Monte Ohrt <monte at ohrt dot com>
+ *
+ * @param string $string text that should by escaped
+ *
+ * @return string
+ */
+function smarty_function_escape_special_chars($string)
+{
+	if (!is_array($string)) {
+		$string = htmlspecialchars((string) $string, ENT_COMPAT, \Smarty\Smarty::$_CHARSET, false);
+	}
+	return $string;
+}
+
+/**
+ * Smarty wordwrap supporting multibyte
+ * Name:     smarty_mb_wordwrap
+ * Purpose:  Wrap a string to a given number of characters
+ *
+ * @link   https://php.net/manual/en/function.wordwrap.php for similarity
+ *
+ * @param string  $str   the string to wrap
+ * @param int     $width the width of the output
+ * @param string  $break the character used to break the line
+ * @param boolean $cut   ignored parameter, just for the sake of
+ *
+ * @return string  wrapped string
+ * @author Rodney Rehm
+ */
+function smarty_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
+{
+	// break words into tokens using white space as a delimiter
+	$tokens = preg_split('!(\s)!S' . \Smarty\Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
+	$length = 0;
+	$t = '';
+	$_previous = false;
+	$_space = false;
+	foreach ($tokens as $_token) {
+		$token_length = mb_strlen($_token, \Smarty\Smarty::$_CHARSET);
+		$_tokens = array($_token);
+		if ($token_length > $width) {
+			if ($cut) {
+				$_tokens = preg_split(
+					'!(.{' . $width . '})!S' . \Smarty\Smarty::$_UTF8_MODIFIER,
+					$_token,
+					-1,
+					PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE
+				);
+			}
+		}
+		foreach ($_tokens as $token) {
+			$_space = !!preg_match('!^\s$!S' . \Smarty\Smarty::$_UTF8_MODIFIER, $token);
+			$token_length = mb_strlen($token, \Smarty\Smarty::$_CHARSET);
+			$length += $token_length;
+			if ($length > $width) {
+				// remove space before inserted break
+				if ($_previous) {
+					$t = mb_substr($t, 0, -1, \Smarty\Smarty::$_CHARSET);
+				}
+				if (!$_space) {
+					// add the break before the token
+					if (!empty($t)) {
+						$t .= $break;
+					}
+					$length = $token_length;
+				}
+			} elseif ($token === "\n") {
+				// hard break must reset counters
+				$length = 0;
+			}
+			$_previous = $_space;
+			// add the token
+			$t .= $token;
+		}
+	}
+	return $t;
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/LICENSE b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/LICENSE
new file mode 100644
index 000000000..6e3afce69
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015-present Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/Mbstring.php b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/Mbstring.php
new file mode 100644
index 000000000..2e0b96940
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/Mbstring.php
@@ -0,0 +1,947 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Mbstring;
+
+/**
+ * Partial mbstring implementation in PHP, iconv based, UTF-8 centric.
+ *
+ * Implemented:
+ * - mb_chr                  - Returns a specific character from its Unicode code point
+ * - mb_convert_encoding     - Convert character encoding
+ * - mb_convert_variables    - Convert character code in variable(s)
+ * - mb_decode_mimeheader    - Decode string in MIME header field
+ * - mb_encode_mimeheader    - Encode string for MIME header XXX NATIVE IMPLEMENTATION IS REALLY BUGGED
+ * - mb_decode_numericentity - Decode HTML numeric string reference to character
+ * - mb_encode_numericentity - Encode character to HTML numeric string reference
+ * - mb_convert_case         - Perform case folding on a string
+ * - mb_detect_encoding      - Detect character encoding
+ * - mb_get_info             - Get internal settings of mbstring
+ * - mb_http_input           - Detect HTTP input character encoding
+ * - mb_http_output          - Set/Get HTTP output character encoding
+ * - mb_internal_encoding    - Set/Get internal character encoding
+ * - mb_list_encodings       - Returns an array of all supported encodings
+ * - mb_ord                  - Returns the Unicode code point of a character
+ * - mb_output_handler       - Callback function converts character encoding in output buffer
+ * - mb_scrub                - Replaces ill-formed byte sequences with substitute characters
+ * - mb_strlen               - Get string length
+ * - mb_strpos               - Find position of first occurrence of string in a string
+ * - mb_strrpos              - Find position of last occurrence of a string in a string
+ * - mb_str_split            - Convert a string to an array
+ * - mb_strtolower           - Make a string lowercase
+ * - mb_strtoupper           - Make a string uppercase
+ * - mb_substitute_character - Set/Get substitution character
+ * - mb_substr               - Get part of string
+ * - mb_stripos              - Finds position of first occurrence of a string within another, case insensitive
+ * - mb_stristr              - Finds first occurrence of a string within another, case insensitive
+ * - mb_strrchr              - Finds the last occurrence of a character in a string within another
+ * - mb_strrichr             - Finds the last occurrence of a character in a string within another, case insensitive
+ * - mb_strripos             - Finds position of last occurrence of a string within another, case insensitive
+ * - mb_strstr               - Finds first occurrence of a string within another
+ * - mb_strwidth             - Return width of string
+ * - mb_substr_count         - Count the number of substring occurrences
+ *
+ * Not implemented:
+ * - mb_convert_kana         - Convert "kana" one from another ("zen-kaku", "han-kaku" and more)
+ * - mb_ereg_*               - Regular expression with multibyte support
+ * - mb_parse_str            - Parse GET/POST/COOKIE data and set global variable
+ * - mb_preferred_mime_name  - Get MIME charset string
+ * - mb_regex_encoding       - Returns current encoding for multibyte regex as string
+ * - mb_regex_set_options    - Set/Get the default options for mbregex functions
+ * - mb_send_mail            - Send encoded mail
+ * - mb_split                - Split multibyte string using regular expression
+ * - mb_strcut               - Get part of string
+ * - mb_strimwidth           - Get truncated string with specified width
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+final class Mbstring
+{
+    public const MB_CASE_FOLD = \PHP_INT_MAX;
+
+    private const SIMPLE_CASE_FOLD = [
+        ['µ', 'ſ', "\xCD\x85", 'ς', "\xCF\x90", "\xCF\x91", "\xCF\x95", "\xCF\x96", "\xCF\xB0", "\xCF\xB1", "\xCF\xB5", "\xE1\xBA\x9B", "\xE1\xBE\xBE"],
+        ['μ', 's', 'ι',        'σ', 'β',        'θ',        'φ',        'π',        'κ',        '�',        'ε',        "\xE1\xB9\xA1", 'ι'],
+    ];
+
+    private static $encodingList = ['ASCII', 'UTF-8'];
+    private static $language = 'neutral';
+    private static $internalEncoding = 'UTF-8';
+
+    public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null)
+    {
+        if (\is_array($fromEncoding) || (null !== $fromEncoding && false !== strpos($fromEncoding, ','))) {
+            $fromEncoding = self::mb_detect_encoding($s, $fromEncoding);
+        } else {
+            $fromEncoding = self::getEncoding($fromEncoding);
+        }
+
+        $toEncoding = self::getEncoding($toEncoding);
+
+        if ('BASE64' === $fromEncoding) {
+            $s = base64_decode($s);
+            $fromEncoding = $toEncoding;
+        }
+
+        if ('BASE64' === $toEncoding) {
+            return base64_encode($s);
+        }
+
+        if ('HTML-ENTITIES' === $toEncoding || 'HTML' === $toEncoding) {
+            if ('HTML-ENTITIES' === $fromEncoding || 'HTML' === $fromEncoding) {
+                $fromEncoding = 'Windows-1252';
+            }
+            if ('UTF-8' !== $fromEncoding) {
+                $s = iconv($fromEncoding, 'UTF-8//IGNORE', $s);
+            }
+
+            return preg_replace_callback('/[\x80-\xFF]+/', [__CLASS__, 'html_encoding_callback'], $s);
+        }
+
+        if ('HTML-ENTITIES' === $fromEncoding) {
+            $s = html_entity_decode($s, \ENT_COMPAT, 'UTF-8');
+            $fromEncoding = 'UTF-8';
+        }
+
+        return iconv($fromEncoding, $toEncoding.'//IGNORE', $s);
+    }
+
+    public static function mb_convert_variables($toEncoding, $fromEncoding, &...$vars)
+    {
+        $ok = true;
+        array_walk_recursive($vars, function (&$v) use (&$ok, $toEncoding, $fromEncoding) {
+            if (false === $v = self::mb_convert_encoding($v, $toEncoding, $fromEncoding)) {
+                $ok = false;
+            }
+        });
+
+        return $ok ? $fromEncoding : false;
+    }
+
+    public static function mb_decode_mimeheader($s)
+    {
+        return iconv_mime_decode($s, 2, self::$internalEncoding);
+    }
+
+    public static function mb_encode_mimeheader($s, $charset = null, $transferEncoding = null, $linefeed = null, $indent = null)
+    {
+        trigger_error('mb_encode_mimeheader() is bugged. Please use iconv_mime_encode() instead', \E_USER_WARNING);
+    }
+
+    public static function mb_decode_numericentity($s, $convmap, $encoding = null)
+    {
+        if (null !== $s && !\is_scalar($s) && !(\is_object($s) && method_exists($s, '__toString'))) {
+            trigger_error('mb_decode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', \E_USER_WARNING);
+
+            return null;
+        }
+
+        if (!\is_array($convmap) || (80000 > \PHP_VERSION_ID && !$convmap)) {
+            return false;
+        }
+
+        if (null !== $encoding && !\is_scalar($encoding)) {
+            trigger_error('mb_decode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', \E_USER_WARNING);
+
+            return '';  // Instead of null (cf. mb_encode_numericentity).
+        }
+
+        $s = (string) $s;
+        if ('' === $s) {
+            return '';
+        }
+
+        $encoding = self::getEncoding($encoding);
+
+        if ('UTF-8' === $encoding) {
+            $encoding = null;
+            if (!preg_match('//u', $s)) {
+                $s = @iconv('UTF-8', 'UTF-8//IGNORE', $s);
+            }
+        } else {
+            $s = iconv($encoding, 'UTF-8//IGNORE', $s);
+        }
+
+        $cnt = floor(\count($convmap) / 4) * 4;
+
+        for ($i = 0; $i < $cnt; $i += 4) {
+            // collector_decode_htmlnumericentity ignores $convmap[$i + 3]
+            $convmap[$i] += $convmap[$i + 2];
+            $convmap[$i + 1] += $convmap[$i + 2];
+        }
+
+        $s = preg_replace_callback('/&#(?:0*([0-9]+)|x0*([0-9a-fA-F]+))(?!&);?/', function (array $m) use ($cnt, $convmap) {
+            $c = isset($m[2]) ? (int) hexdec($m[2]) : $m[1];
+            for ($i = 0; $i < $cnt; $i += 4) {
+                if ($c >= $convmap[$i] && $c <= $convmap[$i + 1]) {
+                    return self::mb_chr($c - $convmap[$i + 2]);
+                }
+            }
+
+            return $m[0];
+        }, $s);
+
+        if (null === $encoding) {
+            return $s;
+        }
+
+        return iconv('UTF-8', $encoding.'//IGNORE', $s);
+    }
+
+    public static function mb_encode_numericentity($s, $convmap, $encoding = null, $is_hex = false)
+    {
+        if (null !== $s && !\is_scalar($s) && !(\is_object($s) && method_exists($s, '__toString'))) {
+            trigger_error('mb_encode_numericentity() expects parameter 1 to be string, '.\gettype($s).' given', \E_USER_WARNING);
+
+            return null;
+        }
+
+        if (!\is_array($convmap) || (80000 > \PHP_VERSION_ID && !$convmap)) {
+            return false;
+        }
+
+        if (null !== $encoding && !\is_scalar($encoding)) {
+            trigger_error('mb_encode_numericentity() expects parameter 3 to be string, '.\gettype($s).' given', \E_USER_WARNING);
+
+            return null;  // Instead of '' (cf. mb_decode_numericentity).
+        }
+
+        if (null !== $is_hex && !\is_scalar($is_hex)) {
+            trigger_error('mb_encode_numericentity() expects parameter 4 to be boolean, '.\gettype($s).' given', \E_USER_WARNING);
+
+            return null;
+        }
+
+        $s = (string) $s;
+        if ('' === $s) {
+            return '';
+        }
+
+        $encoding = self::getEncoding($encoding);
+
+        if ('UTF-8' === $encoding) {
+            $encoding = null;
+            if (!preg_match('//u', $s)) {
+                $s = @iconv('UTF-8', 'UTF-8//IGNORE', $s);
+            }
+        } else {
+            $s = iconv($encoding, 'UTF-8//IGNORE', $s);
+        }
+
+        static $ulenMask = ["\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4];
+
+        $cnt = floor(\count($convmap) / 4) * 4;
+        $i = 0;
+        $len = \strlen($s);
+        $result = '';
+
+        while ($i < $len) {
+            $ulen = $s[$i] < "\x80" ? 1 : $ulenMask[$s[$i] & "\xF0"];
+            $uchr = substr($s, $i, $ulen);
+            $i += $ulen;
+            $c = self::mb_ord($uchr);
+
+            for ($j = 0; $j < $cnt; $j += 4) {
+                if ($c >= $convmap[$j] && $c <= $convmap[$j + 1]) {
+                    $cOffset = ($c + $convmap[$j + 2]) & $convmap[$j + 3];
+                    $result .= $is_hex ? sprintf('&#x%X;', $cOffset) : '&#'.$cOffset.';';
+                    continue 2;
+                }
+            }
+            $result .= $uchr;
+        }
+
+        if (null === $encoding) {
+            return $result;
+        }
+
+        return iconv('UTF-8', $encoding.'//IGNORE', $result);
+    }
+
+    public static function mb_convert_case($s, $mode, $encoding = null)
+    {
+        $s = (string) $s;
+        if ('' === $s) {
+            return '';
+        }
+
+        $encoding = self::getEncoding($encoding);
+
+        if ('UTF-8' === $encoding) {
+            $encoding = null;
+            if (!preg_match('//u', $s)) {
+                $s = @iconv('UTF-8', 'UTF-8//IGNORE', $s);
+            }
+        } else {
+            $s = iconv($encoding, 'UTF-8//IGNORE', $s);
+        }
+
+        if (\MB_CASE_TITLE == $mode) {
+            static $titleRegexp = null;
+            if (null === $titleRegexp) {
+                $titleRegexp = self::getData('titleCaseRegexp');
+            }
+            $s = preg_replace_callback($titleRegexp, [__CLASS__, 'title_case'], $s);
+        } else {
+            if (\MB_CASE_UPPER == $mode) {
+                static $upper = null;
+                if (null === $upper) {
+                    $upper = self::getData('upperCase');
+                }
+                $map = $upper;
+            } else {
+                if (self::MB_CASE_FOLD === $mode) {
+                    static $caseFolding = null;
+                    if (null === $caseFolding) {
+                        $caseFolding = self::getData('caseFolding');
+                    }
+                    $s = strtr($s, $caseFolding);
+                }
+
+                static $lower = null;
+                if (null === $lower) {
+                    $lower = self::getData('lowerCase');
+                }
+                $map = $lower;
+            }
+
+            static $ulenMask = ["\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4];
+
+            $i = 0;
+            $len = \strlen($s);
+
+            while ($i < $len) {
+                $ulen = $s[$i] < "\x80" ? 1 : $ulenMask[$s[$i] & "\xF0"];
+                $uchr = substr($s, $i, $ulen);
+                $i += $ulen;
+
+                if (isset($map[$uchr])) {
+                    $uchr = $map[$uchr];
+                    $nlen = \strlen($uchr);
+
+                    if ($nlen == $ulen) {
+                        $nlen = $i;
+                        do {
+                            $s[--$nlen] = $uchr[--$ulen];
+                        } while ($ulen);
+                    } else {
+                        $s = substr_replace($s, $uchr, $i - $ulen, $ulen);
+                        $len += $nlen - $ulen;
+                        $i += $nlen - $ulen;
+                    }
+                }
+            }
+        }
+
+        if (null === $encoding) {
+            return $s;
+        }
+
+        return iconv('UTF-8', $encoding.'//IGNORE', $s);
+    }
+
+    public static function mb_internal_encoding($encoding = null)
+    {
+        if (null === $encoding) {
+            return self::$internalEncoding;
+        }
+
+        $normalizedEncoding = self::getEncoding($encoding);
+
+        if ('UTF-8' === $normalizedEncoding || false !== @iconv($normalizedEncoding, $normalizedEncoding, ' ')) {
+            self::$internalEncoding = $normalizedEncoding;
+
+            return true;
+        }
+
+        if (80000 > \PHP_VERSION_ID) {
+            return false;
+        }
+
+        throw new \ValueError(sprintf('Argument #1 ($encoding) must be a valid encoding, "%s" given', $encoding));
+    }
+
+    public static function mb_language($lang = null)
+    {
+        if (null === $lang) {
+            return self::$language;
+        }
+
+        switch ($normalizedLang = strtolower($lang)) {
+            case 'uni':
+            case 'neutral':
+                self::$language = $normalizedLang;
+
+                return true;
+        }
+
+        if (80000 > \PHP_VERSION_ID) {
+            return false;
+        }
+
+        throw new \ValueError(sprintf('Argument #1 ($language) must be a valid language, "%s" given', $lang));
+    }
+
+    public static function mb_list_encodings()
+    {
+        return ['UTF-8'];
+    }
+
+    public static function mb_encoding_aliases($encoding)
+    {
+        switch (strtoupper($encoding)) {
+            case 'UTF8':
+            case 'UTF-8':
+                return ['utf8'];
+        }
+
+        return false;
+    }
+
+    public static function mb_check_encoding($var = null, $encoding = null)
+    {
+        if (PHP_VERSION_ID < 70200 && \is_array($var)) {
+            trigger_error('mb_check_encoding() expects parameter 1 to be string, array given', \E_USER_WARNING);
+
+            return null;
+        }
+
+        if (null === $encoding) {
+            if (null === $var) {
+                return false;
+            }
+            $encoding = self::$internalEncoding;
+        }
+
+        if (!\is_array($var)) {
+            return self::mb_detect_encoding($var, [$encoding]) || false !== @iconv($encoding, $encoding, $var);
+        }
+
+        foreach ($var as $key => $value) {
+            if (!self::mb_check_encoding($key, $encoding)) {
+                return false;
+            }
+            if (!self::mb_check_encoding($value, $encoding)) {
+                return false;
+            }
+        }
+
+        return true;
+
+    }
+
+    public static function mb_detect_encoding($str, $encodingList = null, $strict = false)
+    {
+        if (null === $encodingList) {
+            $encodingList = self::$encodingList;
+        } else {
+            if (!\is_array($encodingList)) {
+                $encodingList = array_map('trim', explode(',', $encodingList));
+            }
+            $encodingList = array_map('strtoupper', $encodingList);
+        }
+
+        foreach ($encodingList as $enc) {
+            switch ($enc) {
+                case 'ASCII':
+                    if (!preg_match('/[\x80-\xFF]/', $str)) {
+                        return $enc;
+                    }
+                    break;
+
+                case 'UTF8':
+                case 'UTF-8':
+                    if (preg_match('//u', $str)) {
+                        return 'UTF-8';
+                    }
+                    break;
+
+                default:
+                    if (0 === strncmp($enc, 'ISO-8859-', 9)) {
+                        return $enc;
+                    }
+            }
+        }
+
+        return false;
+    }
+
+    public static function mb_detect_order($encodingList = null)
+    {
+        if (null === $encodingList) {
+            return self::$encodingList;
+        }
+
+        if (!\is_array($encodingList)) {
+            $encodingList = array_map('trim', explode(',', $encodingList));
+        }
+        $encodingList = array_map('strtoupper', $encodingList);
+
+        foreach ($encodingList as $enc) {
+            switch ($enc) {
+                default:
+                    if (strncmp($enc, 'ISO-8859-', 9)) {
+                        return false;
+                    }
+                    // no break
+                case 'ASCII':
+                case 'UTF8':
+                case 'UTF-8':
+            }
+        }
+
+        self::$encodingList = $encodingList;
+
+        return true;
+    }
+
+    public static function mb_strlen($s, $encoding = null)
+    {
+        $encoding = self::getEncoding($encoding);
+        if ('CP850' === $encoding || 'ASCII' === $encoding) {
+            return \strlen($s);
+        }
+
+        return @iconv_strlen($s, $encoding);
+    }
+
+    public static function mb_strpos($haystack, $needle, $offset = 0, $encoding = null)
+    {
+        $encoding = self::getEncoding($encoding);
+        if ('CP850' === $encoding || 'ASCII' === $encoding) {
+            return strpos($haystack, $needle, $offset);
+        }
+
+        $needle = (string) $needle;
+        if ('' === $needle) {
+            if (80000 > \PHP_VERSION_ID) {
+                trigger_error(__METHOD__.': Empty delimiter', \E_USER_WARNING);
+
+                return false;
+            }
+
+            return 0;
+        }
+
+        return iconv_strpos($haystack, $needle, $offset, $encoding);
+    }
+
+    public static function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null)
+    {
+        $encoding = self::getEncoding($encoding);
+        if ('CP850' === $encoding || 'ASCII' === $encoding) {
+            return strrpos($haystack, $needle, $offset);
+        }
+
+        if ($offset != (int) $offset) {
+            $offset = 0;
+        } elseif ($offset = (int) $offset) {
+            if ($offset < 0) {
+                if (0 > $offset += self::mb_strlen($needle)) {
+                    $haystack = self::mb_substr($haystack, 0, $offset, $encoding);
+                }
+                $offset = 0;
+            } else {
+                $haystack = self::mb_substr($haystack, $offset, 2147483647, $encoding);
+            }
+        }
+
+        $pos = '' !== $needle || 80000 > \PHP_VERSION_ID
+            ? iconv_strrpos($haystack, $needle, $encoding)
+            : self::mb_strlen($haystack, $encoding);
+
+        return false !== $pos ? $offset + $pos : false;
+    }
+
+    public static function mb_str_split($string, $split_length = 1, $encoding = null)
+    {
+        if (null !== $string && !\is_scalar($string) && !(\is_object($string) && method_exists($string, '__toString'))) {
+            trigger_error('mb_str_split() expects parameter 1 to be string, '.\gettype($string).' given', \E_USER_WARNING);
+
+            return null;
+        }
+
+        if (1 > $split_length = (int) $split_length) {
+            if (80000 > \PHP_VERSION_ID) {
+                trigger_error('The length of each segment must be greater than zero', \E_USER_WARNING);
+
+                return false;
+            }
+
+            throw new \ValueError('Argument #2 ($length) must be greater than 0');
+        }
+
+        if (null === $encoding) {
+            $encoding = mb_internal_encoding();
+        }
+
+        if ('UTF-8' === $encoding = self::getEncoding($encoding)) {
+            $rx = '/(';
+            while (65535 < $split_length) {
+                $rx .= '.{65535}';
+                $split_length -= 65535;
+            }
+            $rx .= '.{'.$split_length.'})/us';
+
+            return preg_split($rx, $string, -1, \PREG_SPLIT_DELIM_CAPTURE | \PREG_SPLIT_NO_EMPTY);
+        }
+
+        $result = [];
+        $length = mb_strlen($string, $encoding);
+
+        for ($i = 0; $i < $length; $i += $split_length) {
+            $result[] = mb_substr($string, $i, $split_length, $encoding);
+        }
+
+        return $result;
+    }
+
+    public static function mb_strtolower($s, $encoding = null)
+    {
+        return self::mb_convert_case($s, \MB_CASE_LOWER, $encoding);
+    }
+
+    public static function mb_strtoupper($s, $encoding = null)
+    {
+        return self::mb_convert_case($s, \MB_CASE_UPPER, $encoding);
+    }
+
+    public static function mb_substitute_character($c = null)
+    {
+        if (null === $c) {
+            return 'none';
+        }
+        if (0 === strcasecmp($c, 'none')) {
+            return true;
+        }
+        if (80000 > \PHP_VERSION_ID) {
+            return false;
+        }
+        if (\is_int($c) || 'long' === $c || 'entity' === $c) {
+            return false;
+        }
+
+        throw new \ValueError('Argument #1 ($substitute_character) must be "none", "long", "entity" or a valid codepoint');
+    }
+
+    public static function mb_substr($s, $start, $length = null, $encoding = null)
+    {
+        $encoding = self::getEncoding($encoding);
+        if ('CP850' === $encoding || 'ASCII' === $encoding) {
+            return (string) substr($s, $start, null === $length ? 2147483647 : $length);
+        }
+
+        if ($start < 0) {
+            $start = iconv_strlen($s, $encoding) + $start;
+            if ($start < 0) {
+                $start = 0;
+            }
+        }
+
+        if (null === $length) {
+            $length = 2147483647;
+        } elseif ($length < 0) {
+            $length = iconv_strlen($s, $encoding) + $length - $start;
+            if ($length < 0) {
+                return '';
+            }
+        }
+
+        return (string) iconv_substr($s, $start, $length, $encoding);
+    }
+
+    public static function mb_stripos($haystack, $needle, $offset = 0, $encoding = null)
+    {
+        [$haystack, $needle] = str_replace(self::SIMPLE_CASE_FOLD[0], self::SIMPLE_CASE_FOLD[1], [
+            self::mb_convert_case($haystack, \MB_CASE_LOWER, $encoding),
+            self::mb_convert_case($needle, \MB_CASE_LOWER, $encoding),
+        ]);
+
+        return self::mb_strpos($haystack, $needle, $offset, $encoding);
+    }
+
+    public static function mb_stristr($haystack, $needle, $part = false, $encoding = null)
+    {
+        $pos = self::mb_stripos($haystack, $needle, 0, $encoding);
+
+        return self::getSubpart($pos, $part, $haystack, $encoding);
+    }
+
+    public static function mb_strrchr($haystack, $needle, $part = false, $encoding = null)
+    {
+        $encoding = self::getEncoding($encoding);
+        if ('CP850' === $encoding || 'ASCII' === $encoding) {
+            $pos = strrpos($haystack, $needle);
+        } else {
+            $needle = self::mb_substr($needle, 0, 1, $encoding);
+            $pos = iconv_strrpos($haystack, $needle, $encoding);
+        }
+
+        return self::getSubpart($pos, $part, $haystack, $encoding);
+    }
+
+    public static function mb_strrichr($haystack, $needle, $part = false, $encoding = null)
+    {
+        $needle = self::mb_substr($needle, 0, 1, $encoding);
+        $pos = self::mb_strripos($haystack, $needle, $encoding);
+
+        return self::getSubpart($pos, $part, $haystack, $encoding);
+    }
+
+    public static function mb_strripos($haystack, $needle, $offset = 0, $encoding = null)
+    {
+        $haystack = self::mb_convert_case($haystack, \MB_CASE_LOWER, $encoding);
+        $needle = self::mb_convert_case($needle, \MB_CASE_LOWER, $encoding);
+
+        $haystack = str_replace(self::SIMPLE_CASE_FOLD[0], self::SIMPLE_CASE_FOLD[1], $haystack);
+        $needle = str_replace(self::SIMPLE_CASE_FOLD[0], self::SIMPLE_CASE_FOLD[1], $needle);
+
+        return self::mb_strrpos($haystack, $needle, $offset, $encoding);
+    }
+
+    public static function mb_strstr($haystack, $needle, $part = false, $encoding = null)
+    {
+        $pos = strpos($haystack, $needle);
+        if (false === $pos) {
+            return false;
+        }
+        if ($part) {
+            return substr($haystack, 0, $pos);
+        }
+
+        return substr($haystack, $pos);
+    }
+
+    public static function mb_get_info($type = 'all')
+    {
+        $info = [
+            'internal_encoding' => self::$internalEncoding,
+            'http_output' => 'pass',
+            'http_output_conv_mimetypes' => '^(text/|application/xhtml\+xml)',
+            'func_overload' => 0,
+            'func_overload_list' => 'no overload',
+            'mail_charset' => 'UTF-8',
+            'mail_header_encoding' => 'BASE64',
+            'mail_body_encoding' => 'BASE64',
+            'illegal_chars' => 0,
+            'encoding_translation' => 'Off',
+            'language' => self::$language,
+            'detect_order' => self::$encodingList,
+            'substitute_character' => 'none',
+            'strict_detection' => 'Off',
+        ];
+
+        if ('all' === $type) {
+            return $info;
+        }
+        if (isset($info[$type])) {
+            return $info[$type];
+        }
+
+        return false;
+    }
+
+    public static function mb_http_input($type = '')
+    {
+        return false;
+    }
+
+    public static function mb_http_output($encoding = null)
+    {
+        return null !== $encoding ? 'pass' === $encoding : 'pass';
+    }
+
+    public static function mb_strwidth($s, $encoding = null)
+    {
+        $encoding = self::getEncoding($encoding);
+
+        if ('UTF-8' !== $encoding) {
+            $s = iconv($encoding, 'UTF-8//IGNORE', $s);
+        }
+
+        $s = preg_replace('/[\x{1100}-\x{115F}\x{2329}\x{232A}\x{2E80}-\x{303E}\x{3040}-\x{A4CF}\x{AC00}-\x{D7A3}\x{F900}-\x{FAFF}\x{FE10}-\x{FE19}\x{FE30}-\x{FE6F}\x{FF00}-\x{FF60}\x{FFE0}-\x{FFE6}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}]/u', '', $s, -1, $wide);
+
+        return ($wide << 1) + iconv_strlen($s, 'UTF-8');
+    }
+
+    public static function mb_substr_count($haystack, $needle, $encoding = null)
+    {
+        return substr_count($haystack, $needle);
+    }
+
+    public static function mb_output_handler($contents, $status)
+    {
+        return $contents;
+    }
+
+    public static function mb_chr($code, $encoding = null)
+    {
+        if (0x80 > $code %= 0x200000) {
+            $s = \chr($code);
+        } elseif (0x800 > $code) {
+            $s = \chr(0xC0 | $code >> 6).\chr(0x80 | $code & 0x3F);
+        } elseif (0x10000 > $code) {
+            $s = \chr(0xE0 | $code >> 12).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F);
+        } else {
+            $s = \chr(0xF0 | $code >> 18).\chr(0x80 | $code >> 12 & 0x3F).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F);
+        }
+
+        if ('UTF-8' !== $encoding = self::getEncoding($encoding)) {
+            $s = mb_convert_encoding($s, $encoding, 'UTF-8');
+        }
+
+        return $s;
+    }
+
+    public static function mb_ord($s, $encoding = null)
+    {
+        if ('UTF-8' !== $encoding = self::getEncoding($encoding)) {
+            $s = mb_convert_encoding($s, 'UTF-8', $encoding);
+        }
+
+        if (1 === \strlen($s)) {
+            return \ord($s);
+        }
+
+        $code = ($s = unpack('C*', substr($s, 0, 4))) ? $s[1] : 0;
+        if (0xF0 <= $code) {
+            return (($code - 0xF0) << 18) + (($s[2] - 0x80) << 12) + (($s[3] - 0x80) << 6) + $s[4] - 0x80;
+        }
+        if (0xE0 <= $code) {
+            return (($code - 0xE0) << 12) + (($s[2] - 0x80) << 6) + $s[3] - 0x80;
+        }
+        if (0xC0 <= $code) {
+            return (($code - 0xC0) << 6) + $s[2] - 0x80;
+        }
+
+        return $code;
+    }
+
+    public static function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = \STR_PAD_RIGHT, string $encoding = null): string
+    {
+        if (!\in_array($pad_type, [\STR_PAD_RIGHT, \STR_PAD_LEFT, \STR_PAD_BOTH], true)) {
+            throw new \ValueError('mb_str_pad(): Argument #4 ($pad_type) must be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH');
+        }
+
+        if (null === $encoding) {
+            $encoding = self::mb_internal_encoding();
+        }
+
+        try {
+            $validEncoding = @self::mb_check_encoding('', $encoding);
+        } catch (\ValueError $e) {
+            throw new \ValueError(sprintf('mb_str_pad(): Argument #5 ($encoding) must be a valid encoding, "%s" given', $encoding));
+        }
+
+        // BC for PHP 7.3 and lower
+        if (!$validEncoding) {
+            throw new \ValueError(sprintf('mb_str_pad(): Argument #5 ($encoding) must be a valid encoding, "%s" given', $encoding));
+        }
+
+        if (self::mb_strlen($pad_string, $encoding) <= 0) {
+            throw new \ValueError('mb_str_pad(): Argument #3 ($pad_string) must be a non-empty string');
+        }
+
+        $paddingRequired = $length - self::mb_strlen($string, $encoding);
+
+        if ($paddingRequired < 1) {
+            return $string;
+        }
+
+        switch ($pad_type) {
+            case \STR_PAD_LEFT:
+                return self::mb_substr(str_repeat($pad_string, $paddingRequired), 0, $paddingRequired, $encoding).$string;
+            case \STR_PAD_RIGHT:
+                return $string.self::mb_substr(str_repeat($pad_string, $paddingRequired), 0, $paddingRequired, $encoding);
+            default:
+                $leftPaddingLength = floor($paddingRequired / 2);
+                $rightPaddingLength = $paddingRequired - $leftPaddingLength;
+
+                return self::mb_substr(str_repeat($pad_string, $leftPaddingLength), 0, $leftPaddingLength, $encoding).$string.self::mb_substr(str_repeat($pad_string, $rightPaddingLength), 0, $rightPaddingLength, $encoding);
+        }
+    }
+
+    private static function getSubpart($pos, $part, $haystack, $encoding)
+    {
+        if (false === $pos) {
+            return false;
+        }
+        if ($part) {
+            return self::mb_substr($haystack, 0, $pos, $encoding);
+        }
+
+        return self::mb_substr($haystack, $pos, null, $encoding);
+    }
+
+    private static function html_encoding_callback(array $m)
+    {
+        $i = 1;
+        $entities = '';
+        $m = unpack('C*', htmlentities($m[0], \ENT_COMPAT, 'UTF-8'));
+
+        while (isset($m[$i])) {
+            if (0x80 > $m[$i]) {
+                $entities .= \chr($m[$i++]);
+                continue;
+            }
+            if (0xF0 <= $m[$i]) {
+                $c = (($m[$i++] - 0xF0) << 18) + (($m[$i++] - 0x80) << 12) + (($m[$i++] - 0x80) << 6) + $m[$i++] - 0x80;
+            } elseif (0xE0 <= $m[$i]) {
+                $c = (($m[$i++] - 0xE0) << 12) + (($m[$i++] - 0x80) << 6) + $m[$i++] - 0x80;
+            } else {
+                $c = (($m[$i++] - 0xC0) << 6) + $m[$i++] - 0x80;
+            }
+
+            $entities .= '&#'.$c.';';
+        }
+
+        return $entities;
+    }
+
+    private static function title_case(array $s)
+    {
+        return self::mb_convert_case($s[1], \MB_CASE_UPPER, 'UTF-8').self::mb_convert_case($s[2], \MB_CASE_LOWER, 'UTF-8');
+    }
+
+    private static function getData($file)
+    {
+        if (file_exists($file = __DIR__.'/Resources/unidata/'.$file.'.php')) {
+            return require $file;
+        }
+
+        return false;
+    }
+
+    private static function getEncoding($encoding)
+    {
+        if (null === $encoding) {
+            return self::$internalEncoding;
+        }
+
+        if ('UTF-8' === $encoding) {
+            return 'UTF-8';
+        }
+
+        $encoding = strtoupper($encoding);
+
+        if ('8BIT' === $encoding || 'BINARY' === $encoding) {
+            return 'CP850';
+        }
+
+        if ('UTF8' === $encoding) {
+            return 'UTF-8';
+        }
+
+        return $encoding;
+    }
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/README.md b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/README.md
new file mode 100644
index 000000000..478b40da2
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/README.md
@@ -0,0 +1,13 @@
+Symfony Polyfill / Mbstring
+===========================
+
+This component provides a partial, native PHP implementation for the
+[Mbstring](https://php.net/mbstring) extension.
+
+More information can be found in the
+[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
+
+License
+=======
+
+This library is released under the [MIT license](LICENSE).
diff --git a/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/Resources/unidata/caseFolding.php b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/Resources/unidata/caseFolding.php
new file mode 100644
index 000000000..512bba0bf
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/Resources/unidata/caseFolding.php
@@ -0,0 +1,119 @@
+<?php
+
+return [
+    'İ' => 'i̇',
+    'µ' => 'μ',
+    'Å¿' => 's',
+    'ͅ' => 'ι',
+    'ς' => 'σ',
+    '�' => 'β',
+    'ϑ' => 'θ',
+    'ϕ' => 'φ',
+    'Ï–' => 'Ï€',
+    'ϰ' => 'κ',
+    'ϱ' => '�',
+    'ϵ' => 'ε',
+    'ẛ' => 'ṡ',
+    'ι' => 'ι',
+    'ß' => 'ss',
+    'ʼn' => 'ʼn',
+    'Ç°' => 'Ç°',
+    '�' => '�',
+    'ΰ' => 'ΰ',
+    'Ö‡' => 'Õ¥Ö‚',
+    'ẖ' => 'ẖ',
+    'ẗ' => 'ẗ',
+    'ẘ' => 'ẘ',
+    'ẙ' => 'ẙ',
+    'ẚ' => 'aʾ',
+    'ẞ' => 'ss',
+    '�' => '�',
+    'á½’' => 'á½’',
+    'á½”' => 'á½”',
+    'á½–' => 'á½–',
+    'ᾀ' => 'ἀι',
+    '�' => '�ι',
+    'ᾂ' => 'ἂι',
+    'ᾃ' => 'ἃι',
+    'ᾄ' => 'ἄι',
+    'ᾅ' => 'ἅι',
+    'ᾆ' => 'ἆι',
+    'ᾇ' => 'ἇι',
+    'ᾈ' => 'ἀι',
+    'ᾉ' => '�ι',
+    'ᾊ' => 'ἂι',
+    'ᾋ' => 'ἃι',
+    'ᾌ' => 'ἄι',
+    '�' => 'ἅι',
+    'ᾎ' => 'ἆι',
+    '�' => 'ἇι',
+    '�' => 'ἠι',
+    'ᾑ' => 'ἡι',
+    'ᾒ' => 'ἢι',
+    'ᾓ' => 'ἣι',
+    'ᾔ' => 'ἤι',
+    'ᾕ' => 'ἥι',
+    'ᾖ' => 'ἦι',
+    'ᾗ' => 'ἧι',
+    'ᾘ' => 'ἠι',
+    'ᾙ' => 'ἡι',
+    'ᾚ' => 'ἢι',
+    'ᾛ' => 'ἣι',
+    'ᾜ' => 'ἤι',
+    '�' => 'ἥι',
+    'ᾞ' => 'ἦι',
+    'ᾟ' => 'ἧι',
+    'ᾠ' => 'ὠι',
+    'ᾡ' => 'ὡι',
+    'ᾢ' => 'ὢι',
+    'ᾣ' => 'ὣι',
+    'ᾤ' => 'ὤι',
+    'ᾥ' => 'ὥι',
+    'ᾦ' => 'ὦι',
+    'ᾧ' => 'ὧι',
+    'ᾨ' => 'ὠι',
+    'ᾩ' => 'ὡι',
+    'ᾪ' => 'ὢι',
+    'ᾫ' => 'ὣι',
+    'ᾬ' => 'ὤι',
+    'ᾭ' => 'ὥι',
+    'ᾮ' => 'ὦι',
+    'ᾯ' => 'ὧι',
+    'ᾲ' => 'ὰι',
+    'ᾳ' => 'αι',
+    'ᾴ' => 'άι',
+    'ᾶ' => 'ᾶ',
+    'ᾷ' => 'ᾶι',
+    'ᾼ' => 'αι',
+    'ῂ' => 'ὴι',
+    'ῃ' => 'ηι',
+    'ῄ' => 'ήι',
+    'ῆ' => 'ῆ',
+    'ῇ' => 'ῆι',
+    'ῌ' => 'ηι',
+    'á¿’' => 'á¿’',
+    'á¿–' => 'á¿–',
+    'á¿—' => 'á¿—',
+    'á¿¢' => 'á¿¢',
+    'ῤ' => 'ῤ',
+    'ῦ' => 'ῦ',
+    'ῧ' => 'ῧ',
+    'ῲ' => 'ὼι',
+    'ῳ' => 'ωι',
+    'ῴ' => 'ώι',
+    'ῶ' => 'ῶ',
+    'ῷ' => 'ῶι',
+    'ῼ' => 'ωι',
+    'ff' => 'ff',
+    '�' => 'fi',
+    'fl' => 'fl',
+    'ffi' => 'ffi',
+    'ffl' => 'ffl',
+    'ſt' => 'st',
+    'st' => 'st',
+    'ﬓ' => 'մն',
+    'ﬔ' => 'մե',
+    'ﬕ' => 'մի',
+    'ﬖ' => 'վն',
+    'ﬗ' => 'մխ',
+];
diff --git a/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php
new file mode 100644
index 000000000..fac60b081
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php
@@ -0,0 +1,1397 @@
+<?php
+
+return array (
+  'A' => 'a',
+  'B' => 'b',
+  'C' => 'c',
+  'D' => 'd',
+  'E' => 'e',
+  'F' => 'f',
+  'G' => 'g',
+  'H' => 'h',
+  'I' => 'i',
+  'J' => 'j',
+  'K' => 'k',
+  'L' => 'l',
+  'M' => 'm',
+  'N' => 'n',
+  'O' => 'o',
+  'P' => 'p',
+  'Q' => 'q',
+  'R' => 'r',
+  'S' => 's',
+  'T' => 't',
+  'U' => 'u',
+  'V' => 'v',
+  'W' => 'w',
+  'X' => 'x',
+  'Y' => 'y',
+  'Z' => 'z',
+  'À' => 'à',
+  '�' => 'á',
+  'Â' => 'â',
+  'Ã' => 'ã',
+  'Ä' => 'ä',
+  'Ã…' => 'Ã¥',
+  'Æ' => 'æ',
+  'Ç' => 'ç',
+  'È' => 'è',
+  'É' => 'é',
+  'Ê' => 'ê',
+  'Ë' => 'ë',
+  'Ì' => 'ì',
+  '�' => 'í',
+  'Î' => 'î',
+  '�' => 'ï',
+  '�' => 'ð',
+  'Ñ' => 'ñ',
+  'Ò' => 'ò',
+  'Ó' => 'ó',
+  'Ô' => 'ô',
+  'Õ' => 'õ',
+  'Ö' => 'ö',
+  'Ø' => 'ø',
+  'Ù' => 'ù',
+  'Ú' => 'ú',
+  'Û' => 'û',
+  'Ü' => 'ü',
+  '�' => 'ý',
+  'Þ' => 'þ',
+  'Ā' => '�',
+  'Ă' => 'ă',
+  'Ä„' => 'Ä…',
+  'Ć' => 'ć',
+  'Ĉ' => 'ĉ',
+  'ÄŠ' => 'Ä‹',
+  'Č' => '�',
+  'Ď' => '�',
+  '�' => 'đ',
+  'Ä’' => 'Ä“',
+  'Ä”' => 'Ä•',
+  'Ä–' => 'Ä—',
+  'Ę' => 'ę',
+  'Äš' => 'Ä›',
+  'Ĝ' => '�',
+  'Äž' => 'ÄŸ',
+  'Ä ' => 'Ä¡',
+  'Ä¢' => 'Ä£',
+  'Ĥ' => 'ĥ',
+  'Ħ' => 'ħ',
+  'Ĩ' => 'ĩ',
+  'Ī' => 'ī',
+  'Ĭ' => 'ĭ',
+  'Į' => 'į',
+  'İ' => 'i̇',
+  'IJ' => 'ij',
+  'Ĵ' => 'ĵ',
+  'Ķ' => 'ķ',
+  'Ĺ' => 'ĺ',
+  'Ļ' => 'ļ',
+  'Ľ' => 'ľ',
+  'Ä¿' => 'Å€',
+  '�' => 'ł',
+  'Ń' => 'ń',
+  'Ņ' => 'ņ',
+  'Ň' => 'ň',
+  'ÅŠ' => 'Å‹',
+  'Ō' => '�',
+  'Ŏ' => '�',
+  '�' => 'ő',
+  'Å’' => 'Å“',
+  'Å”' => 'Å•',
+  'Å–' => 'Å—',
+  'Ř' => 'ř',
+  'Åš' => 'Å›',
+  'Ŝ' => '�',
+  'Åž' => 'ÅŸ',
+  'Å ' => 'Å¡',
+  'Å¢' => 'Å£',
+  'Ť' => 'ť',
+  'Ŧ' => 'ŧ',
+  'Ũ' => 'ũ',
+  'Ū' => 'ū',
+  'Ŭ' => 'ŭ',
+  'Ů' => 'ů',
+  'Ű' => 'ű',
+  'Ų' => 'ų',
+  'Ŵ' => 'ŵ',
+  'Ŷ' => 'ŷ',
+  'Ÿ' => 'ÿ',
+  'Ź' => 'ź',
+  'Ż' => 'ż',
+  'Ž' => 'ž',
+  '�' => 'ɓ',
+  'Ƃ' => 'ƃ',
+  'Æ„' => 'Æ…',
+  'Ɔ' => 'ɔ',
+  'Ƈ' => 'ƈ',
+  'Ɖ' => 'ɖ',
+  'ÆŠ' => 'É—',
+  'Ƌ' => 'ƌ',
+  'Ǝ' => '�',
+  '�' => 'ə',
+  '�' => 'ɛ',
+  'Æ‘' => 'Æ’',
+  'Æ“' => 'É ',
+  'Æ”' => 'É£',
+  'Æ–' => 'É©',
+  'Ɨ' => 'ɨ',
+  'Ƙ' => 'ƙ',
+  'Ɯ' => 'ɯ',
+  '�' => 'ɲ',
+  'Ɵ' => 'ɵ',
+  'Æ ' => 'Æ¡',
+  'Æ¢' => 'Æ£',
+  'Ƥ' => 'ƥ',
+  'Ʀ' => 'ʀ',
+  'Ƨ' => 'ƨ',
+  'Ʃ' => 'ʃ',
+  'Ƭ' => 'ƭ',
+  'Ʈ' => 'ʈ',
+  'Ư' => 'ư',
+  'Ʊ' => 'ʊ',
+  'Ʋ' => 'ʋ',
+  'Ƴ' => 'ƴ',
+  'Ƶ' => 'ƶ',
+  'Æ·' => 'Ê’',
+  'Ƹ' => 'ƹ',
+  'Ƽ' => 'ƽ',
+  'DŽ' => 'dž',
+  'Dž' => 'dž',
+  'LJ' => 'lj',
+  'Lj' => 'lj',
+  'NJ' => 'nj',
+  'Nj' => 'nj',
+  '�' => 'ǎ',
+  '�' => '�',
+  'Ç‘' => 'Ç’',
+  'Ç“' => 'Ç”',
+  'Ç•' => 'Ç–',
+  'Ǘ' => 'ǘ',
+  'Ç™' => 'Çš',
+  'Ǜ' => 'ǜ',
+  'Çž' => 'ÇŸ',
+  'Ç ' => 'Ç¡',
+  'Ç¢' => 'Ç£',
+  'Ǥ' => 'ǥ',
+  'Ǧ' => 'ǧ',
+  'Ǩ' => 'ǩ',
+  'Ǫ' => 'ǫ',
+  'Ǭ' => 'ǭ',
+  'Ǯ' => 'ǯ',
+  'DZ' => 'dz',
+  'Dz' => 'dz',
+  'Ǵ' => 'ǵ',
+  'Ƕ' => 'ƕ',
+  'Ç·' => 'Æ¿',
+  'Ǹ' => 'ǹ',
+  'Ǻ' => 'ǻ',
+  'Ǽ' => 'ǽ',
+  'Ǿ' => 'ǿ',
+  'Ȁ' => '�',
+  'Ȃ' => 'ȃ',
+  'È„' => 'È…',
+  'Ȇ' => 'ȇ',
+  'Ȉ' => 'ȉ',
+  'ÈŠ' => 'È‹',
+  'Ȍ' => '�',
+  'Ȏ' => '�',
+  '�' => 'ȑ',
+  'È’' => 'È“',
+  'È”' => 'È•',
+  'È–' => 'È—',
+  'Ș' => 'ș',
+  'Èš' => 'È›',
+  'Ȝ' => '�',
+  'Èž' => 'ÈŸ',
+  'È ' => 'Æž',
+  'È¢' => 'È£',
+  'Ȥ' => 'ȥ',
+  'Ȧ' => 'ȧ',
+  'Ȩ' => 'ȩ',
+  'Ȫ' => 'ȫ',
+  'Ȭ' => 'ȭ',
+  'Ȯ' => 'ȯ',
+  'Ȱ' => 'ȱ',
+  'Ȳ' => 'ȳ',
+  'Ⱥ' => 'ⱥ',
+  'Ȼ' => 'ȼ',
+  'Ƚ' => 'ƚ',
+  'Ⱦ' => 'ⱦ',
+  '�' => 'ɂ',
+  'Ƀ' => 'ƀ',
+  'Ʉ' => 'ʉ',
+  'Ʌ' => 'ʌ',
+  'Ɇ' => 'ɇ',
+  'Ɉ' => 'ɉ',
+  'ÉŠ' => 'É‹',
+  'Ɍ' => '�',
+  'Ɏ' => '�',
+  'Ͱ' => 'ͱ',
+  'Ͳ' => 'ͳ',
+  'Ͷ' => 'ͷ',
+  'Ϳ' => 'ϳ',
+  'Ά' => 'ά',
+  'Έ' => 'έ',
+  'Ή' => 'ή',
+  'Ί' => 'ί',
+  'Ό' => 'ό',
+  'Ύ' => '�',
+  '�' => 'ώ',
+  'Α' => 'α',
+  'Β' => 'β',
+  'Γ' => 'γ',
+  'Δ' => 'δ',
+  'Ε' => 'ε',
+  'Ζ' => 'ζ',
+  'Η' => 'η',
+  'Θ' => 'θ',
+  'Ι' => 'ι',
+  'Κ' => 'κ',
+  'Λ' => 'λ',
+  'Μ' => 'μ',
+  '�' => 'ν',
+  'Ξ' => 'ξ',
+  'Ο' => 'ο',
+  'Π' => 'π',
+  'Ρ' => '�',
+  'Σ' => 'σ',
+  'Τ' => 'τ',
+  'Î¥' => 'Ï…',
+  'Φ' => 'φ',
+  'Χ' => 'χ',
+  'Ψ' => 'ψ',
+  'Ω' => 'ω',
+  'Ϊ' => 'ϊ',
+  'Ϋ' => 'ϋ',
+  '�' => 'ϗ',
+  'Ϙ' => 'ϙ',
+  'Ïš' => 'Ï›',
+  'Ϝ' => '�',
+  'Ïž' => 'ÏŸ',
+  'Ï ' => 'Ï¡',
+  'Ï¢' => 'Ï£',
+  'Ϥ' => 'ϥ',
+  'Ϧ' => 'ϧ',
+  'Ϩ' => 'ϩ',
+  'Ϫ' => 'ϫ',
+  'Ϭ' => 'ϭ',
+  'Ϯ' => 'ϯ',
+  'ϴ' => 'θ',
+  'Ϸ' => 'ϸ',
+  'Ϲ' => 'ϲ',
+  'Ϻ' => 'ϻ',
+  'Ͻ' => 'ͻ',
+  'Ͼ' => 'ͼ',
+  'Ͽ' => 'ͽ',
+  'Ѐ' => '�',
+  '�' => 'ё',
+  'Ђ' => 'ђ',
+  'Ѓ' => 'ѓ',
+  'Є' => 'є',
+  'Ð…' => 'Ñ•',
+  'І' => 'і',
+  'Ї' => 'ї',
+  'Ј' => 'ј',
+  'Љ' => 'љ',
+  'Њ' => 'њ',
+  'Ћ' => 'ћ',
+  'Ќ' => 'ќ',
+  '�' => '�',
+  'ÐŽ' => 'Ñž',
+  '�' => 'џ',
+  '�' => 'а',
+  'Б' => 'б',
+  'В' => 'в',
+  'Г' => 'г',
+  'Д' => 'д',
+  'Е' => 'е',
+  'Ж' => 'ж',
+  'З' => 'з',
+  'И' => 'и',
+  'Й' => 'й',
+  'К' => 'к',
+  'Л' => 'л',
+  'М' => 'м',
+  '�' => 'н',
+  'О' => 'о',
+  'П' => 'п',
+  'Р' => 'р',
+  'С' => '�',
+  'Т' => 'т',
+  'У' => 'у',
+  'Ф' => 'ф',
+  'Ð¥' => 'Ñ…',
+  'Ц' => 'ц',
+  'Ч' => 'ч',
+  'Ш' => 'ш',
+  'Щ' => 'щ',
+  'Ъ' => 'ъ',
+  'Ы' => 'ы',
+  'Ь' => 'ь',
+  'Э' => '�',
+  'Ю' => 'ю',
+  'Я' => '�',
+  'Ñ ' => 'Ñ¡',
+  'Ñ¢' => 'Ñ£',
+  'Ѥ' => 'ѥ',
+  'Ѧ' => 'ѧ',
+  'Ѩ' => 'ѩ',
+  'Ѫ' => 'ѫ',
+  'Ѭ' => 'ѭ',
+  'Ѯ' => 'ѯ',
+  'Ѱ' => 'ѱ',
+  'Ѳ' => 'ѳ',
+  'Ѵ' => 'ѵ',
+  'Ѷ' => 'ѷ',
+  'Ѹ' => 'ѹ',
+  'Ѻ' => 'ѻ',
+  'Ѽ' => 'ѽ',
+  'Ѿ' => 'ѿ',
+  'Ò€' => 'Ò�',
+  'ÒŠ' => 'Ò‹',
+  'Ҍ' => '�',
+  'ÒŽ' => 'Ò�',
+  'Ò�' => 'Ò‘',
+  'Ò’' => 'Ò“',
+  'Ò”' => 'Ò•',
+  'Ò–' => 'Ò—',
+  'Ò˜' => 'Ò™',
+  'Òš' => 'Ò›',
+  'Ҝ' => '�',
+  'Òž' => 'ÒŸ',
+  'Ò ' => 'Ò¡',
+  'Ò¢' => 'Ò£',
+  'Ò¤' => 'Ò¥',
+  'Ò¦' => 'Ò§',
+  'Ò¨' => 'Ò©',
+  'Òª' => 'Ò«',
+  'Ò¬' => 'Ò­',
+  'Ò®' => 'Ò¯',
+  'Ò°' => 'Ò±',
+  'Ò²' => 'Ò³',
+  'Ò´' => 'Òµ',
+  'Ò¶' => 'Ò·',
+  'Ò¸' => 'Ò¹',
+  'Òº' => 'Ò»',
+  'Ò¼' => 'Ò½',
+  'Ò¾' => 'Ò¿',
+  'Ó€' => 'Ó�',
+  'Ó�' => 'Ó‚',
+  'Óƒ' => 'Ó„',
+  'Ó…' => 'Ó†',
+  'Ó‡' => 'Óˆ',
+  'Ó‰' => 'ÓŠ',
+  'Ӌ' => 'ӌ',
+  'Ó�' => 'ÓŽ',
+  'Ó�' => 'Ó‘',
+  'Ó’' => 'Ó“',
+  'Ó”' => 'Ó•',
+  'Ó–' => 'Ó—',
+  'Ó˜' => 'Ó™',
+  'Óš' => 'Ó›',
+  'Ӝ' => '�',
+  'Óž' => 'ÓŸ',
+  'Ó ' => 'Ó¡',
+  'Ó¢' => 'Ó£',
+  'Ó¤' => 'Ó¥',
+  'Ó¦' => 'Ó§',
+  'Ó¨' => 'Ó©',
+  'Óª' => 'Ó«',
+  'Ó¬' => 'Ó­',
+  'Ó®' => 'Ó¯',
+  'Ó°' => 'Ó±',
+  'Ó²' => 'Ó³',
+  'Ó´' => 'Óµ',
+  'Ó¶' => 'Ó·',
+  'Ó¸' => 'Ó¹',
+  'Óº' => 'Ó»',
+  'Ó¼' => 'Ó½',
+  'Ó¾' => 'Ó¿',
+  'Ô€' => 'Ô�',
+  'Ô‚' => 'Ôƒ',
+  'Ô„' => 'Ô…',
+  'Ô†' => 'Ô‡',
+  'Ôˆ' => 'Ô‰',
+  'ÔŠ' => 'Ô‹',
+  'Ԍ' => '�',
+  'ÔŽ' => 'Ô�',
+  'Ô�' => 'Ô‘',
+  'Ô’' => 'Ô“',
+  'Ô”' => 'Ô•',
+  'Ô–' => 'Ô—',
+  'Ô˜' => 'Ô™',
+  'Ôš' => 'Ô›',
+  'Ԝ' => '�',
+  'Ôž' => 'ÔŸ',
+  'Ô ' => 'Ô¡',
+  'Ô¢' => 'Ô£',
+  'Ô¤' => 'Ô¥',
+  'Ô¦' => 'Ô§',
+  'Ô¨' => 'Ô©',
+  'Ôª' => 'Ô«',
+  'Ô¬' => 'Ô­',
+  'Ô®' => 'Ô¯',
+  'Ô±' => 'Õ¡',
+  'Ô²' => 'Õ¢',
+  'Ô³' => 'Õ£',
+  'Ô´' => 'Õ¤',
+  'Ôµ' => 'Õ¥',
+  'Ô¶' => 'Õ¦',
+  'Ô·' => 'Õ§',
+  'Ô¸' => 'Õ¨',
+  'Ô¹' => 'Õ©',
+  'Ôº' => 'Õª',
+  'Ô»' => 'Õ«',
+  'Ô¼' => 'Õ¬',
+  'Ô½' => 'Õ­',
+  'Ô¾' => 'Õ®',
+  'Ô¿' => 'Õ¯',
+  'Õ€' => 'Õ°',
+  'Õ�' => 'Õ±',
+  'Õ‚' => 'Õ²',
+  'Õƒ' => 'Õ³',
+  'Õ„' => 'Õ´',
+  'Õ…' => 'Õµ',
+  'Õ†' => 'Õ¶',
+  'Õ‡' => 'Õ·',
+  'Õˆ' => 'Õ¸',
+  'Õ‰' => 'Õ¹',
+  'ÕŠ' => 'Õº',
+  'Õ‹' => 'Õ»',
+  'Ռ' => 'ռ',
+  'Õ�' => 'Õ½',
+  'ÕŽ' => 'Õ¾',
+  'Õ�' => 'Õ¿',
+  'Õ�' => 'Ö€',
+  'Õ‘' => 'Ö�',
+  'Õ’' => 'Ö‚',
+  'Õ“' => 'Öƒ',
+  'Õ”' => 'Ö„',
+  'Õ•' => 'Ö…',
+  'Õ–' => 'Ö†',
+  'á‚ ' => 'â´€',
+  'á‚¡' => 'â´�',
+  'á‚¢' => 'â´‚',
+  'á‚£' => 'â´ƒ',
+  'Ⴄ' => 'ⴄ',
+  'á‚¥' => 'â´…',
+  'Ⴆ' => 'ⴆ',
+  'Ⴇ' => 'ⴇ',
+  'Ⴈ' => 'ⴈ',
+  'á‚©' => 'â´‰',
+  'Ⴊ' => 'ⴊ',
+  'á‚«' => 'â´‹',
+  'Ⴌ' => 'ⴌ',
+  'á‚­' => 'â´�',
+  'á‚®' => 'â´Ž',
+  'Ⴏ' => '�',
+  'á‚°' => 'â´�',
+  'Ⴑ' => 'ⴑ',
+  'Ⴒ' => 'ⴒ',
+  'Ⴓ' => 'ⴓ',
+  'á‚´' => 'â´”',
+  'Ⴕ' => 'ⴕ',
+  'Ⴖ' => 'ⴖ',
+  'á‚·' => 'â´—',
+  'Ⴘ' => 'ⴘ',
+  'Ⴙ' => 'ⴙ',
+  'Ⴚ' => 'ⴚ',
+  'á‚»' => 'â´›',
+  'Ⴜ' => 'ⴜ',
+  'Ⴝ' => '�',
+  'Ⴞ' => 'ⴞ',
+  'á‚¿' => 'â´Ÿ',
+  'Ⴠ' => 'ⴠ',
+  '�' => 'ⴡ',
+  'Ⴢ' => 'ⴢ',
+  'Ⴣ' => 'ⴣ',
+  'Ⴤ' => 'ⴤ',
+  'Ⴥ' => 'ⴥ',
+  'Ⴧ' => 'ⴧ',
+  '�' => 'ⴭ',
+  'Ꭰ' => 'ꭰ',
+  'Ꭱ' => 'ꭱ',
+  'Ꭲ' => 'ꭲ',
+  'Ꭳ' => 'ꭳ',
+  'Ꭴ' => 'ꭴ',
+  'Ꭵ' => 'ꭵ',
+  'Ꭶ' => 'ꭶ',
+  'Ꭷ' => 'ꭷ',
+  'Ꭸ' => 'ꭸ',
+  'Ꭹ' => 'ꭹ',
+  'Ꭺ' => 'ꭺ',
+  'Ꭻ' => 'ꭻ',
+  'Ꭼ' => 'ꭼ',
+  'Ꭽ' => 'ꭽ',
+  'Ꭾ' => 'ꭾ',
+  'Ꭿ' => 'ꭿ',
+  'Ꮀ' => 'ꮀ',
+  'Ꮁ' => '�',
+  'Ꮂ' => 'ꮂ',
+  'Ꮃ' => 'ꮃ',
+  'Ꮄ' => 'ꮄ',
+  'Ꮅ' => 'ꮅ',
+  'Ꮆ' => 'ꮆ',
+  'Ꮇ' => 'ꮇ',
+  'Ꮈ' => 'ꮈ',
+  'Ꮉ' => 'ꮉ',
+  'Ꮊ' => 'ꮊ',
+  'Ꮋ' => 'ꮋ',
+  'Ꮌ' => 'ꮌ',
+  'Ꮍ' => '�',
+  'Ꮎ' => 'ꮎ',
+  'Ꮏ' => '�',
+  '�' => '�',
+  '�' => 'ꮑ',
+  '�' => 'ꮒ',
+  '�' => 'ꮓ',
+  '�' => 'ꮔ',
+  '�' => 'ꮕ',
+  '�' => 'ꮖ',
+  '�' => 'ꮗ',
+  '�' => 'ꮘ',
+  '�' => 'ꮙ',
+  '�' => 'ꮚ',
+  '�' => 'ꮛ',
+  '�' => 'ꮜ',
+  '�' => '�',
+  '�' => 'ꮞ',
+  '�' => 'ꮟ',
+  '�' => 'ꮠ',
+  '�' => 'ꮡ',
+  '�' => 'ꮢ',
+  '�' => 'ꮣ',
+  '�' => 'ꮤ',
+  '�' => 'ꮥ',
+  '�' => 'ꮦ',
+  '�' => 'ꮧ',
+  '�' => 'ꮨ',
+  '�' => 'ꮩ',
+  '�' => 'ꮪ',
+  '�' => 'ꮫ',
+  '�' => 'ꮬ',
+  '�' => 'ꮭ',
+  '�' => 'ꮮ',
+  '�' => 'ꮯ',
+  '�' => 'ꮰ',
+  '�' => 'ꮱ',
+  '�' => 'ꮲ',
+  '�' => 'ꮳ',
+  '�' => 'ꮴ',
+  '�' => 'ꮵ',
+  '�' => 'ꮶ',
+  '�' => 'ꮷ',
+  '�' => 'ꮸ',
+  '�' => 'ꮹ',
+  '�' => 'ꮺ',
+  '�' => 'ꮻ',
+  '�' => 'ꮼ',
+  '�' => 'ꮽ',
+  '�' => 'ꮾ',
+  '�' => 'ꮿ',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  'Ბ' => 'ბ',
+  'Გ' => 'გ',
+  'Დ' => 'დ',
+  'Ე' => 'ე',
+  'Ვ' => 'ვ',
+  'Ზ' => 'ზ',
+  'Თ' => 'თ',
+  'Ი' => 'ი',
+  'Კ' => 'კ',
+  'Ლ' => 'ლ',
+  'Მ' => 'მ',
+  'Ნ' => 'ნ',
+  '�' => '�',
+  'Პ' => 'პ',
+  'Ჟ' => 'ჟ',
+  'Რ' => 'რ',
+  'Ს' => 'ს',
+  'Ტ' => 'ტ',
+  'Უ' => 'უ',
+  'Ფ' => 'ფ',
+  'Ქ' => 'ქ',
+  'Ღ' => 'ღ',
+  'Ყ' => 'ყ',
+  'Შ' => 'შ',
+  'Ჩ' => 'ჩ',
+  'Ც' => 'ც',
+  'Ძ' => 'ძ',
+  'Წ' => 'წ',
+  'Ჭ' => 'ჭ',
+  'Ხ' => 'ხ',
+  'Ჯ' => 'ჯ',
+  'Ჰ' => 'ჰ',
+  'Ჱ' => 'ჱ',
+  'Ჲ' => 'ჲ',
+  'Ჳ' => 'ჳ',
+  'Ჴ' => 'ჴ',
+  'Ჵ' => 'ჵ',
+  'Ჶ' => 'ჶ',
+  'Ჷ' => 'ჷ',
+  'Ჸ' => 'ჸ',
+  'Ჹ' => 'ჹ',
+  'Ჺ' => 'ჺ',
+  'Ჽ' => 'ჽ',
+  'Ჾ' => 'ჾ',
+  'Ჿ' => 'ჿ',
+  'Ḁ' => '�',
+  'Ḃ' => 'ḃ',
+  'Ḅ' => 'ḅ',
+  'Ḇ' => 'ḇ',
+  'Ḉ' => 'ḉ',
+  'Ḋ' => 'ḋ',
+  'Ḍ' => '�',
+  'Ḏ' => '�',
+  '�' => 'ḑ',
+  'Ḓ' => 'ḓ',
+  'Ḕ' => 'ḕ',
+  'Ḗ' => 'ḗ',
+  'Ḙ' => 'ḙ',
+  'Ḛ' => 'ḛ',
+  'Ḝ' => '�',
+  'Ḟ' => 'ḟ',
+  'Ḡ' => 'ḡ',
+  'Ḣ' => 'ḣ',
+  'Ḥ' => 'ḥ',
+  'Ḧ' => 'ḧ',
+  'Ḩ' => 'ḩ',
+  'Ḫ' => 'ḫ',
+  'Ḭ' => 'ḭ',
+  'Ḯ' => 'ḯ',
+  'Ḱ' => 'ḱ',
+  'Ḳ' => 'ḳ',
+  'Ḵ' => 'ḵ',
+  'Ḷ' => 'ḷ',
+  'Ḹ' => 'ḹ',
+  'Ḻ' => 'ḻ',
+  'Ḽ' => 'ḽ',
+  'Ḿ' => 'ḿ',
+  'Ṁ' => '�',
+  'Ṃ' => 'ṃ',
+  'Ṅ' => 'ṅ',
+  'Ṇ' => 'ṇ',
+  'Ṉ' => 'ṉ',
+  'Ṋ' => 'ṋ',
+  'Ṍ' => '�',
+  'Ṏ' => '�',
+  '�' => 'ṑ',
+  'Ṓ' => 'ṓ',
+  'Ṕ' => 'ṕ',
+  'á¹–' => 'á¹—',
+  'Ṙ' => 'ṙ',
+  'Ṛ' => 'ṛ',
+  'Ṝ' => '�',
+  'Ṟ' => 'ṟ',
+  'Ṡ' => 'ṡ',
+  'á¹¢' => 'á¹£',
+  'Ṥ' => 'ṥ',
+  'Ṧ' => 'ṧ',
+  'Ṩ' => 'ṩ',
+  'Ṫ' => 'ṫ',
+  'Ṭ' => 'ṭ',
+  'Ṯ' => 'ṯ',
+  'á¹°' => 'á¹±',
+  'á¹²' => 'á¹³',
+  'á¹´' => 'á¹µ',
+  'Ṷ' => 'ṷ',
+  'Ṹ' => 'ṹ',
+  'Ṻ' => 'ṻ',
+  'á¹¼' => 'á¹½',
+  'Ṿ' => 'ṿ',
+  'Ẁ' => '�',
+  'Ẃ' => 'ẃ',
+  'Ẅ' => 'ẅ',
+  'Ẇ' => 'ẇ',
+  'Ẉ' => 'ẉ',
+  'Ẋ' => 'ẋ',
+  'Ẍ' => '�',
+  'Ẏ' => '�',
+  '�' => 'ẑ',
+  'Ẓ' => 'ẓ',
+  'Ẕ' => 'ẕ',
+  'ẞ' => 'ß',
+  'Ạ' => 'ạ',
+  'Ả' => 'ả',
+  'Ấ' => 'ấ',
+  'Ầ' => 'ầ',
+  'Ẩ' => 'ẩ',
+  'Ẫ' => 'ẫ',
+  'Ậ' => 'ậ',
+  'Ắ' => 'ắ',
+  'Ằ' => 'ằ',
+  'Ẳ' => 'ẳ',
+  'Ẵ' => 'ẵ',
+  'Ặ' => 'ặ',
+  'Ẹ' => 'ẹ',
+  'Ẻ' => 'ẻ',
+  'Ẽ' => 'ẽ',
+  'Ế' => 'ế',
+  'Ề' => '�',
+  'Ể' => 'ể',
+  'Ễ' => 'ễ',
+  'Ệ' => 'ệ',
+  'Ỉ' => 'ỉ',
+  'Ị' => 'ị',
+  'Ọ' => '�',
+  'Ỏ' => '�',
+  '�' => 'ố',
+  'Ồ' => 'ồ',
+  'Ổ' => 'ổ',
+  'á»–' => 'á»—',
+  'Ộ' => 'ộ',
+  'Ớ' => 'ớ',
+  'Ờ' => '�',
+  'Ở' => 'ở',
+  'Ỡ' => 'ỡ',
+  'Ợ' => 'ợ',
+  'Ụ' => 'ụ',
+  'Ủ' => 'ủ',
+  'Ứ' => 'ứ',
+  'Ừ' => 'ừ',
+  'Ử' => 'ử',
+  'Ữ' => 'ữ',
+  'á»°' => 'á»±',
+  'Ỳ' => 'ỳ',
+  'Ỵ' => 'ỵ',
+  'Ỷ' => 'ỷ',
+  'Ỹ' => 'ỹ',
+  'Ỻ' => 'ỻ',
+  'Ỽ' => 'ỽ',
+  'Ỿ' => 'ỿ',
+  'Ἀ' => 'ἀ',
+  'Ἁ' => '�',
+  'Ἂ' => 'ἂ',
+  'Ἃ' => 'ἃ',
+  'Ἄ' => 'ἄ',
+  '�' => 'ἅ',
+  'Ἆ' => 'ἆ',
+  '�' => 'ἇ',
+  'Ἐ' => '�',
+  'Ἑ' => 'ἑ',
+  'Ἒ' => 'ἒ',
+  'Ἓ' => 'ἓ',
+  'Ἔ' => 'ἔ',
+  '�' => 'ἕ',
+  'Ἠ' => 'ἠ',
+  'Ἡ' => 'ἡ',
+  'Ἢ' => 'ἢ',
+  'Ἣ' => 'ἣ',
+  'Ἤ' => 'ἤ',
+  'á¼­' => 'á¼¥',
+  'Ἦ' => 'ἦ',
+  'Ἧ' => 'ἧ',
+  'Ἰ' => 'ἰ',
+  'á¼¹' => 'á¼±',
+  'Ἲ' => 'ἲ',
+  'á¼»' => 'á¼³',
+  'á¼¼' => 'á¼´',
+  'á¼½' => 'á¼µ',
+  'Ἶ' => 'ἶ',
+  'Ἷ' => 'ἷ',
+  'Ὀ' => 'ὀ',
+  'Ὁ' => '�',
+  'Ὂ' => 'ὂ',
+  'Ὃ' => 'ὃ',
+  'Ὄ' => 'ὄ',
+  '�' => 'ὅ',
+  'Ὑ' => 'ὑ',
+  'Ὓ' => 'ὓ',
+  '�' => 'ὕ',
+  'Ὗ' => 'ὗ',
+  'Ὠ' => 'ὠ',
+  'Ὡ' => 'ὡ',
+  'Ὢ' => 'ὢ',
+  'Ὣ' => 'ὣ',
+  'Ὤ' => 'ὤ',
+  'á½­' => 'á½¥',
+  'Ὦ' => 'ὦ',
+  'Ὧ' => 'ὧ',
+  'ᾈ' => 'ᾀ',
+  'ᾉ' => '�',
+  'ᾊ' => 'ᾂ',
+  'ᾋ' => 'ᾃ',
+  'ᾌ' => 'ᾄ',
+  '�' => 'ᾅ',
+  'ᾎ' => 'ᾆ',
+  '�' => 'ᾇ',
+  'ᾘ' => '�',
+  'ᾙ' => 'ᾑ',
+  'ᾚ' => 'ᾒ',
+  'ᾛ' => 'ᾓ',
+  'ᾜ' => 'ᾔ',
+  '�' => 'ᾕ',
+  'ᾞ' => 'ᾖ',
+  'ᾟ' => 'ᾗ',
+  'ᾨ' => 'ᾠ',
+  'ᾩ' => 'ᾡ',
+  'ᾪ' => 'ᾢ',
+  'ᾫ' => 'ᾣ',
+  'ᾬ' => 'ᾤ',
+  'á¾­' => 'á¾¥',
+  'ᾮ' => 'ᾦ',
+  'ᾯ' => 'ᾧ',
+  'Ᾰ' => 'ᾰ',
+  'á¾¹' => 'á¾±',
+  'Ὰ' => 'ὰ',
+  'á¾»' => 'á½±',
+  'á¾¼' => 'á¾³',
+  'Ὲ' => 'ὲ',
+  'Έ' => 'έ',
+  'á¿Š' => 'á½´',
+  'á¿‹' => 'á½µ',
+  'ῌ' => 'ῃ',
+  'Ῐ' => '�',
+  'á¿™' => 'á¿‘',
+  'Ὶ' => 'ὶ',
+  'á¿›' => 'á½·',
+  'Ῠ' => 'ῠ',
+  'á¿©' => 'á¿¡',
+  'Ὺ' => 'ὺ',
+  'á¿«' => 'á½»',
+  'Ῥ' => 'ῥ',
+  'Ὸ' => 'ὸ',
+  'Ό' => 'ό',
+  'Ὼ' => 'ὼ',
+  'á¿»' => 'á½½',
+  'ῼ' => 'ῳ',
+  'Ω' => 'ω',
+  'K' => 'k',
+  'â„«' => 'Ã¥',
+  'Ⅎ' => 'ⅎ',
+  'â… ' => 'â…°',
+  'â…¡' => 'â…±',
+  'â…¢' => 'â…²',
+  'â…£' => 'â…³',
+  'â…¤' => 'â…´',
+  'â…¥' => 'â…µ',
+  'â…¦' => 'â…¶',
+  'â…§' => 'â…·',
+  'â…¨' => 'â…¸',
+  'â…©' => 'â…¹',
+  'â…ª' => 'â…º',
+  'â…«' => 'â…»',
+  'â…¬' => 'â…¼',
+  'â…­' => 'â…½',
+  'â…®' => 'â…¾',
+  'â…¯' => 'â…¿',
+  'Ↄ' => 'ↄ',
+  'Ⓐ' => '�',
+  'â’·' => 'â“‘',
+  'â’¸' => 'â“’',
+  'â’¹' => 'â““',
+  'â’º' => 'â“”',
+  'â’»' => 'â“•',
+  'â’¼' => 'â“–',
+  'â’½' => 'â“—',
+  'Ⓘ' => 'ⓘ',
+  'â’¿' => 'â“™',
+  'â“€' => 'â“š',
+  '�' => 'ⓛ',
+  'Ⓜ' => 'ⓜ',
+  'Ⓝ' => '�',
+  'â“„' => 'â“ž',
+  'â“…' => 'â“Ÿ',
+  'Ⓠ' => 'ⓠ',
+  'Ⓡ' => 'ⓡ',
+  'Ⓢ' => 'ⓢ',
+  'Ⓣ' => 'ⓣ',
+  'Ⓤ' => 'ⓤ',
+  'â“‹' => 'â“¥',
+  'Ⓦ' => 'ⓦ',
+  '�' => 'ⓧ',
+  'Ⓨ' => 'ⓨ',
+  '�' => 'ⓩ',
+  'â°€' => 'â°°',
+  'â°�' => 'â°±',
+  'â°‚' => 'â°²',
+  'â°ƒ' => 'â°³',
+  'â°„' => 'â°´',
+  'â°…' => 'â°µ',
+  'â°†' => 'â°¶',
+  'â°‡' => 'â°·',
+  'â°ˆ' => 'â°¸',
+  'â°‰' => 'â°¹',
+  'â°Š' => 'â°º',
+  'â°‹' => 'â°»',
+  'Ⰼ' => 'ⰼ',
+  'â°�' => 'â°½',
+  'â°Ž' => 'â°¾',
+  'â°�' => 'â°¿',
+  'â°�' => 'â±€',
+  'Ⱁ' => '�',
+  'Ⱂ' => 'ⱂ',
+  'Ⱃ' => 'ⱃ',
+  'Ⱄ' => 'ⱄ',
+  'â°•' => 'â±…',
+  'Ⱆ' => 'ⱆ',
+  'Ⱇ' => 'ⱇ',
+  'Ⱈ' => 'ⱈ',
+  'Ⱉ' => 'ⱉ',
+  'Ⱊ' => 'ⱊ',
+  'Ⱋ' => 'ⱋ',
+  'Ⱌ' => 'ⱌ',
+  '�' => '�',
+  'Ⱎ' => 'ⱎ',
+  'Ⱏ' => '�',
+  'Ⱐ' => '�',
+  'Ⱑ' => 'ⱑ',
+  'â°¢' => 'â±’',
+  'Ⱓ' => 'ⱓ',
+  'â°¤' => 'â±”',
+  'Ⱕ' => 'ⱕ',
+  'â°¦' => 'â±–',
+  'â°§' => 'â±—',
+  'Ⱘ' => 'ⱘ',
+  'â°©' => 'â±™',
+  'Ⱚ' => 'ⱚ',
+  'â°«' => 'â±›',
+  'Ⱜ' => 'ⱜ',
+  'Ⱝ' => '�',
+  'Ⱞ' => 'ⱞ',
+  'Ⱡ' => 'ⱡ',
+  'â±¢' => 'É«',
+  'â±£' => 'áµ½',
+  'Ɽ' => 'ɽ',
+  'Ⱨ' => 'ⱨ',
+  'Ⱪ' => 'ⱪ',
+  'Ⱬ' => 'ⱬ',
+  'â±­' => 'É‘',
+  'Ɱ' => 'ɱ',
+  'Ɐ' => '�',
+  'â±°' => 'É’',
+  'â±²' => 'â±³',
+  'Ⱶ' => 'ⱶ',
+  'â±¾' => 'È¿',
+  'Ɀ' => 'ɀ',
+  'Ⲁ' => '�',
+  'Ⲃ' => 'ⲃ',
+  'Ⲅ' => 'ⲅ',
+  'Ⲇ' => 'ⲇ',
+  'Ⲉ' => 'ⲉ',
+  'Ⲋ' => 'ⲋ',
+  'Ⲍ' => '�',
+  'Ⲏ' => '�',
+  '�' => 'ⲑ',
+  'Ⲓ' => 'ⲓ',
+  'Ⲕ' => 'ⲕ',
+  'â²–' => 'â²—',
+  'Ⲙ' => 'ⲙ',
+  'Ⲛ' => 'ⲛ',
+  'Ⲝ' => '�',
+  'Ⲟ' => 'ⲟ',
+  'Ⲡ' => 'ⲡ',
+  'â²¢' => 'â²£',
+  'Ⲥ' => 'ⲥ',
+  'Ⲧ' => 'ⲧ',
+  'Ⲩ' => 'ⲩ',
+  'Ⲫ' => 'ⲫ',
+  'Ⲭ' => 'ⲭ',
+  'Ⲯ' => 'ⲯ',
+  'â²°' => 'â²±',
+  'â²²' => 'â²³',
+  'â²´' => 'â²µ',
+  'Ⲷ' => 'ⲷ',
+  'Ⲹ' => 'ⲹ',
+  'Ⲻ' => 'ⲻ',
+  'â²¼' => 'â²½',
+  'Ⲿ' => 'ⲿ',
+  'Ⳁ' => '�',
+  'Ⳃ' => 'ⳃ',
+  'Ⳅ' => 'ⳅ',
+  'Ⳇ' => 'ⳇ',
+  'Ⳉ' => 'ⳉ',
+  'Ⳋ' => 'ⳋ',
+  'Ⳍ' => '�',
+  'Ⳏ' => '�',
+  '�' => 'ⳑ',
+  'Ⳓ' => 'ⳓ',
+  'Ⳕ' => 'ⳕ',
+  'â³–' => 'â³—',
+  'Ⳙ' => 'ⳙ',
+  'Ⳛ' => 'ⳛ',
+  'Ⳝ' => '�',
+  'Ⳟ' => 'ⳟ',
+  'Ⳡ' => 'ⳡ',
+  'â³¢' => 'â³£',
+  'Ⳬ' => 'ⳬ',
+  'â³­' => 'â³®',
+  'â³²' => 'â³³',
+  'Ꙁ' => '�',
+  'Ꙃ' => 'ꙃ',
+  'Ꙅ' => 'ꙅ',
+  'Ꙇ' => 'ꙇ',
+  'Ꙉ' => 'ꙉ',
+  'Ꙋ' => 'ꙋ',
+  'Ꙍ' => '�',
+  'Ꙏ' => '�',
+  '�' => 'ꙑ',
+  'Ꙓ' => 'ꙓ',
+  'Ꙕ' => 'ꙕ',
+  'ê™–' => 'ê™—',
+  'Ꙙ' => 'ꙙ',
+  'Ꙛ' => 'ꙛ',
+  'Ꙝ' => '�',
+  'Ꙟ' => 'ꙟ',
+  'Ꙡ' => 'ꙡ',
+  'Ꙣ' => 'ꙣ',
+  'Ꙥ' => 'ꙥ',
+  'Ꙧ' => 'ꙧ',
+  'Ꙩ' => 'ꙩ',
+  'Ꙫ' => 'ꙫ',
+  'Ꙭ' => 'ꙭ',
+  'Ꚁ' => '�',
+  'Ꚃ' => 'ꚃ',
+  'êš„' => 'êš…',
+  'Ꚇ' => 'ꚇ',
+  'Ꚉ' => 'ꚉ',
+  'Ꚋ' => 'ꚋ',
+  'Ꚍ' => '�',
+  'Ꚏ' => '�',
+  '�' => 'ꚑ',
+  'êš’' => 'êš“',
+  'êš”' => 'êš•',
+  'êš–' => 'êš—',
+  'Ꚙ' => 'ꚙ',
+  'êšš' => 'êš›',
+  'Ꜣ' => 'ꜣ',
+  'Ꜥ' => 'ꜥ',
+  'Ꜧ' => 'ꜧ',
+  'Ꜩ' => 'ꜩ',
+  'Ꜫ' => 'ꜫ',
+  'Ꜭ' => 'ꜭ',
+  'Ꜯ' => 'ꜯ',
+  'Ꜳ' => 'ꜳ',
+  'Ꜵ' => 'ꜵ',
+  'Ꜷ' => 'ꜷ',
+  'Ꜹ' => 'ꜹ',
+  'Ꜻ' => 'ꜻ',
+  'Ꜽ' => 'ꜽ',
+  'Ꜿ' => 'ꜿ',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => 'ᵹ',
+  '�' => '�',
+  'Ꞁ' => '�',
+  'Ꞃ' => 'ꞃ',
+  'êž„' => 'êž…',
+  'Ꞇ' => 'ꞇ',
+  'Ꞌ' => 'ꞌ',
+  '�' => 'ɥ',
+  '�' => 'ꞑ',
+  'êž’' => 'êž“',
+  'êž–' => 'êž—',
+  'Ꞙ' => 'ꞙ',
+  'êžš' => 'êž›',
+  'Ꞝ' => '�',
+  'Ꞟ' => 'ꞟ',
+  'êž ' => 'êž¡',
+  'Ꞣ' => 'ꞣ',
+  'Ꞥ' => 'ꞥ',
+  'Ꞧ' => 'ꞧ',
+  'Ꞩ' => 'ꞩ',
+  'Ɦ' => 'ɦ',
+  'Ɜ' => 'ɜ',
+  'Ɡ' => 'ɡ',
+  'Ɬ' => 'ɬ',
+  'Ɪ' => 'ɪ',
+  'êž°' => 'Êž',
+  'Ʇ' => 'ʇ',
+  'Ʝ' => '�',
+  'êž³' => 'ê­“',
+  'êž´' => 'êžµ',
+  'Ꞷ' => 'ꞷ',
+  'Ꞹ' => 'ꞹ',
+  'Ꞻ' => 'ꞻ',
+  'êž¼' => 'êž½',
+  'êž¾' => 'êž¿',
+  'Ꟃ' => 'ꟃ',
+  'Ꞔ' => 'ꞔ',
+  'Ʂ' => 'ʂ',
+  'Ᶎ' => 'ᶎ',
+  'Ꟈ' => 'ꟈ',
+  'Ꟊ' => 'ꟊ',
+  'Ꟶ' => 'ꟶ',
+  'Ａ' => '�',
+  'Ｂ' => 'ｂ',
+  'Ｃ' => 'ｃ',
+  'Ｄ' => 'ｄ',
+  'ï¼¥' => 'ï½…',
+  'Ｆ' => 'ｆ',
+  'Ｇ' => 'ｇ',
+  'Ｈ' => 'ｈ',
+  'Ｉ' => 'ｉ',
+  'Ｊ' => 'ｊ',
+  'Ｋ' => 'ｋ',
+  'Ｌ' => 'ｌ',
+  'Ｍ' => '�',
+  'Ｎ' => 'ｎ',
+  'Ｏ' => '�',
+  'Ｐ' => '�',
+  'Ｑ' => 'ｑ',
+  'ï¼²' => 'ï½’',
+  'Ｓ' => 'ｓ',
+  'ï¼´' => 'ï½”',
+  'Ｕ' => 'ｕ',
+  'Ｖ' => 'ｖ',
+  'ï¼·' => 'ï½—',
+  'Ｘ' => 'ｘ',
+  'ï¼¹' => 'ï½™',
+  'Ｚ' => 'ｚ',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  'ð‘¢ ' => 'ð‘£€',
+  '𑢡' => '�',
+  '𑢢' => '𑣂',
+  '𑢣' => '𑣃',
+  '𑢤' => '𑣄',
+  'ð‘¢¥' => 'ð‘£…',
+  '𑢦' => '𑣆',
+  '𑢧' => '𑣇',
+  '𑢨' => '𑣈',
+  '𑢩' => '𑣉',
+  '𑢪' => '𑣊',
+  '𑢫' => '𑣋',
+  '𑢬' => '𑣌',
+  '𑢭' => '�',
+  '𑢮' => '𑣎',
+  '𑢯' => '�',
+  '𑢰' => '�',
+  '𑢱' => '𑣑',
+  'ð‘¢²' => 'ð‘£’',
+  '𑢳' => '𑣓',
+  'ð‘¢´' => 'ð‘£”',
+  '𑢵' => '𑣕',
+  '𑢶' => '𑣖',
+  'ð‘¢·' => 'ð‘£—',
+  '𑢸' => '𑣘',
+  'ð‘¢¹' => 'ð‘£™',
+  '𑢺' => '𑣚',
+  'ð‘¢»' => 'ð‘£›',
+  '𑢼' => '𑣜',
+  '𑢽' => '�',
+  '𑢾' => '𑣞',
+  '𑢿' => '𑣟',
+  'ð–¹€' => 'ð–¹ ',
+  '�' => '𖹡',
+  '𖹂' => '𖹢',
+  '𖹃' => '𖹣',
+  '𖹄' => '𖹤',
+  'ð–¹…' => 'ð–¹¥',
+  '𖹆' => '𖹦',
+  '𖹇' => '𖹧',
+  '𖹈' => '𖹨',
+  '𖹉' => '𖹩',
+  '𖹊' => '𖹪',
+  '𖹋' => '𖹫',
+  '𖹌' => '𖹬',
+  '�' => '𖹭',
+  '𖹎' => '𖹮',
+  '�' => '𖹯',
+  '�' => '𖹰',
+  '𖹑' => '𖹱',
+  'ð–¹’' => 'ð–¹²',
+  '𖹓' => '𖹳',
+  'ð–¹”' => 'ð–¹´',
+  '𖹕' => '𖹵',
+  '𖹖' => '𖹶',
+  'ð–¹—' => 'ð–¹·',
+  '𖹘' => '𖹸',
+  'ð–¹™' => 'ð–¹¹',
+  '𖹚' => '𖹺',
+  'ð–¹›' => 'ð–¹»',
+  '𖹜' => '𖹼',
+  '�' => '𖹽',
+  '𖹞' => '𖹾',
+  '𖹟' => '𖹿',
+  '𞤀' => '𞤢',
+  '�' => '𞤣',
+  '𞤂' => '𞤤',
+  '𞤃' => '𞤥',
+  '𞤄' => '𞤦',
+  '𞤅' => '𞤧',
+  '𞤆' => '𞤨',
+  '𞤇' => '𞤩',
+  '𞤈' => '𞤪',
+  '𞤉' => '𞤫',
+  '𞤊' => '𞤬',
+  '𞤋' => '𞤭',
+  '𞤌' => '𞤮',
+  '�' => '𞤯',
+  '𞤎' => '𞤰',
+  '�' => '𞤱',
+  '�' => '𞤲',
+  '𞤑' => '𞤳',
+  '𞤒' => '𞤴',
+  '𞤓' => '𞤵',
+  '𞤔' => '𞤶',
+  '𞤕' => '𞤷',
+  '𞤖' => '𞤸',
+  '𞤗' => '𞤹',
+  '𞤘' => '𞤺',
+  '𞤙' => '𞤻',
+  '𞤚' => '𞤼',
+  '𞤛' => '𞤽',
+  '𞤜' => '𞤾',
+  '�' => '𞤿',
+  '𞤞' => '𞥀',
+  '𞤟' => '�',
+  '𞤠' => '𞥂',
+  '𞤡' => '𞥃',
+);
diff --git a/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php
new file mode 100644
index 000000000..2a8f6e73b
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php
@@ -0,0 +1,5 @@
+<?php
+
+// from Case_Ignorable in https://unicode.org/Public/UNIDATA/DerivedCoreProperties.txt
+
+return '/(?<![\x{0027}\x{002E}\x{003A}\x{005E}\x{0060}\x{00A8}\x{00AD}\x{00AF}\x{00B4}\x{00B7}\x{00B8}\x{02B0}-\x{02C1}\x{02C2}-\x{02C5}\x{02C6}-\x{02D1}\x{02D2}-\x{02DF}\x{02E0}-\x{02E4}\x{02E5}-\x{02EB}\x{02EC}\x{02ED}\x{02EE}\x{02EF}-\x{02FF}\x{0300}-\x{036F}\x{0374}\x{0375}\x{037A}\x{0384}-\x{0385}\x{0387}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{0559}\x{0591}-\x{05BD}\x{05BF}\x{05C1}-\x{05C2}\x{05C4}-\x{05C5}\x{05C7}\x{05F4}\x{0600}-\x{0605}\x{0610}-\x{061A}\x{061C}\x{0640}\x{064B}-\x{065F}\x{0670}\x{06D6}-\x{06DC}\x{06DD}\x{06DF}-\x{06E4}\x{06E5}-\x{06E6}\x{06E7}-\x{06E8}\x{06EA}-\x{06ED}\x{070F}\x{0711}\x{0730}-\x{074A}\x{07A6}-\x{07B0}\x{07EB}-\x{07F3}\x{07F4}-\x{07F5}\x{07FA}\x{07FD}\x{0816}-\x{0819}\x{081A}\x{081B}-\x{0823}\x{0824}\x{0825}-\x{0827}\x{0828}\x{0829}-\x{082D}\x{0859}-\x{085B}\x{08D3}-\x{08E1}\x{08E2}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0971}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C81}\x{0CBC}\x{0CBF}\x{0CC6}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E46}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EB9}\x{0EBB}-\x{0EBC}\x{0EC6}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{10FC}\x{135D}-\x{135F}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17D7}\x{17DD}\x{180B}-\x{180D}\x{180E}\x{1843}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AA7}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1C78}-\x{1C7D}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1D2C}-\x{1D6A}\x{1D78}\x{1D9B}-\x{1DBF}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{1FBD}\x{1FBF}-\x{1FC1}\x{1FCD}-\x{1FCF}\x{1FDD}-\x{1FDF}\x{1FED}-\x{1FEF}\x{1FFD}-\x{1FFE}\x{200B}-\x{200F}\x{2018}\x{2019}\x{2024}\x{2027}\x{202A}-\x{202E}\x{2060}-\x{2064}\x{2066}-\x{206F}\x{2071}\x{207F}\x{2090}-\x{209C}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2C7C}-\x{2C7D}\x{2CEF}-\x{2CF1}\x{2D6F}\x{2D7F}\x{2DE0}-\x{2DFF}\x{2E2F}\x{3005}\x{302A}-\x{302D}\x{3031}-\x{3035}\x{303B}\x{3099}-\x{309A}\x{309B}-\x{309C}\x{309D}-\x{309E}\x{30FC}-\x{30FE}\x{A015}\x{A4F8}-\x{A4FD}\x{A60C}\x{A66F}\x{A670}-\x{A672}\x{A674}-\x{A67D}\x{A67F}\x{A69C}-\x{A69D}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A700}-\x{A716}\x{A717}-\x{A71F}\x{A720}-\x{A721}\x{A770}\x{A788}\x{A789}-\x{A78A}\x{A7F8}-\x{A7F9}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}\x{A9CF}\x{A9E5}\x{A9E6}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA70}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AADD}\x{AAEC}-\x{AAED}\x{AAF3}-\x{AAF4}\x{AAF6}\x{AB5B}\x{AB5C}-\x{AB5F}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1E}\x{FBB2}-\x{FBC1}\x{FE00}-\x{FE0F}\x{FE13}\x{FE20}-\x{FE2F}\x{FE52}\x{FE55}\x{FEFF}\x{FF07}\x{FF0E}\x{FF1A}\x{FF3E}\x{FF40}\x{FF70}\x{FF9E}-\x{FF9F}\x{FFE3}\x{FFF9}-\x{FFFB}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10A01}-\x{10A03}\x{10A05}-\x{10A06}\x{10A0C}-\x{10A0F}\x{10A38}-\x{10A3A}\x{10A3F}\x{10AE5}-\x{10AE6}\x{10D24}-\x{10D27}\x{10F46}-\x{10F50}\x{11001}\x{11038}-\x{11046}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{110BD}\x{110CD}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{11A01}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C3F}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16B40}-\x{16B43}\x{16F8F}-\x{16F92}\x{16F93}-\x{16F9F}\x{16FE0}-\x{16FE1}\x{1BC9D}-\x{1BC9E}\x{1BCA0}-\x{1BCA3}\x{1D167}-\x{1D169}\x{1D173}-\x{1D17A}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D242}-\x{1D244}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E8D0}-\x{1E8D6}\x{1E944}-\x{1E94A}\x{1F3FB}-\x{1F3FF}\x{E0001}\x{E0020}-\x{E007F}\x{E0100}-\x{E01EF}])(\pL)(\pL*+)/u';
diff --git a/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php
new file mode 100644
index 000000000..56b9cb852
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php
@@ -0,0 +1,1489 @@
+<?php
+
+return array (
+  'a' => 'A',
+  'b' => 'B',
+  'c' => 'C',
+  'd' => 'D',
+  'e' => 'E',
+  'f' => 'F',
+  'g' => 'G',
+  'h' => 'H',
+  'i' => 'I',
+  'j' => 'J',
+  'k' => 'K',
+  'l' => 'L',
+  'm' => 'M',
+  'n' => 'N',
+  'o' => 'O',
+  'p' => 'P',
+  'q' => 'Q',
+  'r' => 'R',
+  's' => 'S',
+  't' => 'T',
+  'u' => 'U',
+  'v' => 'V',
+  'w' => 'W',
+  'x' => 'X',
+  'y' => 'Y',
+  'z' => 'Z',
+  'µ' => 'Μ',
+  'à' => 'À',
+  'á' => '�',
+  'â' => 'Â',
+  'ã' => 'Ã',
+  'ä' => 'Ä',
+  'Ã¥' => 'Ã…',
+  'æ' => 'Æ',
+  'ç' => 'Ç',
+  'è' => 'È',
+  'é' => 'É',
+  'ê' => 'Ê',
+  'ë' => 'Ë',
+  'ì' => 'Ì',
+  'í' => '�',
+  'î' => 'Î',
+  'ï' => '�',
+  'ð' => '�',
+  'ñ' => 'Ñ',
+  'ò' => 'Ò',
+  'ó' => 'Ó',
+  'ô' => 'Ô',
+  'õ' => 'Õ',
+  'ö' => 'Ö',
+  'ø' => 'Ø',
+  'ù' => 'Ù',
+  'ú' => 'Ú',
+  'û' => 'Û',
+  'ü' => 'Ü',
+  'ý' => '�',
+  'þ' => 'Þ',
+  'ÿ' => 'Ÿ',
+  '�' => 'Ā',
+  'ă' => 'Ă',
+  'Ä…' => 'Ä„',
+  'ć' => 'Ć',
+  'ĉ' => 'Ĉ',
+  'Ä‹' => 'ÄŠ',
+  '�' => 'Č',
+  '�' => 'Ď',
+  'đ' => '�',
+  'Ä“' => 'Ä’',
+  'Ä•' => 'Ä”',
+  'Ä—' => 'Ä–',
+  'ę' => 'Ę',
+  'Ä›' => 'Äš',
+  '�' => 'Ĝ',
+  'ÄŸ' => 'Äž',
+  'Ä¡' => 'Ä ',
+  'Ä£' => 'Ä¢',
+  'ĥ' => 'Ĥ',
+  'ħ' => 'Ħ',
+  'ĩ' => 'Ĩ',
+  'ī' => 'Ī',
+  'ĭ' => 'Ĭ',
+  'į' => 'Į',
+  'ı' => 'I',
+  'ij' => 'IJ',
+  'ĵ' => 'Ĵ',
+  'ķ' => 'Ķ',
+  'ĺ' => 'Ĺ',
+  'ļ' => 'Ļ',
+  'ľ' => 'Ľ',
+  'Å€' => 'Ä¿',
+  'ł' => '�',
+  'ń' => 'Ń',
+  'ņ' => 'Ņ',
+  'ň' => 'Ň',
+  'Å‹' => 'ÅŠ',
+  '�' => 'Ō',
+  '�' => 'Ŏ',
+  'ő' => '�',
+  'Å“' => 'Å’',
+  'Å•' => 'Å”',
+  'Å—' => 'Å–',
+  'ř' => 'Ř',
+  'Å›' => 'Åš',
+  '�' => 'Ŝ',
+  'ÅŸ' => 'Åž',
+  'Å¡' => 'Å ',
+  'Å£' => 'Å¢',
+  'ť' => 'Ť',
+  'ŧ' => 'Ŧ',
+  'ũ' => 'Ũ',
+  'ū' => 'Ū',
+  'ŭ' => 'Ŭ',
+  'ů' => 'Ů',
+  'ű' => 'Ű',
+  'ų' => 'Ų',
+  'ŵ' => 'Ŵ',
+  'ŷ' => 'Ŷ',
+  'ź' => 'Ź',
+  'ż' => 'Ż',
+  'ž' => 'Ž',
+  'Å¿' => 'S',
+  'ƀ' => 'Ƀ',
+  'ƃ' => 'Ƃ',
+  'Æ…' => 'Æ„',
+  'ƈ' => 'Ƈ',
+  'ƌ' => 'Ƌ',
+  'Æ’' => 'Æ‘',
+  'ƕ' => 'Ƕ',
+  'ƙ' => 'Ƙ',
+  'ƚ' => 'Ƚ',
+  'Æž' => 'È ',
+  'Æ¡' => 'Æ ',
+  'Æ£' => 'Æ¢',
+  'ƥ' => 'Ƥ',
+  'ƨ' => 'Ƨ',
+  'ƭ' => 'Ƭ',
+  'ư' => 'Ư',
+  'ƴ' => 'Ƴ',
+  'ƶ' => 'Ƶ',
+  'ƹ' => 'Ƹ',
+  'ƽ' => 'Ƽ',
+  'Æ¿' => 'Ç·',
+  'Ç…' => 'Ç„',
+  'dž' => 'DŽ',
+  'Lj' => 'LJ',
+  'lj' => 'LJ',
+  'Ç‹' => 'ÇŠ',
+  'nj' => 'NJ',
+  'ǎ' => '�',
+  '�' => '�',
+  'Ç’' => 'Ç‘',
+  'Ç”' => 'Ç“',
+  'Ç–' => 'Ç•',
+  'ǘ' => 'Ǘ',
+  'Çš' => 'Ç™',
+  'ǜ' => 'Ǜ',
+  '�' => 'Ǝ',
+  'ÇŸ' => 'Çž',
+  'Ç¡' => 'Ç ',
+  'Ç£' => 'Ç¢',
+  'ǥ' => 'Ǥ',
+  'ǧ' => 'Ǧ',
+  'ǩ' => 'Ǩ',
+  'ǫ' => 'Ǫ',
+  'ǭ' => 'Ǭ',
+  'ǯ' => 'Ǯ',
+  'Dz' => 'DZ',
+  'dz' => 'DZ',
+  'ǵ' => 'Ǵ',
+  'ǹ' => 'Ǹ',
+  'ǻ' => 'Ǻ',
+  'ǽ' => 'Ǽ',
+  'ǿ' => 'Ǿ',
+  '�' => 'Ȁ',
+  'ȃ' => 'Ȃ',
+  'È…' => 'È„',
+  'ȇ' => 'Ȇ',
+  'ȉ' => 'Ȉ',
+  'È‹' => 'ÈŠ',
+  '�' => 'Ȍ',
+  '�' => 'Ȏ',
+  'ȑ' => '�',
+  'È“' => 'È’',
+  'È•' => 'È”',
+  'È—' => 'È–',
+  'ș' => 'Ș',
+  'È›' => 'Èš',
+  '�' => 'Ȝ',
+  'ÈŸ' => 'Èž',
+  'È£' => 'È¢',
+  'ȥ' => 'Ȥ',
+  'ȧ' => 'Ȧ',
+  'ȩ' => 'Ȩ',
+  'ȫ' => 'Ȫ',
+  'ȭ' => 'Ȭ',
+  'ȯ' => 'Ȯ',
+  'ȱ' => 'Ȱ',
+  'ȳ' => 'Ȳ',
+  'ȼ' => 'Ȼ',
+  'È¿' => 'â±¾',
+  'ɀ' => 'Ɀ',
+  'ɂ' => '�',
+  'ɇ' => 'Ɇ',
+  'ɉ' => 'Ɉ',
+  'É‹' => 'ÉŠ',
+  '�' => 'Ɍ',
+  '�' => 'Ɏ',
+  '�' => 'Ɐ',
+  'É‘' => 'â±­',
+  'É’' => 'â±°',
+  'ɓ' => '�',
+  'ɔ' => 'Ɔ',
+  'ɖ' => 'Ɖ',
+  'É—' => 'ÆŠ',
+  'ə' => '�',
+  'ɛ' => '�',
+  'ɜ' => 'Ɜ',
+  'É ' => 'Æ“',
+  'ɡ' => 'Ɡ',
+  'É£' => 'Æ”',
+  'ɥ' => '�',
+  'ɦ' => 'Ɦ',
+  'ɨ' => 'Ɨ',
+  'É©' => 'Æ–',
+  'ɪ' => 'Ɪ',
+  'É«' => 'â±¢',
+  'ɬ' => 'Ɬ',
+  'ɯ' => 'Ɯ',
+  'ɱ' => 'Ɱ',
+  'ɲ' => '�',
+  'ɵ' => 'Ɵ',
+  'ɽ' => 'Ɽ',
+  'ʀ' => 'Ʀ',
+  'ʂ' => 'Ʂ',
+  'ʃ' => 'Ʃ',
+  'ʇ' => 'Ʇ',
+  'ʈ' => 'Ʈ',
+  'ʉ' => 'Ʉ',
+  'ʊ' => 'Ʊ',
+  'ʋ' => 'Ʋ',
+  'ʌ' => 'Ʌ',
+  'Ê’' => 'Æ·',
+  '�' => 'Ʝ',
+  'Êž' => 'êž°',
+  'ͅ' => 'Ι',
+  'ͱ' => 'Ͱ',
+  'ͳ' => 'Ͳ',
+  'ͷ' => 'Ͷ',
+  'ͻ' => 'Ͻ',
+  'ͼ' => 'Ͼ',
+  'ͽ' => 'Ͽ',
+  'ά' => 'Ά',
+  'έ' => 'Έ',
+  'ή' => 'Ή',
+  'ί' => 'Ί',
+  'α' => 'Α',
+  'β' => 'Β',
+  'γ' => 'Γ',
+  'δ' => 'Δ',
+  'ε' => 'Ε',
+  'ζ' => 'Ζ',
+  'η' => 'Η',
+  'θ' => 'Θ',
+  'ι' => 'Ι',
+  'κ' => 'Κ',
+  'λ' => 'Λ',
+  'μ' => 'Μ',
+  'ν' => '�',
+  'ξ' => 'Ξ',
+  'ο' => 'Ο',
+  'π' => 'Π',
+  '�' => 'Ρ',
+  'ς' => 'Σ',
+  'σ' => 'Σ',
+  'τ' => 'Τ',
+  'Ï…' => 'Î¥',
+  'φ' => 'Φ',
+  'χ' => 'Χ',
+  'ψ' => 'Ψ',
+  'ω' => 'Ω',
+  'ϊ' => 'Ϊ',
+  'ϋ' => 'Ϋ',
+  'ό' => 'Ό',
+  '�' => 'Ύ',
+  'ώ' => '�',
+  '�' => 'Β',
+  'ϑ' => 'Θ',
+  'ϕ' => 'Φ',
+  'ϖ' => 'Π',
+  'ϗ' => '�',
+  'ϙ' => 'Ϙ',
+  'Ï›' => 'Ïš',
+  '�' => 'Ϝ',
+  'ÏŸ' => 'Ïž',
+  'Ï¡' => 'Ï ',
+  'Ï£' => 'Ï¢',
+  'ϥ' => 'Ϥ',
+  'ϧ' => 'Ϧ',
+  'ϩ' => 'Ϩ',
+  'ϫ' => 'Ϫ',
+  'ϭ' => 'Ϭ',
+  'ϯ' => 'Ϯ',
+  'ϰ' => 'Κ',
+  'ϱ' => 'Ρ',
+  'ϲ' => 'Ϲ',
+  'ϳ' => 'Ϳ',
+  'ϵ' => 'Ε',
+  'ϸ' => 'Ϸ',
+  'ϻ' => 'Ϻ',
+  'а' => '�',
+  'б' => 'Б',
+  'в' => 'В',
+  'г' => 'Г',
+  'д' => 'Д',
+  'е' => 'Е',
+  'ж' => 'Ж',
+  'з' => 'З',
+  'и' => 'И',
+  'й' => 'Й',
+  'к' => 'К',
+  'л' => 'Л',
+  'м' => 'М',
+  'н' => '�',
+  'о' => 'О',
+  'п' => 'П',
+  'р' => 'Р',
+  '�' => 'С',
+  'т' => 'Т',
+  'у' => 'У',
+  'ф' => 'Ф',
+  'Ñ…' => 'Ð¥',
+  'ц' => 'Ц',
+  'ч' => 'Ч',
+  'ш' => 'Ш',
+  'щ' => 'Щ',
+  'ъ' => 'Ъ',
+  'ы' => 'Ы',
+  'ь' => 'Ь',
+  '�' => 'Э',
+  'ю' => 'Ю',
+  '�' => 'Я',
+  '�' => 'Ѐ',
+  'ё' => '�',
+  'ђ' => 'Ђ',
+  'ѓ' => 'Ѓ',
+  'є' => 'Є',
+  'Ñ•' => 'Ð…',
+  'і' => 'І',
+  'ї' => 'Ї',
+  'ј' => 'Ј',
+  'љ' => 'Љ',
+  'њ' => 'Њ',
+  'ћ' => 'Ћ',
+  'ќ' => 'Ќ',
+  '�' => '�',
+  'Ñž' => 'ÐŽ',
+  'џ' => '�',
+  'Ñ¡' => 'Ñ ',
+  'Ñ£' => 'Ñ¢',
+  'ѥ' => 'Ѥ',
+  'ѧ' => 'Ѧ',
+  'ѩ' => 'Ѩ',
+  'ѫ' => 'Ѫ',
+  'ѭ' => 'Ѭ',
+  'ѯ' => 'Ѯ',
+  'ѱ' => 'Ѱ',
+  'ѳ' => 'Ѳ',
+  'ѵ' => 'Ѵ',
+  'ѷ' => 'Ѷ',
+  'ѹ' => 'Ѹ',
+  'ѻ' => 'Ѻ',
+  'ѽ' => 'Ѽ',
+  'ѿ' => 'Ѿ',
+  'Ò�' => 'Ò€',
+  'Ò‹' => 'ÒŠ',
+  '�' => 'Ҍ',
+  'Ò�' => 'ÒŽ',
+  'Ò‘' => 'Ò�',
+  'Ò“' => 'Ò’',
+  'Ò•' => 'Ò”',
+  'Ò—' => 'Ò–',
+  'Ò™' => 'Ò˜',
+  'Ò›' => 'Òš',
+  '�' => 'Ҝ',
+  'ÒŸ' => 'Òž',
+  'Ò¡' => 'Ò ',
+  'Ò£' => 'Ò¢',
+  'Ò¥' => 'Ò¤',
+  'Ò§' => 'Ò¦',
+  'Ò©' => 'Ò¨',
+  'Ò«' => 'Òª',
+  'Ò­' => 'Ò¬',
+  'Ò¯' => 'Ò®',
+  'Ò±' => 'Ò°',
+  'Ò³' => 'Ò²',
+  'Òµ' => 'Ò´',
+  'Ò·' => 'Ò¶',
+  'Ò¹' => 'Ò¸',
+  'Ò»' => 'Òº',
+  'Ò½' => 'Ò¼',
+  'Ò¿' => 'Ò¾',
+  'Ó‚' => 'Ó�',
+  'Ó„' => 'Óƒ',
+  'Ó†' => 'Ó…',
+  'Óˆ' => 'Ó‡',
+  'ÓŠ' => 'Ó‰',
+  'ӌ' => 'Ӌ',
+  'ÓŽ' => 'Ó�',
+  'Ó�' => 'Ó€',
+  'Ó‘' => 'Ó�',
+  'Ó“' => 'Ó’',
+  'Ó•' => 'Ó”',
+  'Ó—' => 'Ó–',
+  'Ó™' => 'Ó˜',
+  'Ó›' => 'Óš',
+  '�' => 'Ӝ',
+  'ÓŸ' => 'Óž',
+  'Ó¡' => 'Ó ',
+  'Ó£' => 'Ó¢',
+  'Ó¥' => 'Ó¤',
+  'Ó§' => 'Ó¦',
+  'Ó©' => 'Ó¨',
+  'Ó«' => 'Óª',
+  'Ó­' => 'Ó¬',
+  'Ó¯' => 'Ó®',
+  'Ó±' => 'Ó°',
+  'Ó³' => 'Ó²',
+  'Óµ' => 'Ó´',
+  'Ó·' => 'Ó¶',
+  'Ó¹' => 'Ó¸',
+  'Ó»' => 'Óº',
+  'Ó½' => 'Ó¼',
+  'Ó¿' => 'Ó¾',
+  'Ô�' => 'Ô€',
+  'Ôƒ' => 'Ô‚',
+  'Ô…' => 'Ô„',
+  'Ô‡' => 'Ô†',
+  'Ô‰' => 'Ôˆ',
+  'Ô‹' => 'ÔŠ',
+  '�' => 'Ԍ',
+  'Ô�' => 'ÔŽ',
+  'Ô‘' => 'Ô�',
+  'Ô“' => 'Ô’',
+  'Ô•' => 'Ô”',
+  'Ô—' => 'Ô–',
+  'Ô™' => 'Ô˜',
+  'Ô›' => 'Ôš',
+  '�' => 'Ԝ',
+  'ÔŸ' => 'Ôž',
+  'Ô¡' => 'Ô ',
+  'Ô£' => 'Ô¢',
+  'Ô¥' => 'Ô¤',
+  'Ô§' => 'Ô¦',
+  'Ô©' => 'Ô¨',
+  'Ô«' => 'Ôª',
+  'Ô­' => 'Ô¬',
+  'Ô¯' => 'Ô®',
+  'Õ¡' => 'Ô±',
+  'Õ¢' => 'Ô²',
+  'Õ£' => 'Ô³',
+  'Õ¤' => 'Ô´',
+  'Õ¥' => 'Ôµ',
+  'Õ¦' => 'Ô¶',
+  'Õ§' => 'Ô·',
+  'Õ¨' => 'Ô¸',
+  'Õ©' => 'Ô¹',
+  'Õª' => 'Ôº',
+  'Õ«' => 'Ô»',
+  'Õ¬' => 'Ô¼',
+  'Õ­' => 'Ô½',
+  'Õ®' => 'Ô¾',
+  'Õ¯' => 'Ô¿',
+  'Õ°' => 'Õ€',
+  'Õ±' => 'Õ�',
+  'Õ²' => 'Õ‚',
+  'Õ³' => 'Õƒ',
+  'Õ´' => 'Õ„',
+  'Õµ' => 'Õ…',
+  'Õ¶' => 'Õ†',
+  'Õ·' => 'Õ‡',
+  'Õ¸' => 'Õˆ',
+  'Õ¹' => 'Õ‰',
+  'Õº' => 'ÕŠ',
+  'Õ»' => 'Õ‹',
+  'ռ' => 'Ռ',
+  'Õ½' => 'Õ�',
+  'Õ¾' => 'ÕŽ',
+  'Õ¿' => 'Õ�',
+  'Ö€' => 'Õ�',
+  'Ö�' => 'Õ‘',
+  'Ö‚' => 'Õ’',
+  'Öƒ' => 'Õ“',
+  'Ö„' => 'Õ”',
+  'Ö…' => 'Õ•',
+  'Ö†' => 'Õ–',
+  '�' => '�',
+  'ბ' => 'Ბ',
+  'გ' => 'Გ',
+  'დ' => 'Დ',
+  'ე' => 'Ე',
+  'ვ' => 'Ვ',
+  'ზ' => 'Ზ',
+  'თ' => 'Თ',
+  'ი' => 'Ი',
+  'კ' => 'Კ',
+  'ლ' => 'Ლ',
+  'მ' => 'Მ',
+  'ნ' => 'Ნ',
+  '�' => '�',
+  'პ' => 'Პ',
+  'ჟ' => 'Ჟ',
+  'რ' => 'Რ',
+  'ს' => 'Ს',
+  'ტ' => 'Ტ',
+  'უ' => 'Უ',
+  'ფ' => 'Ფ',
+  'ქ' => 'Ქ',
+  'ღ' => 'Ღ',
+  'ყ' => 'Ყ',
+  'შ' => 'Შ',
+  'ჩ' => 'Ჩ',
+  'ც' => 'Ც',
+  'ძ' => 'Ძ',
+  'წ' => 'Წ',
+  'ჭ' => 'Ჭ',
+  'ხ' => 'Ხ',
+  'ჯ' => 'Ჯ',
+  'ჰ' => 'Ჰ',
+  'ჱ' => 'Ჱ',
+  'ჲ' => 'Ჲ',
+  'ჳ' => 'Ჳ',
+  'ჴ' => 'Ჴ',
+  'ჵ' => 'Ჵ',
+  'ჶ' => 'Ჶ',
+  'ჷ' => 'Ჷ',
+  'ჸ' => 'Ჸ',
+  'ჹ' => 'Ჹ',
+  'ჺ' => 'Ჺ',
+  'ჽ' => 'Ჽ',
+  'ჾ' => 'Ჾ',
+  'ჿ' => 'Ჿ',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  'á²€' => 'Ð’',
+  '�' => 'Д',
+  'ᲂ' => 'О',
+  'ᲃ' => 'С',
+  'ᲄ' => 'Т',
+  'ᲅ' => 'Т',
+  'ᲆ' => 'Ъ',
+  'ᲇ' => 'Ѣ',
+  'ᲈ' => 'Ꙋ',
+  'ᵹ' => '�',
+  'áµ½' => 'â±£',
+  'ᶎ' => 'Ᶎ',
+  '�' => 'Ḁ',
+  'ḃ' => 'Ḃ',
+  'ḅ' => 'Ḅ',
+  'ḇ' => 'Ḇ',
+  'ḉ' => 'Ḉ',
+  'ḋ' => 'Ḋ',
+  '�' => 'Ḍ',
+  '�' => 'Ḏ',
+  'ḑ' => '�',
+  'ḓ' => 'Ḓ',
+  'ḕ' => 'Ḕ',
+  'ḗ' => 'Ḗ',
+  'ḙ' => 'Ḙ',
+  'ḛ' => 'Ḛ',
+  '�' => 'Ḝ',
+  'ḟ' => 'Ḟ',
+  'ḡ' => 'Ḡ',
+  'ḣ' => 'Ḣ',
+  'ḥ' => 'Ḥ',
+  'ḧ' => 'Ḧ',
+  'ḩ' => 'Ḩ',
+  'ḫ' => 'Ḫ',
+  'ḭ' => 'Ḭ',
+  'ḯ' => 'Ḯ',
+  'ḱ' => 'Ḱ',
+  'ḳ' => 'Ḳ',
+  'ḵ' => 'Ḵ',
+  'ḷ' => 'Ḷ',
+  'ḹ' => 'Ḹ',
+  'ḻ' => 'Ḻ',
+  'ḽ' => 'Ḽ',
+  'ḿ' => 'Ḿ',
+  '�' => 'Ṁ',
+  'ṃ' => 'Ṃ',
+  'ṅ' => 'Ṅ',
+  'ṇ' => 'Ṇ',
+  'ṉ' => 'Ṉ',
+  'ṋ' => 'Ṋ',
+  '�' => 'Ṍ',
+  '�' => 'Ṏ',
+  'ṑ' => '�',
+  'ṓ' => 'Ṓ',
+  'ṕ' => 'Ṕ',
+  'á¹—' => 'á¹–',
+  'ṙ' => 'Ṙ',
+  'ṛ' => 'Ṛ',
+  '�' => 'Ṝ',
+  'ṟ' => 'Ṟ',
+  'ṡ' => 'Ṡ',
+  'á¹£' => 'á¹¢',
+  'ṥ' => 'Ṥ',
+  'ṧ' => 'Ṧ',
+  'ṩ' => 'Ṩ',
+  'ṫ' => 'Ṫ',
+  'ṭ' => 'Ṭ',
+  'ṯ' => 'Ṯ',
+  'á¹±' => 'á¹°',
+  'á¹³' => 'á¹²',
+  'á¹µ' => 'á¹´',
+  'ṷ' => 'Ṷ',
+  'ṹ' => 'Ṹ',
+  'ṻ' => 'Ṻ',
+  'á¹½' => 'á¹¼',
+  'ṿ' => 'Ṿ',
+  '�' => 'Ẁ',
+  'ẃ' => 'Ẃ',
+  'ẅ' => 'Ẅ',
+  'ẇ' => 'Ẇ',
+  'ẉ' => 'Ẉ',
+  'ẋ' => 'Ẋ',
+  '�' => 'Ẍ',
+  '�' => 'Ẏ',
+  'ẑ' => '�',
+  'ẓ' => 'Ẓ',
+  'ẕ' => 'Ẕ',
+  'ẛ' => 'Ṡ',
+  'ạ' => 'Ạ',
+  'ả' => 'Ả',
+  'ấ' => 'Ấ',
+  'ầ' => 'Ầ',
+  'ẩ' => 'Ẩ',
+  'ẫ' => 'Ẫ',
+  'ậ' => 'Ậ',
+  'ắ' => 'Ắ',
+  'ằ' => 'Ằ',
+  'ẳ' => 'Ẳ',
+  'ẵ' => 'Ẵ',
+  'ặ' => 'Ặ',
+  'ẹ' => 'Ẹ',
+  'ẻ' => 'Ẻ',
+  'ẽ' => 'Ẽ',
+  'ế' => 'Ế',
+  '�' => 'Ề',
+  'ể' => 'Ể',
+  'ễ' => 'Ễ',
+  'ệ' => 'Ệ',
+  'ỉ' => 'Ỉ',
+  'ị' => 'Ị',
+  '�' => 'Ọ',
+  '�' => 'Ỏ',
+  'ố' => '�',
+  'ồ' => 'Ồ',
+  'ổ' => 'Ổ',
+  'á»—' => 'á»–',
+  'ộ' => 'Ộ',
+  'ớ' => 'Ớ',
+  '�' => 'Ờ',
+  'ở' => 'Ở',
+  'ỡ' => 'Ỡ',
+  'ợ' => 'Ợ',
+  'ụ' => 'Ụ',
+  'ủ' => 'Ủ',
+  'ứ' => 'Ứ',
+  'ừ' => 'Ừ',
+  'ử' => 'Ử',
+  'ữ' => 'Ữ',
+  'á»±' => 'á»°',
+  'ỳ' => 'Ỳ',
+  'ỵ' => 'Ỵ',
+  'ỷ' => 'Ỷ',
+  'ỹ' => 'Ỹ',
+  'ỻ' => 'Ỻ',
+  'ỽ' => 'Ỽ',
+  'ỿ' => 'Ỿ',
+  'ἀ' => 'Ἀ',
+  '�' => 'Ἁ',
+  'ἂ' => 'Ἂ',
+  'ἃ' => 'Ἃ',
+  'ἄ' => 'Ἄ',
+  'ἅ' => '�',
+  'ἆ' => 'Ἆ',
+  'ἇ' => '�',
+  '�' => 'Ἐ',
+  'ἑ' => 'Ἑ',
+  'ἒ' => 'Ἒ',
+  'ἓ' => 'Ἓ',
+  'ἔ' => 'Ἔ',
+  'ἕ' => '�',
+  'ἠ' => 'Ἠ',
+  'ἡ' => 'Ἡ',
+  'ἢ' => 'Ἢ',
+  'ἣ' => 'Ἣ',
+  'ἤ' => 'Ἤ',
+  'á¼¥' => 'á¼­',
+  'ἦ' => 'Ἦ',
+  'ἧ' => 'Ἧ',
+  'ἰ' => 'Ἰ',
+  'á¼±' => 'á¼¹',
+  'ἲ' => 'Ἲ',
+  'á¼³' => 'á¼»',
+  'á¼´' => 'á¼¼',
+  'á¼µ' => 'á¼½',
+  'ἶ' => 'Ἶ',
+  'ἷ' => 'Ἷ',
+  'ὀ' => 'Ὀ',
+  '�' => 'Ὁ',
+  'ὂ' => 'Ὂ',
+  'ὃ' => 'Ὃ',
+  'ὄ' => 'Ὄ',
+  'ὅ' => '�',
+  'ὑ' => 'Ὑ',
+  'ὓ' => 'Ὓ',
+  'ὕ' => '�',
+  'ὗ' => 'Ὗ',
+  'ὠ' => 'Ὠ',
+  'ὡ' => 'Ὡ',
+  'ὢ' => 'Ὢ',
+  'ὣ' => 'Ὣ',
+  'ὤ' => 'Ὤ',
+  'á½¥' => 'á½­',
+  'ὦ' => 'Ὦ',
+  'ὧ' => 'Ὧ',
+  'ὰ' => 'Ὰ',
+  'á½±' => 'á¾»',
+  'ὲ' => 'Ὲ',
+  'έ' => 'Έ',
+  'á½´' => 'á¿Š',
+  'á½µ' => 'á¿‹',
+  'ὶ' => 'Ὶ',
+  'á½·' => 'á¿›',
+  'ὸ' => 'Ὸ',
+  'ό' => 'Ό',
+  'ὺ' => 'Ὺ',
+  'á½»' => 'á¿«',
+  'ὼ' => 'Ὼ',
+  'á½½' => 'á¿»',
+  'ᾀ' => 'ἈΙ',
+  '�' => 'ἉΙ',
+  'ᾂ' => 'ἊΙ',
+  'ᾃ' => 'ἋΙ',
+  'ᾄ' => 'ἌΙ',
+  'ᾅ' => '�Ι',
+  'ᾆ' => 'ἎΙ',
+  'ᾇ' => '�Ι',
+  '�' => 'ἨΙ',
+  'ᾑ' => 'ἩΙ',
+  'ᾒ' => 'ἪΙ',
+  'ᾓ' => 'ἫΙ',
+  'ᾔ' => 'ἬΙ',
+  'ᾕ' => 'ἭΙ',
+  'ᾖ' => 'ἮΙ',
+  'ᾗ' => 'ἯΙ',
+  'ᾠ' => 'ὨΙ',
+  'ᾡ' => 'ὩΙ',
+  'ᾢ' => 'ὪΙ',
+  'ᾣ' => 'ὫΙ',
+  'ᾤ' => 'ὬΙ',
+  'ᾥ' => 'ὭΙ',
+  'ᾦ' => 'ὮΙ',
+  'ᾧ' => 'ὯΙ',
+  'ᾰ' => 'Ᾰ',
+  'á¾±' => 'á¾¹',
+  'ᾳ' => 'ΑΙ',
+  'ι' => 'Ι',
+  'ῃ' => 'ΗΙ',
+  '�' => 'Ῐ',
+  'á¿‘' => 'á¿™',
+  'ῠ' => 'Ῠ',
+  'á¿¡' => 'á¿©',
+  'ῥ' => 'Ῥ',
+  'ῳ' => 'ΩΙ',
+  'ⅎ' => 'Ⅎ',
+  'â…°' => 'â… ',
+  'â…±' => 'â…¡',
+  'â…²' => 'â…¢',
+  'â…³' => 'â…£',
+  'â…´' => 'â…¤',
+  'â…µ' => 'â…¥',
+  'â…¶' => 'â…¦',
+  'â…·' => 'â…§',
+  'â…¸' => 'â…¨',
+  'â…¹' => 'â…©',
+  'â…º' => 'â…ª',
+  'â…»' => 'â…«',
+  'â…¼' => 'â…¬',
+  'â…½' => 'â…­',
+  'â…¾' => 'â…®',
+  'â…¿' => 'â…¯',
+  'ↄ' => 'Ↄ',
+  '�' => 'Ⓐ',
+  'â“‘' => 'â’·',
+  'â“’' => 'â’¸',
+  'â““' => 'â’¹',
+  'â“”' => 'â’º',
+  'â“•' => 'â’»',
+  'â“–' => 'â’¼',
+  'â“—' => 'â’½',
+  'ⓘ' => 'Ⓘ',
+  'â“™' => 'â’¿',
+  'â“š' => 'â“€',
+  'ⓛ' => '�',
+  'ⓜ' => 'Ⓜ',
+  '�' => 'Ⓝ',
+  'â“ž' => 'â“„',
+  'â“Ÿ' => 'â“…',
+  'ⓠ' => 'Ⓠ',
+  'ⓡ' => 'Ⓡ',
+  'ⓢ' => 'Ⓢ',
+  'ⓣ' => 'Ⓣ',
+  'ⓤ' => 'Ⓤ',
+  'â“¥' => 'â“‹',
+  'ⓦ' => 'Ⓦ',
+  'ⓧ' => '�',
+  'ⓨ' => 'Ⓨ',
+  'ⓩ' => '�',
+  'â°°' => 'â°€',
+  'â°±' => 'â°�',
+  'â°²' => 'â°‚',
+  'â°³' => 'â°ƒ',
+  'â°´' => 'â°„',
+  'â°µ' => 'â°…',
+  'â°¶' => 'â°†',
+  'â°·' => 'â°‡',
+  'â°¸' => 'â°ˆ',
+  'â°¹' => 'â°‰',
+  'â°º' => 'â°Š',
+  'â°»' => 'â°‹',
+  'ⰼ' => 'Ⰼ',
+  'â°½' => 'â°�',
+  'â°¾' => 'â°Ž',
+  'â°¿' => 'â°�',
+  'â±€' => 'â°�',
+  '�' => 'Ⱁ',
+  'ⱂ' => 'Ⱂ',
+  'ⱃ' => 'Ⱃ',
+  'ⱄ' => 'Ⱄ',
+  'â±…' => 'â°•',
+  'ⱆ' => 'Ⱆ',
+  'ⱇ' => 'Ⱇ',
+  'ⱈ' => 'Ⱈ',
+  'ⱉ' => 'Ⱉ',
+  'ⱊ' => 'Ⱊ',
+  'ⱋ' => 'Ⱋ',
+  'ⱌ' => 'Ⱌ',
+  '�' => '�',
+  'ⱎ' => 'Ⱎ',
+  '�' => 'Ⱏ',
+  '�' => 'Ⱐ',
+  'ⱑ' => 'Ⱑ',
+  'â±’' => 'â°¢',
+  'ⱓ' => 'Ⱓ',
+  'â±”' => 'â°¤',
+  'ⱕ' => 'Ⱕ',
+  'â±–' => 'â°¦',
+  'â±—' => 'â°§',
+  'ⱘ' => 'Ⱘ',
+  'â±™' => 'â°©',
+  'ⱚ' => 'Ⱚ',
+  'â±›' => 'â°«',
+  'ⱜ' => 'Ⱜ',
+  '�' => 'Ⱝ',
+  'ⱞ' => 'Ⱞ',
+  'ⱡ' => 'Ⱡ',
+  'ⱥ' => 'Ⱥ',
+  'ⱦ' => 'Ⱦ',
+  'ⱨ' => 'Ⱨ',
+  'ⱪ' => 'Ⱪ',
+  'ⱬ' => 'Ⱬ',
+  'â±³' => 'â±²',
+  'ⱶ' => 'Ⱶ',
+  '�' => 'Ⲁ',
+  'ⲃ' => 'Ⲃ',
+  'ⲅ' => 'Ⲅ',
+  'ⲇ' => 'Ⲇ',
+  'ⲉ' => 'Ⲉ',
+  'ⲋ' => 'Ⲋ',
+  '�' => 'Ⲍ',
+  '�' => 'Ⲏ',
+  'ⲑ' => '�',
+  'ⲓ' => 'Ⲓ',
+  'ⲕ' => 'Ⲕ',
+  'â²—' => 'â²–',
+  'ⲙ' => 'Ⲙ',
+  'ⲛ' => 'Ⲛ',
+  '�' => 'Ⲝ',
+  'ⲟ' => 'Ⲟ',
+  'ⲡ' => 'Ⲡ',
+  'â²£' => 'â²¢',
+  'ⲥ' => 'Ⲥ',
+  'ⲧ' => 'Ⲧ',
+  'ⲩ' => 'Ⲩ',
+  'ⲫ' => 'Ⲫ',
+  'ⲭ' => 'Ⲭ',
+  'ⲯ' => 'Ⲯ',
+  'â²±' => 'â²°',
+  'â²³' => 'â²²',
+  'â²µ' => 'â²´',
+  'ⲷ' => 'Ⲷ',
+  'ⲹ' => 'Ⲹ',
+  'ⲻ' => 'Ⲻ',
+  'â²½' => 'â²¼',
+  'ⲿ' => 'Ⲿ',
+  '�' => 'Ⳁ',
+  'ⳃ' => 'Ⳃ',
+  'ⳅ' => 'Ⳅ',
+  'ⳇ' => 'Ⳇ',
+  'ⳉ' => 'Ⳉ',
+  'ⳋ' => 'Ⳋ',
+  '�' => 'Ⳍ',
+  '�' => 'Ⳏ',
+  'ⳑ' => '�',
+  'ⳓ' => 'Ⳓ',
+  'ⳕ' => 'Ⳕ',
+  'â³—' => 'â³–',
+  'ⳙ' => 'Ⳙ',
+  'ⳛ' => 'Ⳛ',
+  '�' => 'Ⳝ',
+  'ⳟ' => 'Ⳟ',
+  'ⳡ' => 'Ⳡ',
+  'â³£' => 'â³¢',
+  'ⳬ' => 'Ⳬ',
+  'â³®' => 'â³­',
+  'â³³' => 'â³²',
+  'â´€' => 'á‚ ',
+  'â´�' => 'á‚¡',
+  'â´‚' => 'á‚¢',
+  'â´ƒ' => 'á‚£',
+  'ⴄ' => 'Ⴄ',
+  'â´…' => 'á‚¥',
+  'ⴆ' => 'Ⴆ',
+  'ⴇ' => 'Ⴇ',
+  'ⴈ' => 'Ⴈ',
+  'â´‰' => 'á‚©',
+  'ⴊ' => 'Ⴊ',
+  'â´‹' => 'á‚«',
+  'ⴌ' => 'Ⴌ',
+  'â´�' => 'á‚­',
+  'â´Ž' => 'á‚®',
+  '�' => 'Ⴏ',
+  'â´�' => 'á‚°',
+  'ⴑ' => 'Ⴑ',
+  'ⴒ' => 'Ⴒ',
+  'ⴓ' => 'Ⴓ',
+  'â´”' => 'á‚´',
+  'ⴕ' => 'Ⴕ',
+  'ⴖ' => 'Ⴖ',
+  'â´—' => 'á‚·',
+  'ⴘ' => 'Ⴘ',
+  'ⴙ' => 'Ⴙ',
+  'ⴚ' => 'Ⴚ',
+  'â´›' => 'á‚»',
+  'ⴜ' => 'Ⴜ',
+  '�' => 'Ⴝ',
+  'ⴞ' => 'Ⴞ',
+  'â´Ÿ' => 'á‚¿',
+  'ⴠ' => 'Ⴠ',
+  'ⴡ' => '�',
+  'ⴢ' => 'Ⴢ',
+  'ⴣ' => 'Ⴣ',
+  'ⴤ' => 'Ⴤ',
+  'ⴥ' => 'Ⴥ',
+  'ⴧ' => 'Ⴧ',
+  'ⴭ' => '�',
+  '�' => 'Ꙁ',
+  'ꙃ' => 'Ꙃ',
+  'ꙅ' => 'Ꙅ',
+  'ꙇ' => 'Ꙇ',
+  'ꙉ' => 'Ꙉ',
+  'ꙋ' => 'Ꙋ',
+  '�' => 'Ꙍ',
+  '�' => 'Ꙏ',
+  'ꙑ' => '�',
+  'ꙓ' => 'Ꙓ',
+  'ꙕ' => 'Ꙕ',
+  'ê™—' => 'ê™–',
+  'ꙙ' => 'Ꙙ',
+  'ꙛ' => 'Ꙛ',
+  '�' => 'Ꙝ',
+  'ꙟ' => 'Ꙟ',
+  'ꙡ' => 'Ꙡ',
+  'ꙣ' => 'Ꙣ',
+  'ꙥ' => 'Ꙥ',
+  'ꙧ' => 'Ꙧ',
+  'ꙩ' => 'Ꙩ',
+  'ꙫ' => 'Ꙫ',
+  'ꙭ' => 'Ꙭ',
+  '�' => 'Ꚁ',
+  'ꚃ' => 'Ꚃ',
+  'êš…' => 'êš„',
+  'ꚇ' => 'Ꚇ',
+  'ꚉ' => 'Ꚉ',
+  'ꚋ' => 'Ꚋ',
+  '�' => 'Ꚍ',
+  '�' => 'Ꚏ',
+  'ꚑ' => '�',
+  'êš“' => 'êš’',
+  'êš•' => 'êš”',
+  'êš—' => 'êš–',
+  'ꚙ' => 'Ꚙ',
+  'êš›' => 'êšš',
+  'ꜣ' => 'Ꜣ',
+  'ꜥ' => 'Ꜥ',
+  'ꜧ' => 'Ꜧ',
+  'ꜩ' => 'Ꜩ',
+  'ꜫ' => 'Ꜫ',
+  'ꜭ' => 'Ꜭ',
+  'ꜯ' => 'Ꜯ',
+  'ꜳ' => 'Ꜳ',
+  'ꜵ' => 'Ꜵ',
+  'ꜷ' => 'Ꜷ',
+  'ꜹ' => 'Ꜹ',
+  'ꜻ' => 'Ꜻ',
+  'ꜽ' => 'Ꜽ',
+  'ꜿ' => 'Ꜿ',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => 'Ꞁ',
+  'ꞃ' => 'Ꞃ',
+  'êž…' => 'êž„',
+  'ꞇ' => 'Ꞇ',
+  'ꞌ' => 'Ꞌ',
+  'ꞑ' => '�',
+  'êž“' => 'êž’',
+  'ꞔ' => 'Ꞔ',
+  'êž—' => 'êž–',
+  'ꞙ' => 'Ꞙ',
+  'êž›' => 'êžš',
+  '�' => 'Ꞝ',
+  'ꞟ' => 'Ꞟ',
+  'êž¡' => 'êž ',
+  'ꞣ' => 'Ꞣ',
+  'ꞥ' => 'Ꞥ',
+  'ꞧ' => 'Ꞧ',
+  'ꞩ' => 'Ꞩ',
+  'êžµ' => 'êž´',
+  'ꞷ' => 'Ꞷ',
+  'ꞹ' => 'Ꞹ',
+  'ꞻ' => 'Ꞻ',
+  'êž½' => 'êž¼',
+  'êž¿' => 'êž¾',
+  'ꟃ' => 'Ꟃ',
+  'ꟈ' => 'Ꟈ',
+  'ꟊ' => 'Ꟊ',
+  'ꟶ' => 'Ꟶ',
+  'ê­“' => 'êž³',
+  'ꭰ' => 'Ꭰ',
+  'ꭱ' => 'Ꭱ',
+  'ꭲ' => 'Ꭲ',
+  'ꭳ' => 'Ꭳ',
+  'ꭴ' => 'Ꭴ',
+  'ꭵ' => 'Ꭵ',
+  'ꭶ' => 'Ꭶ',
+  'ꭷ' => 'Ꭷ',
+  'ꭸ' => 'Ꭸ',
+  'ꭹ' => 'Ꭹ',
+  'ꭺ' => 'Ꭺ',
+  'ꭻ' => 'Ꭻ',
+  'ꭼ' => 'Ꭼ',
+  'ꭽ' => 'Ꭽ',
+  'ꭾ' => 'Ꭾ',
+  'ꭿ' => 'Ꭿ',
+  'ꮀ' => 'Ꮀ',
+  '�' => 'Ꮁ',
+  'ꮂ' => 'Ꮂ',
+  'ꮃ' => 'Ꮃ',
+  'ꮄ' => 'Ꮄ',
+  'ꮅ' => 'Ꮅ',
+  'ꮆ' => 'Ꮆ',
+  'ꮇ' => 'Ꮇ',
+  'ꮈ' => 'Ꮈ',
+  'ꮉ' => 'Ꮉ',
+  'ꮊ' => 'Ꮊ',
+  'ꮋ' => 'Ꮋ',
+  'ꮌ' => 'Ꮌ',
+  '�' => 'Ꮍ',
+  'ꮎ' => 'Ꮎ',
+  '�' => 'Ꮏ',
+  '�' => '�',
+  'ꮑ' => '�',
+  'ꮒ' => '�',
+  'ꮓ' => '�',
+  'ꮔ' => '�',
+  'ꮕ' => '�',
+  'ꮖ' => '�',
+  'ꮗ' => '�',
+  'ꮘ' => '�',
+  'ꮙ' => '�',
+  'ꮚ' => '�',
+  'ꮛ' => '�',
+  'ꮜ' => '�',
+  '�' => '�',
+  'ꮞ' => '�',
+  'ꮟ' => '�',
+  'ꮠ' => '�',
+  'ꮡ' => '�',
+  'ꮢ' => '�',
+  'ꮣ' => '�',
+  'ꮤ' => '�',
+  'ꮥ' => '�',
+  'ꮦ' => '�',
+  'ꮧ' => '�',
+  'ꮨ' => '�',
+  'ꮩ' => '�',
+  'ꮪ' => '�',
+  'ꮫ' => '�',
+  'ꮬ' => '�',
+  'ꮭ' => '�',
+  'ꮮ' => '�',
+  'ꮯ' => '�',
+  'ꮰ' => '�',
+  'ꮱ' => '�',
+  'ꮲ' => '�',
+  'ꮳ' => '�',
+  'ꮴ' => '�',
+  'ꮵ' => '�',
+  'ꮶ' => '�',
+  'ꮷ' => '�',
+  'ꮸ' => '�',
+  'ꮹ' => '�',
+  'ꮺ' => '�',
+  'ꮻ' => '�',
+  'ꮼ' => '�',
+  'ꮽ' => '�',
+  'ꮾ' => '�',
+  'ꮿ' => '�',
+  '�' => 'Ａ',
+  'ｂ' => 'Ｂ',
+  'ｃ' => 'Ｃ',
+  'ｄ' => 'Ｄ',
+  'ï½…' => 'ï¼¥',
+  'ｆ' => 'Ｆ',
+  'ｇ' => 'Ｇ',
+  'ｈ' => 'Ｈ',
+  'ｉ' => 'Ｉ',
+  'ｊ' => 'Ｊ',
+  'ｋ' => 'Ｋ',
+  'ｌ' => 'Ｌ',
+  '�' => 'Ｍ',
+  'ｎ' => 'Ｎ',
+  '�' => 'Ｏ',
+  '�' => 'Ｐ',
+  'ｑ' => 'Ｑ',
+  'ï½’' => 'ï¼²',
+  'ｓ' => 'Ｓ',
+  'ï½”' => 'ï¼´',
+  'ｕ' => 'Ｕ',
+  'ｖ' => 'Ｖ',
+  'ï½—' => 'ï¼·',
+  'ｘ' => 'Ｘ',
+  'ï½™' => 'ï¼¹',
+  'ｚ' => 'Ｚ',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  '�' => '�',
+  'ð‘£€' => 'ð‘¢ ',
+  '�' => '𑢡',
+  '𑣂' => '𑢢',
+  '𑣃' => '𑢣',
+  '𑣄' => '𑢤',
+  'ð‘£…' => 'ð‘¢¥',
+  '𑣆' => '𑢦',
+  '𑣇' => '𑢧',
+  '𑣈' => '𑢨',
+  '𑣉' => '𑢩',
+  '𑣊' => '𑢪',
+  '𑣋' => '𑢫',
+  '𑣌' => '𑢬',
+  '�' => '𑢭',
+  '𑣎' => '𑢮',
+  '�' => '𑢯',
+  '�' => '𑢰',
+  '𑣑' => '𑢱',
+  'ð‘£’' => 'ð‘¢²',
+  '𑣓' => '𑢳',
+  'ð‘£”' => 'ð‘¢´',
+  '𑣕' => '𑢵',
+  '𑣖' => '𑢶',
+  'ð‘£—' => 'ð‘¢·',
+  '𑣘' => '𑢸',
+  'ð‘£™' => 'ð‘¢¹',
+  '𑣚' => '𑢺',
+  'ð‘£›' => 'ð‘¢»',
+  '𑣜' => '𑢼',
+  '�' => '𑢽',
+  '𑣞' => '𑢾',
+  '𑣟' => '𑢿',
+  'ð–¹ ' => 'ð–¹€',
+  '𖹡' => '�',
+  '𖹢' => '𖹂',
+  '𖹣' => '𖹃',
+  '𖹤' => '𖹄',
+  'ð–¹¥' => 'ð–¹…',
+  '𖹦' => '𖹆',
+  '𖹧' => '𖹇',
+  '𖹨' => '𖹈',
+  '𖹩' => '𖹉',
+  '𖹪' => '𖹊',
+  '𖹫' => '𖹋',
+  '𖹬' => '𖹌',
+  '𖹭' => '�',
+  '𖹮' => '𖹎',
+  '𖹯' => '�',
+  '𖹰' => '�',
+  '𖹱' => '𖹑',
+  'ð–¹²' => 'ð–¹’',
+  '𖹳' => '𖹓',
+  'ð–¹´' => 'ð–¹”',
+  '𖹵' => '𖹕',
+  '𖹶' => '𖹖',
+  'ð–¹·' => 'ð–¹—',
+  '𖹸' => '𖹘',
+  'ð–¹¹' => 'ð–¹™',
+  '𖹺' => '𖹚',
+  'ð–¹»' => 'ð–¹›',
+  '𖹼' => '𖹜',
+  '𖹽' => '�',
+  '𖹾' => '𖹞',
+  '𖹿' => '𖹟',
+  '𞤢' => '𞤀',
+  '𞤣' => '�',
+  '𞤤' => '𞤂',
+  '𞤥' => '𞤃',
+  '𞤦' => '𞤄',
+  '𞤧' => '𞤅',
+  '𞤨' => '𞤆',
+  '𞤩' => '𞤇',
+  '𞤪' => '𞤈',
+  '𞤫' => '𞤉',
+  '𞤬' => '𞤊',
+  '𞤭' => '𞤋',
+  '𞤮' => '𞤌',
+  '𞤯' => '�',
+  '𞤰' => '𞤎',
+  '𞤱' => '�',
+  '𞤲' => '�',
+  '𞤳' => '𞤑',
+  '𞤴' => '𞤒',
+  '𞤵' => '𞤓',
+  '𞤶' => '𞤔',
+  '𞤷' => '𞤕',
+  '𞤸' => '𞤖',
+  '𞤹' => '𞤗',
+  '𞤺' => '𞤘',
+  '𞤻' => '𞤙',
+  '𞤼' => '𞤚',
+  '𞤽' => '𞤛',
+  '𞤾' => '𞤜',
+  '𞤿' => '�',
+  '𞥀' => '𞤞',
+  '�' => '𞤟',
+  '𞥂' => '𞤠',
+  '𞥃' => '𞤡',
+  'ß' => 'SS',
+  'ff' => 'FF',
+  '�' => 'FI',
+  'fl' => 'FL',
+  'ffi' => 'FFI',
+  'ffl' => 'FFL',
+  'ſt' => 'ST',
+  'st' => 'ST',
+  'Ö‡' => 'ÔµÕ’',
+  'ﬓ' => 'ՄՆ',
+  'ﬔ' => 'ՄԵ',
+  'ﬕ' => 'ՄԻ',
+  'ﬖ' => 'ՎՆ',
+  'ﬗ' => 'ՄԽ',
+  'ʼn' => 'ʼN',
+  '�' => 'Ϊ�',
+  'ΰ' => 'Ϋ�',
+  'ǰ' => 'J̌',
+  'ẖ' => 'H̱',
+  'ẗ' => 'T̈',
+  'ẘ' => 'W̊',
+  'ẙ' => 'Y̊',
+  'ẚ' => 'Aʾ',
+  '�' => 'Υ̓',
+  'ὒ' => 'Υ̓̀',
+  'ὔ' => 'Υ̓�',
+  'ὖ' => 'Υ̓͂',
+  'ᾶ' => 'Α͂',
+  'ῆ' => 'Η͂',
+  'ῒ' => 'Ϊ̀',
+  'ΐ' => 'Ϊ�',
+  'ῖ' => 'Ι͂',
+  'ῗ' => 'Ϊ͂',
+  'ῢ' => 'Ϋ̀',
+  'ΰ' => 'Ϋ�',
+  'ῤ' => 'Ρ̓',
+  'ῦ' => 'Υ͂',
+  'ῧ' => 'Ϋ͂',
+  'ῶ' => 'Ω͂',
+  'ᾈ' => 'ἈΙ',
+  'ᾉ' => 'ἉΙ',
+  'ᾊ' => 'ἊΙ',
+  'ᾋ' => 'ἋΙ',
+  'ᾌ' => 'ἌΙ',
+  '�' => '�Ι',
+  'ᾎ' => 'ἎΙ',
+  '�' => '�Ι',
+  'ᾘ' => 'ἨΙ',
+  'ᾙ' => 'ἩΙ',
+  'ᾚ' => 'ἪΙ',
+  'ᾛ' => 'ἫΙ',
+  'ᾜ' => 'ἬΙ',
+  '�' => 'ἭΙ',
+  'ᾞ' => 'ἮΙ',
+  'ᾟ' => 'ἯΙ',
+  'ᾨ' => 'ὨΙ',
+  'ᾩ' => 'ὩΙ',
+  'ᾪ' => 'ὪΙ',
+  'ᾫ' => 'ὫΙ',
+  'ᾬ' => 'ὬΙ',
+  'ᾭ' => 'ὭΙ',
+  'ᾮ' => 'ὮΙ',
+  'ᾯ' => 'ὯΙ',
+  'ᾼ' => 'ΑΙ',
+  'ῌ' => 'ΗΙ',
+  'ῼ' => 'ΩΙ',
+  'ᾲ' => 'ᾺΙ',
+  'ᾴ' => 'ΆΙ',
+  'ῂ' => 'ῊΙ',
+  'ῄ' => 'ΉΙ',
+  'ῲ' => 'ῺΙ',
+  'ῴ' => '�Ι',
+  'ᾷ' => 'Α͂Ι',
+  'ῇ' => 'Η͂Ι',
+  'ῷ' => 'Ω͂Ι',
+);
diff --git a/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/bootstrap.php b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/bootstrap.php
new file mode 100644
index 000000000..ecf1a0352
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/bootstrap.php
@@ -0,0 +1,151 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Mbstring as p;
+
+if (\PHP_VERSION_ID >= 80000) {
+    return require __DIR__.'/bootstrap80.php';
+}
+
+if (!function_exists('mb_convert_encoding')) {
+    function mb_convert_encoding($string, $to_encoding, $from_encoding = null) { return p\Mbstring::mb_convert_encoding($string, $to_encoding, $from_encoding); }
+}
+if (!function_exists('mb_decode_mimeheader')) {
+    function mb_decode_mimeheader($string) { return p\Mbstring::mb_decode_mimeheader($string); }
+}
+if (!function_exists('mb_encode_mimeheader')) {
+    function mb_encode_mimeheader($string, $charset = null, $transfer_encoding = null, $newline = "\r\n", $indent = 0) { return p\Mbstring::mb_encode_mimeheader($string, $charset, $transfer_encoding, $newline, $indent); }
+}
+if (!function_exists('mb_decode_numericentity')) {
+    function mb_decode_numericentity($string, $map, $encoding = null) { return p\Mbstring::mb_decode_numericentity($string, $map, $encoding); }
+}
+if (!function_exists('mb_encode_numericentity')) {
+    function mb_encode_numericentity($string, $map, $encoding = null, $hex = false) { return p\Mbstring::mb_encode_numericentity($string, $map, $encoding, $hex); }
+}
+if (!function_exists('mb_convert_case')) {
+    function mb_convert_case($string, $mode, $encoding = null) { return p\Mbstring::mb_convert_case($string, $mode, $encoding); }
+}
+if (!function_exists('mb_internal_encoding')) {
+    function mb_internal_encoding($encoding = null) { return p\Mbstring::mb_internal_encoding($encoding); }
+}
+if (!function_exists('mb_language')) {
+    function mb_language($language = null) { return p\Mbstring::mb_language($language); }
+}
+if (!function_exists('mb_list_encodings')) {
+    function mb_list_encodings() { return p\Mbstring::mb_list_encodings(); }
+}
+if (!function_exists('mb_encoding_aliases')) {
+    function mb_encoding_aliases($encoding) { return p\Mbstring::mb_encoding_aliases($encoding); }
+}
+if (!function_exists('mb_check_encoding')) {
+    function mb_check_encoding($value = null, $encoding = null) { return p\Mbstring::mb_check_encoding($value, $encoding); }
+}
+if (!function_exists('mb_detect_encoding')) {
+    function mb_detect_encoding($string, $encodings = null, $strict = false) { return p\Mbstring::mb_detect_encoding($string, $encodings, $strict); }
+}
+if (!function_exists('mb_detect_order')) {
+    function mb_detect_order($encoding = null) { return p\Mbstring::mb_detect_order($encoding); }
+}
+if (!function_exists('mb_parse_str')) {
+    function mb_parse_str($string, &$result = []) { parse_str($string, $result); return (bool) $result; }
+}
+if (!function_exists('mb_strlen')) {
+    function mb_strlen($string, $encoding = null) { return p\Mbstring::mb_strlen($string, $encoding); }
+}
+if (!function_exists('mb_strpos')) {
+    function mb_strpos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strpos($haystack, $needle, $offset, $encoding); }
+}
+if (!function_exists('mb_strtolower')) {
+    function mb_strtolower($string, $encoding = null) { return p\Mbstring::mb_strtolower($string, $encoding); }
+}
+if (!function_exists('mb_strtoupper')) {
+    function mb_strtoupper($string, $encoding = null) { return p\Mbstring::mb_strtoupper($string, $encoding); }
+}
+if (!function_exists('mb_substitute_character')) {
+    function mb_substitute_character($substitute_character = null) { return p\Mbstring::mb_substitute_character($substitute_character); }
+}
+if (!function_exists('mb_substr')) {
+    function mb_substr($string, $start, $length = 2147483647, $encoding = null) { return p\Mbstring::mb_substr($string, $start, $length, $encoding); }
+}
+if (!function_exists('mb_stripos')) {
+    function mb_stripos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_stripos($haystack, $needle, $offset, $encoding); }
+}
+if (!function_exists('mb_stristr')) {
+    function mb_stristr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_stristr($haystack, $needle, $before_needle, $encoding); }
+}
+if (!function_exists('mb_strrchr')) {
+    function mb_strrchr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strrchr($haystack, $needle, $before_needle, $encoding); }
+}
+if (!function_exists('mb_strrichr')) {
+    function mb_strrichr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strrichr($haystack, $needle, $before_needle, $encoding); }
+}
+if (!function_exists('mb_strripos')) {
+    function mb_strripos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strripos($haystack, $needle, $offset, $encoding); }
+}
+if (!function_exists('mb_strrpos')) {
+    function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strrpos($haystack, $needle, $offset, $encoding); }
+}
+if (!function_exists('mb_strstr')) {
+    function mb_strstr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strstr($haystack, $needle, $before_needle, $encoding); }
+}
+if (!function_exists('mb_get_info')) {
+    function mb_get_info($type = 'all') { return p\Mbstring::mb_get_info($type); }
+}
+if (!function_exists('mb_http_output')) {
+    function mb_http_output($encoding = null) { return p\Mbstring::mb_http_output($encoding); }
+}
+if (!function_exists('mb_strwidth')) {
+    function mb_strwidth($string, $encoding = null) { return p\Mbstring::mb_strwidth($string, $encoding); }
+}
+if (!function_exists('mb_substr_count')) {
+    function mb_substr_count($haystack, $needle, $encoding = null) { return p\Mbstring::mb_substr_count($haystack, $needle, $encoding); }
+}
+if (!function_exists('mb_output_handler')) {
+    function mb_output_handler($string, $status) { return p\Mbstring::mb_output_handler($string, $status); }
+}
+if (!function_exists('mb_http_input')) {
+    function mb_http_input($type = null) { return p\Mbstring::mb_http_input($type); }
+}
+
+if (!function_exists('mb_convert_variables')) {
+    function mb_convert_variables($to_encoding, $from_encoding, &...$vars) { return p\Mbstring::mb_convert_variables($to_encoding, $from_encoding, ...$vars); }
+}
+
+if (!function_exists('mb_ord')) {
+    function mb_ord($string, $encoding = null) { return p\Mbstring::mb_ord($string, $encoding); }
+}
+if (!function_exists('mb_chr')) {
+    function mb_chr($codepoint, $encoding = null) { return p\Mbstring::mb_chr($codepoint, $encoding); }
+}
+if (!function_exists('mb_scrub')) {
+    function mb_scrub($string, $encoding = null) { $encoding = null === $encoding ? mb_internal_encoding() : $encoding; return mb_convert_encoding($string, $encoding, $encoding); }
+}
+if (!function_exists('mb_str_split')) {
+    function mb_str_split($string, $length = 1, $encoding = null) { return p\Mbstring::mb_str_split($string, $length, $encoding); }
+}
+
+if (!function_exists('mb_str_pad')) {
+    function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = STR_PAD_RIGHT, ?string $encoding = null): string { return p\Mbstring::mb_str_pad($string, $length, $pad_string, $pad_type, $encoding); }
+}
+
+if (extension_loaded('mbstring')) {
+    return;
+}
+
+if (!defined('MB_CASE_UPPER')) {
+    define('MB_CASE_UPPER', 0);
+}
+if (!defined('MB_CASE_LOWER')) {
+    define('MB_CASE_LOWER', 1);
+}
+if (!defined('MB_CASE_TITLE')) {
+    define('MB_CASE_TITLE', 2);
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/bootstrap80.php b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/bootstrap80.php
new file mode 100644
index 000000000..2f9fb5b42
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/bootstrap80.php
@@ -0,0 +1,147 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Mbstring as p;
+
+if (!function_exists('mb_convert_encoding')) {
+    function mb_convert_encoding(array|string|null $string, ?string $to_encoding, array|string|null $from_encoding = null): array|string|false { return p\Mbstring::mb_convert_encoding($string ?? '', (string) $to_encoding, $from_encoding); }
+}
+if (!function_exists('mb_decode_mimeheader')) {
+    function mb_decode_mimeheader(?string $string): string { return p\Mbstring::mb_decode_mimeheader((string) $string); }
+}
+if (!function_exists('mb_encode_mimeheader')) {
+    function mb_encode_mimeheader(?string $string, ?string $charset = null, ?string $transfer_encoding = null, ?string $newline = "\r\n", ?int $indent = 0): string { return p\Mbstring::mb_encode_mimeheader((string) $string, $charset, $transfer_encoding, (string) $newline, (int) $indent); }
+}
+if (!function_exists('mb_decode_numericentity')) {
+    function mb_decode_numericentity(?string $string, array $map, ?string $encoding = null): string { return p\Mbstring::mb_decode_numericentity((string) $string, $map, $encoding); }
+}
+if (!function_exists('mb_encode_numericentity')) {
+    function mb_encode_numericentity(?string $string, array $map, ?string $encoding = null, ?bool $hex = false): string { return p\Mbstring::mb_encode_numericentity((string) $string, $map, $encoding, (bool) $hex); }
+}
+if (!function_exists('mb_convert_case')) {
+    function mb_convert_case(?string $string, ?int $mode, ?string $encoding = null): string { return p\Mbstring::mb_convert_case((string) $string, (int) $mode, $encoding); }
+}
+if (!function_exists('mb_internal_encoding')) {
+    function mb_internal_encoding(?string $encoding = null): string|bool { return p\Mbstring::mb_internal_encoding($encoding); }
+}
+if (!function_exists('mb_language')) {
+    function mb_language(?string $language = null): string|bool { return p\Mbstring::mb_language($language); }
+}
+if (!function_exists('mb_list_encodings')) {
+    function mb_list_encodings(): array { return p\Mbstring::mb_list_encodings(); }
+}
+if (!function_exists('mb_encoding_aliases')) {
+    function mb_encoding_aliases(?string $encoding): array { return p\Mbstring::mb_encoding_aliases((string) $encoding); }
+}
+if (!function_exists('mb_check_encoding')) {
+    function mb_check_encoding(array|string|null $value = null, ?string $encoding = null): bool { return p\Mbstring::mb_check_encoding($value, $encoding); }
+}
+if (!function_exists('mb_detect_encoding')) {
+    function mb_detect_encoding(?string $string, array|string|null $encodings = null, ?bool $strict = false): string|false { return p\Mbstring::mb_detect_encoding((string) $string, $encodings, (bool) $strict); }
+}
+if (!function_exists('mb_detect_order')) {
+    function mb_detect_order(array|string|null $encoding = null): array|bool { return p\Mbstring::mb_detect_order($encoding); }
+}
+if (!function_exists('mb_parse_str')) {
+    function mb_parse_str(?string $string, &$result = []): bool { parse_str((string) $string, $result); return (bool) $result; }
+}
+if (!function_exists('mb_strlen')) {
+    function mb_strlen(?string $string, ?string $encoding = null): int { return p\Mbstring::mb_strlen((string) $string, $encoding); }
+}
+if (!function_exists('mb_strpos')) {
+    function mb_strpos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_strpos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
+}
+if (!function_exists('mb_strtolower')) {
+    function mb_strtolower(?string $string, ?string $encoding = null): string { return p\Mbstring::mb_strtolower((string) $string, $encoding); }
+}
+if (!function_exists('mb_strtoupper')) {
+    function mb_strtoupper(?string $string, ?string $encoding = null): string { return p\Mbstring::mb_strtoupper((string) $string, $encoding); }
+}
+if (!function_exists('mb_substitute_character')) {
+    function mb_substitute_character(string|int|null $substitute_character = null): string|int|bool { return p\Mbstring::mb_substitute_character($substitute_character); }
+}
+if (!function_exists('mb_substr')) {
+    function mb_substr(?string $string, ?int $start, ?int $length = null, ?string $encoding = null): string { return p\Mbstring::mb_substr((string) $string, (int) $start, $length, $encoding); }
+}
+if (!function_exists('mb_stripos')) {
+    function mb_stripos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_stripos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
+}
+if (!function_exists('mb_stristr')) {
+    function mb_stristr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_stristr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
+}
+if (!function_exists('mb_strrchr')) {
+    function mb_strrchr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_strrchr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
+}
+if (!function_exists('mb_strrichr')) {
+    function mb_strrichr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_strrichr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
+}
+if (!function_exists('mb_strripos')) {
+    function mb_strripos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_strripos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
+}
+if (!function_exists('mb_strrpos')) {
+    function mb_strrpos(?string $haystack, ?string $needle, ?int $offset = 0, ?string $encoding = null): int|false { return p\Mbstring::mb_strrpos((string) $haystack, (string) $needle, (int) $offset, $encoding); }
+}
+if (!function_exists('mb_strstr')) {
+    function mb_strstr(?string $haystack, ?string $needle, ?bool $before_needle = false, ?string $encoding = null): string|false { return p\Mbstring::mb_strstr((string) $haystack, (string) $needle, (bool) $before_needle, $encoding); }
+}
+if (!function_exists('mb_get_info')) {
+    function mb_get_info(?string $type = 'all'): array|string|int|false { return p\Mbstring::mb_get_info((string) $type); }
+}
+if (!function_exists('mb_http_output')) {
+    function mb_http_output(?string $encoding = null): string|bool { return p\Mbstring::mb_http_output($encoding); }
+}
+if (!function_exists('mb_strwidth')) {
+    function mb_strwidth(?string $string, ?string $encoding = null): int { return p\Mbstring::mb_strwidth((string) $string, $encoding); }
+}
+if (!function_exists('mb_substr_count')) {
+    function mb_substr_count(?string $haystack, ?string $needle, ?string $encoding = null): int { return p\Mbstring::mb_substr_count((string) $haystack, (string) $needle, $encoding); }
+}
+if (!function_exists('mb_output_handler')) {
+    function mb_output_handler(?string $string, ?int $status): string { return p\Mbstring::mb_output_handler((string) $string, (int) $status); }
+}
+if (!function_exists('mb_http_input')) {
+    function mb_http_input(?string $type = null): array|string|false { return p\Mbstring::mb_http_input($type); }
+}
+
+if (!function_exists('mb_convert_variables')) {
+    function mb_convert_variables(?string $to_encoding, array|string|null $from_encoding, mixed &$var, mixed &...$vars): string|false { return p\Mbstring::mb_convert_variables((string) $to_encoding, $from_encoding ?? '', $var, ...$vars); }
+}
+
+if (!function_exists('mb_ord')) {
+    function mb_ord(?string $string, ?string $encoding = null): int|false { return p\Mbstring::mb_ord((string) $string, $encoding); }
+}
+if (!function_exists('mb_chr')) {
+    function mb_chr(?int $codepoint, ?string $encoding = null): string|false { return p\Mbstring::mb_chr((int) $codepoint, $encoding); }
+}
+if (!function_exists('mb_scrub')) {
+    function mb_scrub(?string $string, ?string $encoding = null): string { $encoding ??= mb_internal_encoding(); return mb_convert_encoding((string) $string, $encoding, $encoding); }
+}
+if (!function_exists('mb_str_split')) {
+    function mb_str_split(?string $string, ?int $length = 1, ?string $encoding = null): array { return p\Mbstring::mb_str_split((string) $string, (int) $length, $encoding); }
+}
+
+if (!function_exists('mb_str_pad')) {
+    function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $pad_type = STR_PAD_RIGHT, ?string $encoding = null): string { return p\Mbstring::mb_str_pad($string, $length, $pad_string, $pad_type, $encoding); }
+}
+
+if (extension_loaded('mbstring')) {
+    return;
+}
+
+if (!defined('MB_CASE_UPPER')) {
+    define('MB_CASE_UPPER', 0);
+}
+if (!defined('MB_CASE_LOWER')) {
+    define('MB_CASE_LOWER', 1);
+}
+if (!defined('MB_CASE_TITLE')) {
+    define('MB_CASE_TITLE', 2);
+}
diff --git a/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/composer.json b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/composer.json
new file mode 100644
index 000000000..bd99d4b9d
--- /dev/null
+++ b/www/modules/civicrm/packages/smarty5/vendor/symfony/polyfill-mbstring/composer.json
@@ -0,0 +1,38 @@
+{
+    "name": "symfony/polyfill-mbstring",
+    "type": "library",
+    "description": "Symfony polyfill for the Mbstring extension",
+    "keywords": ["polyfill", "shim", "compatibility", "portable", "mbstring"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=7.1"
+    },
+    "provide": {
+        "ext-mbstring": "*"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Polyfill\\Mbstring\\": "" },
+        "files": [ "bootstrap.php" ]
+    },
+    "suggest": {
+        "ext-mbstring": "For best performance"
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "thanks": {
+            "name": "symfony/polyfill",
+            "url": "https://github.com/symfony/polyfill"
+        }
+    }
+}
diff --git a/www/modules/civicrm/release-notes.md b/www/modules/civicrm/release-notes.md
index 3a9a8833f..d41dc9fef 100644
--- a/www/modules/civicrm/release-notes.md
+++ b/www/modules/civicrm/release-notes.md
@@ -15,27 +15,171 @@ Other resources for identifying changes are:
     * https://github.com/civicrm/civicrm-joomla
     * https://github.com/civicrm/civicrm-wordpress
 
-## CiviCRM 5.70.2
+## CiviCRM 5.74.4
 
-Released March 2, 2024
+Released June 19, 2024
 
-- **[Synopsis](release-notes/5.70.2.md#synopsis)**
-- **[Bugs resolved](release-notes/5.70.2.md#bugs)**
-- **[Credits](release-notes/5.70.2.md#credits)**
-- **[Feedback](release-notes/5.70.2.md#feedback)**
+- **[Synopsis](release-notes/5.74.4.md#synopsis)**
+- **[Security advisories](release-notes/5.74.4.md#security)**
+- **[Bugs resolved](release-notes/5.74.4.md#bugs)**
+- **[Credits](release-notes/5.74.4.md#credits)**
+- **[Feedback](release-notes/5.74.4.md#feedback)**
 
-## CiviCRM 5.70.1
+## CiviCRM 5.74.3
 
-Released February 22, 2024
+Released June 15, 2024
 
-- **[Synopsis](release-notes/5.70.1.md#synopsis)**
-- **[Bugs resolved](release-notes/5.70.1.md#bugs)**
-- **[Credits](release-notes/5.70.1.md#credits)**
-- **[Feedback](release-notes/5.70.1.md#feedback)**
+- **[Synopsis](release-notes/5.74.3.md#synopsis)**
+- **[Bugs resolved](release-notes/5.74.3.md#bugs)**
+- **[Credits](release-notes/5.74.3.md#credits)**
+- **[Feedback](release-notes/5.74.3.md#feedback)**
+
+## CiviCRM 5.74.2
+
+Released June 13, 2024
+
+- **[Synopsis](release-notes/5.74.2.md#synopsis)**
+- **[Bugs resolved](release-notes/5.74.2.md#bugs)**
+- **[Credits](release-notes/5.74.2.md#credits)**
+- **[Feedback](release-notes/5.74.2.md#feedback)**
+
+## CiviCRM 5.74.1
+
+Released June 11, 2024
+
+- **[Synopsis](release-notes/5.74.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.74.1.md#bugs)**
+- **[Credits](release-notes/5.74.1.md#credits)**
+- **[Feedback](release-notes/5.74.1.md#feedback)**
+
+## CiviCRM 5.74.0
+
+Released June 6, 2024
+
+- **[Synopsis](release-notes/5.74.0.md#synopsis)**
+- **[Features](release-notes/5.74.0.md#features)**
+- **[Bugs resolved](release-notes/5.74.0.md#bugs)**
+- **[Miscellany](release-notes/5.74.0.md#misc)**
+- **[Credits](release-notes/5.74.0.md#credits)**
+- **[Feedback](release-notes/5.74.0.md#feedback)**
+
+## CiviCRM 5.73.4
+
+Released May 30, 2024
+
+- **[Synopsis](release-notes/5.73.4.md#synopsis)**
+- **[Bugs resolved](release-notes/5.73.4.md#bugs)**
+- **[Credits](release-notes/5.73.4.md#credits)**
+- **[Feedback](release-notes/5.73.4.md#feedback)**
+
+## CiviCRM 5.73.3
+
+Released May 23, 2024
+
+- **[Synopsis](release-notes/5.73.3.md#synopsis)**
+- **[Bugs resolved](release-notes/5.73.3.md#bugs)**
+- **[Credits](release-notes/5.73.3.md#credits)**
+- **[Feedback](release-notes/5.73.3.md#feedback)**
+
+## CiviCRM 5.73.2
+
+Released May 17, 2024
+
+- **[Synopsis](release-notes/5.73.2.md#synopsis)**
+- **[Bugs resolved](release-notes/5.73.2.md#bugs)**
+- **[Credits](release-notes/5.73.2.md#credits)**
+- **[Feedback](release-notes/5.73.2.md#feedback)**
+
+## CiviCRM 5.73.1
+
+Released May 6, 2024
+
+- **[Synopsis](release-notes/5.73.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.73.1.md#bugs)**
+- **[Credits](release-notes/5.73.1.md#credits)**
+- **[Feedback](release-notes/5.73.1.md#feedback)**
+
+## CiviCRM 5.73.0
+
+Released May 2, 2024
+
+- **[Synopsis](release-notes/5.73.0.md#synopsis)**
+- **[Features](release-notes/5.73.0.md#features)**
+- **[Bugs resolved](release-notes/5.73.0.md#bugs)**
+- **[Miscellany](release-notes/5.73.0.md#misc)**
+- **[Credits](release-notes/5.73.0.md#credits)**
+- **[Feedback](release-notes/5.73.0.md#feedback)**
+
+## CiviCRM 5.72.3
+
+Released May 1, 2024
+
+- **[Synopsis](release-notes/5.72.3.md#synopsis)**
+- **[Bugs resolved](release-notes/5.72.3.md#bugs)**
+- **[Credits](release-notes/5.72.3.md#credits)**
+- **[Feedback](release-notes/5.72.3.md#feedback)**
+
+## CiviCRM 5.72.2
+
+Released April 23, 2024
+
+- **[Synopsis](release-notes/5.72.2.md#synopsis)**
+- **[Bugs resolved](release-notes/5.72.2.md#bugs)**
+- **[Credits](release-notes/5.72.2.md#credits)**
+- **[Feedback](release-notes/5.72.2.md#feedback)**
+
+## CiviCRM 5.72.1
+
+Released April 8, 2024
+
+- **[Synopsis](release-notes/5.72.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.72.1.md#bugs)**
+- **[Credits](release-notes/5.72.1.md#credits)**
+- **[Feedback](release-notes/5.72.1.md#feedback)**
+
+## CiviCRM 5.72.0
+
+Released April 3, 2024
+
+- **[Synopsis](release-notes/5.72.0.md#synopsis)**
+- **[Features](release-notes/5.72.0.md#features)**
+- **[Bugs resolved](release-notes/5.72.0.md#bugs)**
+- **[Miscellany](release-notes/5.72.0.md#misc)**
+- **[Credits](release-notes/5.72.0.md#credits)**
+- **[Feedback](release-notes/5.72.0.md#feedback)**
+
+## CiviCRM 5.71.2
+
+Released March 28, 2024
+
+- **[Synopsis](release-notes/5.71.2.md#synopsis)**
+- **[Bugs resolved](release-notes/5.71.2.md#bugs)**
+- **[Credits](release-notes/5.71.2.md#credits)**
+- **[Feedback](release-notes/5.71.2.md#feedback)**
+
+## CiviCRM 5.71.1
+
+Released March 8, 2024
+
+- **[Synopsis](release-notes/5.71.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.71.1.md#bugs)**
+- **[Credits](release-notes/5.71.1.md#credits)**
+- **[Feedback](release-notes/5.71.1.md#feedback)**
+
+## CiviCRM 5.71.0
+
+Released March 6, 2024
+
+- **[Synopsis](release-notes/5.71.0.md#synopsis)**
+- **[Features](release-notes/5.71.0.md#features)**
+- **[Bugs resolved](release-notes/5.71.0.md#bugs)**
+- **[Miscellany](release-notes/5.71.0.md#misc)**
+- **[Credits](release-notes/5.71.0.md#credits)**
+- **[Feedback](release-notes/5.71.0.md#feedback)**
 
 ## CiviCRM 5.70.0
 
-Released February 8, 2024
+Released February 7, 2024
 
 - **[Synopsis](release-notes/5.70.0.md#synopsis)**
 - **[Features](release-notes/5.70.0.md#features)**
diff --git a/www/modules/civicrm/release-notes/5.70.1.md b/www/modules/civicrm/release-notes/5.70.1.md
deleted file mode 100644
index bcba22a21..000000000
--- a/www/modules/civicrm/release-notes/5.70.1.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# CiviCRM 5.70.1
-
-Released February 22, 2024
-
-- **[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**  |
-| Fix security vulnerabilities?                                   | no       |
-
-## <a name="bugs"></a>Bugs resolved
-
-* **_CiviContribute_: Don't show inactive "Premiums" ([dev/core#5014](https://lab.civicrm.org/dev/core/-/issues/5014): [#29427](https://github.com/civicrm/civicrm-core/pull/29427))**
-* **_CiviContribute_: "Contribution Page" incorrectly displays alternative currency ([dev/core#4989](https://lab.civicrm.org/dev/core/-/issues/4989): [#29373](https://github.com/civicrm/civicrm-core/pull/29373))**
-* **_CiviContribute_: Access to "Contribution Page" blocked if financial data has ACLs ([dev/core#4997](https://lab.civicrm.org/dev/core/-/issues/4997): [#29369](https://github.com/civicrm/civicrm-core/pull/29369))**
-* **_CiviEvent_: Error rendering receipt ([dev/core#5006](https://lab.civicrm.org/dev/core/-/issues/5006): [#29408](https://github.com/civicrm/civicrm-core/pull/29408))**
-* **_CiviMember_: Current membership level should be pre-selected (for "Quick Config" pages) ([dev/core#5007](https://lab.civicrm.org/dev/core/-/issues/5007): [#29406](https://github.com/civicrm/civicrm-core/pull/29406))**
-* **_Custom Data_: Error saving changes that affect an inactive "Event" ([dev/core#5005](https://lab.civicrm.org/dev/core/-/issues/5005): [#29444](https://github.com/civicrm/civicrm-core/pull/29444))**
-* **_Form Builder_: Incorrectly saves forms with "Relationships" and "Custom Fields" ([dev/core#4977](https://lab.civicrm.org/dev/core/-/issues/4977): [#29400](https://github.com/civicrm/civicrm-core/pull/29400))**
-* **_News Dashlet_: Fix styling of unread items ([#29452](https://github.com/civicrm/civicrm-core/pull/29452))**
-* **_Smarty v3_: Deprecation message appears in email ([dev/core#5012](https://lab.civicrm.org/dev/core/-/issues/5012): [#29410](https://github.com/civicrm/civicrm-core/pull/29410))**
-
-## <a name="credits"></a>Credits
-
-This release was developed by the following authors and reviewers:
-
-Wikimedia Foundation - Eileen McNaughton; Savion Lee; Nicol Wistreich; Megaphone
-Technology Consulting - Jon Goldberg; John Kingsnorth; JMA Consulting - Seamus Lee;
-Gokhalemethod - Sadashiv; Francesc Bassas i Bullich; Dave D; Coop SymbioTIC - Samuel
-Vanhove, Mathieu Lutfy; CiviCRM - Tim Otten, Coleman Watts; ASMAC (American Society of
-Music Arrangers and Composers) - Jeff Kellem Andy Burns; AGH Strategies - Chris Garaffa
-
-## <a name="feedback"></a>Feedback
-
-These release notes are edited by Tim Otten and Andie Hunt.  If you'd like to
-provide feedback on them, please login to https://chat.civicrm.org/civicrm and
-contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.71.0.md b/www/modules/civicrm/release-notes/5.71.0.md
new file mode 100644
index 000000000..bc187c7d8
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.71.0.md
@@ -0,0 +1,760 @@
+# CiviCRM 5.71.0
+
+Released March 6, 2024
+
+- **[Synopsis](#synopsis)**
+- **[Features](#features)**
+- **[Bugs resolved](#bugs)**
+- **[Miscellany](#misc)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?*                                         |         |
+|:--------------------------------------------------------------- |:-------:|
+| Fix security vulnerabilities?                                   |   no    |
+| Change the database schema?                                     |         |
+| **Alter the API?**                                              | **yes** |
+| **Require attention to configuration options?**                 | **yes** |
+| Fix problems installing or upgrading to a previous version?     |         |
+| **Introduce features?**                                         | **yes** |
+| **Fix bugs?**                                                   | **yes** |
+
+## <a name="features"></a>Features
+
+### Core CiviCRM
+
+- **Make name, title, frontend_title fields on UFGroup consistent with
+  ContributionPage, Group
+  ([28492](https://github.com/civicrm/civicrm-core/pull/28492))**
+
+  This makes profile names operate in the same way as group and contribution
+  page names
+
+### CiviEvent
+
+- **Consolidate handling of line items in back office participant form
+  ([28735](https://github.com/civicrm/civicrm-core/pull/28735))**
+
+- **Clean up  code to add custom data to forms, implement on back office
+  participant form
+  ([28733](https://github.com/civicrm/civicrm-core/pull/28733))**
+
+- **Add html types to Participant schema
+  ([28900](https://github.com/civicrm/civicrm-core/pull/28900))**
+
+### CiviMember
+
+- **SearchUI - Add Find Membership using searchkit
+  ([29064](https://github.com/civicrm/civicrm-core/pull/29064))**
+
+- **ContactSummary - Replace Membership tab with Searchkit display
+  ([28810](https://github.com/civicrm/civicrm-core/pull/28810))**
+
+## <a name="bugs"></a>Bugs resolved
+
+### Core CiviCRM
+
+- **Regression - Fix missing getLinks action in SKEntity
+  ([29589](https://github.com/civicrm/civicrm-core/pull/29589))**
+
+- **SearchKit - Fix enable/disable links in displays ([29547](https://github.com/civicrm/civicrm-core/pull/29547))**
+
+- **Rename 'Provider' entity to 'SmsProvider' ([29555](https://github.com/civicrm/civicrm-core/pull/29555))**
+
+- **Make integer field selfcancelxfer_time required ([29525](https://github.com/civicrm/civicrm-core/pull/29525))**
+
+- **Fix regression from #27902 disabled options showing ([29504](https://github.com/civicrm/civicrm-core/pull/29504))**
+
+- **dev/core#5018 Fix UFGroup.xml ([29461](https://github.com/civicrm/civicrm-core/pull/29461))**
+
+- **dev/core#4889 - Don't delete my files (alternate) ([29421](https://github.com/civicrm/civicrm-core/pull/29421))**
+
+- **News Dashlet - Fix styling of unread items ([29452](https://github.com/civicrm/civicrm-core/pull/29452))**
+
+- **dev/core#5005 Fix validating to allow for saving with entity sub filt… ([29444](https://github.com/civicrm/civicrm-core/pull/29444))**
+
+- **Afform - Fix incorrect html encoding when saving ([29400](https://github.com/civicrm/civicrm-core/pull/29400))**
+
+- **AngularJS - Fix log warning on upgrade UI ([29403](https://github.com/civicrm/civicrm-core/pull/29403))**
+
+- **5.71 upgrade is not safe to re-run ([29398](https://github.com/civicrm/civicrm-core/pull/29398))**
+
+- **CryptoJwt - Fix detection of firebase/php-jwt APIs ([29376](https://github.com/civicrm/civicrm-core/pull/29376))**
+
+- **APIv4 - Fetch all options when matching pseudoconstants. ([29369](https://github.com/civicrm/civicrm-core/pull/29369))**
+
+- **CryptoJwt - Fix detection of firebase/php-jwt APIs ([29345](https://github.com/civicrm/civicrm-core/pull/29345))**
+
+- **Unshare the SMSCommon::preProcess function between the  ([29339](https://github.com/civicrm/civicrm-core/pull/29339))**
+
+- **dev/core#4821 - APIv4: Allow custom field to reference value in bridge joins ([29325](https://github.com/civicrm/civicrm-core/pull/29325))**
+
+- **dev/core#3381 Fix currency display on total fees ([29299](https://github.com/civicrm/civicrm-core/pull/29299))**
+
+- **Fix php8.x issues in payment form ([29245](https://github.com/civicrm/civicrm-core/pull/29245))**
+
+- **SMS tasks, use shared trait, move some functions to it ([29285](https://github.com/civicrm/civicrm-core/pull/29285))**
+
+- **Remove incorrectly placed ChangeCaseStatus class properties and convert one of them to a local var ([29284](https://github.com/civicrm/civicrm-core/pull/29284))**
+
+- **Fix misunderstanding about return value of getKeyId ([29141](https://github.com/civicrm/civicrm-core/pull/29141))**
+
+- **Stop burying the lead ([29306](https://github.com/civicrm/civicrm-core/pull/29306))**
+
+- **dev/core#4974 Fix total fees over-sharing ([29309](https://github.com/civicrm/civicrm-core/pull/29309))**
+
+- **Afform - Reduce noise in mgd.php file ([29316](https://github.com/civicrm/civicrm-core/pull/29316))**
+
+- **Drupal.civi-setup: setAuthorized if running via drush ([29303](https://github.com/civicrm/civicrm-core/pull/29303))**
+
+- **APIv4 - Add type hints to Result object ([29258](https://github.com/civicrm/civicrm-core/pull/29258))**
+
+- **WP - Handle updated permissions format ([29297](https://github.com/civicrm/civicrm-core/pull/29297))**
+
+- **Clean up on clear_assign ([29287](https://github.com/civicrm/civicrm-core/pull/29287))**
+
+- **API - More helpful authorization failed error message ([29179](https://github.com/civicrm/civicrm-core/pull/29179))**
+
+- **(REF) Cleanup - Replace more nested CRM_Utils_Array::value with ?? ([29283](https://github.com/civicrm/civicrm-core/pull/29283))**
+
+- **composer.json: Use current SPDX license identifier ([29078](https://github.com/civicrm/civicrm-core/pull/29078))**
+
+- **[php8.x] Clean up max value functionality ([29254](https://github.com/civicrm/civicrm-core/pull/29254))**
+
+- **(REF) Cleanup - Replace illegible nested CRM_Utils_Array::value with ?? ([29268](https://github.com/civicrm/civicrm-core/pull/29268))**
+
+- **[php8.x] Minor cleanup in priceSetOptionsCount ([29255](https://github.com/civicrm/civicrm-core/pull/29255))**
+
+- **[php8.x] Clarify what `optionsMaxValueTotal` means ([29252](https://github.com/civicrm/civicrm-core/pull/29252))**
+
+- **Allow cascade delete for custom entity reference fields ([28225](https://github.com/civicrm/civicrm-core/pull/28225))**
+
+- **Do not permit a contact to be deleted if it is linked to a CMS user issue1290 ([29026](https://github.com/civicrm/civicrm-core/pull/29026))**
+
+- **Update template deprecation text, add one more string ([29250](https://github.com/civicrm/civicrm-core/pull/29250))**
+
+- **Unshare another function to permit code cleanup ([29248](https://github.com/civicrm/civicrm-core/pull/29248))**
+
+- **Fold functions that only support one form back into that form (survey) ([29232](https://github.com/civicrm/civicrm-core/pull/29232))**
+
+- **Make form-specific funciont protected, non-static ([29247](https://github.com/civicrm/civicrm-core/pull/29247))**
+
+- **Afform - Remove guesswork from fk lookups ([29236](https://github.com/civicrm/civicrm-core/pull/29236))**
+
+- **Remove call to silly non-php8.2 compliant function ([29230](https://github.com/civicrm/civicrm-core/pull/29230))**
+
+- **APIv4 - Add type hints to FieldSpec functions ([29223](https://github.com/civicrm/civicrm-core/pull/29223))**
+
+- **Declare some public variables on ChangeCaseStatus ([29227](https://github.com/civicrm/civicrm-core/pull/29227))**
+
+- **DAO - Remove buggy caching from import/export ([29182](https://github.com/civicrm/civicrm-core/pull/29182))**
+
+- **CorePermission - Declare more implied permissions explicitly ([29218](https://github.com/civicrm/civicrm-core/pull/29218))**
+
+- **Use standardised function to get PriceFieldMetadata ([29219](https://github.com/civicrm/civicrm-core/pull/29219))**
+
+- **Unshare another function with over-sharing ([29217](https://github.com/civicrm/civicrm-core/pull/29217))**
+
+- **Make previously shared function non-static ([29216](https://github.com/civicrm/civicrm-core/pull/29216))**
+
+- **Permissions - Make implied permissions declarative ([29174](https://github.com/civicrm/civicrm-core/pull/29174))**
+
+- **Pass fee block into validatePriceset rather than looking up property ([29215](https://github.com/civicrm/civicrm-core/pull/29215))**
+
+- **Unshare initFee function ([29211](https://github.com/civicrm/civicrm-core/pull/29211))**
+
+- **Pass variables into validatePriceSet rather than getting from the form ([29210](https://github.com/civicrm/civicrm-core/pull/29210))**
+
+- **Move static function to parent, make non-static ([29207](https://github.com/civicrm/civicrm-core/pull/29207))**
+
+- **SearchKit - Hide invalid links and prevent error ([29201](https://github.com/civicrm/civicrm-core/pull/29201))**
+
+- **Move function to shared parent & make non-static ([29198](https://github.com/civicrm/civicrm-core/pull/29198))**
+
+- **Remove unused properties, make internal function private ([29161](https://github.com/civicrm/civicrm-core/pull/29161))**
+
+- **Core/DAO - Add boilerplate import/export functions to base class  ([29181](https://github.com/civicrm/civicrm-core/pull/29181))**
+
+- **Fix notices on Additional Payment Form ([29110](https://github.com/civicrm/civicrm-core/pull/29110))**
+
+- **Return determination  of title to the only user ([29103](https://github.com/civicrm/civicrm-core/pull/29103))**
+
+- **Remove function noisily deprecated in 2020 ([29177](https://github.com/civicrm/civicrm-core/pull/29177))**
+
+- **Add some deprecation warnings, annotations ([29176](https://github.com/civicrm/civicrm-core/pull/29176))**
+
+- **(REF) Normalize internal format of permissions ([29173](https://github.com/civicrm/civicrm-core/pull/29173))**
+
+- **Remove some unused function variables ([29167](https://github.com/civicrm/civicrm-core/pull/29167))**
+
+- **corePermissions - Add label and description keys to arrays ([29170](https://github.com/civicrm/civicrm-core/pull/29170))**
+
+- **Remove unused extra param in getAllModulePermissions ([29165](https://github.com/civicrm/civicrm-core/pull/29165))**
+
+- **Remove unused implied_permissions declaration ([29164](https://github.com/civicrm/civicrm-core/pull/29164))**
+
+- **Remove non-sms parts from SMS class ([29153](https://github.com/civicrm/civicrm-core/pull/29153))**
+
+- **Remove instances of bltID ([29160](https://github.com/civicrm/civicrm-core/pull/29160))**
+
+- **Stop passing billingLocationID to functions that ignore the incoming parameter ([28762](https://github.com/civicrm/civicrm-core/pull/28762))**
+
+- **Use names rather than variables for table names in findPendingTasks ([29150](https://github.com/civicrm/civicrm-core/pull/29150))**
+
+- **Use table names directly in query ([29144](https://github.com/civicrm/civicrm-core/pull/29144))**
+
+- **Contact tokens - Implement fall back from billing address to primary address ([29121](https://github.com/civicrm/civicrm-core/pull/29121))**
+
+- **Remove un-passed parameter ([29146](https://github.com/civicrm/civicrm-core/pull/29146))**
+
+- **SearchKit - Assign raw values to Smarty in field rewrite ([26742](https://github.com/civicrm/civicrm-core/pull/26742))**
+
+- **(REF) ContactType - Fix 2 functions to be more reliable and efficient ([29052](https://github.com/civicrm/civicrm-core/pull/29052))**
+
+- **Do not use a variable for table names ([29134](https://github.com/civicrm/civicrm-core/pull/29134))**
+
+- **Do not return params from doSubmitActions, it is unchanged ([29131](https://github.com/civicrm/civicrm-core/pull/29131))**
+
+- **Remove unused properties, variables ([29129](https://github.com/civicrm/civicrm-core/pull/29129))**
+
+- **Remove unused variables, object fetch ([29130](https://github.com/civicrm/civicrm-core/pull/29130))**
+
+- **Notice fix on qfKey ([29128](https://github.com/civicrm/civicrm-core/pull/29128))**
+
+- **dev/core#4836 Fix mishandling of multiple fields with serialize ([29116](https://github.com/civicrm/civicrm-core/pull/29116))**
+
+- **Fix php warnings on contact edit ([29111](https://github.com/civicrm/civicrm-core/pull/29111))**
+
+- **Use cached array field for custom field validation ([29108](https://github.com/civicrm/civicrm-core/pull/29108))**
+
+- **Degrade consistently when civi_report not enabled but logging is ([28864](https://github.com/civicrm/civicrm-core/pull/28864))**
+
+- **Contact Changelog: use h3 for page title ([29067](https://github.com/civicrm/civicrm-core/pull/29067))**
+
+- **SearchKit - Run filterTasksForDisplay after all other hooks ([29088](https://github.com/civicrm/civicrm-core/pull/29088))**
+
+- **(REF) CRM_Core_Session - Streamline lookup of current user id & display name ([29048](https://github.com/civicrm/civicrm-core/pull/29048))**
+
+- **APIv4 - RequestSpec caching ([29066](https://github.com/civicrm/civicrm-core/pull/29066))**
+
+- **(REF) APIv4 - Remove unnecessary class namespace prefixes ([29068](https://github.com/civicrm/civicrm-core/pull/29068))**
+
+- **Fix internal links in AdminUI templates ([29065](https://github.com/civicrm/civicrm-core/pull/29065))**
+
+- **Move import export to UserJob ([29062](https://github.com/civicrm/civicrm-core/pull/29062))**
+
+- **Deprecate unused function getSurveyCustomGroups ([29053](https://github.com/civicrm/civicrm-core/pull/29053))**
+
+- **(REF) APIv4 - Use caching to speed up invoke function ([29061](https://github.com/civicrm/civicrm-core/pull/29061))**
+
+- **Import minor adjustments - add getters, setters, flush, ability to export ([29057](https://github.com/civicrm/civicrm-core/pull/29057))**
+
+- **Use static caching to reduce lookups in import display ([29059](https://github.com/civicrm/civicrm-core/pull/29059))**
+
+- **jsortable.tpl: make order direction configurable ([28672](https://github.com/civicrm/civicrm-core/pull/28672))**
+
+- **(REF) - Cleanup ajax on profile field admin form ([29042](https://github.com/civicrm/civicrm-core/pull/29042))**
+
+- **Add missing aliases for billingCountry fields ([28926](https://github.com/civicrm/civicrm-core/pull/28926))**
+
+- **(REF) Profile - simplify loop to check for multi-record custom group ([29037](https://github.com/civicrm/civicrm-core/pull/29037))**
+
+- **Fix isMultiRecordField function to return group id ([29036](https://github.com/civicrm/civicrm-core/pull/29036))**
+
+- **PHP8 - Remove unnecessary pass-by-reference ([29030](https://github.com/civicrm/civicrm-core/pull/29030))**
+
+- **APIv4 - Deprecae unused function ([29031](https://github.com/civicrm/civicrm-core/pull/29031))**
+
+- **SearchKit - Allow rewrite with only whitespace ([29024](https://github.com/civicrm/civicrm-core/pull/29024))**
+
+- **Correct message template warning in MessageTemplates.php ([29015](https://github.com/civicrm/civicrm-core/pull/29015))**
+
+- **UFGroup - Cleanup getCustomFields and standardize checkPermission param ([29004](https://github.com/civicrm/civicrm-core/pull/29004))**
+
+- **Dedupe - Include EntityReference custom fields ([28991](https://github.com/civicrm/civicrm-core/pull/28991))**
+
+- **Remove check for core-error, never thrown ([28980](https://github.com/civicrm/civicrm-core/pull/28980))**
+
+- **Add params to actions when creating a WordPress User ([28992](https://github.com/civicrm/civicrm-core/pull/28992))**
+
+- **Take a copy of importable fields back to the upgrade  class ([28982](https://github.com/civicrm/civicrm-core/pull/28982))**
+
+- **Superficial clean up Use strict type checks ([28961](https://github.com/civicrm/civicrm-core/pull/28961))**
+
+- **Remove duplicate financial acl check ([28963](https://github.com/civicrm/civicrm-core/pull/28963))**
+
+- **Add comments to settings definition to clarify that this is not the preferred method ([28969](https://github.com/civicrm/civicrm-core/pull/28969))**
+
+- **CiviCRM APIv4, Extension::get - expose more Extension properties ([28986](https://github.com/civicrm/civicrm-core/pull/28986))**
+
+- **Remove arguable statement about refunds ([28979](https://github.com/civicrm/civicrm-core/pull/28979))**
+
+- **Make error message more traceable ([28972](https://github.com/civicrm/civicrm-core/pull/28972))**
+
+- **(REF)  Convert _checkAccess to event listener ([28890](https://github.com/civicrm/civicrm-core/pull/28890))**
+
+- **PCP - Add metadata for SearchKit dynamic joins ([28549](https://github.com/civicrm/civicrm-core/pull/28549))**
+
+- **Followup to 28936 ([28956](https://github.com/civicrm/civicrm-core/pull/28956))**
+
+- **(REF) SearchKit - minor code cleanup/clarification ([28958](https://github.com/civicrm/civicrm-core/pull/28958))**
+
+- **dev/core#4888 - Location field on case activity is misaligned ([28955](https://github.com/civicrm/civicrm-core/pull/28955))**
+
+- **Copy formatFieldsForOptionFull to not share backoffice & front end ([28938](https://github.com/civicrm/civicrm-core/pull/28938))**
+
+- **hook_links - Identify more quirks ([28950](https://github.com/civicrm/civicrm-core/pull/28950))**
+
+- **Add system checks for civicrm.settings performance options ([28936](https://github.com/civicrm/civicrm-core/pull/28936))**
+
+- **APIv4 - Improve getFields internal value lookups ([28940](https://github.com/civicrm/civicrm-core/pull/28940))**
+
+- **Remove un-used noticey function ([28885](https://github.com/civicrm/civicrm-core/pull/28885))**
+
+- **Stop setting unused key ([28923](https://github.com/civicrm/civicrm-core/pull/28923))**
+
+- **Remove unused variable ([28939](https://github.com/civicrm/civicrm-core/pull/28939))**
+
+- **DeletedFilesCheck - Include renamed as well as deleted files ([28930](https://github.com/civicrm/civicrm-core/pull/28930))**
+
+- **Make function non-static, protected ([28924](https://github.com/civicrm/civicrm-core/pull/28924))**
+
+- **Add preliminary previewability and token support to case-activity ([28800](https://github.com/civicrm/civicrm-core/pull/28800))**
+
+- **Handle updated permissions format ([678](https://github.com/civicrm/civicrm-drupal/pull/678))**
+
+- **Use unaliased Exception ([315](https://github.com/civicrm/civicrm-wordpress/pull/315))**
+
+- **Handle updated permissions format ([172](https://github.com/civicrm/civicrm-backdrop/pull/172))**
+
+- **Add clearAssign transitional shim ([384](https://github.com/civicrm/civicrm-packages/pull/384))**
+
+- **Contemplate nothingness ([29269](https://github.com/civicrm/civicrm-core/pull/29269))**
+
+### CiviContribute
+
+- **Warn when undefined php properties in mail text
+  ([28399](https://github.com/civicrm/civicrm-core/pull/28399))**
+
+- **fix bug saving a new recurring contribution to the database
+  ([29005](https://github.com/civicrm/civicrm-core/pull/29005))**
+
+### CiviEvent
+
+- **[php8.x] [online-event] [test] Use Order object rather than passed
+  parameter to figure out if price field values use participant count
+  ([29249](https://github.com/civicrm/civicrm-core/pull/29249))**
+
+- **Multiple Participant Event Registration Issue
+  ([dev/core#4390](https://lab.civicrm.org/dev/core/-/issues/4390):
+  [29358](https://github.com/civicrm/civicrm-core/pull/29358))**
+
+  This removes unused code that results in errors for multiple participant registration.
+
+- **BackOffice participant form - Fix failure to reload correct default when
+  custom data subtype changes
+  ([29356](https://github.com/civicrm/civicrm-core/pull/29356))**
+
+- **Event full inconsistencies
+  ([dev/core#4907](https://lab.civicrm.org/dev/core/-/issues/4907),
+  [dev/core#4918](https://lab.civicrm.org/dev/core/-/issues/4918), and
+  [dev/core#4942](https://lab.civicrm.org/dev/core/-/issues/4942):
+  [28983](https://github.com/civicrm/civicrm-core/pull/28983)
+  [28984](https://github.com/civicrm/civicrm-core/pull/28984),
+  [29105](https://github.com/civicrm/civicrm-core/pull/29105),
+  [29106](https://github.com/civicrm/civicrm-core/pull/29106),
+  [29127](https://github.com/civicrm/civicrm-core/pull/29127), and
+  [29197](https://github.com/civicrm/civicrm-core/pull/29197))**
+
+- **event title is blank in transfer participant email
+  ([28993](https://github.com/civicrm/civicrm-core/pull/28993))**
+
+- **Regression - Events - Registration Confirmation and Receipt (on-line)
+  ([dev/core#5006](https://lab.civicrm.org/dev/core/-/issues/5006):
+  [29408](https://github.com/civicrm/civicrm-core/pull/29408))**
+
+- **Extra squiggly bracket appearing on event thankyou page
+  ([29464](https://github.com/civicrm/civicrm-core/pull/29464))**
+
+- **Notice fixes on AdditionalParticipant page
+  ([29234](https://github.com/civicrm/civicrm-core/pull/29234))**
+
+- **Stop calculating optionsCountDetails in non-unshared function on
+  participantFeeSelection
+  ([29221](https://github.com/civicrm/civicrm-core/pull/29221))**
+
+- **Fix Participant fee selection to use standardised getPriceFieldMetadata
+  ([29220](https://github.com/civicrm/civicrm-core/pull/29220))**
+
+- **Event cart - stop using undeclared property cid
+  ([29237](https://github.com/civicrm/civicrm-core/pull/29237))**
+
+- **Fix a couple of notices on event dashboard
+  ([29222](https://github.com/civicrm/civicrm-core/pull/29222))**
+
+- **Fix Smarty Notices on Event confirm & thank you pages
+  ([29310](https://github.com/civicrm/civicrm-core/pull/29310))**
+
+- **[online-event] Fix typing on fee level
+  ([29239](https://github.com/civicrm/civicrm-core/pull/29239))**
+
+- **Fix notices on event info page
+  ([29304](https://github.com/civicrm/civicrm-core/pull/29304))**
+
+- **Copy buildAmount back to form to avoid unhelpful sharing
+  ([28916](https://github.com/civicrm/civicrm-core/pull/28916))**
+
+- **[online-event] PHP8.2 stop unnecessarily setting undefined Properties in
+  event thankyou ([29244](https://github.com/civicrm/civicrm-core/pull/29244))**
+
+- **Fix master-only regression on saving event info when no custom data applies
+  ([29301](https://github.com/civicrm/civicrm-core/pull/29301))**
+
+- **Event Registration Confirm/Thank You pages show incorrect currency
+  ([dev/core#3381](https://lab.civicrm.org/dev/core/-/issues/3381):
+  [29251](https://github.com/civicrm/civicrm-core/pull/29251))**
+
+- **organizer field should ONLY be included if ics is used for group scheduling
+  ([28954](https://github.com/civicrm/civicrm-core/pull/28954))**
+
+- **Fix notices & php8.2 compatibility on Manage Event Info page
+  ([29240](https://github.com/civicrm/civicrm-core/pull/29240))**
+
+- **FIx show-hide notices on event confirm
+  ([29224](https://github.com/civicrm/civicrm-core/pull/29224))**
+
+- **Remove a chunk of legacy code from (probably unused) EventForward code)
+  ([29145](https://github.com/civicrm/civicrm-core/pull/29145))**
+
+- **Number field input validation does not respect decimal separator setting
+  (event custom field)
+  ([dev/core#4941](https://lab.civicrm.org/dev/core/-/issues/4941):
+  [29125](https://github.com/civicrm/civicrm-core/pull/29125))**
+
+- **Notice fix on event thank you page
+  ([29126](https://github.com/civicrm/civicrm-core/pull/29126))**
+
+- **VTIMEZONE block in ICS file publishes DSTART in wrong timezone
+  ([dev/core#4860](https://lab.civicrm.org/dev/core/-/issues/4860):
+  [28853](https://github.com/civicrm/civicrm-core/pull/28853))**
+
+- **Fix handling for available registrations in event Register::formRule
+  ([28987](https://github.com/civicrm/civicrm-core/pull/28987))**
+
+- **Remove bltID from eventFees class
+  ([28772](https://github.com/civicrm/civicrm-core/pull/28772))**
+
+- **E-notice fix, online event, currency
+  ([28883](https://github.com/civicrm/civicrm-core/pull/28883))**
+
+- **Unconditionally assign priceSet on event forms to avoid notices
+  ([28949](https://github.com/civicrm/civicrm-core/pull/28949))**
+
+### CiviMail
+
+- **[PHP 8.2] mail wrongly formatted
+  ([dev/core#4913](https://lab.civicrm.org/dev/core/-/issues/4913):
+  [29035](https://github.com/civicrm/civicrm-core/pull/29035))**
+
+  This is resolved by updating the pear/mail and pear/db libraries.
+
+- **don't create duplicate contacts when sending test emails
+  ([29212](https://github.com/civicrm/civicrm-core/pull/29212))**
+
+- **Add test & clean up deprecated apiv3 Forward action
+  ([29166](https://github.com/civicrm/civicrm-core/pull/29166))**
+
+- **Remove unused paramter (was to support email forward deprecated function -
+  but that no longer calls this)
+  ([29147](https://github.com/civicrm/civicrm-core/pull/29147))**
+
+- **Fix apiv4 Mailing Api to not do scheduling
+  ([29138](https://github.com/civicrm/civicrm-core/pull/29138))**
+
+- **(REF) Flexmailer - Simplify service definitions
+  ([29163](https://github.com/civicrm/civicrm-core/pull/29163))**
+
+- **Remove guts of civicrm Mailing.preview
+  ([29171](https://github.com/civicrm/civicrm-core/pull/29171))**
+
+- **Stop over-sharing - MailingJob::findPendingTasks
+  ([29162](https://github.com/civicrm/civicrm-core/pull/29162))**
+
+- **Noisily deprecate & stop using BAO_MailingJob::create
+  ([29137](https://github.com/civicrm/civicrm-core/pull/29137))**
+
+- **Use writeRecord from mailing job DAO
+  ([29135](https://github.com/civicrm/civicrm-core/pull/29135))**
+
+- **Rationalise MailingJob::queue
+  ([29148](https://github.com/civicrm/civicrm-core/pull/29148))**
+
+- **Fix confusion over what function is called when delivering mailing
+  ([29149](https://github.com/civicrm/civicrm-core/pull/29149))**
+
+- **Extract refreshMailingGroupCache
+  ([29133](https://github.com/civicrm/civicrm-core/pull/29133))**
+
+- **(REF) CiviMail - Remove old/unused page controller
+  ([28998](https://github.com/civicrm/civicrm-core/pull/28998))**
+
+### CiviMember
+
+- **Editing an unpaid event registration to add a partial payment crashes
+  ([dev/core#5035](https://lab.civicrm.org/dev/core/-/issues/5035):
+  [29507](https://github.com/civicrm/civicrm-core/pull/29507))**
+
+- **Setting a default membership type in a contribution page has no effect
+  ([dev/core#5051](https://lab.civicrm.org/dev/core/-/issues/5051):
+  [29623](https://github.com/civicrm/civicrm-core/pull/29623))**
+
+- **Align membership online receipt with contribution online receipt
+  ([29498](https://github.com/civicrm/civicrm-core/pull/29498))**
+
+- **AdminUI: Fix auto renew display on new SK membership tab
+  ([29012](https://github.com/civicrm/civicrm-core/pull/29012))**
+
+## Standalone
+
+- **standalone: apply user's timezone during boot ([29282](https://github.com/civicrm/civicrm-core/pull/29282))**
+
+- **standalone: fix ACLs on Roles re core #4862 ([29256](https://github.com/civicrm/civicrm-core/pull/29256))**
+
+- **Standaloneusers API permission lockdown ([28877](https://github.com/civicrm/civicrm-core/pull/28877))**
+
+### Special Topic: Custom Field Caches
+
+- **dev/core#4905 - More efficient loading and caching of custom field metadata ([28975](https://github.com/civicrm/civicrm-core/pull/28975))**
+
+- **dev/core#4905 - Deprecate redundant functions that fetch custom groups ([28990](https://github.com/civicrm/civicrm-core/pull/28990))**
+
+- **dev/core#4905 - Add CRM_Core_BAO_CustomGroup::getAll() with optional filters ([28995](https://github.com/civicrm/civicrm-core/pull/28995))**
+
+- **dev/core#4905 - Deprecate CustomGroup::getAllCustomGroupsByBaseEntity ([28999](https://github.com/civicrm/civicrm-core/pull/28999))**
+
+- **dev/core#4905 - Refactor CustomField::getFields() to use more efficient getter ([29002](https://github.com/civicrm/civicrm-core/pull/29002))**
+
+- **dev/core#4905 - DedupeMerger - Delete detangled function, use api instead ([29006](https://github.com/civicrm/civicrm-core/pull/29006))**
+
+- **dev/core#4905 - Refactor out duplicate CustomField getter functions ([29011](https://github.com/civicrm/civicrm-core/pull/29011))**
+
+- **dev/core#4905 - Refactor SelectValues::getQuicksearchOptions to use caching ([29020](https://github.com/civicrm/civicrm-core/pull/29020))**
+
+- **dev/core#4905 - Refactor legacy CustomGroup getters to use cached data provider ([29027](https://github.com/civicrm/civicrm-core/pull/29027))**
+
+- **dev/core#4905 - Refactor CustomField getters to use cached provider ([29032](https://github.com/civicrm/civicrm-core/pull/29032))**
+
+- **dev/core#4905 - Add CustomGroup::getGroup() function ([29034](https://github.com/civicrm/civicrm-core/pull/29034))**
+
+- **(REF) dev/core#4905 - Cleanup CustomGroup functions to use more efficient getter ([29044](https://github.com/civicrm/civicrm-core/pull/29044))**
+
+- **dev/core#4905 - Improve Afform.get to use cached custom group getter ([29045](https://github.com/civicrm/civicrm-core/pull/29045))**
+
+- **dev/core#4905 - DedupeMerger - Use cached function to get custom groups ([29046](https://github.com/civicrm/civicrm-core/pull/29046))**
+
+- **dev/core#4905 - ImportParser - Use cached function to get custom groups ([29047](https://github.com/civicrm/civicrm-core/pull/29047))**
+
+- **dev/core#4905 - Cleanup customField lookup code in CiviCase ([29050](https://github.com/civicrm/civicrm-core/pull/29050))**
+
+- **(REF) dev/core#4905 - Cleanup customField lookup code in DedupeRule ([29051](https://github.com/civicrm/civicrm-core/pull/29051))**
+
+- **dev/core#4905 - CiviReport - Use cached function to get custom groups & fields ([29054](https://github.com/civicrm/civicrm-core/pull/29054))**
+
+- **(REF) dev/core#4905 - Simplify custom field lookup code in ImportParser ([29089](https://github.com/civicrm/civicrm-core/pull/29089))**
+
+- **(REF) dev/core#4905 ContactType - Use cache to get custom fields ([29094](https://github.com/civicrm/civicrm-core/pull/29094))**
+
+- **dev/core#4905 - Use cached getFieldObject instead of new customField ([29098](https://github.com/civicrm/civicrm-core/pull/29098))**
+
+- **dev/core#4905 - Delete unused buildGroupTree function ([29099](https://github.com/civicrm/civicrm-core/pull/29099))**
+
+- **dev/core#4905 - Use cache to fetch custom groups by contact type ([29100](https://github.com/civicrm/civicrm-core/pull/29100))**
+
+- **dev/core#4905 - Make internal function private again ([29101](https://github.com/civicrm/civicrm-core/pull/29101))**
+
+- **dev/core#4905 - Relocate survey-specific function to CiviCampaign class ([29102](https://github.com/civicrm/civicrm-core/pull/29102))**
+
+- **dev/core#4905 - Simplify CustomValueTable::setValues to use new getter ([29124](https://github.com/civicrm/civicrm-core/pull/29124))**
+
+- **dev/core#4905 - Use new customField getter in a few more places ([29259](https://github.com/civicrm/civicrm-core/pull/29259))**
+
+### Special Topic: Smarty Compatibility
+
+- **Add Smarty4 folder ([380](https://github.com/civicrm/civicrm-packages/pull/380))**
+
+- **Add Smarty5 to packages ([382](https://github.com/civicrm/civicrm-packages/pull/382))**
+
+- **Hack more forward compatibility into Smarty2 ([383](https://github.com/civicrm/civicrm-packages/pull/383))**
+
+- **Bump smarty/smarty from 4.0.0 to 4.3.1 in /smarty4 ([385](https://github.com/civicrm/civicrm-packages/pull/385))**
+
+- **Update to latest Smarty4 ([386](https://github.com/civicrm/civicrm-packages/pull/386))**
+
+- **Run tests on Smarty4 instead of 3
+  ([29288](https://github.com/civicrm/civicrm-core/pull/29288))**
+
+- **[Smarty Gencode] Load Smarty3 in Gencode too  ([28774](https://github.com/civicrm/civicrm-core/pull/28774))**
+
+- **[Smarty Gencode] Fixes on clearAllAssign ([29265](https://github.com/civicrm/civicrm-core/pull/29265))**
+
+- **[Smarty Gencode] Switch createSmarty to use functions that work on v2,v3,v4 ([29279](https://github.com/civicrm/civicrm-core/pull/29279))**
+
+- **[Smarty Gencode] Clean up resourcesTest for Smarty3
+  ([29266](https://github.com/civicrm/civicrm-core/pull/29266))**
+
+- **[Smarty Gencode] Remove clearAllVars from SessionTest
+  ([29263](https://github.com/civicrm/civicrm-core/pull/29263))**
+
+- **[Smarty Gencode] Try removing clearTemplateVars hack from test
+  ([29262](https://github.com/civicrm/civicrm-core/pull/29262))**
+
+- **Update Smarty function in snapshop template ([28832](https://github.com/civicrm/civicrm-core/pull/28832))**
+
+- **Register native php functions that we use as Smarty plugins ([29289](https://github.com/civicrm/civicrm-core/pull/29289))**
+
+- **Deprecate a couple of backward compatibility Smarty functions ([29302](https://github.com/civicrm/civicrm-core/pull/29302))**
+
+- **Do not attempt to register string resources for Smarty3+ ([29104](https://github.com/civicrm/civicrm-core/pull/29104))**
+
+- **dev/core#4928 - Smarty3 filenames generated by singleUseString are invalid on windows ([29056](https://github.com/civicrm/civicrm-core/pull/29056))**
+
+- **dev/core#4951 Add support for Smarty debugging ([29183](https://github.com/civicrm/civicrm-core/pull/29183))**
+
+- **Use upper not strtoupper in Smarty as that is supported going forwards ([29321](https://github.com/civicrm/civicrm-core/pull/29321))**
+
+- **Remove calls to get_template_vars, template_exists ([29411](https://github.com/civicrm/civicrm-core/pull/29411))**
+
+- **Add str_starts_with modifier to Smarty ([29337](https://github.com/civicrm/civicrm-core/pull/29337))**
+
+- **Stop using intval in Smarty ([29323](https://github.com/civicrm/civicrm-core/pull/29323))**
+
+- **Add smarty mixin (replaces smartyv2 for clarify only) ([29187](https://github.com/civicrm/civicrm-core/pull/29187))**
+
+- **Stop calling assign_by_ref on Smarty ([29414](https://github.com/civicrm/civicrm-core/pull/29414))**
+
+- **Fix SmartyCompatibility to use php8.3 friendly function ([29415](https://github.com/civicrm/civicrm-core/pull/29415))**
+
+- **Update Smarty autoload constant to be version agnostic ([29185](https://github.com/civicrm/civicrm-core/pull/29185))**
+
+- **Remove getTemplateVars() override now that it happens in Smarty2 ([29184](https://github.com/civicrm/civicrm-core/pull/29184))**
+
+- **Move messageTemplate call out of create Smarty ([29261](https://github.com/civicrm/civicrm-core/pull/29261))**
+
+- **dev/core#4955 Hack Smarty3+ getTemplateVars into Smarty2 ([381](https://github.com/civicrm/civicrm-packages/pull/381))**
+
+- **(REF) Fix Smarty Notice on missing hideRelativeLabel ([29087](https://github.com/civicrm/civicrm-core/pull/29087))**
+
+- **Fix Smarty notice when a single contact is deleted (not from search) ([29238](https://github.com/civicrm/civicrm-core/pull/29238))**
+
+- **Smarty notice fix ([29151](https://github.com/civicrm/civicrm-core/pull/29151))**
+
+- **Smarty notice fix ([29231](https://github.com/civicrm/civicrm-core/pull/29231))**
+
+- **Fix a few tests to be Smarty3 friendly
+  ([29257](https://github.com/civicrm/civicrm-core/pull/29257))**
+
+## <a name="misc"></a>Miscellany
+
+- **Bump phpseclib/phpseclib from 2.0.31 to 2.0.47
+  ([29620](https://github.com/civicrm/civicrm-core/pull/29620))**
+
+- **Bump phenx/php-svg-lib from 0.5.1 to 0.5.2
+  ([29469](https://github.com/civicrm/civicrm-core/pull/29469))**
+
+- **(NFC) test fix for leap year
+  ([29515](https://github.com/civicrm/civicrm-core/pull/29515))**
+
+- **dev/core#5006 Add test for self_cancel
+  ([29509](https://github.com/civicrm/civicrm-core/pull/29509))**
+
+- **(NFC) Remove redundant deprecated checks for assertObjectHasAttribute
+  ([29336](https://github.com/civicrm/civicrm-core/pull/29336))**
+
+- **Disable failing test in PR runs for now
+  ([29242](https://github.com/civicrm/civicrm-core/pull/29242))**
+
+- **APIv4 - Remove unused PerformanceTest
+  ([29077](https://github.com/civicrm/civicrm-core/pull/29077))**
+
+- **dev/core#4847 - Add test to verify APIv4 Activity ACL works properly
+  ([29055](https://github.com/civicrm/civicrm-core/pull/29055))**
+
+- **Update Event RegisterTest form to use the FormTrait
+  ([28988](https://github.com/civicrm/civicrm-core/pull/28988))**
+
+- **Test helper fix, link price set ID if passed in
+  ([28989](https://github.com/civicrm/civicrm-core/pull/28989))**
+
+- **Minor clean up in test class
+  ([28951](https://github.com/civicrm/civicrm-core/pull/28951))**
+
+- **Remove now-unused test-template
+  ([28968](https://github.com/civicrm/civicrm-core/pull/28968))**
+
+- **Minor clean up in test class
+  ([28981](https://github.com/civicrm/civicrm-core/pull/28981))**
+
+- **Switch confirmTest to use the form wrapper
+  ([28937](https://github.com/civicrm/civicrm-core/pull/28937))**
+
+- **Add test cover for event additional profiles
+  ([28891](https://github.com/civicrm/civicrm-core/pull/28891))**
+
+- **(REF) Move paymentProcessorAuthorizeNetCreate test function to authorizenet
+  test trait ([28925](https://github.com/civicrm/civicrm-core/pull/28925))**
+
+- **(REF) Minor cleanup in handling of additional participants when sending
+  mail + improve test
+  ([28889](https://github.com/civicrm/civicrm-core/pull/28889))**
+
+- **Fix Profile set up in test configuration
+  ([28899](https://github.com/civicrm/civicrm-core/pull/28899))**
+
+- **(NFC) CoreExt - Cleanup boilerplate from extension readmes
+  ([29340](https://github.com/civicrm/civicrm-core/pull/29340))**
+
+- **(NFC) Deprecated class name for abstract classes in phpunit
+  ([29335](https://github.com/civicrm/civicrm-core/pull/29335))**
+
+- **(NFC) CustomField - Add @deprecated notice to old function
+  ([29009](https://github.com/civicrm/civicrm-core/pull/29009))**
+
+- **(NFC) composer.json - Add comments block for the `patches` section
+  ([29028](https://github.com/civicrm/civicrm-core/pull/29028))**
+
+- **(NFC) ContactType - Cleanup function docs & type hints
+  ([28996](https://github.com/civicrm/civicrm-core/pull/28996))**
+
+- **(NFC) Simplify translatePermission() switch statement
+  ([28835](https://github.com/civicrm/civicrm-core/pull/28835))**
+
+- **setting-admin@1 - Bump version
+  ([29322](https://github.com/civicrm/civicrm-core/pull/29322))**
+
+- **Restore membership types in tearDown
+  ([28680](https://github.com/civicrm/civicrm-core/pull/28680))**
+
+- **EventCart - Update readme to reflect current state
+  ([29341](https://github.com/civicrm/civicrm-core/pull/29341))**
+
+- **ContributionBase - Remove unused code
+  ([29281](https://github.com/civicrm/civicrm-core/pull/29281))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following code authors:
+
+AGH Strategies - Andie Hunt; Agileware - Justin Freeman; Artful Robot - Rich Lott; Christian Wach; Circle Interactive - Pradeep Nayak; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Yashodha Chaku; Coop SymbioTIC - Mathieu Lutfy; Dave D; Fuzion - Jitendra Purohit; Humanists UK - Andrew West;; JMA Consulting - Seamus Lee; John Kingsnorth; Megaphone Technology Consulting - Jon Goldberg; MJW Consulting - Matthew Wire; Progressive Technology Project - Jamie McClelland; Reflexive Communications - Sandor Semsey; Stephen Palmstrom; Third Sector Design - Kurund Jalmi, William Mortada; University of Waterloo - Patrick Lam; Wikimedia Foundation - Eileen McNaughton
+
+Most authors also reviewed code for this release; in addition, the following
+reviewers contributed their comments:
+
+AGH Strategies - Chris Garaffa; Andy Burns; ASMAC (American Society of Music Arrangers and Composers) - Jeff Kellem; BrightMinded Ltd - Bradley Taylor; civiservice.de - Detlev Sieber; Coop SymbioTIC - Samuel Vanhove; Francesc Bassas i Bullich; Greenleaf Advancement - Guy Iaccarino; JMA Consulting - Joe Murray; Nicol Wistreich; Squiffle Consulting - Aidan Saunders; Systopia - Dominic Tubach; Tadpole Collective - Kevin Cristiano
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Alice Frumin and Andie Hunt.  If you'd like
+to provide feedback on them, please log in to https://chat.civicrm.org/civicrm
+and contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.71.1.md b/www/modules/civicrm/release-notes/5.71.1.md
new file mode 100644
index 000000000..06102bf8c
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.71.1.md
@@ -0,0 +1,39 @@
+# CiviCRM 5.71.1
+
+Released March 8, 2024
+
+- **[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**  |
+| Fix security vulnerabilities?                                   | no       |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviContribute_: Emails with monetary tokens sometimes fail to render ([#29654](https://github.com/civicrm/civicrm-core/pull/29654))**
+* **_CiviMember_: Some "Price Set" configurations involving checkboxes lead to PHP error ([dev/core#5071](https://lab.civicrm.org/dev/core/-/issues/5071): [#29653](https://github.com/civicrm/civicrm-core/pull/29653))**
+* **_CiviSurvey_: Error displaying results ("Return type declaration") ([#29658](https://github.com/civicrm/civicrm-core/pull/29658))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; CiviCRM - Coleman Watts; Agileware - Francis
+Whittle, Agileware Team
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.71.2.md b/www/modules/civicrm/release-notes/5.71.2.md
new file mode 100644
index 000000000..dbb6dbff5
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.71.2.md
@@ -0,0 +1,41 @@
+# CiviCRM 5.71.2
+
+Released March 28, 2024
+
+- **[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**  |
+| Fix security vulnerabilities?                                   | no       |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviContribute_: When submitting an "Other Amount", the amount is split into units of $1 ([dev/core#5079](https://lab.civicrm.org/dev/core/-/issues/5079), [dev/core#5100](https://lab.civicrm.org/dev/core/-/issues/5100): [#29717](https://github.com/civicrm/civicrm-core/pull/29717))**
+* **_CiviEvent_: Email receipt does not show transaction number ([dev/core#5088](https://lab.civicrm.org/dev/core/-/issues/5088): [#29715](https://github.com/civicrm/civicrm-core/pull/29715))**
+* **_Custom Data_: Multi-select field does not show current values ([dev/core#5090](https://lab.civicrm.org/dev/core/-/issues/5090): [#29721](https://github.com/civicrm/civicrm-core/pull/29721))**
+* **_Form Builder_: Page title doesn't display ([#29694](https://github.com/civicrm/civicrm-core/pull/29694))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Third Sector Design - William Mortada, Kurund
+Jalmi; Megaphone Technology Consulting - Jon Goldberg; JMA Consulting - Seamus Lee;
+civiservice.de - Detlev Sieber; CiviCRM - Coleman Watts
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.72.0.md b/www/modules/civicrm/release-notes/5.72.0.md
new file mode 100644
index 000000000..15d7beedb
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.72.0.md
@@ -0,0 +1,618 @@
+# CiviCRM 5.72.0
+
+Released April 3, 2024
+
+- **[Synopsis](#synopsis)**
+- **[Features](#features)**
+- **[Bugs resolved](#bugs)**
+- **[Miscellany](#misc)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?*                                         |         |
+|:--------------------------------------------------------------- |:-------:|
+| 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
+
+### Core CiviCRM
+
+- **Scheduled Jobs - Define and track  "last_run_end" 
+  ([29587](https://github.com/civicrm/civicrm-core/pull/29587))**
+
+  If a job completes (whether successful or by exception) it will record a 
+  `last_run_end` date in the job table.
+
+- **Support oEmbed for external facing pages 
+  ([dev/core#2994](https://lab.civicrm.org/dev/core/-/issues/2994):
+  [29496](https://github.com/civicrm/civicrm-core/pull/29496) and
+  [29536](https://github.com/civicrm/civicrm-core/pull/29536))**
+
+  This adds initial support for CiviCRM to provide embeddable content on 
+  external websites. However, the mechanism is somewhat experimental. 
+  Consequently, it is implemented as a hidden extension (`oembed`).
+
+- **Updating php-weasyprint to latest version 
+  ([29806](https://github.com/civicrm/civicrm-core/pull/29806) and
+  [29844](https://github.com/civicrm/civicrm-core/pull/29844))**
+
+### CiviContribute
+
+- **Convert confirm email text to html 
+  ([29532](https://github.com/civicrm/civicrm-core/pull/29532))**
+
+  The field for custom text in a contribution or event confirmation email is
+  now rich text stored as HTML.
+
+- **Switch variables for tokens in contribution invoice template 
+  (Preparing for [dev/core#4940](https://lab.civicrm.org/dev/core/-/issues/4940): 
+  [29119](https://github.com/civicrm/civicrm-core/pull/29119))**
+
+  Most variables are no longer tied to the form layer.
+
+### CiviEvent
+
+- **Replace Contact Summary Events tab with Admin UI Search Display and Form 
+  ([29570](https://github.com/civicrm/civicrm-core/pull/29570))**
+
+  This continues work to replace admin screens with displays built on 
+  SearchKit. Note: customizations using `hook_civicrm_links()` on the replaced
+  tab will no longer work. They can be reimplemented by customizing the 
+  display.
+
+- **add class for fee level column 
+  ([29123](https://github.com/civicrm/civicrm-core/pull/29123))**
+
+  The results in Find Participants had classes for all the columns besides the
+  Fee Level column. This adds a class to the column so that it can used as reference if needed to alter the column via JS or CSS.
+
+### CiviMail
+
+- **Add fields to mailing details report 
+  ([dev/core#5010](https://lab.civicrm.org/dev/core/-/issues/5010): 
+  [29387](https://github.com/civicrm/civicrm-core/pull/29387))**
+
+  Time stamp fields are now available in the mailing details report to show when the mailing was delivered.
+
+- **Updates SMS form to use api based widget to select phones rather than the 
+  hacky one-off ajax 
+  ([29647](https://github.com/civicrm/civicrm-core/pull/29647))**
+
+## <a name="bugs"></a>Bugs resolved
+
+### Core CiviCRM
+
+- **Accordions: Eight patterns in Civi markup – reduce & make more accessible?
+  ([dev/user-interface#60](https://lab.civicrm.org/dev/user-interface/-/issues/60):
+  [29446](https://github.com/civicrm/civicrm-core/pull/29446),
+  [29448](https://github.com/civicrm/civicrm-core/pull/29448),
+  [29449](https://github.com/civicrm/civicrm-core/pull/29449),
+  [29533](https://github.com/civicrm/civicrm-core/pull/29533),
+  [29543](https://github.com/civicrm/civicrm-core/pull/29543),
+  [29551](https://github.com/civicrm/civicrm-core/pull/29551),
+  [29563](https://github.com/civicrm/civicrm-core/pull/29563),
+  [29594](https://github.com/civicrm/civicrm-core/pull/29594),
+  [29600](https://github.com/civicrm/civicrm-core/pull/29600),
+  [29602](https://github.com/civicrm/civicrm-core/pull/29602),
+  [29633](https://github.com/civicrm/civicrm-core/pull/29633),
+  [29704](https://github.com/civicrm/civicrm-core/pull/29704),
+  [29713](https://github.com/civicrm/civicrm-core/pull/29713), and
+  [680](https://github.com/civicrm/civicrm-drupal/pull/680))**
+
+  This removes a `crm-collapsible` class which is deprecated, replacing it with
+  `<summary>` and `<details>` elements.
+
+- **Fix bug where fields is not present ([29870](https://github.com/civicrm/civicrm-core/pull/29870))**
+
+- **Blank custom fields accordion appears on Find XXX search forms 
+  ([dev/core#5112](https://lab.civicrm.org/dev/core/-/issues/5112):
+  [29840](https://github.com/civicrm/civicrm-core/pull/29840))**
+
+- **[REF] Do not add arrays consisting of just the auto renew as options … ([29770](https://github.com/civicrm/civicrm-core/pull/29770))**
+
+- **[REF] Fix showing Main Email field only when email doesn't exist in a 
+  profile ([29749](https://github.com/civicrm/civicrm-core/pull/29749))**
+
+- **Update follow redirects to 1.15.6 ([29748](https://github.com/civicrm/civicrm-core/pull/29748))**
+
+- **Afform - fix missing page title ([29694](https://github.com/civicrm/civicrm-core/pull/29694))**
+
+- **Specify rounding mode when rendering Monetary entity tokens 
+  ([29654](https://github.com/civicrm/civicrm-core/pull/29654))**
+
+- **missing literal ([29668](https://github.com/civicrm/civicrm-core/pull/29668))**
+
+- **Afform - typo when getting options from SavedSearch entity ([29662](https://github.com/civicrm/civicrm-core/pull/29662))**
+
+- **Remove unnecessary pass-by-ref ([29650](https://github.com/civicrm/civicrm-core/pull/29650))**
+
+- **SearchKit - Update crmSearchAdminFields.html to use X icon instead of ban icon for removing fields ([29549](https://github.com/civicrm/civicrm-core/pull/29549))**
+
+- **Pass all available relevant fields to Contact.getduplicates on checkMatchingContact ([29554](https://github.com/civicrm/civicrm-core/pull/29554))**
+
+- **Finish decommissioning use of legacy `getTree()` function ([29643](https://github.com/civicrm/civicrm-core/pull/29643))**
+
+- **Dedupe finder field wrangler - de-nest groupTree results ([29640](https://github.com/civicrm/civicrm-core/pull/29640))**
+
+- **Remove unset variables from previously shared function ([29636](https://github.com/civicrm/civicrm-core/pull/29636))**
+
+- **Remove some legacy code that is not relevant in this previously shared function ([29639](https://github.com/civicrm/civicrm-core/pull/29639))**
+
+- **Dont crash if we can't start a session when a file path doesnt exist ([29363](https://github.com/civicrm/civicrm-core/pull/29363))**
+
+- **Don't clear sessions when clearing cache ([29610](https://github.com/civicrm/civicrm-core/pull/29610))**
+
+- **Remove always NULL variable from previously shared function ([29635](https://github.com/civicrm/civicrm-core/pull/29635))**
+
+- **Dedupe selected fields, simplify, removed greeting id fields ([29632](https://github.com/civicrm/civicrm-core/pull/29632))**
+
+- **[Ref] Duplicate deprecated getTree function to another place in dedupe code ([29631](https://github.com/civicrm/civicrm-core/pull/29631))**
+
+- **[custom data code cleanup, Finder] Fold another previously shared function into only caller ([29628](https://github.com/civicrm/civicrm-core/pull/29628))**
+
+- **Check workflow not deprecated workflow_id on showing message templates ([29526](https://github.com/civicrm/civicrm-core/pull/29526))**
+
+- **Fold another function back into caller ([29626](https://github.com/civicrm/civicrm-core/pull/29626))**
+
+- **Access submitted value directly rather than passing around ([29627](https://github.com/civicrm/civicrm-core/pull/29627))**
+
+- **Fold the 2 groupTree wrangling functions into 1 ([29622](https://github.com/civicrm/civicrm-core/pull/29622))**
+
+- **Return function to only calling class ([29517](https://github.com/civicrm/civicrm-core/pull/29517))**
+
+- **Import - Use localized alternative to English-only headerPattern from field metadata ([29612](https://github.com/civicrm/civicrm-core/pull/29612))**
+
+- **Remove always true parameter & associated IF from previously shared function ([29531](https://github.com/civicrm/civicrm-core/pull/29531))**
+
+- **avoid passing null to strnatcmp deprecation notice ([29615](https://github.com/civicrm/civicrm-core/pull/29615))**
+
+- **OpenID - Set field widget to match field rule ([29611](https://github.com/civicrm/civicrm-core/pull/29611))**
+
+- **Use name instead of label in conditionals ([29608](https://github.com/civicrm/civicrm-core/pull/29608))**
+
+- **Replace assign_by_ref with assign 
+  ([29433](https://github.com/civicrm/civicrm-core/pull/29433),
+  [29442](https://github.com/civicrm/civicrm-core/pull/29442),
+  [29443](https://github.com/civicrm/civicrm-core/pull/29443),
+  [29576](https://github.com/civicrm/civicrm-core/pull/29576),
+  [29601](https://github.com/civicrm/civicrm-core/pull/29601),
+  [29603](https://github.com/civicrm/civicrm-core/pull/29603),
+  [29606](https://github.com/civicrm/civicrm-core/pull/29606), and
+  [29609](https://github.com/civicrm/civicrm-core/pull/29609))**
+
+- **Extract isInvalidRecipient ([29565](https://github.com/civicrm/civicrm-core/pull/29565))**
+
+- **Remove unused inputs & outputs from buildLegacyGroupTree ([29557](https://github.com/civicrm/civicrm-core/pull/29557))**
+
+- **Update 'Administer Custom Groups' to show subtypes ([29584](https://github.com/civicrm/civicrm-core/pull/29584))**
+
+- **(REF) Crypto - Cleanup service declarations ([29571](https://github.com/civicrm/civicrm-core/pull/29571))**
+
+- **APIv4 Explorer - Accept action-parameters of type "float" ([29586](https://github.com/civicrm/civicrm-core/pull/29586))**
+
+- **entity id in rows ([29582](https://github.com/civicrm/civicrm-core/pull/29582))**
+
+- **if no clicks, display 0 rather than empty string ([29568](https://github.com/civicrm/civicrm-core/pull/29568))**
+
+- **AdminUI - Edit title, description, comment to clarify what it's for ([29581](https://github.com/civicrm/civicrm-core/pull/29581))**
+
+- **Conditionally show updateTemplate fields ([29577](https://github.com/civicrm/civicrm-core/pull/29577))**
+
+- **More briefName fixes ([29579](https://github.com/civicrm/civicrm-core/pull/29579))**
+
+- **Finish making DedupeRule sql() static ([29540](https://github.com/civicrm/civicrm-core/pull/29540))**
+
+- **Call browse directly rather than forcing through run ([29481](https://github.com/civicrm/civicrm-core/pull/29481))**
+
+- **Deprecate dupeQuery hook ([29544](https://github.com/civicrm/civicrm-core/pull/29544))**
+
+- **Remove non-variable variables from recently unshared function ([29556](https://github.com/civicrm/civicrm-core/pull/29556))**
+
+- **Add some noise to legacy code that I believe to be no longer reachable ([29535](https://github.com/civicrm/civicrm-core/pull/29535))**
+
+- **Copy getTree function back to finder class ([29546](https://github.com/civicrm/civicrm-core/pull/29546))**
+
+- **Admin UI page pdf formats ([29545](https://github.com/civicrm/civicrm-core/pull/29545))**
+
+- **Assign profileID to template in UFNotify, add example ([29441](https://github.com/civicrm/civicrm-core/pull/29441))**
+
+- **SearchKit - Support field comparisons in HAVING clause ([29542](https://github.com/civicrm/civicrm-core/pull/29542))**
+
+- **A11y: Fix info button contrast ratio ([29529](https://github.com/civicrm/civicrm-core/pull/29529))**
+
+- **Pass values into DedupeRule->sql() rather than hybrid object ([29520](https://github.com/civicrm/civicrm-core/pull/29520))**
+
+- **Remove code slated for removal ([29534](https://github.com/civicrm/civicrm-core/pull/29534))**
+
+- **UI: Swaps icon image sprite with FA icon ([29530](https://github.com/civicrm/civicrm-core/pull/29530))**
+
+- **Deprecate function back to only caller ([29524](https://github.com/civicrm/civicrm-core/pull/29524))**
+
+- **Remove unreachable broken rollback ([29511](https://github.com/civicrm/civicrm-core/pull/29511))**
+
+- **[REF} extract code for formatting custom fields ([29518](https://github.com/civicrm/civicrm-core/pull/29518))**
+
+- **Add some noise if people use getVar to access internal properties ([29492](https://github.com/civicrm/civicrm-core/pull/29492))**
+
+- **Copy functions from TabHeader back to the only caller ([29490](https://github.com/civicrm/civicrm-core/pull/29490))**
+
+- **Stop passing parameters to previously shared now-private function ([29491](https://github.com/civicrm/civicrm-core/pull/29491))**
+
+- **Allow json parameter definition for scheduled jobs ([29486](https://github.com/civicrm/civicrm-core/pull/29486))**
+
+- **Do not use getVar to access property on same form ([29493](https://github.com/civicrm/civicrm-core/pull/29493))**
+
+- **Stop passing some-weird-but-always-the-same params to getPositions ([29395](https://github.com/civicrm/civicrm-core/pull/29395))**
+
+- **[REF] Ensure that gName is always asigned to page template ([29480](https://github.com/civicrm/civicrm-core/pull/29480))**
+
+- **Sub str_starts_with instead of substring ([29478](https://github.com/civicrm/civicrm-core/pull/29478))**
+
+- **AllCoreTables - Reduce reliance on class index. ([29471](https://github.com/civicrm/civicrm-core/pull/29471))**
+
+- **Add deprecation tag & pointers ([29467](https://github.com/civicrm/civicrm-core/pull/29467))**
+
+- **Remove pass-by-ref ([29468](https://github.com/civicrm/civicrm-core/pull/29468))**
+
+- **Copy last remaining usage of getComponentDetails() to relevant subsystem ([29459](https://github.com/civicrm/civicrm-core/pull/29459))**
+
+- **[REF] Fully deprecated getSubType function ([29462](https://github.com/civicrm/civicrm-core/pull/29462))**
+
+- **Display labels for numeric custom field key values in Log Detail Report ([29029](https://github.com/civicrm/civicrm-core/pull/29029))**
+
+- **Split code from quasi-shared code in order to be able to clean it up ([29435](https://github.com/civicrm/civicrm-core/pull/29435))**
+
+- **Remove unused function, noisily deprecated a year ago ([29434](https://github.com/civicrm/civicrm-core/pull/29434))**
+
+- **SchemaHandler - Get table names from canonical sources instead of string-fu guesswork ([29389](https://github.com/civicrm/civicrm-core/pull/29389))**
+
+- **[REF] AllCoreTables - Cleanup comments, rename functions for consistency ([29390](https://github.com/civicrm/civicrm-core/pull/29390))**
+
+- **APIv4: Automatically add 'OR IS NULL' to 'NOT CONTAINS' ([29402](https://github.com/civicrm/civicrm-core/pull/29402))**
+
+- **[REF] AllCoreTables - Make internal function private ([29418](https://github.com/civicrm/civicrm-core/pull/29418))**
+
+- **[REF] DAO - Make `getEntityIcon()` function more useful ([29423](https://github.com/civicrm/civicrm-core/pull/29423))**
+
+- **MultiLingual - Fix inconsistent handling of table names ([29366](https://github.com/civicrm/civicrm-core/pull/29366))**
+
+- **Comment functions with deprecation/ preferred method notices ([29417](https://github.com/civicrm/civicrm-core/pull/29417))**
+
+- **Remove (unreachable) call to clearAssign ([29412](https://github.com/civicrm/civicrm-core/pull/29412))**
+
+- **Fix PHP Notice in Contact Import Parser 
+  ([29396](https://github.com/civicrm/civicrm-core/pull/29396))**
+
+- **CRM_Utils_JS - Improve encoding of object keys ([29392](https://github.com/civicrm/civicrm-core/pull/29392))**
+
+- **AdminUI - Add link to create new field directly from custom group listing ([29397](https://github.com/civicrm/civicrm-core/pull/29397))**
+
+- **[php8.2] Clean up the 2 forms that support Group-extending custom data for 
+  notices, php8.2 compliance 
+  ([29229](https://github.com/civicrm/civicrm-core/pull/29229))**
+
+- **CRM_Core_DAO - Deprecate unused functions ([29391](https://github.com/civicrm/civicrm-core/pull/29391))**
+
+- **(REF) Drop unused SQL file (civicrm_arms_sample_data.sql) ([29386](https://github.com/civicrm/civicrm-core/pull/29386))**
+
+- **Switch Smartyv2 mixin to Smarty mixin ([29382](https://github.com/civicrm/civicrm-core/pull/29382))**
+
+- **Fix references to old location for HookInterface ([29385](https://github.com/civicrm/civicrm-core/pull/29385))**
+
+- **Switch our default dev & demo smarty version from 3 to 4 ([29370](https://github.com/civicrm/civicrm-core/pull/29370))**
+
+- **Ext - Specify COLLATE when creating tables ([29384](https://github.com/civicrm/civicrm-core/pull/29384))**
+
+- **avoid deprecation errors  ([29383](https://github.com/civicrm/civicrm-core/pull/29383))**
+
+- **Update file ID in entity field on file upload in Afform ([29199](https://github.com/civicrm/civicrm-core/pull/29199))**
+
+- **[REF] AllCoreTables - More efficient array lookups ([29377](https://github.com/civicrm/civicrm-core/pull/29377))**
+
+- **Remove financial acls properties in core that are set but not accessed ([28960](https://github.com/civicrm/civicrm-core/pull/28960))**
+
+- **Replace 'Expose Publicly' phrasing with 'Public Pages' 
+  ([dev/core#2915](https://lab.civicrm.org/dev/core/-/issues/2915):
+  [29347](https://github.com/civicrm/civicrm-core/pull/29347))**
+
+- **[REF] DAO - Consolidate redundant functions keys() and getPrimaryKey() ([29367](https://github.com/civicrm/civicrm-core/pull/29367))**
+
+- **Add load filter compatibility function to Smarty2 ([388](https://github.com/civicrm/civicrm-packages/pull/388))**
+
+### CiviCampaign
+
+- **[Survey] 5.71 regression - survey forms missing type hints 
+  ([29658](https://github.com/civicrm/civicrm-core/pull/29658))**
+
+- **CiviCampaign - Ensure dashboard fields are translated 
+  ([29723](https://github.com/civicrm/civicrm-core/pull/29723))**
+
+### CiviCase
+
+- **php 8.2 fix ChangeCaseStartDate 
+  ([29666](https://github.com/civicrm/civicrm-core/pull/29666))**
+
+### CiviContribute
+
+- **Premiums configuration gives a 500 error 
+  ([dev/core#5107](https://lab.civicrm.org/dev/core/-/issues/5107): 
+  [29843](https://github.com/civicrm/civicrm-core/pull/29843))**
+
+- **(regression) Submission of non-numeric value on contribution form causes 
+  crash ([dev/core#5079](https://lab.civicrm.org/dev/core/-/issues/5079):
+  [29717](https://github.com/civicrm/civicrm-core/pull/29717))**
+
+- **Price Sets: total calculation wrong if decimal separator is different than 
+  "." ([dev/core#5026](https://lab.civicrm.org/dev/core/-/issues/5026):
+  [29499](https://github.com/civicrm/civicrm-core/pull/29499))**
+
+- **Fix Payment Processor form to use the right way to get the 
+  `paymentProcessorID` 
+  ([29477](https://github.com/civicrm/civicrm-core/pull/29477))**
+
+- **Fix Smarty notice on add payment 
+  ([29502](https://github.com/civicrm/civicrm-core/pull/29502))**
+
+- **[Update Subscription Form] Align UpdateSubscription to more recent 
+  practices ([29538](https://github.com/civicrm/civicrm-core/pull/29538),
+  [29539](https://github.com/civicrm/civicrm-core/pull/29539),
+  [29564](https://github.com/civicrm/civicrm-core/pull/29564),
+  [29572](https://github.com/civicrm/civicrm-core/pull/29572),
+  [29573](https://github.com/civicrm/civicrm-core/pull/29573), 
+  [29574](https://github.com/civicrm/civicrm-core/pull/29574), and
+  [29580](https://github.com/civicrm/civicrm-core/pull/29580))**
+
+- **Use getPaymentProcessorObject() in updateBilling 
+  ([29605](https://github.com/civicrm/civicrm-core/pull/29605))**
+
+- **Make getContributionID public on AbstractEditPayment 
+  ([29483](https://github.com/civicrm/civicrm-core/pull/29483))**
+
+  We have the same function many places & have been making it public & api 
+  supported but this one is protected
+
+- **[REF] Ensure that CMS is booted prior to processing legacy PayPal IPN 
+  ([29521](https://github.com/civicrm/civicrm-core/pull/29521))**
+
+### CiviEvent
+
+- **Incorrect fee level saved when editing event participant 
+  ([dev/core#5085](https://lab.civicrm.org/dev/core/-/issues/5085): 
+  [29726](https://github.com/civicrm/civicrm-core/pull/29726))**
+
+- **Intro text on event confirm is actually html 
+  ([29841](https://github.com/civicrm/civicrm-core/pull/29841))**
+
+- **Display of autocomplete multi-select custom fields for events is broken 
+  ([dev/core#5090](https://lab.civicrm.org/dev/core/-/issues/5090): 
+  [29721](https://github.com/civicrm/civicrm-core/pull/29721))**
+
+- **message template "Events - Registration Confirmation and Receipt (on-line)"
+  transaction no. not displayed 
+  ([dev/core#5088](https://lab.civicrm.org/dev/core/-/issues/5088): 
+  [29715](https://github.com/civicrm/civicrm-core/pull/29715))**
+
+- **Afform - Add Participant Note block 
+  ([29575](https://github.com/civicrm/civicrm-core/pull/29575))**
+
+  This adds a missing Note field for editing participants in Form Builder.
+
+- **Disabled Event Name Badge Layouts Are Not Disabled 
+  ([dev/core#5032](https://lab.civicrm.org/dev/core/-/issues/5032): 
+  [29494](https://github.com/civicrm/civicrm-core/pull/29494))**
+
+- **Columns are misaligned on find participants results 
+  ([dev/core#5030](https://lab.civicrm.org/dev/core/-/issues/5030):
+  [29489](https://github.com/civicrm/civicrm-core/pull/29489) and
+  [29500](https://github.com/civicrm/civicrm-core/pull/29500))**
+
+- **Fix manage event pages to clear caches on save 
+  ([29510](https://github.com/civicrm/civicrm-core/pull/29510))**
+
+- **Match event breadcrumb label to context 
+  ([29537](https://github.com/civicrm/civicrm-core/pull/29537))**
+
+- **Fix notices on participantView 
+  ([29473](https://github.com/civicrm/civicrm-core/pull/29473) and
+  [29476](https://github.com/civicrm/civicrm-core/pull/29476))**
+
+### CiviMail
+
+- **With URL tracking enabled, a personalised "View in your browser" link 
+  incorrectly replaces ? with & which causes CiviCRM to respond with error: 
+  "You do not have permission to access this page" 
+  ([dev/core#5082](https://lab.civicrm.org/dev/core/-/issues/5082): 
+  [29850](https://github.com/civicrm/civicrm-core/pull/29850))**
+
+- **sms form missing tokens dropdown and save template section at bottom not  
+  hidden properly 
+  ([dev/core#5029](https://lab.civicrm.org/dev/core/-/issues/5029):
+  [29667](https://github.com/civicrm/civicrm-core/pull/29667))**
+
+- **[SMS Trait] Consolidate 2 foreach loops into 1 in sms trait 
+  ([29629](https://github.com/civicrm/civicrm-core/pull/29629))**
+
+- **SMSTrait - extract getSMSProviderParams 
+  ([29607](https://github.com/civicrm/civicrm-core/pull/29607))**
+
+- **Clean up phone filtering in sms activity trait 
+  ([29604](https://github.com/civicrm/civicrm-core/pull/29604))**
+
+- **SMS form cleanup Stop passing contactIds into previously shared function 
+  ([29614](https://github.com/civicrm/civicrm-core/pull/29614))**
+
+- **Use Api rather than BAO::create to create activity in SMS Trait 
+  ([29475](https://github.com/civicrm/civicrm-core/pull/29475))**
+
+- **[SMS Trait] Remove unvariable variables from previously shared code  
+  ([29474](https://github.com/civicrm/civicrm-core/pull/29474))**
+
+- **SMS Trait - add support for Autocomplete subscriber, notice fix 
+  ([29429](https://github.com/civicrm/civicrm-core/pull/29429))**
+
+### CiviMember
+
+- **Scheduled Reminder listing will not load at all if any Scheduled Reminder 
+  exists which refers to a deleted Membership Type 
+  ([29460](https://github.com/civicrm/civicrm-core/pull/29460))**
+
+- **TypeError when trying to use checkboxes with default non-membership 
+  options in the Membership section of Contribution Pages 
+  ([dev/core#5071](https://lab.civicrm.org/dev/core/-/issues/5071): 
+  [29653](https://github.com/civicrm/civicrm-core/pull/29653))**
+  
+- **Custom field value not saved first time after membership type changed 
+  ([dev/core#4026](https://lab.civicrm.org/dev/core/-/issues/4026): 
+  [29355](https://github.com/civicrm/civicrm-core/pull/29355))**
+
+- **Fix failure to handle localised money, notice on batch membership form 
+  ([29349](https://github.com/civicrm/civicrm-core/pull/29349))**
+
+- **Ensure price from url is set as default 
+  ([29822](https://github.com/civicrm/civicrm-core/pull/29822))**
+
+  Specifying price field ID in URL was overriden by current membership type.
+
+- **Fix New Member receipt setting for non-English 
+  ([29451](https://github.com/civicrm/civicrm-core/pull/29451))**
+
+- **Fix BackOffice Membership forms getPriceSetID() to be standard 
+  ([29348](https://github.com/civicrm/civicrm-core/pull/29348))**
+
+- **Add filters to membership type sk on contact membership tab 
+  ([29775](https://github.com/civicrm/civicrm-core/pull/29775))**
+
+### Drupal Integration
+
+- **drupal 8 - php warnings on every page: html_entity_decode(): Passing null 
+  to parameter #1 ($string) of type string is deprecated 
+  ([dev/core#5052](https://github.com/civicrm/civicrm-core/pull/29560): 
+  [29560](https://github.com/civicrm/civicrm-core/pull/29560))**
+
+- **Issue #194: add core resources to blocks 
+  ([89](https://github.com/civicrm/civicrm-drupal-8/pull/89))**
+
+### Joomla! Integration
+
+- **Respect CIVICRM_DSN and CIVICRM_UF_DSN being different on upgrade 
+  ([69](https://github.com/civicrm/civicrm-joomla/pull/69))**
+
+- **Check if valid UF Match exists in user plugin 
+  ([55](https://github.com/civicrm/civicrm-joomla/pull/55))**
+
+- **Fixes broken links on post-upgrade/install page 
+  ([66](https://github.com/civicrm/civicrm-joomla/pull/66))**
+
+- **Fix event listing as front page for Joomla 4 
+  ([73](https://github.com/civicrm/civicrm-joomla/pull/73))**
+
+### Standalone Implementation
+
+- **Standalone: doesn't install because of missing session class 
+  ([dev/core#4988](https://lab.civicrm.org/dev/core/-/issues/4988): 
+  [29352](https://github.com/civicrm/civicrm-core/pull/29352))**
+
+- **Standalone install in another language 
+  ([dev/core#5037](https://lab.civicrm.org/dev/core/-/issues/5037): 
+  [29522](https://github.com/civicrm/civicrm-core/pull/29522))**
+
+- **Disable Sync CMS Users form and functionality on Standalone 
+  ([dev/core#4993](https://lab.civicrm.org/dev/core/-/issues/4993):
+  [29351](https://github.com/civicrm/civicrm-core/pull/29351))**
+
+- **Standalone install - check upload directory is writable 
+  ([29354](https://github.com/civicrm/civicrm-core/pull/29354))**
+
+## <a name="misc"></a>Miscellany
+
+- **Imagine a world without CodeGen 
+  (Toward [dev/core#4999](https://lab.civicrm.org/dev/core/-/issues/4999): 
+  [29365](https://github.com/civicrm/civicrm-core/pull/29365) and
+  [29364](https://github.com/civicrm/civicrm-core/pull/29364))**
+
+- **ReferenceDynamic - Save lots of irrelevant queries when finding 
+  backreferences ([29381](https://github.com/civicrm/civicrm-core/pull/29381) 
+  and [29569](https://github.com/civicrm/civicrm-core/pull/29569))**
+
+- **Regen DAOs ([29372](https://github.com/civicrm/civicrm-core/pull/29372))**
+
+- **Make mailingJob::queue static 
+  ([29175](https://github.com/civicrm/civicrm-core/pull/29175))**
+
+- **Suppress last php8.2 test fail for PR tests 
+  ([29724](https://github.com/civicrm/civicrm-core/pull/29724))**
+
+- **[REF] Clarify type of group_id & rule_group_id is int or null 
+  ([29394](https://github.com/civicrm/civicrm-core/pull/29394))**
+
+- **Ornery++ ([29550](https://github.com/civicrm/civicrm-core/pull/29550))**
+
+- **Fix test to call actual function 
+  ([29630](https://github.com/civicrm/civicrm-core/pull/29630))**
+
+- **add field name to SearchKit cells, primarily for testing 
+  ([29595](https://github.com/civicrm/civicrm-core/pull/29595))**
+
+- **fix 'Authorization Failed' on API4TestTrait 
+  ([29590](https://github.com/civicrm/civicrm-core/pull/29590))**
+
+- **[NFC] Fix tests for leap year 
+  ([29562](https://github.com/civicrm/civicrm-core/pull/29562))**
+
+- **LocalizedDataTest - Simplify test protocol. Only care about live SQL. 
+  ([29311](https://github.com/civicrm/civicrm-core/pull/29311))**
+
+- **SMS form test - fix to test the function actually being used 
+  ([29432](https://github.com/civicrm/civicrm-core/pull/29432))**
+
+- **Add test on merge code 
+  ([29405](https://github.com/civicrm/civicrm-core/pull/29405))**
+
+- **NFC: fix incorrect comment 
+  ([29596](https://github.com/civicrm/civicrm-core/pull/29596))**
+
+- **[NFC] Don't flush someone else's ob 
+  ([29426](https://github.com/civicrm/civicrm-core/pull/29426))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following code authors:
+
+AGH Strategies - Andie Hunt; Agileware - Agileware Team, Francis Whittle, 
+Justin Freeman; Benjamin W; Christian Wach; Circle Interactive - Pradeep 
+Nayak; CiviCoop - Jaap Jansma; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - 
+Yashodha Chaku; civiservice.de - Detlev Sieber; Coop SymbioTIC - Mathieu 
+Lutfy, Samuel Vanhove, Shane Bill; Dave D; dependabot[bot]; Freeform Solutions 
+- Herb van den Dool; Fuzion - Jitendra Purohit; Gokhalemethod - Sadashiv; 
+Greenleaf Advancement - Guy Iaccarino; JMA Consulting - Seamus Lee; John 
+Kingsnorth; kapn*net Technology Services - Keith Nunn; Lemniscus - Noah 
+Miller; Makoa - Usha F. Matisson; Megaphone Technology Consulting - Jon 
+Goldberg; MJW Consulting - Matthew Wire; Mosier Consulting - Justin Mosier; 
+Nicol Wistreich; Progressive Technology Project - Jamie McClelland; Responsive 
+Development Technologies - Thomas Nilefalk; Squiffle Consulting - Aidan 
+Saunders; Third Sector Design - Kurund Jalmi; Wikimedia Foundation - Eileen 
+McNaughton, Elliott Eggleston
+
+Most authors also reviewed code for this release; in addition, the following
+reviewers contributed their comments:
+
+AGH Strategies - Chris Garaffa; Artful Robot - Rich Lott; ASMAC (American 
+Society of Music Arrangers and Composers) - Jeff Kellem; Australian Greens - 
+Andrew Cormick-Dockery; Francesc Bassas i Bullich; Fuzion - Luke Stewart; 
+James Bugden; JMA Consulting - Joe Murray; mmyriam; Systopia - Dominic Tubach, 
+Johannes Franz; Tadpole Collective - Kevin Cristiano; Third Sector Design - 
+William Mortada
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Alice Frumin and Andie Hunt.  If you'd like
+to provide feedback on them, please log in to https://chat.civicrm.org/civicrm
+and contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.72.1.md b/www/modules/civicrm/release-notes/5.72.1.md
new file mode 100644
index 000000000..8c676de97
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.72.1.md
@@ -0,0 +1,42 @@
+# CiviCRM 5.72.1
+
+Released April 8, 2024
+
+- **[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**  |
+| Fix security vulnerabilities?                                   | no       |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviCase_: "New Case Type" UI doesn't show translated strings ([dev/translation#85](https://lab.civicrm.org/dev/translation/-/issues/85): [#29891](https://github.com/civicrm/civicrm-core/pull/29891))**
+* **_CiviMail_: "New Mailing" UI doesn't show translated strings ([dev/translation#85](https://lab.civicrm.org/dev/translation/-/issues/85): [#29891](https://github.com/civicrm/civicrm-core/pull/29891))**
+* **_Distmaker_: `iframe` extension missing from tar/zip builds ([#29917](https://github.com/civicrm/civicrm-core/pull/29917))**
+* **_Form Builder_: When custom-field of type "File" is present, updates aren't saved ([dev/core#5078](https://lab.civicrm.org/dev/core/-/issues/5078): [#29833](https://github.com/civicrm/civicrm-core/pull/29833))**
+* **_WordPress_: Frontend forms may incorrectly submit results to backend handlers ([dev/core#5127](https://lab.civicrm.org/dev/core/-/issues/5127): [wordpress#318](https://github.com/civicrm/civicrm-wordpress/pull/318/), [wordpress#320](https://github.com/civicrm/civicrm-wordpress/pull/320))**
+* **_WordPress_: Update README ([wordpress#319](https://github.com/civicrm/civicrm-wordpress/pull/319))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Tadpole Collective - Kevin Cristiano; Nadaillac; JMA Consulting - Seamus Lee;
+Coop SymbioTIC - Mathieu Lutfy; CiviCRM - Tim Otten, Coleman Watts; Christian Wach; All In Appli.com - Guillaume Sorel
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.72.2.md b/www/modules/civicrm/release-notes/5.72.2.md
new file mode 100644
index 000000000..2f649ee55
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.72.2.md
@@ -0,0 +1,45 @@
+# CiviCRM 5.72.2
+
+Released April 23, 2024
+
+- **[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**  |
+| Fix security vulnerabilities?                                   | no       |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_Admin UI_: When viewing a "Contact", the "Memberships" tab omits some memberships ([dev/core#5137](https://lab.civicrm.org/dev/core/-/issues/5137): [#29994](https://github.com/civicrm/civicrm-core/pull/29994))**
+* **_Joomla_: Permissions are presented without labels ([dev/joomla#56](https://lab.civicrm.org/dev/joomla/-/issues/56): [joomla#75](https://github.com/civicrm/civicrm-joomla/pull/75))**
+* **_Regen_: The "regen.sh" script crashes when flushing ([#29997](https://github.com/civicrm/civicrm-core/pull/29997))**
+* **_Search Kit_: Admins incorrectly denied permission to edit ([dev/core#5166](https://lab.civicrm.org/dev/core/-/issues/5166): [#30054](https://github.com/civicrm/civicrm-core/pull/30054))**
+* **_Search Kit_: The "NOT CONTAINS" operator generates invalid SQL ([dev/core#5159](https://lab.civicrm.org/dev/core/-/issues/5159): [#30018](https://github.com/civicrm/civicrm-core/pull/30018))**
+* **_Smarty v3/v4_: Misapplication of Smarty v2 plugins may lead to crashes ([dev/core#5130](https://lab.civicrm.org/dev/core/-/issues/5130): [#29911](https://github.com/civicrm/civicrm-core/pull/29911))**
+* **_Tcpdf_: Update to v6.7.5 ([#30027](https://github.com/civicrm/civicrm-core/pull/30027), [#29969](https://github.com/civicrm/civicrm-core/pull/29969))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Tadpole Collective - Kevin Cristiano;
+rebeccatregenna; Nicol Wistreich; JMA Consulting - Seamus Lee; Dave D; CSES (Chelmsford
+Science and Engineering Society) - Adam Wood; Coop SymbioTIC - mmyriam; CiviCRM - Tim
+Otten, Coleman Watts
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.70.2.md b/www/modules/civicrm/release-notes/5.72.3.md
similarity index 72%
rename from www/modules/civicrm/release-notes/5.70.2.md
rename to www/modules/civicrm/release-notes/5.72.3.md
index 50e34f2eb..142a765d6 100644
--- a/www/modules/civicrm/release-notes/5.70.2.md
+++ b/www/modules/civicrm/release-notes/5.72.3.md
@@ -1,6 +1,6 @@
-# CiviCRM 5.70.2
+# CiviCRM 5.72.3
 
-Released March 2, 2024
+Released May 1, 2024
 
 - **[Synopsis](#synopsis)**
 - **[Bugs resolved](#bugs)**
@@ -21,15 +21,13 @@ Released March 2, 2024
 
 ## <a name="bugs"></a>Bugs resolved
 
-* **_Search Kit_: Displays of type "DB Entity" may lead to errors about "getLinks" ([#29589](https://github.com/civicrm/civicrm-core/pull/29589))**
-* **_Search Kit_: Some tasks ("Enable", "Disable") display an inappropriate pop-up ([#29547](https://github.com/civicrm/civicrm-core/pull/29547))**
+* **_Message Templates_: Editing message-template may lead to mangled markup ([dev/core#5176](https://lab.civicrm.org/dev/core/-/issues/5176), [dev/core#5180](https://lab.civicrm.org/dev/core/-/issues/5180): [#30081](https://github.com/civicrm/civicrm-core/pull/30081))**
 
 ## <a name="credits"></a>Credits
 
 This release was developed by the following authors and reviewers:
 
-MJW Consulting - Matthew Wire; Greenleaf Advancement - Guy Iaccarino; Coop SymbioTIC -
-Samuel Vanhove; CiviCRM - Coleman Watts,
+Wikimedia Foundation - Eileen McNaughton; PERORA SRL - Samuele Masetto; Dave D; Agileware - Justin Freeman
 
 ## <a name="feedback"></a>Feedback
 
diff --git a/www/modules/civicrm/release-notes/5.73.0.md b/www/modules/civicrm/release-notes/5.73.0.md
new file mode 100644
index 000000000..119eebb32
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.73.0.md
@@ -0,0 +1,600 @@
+# CiviCRM 5.73.0
+
+Released May 2, 2024
+
+- **[Synopsis](#synopsis)**
+- **[Features](#features)**
+- **[Bugs resolved](#bugs)**
+- **[Miscellany](#misc)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?*                                         |         |
+|:--------------------------------------------------------------- |:-------:|
+| 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
+
+- **Afform - Enable updating relationship by id
+  ([29693](https://github.com/civicrm/civicrm-core/pull/29693))**
+
+  Previously relationships could only be updated if required fields were
+  present. Now if there is an id it can be updated without any other fields on
+  the form.
+
+- **Warn when disabling/deleting groups which feature in smart group criteria  
+  ([29732](https://github.com/civicrm/civicrm-core/pull/29732))**
+
+  Adds a warning when disabling/deleting a group will have repercussions
+  for other groups.
+
+- **SearchKit - Enable predefined link conditionals
+  ([29735](https://github.com/civicrm/civicrm-core/pull/29735))**
+
+  Improves links in SearchKit by pre-defining conditional rules.
+
+- **Imagine a world without CodeGen (Work Towards
+  [dev/core#4999](https://lab.civicrm.org/dev/core/-/issues/4999):
+  [29771](https://github.com/civicrm/civicrm-core/pull/29771))**
+
+  Adds a new mixin for use by non-xml-based entities.
+
+- **Api4 - Add 'usage' to getFields output
+  ([29634](https://github.com/civicrm/civicrm-core/pull/29634))**
+
+  Adds metadata to APIv4 getFields.
+
+- **Allow access to API params from Api4Query
+  (Work Towards [dev/core#5102](https://lab.civicrm.org/dev/core/-/issues/5102):
+  [29774](https://github.com/civicrm/civicrm-core/pull/29774))**
+
+  Get any API param from the Api4Query class.
+
+### CiviMail
+
+- **(dev/core#5118) Tokens - Expand support for symbol-tokens ([30100](https://github.com/civicrm/civicrm-core/pull/30100), [30102](https://github.com/civicrm/civicrm-core/pull/30102), [30101](https://github.com/civicrm/civicrm-core/pull/30101))**
+
+## <a name="bugs"></a>Bugs resolved
+
+### Core CiviCRM
+
+- **(dev/core#5183) Search Tasks - Actions incorrectly apply to all records in database ([30111](https://github.com/civicrm/civicrm-core/pull/30111))**
+
+- **Cannot create proper `Group`s on multilingual with MySQL 5.6 and Civi
+  5.31-rc
+  ([dev/translation#85](https://lab.civicrm.org/dev/translation/-/issues/58):
+  [29891](https://github.com/civicrm/civicrm-core/pull/29891))**
+
+- **Searching by phone in Advanced Search with a non-default Search Profile
+  returns DB Error: no such field
+  ([dev/core#3836](https://lab.civicrm.org/dev/core/-/issues/3836):
+  [24450](https://github.com/civicrm/civicrm-core/pull/24450))**
+
+- **Formbuilder: updates not saved when a populated field of type "file" is
+  present in the form
+  ([dev/core#5078](https://lab.civicrm.org/dev/core/-/issues/5078):
+  [29884](https://github.com/civicrm/civicrm-core/pull/29884))**
+
+- **Saving checkbox custom fields via APIv4 fails for custom/dynamic entities
+  ([dev/core#5103](https://lab.civicrm.org/dev/core/-/issues/5103):
+  [29786](https://github.com/civicrm/civicrm-core/pull/29786))**
+
+- **Inconsistent handling of tag name and tag label  
+  ([dev/core#5108](https://lab.civicrm.org/dev/core/-/issues/5108):
+  [29875](https://github.com/civicrm/civicrm-core/pull/29875))**
+
+- **smarty 3/4 still calling smarty2 plugins, which errors for e.g. date_format
+  ([dev/core#5130](https://lab.civicrm.org/dev/core/-/issues/5130):
+  [29911](https://github.com/civicrm/civicrm-core/pull/29911))**
+
+- **Failure when .hlp files contain php functions like array_key_exists
+  ([dev/core#5136](https://lab.civicrm.org/dev/core/-/issues/5136):
+  [29923](https://github.com/civicrm/civicrm-core/pull/29923))**
+
+- **Register some more functions for Smarty
+  ([29856](https://github.com/civicrm/civicrm-core/pull/29856))**
+
+- **Add check for whether SMARTY_DIR is defined
+  ([29853](https://github.com/civicrm/civicrm-core/pull/29853))**
+
+- **asofDate gets used as constructor to DateTime which wants a string
+  ([29858](https://github.com/civicrm/civicrm-core/pull/29858))**
+
+- **`hook_civicrm_links` - don't pass `objectId` by-reference
+  ([29764](https://github.com/civicrm/civicrm-core/pull/29764))**
+
+- **Set error response code before starting error response
+  ([29809](https://github.com/civicrm/civicrm-core/pull/29809))**
+
+- **Don't clear the smarty debugging var
+  ([29754](https://github.com/civicrm/civicrm-core/pull/29754))**
+
+- **Allow `0.0` as value for a required float APIv4 action parameter
+  ([29766](https://github.com/civicrm/civicrm-core/pull/29766))**
+
+- **Add deprecation notice to hook_civicrm_links used by search forms
+  ([29765](https://github.com/civicrm/civicrm-core/pull/29765))**
+
+- **AngularJS - Fix multi-select fields when value contains a comma
+  ([29645](https://github.com/civicrm/civicrm-core/pull/29645))**
+
+- **php8.2 Update Case form to handle both Activity & Case custom data with
+  standard ajax methods
+  ([29799](https://github.com/civicrm/civicrm-core/pull/29799))**
+
+- **call buildamount hook
+  ([29829](https://github.com/civicrm/civicrm-core/pull/29829))**
+
+  Fixes CiviDiscount.
+
+- **Look up using phone_numeric
+  ([29740](https://github.com/civicrm/civicrm-core/pull/29740))**
+
+- **Ensure confirm hooks are called if confirmation page is disabled
+  ([29710](https://github.com/civicrm/civicrm-core/pull/29710))**
+
+- **Smarty4 -  updates to latest versions Smarty 4.51
+  ([393](https://github.com/civicrm/civicrm-packages/pull/393))**
+
+- **Update Smarty5 from rc to 5.0.1 & add loading helper class
+  ([394](https://github.com/civicrm/civicrm-packages/pull/394))**
+
+- **Smarty4 & Smarty 5 - update to latest
+  ([392](https://github.com/civicrm/civicrm-packages/pull/392))**
+
+- **xml/schema - Fix erroneous description tag
+  ([29711](https://github.com/civicrm/civicrm-core/pull/29711))**
+
+- **Move logic from tpl to php layer (extension page)
+  ([29898](https://github.com/civicrm/civicrm-core/pull/29898))**
+
+- **Exclude Cancelled & Failed recurring from Autorenew membership reminders
+  ([26563](https://github.com/civicrm/civicrm-core/pull/26563))**
+
+- **Fix bug where fields is not present
+  ([29681](https://github.com/civicrm/civicrm-core/pull/29681))**
+
+- **Follow up fix on setDefaultValues fix
+  ([29685](https://github.com/civicrm/civicrm-core/pull/29685))**
+
+- **Add missing alias trxn_id to transactionID
+  ([29683](https://github.com/civicrm/civicrm-core/pull/29683))**
+
+- **Use getters & setters to interact with Smarty properties, where possible
+  ([29852](https://github.com/civicrm/civicrm-core/pull/29852))**
+
+- **Update Smarty3 check to refer to Smarty4
+  ([29874](https://github.com/civicrm/civicrm-core/pull/29874))**
+
+- **Fix Smarty help function to not call fetchWith
+  ([29851](https://github.com/civicrm/civicrm-core/pull/29851))**
+
+- **Extract code to determine rule filter
+  ([29877](https://github.com/civicrm/civicrm-core/pull/29877))**
+
+- **Extract code to build table-level filter
+  ([29876](https://github.com/civicrm/civicrm-core/pull/29876))**
+
+- **Notice fixes on Contact Edit screen (with multiple contact fields & address
+  fields - ie testData extension installed)
+  ([29706](https://github.com/civicrm/civicrm-core/pull/29706))**
+
+- **Pass contact Type into sql lookup
+  ([29866](https://github.com/civicrm/civicrm-core/pull/29866))**
+
+- **Clarify join type
+  ([29865](https://github.com/civicrm/civicrm-core/pull/29865))**
+
+- **Make function private on only caller
+  ([29867](https://github.com/civicrm/civicrm-core/pull/29867))**
+
+- **Remove a handling for CRM_Core_Error returned
+  ([29797](https://github.com/civicrm/civicrm-core/pull/29797))**
+
+- **Fix deprecation notice
+  ([29827](https://github.com/civicrm/civicrm-core/pull/29827))**
+
+- **Fix for `TypeError: array_key_exists(): Argument #2 ($array) must be of type
+  array, null given a CRM_Core_DAO->copyValues()
+  ([29868](https://github.com/civicrm/civicrm-core/pull/29868))**
+
+- **Stop calling complex function to just add a field
+  ([29795](https://github.com/civicrm/civicrm-core/pull/29795))**
+
+- **Simplify a ts
+  ([29861](https://github.com/civicrm/civicrm-core/pull/29861))**
+
+- **Deleting profile photo produces error ([dev/core#5145](https://lab.civicrm.org/dev/core/-/issues/5145): [30119](https://github.com/civicrm/civicrm-core/pull/30119))**
+
+- **Deleting an individual contact gives confusing message ([dev/core#5165](https://lab.civicrm.org/dev/core/-/issues/5165), [dev/core#5181](https://lab.civicrm.org/dev/core/-/issues/5181): [30107](https://github.com/civicrm/civicrm-core/pull/30107))**
+
+- **Fix customDataBlock to convert false to 'false' ([dev/core#5152](https://lab.civicrm.org/dev/core/-/issues/5152)): ([30103](https://github.com/civicrm/civicrm-core/pull/30103))**
+
+- **Fix customGroup function overwriting extends data ([dev/core#5149](https://lab.civicrm.org/dev/core/-/issues/5149)): ([29983](https://github.com/civicrm/civicrm-core/pull/29983))**
+
+### CiviCampaign
+
+- **Custom Fields on Campaign are hidden on validation
+  ([dev/core#4803](https://lab.civicrm.org/dev/core/-/issues/4803):
+  [29751](https://github.com/civicrm/civicrm-core/pull/29751))**
+
+- **show distinct contacts when reserving for a survey
+  ([29617](https://github.com/civicrm/civicrm-core/pull/29617))**
+
+### CiviCase
+
+- **accept array of case_type_ids when finding available case statuses
+  ([29663](https://github.com/civicrm/civicrm-core/pull/29663))**
+
+### CiviContribute
+
+- **Fix Smarty noticed when contribution tab opened outside of ajax
+  ([29672](https://github.com/civicrm/civicrm-core/pull/29672))**
+
+- **Additional Payments form: Use submitted trxn_id if payment result doesn't
+  exist ([29869](https://github.com/civicrm/civicrm-core/pull/29869))**
+
+- **Premium Products: allow key=val format for product options
+  ([29691](https://github.com/civicrm/civicrm-core/pull/29691))**
+
+- **ContributionProduct - Add serialize metadata
+  ([29767](https://github.com/civicrm/civicrm-core/pull/29767))**
+
+### CiviEvent
+
+- **Fix Event register form to call buildAmount exactly once
+  ([29900](https://github.com/civicrm/civicrm-core/pull/29900))**
+
+### CiviMail
+
+- **(dev/core#5176) Message Templates - Prevent malformed content, loss of customizations ([30081](https://github.com/civicrm/civicrm-core/pull/30081))**
+
+- **MailSettings - Fix typo in metadata
+  ([29769](https://github.com/civicrm/civicrm-core/pull/29769))**
+
+### CiviMember
+
+- **Membership dashboard is not shown
+  ([dev/core#5123](https://lab.civicrm.org/dev/core/-/issues/5123):
+  [29882](https://github.com/civicrm/civicrm-core/pull/29882) and
+  [29883](https://github.com/civicrm/civicrm-core/pull/29883))**
+
+- **Membership terms present in price set not get used in the offline form
+  signup. ([dev/core#3752 ](https://lab.civicrm.org/dev/core/-/issues/3752):
+  [29730](https://github.com/civicrm/civicrm-core/pull/29730))**
+
+- **Fix override on pending memberships
+  ([29661](https://github.com/civicrm/civicrm-core/pull/29661))**
+
+- **E-notice fix on Membership from in edit mode
+  ([29744](https://github.com/civicrm/civicrm-core/pull/29744))**
+
+### CiviSMS
+
+- **CiviSMS - Ensure activities are attached to correct contact ([30096](https://github.com/civicrm/civicrm-core/pull/30096))**
+
+### CiviCRM Admin UI
+
+- **Admin UI - Sort by `register_date` Contact Summary Events tab ([30097](https://github.com/civicrm/civicrm-core/pull/30097))**
+
+- **Admin UI - Fix missing translation ([30012](https://github.com/civicrm/civicrm-core/pull/30012))**
+
+- **Admin UI - Fix display of related memberships ([29994](https://github.com/civicrm/civicrm-core/pull/29994))**
+
+### Drupal Integration
+
+- **Check route object exists in processes that do not have routes
+  ([90](https://github.com/civicrm/civicrm-drupal-8/pull/90))**
+
+- **Update CiviCRM on Drupal 10: Deprecation Notices regarding TOGoS
+  ([dev/core#4919](https://lab.civicrm.org/dev/core/-/issues/4919):
+  [29926](https://github.com/civicrm/civicrm-core/pull/29926))**
+
+### Joomla Integration
+
+- **Joomla: fixes broken mobile menu and a small regression.
+  ([29939](https://github.com/civicrm/civicrm-core/pull/29939))**
+
+- **CSS: Adds styling resets to Joomla4 for new accordions
+  ([29712](https://github.com/civicrm/civicrm-core/pull/29712))**
+
+- **Removes ~90% of joomla.css - much pre-dates Civi 2.x  
+  ([27834](https://github.com/civicrm/civicrm-core/pull/27834))**
+
+- **Fixes Joomla regression in #27834 that hides select2 dropdown options when
+  used in modal ([29821](https://github.com/civicrm/civicrm-core/pull/29821))**
+
+### Search Kit
+
+- **(dev/core#5126) Fix crash involving Smarty rewrite ([30004](https://github.com/civicrm/civicrm-core/pull/30004))**
+
+- **Fix display of email bounces ([30043](https://github.com/civicrm/civicrm-core/pull/30043))**
+
+- **Fix saving search displays with 'Bypass Permissions' ([30054](https://github.com/civicrm/civicrm-core/pull/30054))**
+
+- **(dev/core#5159) Fix broken NOT CONTAINS operator ([30018](https://github.com/civicrm/civicrm-core/pull/30018))**
+
+### Standalone Integration
+
+- **reenable status messages in standalone page template
+  ([29699](https://github.com/civicrm/civicrm-core/pull/29699))**
+
+- **standalone: permanent "session already active" errors
+ ([dev/core#5069](https://lab.civicrm.org/dev/core/-/issues/5069):
+ [29808](https://github.com/civicrm/civicrm-core/pull/29808))**
+
+- **standalone: rebase @pfigel's JWT password reset PR 28505
+  ([29642](https://github.com/civicrm/civicrm-core/pull/29642))**
+
+- **standalone: prevent installer using secret admin pass. Fixes 5038
+  ([29641](https://github.com/civicrm/civicrm-core/pull/29641))**
+
+### WordPress Integration
+
+- **Possible WordPress regression - event that fails validation or has code
+  submitted redirects to back office page
+  ([dev/core#5127](https://lab.civicrm.org/dev/core/-/issues/5127):
+  [321](https://github.com/civicrm/civicrm-wordpress/pull/321))**
+
+## <a name="misc"></a>Miscellany
+
+- **Switch getPreviousFinancialItem() to use API4 internally
+  ([29761](https://github.com/civicrm/civicrm-core/pull/29761))**
+
+- **Deprecate formatPhone, use new cut down private function
+  ([29742](https://github.com/civicrm/civicrm-core/pull/29742))**
+
+- **APIv4 - Move MembershipLinksProvider to correct directory
+  ([29746](https://github.com/civicrm/civicrm-core/pull/29746))**
+
+- **Add validate.tpl to customDataBlock, minor cleanup
+  ([29812](https://github.com/civicrm/civicrm-core/pull/29812))**
+
+- **Register trim as a smarty plugin
+  ([29759](https://github.com/civicrm/civicrm-core/pull/29759))**
+
+- **Updating php-weasyprint to latest version
+  ([29697](https://github.com/civicrm/civicrm-core/pull/29697))**
+
+- **Add deprecation tag at class level
+  ([29696](https://github.com/civicrm/civicrm-core/pull/29696))**
+
+- **Improve visibility of what functions are called on backoffice Contact form
+  ([29674](https://github.com/civicrm/civicrm-core/pull/29674))**
+
+- **Deprecated smarty modifier
+  ([29755](https://github.com/civicrm/civicrm-core/pull/29755))**
+
+- **Make everyone share my pain
+  ([29479](https://github.com/civicrm/civicrm-core/pull/29479))**
+
+- **Add deprecation to class comment
+  ([29839](https://github.com/civicrm/civicrm-core/pull/29839))**
+
+- **Panacea for brain pain
+  ([29838](https://github.com/civicrm/civicrm-core/pull/29838))**
+
+- **Port one more function to Smarty2
+  ([395](https://github.com/civicrm/civicrm-packages/pull/395))**
+
+- **distmaker - Add `iframe` and `oembed` (5.73-rc)
+  ([29917](https://github.com/civicrm/civicrm-core/pull/29917))**
+
+- **Remove smarty function ported (hacked) to Smarty2
+  ([29846](https://github.com/civicrm/civicrm-core/pull/29846))**
+
+- **Remove ornery from now-compliant tests
+  ([29816](https://github.com/civicrm/civicrm-core/pull/29816))**
+
+- **Fold private function back into only caller
+  ([29762](https://github.com/civicrm/civicrm-core/pull/29762))**
+
+- **Use smarty capitalize instead of ucfirst
+  ([29815](https://github.com/civicrm/civicrm-core/pull/29815))**
+
+- **Remove deprecated misspelled event
+  ([29757](https://github.com/civicrm/civicrm-core/pull/29757))**
+
+- **Remove unused variable
+  ([29727](https://github.com/civicrm/civicrm-core/pull/29727))**
+
+- **Remove a couple on handlings for no-longer returned CRM_Core_Error
+  ([29136](https://github.com/civicrm/civicrm-core/pull/29136))**
+
+- **Copy small functions back to callers
+  ([29758](https://github.com/civicrm/civicrm-core/pull/29758))**
+
+- **Make code clearer
+  ([29836](https://github.com/civicrm/civicrm-core/pull/29836))**
+
+- **Replace CRM_Utils_Array::value
+  ([29684](https://github.com/civicrm/civicrm-core/pull/29684))**
+
+- **Post split clean up - stop calling this form
+  ([29811](https://github.com/civicrm/civicrm-core/pull/29811))**
+
+- **Post split code cleanup
+  ([29810](https://github.com/civicrm/civicrm-core/pull/29810))**
+
+- **Copy function back to one of the few remaining callers
+  ([29802](https://github.com/civicrm/civicrm-core/pull/29802))**
+
+- **Post split tidy up - remove extraneous subType handling
+  ([29819](https://github.com/civicrm/civicrm-core/pull/29819))**
+
+- **Post split tidy up - remove multiple setting of Group Count
+  ([29818](https://github.com/civicrm/civicrm-core/pull/29818))**
+
+- **Post split tidy up - consistent treatment of contactID
+  ([29814](https://github.com/civicrm/civicrm-core/pull/29814))**
+
+- **Post split cleanup - fold private function back into caller
+  ([29820](https://github.com/civicrm/civicrm-core/pull/29820))**
+
+- **Some post split cleanup
+  ([29804](https://github.com/civicrm/civicrm-core/pull/29804))**
+
+- **Remove unreachable code
+  ([29794](https://github.com/civicrm/civicrm-core/pull/29794))**
+
+- **Fold preProcess function from Custom data form back to only caller
+  ([29687](https://github.com/civicrm/civicrm-core/pull/29687))**
+
+- **Copy complex function back to calling class for simplifying
+  ([29689](https://github.com/civicrm/civicrm-core/pull/29689))**
+
+- **Minor cleanup
+  ([29678](https://github.com/civicrm/civicrm-core/pull/29678))**
+
+- **Copy function back to only calling class
+  ([29686](https://github.com/civicrm/civicrm-core/pull/29686))**
+
+- **Post copy back clean up
+  ([29690](https://github.com/civicrm/civicrm-core/pull/29690))**
+
+- **standaloneusers tests - error message assertions are too strict
+  ([29824](https://github.com/civicrm/civicrm-core/pull/29824))**
+
+- **allow standalone's alternative access denied wording in afform test
+  ([29849](https://github.com/civicrm/civicrm-core/pull/29849))**
+
+- **Minor test clean up
+  ([29801](https://github.com/civicrm/civicrm-core/pull/29801))**
+
+- **Add test check on imported multple fields
+  ([29737](https://github.com/civicrm/civicrm-core/pull/29737))**
+
+- **Schema - Update autoincrement to reflect what it actually is
+  ([29709](https://github.com/civicrm/civicrm-core/pull/29709))**
+
+- **Update contributor-key.yml
+  ([29731](https://github.com/civicrm/civicrm-core/pull/29731))**
+
+- **Copy shared function back to form as private function
+  ([29803](https://github.com/civicrm/civicrm-core/pull/29803))**
+
+- **Add tests for unsubscribing from mail groups
+  ([29790](https://github.com/civicrm/civicrm-core/pull/29790))**
+
+- **Reworking of unsubscribe tests in #29790, add grandparent and smart groups
+  ([29830](https://github.com/civicrm/civicrm-core/pull/29830))**
+
+- **Minor clean up in test class
+  ([29729](https://github.com/civicrm/civicrm-core/pull/29729))**
+
+- **Make private function non static
+  ([29728](https://github.com/civicrm/civicrm-core/pull/29728))**
+
+- **Suppress last php8.2 test fail for PR tests  
+  ([29680](https://github.com/civicrm/civicrm-core/pull/29680))**
+
+- **PHP8.2 Fix Financial Account form to load custom data via ajax
+  ([29241](https://github.com/civicrm/civicrm-core/pull/29241))**
+
+- **[php8.2] Fix MembershipType + other entityFormTrait uses for php8.2
+  ([29671](https://github.com/civicrm/civicrm-core/pull/29671))**
+
+- **[php8.2], [bug-fix] Fix default value loading for multiple custom fields
+  ([29708](https://github.com/civicrm/civicrm-core/pull/29708))**
+
+- **[php8.2] Finish consolidating customData code on the Contact form
+  ([29792](https://github.com/civicrm/civicrm-core/pull/29792))**
+
+- **php8.2 Remove non-compliant code replaced by jquery validation
+  ([29793](https://github.com/civicrm/civicrm-core/pull/29793))**
+
+- **[php8.2] Fix Campaign form custom data for php8,2
+  ([29657](https://github.com/civicrm/civicrm-core/pull/29657))**
+
+- **[Php8.2] Fix relationship form to use preferred php8.2 compliant methods
+  ([29652](https://github.com/civicrm/civicrm-core/pull/29652))**
+
+- **[php8.2] Share Custom data fixes from Membership form to renewal
+  ([29592](https://github.com/civicrm/civicrm-core/pull/29592))**
+
+- **[php8.2] Apply custom data handling improvements to grant form  
+  ([29651](https://github.com/civicrm/civicrm-core/pull/29651))**
+
+- **[php8.2]  compliant ajax method for custom data on pledge form
+  ([29228](https://github.com/civicrm/civicrm-core/pull/29228))**
+
+- **[php8.2] apply php8.2 clean up to contribution form custom data
+  ([29655](https://github.com/civicrm/civicrm-core/pull/29655))**
+
+- **[php8.2] apply php8.2 clean up to activity form custom data
+  ([29656](https://github.com/civicrm/civicrm-core/pull/29656))**
+
+- **[php8.2] Fix Survey configuration forms for  custom data for php8.2
+  ([29660](https://github.com/civicrm/civicrm-core/pull/29660))**
+
+- **(php83) UnitTests - Fix warning
+  ([29785](https://github.com/civicrm/civicrm-core/pull/29785))**
+
+- **Possible fix for export test on php8.3
+  ([29688](https://github.com/civicrm/civicrm-core/pull/29688))**
+
+- **Extract isUseReservedQuery
+  ([29864](https://github.com/civicrm/civicrm-core/pull/29864))**
+
+- **[REF] Extract function to get the ContactIDFieldName
+  ([29873](https://github.com/civicrm/civicrm-core/pull/29873))**
+
+- **[REF] Pass IP address to Elavon when submitting credit card payment
+  ([29791](https://github.com/civicrm/civicrm-core/pull/29791))**
+
+- **Refactor template assignments off deprecated CRM_Utils_Array::value
+  ([29780](https://github.com/civicrm/civicrm-core/pull/29780))**
+
+- **Refactor out calls to deprecated CRM_Utils_Array::value()
+  ([29779](https://github.com/civicrm/civicrm-core/pull/29779))**
+
+- **(NFC) gitignore - Don't care about .composer-downloads
+  ([29826](https://github.com/civicrm/civicrm-core/pull/29826))**
+
+- **(NFC) Contribute/Product.xml - No newline in comment
+  ([29825](https://github.com/civicrm/civicrm-core/pull/29825))**
+
+- **Update TCPDF ([29969](https://github.com/civicrm/civicrm-core/pull/29969), [30027](https://github.com/civicrm/civicrm-core/pull/30027))**
+
+- **Fix regen.sh ([29997](https://github.com/civicrm/civicrm-core/pull/29997), [29998](https://github.com/civicrm/civicrm-core/pull/29998))**
+
+- **[php8] Update compile-plugin to v0.20 ([29972](https://github.com/civicrm/civicrm-core/pull/29972))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following code authors:
+
+AGH Strategies - Andie Hunt; Agileware - Agileware Team, Francis Whittle; Artful
+Robot - Rich Lott; Benjamin W; Christian Wach; Circle Interactive - Pradeep
+Nayak; CiviCoop - Jaap Jansma; CiviCRM - Coleman Watts, Tim Otten; CiviDesk -
+Yashodha Chaku; civiservice.de - Detlev Sieber; Coop SymbioTIC - Mathieu Lutfy;
+Dave D; Francesc Bassas i Bullich; Fuzion - Jitendra Purohit, Luke Stewart;
+Gokhalemethod - Sadashiv; Greenpeace Central and Eastern Europe - Patrick Figel;
+iXiam - Albert Vall-Llovera; JMA Consulting - Seamus Lee; MJW Consulting -
+Matthew Wire; Nicol Wistreich; MetaDrop - Omar Mohamad; Progressive Technology
+Project - Jamie McClelland; Squiffle Consulting - Aidan Saunders; Tadpole
+Collective - Kevin Cristiano; Third Sector Design - Michael McAndrew; Wikimedia
+Foundation - Eileen McNaughton
+
+Most authors also reviewed code for this release; in addition, the following
+reviewers contributed their comments:
+
+CiviCoop - Erik Hommel; devappsoftware; gibsonoliver; MC3 - Graham Mitchell;
+Megaphone Technology Consulting - Brienne Kordis, Jon Goldberg; Systopia -
+Johannes Franz; Wildsight - Lars Sander-Green
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Alice Frumin and Andie Hunt.  If you'd like
+to provide feedback on them, please log in to https://chat.civicrm.org/civicrm
+and contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.73.1.md b/www/modules/civicrm/release-notes/5.73.1.md
new file mode 100644
index 000000000..c58079514
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.73.1.md
@@ -0,0 +1,40 @@
+# CiviCRM 5.73.1
+
+Released May 6, 2024
+
+- **[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**  |
+| Fix security vulnerabilities?                                   | no       |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviEvent_: On free events which require approval for each participant, the final registration step is blocked incorrectly. ([#30124](https://github.com/civicrm/civicrm-core/pull/30124))**
+* **_Scheduled Reminders_: On multi-lingual systems, language filter is missing ([dev/core#5116](https://lab.civicrm.org/dev/core/-/issues/5116): [#30131](https://github.com/civicrm/civicrm-core/pull/30131))**
+* **_Smart Groups_: Error computing group memberships if an unrelated custom-field was previously deleted ([#30104](https://github.com/civicrm/civicrm-core/pull/30104))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Fuzion - Jitendra Purohit, Luke Stewart; Dave D;
+Coop SymbioTIC - Mathieu Lutfy; CiviCRM - Tim Otten, Coleman Watts; Agileware - Justin
+Freeman
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.73.2.md b/www/modules/civicrm/release-notes/5.73.2.md
new file mode 100644
index 000000000..d60616bf1
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.73.2.md
@@ -0,0 +1,42 @@
+# CiviCRM 5.73.2
+
+Released May 17, 2024
+
+- **[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**  |
+| Fix security vulnerabilities?                                   | no       |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_Contacts_: The "Edit Contact" screen drops additional email addresses ([dev/core#5208](https://lab.civicrm.org/dev/core/-/issues/5208): [#30196](https://github.com/civicrm/civicrm-core/pull/30196))**
+* **_Custom Data_: "File" fields on "Contributions" don't save correctly ([#30191](https://github.com/civicrm/civicrm-core/pull/30191))**
+* **_Administration_: When reconfiguring "From Email Address", the new value saves incorrectly ([#30204](https://github.com/civicrm/civicrm-core/pull/30204))**
+* **_Smarty 3/4_: Fix compatibility with "Administer: Address Settings" ([#29968](https://github.com/civicrm/civicrm-core/pull/29968))**
+* **_Smarty 3/4_: Fix compatibility with "Contact Layout Editor" ([#30148](https://github.com/civicrm/civicrm-core/pull/30148))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; MJW Consulting - Matthew Wire; Megaphone
+Technology Consulting - Jon Goldberg; JMA Consulting - Seamus Lee; Dave D; CiviCRM - Tim
+Otten, Coleman Watts; Circle Interactive - Pradeep Nayak
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.73.3.md b/www/modules/civicrm/release-notes/5.73.3.md
new file mode 100644
index 000000000..17e4b7277
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.73.3.md
@@ -0,0 +1,44 @@
+# CiviCRM 5.73.3
+
+Released May 23, 2024
+
+- **[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?** | **yes**  |
+| Introduce features?                                             | no       |
+| **Fix bugs?**                                                   | **yes**  |
+| Fix security vulnerabilities?                                   | no       |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviContribute_: Cannot cancel a recurring contribution if CiviMember is inactive ([dev/core#5226](https://lab.civicrm.org/dev/core/-/issues/5226): [#30226](https://github.com/civicrm/civicrm-core/pull/30226))**
+* **_CiviMember_: When using additional "Price Fields", some fields (checkboxes) do not save ([dev/core#5212](https://lab.civicrm.org/dev/core/-/issues/5212): [#30233](https://github.com/civicrm/civicrm-core/pull/30233))**
+* **_Quick Forms_: Forms do not correctly show preexisting field-values involving auto-complete/multi-select ([dev/core#5216](https://lab.civicrm.org/dev/core/-/issues/5216): [#30199](https://github.com/civicrm/civicrm-core/pull/30199))**
+
+  This may affect some "Scheduled Reminders" ("Manual Recipients"),  some "Custom Fields" ("Entity Reference"), and outbound "SMS" ("To").
+
+* **_Joomla_: Upgrade fails if database password has unusual characters ([dev/core#5128](https://lab.civicrm.org/dev/core/-/issues/5128): [joomla#78](https://github.com/civicrm/civicrm-joomla/pull/78))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Megaphone Technology Consulting - Jon Goldberg;
+John Kingsnorth; jmbegley; JMA Consulting - Seamus Lee; Dave D; CiviCRM - Coleman Watts,
+Tim Otten; CiviCoop - Jaap Jansma; Botanical Society of America - Rob Brandt
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.73.4.md b/www/modules/civicrm/release-notes/5.73.4.md
new file mode 100644
index 000000000..0cedae347
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.73.4.md
@@ -0,0 +1,43 @@
+# CiviCRM 5.73.4
+
+Released May 30, 2024
+
+- **[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?** | **yes**  |
+| Introduce features?                                             | no       |
+| **Fix bugs?**                                                   | **yes**  |
+| Fix security vulnerabilities?                                   | no       |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviContribute_: "Send Letter" fails with error about "call_user_func" ([dev/core#5250](https://lab.civicrm.org/dev/core/-/issues/5250): [#30298](https://github.com/civicrm/civicrm-core/pull/30298))**
+* **_CiviContribute_: When recording a manual payment with truncated PAN, the value does not initially save ([#30223](https://github.com/civicrm/civicrm-core/pull/30223))**
+* **_CiviEvent_: Error when cancelling a registration which involves Paypal Standard ([dev/core#5207](https://lab.civicrm.org/dev/core/-/issues/5207): [#30260](https://github.com/civicrm/civicrm-core/pull/30260))**
+* **_CiviEvent_: Some event confirmation emails display extra formatting tags ([dev/core#5230](https://lab.civicrm.org/dev/core/-/issues/5230): [#30259](https://github.com/civicrm/civicrm-core/pull/30259))**
+* **_Joomla_: Upgrade from CiviCRM v5.66 (or earlier) mangles data if database password has certain URL characters ([dev/core#5128](https://lab.civicrm.org/dev/core/-/issues/5128): [joomla#81](https://github.com/civicrm/civicrm-joomla/pull/81))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Tadpole Collective - Kevin Cristiano; Squiffle
+Consulting - Aidan Saunders; rebeccatregenna; Levi.k; JMA Consulting - Seamus Lee, Monish
+Deb; Dave D; CiviCRM - Tim Otten, Coleman Watts; CiviCoop - Jaap Jansma; Circle
+Interactive - Pradeep Nayak; AGH Strategies - Chris Garaffa 
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.74.0.md b/www/modules/civicrm/release-notes/5.74.0.md
new file mode 100644
index 000000000..6b2c7f48f
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.74.0.md
@@ -0,0 +1,684 @@
+# CiviCRM 5.74.0
+
+Released June 6, 2024
+
+- **[Synopsis](#synopsis)**
+- **[Features](#features)**
+- **[Bugs resolved](#bugs)**
+- **[Miscellany](#misc)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?*                                         |         |
+|:--------------------------------------------------------------- |:-------:|
+| 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?     |   no    |
+| **Introduce features?**                                         | **yes** |
+| **Fix bugs?**                                                   | **yes** |
+
+## <a name="features"></a>Features
+
+### CiviCRM Core
+
+- **Imagine a world without CodeGen (Work Towards
+  [dev/core#4999](https://lab.civicrm.org/dev/core/-/issues/4999):
+  [29472](https://github.com/civicrm/civicrm-core/pull/29472),
+  [29988](https://github.com/civicrm/civicrm-core/pull/29988),
+  [30016](https://github.com/civicrm/civicrm-core/pull/30016) and
+  [30021](https://github.com/civicrm/civicrm-core/pull/30021))**
+
+  Works towards a world without code gen by fixing delegation for queued upgrade
+  tasks and converting xml schema to new entityType.php format.
+
+- **Upgrade Smarty to 5.1.0.0
+  ([396](https://github.com/civicrm/civicrm-packages/pull/396))**
+
+  Upgrades Smarty to 5.1.0.0.
+
+- **Switch default smarty for localhost, demo to Smarty5
+  ([29909](https://github.com/civicrm/civicrm-core/pull/29909))**
+
+  Defaults demo to Smarty5.
+
+- **Remove text version of some more message templates
+  ([30041](https://github.com/civicrm/civicrm-core/pull/30041),
+  [30040](https://github.com/civicrm/civicrm-core/pull/30040),
+  [30038](https://github.com/civicrm/civicrm-core/pull/30038) and
+  [30039](https://github.com/civicrm/civicrm-core/pull/30039))**
+
+  Removes text versions of some more message templates. If no text version is
+  entered, text is generated based on the html version.
+
+- **Add support for saving custom data on option values
+  ([29929](https://github.com/civicrm/civicrm-core/pull/29929))**
+
+  Adds support for custom data on option values.
+
+- **Afform - Allow 'Current Date' as a value option for date fields
+  ([29986](https://github.com/civicrm/civicrm-core/pull/29986))**
+
+  Makes it so one can set "Current Date" as a value option for date fields in
+  Afform.
+
+- **Afform - enable autocomplete id filter on search forms
+  ([29919](https://github.com/civicrm/civicrm-core/pull/29919))**
+
+  Permits the ID field to be used as an autocomplete on search forms.
+
+- **Angular Datepicker - Default to +-100 year range
+  ([29885](https://github.com/civicrm/civicrm-core/pull/29885))**
+
+  Makes Angular Datepickers default to +-100 year range.
+
+- **OAuth - Add permission implications
+  ([29950](https://github.com/civicrm/civicrm-core/pull/29950))**
+
+  Adds a logical relationship between the 2 permissions declared by OAuth.
+
+- **Update UserJob status & date fields as it progresses
+  ([29981](https://github.com/civicrm/civicrm-core/pull/29981))**
+
+  Ensures UserJob start & end date are updated appropriately, and the job
+  progresses through draft->scheduled->in progress->completed.
+
+- **Add expires_date as an editable field to "my imports" and "all imports" SK
+  ([29977](https://github.com/civicrm/civicrm-core/pull/29977))**
+
+  Makes the expiration date an editable field on SearchKit import screens.
+
+- **Feature request - APIv4 Get action, provide ability to define aliases for
+  the select fields so that external integrations with CiviCRM do not break
+  when the field name changes OR a different field is selected (Work Towards
+  [dev/core#3738](https://lab.civicrm.org/dev/core/-/issues/3738):
+  [29714](https://github.com/civicrm/civicrm-core/pull/29714))**
+
+  Adds APIv4 rekey function.
+
+- **Improve support for German dates on import
+  ([30067](https://github.com/civicrm/civicrm-core/pull/30067))**
+
+  Improves supports for German dates when importing.
+
+- **SMS Provider searchkit admin ui
+  ([29567](https://github.com/civicrm/civicrm-core/pull/29567))**
+
+  Converts the SMS Provider page to searchkit.
+
+- **Permissions - Allow hooks/extensions to declare implied permissions  
+  ([29940](https://github.com/civicrm/civicrm-core/pull/29940))**
+
+  Enables extensions to take advantage of implied permissions.
+
+- **CRM_Admin_Form_Setting_Url: use metadata for enableSSL, verifySSL fields
+  ([30075](https://github.com/civicrm/civicrm-core/pull/30075))**
+
+  Improves user experience when editing SSL settings.
+
+### CiviEvent
+
+- **Update participant import to work on updates (with participant ID)
+  ([30052](https://github.com/civicrm/civicrm-core/pull/30052))**
+
+  Makes it so one can update participant records by import using a participant
+  ID.
+
+### CiviMail
+
+- **Call hooks when recording mailing open
+  ([29887](https://github.com/civicrm/civicrm-core/pull/29887))**
+
+  Ensures hooks are called when a mailing open event is recorded.
+
+### Backdrop Integration
+
+- **Support oEmbed for external facing pages
+  (Work Towards [dev/core#2994](https://lab.civicrm.org/dev/core/-/issues/2994):
+  [29928](https://github.com/civicrm/civicrm-core/pull/29928))**
+
+  Adds support for IFrame Connector extension (to allow remote iframes) for
+  backdrop.
+
+### Standalone Integration
+
+- **Standalone - Add permission implications
+  ([29945](https://github.com/civicrm/civicrm-core/pull/29945))**
+
+  Adds a logical relationship between the 2 permissions declared by standalone.
+
+- **standalone: password change screen
+  ([29788](https://github.com/civicrm/civicrm-core/pull/29788))**
+
+  Sets up a password change screen for standalone integrations.
+
+## <a name="bugs"></a>Bugs resolved
+
+### Core CiviCRM
+
+- **`testLocalizedData()` failing after recent strings update
+  ([dev/translation#84](https://lab.civicrm.org/dev/translation/-/issues/84):
+  [30141](https://github.com/civicrm/civicrm-core/pull/30141))**
+
+- **API Deprecation (Work Towards
+  [dev/core#4846](https://lab.civicrm.org/dev/core/-/issues/4846):
+  [30026](https://github.com/civicrm/civicrm-core/pull/30026))**
+
+  Fixes call to deprecated function.
+
+- **Formbuilder: Individual 1 fields are refreshed to their initial values
+  (updates are lost) as soon as a Individual 2 contact is chosen in an existing
+  contact field
+  ([dev/core#5094](https://lab.civicrm.org/dev/core/-/issues/5094):
+  [29832](https://github.com/civicrm/civicrm-core/pull/29832))**
+
+  Afform fix prefill of one entity overwriting 'current user'.
+
+- **Scheduled Reminders: with multi-lingual, the language filters are empty
+  ([dev/core#5116](https://lab.civicrm.org/dev/core/-/issues/5116):
+  [30131](https://github.com/civicrm/civicrm-core/pull/30131))**
+
+  Fixes missing language selector for scheduled reminders.
+
+- **Wrong Link from Administer page to Date Preferences page
+  ([dev/core#5139](https://lab.civicrm.org/dev/core/-/issues/5139):
+  [30147](https://github.com/civicrm/civicrm-core/pull/30147))**
+
+- **Can't select parent menu when cloning report
+  ([dev/core#5141](https://lab.civicrm.org/dev/core/-/issues/5141):
+  [30143](https://github.com/civicrm/civicrm-core/pull/30143))**
+
+- **Non-admin users unable to view Contact Reports menu item
+  ([dev/core#5148](https://lab.civicrm.org/dev/core/-/issues/5148):
+  [30064](https://github.com/civicrm/civicrm-core/pull/30064))**
+
+- **Do not use wysiwyg editor for system workflow message when workflow_name is
+  set ([dev/core#5154](https://lab.civicrm.org/dev/core/-/issues/5154):
+  [29999](https://github.com/civicrm/civicrm-core/pull/29999))**
+
+- **Deleting a individual contact gives: The contact might be the Membership
+  Organization of a Membership Type when the contact is not an organisation
+  ([dev/core#5165](https://lab.civicrm.org/dev/core/-/issues/5165):
+  [30053](https://github.com/civicrm/civicrm-core/pull/30053))**
+
+- **Required radio buttons don't display "This field is required."
+  ([dev/core#5167](https://lab.civicrm.org/dev/core/-/issues/5167):
+  [30060](https://github.com/civicrm/civicrm-core/pull/30060))**
+
+- **System Workflow Message regression: html, head, body tags disappear
+  ([dev/core#5176](https://lab.civicrm.org/dev/core/-/issues/5176):
+  [30204](https://github.com/civicrm/civicrm-core/pull/30204))**
+
+- **CiviCRM 5.72.1 and newer, PHP 8.x - Smart groups trigger a PHP Fatal error
+  and no longer load if the saved search criteria refers to any custom fields
+  which have been deleted
+  ([dev/core#5185](https://lab.civicrm.org/dev/core/-/issues/5185):
+  [30104](https://github.com/civicrm/civicrm-core/pull/30104))**
+
+- **Some emails not shown when editing a contact in non-inline mode
+  ([dev/core#5208](https://lab.civicrm.org/dev/core/-/issues/5208):
+  [30196](https://github.com/civicrm/civicrm-core/pull/30196))**
+
+- **Can't cancel recurring contributions if CiviMember is not enabled
+  (regression) ([dev/core#5226](https://lab.civicrm.org/dev/core/-/issues/5226):
+  [30226](https://github.com/civicrm/civicrm-core/pull/30226))**
+
+- **Api4 - Set 'usage' property for custom fields
+  ([30058](https://github.com/civicrm/civicrm-core/pull/30058))**
+
+  Sets property for custom fields in APIv4 to be equivalent to core fields.
+
+- **Reduce import controller boiler plate
+  ([29978](https://github.com/civicrm/civicrm-core/pull/29978))**
+
+- **Assign highlighted fields as json
+  ([29976](https://github.com/civicrm/civicrm-core/pull/29976))**
+
+- **SearchKit - Move search tasks to their respective component-extensions
+  ([29747](https://github.com/civicrm/civicrm-core/pull/29747))**
+
+- **SearchKit - Add conditional rule for membershipStatus links
+  ([29745](https://github.com/civicrm/civicrm-core/pull/29745))**
+
+  Adds conditional rules to enforce the status-quo in Admin UI.
+
+- **add missing cms: prefix to permission check
+  ([29946](https://github.com/civicrm/civicrm-core/pull/29946))**
+
+- **Smarty 3/4 - Fix prepending extension template directories
+  ([30148](https://github.com/civicrm/civicrm-core/pull/30148))**
+
+- **Smarty3/4 compatibility for Address.tpl
+  ([29968](https://github.com/civicrm/civicrm-core/pull/29968))**
+
+- **Message templates admin page crashes with smarty 5
+  ([30070](https://github.com/civicrm/civicrm-core/pull/30070))**
+
+- **support 'current user' as value in Afform
+  ([30089](https://github.com/civicrm/civicrm-core/pull/30089))**
+
+- **Partially convert recur updateOnNewPayment to API4
+  ([30062](https://github.com/civicrm/civicrm-core/pull/30062))**
+
+- **Afform - Fix 'Edit' links to always go to backend
+  ([29922](https://github.com/civicrm/civicrm-core/pull/29922))**
+
+- **Regression: Custom field file type not saved on entity
+  ([30191](https://github.com/civicrm/civicrm-core/pull/30191))**
+
+- **SampleData - Add missing customGroup weights
+  ([29984](https://github.com/civicrm/civicrm-core/pull/29984))**
+
+- **SearchKit - Fix SearchSegment state/province
+  ([29927](https://github.com/civicrm/civicrm-core/pull/29927))**
+
+- **Guard against missing saved search class during smart group cache rebuild
+  ([29956](https://github.com/civicrm/civicrm-core/pull/29956))**
+
+- **Afform - Fix edit links permission for multiple users
+  ([30205](https://github.com/civicrm/civicrm-core/pull/30205))**
+
+- **Fix setTemplateDir to actually work
+  ([397](https://github.com/civicrm/civicrm-packages/pull/397))**
+
+- **Stop passing ids to function that does not use them
+  ([30049](https://github.com/civicrm/civicrm-core/pull/30049))**
+
+- **Fix rendering default value of autocomplete fields
+  ([30199](https://github.com/civicrm/civicrm-core/pull/30199))**
+
+- **Fix invalid date with STRICT SQL mode
+  ([29916](https://github.com/civicrm/civicrm-core/pull/29916) and
+  [29921](https://github.com/civicrm/civicrm-core/pull/29921))**
+
+- **avoid deprecation notice if header is null
+  ([29901](https://github.com/civicrm/civicrm-core/pull/29901))**
+
+- **Fix wrong function in error message
+  ([29894](https://github.com/civicrm/civicrm-core/pull/29894))**
+
+- **Fix function to use apiv4
+  ([30006](https://github.com/civicrm/civicrm-core/pull/30006))**
+
+- **Fix double passing of same params to private function
+  ([30009](https://github.com/civicrm/civicrm-core/pull/30009))**
+
+- **Stop setting now-already-set id
+  ([30003](https://github.com/civicrm/civicrm-core/pull/30003))**
+
+- **PHP8 - Fix wordReplacement function to always return an array
+  ([29934](https://github.com/civicrm/civicrm-core/pull/29934))**
+
+- **Include schema in tarball - so that civicrm can be installed
+  ([30150](https://github.com/civicrm/civicrm-core/pull/30150))**
+
+- **Default values having ampersand (`&`) displayed as `&amp;` ([dev/core#5252](https://lab.civicrm.org/dev/core/-/issues/5252): [#30331](https://github.com/civicrm/civicrm-core/pull/30331))**
+- **ContactSummary - Ensure tabs are refreshed with admin_ui enabled ([dev/core#5171](https://lab.civicrm.org/dev/core/-/issues/5171): [#30344](https://github.com/civicrm/civicrm-core/pull/30344))**
+- **Tokens -  Newer style tokesn (with quotes) should work with HTML encoding ([dev/core#5199](https://lab.civicrm.org/dev/core/-/issues/5199): [#30330](https://github.com/civicrm/civicrm-core/pull/30330))**
+
+### CiviCase
+
+- **Similar to 30189 - customgroup::getGroupDetail is case-sensitive now
+  ([30190](https://github.com/civicrm/civicrm-core/pull/30190))**
+
+- **Case custom fields no longer appearing on print report
+  ([30189](https://github.com/civicrm/civicrm-core/pull/30189))**
+
+- **Crash in Smarty 5 on Manage Case ([#30325](https://github.com/civicrm/civicrm-core/pull/30325))**
+
+### CiviContribute
+
+- **Contribution pending status wrong
+  ([dev/core#5070](https://lab.civicrm.org/dev/core/-/issues/5070):
+  [30165](https://github.com/civicrm/civicrm-core/pull/30165))**
+
+  Fix failure to set is_pay_later on back office.
+
+- **Improve loading of PriceField metadata on Contribution Form to avoid notice
+  ([29936](https://github.com/civicrm/civicrm-core/pull/29936))**
+
+- **Align price field loading with other forms to address notice
+  ([30078](https://github.com/civicrm/civicrm-core/pull/30078))**
+
+- **On contribution forms, checkbox fields don't save all options selected
+  ([dev/core#5212](https://lab.civicrm.org/dev/core/-/issues/5212):
+  [30233](https://github.com/civicrm/civicrm-core/pull/30233))**
+
+- **Move BAO/Contribute to api4 not api3, replacing getvalue/getsingle
+  ([29992](https://github.com/civicrm/civicrm-core/pull/29992))**
+
+- **Use pan_truncation where present on form
+  ([30223](https://github.com/civicrm/civicrm-core/pull/30223))**
+
+- **Fix calculation on amount allocation for tax line to happen in main loop
+  ([29947](https://github.com/civicrm/civicrm-core/pull/29947))**
+
+- **Resolve issue with Payment allocation for Sales Item
+  ([30017](https://github.com/civicrm/civicrm-core/pull/30017))**
+
+- **Alternate fix to remove extraneous tax display
+  ([29889](https://github.com/civicrm/civicrm-core/pull/29889))**
+
+- **Contribution page confirmation page help text says click continue but the
+  button actually says "Make Contribution"
+  ([dev/core#5155](https://lab.civicrm.org/dev/core/-/issues/5155):
+  [30000](https://github.com/civicrm/civicrm-core/pull/30000))**
+
+- **""Send Letter"" - Crashes while rendering help widget ([dev/core#5250](https://lab.civicrm.org/dev/core/-/issues/5250): [#30298](https://github.com/civicrm/civicrm-core/pull/30298))**
+
+### CiviEvent
+
+- **Update import/participant url to match new standardised name
+  ([30056](https://github.com/civicrm/civicrm-core/pull/30056))**
+
+- **CiviEvent: Online registration of multiple participants is broken (if no
+  waitlist activated)
+  ([dev/core#5168](https://lab.civicrm.org/dev/core/-/issues/5168):
+  [30124](https://github.com/civicrm/civicrm-core/pull/30124))**
+
+- **Custom data displayed twice ([#30341](https://github.com/civicrm/civicrm-core/pull/30341))**
+- **"Total amount" on some event registrations is showing wrong amounts ([#30335](https://github.com/civicrm/civicrm-core/pull/30335))**
+- **Some custom event fields don't display on "Event Info" form ([#30336](https://github.com/civicrm/civicrm-core/pull/30336))**
+
+### CiviMail
+
+- **“Save & Send Test Email� should call the alterMailParams hook to replicate
+  live conditions
+  ([dev/core#5151](https://lab.civicrm.org/dev/core/-/issues/5151):
+  [29995](https://github.com/civicrm/civicrm-core/pull/29995))**
+
+### CiviMember
+
+- **Assign weights on membership tab
+  ([30108](https://github.com/civicrm/civicrm-core/pull/30108))**
+
+- **Fix notice on membership form by loading price field information in
+  standardised way
+  ([30079](https://github.com/civicrm/civicrm-core/pull/30079))**
+
+- **Membership price fields ignored in backend
+  ([dev/core#5147](https://lab.civicrm.org/dev/core/-/issues/5147):
+  [29982](https://github.com/civicrm/civicrm-core/pull/29982))**
+
+### CiviPledge
+
+- **Clean up smarty notices on pledge view
+  ([29705](https://github.com/civicrm/civicrm-core/pull/29705))**
+
+### Backdrop Integration
+
+- **Correct CRMDatabasePrefix() for Backdrop
+ ([dev/core#5158](https://lab.civicrm.org/dev/core/-/issues/5158):
+ [30015](https://github.com/civicrm/civicrm-core/pull/30015))**
+
+### Drupal Integration
+
+- **Fix broken user account profile tab in drupal 10
+  ([29965](https://github.com/civicrm/civicrm-core/pull/29965))**
+
+- **Drupal 10 - Fix breadcrumbs with id tokens
+  ([29958](https://github.com/civicrm/civicrm-core/pull/29958))**
+
+- **composer.json - Explicitly allow dev-master
+  ([91](https://github.com/civicrm/civicrm-drupal-8/pull/91))**
+
+### Joomla Integration
+
+- **KC Finder Not Working Under Joomla 4
+  ([dev/joomla#46](https://lab.civicrm.org/dev/joomla/-/issues/46):
+  [374](https://github.com/civicrm/civicrm-packages/pull/374))**
+
+### Standalone Integration
+
+- **Standalone - ensure id value is an int for comparison check when changing
+  password ([29895](https://github.com/civicrm/civicrm-core/pull/29895))**
+
+- **Standalone installer - fix admin not getting admin role
+  ([30136](https://github.com/civicrm/civicrm-core/pull/30136))**
+
+- **Standalone cms permissions are civi permissions
+  ([dev/core#5125](https://lab.civicrm.org/dev/core/-/issue/5125):
+  [29896](https://github.com/civicrm/civicrm-core/pull/29896))**
+
+### WordPress Integration
+
+- **Fix Asset Builder links in Afform Shortcodes
+  ([324](https://github.com/civicrm/civicrm-wordpress/pull/324))**
+
+- **Skip Base Page test when there is no Post object
+  ([317](https://github.com/civicrm/civicrm-wordpress/pull/317))**
+
+- **Declare class property to avoid PHP warning
+  ([323](https://github.com/civicrm/civicrm-wordpress/pull/323))**
+
+- **Use base page URL function to build links in multiple Shortcodes
+  ([313](https://github.com/civicrm/civicrm-wordpress/pull/313))**
+
+## <a name="misc"></a>Miscellany
+
+- **Update AuthSasl Net_SMTP and Net_Socket packages
+  ([30066](https://github.com/civicrm/civicrm-core/pull/30066))**
+
+- **Use addPluginsDir rather than non-public property
+  ([30158](https://github.com/civicrm/civicrm-core/pull/30158))**
+
+- **Extract our code to override addPluginsDir
+  ([401](https://github.com/civicrm/civicrm-packages/pull/401))**
+
+- **Backport addPluginsDir to Smarty2
+  ([398](https://github.com/civicrm/civicrm-packages/pull/398))**
+
+- **Upgrader - Delete old schemaStructure files
+  ([30045](https://github.com/civicrm/civicrm-core/pull/30045))**
+
+- **Use loaded balance_amount
+  ([29990](https://github.com/civicrm/civicrm-core/pull/29990))**
+
+- **Use apiv4 to getFields for participant import
+  ([30048](https://github.com/civicrm/civicrm-core/pull/30048))**
+
+- **Tidy up Import StateMachine & Controller
+  ([30044](https://github.com/civicrm/civicrm-core/pull/30044))**
+
+- **DAO - Add getter function for labelField
+  ([30013](https://github.com/civicrm/civicrm-core/pull/30013))**
+
+- **Use Apiv4 rather than funky function to get line items
+  ([29964](https://github.com/civicrm/civicrm-core/pull/29964))**
+
+- **Switch from apv3 to apiv4 within Payment.create
+  ([29966](https://github.com/civicrm/civicrm-core/pull/29966))**
+
+- **Regen - message templates out of date
+  ([30069](https://github.com/civicrm/civicrm-core/pull/30069))**
+
+- **Regenerate schema files with core-style fixes
+  ([30014](https://github.com/civicrm/civicrm-core/pull/30014))**
+
+- **regen - node 16 deprecated in github actions
+  ([30011](https://github.com/civicrm/civicrm-core/pull/30011))**
+
+- **Switch to already loaded paid_amount
+  ([30005](https://github.com/civicrm/civicrm-core/pull/30005))**
+
+- **Clean up some no-longer-used properties
+  ([30008](https://github.com/civicrm/civicrm-core/pull/30008))**
+
+- **Fold function back into the main scope, simplify, use apiv4
+  ([29944](https://github.com/civicrm/civicrm-core/pull/29944))**
+
+- **Switch function to apiv4, minor cleanup
+  ([29943](https://github.com/civicrm/civicrm-core/pull/29943))**
+
+- **AdminUI - Remove redundant conditionals
+  ([29942](https://github.com/civicrm/civicrm-core/pull/29942))**
+
+- **Further cleanup on arrays in payment create.
+  ([29913](https://github.com/civicrm/civicrm-core/pull/29913))**
+
+- **Consolidate some of the subtype wrangling code in dedupe finder
+  ([29862](https://github.com/civicrm/civicrm-core/pull/29862))**
+
+- **Fold function back into only caller
+  ([29937](https://github.com/civicrm/civicrm-core/pull/29937))**
+
+- **Fix comments ([29974](https://github.com/civicrm/civicrm-core/pull/29974))**
+
+- **Fix some CRM_Utils_array to ... not be
+  ([29952](https://github.com/civicrm/civicrm-core/pull/29952))**
+
+- **Move the code to generate payableItems back into getPayableItems
+  ([29989](https://github.com/civicrm/civicrm-core/pull/29989))**
+
+- **Unravel variable variables  
+  ([29951](https://github.com/civicrm/civicrm-core/pull/29951))**
+
+- **Fix old merge conflict mis-resolution, superficial tidy up
+  ([30082](https://github.com/civicrm/civicrm-core/pull/30082))**
+
+- **UtilsArray - Refactor out deprecated value() in array assignments  
+  ([29925](https://github.com/civicrm/civicrm-core/pull/29925))**
+
+- **Remove a few more variable variables
+  ([29953](https://github.com/civicrm/civicrm-core/pull/29953))**
+
+- **Remove deprecated function
+  ([29796](https://github.com/civicrm/civicrm-core/pull/29796))**
+
+- **Remove function that no longer does much of anything
+  ([30036](https://github.com/civicrm/civicrm-core/pull/30036))**
+
+- **Remove function deprecated in 2022, after universe search
+  ([30033](https://github.com/civicrm/civicrm-core/pull/30033))**
+
+- **Remove some unreachable legacy code
+  ([30032](https://github.com/civicrm/civicrm-core/pull/30032))**
+
+- **Remove cancerous unreachable code
+  ([30050](https://github.com/civicrm/civicrm-core/pull/30050))**
+
+- **Remove a couple of utils_array::value
+  ([30042](https://github.com/civicrm/civicrm-core/pull/30042))**
+
+- **Remove unused properties
+  ([29980](https://github.com/civicrm/civicrm-core/pull/29980))**
+
+- **Remove always true if from previously shared code
+  ([29941](https://github.com/civicrm/civicrm-core/pull/29941))**
+
+- **Remove unused variable + some test tidy up
+  ([29904](https://github.com/civicrm/civicrm-core/pull/29904))**
+
+- **Remove deprecated functions that were on their final notice
+  ([29905](https://github.com/civicrm/civicrm-core/pull/29905))**
+
+- **Remove deprecated function
+  ([30090](https://github.com/civicrm/civicrm-core/pull/30090))**
+
+- **[REF] Start to use sane arrays in Payment create
+  ([29893](https://github.com/civicrm/civicrm-core/pull/29893))**
+
+- **[REF] Use standard DeleteMessage functionality from EntityFormTrait for
+  OptionValues ([29930](https://github.com/civicrm/civicrm-core/pull/29930))**
+
+- **[REF] Autocleanup - Remove redundant conditions
+  ([29935](https://github.com/civicrm/civicrm-core/pull/29935))**
+
+- **[REF] Refactor out deprecated CRM_Utils_Array from UFGroup class
+  ([29932](https://github.com/civicrm/civicrm-core/pull/29932))**
+
+- **[REF] Refactor out deprecated CRM_Utils_Array from some BAO classes
+  ([29933](https://github.com/civicrm/civicrm-core/pull/29933))**
+
+- **[REF] CustomGroup BAO function cleanup
+  ([29985](https://github.com/civicrm/civicrm-core/pull/29985))**
+
+- **[REF] Payment.create - Combine the 2 calls to LineItem.get
+  ([30010](https://github.com/civicrm/civicrm-core/pull/30010))**
+
+- **(REF) `ts()` - Move from class-file to `functions.php`
+  ([30071](https://github.com/civicrm/civicrm-core/pull/30071))**
+
+- **(REF) Drop references to `require_once "CRM/Core/I18n.php"`
+  ([30072](https://github.com/civicrm/civicrm-core/pull/30072))**
+
+- **[NFC] APIv4 - Add documentation comments to addJoin() function
+  ([29899](https://github.com/civicrm/civicrm-core/pull/29899))**
+
+- **[NFC] UtilsCheck - Improve docblock comments
+  ([29959](https://github.com/civicrm/civicrm-core/pull/29959))**
+
+- **[NFC] space error in a ts in the event receipt template
+  ([29970](https://github.com/civicrm/civicrm-core/pull/29970))**
+
+- **[NFC] Fix registration confirmtest
+  ([30073](https://github.com/civicrm/civicrm-core/pull/30073))**
+
+- **NFC: Rewrite "is_page_request" method for comment
+  ([325](https://github.com/civicrm/civicrm-wordpress/pull/325))**
+
+- **Notice fixes in test, use preferred helper
+  ([30080](https://github.com/civicrm/civicrm-core/pull/30080))**
+
+- **Test handling for path argument
+  ([30076](https://github.com/civicrm/civicrm-core/pull/30076))**
+
+- **Fix some tests to not rely on natural sort (implicit id)
+  ([29915](https://github.com/civicrm/civicrm-core/pull/29915))**
+
+- **Fix test to use full form flow
+  ([29906](https://github.com/civicrm/civicrm-core/pull/29906))**
+
+- **CRM_Utils_Cache_Tiered - Fix test failure on Standalone
+  ([30095](https://github.com/civicrm/civicrm-core/pull/30095))**
+
+- **Fix test to test form, not a deprecated function
+  ([29907](https://github.com/civicrm/civicrm-core/pull/29907))**
+
+- **Fix test to use full form flow
+  ([29903](https://github.com/civicrm/civicrm-core/pull/29903))**
+
+- **Update tests to orderBy amount rather than rely on id order
+  ([29897](https://github.com/civicrm/civicrm-core/pull/29897))**
+
+- **Crash in Smarty 5 if you have the fulltext block enabled ([#30326](https://github.com/civicrm/civicrm-core/pull/30326), [#30296](https://github.com/civicrm/civicrm-core/pull/30296))**
+- **5.74 release notes first pass ([#30305](https://github.com/civicrm/civicrm-core/pull/30305))**
+- **Port Point Release Notes to RC branch ([#30304](https://github.com/civicrm/civicrm-core/pull/30304))**
+- **DaoBase - Move class to correct directory  ([#30306](https://github.com/civicrm/civicrm-core/pull/30306))**
+- **Hold back recent deprecation ([#30332](https://github.com/civicrm/civicrm-core/pull/30332))**
+- **Smarty - Remove duplicate template dirs ([#30290](https://github.com/civicrm/civicrm-core/pull/30290))**
+- **Smarty - Allow setting version via environment variable ([#30272](https://github.com/civicrm/civicrm-core/pull/30272))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following code authors:
+
+AGH Strategies - Andie Hunt; Agileware - Agileware Team, Francis Whittle; angelajackson07; Artful
+Robot - Rich Lott; Benjamin W; Christian Wach; Circle Interactive - Pradeep
+Nayak; CiviCRM - Coleman Watts, Tim Otten; Compuco - Olayiwola Odunsi; Coop
+SymbioTIC - Samuel Vanhove; CrusonWeb - Dan Cruson; CSES (Chelmsford Science and
+Engineering Society) - Adam Wood; Dave D; Francesc Bassas i Bullich; Freeform
+Solutions - Herb van den Dool; Fuzion - Jitendra Purohit; Jens Schuppe; JMA
+Consulting - Seamus Lee; John Kingsnorth; Megaphone Technology Consulting - Jon
+Goldberg; MJW Consulting - Matthew Wire; Nicol Wistreich; Progressive Technology
+Project - Jamie McClelland; Reflexive Communications - Sandor Semsey; Squiffle
+Consulting - Aidan Saunders; Stephen Palmstrom; Tadpole Collective - Kevin
+Cristiano; Third Sector Design - Michael McAndrew, William Mortada; Wikimedia
+Foundation - Eileen McNaughton
+
+Most authors also reviewed code for this release; in addition, the following
+reviewers contributed their comments:
+
+AGH Strategies - Alice Frumin; Agileware - Justin Freeman; ALL IN APPLI admin;
+Australian Greens - John Twyman; CiviDesk - Yashodha Chaku; civiservice.de -
+Detlev Sieber; CompuCorp - Omar Abu Hussein; Coop SymbioTIC - Mathieu Lutfy,
+mmyriam; Fransly; Fuzion - Luke Stewart; Guydn; Levi.k;
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Alice Frumin and Andie Hunt.  If you'd like
+to provide feedback on them, please log in to https://chat.civicrm.org/civicrm
+and contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.74.1.md b/www/modules/civicrm/release-notes/5.74.1.md
new file mode 100644
index 000000000..8535ad62e
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.74.1.md
@@ -0,0 +1,41 @@
+# CiviCRM 5.74.1
+
+Released June 11, 2024
+
+- **[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**  |
+| Fix security vulnerabilities?                                   | no       |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_Backdrop_: Navigation icon renders incorrectly on Backdrop (before v1.28) ([dev/backdrop#85#note_165525](https://lab.civicrm.org/dev/backdrop/-/issues/85#note_165525): [backdrop#179](https://github.com/civicrm/civicrm-backdrop/pull/179))**
+* **_CiviEvent_: Event registration fails on certain payment processors ([dev/core#5207#note_165605](https://lab.civicrm.org/dev/core/-/issues/5207#note_165605): [#30392](https://github.com/civicrm/civicrm-core/pull/30392))**
+
+  Displays error "Expected to find one Participant record, but there were zero."
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Megaphone Technology Consulting - Jon Goldberg;
+JMA Consulting - Monish Deb; Freeform Solutions - Herb van den Dool; Dave D; CiviCRM - Tim
+Otten; Circle Interactive - Pradeep Nayak
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.74.2.md b/www/modules/civicrm/release-notes/5.74.2.md
new file mode 100644
index 000000000..ef8a2f691
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.74.2.md
@@ -0,0 +1,43 @@
+# CiviCRM 5.74.2
+
+Released June 13, 2024
+
+- **[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**  |
+| Fix security vulnerabilities?                                   | no       |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviContribute_: "Update Recurring Contribution" fails to open ([dev/core#5282](https://lab.civicrm.org/dev/core/-/issues/5282): [#30410](https://github.com/civicrm/civicrm-core/pull/30410))**
+* **_CiviGrant_: Disabling CiviGrant leads to errors about "CRM_Utils_SQL::mergeSubquery" ([dev/core#5284](https://lab.civicrm.org/dev/core/-/issues/5284): [#30404](https://github.com/civicrm/civicrm-core/pull/30404))**
+
+  Other disabled extensions might provoke similar errors, but this has not been specifically tested.
+
+* **_Form Builder_: Forms with certain navigation options fail to render ([dev/core#5286](https://lab.civicrm.org/dev/core/-/issues/5286): [#30063](https://github.com/civicrm/civicrm-core/pull/30063))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Michael Labriola; Megaphone Technology
+Consulting - Jon Goldberg; JMA Consulting - Monish Deb; CiviCRM - Coleman Watts, Tim
+Otten; CiviCoop - Jaap Jansma; Circle Interactive - Pradeep Nayak; callan; Benjamin W
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.74.3.md b/www/modules/civicrm/release-notes/5.74.3.md
new file mode 100644
index 000000000..ad42c30ca
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.74.3.md
@@ -0,0 +1,41 @@
+# CiviCRM 5.74.3
+
+Released June 15, 2024
+
+- **[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**  |
+| Fix security vulnerabilities?                                   | no       |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviEvent_: In "View Participant", the deletion link may be malformed ([#30433](https://github.com/civicrm/civicrm-core/pull/30433))**
+* **_CiviEvent_: When editing certain participant records, changes to the "Fee Amount" may not save ([dev/core#5289](https://lab.civicrm.org/dev/core/-/issues/5289): [#30439](https://github.com/civicrm/civicrm-core/pull/30439))**
+* **_Custom Data_: Custom fields for "Relationship Type" records are not displayed ([#30417](https://github.com/civicrm/civicrm-core/pull/30417))**
+* **_Email Composition_: When editing a scheduled-reminder or message-component, tokens are encoded incorrectly ([dev/core#5288](https://lab.civicrm.org/dev/core/-/issues/5288): [#30428](https://github.com/civicrm/civicrm-core/pull/30428), [#30444](https://github.com/civicrm/civicrm-core/pull/30444))**
+* **_Search Kit_: Data-segmentation involving certain fields does not work ([#30435](https://github.com/civicrm/civicrm-core/pull/30435))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; timtomch; pbarmak; Fuzion - Jitendra Purohit;
+Dave D; CiviCRM - Coleman Watts, Tim Otten
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/www/modules/civicrm/release-notes/5.74.4.md b/www/modules/civicrm/release-notes/5.74.4.md
new file mode 100644
index 000000000..547d9684d
--- /dev/null
+++ b/www/modules/civicrm/release-notes/5.74.4.md
@@ -0,0 +1,47 @@
+# CiviCRM 5.74.4
+
+Released June 19, 2024
+
+- **[Synopsis](#synopsis)**
+- **[Security advisories](#security)**
+- **[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**  |
+| **Fix security vulnerabilities?**                               | **yes**  |
+
+## <a name="security"></a>Security advisories
+
+* **[CIVI-SA-2024-01](https://civicrm.org/advisory/civi-sa-2024-01-view-contact-xss): View Contact XSS (Multiple)**
+* **[CIVI-SA-2024-02](https://civicrm.org/advisory/civi-sa-2024-02-json-settings-xss): JSON Settings (XSS)**
+* **[CIVI-SA-2024-03](https://civicrm.org/advisory/civi-sa-2024-03-smarty-security-policy): Smary Security Policy**
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviCase_: Case Roles Section is squished ([dev/user-interface#73](https://lab.civicrm.org/dev/user-interface/-/issues/73): [#30465](https://github.com/civicrm/civicrm-core/pull/30465))**
+* **_CiviCase_: Case Roles Section does not remain open ([dev/core#5296](https://lab.civicrm.org/dev/core/-/issues/5296): [#30502](https://github.com/civicrm/civicrm-core/pull/30502))**
+* **_FormBuilder_: Fix console error with multi-select fields ([#30477](https://github.com/civicrm/civicrm-core/pull/30477))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Nicol Wistreich; Québec Ministère de la Cybersécurité et du Numérique; JMA
+Consulting - Seamus Lee; Greenpeace Central and Eastern Europe - Patrick Figel; Dave D; Coop SymbioTIC - Mathieu Lutfy;
+Claude Bernard Lyon 1 University - Security Team; CiviCRM - Coleman Watts, Tim Otten
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andie Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/www/modules/civicrm/schema/ACL/ACL.entityType.php b/www/modules/civicrm/schema/ACL/ACL.entityType.php
new file mode 100644
index 000000000..78f5965bf
--- /dev/null
+++ b/www/modules/civicrm/schema/ACL/ACL.entityType.php
@@ -0,0 +1,163 @@
+<?php
+
+return [
+  'name' => 'ACL',
+  'table' => 'civicrm_acl',
+  'class' => 'CRM_ACL_DAO_ACL',
+  'getInfo' => fn() => [
+    'title' => ts('ACL'),
+    'title_plural' => ts('ACLs'),
+    'description' => ts('Access Control List'),
+    'add' => '1.6',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/acl/edit?reset=1&action=add',
+    'delete' => 'civicrm/acl/delete?reset=1&action=delete&id=[id]',
+    'update' => 'civicrm/acl/edit?reset=1&action=edit&id=[id]',
+    'browse' => 'civicrm/acl',
+  ],
+  'getIndices' => fn() => [
+    'index_acl_id' => [
+      'fields' => [
+        'acl_id' => TRUE,
+      ],
+      'add' => '1.6',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('ACL ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique table ID'),
+      'add' => '1.6',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('ACL Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('ACL Name.'),
+      'add' => '1.6',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'deny' => [
+      'title' => ts('Deny ACL?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'Radio',
+      'required' => TRUE,
+      'description' => ts('Is this ACL entry Allow (0) or Deny (1) ?'),
+      'add' => '1.6',
+      'default' => FALSE,
+    ],
+    'entity_table' => [
+      'title' => ts('ACL Entity'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Table of the object possessing this ACL entry (Contact, Group, or ACL Group)'),
+      'add' => '1.6',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('ID of the object possessing this ACL'),
+      'add' => '1.6',
+      'pseudoconstant' => [
+        'option_group_name' => 'acl_role',
+      ],
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'operation' => [
+      'title' => ts('ACL Operation'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('What operation does this ACL entry control?'),
+      'add' => '1.6',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_ACL_BAO_ACL::operation',
+      ],
+    ],
+    'object_table' => [
+      'title' => ts('ACL Object'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('The table of the object controlled by this ACL entry'),
+      'add' => '1.6',
+      'input_attrs' => [
+        'label' => ts('Type of Data'),
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_ACL_BAO_ACL::getObjectTableOptions',
+      ],
+    ],
+    'object_id' => [
+      'title' => ts('ACL Object ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('The ID of the object controlled by this ACL entry'),
+      'add' => '1.6',
+      'input_attrs' => [
+        'label' => ts('Which Data'),
+        'control_field' => 'object_table',
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_ACL_BAO_ACL::getObjectIdOptions',
+        'prefetch' => 'disabled',
+      ],
+    ],
+    'acl_table' => [
+      'title' => ts('ACL Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('If this is a grant/revoke entry, what table are we granting?'),
+      'add' => '1.6',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'acl_id' => [
+      'title' => ts('ACL Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('ID of the ACL or ACL group being granted/revoked'),
+      'add' => '1.6',
+    ],
+    'is_active' => [
+      'title' => ts('ACL Is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this property active?'),
+      'add' => '1.6',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'priority' => [
+      'title' => ts('Priority'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '5.64',
+      'default' => 0,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/ACL/ACLCache.entityType.php b/www/modules/civicrm/schema/ACL/ACLCache.entityType.php
new file mode 100644
index 000000000..c9cfd7967
--- /dev/null
+++ b/www/modules/civicrm/schema/ACL/ACLCache.entityType.php
@@ -0,0 +1,83 @@
+<?php
+
+return [
+  'name' => 'ACLCache',
+  'table' => 'civicrm_acl_cache',
+  'class' => 'CRM_ACL_DAO_ACLCache',
+  'getInfo' => fn() => [
+    'title' => ts('ACLCache'),
+    'title_plural' => ts('ACLCaches'),
+    'description' => ts('Cache for acls and contacts'),
+    'add' => '1.6',
+  ],
+  'getIndices' => fn() => [
+    'index_contact_id' => [
+      'fields' => [
+        'contact_id' => TRUE,
+      ],
+      'add' => '5.31',
+    ],
+    'index_acl_id' => [
+      'fields' => [
+        'acl_id' => TRUE,
+      ],
+      'add' => '1.6',
+    ],
+    'index_modified_date' => [
+      'fields' => [
+        'modified_date' => TRUE,
+      ],
+      'add' => '5.22',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Cache ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique table ID'),
+      'add' => '1.6',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Foreign Key to Contact'),
+      'add' => '1.6',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+    ],
+    'acl_id' => [
+      'title' => ts('ACL ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Foreign Key to ACL'),
+      'add' => '1.6',
+      'input_attrs' => [
+        'label' => ts('ACL'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_acl',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'ACL',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'modified_date' => [
+      'title' => ts('Cache Modified Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('When was this cache entry last modified'),
+      'add' => '1.6',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/ACL/ACLEntityRole.entityType.php b/www/modules/civicrm/schema/ACL/ACLEntityRole.entityType.php
new file mode 100644
index 000000000..e6c2ae815
--- /dev/null
+++ b/www/modules/civicrm/schema/ACL/ACLEntityRole.entityType.php
@@ -0,0 +1,95 @@
+<?php
+
+return [
+  'name' => 'ACLEntityRole',
+  'table' => 'civicrm_acl_entity_role',
+  'class' => 'CRM_ACL_DAO_ACLEntityRole',
+  'getInfo' => fn() => [
+    'title' => ts('ACL Role Assignment'),
+    'title_plural' => ts('ACL Role Assignments'),
+    'description' => ts('Join table for Contacts and Groups to ACL Roles'),
+    'add' => '1.6',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/acl/entityrole/edit?reset=1&action=add',
+    'delete' => 'civicrm/acl/entityrole/edit?reset=1&action=delete&id=[id]',
+    'update' => 'civicrm/acl/entityrole/edit?reset=1&action=update&id=[id]',
+    'browse' => 'civicrm/acl/entityrole',
+  ],
+  'getIndices' => fn() => [
+    'index_role' => [
+      'fields' => [
+        'acl_role_id' => TRUE,
+      ],
+      'add' => '1.6',
+    ],
+    'index_entity' => [
+      'fields' => [
+        'entity_table' => TRUE,
+        'entity_id' => TRUE,
+      ],
+      'add' => '1.6',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Entity Role'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique table ID'),
+      'add' => '1.6',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'acl_role_id' => [
+      'title' => ts('ACL Role ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Foreign Key to ACL Role (which is an option value pair and hence an implicit FK)'),
+      'add' => '1.6',
+      'pseudoconstant' => [
+        'option_group_name' => 'acl_role',
+      ],
+    ],
+    'entity_table' => [
+      'title' => ts('Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Table of the object joined to the ACL Role (Contact or Group)'),
+      'add' => '1.6',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_ACL_BAO_ACLEntityRole::entityTables',
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('ACL Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('ID of the group/contact object being joined'),
+      'add' => '1.6',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('ACL Entity Role is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this property active?'),
+      'add' => '1.6',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Activity/Activity.entityType.php b/www/modules/civicrm/schema/Activity/Activity.entityType.php
new file mode 100644
index 000000000..39e8c5ceb
--- /dev/null
+++ b/www/modules/civicrm/schema/Activity/Activity.entityType.php
@@ -0,0 +1,456 @@
+<?php
+
+return [
+  'name' => 'Activity',
+  'table' => 'civicrm_activity',
+  'class' => 'CRM_Activity_DAO_Activity',
+  'getInfo' => fn() => [
+    'title' => ts('Activity'),
+    'title_plural' => ts('Activities'),
+    'description' => ts('Past or future actions concerning one or more contacts.'),
+    'log' => TRUE,
+    'add' => '1.1',
+    'icon' => 'fa-tasks',
+    'label_field' => 'subject',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/activity?reset=1&action=add&context=standalone',
+    'view' => 'civicrm/activity?reset=1&action=view&id=[id]',
+    'update' => 'civicrm/activity/add?reset=1&action=update&id=[id]',
+    'delete' => 'civicrm/activity?reset=1&action=delete&id=[id]',
+  ],
+  'getIndices' => fn() => [
+    'UI_source_record_id' => [
+      'fields' => [
+        'source_record_id' => TRUE,
+      ],
+      'add' => '3.2',
+    ],
+    'UI_activity_type_id' => [
+      'fields' => [
+        'activity_type_id' => TRUE,
+      ],
+      'add' => '1.6',
+    ],
+    'index_activity_date_time' => [
+      'fields' => [
+        'activity_date_time' => TRUE,
+      ],
+      'add' => '4.7',
+    ],
+    'index_status_id' => [
+      'fields' => [
+        'status_id' => TRUE,
+      ],
+      'add' => '4.7',
+    ],
+    'index_is_current_revision' => [
+      'fields' => [
+        'is_current_revision' => TRUE,
+      ],
+      'add' => '2.2',
+    ],
+    'index_is_deleted' => [
+      'fields' => [
+        'is_deleted' => TRUE,
+      ],
+      'add' => '2.2',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Activity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique Other Activity ID'),
+      'add' => '1.1',
+      'unique_name' => 'activity_id',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'source_record_id' => [
+      'title' => ts('Source Record'),
+      'sql_type' => 'int unsigned',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('Artificial FK to original transaction (e.g. contribution) IF it is not an Activity. Entity table is discovered by filtering by the appropriate activity_type_id.'),
+      'add' => '2.0',
+    ],
+    'activity_type_id' => [
+      'title' => ts('Activity Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_option_value.id, that has to be valid, registered activity type.'),
+      'add' => '1.1',
+      'default' => 1,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Activity Type'),
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'activity_type',
+      ],
+    ],
+    'subject' => [
+      'title' => ts('Subject'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('The subject/purpose/short description of the activity.'),
+      'add' => '1.1',
+      'unique_name' => 'activity_subject',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'activity_date_time' => [
+      'title' => ts('Activity Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time this activity is scheduled to occur. Formerly named scheduled_date_time.'),
+      'add' => '2.0',
+      'default' => 'CURRENT_TIMESTAMP',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'duration' => [
+      'title' => ts('Duration'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Planned or actual duration of activity expressed in minutes. Conglomerate of former duration_hours and duration_minutes.'),
+      'add' => '2.0',
+      'unique_name' => 'activity_duration',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'location' => [
+      'title' => ts('Location'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Location of the activity (optional, open text).'),
+      'add' => '1.1',
+      'unique_name' => 'activity_location',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'phone_id' => [
+      'title' => ts('Phone ID (called)'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'deprecated' => TRUE,
+      'description' => ts('Phone ID of the number called (optional - used if an existing phone number is selected).'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Phone (called)'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Phone',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'phone_number' => [
+      'title' => ts('Phone (called) Number'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'deprecated' => TRUE,
+      'description' => ts('Phone number in case the number does not exist in the civicrm_phone table.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'details' => [
+      'title' => ts('Details'),
+      'sql_type' => 'longtext',
+      'input_type' => 'RichTextEditor',
+      'description' => ts('Details about the activity (agenda, notes, etc).'),
+      'add' => '1.1',
+      'unique_name' => 'activity_details',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'rows' => 8,
+        'cols' => 60,
+      ],
+    ],
+    'status_id' => [
+      'title' => ts('Activity Status'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('ID of the status this activity is currently in. Foreign key to civicrm_option_value.'),
+      'add' => '2.0',
+      'unique_name' => 'activity_status_id',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'activity_status',
+      ],
+    ],
+    'priority_id' => [
+      'title' => ts('Priority'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('ID of the priority given to this activity. Foreign key to civicrm_option_value.'),
+      'add' => '2.0',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'priority',
+      ],
+    ],
+    'parent_id' => [
+      'title' => ts('Parent Activity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('Parent meeting ID (if this is a follow-up item).'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Parent Activity'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Activity',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'is_test' => [
+      'title' => ts('Test'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '2.0',
+      'unique_name' => 'activity_is_test',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'medium_id' => [
+      'title' => ts('Activity Medium'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Activity Medium, Implicit FK to civicrm_option_value where option_group = encounter_medium.'),
+      'add' => '2.2',
+      'unique_name' => 'activity_medium_id',
+      'default' => NULL,
+      'pseudoconstant' => [
+        'option_group_name' => 'encounter_medium',
+      ],
+    ],
+    'is_auto' => [
+      'title' => ts('Auto'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '2.2',
+      'default' => FALSE,
+    ],
+    'relationship_id' => [
+      'title' => ts('Relationship ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'deprecated' => TRUE,
+      'description' => ts('FK to Relationship ID'),
+      'add' => '2.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Relationship'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Relationship',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'is_current_revision' => [
+      'title' => ts('Is current (unused)'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'deprecated' => TRUE,
+      'description' => ts('Unused deprecated column.'),
+      'add' => '2.2',
+      'default' => TRUE,
+    ],
+    'original_id' => [
+      'title' => ts('Original ID (unused)'),
+      'sql_type' => 'int unsigned',
+      'input_type' => NULL,
+      'deprecated' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('Unused deprecated column.'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'label' => ts('Original Activity'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Activity',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'result' => [
+      'title' => ts('Result'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Currently being used to store result id for survey activity, FK to option value.'),
+      'add' => '3.3',
+      'unique_name' => 'activity_result',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_deleted' => [
+      'title' => ts('Activity is in the Trash'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '2.2',
+      'unique_name' => 'activity_is_deleted',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'campaign_id' => [
+      'title' => ts('Campaign ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('The campaign for which this activity has been triggered.'),
+      'add' => '3.4',
+      'unique_name' => 'activity_campaign_id',
+      'component' => 'CiviCampaign',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Campaign'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_campaign',
+        'key_column' => 'id',
+        'label_column' => 'title',
+        'prefetch' => 'disabled',
+      ],
+      'entity_reference' => [
+        'entity' => 'Campaign',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'engagement_level' => [
+      'title' => ts('Engagement Index'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Assign a specific level of engagement to this activity. Used for tracking constituents in ladder of engagement.'),
+      'add' => '3.4',
+      'unique_name' => 'activity_engagement_level',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'engagement_index',
+      ],
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'add' => '4.1',
+    ],
+    'is_star' => [
+      'title' => ts('Is Starred'),
+      'sql_type' => 'boolean',
+      'input_type' => 'Checkbox',
+      'required' => TRUE,
+      'description' => ts('Activity marked as favorite.'),
+      'add' => '4.7',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Created Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'description' => ts('When was the activity was created.'),
+      'add' => '4.7',
+      'unique_name' => 'activity_created_date',
+      'default' => 'CURRENT_TIMESTAMP',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'label' => ts('Created Date'),
+      ],
+    ],
+    'modified_date' => [
+      'title' => ts('Modified Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'readonly' => TRUE,
+      'description' => ts('When was the activity (or closely related entity) was created or modified or deleted.'),
+      'add' => '4.7',
+      'unique_name' => 'activity_modified_date',
+      'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'label' => ts('Modified Date'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Activity/ActivityContact.entityType.php b/www/modules/civicrm/schema/Activity/ActivityContact.entityType.php
new file mode 100644
index 000000000..64e920634
--- /dev/null
+++ b/www/modules/civicrm/schema/Activity/ActivityContact.entityType.php
@@ -0,0 +1,94 @@
+<?php
+
+return [
+  'name' => 'ActivityContact',
+  'table' => 'civicrm_activity_contact',
+  'class' => 'CRM_Activity_DAO_ActivityContact',
+  'getInfo' => fn() => [
+    'title' => ts('Activity Contact'),
+    'title_plural' => ts('Activity Contacts'),
+    'description' => ts('Activity Contact'),
+    'log' => TRUE,
+    'add' => '4.4',
+  ],
+  'getIndices' => fn() => [
+    'UI_activity_contact' => [
+      'fields' => [
+        'contact_id' => TRUE,
+        'activity_id' => TRUE,
+        'record_type_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '4.4',
+    ],
+    'index_record_type' => [
+      'fields' => [
+        'activity_id' => TRUE,
+        'record_type_id' => TRUE,
+      ],
+      'add' => '4.4',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Activity Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Activity contact id'),
+      'add' => '4.4',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'activity_id' => [
+      'title' => ts('Activity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Foreign key to the activity for this record.'),
+      'add' => '4.4',
+      'input_attrs' => [
+        'label' => ts('Activity'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Activity',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Foreign key to the contact for this record.'),
+      'add' => '4.4',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'record_type_id' => [
+      'title' => ts('Activity Contact Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Determines the contact\'s role in the activity (source, target, or assignee).'),
+      'add' => '4.4',
+      'input_attrs' => [
+        'label' => ts('Contact Role'),
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'activity_contacts',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Batch/Batch.entityType.php b/www/modules/civicrm/schema/Batch/Batch.entityType.php
new file mode 100644
index 000000000..489b43a32
--- /dev/null
+++ b/www/modules/civicrm/schema/Batch/Batch.entityType.php
@@ -0,0 +1,198 @@
+<?php
+
+return [
+  'name' => 'Batch',
+  'table' => 'civicrm_batch',
+  'class' => 'CRM_Batch_DAO_Batch',
+  'getInfo' => fn() => [
+    'title' => ts('Batch'),
+    'title_plural' => ts('Batches'),
+    'description' => ts('Stores the details of a batch operation Used primarily when doing batch operations with an external system.'),
+    'add' => '3.3',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '4.2',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Batch ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique Address ID'),
+      'add' => '3.3',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Batch Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Variable name/programmatic handle for this batch.'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'title' => [
+      'title' => ts('Batch Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Friendly Name.'),
+      'add' => '4.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Batch Description'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Description of this batch set.'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 80,
+      ],
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Batch Created Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('When was this item created'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'modified_id' => [
+      'title' => ts('Modified By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'label' => ts('Modified By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'modified_date' => [
+      'title' => ts('Batch Modified Date'),
+      'sql_type' => 'datetime',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('When was this item modified'),
+      'add' => '3.3',
+    ],
+    'saved_search_id' => [
+      'title' => ts('Smart Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Saved Search ID'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'label' => ts('Smart Group'),
+      ],
+      'entity_reference' => [
+        'entity' => 'SavedSearch',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'status_id' => [
+      'title' => ts('Batch Status'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('fk to Batch Status options in civicrm_option_values'),
+      'add' => '4.2',
+      'pseudoconstant' => [
+        'option_group_name' => 'batch_status',
+      ],
+    ],
+    'type_id' => [
+      'title' => ts('Batch Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('fk to Batch Type options in civicrm_option_values'),
+      'add' => '4.2',
+      'pseudoconstant' => [
+        'option_group_name' => 'batch_type',
+      ],
+    ],
+    'mode_id' => [
+      'title' => ts('Batch Mode'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('fk to Batch mode options in civicrm_option_values'),
+      'add' => '4.2',
+      'pseudoconstant' => [
+        'option_group_name' => 'batch_mode',
+      ],
+    ],
+    'total' => [
+      'title' => ts('Batch Total'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'description' => ts('Total amount for this batch.'),
+      'add' => '4.2',
+    ],
+    'item_count' => [
+      'title' => ts('Batch Number of Items'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'description' => ts('Number of items in a batch.'),
+      'add' => '4.2',
+    ],
+    'payment_instrument_id' => [
+      'title' => ts('Batch Payment Method'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('fk to Payment Instrument options in civicrm_option_values'),
+      'add' => '4.3',
+      'pseudoconstant' => [
+        'option_group_name' => 'payment_instrument',
+      ],
+    ],
+    'exported_date' => [
+      'title' => ts('Batch Exported Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'add' => '4.3',
+    ],
+    'data' => [
+      'title' => ts('Batch Data'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('cache entered data'),
+      'add' => '4.4',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Batch/EntityBatch.entityType.php b/www/modules/civicrm/schema/Batch/EntityBatch.entityType.php
new file mode 100644
index 000000000..0b8610c7f
--- /dev/null
+++ b/www/modules/civicrm/schema/Batch/EntityBatch.entityType.php
@@ -0,0 +1,89 @@
+<?php
+
+return [
+  'name' => 'EntityBatch',
+  'table' => 'civicrm_entity_batch',
+  'class' => 'CRM_Batch_DAO_EntityBatch',
+  'getInfo' => fn() => [
+    'title' => ts('Entity Batch'),
+    'title_plural' => ts('Entity Batches'),
+    'description' => ts('Batch entities (Contributions, Participants, Contacts) to a batch.'),
+    'add' => '3.3',
+  ],
+  'getIndices' => fn() => [
+    'index_entity' => [
+      'fields' => [
+        'entity_table' => TRUE,
+        'entity_id' => TRUE,
+      ],
+      'add' => '3.3',
+    ],
+    'UI_batch_entity' => [
+      'fields' => [
+        'batch_id' => TRUE,
+        'entity_id' => TRUE,
+        'entity_table' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '3.3',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('EntityBatch ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('primary key'),
+      'add' => '3.3',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('EntityBatch Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('physical tablename for entity being joined to file, e.g. civicrm_contact'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'entity_batch_extends',
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to entity table specified in entity_table column.'),
+      'add' => '3.3',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'batch_id' => [
+      'title' => ts('Batch ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_batch'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'label' => ts('Batch'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_batch',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'Batch',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Campaign/Campaign.entityType.php b/www/modules/civicrm/schema/Campaign/Campaign.entityType.php
new file mode 100644
index 000000000..7a3f82178
--- /dev/null
+++ b/www/modules/civicrm/schema/Campaign/Campaign.entityType.php
@@ -0,0 +1,302 @@
+<?php
+
+return [
+  'name' => 'Campaign',
+  'table' => 'civicrm_campaign',
+  'class' => 'CRM_Campaign_DAO_Campaign',
+  'getInfo' => fn() => [
+    'title' => ts('Campaign'),
+    'title_plural' => ts('Campaigns'),
+    'description' => ts('Campaigns link activities, contributions, mailings, etc. that share a programmatic goal.'),
+    'add' => '3.3',
+    'icon' => 'fa-bullhorn',
+    'label_field' => 'title',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/campaign/add?reset=1',
+    'update' => 'civicrm/campaign/add?reset=1&action=update&id=[id]',
+    'delete' => 'civicrm/campaign/add?reset=1&action=delete&id=[id]',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '5.63',
+    ],
+    'index_campaign_type_id' => [
+      'fields' => [
+        'campaign_type_id' => TRUE,
+      ],
+      'add' => '5.63',
+    ],
+    'index_status_id' => [
+      'fields' => [
+        'status_id' => TRUE,
+      ],
+      'add' => '5.63',
+    ],
+    'UI_external_identifier' => [
+      'fields' => [
+        'external_identifier' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '3.3',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Campaign ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique Campaign ID.'),
+      'add' => '3.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('ID'),
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Campaign Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Name of the Campaign.'),
+      'add' => '3.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Name'),
+        'maxlength' => 255,
+      ],
+    ],
+    'title' => [
+      'title' => ts('Campaign Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Title of the Campaign.'),
+      'add' => '3.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Title'),
+        'maxlength' => 255,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Campaign Description'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Full description of Campaign.'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'rows' => 8,
+        'cols' => 60,
+        'label' => ts('Description'),
+      ],
+    ],
+    'start_date' => [
+      'title' => ts('Campaign Start Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time that Campaign starts.'),
+      'add' => '3.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Start Date'),
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'end_date' => [
+      'title' => ts('Campaign End Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time that Campaign ends.'),
+      'add' => '3.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('End Date'),
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'campaign_type_id' => [
+      'title' => ts('Campaign Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Campaign Type ID.Implicit FK to civicrm_option_value where option_group = campaign_type'),
+      'add' => '3.3',
+      'default' => NULL,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Type'),
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'campaign_type',
+      ],
+    ],
+    'status_id' => [
+      'title' => ts('Campaign Status'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Campaign status ID.Implicit FK to civicrm_option_value where option_group = campaign_status'),
+      'add' => '3.3',
+      'default' => NULL,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Status'),
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'campaign_status',
+      ],
+    ],
+    'external_identifier' => [
+      'title' => ts('Campaign External ID'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => 'Text',
+      'description' => ts('Unique trusted external ID (generally from a legacy app/datasource). Particularly useful for deduping operations.'),
+      'add' => '3.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('External ID'),
+        'maxlength' => 32,
+      ],
+    ],
+    'parent_id' => [
+      'title' => ts('Parent Campaign ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Optional parent id for this Campaign.'),
+      'add' => '3.3',
+      'default' => NULL,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Parent Campaign'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Campaign',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Is Campaign Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this Campaign enabled or disabled/cancelled?'),
+      'add' => '3.3',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => [
+          'Enabled',
+          'Enabled',
+        ],
+      ],
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_contact, who created this Campaign.'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Campaign Created Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'readonly' => TRUE,
+      'description' => ts('Date and time that Campaign was created.'),
+      'add' => '3.3',
+      'default' => 'CURRENT_TIMESTAMP',
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+        'label' => ts('Created Date'),
+      ],
+    ],
+    'last_modified_id' => [
+      'title' => ts('Modified By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_contact, who recently edited this Campaign.'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'label' => ts('Modified By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'last_modified_date' => [
+      'title' => ts('Campaign Modified Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time that Campaign was edited last time.'),
+      'add' => '3.3',
+    ],
+    'goal_general' => [
+      'title' => ts('Campaign Goals'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'description' => ts('General goals for Campaign.'),
+      'add' => '3.4',
+    ],
+    'goal_revenue' => [
+      'title' => ts('Goal Revenue'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'description' => ts('The target revenue for this campaign.'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('Goal Revenue'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Campaign/CampaignGroup.entityType.php b/www/modules/civicrm/schema/Campaign/CampaignGroup.entityType.php
new file mode 100644
index 000000000..f08c1c993
--- /dev/null
+++ b/www/modules/civicrm/schema/Campaign/CampaignGroup.entityType.php
@@ -0,0 +1,83 @@
+<?php
+
+return [
+  'name' => 'CampaignGroup',
+  'table' => 'civicrm_campaign_group',
+  'class' => 'CRM_Campaign_DAO_CampaignGroup',
+  'getInfo' => fn() => [
+    'title' => ts('Campaign Group'),
+    'title_plural' => ts('Campaign Groups'),
+    'description' => ts('Campaign Group Details.'),
+    'add' => '3.3',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Campaign Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Campaign Group id.'),
+      'add' => '3.3',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'campaign_id' => [
+      'title' => ts('Campaign ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Foreign key to the activity Campaign.'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'label' => ts('Campaign'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_campaign',
+        'key_column' => 'id',
+        'label_column' => 'title',
+        'prefetch' => 'disabled',
+      ],
+      'entity_reference' => [
+        'entity' => 'Campaign',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'group_type' => [
+      'title' => ts('Campaign Group Type'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('Type of Group.'),
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::getCampaignGroupTypes',
+      ],
+    ],
+    'entity_table' => [
+      'title' => ts('Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Name of table where item being referenced is stored.'),
+      'add' => '3.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Entity id of referenced table.'),
+      'add' => '3.3',
+      'default' => NULL,
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Campaign/Survey.entityType.php b/www/modules/civicrm/schema/Campaign/Survey.entityType.php
new file mode 100644
index 000000000..eec9d365c
--- /dev/null
+++ b/www/modules/civicrm/schema/Campaign/Survey.entityType.php
@@ -0,0 +1,255 @@
+<?php
+
+return [
+  'name' => 'Survey',
+  'table' => 'civicrm_survey',
+  'class' => 'CRM_Campaign_DAO_Survey',
+  'getInfo' => fn() => [
+    'title' => ts('Survey'),
+    'title_plural' => ts('Surveys'),
+    'description' => ts('Campaign Survey Details.'),
+    'add' => '3.2',
+    'icon' => 'fa-clipboard',
+    'label_field' => 'title',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/survey/add?reset=1',
+    'update' => 'civicrm/survey/configure/main?reset=1&action=update&id=[id]',
+    'delete' => 'civicrm/survey/delete?reset=1&id=[id]',
+  ],
+  'getIndices' => fn() => [
+    'UI_activity_type_id' => [
+      'fields' => [
+        'activity_type_id' => TRUE,
+      ],
+      'add' => '3.3',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Survey ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Survey id.'),
+      'add' => '3.3',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'title' => [
+      'title' => ts('Survey Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Title of the Survey.'),
+      'add' => '3.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'campaign_id' => [
+      'title' => ts('Campaign ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Foreign key to the Campaign.'),
+      'add' => '3.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Campaign'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_campaign',
+        'key_column' => 'id',
+        'label_column' => 'title',
+        'prefetch' => 'disabled',
+      ],
+      'entity_reference' => [
+        'entity' => 'Campaign',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'activity_type_id' => [
+      'title' => ts('Activity Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Implicit FK to civicrm_option_value where option_group = activity_type'),
+      'add' => '3.3',
+      'default' => NULL,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'activity_type',
+      ],
+    ],
+    'instructions' => [
+      'title' => ts('Instructions'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('Script instructions for volunteers to use for the survey.'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'rows' => 20,
+        'cols' => 80,
+      ],
+    ],
+    'release_frequency' => [
+      'title' => ts('Survey Hold Duration'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Number of days for recurrence of release.'),
+      'add' => '3.3',
+      'default' => NULL,
+    ],
+    'max_number_of_contacts' => [
+      'title' => ts('Maximum number of contacts'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Maximum number of contacts to allow for survey.'),
+      'add' => '3.3',
+      'default' => NULL,
+    ],
+    'default_number_of_contacts' => [
+      'title' => ts('Default number of contacts'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Default number of contacts to allow for survey.'),
+      'add' => '3.3',
+      'default' => NULL,
+    ],
+    'is_active' => [
+      'title' => ts('Survey Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this survey enabled or disabled/cancelled?'),
+      'add' => '3.3',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_default' => [
+      'title' => ts('Is Default Survey'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this default survey?'),
+      'add' => '3.3',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Default'),
+      ],
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_contact, who created this Survey.'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Campaign Created Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time that Survey was created.'),
+      'add' => '3.3',
+    ],
+    'last_modified_id' => [
+      'title' => ts('Modified By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_contact, who recently edited this Survey.'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'label' => ts('Modified By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'last_modified_date' => [
+      'title' => ts('Survey Modified On'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time that Survey was edited last time.'),
+      'add' => '3.3',
+    ],
+    'result_id' => [
+      'title' => ts('Survey Result'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Used to store option group id.'),
+      'add' => '3.3',
+      'default' => NULL,
+      'pseudoconstant' => [
+        'table' => 'civicrm_option_group',
+        'key_column' => 'id',
+        'label_column' => 'title',
+        'name_column' => 'name',
+        'condition' => 'name LIKE "civicrm_survey_%"',
+      ],
+    ],
+    'bypass_confirm' => [
+      'title' => ts('No Email Verification'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Bypass the email verification.'),
+      'add' => '4.2',
+      'default' => FALSE,
+    ],
+    'thankyou_title' => [
+      'title' => ts('Thank-you Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Title for Thank-you page (header title tag, and display at the top of the page).'),
+      'add' => '4.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'thankyou_text' => [
+      'title' => ts('Thank-you Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('text and html allowed. displayed above result on success page'),
+      'add' => '4.2',
+      'input_attrs' => [
+        'rows' => 8,
+        'cols' => 60,
+      ],
+    ],
+    'is_share' => [
+      'title' => ts('Is shared through social media'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Can people share the petition through social media?'),
+      'add' => '4.4',
+      'default' => TRUE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Case/Case.entityType.php b/www/modules/civicrm/schema/Case/Case.entityType.php
new file mode 100644
index 000000000..c88fe8d7f
--- /dev/null
+++ b/www/modules/civicrm/schema/Case/Case.entityType.php
@@ -0,0 +1,200 @@
+<?php
+
+return [
+  'name' => 'Case',
+  'table' => 'civicrm_case',
+  'class' => 'CRM_Case_DAO_Case',
+  'getInfo' => fn() => [
+    'title' => ts('Case'),
+    'title_plural' => ts('Cases'),
+    'description' => ts('Collections of activities and relationships for a given purpose.'),
+    'log' => TRUE,
+    'add' => '1.8',
+    'icon' => 'fa-folder-open',
+    'label_field' => 'subject',
+  ],
+  'getPaths' => fn() => [
+    'view' => 'civicrm/contact/view/case?action=view&reset=1&id=[id]',
+  ],
+  'getIndices' => fn() => [
+    'index_case_type_id' => [
+      'fields' => [
+        'case_type_id' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+    'index_is_deleted' => [
+      'fields' => [
+        'is_deleted' => TRUE,
+      ],
+      'add' => '2.2',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Case ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique Case ID'),
+      'add' => '1.8',
+      'unique_name' => 'case_id',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'case_type_id' => [
+      'title' => ts('Case Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_case_type.id'),
+      'add' => '2.0',
+      'usage' => [
+        'import',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Case Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_case_type',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'CaseType',
+        'key' => 'id',
+      ],
+    ],
+    'subject' => [
+      'title' => ts('Case Subject'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Short name of the case.'),
+      'add' => '1.8',
+      'unique_name' => 'case_subject',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+    'start_date' => [
+      'title' => ts('Case Start Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('Date on which given case starts.'),
+      'add' => '1.8',
+      'unique_name' => 'case_start_date',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'end_date' => [
+      'title' => ts('Case End Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('Date on which given case ends.'),
+      'add' => '1.8',
+      'unique_name' => 'case_end_date',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'details' => [
+      'title' => ts('Details'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Details populated from Open Case. Only used in the CiviCase extension.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'rows' => 8,
+        'cols' => 60,
+        'label' => ts('Details'),
+      ],
+    ],
+    'status_id' => [
+      'title' => ts('Case Status'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('ID of case status.'),
+      'add' => '1.8',
+      'unique_name' => 'case_status_id',
+      'usage' => [
+        'import',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'control_field' => 'case_type_id',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'case_status',
+      ],
+    ],
+    'is_deleted' => [
+      'title' => ts('Case is in the Trash'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '2.2',
+      'unique_name' => 'case_deleted',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Created Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('When was the case was created.'),
+      'add' => '4.7',
+      'unique_name' => 'case_created_date',
+      'default' => NULL,
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'label' => ts('Created Date'),
+      ],
+    ],
+    'modified_date' => [
+      'title' => ts('Modified Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('When was the case (or closely related entity) was created or modified or deleted.'),
+      'add' => '4.7',
+      'unique_name' => 'case_modified_date',
+      'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'label' => ts('Modified Date'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Case/CaseActivity.entityType.php b/www/modules/civicrm/schema/Case/CaseActivity.entityType.php
new file mode 100644
index 000000000..722ea2ea9
--- /dev/null
+++ b/www/modules/civicrm/schema/Case/CaseActivity.entityType.php
@@ -0,0 +1,67 @@
+<?php
+
+return [
+  'name' => 'CaseActivity',
+  'table' => 'civicrm_case_activity',
+  'class' => 'CRM_Case_DAO_CaseActivity',
+  'getInfo' => fn() => [
+    'title' => ts('Case Activity'),
+    'title_plural' => ts('Case Activities'),
+    'description' => ts('Joining table for case-activity associations.'),
+    'log' => TRUE,
+    'add' => '1.8',
+  ],
+  'getIndices' => fn() => [
+    'UI_case_activity_id' => [
+      'fields' => [
+        'case_id' => TRUE,
+        'activity_id' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Case Activity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique case-activity association id'),
+      'add' => '1.8',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'case_id' => [
+      'title' => ts('Case ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Case ID of case-activity association.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'label' => ts('Case'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Case',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'activity_id' => [
+      'title' => ts('Activity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Activity ID of case-activity association.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Activity'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Activity',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Case/CaseContact.entityType.php b/www/modules/civicrm/schema/Case/CaseContact.entityType.php
new file mode 100644
index 000000000..2641fafc1
--- /dev/null
+++ b/www/modules/civicrm/schema/Case/CaseContact.entityType.php
@@ -0,0 +1,68 @@
+<?php
+
+return [
+  'name' => 'CaseContact',
+  'table' => 'civicrm_case_contact',
+  'class' => 'CRM_Case_DAO_CaseContact',
+  'getInfo' => fn() => [
+    'title' => ts('Case Contact'),
+    'title_plural' => ts('Case Contacts'),
+    'description' => ts('Joining table for case-contact associations.'),
+    'log' => TRUE,
+    'add' => '2.1',
+  ],
+  'getIndices' => fn() => [
+    'UI_case_contact_id' => [
+      'fields' => [
+        'case_id' => TRUE,
+        'contact_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Case Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique case-contact association id'),
+      'add' => '2.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'case_id' => [
+      'title' => ts('Case ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Case ID of case-contact association.'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'label' => ts('Case'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Case',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Contact ID of contact record given case belongs to.'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Case/CaseType.entityType.php b/www/modules/civicrm/schema/Case/CaseType.entityType.php
new file mode 100644
index 000000000..1318d88a8
--- /dev/null
+++ b/www/modules/civicrm/schema/Case/CaseType.entityType.php
@@ -0,0 +1,106 @@
+<?php
+
+return [
+  'name' => 'CaseType',
+  'table' => 'civicrm_case_type',
+  'class' => 'CRM_Case_DAO_CaseType',
+  'getInfo' => fn() => [
+    'title' => ts('Case Type'),
+    'title_plural' => ts('Case Types'),
+    'description' => ts('Case type definition'),
+    'log' => TRUE,
+    'add' => '4.5',
+  ],
+  'getIndices' => fn() => [
+    'case_type_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '4.5',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Case Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Autoincremented type id'),
+      'add' => '4.5',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Case Type Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Machine name for Case Type'),
+      'add' => '4.5',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'title' => [
+      'title' => ts('Case Type Title'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Natural language name for Case Type'),
+      'add' => '4.5',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Case Type Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Description of the Case Type'),
+      'add' => '4.5',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Case Type Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this case type enabled?'),
+      'add' => '4.5',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_reserved' => [
+      'title' => ts('Case Type Is Reserved'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this case type a predefined system type?'),
+      'add' => '4.5',
+      'default' => FALSE,
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Ordering of the case types'),
+      'add' => '4.5',
+      'default' => 1,
+    ],
+    'definition' => [
+      'title' => ts('Case Type Definition'),
+      'sql_type' => 'blob',
+      'input_type' => NULL,
+      'description' => ts('xml definition of case type'),
+      'add' => '4.5',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contact/ACLContactCache.entityType.php b/www/modules/civicrm/schema/Contact/ACLContactCache.entityType.php
new file mode 100644
index 000000000..b8d9571c9
--- /dev/null
+++ b/www/modules/civicrm/schema/Contact/ACLContactCache.entityType.php
@@ -0,0 +1,68 @@
+<?php
+
+return [
+  'name' => 'ACLContactCache',
+  'table' => 'civicrm_acl_contact_cache',
+  'class' => 'CRM_Contact_DAO_ACLContactCache',
+  'getInfo' => fn() => [
+    'title' => ts('ACLContact Cache'),
+    'title_plural' => ts('ACLContact Caches'),
+    'description' => ts('Join table cache for contacts that a user has permission on.'),
+    'add' => '3.1',
+  ],
+  'getIndices' => fn() => [
+    'UI_user_contact_operation' => [
+      'fields' => [
+        'user_id' => TRUE,
+        'contact_id' => TRUE,
+        'operation' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '3.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('ACL Contact Cache ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('primary key'),
+      'add' => '3.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'user_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('FK to civicrm_contact (could be null for anon user)'),
+      'add' => '3.1',
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_contact'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+    ],
+    'operation' => [
+      'title' => ts('Operation'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('What operation does this user have permission on?'),
+      'add' => '1.6',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_ACL_BAO_ACL::operation',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contact/Contact.entityType.php b/www/modules/civicrm/schema/Contact/Contact.entityType.php
new file mode 100644
index 000000000..69f0f4eea
--- /dev/null
+++ b/www/modules/civicrm/schema/Contact/Contact.entityType.php
@@ -0,0 +1,992 @@
+<?php
+
+return [
+  'name' => 'Contact',
+  'table' => 'civicrm_contact',
+  'class' => 'CRM_Contact_DAO_Contact',
+  'getInfo' => fn() => [
+    'title' => ts('Contact'),
+    'title_plural' => ts('Contacts'),
+    'description' => ts('Individuals, organizations, households, etc.'),
+    'log' => TRUE,
+    'add' => '1.1',
+    'icon' => 'fa-address-book-o',
+    'label_field' => 'display_name',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/contact/add?reset=1&ct=[contact_type]',
+    'view' => 'civicrm/contact/view?reset=1&cid=[id]',
+    'update' => 'civicrm/contact/add?reset=1&action=update&cid=[id]',
+    'delete' => 'civicrm/contact/view/delete?reset=1&delete=1&cid=[id]',
+  ],
+  'getIndices' => fn() => [
+    'index_contact_type' => [
+      'fields' => [
+        'contact_type' => TRUE,
+      ],
+      'add' => '2.1',
+    ],
+    'UI_external_identifier' => [
+      'fields' => [
+        'external_identifier' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '1.7',
+    ],
+    'index_organization_name' => [
+      'fields' => [
+        'organization_name' => TRUE,
+      ],
+      'add' => '1.8',
+    ],
+    'index_contact_sub_type' => [
+      'fields' => [
+        'contact_sub_type' => TRUE,
+      ],
+      'add' => '2.1',
+    ],
+    'index_first_name' => [
+      'fields' => [
+        'first_name' => TRUE,
+      ],
+      'add' => '1.8',
+    ],
+    'index_last_name' => [
+      'fields' => [
+        'last_name' => TRUE,
+      ],
+      'add' => '1.8',
+    ],
+    'index_sort_name' => [
+      'fields' => [
+        'sort_name' => TRUE,
+      ],
+      'add' => '2.1',
+    ],
+    'index_preferred_communication_method' => [
+      'fields' => [
+        'preferred_communication_method' => TRUE,
+      ],
+      'add' => '1.6',
+    ],
+    'index_hash' => [
+      'fields' => [
+        'hash' => TRUE,
+      ],
+      'add' => '2.1',
+    ],
+    'index_api_key' => [
+      'fields' => [
+        'api_key' => TRUE,
+      ],
+      'add' => '2.1',
+    ],
+    'UI_prefix' => [
+      'fields' => [
+        'prefix_id' => TRUE,
+      ],
+      'add' => '1.6',
+    ],
+    'UI_suffix' => [
+      'fields' => [
+        'suffix_id' => TRUE,
+      ],
+      'add' => '1.6',
+    ],
+    'index_communication_style_id' => [
+      'fields' => [
+        'communication_style_id' => TRUE,
+      ],
+      'add' => '4.4',
+    ],
+    'UI_gender' => [
+      'fields' => [
+        'gender_id' => TRUE,
+      ],
+      'add' => '1.6',
+    ],
+    'index_is_deceased' => [
+      'fields' => [
+        'is_deceased' => TRUE,
+      ],
+      'add' => '4.7',
+    ],
+    'index_household_name' => [
+      'fields' => [
+        'household_name' => TRUE,
+      ],
+      'add' => '1.8',
+    ],
+    'index_is_deleted_sort_name' => [
+      'fields' => [
+        'is_deleted' => TRUE,
+        'sort_name' => TRUE,
+        'id' => TRUE,
+      ],
+      'add' => '4.4',
+    ],
+    'index_created_date' => [
+      'fields' => [
+        'created_date' => TRUE,
+      ],
+      'add' => '5.18',
+    ],
+    'index_modified_date' => [
+      'fields' => [
+        'modified_date' => TRUE,
+      ],
+      'add' => '5.18',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique Contact ID'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_type' => [
+      'title' => ts('Contact Type'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'readonly' => TRUE,
+      'description' => ts('Type of Contact.'),
+      'add' => '1.1',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_contact_type',
+        'key_column' => 'name',
+        'label_column' => 'label',
+        'icon_column' => 'icon',
+        'condition' => 'parent_id IS NULL',
+      ],
+    ],
+    'external_identifier' => [
+      'title' => ts('External Identifier'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Unique trusted external ID (generally from a legacy app/datasource). Particularly useful for deduping operations.'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '8',
+        'label' => ts('External Identifier'),
+        'maxlength' => 64,
+      ],
+    ],
+    'display_name' => [
+      'title' => ts('Display Name'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'readonly' => TRUE,
+      'description' => ts('Formatted name representing preferred format for display/print/other output.'),
+      'add' => '1.1',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'size' => '30',
+        'maxlength' => 128,
+      ],
+    ],
+    'organization_name' => [
+      'title' => ts('Organization Name'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Organization Name.'),
+      'add' => '1.1',
+      'contact_type' => 'Organization',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '30',
+        'label' => ts('Organization Name'),
+        'maxlength' => 128,
+      ],
+    ],
+    'contact_sub_type' => [
+      'title' => ts('Contact Subtype'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Select',
+      'description' => ts('May be used to over-ride contact view and edit templates.'),
+      'add' => '1.5',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'multiple' => '1',
+        'control_field' => 'contact_type',
+        'maxlength' => 255,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_contact_type',
+        'key_column' => 'name',
+        'label_column' => 'label',
+        'icon_column' => 'icon',
+        'condition' => 'parent_id IS NOT NULL',
+      ],
+    ],
+    'first_name' => [
+      'title' => ts('First Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('First Name.'),
+      'add' => '1.1',
+      'contact_type' => 'Individual',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '30',
+        'label' => ts('First Name'),
+        'maxlength' => 64,
+      ],
+    ],
+    'middle_name' => [
+      'title' => ts('Middle Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Middle Name.'),
+      'add' => '1.1',
+      'contact_type' => 'Individual',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '30',
+        'label' => ts('Middle Name'),
+        'maxlength' => 64,
+      ],
+    ],
+    'last_name' => [
+      'title' => ts('Last Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Last Name.'),
+      'add' => '1.1',
+      'contact_type' => 'Individual',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '30',
+        'label' => ts('Last Name'),
+        'maxlength' => 64,
+      ],
+    ],
+    'do_not_email' => [
+      'title' => ts('Do Not Email'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '1.1',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Do Not Email'),
+      ],
+    ],
+    'do_not_phone' => [
+      'title' => ts('Do Not Phone'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '1.1',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Do Not Phone'),
+      ],
+    ],
+    'do_not_mail' => [
+      'title' => ts('Do Not Mail'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '1.1',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Do Not Mail'),
+      ],
+    ],
+    'do_not_sms' => [
+      'title' => ts('Do Not Sms'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '3.0',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Do Not Sms'),
+      ],
+    ],
+    'do_not_trade' => [
+      'title' => ts('Do Not Trade'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '1.1',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Do Not Trade'),
+      ],
+    ],
+    'is_opt_out' => [
+      'title' => ts('No Bulk Emails (User Opt Out)'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Has the contact opted out from receiving all bulk email from the organization or site domain?'),
+      'add' => '1.1',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Is Opt Out'),
+      ],
+    ],
+    'legal_identifier' => [
+      'title' => ts('Legal Identifier'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => 'Text',
+      'description' => ts('May be used for SSN, EIN/TIN, Household ID (census) or other applicable unique legal/government ID.'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Legal Identifier'),
+        'maxlength' => 32,
+      ],
+    ],
+    'sort_name' => [
+      'title' => ts('Sort Name'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'readonly' => TRUE,
+      'description' => ts('Name used for sorting different contact types'),
+      'add' => '1.1',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'size' => '30',
+        'maxlength' => 128,
+      ],
+    ],
+    'nick_name' => [
+      'title' => ts('Nickname'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Nickname.'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '30',
+        'maxlength' => 128,
+      ],
+    ],
+    'legal_name' => [
+      'title' => ts('Legal Name'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Legal Name.'),
+      'add' => '1.1',
+      'contact_type' => 'Organization',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '30',
+        'label' => ts('Legal Name'),
+        'maxlength' => 128,
+      ],
+    ],
+    'image_URL' => [
+      'title' => ts('Image Url'),
+      'sql_type' => 'text',
+      'input_type' => 'File',
+      'description' => ts('optional URL for preferred image (photo, logo, etc.) to display for this contact.'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '30',
+        'label' => ts('Image'),
+      ],
+    ],
+    'preferred_communication_method' => [
+      'title' => ts('Preferred Communication Method'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Select',
+      'description' => ts('What is the preferred mode of communication.'),
+      'add' => '1.1',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'multiple' => '1',
+        'maxlength' => 255,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'preferred_communication_method',
+      ],
+    ],
+    'preferred_language' => [
+      'title' => ts('Preferred Language'),
+      'sql_type' => 'varchar(5)',
+      'input_type' => 'Select',
+      'description' => ts('Which language is preferred for communication. FK to languages in civicrm_option_value.'),
+      'add' => '3.2',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 5,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'languages',
+        'key_column' => 'name',
+      ],
+    ],
+    'hash' => [
+      'title' => ts('Contact Hash'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('Key for validating requests related to this contact.'),
+      'add' => '1.1',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'maxlength' => 32,
+      ],
+    ],
+    'api_key' => [
+      'title' => ts('Api Key'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('API Key for validating requests related to this contact.'),
+      'add' => '2.2',
+      'permission' => [
+        [
+          'administer CiviCRM',
+          'edit api keys',
+        ],
+      ],
+      'input_attrs' => [
+        'label' => ts('API KEY'),
+        'maxlength' => 32,
+      ],
+    ],
+    'source' => [
+      'title' => ts('Contact Source'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('where contact come from, e.g. import, donate module insert...'),
+      'add' => '1.1',
+      'unique_name' => 'contact_source',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '30',
+        'maxlength' => 255,
+      ],
+    ],
+    'prefix_id' => [
+      'title' => ts('Individual Prefix'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Prefix or Title for name (Ms, Mr...). FK to prefix ID'),
+      'add' => '1.2',
+      'contact_type' => 'Individual',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'individual_prefix',
+      ],
+    ],
+    'suffix_id' => [
+      'title' => ts('Individual Suffix'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Suffix for name (Jr, Sr...). FK to suffix ID'),
+      'add' => '1.2',
+      'contact_type' => 'Individual',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'individual_suffix',
+      ],
+    ],
+    'formal_title' => [
+      'title' => ts('Formal Title'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Formal (academic or similar) title in front of name. (Prof., Dr. etc.)'),
+      'add' => '4.5',
+      'contact_type' => 'Individual',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Formal Title'),
+        'maxlength' => 64,
+      ],
+    ],
+    'communication_style_id' => [
+      'title' => ts('Communication Style'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Communication style (e.g. formal vs. familiar) to use with this contact. FK to communication styles in civicrm_option_value.'),
+      'add' => '4.4',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'communication_style',
+      ],
+    ],
+    'email_greeting_id' => [
+      'title' => ts('Email Greeting ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to civicrm_option_value.id, that has to be valid registered Email Greeting.'),
+      'add' => '3.0',
+      'usage' => [
+        'export',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'email_greeting',
+      ],
+    ],
+    'email_greeting_custom' => [
+      'title' => ts('Email Greeting Custom'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Custom Email Greeting.'),
+      'add' => '3.0',
+      'usage' => [
+        'import',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Email Greeting Custom'),
+        'maxlength' => 128,
+      ],
+    ],
+    'email_greeting_display' => [
+      'title' => ts('Email Greeting'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('Cache Email Greeting.'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'postal_greeting_id' => [
+      'title' => ts('Postal Greeting ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to civicrm_option_value.id, that has to be valid registered Postal Greeting.'),
+      'add' => '3.0',
+      'usage' => [
+        'export',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'postal_greeting',
+      ],
+    ],
+    'postal_greeting_custom' => [
+      'title' => ts('Postal Greeting Custom'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Custom Postal greeting.'),
+      'add' => '3.0',
+      'usage' => [
+        'import',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Postal Greeting Custom'),
+        'maxlength' => 128,
+      ],
+    ],
+    'postal_greeting_display' => [
+      'title' => ts('Postal Greeting'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('Cache Postal greeting.'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'addressee_id' => [
+      'title' => ts('Addressee ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to civicrm_option_value.id, that has to be valid registered Addressee.'),
+      'add' => '3.0',
+      'usage' => [
+        'export',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'addressee',
+      ],
+    ],
+    'addressee_custom' => [
+      'title' => ts('Addressee Custom'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Custom Addressee.'),
+      'add' => '3.0',
+      'usage' => [
+        'import',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Addressee Custom'),
+        'maxlength' => 128,
+      ],
+    ],
+    'addressee_display' => [
+      'title' => ts('Addressee'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('Cache Addressee.'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'job_title' => [
+      'title' => ts('Job Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Job Title'),
+      'add' => '1.1',
+      'contact_type' => 'Individual',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '30',
+        'label' => ts('Job Title'),
+        'maxlength' => 255,
+      ],
+    ],
+    'gender_id' => [
+      'title' => ts('Gender ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to gender ID'),
+      'add' => '1.2',
+      'contact_type' => 'Individual',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Gender'),
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'gender',
+      ],
+    ],
+    'birth_date' => [
+      'title' => ts('Birth Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('Date of birth'),
+      'add' => '1.1',
+      'contact_type' => 'Individual',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'birth',
+        'label' => ts('Birth Date'),
+      ],
+    ],
+    'is_deceased' => [
+      'title' => ts('Deceased'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '1.1',
+      'contact_type' => 'Individual',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Is Deceased'),
+      ],
+    ],
+    'deceased_date' => [
+      'title' => ts('Deceased Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('Date of deceased'),
+      'add' => '1.5',
+      'contact_type' => 'Individual',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'birth',
+        'label' => ts('Deceased Date'),
+      ],
+    ],
+    'household_name' => [
+      'title' => ts('Household Name'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Household Name.'),
+      'add' => '1.1',
+      'contact_type' => 'Household',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '30',
+        'label' => ts('Household Name'),
+        'maxlength' => 128,
+      ],
+    ],
+    'primary_contact_id' => [
+      'title' => ts('Household Primary Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('Optional FK to Primary Contact for this household.'),
+      'add' => '1.1',
+      'contact_type' => 'Household',
+      'input_attrs' => [
+        'label' => ts('Household Primary Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'sic_code' => [
+      'title' => ts('Sic Code'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Text',
+      'description' => ts('Standard Industry Classification Code.'),
+      'add' => '1.1',
+      'contact_type' => 'Organization',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('SIC Code'),
+        'maxlength' => 8,
+      ],
+    ],
+    'user_unique_id' => [
+      'title' => ts('Unique ID (OpenID)'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'deprecated' => TRUE,
+      'description' => ts('the OpenID (or OpenID-style http://username.domain/) unique identifier for this contact mainly used for logging in to CiviCRM'),
+      'add' => '2.0',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'employer_id' => [
+      'title' => ts('Current Employer ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('OPTIONAL FK to civicrm_contact record.'),
+      'add' => '2.1',
+      'unique_name' => 'current_employer_id',
+      'contact_type' => 'Individual',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'label' => ts('Current Employer'),
+        'filter' => 'contact_type=Organization',
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'is_deleted' => [
+      'title' => ts('Contact is in Trash'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '3.2',
+      'unique_name' => 'contact_is_deleted',
+      'default' => FALSE,
+      'usage' => [
+        'export',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Created Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'readonly' => TRUE,
+      'description' => ts('When was the contact was created.'),
+      'add' => '4.3',
+      'default' => NULL,
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+        'label' => ts('Created Date'),
+      ],
+    ],
+    'modified_date' => [
+      'title' => ts('Modified Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'readonly' => TRUE,
+      'description' => ts('When was the contact (or closely related entity) was created or modified or deleted.'),
+      'add' => '4.3',
+      'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+        'label' => ts('Modified Date'),
+      ],
+    ],
+    'preferred_mail_format' => [
+      'title' => ts('Preferred Mail Format'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'deprecated' => TRUE,
+      'description' => ts('Deprecated setting for text vs html mailings'),
+      'add' => '1.1',
+      'default' => 'Both',
+      'input_attrs' => [
+        'label' => ts('Preferred Mail Format'),
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::pmf',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contact/ContactType.entityType.php b/www/modules/civicrm/schema/Contact/ContactType.entityType.php
new file mode 100644
index 000000000..1d3b93d50
--- /dev/null
+++ b/www/modules/civicrm/schema/Contact/ContactType.entityType.php
@@ -0,0 +1,139 @@
+<?php
+
+return [
+  'name' => 'ContactType',
+  'table' => 'civicrm_contact_type',
+  'class' => 'CRM_Contact_DAO_ContactType',
+  'getInfo' => fn() => [
+    'title' => ts('Contact Type'),
+    'title_plural' => ts('Contact Types'),
+    'description' => ts('Provide type information for contacts'),
+    'add' => '3.1',
+    'label_field' => 'label',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/options/subtype/edit?action=add&reset=1',
+    'update' => 'civicrm/admin/options/subtype/edit?action=update&id=[id]&reset=1',
+    'delete' => 'civicrm/admin/options/subtype/edit?action=delete&id=[id]&reset=1',
+    'browse' => 'civicrm/admin/options/subtype',
+  ],
+  'getIndices' => fn() => [
+    'contact_type' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '3.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Contact Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Contact Type ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Internal name of Contact Type (or Subtype).'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'label' => ts('Name'),
+        'maxlength' => 64,
+      ],
+    ],
+    'label' => [
+      'title' => ts('Contact Type Label'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('localized Name of Contact Type.'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'label' => ts('Label'),
+        'maxlength' => 64,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Contact Type Description'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('localized Optional verbose description of the type.'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'rows' => 2,
+        'cols' => 60,
+      ],
+    ],
+    'image_URL' => [
+      'title' => ts('Contact Type Image URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('URL of image if any.'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'icon' => [
+      'title' => ts('Icon'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('crm-i icon class representing this contact type'),
+      'add' => '5.49',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'parent_id' => [
+      'title' => ts('Parent ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Optional FK to parent contact type.'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'label' => ts('Parent'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_contact_type',
+        'key_column' => 'id',
+        'label_column' => 'label',
+        'condition' => 'parent_id IS NULL',
+      ],
+      'entity_reference' => [
+        'entity' => 'ContactType',
+        'key' => 'id',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Contact Type Enabled'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this entry active?'),
+      'add' => '3.1',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_reserved' => [
+      'title' => ts('Contact Type is Reserved'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this contact type a predefined system type'),
+      'add' => '3.1',
+      'default' => FALSE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contact/DashboardContact.entityType.php b/www/modules/civicrm/schema/Contact/DashboardContact.entityType.php
new file mode 100644
index 000000000..420dde558
--- /dev/null
+++ b/www/modules/civicrm/schema/Contact/DashboardContact.entityType.php
@@ -0,0 +1,97 @@
+<?php
+
+return [
+  'name' => 'DashboardContact',
+  'table' => 'civicrm_dashboard_contact',
+  'class' => 'CRM_Contact_DAO_DashboardContact',
+  'getInfo' => fn() => [
+    'title' => ts('Dashboard Contact'),
+    'title_plural' => ts('Dashboard Contacts'),
+    'description' => ts('Table to store dashboard for each contact.'),
+    'add' => '3.1',
+  ],
+  'getIndices' => fn() => [
+    'index_dashboard_id_contact_id' => [
+      'fields' => [
+        'dashboard_id' => TRUE,
+        'contact_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '4.7',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Dashboard Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '3.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'dashboard_id' => [
+      'title' => ts('Dashboard ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Dashboard ID'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'label' => ts('Dashboard'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Dashboard',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Contact ID'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'column_no' => [
+      'title' => ts('Column No'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('column no for this widget'),
+      'add' => '3.1',
+      'default' => 0,
+      'input_attrs' => [
+        'label' => ts('Column Number'),
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Dashlet is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this widget active?'),
+      'add' => '3.1',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('Ordering of the widgets.'),
+      'add' => '3.1',
+      'default' => 0,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contact/Group.entityType.php b/www/modules/civicrm/schema/Contact/Group.entityType.php
new file mode 100644
index 000000000..416828b34
--- /dev/null
+++ b/www/modules/civicrm/schema/Contact/Group.entityType.php
@@ -0,0 +1,326 @@
+<?php
+
+return [
+  'name' => 'Group',
+  'table' => 'civicrm_group',
+  'class' => 'CRM_Contact_DAO_Group',
+  'getInfo' => fn() => [
+    'title' => ts('Group'),
+    'title_plural' => ts('Groups'),
+    'description' => ts('Provide grouping of related contacts'),
+    'log' => TRUE,
+    'add' => '1.1',
+    'icon' => 'fa-users',
+    'label_field' => 'title',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/group/add?reset=1',
+    'view' => 'civicrm/group/search?force=1&context=smog&gid=[id]&component_mode=1',
+    'update' => 'civicrm/group/edit?reset=1&action=update&id=[id]',
+    'delete' => 'civicrm/group/edit?reset=1&action=delete&id=[id]',
+    'browse' => 'civicrm/group',
+  ],
+  'getIndices' => fn() => [
+    'UI_cache_date' => [
+      'fields' => [
+        'cache_date' => TRUE,
+      ],
+      'add' => '5.34',
+    ],
+    'index_group_type' => [
+      'fields' => [
+        'group_type' => TRUE,
+      ],
+      'add' => '1.9',
+    ],
+    'UI_title' => [
+      'fields' => [
+        'title' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Group ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Group Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Internal name of Group.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'title' => [
+      'title' => ts('Group Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Name of Group.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Group Description'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Optional verbose description of the group.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'rows' => 2,
+        'cols' => 60,
+      ],
+    ],
+    'source' => [
+      'title' => ts('Group Source'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Module or process which created this group.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'saved_search_id' => [
+      'title' => ts('Saved Search ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to saved search table.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Saved Search'),
+      ],
+      'entity_reference' => [
+        'entity' => 'SavedSearch',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Group Enabled'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this group active?'),
+      'add' => '1.1',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'visibility' => [
+      'title' => ts('Group Visibility Setting'),
+      'sql_type' => 'varchar(24)',
+      'input_type' => 'Select',
+      'description' => ts('In what context(s) is this field visible.'),
+      'add' => '1.2',
+      'default' => 'User and User Admin Only',
+      'input_attrs' => [
+        'maxlength' => 24,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::groupVisibility',
+      ],
+    ],
+    'where_clause' => [
+      'title' => ts('Group Where Clause'),
+      'sql_type' => 'text',
+      'input_type' => NULL,
+      'deprecated' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('the sql where clause if a saved search acl'),
+      'add' => '1.6',
+    ],
+    'select_tables' => [
+      'title' => ts('Tables For Select Clause'),
+      'sql_type' => 'text',
+      'input_type' => NULL,
+      'deprecated' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('the tables to be included in a select data'),
+      'add' => '1.6',
+      'serialize' => CRM_Core_DAO::SERIALIZE_PHP,
+    ],
+    'where_tables' => [
+      'title' => ts('Tables For Where Clause'),
+      'sql_type' => 'text',
+      'input_type' => NULL,
+      'deprecated' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('the tables to be included in the count statement'),
+      'add' => '1.6',
+      'serialize' => CRM_Core_DAO::SERIALIZE_PHP,
+    ],
+    'group_type' => [
+      'title' => ts('Group Type'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Select',
+      'description' => ts('FK to group type'),
+      'add' => '1.9',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND,
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'group_type',
+      ],
+    ],
+    'cache_date' => [
+      'title' => ts('Group Cache Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('Date when we created the cache for a smart group'),
+      'add' => '2.1',
+    ],
+    'cache_fill_took' => [
+      'title' => ts('Seconds taken by last cache fill'),
+      'sql_type' => 'double',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('Seconds taken to fill smart group cache'),
+      'add' => '5.67',
+    ],
+    'refresh_date' => [
+      'title' => ts('Next Group Refresh Time'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'deprecated' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('Unused deprecated column.'),
+      'add' => '4.3',
+    ],
+    'parents' => [
+      'title' => ts('Group Parents'),
+      'sql_type' => 'text',
+      'input_type' => 'EntityRef',
+      'description' => ts('List of parent groups'),
+      'add' => '2.1',
+      'serialize' => CRM_Core_DAO::SERIALIZE_COMMA,
+      'input_attrs' => [
+        'label' => ts('Parent Groups'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_group',
+        'key_column' => 'id',
+        'name_column' => 'name',
+        'label_column' => 'title',
+        'prefetch' => 'disabled',
+      ],
+    ],
+    'children' => [
+      'title' => ts('Group Children'),
+      'sql_type' => 'text',
+      'input_type' => 'EntityRef',
+      'readonly' => TRUE,
+      'description' => ts('List of child groups (calculated)'),
+      'add' => '2.1',
+      'serialize' => CRM_Core_DAO::SERIALIZE_COMMA,
+      'input_attrs' => [
+        'label' => ts('Child Groups'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_group',
+        'key_column' => 'id',
+        'name_column' => 'name',
+        'label_column' => 'title',
+        'prefetch' => 'disabled',
+      ],
+    ],
+    'is_hidden' => [
+      'title' => ts('Group is Hidden'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this group hidden?'),
+      'add' => '2.2',
+      'default' => FALSE,
+    ],
+    'is_reserved' => [
+      'title' => ts('Group is Reserved'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '4.2',
+      'default' => FALSE,
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to contact table.'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'modified_id' => [
+      'title' => ts('Modified By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('FK to contact table.'),
+      'add' => '4.5',
+      'input_attrs' => [
+        'label' => ts('Modified By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'frontend_title' => [
+      'title' => ts('Public Group Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Alternative public title for this Group.'),
+      'add' => '5.31',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'frontend_description' => [
+      'title' => ts('Public Group Description'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Alternative public description of the group.'),
+      'add' => '5.31',
+      'default' => NULL,
+      'input_attrs' => [
+        'rows' => 2,
+        'cols' => 60,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contact/GroupContact.entityType.php b/www/modules/civicrm/schema/Contact/GroupContact.entityType.php
new file mode 100644
index 000000000..f0341720c
--- /dev/null
+++ b/www/modules/civicrm/schema/Contact/GroupContact.entityType.php
@@ -0,0 +1,115 @@
+<?php
+
+return [
+  'name' => 'GroupContact',
+  'table' => 'civicrm_group_contact',
+  'class' => 'CRM_Contact_DAO_GroupContact',
+  'getInfo' => fn() => [
+    'title' => ts('Group Contact'),
+    'title_plural' => ts('Group Contacts'),
+    'description' => ts('Join table sets membership for \'static\' groups. Also used to store \'opt-out\' entries for \'query\' type groups (status = \'OUT\')'),
+    'log' => TRUE,
+    'add' => '1.1',
+  ],
+  'getIndices' => fn() => [
+    'UI_contact_group' => [
+      'fields' => [
+        'contact_id' => TRUE,
+        'group_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '1.6',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Group Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('primary key'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'group_id' => [
+      'title' => ts('Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_group'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Group'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_group',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'Group',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_contact'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'status' => [
+      'title' => ts('Group Contact Status'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('status of contact relative to membership in group'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::groupContactStatus',
+      ],
+    ],
+    'location_id' => [
+      'title' => ts('Location ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Optional location to associate with this membership'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Location'),
+      ],
+      'entity_reference' => [
+        'entity' => 'LocBlock',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'email_id' => [
+      'title' => ts('Email ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Optional email to associate with this membership'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Email'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Email',
+        'key' => 'id',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contact/GroupContactCache.entityType.php b/www/modules/civicrm/schema/Contact/GroupContactCache.entityType.php
new file mode 100644
index 000000000..55cbb4cd1
--- /dev/null
+++ b/www/modules/civicrm/schema/Contact/GroupContactCache.entityType.php
@@ -0,0 +1,72 @@
+<?php
+
+return [
+  'name' => 'GroupContactCache',
+  'table' => 'civicrm_group_contact_cache',
+  'class' => 'CRM_Contact_DAO_GroupContactCache',
+  'getInfo' => fn() => [
+    'title' => ts('Group Contact Cache'),
+    'title_plural' => ts('Group Contact Caches'),
+    'description' => ts('Join table cache for \'static\' groups.'),
+    'add' => '2.1',
+  ],
+  'getIndices' => fn() => [
+    'UI_contact_group' => [
+      'fields' => [
+        'contact_id' => TRUE,
+        'group_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Group Contact Cache ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('primary key'),
+      'add' => '2.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'group_id' => [
+      'title' => ts('Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_group'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'label' => ts('Group'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_group',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'Group',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_contact'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contact/GroupNesting.entityType.php b/www/modules/civicrm/schema/Contact/GroupNesting.entityType.php
new file mode 100644
index 000000000..746f1a803
--- /dev/null
+++ b/www/modules/civicrm/schema/Contact/GroupNesting.entityType.php
@@ -0,0 +1,58 @@
+<?php
+
+return [
+  'name' => 'GroupNesting',
+  'table' => 'civicrm_group_nesting',
+  'class' => 'CRM_Contact_DAO_GroupNesting',
+  'getInfo' => fn() => [
+    'title' => ts('Group Nesting'),
+    'title_plural' => ts('Group Nestings'),
+    'description' => ts('Provide parent-child relationships for groups'),
+    'log' => TRUE,
+    'add' => '2.0',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Group Nesting ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Relationship ID'),
+      'add' => '2.0',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'child_group_id' => [
+      'title' => ts('Child Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('ID of the child group'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Child Group'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Group',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'parent_group_id' => [
+      'title' => ts('Parent Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('ID of the parent group'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Parent Group'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Group',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contact/GroupOrganization.entityType.php b/www/modules/civicrm/schema/Contact/GroupOrganization.entityType.php
new file mode 100644
index 000000000..f501381a1
--- /dev/null
+++ b/www/modules/civicrm/schema/Contact/GroupOrganization.entityType.php
@@ -0,0 +1,73 @@
+<?php
+
+return [
+  'name' => 'GroupOrganization',
+  'table' => 'civicrm_group_organization',
+  'class' => 'CRM_Contact_DAO_GroupOrganization',
+  'getInfo' => fn() => [
+    'title' => ts('Group Organization'),
+    'title_plural' => ts('Group Organizations'),
+    'description' => ts('Integrate Organization information into Groups'),
+    'log' => TRUE,
+    'add' => '2.0',
+  ],
+  'getIndices' => fn() => [
+    'UI_group_organization' => [
+      'fields' => [
+        'group_id' => TRUE,
+        'organization_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.0',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Group Organization ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Relationship ID'),
+      'add' => '2.0',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'group_id' => [
+      'title' => ts('Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('ID of the group'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Group'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_group',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'Group',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'organization_id' => [
+      'title' => ts('Organization ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('ID of the Organization Contact'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Organization'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contact/Relationship.entityType.php b/www/modules/civicrm/schema/Contact/Relationship.entityType.php
new file mode 100644
index 000000000..9fdc9f3d1
--- /dev/null
+++ b/www/modules/civicrm/schema/Contact/Relationship.entityType.php
@@ -0,0 +1,199 @@
+<?php
+
+return [
+  'name' => 'Relationship',
+  'table' => 'civicrm_relationship',
+  'class' => 'CRM_Contact_DAO_Relationship',
+  'getInfo' => fn() => [
+    'title' => ts('Relationship'),
+    'title_plural' => ts('Relationships'),
+    'description' => ts('Relationship between any 2 types of contacts.'),
+    'log' => TRUE,
+    'add' => '1.1',
+    'icon' => 'fa-handshake-o',
+  ],
+  'getPaths' => fn() => [
+    'view' => 'civicrm/contact/view/rel?action=view&reset=1&cid=[contact_id_a]&id=[id]',
+    'delete' => 'civicrm/contact/view/rel?action=delete&reset=1&cid=[contact_id_a]&id=[id]',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Relationship ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Relationship ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id_a' => [
+      'title' => ts('Contact A ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('id of the first contact'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Contact A'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'contact_id_b' => [
+      'title' => ts('Contact B ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('id of the second contact'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Contact B'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'relationship_type_id' => [
+      'title' => ts('Relationship Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Type of relationship'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Relationship Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_relationship_type',
+        'key_column' => 'id',
+        'name_column' => 'name_a_b',
+        'label_column' => 'label_a_b',
+      ],
+      'entity_reference' => [
+        'entity' => 'RelationshipType',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'start_date' => [
+      'title' => ts('Relationship Start Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('date when the relationship started'),
+      'add' => '1.1',
+      'unique_name' => 'relationship_start_date',
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'end_date' => [
+      'title' => ts('Relationship End Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('date when the relationship ended'),
+      'add' => '1.1',
+      'unique_name' => 'relationship_end_date',
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Relationship Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('is the relationship active ?'),
+      'add' => '1.1',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'description' => [
+      'title' => ts('Relationship Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Optional verbose description for the relationship.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_permission_a_b' => [
+      'title' => ts('Contact A has Permission Over Contact B'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Radio',
+      'required' => TRUE,
+      'description' => ts('Permission that Contact A has to view/update Contact B'),
+      'add' => '2.1',
+      'default' => 0,
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::getPermissionedRelationshipOptions',
+        'suffixes' => [
+          'name',
+          'label',
+          'icon',
+        ],
+      ],
+    ],
+    'is_permission_b_a' => [
+      'title' => ts('Contact B has Permission Over Contact A'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Radio',
+      'required' => TRUE,
+      'description' => ts('Permission that Contact B has to view/update Contact A'),
+      'add' => '2.1',
+      'default' => 0,
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::getPermissionedRelationshipOptions',
+        'suffixes' => [
+          'name',
+          'label',
+          'icon',
+        ],
+      ],
+    ],
+    'case_id' => [
+      'title' => ts('Case ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_case'),
+      'add' => '2.2',
+      'component' => 'CiviCase',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Case'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Case',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Created Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('Relationship created date.'),
+      'add' => '5.47',
+      'default' => 'CURRENT_TIMESTAMP',
+    ],
+    'modified_date' => [
+      'title' => ts('Relationship Modified Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('Relationship last modified.'),
+      'add' => '5.47',
+      'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contact/RelationshipCache.entityType.php b/www/modules/civicrm/schema/Contact/RelationshipCache.entityType.php
new file mode 100644
index 000000000..e0d5028c2
--- /dev/null
+++ b/www/modules/civicrm/schema/Contact/RelationshipCache.entityType.php
@@ -0,0 +1,231 @@
+<?php
+
+return [
+  'name' => 'RelationshipCache',
+  'table' => 'civicrm_relationship_cache',
+  'class' => 'CRM_Contact_DAO_RelationshipCache',
+  'getInfo' => fn() => [
+    'title' => ts('Related Contact'),
+    'title_plural' => ts('Related Contacts'),
+    'description' => ts('The cache permutes information from the relationship table to facilitate querying. Every relationship is mapped to multiple records in the cache. Joins should begin on the near side and extract info from the far side.'),
+    'log' => FALSE,
+    'add' => '5.29',
+    'icon' => 'fa-handshake-o',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/contact/view/rel?cid=[near_contact_id]&action=add&reset=1',
+    'view' => 'civicrm/contact/view/rel?action=view&reset=1&cid=[near_contact_id]&id=[relationship_id]',
+    'update' => 'civicrm/contact/view/rel?action=update&reset=1&cid=[near_contact_id]&id=[relationship_id]&rtype=[orientation]',
+    'delete' => 'civicrm/contact/view/rel?action=delete&reset=1&cid=[near_contact_id]&id=[relationship_id]',
+  ],
+  'getIndices' => fn() => [
+    'UI_relationship' => [
+      'fields' => [
+        'relationship_id' => TRUE,
+        'orientation' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '5.29',
+    ],
+    'index_nearid_nearrelation' => [
+      'fields' => [
+        'near_contact_id' => TRUE,
+        'near_relation' => TRUE,
+      ],
+      'add' => '5.29',
+    ],
+    'index_nearid_farrelation' => [
+      'fields' => [
+        'near_contact_id' => TRUE,
+        'far_relation' => TRUE,
+      ],
+      'add' => '5.29',
+    ],
+    'index_near_relation' => [
+      'fields' => [
+        'near_relation' => TRUE,
+      ],
+      'add' => '5.29',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Relationship Cache ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Relationship Cache ID'),
+      'add' => '5.29',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'relationship_id' => [
+      'title' => ts('Relationship ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('id of the relationship (FK to civicrm_relationship.id)'),
+      'add' => '5.29',
+      'input_attrs' => [
+        'label' => ts('Relationship'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Relationship',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'relationship_type_id' => [
+      'title' => ts('Relationship Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('id of the relationship type'),
+      'add' => '5.29',
+      'input_attrs' => [
+        'label' => ts('Relationship Type'),
+      ],
+      'entity_reference' => [
+        'entity' => 'RelationshipType',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'orientation' => [
+      'title' => ts('Orientation (a_b or b_a)'),
+      'sql_type' => 'char(3)',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('The cache record is a permutation of the original relationship record. The orientation indicates whether it is forward (a_b) or reverse (b_a) relationship.'),
+      'add' => '5.29',
+      'input_attrs' => [
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::relationshipOrientation',
+      ],
+    ],
+    'near_contact_id' => [
+      'title' => ts('Contact ID (Near side)'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('id of the first contact'),
+      'add' => '5.29',
+      'input_attrs' => [
+        'label' => ts('Contact (Near side)'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'near_relation' => [
+      'title' => ts('Relationship Name (to related contact)'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'readonly' => TRUE,
+      'description' => ts('name for relationship of near_contact to far_contact.'),
+      'add' => '5.29',
+      'input_attrs' => [
+        'label' => ts('Relationship to contact'),
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_PseudoConstant::relationshipTypeOptions',
+      ],
+    ],
+    'far_contact_id' => [
+      'title' => ts('Contact ID (Far side)'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('id of the second contact'),
+      'add' => '5.29',
+      'input_attrs' => [
+        'label' => ts('Contact (Far side)'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'far_relation' => [
+      'title' => ts('Relationship Name (from related contact)'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'readonly' => TRUE,
+      'description' => ts('name for relationship of far_contact to near_contact.'),
+      'add' => '5.29',
+      'input_attrs' => [
+        'label' => ts('Relationship from contact'),
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_PseudoConstant::relationshipTypeOptions',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Relationship Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('is the relationship active ?'),
+      'add' => '5.29',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'start_date' => [
+      'title' => ts('Relationship Start Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'readonly' => TRUE,
+      'description' => ts('date when the relationship started'),
+      'add' => '5.29',
+      'unique_name' => 'relationship_start_date',
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'end_date' => [
+      'title' => ts('Relationship End Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'readonly' => TRUE,
+      'description' => ts('date when the relationship ended'),
+      'add' => '5.29',
+      'unique_name' => 'relationship_end_date',
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'case_id' => [
+      'title' => ts('Case ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'readonly' => TRUE,
+      'description' => ts('FK to civicrm_case'),
+      'add' => '5.44',
+      'component' => 'CiviCase',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Case'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Case',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contact/RelationshipType.entityType.php b/www/modules/civicrm/schema/Contact/RelationshipType.entityType.php
new file mode 100644
index 000000000..686bf281e
--- /dev/null
+++ b/www/modules/civicrm/schema/Contact/RelationshipType.entityType.php
@@ -0,0 +1,188 @@
+<?php
+
+return [
+  'name' => 'RelationshipType',
+  'table' => 'civicrm_relationship_type',
+  'class' => 'CRM_Contact_DAO_RelationshipType',
+  'getInfo' => fn() => [
+    'title' => ts('Relationship Type'),
+    'title_plural' => ts('Relationship Types'),
+    'description' => ts('Relationship types s/b structured with contact_a as the \'subject/child\' contact and contact_b as the \'object/parent\' contact (e.g. Individual A is Employee of Org B).'),
+    'log' => TRUE,
+    'add' => '1.1',
+    'label_field' => 'label_a_b',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/reltype/edit?action=add&reset=1',
+    'view' => 'civicrm/admin/reltype/edit?action=view&id=[id]&reset=1',
+    'update' => 'civicrm/admin/reltype/edit?action=update&id=[id]&reset=1',
+    'delete' => 'civicrm/admin/reltype/edit?action=delete&id=[id]&reset=1',
+    'browse' => 'civicrm/admin/reltype',
+  ],
+  'getIndices' => fn() => [
+    'UI_name_a_b' => [
+      'fields' => [
+        'name_a_b' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+    'UI_name_b_a' => [
+      'fields' => [
+        'name_b_a' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Relationship Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Primary key'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name_a_b' => [
+      'title' => ts('Relationship Type Name A to B'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('name for relationship of contact_a to contact_b.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'label_a_b' => [
+      'title' => ts('Relationship Type Label A to B'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('label for relationship of contact_a to contact_b.'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'name_b_a' => [
+      'title' => ts('Relationship Type Name B to A'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Optional name for relationship of contact_b to contact_a.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'label_b_a' => [
+      'title' => ts('Relationship Type Label B to A'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Optional label for relationship of contact_b to contact_a.'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Relationship Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Optional verbose description of the relationship type.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'contact_type_a' => [
+      'title' => ts('Contact Type for Contact A'),
+      'sql_type' => 'varchar(12)',
+      'input_type' => 'Select',
+      'description' => ts('If defined, contact_a in a relationship of this type must be a specific contact_type.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 12,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_contact_type',
+        'key_column' => 'name',
+        'label_column' => 'label',
+        'condition' => 'parent_id IS NULL',
+      ],
+    ],
+    'contact_type_b' => [
+      'title' => ts('Contact Type for Contact B'),
+      'sql_type' => 'varchar(12)',
+      'input_type' => 'Select',
+      'description' => ts('If defined, contact_b in a relationship of this type must be a specific contact_type.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 12,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_contact_type',
+        'key_column' => 'name',
+        'label_column' => 'label',
+        'condition' => 'parent_id IS NULL',
+      ],
+    ],
+    'contact_sub_type_a' => [
+      'title' => ts('Contact Subtype A'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('If defined, contact_sub_type_a in a relationship of this type must be a specific contact_sub_type.'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_contact_type',
+        'key_column' => 'name',
+        'label_column' => 'label',
+        'condition' => 'parent_id IS NOT NULL',
+      ],
+    ],
+    'contact_sub_type_b' => [
+      'title' => ts('Contact Subtype B'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('If defined, contact_sub_type_b in a relationship of this type must be a specific contact_sub_type.'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_contact_type',
+        'key_column' => 'name',
+        'label_column' => 'label',
+        'condition' => 'parent_id IS NOT NULL',
+      ],
+    ],
+    'is_reserved' => [
+      'title' => ts('Relationship Type is Reserved'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this relationship type a predefined system type (can not be changed or de-activated)?'),
+      'add' => '1.1',
+      'default' => FALSE,
+    ],
+    'is_active' => [
+      'title' => ts('Relationship Type is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this relationship type currently active (i.e. can be used when creating or editing relationships)?'),
+      'add' => '1.1',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contact/SavedSearch.entityType.php b/www/modules/civicrm/schema/Contact/SavedSearch.entityType.php
new file mode 100644
index 000000000..d9a112d8f
--- /dev/null
+++ b/www/modules/civicrm/schema/Contact/SavedSearch.entityType.php
@@ -0,0 +1,190 @@
+<?php
+
+return [
+  'name' => 'SavedSearch',
+  'table' => 'civicrm_saved_search',
+  'class' => 'CRM_Contact_DAO_SavedSearch',
+  'getInfo' => fn() => [
+    'title' => ts('Saved Search'),
+    'title_plural' => ts('Saved Searches'),
+    'description' => ts('Users can save their complex SQL queries and use them later.'),
+    'add' => '1.1',
+    'icon' => 'fa-search-plus',
+    'label_field' => 'label',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '5.32',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Saved Search ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Saved Search ID'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('ID'),
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Saved Search Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Unique name of saved search'),
+      'add' => '1.0',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Name'),
+        'maxlength' => 255,
+      ],
+    ],
+    'label' => [
+      'title' => ts('Saved Search Label'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Administrative label for search'),
+      'add' => '5.32',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Label'),
+        'maxlength' => 255,
+      ],
+    ],
+    'form_values' => [
+      'title' => ts('Submitted Form Values'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Submitted form values for this search'),
+      'add' => '1.1',
+      'serialize' => CRM_Core_DAO::SERIALIZE_PHP,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'mapping_id' => [
+      'title' => ts('Mapping ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Foreign key to civicrm_mapping used for saved search-builder searches.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('Mapping'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Mapping',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'search_custom_id' => [
+      'title' => ts('Option Value ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Foreign key to civicrm_option value table used for saved custom searches.'),
+      'add' => '2.0',
+    ],
+    'api_entity' => [
+      'title' => ts('Entity Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Select',
+      'description' => ts('Entity name for API based search'),
+      'add' => '5.24',
+      'input_attrs' => [
+        'label' => ts('For'),
+        'maxlength' => 255,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Contact_BAO_SavedSearch::getApiEntityOptions',
+      ],
+    ],
+    'api_params' => [
+      'title' => ts('API Parameters'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Parameters for API based search'),
+      'add' => '5.24',
+      'serialize' => CRM_Core_DAO::SERIALIZE_JSON,
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('FK to contact table.'),
+      'add' => '5.36',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'modified_id' => [
+      'title' => ts('Modified By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('FK to contact table.'),
+      'add' => '5.36',
+      'input_attrs' => [
+        'label' => ts('Modified By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'expires_date' => [
+      'title' => ts('Search Expiry Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('Optional date after which the search is not needed'),
+      'add' => '5.36',
+    ],
+    'created_date' => [
+      'title' => ts('Created Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('When the search was created.'),
+      'add' => '5.36',
+      'default' => 'CURRENT_TIMESTAMP',
+    ],
+    'modified_date' => [
+      'title' => ts('Modified Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('When the search was last modified.'),
+      'add' => '5.36',
+      'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+    ],
+    'description' => [
+      'title' => ts('Saved Search Description'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'add' => '5.36',
+      'input_attrs' => [
+        'label' => ts('Description'),
+        'rows' => 2,
+        'cols' => 60,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contact/SubscriptionHistory.entityType.php b/www/modules/civicrm/schema/Contact/SubscriptionHistory.entityType.php
new file mode 100644
index 000000000..fa764eca5
--- /dev/null
+++ b/www/modules/civicrm/schema/Contact/SubscriptionHistory.entityType.php
@@ -0,0 +1,111 @@
+<?php
+
+return [
+  'name' => 'SubscriptionHistory',
+  'table' => 'civicrm_subscription_history',
+  'class' => 'CRM_Contact_DAO_SubscriptionHistory',
+  'getInfo' => fn() => [
+    'title' => ts('Subscription History'),
+    'title_plural' => ts('Subscription Histories'),
+    'description' => ts('History information of subscribe/unsubscribe actions'),
+    'log' => TRUE,
+    'add' => '1.1',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Group Membership History ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Internal ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Contact ID'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'group_id' => [
+      'title' => ts('Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Group ID'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Group'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_group',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'Group',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'date' => [
+      'title' => ts('Group Membership Action Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'required' => TRUE,
+      'description' => ts('Date of the (un)subscription'),
+      'add' => '1.1',
+      'default' => 'CURRENT_TIMESTAMP',
+      'input_attrs' => [
+        'label' => ts('Group Membership Action Date'),
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'method' => [
+      'title' => ts('Group Membership Action'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('How the (un)subscription was triggered'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::getSubscriptionHistoryMethods',
+      ],
+    ],
+    'status' => [
+      'title' => ts('Group Membership Status'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('The state of the contact within the group'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::groupContactStatus',
+      ],
+    ],
+    'tracking' => [
+      'title' => ts('Group Membership Tracking'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('IP address or other tracking info'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contribute/Contribution.entityType.php b/www/modules/civicrm/schema/Contribute/Contribution.entityType.php
new file mode 100644
index 000000000..49712fc05
--- /dev/null
+++ b/www/modules/civicrm/schema/Contribute/Contribution.entityType.php
@@ -0,0 +1,606 @@
+<?php
+
+return [
+  'name' => 'Contribution',
+  'table' => 'civicrm_contribution',
+  'class' => 'CRM_Contribute_DAO_Contribution',
+  'getInfo' => fn() => [
+    'title' => ts('Contribution'),
+    'title_plural' => ts('Contributions'),
+    'description' => ts('Financial records consisting of transactions, line-items, etc.'),
+    'log' => TRUE,
+    'add' => '1.3',
+    'icon' => 'fa-credit-card',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/contribute/add?reset=1&action=add&context=standalone',
+    'view' => 'civicrm/contact/view/contribution?reset=1&action=view&id=[id]',
+    'update' => 'civicrm/contact/view/contribution?reset=1&action=update&id=[id]',
+    'delete' => 'civicrm/contact/view/contribution?reset=1&action=delete&id=[id]',
+  ],
+  'getIndices' => fn() => [
+    'UI_contrib_payment_instrument_id' => [
+      'fields' => [
+        'payment_instrument_id' => TRUE,
+      ],
+      'add' => '1.6',
+    ],
+    'index_total_amount_receive_date' => [
+      'fields' => [
+        'total_amount' => TRUE,
+        'receive_date' => TRUE,
+      ],
+      'add' => '4.7',
+    ],
+    'index_source' => [
+      'fields' => [
+        'source' => TRUE,
+      ],
+      'add' => '4.7',
+    ],
+    'UI_contrib_trxn_id' => [
+      'fields' => [
+        'trxn_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+    'UI_contrib_invoice_id' => [
+      'fields' => [
+        'invoice_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+    'index_contribution_status' => [
+      'fields' => [
+        'contribution_status_id' => TRUE,
+      ],
+      'add' => '1.6',
+    ],
+    'received_date' => [
+      'fields' => [
+        'receive_date' => TRUE,
+      ],
+      'add' => '1.6',
+    ],
+    'check_number' => [
+      'fields' => [
+        'check_number' => TRUE,
+      ],
+      'add' => '2.2',
+    ],
+    'index_creditnote_id' => [
+      'fields' => [
+        'creditnote_id' => TRUE,
+      ],
+      'add' => '4.7',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Contribution ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Contribution ID'),
+      'add' => '1.3',
+      'unique_name' => 'contribution_id',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Contact ID'),
+      'add' => '1.3',
+      'unique_name' => 'contribution_contact_id',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'financial_type_id' => [
+      'title' => ts('Financial Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to Financial Type for (total_amount - non_deductible_amount).'),
+      'add' => '4.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Financial Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_type',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialType',
+        'key' => 'id',
+      ],
+    ],
+    'contribution_page_id' => [
+      'title' => ts('Contribution Page ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('The Contribution Page which triggered this contribution'),
+      'add' => '1.5',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Contribution Page'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_contribution_page',
+        'key_column' => 'id',
+        'name_column' => 'name',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'ContributionPage',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'payment_instrument_id' => [
+      'title' => ts('Payment Method ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to Payment Instrument'),
+      'add' => '1.3',
+      'unique_name' => 'payment_instrument_id',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Payment Method'),
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'payment_instrument',
+      ],
+    ],
+    'receive_date' => [
+      'title' => ts('Contribution Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'add' => '1.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'non_deductible_amount' => [
+      'title' => ts('Non-deductible Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'description' => ts('Portion of total amount which is NOT tax deductible. Equal to total_amount for non-deductible financial types.'),
+      'add' => '1.3',
+      'default' => '0',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'total_amount' => [
+      'title' => ts('Total Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Total amount of this contribution. Use market value for non-monetary gifts.'),
+      'add' => '1.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Total Amount'),
+      ],
+    ],
+    'fee_amount' => [
+      'title' => ts('Fee Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'description' => ts('actual processor fee if known - may be 0.'),
+      'add' => '1.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Fee Amount'),
+      ],
+    ],
+    'net_amount' => [
+      'title' => ts('Net Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'description' => ts('actual funds transfer amount. total less fees. if processor does not report actual fee during transaction, this is set to total_amount.'),
+      'add' => '1.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Net Amount'),
+      ],
+    ],
+    'trxn_id' => [
+      'title' => ts('Transaction ID'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'readonly' => TRUE,
+      'description' => ts('unique transaction id. may be processor id, bank id + trans id, or account number + check number... depending on payment_method'),
+      'add' => '1.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'invoice_id' => [
+      'title' => ts('Invoice Reference'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'readonly' => TRUE,
+      'description' => ts('unique invoice id, system generated or passed in'),
+      'add' => '1.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'invoice_number' => [
+      'title' => ts('Invoice Number'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Human readable invoice number'),
+      'add' => '4.7',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'currency' => [
+      'title' => ts('Currency'),
+      'sql_type' => 'varchar(3)',
+      'input_type' => 'Select',
+      'description' => ts('3 character string, value from config setting or input via user.'),
+      'add' => '1.3',
+      'default' => NULL,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Currency'),
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_currency',
+        'key_column' => 'name',
+        'label_column' => 'full_name',
+        'name_column' => 'name',
+        'abbr_column' => 'symbol',
+      ],
+    ],
+    'cancel_date' => [
+      'title' => ts('Cancelled / Refunded Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('when was gift cancelled'),
+      'add' => '1.3',
+      'unique_name' => 'contribution_cancel_date',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'cancel_reason' => [
+      'title' => ts('Cancellation / Refund Reason'),
+      'sql_type' => 'text',
+      'input_type' => 'Text',
+      'add' => '1.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '40',
+      ],
+    ],
+    'receipt_date' => [
+      'title' => ts('Receipt Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('when (if) receipt was sent. populated automatically for online donations w/ automatic receipting'),
+      'add' => '1.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+        'label' => ts('Receipt Date'),
+      ],
+    ],
+    'thankyou_date' => [
+      'title' => ts('Thank-you Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('when (if) was donor thanked'),
+      'add' => '1.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'source' => [
+      'title' => ts('Contribution Source'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Origin of this Contribution.'),
+      'add' => '1.3',
+      'unique_name' => 'contribution_source',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'amount_level' => [
+      'title' => ts('Amount Label'),
+      'sql_type' => 'text',
+      'input_type' => 'Text',
+      'add' => '1.7',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'contribution_recur_id' => [
+      'title' => ts('Recurring Contribution ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'readonly' => TRUE,
+      'description' => ts('Conditional foreign key to civicrm_contribution_recur id. Each contribution made in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events.'),
+      'add' => '1.4',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'label' => ts('Recurring Contribution'),
+      ],
+      'entity_reference' => [
+        'entity' => 'ContributionRecur',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'is_test' => [
+      'title' => ts('Test'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'is_pay_later' => [
+      'title' => ts('Is Pay Later'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '2.1',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'contribution_status_id' => [
+      'title' => ts('Contribution Status ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'add' => '1.6',
+      'default' => 1,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Contribution Status'),
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'contribution_status',
+      ],
+    ],
+    'address_id' => [
+      'title' => ts('Address ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Conditional foreign key to civicrm_address.id. We insert an address record for each contribution when we have associated billing name and address data.'),
+      'add' => '2.2',
+      'unique_name' => 'contribution_address_id',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'label' => ts('Address'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Address',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'check_number' => [
+      'title' => ts('Check Number'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '2.2',
+      'unique_name' => 'contribution_check_number',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '6',
+        'maxlength' => 255,
+      ],
+    ],
+    'campaign_id' => [
+      'title' => ts('Campaign ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('The campaign for which this contribution has been triggered.'),
+      'add' => '3.4',
+      'unique_name' => 'contribution_campaign_id',
+      'component' => 'CiviCampaign',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Campaign'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_campaign',
+        'key_column' => 'id',
+        'label_column' => 'title',
+        'prefetch' => 'disabled',
+      ],
+      'entity_reference' => [
+        'entity' => 'Campaign',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'creditnote_id' => [
+      'title' => ts('Credit Note ID'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('unique credit note id, system generated or passed in'),
+      'add' => '4.6',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'tax_amount' => [
+      'title' => ts('Tax Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Total tax amount of this contribution.'),
+      'add' => '4.6',
+      'default' => '0',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'revenue_recognition_date' => [
+      'title' => ts('Revenue Recognition Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Stores the date when revenue should be recognized.'),
+      'add' => '4.7',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+        'label' => ts('Revenue Recognition Date'),
+      ],
+    ],
+    'is_template' => [
+      'title' => ts('Is a Template Contribution'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('Shows this is a template for recurring contributions.'),
+      'add' => '5.20',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contribute/ContributionPage.entityType.php b/www/modules/civicrm/schema/Contribute/ContributionPage.entityType.php
new file mode 100644
index 000000000..23165b3d2
--- /dev/null
+++ b/www/modules/civicrm/schema/Contribute/ContributionPage.entityType.php
@@ -0,0 +1,538 @@
+<?php
+
+return [
+  'name' => 'ContributionPage',
+  'table' => 'civicrm_contribution_page',
+  'class' => 'CRM_Contribute_DAO_ContributionPage',
+  'getInfo' => fn() => [
+    'title' => ts('Contribution Page'),
+    'title_plural' => ts('Contribution Pages'),
+    'description' => ts('A Contribution object store meta information about a single customized contribution page'),
+    'log' => TRUE,
+    'add' => '1.3',
+    'label_field' => 'title',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/contribute/add?reset=1&action=add',
+    'update' => 'civicrm/admin/contribute/settings?reset=1&action=update&id=[id]',
+    'delete' => 'civicrm/admin/contribute/manage?reset=1&action=delete&id=[id]',
+    'browse' => 'civicrm/admin/contribute',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Contribution Page ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Contribution ID'),
+      'add' => '1.3',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'title' => [
+      'title' => ts('Page Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Contribution Page title. For top of page display'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'frontend_title' => [
+      'title' => ts('Public Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Contribution Page Public title'),
+      'add' => '5.20',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'name' => [
+      'title' => ts('Unique Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Unique name for identifying contribution page'),
+      'add' => '5.63',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'intro_text' => [
+      'title' => ts('Contribution Page Introduction Text'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('Text and html allowed. Displayed below title.'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'rows' => 6,
+        'cols' => 50,
+      ],
+    ],
+    'financial_type_id' => [
+      'title' => ts('Financial Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('default financial type assigned to contributions submitted via this page, e.g. Contribution, Campaign Contribution'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Financial Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_type',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialType',
+        'key' => 'id',
+      ],
+    ],
+    'payment_processor' => [
+      'title' => ts('Payment Processor'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Select',
+      'description' => ts('Payment Processors configured for this contribution Page'),
+      'add' => '1.8',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED,
+      'input_attrs' => [
+        'label' => ts('Payment Processors'),
+        'maxlength' => 128,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_payment_processor',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+    ],
+    'is_credit_card_only' => [
+      'title' => ts('Is Credit Card Only?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if true - processing logic must reject transaction at confirmation stage if pay method != credit card'),
+      'add' => '1.3',
+      'default' => FALSE,
+    ],
+    'is_monetary' => [
+      'title' => ts('Is Monetary'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if true - allows real-time monetary transactions otherwise non-monetary transactions'),
+      'add' => '1.6',
+      'default' => TRUE,
+    ],
+    'is_recur' => [
+      'title' => ts('Is Recurring'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if true - allows recurring contributions, valid only for PayPal_Standard'),
+      'add' => '1.6',
+      'default' => FALSE,
+    ],
+    'is_confirm_enabled' => [
+      'title' => ts('Confirmation Page?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if FALSE, the confirm page in contribution pages gets skipped'),
+      'add' => '4.2',
+      'default' => TRUE,
+    ],
+    'recur_frequency_unit' => [
+      'title' => ts('Recurring Frequency'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Select',
+      'description' => ts('Supported recurring frequency units.'),
+      'add' => '2.1',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED,
+      'input_attrs' => [
+        'multiple' => '1',
+        'maxlength' => 128,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'recur_frequency_units',
+        'key_column' => 'name',
+      ],
+    ],
+    'is_recur_interval' => [
+      'title' => ts('Support Recurring Intervals'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if true - supports recurring intervals'),
+      'add' => '2.1',
+      'default' => FALSE,
+    ],
+    'is_recur_installments' => [
+      'title' => ts('Recurring Installments?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if true - asks user for recurring installments'),
+      'add' => '4.3',
+      'default' => FALSE,
+    ],
+    'adjust_recur_start_date' => [
+      'title' => ts('Adjust Recurring Start Date'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if true - user is able to adjust payment start date'),
+      'add' => '4.7',
+      'default' => FALSE,
+    ],
+    'is_pay_later' => [
+      'title' => ts('Pay Later'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if true - allows the user to send payment directly to the org later'),
+      'add' => '2.0',
+      'default' => FALSE,
+    ],
+    'pay_later_text' => [
+      'title' => ts('Pay Later Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('The text displayed to the user in the main form'),
+      'add' => '2.0',
+    ],
+    'pay_later_receipt' => [
+      'title' => ts('Pay Later Receipt'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('The receipt sent to the user instead of the normal receipt text'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'rows' => 8,
+        'cols' => 60,
+      ],
+    ],
+    'is_partial_payment' => [
+      'title' => ts('Allow Partial Payment'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'description' => ts('is partial payment enabled for this online contribution page'),
+      'add' => '4.3',
+      'default' => FALSE,
+    ],
+    'initial_amount_label' => [
+      'title' => ts('Initial Amount Label'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Initial amount label for partial payment'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Initial Amount Label'),
+        'maxlength' => 255,
+      ],
+    ],
+    'initial_amount_help_text' => [
+      'title' => ts('Initial Amount Help Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Initial amount help text for partial payment'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Initial Amount Help Text'),
+      ],
+    ],
+    'min_initial_amount' => [
+      'title' => ts('Min Initial Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'description' => ts('Minimum initial amount for partial payment'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Min. Initial Amount'),
+      ],
+    ],
+    'is_allow_other_amount' => [
+      'title' => ts('Allow Other Amounts'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if TRUE, page will include an input text field where user can enter their own amount'),
+      'add' => '1.3',
+      'default' => FALSE,
+    ],
+    'default_amount_id' => [
+      'title' => ts('Default Amount'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('FK to civicrm_option_value.'),
+      'add' => '1.7',
+    ],
+    'min_amount' => [
+      'title' => ts('Minimum Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'description' => ts('if other amounts allowed, user can configure minimum allowed.'),
+      'add' => '1.3',
+    ],
+    'max_amount' => [
+      'title' => ts('Maximum Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'description' => ts('if other amounts allowed, user can configure maximum allowed.'),
+      'add' => '1.3',
+    ],
+    'goal_amount' => [
+      'title' => ts('Goal Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'description' => ts('The target goal for this page, allows people to build a goal meter'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('Goal Amount'),
+      ],
+    ],
+    'thankyou_title' => [
+      'title' => ts('Thank-you Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Title for Thank-you page (header title tag, and display at the top of the page).'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'thankyou_text' => [
+      'title' => ts('Thank-you Text'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('text and html allowed. displayed above result on success page'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'rows' => 8,
+        'cols' => 60,
+      ],
+    ],
+    'thankyou_footer' => [
+      'title' => ts('Thank-you Footer'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('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.'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'rows' => 8,
+        'cols' => 60,
+      ],
+    ],
+    'is_email_receipt' => [
+      'title' => ts('Send email Receipt'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if TRUE, receipt is automatically emailed to contact on success'),
+      'add' => '1.3',
+      'default' => FALSE,
+    ],
+    'receipt_from_name' => [
+      'title' => ts('Receipt From'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('FROM email name used for receipts generated by contributions to this contribution page.'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'receipt_from_email' => [
+      'title' => ts('Receipt From email'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('FROM email address used for receipts generated by contributions to this contribution page.'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'cc_receipt' => [
+      'title' => ts('Receipt cc'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('comma-separated list of email addresses to cc each time a receipt is sent'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'bcc_receipt' => [
+      'title' => ts('Receipt bcc'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('comma-separated list of email addresses to bcc each time a receipt is sent'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'receipt_text' => [
+      'title' => ts('Receipt Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('text to include above standard receipt info on receipt email. emails are text-only, so do not allow html for now'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'rows' => 6,
+        'cols' => 50,
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Is Page Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this page active?'),
+      'add' => '1.3',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'footer_text' => [
+      'title' => ts('Footer Text'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('Text and html allowed. Displayed at the bottom of the first page of the contribution wizard.'),
+      'add' => '1.4',
+      'input_attrs' => [
+        'rows' => 6,
+        'cols' => 50,
+      ],
+    ],
+    'amount_block_is_active' => [
+      'title' => ts('Is Amount Block Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this property active?'),
+      'add' => '1.5',
+      'default' => TRUE,
+    ],
+    'start_date' => [
+      'title' => ts('Contribution Page Start Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time that this page starts.'),
+      'add' => '1.8',
+    ],
+    'end_date' => [
+      'title' => ts('Contribution Page End Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time that this page ends. May be NULL if no defined end date/time'),
+      'add' => '1.8',
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_contact, who created this contribution page'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Contribution Page Created Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time that contribution page was created.'),
+      'add' => '3.0',
+    ],
+    'currency' => [
+      'title' => ts('Contribution Page Currency'),
+      'sql_type' => 'varchar(3)',
+      'input_type' => 'Select',
+      'description' => ts('3 character string, value from config setting or input via user.'),
+      'add' => '3.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_currency',
+        'key_column' => 'name',
+        'label_column' => 'full_name',
+        'name_column' => 'name',
+        'abbr_column' => 'symbol',
+      ],
+    ],
+    'campaign_id' => [
+      'title' => ts('Campaign ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('The campaign for which we are collecting contributions with this page.'),
+      'add' => '3.4',
+      'component' => 'CiviCampaign',
+      'input_attrs' => [
+        'label' => ts('Campaign'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_campaign',
+        'key_column' => 'id',
+        'label_column' => 'title',
+        'prefetch' => 'disabled',
+      ],
+      'entity_reference' => [
+        'entity' => 'Campaign',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'is_share' => [
+      'title' => ts('Is Contribution Page Shared?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Can people share the contribution page through social media?'),
+      'add' => '4.1',
+      'default' => TRUE,
+    ],
+    'is_billing_required' => [
+      'title' => ts('Is billing block required'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if true - billing block is required for online contribution page'),
+      'add' => '4.6',
+      'default' => FALSE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contribute/ContributionProduct.entityType.php b/www/modules/civicrm/schema/Contribute/ContributionProduct.entityType.php
new file mode 100644
index 000000000..caedaa78b
--- /dev/null
+++ b/www/modules/civicrm/schema/Contribute/ContributionProduct.entityType.php
@@ -0,0 +1,136 @@
+<?php
+
+return [
+  'name' => 'ContributionProduct',
+  'table' => 'civicrm_contribution_product',
+  'class' => 'CRM_Contribute_DAO_ContributionProduct',
+  'getInfo' => fn() => [
+    'title' => ts('Contribution Product'),
+    'title_plural' => ts('Contribution Products'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '1.4',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Contribution Product ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '1.4',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'product_id' => [
+      'title' => ts('Product ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'add' => '1.4',
+      'entity_reference' => [
+        'entity' => 'Product',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'contribution_id' => [
+      'title' => ts('Contribution ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'add' => '1.4',
+      'input_attrs' => [
+        'label' => ts('Contribution'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contribution',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'product_option' => [
+      'title' => ts('Product Option'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Option value selected if applicable - e.g. color, size etc.'),
+      'add' => '1.4',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'quantity' => [
+      'title' => ts('Quantity'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'add' => '1.4',
+      'usage' => [
+        'export',
+      ],
+    ],
+    'fulfilled_date' => [
+      'title' => ts('Fulfilled Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('Optional. Can be used to record the date this product was fulfilled or shipped.'),
+      'add' => '1.4',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'start_date' => [
+      'title' => ts('Start date for premium'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('Actual start date for a time-delimited premium (subscription, service or membership)'),
+      'add' => '1.4',
+      'unique_name' => 'contribution_start_date',
+      'usage' => [
+        'export',
+      ],
+    ],
+    'end_date' => [
+      'title' => ts('End date for premium'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('Actual end date for a time-delimited premium (subscription, service or membership)'),
+      'add' => '1.4',
+      'unique_name' => 'contribution_end_date',
+      'usage' => [
+        'export',
+      ],
+    ],
+    'comment' => [
+      'title' => ts('Premium comment'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'add' => '1.4',
+    ],
+    'financial_type_id' => [
+      'title' => ts('Financial Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Financial Type(for membership price sets only).'),
+      'add' => '4.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Financial Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_type',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialType',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contribute/ContributionRecur.entityType.php b/www/modules/civicrm/schema/Contribute/ContributionRecur.entityType.php
new file mode 100644
index 000000000..676f4b45c
--- /dev/null
+++ b/www/modules/civicrm/schema/Contribute/ContributionRecur.entityType.php
@@ -0,0 +1,419 @@
+<?php
+
+return [
+  'name' => 'ContributionRecur',
+  'table' => 'civicrm_contribution_recur',
+  'class' => 'CRM_Contribute_DAO_ContributionRecur',
+  'getInfo' => fn() => [
+    'title' => ts('Recurring Contribution'),
+    'title_plural' => ts('Recurring Contributions'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '1.6',
+  ],
+  'getIndices' => fn() => [
+    'UI_contrib_trxn_id' => [
+      'fields' => [
+        'trxn_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+    'UI_contrib_invoice_id' => [
+      'fields' => [
+        'invoice_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+    'index_contribution_status' => [
+      'fields' => [
+        'contribution_status_id' => TRUE,
+      ],
+      'add' => '1.6',
+    ],
+    'UI_contribution_recur_payment_instrument_id' => [
+      'fields' => [
+        'payment_instrument_id' => TRUE,
+      ],
+      'add' => '4.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Recurring Contribution ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Contribution Recur ID'),
+      'add' => '1.6',
+      'unique_name' => 'contribution_recur_id',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Foreign key to civicrm_contact.id.'),
+      'add' => '1.6',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'amount' => [
+      'title' => ts('Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Amount to be collected (including any sales tax) by payment processor each recurrence.'),
+      'add' => '1.6',
+    ],
+    'currency' => [
+      'title' => ts('Currency'),
+      'sql_type' => 'varchar(3)',
+      'input_type' => 'Select',
+      'description' => ts('3 character string, value from config setting or input via user.'),
+      'add' => '3.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_currency',
+        'key_column' => 'name',
+        'label_column' => 'full_name',
+        'name_column' => 'name',
+        'abbr_column' => 'symbol',
+      ],
+    ],
+    'frequency_unit' => [
+      'title' => ts('Frequency Unit'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('Time units for recurrence of payment.'),
+      'add' => '1.6',
+      'default' => 'month',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'recur_frequency_units',
+        'key_column' => 'name',
+      ],
+    ],
+    'frequency_interval' => [
+      'title' => ts('Interval (number of units)'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Number of time units for recurrence of payment.'),
+      'add' => '1.6',
+      'default' => 1,
+    ],
+    'installments' => [
+      'title' => ts('Number of Installments'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'description' => ts('Total number of payments to be made. Set this to 0 if this is an open-ended commitment i.e. no set end date.'),
+      'add' => '1.6',
+    ],
+    'start_date' => [
+      'title' => ts('Start Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'required' => TRUE,
+      'description' => ts('The date the first scheduled recurring contribution occurs.'),
+      'add' => '1.6',
+      'unique_name' => 'contribution_recur_start_date',
+      'unique_title' => 'Recurring Contribution Start Date',
+      'default' => 'CURRENT_TIMESTAMP',
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'create_date' => [
+      'title' => ts('Created Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'required' => TRUE,
+      'description' => ts('When this recurring contribution record was created.'),
+      'add' => '1.6',
+      'unique_name' => 'contribution_recur_create_date',
+      'unique_title' => 'Recurring Contribution Create Date',
+      'default' => 'CURRENT_TIMESTAMP',
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'modified_date' => [
+      'title' => ts('Modified Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'readonly' => TRUE,
+      'description' => ts('Last updated date for this record. mostly the last time a payment was received'),
+      'add' => '1.6',
+      'unique_name' => 'contribution_recur_modified_date',
+      'unique_title' => 'Recurring Contribution Modified Date',
+      'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'cancel_date' => [
+      'title' => ts('Cancel Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date this recurring contribution was cancelled by contributor- if we can get access to it'),
+      'add' => '1.6',
+      'unique_name' => 'contribution_recur_cancel_date',
+      'unique_title' => 'Recurring Contribution Cancel Date',
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'cancel_reason' => [
+      'title' => ts('Cancellation Reason'),
+      'sql_type' => 'text',
+      'input_type' => 'Text',
+      'description' => ts('Free text field for a reason for cancelling'),
+      'add' => '5.13',
+      'unique_name' => 'contribution_recur_cancel_reason',
+      'unique_title' => 'Recurring Contribution Cancel Reason',
+      'input_attrs' => [
+        'size' => '40',
+      ],
+    ],
+    'end_date' => [
+      'title' => ts('Recurring Contribution End Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date this recurring contribution finished successfully'),
+      'add' => '1.6',
+      'unique_name' => 'contribution_recur_end_date',
+      'unique_title' => 'Recurring Contribution End Date',
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'processor_id' => [
+      'title' => ts('Processor ID'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Possibly needed to store a unique identifier for this recurring payment order - if this is available from the processor??'),
+      'add' => '1.6',
+      'unique_name' => 'contribution_recur_processor_id',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'payment_token_id' => [
+      'title' => ts('Payment Token ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Optionally used to store a link to a payment token used for this recurring contribution.'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'label' => ts('Payment Token'),
+      ],
+      'entity_reference' => [
+        'entity' => 'PaymentToken',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'trxn_id' => [
+      'title' => ts('Transaction ID'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('unique transaction id (deprecated - use processor_id)'),
+      'add' => '1.6',
+      'unique_name' => 'contribution_recur_trxn_id',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'invoice_id' => [
+      'title' => ts('Invoice ID'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('unique invoice id, system generated or passed in'),
+      'add' => '1.6',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'contribution_status_id' => [
+      'title' => ts('Status'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'add' => '1.6',
+      'unique_name' => 'contribution_recur_contribution_status_id',
+      'default' => 2,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'contribution_recur_status',
+      ],
+    ],
+    'is_test' => [
+      'title' => ts('Test'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'cycle_day' => [
+      'title' => ts('Cycle Day'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Day in the period when the payment should be charged e.g. 1st of month, 15th etc.'),
+      'add' => '1.6',
+      'default' => 1,
+    ],
+    'next_sched_contribution_date' => [
+      'title' => ts('Next Scheduled Contribution Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Next scheduled date'),
+      'add' => '4.4',
+      'unique_name' => 'contribution_recur_next_sched_contribution_date',
+      'unique_title' => 'Next Scheduled Recurring Contribution',
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'failure_count' => [
+      'title' => ts('Number of Failures'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'description' => ts('Number of failed charge attempts since last success. Business rule could be set to deactivate on more than x failures.'),
+      'add' => '1.6',
+      'default' => 0,
+    ],
+    'failure_retry_date' => [
+      'title' => ts('Retry Failed Attempt Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date to retry failed attempt'),
+      'add' => '1.6',
+      'unique_name' => 'contribution_recur_failure_retry_date',
+      'unique_title' => 'Failed Recurring Contribution Retry Date',
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'auto_renew' => [
+      'title' => ts('Auto Renew'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Some systems allow contributor to set a number of installments - but then auto-renew the subscription or commitment if they do not cancel.'),
+      'add' => '1.6',
+      'default' => FALSE,
+    ],
+    'payment_processor_id' => [
+      'title' => ts('Payment Processor ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Foreign key to civicrm_payment_processor.id'),
+      'add' => '3.3',
+      'unique_name' => 'contribution_recur_payment_processor_id',
+      'input_attrs' => [
+        'label' => ts('Payment Processor'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_payment_processor',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'PaymentProcessor',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'financial_type_id' => [
+      'title' => ts('Financial Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to Financial Type'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Financial Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_type',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialType',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'payment_instrument_id' => [
+      'title' => ts('Payment Method'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to Payment Instrument'),
+      'add' => '4.1',
+      'pseudoconstant' => [
+        'option_group_name' => 'payment_instrument',
+      ],
+    ],
+    'campaign_id' => [
+      'title' => ts('Campaign ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('The campaign for which this contribution has been triggered.'),
+      'add' => '4.1',
+      'unique_name' => 'contribution_campaign_id',
+      'component' => 'CiviCampaign',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Campaign'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_campaign',
+        'key_column' => 'id',
+        'label_column' => 'title',
+        'prefetch' => 'disabled',
+      ],
+      'entity_reference' => [
+        'entity' => 'Campaign',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'is_email_receipt' => [
+      'title' => ts('Send email Receipt?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if TRUE, receipt is automatically emailed to contact on each successful payment'),
+      'add' => '4.1',
+      'default' => TRUE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contribute/ContributionSoft.entityType.php b/www/modules/civicrm/schema/Contribute/ContributionSoft.entityType.php
new file mode 100644
index 000000000..a5de9241c
--- /dev/null
+++ b/www/modules/civicrm/schema/Contribute/ContributionSoft.entityType.php
@@ -0,0 +1,169 @@
+<?php
+
+return [
+  'name' => 'ContributionSoft',
+  'table' => 'civicrm_contribution_soft',
+  'class' => 'CRM_Contribute_DAO_ContributionSoft',
+  'getInfo' => fn() => [
+    'title' => ts('Contribution Soft Credit'),
+    'title_plural' => ts('Contribution Soft Credits'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '2.2',
+  ],
+  'getIndices' => fn() => [
+    'index_id' => [
+      'fields' => [
+        'pcp_id' => TRUE,
+      ],
+      'add' => '2.2',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Soft Credit ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Soft Credit ID'),
+      'add' => '2.2',
+      'unique_name' => 'contribution_soft_id',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contribution_id' => [
+      'title' => ts('Contribution ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to contribution table.'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'label' => ts('Contribution'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contribution',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Contact ID'),
+      'add' => '2.2',
+      'unique_name' => 'contribution_soft_contact_id',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'amount' => [
+      'title' => ts('Soft Credit Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('Amount of this soft credit.'),
+      'add' => '2.2',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'currency' => [
+      'title' => ts('Soft Contribution Currency'),
+      'sql_type' => 'varchar(3)',
+      'input_type' => 'Select',
+      'description' => ts('3 character string, value from config setting or input via user.'),
+      'add' => '3.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_currency',
+        'key_column' => 'name',
+        'label_column' => 'full_name',
+        'name_column' => 'name',
+        'abbr_column' => 'symbol',
+      ],
+    ],
+    'pcp_id' => [
+      'title' => ts('PCP ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_pcp.id'),
+      'add' => '2.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('PCP'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_pcp',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'PCP',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'pcp_display_in_roll' => [
+      'title' => ts('Soft Contribution Display on PCP'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '2.2',
+      'default' => FALSE,
+    ],
+    'pcp_roll_nickname' => [
+      'title' => ts('Soft Contribution PCP Nickname'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '2.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'pcp_personal_note' => [
+      'title' => ts('Soft Contribution PCP Note'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'TextArea',
+      'add' => '2.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'soft_credit_type_id' => [
+      'title' => ts('Soft Credit Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Soft Credit Type ID.Implicit FK to civicrm_option_value where option_group = soft_credit_type.'),
+      'add' => '2.2',
+      'default' => NULL,
+      'pseudoconstant' => [
+        'option_group_name' => 'soft_credit_type',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contribute/Premium.entityType.php b/www/modules/civicrm/schema/Contribute/Premium.entityType.php
new file mode 100644
index 000000000..68eee76f4
--- /dev/null
+++ b/www/modules/civicrm/schema/Contribute/Premium.entityType.php
@@ -0,0 +1,125 @@
+<?php
+
+return [
+  'name' => 'Premium',
+  'table' => 'civicrm_premiums',
+  'class' => 'CRM_Contribute_DAO_Premium',
+  'getInfo' => fn() => [
+    'title' => ts('Premium'),
+    'title_plural' => ts('Premiums'),
+    'description' => ts('table - settings for the Premiums features for a given contribution page'),
+    'log' => TRUE,
+    'add' => '1.4',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Premium ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '1.4',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Premium Entity'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Joins these premium settings to another object. Always civicrm_contribution_page for now.'),
+      'add' => '1.4',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Contribute_BAO_Premium::entityTables',
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Premium entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'add' => '1.4',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'premiums_active' => [
+      'title' => ts('Is Premium Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is the Premiums feature enabled for this page?'),
+      'add' => '1.4',
+      'default' => FALSE,
+    ],
+    'premiums_intro_title' => [
+      'title' => ts('Title for Premiums section'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Title for Premiums section.'),
+      'add' => '1.4',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'premiums_intro_text' => [
+      'title' => ts('Premium Introductory Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Displayed in <div> at top of Premiums section of page. Text and HTML allowed.'),
+      'add' => '1.4',
+    ],
+    'premiums_contact_email' => [
+      'title' => ts('Premium Contact Email'),
+      'sql_type' => 'varchar(100)',
+      'input_type' => 'Text',
+      'description' => ts('This email address is included in receipts if it is populated and a premium has been selected.'),
+      'add' => '1.4',
+      'input_attrs' => [
+        'maxlength' => 100,
+      ],
+    ],
+    'premiums_contact_phone' => [
+      'title' => ts('Premiums Contact Phone'),
+      'sql_type' => 'varchar(50)',
+      'input_type' => 'Text',
+      'description' => ts('This phone number is included in receipts if it is populated and a premium has been selected.'),
+      'add' => '1.4',
+      'input_attrs' => [
+        'maxlength' => 50,
+      ],
+    ],
+    'premiums_display_min_contribution' => [
+      'title' => ts('Display Minimum Contribution?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Boolean. Should we automatically display minimum contribution amount text after the premium descriptions.'),
+      'add' => '1.4',
+      'default' => FALSE,
+    ],
+    'premiums_nothankyou_label' => [
+      'title' => ts('No Thank-you Text'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Label displayed for No Thank-you option in premiums block (e.g. No thank you)'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'premiums_nothankyou_position' => [
+      'title' => ts('No Thank-you Position'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'add' => '4.3',
+      'default' => 1,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contribute/PremiumsProduct.entityType.php b/www/modules/civicrm/schema/Contribute/PremiumsProduct.entityType.php
new file mode 100644
index 000000000..bee0b0a67
--- /dev/null
+++ b/www/modules/civicrm/schema/Contribute/PremiumsProduct.entityType.php
@@ -0,0 +1,84 @@
+<?php
+
+return [
+  'name' => 'PremiumsProduct',
+  'table' => 'civicrm_premiums_product',
+  'class' => 'CRM_Contribute_DAO_PremiumsProduct',
+  'getInfo' => fn() => [
+    'title' => ts('Product Premium'),
+    'title_plural' => ts('Product Premiums'),
+    'description' => ts('joins premiums (settings) to individual product/premium items - determines which products are available for a given contribution page'),
+    'log' => TRUE,
+    'add' => '1.4',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Premium Product ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Contribution ID'),
+      'add' => '1.4',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'premiums_id' => [
+      'title' => ts('Premium ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Foreign key to premiums settings record.'),
+      'add' => '1.4',
+      'input_attrs' => [
+        'label' => ts('Premium'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Premium',
+        'key' => 'id',
+      ],
+    ],
+    'product_id' => [
+      'title' => ts('Product ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Foreign key to each product object.'),
+      'add' => '1.4',
+      'input_attrs' => [
+        'label' => ts('Product'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Product',
+        'key' => 'id',
+      ],
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '2.0',
+    ],
+    'financial_type_id' => [
+      'title' => ts('Financial Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Financial Type.'),
+      'add' => '4.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Financial Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_type',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialType',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contribute/Product.entityType.php b/www/modules/civicrm/schema/Contribute/Product.entityType.php
new file mode 100644
index 000000000..966fa3206
--- /dev/null
+++ b/www/modules/civicrm/schema/Contribute/Product.entityType.php
@@ -0,0 +1,235 @@
+<?php
+
+return [
+  'name' => 'Product',
+  'table' => 'civicrm_product',
+  'class' => 'CRM_Contribute_DAO_Product',
+  'getInfo' => fn() => [
+    'title' => ts('Product'),
+    'title_plural' => ts('Products'),
+    'description' => ts('able - stores "product info" for premiums and can be used for non-incentive products'),
+    'log' => TRUE,
+    'add' => '1.4',
+    'label_field' => 'name',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/contribute/managePremiums/edit?action=add&reset=1',
+    'update' => 'civicrm/admin/contribute/managePremiums/edit?action=update&id=[id]&reset=1',
+    'delete' => 'civicrm/admin/contribute/managePremiums/edit?action=delete&id=[id]&reset=1',
+    'preview' => 'civicrm/admin/contribute/managePremiums/edit?action=preview&reset=1&id=[id]',
+    'browse' => 'civicrm/admin/contribute/managePremiums/',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Product ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '1.4',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Product Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Required product/premium name'),
+      'add' => '1.4',
+      'unique_name' => 'product_name',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Description'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Optional description of the product/premium.'),
+      'add' => '1.4',
+    ],
+    'sku' => [
+      'title' => ts('SKU'),
+      'sql_type' => 'varchar(50)',
+      'input_type' => 'Text',
+      'description' => ts('Optional product sku or code.'),
+      'add' => '1.4',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'maxlength' => 50,
+      ],
+    ],
+    'options' => [
+      'title' => ts('Options'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Store comma-delimited list of color, size, etc. options for the product.'),
+      'add' => '1.4',
+      'serialize' => CRM_Core_DAO::SERIALIZE_COMMA,
+    ],
+    'image' => [
+      'title' => ts('Image'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Full or relative URL to uploaded image - fullsize.'),
+      'add' => '1.4',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'thumbnail' => [
+      'title' => ts('Thumbnail'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Full or relative URL to image thumbnail.'),
+      'add' => '1.4',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'price' => [
+      'title' => ts('Price'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'description' => ts('Sell price or market value for premiums. For tax-deductible contributions, this will be stored as non_deductible_amount in the contribution record.'),
+      'add' => '1.4',
+    ],
+    'currency' => [
+      'title' => ts('Currency'),
+      'sql_type' => 'varchar(3)',
+      'input_type' => 'Select',
+      'description' => ts('3 character string, value from config setting or input via user.'),
+      'add' => '3.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Currency'),
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_currency',
+        'key_column' => 'name',
+        'label_column' => 'full_name',
+        'name_column' => 'name',
+        'abbr_column' => 'symbol',
+      ],
+    ],
+    'financial_type_id' => [
+      'title' => ts('Financial Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Financial Type.'),
+      'add' => '4.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Financial Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_type',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialType',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'min_contribution' => [
+      'title' => ts('Minimum Contribution'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'description' => ts('Minimum contribution required to be eligible to select this premium.'),
+      'add' => '1.4',
+    ],
+    'cost' => [
+      'title' => ts('Cost'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'description' => ts('Actual cost of this product. Useful to determine net return from sale or using this as an incentive.'),
+      'add' => '1.4',
+    ],
+    'is_active' => [
+      'title' => ts('Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Disabling premium removes it from the premiums_premium join table below.'),
+      'add' => '1.4',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'period_type' => [
+      'title' => ts('Period Type'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('Rolling means we set start/end based on current day, fixed means we set start/end for current year or month (e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006)'),
+      'add' => '1.4',
+      'default' => 'rolling',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::periodType',
+      ],
+    ],
+    'fixed_period_start_day' => [
+      'title' => ts('Fixed Period Start Day'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('Month and day (MMDD) that fixed period type subscription or membership starts.'),
+      'add' => '1.4',
+      'default' => 101,
+    ],
+    'duration_unit' => [
+      'title' => ts('Duration Unit'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'add' => '1.4',
+      'default' => 'year',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::getPremiumUnits',
+      ],
+    ],
+    'duration_interval' => [
+      'title' => ts('Duration Interval'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('Number of units for total duration of subscription, service, membership (e.g. 12 Months).'),
+      'add' => '1.4',
+    ],
+    'frequency_unit' => [
+      'title' => ts('Frequency Unit'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('Frequency unit and interval allow option to store actual delivery frequency for a subscription or service.'),
+      'add' => '1.4',
+      'default' => 'month',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::getPremiumUnits',
+      ],
+    ],
+    'frequency_interval' => [
+      'title' => ts('Frequency Interval'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('Number of units for delivery frequency of subscription, service, membership (e.g. every 3 Months).'),
+      'add' => '1.4',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Contribute/Widget.entityType.php b/www/modules/civicrm/schema/Contribute/Widget.entityType.php
new file mode 100644
index 000000000..e5aac081d
--- /dev/null
+++ b/www/modules/civicrm/schema/Contribute/Widget.entityType.php
@@ -0,0 +1,181 @@
+<?php
+
+return [
+  'name' => 'Widget',
+  'table' => 'civicrm_contribution_widget',
+  'class' => 'CRM_Contribute_DAO_Widget',
+  'getInfo' => fn() => [
+    'title' => ts('Widget'),
+    'title_plural' => ts('Widgets'),
+    'description' => ts('A Widget object to store meta information about a single customized contribution widget'),
+    'log' => TRUE,
+    'add' => '2.0',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Widget ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Contribution ID'),
+      'add' => '2.0',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contribution_page_id' => [
+      'title' => ts('Contribution Page ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('The Contribution Page which triggered this contribution'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('Contribution Page'),
+      ],
+      'entity_reference' => [
+        'entity' => 'ContributionPage',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Enabled?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this property active?'),
+      'add' => '2.0',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'title' => [
+      'title' => ts('Widget Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Widget title.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'url_logo' => [
+      'title' => ts('Widget Image Url'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('URL to Widget logo'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'button_title' => [
+      'title' => ts('Button Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Button title.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'about' => [
+      'title' => ts('Description'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('About description.'),
+      'add' => '2.0',
+    ],
+    'url_homepage' => [
+      'title' => ts('Homepage Url'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('URL to Homepage.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'color_title' => [
+      'title' => ts('Title Color'),
+      'sql_type' => 'varchar(10)',
+      'input_type' => 'Text',
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 10,
+      ],
+    ],
+    'color_button' => [
+      'title' => ts('Button Color'),
+      'sql_type' => 'varchar(10)',
+      'input_type' => 'Text',
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 10,
+      ],
+    ],
+    'color_bar' => [
+      'title' => ts('Bar Color'),
+      'sql_type' => 'varchar(10)',
+      'input_type' => 'Text',
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 10,
+      ],
+    ],
+    'color_main_text' => [
+      'title' => ts('Main Text Color'),
+      'sql_type' => 'varchar(10)',
+      'input_type' => 'Text',
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 10,
+      ],
+    ],
+    'color_main' => [
+      'title' => ts('Main Color'),
+      'sql_type' => 'varchar(10)',
+      'input_type' => 'Text',
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 10,
+      ],
+    ],
+    'color_main_bg' => [
+      'title' => ts('Background Color'),
+      'sql_type' => 'varchar(10)',
+      'input_type' => 'Text',
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 10,
+      ],
+    ],
+    'color_bg' => [
+      'title' => ts('Other Background Color'),
+      'sql_type' => 'varchar(10)',
+      'input_type' => 'Text',
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 10,
+      ],
+    ],
+    'color_about_link' => [
+      'title' => ts('About Link Color'),
+      'sql_type' => 'varchar(10)',
+      'input_type' => 'Text',
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 10,
+      ],
+    ],
+    'color_homepage_link' => [
+      'title' => ts('Homepage Link Color'),
+      'sql_type' => 'varchar(10)',
+      'input_type' => 'Text',
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 10,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/ActionLog.entityType.php b/www/modules/civicrm/schema/Core/ActionLog.entityType.php
new file mode 100644
index 000000000..a9e6d578f
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/ActionLog.entityType.php
@@ -0,0 +1,115 @@
+<?php
+
+return [
+  'name' => 'ActionLog',
+  'table' => 'civicrm_action_log',
+  'class' => 'CRM_Core_DAO_ActionLog',
+  'getInfo' => fn() => [
+    'title' => ts('Action Log'),
+    'title_plural' => ts('Action Logs'),
+    'description' => ts('Table to store log for the reminder.'),
+    'add' => '3.4',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Action Schedule ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '3.4',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to id of the entity that the action was performed on. Pseudo - FK.'),
+      'add' => '3.4',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'entity_table' => [
+      'title' => ts('Entity Table'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('name of the entity table for the above id, e.g. civicrm_activity, civicrm_participant'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'action_schedule_id' => [
+      'title' => ts('Schedule ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to the action schedule that this action originated from.'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('Schedule'),
+      ],
+      'entity_reference' => [
+        'entity' => 'ActionSchedule',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'action_date_time' => [
+      'title' => ts('Action Date And Time'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('date time that the action was performed on.'),
+      'add' => '3.4',
+    ],
+    'is_error' => [
+      'title' => ts('Error?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Was there any error sending the reminder?'),
+      'add' => '3.4',
+      'default' => FALSE,
+    ],
+    'message' => [
+      'title' => ts('Message'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Description / text in case there was an error encountered.'),
+      'add' => '3.4',
+    ],
+    'repetition_number' => [
+      'title' => ts('Repetition Number'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Keeps track of the sequence number of this repetition.'),
+      'add' => '3.4',
+    ],
+    'reference_date' => [
+      'title' => ts('Reference Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Stores the date from the entity which triggered this reminder action (e.g. membership.end_date for most membership renewal reminders)'),
+      'add' => '4.6',
+      'default' => NULL,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/ActionSchedule.entityType.php b/www/modules/civicrm/schema/Core/ActionSchedule.entityType.php
new file mode 100644
index 000000000..7e2900a9d
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/ActionSchedule.entityType.php
@@ -0,0 +1,577 @@
+<?php
+
+return [
+  'name' => 'ActionSchedule',
+  'table' => 'civicrm_action_schedule',
+  'class' => 'CRM_Core_DAO_ActionSchedule',
+  'getInfo' => fn() => [
+    'title' => ts('Scheduled Reminder'),
+    'title_plural' => ts('Scheduled Reminders'),
+    'description' => ts('Table to store the reminders.'),
+    'add' => '3.4',
+    'label_field' => 'title',
+  ],
+  'getPaths' => fn() => [
+    'browse' => 'civicrm/admin/scheduleReminders',
+    'add' => 'civicrm/admin/scheduleReminders/edit?reset=1&action=add',
+    'update' => 'civicrm/admin/scheduleReminders/edit?reset=1&action=update&id=[id]',
+    'delete' => 'civicrm/admin/scheduleReminders/edit?reset=1&action=delete&id=[id]',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '5.65',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Action Schedule ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '3.4',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Name'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Name of the scheduled action'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+    'title' => [
+      'title' => ts('Title'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Title of the action(reminder)'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'recipient' => [
+      'title' => ts('Recipient'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('Recipient'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('Limit or Add Recipients'),
+        'control_field' => 'mapping_id',
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_ActionSchedule::getRecipientOptions',
+      ],
+    ],
+    'limit_to' => [
+      'title' => ts('Limit To'),
+      'sql_type' => 'int',
+      'input_type' => 'Select',
+      'description' => ts('Is this the recipient criteria limited to OR in addition to?'),
+      'add' => '4.4',
+      'input_attrs' => [
+        'label' => ts('Limit/Add'),
+        'control_field' => 'mapping_id',
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_ActionSchedule::getLimitToOptions',
+      ],
+    ],
+    'entity_value' => [
+      'title' => ts('Entity Value'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Select',
+      'description' => ts('Entity value'),
+      'add' => '3.4',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED,
+      'input_attrs' => [
+        'label' => ts('Entity Value'),
+        'multiple' => '1',
+        'control_field' => 'mapping_id',
+        'maxlength' => 255,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_ActionSchedule::getEntityValueOptions',
+      ],
+    ],
+    'entity_status' => [
+      'title' => ts('Entity Status'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('Entity status'),
+      'add' => '3.4',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED,
+      'input_attrs' => [
+        'label' => ts('Entity Status'),
+        'multiple' => '1',
+        'control_field' => 'entity_value',
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_ActionSchedule::getEntityStatusOptions',
+      ],
+    ],
+    'start_action_offset' => [
+      'title' => ts('Start Action Offset'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Reminder Interval.'),
+      'add' => '3.4',
+      'default' => 0,
+      'input_attrs' => [
+        'min' => '0',
+        'label' => ts('Start Action Offset'),
+      ],
+    ],
+    'start_action_unit' => [
+      'title' => ts('Start Action Unit'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('Time units for reminder.'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('Start Action Unit'),
+        'control_field' => 'start_action_offset',
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_ActionSchedule::getDateUnits',
+      ],
+    ],
+    'start_action_condition' => [
+      'title' => ts('Start Action Condition'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('Reminder Action'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('Start Condition'),
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::beforeAfter',
+      ],
+    ],
+    'start_action_date' => [
+      'title' => ts('Start Action Date'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('Entity date'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('Start Date'),
+        'control_field' => 'entity_value',
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_ActionSchedule::getActionDateOptions',
+      ],
+    ],
+    'is_repeat' => [
+      'title' => ts('Repeat'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '3.4',
+      'default' => FALSE,
+    ],
+    'repetition_frequency_unit' => [
+      'title' => ts('Repetition Frequency Unit'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('Time units for repetition of reminder.'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('Repetition Frequency Unit'),
+        'control_field' => 'repetition_frequency_interval',
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_ActionSchedule::getDateUnits',
+      ],
+    ],
+    'repetition_frequency_interval' => [
+      'title' => ts('Repetition Frequency Interval'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Time interval for repeating the reminder.'),
+      'add' => '3.4',
+      'default' => 0,
+      'input_attrs' => [
+        'min' => '0',
+        'label' => ts('Repetition Frequency Interval'),
+      ],
+    ],
+    'end_frequency_unit' => [
+      'title' => ts('End Frequency Unit'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('Time units till repetition of reminder.'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('End Frequency Unit'),
+        'control_field' => 'end_frequency_interval',
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_ActionSchedule::getDateUnits',
+      ],
+    ],
+    'end_frequency_interval' => [
+      'title' => ts('End Frequency Interval'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Time interval till repeating the reminder.'),
+      'add' => '3.4',
+      'default' => 0,
+      'input_attrs' => [
+        'min' => '0',
+        'label' => ts('End Frequency Interval'),
+      ],
+    ],
+    'end_action' => [
+      'title' => ts('End Action'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => 'Select',
+      'description' => ts('Reminder Action till repeating the reminder.'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('End Condition'),
+        'maxlength' => 32,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::beforeAfter',
+      ],
+    ],
+    'end_date' => [
+      'title' => ts('End Date'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('Entity end date'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('End Date'),
+        'control_field' => 'entity_value',
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_ActionSchedule::getActionDateOptions',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Schedule is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this option active?'),
+      'add' => '3.4',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'recipient_manual' => [
+      'title' => ts('Recipient Manual'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'EntityRef',
+      'description' => ts('Contact IDs to which reminder should be sent.'),
+      'add' => '3.4',
+      'serialize' => CRM_Core_DAO::SERIALIZE_COMMA,
+      'input_attrs' => [
+        'label' => ts('Manual Recipients'),
+        'multiple' => '1',
+        'maxlength' => 128,
+      ],
+    ],
+    'recipient_listing' => [
+      'title' => ts('Recipient Listing'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Select',
+      'description' => ts('listing based on recipient field.'),
+      'add' => '4.1',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED,
+      'input_attrs' => [
+        'label' => ts('Recipient Roles'),
+        'multiple' => '1',
+        'control_field' => 'recipient',
+        'maxlength' => 128,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_ActionSchedule::getRecipientListingOptions',
+      ],
+    ],
+    'body_text' => [
+      'title' => ts('Reminder Text'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('Body of the mailing in text format.'),
+      'add' => '3.4',
+    ],
+    'body_html' => [
+      'title' => ts('Reminder HTML'),
+      'sql_type' => 'longtext',
+      'input_type' => 'RichTextEditor',
+      'description' => ts('Body of the mailing in html format.'),
+      'add' => '3.4',
+    ],
+    'sms_body_text' => [
+      'title' => ts('SMS Reminder Text'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('Content of the SMS text.'),
+      'add' => '4.5',
+    ],
+    'subject' => [
+      'title' => ts('Reminder Subject'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Subject of mailing'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+    'record_activity' => [
+      'title' => ts('Record Activity'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Record Activity for this reminder?'),
+      'add' => '3.4',
+      'default' => FALSE,
+    ],
+    'mapping_id' => [
+      'title' => ts('Reminder For'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('Name/ID of the mapping to use on this table'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('Used For'),
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_ActionSchedule::getMappingOptions',
+        'suffixes' => [
+          'name',
+          'label',
+          'icon',
+        ],
+      ],
+    ],
+    'group_id' => [
+      'title' => ts('Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Group'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('Group'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_group',
+        'key_column' => 'id',
+        'label_column' => 'title',
+        'prefetch' => 'disabled',
+      ],
+      'entity_reference' => [
+        'entity' => 'Group',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'msg_template_id' => [
+      'title' => ts('Message Template ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to the message template.'),
+      'input_attrs' => [
+        'label' => ts('Message Template'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MessageTemplate',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'sms_template_id' => [
+      'title' => ts('SMS Template ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to the message template.'),
+      'input_attrs' => [
+        'label' => ts('SMS Template'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MessageTemplate',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'absolute_date' => [
+      'title' => ts('Fixed Date for Reminder'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('Date on which the reminder be sent.'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'from_name' => [
+      'title' => ts('Reminder from Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Name in "from" field'),
+      'add' => '4.5',
+      'input_attrs' => [
+        'label' => ts('From Name'),
+        'maxlength' => 255,
+      ],
+    ],
+    'from_email' => [
+      'title' => ts('Reminder From Email'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Email',
+      'description' => ts('Email address in "from" field'),
+      'add' => '4.5',
+      'input_attrs' => [
+        'label' => ts('From Email'),
+        'maxlength' => 255,
+      ],
+    ],
+    'mode' => [
+      'title' => ts('Message Mode'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Select',
+      'description' => ts('Send the message as email or sms or both.'),
+      'add' => '4.5',
+      'default' => 'Email',
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'msg_mode',
+      ],
+    ],
+    'sms_provider_id' => [
+      'title' => ts('SMS Provider ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'add' => '4.5',
+      'input_attrs' => [
+        'label' => ts('SMS Provider'),
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::smsProvider',
+      ],
+      'entity_reference' => [
+        'entity' => 'SmsProvider',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'used_for' => [
+      'title' => ts('Used For'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Used for repeating entity'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'label' => ts('Used For'),
+        'maxlength' => 64,
+      ],
+    ],
+    'filter_contact_language' => [
+      'title' => ts('Filter Contact Language'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Select',
+      'description' => ts('Used for multilingual installation'),
+      'add' => '4.7',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED,
+      'input_attrs' => [
+        'multiple' => '1',
+        'label' => ts('Recipients Language'),
+        'maxlength' => 128,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_ActionSchedule::getFilterContactLanguageOptions',
+      ],
+    ],
+    'communication_language' => [
+      'title' => ts('Communication Language'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('Used for multilingual installation'),
+      'add' => '4.7',
+      'input_attrs' => [
+        'label' => ts('Communication Language'),
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_ActionSchedule::getCommunicationLanguageOptions',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Created Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('When was the scheduled reminder created.'),
+      'add' => '5.34',
+      'unique_name' => 'action_schedule_created_date',
+      'default' => 'CURRENT_TIMESTAMP',
+      'usage' => [
+        'export',
+      ],
+    ],
+    'modified_date' => [
+      'title' => ts('Modified Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('When the reminder was created or modified.'),
+      'add' => '5.34',
+      'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+      'input_attrs' => [
+        'label' => ts('Modified Date'),
+      ],
+    ],
+    'effective_start_date' => [
+      'title' => ts('Effective start date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'description' => ts('Earliest date to consider start events from.'),
+      'add' => '5.34',
+      'unique_name' => 'action_schedule_effective_start_date',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'effective_end_date' => [
+      'title' => ts('Effective end date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'description' => ts('Latest date to consider end events from.'),
+      'add' => '5.34',
+      'unique_name' => 'action_schedule_effective_end_date',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Address.entityType.php b/www/modules/civicrm/schema/Core/Address.entityType.php
new file mode 100644
index 000000000..df96ac4d2
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Address.entityType.php
@@ -0,0 +1,478 @@
+<?php
+
+return [
+  'name' => 'Address',
+  'table' => 'civicrm_address',
+  'class' => 'CRM_Core_DAO_Address',
+  'getInfo' => fn() => [
+    'title' => ts('Address'),
+    'title_plural' => ts('Addresses'),
+    'description' => ts('Stores the physical street / mailing address. This format should be capable of storing ALL international addresses.'),
+    'log' => TRUE,
+    'add' => '1.1',
+    'icon' => 'fa-map-marker',
+  ],
+  'getIndices' => fn() => [
+    'index_location_type' => [
+      'fields' => [
+        'location_type_id' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+    'index_is_primary' => [
+      'fields' => [
+        'is_primary' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+    'index_is_billing' => [
+      'fields' => [
+        'is_billing' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+    'index_street_name' => [
+      'fields' => [
+        'street_name' => TRUE,
+      ],
+      'add' => '1.1',
+    ],
+    'index_city' => [
+      'fields' => [
+        'city' => TRUE,
+      ],
+      'add' => '1.1',
+    ],
+    'index_geo_code_1_geo_code_2' => [
+      'fields' => [
+        'geo_code_1' => TRUE,
+        'geo_code_2' => TRUE,
+      ],
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Address ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique Address ID'),
+      'add' => '1.1',
+      'unique_name' => 'address_id',
+      'usage' => [
+        'export',
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'location_type_id' => [
+      'title' => ts('Address Location Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Which Location does this address belong to.'),
+      'add' => '2.0',
+      'pseudoconstant' => [
+        'table' => 'civicrm_location_type',
+        'key_column' => 'id',
+        'label_column' => 'display_name',
+      ],
+    ],
+    'is_primary' => [
+      'title' => ts('Is Primary'),
+      'sql_type' => 'boolean',
+      'input_type' => 'Radio',
+      'required' => TRUE,
+      'description' => ts('Is this the primary address.'),
+      'add' => '2.0',
+      'default' => FALSE,
+    ],
+    'is_billing' => [
+      'title' => ts('Is Billing Address'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this the billing address.'),
+      'add' => '2.0',
+      'default' => FALSE,
+    ],
+    'street_address' => [
+      'title' => ts('Street Address'),
+      'sql_type' => 'varchar(96)',
+      'input_type' => 'Text',
+      'description' => ts('Concatenation of all routable street address components (prefix, street number, street name, suffix, unit number OR P.O. Box). Apps should be able to determine physical location with this data (for mapping, mail delivery, etc.).'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 96,
+      ],
+    ],
+    'street_number' => [
+      'title' => ts('Street Number'),
+      'sql_type' => 'int',
+      'input_type' => 'Text',
+      'description' => ts('Numeric portion of address number on the street, e.g. For 112A Main St, the street_number = 112.'),
+      'add' => '1.1',
+      'usage' => [
+        'export',
+      ],
+    ],
+    'street_number_suffix' => [
+      'title' => ts('Street Number Suffix'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Text',
+      'description' => ts('Non-numeric portion of address number on the street, e.g. For 112A Main St, the street_number_suffix = A'),
+      'add' => '1.1',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+    ],
+    'street_number_predirectional' => [
+      'title' => ts('Street Direction Prefix'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Text',
+      'description' => ts('Directional prefix, e.g. SE Main St, SE is the prefix.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+    ],
+    'street_name' => [
+      'title' => ts('Street Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Actual street name, excluding St, Dr, Rd, Ave, e.g. For 112 Main St, the street_name = Main.'),
+      'add' => '1.1',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'street_type' => [
+      'title' => ts('Street Type'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Text',
+      'description' => ts('St, Rd, Dr, etc.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+    ],
+    'street_number_postdirectional' => [
+      'title' => ts('Street Direction Suffix'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Text',
+      'description' => ts('Directional prefix, e.g. Main St S, S is the suffix.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+    ],
+    'street_unit' => [
+      'title' => ts('Street Unit'),
+      'sql_type' => 'varchar(16)',
+      'input_type' => 'Text',
+      'description' => ts('Secondary unit designator, e.g. Apt 3 or Unit # 14, or Bldg 1200'),
+      'add' => '1.1',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'maxlength' => 16,
+      ],
+    ],
+    'supplemental_address_1' => [
+      'title' => ts('Supplemental Address 1'),
+      'sql_type' => 'varchar(96)',
+      'input_type' => 'Text',
+      'description' => ts('Supplemental Address Information, Line 1'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 96,
+      ],
+    ],
+    'supplemental_address_2' => [
+      'title' => ts('Supplemental Address 2'),
+      'sql_type' => 'varchar(96)',
+      'input_type' => 'Text',
+      'description' => ts('Supplemental Address Information, Line 2'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 96,
+      ],
+    ],
+    'supplemental_address_3' => [
+      'title' => ts('Supplemental Address 3'),
+      'sql_type' => 'varchar(96)',
+      'input_type' => 'Text',
+      'description' => ts('Supplemental Address Information, Line 3'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 96,
+      ],
+    ],
+    'city' => [
+      'title' => ts('City'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('City, Town or Village Name.'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'county_id' => [
+      'title' => ts('County ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'ChainSelect',
+      'description' => ts('Which County does this address belong to.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'control_field' => 'state_province_id',
+        'label' => ts('County'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_county',
+        'key_column' => 'id',
+        'label_column' => 'name',
+        'abbr_column' => 'abbreviation',
+        'suffixes' => [
+          'label',
+          'abbr',
+        ],
+      ],
+      'entity_reference' => [
+        'entity' => 'County',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'state_province_id' => [
+      'title' => ts('State/Province ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'ChainSelect',
+      'description' => ts('Which State_Province does this address belong to.'),
+      'add' => '1.1',
+      'localize_context' => 'province',
+      'input_attrs' => [
+        'control_field' => 'country_id',
+        'label' => ts('State/Province'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_state_province',
+        'key_column' => 'id',
+        'label_column' => 'name',
+        'abbr_column' => 'abbreviation',
+        'suffixes' => [
+          'label',
+          'abbr',
+        ],
+      ],
+      'entity_reference' => [
+        'entity' => 'StateProvince',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'postal_code_suffix' => [
+      'title' => ts('Postal Code Suffix'),
+      'sql_type' => 'varchar(12)',
+      'input_type' => 'Text',
+      'description' => ts('Store the suffix, like the +4 part in the USPS system.'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '3',
+        'maxlength' => 12,
+      ],
+    ],
+    'postal_code' => [
+      'title' => ts('Postal Code'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Store both US (zip5) AND international postal codes. App is responsible for country/region appropriate validation.'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '6',
+        'maxlength' => 64,
+      ],
+    ],
+    'usps_adc' => [
+      'title' => ts('USPS Code'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => 'Text',
+      'deprecated' => TRUE,
+      'description' => ts('USPS Bulk mailing code.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 32,
+      ],
+    ],
+    'country_id' => [
+      'title' => ts('Country ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Which Country does this address belong to.'),
+      'add' => '1.1',
+      'localize_context' => 'country',
+      'input_attrs' => [
+        'label' => ts('Country'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_country',
+        'key_column' => 'id',
+        'label_column' => 'name',
+        'name_column' => 'iso_code',
+        'abbr_column' => 'iso_code',
+        'suffixes' => [
+          'label',
+          'abbr',
+        ],
+      ],
+      'entity_reference' => [
+        'entity' => 'Country',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'geo_code_1' => [
+      'title' => ts('Latitude'),
+      'sql_type' => 'double',
+      'input_type' => 'Text',
+      'description' => ts('Latitude'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '9',
+      ],
+    ],
+    'geo_code_2' => [
+      'title' => ts('Longitude'),
+      'sql_type' => 'double',
+      'input_type' => 'Text',
+      'description' => ts('Longitude'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '9',
+      ],
+    ],
+    'manual_geo_code' => [
+      'title' => ts('Is Manually Geocoded'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this a manually entered geo code'),
+      'add' => '4.3',
+      'default' => FALSE,
+      'usage' => [
+        'export',
+      ],
+    ],
+    'timezone' => [
+      'title' => ts('Timezone'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Text',
+      'description' => ts('Timezone expressed as a UTC offset - e.g. United States CST would be written as "UTC-6".'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+    ],
+    'name' => [
+      'title' => ts('Address Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '2.1',
+      'unique_name' => 'address_name',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'master_id' => [
+      'title' => ts('Master Address ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Address ID'),
+      'add' => '3.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Master Address Belongs To'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Address',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/AddressFormat.entityType.php b/www/modules/civicrm/schema/Core/AddressFormat.entityType.php
new file mode 100644
index 000000000..4a40ade7e
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/AddressFormat.entityType.php
@@ -0,0 +1,32 @@
+<?php
+
+return [
+  'name' => 'AddressFormat',
+  'table' => 'civicrm_address_format',
+  'class' => 'CRM_Core_DAO_AddressFormat',
+  'getInfo' => fn() => [
+    'title' => ts('Address Format'),
+    'title_plural' => ts('Address Formats'),
+    'description' => ts('FIXME'),
+    'add' => '3.2',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Address Format ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Address Format ID'),
+      'add' => '3.2',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'format' => [
+      'title' => ts('Address Format'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('The format of an address'),
+      'add' => '3.2',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Cache.entityType.php b/www/modules/civicrm/schema/Core/Cache.entityType.php
new file mode 100644
index 000000000..dfaf57ebb
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Cache.entityType.php
@@ -0,0 +1,104 @@
+<?php
+
+return [
+  'name' => 'Cache',
+  'table' => 'civicrm_cache',
+  'class' => 'CRM_Core_DAO_Cache',
+  'getInfo' => fn() => [
+    'title' => ts('Cache'),
+    'title_plural' => ts('Caches'),
+    'description' => ts('Table to cache items for civicrm components.'),
+    'add' => '2.1',
+  ],
+  'getIndices' => fn() => [
+    'UI_group_name_path' => [
+      'fields' => [
+        'group_name' => TRUE,
+        'path' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '5.61',
+    ],
+    'index_expired_date' => [
+      'fields' => [
+        'expired_date' => TRUE,
+      ],
+      'add' => '5.61',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Cache ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique table ID'),
+      'add' => '2.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'group_name' => [
+      'title' => ts('Group Name'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('group name for cache element, useful in cleaning cache elements'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'maxlength' => 32,
+      ],
+    ],
+    'path' => [
+      'title' => ts('Path'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Unique path name for cache element'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'data' => [
+      'title' => ts('Data'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('data associated with this path'),
+      'add' => '2.1',
+    ],
+    'component_id' => [
+      'title' => ts('Component ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Component that this menu item belongs to'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'label' => ts('Component'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_component',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Component',
+        'key' => 'id',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Created Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('When was the cache item created'),
+      'add' => '2.1',
+      'default' => 'CURRENT_TIMESTAMP',
+    ],
+    'expired_date' => [
+      'title' => ts('Expired Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('When should the cache item expire'),
+      'add' => '2.1',
+      'default' => NULL,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Component.entityType.php b/www/modules/civicrm/schema/Core/Component.entityType.php
new file mode 100644
index 000000000..35daea071
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Component.entityType.php
@@ -0,0 +1,46 @@
+<?php
+
+return [
+  'name' => 'Component',
+  'table' => 'civicrm_component',
+  'class' => 'CRM_Core_DAO_Component',
+  'getInfo' => fn() => [
+    'title' => ts('Component'),
+    'title_plural' => ts('Components'),
+    'description' => ts('FIXME'),
+    'add' => '2.0',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Component ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Component ID'),
+      'add' => '2.0',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Component name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Name of the component.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'namespace' => [
+      'title' => ts('Namespace reserved for component.'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Path to components main directory in a form of a class namespace.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Country.entityType.php b/www/modules/civicrm/schema/Core/Country.entityType.php
new file mode 100644
index 000000000..359509e3e
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Country.entityType.php
@@ -0,0 +1,148 @@
+<?php
+
+return [
+  'name' => 'Country',
+  'table' => 'civicrm_country',
+  'class' => 'CRM_Core_DAO_Country',
+  'getInfo' => fn() => [
+    'title' => ts('Country'),
+    'title_plural' => ts('Countries'),
+    'description' => ts('Countries of the world'),
+    'add' => '1.1',
+    'icon' => 'fa-globe',
+    'label_field' => 'name',
+  ],
+  'getIndices' => fn() => [
+    'UI_name_iso_code' => [
+      'fields' => [
+        'name' => TRUE,
+        'iso_code' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '1.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Country ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Country ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Country'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Country Name'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'iso_code' => [
+      'title' => ts('Country ISO Code'),
+      'sql_type' => 'char(2)',
+      'input_type' => 'Text',
+      'description' => ts('ISO Code'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 2,
+      ],
+    ],
+    'country_code' => [
+      'title' => ts('Country Phone Prefix'),
+      'sql_type' => 'varchar(4)',
+      'input_type' => 'Text',
+      'description' => ts('National prefix to be used when dialing TO this country.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 4,
+      ],
+    ],
+    'address_format_id' => [
+      'title' => ts('Address Format ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Foreign key to civicrm_address_format.id.'),
+      'add' => '3.2',
+      'input_attrs' => [
+        'label' => ts('Address Format'),
+      ],
+      'entity_reference' => [
+        'entity' => 'AddressFormat',
+        'key' => 'id',
+      ],
+    ],
+    'idd_prefix' => [
+      'title' => ts('Outgoing Phone Prefix'),
+      'sql_type' => 'varchar(4)',
+      'input_type' => 'Text',
+      'description' => ts('International direct dialing prefix from within the country TO another country'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 4,
+      ],
+    ],
+    'ndd_prefix' => [
+      'title' => ts('Area Code'),
+      'sql_type' => 'varchar(4)',
+      'input_type' => 'Text',
+      'description' => ts('Access prefix to call within a country to a different area'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 4,
+      ],
+    ],
+    'region_id' => [
+      'title' => ts('World Region ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Foreign key to civicrm_worldregion.id.'),
+      'add' => '1.8',
+      'localize_context' => 'country',
+      'input_attrs' => [
+        'label' => ts('World Region'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_worldregion',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'WorldRegion',
+        'key' => 'id',
+      ],
+    ],
+    'is_province_abbreviated' => [
+      'title' => ts('Abbreviate Province?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should state/province be displayed as abbreviation for contacts from this country?'),
+      'add' => '3.1',
+      'default' => FALSE,
+    ],
+    'is_active' => [
+      'title' => ts('Country Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this Country active?'),
+      'add' => '5.35',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/County.entityType.php b/www/modules/civicrm/schema/Core/County.entityType.php
new file mode 100644
index 000000000..167472e1e
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/County.entityType.php
@@ -0,0 +1,94 @@
+<?php
+
+return [
+  'name' => 'County',
+  'table' => 'civicrm_county',
+  'class' => 'CRM_Core_DAO_County',
+  'getInfo' => fn() => [
+    'title' => ts('County'),
+    'title_plural' => ts('Counties'),
+    'description' => ts('FIXME'),
+    'add' => '1.1',
+    'label_field' => 'name',
+  ],
+  'getIndices' => fn() => [
+    'UI_name_state_id' => [
+      'fields' => [
+        'name' => TRUE,
+        'state_province_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '1.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('County ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('County ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('County'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Name of County'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'abbreviation' => [
+      'title' => ts('County Abbreviation'),
+      'sql_type' => 'varchar(4)',
+      'input_type' => 'Text',
+      'description' => ts('2-4 Character Abbreviation of County'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 4,
+      ],
+    ],
+    'state_province_id' => [
+      'title' => ts('State ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('ID of State/Province that County belongs'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('State'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_state_province',
+        'key_column' => 'id',
+        'label_column' => 'name',
+        'abbr_column' => 'abbreviation',
+      ],
+      'entity_reference' => [
+        'entity' => 'StateProvince',
+        'key' => 'id',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('County Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this County active?'),
+      'add' => '5.35',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/CustomField.entityType.php b/www/modules/civicrm/schema/Core/CustomField.entityType.php
new file mode 100644
index 000000000..e4c90b903
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/CustomField.entityType.php
@@ -0,0 +1,371 @@
+<?php
+
+return [
+  'name' => 'CustomField',
+  'table' => 'civicrm_custom_field',
+  'class' => 'CRM_Core_DAO_CustomField',
+  'getInfo' => fn() => [
+    'title' => ts('Custom Field'),
+    'title_plural' => ts('Custom Fields'),
+    'description' => ts('Stores info about an extended (custom) property (data and form field info).'),
+    'log' => TRUE,
+    'add' => '1.1',
+    'label_field' => 'label',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/custom/group/field/add?reset=1&action=add&gid=[custom_group_id]',
+    'update' => 'civicrm/admin/custom/group/field/update?action=update&reset=1&id=[id]&gid=[custom_group_id]',
+    'preview' => 'civicrm/admin/custom/group/preview?reset=1&fid=[id]',
+    'delete' => 'civicrm/admin/custom/group/field/delete?reset=1&id=[id]',
+    'detach' => 'civicrm/admin/custom/group/field/move?reset=1&fid=[id]',
+  ],
+  'getIndices' => fn() => [
+    'UI_label_custom_group_id' => [
+      'fields' => [
+        'label' => TRUE,
+        'custom_group_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '1.1',
+    ],
+    'UI_name_custom_group_id' => [
+      'fields' => [
+        'name' => TRUE,
+        'custom_group_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '4.3',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Custom Field ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique Custom Field ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'custom_group_id' => [
+      'title' => ts('Custom Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_custom_group.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Custom Group'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_custom_group',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'CustomGroup',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'name' => [
+      'title' => ts('Custom Field Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Variable name/programmatic handle for this field.'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'label' => [
+      'title' => ts('Custom Field Label'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Text for form field label (also friendly name for administering this custom property).'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'data_type' => [
+      'title' => ts('Data Type'),
+      'sql_type' => 'varchar(16)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Controls location of data storage in extended_data table.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Data Type'),
+        'maxlength' => 16,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_CustomField::dataType',
+      ],
+    ],
+    'html_type' => [
+      'title' => ts('HTML Type'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('HTML types plus several built-in extended types.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Field Input Type'),
+        'maxlength' => 32,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::customHtmlType',
+      ],
+    ],
+    'default_value' => [
+      'title' => ts('Custom Field Default'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Use form_options.is_default for field_types which use options.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_required' => [
+      'title' => ts('Custom Field Is Required?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is a value required for this property.'),
+      'add' => '1.1',
+      'default' => FALSE,
+    ],
+    'is_searchable' => [
+      'title' => ts('Allow Searching on Field?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this property searchable.'),
+      'add' => '1.1',
+      'default' => FALSE,
+    ],
+    'is_search_range' => [
+      'title' => ts('Search as a Range'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this property range searchable.'),
+      'add' => '1.4',
+      'default' => FALSE,
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Controls field display order within an extended property group.'),
+      'add' => '1.1',
+      'default' => 1,
+    ],
+    'help_pre' => [
+      'title' => ts('Custom Field Pre Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Description and/or help text to display before this field.'),
+      'add' => '1.1',
+    ],
+    'help_post' => [
+      'title' => ts('Custom Field Post Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Description and/or help text to display after this field.'),
+      'add' => '1.1',
+    ],
+    'attributes' => [
+      'title' => ts('Custom Field Attributes'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Store collection of type-appropriate attributes, e.g. textarea needs rows/cols attributes'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Custom Field Is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'description' => ts('Is this property active?'),
+      'add' => '1.1',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_view' => [
+      'title' => ts('Field is Viewable'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this property set by PHP Code? A code field is viewable but not editable'),
+      'add' => '1.1',
+      'default' => FALSE,
+    ],
+    'options_per_line' => [
+      'title' => ts('Field Options Per Line'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('number of options per line for checkbox and radio'),
+    ],
+    'text_length' => [
+      'title' => ts('Field Length'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('field length if alphanumeric'),
+      'add' => '2.2',
+    ],
+    'start_date_years' => [
+      'title' => ts('Field Start Date'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('Date may be up to start_date_years years prior to the current date.'),
+      'add' => '1.4',
+    ],
+    'end_date_years' => [
+      'title' => ts('Field End Date'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('Date may be up to end_date_years years after the current date.'),
+      'add' => '1.4',
+    ],
+    'date_format' => [
+      'title' => ts('Field Data Format'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('date format for custom date'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::getDatePluginInputFormats',
+      ],
+    ],
+    'time_format' => [
+      'title' => ts('Field Time Format'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('time format for custom date'),
+      'add' => '3.1',
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::getTimeFormats',
+      ],
+    ],
+    'note_columns' => [
+      'title' => ts('Field Note Columns'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Number of columns in Note Field'),
+      'add' => '1.4',
+    ],
+    'note_rows' => [
+      'title' => ts('Field Note Rows'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Number of rows in Note Field'),
+      'add' => '1.4',
+    ],
+    'column_name' => [
+      'title' => ts('Field Column Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Name of the column that holds the values for this field.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'option_group_id' => [
+      'title' => ts('Field Option Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('For elements with options, the option group id that is used'),
+      'add' => '1.4',
+      'input_attrs' => [
+        'label' => ts('Field Option Group'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_option_group',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'OptionGroup',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'serialize' => [
+      'title' => ts('Serialize'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Serialization method - a non-zero value indicates a multi-valued field.'),
+      'add' => '5.27',
+      'default' => 0,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::fieldSerialization',
+      ],
+    ],
+    'filter' => [
+      'title' => ts('Field Filter'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Stores Contact Get API params contact reference custom fields. May be used for other filters in the future.'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'in_selector' => [
+      'title' => ts('Field Display'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should the multi-record custom field values be displayed in tab table listing'),
+      'add' => '4.5',
+      'default' => FALSE,
+    ],
+    'fk_entity' => [
+      'title' => ts('Entity'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Name of entity being referenced.'),
+      'add' => '5.60',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'fk_entity_on_delete' => [
+      'title' => ts('On Referenced Entity Delete'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Behavior if referenced entity is deleted.'),
+      'add' => '5.71',
+      'default' => 'set_null',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_CustomField::getFkEntityOnDeleteOptions',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/CustomGroup.entityType.php b/www/modules/civicrm/schema/Core/CustomGroup.entityType.php
new file mode 100644
index 000000000..206035b01
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/CustomGroup.entityType.php
@@ -0,0 +1,289 @@
+<?php
+
+return [
+  'name' => 'CustomGroup',
+  'table' => 'civicrm_custom_group',
+  'class' => 'CRM_Core_DAO_CustomGroup',
+  'getInfo' => fn() => [
+    'title' => ts('Custom Field Group'),
+    'title_plural' => ts('Custom Field Groups'),
+    'description' => ts('All extended (custom) properties are associated with a group. These are logical sets of related data.'),
+    'log' => TRUE,
+    'add' => '1.1',
+    'label_field' => 'title',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/custom/group/edit?action=add&reset=1',
+    'update' => 'civicrm/admin/custom/group/edit?action=update&reset=1&id=[id]',
+    'preview' => 'civicrm/admin/custom/group/preview?reset=1&gid=[id]',
+    'delete' => 'civicrm/admin/custom/group/delete?reset=1&id=[id]',
+    'browse' => 'civicrm/admin/custom/group',
+  ],
+  'getIndices' => fn() => [
+    'UI_title_extends' => [
+      'fields' => [
+        'title' => TRUE,
+        'extends' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '5.47',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Custom Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique Custom Group ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Custom Group Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Variable name/programmatic handle for this group.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'title' => [
+      'title' => ts('Custom Group Title'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Friendly Name.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'extends' => [
+      'title' => ts('Custom Group Extends'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Select',
+      'description' => ts('Type of object this group extends (can add other options later e.g. contact_address, etc.).'),
+      'add' => '1.1',
+      'default' => 'Contact',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_CustomGroup::getCustomGroupExtendsOptions',
+        'suffixes' => [
+          'name',
+          'label',
+          'grouping',
+          'icon',
+        ],
+      ],
+    ],
+    'extends_entity_column_id' => [
+      'title' => ts('Custom Group Subtype List'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'ChainSelect',
+      'description' => ts('FK to civicrm_option_value.value (for option group custom_data_type)'),
+      'add' => '2.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'control_field' => 'extends',
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_CustomGroup::getExtendsEntityColumnIdOptions',
+        'suffixes' => [
+          'name',
+          'label',
+          'grouping',
+        ],
+      ],
+    ],
+    'extends_entity_column_value' => [
+      'title' => ts('Custom Group Subtype'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'ChainSelect',
+      'description' => ts('linking custom group for dynamic object'),
+      'add' => '1.6',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND,
+      'input_attrs' => [
+        'control_field' => 'extends_entity_column_id',
+        'maxlength' => 255,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_CustomGroup::getExtendsEntityColumnValueOptions',
+      ],
+    ],
+    'style' => [
+      'title' => ts('Custom Group Style'),
+      'sql_type' => 'varchar(15)',
+      'input_type' => 'Select',
+      'description' => ts('Visual relationship between this form and its parent.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 15,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::customGroupStyle',
+      ],
+    ],
+    'collapse_display' => [
+      'title' => ts('Collapse Custom Group?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Will this group be in collapsed or expanded mode on initial display ?'),
+      'add' => '1.1',
+      'default' => FALSE,
+    ],
+    'help_pre' => [
+      'title' => ts('Custom Group Pre Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Description and/or help text to display before fields in form.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 80,
+      ],
+    ],
+    'help_post' => [
+      'title' => ts('Custom Group Post Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Description and/or help text to display after fields in form.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 80,
+      ],
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Controls display order when multiple extended property groups are setup for the same class.'),
+      'add' => '1.1',
+      'default' => 1,
+    ],
+    'is_active' => [
+      'title' => ts('Custom Group Is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this property active?'),
+      'add' => '1.1',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'table_name' => [
+      'title' => ts('Table Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('Name of the table that holds the values for this group.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Table Name'),
+        'maxlength' => 255,
+      ],
+    ],
+    'is_multiple' => [
+      'title' => ts('Supports Multiple Records'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Does this group hold multiple values?'),
+      'add' => '2.0',
+      'default' => FALSE,
+    ],
+    'min_multiple' => [
+      'title' => ts('Minimum Multiple Records'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('minimum number of multiple records (typically 0?)'),
+      'add' => '2.2',
+    ],
+    'max_multiple' => [
+      'title' => ts('Maximum Multiple Records'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('maximum number of multiple records, if 0 - no max'),
+      'add' => '2.2',
+    ],
+    'collapse_adv_display' => [
+      'title' => ts('Collapse Group Display'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Will this group be in collapsed or expanded mode on advanced search display ?'),
+      'add' => '3.0',
+      'default' => FALSE,
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_contact, who created this custom group'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Custom Group Created Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time this custom group was created.'),
+      'add' => '3.0',
+    ],
+    'is_reserved' => [
+      'title' => ts('Reserved Group?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this a reserved Custom Group?'),
+      'add' => '4.4',
+      'default' => FALSE,
+    ],
+    'is_public' => [
+      'title' => ts('Custom Group Is Public?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this property public?'),
+      'add' => '4.7',
+      'default' => TRUE,
+    ],
+    'icon' => [
+      'title' => ts('Icon'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('crm-i icon class'),
+      'add' => '5.28',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Dashboard.entityType.php b/www/modules/civicrm/schema/Core/Dashboard.entityType.php
new file mode 100644
index 000000000..9a82535ca
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Dashboard.entityType.php
@@ -0,0 +1,150 @@
+<?php
+
+return [
+  'name' => 'Dashboard',
+  'table' => 'civicrm_dashboard',
+  'class' => 'CRM_Core_DAO_Dashboard',
+  'getInfo' => fn() => [
+    'title' => ts('Dashboard'),
+    'title_plural' => ts('Dashboards'),
+    'description' => ts('Table to store dashboard.'),
+    'add' => '3.1',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('DashletID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '3.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Domain for dashboard'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'name' => [
+      'title' => ts('Dashlet Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Internal name of dashlet.'),
+      'add' => '4.4',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'label' => [
+      'title' => ts('Dashlet Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('dashlet title'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'url' => [
+      'title' => ts('Dashlet URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('url in case of external dashlet'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'permission' => [
+      'title' => ts('Dashlet Permission'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Permission for the dashlet'),
+      'add' => '3.1',
+      'serialize' => CRM_Core_DAO::SERIALIZE_COMMA,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'permission_operator' => [
+      'title' => ts('Dashlet Permission Operator'),
+      'sql_type' => 'varchar(3)',
+      'input_type' => 'Select',
+      'description' => ts('Permission Operator'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::andOr',
+      ],
+    ],
+    'fullscreen_url' => [
+      'title' => ts('Fullscreen URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('fullscreen url for dashlet'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Is Dashlet Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this dashlet active?'),
+      'add' => '3.1',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_reserved' => [
+      'title' => ts('Is Dashlet Reserved?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this dashlet reserved?'),
+      'add' => '3.1',
+      'default' => FALSE,
+    ],
+    'cache_minutes' => [
+      'title' => ts('Cache Minutes'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Number of minutes to cache dashlet content in browser localStorage.'),
+      'add' => '4.7',
+      'default' => 60,
+    ],
+    'directive' => [
+      'title' => ts('Angular directive'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Element name of angular directive to invoke (lowercase hyphenated format)'),
+      'add' => '5.33',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Discount.entityType.php b/www/modules/civicrm/schema/Core/Discount.entityType.php
new file mode 100644
index 000000000..fbc74b757
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Discount.entityType.php
@@ -0,0 +1,109 @@
+<?php
+
+return [
+  'name' => 'Discount',
+  'table' => 'civicrm_discount',
+  'class' => 'CRM_Core_DAO_Discount',
+  'getInfo' => fn() => [
+    'title' => ts('Discount'),
+    'title_plural' => ts('Discounts'),
+    'description' => ts('Stores discounts for events on the basis of date'),
+    'log' => TRUE,
+    'add' => '2.1',
+  ],
+  'getIndices' => fn() => [
+    'index_entity' => [
+      'fields' => [
+        'entity_table' => TRUE,
+        'entity_id' => TRUE,
+      ],
+      'add' => '2.1',
+    ],
+    'index_entity_option_id' => [
+      'fields' => [
+        'entity_table' => TRUE,
+        'entity_id' => TRUE,
+        'price_set_id' => TRUE,
+      ],
+      'add' => '2.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Discount ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('primary key'),
+      'add' => '2.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('physical tablename for entity being joined to discount, e.g. civicrm_event'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_Discount::entityTables',
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to entity table specified in entity_table column.'),
+      'add' => '2.1',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'price_set_id' => [
+      'title' => ts('Price Set ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_price_set'),
+      'add' => '4.3',
+      'unique_name' => 'participant_discount_name',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'label' => ts('Price Set'),
+        'control_field' => 'entity_id',
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_price_set',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'PriceSet',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'start_date' => [
+      'title' => ts('Discount Start Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('Date when discount starts.'),
+      'add' => '2.1',
+    ],
+    'end_date' => [
+      'title' => ts('Discount End Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('Date when discount ends.'),
+      'add' => '2.1',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Domain.entityType.php b/www/modules/civicrm/schema/Core/Domain.entityType.php
new file mode 100644
index 000000000..689462b38
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Domain.entityType.php
@@ -0,0 +1,94 @@
+<?php
+
+return [
+  'name' => 'Domain',
+  'table' => 'civicrm_domain',
+  'class' => 'CRM_Core_DAO_Domain',
+  'getInfo' => fn() => [
+    'title' => ts('Domain'),
+    'title_plural' => ts('Domains'),
+    'description' => ts('Top-level hierarchy to support multi-org/domain installations. Define domains for multi-org installs, else all contacts belong to one domain.'),
+    'add' => '1.1',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '1.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Domain ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Domain Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Name of Domain / Organization'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Domain Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Description of Domain.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'version' => [
+      'title' => ts('CiviCRM Version'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => 'Text',
+      'description' => ts('The civicrm version this instance is running'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 32,
+      ],
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID. This is specifically not an FK to avoid circular constraints'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+      ],
+    ],
+    'locales' => [
+      'title' => ts('Supported Languages'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('list of locales supported by the current db state (NULL for single-lang install)'),
+      'add' => '2.1',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED,
+    ],
+    'locale_custom_strings' => [
+      'title' => ts('Language Customizations'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Locale specific string overrides'),
+      'add' => '3.2',
+      'serialize' => CRM_Core_DAO::SERIALIZE_PHP,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Email.entityType.php b/www/modules/civicrm/schema/Core/Email.entityType.php
new file mode 100644
index 000000000..f651c6e9e
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Email.entityType.php
@@ -0,0 +1,197 @@
+<?php
+
+return [
+  'name' => 'Email',
+  'table' => 'civicrm_email',
+  'class' => 'CRM_Core_DAO_Email',
+  'getInfo' => fn() => [
+    'title' => ts('Email'),
+    'title_plural' => ts('Emails'),
+    'description' => ts('Email information for a specific location.'),
+    'log' => TRUE,
+    'add' => '1.1',
+    'icon' => 'fa-envelope-o',
+    'label_field' => 'email',
+  ],
+  'getIndices' => fn() => [
+    'index_location_type' => [
+      'fields' => [
+        'location_type_id' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+    'UI_email' => [
+      'fields' => [
+        'email' => TRUE,
+      ],
+      'add' => '1.5',
+    ],
+    'index_is_primary' => [
+      'fields' => [
+        'is_primary' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+    'index_is_billing' => [
+      'fields' => [
+        'is_billing' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Email ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique Email ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'location_type_id' => [
+      'title' => ts('Email Location Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Which Location does this email belong to.'),
+      'add' => '2.0',
+      'pseudoconstant' => [
+        'table' => 'civicrm_location_type',
+        'key_column' => 'id',
+        'label_column' => 'display_name',
+      ],
+    ],
+    'email' => [
+      'title' => ts('Email'),
+      'sql_type' => 'varchar(254)',
+      'input_type' => 'Email',
+      'description' => ts('Email address'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '30',
+        'maxlength' => 254,
+      ],
+    ],
+    'is_primary' => [
+      'title' => ts('Is Primary'),
+      'sql_type' => 'boolean',
+      'input_type' => 'Radio',
+      'required' => TRUE,
+      'description' => ts('Is this the primary email address'),
+      'add' => '1.1',
+      'default' => FALSE,
+    ],
+    'is_billing' => [
+      'title' => ts('Is Billing Email?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this the billing?'),
+      'add' => '2.0',
+      'default' => FALSE,
+    ],
+    'on_hold' => [
+      'title' => ts('On Hold'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Implicit FK to civicrm_option_value where option_group = email_on_hold.'),
+      'add' => '1.1',
+      'default' => 0,
+      'usage' => [
+        'export',
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_PseudoConstant::emailOnHoldOptions',
+      ],
+    ],
+    'is_bulkmail' => [
+      'title' => ts('Use for Bulk Mail'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this address for bulk mail ?'),
+      'add' => '1.9',
+      'default' => FALSE,
+      'usage' => [
+        'export',
+      ],
+    ],
+    'hold_date' => [
+      'title' => ts('Hold Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'readonly' => TRUE,
+      'description' => ts('When the address went on bounce hold'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Hold Date'),
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'reset_date' => [
+      'title' => ts('Reset Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('When the address bounce status was last reset'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Reset Date'),
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'signature_text' => [
+      'title' => ts('Signature Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Text formatted signature for the email.'),
+      'add' => '3.2',
+      'default' => NULL,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Signature Text'),
+      ],
+    ],
+    'signature_html' => [
+      'title' => ts('Signature Html'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('HTML formatted signature for the email.'),
+      'add' => '3.2',
+      'default' => NULL,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Signature HTML'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/EntityFile.entityType.php b/www/modules/civicrm/schema/Core/EntityFile.entityType.php
new file mode 100644
index 000000000..cd8dbdfef
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/EntityFile.entityType.php
@@ -0,0 +1,78 @@
+<?php
+
+return [
+  'name' => 'EntityFile',
+  'table' => 'civicrm_entity_file',
+  'class' => 'CRM_Core_DAO_EntityFile',
+  'getInfo' => fn() => [
+    'title' => ts('Entity File'),
+    'title_plural' => ts('Entity Files'),
+    'description' => ts('Attaches (joins) uploaded files (images, documents, etc.) to entities (Contacts, Groups, Actions).'),
+    'log' => TRUE,
+    'add' => '1.5',
+  ],
+  'getIndices' => fn() => [
+    'UI_entity_id_entity_table_file_id' => [
+      'fields' => [
+        'entity_id' => TRUE,
+        'entity_table' => TRUE,
+        'file_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '1.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Entity File ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('primary key'),
+      'add' => '1.5',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('physical tablename for entity being joined to file, e.g. civicrm_contact'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_File::getEntityTables',
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to entity table specified in entity_table column.'),
+      'add' => '1.5',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'file_id' => [
+      'title' => ts('File ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_file'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('File'),
+      ],
+      'entity_reference' => [
+        'entity' => 'File',
+        'key' => 'id',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/EntityTag.entityType.php b/www/modules/civicrm/schema/Core/EntityTag.entityType.php
new file mode 100644
index 000000000..ec80c449f
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/EntityTag.entityType.php
@@ -0,0 +1,86 @@
+<?php
+
+return [
+  'name' => 'EntityTag',
+  'table' => 'civicrm_entity_tag',
+  'class' => 'CRM_Core_DAO_EntityTag',
+  'getInfo' => fn() => [
+    'title' => ts('Entity Tag'),
+    'title_plural' => ts('Entity Tags'),
+    'description' => ts('Tag entities (Contacts, Groups, Actions) to categories.'),
+    'log' => TRUE,
+    'add' => '1.1',
+  ],
+  'getIndices' => fn() => [
+    'UI_entity_id_entity_table_tag_id' => [
+      'fields' => [
+        'entity_id' => TRUE,
+        'entity_table' => TRUE,
+        'tag_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '3.4',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Entity Tag ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('primary key'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('physical tablename for entity being joined to file, e.g. civicrm_contact'),
+      'add' => '3.2',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'tag_used_for',
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to entity table specified in entity_table column.'),
+      'add' => '3.2',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'tag_id' => [
+      'title' => ts('Tag ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_tag'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Tag'),
+        'control_field' => 'entity_table',
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_tag',
+        'key_column' => 'id',
+        'name_column' => 'name',
+        'label_column' => 'label',
+        'condition' => 'is_tagset != 1',
+      ],
+      'entity_reference' => [
+        'entity' => 'Tag',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Extension.entityType.php b/www/modules/civicrm/schema/Core/Extension.entityType.php
new file mode 100644
index 000000000..e99e6b2e5
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Extension.entityType.php
@@ -0,0 +1,136 @@
+<?php
+
+return [
+  'name' => 'Extension',
+  'table' => 'civicrm_extension',
+  'class' => 'CRM_Core_DAO_Extension',
+  'getInfo' => fn() => [
+    'title' => ts('Extension'),
+    'title_plural' => ts('Extensions'),
+    'description' => ts('FIXME'),
+    'log' => FALSE,
+    'add' => '4.2',
+  ],
+  'getIndices' => fn() => [
+    'UI_extension_full_name' => [
+      'fields' => [
+        'full_name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '4.2',
+    ],
+    'UI_extension_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'add' => '4.2',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Extension ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Local Extension ID'),
+      'add' => '4.2',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'type' => [
+      'title' => ts('Type'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'add' => '4.2',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::getExtensionTypes',
+      ],
+    ],
+    'full_name' => [
+      'title' => ts('Key'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Fully qualified extension name'),
+      'add' => '4.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'name' => [
+      'title' => ts('Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Short name'),
+      'add' => '4.2',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'label' => [
+      'title' => ts('Label'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Short, printable name'),
+      'add' => '4.2',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'file' => [
+      'title' => ts('File'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Primary PHP file'),
+      'add' => '4.2',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'schema_version' => [
+      'title' => ts('Schema Version'),
+      'sql_type' => 'varchar(63)',
+      'input_type' => 'Text',
+      'description' => ts('Revision code of the database schema; the format is module-defined'),
+      'add' => '4.2',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 63,
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Extension is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'description' => ts('Is this extension active?'),
+      'add' => '4.2',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/File.entityType.php b/www/modules/civicrm/schema/Core/File.entityType.php
new file mode 100644
index 000000000..f40ba2f7e
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/File.entityType.php
@@ -0,0 +1,95 @@
+<?php
+
+return [
+  'name' => 'File',
+  'table' => 'civicrm_file',
+  'class' => 'CRM_Core_DAO_File',
+  'getInfo' => fn() => [
+    'title' => ts('File'),
+    'title_plural' => ts('Files'),
+    'description' => ts('Data store for uploaded (attached) files (pointer to file on disk OR blob). Maybe be joined to entities via custom_value.file_id or entity_file table.'),
+    'log' => TRUE,
+    'add' => '1.5',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('File ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique ID'),
+      'add' => '1.5',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'file_type_id' => [
+      'title' => ts('File Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Type of file (e.g. Transcript, Income Tax Return, etc). FK to civicrm_option_value.'),
+      'add' => '1.5',
+      'pseudoconstant' => [
+        'option_group_name' => 'file_type',
+      ],
+    ],
+    'mime_type' => [
+      'title' => ts('Mime Type'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('mime type of the document'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'uri' => [
+      'title' => ts('Path'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('uri of the file on disk'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'document' => [
+      'title' => ts('File Contents'),
+      'sql_type' => 'mediumblob',
+      'input_type' => NULL,
+      'description' => ts('contents of the document'),
+      'add' => '1.5',
+    ],
+    'description' => [
+      'title' => ts('File Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Additional descriptive text regarding this attachment (optional).'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'upload_date' => [
+      'title' => ts('File Upload Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time that this attachment was uploaded or written to server.'),
+      'add' => '1.5',
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_contact, who uploaded this file'),
+      'add' => '5.3',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/IM.entityType.php b/www/modules/civicrm/schema/Core/IM.entityType.php
new file mode 100644
index 000000000..5e43f24c8
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/IM.entityType.php
@@ -0,0 +1,124 @@
+<?php
+
+return [
+  'name' => 'IM',
+  'table' => 'civicrm_im',
+  'class' => 'CRM_Core_DAO_IM',
+  'getInfo' => fn() => [
+    'title' => ts('Instant Messaging'),
+    'title_plural' => ts('Instant Messaging'),
+    'description' => ts('IM information for a specific location.'),
+    'log' => TRUE,
+    'add' => '1.1',
+    'icon' => 'fa-comments-o',
+    'label_field' => 'name',
+  ],
+  'getIndices' => fn() => [
+    'index_location_type' => [
+      'fields' => [
+        'location_type_id' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+    'UI_provider_id' => [
+      'fields' => [
+        'provider_id' => TRUE,
+      ],
+      'add' => '1.6',
+    ],
+    'index_is_primary' => [
+      'fields' => [
+        'is_primary' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+    'index_is_billing' => [
+      'fields' => [
+        'is_billing' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Instant Messenger ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique IM ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'location_type_id' => [
+      'title' => ts('IM Location Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Which Location does this email belong to.'),
+      'add' => '2.0',
+      'pseudoconstant' => [
+        'table' => 'civicrm_location_type',
+        'key_column' => 'id',
+        'label_column' => 'display_name',
+      ],
+    ],
+    'name' => [
+      'title' => ts('IM Screen Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('IM screen name'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'provider_id' => [
+      'title' => ts('IM Provider'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Which IM Provider does this screen name belong to.'),
+      'add' => '1.1',
+      'pseudoconstant' => [
+        'option_group_name' => 'instant_messenger_service',
+      ],
+    ],
+    'is_primary' => [
+      'title' => ts('Is Primary'),
+      'sql_type' => 'boolean',
+      'input_type' => 'Radio',
+      'required' => TRUE,
+      'description' => ts('Is this the primary IM for this contact and location.'),
+      'add' => '1.1',
+      'default' => FALSE,
+    ],
+    'is_billing' => [
+      'title' => ts('Is IM Billing?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this the billing?'),
+      'add' => '2.0',
+      'default' => FALSE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Job.entityType.php b/www/modules/civicrm/schema/Core/Job.entityType.php
new file mode 100644
index 000000000..a63e646a1
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Job.entityType.php
@@ -0,0 +1,164 @@
+<?php
+
+return [
+  'name' => 'Job',
+  'table' => 'civicrm_job',
+  'class' => 'CRM_Core_DAO_Job',
+  'getInfo' => fn() => [
+    'title' => ts('Job'),
+    'title_plural' => ts('Jobs'),
+    'description' => ts('Scheduled job.'),
+    'log' => FALSE,
+    'add' => '4.1',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/job/add?reset=1&action=add',
+    'delete' => 'civicrm/admin/job/edit?reset=1&action=delete&id=[id]',
+    'update' => 'civicrm/admin/job/edit?reset=1&action=update&id=[id]',
+    'browse' => 'civicrm/admin/job',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Job ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Job ID'),
+      'add' => '4.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Which Domain is this scheduled job for'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+      ],
+    ],
+    'run_frequency' => [
+      'title' => ts('Job Frequency'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('Scheduled job run frequency.'),
+      'add' => '4.1',
+      'default' => 'Daily',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::getJobFrequency',
+      ],
+    ],
+    'last_run' => [
+      'title' => ts('Last Run'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('When was this cron entry last run'),
+      'add' => '4.1',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Last Run'),
+      ],
+    ],
+    'last_run_end' => [
+      'title' => ts('Last Run End'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('When did this cron entry last finish running'),
+      'add' => '5.72',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Last Run End'),
+      ],
+    ],
+    'scheduled_run_date' => [
+      'title' => ts('Scheduled Run Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('When is this cron entry scheduled to run'),
+      'add' => '4.7',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Scheduled Run Date'),
+      ],
+    ],
+    'name' => [
+      'title' => ts('Job Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Title of the job'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Job Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'TextArea',
+      'description' => ts('Description of the job'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 60,
+        'maxlength' => 255,
+      ],
+    ],
+    'api_entity' => [
+      'title' => ts('API Entity'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Entity of the job api call'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'api_action' => [
+      'title' => ts('API Action'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Action of the job api call'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'parameters' => [
+      'title' => ts('API Parameters'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('List of parameters to the command.'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 60,
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Job Is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this job active?'),
+      'add' => '4.1',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/JobLog.entityType.php b/www/modules/civicrm/schema/Core/JobLog.entityType.php
new file mode 100644
index 000000000..ac8125e54
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/JobLog.entityType.php
@@ -0,0 +1,102 @@
+<?php
+
+return [
+  'name' => 'JobLog',
+  'table' => 'civicrm_job_log',
+  'class' => 'CRM_Core_DAO_JobLog',
+  'getInfo' => fn() => [
+    'title' => ts('Job Log'),
+    'title_plural' => ts('Job Logs'),
+    'description' => ts('Scheduled jobs log.'),
+    'log' => FALSE,
+    'add' => '4.1',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Job Log ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Job log entry ID'),
+      'add' => '4.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Which Domain is this scheduled job for'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+      ],
+    ],
+    'run_time' => [
+      'title' => ts('Timestamp'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('Log entry date'),
+      'add' => '4.1',
+    ],
+    'job_id' => [
+      'title' => ts('Job ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Pointer to job id'),
+      'add' => '4.1',
+      'entity_reference' => [
+        'entity' => 'Job',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'name' => [
+      'title' => ts('Job Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Title of the job'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'command' => [
+      'title' => ts('Command'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Full path to file containing job script'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Title line of log entry'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'data' => [
+      'title' => ts('Extended Data'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('Potential extended data for specific job run (e.g. tracebacks).'),
+      'add' => '4.1',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/LocBlock.entityType.php b/www/modules/civicrm/schema/Core/LocBlock.entityType.php
new file mode 100644
index 000000000..3b8d34624
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/LocBlock.entityType.php
@@ -0,0 +1,139 @@
+<?php
+
+return [
+  'name' => 'LocBlock',
+  'table' => 'civicrm_loc_block',
+  'class' => 'CRM_Core_DAO_LocBlock',
+  'getInfo' => fn() => [
+    'title' => ts('Location'),
+    'title_plural' => ts('Locations'),
+    'description' => ts('Define location specific properties'),
+    'log' => TRUE,
+    'add' => '2.0',
+    'icon' => 'fa-map-o',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Location Block ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique ID'),
+      'add' => '2.0',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'address_id' => [
+      'title' => ts('Address ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Address'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Address',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'email_id' => [
+      'title' => ts('Email ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Email'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Email',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'phone_id' => [
+      'title' => ts('Phone ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Phone'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Phone',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'im_id' => [
+      'title' => ts('IM ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Instant Messenger'),
+      ],
+      'entity_reference' => [
+        'entity' => 'IM',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'address_2_id' => [
+      'title' => ts('Address 2 ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Address 2'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Address',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'email_2_id' => [
+      'title' => ts('Email 2 ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Email 2'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Email',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'phone_2_id' => [
+      'title' => ts('Phone 2 ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Phone 2'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Phone',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'im_2_id' => [
+      'title' => ts('IM 2 ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Instant Messenger 2'),
+      ],
+      'entity_reference' => [
+        'entity' => 'IM',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/LocationType.entityType.php b/www/modules/civicrm/schema/Core/LocationType.entityType.php
new file mode 100644
index 000000000..53a04b73b
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/LocationType.entityType.php
@@ -0,0 +1,121 @@
+<?php
+
+return [
+  'name' => 'LocationType',
+  'table' => 'civicrm_location_type',
+  'class' => 'CRM_Core_DAO_LocationType',
+  'getInfo' => fn() => [
+    'title' => ts('Location Type'),
+    'title_plural' => ts('Location Types'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '1.1',
+    'label_field' => 'display_name',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/locationType/edit?action=add&reset=1',
+    'update' => 'civicrm/admin/locationType/edit?action=update&id=[id]&reset=1',
+    'delete' => 'civicrm/admin/locationType/edit?action=delete&id=[id]&reset=1',
+    'browse' => 'civicrm/admin/locationType',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Location Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Location Type ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Location Type'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Location Type Name.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'display_name' => [
+      'title' => ts('Display Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Location Type Display Name.'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'vcard_name' => [
+      'title' => ts('vCard Location Type'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('vCard Location Type Name.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Location Type Description.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_reserved' => [
+      'title' => ts('Location Type is Reserved?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this location type a predefined system location?'),
+      'add' => '1.1',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Reserved'),
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Location Type is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this property active?'),
+      'add' => '1.1',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_default' => [
+      'title' => ts('Default Location Type?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this location type the default?'),
+      'add' => '1.1',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Default'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Log.entityType.php b/www/modules/civicrm/schema/Core/Log.entityType.php
new file mode 100644
index 000000000..7fafa0ee1
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Log.entityType.php
@@ -0,0 +1,86 @@
+<?php
+
+return [
+  'name' => 'Log',
+  'table' => 'civicrm_log',
+  'class' => 'CRM_Core_DAO_Log',
+  'getInfo' => fn() => [
+    'title' => ts('Log'),
+    'title_plural' => ts('Logs'),
+    'description' => ts('Log can be linked to any object in the application.'),
+    'add' => '1.5',
+  ],
+  'getIndices' => fn() => [
+    'index_entity' => [
+      'fields' => [
+        'entity_table' => TRUE,
+        'entity_id' => TRUE,
+      ],
+      'add' => '1.5',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Log ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Log ID'),
+      'add' => '1.5',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Name of table where item being referenced is stored.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Foreign key to the referenced item.'),
+      'add' => '1.5',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'data' => [
+      'title' => ts('Data'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Updates does to this object if any.'),
+      'add' => '1.5',
+    ],
+    'modified_id' => [
+      'title' => ts('Modified By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID of person under whose credentials this data modification was made.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('Modified By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'modified_date' => [
+      'title' => ts('Modified Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('When was the referenced entity created or modified or deleted.'),
+      'add' => '1.5',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/MailSettings.entityType.php b/www/modules/civicrm/schema/Core/MailSettings.entityType.php
new file mode 100644
index 000000000..1a2cafeb9
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/MailSettings.entityType.php
@@ -0,0 +1,278 @@
+<?php
+
+return [
+  'name' => 'MailSettings',
+  'table' => 'civicrm_mail_settings',
+  'class' => 'CRM_Core_DAO_MailSettings',
+  'getInfo' => fn() => [
+    'title' => ts('Mail Account'),
+    'title_plural' => ts('Mail Accounts'),
+    'description' => ts('Various email accounts for use by CiviMail (and its processor)'),
+    'add' => '2.2',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/mailSettings/edit?action=add&reset=1',
+    'update' => 'civicrm/admin/mailSettings/edit?action=update&id=[id]&reset=1',
+    'delete' => 'civicrm/admin/mailSettings/edit?action=delete&id=[id]&reset=1',
+    'browse' => 'civicrm/admin/mailSettings',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Mail Settings ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('primary key'),
+      'add' => '2.2',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Which Domain is this match entry for'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'name' => [
+      'title' => ts('Mail Settings Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('name of this group of settings'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_default' => [
+      'title' => ts('Is Default Mail Settings?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('whether this is the default set of settings for this domain'),
+      'add' => '2.2',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Default'),
+      ],
+    ],
+    'domain' => [
+      'title' => ts('email Domain'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('email address domain (the part after @)'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'localpart' => [
+      'title' => ts('email Local Part'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('optional local part (like civimail+ for addresses like civimail+s.1.2@example.com)'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'return_path' => [
+      'title' => ts('Return Path'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('contents of the Return-Path header'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'protocol' => [
+      'title' => ts('Protocol'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Select',
+      'description' => ts('name of the protocol to use for polling (like IMAP, POP3 or Maildir)'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'mail_protocol',
+      ],
+    ],
+    'server' => [
+      'title' => ts('Mail Server'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('server to use when polling'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'port' => [
+      'title' => ts('Mail Port'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('port to use when polling'),
+      'add' => '2.2',
+    ],
+    'username' => [
+      'title' => ts('Mail Account Username'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('username to use when polling'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'password' => [
+      'title' => ts('Mail Account Password'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('password to use when polling'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_ssl' => [
+      'title' => ts('Mail Account Uses SSL'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('whether to use SSL or not'),
+      'add' => '2.2',
+      'default' => FALSE,
+    ],
+    'source' => [
+      'title' => ts('Mail Folder'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('folder to poll from when using IMAP, path to poll from when using Maildir, etc.'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'activity_status' => [
+      'title' => ts('Activity Status'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Select',
+      'description' => ts('Name of status to use when creating email to activity.'),
+      'add' => '4.7',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'activity_status',
+        'key_column' => 'name',
+      ],
+    ],
+    'is_non_case_email_skipped' => [
+      'title' => ts('Skip emails which do not have a Case ID or Case hash'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => 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. Any emails that are not processed will be moved to the ignored folder.'),
+      'add' => '5.31',
+      'default' => FALSE,
+    ],
+    'is_contact_creation_disabled_if_no_match' => [
+      'title' => ts('Do not create new contacts when filing emails'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('If this option is enabled, CiviCRM will not create new contacts when filing emails.'),
+      'add' => '5.31',
+      'default' => FALSE,
+    ],
+    'is_active' => [
+      'title' => ts('Enabled?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Ignored for bounce processing, only for email-to-activity'),
+      'add' => '5.66',
+      'default' => TRUE,
+    ],
+    'activity_type_id' => [
+      'title' => ts('Activity Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Implicit FK to civicrm_option_value where option_group = activity_type'),
+      'add' => '5.66',
+      'pseudoconstant' => [
+        'option_group_name' => 'activity_type',
+      ],
+    ],
+    'campaign_id' => [
+      'title' => ts('Campaign ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Foreign key to the Campaign.'),
+      'add' => '5.66',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Campaign'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_campaign',
+        'key_column' => 'id',
+        'label_column' => 'title',
+        'prefetch' => 'disabled',
+      ],
+      'entity_reference' => [
+        'entity' => 'Campaign',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'activity_source' => [
+      'title' => ts('Activity Source'),
+      'sql_type' => 'varchar(4)',
+      'input_type' => 'Select',
+      'description' => ts('Which email recipient to add as the activity source (from, to, cc, bcc).'),
+      'add' => '5.66',
+      'input_attrs' => [
+        'maxlength' => 4,
+      ],
+    ],
+    'activity_targets' => [
+      'title' => ts('Activity Targets'),
+      'sql_type' => 'varchar(16)',
+      'input_type' => 'Select',
+      'description' => ts('Which email recipients to add as the activity targets (from, to, cc, bcc).'),
+      'add' => '5.66',
+      'serialize' => CRM_Core_DAO::SERIALIZE_COMMA,
+      'input_attrs' => [
+        'maxlength' => 16,
+      ],
+    ],
+    'activity_assignees' => [
+      'title' => ts('Activity Assignees'),
+      'sql_type' => 'varchar(16)',
+      'input_type' => 'Select',
+      'description' => ts('Which email recipients to add as the activity assignees (from, to, cc, bcc).'),
+      'add' => '5.66',
+      'serialize' => CRM_Core_DAO::SERIALIZE_COMMA,
+      'input_attrs' => [
+        'maxlength' => 16,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Managed.entityType.php b/www/modules/civicrm/schema/Core/Managed.entityType.php
new file mode 100644
index 000000000..ef99e9010
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Managed.entityType.php
@@ -0,0 +1,108 @@
+<?php
+
+return [
+  'name' => 'Managed',
+  'table' => 'civicrm_managed',
+  'class' => 'CRM_Core_DAO_Managed',
+  'getInfo' => fn() => [
+    'title' => ts('Managed Record'),
+    'title_plural' => ts('Managed Records'),
+    'description' => ts('List of declaratively managed objects'),
+    'log' => FALSE,
+    'add' => '4.2',
+  ],
+  'getIndices' => fn() => [
+    'UI_managed_module_name' => [
+      'fields' => [
+        'module' => TRUE,
+        'name' => TRUE,
+      ],
+      'add' => '4.2',
+    ],
+    'UI_managed_entity' => [
+      'fields' => [
+        'entity_type' => TRUE,
+        'entity_id' => TRUE,
+      ],
+      'add' => '4.2',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Managed ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Surrogate Key'),
+      'add' => '4.2',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'module' => [
+      'title' => ts('Module'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Name of the module which declared this object (soft FK to civicrm_extension.full_name)'),
+      'add' => '4.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_Managed::getBaseModules',
+      ],
+    ],
+    'name' => [
+      'title' => ts('Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Symbolic name used by the module to identify the object'),
+      'add' => '4.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'entity_type' => [
+      'title' => ts('Entity Type'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('API entity type'),
+      'add' => '4.2',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Soft foreign key to the referenced item.'),
+      'add' => '4.2',
+    ],
+    'cleanup' => [
+      'title' => ts('Cleanup Setting'),
+      'sql_type' => 'varchar(16)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Policy on when to cleanup entity (always, never, unused)'),
+      'add' => '4.5',
+      'default' => 'always',
+      'input_attrs' => [
+        'maxlength' => 16,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_ManagedEntities::getCleanupOptions',
+      ],
+    ],
+    'entity_modified_date' => [
+      'title' => ts('Entity Modified Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('When the managed entity was changed from its original settings.'),
+      'add' => '5.45',
+      'default' => NULL,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Mapping.entityType.php b/www/modules/civicrm/schema/Core/Mapping.entityType.php
new file mode 100644
index 000000000..448d83fd2
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Mapping.entityType.php
@@ -0,0 +1,71 @@
+<?php
+
+return [
+  'name' => 'Mapping',
+  'table' => 'civicrm_mapping',
+  'class' => 'CRM_Core_DAO_Mapping',
+  'getInfo' => fn() => [
+    'title' => ts('Field Mapping'),
+    'title_plural' => ts('Field Mappings'),
+    'description' => ts('Store field mappings in import or export for reuse'),
+    'add' => '1.2',
+    'label_field' => 'name',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/mapping/edit?reset=1&action=add',
+    'browse' => 'civicrm/admin/mapping?reset=1',
+    'update' => 'civicrm/admin/mapping/edit?reset=1&action=update&id=[id]',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '1.2',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Mapping ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Mapping ID'),
+      'add' => '1.2',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Mapping Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Unique name of Mapping'),
+      'add' => '1.2',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Description of Mapping.'),
+      'add' => '1.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'mapping_type_id' => [
+      'title' => ts('Mapping Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Mapping Type'),
+      'add' => '2.1',
+      'pseudoconstant' => [
+        'option_group_name' => 'mapping_type',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/MappingField.entityType.php b/www/modules/civicrm/schema/Core/MappingField.entityType.php
new file mode 100644
index 000000000..d9278c340
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/MappingField.entityType.php
@@ -0,0 +1,169 @@
+<?php
+
+return [
+  'name' => 'MappingField',
+  'table' => 'civicrm_mapping_field',
+  'class' => 'CRM_Core_DAO_MappingField',
+  'getInfo' => fn() => [
+    'title' => ts('Mapping Field'),
+    'title_plural' => ts('Mapping Fields'),
+    'description' => ts('Individual field mappings for Mapping'),
+    'add' => '1.2',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Mapping Field ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Mapping Field ID'),
+      'add' => '1.2',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'mapping_id' => [
+      'title' => ts('Mapping ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Mapping to which this field belongs'),
+      'add' => '1.2',
+      'input_attrs' => [
+        'label' => ts('Mapping'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Mapping',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'name' => [
+      'title' => ts('Field Name (or unique reference)'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Mapping field key'),
+      'add' => '1.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'contact_type' => [
+      'title' => ts('Contact Type'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('Contact Type in mapping'),
+      'add' => '1.2',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'column_number' => [
+      'title' => ts('Column Number to map to'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Column number for mapping set'),
+      'add' => '1.2',
+    ],
+    'location_type_id' => [
+      'title' => ts('Location type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Location type of this mapping, if required'),
+      'add' => '1.2',
+      'input_attrs' => [
+        'label' => ts('Location type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_location_type',
+        'key_column' => 'id',
+        'label_column' => 'display_name',
+      ],
+      'entity_reference' => [
+        'entity' => 'LocationType',
+        'key' => 'id',
+      ],
+    ],
+    'phone_type_id' => [
+      'title' => ts('Phone type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Which type of phone does this number belongs.'),
+      'add' => '2.2',
+    ],
+    'im_provider_id' => [
+      'title' => ts('IM provider ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Which type of IM Provider does this name belong.'),
+      'add' => '3.0',
+      'pseudoconstant' => [
+        'option_group_name' => 'instant_messenger_service',
+      ],
+    ],
+    'website_type_id' => [
+      'title' => ts('Website type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Which type of website does this site belong'),
+      'add' => '3.2',
+      'pseudoconstant' => [
+        'option_group_name' => 'website_type',
+      ],
+    ],
+    'relationship_type_id' => [
+      'title' => ts('Relationship type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Relationship type, if required'),
+      'add' => '1.2',
+      'input_attrs' => [
+        'label' => ts('Relationship type'),
+      ],
+      'entity_reference' => [
+        'entity' => 'RelationshipType',
+        'key' => 'id',
+      ],
+    ],
+    'relationship_direction' => [
+      'title' => ts('Relationship Direction'),
+      'sql_type' => 'varchar(6)',
+      'input_type' => 'Text',
+      'add' => '1.7',
+      'input_attrs' => [
+        'maxlength' => 6,
+      ],
+    ],
+    'grouping' => [
+      'title' => ts('Field Grouping'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Used to group mapping_field records into related sets (e.g. for criteria sets in search builder mappings).'),
+      'add' => '1.5',
+      'default' => 1,
+    ],
+    'operator' => [
+      'title' => ts('Operator'),
+      'sql_type' => 'varchar(16)',
+      'input_type' => 'Select',
+      'description' => ts('SQL WHERE operator for search-builder mapping fields (search criteria).'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 16,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::getSearchBuilderOperators',
+      ],
+    ],
+    'value' => [
+      'title' => ts('Search builder where clause'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('SQL WHERE value for search-builder mapping fields.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Menu.entityType.php b/www/modules/civicrm/schema/Core/Menu.entityType.php
new file mode 100644
index 000000000..049e238cf
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Menu.entityType.php
@@ -0,0 +1,244 @@
+<?php
+
+return [
+  'name' => 'Menu',
+  'table' => 'civicrm_menu',
+  'class' => 'CRM_Core_DAO_Menu',
+  'getInfo' => fn() => [
+    'title' => ts('Menu'),
+    'title_plural' => ts('Menus'),
+    'description' => ts('Table to store menu items for all civicrm components.'),
+    'add' => '1.1',
+  ],
+  'getIndices' => fn() => [
+    'UI_path_domain_id' => [
+      'fields' => [
+        'path' => TRUE,
+        'domain_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Menu ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '2.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Which Domain is this menu item for'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+      ],
+    ],
+    'path' => [
+      'title' => ts('Path'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Path Name'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'path_arguments' => [
+      'title' => ts('Arguments'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Arguments to pass to the url'),
+      'add' => '2.1',
+    ],
+    'title' => [
+      'title' => ts('Menu Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '2.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'access_callback' => [
+      'title' => ts('Access Callback'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Function to call to check access permissions'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'access_arguments' => [
+      'title' => ts('Access Arguments'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Arguments to pass to access callback'),
+      'add' => '2.1',
+    ],
+    'page_callback' => [
+      'title' => ts('Page Callback'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('function to call for this url'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'page_arguments' => [
+      'title' => ts('Page Arguments'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Arguments to pass to page callback'),
+      'add' => '2.1',
+    ],
+    'breadcrumb' => [
+      'title' => ts('Breadcrumb'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Breadcrumb for the path.'),
+      'add' => '2.1',
+    ],
+    'return_url' => [
+      'title' => ts('Return Url'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Url where a page should redirected to, if next url not known.'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'label' => ts('Return URL'),
+        'maxlength' => 255,
+      ],
+    ],
+    'return_url_args' => [
+      'title' => ts('Return Url Args'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Arguments to pass to return_url'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'label' => ts('Return URL Arguments'),
+        'maxlength' => 255,
+      ],
+    ],
+    'component_id' => [
+      'title' => ts('Component ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Component that this menu item belongs to'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'label' => ts('Component'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_component',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Component',
+        'key' => 'id',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Enabled?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this menu item active?'),
+      'add' => '2.1',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_public' => [
+      'title' => ts('Public?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this menu accessible to the public?'),
+      'add' => '2.1',
+      'default' => FALSE,
+    ],
+    'is_exposed' => [
+      'title' => ts('Exposed?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this menu exposed to the navigation system?'),
+      'add' => '2.1',
+      'default' => TRUE,
+    ],
+    'is_ssl' => [
+      'title' => ts('Use SSL?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should this menu be exposed via SSL if enabled?'),
+      'add' => '2.1',
+      'default' => TRUE,
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Ordering of the menu items in various blocks.'),
+      'add' => '2.1',
+      'default' => 1,
+    ],
+    'type' => [
+      'title' => ts('Type'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Drupal menu type.'),
+      'add' => '2.1',
+      'default' => 1,
+    ],
+    'page_type' => [
+      'title' => ts('Page Type'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('CiviCRM menu type.'),
+      'add' => '2.1',
+      'default' => 1,
+    ],
+    'skipBreadcrumb' => [
+      'title' => ts('Hide Breadcrumb?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('skip this url being exposed to breadcrumb'),
+      'add' => '2.2',
+      'default' => FALSE,
+    ],
+    'module_data' => [
+      'title' => ts('Other menu data'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('All other menu metadata not stored in other fields'),
+      'add' => '4.7',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/MessageTemplate.entityType.php b/www/modules/civicrm/schema/Core/MessageTemplate.entityType.php
new file mode 100644
index 000000000..46dd327cb
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/MessageTemplate.entityType.php
@@ -0,0 +1,140 @@
+<?php
+
+return [
+  'name' => 'MessageTemplate',
+  'table' => 'civicrm_msg_template',
+  'class' => 'CRM_Core_DAO_MessageTemplate',
+  'getInfo' => fn() => [
+    'title' => ts('Message Template'),
+    'title_plural' => ts('Message Templates'),
+    'description' => ts('Users will need a way to save and retrieve templates with tokens for use in recurring email communication tasks'),
+    'add' => '1.6',
+    'icon' => 'fa-newspaper-o',
+    'label_field' => 'msg_title',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/messageTemplates/add?action=add&reset=1',
+    'view' => 'civicrm/admin/messageTemplates/add?action=view&id=[id]&reset=1',
+    'update' => 'civicrm/admin/messageTemplates/add?action=update&id=[id]&reset=1',
+    'delete' => 'civicrm/admin/messageTemplates?action=delete&id=[id]&reset=1',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Message Template ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Message Template ID'),
+      'add' => '1.6',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'msg_title' => [
+      'title' => ts('Message Template Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Descriptive title of message'),
+      'add' => '1.6',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'msg_subject' => [
+      'title' => ts('Message Template Subject'),
+      'sql_type' => 'text',
+      'input_type' => 'Text',
+      'description' => ts('Subject for email message.'),
+      'add' => '1.6',
+    ],
+    'msg_text' => [
+      'title' => ts('Message Template Text'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('Text formatted message'),
+      'add' => '1.6',
+      'input_attrs' => [
+        'rows' => 10,
+        'cols' => 75,
+      ],
+    ],
+    'msg_html' => [
+      'title' => ts('Message Template HTML'),
+      'sql_type' => 'longtext',
+      'input_type' => 'RichTextEditor',
+      'description' => ts('HTML formatted message'),
+      'add' => '1.6',
+      'input_attrs' => [
+        'rows' => 10,
+        'cols' => 75,
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '1.6',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'workflow_id' => [
+      'title' => ts('Deprecated field for Message Template Workflow.'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('a pseudo-FK to civicrm_option_value'),
+      'add' => '3.1',
+    ],
+    'workflow_name' => [
+      'title' => ts('Message Template Workflow Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '5.26',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_default' => [
+      'title' => ts('Message Template Is Default?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('is this the default message template for the workflow referenced by workflow_id?'),
+      'add' => '3.1',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Default'),
+      ],
+    ],
+    'is_reserved' => [
+      'title' => ts('Message Template Is Reserved?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('is this the reserved message template which we ship for the workflow referenced by workflow_id?'),
+      'add' => '3.1',
+      'default' => FALSE,
+    ],
+    'is_sms' => [
+      'title' => ts('Message Template is used for SMS?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this message template used for sms?'),
+      'add' => '4.5',
+      'default' => FALSE,
+    ],
+    'pdf_format_id' => [
+      'title' => ts('Message Template Format'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('a pseudo-FK to civicrm_option_value containing PDF Page Format.'),
+      'add' => '3.4',
+      'pseudoconstant' => [
+        'option_group_name' => 'pdf_format',
+        'key_column' => 'id',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Navigation.entityType.php b/www/modules/civicrm/schema/Core/Navigation.entityType.php
new file mode 100644
index 000000000..03fcc0fb3
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Navigation.entityType.php
@@ -0,0 +1,163 @@
+<?php
+
+return [
+  'name' => 'Navigation',
+  'table' => 'civicrm_navigation',
+  'class' => 'CRM_Core_DAO_Navigation',
+  'getInfo' => fn() => [
+    'title' => ts('Menu Item'),
+    'title_plural' => ts('Menu Items'),
+    'description' => ts('Table to store navigation.'),
+    'add' => '3.0',
+    'label_field' => 'label',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Navigation ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '3.0',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Which Domain is this navigation item for'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+      ],
+    ],
+    'label' => [
+      'title' => ts('Navigation Item Label'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Navigation Title'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'name' => [
+      'title' => ts('Navigation Item Machine Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Internal Name'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'url' => [
+      'title' => ts('Url'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('url in case of custom navigation link'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'icon' => [
+      'title' => ts('Icon'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('CSS class name for an icon'),
+      'add' => '4.7',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'permission' => [
+      'title' => ts('Required Permission'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Permission(s) needed to access menu item'),
+      'add' => '3.0',
+      'serialize' => CRM_Core_DAO::SERIALIZE_COMMA,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'permission_operator' => [
+      'title' => ts('Permission Operator'),
+      'sql_type' => 'varchar(3)',
+      'input_type' => 'Select',
+      'description' => ts('Operator to use if item has more than one permission'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::andOr',
+      ],
+    ],
+    'parent_id' => [
+      'title' => ts('parent ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Parent navigation item, used for grouping'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'label' => ts('parent'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_navigation',
+        'key_column' => 'id',
+        'name_column' => 'name',
+        'label_column' => 'label',
+      ],
+      'entity_reference' => [
+        'entity' => 'Navigation',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this navigation item active?'),
+      'add' => '3.0',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'has_separator' => [
+      'title' => ts('Separator'),
+      'sql_type' => 'tinyint',
+      'input_type' => 'Select',
+      'description' => ts('Place a separator either before or after this menu item.'),
+      'add' => '3.0',
+      'default' => 0,
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::navigationMenuSeparator',
+      ],
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Ordering of the navigation items in various blocks.'),
+      'add' => '3.0',
+      'default' => 0,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Note.entityType.php b/www/modules/civicrm/schema/Core/Note.entityType.php
new file mode 100644
index 000000000..19114314c
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Note.entityType.php
@@ -0,0 +1,166 @@
+<?php
+
+return [
+  'name' => 'Note',
+  'table' => 'civicrm_note',
+  'class' => 'CRM_Core_DAO_Note',
+  'getInfo' => fn() => [
+    'title' => ts('Note'),
+    'title_plural' => ts('Notes'),
+    'description' => ts('Notes can be linked to any object in the application.'),
+    'log' => TRUE,
+    'add' => '1.1',
+    'icon' => 'fa-sticky-note',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/note?reset=1&action=add&entity_table=[entity_table]&entity_id=[entity_id]',
+    'view' => 'civicrm/note?reset=1&action=view&id=[id]',
+    'update' => 'civicrm/note?reset=1&action=update&id=[id]',
+    'delete' => 'civicrm/note?reset=1&action=delete&id=[id]',
+  ],
+  'getIndices' => fn() => [
+    'index_entity' => [
+      'fields' => [
+        'entity_table' => TRUE,
+        'entity_id' => TRUE,
+      ],
+      'add' => '1.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Note ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Note ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Note Entity'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Name of table where item being referenced is stored.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Reference Type'),
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'note_used_for',
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Note Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Foreign key to the referenced item.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Reference Item'),
+      ],
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'note' => [
+      'title' => ts('Note'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Note and/or Comment.'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 60,
+      ],
+    ],
+    'contact_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID creator'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'note_date' => [
+      'title' => ts('Note Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'description' => ts('Date attached to the note'),
+      'add' => '5.36',
+      'default' => 'CURRENT_TIMESTAMP',
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Created Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'required' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('When the note was created.'),
+      'add' => '5.36',
+      'default' => 'CURRENT_TIMESTAMP',
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'modified_date' => [
+      'title' => ts('Note Modified Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'readonly' => TRUE,
+      'description' => ts('When was this note last modified/edited'),
+      'add' => '1.1',
+      'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+      'input_attrs' => [
+        'label' => ts('Modified Date'),
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'subject' => [
+      'title' => ts('Subject'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('subject of note description'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'size' => '60',
+        'maxlength' => 255,
+      ],
+    ],
+    'privacy' => [
+      'title' => ts('Privacy'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Foreign Key to Note Privacy Level (which is an option value pair and hence an implicit FK)'),
+      'add' => '3.3',
+      'default' => '0',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'note_privacy',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/OpenID.entityType.php b/www/modules/civicrm/schema/Core/OpenID.entityType.php
new file mode 100644
index 000000000..740011f0c
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/OpenID.entityType.php
@@ -0,0 +1,103 @@
+<?php
+
+return [
+  'name' => 'OpenID',
+  'table' => 'civicrm_openid',
+  'class' => 'CRM_Core_DAO_OpenID',
+  'getInfo' => fn() => [
+    'title' => ts('Open ID'),
+    'title_plural' => ts('Open IDs'),
+    'description' => ts('OpenID information for a specific location.'),
+    'add' => '2.0',
+  ],
+  'getIndices' => fn() => [
+    'index_location_type' => [
+      'fields' => [
+        'location_type_id' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+    'UI_openid' => [
+      'fields' => [
+        'openid' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.0',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Open ID identifier'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique OpenID ID'),
+      'add' => '2.0',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'location_type_id' => [
+      'title' => ts('OpenID Location Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Which Location does this email belong to.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Location Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_location_type',
+        'key_column' => 'id',
+        'label_column' => 'display_name',
+      ],
+    ],
+    'openid' => [
+      'title' => ts('OpenID'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Url',
+      'description' => ts('the OpenID (or OpenID-style http://username.domain/) unique identifier for this contact mainly used for logging in to CiviCRM'),
+      'add' => '2.0',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'allowed_to_login' => [
+      'title' => ts('Allowed to login?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Whether or not this user is allowed to login'),
+      'add' => '2.0',
+      'default' => FALSE,
+    ],
+    'is_primary' => [
+      'title' => ts('Is Primary'),
+      'sql_type' => 'boolean',
+      'input_type' => 'Radio',
+      'required' => TRUE,
+      'description' => ts('Is this the primary email for this contact and location.'),
+      'add' => '2.0',
+      'default' => FALSE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/OptionGroup.entityType.php b/www/modules/civicrm/schema/Core/OptionGroup.entityType.php
new file mode 100644
index 000000000..31c66d33e
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/OptionGroup.entityType.php
@@ -0,0 +1,133 @@
+<?php
+
+return [
+  'name' => 'OptionGroup',
+  'table' => 'civicrm_option_group',
+  'class' => 'CRM_Core_DAO_OptionGroup',
+  'getInfo' => fn() => [
+    'title' => ts('Option Group'),
+    'title_plural' => ts('Option Groups'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '1.5',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/options?action=add&reset=1',
+    'update' => 'civicrm/admin/options?action=update&reset=1&id=[id]',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Option Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Option Group ID'),
+      'add' => '1.5',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Option Group Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Option group name. Used as selection key by class properties which lookup options in civicrm_option_value.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'title' => [
+      'title' => ts('Option Group Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Option Group title.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Option Group Description'),
+      'sql_type' => 'text',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Option group description.'),
+      'add' => '1.5',
+    ],
+    'data_type' => [
+      'title' => ts('Data Type'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Select',
+      'description' => ts('Type of data stored by this option group.'),
+      'add' => '4.7',
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Utils_Type::dataTypes',
+      ],
+    ],
+    'is_reserved' => [
+      'title' => ts('Option Group Is Reserved'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this a predefined system option group (i.e. it can not be deleted)?'),
+      'add' => '1.5',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Reserved'),
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Enabled'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this option group active?'),
+      'add' => '1.5',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_locked' => [
+      'title' => ts('Option Group Is Locked'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('A lock to remove the ability to add new options via the UI.'),
+      'add' => '4.5',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Locked'),
+      ],
+    ],
+    'option_value_fields' => [
+      'title' => ts('Option Value Fields'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Select',
+      'description' => ts('Which optional columns from the option_value table are in use by this group.'),
+      'add' => '5.49',
+      'default' => 'name,label,description',
+      'serialize' => CRM_Core_DAO::SERIALIZE_COMMA,
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::optionValueFields',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/OptionValue.entityType.php b/www/modules/civicrm/schema/Core/OptionValue.entityType.php
new file mode 100644
index 000000000..f919b06e5
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/OptionValue.entityType.php
@@ -0,0 +1,255 @@
+<?php
+
+return [
+  'name' => 'OptionValue',
+  'table' => 'civicrm_option_value',
+  'class' => 'CRM_Core_DAO_OptionValue',
+  'getInfo' => fn() => [
+    'title' => ts('Option Value'),
+    'title_plural' => ts('Option Values'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '1.5',
+  ],
+  'getPaths' => fn() => [
+    'update' => 'civicrm/admin/options/[option_group_id:name]?reset=1&action=update&id=[id]',
+    'delete' => 'civicrm/admin/options/[option_group_id:name]?reset=1&action=delete&id=[id]',
+  ],
+  'getIndices' => fn() => [
+    'index_option_group_id_value' => [
+      'fields' => [
+        'value' => 128,
+        'option_group_id' => TRUE,
+      ],
+      'add' => '1.5',
+    ],
+    'index_option_group_id_name' => [
+      'fields' => [
+        'name' => 128,
+        'option_group_id' => TRUE,
+      ],
+      'add' => '2.2',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Option Value ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Option ID'),
+      'add' => '1.5',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'option_group_id' => [
+      'title' => ts('Option Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Group which this option belongs to.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('Option Group'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_option_group',
+        'key_column' => 'id',
+        'name_column' => 'name',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'OptionGroup',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'label' => [
+      'title' => ts('Option Label'),
+      'sql_type' => 'varchar(512)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Option string as displayed to users - e.g. the label in an HTML OPTION tag.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 512,
+      ],
+    ],
+    'value' => [
+      'title' => ts('Option Value'),
+      'sql_type' => 'varchar(512)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('The actual value stored (as a foreign key) in the data record. Functions which need lookup option_value.title should use civicrm_option_value.option_group_id plus civicrm_option_value.value as the key.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 512,
+      ],
+    ],
+    'name' => [
+      'title' => ts('Option Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Stores a fixed (non-translated) name for this option value. Lookup functions should use the name as the key for the option value row.'),
+      'add' => '1.5',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'grouping' => [
+      'title' => ts('Option Grouping Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Use to sort and/or set display properties for sub-set(s) of options within an option group. EXAMPLE: Use for college_interest field, to differentiate partners from non-partners.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'filter' => [
+      'title' => ts('Filter'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Bitwise logic can be used to create subsets of options within an option_group for different uses.'),
+      'add' => '1.5',
+      'default' => 0,
+      'input_attrs' => [
+        'label' => ts('Filter'),
+      ],
+    ],
+    'is_default' => [
+      'title' => ts('Option is Default?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'description' => ts('Is this the default option for the group?'),
+      'add' => '1.5',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Default'),
+      ],
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Controls display sort order.'),
+      'add' => '1.5',
+    ],
+    'description' => [
+      'title' => ts('Option Description'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Optional description.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'rows' => 8,
+        'cols' => 60,
+      ],
+    ],
+    'is_optgroup' => [
+      'title' => ts('Option is Header?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'description' => ts('Is this row simply a display header? Expected usage is to render these as OPTGROUP tags within a SELECT field list of options?'),
+      'add' => '1.5',
+      'default' => FALSE,
+    ],
+    'is_reserved' => [
+      'title' => ts('Option Is Reserved?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'description' => ts('Is this a predefined system object?'),
+      'add' => '1.5',
+      'default' => FALSE,
+    ],
+    'is_active' => [
+      'title' => ts('Option Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'description' => ts('Is this option active?'),
+      'add' => '1.5',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'component_id' => [
+      'title' => ts('Component ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Component that this option value belongs/caters to.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Component'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_component',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Component',
+        'key' => 'id',
+      ],
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Which Domain is this option value for'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+      ],
+    ],
+    'visibility_id' => [
+      'title' => ts('Option Visibility'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'add' => '2.2',
+      'default' => NULL,
+      'pseudoconstant' => [
+        'option_group_name' => 'visibility',
+      ],
+    ],
+    'icon' => [
+      'title' => ts('Icon'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('crm-i icon class'),
+      'add' => '4.7',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'color' => [
+      'title' => ts('Color'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Hex color value e.g. #ffffff'),
+      'add' => '4.7',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Phone.entityType.php b/www/modules/civicrm/schema/Core/Phone.entityType.php
new file mode 100644
index 000000000..ed03415cd
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Phone.entityType.php
@@ -0,0 +1,176 @@
+<?php
+
+return [
+  'name' => 'Phone',
+  'table' => 'civicrm_phone',
+  'class' => 'CRM_Core_DAO_Phone',
+  'getInfo' => fn() => [
+    'title' => ts('Phone'),
+    'title_plural' => ts('Phones'),
+    'description' => ts('Phone information for a specific location.'),
+    'log' => TRUE,
+    'add' => '1.1',
+    'icon' => 'fa-phone',
+    'label_field' => 'phone',
+  ],
+  'getIndices' => fn() => [
+    'index_location_type' => [
+      'fields' => [
+        'location_type_id' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+    'index_is_primary' => [
+      'fields' => [
+        'is_primary' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+    'index_is_billing' => [
+      'fields' => [
+        'is_billing' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+    'UI_mobile_provider_id' => [
+      'fields' => [
+        'mobile_provider_id' => TRUE,
+      ],
+      'add' => '1.6',
+    ],
+    'index_phone_numeric' => [
+      'fields' => [
+        'phone_numeric' => TRUE,
+      ],
+      'add' => '4.3',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Phone ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique Phone ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'location_type_id' => [
+      'title' => ts('Location Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Which Location does this phone belong to.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Location Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_location_type',
+        'key_column' => 'id',
+        'label_column' => 'display_name',
+      ],
+    ],
+    'is_primary' => [
+      'title' => ts('Is Primary'),
+      'sql_type' => 'boolean',
+      'input_type' => 'Radio',
+      'required' => TRUE,
+      'description' => ts('Is this the primary phone for this contact and location.'),
+      'add' => '1.1',
+      'default' => FALSE,
+    ],
+    'is_billing' => [
+      'title' => ts('Is Billing Phone'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this the billing?'),
+      'add' => '2.0',
+      'default' => FALSE,
+    ],
+    'mobile_provider_id' => [
+      'title' => ts('Mobile Provider'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'deprecated' => TRUE,
+      'description' => ts('Which Mobile Provider does this phone belong to.'),
+      'add' => '1.1',
+    ],
+    'phone' => [
+      'title' => ts('Phone'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => 'Text',
+      'description' => ts('Complete phone number.'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Phone'),
+        'maxlength' => 32,
+      ],
+    ],
+    'phone_ext' => [
+      'title' => ts('Phone Extension'),
+      'sql_type' => 'varchar(16)',
+      'input_type' => 'Text',
+      'description' => ts('Optional extension for a phone number.'),
+      'add' => '3.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '4',
+        'maxlength' => 16,
+      ],
+    ],
+    'phone_numeric' => [
+      'title' => ts('Phone Numeric'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('Phone number stripped of all whitespace, letters, and punctuation.'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Numeric'),
+        'maxlength' => 32,
+      ],
+    ],
+    'phone_type_id' => [
+      'title' => ts('Phone Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Which type of phone does this number belongs.'),
+      'add' => '2.2',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'label' => ts('Phone Type'),
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'phone_type',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/PreferencesDate.entityType.php b/www/modules/civicrm/schema/Core/PreferencesDate.entityType.php
new file mode 100644
index 000000000..aecf75b7b
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/PreferencesDate.entityType.php
@@ -0,0 +1,101 @@
+<?php
+
+return [
+  'name' => 'PreferencesDate',
+  'table' => 'civicrm_preferences_date',
+  'class' => 'CRM_Core_DAO_PreferencesDate',
+  'getInfo' => fn() => [
+    'title' => ts('Date Preference'),
+    'title_plural' => ts('Date Preferences'),
+    'description' => ts('Define date preferences for the site'),
+    'log' => TRUE,
+    'add' => '2.0',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/setting/preferences/date/edit?reset=1&action=add',
+    'browse' => 'civicrm/admin/setting/preferences/date?reset=1',
+    'update' => 'civicrm/admin/setting/preferences/date/edit?reset=1&action=update&id=[id]',
+  ],
+  'getIndices' => fn() => [
+    'index_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Date Preference ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '2.0',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Date Preference Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('The meta name for this date (fixed in code)'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Description of this date type.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Description'),
+        'maxlength' => 255,
+      ],
+    ],
+    'start' => [
+      'title' => ts('Start'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('The start offset relative to current year'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Start'),
+      ],
+    ],
+    'end' => [
+      'title' => ts('End Offset'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('The end offset relative to current year, can be negative'),
+      'add' => '2.0',
+    ],
+    'date_format' => [
+      'title' => ts('Date Format'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('The date type'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Date Format'),
+        'maxlength' => 64,
+      ],
+    ],
+    'time_format' => [
+      'title' => ts('Time Format'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('time format'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'label' => ts('Time Format'),
+        'maxlength' => 64,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/PrevNextCache.entityType.php b/www/modules/civicrm/schema/Core/PrevNextCache.entityType.php
new file mode 100644
index 000000000..80aaf5560
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/PrevNextCache.entityType.php
@@ -0,0 +1,86 @@
+<?php
+
+return [
+  'name' => 'PrevNextCache',
+  'table' => 'civicrm_prevnext_cache',
+  'class' => 'CRM_Core_DAO_PrevNextCache',
+  'getInfo' => fn() => [
+    'title' => ts('Prev Next Cache'),
+    'title_plural' => ts('Prev Next Caches'),
+    'description' => ts('Table to cache items for navigation on civicrm searched results.'),
+    'add' => '3.4',
+  ],
+  'getIndices' => fn() => [
+    'index_all' => [
+      'fields' => [
+        'cachekey' => TRUE,
+        'entity_id1' => TRUE,
+        'entity_id2' => TRUE,
+        'entity_table' => TRUE,
+        'is_selected' => TRUE,
+      ],
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Prev Next Cache ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '3.4',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Prev Next Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('physical tablename for entity being joined to discount, e.g. civicrm_event'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'entity_id1' => [
+      'title' => ts('Prev Next Entity ID 1'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('FK to entity table specified in entity_table column.'),
+      'add' => '3.4',
+    ],
+    'entity_id2' => [
+      'title' => ts('Prev Next Entity ID 2'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('FK to entity table specified in entity_table column.'),
+      'add' => '3.4',
+    ],
+    'cachekey' => [
+      'title' => ts('Cache Key'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Unique path name for cache element of the searched item'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'data' => [
+      'title' => ts('Prev Next Data'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('cached snapshot of the serialized data'),
+      'add' => '3.4',
+      'serialize' => CRM_Core_DAO::SERIALIZE_PHP,
+    ],
+    'is_selected' => [
+      'title' => ts('Is Selected'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '4.2',
+      'default' => FALSE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/PrintLabel.entityType.php b/www/modules/civicrm/schema/Core/PrintLabel.entityType.php
new file mode 100644
index 000000000..9174e9138
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/PrintLabel.entityType.php
@@ -0,0 +1,136 @@
+<?php
+
+return [
+  'name' => 'PrintLabel',
+  'table' => 'civicrm_print_label',
+  'class' => 'CRM_Core_DAO_PrintLabel',
+  'getInfo' => fn() => [
+    'title' => ts('Print Label'),
+    'title_plural' => ts('Print Labels'),
+    'description' => ts('Table to store the labels created by user.'),
+    'add' => '4.4',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Print Label ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '4.4',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'title' => [
+      'title' => ts('Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('User title for this label layout'),
+      'add' => '4.4',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'name' => [
+      'title' => ts('Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('variable name/programmatic handle for this field.'),
+      'add' => '4.4',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Description'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Description of this label layout'),
+      'add' => '4.4',
+      'input_attrs' => [
+        'label' => ts('Description'),
+      ],
+    ],
+    'label_format_name' => [
+      'title' => ts('Label Format'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Select',
+      'description' => ts('This refers to name column of civicrm_option_value row in name_badge option group'),
+      'add' => '4.4',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'name_badge',
+      ],
+    ],
+    'label_type_id' => [
+      'title' => ts('Label Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Implicit FK to civicrm_option_value row in NEW label_type option group'),
+      'add' => '4.4',
+      'pseudoconstant' => [
+        'option_group_name' => 'label_type',
+      ],
+    ],
+    'data' => [
+      'title' => ts('Data'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('contains json encode configurations options'),
+      'add' => '4.4',
+      'serialize' => CRM_Core_DAO::SERIALIZE_JSON,
+      'input_attrs' => [
+        'label' => ts('Data'),
+      ],
+    ],
+    'is_default' => [
+      'title' => ts('Label is Default?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this default?'),
+      'add' => '4.4',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Default'),
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Label Is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this option active?'),
+      'add' => '4.4',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_reserved' => [
+      'title' => ts('Is Label Reserved?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this reserved label?'),
+      'add' => '4.4',
+      'default' => TRUE,
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_contact, who created this label layout'),
+      'add' => '4.4',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/RecurringEntity.entityType.php b/www/modules/civicrm/schema/Core/RecurringEntity.entityType.php
new file mode 100644
index 000000000..6d1beb8fc
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/RecurringEntity.entityType.php
@@ -0,0 +1,69 @@
+<?php
+
+return [
+  'name' => 'RecurringEntity',
+  'table' => 'civicrm_recurring_entity',
+  'class' => 'CRM_Core_DAO_RecurringEntity',
+  'getInfo' => fn() => [
+    'title' => ts('Recurring Entity'),
+    'title_plural' => ts('Recurring Entities'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '4.6',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 10,
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'parent_id' => [
+      'title' => ts('Parent ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Recurring Entity Parent ID'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 10,
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Recurring Entity Child ID'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 10,
+      ],
+    ],
+    'entity_table' => [
+      'title' => ts('Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Physical tablename for entity, e.g. civicrm_event'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'mode' => [
+      'title' => ts('Cascade Type'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('1-this entity, 2-this and the following entities, 3-all the entities'),
+      'add' => '4.6',
+      'default' => TRUE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Setting.entityType.php b/www/modules/civicrm/schema/Core/Setting.entityType.php
new file mode 100644
index 000000000..881fe2262
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Setting.entityType.php
@@ -0,0 +1,142 @@
+<?php
+
+return [
+  'name' => 'Setting',
+  'table' => 'civicrm_setting',
+  'class' => 'CRM_Core_DAO_Setting',
+  'getInfo' => fn() => [
+    'title' => ts('Setting'),
+    'title_plural' => ts('Settings'),
+    'description' => ts('Table to store civicrm settings for civicrm core and components.'),
+    'add' => '4.1',
+  ],
+  'getIndices' => fn() => [
+    'index_domain_contact_name' => [
+      'fields' => [
+        'domain_id' => TRUE,
+        'contact_id' => TRUE,
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '4.7',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Setting ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '4.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Setting Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Unique name for setting'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'value' => [
+      'title' => ts('Value'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('data associated with this group / name combo'),
+      'add' => '4.1',
+      'serialize' => CRM_Core_DAO::SERIALIZE_PHP,
+      'input_attrs' => [
+        'label' => ts('Value'),
+      ],
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Which Domain does this setting belong to'),
+      'add' => '4.1',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID if the setting is localized to a contact'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'is_domain' => [
+      'title' => ts('Is Domain Setting?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this setting per-domain or global?'),
+      'add' => '4.1',
+      'default' => FALSE,
+    ],
+    'component_id' => [
+      'title' => ts('Component ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Component that this menu item belongs to'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'label' => ts('Component'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_component',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Component',
+        'key' => 'id',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Setting Created Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('When was the setting created'),
+      'add' => '4.1',
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_contact, who created this setting'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/StateProvince.entityType.php b/www/modules/civicrm/schema/Core/StateProvince.entityType.php
new file mode 100644
index 000000000..2db29878c
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/StateProvince.entityType.php
@@ -0,0 +1,88 @@
+<?php
+
+return [
+  'name' => 'StateProvince',
+  'table' => 'civicrm_state_province',
+  'class' => 'CRM_Core_DAO_StateProvince',
+  'getInfo' => fn() => [
+    'title' => ts('State/Province'),
+    'title_plural' => ts('States/Provinces'),
+    'description' => ts('FIXME'),
+    'add' => '1.1',
+    'label_field' => 'name',
+  ],
+  'getIndices' => fn() => [
+    'UI_name_country_id' => [
+      'fields' => [
+        'name' => TRUE,
+        'country_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '1.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('State ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('State/Province ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('State'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Name of State/Province'),
+      'add' => '1.1',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'abbreviation' => [
+      'title' => ts('State Abbreviation'),
+      'sql_type' => 'varchar(4)',
+      'input_type' => 'Text',
+      'description' => ts('2-4 Character Abbreviation of State/Province'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 4,
+      ],
+    ],
+    'country_id' => [
+      'title' => ts('Country ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('ID of Country that State/Province belong'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Country'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Country',
+        'key' => 'id',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('StateProvince Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this StateProvince active?'),
+      'add' => '5.35',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/StatusPreference.entityType.php b/www/modules/civicrm/schema/Core/StatusPreference.entityType.php
new file mode 100644
index 000000000..36149e738
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/StatusPreference.entityType.php
@@ -0,0 +1,130 @@
+<?php
+
+return [
+  'name' => 'StatusPreference',
+  'table' => 'civicrm_status_pref',
+  'class' => 'CRM_Core_DAO_StatusPreference',
+  'getInfo' => fn() => [
+    'title' => ts('Status Preference'),
+    'title_plural' => ts('Status Preferences'),
+    'description' => ts('Preferences controlling status checks called in system.check.'),
+    'add' => '4.7',
+  ],
+  'getIndices' => fn() => [
+    'UI_status_pref_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'add' => '4.7',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Status Preference ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique Status Preference ID'),
+      'add' => '4.7',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Which Domain is this Status Preference for'),
+      'add' => '4.7',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+      ],
+    ],
+    'name' => [
+      'title' => ts('Status Check Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Name of the status check this preference references.'),
+      'add' => '4.7',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'hush_until' => [
+      'title' => ts('Snooze Status Notifications Until'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('expires ignore_severity. NULL never hushes.'),
+      'add' => '4.7',
+      'default' => NULL,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'ignore_severity' => [
+      'title' => ts('Ignore Severity'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Hush messages up to and including this severity.'),
+      'add' => '4.7',
+      'default' => 1,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Utils_Check::getSeverityOptions',
+      ],
+    ],
+    'prefs' => [
+      'title' => ts('Status Preferences'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('These settings are per-check, and can\'t be compared across checks.'),
+      'add' => '4.7',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'check_info' => [
+      'title' => ts('Check Info'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('These values are per-check, and can\'t be compared across checks.'),
+      'add' => '4.7',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Check Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this status check active?'),
+      'add' => '5.19',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/SystemLog.entityType.php b/www/modules/civicrm/schema/Core/SystemLog.entityType.php
new file mode 100644
index 000000000..bcce81746
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/SystemLog.entityType.php
@@ -0,0 +1,82 @@
+<?php
+
+return [
+  'name' => 'SystemLog',
+  'table' => 'civicrm_system_log',
+  'class' => 'CRM_Core_DAO_SystemLog',
+  'getInfo' => fn() => [
+    'title' => ts('System Log'),
+    'title_plural' => ts('System Logs'),
+    'description' => ts('FIXME'),
+    'add' => '4.5',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('System Log ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Primary key ID'),
+      'add' => '4.4',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'message' => [
+      'title' => ts('System Log Message'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Standardized message'),
+      'add' => '4.5',
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+    'context' => [
+      'title' => ts('Detailed Log Data'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('JSON encoded data'),
+      'add' => '4.5',
+    ],
+    'level' => [
+      'title' => ts('Detailed Log Data'),
+      'sql_type' => 'varchar(9)',
+      'input_type' => 'Text',
+      'description' => ts('error level per PSR3'),
+      'add' => '4.5',
+      'default' => 'info',
+      'input_attrs' => [
+        'maxlength' => 9,
+      ],
+    ],
+    'timestamp' => [
+      'title' => ts('Log Timestamp'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('Timestamp of when event occurred.'),
+      'add' => '4.5',
+      'default' => 'CURRENT_TIMESTAMP',
+    ],
+    'contact_id' => [
+      'title' => ts('Log Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Optional Contact ID that created the log. Not an FK as we keep this regardless'),
+      'add' => '4.5',
+      'input_attrs' => [
+        'maxlength' => 11,
+      ],
+    ],
+    'hostname' => [
+      'title' => ts('Log Host'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Optional Name of logging host'),
+      'add' => '4.5',
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Tag.entityType.php b/www/modules/civicrm/schema/Core/Tag.entityType.php
new file mode 100644
index 000000000..c3507eadf
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Tag.entityType.php
@@ -0,0 +1,168 @@
+<?php
+
+return [
+  'name' => 'Tag',
+  'table' => 'civicrm_tag',
+  'class' => 'CRM_Core_DAO_Tag',
+  'getInfo' => fn() => [
+    'title' => ts('Tag'),
+    'title_plural' => ts('Tags'),
+    'description' => ts('Provides support for flat or hierarchical classification of various types of entities (contacts, groups, actions...).'),
+    'log' => TRUE,
+    'add' => '1.1',
+    'icon' => 'fa-tag',
+    'label_field' => 'label',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Tag ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Tag ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Tag Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Unique machine name'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'label' => [
+      'title' => ts('Tag Label'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('User-facing tag name'),
+      'add' => '5.68',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Optional verbose description of the tag.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'parent_id' => [
+      'title' => ts('Parent Tag ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Optional parent id for this tag.'),
+      'add' => '1.1',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Parent Tag'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_tag',
+        'key_column' => 'id',
+        'name_column' => 'name',
+        'label_column' => 'label',
+      ],
+      'entity_reference' => [
+        'entity' => 'Tag',
+        'key' => 'id',
+      ],
+    ],
+    'is_selectable' => [
+      'title' => ts('Display Tag?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this tag selectable / displayed'),
+      'add' => '2.1',
+      'default' => TRUE,
+    ],
+    'is_reserved' => [
+      'title' => ts('Reserved'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '3.2',
+      'default' => FALSE,
+    ],
+    'is_tagset' => [
+      'title' => ts('Tagset'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '3.2',
+      'default' => FALSE,
+    ],
+    'used_for' => [
+      'title' => ts('Used For'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'add' => '3.2',
+      'default' => NULL,
+      'serialize' => CRM_Core_DAO::SERIALIZE_COMMA,
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'tag_used_for',
+      ],
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_contact, who created this tag'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'color' => [
+      'title' => ts('Color'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Hex color value e.g. #ffffff'),
+      'add' => '4.7',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Tag Created Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'readonly' => TRUE,
+      'description' => ts('Date and time that tag was created.'),
+      'add' => '3.4',
+      'default' => 'CURRENT_TIMESTAMP',
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+        'label' => ts('Created Date'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Timezone.entityType.php b/www/modules/civicrm/schema/Core/Timezone.entityType.php
new file mode 100644
index 000000000..11190f4e6
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Timezone.entityType.php
@@ -0,0 +1,76 @@
+<?php
+
+return [
+  'name' => 'Timezone',
+  'table' => 'civicrm_timezone',
+  'class' => 'CRM_Core_DAO_Timezone',
+  'getInfo' => fn() => [
+    'title' => ts('Timezone'),
+    'title_plural' => ts('Timezones'),
+    'description' => ts('FIXME'),
+    'add' => '1.8',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Timezone ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Timezone ID'),
+      'add' => '1.8',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Timezone Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Timezone full name'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'abbreviation' => [
+      'title' => ts('Timezone Abbreviation'),
+      'sql_type' => 'char(3)',
+      'input_type' => 'Text',
+      'description' => ts('ISO Code for timezone abbreviation'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 3,
+      ],
+    ],
+    'gmt' => [
+      'title' => ts('GMT Name of Timezone'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('GMT name of the timezone'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'offset' => [
+      'title' => ts('GMT Offset'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'add' => '1.8',
+    ],
+    'country_id' => [
+      'title' => ts('Country ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Country ID'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'label' => ts('Country'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Country',
+        'key' => 'id',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Translation.entityType.php b/www/modules/civicrm/schema/Core/Translation.entityType.php
new file mode 100644
index 000000000..1faeb726f
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Translation.entityType.php
@@ -0,0 +1,118 @@
+<?php
+
+return [
+  'name' => 'Translation',
+  'table' => 'civicrm_translation',
+  'class' => 'CRM_Core_DAO_Translation',
+  'getInfo' => fn() => [
+    'title' => ts('Translated String'),
+    'title_plural' => ts('Translated Strings'),
+    'description' => ts('Each string record is an alternate translation of some displayable string in the database.'),
+    'log' => TRUE,
+    'add' => '5.39',
+  ],
+  'getIndices' => fn() => [
+    'index_entity_lang' => [
+      'fields' => [
+        'entity_id' => TRUE,
+        'entity_table' => TRUE,
+        'language' => TRUE,
+      ],
+      'add' => '5.39',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Translated String ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique String ID'),
+      'add' => '5.39',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Translated Entity'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Table where referenced item is stored'),
+      'add' => '5.39',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_Translation::getEntityTables',
+      ],
+    ],
+    'entity_field' => [
+      'title' => ts('Translated Field'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Field where referenced item is stored'),
+      'add' => '5.39',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_Translation::getEntityFields',
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Translated Entity ID'),
+      'sql_type' => 'int',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('ID of the relevant entity.'),
+      'add' => '5.39',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'language' => [
+      'title' => ts('Language'),
+      'sql_type' => 'varchar(5)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Relevant language'),
+      'add' => '5.39',
+      'input_attrs' => [
+        'maxlength' => 5,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'languages',
+        'key_column' => 'name',
+        'option_edit_path' => 'civicrm/admin/options/languages',
+      ],
+    ],
+    'status_id' => [
+      'title' => ts('Status'),
+      'sql_type' => 'tinyint',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Specify whether the string is active, draft, etc'),
+      'add' => '5.39',
+      'default' => 1,
+      'input_attrs' => [
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_Translation::getStatuses',
+      ],
+    ],
+    'string' => [
+      'title' => ts('Translated String'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'required' => TRUE,
+      'description' => ts('Translated string'),
+      'add' => '5.39',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/UFField.entityType.php b/www/modules/civicrm/schema/Core/UFField.entityType.php
new file mode 100644
index 000000000..cf93cbe4c
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/UFField.entityType.php
@@ -0,0 +1,238 @@
+<?php
+
+return [
+  'name' => 'UFField',
+  'table' => 'civicrm_uf_field',
+  'class' => 'CRM_Core_DAO_UFField',
+  'getInfo' => fn() => [
+    'title' => ts('Profile Field'),
+    'title_plural' => ts('Profile Fields'),
+    'description' => ts('User Framework fields and their properties.'),
+    'log' => TRUE,
+    'add' => '1.1',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/uf/group/field/add?reset=1&action=add&gid=[uf_group_id]',
+    'preview' => 'civicrm/admin/uf/group/preview?reset=1&gid=[uf_group_id]&fieldId=[id]',
+    'update' => 'civicrm/admin/uf/group/field/update?reset=1&action=update&id=[id]',
+    'delete' => 'civicrm/admin/uf/group/field/update?reset=1&action=delete&id=[id]',
+    'browse' => 'civicrm/admin/uf/group/field',
+  ],
+  'getIndices' => fn() => [
+    'IX_website_type_id' => [
+      'fields' => [
+        'website_type_id' => TRUE,
+      ],
+      'add' => '4.5',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Profile Field ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique table ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'uf_group_id' => [
+      'title' => ts('Profile ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Which form does this field belong to.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Profile'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_uf_group',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'UFGroup',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'field_name' => [
+      'title' => ts('Profile Field Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Name for CiviCRM field which is being exposed for sharing.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_UFField::getAvailableFieldOptions',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Profile Field Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this field currently shareable? If FALSE, hide the field for all sharing contexts.'),
+      'add' => '1.1',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_view' => [
+      'title' => ts('Profile Is View Only'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('the field is view only and not editable in user forms.'),
+      'add' => '1.1',
+      'default' => FALSE,
+    ],
+    'is_required' => [
+      'title' => ts('Profile Field Is Required'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this field required when included in a user or registration form?'),
+      'add' => '1.1',
+      'default' => FALSE,
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Controls field display order when user framework fields are displayed in registration and account editing forms.'),
+      'add' => '1.1',
+      'default' => 1,
+    ],
+    'help_post' => [
+      'title' => ts('Profile Field Post Help'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Description and/or help text to display after this field.'),
+      'add' => '1.1',
+    ],
+    'help_pre' => [
+      'title' => ts('Profile Field Pre Help'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Description and/or help text to display before this field.'),
+      'add' => '3.2',
+    ],
+    'visibility' => [
+      'title' => ts('Profile Field Visibility'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => 'Select',
+      'description' => ts('In what context(s) is this field visible.'),
+      'add' => '1.1',
+      'default' => 'User and User Admin Only',
+      'input_attrs' => [
+        'maxlength' => 32,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::ufVisibility',
+      ],
+    ],
+    'in_selector' => [
+      'title' => ts('Profile Field Is a Filter'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this field included as a column in the selector table?'),
+      'add' => '1.2',
+      'default' => FALSE,
+    ],
+    'is_searchable' => [
+      'title' => ts('Profile Field Is Searchable'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this field included search form of profile?'),
+      'add' => '1.4',
+      'default' => FALSE,
+    ],
+    'location_type_id' => [
+      'title' => ts('Location Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Location type of this mapping, if required'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'label' => ts('Location Type'),
+      ],
+      'entity_reference' => [
+        'entity' => 'LocationType',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'phone_type_id' => [
+      'title' => ts('Profile Field Phone Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Phone Type ID, if required'),
+      'add' => '2.2',
+      'pseudoconstant' => [
+        'option_group_name' => 'phone_type',
+      ],
+    ],
+    'website_type_id' => [
+      'title' => ts('Profile Field Website Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Website Type ID, if required'),
+      'add' => '4.5',
+      'pseudoconstant' => [
+        'option_group_name' => 'website_type',
+      ],
+    ],
+    'label' => [
+      'title' => ts('Profile Field Label'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('To save label for fields.'),
+      'add' => '1.4',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'field_type' => [
+      'title' => ts('Profile Field Type'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('This field saves field type (ie individual,household.. field etc).'),
+      'add' => '1.4',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_reserved' => [
+      'title' => ts('Profile Field Is Reserved'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this field reserved for use by some other CiviCRM functionality?'),
+      'add' => '3.0',
+      'default' => FALSE,
+    ],
+    'is_multi_summary' => [
+      'title' => ts('Profile Field Supports Multiple'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Include in multi-record listing?'),
+      'add' => '4.3',
+      'default' => FALSE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/UFGroup.entityType.php b/www/modules/civicrm/schema/Core/UFGroup.entityType.php
new file mode 100644
index 000000000..b925fe9f4
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/UFGroup.entityType.php
@@ -0,0 +1,326 @@
+<?php
+
+return [
+  'name' => 'UFGroup',
+  'table' => 'civicrm_uf_group',
+  'class' => 'CRM_Core_DAO_UFGroup',
+  'getInfo' => fn() => [
+    'title' => ts('Profile'),
+    'title_plural' => ts('Profiles'),
+    'description' => ts('User framework groups. Each group represents a form which encompasses a set of fields defined in civicrm_uf_fields table. Initially will be used for CiviCRM Profile form(s). Subsequently we anticipate using this to define other public facing forms (e.g. online donation solicitation forms, mailing list preferences, etc.).'),
+    'log' => TRUE,
+    'add' => '1.1',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/uf/group/add?action=add&reset=1',
+    'preview' => 'civicrm/admin/uf/group/preview?reset=1&gid=[id]',
+    'update' => 'civicrm/admin/uf/group/update?action=update&reset=1&id=[id]',
+    'delete' => 'civicrm/admin/uf/group/update?action=delete&reset=1&id=[id]',
+    'browse' => 'civicrm/admin/uf/group',
+    'copy' => 'civicrm/admin/uf/group/copy?action=copy&reset=1&gid=[id]',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '4.7',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Profile ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique table ID'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Profile Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Name of the UF group for directly addressing it in the codebase'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Profile Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this profile currently active? If FALSE, hide all related fields for all sharing contexts.'),
+      'add' => '1.1',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'group_type' => [
+      'title' => ts('Profile Group Type'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Comma separated list of the type(s) of profile fields.'),
+      'add' => '2.1',
+      'serialize' => CRM_Core_DAO::SERIALIZE_COMMA,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'title' => [
+      'title' => ts('Profile Title'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Form title.'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'frontend_title' => [
+      'title' => ts('Public Title'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Profile Form Public title'),
+      'add' => '4.7',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Profile Description'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Optional verbose description of the profile.'),
+      'add' => '4.4',
+      'input_attrs' => [
+        'rows' => 2,
+        'cols' => 60,
+      ],
+    ],
+    'help_pre' => [
+      'title' => ts('Help Pre'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Description and/or help text to display before fields in form.'),
+      'add' => '1.2',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 80,
+        'label' => ts('Pre Help'),
+      ],
+    ],
+    'help_post' => [
+      'title' => ts('Profile Post Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Description and/or help text to display after fields in form.'),
+      'add' => '1.2',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 80,
+      ],
+    ],
+    'limit_listings_group_id' => [
+      'title' => ts('Search Limit Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Group id, foreign key from civicrm_group'),
+      'add' => '1.4',
+      'input_attrs' => [
+        'label' => ts('Search Limit Group'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Group',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'post_url' => [
+      'title' => ts('Post Url'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Redirect to URL on submit.'),
+      'add' => '1.4',
+      'input_attrs' => [
+        'label' => ts('Post URL'),
+        'maxlength' => 255,
+      ],
+    ],
+    'add_to_group_id' => [
+      'title' => ts('Add Contact To Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('foreign key to civicrm_group_id'),
+      'input_attrs' => [
+        'label' => ts('Add Contact To Group'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Group',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'add_captcha' => [
+      'title' => ts('Show Captcha On Profile'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should a CAPTCHA widget be included this Profile form.'),
+      'add' => '1.1',
+      'default' => FALSE,
+    ],
+    'is_map' => [
+      'title' => ts('Map Profile'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Do we want to map results from this profile.'),
+      'add' => '1.5',
+      'default' => FALSE,
+    ],
+    'is_edit_link' => [
+      'title' => ts('Show Edit Link?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should edit link display in profile selector'),
+      'add' => '1.6',
+      'default' => FALSE,
+    ],
+    'is_uf_link' => [
+      'title' => ts('Show Link to CMS User'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should we display a link to the website profile in profile selector'),
+      'add' => '1.7',
+      'default' => FALSE,
+    ],
+    'is_update_dupe' => [
+      'title' => ts('Update on Duplicate'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should we update the contact record if we find a duplicate'),
+      'add' => '1.7',
+      'default' => FALSE,
+    ],
+    'cancel_url' => [
+      'title' => ts('Profile Cancel URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Redirect to URL when Cancel button clicked.'),
+      'add' => '1.4',
+      'input_attrs' => [
+        'label' => ts('Cancel URL'),
+        'maxlength' => 255,
+      ],
+    ],
+    'is_cms_user' => [
+      'title' => ts('Create CMS User?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should we create a cms user for this profile'),
+      'add' => '1.8',
+      'default' => FALSE,
+    ],
+    'notify' => [
+      'title' => ts('Notify on Profile Submit'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'add' => '1.8',
+    ],
+    'is_reserved' => [
+      'title' => ts('Profile Is Reserved'),
+      'sql_type' => 'boolean',
+      'input_type' => 'Radio',
+      'required' => TRUE,
+      'description' => ts('Is this group reserved for use by some other CiviCRM functionality?'),
+      'add' => '3.0',
+      'default' => FALSE,
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_contact, who created this UF group'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('UF Group Created Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time this UF group was created.'),
+      'add' => '3.0',
+    ],
+    'is_proximity_search' => [
+      'title' => ts('Include Proximity Search?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should we include proximity search feature in this profile search form?'),
+      'add' => '3.2',
+      'default' => FALSE,
+    ],
+    'cancel_button_text' => [
+      'title' => ts('Cancel Button Text'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Custom Text to display on the Cancel button when used in create or edit mode'),
+      'add' => '4.7',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'submit_button_text' => [
+      'title' => ts('Submit Button Text'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Custom Text to display on the submit button on profile edit/create screens'),
+      'add' => '4.7',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'add_cancel_button' => [
+      'title' => ts('Include Cancel Button'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should a Cancel button be included in this Profile form.'),
+      'add' => '5.0',
+      'default' => TRUE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/UFJoin.entityType.php b/www/modules/civicrm/schema/Core/UFJoin.entityType.php
new file mode 100644
index 000000000..d0e223055
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/UFJoin.entityType.php
@@ -0,0 +1,119 @@
+<?php
+
+return [
+  'name' => 'UFJoin',
+  'table' => 'civicrm_uf_join',
+  'class' => 'CRM_Core_DAO_UFJoin',
+  'getInfo' => fn() => [
+    'title' => ts('Profile Use'),
+    'title_plural' => ts('Profile Uses'),
+    'description' => ts('User framework join table. This links various internal civicrm object with a profile. Initial use cases are the donation object and the user module'),
+    'log' => TRUE,
+    'add' => '1.3',
+  ],
+  'getIndices' => fn() => [
+    'index_entity' => [
+      'fields' => [
+        'entity_table' => TRUE,
+        'entity_id' => TRUE,
+      ],
+      'add' => '1.3',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('UF Join ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique table ID'),
+      'add' => '1.3',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'is_active' => [
+      'title' => ts('Profile Use is active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this join currently active?'),
+      'add' => '1.3',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'module' => [
+      'title' => ts('Profile Module'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Module which owns this uf_join instance, e.g. User Registration, CiviDonate, etc.'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'entity_table' => [
+      'title' => ts('Profile Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('Name of table where item being referenced is stored. Modules which only need a single collection of uf_join instances may choose not to populate entity_table and entity_id.'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_UFJoin::entityTables',
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Profile Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Foreign key to the referenced item.'),
+      'add' => '1.3',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Controls display order when multiple user framework groups are setup for concurrent display.'),
+      'add' => '1.3',
+      'default' => 1,
+    ],
+    'uf_group_id' => [
+      'title' => ts('Profile ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Which form does this field belong to.'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'label' => ts('Profile'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_uf_group',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'UFGroup',
+        'key' => 'id',
+      ],
+    ],
+    'module_data' => [
+      'title' => ts('Profile Use Data'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('Json serialized array of data used by the ufjoin.module'),
+      'add' => '4.5',
+      'serialize' => CRM_Core_DAO::SERIALIZE_JSON,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/UFMatch.entityType.php b/www/modules/civicrm/schema/Core/UFMatch.entityType.php
new file mode 100644
index 000000000..6d8332428
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/UFMatch.entityType.php
@@ -0,0 +1,120 @@
+<?php
+
+return [
+  'name' => 'UFMatch',
+  'table' => 'civicrm_uf_match',
+  'class' => 'CRM_Core_DAO_UFMatch',
+  'getInfo' => fn() => [
+    'title' => ts('User Account'),
+    'title_plural' => ts('User Accounts'),
+    'description' => ts('The mapping from an user framework (UF) object to a CRM object.'),
+    'log' => TRUE,
+    'add' => '1.1',
+  ],
+  'getIndices' => fn() => [
+    'I_civicrm_uf_match_uf_id' => [
+      'fields' => [
+        'uf_id' => TRUE,
+      ],
+      'add' => '3.3',
+    ],
+    'UI_uf_match_uf_id_domain_id' => [
+      'fields' => [
+        'uf_id' => TRUE,
+        'domain_id' => TRUE,
+      ],
+      'add' => '5.69',
+    ],
+    'UI_uf_name_domain_id' => [
+      'fields' => [
+        'uf_name' => TRUE,
+        'domain_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+    'UI_contact_domain_id' => [
+      'fields' => [
+        'contact_id' => TRUE,
+        'domain_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '1.6',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('UF Match ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('System generated ID.'),
+      'add' => '1.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Which Domain is this match entry for'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+      ],
+    ],
+    'uf_id' => [
+      'title' => ts('CMS ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('UF ID'),
+      'add' => '1.1',
+    ],
+    'uf_name' => [
+      'title' => ts('CMS Unique Identifier'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('UF Name'),
+      'add' => '1.9',
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'language' => [
+      'title' => ts('Preferred Language'),
+      'sql_type' => 'varchar(5)',
+      'input_type' => 'Text',
+      'description' => ts('UI language preferred by the given user/contact'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'maxlength' => 5,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/UserJob.entityType.php b/www/modules/civicrm/schema/Core/UserJob.entityType.php
new file mode 100644
index 000000000..77dc68a39
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/UserJob.entityType.php
@@ -0,0 +1,174 @@
+<?php
+
+return [
+  'name' => 'UserJob',
+  'table' => 'civicrm_user_job',
+  'class' => 'CRM_Core_DAO_UserJob',
+  'getInfo' => fn() => [
+    'title' => ts('User Job'),
+    'title_plural' => ts('User Jobs'),
+    'description' => ts('Tracking for user jobs (eg. imports).'),
+    'log' => FALSE,
+    'add' => '5.50',
+  ],
+  'getPaths' => fn() => [
+    'view' => 'civicrm/import/contact/summary?reset=1&user_job_id=[id]',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '5.50',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('User Job ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Job ID'),
+      'add' => '5.50',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('User job name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Unique name for job.'),
+      'add' => '5.50',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to contact table.'),
+      'add' => '5.50',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Import Job Created Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'required' => TRUE,
+      'readonly' => TRUE,
+      'description' => ts('Date and time this job was created.'),
+      'add' => '5.50',
+      'default' => 'CURRENT_TIMESTAMP',
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'start_date' => [
+      'title' => ts('Import Job Started Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'readonly' => TRUE,
+      'description' => ts('Date and time this import job started.'),
+      'add' => '5.50',
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'end_date' => [
+      'title' => ts('Job Ended Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time this import job ended.'),
+      'add' => '5.50',
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'expires_date' => [
+      'title' => ts('Import Job Expires Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time to clean up after this import job (temp table deletion date).'),
+      'add' => '5.50',
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'status_id' => [
+      'title' => ts('User Job Status ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'add' => '5.50',
+      'input_attrs' => [
+        'label' => ts('Job Status'),
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_UserJob::getStatuses',
+      ],
+    ],
+    'job_type' => [
+      'title' => ts('User Job Type'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Name of the job type, which will allow finding the correct class'),
+      'add' => '5.50',
+      'input_attrs' => [
+        'label' => ts('Job Type'),
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_BAO_UserJob::getTypes',
+        'suffixes' => [
+          'name',
+          'label',
+          'url',
+        ],
+      ],
+    ],
+    'queue_id' => [
+      'title' => ts('Queue ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Queue'),
+      'input_attrs' => [
+        'label' => ts('Queue'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Queue',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'metadata' => [
+      'title' => ts('Job metadata'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Data pertaining to job configuration'),
+      'add' => '5.50',
+      'serialize' => CRM_Core_DAO::SERIALIZE_JSON,
+    ],
+    'is_template' => [
+      'title' => ts('Is Template'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this a template configuration (for use by other/future jobs)?'),
+      'add' => '5.51',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Is Template'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/Website.entityType.php b/www/modules/civicrm/schema/Core/Website.entityType.php
new file mode 100644
index 000000000..e6171f12f
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/Website.entityType.php
@@ -0,0 +1,76 @@
+<?php
+
+return [
+  'name' => 'Website',
+  'table' => 'civicrm_website',
+  'class' => 'CRM_Core_DAO_Website',
+  'getInfo' => fn() => [
+    'title' => ts('Website'),
+    'title_plural' => ts('Websites'),
+    'description' => ts('Website information for a specific location.'),
+    'add' => '3.2',
+    'icon' => 'fa-desktop',
+    'label_field' => 'url',
+  ],
+  'getIndices' => fn() => [
+    'UI_website_type_id' => [
+      'fields' => [
+        'website_type_id' => TRUE,
+      ],
+      'add' => '3.2',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Website ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique Website ID'),
+      'add' => '3.2',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID'),
+      'add' => '3.2',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'url' => [
+      'title' => ts('Website'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Website'),
+      'add' => '3.2',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'size' => '45',
+        'maxlength' => 255,
+      ],
+    ],
+    'website_type_id' => [
+      'title' => ts('Website Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Which Website type does this website belong to.'),
+      'add' => '3.2',
+      'pseudoconstant' => [
+        'option_group_name' => 'website_type',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/WordReplacement.entityType.php b/www/modules/civicrm/schema/Core/WordReplacement.entityType.php
new file mode 100644
index 000000000..e3a1f0594
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/WordReplacement.entityType.php
@@ -0,0 +1,101 @@
+<?php
+
+return [
+  'name' => 'WordReplacement',
+  'table' => 'civicrm_word_replacement',
+  'class' => 'CRM_Core_DAO_WordReplacement',
+  'getInfo' => fn() => [
+    'title' => ts('Word Replacement'),
+    'title_plural' => ts('Word Replacements'),
+    'description' => ts('Top-level hierarchy to support word replacement.'),
+    'add' => '4.4',
+  ],
+  'getIndices' => fn() => [
+    'UI_domain_find' => [
+      'fields' => [
+        'domain_id' => TRUE,
+        'find_word' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '4.4',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Word Replacement ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Word replacement ID'),
+      'add' => '4.4',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'find_word' => [
+      'title' => ts('Replaced Word'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Word which need to be replaced'),
+      'add' => '4.4',
+      'collate' => 'utf8_bin',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'replace_word' => [
+      'title' => ts('Replacement Word'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Word which will replace the word in find'),
+      'add' => '4.4',
+      'collate' => 'utf8_bin',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Word Replacement is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this entry active?'),
+      'add' => '4.4',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'match_type' => [
+      'title' => ts('Word Replacement Match Type'),
+      'sql_type' => 'varchar(16)',
+      'input_type' => 'Select',
+      'add' => '4.4',
+      'default' => 'wildcardMatch',
+      'input_attrs' => [
+        'maxlength' => 16,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::getWordReplacementMatchType',
+      ],
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Domain ID. This is for Domain specific word replacement'),
+      'add' => '1.1',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Core/WorldRegion.entityType.php b/www/modules/civicrm/schema/Core/WorldRegion.entityType.php
new file mode 100644
index 000000000..2461ed415
--- /dev/null
+++ b/www/modules/civicrm/schema/Core/WorldRegion.entityType.php
@@ -0,0 +1,39 @@
+<?php
+
+return [
+  'name' => 'WorldRegion',
+  'table' => 'civicrm_worldregion',
+  'class' => 'CRM_Core_DAO_Worldregion',
+  'getInfo' => fn() => [
+    'title' => ts('World Region'),
+    'title_plural' => ts('World Regions'),
+    'description' => ts('FIXME'),
+    'add' => '1.8',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('World Region ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Country ID'),
+      'add' => '1.8',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('World Region'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Region name to be associated with countries'),
+      'add' => '1.8',
+      'unique_name' => 'world_region',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Cxn/Cxn.entityType.php b/www/modules/civicrm/schema/Cxn/Cxn.entityType.php
new file mode 100644
index 000000000..1fc90cc50
--- /dev/null
+++ b/www/modules/civicrm/schema/Cxn/Cxn.entityType.php
@@ -0,0 +1,145 @@
+<?php
+
+return [
+  'name' => 'Cxn',
+  'table' => 'civicrm_cxn',
+  'class' => 'CRM_Cxn_DAO_Cxn',
+  'getInfo' => fn() => [
+    'title' => ts('Cxn'),
+    'title_plural' => ts('Cxns'),
+    'description' => ts('FIXME'),
+    'add' => '4.6',
+  ],
+  'getIndices' => fn() => [
+    'UI_appid' => [
+      'fields' => [
+        'app_guid' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '4.6',
+    ],
+    'UI_keypair_cxnid' => [
+      'fields' => [
+        'cxn_guid' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '4.6',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Connection ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Connection ID'),
+      'add' => '4.6',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'app_guid' => [
+      'title' => ts('Application GUID'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Application GUID'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+    'app_meta' => [
+      'title' => ts('Application Metadata (JSON)'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Application Metadata (JSON)'),
+      'add' => '4.6',
+    ],
+    'cxn_guid' => [
+      'title' => ts('Connection GUID'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Connection GUID'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+    'secret' => [
+      'title' => ts('Secret'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Shared secret'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'label' => ts('Secret'),
+      ],
+    ],
+    'perm' => [
+      'title' => ts('Perm'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Permissions approved for the service (JSON)'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'label' => ts('Permissions'),
+      ],
+    ],
+    'options' => [
+      'title' => ts('Options'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Options for the service (JSON)'),
+      'add' => '4.6',
+      'serialize' => CRM_Core_DAO::SERIALIZE_JSON,
+      'input_attrs' => [
+        'label' => ts('Options'),
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is connection currently enabled?'),
+      'add' => '4.6',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Created Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('When was the connection was created.'),
+      'add' => '4.6',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Created Date'),
+      ],
+    ],
+    'modified_date' => [
+      'title' => ts('Modified Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('When the connection was created or modified.'),
+      'add' => '4.6',
+      'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+      'input_attrs' => [
+        'label' => ts('Modified Date'),
+      ],
+    ],
+    'fetched_date' => [
+      'title' => ts('Fetched Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('The last time the application metadata was fetched.'),
+      'add' => '4.6',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Fetched Date'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Dedupe/DedupeException.entityType.php b/www/modules/civicrm/schema/Dedupe/DedupeException.entityType.php
new file mode 100644
index 000000000..5c41778b7
--- /dev/null
+++ b/www/modules/civicrm/schema/Dedupe/DedupeException.entityType.php
@@ -0,0 +1,67 @@
+<?php
+
+return [
+  'name' => 'DedupeException',
+  'table' => 'civicrm_dedupe_exception',
+  'class' => 'CRM_Dedupe_DAO_DedupeException',
+  'getInfo' => fn() => [
+    'title' => ts('Dedupe Exception'),
+    'title_plural' => ts('Dedupe Exceptions'),
+    'description' => ts('Dedupe exceptions'),
+    'add' => '3.3',
+  ],
+  'getIndices' => fn() => [
+    'UI_contact_id1_contact_id2' => [
+      'fields' => [
+        'contact_id1' => TRUE,
+        'contact_id2' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '3.3',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Dedupe Exception ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique dedupe exception id'),
+      'add' => '3.3',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id1' => [
+      'title' => ts('First Dupe Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Contact ID'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'label' => ts('First Dupe Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'contact_id2' => [
+      'title' => ts('Second Dupe Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Contact ID'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'label' => ts('Second Dupe Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Dedupe/DedupeRule.entityType.php b/www/modules/civicrm/schema/Dedupe/DedupeRule.entityType.php
new file mode 100644
index 000000000..96ad4a0b1
--- /dev/null
+++ b/www/modules/civicrm/schema/Dedupe/DedupeRule.entityType.php
@@ -0,0 +1,77 @@
+<?php
+
+return [
+  'name' => 'DedupeRule',
+  'table' => 'civicrm_dedupe_rule',
+  'class' => 'CRM_Dedupe_DAO_DedupeRule',
+  'getInfo' => fn() => [
+    'title' => ts('Dedupe Rule'),
+    'title_plural' => ts('Dedupe Rules'),
+    'description' => ts('Dedupe rules for use by rule groups'),
+    'add' => '1.8',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Dedupe Rule ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique dedupe rule id'),
+      'add' => '1.8',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'dedupe_rule_group_id' => [
+      'title' => ts('Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('The id of the rule group this rule belongs to'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'label' => ts('Group'),
+      ],
+      'entity_reference' => [
+        'entity' => 'DedupeRuleGroup',
+        'key' => 'id',
+      ],
+    ],
+    'rule_table' => [
+      'title' => ts('Rule Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('The name of the table this rule is about'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'rule_field' => [
+      'title' => ts('Rule Field'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('The name of the field of the table referenced in rule_table'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'rule_length' => [
+      'title' => ts('Rule Length'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'description' => ts('The length of the matching substring'),
+      'add' => '1.8',
+    ],
+    'rule_weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('The weight of the rule'),
+      'add' => '1.8',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Dedupe/DedupeRuleGroup.entityType.php b/www/modules/civicrm/schema/Dedupe/DedupeRuleGroup.entityType.php
new file mode 100644
index 000000000..3a6e3c69d
--- /dev/null
+++ b/www/modules/civicrm/schema/Dedupe/DedupeRuleGroup.entityType.php
@@ -0,0 +1,101 @@
+<?php
+
+return [
+  'name' => 'DedupeRuleGroup',
+  'table' => 'civicrm_dedupe_rule_group',
+  'class' => 'CRM_Dedupe_DAO_DedupeRuleGroup',
+  'getInfo' => fn() => [
+    'title' => ts('Dedupe Rule Group'),
+    'title_plural' => ts('Dedupe Rule Groups'),
+    'description' => ts('Dedupe rule groups'),
+    'add' => '1.8',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '5.54',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Rule Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Unique dedupe rule group id'),
+      'add' => '1.8',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_type' => [
+      'title' => ts('Contact Type'),
+      'sql_type' => 'varchar(12)',
+      'input_type' => 'Select',
+      'description' => ts('The type of contacts this group applies to'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 12,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_contact_type',
+        'key_column' => 'name',
+        'label_column' => 'label',
+        'condition' => 'parent_id IS NULL',
+      ],
+    ],
+    'threshold' => [
+      'title' => ts('Threshold'),
+      'sql_type' => 'int',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('The weight threshold the sum of the rule weights has to cross to consider two contacts the same'),
+      'add' => '1.8',
+    ],
+    'used' => [
+      'title' => ts('Length'),
+      'sql_type' => 'varchar(12)',
+      'input_type' => 'Radio',
+      'required' => TRUE,
+      'description' => ts('Whether the rule should be used for cases where usage is Unsupervised, Supervised OR General(programatically)'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'maxlength' => 12,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::getDedupeRuleTypes',
+      ],
+    ],
+    'name' => [
+      'title' => ts('Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Unique name of rule group'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'title' => [
+      'title' => ts('Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Label of the rule group'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_reserved' => [
+      'title' => ts('Reserved?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this a reserved rule - a rule group that has been optimized and cannot be changed by the admin'),
+      'add' => '4.1',
+      'default' => FALSE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Event/Cart.entityType.php b/www/modules/civicrm/schema/Event/Cart.entityType.php
new file mode 100644
index 000000000..b2967ec9c
--- /dev/null
+++ b/www/modules/civicrm/schema/Event/Cart.entityType.php
@@ -0,0 +1,48 @@
+<?php
+
+return [
+  'name' => 'Cart',
+  'table' => 'civicrm_event_carts',
+  'class' => 'CRM_Event_Cart_DAO_Cart',
+  'getInfo' => fn() => [
+    'title' => ts('Cart'),
+    'title_plural' => ts('Carts'),
+    'description' => ts('FIXME'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Cart ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Cart ID'),
+      'add' => '4.1',
+      'unique_name' => 'cart_id',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'user_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_contact who created this cart'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'completed' => [
+      'title' => ts('Complete?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '4.1',
+      'default' => FALSE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Event/Event.entityType.php b/www/modules/civicrm/schema/Event/Event.entityType.php
new file mode 100644
index 000000000..75b58be15
--- /dev/null
+++ b/www/modules/civicrm/schema/Event/Event.entityType.php
@@ -0,0 +1,863 @@
+<?php
+
+return [
+  'name' => 'Event',
+  'table' => 'civicrm_event',
+  'class' => 'CRM_Event_DAO_Event',
+  'getInfo' => fn() => [
+    'title' => ts('Event'),
+    'title_plural' => ts('Events'),
+    'description' => ts('Scheduled in-person or online events which contacts can register for and attend.'),
+    'log' => TRUE,
+    'add' => '1.7',
+    'icon' => 'fa-calendar',
+    'label_field' => 'title',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/event/add?reset=1',
+    'view' => 'civicrm/event/info?reset=1&id=[id]',
+  ],
+  'getIndices' => fn() => [
+    'index_event_type_id' => [
+      'fields' => [
+        'event_type_id' => TRUE,
+      ],
+      'add' => '1.8',
+    ],
+    'index_participant_listing_id' => [
+      'fields' => [
+        'participant_listing_id' => TRUE,
+      ],
+      'add' => '2.0',
+    ],
+    'index_parent_event_id' => [
+      'fields' => [
+        'parent_event_id' => TRUE,
+      ],
+      'add' => '4.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Event ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Event'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'label' => ts('ID'),
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'title' => [
+      'title' => ts('Event Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Event Title (e.g. Fall Fundraiser Dinner)'),
+      'add' => '1.7',
+      'unique_name' => 'event_title',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Title'),
+        'maxlength' => 255,
+      ],
+    ],
+    'summary' => [
+      'title' => ts('Event Summary'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('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.'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'label' => ts('Summary'),
+        'rows' => 4,
+        'cols' => 60,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Event Description'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('Full description of event. Text and html allowed. Displayed on built-in Event Information screens.'),
+      'add' => '1.7',
+      'unique_name' => 'event_description',
+      'input_attrs' => [
+        'label' => ts('Description'),
+        'rows' => 8,
+        'cols' => 60,
+      ],
+    ],
+    'event_type_id' => [
+      'title' => ts('Event Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Event Type ID.Implicit FK to civicrm_option_value where option_group = event_type.'),
+      'add' => '1.7',
+      'unique_name' => 'event_type_id',
+      'default' => 0,
+      'input_attrs' => [
+        'label' => ts('Type'),
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'event_type',
+      ],
+    ],
+    'participant_listing_id' => [
+      'title' => ts('Participant Listing'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Should we expose the participant list? Implicit FK to civicrm_option_value where option_group = participant_listing.'),
+      'add' => '2.0',
+      'unique_name' => 'participant_listing_id',
+      'default' => NULL,
+      'pseudoconstant' => [
+        'option_group_name' => 'participant_listing',
+      ],
+    ],
+    'is_public' => [
+      'title' => ts('Is Event Public'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Public events will be included in the iCal feeds. Access to private event information may be limited using ACLs.'),
+      'add' => '1.7',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Public'),
+      ],
+    ],
+    'start_date' => [
+      'title' => ts('Event Start Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time that event starts.'),
+      'add' => '1.7',
+      'unique_name' => 'event_start_date',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Start Date'),
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'end_date' => [
+      'title' => ts('Event End Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time that event ends. May be NULL if no defined end date/time'),
+      'add' => '1.7',
+      'unique_name' => 'event_end_date',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('End Date'),
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'is_online_registration' => [
+      'title' => ts('Is Online Registration'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('If TRUE, include registration link on Event Info page.'),
+      'add' => '1.7',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Online Registration'),
+      ],
+    ],
+    'registration_link_text' => [
+      'title' => ts('Event Registration Link Text'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Text for link to Event Registration form which is displayed on Event Information screen when is_online_registration is true.'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'registration_start_date' => [
+      'title' => ts('Registration Start Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time that online registration starts.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+        'label' => ts('Registration Start Date'),
+      ],
+    ],
+    'registration_end_date' => [
+      'title' => ts('Registration End Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time that online registration ends.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+        'label' => ts('Registration End Date'),
+      ],
+    ],
+    'max_participants' => [
+      'title' => ts('Max Participants'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'description' => ts('Maximum number of registered participants to allow. After max is reached, a custom Event Full message is displayed. If NULL, allow unlimited number of participants.'),
+      'add' => '1.7',
+      'default' => NULL,
+    ],
+    'event_full_text' => [
+      'title' => ts('Event Information'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('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.'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'label' => ts('Event Full Message'),
+        'rows' => 4,
+        'cols' => 60,
+      ],
+    ],
+    'is_monetary' => [
+      'title' => ts('Is this a PAID event?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('If TRUE, one or more fee amounts must be set and a Payment Processor must be configured for Online Event Registration.'),
+      'add' => '1.7',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Paid Event'),
+      ],
+    ],
+    'financial_type_id' => [
+      'title' => ts('Financial Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Financial type assigned to paid event registrations for this event. Required if is_monetary is true.'),
+      'add' => '4.3',
+      'default' => NULL,
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_type',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+    ],
+    'payment_processor' => [
+      'title' => ts('Payment Processor'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Select',
+      'description' => ts('Payment Processors configured for this Event (if is_monetary is true)'),
+      'add' => '1.8',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED,
+      'input_attrs' => [
+        'label' => ts('Payment Processors'),
+        'maxlength' => 128,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_payment_processor',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+    ],
+    'is_map' => [
+      'title' => ts('Map Enabled'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Include a map block on the Event Information page when geocode info is available and a mapping provider has been specified?'),
+      'add' => '1.7',
+      'default' => FALSE,
+    ],
+    'is_active' => [
+      'title' => ts('Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this Event enabled or disabled/cancelled?'),
+      'add' => '1.7',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => [
+          'Enabled',
+          'Enabled',
+        ],
+      ],
+    ],
+    'fee_label' => [
+      'title' => ts('Fee Label'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'add' => '1.8',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_show_location' => [
+      'title' => ts('Show Location'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('If TRUE, show event location.'),
+      'add' => '1.7',
+      'default' => TRUE,
+    ],
+    'loc_block_id' => [
+      'title' => ts('Location Block ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Location Block ID'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Location Block'),
+      ],
+      'entity_reference' => [
+        'entity' => 'LocBlock',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'default_role_id' => [
+      'title' => ts('Default Role'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Participant role ID. Implicit FK to civicrm_option_value where option_group = participant_role.'),
+      'add' => '2.0',
+      'unique_name' => 'default_role_id',
+      'default' => 1,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'participant_role',
+      ],
+    ],
+    'intro_text' => [
+      'title' => ts('Introductory Message'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form.'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'rows' => 6,
+        'cols' => 50,
+      ],
+    ],
+    'footer_text' => [
+      'title' => ts('Footer Message'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form.'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'rows' => 6,
+        'cols' => 50,
+      ],
+    ],
+    'confirm_title' => [
+      'title' => ts('Confirmation Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Title for Confirmation page.'),
+      'add' => '1.7',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'confirm_text' => [
+      'title' => ts('Confirm Text'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form.'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'rows' => 6,
+        'cols' => 50,
+      ],
+    ],
+    'confirm_footer_text' => [
+      'title' => ts('Footer Text'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form.'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'rows' => 6,
+        'cols' => 50,
+      ],
+    ],
+    'is_email_confirm' => [
+      'title' => ts('Is confirm email'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('If TRUE, confirmation is automatically emailed to contact on successful registration.'),
+      'add' => '1.7',
+      'default' => FALSE,
+    ],
+    'confirm_email_text' => [
+      'title' => ts('Confirmation Email Text'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('text to include above standard event info on confirmation email. emails are text-only, so do not allow html for now'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 50,
+      ],
+    ],
+    'confirm_from_name' => [
+      'title' => ts('Confirm From Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('FROM email name used for confirmation emails.'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'confirm_from_email' => [
+      'title' => ts('Confirm From Email'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('FROM email address used for confirmation emails.'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'cc_confirm' => [
+      'title' => ts('Cc Confirm'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('comma-separated list of email addresses to cc each time a confirmation is sent'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'label' => ts('CC Confirm'),
+        'maxlength' => 255,
+      ],
+    ],
+    'bcc_confirm' => [
+      'title' => ts('Bcc Confirm'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('comma-separated list of email addresses to bcc each time a confirmation is sent'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'label' => ts('BCC Confirm'),
+        'maxlength' => 255,
+      ],
+    ],
+    'default_fee_id' => [
+      'title' => ts('Default Fee ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('FK to civicrm_option_value.'),
+      'add' => '1.7',
+    ],
+    'default_discount_fee_id' => [
+      'title' => ts('Default Discount Fee ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('FK to civicrm_option_value.'),
+      'add' => '1.7',
+    ],
+    'thankyou_title' => [
+      'title' => ts('ThankYou Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Title for ThankYou page.'),
+      'add' => '1.7',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'thankyou_text' => [
+      'title' => ts('ThankYou Text'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('ThankYou Text.'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'rows' => 6,
+        'cols' => 50,
+      ],
+    ],
+    'thankyou_footer_text' => [
+      'title' => ts('Footer Text'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('Footer message.'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'rows' => 6,
+        'cols' => 50,
+      ],
+    ],
+    'is_pay_later' => [
+      'title' => ts('Pay Later Allowed'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if true - allows the user to send payment directly to the org later'),
+      'add' => '2.0',
+      'default' => FALSE,
+    ],
+    'pay_later_text' => [
+      'title' => ts('Pay Later Text'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('The text displayed to the user in the main form'),
+      'add' => '2.0',
+    ],
+    'pay_later_receipt' => [
+      'title' => ts('Pay Later Receipt Text'),
+      'sql_type' => 'text',
+      'input_type' => 'RichTextEditor',
+      'localizable' => TRUE,
+      'description' => ts('The receipt sent to the user instead of the normal receipt text'),
+      'add' => '2.0',
+    ],
+    'is_partial_payment' => [
+      'title' => ts('Partial Payments Enabled'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('is partial payment enabled for this event'),
+      'add' => '4.3',
+      'default' => FALSE,
+    ],
+    'initial_amount_label' => [
+      'title' => ts('Initial Amount Label'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Initial amount label for partial payment'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'initial_amount_help_text' => [
+      'title' => ts('Initial Amount Help Text'),
+      'sql_type' => 'text',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Initial amount help text for partial payment'),
+      'add' => '4.3',
+    ],
+    'min_initial_amount' => [
+      'title' => ts('Minimum Initial Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'description' => ts('Minimum initial amount for partial payment'),
+      'add' => '4.3',
+    ],
+    'is_multiple_registrations' => [
+      'title' => ts('Allow Multiple Registrations'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if true - allows the user to register multiple participants for event'),
+      'add' => '2.1',
+      'default' => FALSE,
+    ],
+    'max_additional_participants' => [
+      'title' => ts('Maximum number of additional participants per registration'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Maximum number of additional participants that can be registered on a single booking'),
+      'add' => '4.7',
+      'default' => 0,
+    ],
+    'allow_same_participant_emails' => [
+      'title' => ts('Does Event allow multiple registrations from same email address?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if true - allows the user to register multiple registrations from same email address.'),
+      'add' => '2.2',
+      'default' => FALSE,
+    ],
+    'has_waitlist' => [
+      'title' => ts('Waitlist Enabled'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Whether the event has waitlist support.'),
+      'add' => '3.0',
+      'default' => FALSE,
+    ],
+    'requires_approval' => [
+      'title' => ts('Requires Approval'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Whether participants require approval before they can finish registering.'),
+      'add' => '3.0',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Requires Approval'),
+      ],
+    ],
+    'expiration_time' => [
+      'title' => ts('Expiration Time'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'description' => ts('Expire pending but unconfirmed registrations after this many hours.'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'label' => ts('Expiration Time'),
+      ],
+    ],
+    'allow_selfcancelxfer' => [
+      'title' => ts('Allow Self-service Cancellation or Transfer'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Allow self service cancellation or transfer for event?'),
+      'add' => '4.7',
+      'default' => FALSE,
+    ],
+    'selfcancelxfer_time' => [
+      'title' => ts('Self-service Cancellation or Transfer Time'),
+      'sql_type' => 'int',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Number of hours prior to event start date to allow self-service cancellation or transfer.'),
+      'add' => '4.7',
+      'default' => 0,
+    ],
+    'waitlist_text' => [
+      'title' => ts('Waitlist Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Text to display when the event is full, but participants can signup for a waitlist.'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 60,
+        'label' => ts('Waitlist Text'),
+      ],
+    ],
+    'approval_req_text' => [
+      'title' => ts('Approval Req Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Text to display when the approval is required to complete registration for an event.'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 60,
+        'label' => ts('Approval Required Text'),
+      ],
+    ],
+    'is_template' => [
+      'title' => ts('Is an Event Template'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('whether the event has template'),
+      'add' => '3.0',
+      'default' => FALSE,
+    ],
+    'template_title' => [
+      'title' => ts('Event Template Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Event Template Title'),
+      'add' => '3.0',
+      'unique_name' => 'template_title',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_contact, who created this event'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Event Created Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time that event was created.'),
+      'add' => '3.0',
+    ],
+    'currency' => [
+      'title' => ts('Currency'),
+      'sql_type' => 'varchar(3)',
+      'input_type' => 'Select',
+      'description' => ts('3 character string, value from config setting or input via user.'),
+      'add' => '3.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Currency'),
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_currency',
+        'key_column' => 'name',
+        'label_column' => 'full_name',
+        'name_column' => 'name',
+        'abbr_column' => 'symbol',
+      ],
+    ],
+    'campaign_id' => [
+      'title' => ts('Campaign ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('The campaign for which this event has been created.'),
+      'add' => '3.4',
+      'component' => 'CiviCampaign',
+      'input_attrs' => [
+        'label' => ts('Campaign'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_campaign',
+        'key_column' => 'id',
+        'label_column' => 'title',
+        'prefetch' => 'disabled',
+      ],
+      'entity_reference' => [
+        'entity' => 'Campaign',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'is_share' => [
+      'title' => ts('Is shared through social media'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Can people share the event through social media?'),
+      'add' => '4.1',
+      'default' => TRUE,
+    ],
+    'is_confirm_enabled' => [
+      'title' => ts('Is the booking confirmation screen enabled?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('If FALSE, the event booking confirmation screen gets skipped'),
+      'add' => '4.5',
+      'default' => TRUE,
+    ],
+    'parent_event_id' => [
+      'title' => ts('Parent Event ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Implicit FK to civicrm_event: parent event'),
+      'add' => '4.1',
+      'default' => NULL,
+    ],
+    'slot_label_id' => [
+      'title' => ts('Subevent Slot Label ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'deprecated' => TRUE,
+      'description' => ts('Needs to be moved to Event cart extension. Subevent slot label. Implicit FK to civicrm_option_value where option_group = conference_slot.'),
+      'add' => '4.1',
+      'default' => NULL,
+    ],
+    'dedupe_rule_group_id' => [
+      'title' => ts('Dedupe Rule ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Rule to use when matching registrations for this event'),
+      'add' => '4.5',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Dedupe Rule'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_dedupe_rule_group',
+        'key_column' => 'id',
+        'name_column' => 'name',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'DedupeRuleGroup',
+        'key' => 'id',
+      ],
+    ],
+    'is_billing_required' => [
+      'title' => ts('Is billing block required'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('if true than billing block is required this event'),
+      'add' => '4.6',
+      'default' => FALSE,
+    ],
+    'is_show_calendar_links' => [
+      'title' => ts('Are calendar links shown?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('If true then calendar links are shown for this event.'),
+      'add' => '5.68',
+      'default' => TRUE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Event/EventInCart.entityType.php b/www/modules/civicrm/schema/Event/EventInCart.entityType.php
new file mode 100644
index 000000000..f9cb2c84d
--- /dev/null
+++ b/www/modules/civicrm/schema/Event/EventInCart.entityType.php
@@ -0,0 +1,55 @@
+<?php
+
+return [
+  'name' => 'EventInCart',
+  'table' => 'civicrm_events_in_carts',
+  'class' => 'CRM_Event_Cart_DAO_EventInCart',
+  'getInfo' => fn() => [
+    'title' => ts('Event In Cart'),
+    'title_plural' => ts('Event In Carts'),
+    'description' => ts('FIXME'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Event In Cart'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Event In Cart ID'),
+      'add' => '4.1',
+      'unique_name' => 'event_in_cart_id',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'event_id' => [
+      'title' => ts('Event ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Event ID'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'label' => ts('Event'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Event',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'event_cart_id' => [
+      'title' => ts('Event Cart ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Event Cart ID'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'label' => ts('Event In Cart'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Cart',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Event/Participant.entityType.php b/www/modules/civicrm/schema/Event/Participant.entityType.php
new file mode 100644
index 000000000..835e8f26a
--- /dev/null
+++ b/www/modules/civicrm/schema/Event/Participant.entityType.php
@@ -0,0 +1,391 @@
+<?php
+
+return [
+  'name' => 'Participant',
+  'table' => 'civicrm_participant',
+  'class' => 'CRM_Event_DAO_Participant',
+  'getInfo' => fn() => [
+    'title' => ts('Participant'),
+    'title_plural' => ts('Participants'),
+    'description' => ts('Records of contacts\' attendance and roles in events.'),
+    'log' => TRUE,
+    'add' => '1.7',
+    'icon' => 'fa-ticket',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/participant/add?action=add&context=standalone&reset=1',
+    'view' => 'civicrm/contact/view/participant?id=[id]&cid=[contact_id]&action=view&reset=1',
+    'update' => 'civicrm/contact/view/participant?id=[id]&cid=[contact_id]&action=update&reset=1',
+    'detach' => 'civicrm/event/selfsvcupdate?reset=1&pid=[id]&is_backoffice=1',
+    'delete' => 'civicrm/participant/delete?id=[id]&reset=1',
+  ],
+  'getIndices' => fn() => [
+    'index_status_id' => [
+      'fields' => [
+        'status_id' => TRUE,
+      ],
+      'add' => '1.8',
+    ],
+    'index_role_id' => [
+      'fields' => [
+        'role_id' => TRUE,
+      ],
+      'add' => '1.8',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Participant ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Participant ID'),
+      'add' => '1.7',
+      'unique_name' => 'participant_id',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Contact ID'),
+      'add' => '1.7',
+      'unique_name' => 'participant_contact_id',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'event_id' => [
+      'title' => ts('Event ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Event ID'),
+      'add' => '1.7',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Event'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Event',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'status_id' => [
+      'title' => ts('Status ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Participant status ID. FK to civicrm_participant_status_type. Default of 1 should map to status = Registered.'),
+      'add' => '1.7',
+      'unique_name' => 'participant_status_id',
+      'default' => 1,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Status'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_participant_status_type',
+        'key_column' => 'id',
+        'label_column' => 'label',
+      ],
+      'entity_reference' => [
+        'entity' => 'ParticipantStatusType',
+        'key' => 'id',
+      ],
+    ],
+    'role_id' => [
+      'title' => ts('Participant Role ID'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Select',
+      'description' => ts('Participant role ID. Implicit FK to civicrm_option_value where option_group = participant_role.'),
+      'add' => '1.7',
+      'unique_name' => 'participant_role_id',
+      'default' => NULL,
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'multiple' => '1',
+        'label' => ts('Participant Role'),
+        'maxlength' => 128,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'participant_role',
+      ],
+    ],
+    'register_date' => [
+      'title' => ts('Register date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('When did contact register for event?'),
+      'add' => '1.7',
+      'unique_name' => 'participant_register_date',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'source' => [
+      'title' => ts('Participant Source'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Source of this event registration.'),
+      'add' => '1.7',
+      'unique_name' => 'participant_source',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+    'fee_level' => [
+      'title' => ts('Fee level'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Populate with the label (text) associated with a fee level for paid events with multiple levels. Note that we store the label value and not the key'),
+      'add' => '1.7',
+      'unique_name' => 'participant_fee_level',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'is_test' => [
+      'title' => ts('Test'),
+      'sql_type' => 'boolean',
+      'input_type' => 'Radio',
+      'required' => TRUE,
+      'add' => '1.7',
+      'unique_name' => 'participant_is_test',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'is_pay_later' => [
+      'title' => ts('Is Pay Later'),
+      'sql_type' => 'boolean',
+      'input_type' => 'Radio',
+      'required' => TRUE,
+      'add' => '2.1',
+      'unique_name' => 'participant_is_pay_later',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'fee_amount' => [
+      'title' => ts('Fee Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'description' => ts('actual processor fee if known - may be 0.'),
+      'add' => '2.1',
+      'unique_name' => 'participant_fee_amount',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'registered_by_id' => [
+      'title' => ts('Registered By Participant ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Participant ID'),
+      'add' => '2.1',
+      'unique_name' => 'participant_registered_by_id',
+      'default' => NULL,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Registered By Participant'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Participant',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'discount_id' => [
+      'title' => ts('Discount ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Discount ID'),
+      'add' => '2.1',
+      'unique_name' => 'participant_discount_id',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Discount'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Discount',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'fee_currency' => [
+      'title' => ts('Fee Currency'),
+      'sql_type' => 'varchar(3)',
+      'input_type' => 'Select',
+      'description' => ts('3 character string, value derived from config setting.'),
+      'add' => '3.0',
+      'unique_name' => 'participant_fee_currency',
+      'default' => NULL,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_currency',
+        'key_column' => 'name',
+        'label_column' => 'full_name',
+        'name_column' => 'name',
+        'abbr_column' => 'symbol',
+      ],
+    ],
+    'campaign_id' => [
+      'title' => ts('Campaign ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('The campaign for which this participant has been registered.'),
+      'add' => '3.4',
+      'unique_name' => 'participant_campaign_id',
+      'component' => 'CiviCampaign',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Campaign'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_campaign',
+        'key_column' => 'id',
+        'label_column' => 'title',
+        'prefetch' => 'disabled',
+      ],
+      'entity_reference' => [
+        'entity' => 'Campaign',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'discount_amount' => [
+      'title' => ts('Discount Amount'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Discount Amount'),
+      'add' => '4.1',
+    ],
+    'cart_id' => [
+      'title' => ts('Event Cart ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_event_carts'),
+      'add' => '4.1',
+      'input_attrs' => [
+        'label' => ts('Event Cart'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Cart',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'must_wait' => [
+      'title' => ts('Must Wait on List'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('On Waiting List'),
+      'add' => '4.1',
+    ],
+    'transferred_to_contact_id' => [
+      'title' => ts('Transferred to Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID'),
+      'add' => '4.7',
+      'unique_name' => 'transferred_to_contact_id',
+      'default' => NULL,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Transferred to'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'created_id' => [
+      'title' => ts('Created by Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Contact responsible for registering this participant'),
+      'add' => '5.54',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Event/ParticipantPayment.entityType.php b/www/modules/civicrm/schema/Event/ParticipantPayment.entityType.php
new file mode 100644
index 000000000..52af89de3
--- /dev/null
+++ b/www/modules/civicrm/schema/Event/ParticipantPayment.entityType.php
@@ -0,0 +1,68 @@
+<?php
+
+return [
+  'name' => 'ParticipantPayment',
+  'table' => 'civicrm_participant_payment',
+  'class' => 'CRM_Event_DAO_ParticipantPayment',
+  'getInfo' => fn() => [
+    'title' => ts('Participant Payment'),
+    'title_plural' => ts('Participant Payments'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '1.7',
+  ],
+  'getIndices' => fn() => [
+    'UI_contribution_participant' => [
+      'fields' => [
+        'contribution_id' => TRUE,
+        'participant_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.0',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Payment ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Participant Payment ID'),
+      'add' => '1.7',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'participant_id' => [
+      'title' => ts('Participant ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Participant ID (FK)'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'label' => ts('Participant'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Participant',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'contribution_id' => [
+      'title' => ts('Contribution ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to contribution table.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Contribution'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contribution',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Event/ParticipantStatusType.entityType.php b/www/modules/civicrm/schema/Event/ParticipantStatusType.entityType.php
new file mode 100644
index 000000000..394173792
--- /dev/null
+++ b/www/modules/civicrm/schema/Event/ParticipantStatusType.entityType.php
@@ -0,0 +1,119 @@
+<?php
+
+return [
+  'name' => 'ParticipantStatusType',
+  'table' => 'civicrm_participant_status_type',
+  'class' => 'CRM_Event_DAO_ParticipantStatusType',
+  'getInfo' => fn() => [
+    'title' => ts('Participant Status Type'),
+    'title_plural' => ts('Participant Status Types'),
+    'description' => ts('various types of CiviEvent participant statuses'),
+    'log' => TRUE,
+    'add' => '3.0',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/participant_status?action=add&reset=1',
+    'update' => 'civicrm/admin/participant_status?action=update&id=[id]&reset=1',
+    'delete' => 'civicrm/admin/participant_status?action=delete&id=[id]&reset=1',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Participant Status Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('unique participant status type id'),
+      'add' => '3.0',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Participant Status'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('non-localized name of the status type'),
+      'add' => '3.0',
+      'unique_name' => 'participant_status',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'label' => [
+      'title' => ts('Participant Status Label'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('localized label for display of this status type'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'class' => [
+      'title' => ts('Participant Status Class'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('the general group of status type this one belongs to'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Event_PseudoConstant::participantStatusClassOptions',
+      ],
+    ],
+    'is_reserved' => [
+      'title' => ts('Participant Status Is Reserved?>'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('whether this is a status type required by the system'),
+      'add' => '3.0',
+      'default' => FALSE,
+    ],
+    'is_active' => [
+      'title' => ts('Participant Status is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('whether this status type is active'),
+      'add' => '3.0',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_counted' => [
+      'title' => ts('Participant Status Counts?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('whether this status type is counted against event size limit'),
+      'add' => '3.0',
+      'default' => FALSE,
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('controls sort order'),
+      'add' => '3.0',
+    ],
+    'visibility_id' => [
+      'title' => ts('Participant Status Visibility'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('whether the status type is visible to the public, an implicit foreign key to option_value.value related to the `visibility` option_group'),
+      'add' => '3.0',
+      'pseudoconstant' => [
+        'option_group_name' => 'visibility',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Financial/Currency.entityType.php b/www/modules/civicrm/schema/Financial/Currency.entityType.php
new file mode 100644
index 000000000..76a766b64
--- /dev/null
+++ b/www/modules/civicrm/schema/Financial/Currency.entityType.php
@@ -0,0 +1,76 @@
+<?php
+
+return [
+  'name' => 'Currency',
+  'table' => 'civicrm_currency',
+  'class' => 'CRM_Financial_DAO_Currency',
+  'getInfo' => fn() => [
+    'title' => ts('Currency'),
+    'title_plural' => ts('Currencies'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '1.7',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Currency ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Currency ID'),
+      'add' => '1.7',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Currency'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Currency Name'),
+      'add' => '1.7',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'symbol' => [
+      'title' => ts('Currency Symbol'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Text',
+      'description' => ts('Currency Symbol'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+    ],
+    'numeric_code' => [
+      'title' => ts('Currency Numeric Code'),
+      'sql_type' => 'varchar(3)',
+      'input_type' => 'Text',
+      'description' => ts('Numeric currency code'),
+      'add' => '1.9',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 3,
+      ],
+    ],
+    'full_name' => [
+      'title' => ts('Full Currency Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Full currency name'),
+      'add' => '1.9',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Financial/EntityFinancialAccount.entityType.php b/www/modules/civicrm/schema/Financial/EntityFinancialAccount.entityType.php
new file mode 100644
index 000000000..77108d2d3
--- /dev/null
+++ b/www/modules/civicrm/schema/Financial/EntityFinancialAccount.entityType.php
@@ -0,0 +1,109 @@
+<?php
+
+return [
+  'name' => 'EntityFinancialAccount',
+  'table' => 'civicrm_entity_financial_account',
+  'class' => 'CRM_Financial_DAO_EntityFinancialAccount',
+  'getInfo' => fn() => [
+    'title' => ts('Entity Financial Account'),
+    'title_plural' => ts('Entity Financial Accounts'),
+    'description' => ts('Map between an entity and a financial account, where there is a specific relationship between the financial account and the entity, e.g. Income Account for or AR Account for'),
+    'log' => TRUE,
+    'add' => '4.3',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/financial/financialType/accounts?action=add&reset=1&aid=[entity_id]',
+    'update' => 'civicrm/admin/financial/financialType/accounts?action=update&id=[id]&aid=[entity_id]&reset=1',
+    'delete' => 'civicrm/admin/financial/financialType/accounts?action=delete&id=[id]&aid=[entity_id]&reset=1',
+  ],
+  'getIndices' => fn() => [
+    'index_entity_id_entity_table_account_relationship' => [
+      'fields' => [
+        'entity_id' => TRUE,
+        'entity_table' => TRUE,
+        'account_relationship' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '4.7',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Entity Financial Account ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('ID'),
+      'add' => '4.3',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Links to an entity_table like civicrm_financial_type'),
+      'add' => '4.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Entity Type'),
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Financial_BAO_EntityFinancialAccount::entityTables',
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Links to an id in the entity_table, such as vid in civicrm_financial_type'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Entity'),
+      ],
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'account_relationship' => [
+      'title' => ts('Account Relationship'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('FK to a new civicrm_option_value (account_relationship)'),
+      'add' => '4.3',
+      'pseudoconstant' => [
+        'option_group_name' => 'account_relationship',
+      ],
+    ],
+    'financial_account_id' => [
+      'title' => ts('Financial Account ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('FK to the financial_account_id'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Financial Account'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_account',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialAccount',
+        'key' => 'id',
+        'on_delete' => 'RESTRICT',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Financial/EntityFinancialTrxn.entityType.php b/www/modules/civicrm/schema/Financial/EntityFinancialTrxn.entityType.php
new file mode 100644
index 000000000..f020f73e6
--- /dev/null
+++ b/www/modules/civicrm/schema/Financial/EntityFinancialTrxn.entityType.php
@@ -0,0 +1,96 @@
+<?php
+
+return [
+  'name' => 'EntityFinancialTrxn',
+  'table' => 'civicrm_entity_financial_trxn',
+  'class' => 'CRM_Financial_DAO_EntityFinancialTrxn',
+  'getInfo' => fn() => [
+    'title' => ts('Entity Financial Trxn'),
+    'title_plural' => ts('Entity Financial Trxns'),
+    'description' => ts('FIXME'),
+    'add' => '3.2',
+  ],
+  'getIndices' => fn() => [
+    'UI_entity_financial_trxn_entity_table' => [
+      'fields' => [
+        'entity_table' => TRUE,
+      ],
+      'add' => '4.3',
+    ],
+    'UI_entity_financial_trxn_entity_id' => [
+      'fields' => [
+        'entity_id' => TRUE,
+      ],
+      'add' => '4.3',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Entity Financial Transaction ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('ID'),
+      'add' => '3.2',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('May contain civicrm_financial_item, civicrm_contribution, civicrm_financial_trxn, civicrm_grant, etc'),
+      'add' => '3.2',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Financial_BAO_EntityFinancialTrxn::entityTables',
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'add' => '3.2',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'financial_trxn_id' => [
+      'title' => ts('Financial Transaction ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'add' => '3.2',
+      'input_attrs' => [
+        'label' => ts('Financial Transaction'),
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialTrxn',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'amount' => [
+      'title' => ts('Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('allocated amount of transaction to this entity'),
+      'add' => '3.2',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Financial/FinancialAccount.entityType.php b/www/modules/civicrm/schema/Financial/FinancialAccount.entityType.php
new file mode 100644
index 000000000..5dfed7cd3
--- /dev/null
+++ b/www/modules/civicrm/schema/Financial/FinancialAccount.entityType.php
@@ -0,0 +1,200 @@
+<?php
+
+return [
+  'name' => 'FinancialAccount',
+  'table' => 'civicrm_financial_account',
+  'class' => 'CRM_Financial_DAO_FinancialAccount',
+  'getInfo' => fn() => [
+    'title' => ts('Financial Account'),
+    'title_plural' => ts('Financial Accounts'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '3.2',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/financial/financialAccount/edit?action=add&reset=1',
+    'update' => 'civicrm/admin/financial/financialAccount/edit?action=update&id=[id]&reset=1',
+    'delete' => 'civicrm/admin/financial/financialAccount/edit?action=delete&id=[id]&reset=1',
+    'browse' => 'civicrm/admin/financial/financialAccount',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '4.3',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Financial Account ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('ID'),
+      'add' => '3.2',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Financial Account Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Financial Account Name.'),
+      'add' => '3.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID that is responsible for the funds in this account'),
+      'add' => '4.3',
+      'unique_name' => 'financial_account_contact_id',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'financial_account_type_id' => [
+      'title' => ts('Financial Account Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('pseudo FK into civicrm_option_value.'),
+      'add' => '4.3',
+      'default' => 3,
+      'pseudoconstant' => [
+        'option_group_name' => 'financial_account_type',
+      ],
+    ],
+    'accounting_code' => [
+      'title' => ts('Accounting Code'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Optional value for mapping monies owed and received to accounting system codes.'),
+      'add' => '4.3',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'account_type_code' => [
+      'title' => ts('Account Type Code'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Optional value for mapping account types to accounting system account categories (QuickBooks Account Type Codes for example).'),
+      'add' => '4.3',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Financial Account Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Financial Type Description.'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'parent_id' => [
+      'title' => ts('Parent ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Parent ID in account hierarchy'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Parent'),
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialAccount',
+        'key' => 'id',
+      ],
+    ],
+    'is_header_account' => [
+      'title' => ts('Header Financial Account?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this a header account which does not allow transactions to be posted against it directly, but only to its sub-accounts?'),
+      'add' => '4.3',
+      'default' => FALSE,
+    ],
+    'is_deductible' => [
+      'title' => ts('Deductible Financial Account?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this account tax-deductible?'),
+      'add' => '4.3',
+      'default' => FALSE,
+    ],
+    'is_tax' => [
+      'title' => ts('Tax Financial Account?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this account for taxes?'),
+      'add' => '4.3',
+      'default' => FALSE,
+    ],
+    'tax_rate' => [
+      'title' => ts('Financial Account Tax Rate'),
+      'sql_type' => 'decimal(10,8)',
+      'input_type' => NULL,
+      'description' => ts('The percentage of the total_amount that is due for this tax.'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'maxlength' => 10,
+      ],
+    ],
+    'is_reserved' => [
+      'title' => ts('Reserved Financial Account?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this a predefined system object?'),
+      'add' => '4.3',
+      'default' => FALSE,
+    ],
+    'is_active' => [
+      'title' => ts('Financial Account is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this property active?'),
+      'add' => '4.3',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_default' => [
+      'title' => ts('Default Financial Account'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this account the default one (or default tax one) for its financial_account_type?'),
+      'add' => '4.3',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Default'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Financial/FinancialItem.entityType.php b/www/modules/civicrm/schema/Financial/FinancialItem.entityType.php
new file mode 100644
index 000000000..d69f11249
--- /dev/null
+++ b/www/modules/civicrm/schema/Financial/FinancialItem.entityType.php
@@ -0,0 +1,180 @@
+<?php
+
+return [
+  'name' => 'FinancialItem',
+  'table' => 'civicrm_financial_item',
+  'class' => 'CRM_Financial_DAO_FinancialItem',
+  'getInfo' => fn() => [
+    'title' => ts('Financial Item'),
+    'title_plural' => ts('Financial Items'),
+    'description' => ts('Financial data for civicrm_line_item, etc.'),
+    'log' => TRUE,
+    'add' => '4.3',
+  ],
+  'getIndices' => fn() => [
+    'IX_created_date' => [
+      'fields' => [
+        'created_date' => TRUE,
+      ],
+      'add' => '4.3',
+    ],
+    'IX_transaction_date' => [
+      'fields' => [
+        'transaction_date' => TRUE,
+      ],
+      'add' => '4.3',
+    ],
+    'index_entity_id_entity_table' => [
+      'fields' => [
+        'entity_id' => TRUE,
+        'entity_table' => TRUE,
+      ],
+      'add' => '4.7',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Financial Item ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '4.3',
+      'input_attrs' => [
+        'maxlength' => 10,
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'created_date' => [
+      'title' => ts('Financial Item Created Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('Date and time the item was created'),
+      'add' => '4.3',
+      'default' => 'CURRENT_TIMESTAMP',
+    ],
+    'transaction_date' => [
+      'title' => ts('Financial Item Transaction Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'required' => TRUE,
+      'description' => ts('Date and time of the source transaction'),
+      'add' => '4.3',
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Contact ID of contact the item is from'),
+      'add' => '4.3',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'description' => [
+      'title' => ts('Financial Item Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Human readable description of this item, to ease display without lookup of source item.'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'amount' => [
+      'title' => ts('Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('Total amount of this item'),
+      'add' => '4.3',
+      'default' => '0',
+    ],
+    'currency' => [
+      'title' => ts('Financial Item Currency'),
+      'sql_type' => 'varchar(3)',
+      'input_type' => 'Select',
+      'description' => ts('Currency for the amount'),
+      'add' => '4.3',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_currency',
+        'key_column' => 'name',
+        'label_column' => 'full_name',
+        'name_column' => 'name',
+        'abbr_column' => 'symbol',
+      ],
+    ],
+    'financial_account_id' => [
+      'title' => ts('Financial Account ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to civicrm_financial_account'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Financial Account'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_account',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialAccount',
+        'key' => 'id',
+      ],
+    ],
+    'status_id' => [
+      'title' => ts('Financial Item Status ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Payment status: test, paid, part_paid, unpaid (if empty assume unpaid)'),
+      'add' => '4.3',
+      'usage' => [
+        'export',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'financial_item_status',
+      ],
+    ],
+    'entity_table' => [
+      'title' => ts('Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('May contain civicrm_line_item, civicrm_financial_trxn etc'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Financial_BAO_FinancialItem::entityTables',
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('The specific source item that is responsible for the creation of this financial_item'),
+      'add' => '4.3',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Financial/FinancialTrxn.entityType.php b/www/modules/civicrm/schema/Financial/FinancialTrxn.entityType.php
new file mode 100644
index 000000000..a6ceabbb8
--- /dev/null
+++ b/www/modules/civicrm/schema/Financial/FinancialTrxn.entityType.php
@@ -0,0 +1,267 @@
+<?php
+
+return [
+  'name' => 'FinancialTrxn',
+  'table' => 'civicrm_financial_trxn',
+  'class' => 'CRM_Financial_DAO_FinancialTrxn',
+  'getInfo' => fn() => [
+    'title' => ts('Financial Trxn'),
+    'title_plural' => ts('Financial Trxns'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '1.3',
+  ],
+  'getIndices' => fn() => [
+    'UI_ftrxn_trxn_id' => [
+      'fields' => [
+        'trxn_id' => TRUE,
+      ],
+      'add' => '4.7',
+    ],
+    'UI_ftrxn_payment_instrument_id' => [
+      'fields' => [
+        'payment_instrument_id' => TRUE,
+      ],
+      'add' => '4.3',
+    ],
+    'UI_ftrxn_check_number' => [
+      'fields' => [
+        'check_number' => TRUE,
+      ],
+      'add' => '4.3',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Financial Transaction ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '1.3',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'from_financial_account_id' => [
+      'title' => ts('From Account ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to financial_account table.'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('From Account'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_account',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialAccount',
+        'key' => 'id',
+      ],
+    ],
+    'to_financial_account_id' => [
+      'title' => ts('To Account ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to financial_financial_account table.'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('To Account'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_account',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialAccount',
+        'key' => 'id',
+      ],
+    ],
+    'trxn_date' => [
+      'title' => ts('Financial Transaction Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('date transaction occurred'),
+      'add' => '1.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'total_amount' => [
+      'title' => ts('Financial Total Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('amount of transaction'),
+      'add' => '1.3',
+    ],
+    'fee_amount' => [
+      'title' => ts('Financial Fee Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'description' => ts('actual processor fee if known - may be 0.'),
+      'add' => '1.3',
+    ],
+    'net_amount' => [
+      'title' => ts('Financial Net Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'description' => ts('actual funds transfer amount. total less fees. if processor does not report actual fee during transaction, this is set to total_amount.'),
+      'add' => '1.3',
+    ],
+    'currency' => [
+      'title' => ts('Financial Currency'),
+      'sql_type' => 'varchar(3)',
+      'input_type' => 'Select',
+      'description' => ts('3 character string, value from config setting or input via user.'),
+      'add' => '1.3',
+      'default' => NULL,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_currency',
+        'key_column' => 'name',
+        'label_column' => 'full_name',
+        'name_column' => 'name',
+        'abbr_column' => 'symbol',
+      ],
+    ],
+    'is_payment' => [
+      'title' => ts('Is Payment?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this entry either a payment or a reversal of a payment?'),
+      'add' => '4.7',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'trxn_id' => [
+      'title' => ts('Transaction ID'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Transaction id supplied by external processor. This may not be unique.'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'size' => '10',
+        'maxlength' => 255,
+      ],
+    ],
+    'trxn_result_code' => [
+      'title' => ts('Transaction Result Code'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('processor result code'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'status_id' => [
+      'title' => ts('Financial Transaction Status ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('pseudo FK to civicrm_option_value of contribution_status_id option_group'),
+      'add' => '4.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'contribution_status',
+      ],
+    ],
+    'payment_processor_id' => [
+      'title' => ts('Payment Processor ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Payment Processor for this financial transaction'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Payment Processor'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_payment_processor',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'PaymentProcessor',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'payment_instrument_id' => [
+      'title' => ts('Payment Method'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to payment_instrument option group values'),
+      'add' => '4.3',
+      'unique_name' => 'financial_trxn_payment_instrument_id',
+      'pseudoconstant' => [
+        'option_group_name' => 'payment_instrument',
+      ],
+    ],
+    'card_type_id' => [
+      'title' => ts('Card Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to accept_creditcard option group values'),
+      'add' => '4.7',
+      'unique_name' => 'financial_trxn_card_type_id',
+      'pseudoconstant' => [
+        'option_group_name' => 'accept_creditcard',
+      ],
+    ],
+    'check_number' => [
+      'title' => ts('Check Number'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Check number'),
+      'add' => '4.3',
+      'unique_name' => 'financial_trxn_check_number',
+      'input_attrs' => [
+        'size' => '6',
+        'maxlength' => 255,
+      ],
+    ],
+    'pan_truncation' => [
+      'title' => ts('PAN Truncation'),
+      'sql_type' => 'varchar(4)',
+      'input_type' => 'Text',
+      'description' => ts('Last 4 digits of credit card'),
+      'add' => '4.7',
+      'unique_name' => 'financial_trxn_pan_truncation',
+      'input_attrs' => [
+        'size' => '4',
+        'maxlength' => 4,
+      ],
+    ],
+    'order_reference' => [
+      'title' => ts('Order Reference'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Payment Processor external order reference'),
+      'add' => '5.20',
+      'unique_name' => 'financial_trxn_order_reference',
+      'input_attrs' => [
+        'size' => '25',
+        'maxlength' => 255,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Financial/FinancialType.entityType.php b/www/modules/civicrm/schema/Financial/FinancialType.entityType.php
new file mode 100644
index 000000000..a0ae6493c
--- /dev/null
+++ b/www/modules/civicrm/schema/Financial/FinancialType.entityType.php
@@ -0,0 +1,106 @@
+<?php
+
+return [
+  'name' => 'FinancialType',
+  'table' => 'civicrm_financial_type',
+  'class' => 'CRM_Financial_DAO_FinancialType',
+  'getInfo' => fn() => [
+    'title' => ts('Financial Type'),
+    'title_plural' => ts('Financial Types'),
+    'description' => ts('Formerly civicrm_contribution_type merged into this table in 4.3'),
+    'log' => TRUE,
+    'add' => '1.3',
+    'label_field' => 'name',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/financial/financialType/edit?action=add&reset=1',
+    'update' => 'civicrm/admin/financial/financialType/edit?action=update&id=[id]&reset=1',
+    'delete' => 'civicrm/admin/financial/financialType/edit?action=delete&id=[id]&reset=1',
+    'browse' => 'civicrm/admin/financial/financialType',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Financial Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('ID of original financial_type so you can search this table by the financial_type.id and then select the relevant version based on the timestamp'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'maxlength' => 10,
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Financial Type'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Financial Type Name.'),
+      'add' => '1.3',
+      'unique_name' => 'financial_type',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Name'),
+        'maxlength' => 64,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'TextArea',
+      'description' => ts('Financial Type Description.'),
+      'add' => '1.3',
+      'input_attrs' => [
+        'rows' => 6,
+        'cols' => 50,
+        'label' => ts('Description'),
+        'maxlength' => 255,
+      ],
+    ],
+    'is_deductible' => [
+      'title' => ts('Is Tax Deductible?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this financial type tax-deductible? If TRUE, contributions of this type may be fully OR partially deductible - non-deductible amount is stored in the Contribution record.'),
+      'add' => '1.3',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Tax-Deductible?'),
+        'maxlength' => 4,
+      ],
+    ],
+    'is_reserved' => [
+      'title' => ts('Financial Type is Reserved?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this a predefined system object?'),
+      'add' => '1.3',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Reserved?'),
+        'maxlength' => 4,
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Financial Type Is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this property active?'),
+      'add' => '1.3',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+        'maxlength' => 4,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Financial/PaymentProcessor.entityType.php b/www/modules/civicrm/schema/Financial/PaymentProcessor.entityType.php
new file mode 100644
index 000000000..511068ef6
--- /dev/null
+++ b/www/modules/civicrm/schema/Financial/PaymentProcessor.entityType.php
@@ -0,0 +1,291 @@
+<?php
+
+return [
+  'name' => 'PaymentProcessor',
+  'table' => 'civicrm_payment_processor',
+  'class' => 'CRM_Financial_DAO_PaymentProcessor',
+  'getInfo' => fn() => [
+    'title' => ts('Payment Processor'),
+    'title_plural' => ts('Payment Processors'),
+    'description' => ts('FIXME'),
+    'add' => '1.8',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/paymentProcessor/edit?action=add&reset=1',
+    'update' => 'civicrm/admin/paymentProcessor/edit?action=update&id=[id]&reset=1',
+    'delete' => 'civicrm/admin/paymentProcessor/edit?action=delete&id=[id]&reset=1',
+    'browse' => 'civicrm/admin/paymentProcessor',
+  ],
+  'getIndices' => fn() => [
+    'UI_name_test_domain_id' => [
+      'fields' => [
+        'name' => TRUE,
+        'is_test' => TRUE,
+        'domain_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '1.8',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Payment Processor ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Payment Processor ID'),
+      'add' => '1.8',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Which Domain is this match entry for'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+      ],
+    ],
+    'name' => [
+      'title' => ts('Payment Processor Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Payment Processor Name.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'label' => ts('Machine Name'),
+        'maxlength' => 64,
+      ],
+    ],
+    'title' => [
+      'title' => ts('Payment Processor Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Name of processor when shown to CiviCRM administrators.'),
+      'add' => '5.13',
+      'input_attrs' => [
+        'label' => ts('Backend Title'),
+        'maxlength' => 255,
+      ],
+    ],
+    'frontend_title' => [
+      'title' => ts('Payment Processor Frontend Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Name of processor when shown to users making a payment.'),
+      'add' => '5.61',
+      'input_attrs' => [
+        'label' => ts('Frontend Title'),
+        'maxlength' => 255,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Processor Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Additional processor information shown to administrators.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'label' => ts('Description'),
+        'maxlength' => 255,
+      ],
+    ],
+    'payment_processor_type_id' => [
+      'title' => ts('Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Type'),
+        'maxlength' => 10,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_payment_processor_type',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'PaymentProcessorType',
+        'key' => 'id',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Processor is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this processor active?'),
+      'add' => '1.8',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_default' => [
+      'title' => ts('Processor Is Default?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this processor the default?'),
+      'add' => '1.8',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Default'),
+      ],
+    ],
+    'is_test' => [
+      'title' => ts('Is Test Processor?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this processor for a test site?'),
+      'add' => '1.8',
+      'default' => FALSE,
+    ],
+    'user_name' => [
+      'title' => ts('User Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'password' => [
+      'title' => ts('Password'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Password',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'signature' => [
+      'title' => ts('Signature'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'add' => '1.8',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 40,
+      ],
+    ],
+    'url_site' => [
+      'title' => ts('Site URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'url_api' => [
+      'title' => ts('API URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'url_recur' => [
+      'title' => ts('Recurring Payments URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'url_button' => [
+      'title' => ts('Button URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'subject' => [
+      'title' => ts('Subject'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'class_name' => [
+      'title' => ts('Suffix for PHP class name implementation'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'billing_mode' => [
+      'title' => ts('Processor Billing Mode'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Billing Mode (deprecated)'),
+      'add' => '1.8',
+    ],
+    'is_recur' => [
+      'title' => ts('Processor Supports Recurring?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Can process recurring contributions'),
+      'add' => '1.8',
+      'default' => FALSE,
+    ],
+    'payment_type' => [
+      'title' => ts('Payment Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Payment Type: Credit or Debit (deprecated)'),
+      'add' => '3.0',
+      'default' => 1,
+    ],
+    'payment_instrument_id' => [
+      'title' => ts('Payment Method'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Payment Instrument ID'),
+      'add' => '4.7',
+      'default' => 1,
+      'pseudoconstant' => [
+        'option_group_name' => 'payment_instrument',
+      ],
+    ],
+    'accepted_credit_cards' => [
+      'title' => ts('Accepted Credit Cards'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('array of accepted credit card types'),
+      'add' => '4.7',
+      'default' => NULL,
+      'serialize' => CRM_Core_DAO::SERIALIZE_JSON,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Financial/PaymentProcessorType.entityType.php b/www/modules/civicrm/schema/Financial/PaymentProcessorType.entityType.php
new file mode 100644
index 000000000..896fcf306
--- /dev/null
+++ b/www/modules/civicrm/schema/Financial/PaymentProcessorType.entityType.php
@@ -0,0 +1,255 @@
+<?php
+
+return [
+  'name' => 'PaymentProcessorType',
+  'table' => 'civicrm_payment_processor_type',
+  'class' => 'CRM_Financial_DAO_PaymentProcessorType',
+  'getInfo' => fn() => [
+    'title' => ts('Payment Processor Type'),
+    'title_plural' => ts('Payment Processor Types'),
+    'description' => ts('FIXME'),
+    'add' => '1.8',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/paymentProcessorType?reset=1&action=add',
+    'delete' => 'civicrm/admin/paymentProcessorType?reset=1&action=delete&id=[id]',
+    'update' => 'civicrm/admin/paymentProcessorType?reset=1&action=update&id=[id]',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Payment Processor Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Payment Processor Type ID'),
+      'add' => '1.8',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Payment Processor Type variable name to be used in code'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Payment Processor Type Name.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'title' => [
+      'title' => ts('Payment Processor Type Title'),
+      'sql_type' => 'varchar(127)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Payment Processor Type Title.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 127,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Processor Type Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Payment Processor Description.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Processor Type Is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this processor active?'),
+      'add' => '1.8',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_default' => [
+      'title' => ts('Processor Type is Default?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this processor the default?'),
+      'add' => '1.8',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Default'),
+      ],
+    ],
+    'user_name_label' => [
+      'title' => ts('Label for User Name if used'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'password_label' => [
+      'title' => ts('Label for password'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'signature_label' => [
+      'title' => ts('Label for Signature'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'subject_label' => [
+      'title' => ts('Label for Subject'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'class_name' => [
+      'title' => ts('Suffix for PHP class name implementation'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'url_site_default' => [
+      'title' => ts('Default Live Site URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'url_api_default' => [
+      'title' => ts('Default API Site URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'url_recur_default' => [
+      'title' => ts('Default Live Recurring Payments URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'url_button_default' => [
+      'title' => ts('Default Live Button URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'url_site_test_default' => [
+      'title' => ts('Default Test Site URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'url_api_test_default' => [
+      'title' => ts('Default Test API URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'url_recur_test_default' => [
+      'title' => ts('Default Test Recurring Payment URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'url_button_test_default' => [
+      'title' => ts('Default Test Button URL'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'billing_mode' => [
+      'title' => ts('Billing Mode'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Billing Mode (deprecated)'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'label' => ts('Billing Mode'),
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::billingMode',
+      ],
+    ],
+    'is_recur' => [
+      'title' => ts('Processor Type Supports Recurring?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Can process recurring contributions'),
+      'add' => '1.8',
+      'default' => FALSE,
+    ],
+    'payment_type' => [
+      'title' => ts('Processor Type Payment Type'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Payment Type: Credit or Debit (deprecated)'),
+      'add' => '3.0',
+      'default' => 1,
+    ],
+    'payment_instrument_id' => [
+      'title' => ts('Payment Method'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Payment Instrument ID'),
+      'add' => '4.7',
+      'default' => 1,
+      'pseudoconstant' => [
+        'option_group_name' => 'payment_instrument',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Financial/PaymentToken.entityType.php b/www/modules/civicrm/schema/Financial/PaymentToken.entityType.php
new file mode 100644
index 000000000..70e611e17
--- /dev/null
+++ b/www/modules/civicrm/schema/Financial/PaymentToken.entityType.php
@@ -0,0 +1,158 @@
+<?php
+
+return [
+  'name' => 'PaymentToken',
+  'table' => 'civicrm_payment_token',
+  'class' => 'CRM_Financial_DAO_PaymentToken',
+  'getInfo' => fn() => [
+    'title' => ts('Payment Token'),
+    'title_plural' => ts('Payment Tokens'),
+    'description' => ts('Payment Token'),
+    'add' => '4.6',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Payment Token ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Payment Token ID'),
+      'add' => '4.6',
+      'unique_name' => 'payment_token_id',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Contact ID for the owner of the token'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'payment_processor_id' => [
+      'title' => ts('Payment Processor ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'add' => '4.6',
+      'input_attrs' => [
+        'label' => ts('Payment Processor'),
+      ],
+      'entity_reference' => [
+        'entity' => 'PaymentProcessor',
+        'key' => 'id',
+        'on_delete' => 'RESTRICT',
+      ],
+    ],
+    'token' => [
+      'title' => ts('Token'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Externally provided token string'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Created Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('Date created'),
+      'add' => '4.6',
+      'default' => 'CURRENT_TIMESTAMP',
+    ],
+    'created_id' => [
+      'title' => ts('Created ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Contact ID of token creator'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'label' => ts('Created'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'expiry_date' => [
+      'title' => ts('Expiry Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date this token expires'),
+      'add' => '4.6',
+    ],
+    'email' => [
+      'title' => ts('Email'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Email at the time of token creation. Useful for fraud forensics'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'billing_first_name' => [
+      'title' => ts('Billing First Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Billing first name at the time of token creation. Useful for fraud forensics'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'billing_middle_name' => [
+      'title' => ts('Billing Middle Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Billing middle name at the time of token creation. Useful for fraud forensics'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'billing_last_name' => [
+      'title' => ts('Billing Last Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Billing last name at the time of token creation. Useful for fraud forensics'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'masked_account_number' => [
+      'title' => ts('Masked Account Number'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Holds the part of the card number or account details that may be retained or displayed'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'ip_address' => [
+      'title' => ts('IP Address'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('IP used when creating the token. Useful for fraud forensics'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Friend/Friend.entityType.php b/www/modules/civicrm/schema/Friend/Friend.entityType.php
new file mode 100644
index 000000000..08380e530
--- /dev/null
+++ b/www/modules/civicrm/schema/Friend/Friend.entityType.php
@@ -0,0 +1,119 @@
+<?php
+
+return [
+  'name' => 'Friend',
+  'table' => 'civicrm_tell_friend',
+  'class' => 'CRM_Friend_DAO_Friend',
+  'getInfo' => fn() => [
+    'title' => ts('Friend'),
+    'title_plural' => ts('Friends'),
+    'description' => ts('FIXME'),
+    'add' => '2.0',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Friend ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Friend ID'),
+      'add' => '2.0',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Name of table where item being referenced is stored.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Foreign key to the referenced item.'),
+      'add' => '2.0',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'title' => [
+      'title' => ts('Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'intro' => [
+      'title' => ts('Intro'),
+      'sql_type' => 'text',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Introductory message to contributor or participant displayed on the Tell a Friend form.'),
+      'add' => '2.0',
+    ],
+    'suggested_message' => [
+      'title' => ts('Suggested Message'),
+      'sql_type' => 'text',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Suggested message to friends, provided as default on the Tell A Friend form.'),
+      'add' => '2.0',
+    ],
+    'general_link' => [
+      'title' => ts('General Link'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('URL for general info about the organization - included in the email sent to friends.'),
+      'add' => '2.0',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'thankyou_title' => [
+      'title' => ts('Thank You Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Text for Tell a Friend thank you page header and HTML title.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'thankyou_text' => [
+      'title' => ts('Thank You Text'),
+      'sql_type' => 'text',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Thank you message displayed on success page.'),
+      'add' => '2.0',
+    ],
+    'is_active' => [
+      'title' => ts('Enabled?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '2.0',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/BouncePattern.entityType.php b/www/modules/civicrm/schema/Mailing/BouncePattern.entityType.php
new file mode 100644
index 000000000..05a2a61ed
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/BouncePattern.entityType.php
@@ -0,0 +1,51 @@
+<?php
+
+return [
+  'name' => 'BouncePattern',
+  'table' => 'civicrm_mailing_bounce_pattern',
+  'class' => 'CRM_Mailing_DAO_BouncePattern',
+  'getInfo' => fn() => [
+    'title' => ts('Bounce Pattern'),
+    'title_plural' => ts('Bounce Patterns'),
+    'description' => ts('Pseudo-constant table of patterns for bounce classification'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Bounce Pattern ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'bounce_type_id' => [
+      'title' => ts('Bounce Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Type of bounce'),
+      'input_attrs' => [
+        'label' => ts('Bounce Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_mailing_bounce_type',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'BounceType',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'pattern' => [
+      'title' => ts('Pattern'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('A regexp to match a message to a bounce type'),
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/BounceType.entityType.php b/www/modules/civicrm/schema/Mailing/BounceType.entityType.php
new file mode 100644
index 000000000..c325e48f0
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/BounceType.entityType.php
@@ -0,0 +1,48 @@
+<?php
+
+return [
+  'name' => 'BounceType',
+  'table' => 'civicrm_mailing_bounce_type',
+  'class' => 'CRM_Mailing_DAO_BounceType',
+  'getInfo' => fn() => [
+    'title' => ts('Bounce Type'),
+    'title_plural' => ts('Bounce Types'),
+    'description' => ts('Table to index the various bounce types and their properties'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Bounce Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Bounce Type Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Type of bounce'),
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Bounce Type Description'),
+      'sql_type' => 'varchar(2048)',
+      'input_type' => 'Text',
+      'description' => ts('A description of this bounce type'),
+      'input_attrs' => [
+        'maxlength' => 2048,
+      ],
+    ],
+    'hold_threshold' => [
+      'title' => ts('Hold Threshold'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Number of bounces of this type required before the email address is put on bounce hold'),
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/Mailing.entityType.php b/www/modules/civicrm/schema/Mailing/Mailing.entityType.php
new file mode 100644
index 000000000..9129ca662
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/Mailing.entityType.php
@@ -0,0 +1,566 @@
+<?php
+
+return [
+  'name' => 'Mailing',
+  'table' => 'civicrm_mailing',
+  'class' => 'CRM_Mailing_DAO_Mailing',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing'),
+    'title_plural' => ts('Mailings'),
+    'description' => ts('Mass emails sent from CiviMail.'),
+    'icon' => 'fa-envelope-o',
+    'label_field' => 'name',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/mailing/send',
+    'update' => 'civicrm/mailing/send?mid=[id]&continue=true',
+    'copy' => 'civicrm/mailing/send?mid=[id]',
+    'view' => 'civicrm/mailing/report?mid=[id]&reset=1',
+    'preview' => 'civicrm/mailing/view?id=[id]&reset=1',
+    'delete' => 'civicrm/mailing/browse?action=delete&mid=[id]&reset=1',
+  ],
+  'getIndices' => fn() => [
+    'index_hash' => [
+      'fields' => [
+        'hash' => TRUE,
+      ],
+      'add' => '4.5',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Mailing ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Which site is this mailing for'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'header_id' => [
+      'title' => ts('Header ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to the header component.'),
+      'input_attrs' => [
+        'label' => ts('Header'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_mailing_component',
+        'key_column' => 'id',
+        'label_column' => 'name',
+        'condition' => 'component_type = "Header"',
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingComponent',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'footer_id' => [
+      'title' => ts('Footer ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to the footer component.'),
+      'input_attrs' => [
+        'label' => ts('Footer'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_mailing_component',
+        'key_column' => 'id',
+        'label_column' => 'name',
+        'condition' => 'component_type = "Footer"',
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingComponent',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'reply_id' => [
+      'title' => ts('Reply ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to the auto-responder component.'),
+      'input_attrs' => [
+        'label' => ts('Reply'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingComponent',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'unsubscribe_id' => [
+      'title' => ts('Unsubscribe ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to the unsubscribe component.'),
+      'input_attrs' => [
+        'label' => ts('Unsubscribe'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingComponent',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'resubscribe_id' => [
+      'title' => ts('Mailing Resubscribe'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+    ],
+    'optout_id' => [
+      'title' => ts('Opt Out ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to the opt-out component.'),
+      'input_attrs' => [
+        'label' => ts('Opt Out'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingComponent',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'name' => [
+      'title' => ts('Mailing Name'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Mailing Name.'),
+      'unique_name' => 'mailing_name',
+      'input_attrs' => [
+        'label' => ts('Name'),
+        'maxlength' => 128,
+      ],
+    ],
+    'mailing_type' => [
+      'title' => ts('Mailing Type'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => 'Select',
+      'description' => ts('differentiate between standalone mailings, A/B tests, and A/B final-winner'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 32,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Mailing_PseudoConstant::mailingTypes',
+      ],
+    ],
+    'from_name' => [
+      'title' => ts('Mailing From Name'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('From Header of mailing'),
+      'input_attrs' => [
+        'label' => ts('From Name'),
+        'maxlength' => 128,
+      ],
+    ],
+    'from_email' => [
+      'title' => ts('Mailing From Email'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('From Email of mailing'),
+      'input_attrs' => [
+        'label' => ts('From Email'),
+        'maxlength' => 128,
+      ],
+    ],
+    'replyto_email' => [
+      'title' => ts('Replyto Email'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Reply-To Email of mailing'),
+      'input_attrs' => [
+        'label' => ts('Reply-To Email'),
+        'maxlength' => 128,
+      ],
+    ],
+    'template_type' => [
+      'title' => ts('Template Type'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('The language/processing system used for email templates.'),
+      'add' => '4.7',
+      'default' => 'traditional',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Mailing_BAO_Mailing::getTemplateTypeNames',
+      ],
+    ],
+    'template_options' => [
+      'title' => ts('Template Options (JSON)'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('Advanced options used by the email templating system. (JSON encoded)'),
+      'add' => '4.7',
+      'serialize' => CRM_Core_DAO::SERIALIZE_JSON,
+    ],
+    'subject' => [
+      'title' => ts('Subject'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Subject of mailing'),
+      'input_attrs' => [
+        'label' => ts('Subject'),
+        'maxlength' => 128,
+      ],
+    ],
+    'body_text' => [
+      'title' => ts('Body Text'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('Body of the mailing in text format.'),
+      'input_attrs' => [
+        'label' => ts('Body Text'),
+      ],
+    ],
+    'body_html' => [
+      'title' => ts('Body Html'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('Body of the mailing in html format.'),
+      'input_attrs' => [
+        'label' => ts('Body HTML'),
+      ],
+    ],
+    'url_tracking' => [
+      'title' => ts('Url Tracking'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should we track URL click-throughs for this mailing?'),
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Url Tracking'),
+      ],
+    ],
+    'forward_replies' => [
+      'title' => ts('Forward Replies'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should we forward replies back to the author?'),
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Forward Replies'),
+      ],
+    ],
+    'auto_responder' => [
+      'title' => ts('Auto Responder'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should we enable the auto-responder?'),
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Auto Responder'),
+      ],
+    ],
+    'open_tracking' => [
+      'title' => ts('Track Mailing?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should we track when recipients open/read this mailing?'),
+      'default' => FALSE,
+    ],
+    'is_completed' => [
+      'title' => ts('Mailing Completed'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Has at least one job associated with this mailing finished?'),
+      'default' => FALSE,
+    ],
+    'msg_template_id' => [
+      'title' => ts('Message Template ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to the message template.'),
+      'input_attrs' => [
+        'label' => ts('Message Template'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MessageTemplate',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'override_verp' => [
+      'title' => ts('Override Verp'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Overwrite the VERP address in Reply-To'),
+      'add' => '2.2',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Overwrite VERP'),
+      ],
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID who first created this mailing'),
+      'input_attrs' => [
+        'label' => ts('Creator'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('Mailing Created Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time this mailing was created.'),
+      'add' => '3.0',
+      'default' => 'CURRENT_TIMESTAMP',
+      'input_attrs' => [
+        'label' => ts('Created Date'),
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'modified_date' => [
+      'title' => ts('Modified Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'readonly' => TRUE,
+      'description' => ts('When the mailing (or closely related entity) was created or modified or deleted.'),
+      'add' => '4.7',
+      'unique_name' => 'mailing_modified_date',
+      'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'label' => ts('Modified Date'),
+      ],
+    ],
+    'scheduled_id' => [
+      'title' => ts('Scheduled By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID who scheduled this mailing'),
+      'input_attrs' => [
+        'label' => ts('Scheduled By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'scheduled_date' => [
+      'title' => ts('Mailing Scheduled Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time this mailing was scheduled.'),
+      'add' => '3.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Scheduled Date'),
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'approver_id' => [
+      'title' => ts('Approved By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID who approved this mailing'),
+      'input_attrs' => [
+        'label' => ts('Approved By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'approval_date' => [
+      'title' => ts('Mailing Approved Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'description' => ts('Date and time this mailing was approved.'),
+      'add' => '3.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'approval_status_id' => [
+      'title' => ts('Approval Status'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('The status of this mailing. Values: none, approved, rejected'),
+      'add' => '3.3',
+      'pseudoconstant' => [
+        'option_group_name' => 'mail_approval_status',
+      ],
+    ],
+    'approval_note' => [
+      'title' => ts('Approval Note'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('Note behind the decision.'),
+      'add' => '3.3',
+    ],
+    'is_archived' => [
+      'title' => ts('Is Mailing Archived?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this mailing archived?'),
+      'add' => '2.2',
+      'default' => FALSE,
+    ],
+    'visibility' => [
+      'title' => ts('Mailing Visibility'),
+      'sql_type' => 'varchar(40)',
+      'input_type' => 'Select',
+      'description' => ts('In what context(s) is the mailing contents visible (online viewing)'),
+      'add' => '3.3',
+      'default' => 'Public Pages',
+      'input_attrs' => [
+        'label' => ts('Visibility'),
+        'maxlength' => 40,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::groupVisibility',
+      ],
+    ],
+    'campaign_id' => [
+      'title' => ts('Campaign ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('The campaign for which this mailing has been initiated.'),
+      'add' => '3.4',
+      'component' => 'CiviCampaign',
+      'input_attrs' => [
+        'label' => ts('Campaign'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_campaign',
+        'key_column' => 'id',
+        'label_column' => 'title',
+        'prefetch' => 'disabled',
+      ],
+      'entity_reference' => [
+        'entity' => 'Campaign',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'dedupe_email' => [
+      'title' => ts('No Duplicate emails?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Remove duplicate emails?'),
+      'add' => '4.1',
+      'default' => FALSE,
+    ],
+    'sms_provider_id' => [
+      'title' => ts('SMS Provider ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'add' => '4.2',
+      'input_attrs' => [
+        'label' => ts('SMS Provider'),
+      ],
+      'entity_reference' => [
+        'entity' => 'SmsProvider',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'hash' => [
+      'title' => ts('Mailing Hash'),
+      'sql_type' => 'varchar(16)',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('Key for validating requests related to this mailing.'),
+      'add' => '4.5',
+      'input_attrs' => [
+        'maxlength' => 16,
+      ],
+    ],
+    'location_type_id' => [
+      'title' => ts('Location Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('With email_selection_method, determines which email address to use'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'label' => ts('Location Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_location_type',
+        'key_column' => 'id',
+        'label_column' => 'display_name',
+      ],
+      'entity_reference' => [
+        'entity' => 'LocationType',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'email_selection_method' => [
+      'title' => ts('Email Selection Method'),
+      'sql_type' => 'varchar(20)',
+      'input_type' => 'Select',
+      'description' => ts('With location_type_id, determine how to choose the email address to use.'),
+      'add' => '4.6',
+      'default' => 'automatic',
+      'input_attrs' => [
+        'label' => ts('Email Selection Method'),
+        'maxlength' => 20,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::emailSelectMethods',
+      ],
+    ],
+    'language' => [
+      'title' => ts('Mailing Language'),
+      'sql_type' => 'varchar(5)',
+      'input_type' => 'Select',
+      'description' => ts('Language of the content of the mailing. Useful for tokens.'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 5,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'languages',
+        'key_column' => 'name',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingAB.entityType.php b/www/modules/civicrm/schema/Mailing/MailingAB.entityType.php
new file mode 100644
index 000000000..baf5b5de7
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingAB.entityType.php
@@ -0,0 +1,147 @@
+<?php
+
+return [
+  'name' => 'MailingAB',
+  'table' => 'civicrm_mailing_abtest',
+  'class' => 'CRM_Mailing_DAO_MailingAB',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing AB'),
+    'title_plural' => ts('Mailing ABs'),
+    'description' => ts('Stores information about abtesting'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('MailingAB ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Name'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Name of the A/B test'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+    'status' => [
+      'title' => ts('Status'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => 'Select',
+      'description' => ts('Status'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 32,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Mailing_PseudoConstant::abStatus',
+      ],
+    ],
+    'mailing_id_a' => [
+      'title' => ts('Mailing ID (A)'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('The first experimental mailing ("A" condition)'),
+      'add' => '4.6',
+    ],
+    'mailing_id_b' => [
+      'title' => ts('Mailing ID (B)'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('The second experimental mailing ("B" condition)'),
+      'add' => '4.6',
+    ],
+    'mailing_id_c' => [
+      'title' => ts('Mailing ID (C)'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('The final, general mailing (derived from A or B)'),
+      'add' => '4.6',
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Which site is this mailing for'),
+      'add' => '4.6',
+    ],
+    'testing_criteria' => [
+      'title' => ts('Testing Criteria'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => 'Select',
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 32,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Mailing_PseudoConstant::abTestCriteria',
+      ],
+    ],
+    'winner_criteria' => [
+      'title' => ts('Winner Criteria'),
+      'sql_type' => 'varchar(32)',
+      'input_type' => 'Select',
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 32,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Mailing_PseudoConstant::abWinnerCriteria',
+      ],
+    ],
+    'specific_url' => [
+      'title' => ts('URL for Winner Criteria'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('What specific url to track'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'declare_winning_time' => [
+      'title' => ts('Declaration Time'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('In how much time to declare winner'),
+      'add' => '4.6',
+    ],
+    'group_percentage' => [
+      'title' => ts('Group Percentage'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'add' => '4.6',
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Contact ID'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'created_date' => [
+      'title' => ts('AB Test Created Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'description' => ts('When was this item created'),
+      'add' => '4.6',
+      'default' => 'CURRENT_TIMESTAMP',
+      'input_attrs' => [
+        'format_type' => 'mailing',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingComponent.entityType.php b/www/modules/civicrm/schema/Mailing/MailingComponent.entityType.php
new file mode 100644
index 000000000..50e72d62f
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingComponent.entityType.php
@@ -0,0 +1,100 @@
+<?php
+
+return [
+  'name' => 'MailingComponent',
+  'table' => 'civicrm_mailing_component',
+  'class' => 'CRM_Mailing_DAO_MailingComponent',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing Component'),
+    'title_plural' => ts('Mailing Components'),
+    'description' => ts('Stores information about the mailing components (header/footer).'),
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/component/edit?action=add&reset=1',
+    'update' => 'civicrm/admin/component/edit?action=update&id=[id]&reset=1',
+    'browse' => 'civicrm/admin/component?action=browse&id=[id]&reset=1',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Mailing Component ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Component Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('The name of this component'),
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'component_type' => [
+      'title' => ts('Mailing Component Type'),
+      'sql_type' => 'varchar(12)',
+      'input_type' => 'Select',
+      'description' => ts('Type of Component.'),
+      'input_attrs' => [
+        'maxlength' => 12,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::mailingComponents',
+      ],
+    ],
+    'subject' => [
+      'title' => ts('Subject'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'input_attrs' => [
+        'label' => ts('Subject'),
+        'maxlength' => 255,
+      ],
+    ],
+    'body_html' => [
+      'title' => ts('Mailing Component Body HTML'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Body of the component in html format.'),
+      'input_attrs' => [
+        'rows' => 8,
+        'cols' => 80,
+      ],
+    ],
+    'body_text' => [
+      'title' => ts('Body Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('Body of the component in text format.'),
+      'input_attrs' => [
+        'rows' => 8,
+        'cols' => 80,
+        'label' => ts('Body in Text Format'),
+      ],
+    ],
+    'is_default' => [
+      'title' => ts('Mailing Component is Default?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this the default component for this component_type?'),
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Default'),
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Mailing Component Is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this property active?'),
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingEventBounce.entityType.php b/www/modules/civicrm/schema/Mailing/MailingEventBounce.entityType.php
new file mode 100644
index 000000000..b0a781233
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingEventBounce.entityType.php
@@ -0,0 +1,71 @@
+<?php
+
+return [
+  'name' => 'MailingEventBounce',
+  'table' => 'civicrm_mailing_event_bounce',
+  'class' => 'CRM_Mailing_Event_DAO_MailingEventBounce',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing Bounce'),
+    'title_plural' => ts('Mailing Bounces'),
+    'description' => ts('Mailings that failed to reach the inbox of the recipient.'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Bounce ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'input_attrs' => [
+        'label' => ts('ID'),
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'event_queue_id' => [
+      'title' => ts('Event Queue ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to EventQueue'),
+      'input_attrs' => [
+        'label' => ts('Recipient'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingEventQueue',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'bounce_type_id' => [
+      'title' => ts('Bounce Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('What type of bounce was it?'),
+      'input_attrs' => [
+        'label' => ts('Bounce Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_mailing_bounce_type',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+    ],
+    'bounce_reason' => [
+      'title' => ts('Bounce Reason'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('The reason the email bounced.'),
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'time_stamp' => [
+      'title' => ts('Timestamp'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('When this bounce event occurred.'),
+      'default' => 'CURRENT_TIMESTAMP',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingEventConfirm.entityType.php b/www/modules/civicrm/schema/Mailing/MailingEventConfirm.entityType.php
new file mode 100644
index 000000000..7cbf7e495
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingEventConfirm.entityType.php
@@ -0,0 +1,48 @@
+<?php
+
+return [
+  'name' => 'MailingEventConfirm',
+  'table' => 'civicrm_mailing_event_confirm',
+  'class' => 'CRM_Mailing_Event_DAO_MailingEventConfirm',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing Opt-In Confirmation'),
+    'title_plural' => ts('Mailing Opt-In Confirmations'),
+    'description' => ts('Tracks when a subscription event is confirmed by email'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Mailing Confirmation ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'input_attrs' => [
+        'label' => ts('ID'),
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'event_subscribe_id' => [
+      'title' => ts('Mailing Subscribe ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_mailing_event_subscribe'),
+      'input_attrs' => [
+        'label' => ts('Mailing Subscribe'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingEventSubscribe',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'time_stamp' => [
+      'title' => ts('Confirm Timestamp'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('When this confirmation event occurred.'),
+      'default' => 'CURRENT_TIMESTAMP',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingEventDelivered.entityType.php b/www/modules/civicrm/schema/Mailing/MailingEventDelivered.entityType.php
new file mode 100644
index 000000000..0efa7fbc9
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingEventDelivered.entityType.php
@@ -0,0 +1,48 @@
+<?php
+
+return [
+  'name' => 'MailingEventDelivered',
+  'table' => 'civicrm_mailing_event_delivered',
+  'class' => 'CRM_Mailing_Event_DAO_MailingEventDelivered',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing Delivery'),
+    'title_plural' => ts('Mailing Deliveries'),
+    'description' => ts('Tracks when a queued email is actually delivered to the MTA'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Delivered ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'input_attrs' => [
+        'label' => ts('ID'),
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'event_queue_id' => [
+      'title' => ts('Event Queue ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to EventQueue'),
+      'input_attrs' => [
+        'label' => ts('Recipient'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingEventQueue',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'time_stamp' => [
+      'title' => ts('Timestamp'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('When this delivery event occurred.'),
+      'default' => 'CURRENT_TIMESTAMP',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingEventForward.entityType.php b/www/modules/civicrm/schema/Mailing/MailingEventForward.entityType.php
new file mode 100644
index 000000000..4835dfd0e
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingEventForward.entityType.php
@@ -0,0 +1,62 @@
+<?php
+
+return [
+  'name' => 'MailingEventForward',
+  'table' => 'civicrm_mailing_event_forward',
+  'class' => 'CRM_Mailing_Event_DAO_MailingEventForward',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing Forward'),
+    'title_plural' => ts('Mailing Forwards'),
+    'description' => ts('Tracks when a contact forwards a mailing to a (new) contact'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Forward ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'input_attrs' => [
+        'label' => ts('ID'),
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'event_queue_id' => [
+      'title' => ts('Event Queue ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to EventQueue'),
+      'input_attrs' => [
+        'label' => ts('Recipient'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingEventQueue',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'dest_queue_id' => [
+      'title' => ts('Destination Queue ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to EventQueue for destination'),
+      'input_attrs' => [
+        'label' => ts('Destination Queue'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingEventQueue',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'time_stamp' => [
+      'title' => ts('Timestamp'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('When this forward event occurred.'),
+      'default' => 'CURRENT_TIMESTAMP',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingEventOpened.entityType.php b/www/modules/civicrm/schema/Mailing/MailingEventOpened.entityType.php
new file mode 100644
index 000000000..00dc3a777
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingEventOpened.entityType.php
@@ -0,0 +1,48 @@
+<?php
+
+return [
+  'name' => 'MailingEventOpened',
+  'table' => 'civicrm_mailing_event_opened',
+  'class' => 'CRM_Mailing_Event_DAO_MailingEventOpened',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing Opened'),
+    'title_plural' => ts('Mailings Opened'),
+    'description' => ts('Tracks when a delivered email is opened by the recipient'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Mailing Opened ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'input_attrs' => [
+        'label' => ts('ID'),
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'event_queue_id' => [
+      'title' => ts('Event Queue ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to EventQueue'),
+      'input_attrs' => [
+        'label' => ts('Recipient'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingEventQueue',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'time_stamp' => [
+      'title' => ts('Timestamp'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('When this open event occurred.'),
+      'default' => 'CURRENT_TIMESTAMP',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingEventQueue.entityType.php b/www/modules/civicrm/schema/Mailing/MailingEventQueue.entityType.php
new file mode 100644
index 000000000..fcd4edfc2
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingEventQueue.entityType.php
@@ -0,0 +1,126 @@
+<?php
+
+return [
+  'name' => 'MailingEventQueue',
+  'table' => 'civicrm_mailing_event_queue',
+  'class' => 'CRM_Mailing_Event_DAO_MailingEventQueue',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing Recipient'),
+    'title_plural' => ts('Mailing Recipients'),
+    'description' => ts('Intended recipients of a mailing.'),
+  ],
+  'getIndices' => fn() => [
+    'index_hash' => [
+      'fields' => [
+        'hash' => TRUE,
+      ],
+      'add' => '4.7',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Mailing Event Queue ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'input_attrs' => [
+        'label' => ts('ID'),
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'job_id' => [
+      'title' => ts('Job ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Mailing Job'),
+      'input_attrs' => [
+        'label' => ts('Outbound Mailing'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingJob',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'mailing_id' => [
+      'title' => ts('Mailing ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Related mailing. Used for reporting on mailing success, if present.'),
+      'add' => '5.67',
+      'input_attrs' => [
+        'label' => ts('Mailing'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Mailing',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'is_test' => [
+      'title' => ts('Test'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'readonly' => TRUE,
+      'add' => '5.67',
+      'default' => FALSE,
+    ],
+    'email_id' => [
+      'title' => ts('Email ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Email'),
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Email'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Email',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Contact'),
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'hash' => [
+      'title' => ts('Security Hash'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Security hash'),
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'phone_id' => [
+      'title' => ts('Phone ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Phone'),
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Phone'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Phone',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingEventReply.entityType.php b/www/modules/civicrm/schema/Mailing/MailingEventReply.entityType.php
new file mode 100644
index 000000000..52605cc06
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingEventReply.entityType.php
@@ -0,0 +1,48 @@
+<?php
+
+return [
+  'name' => 'MailingEventReply',
+  'table' => 'civicrm_mailing_event_reply',
+  'class' => 'CRM_Mailing_Event_DAO_MailingEventReply',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing Reply'),
+    'title_plural' => ts('Mailing Replies'),
+    'description' => ts('Tracks when a contact replies to a mailing'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Reply ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'input_attrs' => [
+        'label' => ts('ID'),
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'event_queue_id' => [
+      'title' => ts('Event Queue ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to EventQueue'),
+      'input_attrs' => [
+        'label' => ts('Recipient'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingEventQueue',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'time_stamp' => [
+      'title' => ts('Reply Timestamp'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('When this reply event occurred.'),
+      'default' => 'CURRENT_TIMESTAMP',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingEventSubscribe.entityType.php b/www/modules/civicrm/schema/Mailing/MailingEventSubscribe.entityType.php
new file mode 100644
index 000000000..407a87cfd
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingEventSubscribe.entityType.php
@@ -0,0 +1,78 @@
+<?php
+
+return [
+  'name' => 'MailingEventSubscribe',
+  'table' => 'civicrm_mailing_event_subscribe',
+  'class' => 'CRM_Mailing_Event_DAO_MailingEventSubscribe',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing Opt-In'),
+    'title_plural' => ts('Mailing Opt-Ins'),
+    'description' => ts('Tracks when a (new) contact subscribes to a group by email'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Mailing Subscribe ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'input_attrs' => [
+        'label' => ts('ID'),
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'group_id' => [
+      'title' => ts('Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('FK to Group'),
+      'input_attrs' => [
+        'label' => ts('Group'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_group',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'Group',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Contact'),
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'hash' => [
+      'title' => ts('Mailing Subscribe Hash'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Security hash'),
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'time_stamp' => [
+      'title' => ts('Mailing Subscribe Timestamp'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('When this subscription event occurred.'),
+      'default' => 'CURRENT_TIMESTAMP',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingEventTrackableURLOpen.entityType.php b/www/modules/civicrm/schema/Mailing/MailingEventTrackableURLOpen.entityType.php
new file mode 100644
index 000000000..c8b28022e
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingEventTrackableURLOpen.entityType.php
@@ -0,0 +1,66 @@
+<?php
+
+return [
+  'name' => 'MailingEventTrackableURLOpen',
+  'table' => 'civicrm_mailing_event_trackable_url_open',
+  'class' => 'CRM_Mailing_Event_DAO_MailingEventTrackableURLOpen',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing Link Clickthrough'),
+    'title_plural' => ts('Mailing Link Clickthroughs'),
+    'description' => ts('Tracks when a TrackableURL is clicked by a recipient.'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Trackable URL Open ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'input_attrs' => [
+        'label' => ts('ID'),
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'event_queue_id' => [
+      'title' => ts('Event Queue ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to EventQueue'),
+      'input_attrs' => [
+        'label' => ts('Recipient'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingEventQueue',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'trackable_url_id' => [
+      'title' => ts('Trackable Url ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to TrackableURL'),
+      'input_attrs' => [
+        'label' => ts('Mailing Link'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingTrackableURL',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'time_stamp' => [
+      'title' => ts('Timestamp'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Date',
+      'required' => TRUE,
+      'description' => ts('When this trackable URL open occurred.'),
+      'default' => 'CURRENT_TIMESTAMP',
+      'input_attrs' => [
+        'label' => ts('Opened Date'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingEventUnsubscribe.entityType.php b/www/modules/civicrm/schema/Mailing/MailingEventUnsubscribe.entityType.php
new file mode 100644
index 000000000..b43a4018b
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingEventUnsubscribe.entityType.php
@@ -0,0 +1,55 @@
+<?php
+
+return [
+  'name' => 'MailingEventUnsubscribe',
+  'table' => 'civicrm_mailing_event_unsubscribe',
+  'class' => 'CRM_Mailing_Event_DAO_MailingEventUnsubscribe',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing Unsubscribe'),
+    'title_plural' => ts('Mailing Unsubscribes'),
+    'description' => ts('Tracks when a recipient unsubscribes from a group/domain'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Unsubscribe ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'input_attrs' => [
+        'label' => ts('ID'),
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'event_queue_id' => [
+      'title' => ts('Event Queue ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to EventQueue'),
+      'input_attrs' => [
+        'label' => ts('Recipient'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingEventQueue',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'org_unsubscribe' => [
+      'title' => ts('Unsubscribe is for Organization?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Unsubscribe at org- or group-level'),
+    ],
+    'time_stamp' => [
+      'title' => ts('Unsubscribe Timestamp'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('When this delivery event occurred.'),
+      'default' => 'CURRENT_TIMESTAMP',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingGroup.entityType.php b/www/modules/civicrm/schema/Mailing/MailingGroup.entityType.php
new file mode 100644
index 000000000..a1b3fb046
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingGroup.entityType.php
@@ -0,0 +1,85 @@
+<?php
+
+return [
+  'name' => 'MailingGroup',
+  'table' => 'civicrm_mailing_group',
+  'class' => 'CRM_Mailing_DAO_MailingGroup',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing Group'),
+    'title_plural' => ts('Mailing Groups'),
+    'description' => ts('Stores information about the groups that participate in this mailing..'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Mailing Group ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'mailing_id' => [
+      'title' => ts('Mailing ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('The ID of a previous mailing to include/exclude recipients.'),
+      'input_attrs' => [
+        'label' => ts('Mailing'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Mailing',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'group_type' => [
+      'title' => ts('Mailing Group Type'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('Are the members of the group included or excluded?.'),
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::getMailingGroupTypes',
+      ],
+    ],
+    'entity_table' => [
+      'title' => ts('Mailing Group Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Name of table where item being referenced is stored.'),
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Mailing_BAO_Mailing::mailingGroupEntityTables',
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Mailing Group Entity'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Foreign key to the referenced item.'),
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'search_id' => [
+      'title' => ts('Mailing Group Search'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('The filtering search. custom search id or -1 for civicrm api search'),
+    ],
+    'search_args' => [
+      'title' => ts('Mailing Group Search Arguments'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('The arguments to be sent to the search function'),
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingJob.entityType.php b/www/modules/civicrm/schema/Mailing/MailingJob.entityType.php
new file mode 100644
index 000000000..2d2cf0bb4
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingJob.entityType.php
@@ -0,0 +1,143 @@
+<?php
+
+return [
+  'name' => 'MailingJob',
+  'table' => 'civicrm_mailing_job',
+  'class' => 'CRM_Mailing_DAO_MailingJob',
+  'getInfo' => fn() => [
+    'title' => ts('Outbound Mailing'),
+    'title_plural' => ts('Outbound Mailings'),
+    'description' => ts('Attempted delivery of a mailing.'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Mailing Job ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'input_attrs' => [
+        'label' => ts('ID'),
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'mailing_id' => [
+      'title' => ts('Mailing ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('The ID of the mailing this Job will send.'),
+      'input_attrs' => [
+        'label' => ts('Mailing'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Mailing',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'scheduled_date' => [
+      'title' => ts('Mailing Scheduled Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'description' => ts('date on which this job was scheduled.'),
+      'default' => NULL,
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'start_date' => [
+      'title' => ts('Mailing Job Start Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'description' => ts('date on which this job was started.'),
+      'unique_name' => 'mailing_job_start_date',
+      'unique_title' => 'Mailing Start Date',
+      'default' => NULL,
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'end_date' => [
+      'title' => ts('Mailing Job End Date'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'description' => ts('date on which this job ended.'),
+      'default' => NULL,
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'status' => [
+      'title' => ts('Mailing Job Status'),
+      'sql_type' => 'varchar(12)',
+      'input_type' => 'Select',
+      'description' => ts('The state of this job'),
+      'unique_name' => 'mailing_job_status',
+      'input_attrs' => [
+        'label' => ts('Status'),
+        'maxlength' => 12,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::getMailingJobStatus',
+      ],
+    ],
+    'is_test' => [
+      'title' => ts('Mailing Job Is Test?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this job for a test mail?'),
+      'add' => '1.9',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Test Mailing'),
+      ],
+    ],
+    'job_type' => [
+      'title' => ts('Mailing Job Type'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Type of mailling job: null | child'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'parent_id' => [
+      'title' => ts('Parent ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Parent job id'),
+      'add' => '3.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Parent'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingJob',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'job_offset' => [
+      'title' => ts('Mailing Job Offset'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('Offset of the child job'),
+      'add' => '3.3',
+      'default' => 0,
+    ],
+    'job_limit' => [
+      'title' => ts('Mailing Job Limit'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('Queue size limit for each child job'),
+      'add' => '3.3',
+      'default' => 0,
+      'input_attrs' => [
+        'label' => ts('Batch Limit'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingRecipients.entityType.php b/www/modules/civicrm/schema/Mailing/MailingRecipients.entityType.php
new file mode 100644
index 000000000..5f9cd4c65
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingRecipients.entityType.php
@@ -0,0 +1,82 @@
+<?php
+
+return [
+  'name' => 'MailingRecipients',
+  'table' => 'civicrm_mailing_recipients',
+  'class' => 'CRM_Mailing_DAO_MailingRecipients',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing Recipient'),
+    'title_plural' => ts('Mailing Recipients'),
+    'description' => ts('Stores information about the recipients of a mailing.'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Mailing Recipients ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'mailing_id' => [
+      'title' => ts('Mailing ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('The ID of the mailing this Job will send.'),
+      'input_attrs' => [
+        'label' => ts('Mailing'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Mailing',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'contact_id' => [
+      'title' => ts('Recipient ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Contact'),
+      'input_attrs' => [
+        'label' => ts('Recipient'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'email_id' => [
+      'title' => ts('Email ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Email'),
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Email'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Email',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'phone_id' => [
+      'title' => ts('Phone ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Phone'),
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Phone'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Phone',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/MailingTrackableURL.entityType.php b/www/modules/civicrm/schema/Mailing/MailingTrackableURL.entityType.php
new file mode 100644
index 000000000..71cf7b15d
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/MailingTrackableURL.entityType.php
@@ -0,0 +1,44 @@
+<?php
+
+return [
+  'name' => 'MailingTrackableURL',
+  'table' => 'civicrm_mailing_trackable_url',
+  'class' => 'CRM_Mailing_DAO_MailingTrackableURL',
+  'getInfo' => fn() => [
+    'title' => ts('Mailing Link'),
+    'title_plural' => ts('Mailing Links'),
+    'description' => ts('Stores URLs for which we should track click-throughs from mailings'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Trackable URL ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'url' => [
+      'title' => ts('Url'),
+      'sql_type' => 'text',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('The URL to be tracked.'),
+    ],
+    'mailing_id' => [
+      'title' => ts('Mailing ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to the mailing'),
+      'input_attrs' => [
+        'label' => ts('Mailing'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Mailing',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Mailing/Spool.entityType.php b/www/modules/civicrm/schema/Mailing/Spool.entityType.php
new file mode 100644
index 000000000..51dcda757
--- /dev/null
+++ b/www/modules/civicrm/schema/Mailing/Spool.entityType.php
@@ -0,0 +1,69 @@
+<?php
+
+return [
+  'name' => 'Spool',
+  'table' => 'civicrm_mailing_spool',
+  'class' => 'CRM_Mailing_DAO_Spool',
+  'getInfo' => fn() => [
+    'title' => ts('Spool'),
+    'title_plural' => ts('Spools'),
+    'description' => ts('Stores the outbond mails'),
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Spool ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'job_id' => [
+      'title' => ts('Job ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('The ID of the Job .'),
+      'input_attrs' => [
+        'label' => ts('Job'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MailingJob',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'recipient_email' => [
+      'title' => ts('Recipient Email'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('The email of the recipients this mail is to be sent.'),
+    ],
+    'headers' => [
+      'title' => ts('Headers'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('The header information of this mailing .'),
+    ],
+    'body' => [
+      'title' => ts('Body'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('The body of this mailing.'),
+    ],
+    'added_at' => [
+      'title' => ts('Added'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('date on which this job was added.'),
+      'default' => NULL,
+    ],
+    'removed_at' => [
+      'title' => ts('Removed'),
+      'sql_type' => 'timestamp',
+      'input_type' => NULL,
+      'description' => ts('date on which this job was removed.'),
+      'default' => NULL,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Member/Membership.entityType.php b/www/modules/civicrm/schema/Member/Membership.entityType.php
new file mode 100644
index 000000000..8476d37c1
--- /dev/null
+++ b/www/modules/civicrm/schema/Member/Membership.entityType.php
@@ -0,0 +1,318 @@
+<?php
+
+return [
+  'name' => 'Membership',
+  'table' => 'civicrm_membership',
+  'class' => 'CRM_Member_DAO_Membership',
+  'getInfo' => fn() => [
+    'title' => ts('Membership'),
+    'title_plural' => ts('Memberships'),
+    'description' => ts('Records of contacts belonging to an organization\'s membership program.'),
+    'log' => TRUE,
+    'add' => '1.5',
+    'icon' => 'fa-id-badge',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/member/add?reset=1&action=add&context=standalone',
+    'view' => 'civicrm/contact/view/membership?reset=1&action=view&id=[id]&cid=[contact_id]',
+    'update' => 'civicrm/contact/view/membership?reset=1&action=update&id=[id]&cid=[contact_id]',
+    'delete' => 'civicrm/contact/view/membership?reset=1&action=delete&id=[id]&cid=[contact_id]',
+  ],
+  'getIndices' => fn() => [
+    'index_owner_membership_id' => [
+      'fields' => [
+        'owner_membership_id' => TRUE,
+      ],
+      'add' => '1.7',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Membership ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Membership ID'),
+      'add' => '1.5',
+      'unique_name' => 'membership_id',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Contact ID'),
+      'add' => '1.5',
+      'unique_name' => 'membership_contact_id',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'membership_type_id' => [
+      'title' => ts('Membership Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('FK to Membership Type'),
+      'add' => '1.5',
+      'usage' => [
+        'import',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Membership Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_membership_type',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'MembershipType',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'join_date' => [
+      'title' => ts('Member Since'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('Beginning of initial membership period (member since...).'),
+      'add' => '1.5',
+      'unique_name' => 'membership_join_date',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'start_date' => [
+      'title' => ts('Membership Start Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('Beginning of current uninterrupted membership period.'),
+      'add' => '1.5',
+      'unique_name' => 'membership_start_date',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'end_date' => [
+      'title' => ts('Membership Expiration Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('Current membership period expire date.'),
+      'add' => '1.5',
+      'unique_name' => 'membership_end_date',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'source' => [
+      'title' => ts('Membership Source'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'add' => '1.5',
+      'unique_name' => 'membership_source',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+    'status_id' => [
+      'title' => ts('Status ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('FK to Membership Status'),
+      'add' => '1.5',
+      'usage' => [
+        'import',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Status'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_membership_status',
+        'key_column' => 'id',
+        'label_column' => 'label',
+      ],
+      'entity_reference' => [
+        'entity' => 'MembershipStatus',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'is_override' => [
+      'title' => ts('Status Override'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Admin users may set a manual status which overrides the calculated status. When this flag is TRUE, automated status update scripts should NOT modify status for the record.'),
+      'add' => '1.5',
+      'unique_name' => 'member_is_override',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'status_override_end_date' => [
+      'title' => ts('Status Override End Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('Then end date of membership status override if \'Override until selected date\' override type is selected.'),
+      'add' => '4.7',
+      'default' => NULL,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'owner_membership_id' => [
+      'title' => ts('Primary Member ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Optional FK to Parent Membership.'),
+      'add' => '1.7',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'label' => ts('Primary Member'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Membership',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'max_related' => [
+      'title' => ts('Max Related'),
+      'sql_type' => 'int',
+      'input_type' => 'Text',
+      'description' => ts('Maximum number of related memberships (membership_type override).'),
+      'add' => '4.3',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'label' => ts('Maximum number of related memberships'),
+      ],
+    ],
+    'is_test' => [
+      'title' => ts('Test'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'unique_name' => 'member_is_test',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'is_pay_later' => [
+      'title' => ts('Is Pay Later'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '2.1',
+      'unique_name' => 'member_is_pay_later',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'contribution_recur_id' => [
+      'title' => ts('Recurring Contribution ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Conditional foreign key to civicrm_contribution_recur id. Each membership in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events.'),
+      'add' => '3.3',
+      'unique_name' => 'membership_recur_id',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'label' => ts('Recurring Contribution'),
+      ],
+      'entity_reference' => [
+        'entity' => 'ContributionRecur',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'campaign_id' => [
+      'title' => ts('Campaign ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('The campaign for which this membership is attached.'),
+      'add' => '3.4',
+      'unique_name' => 'member_campaign_id',
+      'component' => 'CiviCampaign',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Campaign'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_campaign',
+        'key_column' => 'id',
+        'label_column' => 'title',
+        'prefetch' => 'disabled',
+      ],
+      'entity_reference' => [
+        'entity' => 'Campaign',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Member/MembershipBlock.entityType.php b/www/modules/civicrm/schema/Member/MembershipBlock.entityType.php
new file mode 100644
index 000000000..49bdfe07b
--- /dev/null
+++ b/www/modules/civicrm/schema/Member/MembershipBlock.entityType.php
@@ -0,0 +1,153 @@
+<?php
+
+return [
+  'name' => 'MembershipBlock',
+  'table' => 'civicrm_membership_block',
+  'class' => 'CRM_Member_DAO_MembershipBlock',
+  'getInfo' => fn() => [
+    'title' => ts('Membership Block'),
+    'title_plural' => ts('Membership Blocks'),
+    'description' => ts('A Membership Block stores admin configurable status options and rules'),
+    'log' => TRUE,
+    'add' => '1.5',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Membership Block ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Membership ID'),
+      'add' => '1.5',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Membership Block Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Name for Membership Status'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_contribution_page.id'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('Entity'),
+      ],
+      'entity_reference' => [
+        'entity' => 'ContributionPage',
+        'key' => 'id',
+      ],
+    ],
+    'membership_types' => [
+      'title' => ts('Membership Block Membership Types'),
+      'sql_type' => 'varchar(1024)',
+      'input_type' => 'Text',
+      'description' => ts('Membership types to be exposed by this block'),
+      'add' => '1.5',
+      'serialize' => CRM_Core_DAO::SERIALIZE_PHP,
+      'input_attrs' => [
+        'maxlength' => 1024,
+      ],
+    ],
+    'membership_type_default' => [
+      'title' => ts('Default Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Optional foreign key to membership_type'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('Default Type'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MembershipType',
+        'key' => 'id',
+      ],
+    ],
+    'display_min_fee' => [
+      'title' => ts('Membership Block Display Minimum Fee'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Display minimum membership fee'),
+      'add' => '1.5',
+      'default' => TRUE,
+    ],
+    'is_separate_payment' => [
+      'title' => ts('Membership Block Is Separate Payment'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should membership transactions be processed separately'),
+      'add' => '1.5',
+      'default' => TRUE,
+    ],
+    'new_title' => [
+      'title' => ts('Membership Block New Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Title to display at top of block'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'new_text' => [
+      'title' => ts('Membership Block New Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Text to display below title'),
+      'add' => '1.5',
+    ],
+    'renewal_title' => [
+      'title' => ts('Membership Block Renewal Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Title for renewal'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'renewal_text' => [
+      'title' => ts('Membership Block Renewal Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Text to display for member renewal'),
+      'add' => '1.5',
+    ],
+    'is_required' => [
+      'title' => ts('Is Required'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is membership sign up optional'),
+      'add' => '1.5',
+      'default' => FALSE,
+    ],
+    'is_active' => [
+      'title' => ts('Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this membership_block enabled'),
+      'add' => '1.5',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Member/MembershipLog.entityType.php b/www/modules/civicrm/schema/Member/MembershipLog.entityType.php
new file mode 100644
index 000000000..633c2c982
--- /dev/null
+++ b/www/modules/civicrm/schema/Member/MembershipLog.entityType.php
@@ -0,0 +1,116 @@
+<?php
+
+return [
+  'name' => 'MembershipLog',
+  'table' => 'civicrm_membership_log',
+  'class' => 'CRM_Member_DAO_MembershipLog',
+  'getInfo' => fn() => [
+    'title' => ts('Membership Log'),
+    'title_plural' => ts('Membership Logs'),
+    'description' => ts('Logs actions which affect a Membership record (signup, status override, renewal, etc.)'),
+    'log' => TRUE,
+    'add' => '1.5',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Membership Log ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '1.5',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'membership_id' => [
+      'title' => ts('Membership ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Membership table'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('Membership'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Membership',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'status_id' => [
+      'title' => ts('Membership Status ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('New status assigned to membership by this action. FK to Membership Status'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('Membership Status'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MembershipStatus',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'start_date' => [
+      'title' => ts('Membership Log Start Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('New membership period start date'),
+      'add' => '1.5',
+    ],
+    'end_date' => [
+      'title' => ts('Membership Log End Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('New membership period expiration date.'),
+      'add' => '1.5',
+    ],
+    'modified_id' => [
+      'title' => ts('Modified By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('FK to Contact ID of person under whose credentials this data modification was made.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('Modified By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'modified_date' => [
+      'title' => ts('Membership Change Date'),
+      'sql_type' => 'date',
+      'input_type' => 'Select Date',
+      'description' => ts('Date this membership modification action was logged.'),
+      'add' => '1.5',
+    ],
+    'membership_type_id' => [
+      'title' => ts('Membership Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Membership Type.'),
+      'add' => '3.4',
+      'input_attrs' => [
+        'label' => ts('Membership Type'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MembershipType',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'max_related' => [
+      'title' => ts('Maximum Related Memberships'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('Maximum number of related memberships.'),
+      'add' => '4.3',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Member/MembershipPayment.entityType.php b/www/modules/civicrm/schema/Member/MembershipPayment.entityType.php
new file mode 100644
index 000000000..add6be48a
--- /dev/null
+++ b/www/modules/civicrm/schema/Member/MembershipPayment.entityType.php
@@ -0,0 +1,66 @@
+<?php
+
+return [
+  'name' => 'MembershipPayment',
+  'table' => 'civicrm_membership_payment',
+  'class' => 'CRM_Member_DAO_MembershipPayment',
+  'getInfo' => fn() => [
+    'title' => ts('Membership Payment'),
+    'title_plural' => ts('Membership Payments'),
+    'description' => ts('Membership Payment'),
+    'log' => TRUE,
+    'add' => '1.5',
+  ],
+  'getIndices' => fn() => [
+    'UI_contribution_membership' => [
+      'fields' => [
+        'contribution_id' => TRUE,
+        'membership_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '2.0',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Membership Payment ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '1.5',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'membership_id' => [
+      'title' => ts('Membership ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Membership table'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('Membership'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Membership',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'contribution_id' => [
+      'title' => ts('Contribution ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to contribution table.'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'label' => ts('Contribution'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contribution',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Member/MembershipStatus.entityType.php b/www/modules/civicrm/schema/Member/MembershipStatus.entityType.php
new file mode 100644
index 000000000..2204f56df
--- /dev/null
+++ b/www/modules/civicrm/schema/Member/MembershipStatus.entityType.php
@@ -0,0 +1,193 @@
+<?php
+
+return [
+  'name' => 'MembershipStatus',
+  'table' => 'civicrm_membership_status',
+  'class' => 'CRM_Member_DAO_MembershipStatus',
+  'getInfo' => fn() => [
+    'title' => ts('Membership Status'),
+    'title_plural' => ts('Membership Statuses'),
+    'description' => ts('Membership Status stores admin configurable rules for assigning status to memberships.'),
+    'log' => TRUE,
+    'add' => '1.5',
+    'label_field' => 'label',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/member/membershipStatus?action=add&reset=1',
+    'update' => 'civicrm/admin/member/membershipStatus?action=update&id=[id]&reset=1',
+    'delete' => 'civicrm/admin/member/membershipStatus?action=delete&id=[id]&reset=1',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Membership Status ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Membership ID'),
+      'add' => '1.5',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Membership Status'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Name for Membership Status'),
+      'add' => '1.5',
+      'unique_name' => 'membership_status',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+    'label' => [
+      'title' => ts('Label'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Label for Membership Status'),
+      'add' => '3.2',
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+    'start_event' => [
+      'title' => ts('Start Event'),
+      'sql_type' => 'varchar(12)',
+      'input_type' => 'Select',
+      'description' => ts('Event when this status starts.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('Start Event'),
+        'maxlength' => 12,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::eventDate',
+      ],
+    ],
+    'start_event_adjust_unit' => [
+      'title' => ts('Start Event Adjust Unit'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('Unit used for adjusting from start_event.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('Start Event Adjust Unit'),
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::unitList',
+      ],
+    ],
+    'start_event_adjust_interval' => [
+      'title' => ts('Start Event Adjust Interval'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('Status range begins this many units from start_event.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('Start Event Adjust Interval'),
+      ],
+    ],
+    'end_event' => [
+      'title' => ts('End Event'),
+      'sql_type' => 'varchar(12)',
+      'input_type' => 'Select',
+      'description' => ts('Event after which this status ends.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('End Event'),
+        'maxlength' => 12,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::eventDate',
+      ],
+    ],
+    'end_event_adjust_unit' => [
+      'title' => ts('End Event Adjust Unit'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'description' => ts('Unit used for adjusting from the ending event.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('End Event Adjust Unit'),
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::unitList',
+      ],
+    ],
+    'end_event_adjust_interval' => [
+      'title' => ts('End Event Adjust Interval'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('Status range ends this many units from end_event.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('End Event Adjust Interval'),
+      ],
+    ],
+    'is_current_member' => [
+      'title' => ts('Current Membership?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Does this status aggregate to current members (e.g. New, Renewed, Grace might all be TRUE... while Unrenewed, Lapsed, Inactive would be FALSE).'),
+      'add' => '1.5',
+      'default' => FALSE,
+    ],
+    'is_admin' => [
+      'title' => ts('Administrator Only?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this status for admin/manual assignment only.'),
+      'add' => '1.5',
+      'default' => FALSE,
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'add' => '1.5',
+    ],
+    'is_default' => [
+      'title' => ts('Default Status?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Assign this status to a membership record if no other status match is found.'),
+      'add' => '1.5',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Default'),
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this membership_status enabled.'),
+      'add' => '1.5',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_reserved' => [
+      'title' => ts('Is Reserved'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this membership_status reserved.'),
+      'add' => '2.1',
+      'default' => FALSE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Member/MembershipType.entityType.php b/www/modules/civicrm/schema/Member/MembershipType.entityType.php
new file mode 100644
index 000000000..061354fc9
--- /dev/null
+++ b/www/modules/civicrm/schema/Member/MembershipType.entityType.php
@@ -0,0 +1,289 @@
+<?php
+
+return [
+  'name' => 'MembershipType',
+  'table' => 'civicrm_membership_type',
+  'class' => 'CRM_Member_DAO_MembershipType',
+  'getInfo' => fn() => [
+    'title' => ts('Membership Type'),
+    'title_plural' => ts('Membership Types'),
+    'description' => ts('Sites can configure multiple types of memberships. They encode the owner organization, fee, and the rules needed to set start and end (expire) dates when a member signs up for that type.'),
+    'log' => TRUE,
+    'add' => '1.5',
+    'label_field' => 'name',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/member/membershipType/add?action=add&reset=1',
+    'update' => 'civicrm/admin/member/membershipType/add?action=update&id=[id]&reset=1',
+    'delete' => 'civicrm/admin/member/membershipType/add?action=delete&id=[id]&reset=1',
+  ],
+  'getIndices' => fn() => [
+    'index_relationship_type_id' => [
+      'fields' => [
+        'relationship_type_id' => TRUE,
+      ],
+      'add' => '3.3',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Membership Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Membership ID'),
+      'add' => '1.5',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Which Domain is this match entry for'),
+      'add' => '3.0',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+      ],
+    ],
+    'name' => [
+      'title' => ts('Membership Type'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Name of Membership Type'),
+      'add' => '1.5',
+      'unique_name' => 'membership_type',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Name'),
+        'maxlength' => 128,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Description of Membership Type'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'rows' => 6,
+        'cols' => 50,
+        'label' => ts('Description'),
+        'maxlength' => 255,
+      ],
+    ],
+    'member_of_contact_id' => [
+      'title' => ts('Organization ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Owner organization for this membership type. FK to Contact ID'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'label' => ts('Organization'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'RESTRICT',
+      ],
+    ],
+    'financial_type_id' => [
+      'title' => ts('Financial Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('If membership is paid by a contribution - what financial type should be used. FK to civicrm_financial_type.id'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Financial Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_type',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialType',
+        'key' => 'id',
+      ],
+    ],
+    'minimum_fee' => [
+      'title' => ts('Minimum Fee'),
+      'sql_type' => 'decimal(18,9)',
+      'input_type' => 'Text',
+      'description' => ts('Minimum fee for this membership (0 for free/complimentary memberships).'),
+      'add' => '1.5',
+      'default' => '0',
+      'input_attrs' => [
+        'label' => ts('Minimum Fee'),
+        'maxlength' => 18,
+      ],
+    ],
+    'duration_unit' => [
+      'title' => ts('Membership Type Duration Unit'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Unit in which membership period is expressed.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::membershipTypeUnitList',
+      ],
+    ],
+    'duration_interval' => [
+      'title' => ts('Membership Type Duration Interval'),
+      'sql_type' => 'int',
+      'input_type' => 'Text',
+      'description' => ts('Number of duration units in membership period (e.g. 1 year, 12 months).'),
+      'add' => '1.5',
+    ],
+    'period_type' => [
+      'title' => ts('Membership Type Plan'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Rolling membership period starts on signup date. Fixed membership periods start on fixed_period_start_day.'),
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::periodType',
+      ],
+    ],
+    'fixed_period_start_day' => [
+      'title' => ts('Fixed Period Start Day'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('For fixed period memberships, month and day (mmdd) on which subscription/membership will start. Period start is back-dated unless after rollover day.'),
+      'add' => '1.5',
+    ],
+    'fixed_period_rollover_day' => [
+      'title' => ts('Fixed Period Rollover Day'),
+      'sql_type' => 'int',
+      'input_type' => 'Number',
+      'description' => ts('For fixed period memberships, signups after this day (mmdd) rollover to next period.'),
+      'add' => '1.5',
+    ],
+    'relationship_type_id' => [
+      'title' => ts('Membership Type Relationship'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('FK to Relationship Type ID'),
+      'add' => '1.5',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED,
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'relationship_direction' => [
+      'title' => ts('Relationship Direction'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'add' => '1.7',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED,
+      'input_attrs' => [
+        'label' => ts('Relationship Direction'),
+        'maxlength' => 128,
+      ],
+    ],
+    'max_related' => [
+      'title' => ts('Max Related Members for Type'),
+      'sql_type' => 'int',
+      'input_type' => 'Text',
+      'description' => ts('Maximum number of related memberships.'),
+      'add' => '4.3',
+      'input_attrs' => [
+        'label' => ts('Max Related'),
+      ],
+    ],
+    'visibility' => [
+      'title' => ts('Visible'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'add' => '1.5',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::memberVisibility',
+      ],
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int',
+      'input_type' => 'Text',
+      'add' => '1.5',
+    ],
+    'receipt_text_signup' => [
+      'title' => ts('Membership Type Receipt Text'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'TextArea',
+      'description' => ts('Receipt Text for membership signup'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'rows' => 6,
+        'cols' => 50,
+        'maxlength' => 255,
+      ],
+    ],
+    'receipt_text_renewal' => [
+      'title' => ts('Membership Type Renewal Text'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'TextArea',
+      'description' => ts('Receipt Text for membership renewal'),
+      'add' => '2.0',
+      'input_attrs' => [
+        'rows' => 6,
+        'cols' => 50,
+        'maxlength' => 255,
+      ],
+    ],
+    'auto_renew' => [
+      'title' => ts('Auto Renew'),
+      'sql_type' => 'tinyint',
+      'input_type' => 'Radio',
+      'description' => ts('0 = No auto-renew option; 1 = Give option, but not required; 2 = Auto-renew required;'),
+      'add' => '3.3',
+      'default' => 0,
+      'input_attrs' => [
+        'label' => ts('Auto-Renew'),
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Core_SelectValues::memberAutoRenew',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'description' => ts('Is this membership_type enabled'),
+      'add' => '1.5',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/PCP/PCP.entityType.php b/www/modules/civicrm/schema/PCP/PCP.entityType.php
new file mode 100644
index 000000000..49f7e5b3d
--- /dev/null
+++ b/www/modules/civicrm/schema/PCP/PCP.entityType.php
@@ -0,0 +1,189 @@
+<?php
+
+return [
+  'name' => 'PCP',
+  'table' => 'civicrm_pcp',
+  'class' => 'CRM_PCP_DAO_PCP',
+  'getInfo' => fn() => [
+    'title' => ts('Personal Campaign Page'),
+    'title_plural' => ts('Personal Campaign Pages'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '2.2',
+    'label_field' => 'title',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Personal Campaign Page ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Personal Campaign Page ID'),
+      'add' => '2.2',
+      'unique_name' => 'pcp_id',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Contact ID'),
+      'add' => '2.2',
+      'unique_name' => 'pcp_contact_id',
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'status_id' => [
+      'title' => ts('Personal Campaign Page Status'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'add' => '2.2',
+      'pseudoconstant' => [
+        'option_group_name' => 'pcp_status',
+      ],
+    ],
+    'title' => [
+      'title' => ts('Personal Campaign Page Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '2.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'intro_text' => [
+      'title' => ts('Intro Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'add' => '2.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Intro Text'),
+      ],
+    ],
+    'page_text' => [
+      'title' => ts('Page Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'add' => '2.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Page Text'),
+      ],
+    ],
+    'donate_link_text' => [
+      'title' => ts('Donate Link Text'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '2.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'page_id' => [
+      'title' => ts('Contribution Page'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('The Contribution or Event Page which triggered this pcp'),
+      'add' => '4.1',
+      'entity_reference' => [
+        'dynamic_entity' => 'page_type',
+        'key' => 'id',
+      ],
+    ],
+    'page_type' => [
+      'title' => ts('PCP Page Type'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'description' => ts('The type of PCP this is: contribute or event'),
+      'add' => '2.2',
+      'default' => 'contribute',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_PCP_BAO_PCP::pageTypeOptions',
+      ],
+    ],
+    'pcp_block_id' => [
+      'title' => ts('PCP Block'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('The pcp block that this pcp page was created from'),
+      'add' => '4.1',
+    ],
+    'is_thermometer' => [
+      'title' => ts('Use Thermometer?'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'CheckBox',
+      'add' => '2.2',
+      'default' => 0,
+    ],
+    'is_honor_roll' => [
+      'title' => ts('Show Honor Roll?'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'CheckBox',
+      'add' => '2.2',
+      'default' => 0,
+    ],
+    'goal_amount' => [
+      'title' => ts('Goal Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'description' => ts('Goal amount of this Personal Campaign Page.'),
+      'add' => '2.2',
+    ],
+    'currency' => [
+      'title' => ts('Currency'),
+      'sql_type' => 'varchar(3)',
+      'input_type' => 'Select',
+      'description' => ts('3 character string, value from config setting or input via user.'),
+      'add' => '3.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_currency',
+        'key_column' => 'name',
+        'label_column' => 'full_name',
+        'name_column' => 'name',
+        'abbr_column' => 'symbol',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Enabled?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is Personal Campaign Page enabled/active?'),
+      'add' => '2.2',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_notify' => [
+      'title' => ts('Notify Owner?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Notify owner via email when someone donates to page?'),
+      'add' => '4.6',
+      'default' => FALSE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/PCP/PCPBlock.entityType.php b/www/modules/civicrm/schema/PCP/PCPBlock.entityType.php
new file mode 100644
index 000000000..94ad42641
--- /dev/null
+++ b/www/modules/civicrm/schema/PCP/PCPBlock.entityType.php
@@ -0,0 +1,159 @@
+<?php
+
+return [
+  'name' => 'PCPBlock',
+  'table' => 'civicrm_pcp_block',
+  'class' => 'CRM_PCP_DAO_PCPBlock',
+  'getInfo' => fn() => [
+    'title' => ts('Personal Campaign Block'),
+    'title_plural' => ts('Personal Campaign Blocks'),
+    'description' => ts('A Personal Campaign Page Block stores admin configurable status options and rules'),
+    'log' => TRUE,
+    'add' => '2.2',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('PCP Block ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('PCP block ID'),
+      'add' => '2.2',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'add' => '2.2',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_contribution_page.id OR civicrm_event.id'),
+      'add' => '2.2',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'target_entity_type' => [
+      'title' => ts('Target Entity'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('The type of entity that this pcp targets'),
+      'add' => '4.1',
+      'default' => 'contribute',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'target_entity_id' => [
+      'title' => ts('Target Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('The entity that this pcp targets'),
+      'add' => '4.1',
+      'entity_reference' => [
+        'dynamic_entity' => 'target_entity_type',
+        'key' => 'id',
+      ],
+    ],
+    'supporter_profile_id' => [
+      'title' => ts('Supporter Profile ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_uf_group.id. Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)?'),
+      'add' => '2.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Supporter Profile'),
+      ],
+      'entity_reference' => [
+        'entity' => 'UFGroup',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'owner_notify_id' => [
+      'title' => ts('Owner Notification'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Radio',
+      'description' => ts('FK to civicrm_option_group with name = PCP owner notifications'),
+      'add' => '4.6',
+      'default' => 0,
+      'pseudoconstant' => [
+        'option_group_name' => 'pcp_owner_notify',
+      ],
+    ],
+    'is_approval_needed' => [
+      'title' => ts('Approval Required?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)?'),
+      'add' => '2.2',
+      'default' => FALSE,
+    ],
+    'is_tellfriend_enabled' => [
+      'title' => ts('Tell a Friend Enabled?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Does Personal Campaign Page allow using tell a friend?'),
+      'add' => '2.2',
+      'default' => FALSE,
+    ],
+    'tellfriend_limit' => [
+      'title' => ts('Tell A Friend Limit'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Maximum recipient fields allowed in tell a friend'),
+      'add' => '2.2',
+      'default' => NULL,
+    ],
+    'link_text' => [
+      'title' => ts('Link Text'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Link text for PCP.'),
+      'add' => '2.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Enabled?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is Personal Campaign Page Block enabled/active?'),
+      'add' => '2.2',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'notify_email' => [
+      'title' => ts('Notification Email'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('If set, notification is automatically emailed to this email-address on create/update Personal Campaign Page'),
+      'add' => '2.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Pledge/Pledge.entityType.php b/www/modules/civicrm/schema/Pledge/Pledge.entityType.php
new file mode 100644
index 000000000..e4efd8e5f
--- /dev/null
+++ b/www/modules/civicrm/schema/Pledge/Pledge.entityType.php
@@ -0,0 +1,357 @@
+<?php
+
+return [
+  'name' => 'Pledge',
+  'table' => 'civicrm_pledge',
+  'class' => 'CRM_Pledge_DAO_Pledge',
+  'getInfo' => fn() => [
+    'title' => ts('Pledge'),
+    'title_plural' => ts('Pledges'),
+    'description' => ts('Promises to contribute at a future time, either in full, or at regular intervals until a total goal is reached.'),
+    'log' => TRUE,
+    'add' => '2.1',
+    'icon' => 'fa-paper-plane',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/pledge/add?action=add&context=standalone&reset=1',
+    'view' => 'civicrm/contact/view/pledge?id=[id]&cid=[contact_id]&action=view&reset=1',
+    'update' => 'civicrm/contact/view/pledge?id=[id]&cid=[contact_id]&action=update&reset=1',
+    'delete' => 'civicrm/contact/view/pledge?id=[id]&cid=[contact_id]&action=delete&reset=1',
+  ],
+  'getIndices' => fn() => [
+    'index_status' => [
+      'fields' => [
+        'status_id' => TRUE,
+      ],
+      'add' => '2.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Pledge ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Pledge ID'),
+      'add' => '2.1',
+      'unique_name' => 'pledge_id',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'contact_id' => [
+      'title' => ts('Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Foreign key to civicrm_contact.id .'),
+      'add' => '2.1',
+      'unique_name' => 'pledge_contact_id',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Contact'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'financial_type_id' => [
+      'title' => ts('Financial Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to Financial Type'),
+      'add' => '4.3',
+      'unique_name' => 'pledge_financial_type_id',
+      'input_attrs' => [
+        'label' => ts('Financial Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_type',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialType',
+        'key' => 'id',
+      ],
+    ],
+    'contribution_page_id' => [
+      'title' => ts('Contribution Page ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('The Contribution Page which triggered this contribution'),
+      'add' => '2.1',
+      'unique_name' => 'pledge_contribution_page_id',
+      'input_attrs' => [
+        'label' => ts('Contribution Page'),
+      ],
+      'entity_reference' => [
+        'entity' => 'ContributionPage',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'amount' => [
+      'title' => ts('Total Pledged'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Total pledged amount.'),
+      'add' => '2.1',
+      'unique_name' => 'pledge_amount',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'original_installment_amount' => [
+      'title' => ts('Original Installment Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Original amount for each of the installments.'),
+      'add' => '3.2',
+      'unique_name' => 'pledge_original_installment_amount',
+      'usage' => [
+        'export',
+      ],
+    ],
+    'currency' => [
+      'title' => ts('Pledge Currency'),
+      'sql_type' => 'varchar(3)',
+      'input_type' => 'Select',
+      'description' => ts('3 character string, value from config setting or input via user.'),
+      'add' => '3.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_currency',
+        'key_column' => 'name',
+        'label_column' => 'full_name',
+        'name_column' => 'name',
+        'abbr_column' => 'symbol',
+      ],
+    ],
+    'frequency_unit' => [
+      'title' => ts('Pledge Frequency Unit'),
+      'sql_type' => 'varchar(8)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Time units for recurrence of pledge payments.'),
+      'add' => '2.1',
+      'unique_name' => 'pledge_frequency_unit',
+      'default' => 'month',
+      'input_attrs' => [
+        'maxlength' => 8,
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'recur_frequency_units',
+        'key_column' => 'name',
+      ],
+    ],
+    'frequency_interval' => [
+      'title' => ts('Pledge Frequency Interval'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Number of time units for recurrence of pledge payments.'),
+      'add' => '2.1',
+      'unique_name' => 'pledge_frequency_interval',
+      'default' => 1,
+    ],
+    'frequency_day' => [
+      'title' => ts('Pledge day'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Day in the period when the pledge payment is due e.g. 1st of month, 15th etc. Use this to set the scheduled dates for pledge payments.'),
+      'add' => '2.1',
+      'default' => 3,
+    ],
+    'installments' => [
+      'title' => ts('Pledge Number of Installments'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Total number of payments to be made.'),
+      'add' => '2.1',
+      'default' => 1,
+      'usage' => [
+        'export',
+      ],
+    ],
+    'start_date' => [
+      'title' => ts('Pledge Start Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'required' => TRUE,
+      'description' => ts('The date the first scheduled pledge occurs.'),
+      'add' => '2.1',
+      'unique_name' => 'pledge_start_date',
+      'unique_title' => 'Payments Start Date',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'create_date' => [
+      'title' => ts('Pledge Made'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'required' => TRUE,
+      'description' => ts('When this pledge record was created.'),
+      'add' => '2.1',
+      'unique_name' => 'pledge_create_date',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'acknowledge_date' => [
+      'title' => ts('Pledge Acknowledged'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('When a pledge acknowledgement message was sent to the contributor.'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'modified_date' => [
+      'title' => ts('Pledge Modified Date'),
+      'sql_type' => 'datetime',
+      'input_type' => NULL,
+      'readonly' => TRUE,
+      'description' => ts('Last updated date for this pledge record.'),
+      'add' => '2.1',
+    ],
+    'cancel_date' => [
+      'title' => ts('Pledge Cancelled Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date this pledge was cancelled by contributor.'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'end_date' => [
+      'title' => ts('Pledge End Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('Date this pledge finished successfully (total pledge payments equal to or greater than pledged amount).'),
+      'add' => '2.1',
+      'unique_name' => 'pledge_end_date',
+      'unique_title' => 'Payments Ended Date',
+      'usage' => [
+        'export',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'max_reminders' => [
+      'title' => ts('Maximum Number of Reminders'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'description' => ts('The maximum number of payment reminders to send for any given payment.'),
+      'add' => '2.1',
+      'default' => 1,
+    ],
+    'initial_reminder_day' => [
+      'title' => ts('Initial Reminder Day'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Send initial reminder this many days prior to the payment due date.'),
+      'add' => '2.1',
+      'default' => 5,
+    ],
+    'additional_reminder_day' => [
+      'title' => ts('Additional Reminder Days'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'description' => ts('Send additional reminder this many days after last one sent, up to maximum number of reminders.'),
+      'add' => '2.1',
+      'default' => 5,
+    ],
+    'status_id' => [
+      'title' => ts('Pledge Status ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('Implicit foreign key to civicrm_option_values in the pledge_status option group.'),
+      'add' => '2.1',
+      'unique_name' => 'pledge_status_id',
+      'usage' => [
+        'import',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Status'),
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'pledge_status',
+      ],
+    ],
+    'is_test' => [
+      'title' => ts('Test'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'unique_name' => 'pledge_is_test',
+      'default' => FALSE,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'campaign_id' => [
+      'title' => ts('Campaign ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('The campaign for which this pledge has been initiated.'),
+      'add' => '3.4',
+      'unique_name' => 'pledge_campaign_id',
+      'component' => 'CiviCampaign',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Campaign'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_campaign',
+        'key_column' => 'id',
+        'label_column' => 'title',
+        'prefetch' => 'disabled',
+      ],
+      'entity_reference' => [
+        'entity' => 'Campaign',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Pledge/PledgeBlock.entityType.php b/www/modules/civicrm/schema/Pledge/PledgeBlock.entityType.php
new file mode 100644
index 000000000..ee7b4317c
--- /dev/null
+++ b/www/modules/civicrm/schema/Pledge/PledgeBlock.entityType.php
@@ -0,0 +1,129 @@
+<?php
+
+return [
+  'name' => 'PledgeBlock',
+  'table' => 'civicrm_pledge_block',
+  'class' => 'CRM_Pledge_DAO_PledgeBlock',
+  'getInfo' => fn() => [
+    'title' => ts('Pledge Block'),
+    'title_plural' => ts('Pledge Blocks'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '2.1',
+  ],
+  'getIndices' => fn() => [
+    'index_entity' => [
+      'fields' => [
+        'entity_table' => TRUE,
+        'entity_id' => TRUE,
+      ],
+      'add' => '2.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Pledge Block ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Pledge ID'),
+      'add' => '2.1',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('physical tablename for entity being joined to pledge, e.g. civicrm_contact'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to entity table specified in entity_table column.'),
+      'add' => '2.1',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'pledge_frequency_unit' => [
+      'title' => ts('Pledge Frequency Unit'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'description' => ts('Delimited list of supported frequency units'),
+      'add' => '2.1',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED,
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+    'is_pledge_interval' => [
+      'title' => ts('Expose Frequency Interval?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is frequency interval exposed on the contribution form.'),
+      'add' => '2.1',
+      'default' => FALSE,
+    ],
+    'max_reminders' => [
+      'title' => ts('Maximum Number of Reminders'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('The maximum number of payment reminders to send for any given payment.'),
+      'add' => '2.1',
+      'default' => 1,
+    ],
+    'initial_reminder_day' => [
+      'title' => ts('Initial Reminder Day'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Send initial reminder this many days prior to the payment due date.'),
+      'add' => '2.1',
+      'default' => 5,
+    ],
+    'additional_reminder_day' => [
+      'title' => ts('Additional Reminder Days'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Send additional reminder this many days after last one sent, up to maximum number of reminders.'),
+      'add' => '2.1',
+      'default' => 5,
+    ],
+    'pledge_start_date' => [
+      'title' => ts('Pledge Start Date'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('The date the first scheduled pledge occurs.'),
+      'add' => '4.7',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'is_pledge_start_date_visible' => [
+      'title' => ts('Show Recurring Donation Start Date?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('If true - recurring start date is shown.'),
+      'add' => '4.7',
+      'default' => FALSE,
+    ],
+    'is_pledge_start_date_editable' => [
+      'title' => ts('Allow Edits to Recurring Donation Start Date?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('If true - recurring start date is editable.'),
+      'add' => '4.7',
+      'default' => FALSE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Pledge/PledgePayment.entityType.php b/www/modules/civicrm/schema/Pledge/PledgePayment.entityType.php
new file mode 100644
index 000000000..3a374dc96
--- /dev/null
+++ b/www/modules/civicrm/schema/Pledge/PledgePayment.entityType.php
@@ -0,0 +1,181 @@
+<?php
+
+return [
+  'name' => 'PledgePayment',
+  'table' => 'civicrm_pledge_payment',
+  'class' => 'CRM_Pledge_DAO_PledgePayment',
+  'getInfo' => fn() => [
+    'title' => ts('Pledge Payment'),
+    'title_plural' => ts('Pledge Payments'),
+    'description' => ts('Pledge Payment'),
+    'log' => TRUE,
+    'add' => '2.1',
+  ],
+  'getIndices' => fn() => [
+    'index_contribution_pledge' => [
+      'fields' => [
+        'contribution_id' => TRUE,
+        'pledge_id' => TRUE,
+      ],
+      'add' => '2.1',
+    ],
+    'index_status' => [
+      'fields' => [
+        'status_id' => TRUE,
+      ],
+      'add' => '2.1',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Payment ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '2.1',
+      'unique_name' => 'pledge_payment_id',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'pledge_id' => [
+      'title' => ts('Pledge ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to Pledge table'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'label' => ts('Pledge'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Pledge',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'contribution_id' => [
+      'title' => ts('Contribution ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to contribution table.'),
+      'add' => '2.1',
+      'input_attrs' => [
+        'label' => ts('Contribution'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contribution',
+        'key' => 'id',
+        'on_delete' => 'CASCADE',
+      ],
+    ],
+    'scheduled_amount' => [
+      'title' => ts('Scheduled Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('Pledged amount for this payment (the actual contribution amount might be different).'),
+      'add' => '2.1',
+      'unique_name' => 'pledge_payment_scheduled_amount',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'actual_amount' => [
+      'title' => ts('Actual Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'description' => ts('Actual amount that is paid as the Pledged installment amount.'),
+      'add' => '3.2',
+      'unique_name' => 'pledge_payment_actual_amount',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'currency' => [
+      'title' => ts('Currency'),
+      'sql_type' => 'varchar(3)',
+      'input_type' => 'Select',
+      'description' => ts('3 character string, value from config setting or input via user.'),
+      'add' => '3.2',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 3,
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_currency',
+        'key_column' => 'name',
+        'label_column' => 'full_name',
+        'name_column' => 'name',
+        'abbr_column' => 'symbol',
+      ],
+    ],
+    'scheduled_date' => [
+      'title' => ts('Scheduled Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'required' => TRUE,
+      'description' => ts('The date the pledge payment is supposed to happen.'),
+      'add' => '2.1',
+      'unique_name' => 'pledge_payment_scheduled_date',
+      'unique_title' => 'Payment Scheduled',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'format_type' => 'activityDate',
+      ],
+    ],
+    'reminder_date' => [
+      'title' => ts('Last Reminder'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('The date that the most recent payment reminder was sent.'),
+      'add' => '2.1',
+      'unique_name' => 'pledge_payment_reminder_date',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'reminder_count' => [
+      'title' => ts('Reminders Sent'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('The number of payment reminders sent.'),
+      'add' => '2.1',
+      'unique_name' => 'pledge_payment_reminder_count',
+      'default' => 0,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'status_id' => [
+      'title' => ts('Payment Status'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'add' => '2.1',
+      'unique_name' => 'pledge_payment_status_id',
+      'usage' => [
+        'import',
+        'duplicate_matching',
+      ],
+      'pseudoconstant' => [
+        'option_group_name' => 'contribution_status',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Price/LineItem.entityType.php b/www/modules/civicrm/schema/Price/LineItem.entityType.php
new file mode 100644
index 000000000..367454ab4
--- /dev/null
+++ b/www/modules/civicrm/schema/Price/LineItem.entityType.php
@@ -0,0 +1,222 @@
+<?php
+
+return [
+  'name' => 'LineItem',
+  'table' => 'civicrm_line_item',
+  'class' => 'CRM_Price_DAO_LineItem',
+  'getInfo' => fn() => [
+    'title' => ts('Line Item'),
+    'title_plural' => ts('Line Items'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '1.7',
+  ],
+  'getIndices' => fn() => [
+    'UI_line_item_value' => [
+      'fields' => [
+        'entity_id' => TRUE,
+        'entity_table' => TRUE,
+        'contribution_id' => TRUE,
+        'price_field_value_id' => TRUE,
+        'price_field_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '3.3',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Line Item ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Line Item'),
+      'add' => '1.7',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Line Item Entity Type'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('May contain civicrm_contribution, civicrm_participant or civicrm_membership'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Price_BAO_LineItem::entityTables',
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Line Item Entity'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('entry in table'),
+      'add' => '1.7',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'contribution_id' => [
+      'title' => ts('Contribution ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_contribution'),
+      'add' => '4.5',
+      'input_attrs' => [
+        'label' => ts('Contribution'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contribution',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'price_field_id' => [
+      'title' => ts('Price Field ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to civicrm_price_field'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'label' => ts('Price Field'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_price_field',
+        'key_column' => 'id',
+        'name_column' => 'name',
+        'label_column' => 'label',
+      ],
+      'entity_reference' => [
+        'entity' => 'PriceField',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'label' => [
+      'title' => ts('Line Item Label'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('descriptive label for item - from price_field_value.label'),
+      'add' => '1.7',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'qty' => [
+      'title' => ts('Line Item Quantity'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'data_type' => 'Float',
+      'required' => TRUE,
+      'description' => ts('How many items ordered'),
+      'add' => '1.7',
+    ],
+    'unit_price' => [
+      'title' => ts('Unit Price'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('price of each item'),
+      'add' => '1.7',
+      'input_attrs' => [
+        'label' => ts('Unit Price'),
+      ],
+    ],
+    'line_total' => [
+      'title' => ts('Line Item Total'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => NULL,
+      'required' => TRUE,
+      'description' => ts('qty * unit_price'),
+      'add' => '1.7',
+    ],
+    'participant_count' => [
+      'title' => ts('Line Item Participant Count'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'description' => ts('Participant count for field'),
+      'add' => '3.2',
+      'default' => NULL,
+    ],
+    'price_field_value_id' => [
+      'title' => ts('Option ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to civicrm_price_field_value'),
+      'add' => '3.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Option'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_price_field_value',
+        'key_column' => 'id',
+        'name_column' => 'name',
+        'label_column' => 'label',
+      ],
+      'entity_reference' => [
+        'entity' => 'PriceFieldValue',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'financial_type_id' => [
+      'title' => ts('Financial Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to Financial Type.'),
+      'add' => '4.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Financial Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_type',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialType',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'non_deductible_amount' => [
+      'title' => ts('Non-deductible Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Portion of total amount which is NOT tax deductible.'),
+      'add' => '4.7',
+      'default' => '0.0',
+    ],
+    'tax_amount' => [
+      'title' => ts('Tax Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('tax of each item'),
+      'add' => '4.6',
+      'default' => '0',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'membership_num_terms' => [
+      'title' => ts('Number of membership terms purchased'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'description' => ts('Number of terms for this membership (only supported in Order->Payment flow). If the field is NULL it means unknown and it will be assumed to be 1 during payment.create if entity_table is civicrm_membership'),
+      'add' => '5.40',
+      'default' => NULL,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Price/PriceField.entityType.php b/www/modules/civicrm/schema/Price/PriceField.entityType.php
new file mode 100644
index 000000000..d640fe035
--- /dev/null
+++ b/www/modules/civicrm/schema/Price/PriceField.entityType.php
@@ -0,0 +1,220 @@
+<?php
+
+return [
+  'name' => 'PriceField',
+  'table' => 'civicrm_price_field',
+  'class' => 'CRM_Price_DAO_PriceField',
+  'getInfo' => fn() => [
+    'title' => ts('Price Field'),
+    'title_plural' => ts('Price Fields'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '1.8',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/price/field/edit?reset=1&action=add&sid=[price_set_id]',
+    'update' => 'civicrm/admin/price/field/edit?reset=1&action=update&sid=[price_set_id]&fid=[id]',
+    'delete' => 'civicrm/admin/price/field/edit?reset=1&action=delete&sid=[price_set_id]&fid=[id]',
+    'preview' => 'civicrm/admin/price/field/edit?reset=1&action=preview&sid=[price_set_id]&fid=[id]',
+    'browse' => 'civicrm/admin/price/field',
+  ],
+  'getIndices' => fn() => [
+    'index_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'add' => '1.8',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Price Field ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Price Field'),
+      'add' => '1.8',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'price_set_id' => [
+      'title' => ts('Price Set ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_price_set'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'label' => ts('Price Set'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_price_set',
+        'key_column' => 'id',
+        'name_column' => 'name',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'PriceSet',
+        'key' => 'id',
+      ],
+    ],
+    'name' => [
+      'title' => ts('Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Variable name/programmatic handle for this field.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'label' => [
+      'title' => ts('Label'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Text for form field label (also friendly name for administering this field).'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'html_type' => [
+      'title' => ts('Html Type'),
+      'sql_type' => 'varchar(12)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'add' => '1.8',
+      'input_attrs' => [
+        'label' => ts('Html Type'),
+        'maxlength' => 12,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Price_BAO_PriceField::htmlTypes',
+      ],
+    ],
+    'is_enter_qty' => [
+      'title' => ts('Price Field Quantity Required?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Enter a quantity for this field?'),
+      'add' => '1.8',
+      'default' => FALSE,
+    ],
+    'help_pre' => [
+      'title' => ts('Price Field Pre Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Description and/or help text to display before this field.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 80,
+      ],
+    ],
+    'help_post' => [
+      'title' => ts('Price Field Post Text'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Description and/or help text to display after this field.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 80,
+      ],
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int',
+      'input_type' => 'Select',
+      'description' => ts('Order in which the fields should appear'),
+      'add' => '1.8',
+      'default' => 1,
+    ],
+    'is_display_amounts' => [
+      'title' => ts('Price Field Show Amounts?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Should the price be displayed next to the label for each option?'),
+      'default' => TRUE,
+    ],
+    'options_per_line' => [
+      'title' => ts('Price Field Options per Row'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'description' => ts('number of options per line for checkbox and radio'),
+      'add' => '1.8',
+      'default' => 1,
+    ],
+    'is_active' => [
+      'title' => ts('Price Field Is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this price field active'),
+      'add' => '1.8',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'is_required' => [
+      'title' => ts('Price Field is Required?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this price field required (value must be > 1)'),
+      'add' => '1.8',
+      'default' => TRUE,
+    ],
+    'active_on' => [
+      'title' => ts('Price Field Start Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('If non-zero, do not show this field before the date specified'),
+      'add' => '1.8',
+      'default' => NULL,
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'expire_on' => [
+      'title' => ts('Price Field End Date'),
+      'sql_type' => 'datetime',
+      'input_type' => 'Select Date',
+      'description' => ts('If non-zero, do not show this field after the date specified'),
+      'add' => '1.8',
+      'default' => NULL,
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'javascript' => [
+      'title' => ts('Price Field Javascript'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Optional scripting attributes for field'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'visibility_id' => [
+      'title' => ts('Price Field Visibility'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Implicit FK to civicrm_option_group with name = \'visibility\''),
+      'add' => '3.2',
+      'default' => 1,
+      'pseudoconstant' => [
+        'option_group_name' => 'visibility',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Price/PriceFieldValue.entityType.php b/www/modules/civicrm/schema/Price/PriceFieldValue.entityType.php
new file mode 100644
index 000000000..74f02f282
--- /dev/null
+++ b/www/modules/civicrm/schema/Price/PriceFieldValue.entityType.php
@@ -0,0 +1,246 @@
+<?php
+
+return [
+  'name' => 'PriceFieldValue',
+  'table' => 'civicrm_price_field_value',
+  'class' => 'CRM_Price_DAO_PriceFieldValue',
+  'getInfo' => fn() => [
+    'title' => ts('Price Field Value'),
+    'title_plural' => ts('Price Field Values'),
+    'description' => ts('FIXME'),
+    'add' => '3.3',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/price/field/option/edit?reset=1&action=add&fid=[price_field_id]&sid=[price_field_id.price_set_id]',
+    'view' => 'civicrm/admin/price/field/option/edit?reset=1&action=view&oid=[id]&fid=[price_field_id]&sid=[price_field_id.price_set_id]',
+    'update' => 'civicrm/admin/price/field/option/edit?reset=1&action=update&oid=[id]&fid=[price_field_id]&sid=[price_field_id.price_set_id]',
+    'delete' => 'civicrm/admin/price/field/option/edit?reset=1&action=delete&oid=[id]&fid=[price_field_id]&sid=[price_field_id.price_set_id]',
+    'browse' => 'civicrm/admin/price/field/option',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Price Field Value ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Price Field Value'),
+      'add' => '3.3',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'price_field_id' => [
+      'title' => ts('Price Field ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_price_field'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'label' => ts('Price Field'),
+      ],
+      'entity_reference' => [
+        'entity' => 'PriceField',
+        'key' => 'id',
+      ],
+    ],
+    'name' => [
+      'title' => ts('Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Price field option name'),
+      'add' => '3.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'label' => [
+      'title' => ts('Label'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'localizable' => TRUE,
+      'description' => ts('Price field option label'),
+      'add' => '3.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Description'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Price field option description.'),
+      'add' => '3.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'rows' => 2,
+        'cols' => 60,
+        'label' => ts('Description'),
+      ],
+    ],
+    'help_pre' => [
+      'title' => ts('Help Pre'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Price field option pre help text.'),
+      'add' => '4.7',
+      'default' => NULL,
+      'input_attrs' => [
+        'rows' => 2,
+        'cols' => 60,
+        'label' => ts('Pre Help'),
+      ],
+    ],
+    'help_post' => [
+      'title' => ts('Help Post'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Price field option post field help.'),
+      'add' => '4.7',
+      'default' => NULL,
+      'input_attrs' => [
+        'rows' => 2,
+        'cols' => 60,
+        'label' => ts('Post Help'),
+      ],
+    ],
+    'amount' => [
+      'title' => ts('Amount'),
+      'sql_type' => 'decimal(18,9)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Price field option amount'),
+      'add' => '3.3',
+      'input_attrs' => [
+        'size' => '8',
+        'maxlength' => 18,
+      ],
+    ],
+    'count' => [
+      'title' => ts('Count'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'description' => ts('Number of participants per field option'),
+      'add' => '3.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Count'),
+      ],
+    ],
+    'max_value' => [
+      'title' => ts('Max Value'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'description' => ts('Max number of participants per field options'),
+      'add' => '3.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Max Value'),
+      ],
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int',
+      'input_type' => 'Text',
+      'description' => ts('Order in which the field options should appear'),
+      'add' => '3.3',
+      'default' => 1,
+    ],
+    'membership_type_id' => [
+      'title' => ts('Membership Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to Membership Type'),
+      'add' => '3.4',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Membership Type'),
+      ],
+      'entity_reference' => [
+        'entity' => 'MembershipType',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'membership_num_terms' => [
+      'title' => ts('Membership Num Terms'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'description' => ts('Number of terms for this membership'),
+      'add' => '4.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Number of terms'),
+      ],
+    ],
+    'is_default' => [
+      'title' => ts('Is Default Price Field Option?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this default price field option'),
+      'add' => '3.3',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Default'),
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Price Field Value is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this price field value active'),
+      'add' => '3.3',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'financial_type_id' => [
+      'title' => ts('Financial Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to Financial Type.'),
+      'add' => '4.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Financial Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_type',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialType',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'non_deductible_amount' => [
+      'title' => ts('Non-deductible Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Portion of total amount which is NOT tax deductible.'),
+      'add' => '4.7',
+      'default' => '0.0',
+    ],
+    'visibility_id' => [
+      'title' => ts('Price Field Option Visibility'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('Implicit FK to civicrm_option_group with name = \'visibility\''),
+      'add' => '4.7',
+      'default' => 1,
+      'pseudoconstant' => [
+        'option_group_name' => 'visibility',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Price/PriceSet.entityType.php b/www/modules/civicrm/schema/Price/PriceSet.entityType.php
new file mode 100644
index 000000000..ea7e85ea8
--- /dev/null
+++ b/www/modules/civicrm/schema/Price/PriceSet.entityType.php
@@ -0,0 +1,196 @@
+<?php
+
+return [
+  'name' => 'PriceSet',
+  'table' => 'civicrm_price_set',
+  'class' => 'CRM_Price_DAO_PriceSet',
+  'getInfo' => fn() => [
+    'title' => ts('Price Set'),
+    'title_plural' => ts('Price Sets'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '1.8',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/price/add?reset=1&action=add',
+    'update' => 'civicrm/admin/price/edit?reset=1&action=update&sid=[id]',
+    'delete' => 'civicrm/admin/price/edit?reset=1&action=delete&sid=[id]',
+    'preview' => 'civicrm/admin/price/edit?reset=1&action=preview&sid=[id]',
+    'browse' => 'civicrm/admin/price',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '1.8',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Price Set'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Price Set'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'label' => ts('ID'),
+      ],
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'description' => ts('Which Domain is this price-set for'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+      ],
+    ],
+    'name' => [
+      'title' => ts('Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Variable name/programmatic handle for this set of price fields.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'label' => ts('Name'),
+        'maxlength' => 255,
+      ],
+    ],
+    'title' => [
+      'title' => ts('Price Set Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'localizable' => TRUE,
+      'description' => ts('Displayed title for the Price Set.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Price Set Is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this price set active'),
+      'add' => '1.8',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'help_pre' => [
+      'title' => ts('Price Set Pre Help'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Description and/or help text to display before fields in form.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 80,
+      ],
+    ],
+    'help_post' => [
+      'title' => ts('Price Set Post Help'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'localizable' => TRUE,
+      'description' => ts('Description and/or help text to display after fields in form.'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 80,
+      ],
+    ],
+    'javascript' => [
+      'title' => ts('Price Set Javascript'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Optional Javascript script function(s) included on the form with this price_set. Can be used for conditional'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'extends' => [
+      'title' => ts('Price Set Extends'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('What components are using this price set?'),
+      'add' => '3.1',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND,
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Price_BAO_PriceSet::getExtendsOptions',
+      ],
+    ],
+    'financial_type_id' => [
+      'title' => ts('Financial Type ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'description' => ts('FK to Financial Type(for membership price sets only).'),
+      'add' => '4.3',
+      'default' => NULL,
+      'input_attrs' => [
+        'label' => ts('Financial Type'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_financial_type',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'FinancialType',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'is_quick_config' => [
+      'title' => ts('Is Price Set Quick Config?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is set if edited on Contribution or Event Page rather than through Manage Price Sets'),
+      'add' => '4.1',
+      'default' => FALSE,
+    ],
+    'is_reserved' => [
+      'title' => ts('Price Set Is Reserved'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this a predefined system price set (i.e. it can not be deleted, edited)?'),
+      'add' => '4.2',
+      'default' => FALSE,
+    ],
+    'min_amount' => [
+      'title' => ts('Minimum Amount'),
+      'sql_type' => 'decimal(20,2)',
+      'input_type' => 'Text',
+      'description' => ts('Minimum Amount required for this set.'),
+      'add' => '4.7',
+      'default' => '0.0',
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Price/PriceSetEntity.entityType.php b/www/modules/civicrm/schema/Price/PriceSetEntity.entityType.php
new file mode 100644
index 000000000..c97117e7d
--- /dev/null
+++ b/www/modules/civicrm/schema/Price/PriceSetEntity.entityType.php
@@ -0,0 +1,79 @@
+<?php
+
+return [
+  'name' => 'PriceSetEntity',
+  'table' => 'civicrm_price_set_entity',
+  'class' => 'CRM_Price_DAO_PriceSetEntity',
+  'getInfo' => fn() => [
+    'title' => ts('Price Set Entity'),
+    'title_plural' => ts('Price Set Entities'),
+    'description' => ts('FIXME'),
+    'log' => TRUE,
+    'add' => '1.8',
+  ],
+  'getIndices' => fn() => [
+    'UI_entity' => [
+      'fields' => [
+        'entity_table' => TRUE,
+        'entity_id' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '1.8',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Price Set Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Price Set Entity'),
+      'add' => '1.8',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'entity_table' => [
+      'title' => ts('Entity Table'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Table which uses this price set'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'entity_id' => [
+      'title' => ts('Entity ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Item in table'),
+      'add' => '1.8',
+      'entity_reference' => [
+        'dynamic_entity' => 'entity_table',
+        'key' => 'id',
+      ],
+    ],
+    'price_set_id' => [
+      'title' => ts('Price Set ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('price set being used'),
+      'add' => '1.8',
+      'input_attrs' => [
+        'label' => ts('Price Set'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_price_set',
+        'key_column' => 'id',
+        'label_column' => 'title',
+      ],
+      'entity_reference' => [
+        'entity' => 'PriceSet',
+        'key' => 'id',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Queue/Queue.entityType.php b/www/modules/civicrm/schema/Queue/Queue.entityType.php
new file mode 100644
index 000000000..255a8f889
--- /dev/null
+++ b/www/modules/civicrm/schema/Queue/Queue.entityType.php
@@ -0,0 +1,141 @@
+<?php
+
+return [
+  'name' => 'Queue',
+  'table' => 'civicrm_queue',
+  'class' => 'CRM_Queue_DAO_Queue',
+  'getInfo' => fn() => [
+    'title' => ts('Queue'),
+    'title_plural' => ts('Queues'),
+    'description' => ts('Stores a list of persistent queues'),
+    'add' => '5.47',
+  ],
+  'getIndices' => fn() => [
+    'UI_name' => [
+      'fields' => [
+        'name' => TRUE,
+      ],
+      'unique' => TRUE,
+      'add' => '5.47',
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('System Queue ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'add' => '5.47',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Name of the queue'),
+      'add' => '5.47',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'type' => [
+      'title' => ts('Type'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Type of the queue'),
+      'add' => '5.47',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Queue_BAO_Queue::getTypes',
+      ],
+    ],
+    'runner' => [
+      'title' => ts('Runner'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Name of the task runner'),
+      'add' => '5.48',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'batch_limit' => [
+      'title' => ts('Batch Limit'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Maximum number of items in a batch.'),
+      'add' => '5.48',
+      'default' => 1,
+    ],
+    'lease_time' => [
+      'title' => ts('Lease Time'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('When claiming an item (or batch of items) for work, how long should the item(s) be reserved. (Seconds)'),
+      'add' => '5.48',
+      'default' => 3600,
+    ],
+    'retry_limit' => [
+      'title' => ts('Retry Limit'),
+      'sql_type' => 'int',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Number of permitted retries. Set to zero (0) to disable.'),
+      'add' => '5.48',
+      'default' => 0,
+    ],
+    'retry_interval' => [
+      'title' => ts('Retry Interval'),
+      'sql_type' => 'int',
+      'input_type' => 'Text',
+      'description' => ts('Number of seconds to wait before retrying a failed execution.'),
+      'add' => '5.48',
+    ],
+    'status' => [
+      'title' => ts('Status'),
+      'sql_type' => 'varchar(16)',
+      'input_type' => 'Text',
+      'description' => ts('Execution status'),
+      'add' => '5.51',
+      'default' => 'active',
+      'input_attrs' => [
+        'maxlength' => 16,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Queue_BAO_Queue::getStatuses',
+      ],
+    ],
+    'error' => [
+      'title' => ts('Error Mode'),
+      'sql_type' => 'varchar(16)',
+      'input_type' => 'Text',
+      'description' => ts('Fallback behavior for unhandled errors'),
+      'add' => '5.51',
+      'input_attrs' => [
+        'maxlength' => 16,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Queue_BAO_Queue::getErrorModes',
+      ],
+    ],
+    'is_template' => [
+      'title' => ts('Is Template'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this a template configuration (for use by other/future queues)?'),
+      'add' => '5.51',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Is Template'),
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Queue/QueueItem.entityType.php b/www/modules/civicrm/schema/Queue/QueueItem.entityType.php
new file mode 100644
index 000000000..c8a286c22
--- /dev/null
+++ b/www/modules/civicrm/schema/Queue/QueueItem.entityType.php
@@ -0,0 +1,84 @@
+<?php
+
+return [
+  'name' => 'QueueItem',
+  'table' => 'civicrm_queue_item',
+  'class' => 'CRM_Queue_DAO_QueueItem',
+  'getInfo' => fn() => [
+    'title' => ts('Queue Item'),
+    'title_plural' => ts('Queue Items'),
+    'description' => ts('Stores a list of queue items'),
+    'add' => '4.2',
+  ],
+  'getIndices' => fn() => [
+    'index_queueids' => [
+      'fields' => [
+        'queue_name' => TRUE,
+        'weight' => TRUE,
+        'id' => TRUE,
+      ],
+    ],
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Queue Item ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'queue_name' => [
+      'title' => ts('Queue Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Name of the queue which includes this item'),
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'weight' => [
+      'title' => ts('Order'),
+      'sql_type' => 'int',
+      'input_type' => 'Text',
+      'required' => TRUE,
+    ],
+    'submit_time' => [
+      'title' => ts('Submit Time'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'required' => TRUE,
+      'description' => ts('date on which this item was submitted to the queue'),
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'release_time' => [
+      'title' => ts('Release Time'),
+      'sql_type' => 'timestamp',
+      'input_type' => 'Select Date',
+      'description' => ts('date on which this job becomes available; null if ASAP'),
+      'default' => NULL,
+      'input_attrs' => [
+        'format_type' => 'activityDateTime',
+      ],
+    ],
+    'run_count' => [
+      'title' => ts('Run Count'),
+      'sql_type' => 'int',
+      'input_type' => 'Text',
+      'required' => TRUE,
+      'description' => ts('Number of times execution has been attempted.'),
+      'add' => '5.48',
+      'default' => 0,
+    ],
+    'data' => [
+      'title' => ts('Queue item data'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('Serialized queue data'),
+      'serialize' => CRM_Core_DAO::SERIALIZE_PHP,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/Report/ReportInstance.entityType.php b/www/modules/civicrm/schema/Report/ReportInstance.entityType.php
new file mode 100644
index 000000000..abc05d18d
--- /dev/null
+++ b/www/modules/civicrm/schema/Report/ReportInstance.entityType.php
@@ -0,0 +1,272 @@
+<?php
+
+return [
+  'name' => 'ReportInstance',
+  'table' => 'civicrm_report_instance',
+  'class' => 'CRM_Report_DAO_ReportInstance',
+  'getInfo' => fn() => [
+    'title' => ts('Report'),
+    'title_plural' => ts('Reports'),
+    'description' => ts('Users can save their report instance and put in a cron tab etc.'),
+    'add' => '2.2',
+    'icon' => 'fa-bar-chart',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('Report Instance ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('Report Instance ID'),
+      'add' => '2.2',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'required' => TRUE,
+      'description' => ts('Which Domain is this instance for'),
+      'add' => '3.1',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+      ],
+    ],
+    'title' => [
+      'title' => ts('Report Instance Title'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Report Instance Title.'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'report_id' => [
+      'title' => ts('Report template ID'),
+      'sql_type' => 'varchar(512)',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('FK to civicrm_option_value for the report template'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'maxlength' => 512,
+      ],
+    ],
+    'name' => [
+      'title' => ts('Report instance Name'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('when combined with report_id/template uniquely identifies the instance'),
+      'add' => '3.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'args' => [
+      'title' => ts('Report Instance Arguments'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('arguments that are passed in the url when invoking the instance'),
+      'add' => '3.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'description' => [
+      'title' => ts('Report Instance description'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Report Instance description.'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'permission' => [
+      'title' => ts('Report Instance Permissions'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Select',
+      'description' => ts('permission required to be able to run this instance'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'label' => ts('Permission'),
+        'maxlength' => 255,
+      ],
+    ],
+    'grouprole' => [
+      'title' => ts('Report Instance Assigned to Roles'),
+      'sql_type' => 'varchar(1024)',
+      'input_type' => 'Select',
+      'description' => ts('role required to be able to run this instance'),
+      'add' => '4.1',
+      'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_TRIMMED,
+      'input_attrs' => [
+        'title' => ts('ACL Group/Role'),
+        'multiple' => '1',
+        'maxlength' => 1024,
+      ],
+      'pseudoconstant' => [
+        'callback' => 'CRM_Report_BAO_ReportInstance::getGrouproleOptions',
+      ],
+    ],
+    'form_values' => [
+      'title' => ts('Submitted Form Values'),
+      'sql_type' => 'longtext',
+      'input_type' => 'TextArea',
+      'description' => ts('Submitted form values for this report'),
+      'add' => '2.2',
+      'serialize' => CRM_Core_DAO::SERIALIZE_PHP,
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('Report Instance is Active'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'description' => ts('Is this entry active?'),
+      'add' => '2.2',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'created_id' => [
+      'title' => ts('Created By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to contact table.'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'label' => ts('Created By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'owner_id' => [
+      'title' => ts('Owned By Contact ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to contact table.'),
+      'add' => '4.6',
+      'input_attrs' => [
+        'label' => ts('Owned By'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Contact',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'email_subject' => [
+      'title' => ts('Report Instance email Subject'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'description' => ts('Subject of email'),
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'email_to' => [
+      'title' => ts('Email Report Instance To'),
+      'sql_type' => 'text',
+      'input_type' => 'Text',
+      'description' => ts('comma-separated list of email addresses to send the report to'),
+      'add' => '2.2',
+    ],
+    'email_cc' => [
+      'title' => ts('cc Email Report Instance To'),
+      'sql_type' => 'text',
+      'input_type' => 'Text',
+      'description' => ts('comma-separated list of email addresses to send the report to'),
+      'add' => '2.2',
+    ],
+    'header' => [
+      'title' => ts('Report Instance Header'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('comma-separated list of email addresses to send the report to'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 60,
+      ],
+    ],
+    'footer' => [
+      'title' => ts('Report Instance Footer'),
+      'sql_type' => 'text',
+      'input_type' => 'TextArea',
+      'description' => ts('comma-separated list of email addresses to send the report to'),
+      'add' => '2.2',
+      'input_attrs' => [
+        'rows' => 4,
+        'cols' => 60,
+      ],
+    ],
+    'navigation_id' => [
+      'title' => ts('Navigation ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to navigation ID'),
+      'add' => '3.0',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Navigation'),
+      ],
+      'entity_reference' => [
+        'entity' => 'Navigation',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'drilldown_id' => [
+      'title' => ts('Drilldown Report ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('FK to instance ID drilldown to'),
+      'add' => '4.3',
+      'usage' => [
+        'import',
+        'export',
+        'duplicate_matching',
+      ],
+      'input_attrs' => [
+        'label' => ts('Drilldown Report'),
+      ],
+      'entity_reference' => [
+        'entity' => 'ReportInstance',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+    'is_reserved' => [
+      'title' => ts('Instance is Reserved'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '4.2',
+      'default' => FALSE,
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/schema/SMS/SmsProvider.entityType.php b/www/modules/civicrm/schema/SMS/SmsProvider.entityType.php
new file mode 100644
index 000000000..16fc45f80
--- /dev/null
+++ b/www/modules/civicrm/schema/SMS/SmsProvider.entityType.php
@@ -0,0 +1,138 @@
+<?php
+
+return [
+  'name' => 'SmsProvider',
+  'table' => 'civicrm_sms_provider',
+  'class' => 'CRM_SMS_DAO_SmsProvider',
+  'getInfo' => fn() => [
+    'title' => ts('SMS Provider'),
+    'title_plural' => ts('SMS Providers'),
+    'description' => ts('Table to add different sms providers'),
+    'add' => '4.2',
+  ],
+  'getPaths' => fn() => [
+    'add' => 'civicrm/admin/sms/provider/edit?reset=1&action=add',
+    'delete' => 'civicrm/admin/sms/provider/edit?reset=1&action=delete&id=[id]',
+    'update' => 'civicrm/admin/sms/provider/edit?reset=1&action=update&id=[id]',
+    'browse' => 'civicrm/admin/sms/provider?reset=1',
+  ],
+  'getFields' => fn() => [
+    'id' => [
+      'title' => ts('SMS Provider ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Number',
+      'required' => TRUE,
+      'description' => ts('SMS Provider ID'),
+      'add' => '4.2',
+      'primary_key' => TRUE,
+      'auto_increment' => TRUE,
+    ],
+    'name' => [
+      'title' => ts('SMS Provider Name'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Provider internal name points to option_value of option_group sms_provider_name'),
+      'add' => '4.2',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'title' => [
+      'title' => ts('SMS Provider Title'),
+      'sql_type' => 'varchar(64)',
+      'input_type' => 'Text',
+      'description' => ts('Provider name visible to user'),
+      'add' => '4.2',
+      'input_attrs' => [
+        'maxlength' => 64,
+      ],
+    ],
+    'username' => [
+      'title' => ts('SMS Provider Username'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '4.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'password' => [
+      'title' => ts('SMS Provider Password'),
+      'sql_type' => 'varchar(255)',
+      'input_type' => 'Text',
+      'add' => '4.2',
+      'input_attrs' => [
+        'maxlength' => 255,
+      ],
+    ],
+    'api_type' => [
+      'title' => ts('SMS Provider API'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'Select',
+      'required' => TRUE,
+      'description' => ts('points to value in civicrm_option_value for group sms_api_type'),
+      'add' => '4.2',
+      'pseudoconstant' => [
+        'option_group_name' => 'sms_api_type',
+      ],
+    ],
+    'api_url' => [
+      'title' => ts('SMS Provider API URL'),
+      'sql_type' => 'varchar(128)',
+      'input_type' => 'Text',
+      'add' => '4.2',
+      'input_attrs' => [
+        'maxlength' => 128,
+      ],
+    ],
+    'api_params' => [
+      'title' => ts('SMS Provider API Params'),
+      'sql_type' => 'text',
+      'input_type' => 'Text',
+      'description' => ts('the api params in xml, http or smtp format'),
+      'add' => '4.2',
+    ],
+    'is_default' => [
+      'title' => ts('SMS Provider is Default?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '4.2',
+      'default' => FALSE,
+      'input_attrs' => [
+        'label' => ts('Default'),
+      ],
+    ],
+    'is_active' => [
+      'title' => ts('SMS Provider is Active?'),
+      'sql_type' => 'boolean',
+      'input_type' => 'CheckBox',
+      'required' => TRUE,
+      'add' => '4.2',
+      'default' => TRUE,
+      'input_attrs' => [
+        'label' => ts('Enabled'),
+      ],
+    ],
+    'domain_id' => [
+      'title' => ts('Domain ID'),
+      'sql_type' => 'int unsigned',
+      'input_type' => 'EntityRef',
+      'description' => ts('Which Domain is this sms provider for'),
+      'add' => '4.7',
+      'input_attrs' => [
+        'label' => ts('Domain'),
+      ],
+      'pseudoconstant' => [
+        'table' => 'civicrm_domain',
+        'key_column' => 'id',
+        'label_column' => 'name',
+      ],
+      'entity_reference' => [
+        'entity' => 'Domain',
+        'key' => 'id',
+        'on_delete' => 'SET NULL',
+      ],
+    ],
+  ],
+];
diff --git a/www/modules/civicrm/setup/plugins/blocks/admin.civi-setup.php b/www/modules/civicrm/setup/plugins/blocks/admin.civi-setup.php
index 6eb72e0b0..a553d5830 100644
--- a/www/modules/civicrm/setup/plugins/blocks/admin.civi-setup.php
+++ b/www/modules/civicrm/setup/plugins/blocks/admin.civi-setup.php
@@ -27,6 +27,9 @@
         $e->getModel()->extras['adminPassWasSpecified'] = TRUE;
         $e->getModel()->extras['adminPass'] = $e->getField('adminPass');
       }
+      if ($e->getField('adminEmail')) {
+        $e->getModel()->extras['adminEmail'] = $e->getField('adminEmail');
+      }
     }
 
   }, \Civi\Setup::PRIORITY_PREPARE);
diff --git a/www/modules/civicrm/setup/plugins/blocks/admin.tpl.php b/www/modules/civicrm/setup/plugins/blocks/admin.tpl.php
index 5b3f33fee..7444b652a 100644
--- a/www/modules/civicrm/setup/plugins/blocks/admin.tpl.php
+++ b/www/modules/civicrm/setup/plugins/blocks/admin.tpl.php
@@ -1,14 +1,29 @@
-<?php if (!defined('CIVI_SETUP')): exit("Installation plugins must only be loaded by the installer.\n");
-endif; ?>
+<?php if (!defined('CIVI_SETUP')) {
+  exit("Installation plugins must only be loaded by the installer.\n");
+} ?>
 
-<h2><?php echo ts('Administrator'); ?></h2>
+<?php if (empty($reqs->getErrors())) : ?>
 
-<p style="margin-left: 2em">
+<h2><?php echo ts('Administrator Account'); ?></h2>
+
+<div class="civicrm-setup-field-wrapper">
   <label for="adminUser"><span><?php echo ts('Administrative User:'); ?></span></label>
-  <input type="text" id="adminUser" name="civisetup[adminUser]" value="<?php echo htmlentities($model->extras['adminUser'] ?? '') ?>">
-</p>
+  <input type="text" id="adminUser" name="civisetup[adminUser]" required value="<?php echo htmlentities($model->extras['adminUser'] ?? '') ?>">
+</div>
 
-<p style="margin-left: 2em">
+<div class="civicrm-setup-field-wrapper">
   <label for="adminPass"><span><?php echo ts('Administrative Password:'); ?></span></label>
-  <input type="password" id="adminPass" name="civisetup[adminPass]" value="<?php echo htmlentities($model->extras['adminPass'] ?? '') ?>">
-</p>
+  <input type="password" id="adminPass" name="civisetup[adminPass]" required />
+    <?php if (!empty($model->extras['adminPass'])) {
+      echo '<div>';
+      echo ts('Suggestion: <code>%1</code>', [1 => $model->extras['adminPass']]);
+      echo '</div>';
+    } ?>
+</div>
+
+<div class="civicrm-setup-field-wrapper">
+  <label for="adminEmail"><span><?php echo ts('Administrative Email:'); ?></span></label>
+  <input type="email" required id="adminEmail" name="civisetup[adminEmail]" value="<?php htmlspecialchars($model->extras['adminEmail'] ?? '');?>" />
+</div>
+
+<?php endif;
diff --git a/www/modules/civicrm/setup/plugins/blocks/database.tpl.php b/www/modules/civicrm/setup/plugins/blocks/database.tpl.php
index b6f75b84a..d70b6fb84 100644
--- a/www/modules/civicrm/setup/plugins/blocks/database.tpl.php
+++ b/www/modules/civicrm/setup/plugins/blocks/database.tpl.php
@@ -1,24 +1,25 @@
-<?php if (!defined('CIVI_SETUP')): exit("Installation plugins must only be loaded by the installer.\n");
+<?php if (!defined('CIVI_SETUP')) :
+  exit("Installation plugins must only be loaded by the installer.\n");
 endif; ?>
 
 <h2><?php echo ts('Database'); ?></h2>
-
-<p style="margin-left: 2em">
+<div class="civicrm-setup-field-wrapper">
   <label for="server"><span><?php echo ts('Server:'); ?></span></label>
-  <input type="text" id="dbServer" name="civisetup[db][server]" value="<?php echo htmlentities($model->db['server'] ?? '') ?>">
-</p>
+  <input type="text" id="dbServer" name="civisetup[db][server]" value="<?php echo htmlentities($model->db['server'] ?? '') ?>" >
+</div>
 
-<p style="margin-left: 2em">
+<div class="civicrm-setup-field-wrapper">
   <label for="database"><span><?php echo ts('Database:'); ?></span></label>
   <input type="text" id="dbDatabase" name="civisetup[db][database]" value="<?php echo htmlentities($model->db['database'] ?? '') ?>">
-</p>
+</div>
 
-<p style="margin-left: 2em">
+<div class="civicrm-setup-field-wrapper">
   <label for="username"><span><?php echo ts('Username:'); ?></span></label>
   <input type="text" id="dbUsername" name="civisetup[db][username]" value="<?php echo htmlentities($model->db['username'] ?? '') ?>">
-</p>
+</div>
+
+<div class="civicrm-setup-field-wrapper">
 
-<p style="margin-left: 2em">
   <label for="password"><span><?php echo ts('Password:'); ?></span></label>
   <input type="password" id="dbPassword" name="civisetup[db][password]" value="<?php echo htmlentities($model->db['password'] ?? '') ?>">
-</p>
+</div>
diff --git a/www/modules/civicrm/setup/plugins/init/Drupal.civi-setup.php b/www/modules/civicrm/setup/plugins/init/Drupal.civi-setup.php
index 02bf1bb87..6159f550e 100644
--- a/www/modules/civicrm/setup/plugins/init/Drupal.civi-setup.php
+++ b/www/modules/civicrm/setup/plugins/init/Drupal.civi-setup.php
@@ -17,7 +17,7 @@
     }
 
     \Civi\Setup::log()->info(sprintf('[%s] Handle %s', basename(__FILE__), 'checkAuthorized'));
-    $e->setAuthorized(user_access('administer modules'));
+    $e->setAuthorized(\Civi\Setup\DrupalUtil::isDrush() || user_access('administer modules'));
   });
 
 \Civi\Setup::dispatcher()
diff --git a/www/modules/civicrm/setup/plugins/init/StandaloneUsers.civi-setup.php b/www/modules/civicrm/setup/plugins/init/StandaloneUsers.civi-setup.php
index 8e5dcb32e..956d0f66b 100644
--- a/www/modules/civicrm/setup/plugins/init/StandaloneUsers.civi-setup.php
+++ b/www/modules/civicrm/setup/plugins/init/StandaloneUsers.civi-setup.php
@@ -141,9 +141,10 @@
             'view own manual batches',
             'access all custom data',
             'access contact reference fields',
-            // Standalone-defined permissions that have the same name as the cms: prefixed synthetic ones
-            'administer users',
-            'view user account',
+            // standaloneusers provides concrete permissions in place of
+            // the synthetic ones on other UF
+            'cms:administer users',
+            'cms:view user account',
             // The admninister CiviCRM data implicitly sets other permissions as well.
             // Such as, edit message templates and admnister dedupe rules.
             'administer CiviCRM Data',
@@ -178,9 +179,9 @@
     $userID = \CRM_Core_BAO_CMSUser::create($params, 'email');
 
     // Assign 'admin' role to user
-    \Civi\Api4\User::update(FALSE)
-      ->addWhere('id', '=', $userID)
-      ->addValue('roles:name', ['admin'])
+    \Civi\Api4\UserRole::create(FALSE)
+      ->addValue('user_id', $userID)
+      ->addValue('role_id', $roles['admin']['id'])
       ->execute();
 
     $message = "Created new user \"{$e->getModel()->extras['adminUser']}\" (user ID #$userID, contact ID #$contactID) with 'admin' role and ";
diff --git a/www/modules/civicrm/setup/plugins/installDatabase/BootstrapCivi.civi-setup.php b/www/modules/civicrm/setup/plugins/installDatabase/BootstrapCivi.civi-setup.php
index aabe7a6d8..8d311375f 100644
--- a/www/modules/civicrm/setup/plugins/installDatabase/BootstrapCivi.civi-setup.php
+++ b/www/modules/civicrm/setup/plugins/installDatabase/BootstrapCivi.civi-setup.php
@@ -21,7 +21,7 @@
   ->addListener('civi.setup.installDatabase', function (\Civi\Setup\Event\InstallDatabaseEvent $e) {
     \Civi\Setup::log()->info(sprintf('[%s] Bootstrap CiviCRM', basename(__FILE__)));
 
-    \CRM_Core_I18n::$SQL_ESCAPER = NULL;
+    unset($GLOBALS['CIVICRM_SQL_ESCAPER']);
     unset(\Civi\Test::$statics['testPreInstall']);
 
     CRM_Core_Config::singleton(TRUE, TRUE);
diff --git a/www/modules/civicrm/setup/plugins/installDatabase/InstallSchema.civi-setup.php b/www/modules/civicrm/setup/plugins/installDatabase/InstallSchema.civi-setup.php
index 1455edab0..0be8ffdbe 100644
--- a/www/modules/civicrm/setup/plugins/installDatabase/InstallSchema.civi-setup.php
+++ b/www/modules/civicrm/setup/plugins/installDatabase/InstallSchema.civi-setup.php
@@ -66,10 +66,9 @@ public function installDatabase(\Civi\Setup\Event\InstallDatabaseEvent $e) {
     $model = $e->getModel();
 
     $sqlPath = $model->srcPath . DIRECTORY_SEPARATOR . 'sql';
-    $spec = $this->loadSpecification($model->srcPath);
 
     \Civi\Setup::log()->info(sprintf('[%s] Load basic tables', basename(__FILE__)));
-    \Civi\Setup\DbUtil::sourceSQL($model->db, \Civi\Setup\SchemaGenerator::generateCreateSql($model->srcPath, $spec->database, $spec->tables));
+    \Civi\Setup\DbUtil::sourceSQL($model->db, Civi::schemaHelper()->generateInstallSql());
 
     $seedLanguage = $model->lang;
     if (!empty($model->loadGenerated)) {
@@ -86,20 +85,6 @@ public function installDatabase(\Civi\Setup\Event\InstallDatabaseEvent $e) {
     }
   }
 
-  /**
-   * @param string $srcPath
-   * @return \CRM_Core_CodeGen_Specification
-   */
-  protected function loadSpecification($srcPath) {
-    $schemaFile = implode(DIRECTORY_SEPARATOR, [$srcPath, 'xml', 'schema', 'Schema.xml']);
-    $versionFile = implode(DIRECTORY_SEPARATOR, [$srcPath, 'xml', 'version.xml']);
-    $xmlBuilt = \CRM_Core_CodeGen_Util_Xml::parse($versionFile);
-    $buildVersion = preg_replace('/^(\d{1,2}\.\d{1,2})\.(\d{1,2}|\w{4,7})$/i', '$1', $xmlBuilt->version_no);
-    $specification = new \CRM_Core_CodeGen_Specification();
-    $specification->parse($schemaFile, $buildVersion, FALSE);
-    return $specification;
-  }
-
 }
 
 \Civi\Setup::dispatcher()->addSubscriber(new InstallSchemaPlugin());
diff --git a/www/modules/civicrm/setup/plugins/installDatabase/Preboot.civi-setup.php b/www/modules/civicrm/setup/plugins/installDatabase/Preboot.civi-setup.php
index d4851ef6f..462bb4c62 100644
--- a/www/modules/civicrm/setup/plugins/installDatabase/Preboot.civi-setup.php
+++ b/www/modules/civicrm/setup/plugins/installDatabase/Preboot.civi-setup.php
@@ -38,7 +38,7 @@
     CRM_Core_ClassLoader::singleton()->register();
 
     $conn = \Civi\Setup\DbUtil::connect($e->getModel()->db);
-    \CRM_Core_I18n::$SQL_ESCAPER = function($text) use ($conn) {
+    $GLOBALS['CIVICRM_SQL_ESCAPER'] = function($text) use ($conn) {
       return $conn->escape_string($text);
     };
 
diff --git a/www/modules/civicrm/setup/plugins/installFiles/StandaloneCivicrmFilesPath.civi-setup.php b/www/modules/civicrm/setup/plugins/installFiles/StandaloneCivicrmFilesPath.civi-setup.php
new file mode 100644
index 000000000..a73010b18
--- /dev/null
+++ b/www/modules/civicrm/setup/plugins/installFiles/StandaloneCivicrmFilesPath.civi-setup.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @file
+ *
+ * Validate and create the civicrm.files folder.
+ */
+
+if (!defined('CIVI_SETUP')) {
+  exit("Installation plugins must only be loaded by the installer.\n");
+}
+
+\Civi\Setup::dispatcher()
+  ->addListener('civi.setup.checkRequirements', function (\Civi\Setup\Event\CheckRequirementsEvent $e) {
+    \Civi\Setup::log()->info(sprintf('[%s] Handle %s', basename(__FILE__), 'checkRequirements'));
+    $m = $e->getModel();
+
+    if ($m->cms !== 'Standalone') {
+      // The installers on WP+J don't prepopulate $m->paths['civicrm.files'].
+      // TODO: Maybe they should? It would probably be good for all UF's to follow same codepaths for setting up the folder.
+      return;
+    }
+
+    $civicrmFilesDirectory = $m->paths['civicrm.files']['path'] ?? '';
+
+    if (!$civicrmFilesDirectory) {
+      $e->addError('system', 'civicrmFilesPath', 'The civicrm.files directory path is undefined.');
+    }
+    else {
+      $e->addInfo('system', 'civicrmFilesPath', sprintf('The civicrm.files directory path is defined ("%s").', $civicrmFilesDirectory));
+    }
+
+    if ($civicrmFilesDirectory && !file_exists($civicrmFilesDirectory) && !\Civi\Setup\FileUtil::isCreateable($civicrmFilesDirectory)) {
+      $e->addError('system', 'civicrmFilesPathWritable', sprintf('The civicrm files dir "%s" does not exist and cannot be created. Ensure it exists or the parent folder is writable.', $civicrmFilesDirectory));
+    }
+    elseif ($civicrmFilesDirectory && !file_exists($civicrmFilesDirectory)) {
+      $e->addInfo('system', 'civicrmFilesPathWritable', sprintf('The civicrm files dir "%s" can be created.', $civicrmFilesDirectory));
+    }
+  });
+
+\Civi\Setup::dispatcher()
+  ->addListener('civi.setup.installFiles', function (\Civi\Setup\Event\InstallFilesEvent $e) {
+    \Civi\Setup::log()->info(sprintf('[%s] Handle %s', basename(__FILE__), 'installFiles'));
+    $m = $e->getModel();
+
+    $civicrmFilesDirectory = $m->paths['civicrm.files']['path'] ?? '';
+
+    if ($civicrmFilesDirectory && !file_exists($civicrmFilesDirectory)) {
+      Civi\Setup::log()->info('[StandaloneCivicrmFilesPath.civi-setup.php] mkdir "{path}"', [
+        'path' => $civicrmFilesDirectory,
+      ]);
+      mkdir($civicrmFilesDirectory, 0777, TRUE);
+      \Civi\Setup\FileUtil::makeWebWriteable($civicrmFilesDirectory);
+    }
+  });
diff --git a/www/modules/civicrm/setup/res/index.php.txt b/www/modules/civicrm/setup/res/index.php.txt
index 42157b5f9..60f036c2f 100644
--- a/www/modules/civicrm/setup/res/index.php.txt
+++ b/www/modules/civicrm/setup/res/index.php.txt
@@ -3,6 +3,9 @@
 function invoke() {
   $requestUri = $_SERVER['REQUEST_URI'] ?? '';
 
+  // initialise config and boot container
+  \CRM_Core_Config::singleton();
+
   // Add CSS, JS, etc. that is required for this page.
   \CRM_Core_Resources::singleton()->addCoreResources();
   $parts = explode('?', $requestUri);
diff --git a/www/modules/civicrm/setup/res/template.css b/www/modules/civicrm/setup/res/template.css
index 5f3321d39..4097d750a 100644
--- a/www/modules/civicrm/setup/res/template.css
+++ b/www/modules/civicrm/setup/res/template.css
@@ -34,17 +34,16 @@ body {
   100% {
     left: 0;
     color: #555;
-}
+  }
 }
 
 @keyframes slide {
   100% {
     left: 0;
     color: #555;
-}
+  }
 }
 
-
 .civicrm-setup-header hr {
   border-bottom: 2px solid #fff;
   border-top: 2px solid #ddd;
@@ -62,7 +61,6 @@ body {
   width: 100%;
 }
 
-
 /* Header End */
 
 .civicrm-setup-body #All {
@@ -81,7 +79,6 @@ body {
 }
 
 .civicrm-setup-body h2 {
-  margin-top: 0;
   display: inline-block;
 }
 
@@ -127,7 +124,7 @@ body {
   background: #ffb;
   padding: 0.5em;
   margin: 1em auto;
-  width: 50%
+  width: 50%;
 }
 
 .civicrm-setup-body .advancedTip {
@@ -139,8 +136,7 @@ body {
   display: none;
 }
 
-.civicrm-setup-body .install-validate-bad {
-}
+/* .civicrm-setup-body .install-validate-bad { } */
 
 .civicrm-setup-body .reqTable {
   border-collapse: collapse;
@@ -163,7 +159,7 @@ body {
 
 .civicrm-setup-body .settingsTable {
   border-collapse: collapse;
-  margin: 2em
+  margin: 2em;
 }
 
 .civicrm-setup-body th,
@@ -263,7 +259,7 @@ body {
   text-align: center;
   margin: 2em 0.5em;
 }
-.civicrm-setup-body button[type=submit] {
+.civicrm-setup-body button[type="submit"] {
   padding: 15px 25px;
   background: #82c459;
   color: white;
@@ -273,19 +269,33 @@ body {
   border-radius: 5px;
   font-size: 20px;
 }
-.civicrm-setup-body button[type=submit]:hover {
+.civicrm-setup-body button[type="submit"]:hover {
   background: #60a237;
 }
-.civicrm-setup-body button[type=submit]:disabled {
+.civicrm-setup-body button[type="submit"]:disabled {
   background: #888;
   cursor: not-allowed;
 }
 
-.civicrm-setup-body .settingsTable input[type=text] {
+.civicrm-setup-body .settingsTable input[type="text"] {
   width: 80%;
 }
 
-
+.civicrm-setup-field-wrapper {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 0.5em;
+  gap: 1em;
+}
+.civicrm-setup-field-wrapper > label {
+  flex: 0 0 25ch;
+}
+.civicrm-setup-field-wrapper > input {
+  flex: 0 0 25ch;
+}
+.civicrm-setup-field-wrapper > div {
+  flex: 0 0 auto;
+}
 
 @media only screen and (max-width: 801px) {
   .civicrm-setup-body .comp-box {
@@ -307,7 +317,6 @@ body {
     width: 95%;
     margin: 10px 2% 10px 2%;
   }
-
 }
 
 @media only screen and (max-width: 503px) {
diff --git a/www/modules/civicrm/setup/src/Setup/SchemaGenerator.php b/www/modules/civicrm/setup/src/Setup/SchemaGenerator.php
index c27f5fada..14bb06ee4 100644
--- a/www/modules/civicrm/setup/src/Setup/SchemaGenerator.php
+++ b/www/modules/civicrm/setup/src/Setup/SchemaGenerator.php
@@ -3,26 +3,6 @@
 
 class SchemaGenerator {
 
-  /**
-   * Return translated SQL content using tpl, mainly contain SQL codes on table CREATE/DROP
-   *
-   * @param string $srcPath
-   * @param array $database
-   * @param array $tables
-   * @return string
-   */
-  public static function generateCreateSql($srcPath, $database, $tables) {
-    $template = new Template($srcPath, 'sql');
-
-    $template->assign('database', $database);
-    $template->assign('tables', $tables);
-    $dropOrder = array_reverse(array_keys($tables));
-    $template->assign('dropOrder', $dropOrder);
-    $template->assign('mysql', 'modern');
-
-    return $template->getContent('schema.tpl');
-  }
-
   /**
    * Generate an example set of data, including the basic data as well
    * as some example records/entities (e.g. case-types, membership types).
diff --git a/www/modules/civicrm/setup/src/Setup/SmartyUtil.php b/www/modules/civicrm/setup/src/Setup/SmartyUtil.php
index a076ddb32..7a2728ad0 100644
--- a/www/modules/civicrm/setup/src/Setup/SmartyUtil.php
+++ b/www/modules/civicrm/setup/src/Setup/SmartyUtil.php
@@ -7,27 +7,33 @@ class SmartyUtil {
    * Create a Smarty instance.
    *
    * @return \Smarty
+   * @throws \SmartyException
    */
   public static function createSmarty($srcPath) {
-    require_once 'CRM/Core/I18n.php';
-
     $packagePath = PackageUtil::getPath($srcPath);
-    require_once $packagePath . DIRECTORY_SEPARATOR . 'Smarty' . DIRECTORY_SEPARATOR . 'Smarty.class.php';
+    require_once $packagePath . '/smarty4/vendor/autoload.php';
 
     $smarty = new \Smarty();
-    $smarty->template_dir = implode(DIRECTORY_SEPARATOR, [$srcPath, 'xml', 'templates']);
-    $smarty->plugins_dir = [
-      implode(DIRECTORY_SEPARATOR, [$packagePath, 'Smarty', 'plugins']),
-      implode(DIRECTORY_SEPARATOR, [$srcPath, 'CRM', 'Core', 'Smarty', 'plugins']),
-    ];
-    $smarty->compile_dir = \Civi\Setup\FileUtil::createTempDir('templates_c');
-    $smarty->clear_all_cache();
+    $smarty->setTemplateDir(implode(DIRECTORY_SEPARATOR, [$srcPath, 'xml', 'templates']));
+    $pluginsDirectory = $smarty->getPluginsDir();
+    $pluginsDirectory[] = implode(DIRECTORY_SEPARATOR, [$srcPath, 'CRM', 'Core', 'Smarty', 'plugins']);
+    // Doesn't seem to work very well.... since I still need require_once below
+    $smarty->setPluginsDir($pluginsDirectory);
+    $smarty->setCompileDir(\Civi\Setup\FileUtil::createTempDir('templates_c'));
+    $smarty->clearAllCache();
+
+    require_once 'CRM/Core/Smarty/plugins/modifier.crmEscapeSingleQuotes.php';
+    $smarty->registerPlugin('modifier', 'crmEscapeSingleQuotes', 'smarty_modifier_crmEscapeSingleQuotes');
 
     // CRM-5308 / CRM-3507 - we need {localize} to work in the templates
     require_once implode(DIRECTORY_SEPARATOR, [$srcPath, 'CRM', 'Core', 'Smarty', 'plugins', 'block.localize.php']);
-    $smarty->register_block('localize', 'smarty_block_localize');
-    $smarty->assign('gencodeXmlDir', "$srcPath/xml");
+    $smarty->registerPlugin('block', 'localize', 'smarty_block_localize');
+    require_once 'CRM/Core/Smarty/plugins/modifier.crmCountCharacters.php';
+    $smarty->registerPlugin('modifier', 'crmCountCharacters', 'smarty_modifier_crmCountCharacters');
     require_once implode(DIRECTORY_SEPARATOR, [$srcPath, 'CRM', 'Core', 'CodeGen', 'Util', 'MessageTemplates.php']);
+    $smarty->registerPlugin('modifier', 'json_encode', 'json_encode');
+    $smarty->registerPlugin('modifier', 'count', 'count');
+    $smarty->registerPlugin('modifier', 'implode', 'implode');
     \CRM_Core_CodeGen_Util_MessageTemplates::assignSmartyVariables($smarty);
     return $smarty;
   }
diff --git a/www/modules/civicrm/setup/src/Setup/UI/SetupController.php b/www/modules/civicrm/setup/src/Setup/UI/SetupController.php
index 022929552..561e686fe 100644
--- a/www/modules/civicrm/setup/src/Setup/UI/SetupController.php
+++ b/www/modules/civicrm/setup/src/Setup/UI/SetupController.php
@@ -140,8 +140,10 @@ protected function boot($method, $fields) {
 
     global $civicrm_paths;
     foreach ($model->paths as $pathVar => $pathValues) {
-      foreach (['url', 'path'] as $aspectName => $aspectValue) {
-        $civicrm_paths[$pathVar][$aspectName] = $aspectValue;
+      foreach ($pathValues as $aspectName => $aspectValue) {
+        if (in_array($aspectName, ['url', 'path'])) {
+          $civicrm_paths[$pathVar][$aspectName] = $aspectValue;
+        }
       }
     }
 
diff --git a/www/modules/civicrm/sql/civicrm.mysql b/www/modules/civicrm/sql/civicrm.mysql
index b3586f94c..9763a0e98 100644
--- a/www/modules/civicrm/sql/civicrm.mysql
+++ b/www/modules/civicrm/sql/civicrm.mysql
@@ -1,444 +1,162 @@
--- +--------------------------------------------------------------------+
--- | 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       |
--- +--------------------------------------------------------------------+
---
--- Generated from schema.tpl
--- DO NOT EDIT.  Generated by CRM_Core_CodeGen
--- Schema for CiviCRM
--- /*******************************************************
--- *
--- * Clean up the existing tables - this section generated from drop.tpl
--- *
--- *******************************************************/
-
 SET FOREIGN_KEY_CHECKS=0;
-
-DROP TABLE IF EXISTS `civicrm_line_item`;
-DROP TABLE IF EXISTS `civicrm_pledge_payment`;
-DROP TABLE IF EXISTS `civicrm_events_in_carts`;
-DROP TABLE IF EXISTS `civicrm_participant_payment`;
-DROP TABLE IF EXISTS `civicrm_participant`;
-DROP TABLE IF EXISTS `civicrm_event`;
-DROP TABLE IF EXISTS `civicrm_membership_payment`;
-DROP TABLE IF EXISTS `civicrm_entity_financial_trxn`;
-DROP TABLE IF EXISTS `civicrm_contribution_soft`;
-DROP TABLE IF EXISTS `civicrm_contribution_product`;
-DROP TABLE IF EXISTS `civicrm_contribution`;
-DROP TABLE IF EXISTS `civicrm_group_contact`;
-DROP TABLE IF EXISTS `civicrm_loc_block`;
-DROP TABLE IF EXISTS `civicrm_address`;
-DROP TABLE IF EXISTS `civicrm_pcp_block`;
-DROP TABLE IF EXISTS `civicrm_price_field_value`;
-DROP TABLE IF EXISTS `civicrm_price_field`;
-DROP TABLE IF EXISTS `civicrm_case_activity`;
-DROP TABLE IF EXISTS `civicrm_activity_contact`;
+DROP TABLE IF EXISTS `civicrm_acl`;
+DROP TABLE IF EXISTS `civicrm_acl_cache`;
+DROP TABLE IF EXISTS `civicrm_acl_entity_role`;
 DROP TABLE IF EXISTS `civicrm_activity`;
-DROP TABLE IF EXISTS `civicrm_membership_log`;
-DROP TABLE IF EXISTS `civicrm_membership`;
-DROP TABLE IF EXISTS `civicrm_financial_trxn`;
-DROP TABLE IF EXISTS `civicrm_contribution_recur`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_unsubscribe`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_trackable_url_open`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_reply`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_opened`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_forward`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_delivered`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_bounce`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_queue`;
-DROP TABLE IF EXISTS `civicrm_mailing_spool`;
-DROP TABLE IF EXISTS `civicrm_mailing_recipients`;
-DROP TABLE IF EXISTS `civicrm_mailing_job`;
-DROP TABLE IF EXISTS `civicrm_mailing_trackable_url`;
-DROP TABLE IF EXISTS `civicrm_mailing_group`;
-DROP TABLE IF EXISTS `civicrm_mailing`;
-DROP TABLE IF EXISTS `civicrm_relationship_cache`;
-DROP TABLE IF EXISTS `civicrm_relationship`;
+DROP TABLE IF EXISTS `civicrm_activity_contact`;
+DROP TABLE IF EXISTS `civicrm_batch`;
+DROP TABLE IF EXISTS `civicrm_entity_batch`;
+DROP TABLE IF EXISTS `civicrm_campaign`;
+DROP TABLE IF EXISTS `civicrm_campaign_group`;
+DROP TABLE IF EXISTS `civicrm_survey`;
+DROP TABLE IF EXISTS `civicrm_case`;
+DROP TABLE IF EXISTS `civicrm_case_activity`;
+DROP TABLE IF EXISTS `civicrm_case_contact`;
+DROP TABLE IF EXISTS `civicrm_case_type`;
+DROP TABLE IF EXISTS `civicrm_acl_contact_cache`;
+DROP TABLE IF EXISTS `civicrm_contact`;
+DROP TABLE IF EXISTS `civicrm_contact_type`;
 DROP TABLE IF EXISTS `civicrm_dashboard_contact`;
+DROP TABLE IF EXISTS `civicrm_group`;
+DROP TABLE IF EXISTS `civicrm_group_contact`;
+DROP TABLE IF EXISTS `civicrm_group_contact_cache`;
+DROP TABLE IF EXISTS `civicrm_group_nesting`;
+DROP TABLE IF EXISTS `civicrm_group_organization`;
+DROP TABLE IF EXISTS `civicrm_relationship`;
+DROP TABLE IF EXISTS `civicrm_relationship_cache`;
+DROP TABLE IF EXISTS `civicrm_relationship_type`;
+DROP TABLE IF EXISTS `civicrm_saved_search`;
+DROP TABLE IF EXISTS `civicrm_subscription_history`;
+DROP TABLE IF EXISTS `civicrm_contribution`;
+DROP TABLE IF EXISTS `civicrm_contribution_page`;
+DROP TABLE IF EXISTS `civicrm_contribution_product`;
+DROP TABLE IF EXISTS `civicrm_contribution_recur`;
+DROP TABLE IF EXISTS `civicrm_contribution_soft`;
+DROP TABLE IF EXISTS `civicrm_premiums`;
+DROP TABLE IF EXISTS `civicrm_premiums_product`;
+DROP TABLE IF EXISTS `civicrm_product`;
+DROP TABLE IF EXISTS `civicrm_contribution_widget`;
 DROP TABLE IF EXISTS `civicrm_action_log`;
 DROP TABLE IF EXISTS `civicrm_action_schedule`;
-DROP TABLE IF EXISTS `civicrm_uf_join`;
-DROP TABLE IF EXISTS `civicrm_uf_field`;
-DROP TABLE IF EXISTS `civicrm_uf_group`;
-DROP TABLE IF EXISTS `civicrm_entity_tag`;
-DROP TABLE IF EXISTS `civicrm_entity_file`;
-DROP TABLE IF EXISTS `civicrm_discount`;
-DROP TABLE IF EXISTS `civicrm_dashboard`;
+DROP TABLE IF EXISTS `civicrm_address`;
+DROP TABLE IF EXISTS `civicrm_address_format`;
+DROP TABLE IF EXISTS `civicrm_cache`;
+DROP TABLE IF EXISTS `civicrm_component`;
+DROP TABLE IF EXISTS `civicrm_country`;
 DROP TABLE IF EXISTS `civicrm_county`;
-DROP TABLE IF EXISTS `civicrm_price_set_entity`;
-DROP TABLE IF EXISTS `civicrm_price_set`;
-DROP TABLE IF EXISTS `civicrm_report_instance`;
-DROP TABLE IF EXISTS `civicrm_pledge`;
-DROP TABLE IF EXISTS `civicrm_case_contact`;
-DROP TABLE IF EXISTS `civicrm_case`;
-DROP TABLE IF EXISTS `civicrm_membership_block`;
-DROP TABLE IF EXISTS `civicrm_membership_type`;
-DROP TABLE IF EXISTS `civicrm_sms_provider`;
-DROP TABLE IF EXISTS `civicrm_payment_token`;
-DROP TABLE IF EXISTS `civicrm_payment_processor`;
-DROP TABLE IF EXISTS `civicrm_contribution_widget`;
-DROP TABLE IF EXISTS `civicrm_premiums_product`;
-DROP TABLE IF EXISTS `civicrm_product`;
-DROP TABLE IF EXISTS `civicrm_contribution_page`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_confirm`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_subscribe`;
-DROP TABLE IF EXISTS `civicrm_group_organization`;
-DROP TABLE IF EXISTS `civicrm_group_nesting`;
-DROP TABLE IF EXISTS `civicrm_group_contact_cache`;
-DROP TABLE IF EXISTS `civicrm_subscription_history`;
-DROP TABLE IF EXISTS `civicrm_group`;
-DROP TABLE IF EXISTS `civicrm_status_pref`;
-DROP TABLE IF EXISTS `civicrm_word_replacement`;
+DROP TABLE IF EXISTS `civicrm_custom_field`;
+DROP TABLE IF EXISTS `civicrm_custom_group`;
+DROP TABLE IF EXISTS `civicrm_dashboard`;
+DROP TABLE IF EXISTS `civicrm_discount`;
+DROP TABLE IF EXISTS `civicrm_domain`;
+DROP TABLE IF EXISTS `civicrm_email`;
+DROP TABLE IF EXISTS `civicrm_entity_file`;
+DROP TABLE IF EXISTS `civicrm_entity_tag`;
+DROP TABLE IF EXISTS `civicrm_extension`;
+DROP TABLE IF EXISTS `civicrm_file`;
+DROP TABLE IF EXISTS `civicrm_im`;
+DROP TABLE IF EXISTS `civicrm_job`;
+DROP TABLE IF EXISTS `civicrm_job_log`;
+DROP TABLE IF EXISTS `civicrm_loc_block`;
+DROP TABLE IF EXISTS `civicrm_location_type`;
+DROP TABLE IF EXISTS `civicrm_log`;
+DROP TABLE IF EXISTS `civicrm_mail_settings`;
+DROP TABLE IF EXISTS `civicrm_managed`;
+DROP TABLE IF EXISTS `civicrm_mapping`;
+DROP TABLE IF EXISTS `civicrm_mapping_field`;
+DROP TABLE IF EXISTS `civicrm_menu`;
+DROP TABLE IF EXISTS `civicrm_msg_template`;
+DROP TABLE IF EXISTS `civicrm_navigation`;
+DROP TABLE IF EXISTS `civicrm_note`;
+DROP TABLE IF EXISTS `civicrm_openid`;
+DROP TABLE IF EXISTS `civicrm_option_group`;
+DROP TABLE IF EXISTS `civicrm_option_value`;
+DROP TABLE IF EXISTS `civicrm_phone`;
+DROP TABLE IF EXISTS `civicrm_preferences_date`;
+DROP TABLE IF EXISTS `civicrm_prevnext_cache`;
 DROP TABLE IF EXISTS `civicrm_print_label`;
+DROP TABLE IF EXISTS `civicrm_recurring_entity`;
 DROP TABLE IF EXISTS `civicrm_setting`;
-DROP TABLE IF EXISTS `civicrm_website`;
-DROP TABLE IF EXISTS `civicrm_openid`;
+DROP TABLE IF EXISTS `civicrm_state_province`;
+DROP TABLE IF EXISTS `civicrm_status_pref`;
+DROP TABLE IF EXISTS `civicrm_system_log`;
+DROP TABLE IF EXISTS `civicrm_tag`;
 DROP TABLE IF EXISTS `civicrm_timezone`;
-DROP TABLE IF EXISTS `civicrm_user_job`;
+DROP TABLE IF EXISTS `civicrm_translation`;
+DROP TABLE IF EXISTS `civicrm_uf_field`;
+DROP TABLE IF EXISTS `civicrm_uf_group`;
+DROP TABLE IF EXISTS `civicrm_uf_join`;
 DROP TABLE IF EXISTS `civicrm_uf_match`;
-DROP TABLE IF EXISTS `civicrm_tag`;
-DROP TABLE IF EXISTS `civicrm_state_province`;
-DROP TABLE IF EXISTS `civicrm_phone`;
-DROP TABLE IF EXISTS `civicrm_option_value`;
-DROP TABLE IF EXISTS `civicrm_note`;
-DROP TABLE IF EXISTS `civicrm_navigation`;
-DROP TABLE IF EXISTS `civicrm_menu`;
-DROP TABLE IF EXISTS `civicrm_mapping_field`;
-DROP TABLE IF EXISTS `civicrm_mail_settings`;
-DROP TABLE IF EXISTS `civicrm_log`;
-DROP TABLE IF EXISTS `civicrm_job_log`;
-DROP TABLE IF EXISTS `civicrm_job`;
-DROP TABLE IF EXISTS `civicrm_im`;
-DROP TABLE IF EXISTS `civicrm_file`;
-DROP TABLE IF EXISTS `civicrm_email`;
-DROP TABLE IF EXISTS `civicrm_domain`;
-DROP TABLE IF EXISTS `civicrm_custom_field`;
-DROP TABLE IF EXISTS `civicrm_custom_group`;
-DROP TABLE IF EXISTS `civicrm_country`;
-DROP TABLE IF EXISTS `civicrm_cache`;
+DROP TABLE IF EXISTS `civicrm_user_job`;
+DROP TABLE IF EXISTS `civicrm_website`;
+DROP TABLE IF EXISTS `civicrm_word_replacement`;
+DROP TABLE IF EXISTS `civicrm_worldregion`;
 DROP TABLE IF EXISTS `civicrm_cxn`;
-DROP TABLE IF EXISTS `civicrm_pcp`;
-DROP TABLE IF EXISTS `civicrm_queue_item`;
-DROP TABLE IF EXISTS `civicrm_queue`;
-DROP TABLE IF EXISTS `civicrm_pledge_block`;
-DROP TABLE IF EXISTS `civicrm_tell_friend`;
-DROP TABLE IF EXISTS `civicrm_case_type`;
 DROP TABLE IF EXISTS `civicrm_dedupe_exception`;
 DROP TABLE IF EXISTS `civicrm_dedupe_rule`;
 DROP TABLE IF EXISTS `civicrm_dedupe_rule_group`;
 DROP TABLE IF EXISTS `civicrm_event_carts`;
+DROP TABLE IF EXISTS `civicrm_event`;
+DROP TABLE IF EXISTS `civicrm_events_in_carts`;
+DROP TABLE IF EXISTS `civicrm_participant`;
+DROP TABLE IF EXISTS `civicrm_participant_payment`;
 DROP TABLE IF EXISTS `civicrm_participant_status_type`;
-DROP TABLE IF EXISTS `civicrm_survey`;
-DROP TABLE IF EXISTS `civicrm_campaign_group`;
-DROP TABLE IF EXISTS `civicrm_campaign`;
-DROP TABLE IF EXISTS `civicrm_membership_status`;
-DROP TABLE IF EXISTS `civicrm_financial_item`;
+DROP TABLE IF EXISTS `civicrm_currency`;
 DROP TABLE IF EXISTS `civicrm_entity_financial_account`;
+DROP TABLE IF EXISTS `civicrm_entity_financial_trxn`;
+DROP TABLE IF EXISTS `civicrm_financial_account`;
+DROP TABLE IF EXISTS `civicrm_financial_item`;
+DROP TABLE IF EXISTS `civicrm_financial_trxn`;
 DROP TABLE IF EXISTS `civicrm_financial_type`;
+DROP TABLE IF EXISTS `civicrm_payment_processor`;
 DROP TABLE IF EXISTS `civicrm_payment_processor_type`;
-DROP TABLE IF EXISTS `civicrm_financial_account`;
-DROP TABLE IF EXISTS `civicrm_currency`;
-DROP TABLE IF EXISTS `civicrm_premiums`;
+DROP TABLE IF EXISTS `civicrm_payment_token`;
+DROP TABLE IF EXISTS `civicrm_tell_friend`;
 DROP TABLE IF EXISTS `civicrm_mailing_bounce_pattern`;
 DROP TABLE IF EXISTS `civicrm_mailing_bounce_type`;
+DROP TABLE IF EXISTS `civicrm_mailing`;
 DROP TABLE IF EXISTS `civicrm_mailing_abtest`;
 DROP TABLE IF EXISTS `civicrm_mailing_component`;
-DROP TABLE IF EXISTS `civicrm_entity_batch`;
-DROP TABLE IF EXISTS `civicrm_batch`;
-DROP TABLE IF EXISTS `civicrm_contact_type`;
-DROP TABLE IF EXISTS `civicrm_saved_search`;
-DROP TABLE IF EXISTS `civicrm_relationship_type`;
-DROP TABLE IF EXISTS `civicrm_acl_contact_cache`;
-DROP TABLE IF EXISTS `civicrm_contact`;
-DROP TABLE IF EXISTS `civicrm_acl_entity_role`;
-DROP TABLE IF EXISTS `civicrm_acl_cache`;
-DROP TABLE IF EXISTS `civicrm_acl`;
-DROP TABLE IF EXISTS `civicrm_recurring_entity`;
-DROP TABLE IF EXISTS `civicrm_prevnext_cache`;
-DROP TABLE IF EXISTS `civicrm_component`;
-DROP TABLE IF EXISTS `civicrm_worldregion`;
-DROP TABLE IF EXISTS `civicrm_translation`;
-DROP TABLE IF EXISTS `civicrm_system_log`;
-DROP TABLE IF EXISTS `civicrm_preferences_date`;
-DROP TABLE IF EXISTS `civicrm_option_group`;
-DROP TABLE IF EXISTS `civicrm_msg_template`;
-DROP TABLE IF EXISTS `civicrm_mapping`;
-DROP TABLE IF EXISTS `civicrm_managed`;
-DROP TABLE IF EXISTS `civicrm_location_type`;
-DROP TABLE IF EXISTS `civicrm_extension`;
-DROP TABLE IF EXISTS `civicrm_address_format`;
-
-SET FOREIGN_KEY_CHECKS=1;
--- /*******************************************************
--- *
--- * Create new tables
--- *
--- *******************************************************/
-
--- /*******************************************************
--- *
--- * civicrm_address_format
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_address_format` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Address Format ID',
-  `format` text COMMENT 'The format of an address',
-  PRIMARY KEY (`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_extension
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_extension` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Local Extension ID',
-  `type` varchar(8) NOT NULL,
-  `full_name` varchar(255) NOT NULL COMMENT 'Fully qualified extension name',
-  `name` varchar(255) COMMENT 'Short name',
-  `label` varchar(255) COMMENT 'Short, printable name',
-  `file` varchar(255) COMMENT 'Primary PHP file',
-  `schema_version` varchar(63) COMMENT 'Revision code of the database schema; the format is module-defined',
-  `is_active` tinyint DEFAULT 1 COMMENT 'Is this extension active?',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_extension_full_name`(full_name),
-  INDEX `UI_extension_name`(name)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_location_type
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_location_type` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Location Type ID',
-  `name` varchar(64) NOT NULL COMMENT 'Location Type Name.',
-  `display_name` varchar(64) NOT NULL COMMENT 'Location Type Display Name.',
-  `vcard_name` varchar(64) COMMENT 'vCard Location Type Name.',
-  `description` varchar(255) COMMENT 'Location Type Description.',
-  `is_reserved` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this location type a predefined system location?',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this property active?',
-  `is_default` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this location type the default?',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_managed
--- *
--- * List of declaratively managed objects
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_managed` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Surrogate Key',
-  `module` varchar(255) NOT NULL COMMENT 'Name of the module which declared this object (soft FK to civicrm_extension.full_name)',
-  `name` varchar(255) NOT NULL COMMENT 'Symbolic name used by the module to identify the object',
-  `entity_type` varchar(64) NOT NULL COMMENT 'API entity type',
-  `entity_id` int unsigned COMMENT 'Soft foreign key to the referenced item.',
-  `cleanup` varchar(16) NOT NULL DEFAULT 'always' COMMENT 'Policy on when to cleanup entity (always, never, unused)',
-  `entity_modified_date` timestamp NULL DEFAULT NULL COMMENT 'When the managed entity was changed from its original settings.',
-  PRIMARY KEY (`id`),
-  INDEX `UI_managed_module_name`(module, name),
-  INDEX `UI_managed_entity`(entity_type, entity_id)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mapping
--- *
--- * Store field mappings in import or export for reuse
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_mapping` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Mapping ID',
-  `name` varchar(64) NOT NULL COMMENT 'Unique name of Mapping',
-  `description` varchar(255) COMMENT 'Description of Mapping.',
-  `mapping_type_id` int unsigned COMMENT 'Mapping Type',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_msg_template
--- *
--- * Users will need a way to save and retrieve templates with tokens for use in recurring email communication tasks
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_msg_template` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Message Template ID',
-  `msg_title` varchar(255) COMMENT 'Descriptive title of message',
-  `msg_subject` text COMMENT 'Subject for email message.',
-  `msg_text` longtext COMMENT 'Text formatted message',
-  `msg_html` longtext COMMENT 'HTML formatted message',
-  `is_active` tinyint NOT NULL DEFAULT 1,
-  `workflow_id` int unsigned COMMENT 'a pseudo-FK to civicrm_option_value',
-  `workflow_name` varchar(255),
-  `is_default` tinyint NOT NULL DEFAULT 1 COMMENT 'is this the default message template for the workflow referenced by workflow_id?',
-  `is_reserved` tinyint NOT NULL DEFAULT 0 COMMENT 'is this the reserved message template which we ship for the workflow referenced by workflow_id?',
-  `is_sms` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this message template used for sms?',
-  `pdf_format_id` int unsigned COMMENT 'a pseudo-FK to civicrm_option_value containing PDF Page Format.',
-  PRIMARY KEY (`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_option_group
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_option_group` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Option Group ID',
-  `name` varchar(64) NOT NULL COMMENT 'Option group name. Used as selection key by class properties which lookup options in civicrm_option_value.',
-  `title` varchar(255) COMMENT 'Option Group title.',
-  `description` text COMMENT 'Option group description.',
-  `data_type` varchar(128) COMMENT 'Type of data stored by this option group.',
-  `is_reserved` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this a predefined system option group (i.e. it can not be deleted)?',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this option group active?',
-  `is_locked` tinyint NOT NULL DEFAULT 0 COMMENT 'A lock to remove the ability to add new options via the UI.',
-  `option_value_fields` varchar(128) DEFAULT "name,label,description" COMMENT 'Which optional columns from the option_value table are in use by this group.',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_preferences_date
--- *
--- * Define date preferences for the site
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_preferences_date` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(64) NOT NULL COMMENT 'The meta name for this date (fixed in code)',
-  `description` varchar(255) COMMENT 'Description of this date type.',
-  `start` int NOT NULL COMMENT 'The start offset relative to current year',
-  `end` int NOT NULL COMMENT 'The end offset relative to current year, can be negative',
-  `date_format` varchar(64) COMMENT 'The date type',
-  `time_format` varchar(64) COMMENT 'time format',
-  PRIMARY KEY (`id`),
-  INDEX `index_name`(name)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_system_log
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_system_log` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key ID',
-  `message` varchar(128) NOT NULL COMMENT 'Standardized message',
-  `context` longtext COMMENT 'JSON encoded data',
-  `level` varchar(9) DEFAULT 'info' COMMENT 'error level per PSR3',
-  `timestamp` timestamp DEFAULT CURRENT_TIMESTAMP COMMENT 'Timestamp of when event occurred.',
-  `contact_id` int unsigned COMMENT 'Optional Contact ID that created the log. Not an FK as we keep this regardless',
-  `hostname` varchar(128) COMMENT 'Optional Name of logging host',
-  PRIMARY KEY (`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_translation
--- *
--- * Each string record is an alternate translation of some displayable string in the database.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_translation` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique String ID',
-  `entity_table` varchar(64) NOT NULL COMMENT 'Table where referenced item is stored',
-  `entity_field` varchar(64) NOT NULL COMMENT 'Field where referenced item is stored',
-  `entity_id` int NOT NULL COMMENT 'ID of the relevant entity.',
-  `language` varchar(5) NOT NULL COMMENT 'Relevant language',
-  `status_id` tinyint NOT NULL DEFAULT 1 COMMENT 'Specify whether the string is active, draft, etc',
-  `string` longtext NOT NULL COMMENT 'Translated string',
-  PRIMARY KEY (`id`),
-  INDEX `index_entity_lang`(entity_id, entity_table, language)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_worldregion
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_worldregion` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Country ID',
-  `name` varchar(128) COMMENT 'Region name to be associated with countries',
-  PRIMARY KEY (`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_component
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_component` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Component ID',
-  `name` varchar(64) NOT NULL COMMENT 'Name of the component.',
-  `namespace` varchar(128) COMMENT 'Path to components main directory in a form of a class namespace.',
-  PRIMARY KEY (`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_prevnext_cache
--- *
--- * Table to cache items for navigation on civicrm searched results.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_prevnext_cache` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `entity_table` varchar(64) COMMENT 'physical tablename for entity being joined to discount, e.g. civicrm_event',
-  `entity_id1` int unsigned NOT NULL COMMENT 'FK to entity table specified in entity_table column.',
-  `entity_id2` int unsigned NULL COMMENT 'FK to entity table specified in entity_table column.',
-  `cachekey` varchar(255) COMMENT 'Unique path name for cache element of the searched item',
-  `data` longtext COMMENT 'cached snapshot of the serialized data',
-  `is_selected` tinyint NOT NULL DEFAULT 0,
-  PRIMARY KEY (`id`),
-  INDEX `index_all`(cachekey, entity_id1, entity_id2, entity_table, is_selected)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_recurring_entity
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_recurring_entity` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `parent_id` int unsigned NOT NULL COMMENT 'Recurring Entity Parent ID',
-  `entity_id` int unsigned COMMENT 'Recurring Entity Child ID',
-  `entity_table` varchar(64) NOT NULL COMMENT 'Physical tablename for entity, e.g. civicrm_event',
-  `mode` tinyint NOT NULL DEFAULT 1 COMMENT '1-this entity, 2-this and the following entities, 3-all the entities',
-  PRIMARY KEY (`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_acl
--- *
--- * Access Control List
--- *
--- *******************************************************/
+DROP TABLE IF EXISTS `civicrm_mailing_event_bounce`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_confirm`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_delivered`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_forward`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_opened`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_queue`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_reply`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_subscribe`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_trackable_url_open`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_unsubscribe`;
+DROP TABLE IF EXISTS `civicrm_mailing_group`;
+DROP TABLE IF EXISTS `civicrm_mailing_job`;
+DROP TABLE IF EXISTS `civicrm_mailing_recipients`;
+DROP TABLE IF EXISTS `civicrm_mailing_trackable_url`;
+DROP TABLE IF EXISTS `civicrm_mailing_spool`;
+DROP TABLE IF EXISTS `civicrm_membership`;
+DROP TABLE IF EXISTS `civicrm_membership_block`;
+DROP TABLE IF EXISTS `civicrm_membership_log`;
+DROP TABLE IF EXISTS `civicrm_membership_payment`;
+DROP TABLE IF EXISTS `civicrm_membership_status`;
+DROP TABLE IF EXISTS `civicrm_membership_type`;
+DROP TABLE IF EXISTS `civicrm_pcp`;
+DROP TABLE IF EXISTS `civicrm_pcp_block`;
+DROP TABLE IF EXISTS `civicrm_pledge`;
+DROP TABLE IF EXISTS `civicrm_pledge_block`;
+DROP TABLE IF EXISTS `civicrm_pledge_payment`;
+DROP TABLE IF EXISTS `civicrm_line_item`;
+DROP TABLE IF EXISTS `civicrm_price_field`;
+DROP TABLE IF EXISTS `civicrm_price_field_value`;
+DROP TABLE IF EXISTS `civicrm_price_set`;
+DROP TABLE IF EXISTS `civicrm_price_set_entity`;
+DROP TABLE IF EXISTS `civicrm_queue`;
+DROP TABLE IF EXISTS `civicrm_queue_item`;
+DROP TABLE IF EXISTS `civicrm_report_instance`;
+DROP TABLE IF EXISTS `civicrm_sms_provider`;
+SET FOREIGN_KEY_CHECKS=1;
 CREATE TABLE `civicrm_acl` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique table ID',
   `name` varchar(64) COMMENT 'ACL Name.',
-  `deny` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this ACL entry Allow  (0) or Deny (1) ?',
+  `deny` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this ACL entry Allow (0) or Deny (1) ?',
   `entity_table` varchar(64) NOT NULL COMMENT 'Table of the object possessing this ACL entry (Contact, Group, or ACL Group)',
   `entity_id` int unsigned COMMENT 'ID of the object possessing this ACL',
   `operation` varchar(8) NOT NULL COMMENT 'What operation does this ACL entry control?',
@@ -446,240 +164,81 @@ CREATE TABLE `civicrm_acl` (
   `object_id` int unsigned COMMENT 'The ID of the object controlled by this ACL entry',
   `acl_table` varchar(64) COMMENT 'If this is a grant/revoke entry, what table are we granting?',
   `acl_id` int unsigned COMMENT 'ID of the ACL or ACL group being granted/revoked',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this property active?',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this property active?',
   `priority` int NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
-  INDEX `index_acl_id`(acl_id)
+  INDEX `index_acl_id`(`acl_id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_acl_cache
--- *
--- * Cache for acls and contacts
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_acl_cache` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique table ID',
   `contact_id` int unsigned COMMENT 'Foreign Key to Contact',
   `acl_id` int unsigned NOT NULL COMMENT 'Foreign Key to ACL',
   `modified_date` timestamp NULL COMMENT 'When was this cache entry last modified',
   PRIMARY KEY (`id`),
-  INDEX `index_contact_id`(contact_id),
-  INDEX `index_acl_id`(acl_id),
-  INDEX `index_modified_date`(modified_date),
-  CONSTRAINT FK_civicrm_acl_cache_acl_id FOREIGN KEY (`acl_id`) REFERENCES `civicrm_acl`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_acl_entity_role
--- *
--- * Join table for Contacts and Groups to ACL Roles
--- *
--- *******************************************************/
+  INDEX `index_contact_id`(`contact_id`),
+  INDEX `index_acl_id`(`acl_id`),
+  INDEX `index_modified_date`(`modified_date`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_acl_entity_role` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique table ID',
   `acl_role_id` int unsigned NOT NULL COMMENT 'Foreign Key to ACL Role (which is an option value pair and hence an implicit FK)',
   `entity_table` varchar(64) NOT NULL COMMENT 'Table of the object joined to the ACL Role (Contact or Group)',
   `entity_id` int unsigned NOT NULL COMMENT 'ID of the group/contact object being joined',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this property active?',
-  PRIMARY KEY (`id`),
-  INDEX `index_role`(acl_role_id),
-  INDEX `index_entity`(entity_table, entity_id)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_contact
--- *
--- * Contact objects are defined by a civicrm_contact record plus a related civicrm_contact_type record.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_contact` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Contact ID',
-  `contact_type` varchar(64) COMMENT 'Type of Contact.',
-  `external_identifier` varchar(64) COMMENT 'Unique trusted external ID (generally from a legacy app/datasource). Particularly useful for deduping operations.',
-  `display_name` varchar(128) COMMENT 'Formatted name representing preferred format for display/print/other output.',
-  `organization_name` varchar(128) COMMENT 'Organization Name.',
-  `contact_sub_type` varchar(255) COMMENT 'May be used to over-ride contact view and edit templates.',
-  `first_name` varchar(64) COMMENT 'First Name.',
-  `middle_name` varchar(64) COMMENT 'Middle Name.',
-  `last_name` varchar(64) COMMENT 'Last Name.',
-  `do_not_email` tinyint NOT NULL DEFAULT 0,
-  `do_not_phone` tinyint NOT NULL DEFAULT 0,
-  `do_not_mail` tinyint NOT NULL DEFAULT 0,
-  `do_not_sms` tinyint NOT NULL DEFAULT 0,
-  `do_not_trade` tinyint NOT NULL DEFAULT 0,
-  `is_opt_out` tinyint NOT NULL DEFAULT 0 COMMENT 'Has the contact opted out from receiving all bulk email from the organization or site domain?',
-  `legal_identifier` varchar(32) COMMENT 'May be used for SSN, EIN/TIN, Household ID (census) or other applicable unique legal/government ID.',
-  `sort_name` varchar(128) COMMENT 'Name used for sorting different contact types',
-  `nick_name` varchar(128) COMMENT 'Nickname.',
-  `legal_name` varchar(128) COMMENT 'Legal Name.',
-  `image_URL` text COMMENT 'optional URL for preferred image (photo, logo, etc.) to display for this contact.',
-  `preferred_communication_method` varchar(255) COMMENT 'What is the preferred mode of communication.',
-  `preferred_language` varchar(5) COMMENT 'Which language is preferred for communication. FK to languages in civicrm_option_value.',
-  `hash` varchar(32) COMMENT 'Key for validating requests related to this contact.',
-  `api_key` varchar(32) COMMENT 'API Key for validating requests related to this contact.',
-  `source` varchar(255) COMMENT 'where contact come from, e.g. import, donate module insert...',
-  `prefix_id` int unsigned COMMENT 'Prefix or Title for name (Ms, Mr...). FK to prefix ID',
-  `suffix_id` int unsigned COMMENT 'Suffix for name (Jr, Sr...). FK to suffix ID',
-  `formal_title` varchar(64) COMMENT 'Formal (academic or similar) title in front of name. (Prof., Dr. etc.)',
-  `communication_style_id` int unsigned COMMENT 'Communication style (e.g. formal vs. familiar) to use with this contact. FK to communication styles in civicrm_option_value.',
-  `email_greeting_id` int unsigned COMMENT 'FK to civicrm_option_value.id, that has to be valid registered Email Greeting.',
-  `email_greeting_custom` varchar(128) COMMENT 'Custom Email Greeting.',
-  `email_greeting_display` varchar(255) COMMENT 'Cache Email Greeting.',
-  `postal_greeting_id` int unsigned COMMENT 'FK to civicrm_option_value.id, that has to be valid registered Postal Greeting.',
-  `postal_greeting_custom` varchar(128) COMMENT 'Custom Postal greeting.',
-  `postal_greeting_display` varchar(255) COMMENT 'Cache Postal greeting.',
-  `addressee_id` int unsigned COMMENT 'FK to civicrm_option_value.id, that has to be valid registered Addressee.',
-  `addressee_custom` varchar(128) COMMENT 'Custom Addressee.',
-  `addressee_display` varchar(255) COMMENT 'Cache Addressee.',
-  `job_title` varchar(255) COMMENT 'Job Title',
-  `gender_id` int unsigned COMMENT 'FK to gender ID',
-  `birth_date` date COMMENT 'Date of birth',
-  `is_deceased` tinyint NOT NULL DEFAULT 0,
-  `deceased_date` date COMMENT 'Date of deceased',
-  `household_name` varchar(128) COMMENT 'Household Name.',
-  `primary_contact_id` int unsigned COMMENT 'Optional FK to Primary Contact for this household.',
-  `sic_code` varchar(8) COMMENT 'Standard Industry Classification Code.',
-  `user_unique_id` varchar(255) COMMENT 'the OpenID (or OpenID-style http://username.domain/) unique identifier for this contact mainly used for logging in to CiviCRM',
-  `employer_id` int unsigned COMMENT 'OPTIONAL FK to civicrm_contact record.',
-  `is_deleted` tinyint NOT NULL DEFAULT 0,
-  `created_date` timestamp NULL DEFAULT NULL COMMENT 'When was the contact was created.',
-  `modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When was the contact (or closely related entity) was created or modified or deleted.',
-  `preferred_mail_format` varchar(8) DEFAULT "Both" COMMENT 'Deprecated setting for text vs html mailings',
-  PRIMARY KEY (`id`),
-  INDEX `index_contact_type`(contact_type),
-  UNIQUE INDEX `UI_external_identifier`(external_identifier),
-  INDEX `index_organization_name`(organization_name),
-  INDEX `index_contact_sub_type`(contact_sub_type),
-  INDEX `index_first_name`(first_name),
-  INDEX `index_last_name`(last_name),
-  INDEX `index_sort_name`(sort_name),
-  INDEX `index_preferred_communication_method`(preferred_communication_method),
-  INDEX `index_hash`(hash),
-  INDEX `index_api_key`(api_key),
-  INDEX `UI_prefix`(prefix_id),
-  INDEX `UI_suffix`(suffix_id),
-  INDEX `index_communication_style_id`(communication_style_id),
-  INDEX `UI_gender`(gender_id),
-  INDEX `index_is_deceased`(is_deceased),
-  INDEX `index_household_name`(household_name),
-  INDEX `index_is_deleted_sort_name`(is_deleted, sort_name, id),
-  INDEX `index_created_date`(created_date),
-  INDEX `index_modified_date`(modified_date),
-  CONSTRAINT FK_civicrm_contact_primary_contact_id FOREIGN KEY (`primary_contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_contact_employer_id FOREIGN KEY (`employer_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_acl_contact_cache
--- *
--- * Join table cache for contacts that a user has permission on.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_acl_contact_cache` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
-  `user_id` int unsigned COMMENT 'FK to civicrm_contact (could be null for anon user)',
-  `contact_id` int unsigned NOT NULL COMMENT 'FK to civicrm_contact',
-  `operation` varchar(8) NOT NULL COMMENT 'What operation does this user have permission on?',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this property active?',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_user_contact_operation`(user_id, contact_id, operation)
+  INDEX `index_role`(`acl_role_id`),
+  INDEX `index_entity`(`entity_table`, `entity_id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_relationship_type
--- *
--- * Relationship types s/b structured with contact_a as the 'subject/child' contact and contact_b as the 'object/parent' contact (e.g. Individual A is Employee of Org B).
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_relationship_type` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
-  `name_a_b` varchar(64) COMMENT 'name for relationship of contact_a to contact_b.',
-  `label_a_b` varchar(64) COMMENT 'label for relationship of contact_a to contact_b.',
-  `name_b_a` varchar(64) COMMENT 'Optional name for relationship of contact_b to contact_a.',
-  `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.',
-  `contact_type_a` varchar(12) COMMENT 'If defined, contact_a in a relationship of this type must be a specific contact_type.',
-  `contact_type_b` varchar(12) COMMENT 'If defined, contact_b in a relationship of this type must be a specific contact_type.',
-  `contact_sub_type_a` varchar(64) COMMENT 'If defined, contact_sub_type_a in a relationship of this type must be a specific contact_sub_type.',
-  `contact_sub_type_b` varchar(64) COMMENT 'If defined, contact_sub_type_b in a relationship of this type must be a specific contact_sub_type.',
-  `is_reserved` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this relationship type a predefined system type (can not be changed or de-activated)?',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this relationship type currently active (i.e. can be used when creating or editing relationships)?',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name_a_b`(name_a_b),
-  UNIQUE INDEX `UI_name_b_a`(name_b_a)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_saved_search
--- *
--- * Users can save their complex SQL queries and use them later.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_saved_search` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Saved Search ID',
-  `name` varchar(255) DEFAULT NULL COMMENT 'Unique name of saved search',
-  `label` varchar(255) DEFAULT NULL COMMENT 'Administrative label for search',
-  `form_values` text COMMENT 'Submitted form values for this search',
-  `mapping_id` int unsigned COMMENT 'Foreign key to civicrm_mapping used for saved search-builder searches.',
-  `search_custom_id` int unsigned COMMENT 'Foreign key to civicrm_option value table used for saved custom searches.',
-  `api_entity` varchar(255) COMMENT 'Entity name for API based search',
-  `api_params` text COMMENT 'Parameters for API based search',
-  `created_id` int unsigned COMMENT 'FK to contact table.',
-  `modified_id` int unsigned COMMENT 'FK to contact table.',
-  `expires_date` timestamp NULL COMMENT 'Optional date after which the search is not needed',
-  `created_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When the search was created.',
-  `modified_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When the search was last modified.',
-  `description` text,
+CREATE TABLE `civicrm_activity` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Other Activity ID',
+  `source_record_id` int unsigned COMMENT 'Artificial FK to original transaction (e.g. contribution) IF it is not an Activity. Entity table is discovered by filtering by the appropriate activity_type_id.',
+  `activity_type_id` int unsigned NOT NULL DEFAULT 1 COMMENT 'FK to civicrm_option_value.id, that has to be valid, registered activity type.',
+  `subject` varchar(255) COMMENT 'The subject/purpose/short description of the activity.',
+  `activity_date_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'Date and time this activity is scheduled to occur. Formerly named scheduled_date_time.',
+  `duration` int unsigned COMMENT 'Planned or actual duration of activity expressed in minutes. Conglomerate of former duration_hours and duration_minutes.',
+  `location` varchar(255) COMMENT 'Location of the activity (optional, open text).',
+  `phone_id` int unsigned COMMENT 'Phone ID of the number called (optional - used if an existing phone number is selected).',
+  `phone_number` varchar(64) COMMENT 'Phone number in case the number does not exist in the civicrm_phone table.',
+  `details` longtext COMMENT 'Details about the activity (agenda, notes, etc).',
+  `status_id` int unsigned COMMENT 'ID of the status this activity is currently in. Foreign key to civicrm_option_value.',
+  `priority_id` int unsigned COMMENT 'ID of the priority given to this activity. Foreign key to civicrm_option_value.',
+  `parent_id` int unsigned COMMENT 'Parent meeting ID (if this is a follow-up item).',
+  `is_test` boolean NOT NULL DEFAULT FALSE,
+  `medium_id` int unsigned DEFAULT NULL COMMENT 'Activity Medium, Implicit FK to civicrm_option_value where option_group = encounter_medium.',
+  `is_auto` boolean NOT NULL DEFAULT FALSE,
+  `relationship_id` int unsigned DEFAULT NULL COMMENT 'FK to Relationship ID',
+  `is_current_revision` boolean NOT NULL DEFAULT TRUE COMMENT 'Unused deprecated column.',
+  `original_id` int unsigned COMMENT 'Unused deprecated column.',
+  `result` varchar(255) COMMENT 'Currently being used to store result id for survey activity, FK to option value.',
+  `is_deleted` boolean NOT NULL DEFAULT FALSE,
+  `campaign_id` int unsigned COMMENT 'The campaign for which this activity has been triggered.',
+  `engagement_level` int unsigned COMMENT 'Assign a specific level of engagement to this activity. Used for tracking constituents in ladder of engagement.',
+  `weight` int,
+  `is_star` boolean NOT NULL DEFAULT FALSE COMMENT 'Activity marked as favorite.',
+  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When was the activity was created.',
+  `modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When was the activity (or closely related entity) was created or modified or deleted.',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name),
-  CONSTRAINT FK_civicrm_saved_search_mapping_id FOREIGN KEY (`mapping_id`) REFERENCES `civicrm_mapping`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_saved_search_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_saved_search_modified_id FOREIGN KEY (`modified_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_contact_type
--- *
--- * Provide type information for contacts
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_contact_type` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Contact Type ID',
-  `name` varchar(64) NOT NULL COMMENT 'Internal name of Contact Type (or Subtype).',
-  `label` varchar(64) COMMENT 'localized Name of Contact Type.',
-  `description` text COMMENT 'localized Optional verbose description of the type.',
-  `image_URL` varchar(255) COMMENT 'URL of image if any.',
-  `icon` varchar(255) DEFAULT NULL COMMENT 'crm-i icon class representing this contact type',
-  `parent_id` int unsigned COMMENT 'Optional FK to parent contact type.',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this entry active?',
-  `is_reserved` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this contact type a predefined system type',
+  INDEX `UI_source_record_id`(`source_record_id`),
+  INDEX `UI_activity_type_id`(`activity_type_id`),
+  INDEX `index_activity_date_time`(`activity_date_time`),
+  INDEX `index_status_id`(`status_id`),
+  INDEX `index_is_current_revision`(`is_current_revision`),
+  INDEX `index_is_deleted`(`is_deleted`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_activity_contact` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Activity contact id',
+  `activity_id` int unsigned NOT NULL COMMENT 'Foreign key to the activity for this record.',
+  `contact_id` int unsigned NOT NULL COMMENT 'Foreign key to the contact for this record.',
+  `record_type_id` int unsigned COMMENT 'Determines the contact\'s role in the activity (source, target, or assignee).',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `contact_type`(name),
-  CONSTRAINT FK_civicrm_contact_type_parent_id FOREIGN KEY (`parent_id`) REFERENCES `civicrm_contact_type`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_batch
--- *
--- * Stores the details of a batch operation Used primarily when doing batch operations with an external system.
--- *
--- *******************************************************/
+  UNIQUE INDEX `UI_activity_contact`(`contact_id`, `activity_id`, `record_type_id`),
+  INDEX `index_record_type`(`activity_id`, `record_type_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_batch` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Address ID',
   `name` varchar(64) COMMENT 'Variable name/programmatic handle for this batch.',
@@ -699,310 +258,19 @@ CREATE TABLE `civicrm_batch` (
   `exported_date` datetime,
   `data` longtext COMMENT 'cache entered data',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name),
-  CONSTRAINT FK_civicrm_batch_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_batch_modified_id FOREIGN KEY (`modified_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_batch_saved_search_id FOREIGN KEY (`saved_search_id`) REFERENCES `civicrm_saved_search`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_entity_batch
--- *
--- * Batch entities (Contributions, Participants, Contacts) to a batch.
--- *
--- *******************************************************/
+  UNIQUE INDEX `UI_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_entity_batch` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
   `entity_table` varchar(64) COMMENT 'physical tablename for entity being joined to file, e.g. civicrm_contact',
   `entity_id` int unsigned NOT NULL COMMENT 'FK to entity table specified in entity_table column.',
   `batch_id` int unsigned NOT NULL COMMENT 'FK to civicrm_batch',
   PRIMARY KEY (`id`),
-  INDEX `index_entity`(entity_table, entity_id),
-  UNIQUE INDEX `UI_batch_entity`(batch_id, entity_id, entity_table),
-  CONSTRAINT FK_civicrm_entity_batch_batch_id FOREIGN KEY (`batch_id`) REFERENCES `civicrm_batch`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_component
--- *
--- * Stores information about the mailing components (header/footer).
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_mailing_component` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(64) COMMENT 'The name of this component',
-  `component_type` varchar(12) COMMENT 'Type of Component.',
-  `subject` varchar(255),
-  `body_html` text COMMENT 'Body of the component in html format.',
-  `body_text` text COMMENT 'Body of the component in text format.',
-  `is_default` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this the default component for this component_type?',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this property active?',
-  PRIMARY KEY (`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_abtest
--- *
--- * Stores information about abtesting
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_mailing_abtest` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) COMMENT 'Name of the A/B test',
-  `status` varchar(32) COMMENT 'Status',
-  `mailing_id_a` int unsigned COMMENT 'The first experimental mailing (\"A\" condition)',
-  `mailing_id_b` int unsigned COMMENT 'The second experimental mailing (\"B\" condition)',
-  `mailing_id_c` int unsigned COMMENT 'The final, general mailing (derived from A or B)',
-  `domain_id` int unsigned NOT NULL COMMENT 'Which site is this mailing for',
-  `testing_criteria` varchar(32),
-  `winner_criteria` varchar(32),
-  `specific_url` varchar(255) COMMENT 'What specific url to track',
-  `declare_winning_time` datetime COMMENT 'In how much time to declare winner',
-  `group_percentage` int unsigned,
-  `created_id` int unsigned COMMENT 'FK to Contact ID',
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When was this item created',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_abtest_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_bounce_type
--- *
--- * Table to index the various bounce types and their properties
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_mailing_bounce_type` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL COMMENT 'Type of bounce',
-  `description` varchar(2048) COMMENT 'A description of this bounce type',
-  `hold_threshold` int unsigned NOT NULL COMMENT 'Number of bounces of this type required before the email address is put on bounce hold',
-  PRIMARY KEY (`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_bounce_pattern
--- *
--- * Pseudo-constant table of patterns for bounce classification
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_mailing_bounce_pattern` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `bounce_type_id` int unsigned NOT NULL COMMENT 'Type of bounce',
-  `pattern` varchar(255) COMMENT 'A regexp to match a message to a bounce type',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_bounce_pattern_bounce_type_id FOREIGN KEY (`bounce_type_id`) REFERENCES `civicrm_mailing_bounce_type`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_premiums
--- *
--- * table - settings for the Premiums features for a given contribution page 
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_premiums` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `entity_table` varchar(64) NOT NULL COMMENT 'Joins these premium settings to another object. Always civicrm_contribution_page for now.',
-  `entity_id` int unsigned NOT NULL,
-  `premiums_active` tinyint NOT NULL DEFAULT 0 COMMENT 'Is the Premiums feature enabled for this page?',
-  `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_contact_email` varchar(100) COMMENT 'This email address is included in receipts if it is populated and a premium has been selected.',
-  `premiums_contact_phone` varchar(50) COMMENT 'This phone number is included in receipts if it is populated and a premium has been selected.',
-  `premiums_display_min_contribution` tinyint NOT NULL DEFAULT 0 COMMENT 'Boolean. Should we automatically display minimum contribution amount text after the premium descriptions.',
-  `premiums_nothankyou_label` varchar(255) COMMENT 'Label displayed for No Thank-you option in premiums block (e.g. No thank you)',
-  `premiums_nothankyou_position` int unsigned DEFAULT 1,
-  PRIMARY KEY (`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_currency
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_currency` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Currency ID',
-  `name` varchar(64) COMMENT 'Currency Name',
-  `symbol` varchar(8) COMMENT 'Currency Symbol',
-  `numeric_code` varchar(3) COMMENT 'Numeric currency code',
-  `full_name` varchar(64) COMMENT 'Full currency name',
-  PRIMARY KEY (`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_financial_account
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_financial_account` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
-  `name` varchar(255) NOT NULL COMMENT 'Financial Account Name.',
-  `contact_id` int unsigned COMMENT 'FK to Contact ID that is responsible for the funds in this account',
-  `financial_account_type_id` int unsigned NOT NULL DEFAULT 3 COMMENT 'pseudo FK into civicrm_option_value.',
-  `accounting_code` varchar(64) COMMENT 'Optional value for mapping monies owed and received to accounting system codes.',
-  `account_type_code` varchar(64) COMMENT 'Optional value for mapping account types to accounting system account categories (QuickBooks Account Type Codes for example).',
-  `description` varchar(255) COMMENT 'Financial Type Description.',
-  `parent_id` int unsigned COMMENT 'Parent ID in account hierarchy',
-  `is_header_account` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this a header account which does not allow transactions to be posted against it directly, but only to its sub-accounts?',
-  `is_deductible` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this account tax-deductible?',
-  `is_tax` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this account for taxes?',
-  `tax_rate` decimal(10,8) COMMENT 'The percentage of the total_amount that is due for this tax.',
-  `is_reserved` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this a predefined system object?',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this property active?',
-  `is_default` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this account the default one (or default tax one) for its financial_account_type?',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name),
-  CONSTRAINT FK_civicrm_financial_account_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_financial_account_parent_id FOREIGN KEY (`parent_id`) REFERENCES `civicrm_financial_account`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_payment_processor_type
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_payment_processor_type` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Payment Processor Type ID',
-  `name` varchar(64) NOT NULL COMMENT 'Payment Processor Type Name.',
-  `title` varchar(127) NOT NULL COMMENT 'Payment Processor Type Title.',
-  `description` varchar(255) COMMENT 'Payment Processor Description.',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this processor active?',
-  `is_default` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this processor the default?',
-  `user_name_label` varchar(255),
-  `password_label` varchar(255),
-  `signature_label` varchar(255),
-  `subject_label` varchar(255),
-  `class_name` varchar(255) NOT NULL,
-  `url_site_default` varchar(255),
-  `url_api_default` varchar(255),
-  `url_recur_default` varchar(255),
-  `url_button_default` varchar(255),
-  `url_site_test_default` varchar(255),
-  `url_api_test_default` varchar(255),
-  `url_recur_test_default` varchar(255),
-  `url_button_test_default` varchar(255),
-  `billing_mode` int unsigned NOT NULL COMMENT 'Billing Mode (deprecated)',
-  `is_recur` tinyint NOT NULL DEFAULT 0 COMMENT 'Can process recurring contributions',
-  `payment_type` int unsigned DEFAULT 1 COMMENT 'Payment Type: Credit or Debit (deprecated)',
-  `payment_instrument_id` int unsigned DEFAULT 1 COMMENT 'Payment Instrument ID',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_financial_type
--- *
--- * Formerly civicrm_contribution_type merged into this table in 4.3
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_financial_type` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID of original financial_type so you can search this table by the financial_type.id and then select the relevant version based on the timestamp',
-  `name` varchar(64) NOT NULL COMMENT 'Financial Type Name.',
-  `description` varchar(255) COMMENT 'Financial Type Description.',
-  `is_deductible` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this financial type tax-deductible? If true, contributions of this type may be fully OR partially deductible - non-deductible amount is stored in the Contribution record.',
-  `is_reserved` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this a predefined system object?',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this property active?',
-  PRIMARY KEY (`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_entity_financial_account
--- *
--- * Map between an entity and a financial account, where there is a specific relationship between the financial account and the entity, e.g. Income Account for or AR Account for
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_entity_financial_account` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
-  `entity_table` varchar(64) NOT NULL COMMENT 'Links to an entity_table like civicrm_financial_type',
-  `entity_id` int unsigned NOT NULL COMMENT 'Links to an id in the entity_table, such as vid in civicrm_financial_type',
-  `account_relationship` int unsigned NOT NULL COMMENT 'FK to a new civicrm_option_value (account_relationship)',
-  `financial_account_id` int unsigned NOT NULL COMMENT 'FK to the financial_account_id',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `index_entity_id_entity_table_account_relationship`(entity_id, entity_table, account_relationship),
-  CONSTRAINT FK_civicrm_entity_financial_account_financial_account_id FOREIGN KEY (`financial_account_id`) REFERENCES `civicrm_financial_account`(`id`) ON DELETE RESTRICT
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_financial_item
--- *
--- * Financial data for civicrm_line_item, etc.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_financial_item` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `created_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Date and time the item was created',
-  `transaction_date` datetime NOT NULL COMMENT 'Date and time of the source transaction',
-  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact ID of contact the item is from',
-  `description` varchar(255) COMMENT 'Human readable description of this item, to ease display without lookup of source item.',
-  `amount` decimal(20,2) NOT NULL DEFAULT 0 COMMENT 'Total amount of this item',
-  `currency` varchar(3) COMMENT 'Currency for the amount',
-  `financial_account_id` int unsigned COMMENT 'FK to civicrm_financial_account',
-  `status_id` int unsigned COMMENT 'Payment status: test, paid, part_paid, unpaid (if empty assume unpaid)',
-  `entity_table` varchar(64) COMMENT 'May contain civicrm_line_item, civicrm_financial_trxn etc',
-  `entity_id` int unsigned COMMENT 'The specific source item that is responsible for the creation of this financial_item',
-  PRIMARY KEY (`id`),
-  INDEX `IX_created_date`(created_date),
-  INDEX `IX_transaction_date`(transaction_date),
-  INDEX `index_entity_id_entity_table`(entity_id, entity_table),
-  CONSTRAINT FK_civicrm_financial_item_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_financial_item_financial_account_id FOREIGN KEY (`financial_account_id`) REFERENCES `civicrm_financial_account`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_membership_status
--- *
--- * Membership Status stores admin configurable rules for assigning status to memberships.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_membership_status` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Membership ID',
-  `name` varchar(128) NOT NULL COMMENT 'Name for Membership Status',
-  `label` varchar(128) COMMENT 'Label for Membership Status',
-  `start_event` varchar(12) COMMENT 'Event when this status starts.',
-  `start_event_adjust_unit` varchar(8) COMMENT 'Unit used for adjusting from start_event.',
-  `start_event_adjust_interval` int COMMENT 'Status range begins this many units from start_event.',
-  `end_event` varchar(12) COMMENT 'Event after which this status ends.',
-  `end_event_adjust_unit` varchar(8) COMMENT 'Unit used for adjusting from the ending event.',
-  `end_event_adjust_interval` int COMMENT 'Status range ends this many units from end_event.',
-  `is_current_member` tinyint NOT NULL DEFAULT 0 COMMENT 'Does this status aggregate to current members (e.g. New, Renewed, Grace might all be TRUE... while Unrenewed, Lapsed, Inactive would be FALSE).',
-  `is_admin` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this status for admin/manual assignment only.',
-  `weight` int,
-  `is_default` tinyint NOT NULL DEFAULT 0 COMMENT 'Assign this status to a membership record if no other status match is found.',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this membership_status enabled.',
-  `is_reserved` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this membership_status reserved.',
-  PRIMARY KEY (`id`)
+  INDEX `index_entity`(`entity_table`, `entity_id`),
+  UNIQUE INDEX `UI_batch_entity`(`batch_id`, `entity_id`, `entity_table`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_campaign
--- *
--- * Campaign Details.
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_campaign` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Campaign ID.',
   `name` varchar(255) NOT NULL COMMENT 'Name of the Campaign.',
@@ -1014,7 +282,7 @@ CREATE TABLE `civicrm_campaign` (
   `status_id` int unsigned DEFAULT NULL COMMENT 'Campaign status ID.Implicit FK to civicrm_option_value where option_group = campaign_status',
   `external_identifier` varchar(32) COMMENT 'Unique trusted external ID (generally from a legacy app/datasource). Particularly useful for deduping operations.',
   `parent_id` int unsigned DEFAULT NULL COMMENT 'Optional parent id for this Campaign.',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this Campaign enabled or disabled/cancelled?',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this Campaign enabled or disabled/cancelled?',
   `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this Campaign.',
   `created_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'Date and time that Campaign was created.',
   `last_modified_id` int unsigned COMMENT 'FK to civicrm_contact, who recently edited this Campaign.',
@@ -1022,41 +290,21 @@ CREATE TABLE `civicrm_campaign` (
   `goal_general` text COMMENT 'General goals for Campaign.',
   `goal_revenue` decimal(20,2) COMMENT 'The target revenue for this campaign.',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name),
-  INDEX `index_campaign_type_id`(campaign_type_id),
-  INDEX `index_status_id`(status_id),
-  UNIQUE INDEX `UI_external_identifier`(external_identifier),
-  CONSTRAINT FK_civicrm_campaign_parent_id FOREIGN KEY (`parent_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_campaign_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_campaign_last_modified_id FOREIGN KEY (`last_modified_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_campaign_group
--- *
--- * Campaign Group Details.
--- *
--- *******************************************************/
+  UNIQUE INDEX `UI_name`(`name`),
+  INDEX `index_campaign_type_id`(`campaign_type_id`),
+  INDEX `index_status_id`(`status_id`),
+  UNIQUE INDEX `UI_external_identifier`(`external_identifier`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_campaign_group` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Campaign Group id.',
   `campaign_id` int unsigned NOT NULL COMMENT 'Foreign key to the activity Campaign.',
   `group_type` varchar(8) DEFAULT NULL COMMENT 'Type of Group.',
   `entity_table` varchar(64) DEFAULT NULL COMMENT 'Name of table where item being referenced is stored.',
   `entity_id` int unsigned DEFAULT NULL COMMENT 'Entity id of referenced table.',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_campaign_group_campaign_id FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE CASCADE
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_survey
--- *
--- * Campaign Survey Details.
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_survey` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Survey id.',
   `title` varchar(255) NOT NULL COMMENT 'Title of the Survey.',
@@ -1066,301 +314,681 @@ CREATE TABLE `civicrm_survey` (
   `release_frequency` int unsigned DEFAULT NULL COMMENT 'Number of days for recurrence of release.',
   `max_number_of_contacts` int unsigned DEFAULT NULL COMMENT 'Maximum number of contacts to allow for survey.',
   `default_number_of_contacts` int unsigned DEFAULT NULL COMMENT 'Default number of contacts to allow for survey.',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this survey enabled or disabled/cancelled?',
-  `is_default` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this default survey?',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this survey enabled or disabled/cancelled?',
+  `is_default` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this default survey?',
   `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this Survey.',
   `created_date` datetime COMMENT 'Date and time that Survey was created.',
   `last_modified_id` int unsigned COMMENT 'FK to civicrm_contact, who recently edited this Survey.',
   `last_modified_date` datetime COMMENT 'Date and time that Survey was edited last time.',
   `result_id` int unsigned DEFAULT NULL COMMENT 'Used to store option group id.',
-  `bypass_confirm` tinyint NOT NULL DEFAULT 0 COMMENT 'Bypass the email verification.',
+  `bypass_confirm` boolean NOT NULL DEFAULT FALSE COMMENT 'Bypass the email verification.',
   `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',
-  `is_share` tinyint NOT NULL DEFAULT 1 COMMENT 'Can people share the petition through social media?',
+  `is_share` boolean NOT NULL DEFAULT TRUE COMMENT 'Can people share the petition through social media?',
   PRIMARY KEY (`id`),
-  INDEX `UI_activity_type_id`(activity_type_id),
-  CONSTRAINT FK_civicrm_survey_campaign_id FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_survey_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_survey_last_modified_id FOREIGN KEY (`last_modified_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_participant_status_type
--- *
--- * various types of CiviEvent participant statuses
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_participant_status_type` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'unique participant status type id',
-  `name` varchar(64) COMMENT 'non-localized name of the status type',
-  `label` varchar(255) COMMENT 'localized label for display of this status type',
-  `class` varchar(8) COMMENT 'the general group of status type this one belongs to',
-  `is_reserved` tinyint NOT NULL DEFAULT 0 COMMENT 'whether this is a status type required by the system',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'whether this status type is active',
-  `is_counted` tinyint NOT NULL DEFAULT 0 COMMENT 'whether this status type is counted against event size limit',
-  `weight` int unsigned NOT NULL COMMENT 'controls sort order',
-  `visibility_id` int unsigned COMMENT 'whether the status type is visible to the public, an implicit foreign key to option_value.value related to the `visibility` option_group',
-  PRIMARY KEY (`id`)
+  INDEX `UI_activity_type_id`(`activity_type_id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_event_carts
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_event_carts` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Cart ID',
-  `user_id` int unsigned COMMENT 'FK to civicrm_contact who created this cart',
-  `completed` tinyint NOT NULL DEFAULT 0,
+CREATE TABLE `civicrm_case` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Case ID',
+  `case_type_id` int unsigned NOT NULL COMMENT 'FK to civicrm_case_type.id',
+  `subject` varchar(128) COMMENT 'Short name of the case.',
+  `start_date` date COMMENT 'Date on which given case starts.',
+  `end_date` date COMMENT 'Date on which given case ends.',
+  `details` text COMMENT 'Details populated from Open Case. Only used in the CiviCase extension.',
+  `status_id` int unsigned NOT NULL COMMENT 'ID of case status.',
+  `is_deleted` boolean NOT NULL DEFAULT FALSE,
+  `created_date` timestamp NULL DEFAULT NULL COMMENT 'When was the case was created.',
+  `modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When was the case (or closely related entity) was created or modified or deleted.',
   PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_event_carts_user_id FOREIGN KEY (`user_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
+  INDEX `index_case_type_id`(`case_type_id`),
+  INDEX `index_is_deleted`(`is_deleted`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_dedupe_rule_group
--- *
--- * Dedupe rule groups
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_dedupe_rule_group` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique dedupe rule group id',
-  `contact_type` varchar(12) COMMENT 'The type of contacts this group applies to',
-  `threshold` int NOT NULL COMMENT 'The weight threshold the sum of the rule weights has to cross to consider two contacts the same',
-  `used` varchar(12) NOT NULL COMMENT 'Whether the rule should be used for cases where usage is Unsupervised, Supervised OR General(programatically)',
-  `name` varchar(255) COMMENT 'Unique name of rule group',
-  `title` varchar(255) COMMENT 'Label of the rule group',
-  `is_reserved` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this a reserved rule - a rule group that has been optimized and cannot be changed by the admin',
+CREATE TABLE `civicrm_case_activity` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique case-activity association id',
+  `case_id` int unsigned NOT NULL COMMENT 'Case ID of case-activity association.',
+  `activity_id` int unsigned NOT NULL COMMENT 'Activity ID of case-activity association.',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name)
+  INDEX `UI_case_activity_id`(`case_id`, `activity_id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_dedupe_rule
--- *
--- * Dedupe rules for use by rule groups
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_dedupe_rule` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique dedupe rule id',
-  `dedupe_rule_group_id` int unsigned NOT NULL COMMENT 'The id of the rule group this rule belongs to',
-  `rule_table` varchar(64) NOT NULL COMMENT 'The name of the table this rule is about',
-  `rule_field` varchar(64) NOT NULL COMMENT 'The name of the field of the table referenced in rule_table',
-  `rule_length` int unsigned COMMENT 'The length of the matching substring',
-  `rule_weight` int NOT NULL COMMENT 'The weight of the rule',
+CREATE TABLE `civicrm_case_contact` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique case-contact association id',
+  `case_id` int unsigned NOT NULL COMMENT 'Case ID of case-contact association.',
+  `contact_id` int unsigned NOT NULL COMMENT 'Contact ID of contact record given case belongs to.',
   PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_dedupe_rule_dedupe_rule_group_id FOREIGN KEY (`dedupe_rule_group_id`) REFERENCES `civicrm_dedupe_rule_group`(`id`)
+  UNIQUE INDEX `UI_case_contact_id`(`case_id`, `contact_id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_dedupe_exception
--- *
--- * Dedupe exceptions
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_dedupe_exception` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique dedupe exception id',
-  `contact_id1` int unsigned NOT NULL COMMENT 'FK to Contact ID',
-  `contact_id2` int unsigned NOT NULL COMMENT 'FK to Contact ID',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_contact_id1_contact_id2`(contact_id1, contact_id2),
-  CONSTRAINT FK_civicrm_dedupe_exception_contact_id1 FOREIGN KEY (`contact_id1`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_dedupe_exception_contact_id2 FOREIGN KEY (`contact_id2`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_case_type
--- *
--- * Case type definition
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_case_type` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Autoincremented type id',
   `name` varchar(64) NOT NULL COMMENT 'Machine name for Case Type',
   `title` varchar(64) NOT NULL COMMENT 'Natural language name for Case Type',
   `description` varchar(255) COMMENT 'Description of the Case Type',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this case type enabled?',
-  `is_reserved` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this case type a predefined system type?',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this case type enabled?',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this case type a predefined system type?',
   `weight` int NOT NULL DEFAULT 1 COMMENT 'Ordering of the case types',
   `definition` blob COMMENT 'xml definition of case type',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `case_type_name`(name)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_tell_friend
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_tell_friend` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Friend ID',
-  `entity_table` varchar(64) NOT NULL COMMENT 'Name of table where item being referenced is stored.',
-  `entity_id` int unsigned NOT NULL COMMENT 'Foreign key to the referenced item.',
-  `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.',
-  `general_link` varchar(255) COMMENT 'URL for general info about the organization - included in the email sent to friends.',
-  `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.',
-  `is_active` tinyint NOT NULL DEFAULT 1,
-  PRIMARY KEY (`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_pledge_block
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_pledge_block` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Pledge ID',
-  `entity_table` varchar(64) COMMENT 'physical tablename for entity being joined to pledge, e.g. civicrm_contact',
-  `entity_id` int unsigned NOT NULL COMMENT 'FK to entity table specified in entity_table column.',
-  `pledge_frequency_unit` varchar(128) COMMENT 'Delimited list of supported frequency units',
-  `is_pledge_interval` tinyint NOT NULL DEFAULT 0 COMMENT 'Is frequency interval exposed on the contribution form.',
-  `max_reminders` int unsigned DEFAULT 1 COMMENT 'The maximum number of payment reminders to send for any given payment.',
-  `initial_reminder_day` int unsigned DEFAULT 5 COMMENT 'Send initial reminder this many days prior to the payment due date.',
-  `additional_reminder_day` int unsigned DEFAULT 5 COMMENT 'Send additional reminder this many days after last one sent, up to maximum number of reminders.',
-  `pledge_start_date` varchar(64) COMMENT 'The date the first scheduled pledge occurs.',
-  `is_pledge_start_date_visible` tinyint NOT NULL DEFAULT 0 COMMENT 'If true - recurring start date is shown.',
-  `is_pledge_start_date_editable` tinyint NOT NULL DEFAULT 0 COMMENT 'If true - recurring start date is editable.',
-  PRIMARY KEY (`id`),
-  INDEX `index_entity`(entity_table, entity_id)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_queue
--- *
--- * Stores a list of persistent queues
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_queue` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(64) NOT NULL COMMENT 'Name of the queue',
-  `type` varchar(64) NOT NULL COMMENT 'Type of the queue',
-  `runner` varchar(64) NULL COMMENT 'Name of the task runner',
-  `batch_limit` int unsigned NOT NULL DEFAULT 1 COMMENT 'Maximum number of items in a batch.',
-  `lease_time` int unsigned NOT NULL DEFAULT 3600 COMMENT 'When claiming an item (or batch of items) for work, how long should the item(s) be reserved. (Seconds)',
-  `retry_limit` int NOT NULL DEFAULT 0 COMMENT 'Number of permitted retries. Set to zero (0) to disable.',
-  `retry_interval` int NULL COMMENT 'Number of seconds to wait before retrying a failed execution.',
-  `status` varchar(16) NULL DEFAULT 'active' COMMENT 'Execution status',
-  `error` varchar(16) NULL COMMENT 'Fallback behavior for unhandled errors',
-  `is_template` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this a template configuration (for use by other/future queues)?',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_queue_item
--- *
--- * Stores a list of queue items
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_queue_item` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `queue_name` varchar(64) NOT NULL COMMENT 'Name of the queue which includes this item',
-  `weight` int NOT NULL,
-  `submit_time` timestamp NOT NULL COMMENT 'date on which this item was submitted to the queue',
-  `release_time` timestamp NULL DEFAULT NULL COMMENT 'date on which this job becomes available; null if ASAP',
-  `run_count` int NOT NULL DEFAULT 0 COMMENT 'Number of times execution has been attempted.',
-  `data` longtext COMMENT 'Serialized queue data',
-  PRIMARY KEY (`id`),
-  INDEX `index_queueids`(queue_name, weight, id)
+  UNIQUE INDEX `case_type_name`(`name`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_pcp
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_pcp` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Personal Campaign Page ID',
-  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact ID',
-  `status_id` int unsigned NOT NULL,
-  `title` varchar(255) DEFAULT NULL,
-  `intro_text` text DEFAULT NULL,
-  `page_text` text DEFAULT NULL,
-  `donate_link_text` varchar(255) DEFAULT NULL,
-  `page_id` int unsigned NOT NULL COMMENT 'The Contribution or Event Page which triggered this pcp',
-  `page_type` varchar(64) DEFAULT 'contribute' COMMENT 'The type of PCP this is: contribute or event',
-  `pcp_block_id` int unsigned NOT NULL COMMENT 'The pcp block that this pcp page was created from',
-  `is_thermometer` int unsigned DEFAULT 0,
-  `is_honor_roll` int unsigned DEFAULT 0,
-  `goal_amount` decimal(20,2) COMMENT 'Goal amount of this Personal Campaign Page.',
-  `currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is Personal Campaign Page enabled/active?',
-  `is_notify` tinyint NOT NULL DEFAULT 0 COMMENT 'Notify owner via email when someone donates to page?',
+CREATE TABLE `civicrm_acl_contact_cache` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
+  `user_id` int unsigned COMMENT 'FK to civicrm_contact (could be null for anon user)',
+  `contact_id` int unsigned NOT NULL COMMENT 'FK to civicrm_contact',
+  `operation` varchar(8) NOT NULL COMMENT 'What operation does this user have permission on?',
   PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_pcp_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
+  UNIQUE INDEX `UI_user_contact_operation`(`user_id`, `contact_id`, `operation`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_cxn
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_cxn` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Connection ID',
-  `app_guid` varchar(128) COMMENT 'Application GUID',
-  `app_meta` text COMMENT 'Application Metadata (JSON)',
-  `cxn_guid` varchar(128) COMMENT 'Connection GUID',
-  `secret` text COMMENT 'Shared secret',
-  `perm` text COMMENT 'Permissions approved for the service (JSON)',
-  `options` text COMMENT 'Options for the service (JSON)',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is connection currently enabled?',
-  `created_date` timestamp NULL DEFAULT NULL COMMENT 'When was the connection was created.',
-  `modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When the connection was created or modified.',
-  `fetched_date` timestamp NULL DEFAULT NULL COMMENT 'The last time the application metadata was fetched.',
+CREATE TABLE `civicrm_contact` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Contact ID',
+  `contact_type` varchar(64) COMMENT 'Type of Contact.',
+  `external_identifier` varchar(64) COMMENT 'Unique trusted external ID (generally from a legacy app/datasource). Particularly useful for deduping operations.',
+  `display_name` varchar(128) COMMENT 'Formatted name representing preferred format for display/print/other output.',
+  `organization_name` varchar(128) COMMENT 'Organization Name.',
+  `contact_sub_type` varchar(255) COMMENT 'May be used to over-ride contact view and edit templates.',
+  `first_name` varchar(64) COMMENT 'First Name.',
+  `middle_name` varchar(64) COMMENT 'Middle Name.',
+  `last_name` varchar(64) COMMENT 'Last Name.',
+  `do_not_email` boolean NOT NULL DEFAULT FALSE,
+  `do_not_phone` boolean NOT NULL DEFAULT FALSE,
+  `do_not_mail` boolean NOT NULL DEFAULT FALSE,
+  `do_not_sms` boolean NOT NULL DEFAULT FALSE,
+  `do_not_trade` boolean NOT NULL DEFAULT FALSE,
+  `is_opt_out` boolean NOT NULL DEFAULT FALSE COMMENT 'Has the contact opted out from receiving all bulk email from the organization or site domain?',
+  `legal_identifier` varchar(32) COMMENT 'May be used for SSN, EIN/TIN, Household ID (census) or other applicable unique legal/government ID.',
+  `sort_name` varchar(128) COMMENT 'Name used for sorting different contact types',
+  `nick_name` varchar(128) COMMENT 'Nickname.',
+  `legal_name` varchar(128) COMMENT 'Legal Name.',
+  `image_URL` text COMMENT 'optional URL for preferred image (photo, logo, etc.) to display for this contact.',
+  `preferred_communication_method` varchar(255) COMMENT 'What is the preferred mode of communication.',
+  `preferred_language` varchar(5) COMMENT 'Which language is preferred for communication. FK to languages in civicrm_option_value.',
+  `hash` varchar(32) COMMENT 'Key for validating requests related to this contact.',
+  `api_key` varchar(32) COMMENT 'API Key for validating requests related to this contact.',
+  `source` varchar(255) COMMENT 'where contact come from, e.g. import, donate module insert...',
+  `prefix_id` int unsigned COMMENT 'Prefix or Title for name (Ms, Mr...). FK to prefix ID',
+  `suffix_id` int unsigned COMMENT 'Suffix for name (Jr, Sr...). FK to suffix ID',
+  `formal_title` varchar(64) COMMENT 'Formal (academic or similar) title in front of name. (Prof., Dr. etc.)',
+  `communication_style_id` int unsigned COMMENT 'Communication style (e.g. formal vs. familiar) to use with this contact. FK to communication styles in civicrm_option_value.',
+  `email_greeting_id` int unsigned COMMENT 'FK to civicrm_option_value.id, that has to be valid registered Email Greeting.',
+  `email_greeting_custom` varchar(128) COMMENT 'Custom Email Greeting.',
+  `email_greeting_display` varchar(255) COMMENT 'Cache Email Greeting.',
+  `postal_greeting_id` int unsigned COMMENT 'FK to civicrm_option_value.id, that has to be valid registered Postal Greeting.',
+  `postal_greeting_custom` varchar(128) COMMENT 'Custom Postal greeting.',
+  `postal_greeting_display` varchar(255) COMMENT 'Cache Postal greeting.',
+  `addressee_id` int unsigned COMMENT 'FK to civicrm_option_value.id, that has to be valid registered Addressee.',
+  `addressee_custom` varchar(128) COMMENT 'Custom Addressee.',
+  `addressee_display` varchar(255) COMMENT 'Cache Addressee.',
+  `job_title` varchar(255) COMMENT 'Job Title',
+  `gender_id` int unsigned COMMENT 'FK to gender ID',
+  `birth_date` date COMMENT 'Date of birth',
+  `is_deceased` boolean NOT NULL DEFAULT FALSE,
+  `deceased_date` date COMMENT 'Date of deceased',
+  `household_name` varchar(128) COMMENT 'Household Name.',
+  `primary_contact_id` int unsigned COMMENT 'Optional FK to Primary Contact for this household.',
+  `sic_code` varchar(8) COMMENT 'Standard Industry Classification Code.',
+  `user_unique_id` varchar(255) COMMENT 'the OpenID (or OpenID-style http://username.domain/) unique identifier for this contact mainly used for logging in to CiviCRM',
+  `employer_id` int unsigned COMMENT 'OPTIONAL FK to civicrm_contact record.',
+  `is_deleted` boolean NOT NULL DEFAULT FALSE,
+  `created_date` timestamp NULL DEFAULT NULL COMMENT 'When was the contact was created.',
+  `modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When was the contact (or closely related entity) was created or modified or deleted.',
+  `preferred_mail_format` varchar(8) DEFAULT 'Both' COMMENT 'Deprecated setting for text vs html mailings',
+  PRIMARY KEY (`id`),
+  INDEX `index_contact_type`(`contact_type`),
+  UNIQUE INDEX `UI_external_identifier`(`external_identifier`),
+  INDEX `index_organization_name`(`organization_name`),
+  INDEX `index_contact_sub_type`(`contact_sub_type`),
+  INDEX `index_first_name`(`first_name`),
+  INDEX `index_last_name`(`last_name`),
+  INDEX `index_sort_name`(`sort_name`),
+  INDEX `index_preferred_communication_method`(`preferred_communication_method`),
+  INDEX `index_hash`(`hash`),
+  INDEX `index_api_key`(`api_key`),
+  INDEX `UI_prefix`(`prefix_id`),
+  INDEX `UI_suffix`(`suffix_id`),
+  INDEX `index_communication_style_id`(`communication_style_id`),
+  INDEX `UI_gender`(`gender_id`),
+  INDEX `index_is_deceased`(`is_deceased`),
+  INDEX `index_household_name`(`household_name`),
+  INDEX `index_is_deleted_sort_name`(`is_deleted`, `sort_name`, `id`),
+  INDEX `index_created_date`(`created_date`),
+  INDEX `index_modified_date`(`modified_date`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_contact_type` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Contact Type ID',
+  `name` varchar(64) NOT NULL COMMENT 'Internal name of Contact Type (or Subtype).',
+  `label` varchar(64) COMMENT 'localized Name of Contact Type.',
+  `description` text COMMENT 'localized Optional verbose description of the type.',
+  `image_URL` varchar(255) COMMENT 'URL of image if any.',
+  `icon` varchar(255) DEFAULT NULL COMMENT 'crm-i icon class representing this contact type',
+  `parent_id` int unsigned COMMENT 'Optional FK to parent contact type.',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this entry active?',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this contact type a predefined system type',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `contact_type`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_dashboard_contact` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `dashboard_id` int unsigned NOT NULL COMMENT 'Dashboard ID',
+  `contact_id` int unsigned NOT NULL COMMENT 'Contact ID',
+  `column_no` int DEFAULT 0 COMMENT 'column no for this widget',
+  `is_active` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this widget active?',
+  `weight` int DEFAULT 0 COMMENT 'Ordering of the widgets.',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `index_dashboard_id_contact_id`(`dashboard_id`, `contact_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_group` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Group ID',
+  `name` varchar(64) NOT NULL COMMENT 'Internal name of Group.',
+  `title` varchar(255) NOT NULL COMMENT 'Name of Group.',
+  `description` text COMMENT 'Optional verbose description of the group.',
+  `source` varchar(64) COMMENT 'Module or process which created this group.',
+  `saved_search_id` int unsigned COMMENT 'FK to saved search table.',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this group active?',
+  `visibility` varchar(24) DEFAULT 'User and User Admin Only' COMMENT 'In what context(s) is this field visible.',
+  `where_clause` text COMMENT 'the sql where clause if a saved search acl',
+  `select_tables` text COMMENT 'the tables to be included in a select data',
+  `where_tables` text COMMENT 'the tables to be included in the count statement',
+  `group_type` varchar(128) COMMENT 'FK to group type',
+  `cache_date` timestamp NULL COMMENT 'Date when we created the cache for a smart group',
+  `cache_fill_took` double COMMENT 'Seconds taken to fill smart group cache',
+  `refresh_date` timestamp NULL COMMENT 'Unused deprecated column.',
+  `parents` text COMMENT 'List of parent groups',
+  `children` text COMMENT 'List of child groups (calculated)',
+  `is_hidden` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this group hidden?',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE,
+  `created_id` int unsigned COMMENT 'FK to contact table.',
+  `modified_id` int unsigned COMMENT 'FK to contact table.',
+  `frontend_title` varchar(255) NOT NULL COMMENT 'Alternative public title for this Group.',
+  `frontend_description` text DEFAULT NULL COMMENT 'Alternative public description of the group.',
+  PRIMARY KEY (`id`),
+  INDEX `UI_cache_date`(`cache_date`),
+  INDEX `index_group_type`(`group_type`),
+  UNIQUE INDEX `UI_title`(`title`),
+  UNIQUE INDEX `UI_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_group_contact` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
+  `group_id` int unsigned NOT NULL COMMENT 'FK to civicrm_group',
+  `contact_id` int unsigned NOT NULL COMMENT 'FK to civicrm_contact',
+  `status` varchar(8) COMMENT 'status of contact relative to membership in group',
+  `location_id` int unsigned COMMENT 'Optional location to associate with this membership',
+  `email_id` int unsigned COMMENT 'Optional email to associate with this membership',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_contact_group`(`contact_id`, `group_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_group_contact_cache` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
+  `group_id` int unsigned NOT NULL COMMENT 'FK to civicrm_group',
+  `contact_id` int unsigned NOT NULL COMMENT 'FK to civicrm_contact',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_contact_group`(`contact_id`, `group_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_group_nesting` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Relationship ID',
+  `child_group_id` int unsigned NOT NULL COMMENT 'ID of the child group',
+  `parent_group_id` int unsigned NOT NULL COMMENT 'ID of the parent group',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_group_organization` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Relationship ID',
+  `group_id` int unsigned NOT NULL COMMENT 'ID of the group',
+  `organization_id` int unsigned NOT NULL COMMENT 'ID of the Organization Contact',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_group_organization`(`group_id`, `organization_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_relationship` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Relationship ID',
+  `contact_id_a` int unsigned NOT NULL COMMENT 'id of the first contact',
+  `contact_id_b` int unsigned NOT NULL COMMENT 'id of the second contact',
+  `relationship_type_id` int unsigned NOT NULL COMMENT 'Type of relationship',
+  `start_date` date COMMENT 'date when the relationship started',
+  `end_date` date COMMENT 'date when the relationship ended',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'is the relationship active ?',
+  `description` varchar(255) COMMENT 'Optional verbose description for the relationship.',
+  `is_permission_a_b` int unsigned NOT NULL DEFAULT 0 COMMENT 'Permission that Contact A has to view/update Contact B',
+  `is_permission_b_a` int unsigned NOT NULL DEFAULT 0 COMMENT 'Permission that Contact B has to view/update Contact A',
+  `case_id` int unsigned DEFAULT NULL COMMENT 'FK to civicrm_case',
+  `created_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Relationship created date.',
+  `modified_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Relationship last modified.',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_relationship_cache` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Relationship Cache ID',
+  `relationship_id` int unsigned NOT NULL COMMENT 'id of the relationship (FK to civicrm_relationship.id)',
+  `relationship_type_id` int unsigned NOT NULL COMMENT 'id of the relationship type',
+  `orientation` char(3) NOT NULL COMMENT 'The cache record is a permutation of the original relationship record. The orientation indicates whether it is forward (a_b) or reverse (b_a) relationship.',
+  `near_contact_id` int unsigned NOT NULL COMMENT 'id of the first contact',
+  `near_relation` varchar(64) COMMENT 'name for relationship of near_contact to far_contact.',
+  `far_contact_id` int unsigned NOT NULL COMMENT 'id of the second contact',
+  `far_relation` varchar(64) COMMENT 'name for relationship of far_contact to near_contact.',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'is the relationship active ?',
+  `start_date` date COMMENT 'date when the relationship started',
+  `end_date` date COMMENT 'date when the relationship ended',
+  `case_id` int unsigned DEFAULT NULL COMMENT 'FK to civicrm_case',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_relationship`(`relationship_id`, `orientation`),
+  INDEX `index_nearid_nearrelation`(`near_contact_id`, `near_relation`),
+  INDEX `index_nearid_farrelation`(`near_contact_id`, `far_relation`),
+  INDEX `index_near_relation`(`near_relation`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_relationship_type` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key',
+  `name_a_b` varchar(64) COMMENT 'name for relationship of contact_a to contact_b.',
+  `label_a_b` varchar(64) COMMENT 'label for relationship of contact_a to contact_b.',
+  `name_b_a` varchar(64) COMMENT 'Optional name for relationship of contact_b to contact_a.',
+  `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.',
+  `contact_type_a` varchar(12) COMMENT 'If defined, contact_a in a relationship of this type must be a specific contact_type.',
+  `contact_type_b` varchar(12) COMMENT 'If defined, contact_b in a relationship of this type must be a specific contact_type.',
+  `contact_sub_type_a` varchar(64) COMMENT 'If defined, contact_sub_type_a in a relationship of this type must be a specific contact_sub_type.',
+  `contact_sub_type_b` varchar(64) COMMENT 'If defined, contact_sub_type_b in a relationship of this type must be a specific contact_sub_type.',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this relationship type a predefined system type (can not be changed or de-activated)?',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this relationship type currently active (i.e. can be used when creating or editing relationships)?',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_name_a_b`(`name_a_b`),
+  UNIQUE INDEX `UI_name_b_a`(`name_b_a`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_saved_search` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Saved Search ID',
+  `name` varchar(255) DEFAULT NULL COMMENT 'Unique name of saved search',
+  `label` varchar(255) DEFAULT NULL COMMENT 'Administrative label for search',
+  `form_values` text COMMENT 'Submitted form values for this search',
+  `mapping_id` int unsigned COMMENT 'Foreign key to civicrm_mapping used for saved search-builder searches.',
+  `search_custom_id` int unsigned COMMENT 'Foreign key to civicrm_option value table used for saved custom searches.',
+  `api_entity` varchar(255) COMMENT 'Entity name for API based search',
+  `api_params` text COMMENT 'Parameters for API based search',
+  `created_id` int unsigned COMMENT 'FK to contact table.',
+  `modified_id` int unsigned COMMENT 'FK to contact table.',
+  `expires_date` timestamp NULL COMMENT 'Optional date after which the search is not needed',
+  `created_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When the search was created.',
+  `modified_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When the search was last modified.',
+  `description` text,
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_subscription_history` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Internal ID',
+  `contact_id` int unsigned NOT NULL COMMENT 'Contact ID',
+  `group_id` int unsigned COMMENT 'Group ID',
+  `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Date of the (un)subscription',
+  `method` varchar(8) COMMENT 'How the (un)subscription was triggered',
+  `status` varchar(8) COMMENT 'The state of the contact within the group',
+  `tracking` varchar(255) COMMENT 'IP address or other tracking info',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_contribution` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Contribution ID',
+  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact ID',
+  `financial_type_id` int unsigned COMMENT 'FK to Financial Type for (total_amount - non_deductible_amount).',
+  `contribution_page_id` int unsigned COMMENT 'The Contribution Page which triggered this contribution',
+  `payment_instrument_id` int unsigned COMMENT 'FK to Payment Instrument',
+  `receive_date` datetime,
+  `non_deductible_amount` decimal(20,2) DEFAULT '0' COMMENT 'Portion of total amount which is NOT tax deductible. Equal to total_amount for non-deductible financial types.',
+  `total_amount` decimal(20,2) NOT NULL COMMENT 'Total amount of this contribution. Use market value for non-monetary gifts.',
+  `fee_amount` decimal(20,2) COMMENT 'actual processor fee if known - may be 0.',
+  `net_amount` decimal(20,2) COMMENT 'actual funds transfer amount. total less fees. if processor does not report actual fee during transaction, this is set to total_amount.',
+  `trxn_id` varchar(255) COMMENT 'unique transaction id. may be processor id, bank id + trans id, or account number + check number... depending on payment_method',
+  `invoice_id` varchar(255) COMMENT 'unique invoice id, system generated or passed in',
+  `invoice_number` varchar(255) COMMENT 'Human readable invoice number',
+  `currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.',
+  `cancel_date` datetime COMMENT 'when was gift cancelled',
+  `cancel_reason` text,
+  `receipt_date` datetime COMMENT 'when (if) receipt was sent. populated automatically for online donations w/ automatic receipting',
+  `thankyou_date` datetime COMMENT 'when (if) was donor thanked',
+  `source` varchar(255) COMMENT 'Origin of this Contribution.',
+  `amount_level` text,
+  `contribution_recur_id` int unsigned COMMENT 'Conditional foreign key to civicrm_contribution_recur id. Each contribution made in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events.',
+  `is_test` boolean NOT NULL DEFAULT FALSE,
+  `is_pay_later` boolean NOT NULL DEFAULT FALSE,
+  `contribution_status_id` int unsigned DEFAULT 1,
+  `address_id` int unsigned COMMENT 'Conditional foreign key to civicrm_address.id. We insert an address record for each contribution when we have associated billing name and address data.',
+  `check_number` varchar(255),
+  `campaign_id` int unsigned COMMENT 'The campaign for which this contribution has been triggered.',
+  `creditnote_id` varchar(255) COMMENT 'unique credit note id, system generated or passed in',
+  `tax_amount` decimal(20,2) NOT NULL DEFAULT '0' COMMENT 'Total tax amount of this contribution.',
+  `revenue_recognition_date` datetime COMMENT 'Stores the date when revenue should be recognized.',
+  `is_template` boolean NOT NULL DEFAULT FALSE COMMENT 'Shows this is a template for recurring contributions.',
+  PRIMARY KEY (`id`),
+  INDEX `UI_contrib_payment_instrument_id`(`payment_instrument_id`),
+  INDEX `index_total_amount_receive_date`(`total_amount`, `receive_date`),
+  INDEX `index_source`(`source`),
+  UNIQUE INDEX `UI_contrib_trxn_id`(`trxn_id`),
+  UNIQUE INDEX `UI_contrib_invoice_id`(`invoice_id`),
+  INDEX `index_contribution_status`(`contribution_status_id`),
+  INDEX `received_date`(`receive_date`),
+  INDEX `check_number`(`check_number`),
+  INDEX `index_creditnote_id`(`creditnote_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_contribution_page` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Contribution ID',
+  `title` varchar(255) NOT NULL COMMENT 'Contribution Page title. For top of page display',
+  `frontend_title` varchar(255) NOT NULL COMMENT 'Contribution Page Public title',
+  `name` varchar(255) NOT NULL COMMENT 'Unique name for identifying contribution page',
+  `intro_text` text COMMENT 'Text and html allowed. Displayed below title.',
+  `financial_type_id` int unsigned COMMENT 'default financial type assigned to contributions submitted via this page, e.g. Contribution, Campaign Contribution',
+  `payment_processor` varchar(128) COMMENT 'Payment Processors configured for this contribution Page',
+  `is_credit_card_only` boolean NOT NULL DEFAULT FALSE COMMENT 'if true - processing logic must reject transaction at confirmation stage if pay method != credit card',
+  `is_monetary` boolean NOT NULL DEFAULT TRUE COMMENT 'if true - allows real-time monetary transactions otherwise non-monetary transactions',
+  `is_recur` boolean NOT NULL DEFAULT FALSE COMMENT 'if true - allows recurring contributions, valid only for PayPal_Standard',
+  `is_confirm_enabled` boolean NOT NULL DEFAULT TRUE COMMENT 'if FALSE, the confirm page in contribution pages gets skipped',
+  `recur_frequency_unit` varchar(128) COMMENT 'Supported recurring frequency units.',
+  `is_recur_interval` boolean NOT NULL DEFAULT FALSE COMMENT 'if true - supports recurring intervals',
+  `is_recur_installments` boolean NOT NULL DEFAULT FALSE COMMENT 'if true - asks user for recurring installments',
+  `adjust_recur_start_date` boolean NOT NULL DEFAULT FALSE COMMENT 'if true - user is able to adjust payment start date',
+  `is_pay_later` boolean NOT NULL DEFAULT FALSE COMMENT 'if true - allows the user to send payment directly to the org later',
+  `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',
+  `is_partial_payment` boolean DEFAULT FALSE COMMENT 'is partial payment enabled for this online contribution page',
+  `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',
+  `min_initial_amount` decimal(20,2) COMMENT 'Minimum initial amount for partial payment',
+  `is_allow_other_amount` boolean NOT NULL DEFAULT FALSE COMMENT 'if TRUE, page will include an input text field where user can enter their own amount',
+  `default_amount_id` int unsigned COMMENT 'FK to civicrm_option_value.',
+  `min_amount` decimal(20,2) COMMENT 'if other amounts allowed, user can configure minimum allowed.',
+  `max_amount` decimal(20,2) COMMENT 'if other amounts allowed, user can configure maximum allowed.',
+  `goal_amount` decimal(20,2) COMMENT 'The target goal for this page, allows people to build a goal meter',
+  `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.',
+  `is_email_receipt` boolean NOT NULL DEFAULT FALSE COMMENT 'if TRUE, receipt is automatically emailed to contact on success',
+  `receipt_from_name` varchar(255) COMMENT 'FROM email name used for receipts generated by contributions to this contribution page.',
+  `receipt_from_email` varchar(255) COMMENT 'FROM email address used for receipts generated by contributions to this contribution page.',
+  `cc_receipt` varchar(255) COMMENT 'comma-separated list of email addresses to cc each time a receipt is sent',
+  `bcc_receipt` varchar(255) COMMENT 'comma-separated list of email addresses to bcc each time a receipt is sent',
+  `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',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this page active?',
+  `footer_text` text COMMENT 'Text and html allowed. Displayed at the bottom of the first page of the contribution wizard.',
+  `amount_block_is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this property active?',
+  `start_date` datetime COMMENT 'Date and time that this page starts.',
+  `end_date` datetime COMMENT 'Date and time that this page ends. May be NULL if no defined end date/time',
+  `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this contribution page',
+  `created_date` datetime COMMENT 'Date and time that contribution page was created.',
+  `currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.',
+  `campaign_id` int unsigned COMMENT 'The campaign for which we are collecting contributions with this page.',
+  `is_share` boolean NOT NULL DEFAULT TRUE COMMENT 'Can people share the contribution page through social media?',
+  `is_billing_required` boolean NOT NULL DEFAULT FALSE COMMENT 'if true - billing block is required for online contribution page',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_contribution_product` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `product_id` int unsigned NOT NULL,
+  `contribution_id` int unsigned NOT NULL,
+  `product_option` varchar(255) COMMENT 'Option value selected if applicable - e.g. color, size etc.',
+  `quantity` int,
+  `fulfilled_date` date COMMENT 'Optional. Can be used to record the date this product was fulfilled or shipped.',
+  `start_date` date COMMENT 'Actual start date for a time-delimited premium (subscription, service or membership)',
+  `end_date` date COMMENT 'Actual end date for a time-delimited premium (subscription, service or membership)',
+  `comment` text,
+  `financial_type_id` int unsigned DEFAULT NULL COMMENT 'FK to Financial Type(for membership price sets only).',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_contribution_recur` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Contribution Recur ID',
+  `contact_id` int unsigned NOT NULL COMMENT 'Foreign key to civicrm_contact.id.',
+  `amount` decimal(20,2) NOT NULL COMMENT 'Amount to be collected (including any sales tax) by payment processor each recurrence.',
+  `currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.',
+  `frequency_unit` varchar(8) DEFAULT 'month' COMMENT 'Time units for recurrence of payment.',
+  `frequency_interval` int unsigned NOT NULL DEFAULT 1 COMMENT 'Number of time units for recurrence of payment.',
+  `installments` int unsigned COMMENT 'Total number of payments to be made. Set this to 0 if this is an open-ended commitment i.e. no set end date.',
+  `start_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'The date the first scheduled recurring contribution occurs.',
+  `create_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When this recurring contribution record was created.',
+  `modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Last updated date for this record. mostly the last time a payment was received',
+  `cancel_date` datetime COMMENT 'Date this recurring contribution was cancelled by contributor- if we can get access to it',
+  `cancel_reason` text COMMENT 'Free text field for a reason for cancelling',
+  `end_date` datetime COMMENT 'Date this recurring contribution finished successfully',
+  `processor_id` varchar(255) COMMENT 'Possibly needed to store a unique identifier for this recurring payment order - if this is available from the processor??',
+  `payment_token_id` int unsigned COMMENT 'Optionally used to store a link to a payment token used for this recurring contribution.',
+  `trxn_id` varchar(255) COMMENT 'unique transaction id (deprecated - use processor_id)',
+  `invoice_id` varchar(255) COMMENT 'unique invoice id, system generated or passed in',
+  `contribution_status_id` int unsigned DEFAULT 2,
+  `is_test` boolean NOT NULL DEFAULT FALSE,
+  `cycle_day` int unsigned NOT NULL DEFAULT 1 COMMENT 'Day in the period when the payment should be charged e.g. 1st of month, 15th etc.',
+  `next_sched_contribution_date` datetime COMMENT 'Next scheduled date',
+  `failure_count` int unsigned DEFAULT 0 COMMENT 'Number of failed charge attempts since last success. Business rule could be set to deactivate on more than x failures.',
+  `failure_retry_date` datetime COMMENT 'Date to retry failed attempt',
+  `auto_renew` boolean NOT NULL DEFAULT FALSE COMMENT 'Some systems allow contributor to set a number of installments - but then auto-renew the subscription or commitment if they do not cancel.',
+  `payment_processor_id` int unsigned COMMENT 'Foreign key to civicrm_payment_processor.id',
+  `financial_type_id` int unsigned COMMENT 'FK to Financial Type',
+  `payment_instrument_id` int unsigned COMMENT 'FK to Payment Instrument',
+  `campaign_id` int unsigned COMMENT 'The campaign for which this contribution has been triggered.',
+  `is_email_receipt` boolean NOT NULL DEFAULT TRUE COMMENT 'if TRUE, receipt is automatically emailed to contact on each successful payment',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_contrib_trxn_id`(`trxn_id`),
+  UNIQUE INDEX `UI_contrib_invoice_id`(`invoice_id`),
+  INDEX `index_contribution_status`(`contribution_status_id`),
+  INDEX `UI_contribution_recur_payment_instrument_id`(`payment_instrument_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_contribution_soft` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Soft Credit ID',
+  `contribution_id` int unsigned NOT NULL COMMENT 'FK to contribution table.',
+  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact ID',
+  `amount` decimal(20,2) NOT NULL COMMENT 'Amount of this soft credit.',
+  `currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.',
+  `pcp_id` int unsigned DEFAULT NULL COMMENT 'FK to civicrm_pcp.id',
+  `pcp_display_in_roll` boolean NOT NULL DEFAULT FALSE,
+  `pcp_roll_nickname` varchar(255) DEFAULT NULL,
+  `pcp_personal_note` varchar(255) DEFAULT NULL,
+  `soft_credit_type_id` int unsigned DEFAULT NULL COMMENT 'Soft Credit Type ID.Implicit FK to civicrm_option_value where option_group = soft_credit_type.',
+  PRIMARY KEY (`id`),
+  INDEX `index_id`(`pcp_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_premiums` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `entity_table` varchar(64) NOT NULL COMMENT 'Joins these premium settings to another object. Always civicrm_contribution_page for now.',
+  `entity_id` int unsigned NOT NULL,
+  `premiums_active` boolean NOT NULL DEFAULT FALSE COMMENT 'Is the Premiums feature enabled for this page?',
+  `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_contact_email` varchar(100) COMMENT 'This email address is included in receipts if it is populated and a premium has been selected.',
+  `premiums_contact_phone` varchar(50) COMMENT 'This phone number is included in receipts if it is populated and a premium has been selected.',
+  `premiums_display_min_contribution` boolean NOT NULL DEFAULT FALSE COMMENT 'Boolean. Should we automatically display minimum contribution amount text after the premium descriptions.',
+  `premiums_nothankyou_label` varchar(255) COMMENT 'Label displayed for No Thank-you option in premiums block (e.g. No thank you)',
+  `premiums_nothankyou_position` int unsigned DEFAULT 1,
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_premiums_product` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Contribution ID',
+  `premiums_id` int unsigned NOT NULL COMMENT 'Foreign key to premiums settings record.',
+  `product_id` int unsigned NOT NULL COMMENT 'Foreign key to each product object.',
+  `weight` int unsigned NOT NULL,
+  `financial_type_id` int unsigned DEFAULT NULL COMMENT 'FK to Financial Type.',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_product` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL COMMENT 'Required product/premium name',
+  `description` text COMMENT 'Optional description of the product/premium.',
+  `sku` varchar(50) COMMENT 'Optional product sku or code.',
+  `options` text COMMENT 'Store comma-delimited list of color, size, etc. options for the product.',
+  `image` varchar(255) COMMENT 'Full or relative URL to uploaded image - fullsize.',
+  `thumbnail` varchar(255) COMMENT 'Full or relative URL to image thumbnail.',
+  `price` decimal(20,2) COMMENT 'Sell price or market value for premiums. For tax-deductible contributions, this will be stored as non_deductible_amount in the contribution record.',
+  `currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.',
+  `financial_type_id` int unsigned DEFAULT NULL COMMENT 'FK to Financial Type.',
+  `min_contribution` decimal(20,2) COMMENT 'Minimum contribution required to be eligible to select this premium.',
+  `cost` decimal(20,2) COMMENT 'Actual cost of this product. Useful to determine net return from sale or using this as an incentive.',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Disabling premium removes it from the premiums_premium join table below.',
+  `period_type` varchar(8) DEFAULT 'rolling' COMMENT 'Rolling means we set start/end based on current day, fixed means we set start/end for current year or month (e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006)',
+  `fixed_period_start_day` int DEFAULT 101 COMMENT 'Month and day (MMDD) that fixed period type subscription or membership starts.',
+  `duration_unit` varchar(8) DEFAULT 'year',
+  `duration_interval` int COMMENT 'Number of units for total duration of subscription, service, membership (e.g. 12 Months).',
+  `frequency_unit` varchar(8) DEFAULT 'month' COMMENT 'Frequency unit and interval allow option to store actual delivery frequency for a subscription or service.',
+  `frequency_interval` int COMMENT 'Number of units for delivery frequency of subscription, service, membership (e.g. every 3 Months).',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_contribution_widget` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Contribution ID',
+  `contribution_page_id` int unsigned COMMENT 'The Contribution Page which triggered this contribution',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this property active?',
+  `title` varchar(255) COMMENT 'Widget title.',
+  `url_logo` varchar(255) COMMENT 'URL to Widget logo',
+  `button_title` varchar(255) COMMENT 'Button title.',
+  `about` text COMMENT 'About description.',
+  `url_homepage` varchar(255) COMMENT 'URL to Homepage.',
+  `color_title` varchar(10),
+  `color_button` varchar(10),
+  `color_bar` varchar(10),
+  `color_main_text` varchar(10),
+  `color_main` varchar(10),
+  `color_main_bg` varchar(10),
+  `color_bg` varchar(10),
+  `color_about_link` varchar(10),
+  `color_homepage_link` varchar(10),
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_action_log` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `contact_id` int unsigned COMMENT 'FK to Contact ID',
+  `entity_id` int unsigned NOT NULL COMMENT 'FK to id of the entity that the action was performed on. Pseudo - FK.',
+  `entity_table` varchar(255) COMMENT 'name of the entity table for the above id, e.g. civicrm_activity, civicrm_participant',
+  `action_schedule_id` int unsigned NOT NULL COMMENT 'FK to the action schedule that this action originated from.',
+  `action_date_time` datetime COMMENT 'date time that the action was performed on.',
+  `is_error` boolean NOT NULL DEFAULT FALSE COMMENT 'Was there any error sending the reminder?',
+  `message` text COMMENT 'Description / text in case there was an error encountered.',
+  `repetition_number` int unsigned COMMENT 'Keeps track of the sequence number of this repetition.',
+  `reference_date` datetime DEFAULT NULL COMMENT 'Stores the date from the entity which triggered this reminder action (e.g. membership.end_date for most membership renewal reminders)',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_action_schedule` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(128) NOT NULL COMMENT 'Name of the scheduled action',
+  `title` varchar(64) COMMENT 'Title of the action(reminder)',
+  `recipient` varchar(64) COMMENT 'Recipient',
+  `limit_to` int COMMENT 'Is this the recipient criteria limited to OR in addition to?',
+  `entity_value` varchar(255) COMMENT 'Entity value',
+  `entity_status` varchar(64) COMMENT 'Entity status',
+  `start_action_offset` int unsigned DEFAULT 0 COMMENT 'Reminder Interval.',
+  `start_action_unit` varchar(8) COMMENT 'Time units for reminder.',
+  `start_action_condition` varchar(64) COMMENT 'Reminder Action',
+  `start_action_date` varchar(64) COMMENT 'Entity date',
+  `is_repeat` boolean NOT NULL DEFAULT FALSE,
+  `repetition_frequency_unit` varchar(8) COMMENT 'Time units for repetition of reminder.',
+  `repetition_frequency_interval` int unsigned DEFAULT 0 COMMENT 'Time interval for repeating the reminder.',
+  `end_frequency_unit` varchar(8) COMMENT 'Time units till repetition of reminder.',
+  `end_frequency_interval` int unsigned DEFAULT 0 COMMENT 'Time interval till repeating the reminder.',
+  `end_action` varchar(32) COMMENT 'Reminder Action till repeating the reminder.',
+  `end_date` varchar(64) COMMENT 'Entity end date',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this option active?',
+  `recipient_manual` varchar(128) COMMENT 'Contact IDs to which reminder should be sent.',
+  `recipient_listing` varchar(128) COMMENT 'listing based on recipient field.',
+  `body_text` longtext COMMENT 'Body of the mailing in text format.',
+  `body_html` longtext COMMENT 'Body of the mailing in html format.',
+  `sms_body_text` longtext COMMENT 'Content of the SMS text.',
+  `subject` varchar(128) COMMENT 'Subject of mailing',
+  `record_activity` boolean NOT NULL DEFAULT FALSE COMMENT 'Record Activity for this reminder?',
+  `mapping_id` varchar(64) COMMENT 'Name/ID of the mapping to use on this table',
+  `group_id` int unsigned COMMENT 'FK to Group',
+  `msg_template_id` int unsigned COMMENT 'FK to the message template.',
+  `sms_template_id` int unsigned COMMENT 'FK to the message template.',
+  `absolute_date` date COMMENT 'Date on which the reminder be sent.',
+  `from_name` varchar(255) COMMENT 'Name in \"from\" field',
+  `from_email` varchar(255) COMMENT 'Email address in \"from\" field',
+  `mode` varchar(128) DEFAULT 'Email' COMMENT 'Send the message as email or sms or both.',
+  `sms_provider_id` int unsigned,
+  `used_for` varchar(64) COMMENT 'Used for repeating entity',
+  `filter_contact_language` varchar(128) COMMENT 'Used for multilingual installation',
+  `communication_language` varchar(8) COMMENT 'Used for multilingual installation',
+  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When was the scheduled reminder created.',
+  `modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When the reminder was created or modified.',
+  `effective_start_date` timestamp NULL COMMENT 'Earliest date to consider start events from.',
+  `effective_end_date` timestamp NULL COMMENT 'Latest date to consider end events from.',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_address` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Address ID',
+  `contact_id` int unsigned COMMENT 'FK to Contact ID',
+  `location_type_id` int unsigned COMMENT 'Which Location does this address belong to.',
+  `is_primary` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this the primary address.',
+  `is_billing` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this the billing address.',
+  `street_address` varchar(96) COMMENT 'Concatenation of all routable street address components (prefix, street number, street name, suffix, unit number OR P.O. Box). Apps should be able to determine physical location with this data (for mapping, mail delivery, etc.).',
+  `street_number` int COMMENT 'Numeric portion of address number on the street, e.g. For 112A Main St, the street_number = 112.',
+  `street_number_suffix` varchar(8) COMMENT 'Non-numeric portion of address number on the street, e.g. For 112A Main St, the street_number_suffix = A',
+  `street_number_predirectional` varchar(8) COMMENT 'Directional prefix, e.g. SE Main St, SE is the prefix.',
+  `street_name` varchar(64) COMMENT 'Actual street name, excluding St, Dr, Rd, Ave, e.g. For 112 Main St, the street_name = Main.',
+  `street_type` varchar(8) COMMENT 'St, Rd, Dr, etc.',
+  `street_number_postdirectional` varchar(8) COMMENT 'Directional prefix, e.g. Main St S, S is the suffix.',
+  `street_unit` varchar(16) COMMENT 'Secondary unit designator, e.g. Apt 3 or Unit # 14, or Bldg 1200',
+  `supplemental_address_1` varchar(96) COMMENT 'Supplemental Address Information, Line 1',
+  `supplemental_address_2` varchar(96) COMMENT 'Supplemental Address Information, Line 2',
+  `supplemental_address_3` varchar(96) COMMENT 'Supplemental Address Information, Line 3',
+  `city` varchar(64) COMMENT 'City, Town or Village Name.',
+  `county_id` int unsigned COMMENT 'Which County does this address belong to.',
+  `state_province_id` int unsigned COMMENT 'Which State_Province does this address belong to.',
+  `postal_code_suffix` varchar(12) COMMENT 'Store the suffix, like the +4 part in the USPS system.',
+  `postal_code` varchar(64) COMMENT 'Store both US (zip5) AND international postal codes. App is responsible for country/region appropriate validation.',
+  `usps_adc` varchar(32) COMMENT 'USPS Bulk mailing code.',
+  `country_id` int unsigned COMMENT 'Which Country does this address belong to.',
+  `geo_code_1` double COMMENT 'Latitude',
+  `geo_code_2` double COMMENT 'Longitude',
+  `manual_geo_code` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this a manually entered geo code',
+  `timezone` varchar(8) COMMENT 'Timezone expressed as a UTC offset - e.g. United States CST would be written as \"UTC-6\".',
+  `name` varchar(255),
+  `master_id` int unsigned COMMENT 'FK to Address ID',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_appid`(app_guid),
-  UNIQUE INDEX `UI_keypair_cxnid`(cxn_guid)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_cache
--- *
--- * Table to cache items for civicrm components.
--- *
--- *******************************************************/
+  INDEX `index_location_type`(`location_type_id`),
+  INDEX `index_is_primary`(`is_primary`),
+  INDEX `index_is_billing`(`is_billing`),
+  INDEX `index_street_name`(`street_name`),
+  INDEX `index_city`(`city`),
+  INDEX `index_geo_code_1_geo_code_2`(`geo_code_1`, `geo_code_2`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_address_format` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Address Format ID',
+  `format` text COMMENT 'The format of an address',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_cache` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique table ID',
   `group_name` varchar(32) NOT NULL COMMENT 'group name for cache element, useful in cleaning cache elements',
   `path` varchar(255) COMMENT 'Unique path name for cache element',
   `data` longtext COMMENT 'data associated with this path',
   `component_id` int unsigned COMMENT 'Component that this menu item belongs to',
-  `created_date` timestamp DEFAULT CURRENT_TIMESTAMP COMMENT 'When was the cache item created',
+  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When was the cache item created',
   `expired_date` timestamp NULL DEFAULT NULL COMMENT 'When should the cache item expire',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_group_name_path`(group_name, path),
-  INDEX `index_expired_date`(expired_date),
-  CONSTRAINT FK_civicrm_cache_component_id FOREIGN KEY (`component_id`) REFERENCES `civicrm_component`(`id`)
+  UNIQUE INDEX `UI_group_name_path`(`group_name`, `path`),
+  INDEX `index_expired_date`(`expired_date`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_component` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Component ID',
+  `name` varchar(64) NOT NULL COMMENT 'Name of the component.',
+  `namespace` varchar(128) COMMENT 'Path to components main directory in a form of a class namespace.',
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_country
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_country` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Country ID',
   `name` varchar(64) COMMENT 'Country Name',
@@ -1370,60 +998,22 @@ CREATE TABLE `civicrm_country` (
   `idd_prefix` varchar(4) COMMENT 'International direct dialing prefix from within the country TO another country',
   `ndd_prefix` varchar(4) COMMENT 'Access prefix to call within a country to a different area',
   `region_id` int unsigned NOT NULL COMMENT 'Foreign key to civicrm_worldregion.id.',
-  `is_province_abbreviated` tinyint NOT NULL DEFAULT 0 COMMENT 'Should state/province be displayed as abbreviation for contacts from this country?',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this Country active?',
+  `is_province_abbreviated` boolean NOT NULL DEFAULT FALSE COMMENT 'Should state/province be displayed as abbreviation for contacts from this country?',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this Country active?',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name_iso_code`(name, iso_code),
-  CONSTRAINT FK_civicrm_country_address_format_id FOREIGN KEY (`address_format_id`) REFERENCES `civicrm_address_format`(`id`),
-  CONSTRAINT FK_civicrm_country_region_id FOREIGN KEY (`region_id`) REFERENCES `civicrm_worldregion`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_custom_group
--- *
--- * All extended (custom) properties are associated with a group. These are logical sets of related data.
-  
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_custom_group` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Custom Group ID',
-  `name` varchar(64) COMMENT 'Variable name/programmatic handle for this group.',
-  `title` varchar(64) NOT NULL COMMENT 'Friendly Name.',
-  `extends` varchar(255) DEFAULT 'Contact' COMMENT 'Type of object this group extends (can add other options later e.g. contact_address, etc.).',
-  `extends_entity_column_id` int unsigned DEFAULT NULL COMMENT 'FK to civicrm_option_value.value (for option group custom_data_type)',
-  `extends_entity_column_value` varchar(255) COMMENT 'linking custom group for dynamic object',
-  `style` varchar(15) COMMENT 'Visual relationship between this form and its parent.',
-  `collapse_display` tinyint NOT NULL DEFAULT 0 COMMENT 'Will this group be in collapsed or expanded mode on initial display ?',
-  `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.',
-  `weight` int NOT NULL DEFAULT 1 COMMENT 'Controls display order when multiple extended property groups are setup for the same class.',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this property active?',
-  `table_name` varchar(255) COMMENT 'Name of the table that holds the values for this group.',
-  `is_multiple` tinyint NOT NULL DEFAULT 0 COMMENT 'Does this group hold multiple values?',
-  `min_multiple` int unsigned COMMENT 'minimum number of multiple records (typically 0?)',
-  `max_multiple` int unsigned COMMENT 'maximum number of multiple records, if 0 - no max',
-  `collapse_adv_display` tinyint NOT NULL DEFAULT 0 COMMENT 'Will this group be in collapsed or expanded mode on advanced search display ?',
-  `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this custom group',
-  `created_date` datetime COMMENT 'Date and time this custom group was created.',
-  `is_reserved` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this a reserved Custom Group?',
-  `is_public` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this property public?',
-  `icon` varchar(255) DEFAULT NULL COMMENT 'crm-i icon class',
+  UNIQUE INDEX `UI_name_iso_code`(`name`, `iso_code`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_county` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'County ID',
+  `name` varchar(64) COMMENT 'Name of County',
+  `abbreviation` varchar(4) COMMENT '2-4 Character Abbreviation of County',
+  `state_province_id` int unsigned NOT NULL COMMENT 'ID of State/Province that County belongs',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this County active?',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_title_extends`(title, extends),
-  UNIQUE INDEX `UI_name`(name),
-  CONSTRAINT FK_civicrm_custom_group_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_custom_field
--- *
--- * Stores info about an extended (custom) property (data and form field info).
--- *
--- *******************************************************/
+  UNIQUE INDEX `UI_name_state_id`(`name`, `state_province_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_custom_field` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Custom Field ID',
   `custom_group_id` int unsigned NOT NULL COMMENT 'FK to civicrm_custom_group.',
@@ -1432,15 +1022,15 @@ CREATE TABLE `civicrm_custom_field` (
   `data_type` varchar(16) NOT NULL COMMENT 'Controls location of data storage in extended_data table.',
   `html_type` varchar(32) NOT NULL COMMENT 'HTML types plus several built-in extended types.',
   `default_value` varchar(255) COMMENT 'Use form_options.is_default for field_types which use options.',
-  `is_required` tinyint NOT NULL DEFAULT 0 COMMENT 'Is a value required for this property.',
-  `is_searchable` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this property searchable.',
-  `is_search_range` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this property range searchable.',
+  `is_required` boolean NOT NULL DEFAULT FALSE COMMENT 'Is a value required for this property.',
+  `is_searchable` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this property searchable.',
+  `is_search_range` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this property range searchable.',
   `weight` int NOT NULL DEFAULT 1 COMMENT 'Controls field display order within an extended property group.',
   `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.',
-  `attributes` varchar(255) COMMENT 'Store collection of type-appropriate attributes, e.g. textarea  needs rows/cols attributes',
-  `is_active` tinyint DEFAULT 1 COMMENT 'Is this property active?',
-  `is_view` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this property set by PHP Code? A code field is viewable but not editable',
+  `attributes` varchar(255) COMMENT 'Store collection of type-appropriate attributes, e.g. textarea needs rows/cols attributes',
+  `is_active` boolean DEFAULT TRUE COMMENT 'Is this property active?',
+  `is_view` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this property set by PHP Code? A code field is viewable but not editable',
   `options_per_line` int unsigned COMMENT 'number of options per line for checkbox and radio',
   `text_length` int unsigned COMMENT 'field length if alphanumeric',
   `start_date_years` int COMMENT 'Date may be up to start_date_years years prior to the current date.',
@@ -1453,23 +1043,70 @@ CREATE TABLE `civicrm_custom_field` (
   `option_group_id` int unsigned COMMENT 'For elements with options, the option group id that is used',
   `serialize` int unsigned NOT NULL DEFAULT 0 COMMENT 'Serialization method - a non-zero value indicates a multi-valued field.',
   `filter` varchar(255) COMMENT 'Stores Contact Get API params contact reference custom fields. May be used for other filters in the future.',
-  `in_selector` tinyint NOT NULL DEFAULT 0 COMMENT 'Should the multi-record custom field values be displayed in tab table listing',
+  `in_selector` boolean NOT NULL DEFAULT FALSE COMMENT 'Should the multi-record custom field values be displayed in tab table listing',
   `fk_entity` varchar(255) DEFAULT NULL COMMENT 'Name of entity being referenced.',
+  `fk_entity_on_delete` varchar(255) NOT NULL DEFAULT 'set_null' COMMENT 'Behavior if referenced entity is deleted.',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_label_custom_group_id`(`label`, `custom_group_id`),
+  UNIQUE INDEX `UI_name_custom_group_id`(`name`, `custom_group_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_custom_group` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Custom Group ID',
+  `name` varchar(64) COMMENT 'Variable name/programmatic handle for this group.',
+  `title` varchar(64) NOT NULL COMMENT 'Friendly Name.',
+  `extends` varchar(255) DEFAULT 'Contact' COMMENT 'Type of object this group extends (can add other options later e.g. contact_address, etc.).',
+  `extends_entity_column_id` int unsigned DEFAULT NULL COMMENT 'FK to civicrm_option_value.value (for option group custom_data_type)',
+  `extends_entity_column_value` varchar(255) COMMENT 'linking custom group for dynamic object',
+  `style` varchar(15) COMMENT 'Visual relationship between this form and its parent.',
+  `collapse_display` boolean NOT NULL DEFAULT FALSE COMMENT 'Will this group be in collapsed or expanded mode on initial display ?',
+  `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.',
+  `weight` int NOT NULL DEFAULT 1 COMMENT 'Controls display order when multiple extended property groups are setup for the same class.',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this property active?',
+  `table_name` varchar(255) COMMENT 'Name of the table that holds the values for this group.',
+  `is_multiple` boolean NOT NULL DEFAULT FALSE COMMENT 'Does this group hold multiple values?',
+  `min_multiple` int unsigned COMMENT 'minimum number of multiple records (typically 0?)',
+  `max_multiple` int unsigned COMMENT 'maximum number of multiple records, if 0 - no max',
+  `collapse_adv_display` boolean NOT NULL DEFAULT FALSE COMMENT 'Will this group be in collapsed or expanded mode on advanced search display ?',
+  `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this custom group',
+  `created_date` datetime COMMENT 'Date and time this custom group was created.',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this a reserved Custom Group?',
+  `is_public` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this property public?',
+  `icon` varchar(255) DEFAULT NULL COMMENT 'crm-i icon class',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_title_extends`(`title`, `extends`),
+  UNIQUE INDEX `UI_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_dashboard` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `domain_id` int unsigned NOT NULL COMMENT 'Domain for dashboard',
+  `name` varchar(64) COMMENT 'Internal name of dashlet.',
+  `label` varchar(255) COMMENT 'dashlet title',
+  `url` varchar(255) COMMENT 'url in case of external dashlet',
+  `permission` varchar(255) COMMENT 'Permission for the dashlet',
+  `permission_operator` varchar(3) COMMENT 'Permission Operator',
+  `fullscreen_url` varchar(255) COMMENT 'fullscreen url for dashlet',
+  `is_active` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this dashlet active?',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this dashlet reserved?',
+  `cache_minutes` int unsigned NOT NULL DEFAULT 60 COMMENT 'Number of minutes to cache dashlet content in browser localStorage.',
+  `directive` varchar(255) COMMENT 'Element name of angular directive to invoke (lowercase hyphenated format)',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_discount` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
+  `entity_table` varchar(64) NOT NULL COMMENT 'physical tablename for entity being joined to discount, e.g. civicrm_event',
+  `entity_id` int unsigned NOT NULL COMMENT 'FK to entity table specified in entity_table column.',
+  `price_set_id` int unsigned NOT NULL COMMENT 'FK to civicrm_price_set',
+  `start_date` date COMMENT 'Date when discount starts.',
+  `end_date` date COMMENT 'Date when discount ends.',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_label_custom_group_id`(label, custom_group_id),
-  UNIQUE INDEX `UI_name_custom_group_id`(name, custom_group_id),
-  CONSTRAINT FK_civicrm_custom_field_custom_group_id FOREIGN KEY (`custom_group_id`) REFERENCES `civicrm_custom_group`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_custom_field_option_group_id FOREIGN KEY (`option_group_id`) REFERENCES `civicrm_option_group`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_domain
--- *
--- * Top-level hierarchy to support multi-org/domain installations. Define domains for multi-org installs, else all contacts belong to one domain.
--- *
--- *******************************************************/
+  INDEX `index_entity`(`entity_table`, `entity_id`),
+  INDEX `index_entity_option_id`(`entity_table`, `entity_id`, `price_set_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_domain` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Domain ID',
   `name` varchar(64) COMMENT 'Name of Domain / Organization',
@@ -1479,47 +1116,61 @@ CREATE TABLE `civicrm_domain` (
   `locales` text COMMENT 'list of locales supported by the current db state (NULL for single-lang install)',
   `locale_custom_strings` text COMMENT 'Locale specific string overrides',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name),
-  CONSTRAINT FK_civicrm_domain_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_email
--- *
--- * Email information for a specific location.
--- *
--- *******************************************************/
+  UNIQUE INDEX `UI_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_email` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Email ID',
   `contact_id` int unsigned COMMENT 'FK to Contact ID',
   `location_type_id` int unsigned COMMENT 'Which Location does this email belong to.',
   `email` varchar(254) COMMENT 'Email address',
-  `is_primary` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this the primary email address',
-  `is_billing` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this the billing?',
+  `is_primary` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this the primary email address',
+  `is_billing` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this the billing?',
   `on_hold` int unsigned NOT NULL DEFAULT 0 COMMENT 'Implicit FK to civicrm_option_value where option_group = email_on_hold.',
-  `is_bulkmail` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this address for bulk mail ?',
+  `is_bulkmail` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this address for bulk mail ?',
   `hold_date` datetime COMMENT 'When the address went on bounce hold',
   `reset_date` datetime COMMENT 'When the address bounce status was last reset',
   `signature_text` text DEFAULT NULL COMMENT 'Text formatted signature for the email.',
   `signature_html` text DEFAULT NULL COMMENT 'HTML formatted signature for the email.',
   PRIMARY KEY (`id`),
-  INDEX `index_location_type`(location_type_id),
-  INDEX `UI_email`(email),
-  INDEX `index_is_primary`(is_primary),
-  INDEX `index_is_billing`(is_billing),
-  CONSTRAINT FK_civicrm_email_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_file
--- *
--- * Data store for uploaded (attached) files (pointer to file on disk OR blob). Maybe be joined to entities via custom_value.file_id or entity_file table.
--- *
--- *******************************************************/
+  INDEX `index_location_type`(`location_type_id`),
+  INDEX `UI_email`(`email`),
+  INDEX `index_is_primary`(`is_primary`),
+  INDEX `index_is_billing`(`is_billing`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_entity_file` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
+  `entity_table` varchar(64) NOT NULL COMMENT 'physical tablename for entity being joined to file, e.g. civicrm_contact',
+  `entity_id` int unsigned NOT NULL COMMENT 'FK to entity table specified in entity_table column.',
+  `file_id` int unsigned NOT NULL COMMENT 'FK to civicrm_file',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_entity_id_entity_table_file_id`(`entity_id`, `entity_table`, `file_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_entity_tag` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
+  `entity_table` varchar(64) COMMENT 'physical tablename for entity being joined to file, e.g. civicrm_contact',
+  `entity_id` int unsigned NOT NULL COMMENT 'FK to entity table specified in entity_table column.',
+  `tag_id` int unsigned NOT NULL COMMENT 'FK to civicrm_tag',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_entity_id_entity_table_tag_id`(`entity_id`, `entity_table`, `tag_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_extension` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Local Extension ID',
+  `type` varchar(8) NOT NULL,
+  `full_name` varchar(255) NOT NULL COMMENT 'Fully qualified extension name',
+  `name` varchar(255) COMMENT 'Short name',
+  `label` varchar(255) COMMENT 'Short, printable name',
+  `file` varchar(255) COMMENT 'Primary PHP file',
+  `schema_version` varchar(63) COMMENT 'Revision code of the database schema; the format is module-defined',
+  `is_active` boolean DEFAULT TRUE COMMENT 'Is this extension active?',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_extension_full_name`(`full_name`),
+  INDEX `UI_extension_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_file` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique ID',
   `file_type_id` int unsigned COMMENT 'Type of file (e.g. Transcript, Income Tax Return, etc). FK to civicrm_option_value.',
@@ -1529,88 +1180,78 @@ CREATE TABLE `civicrm_file` (
   `description` varchar(255) COMMENT 'Additional descriptive text regarding this attachment (optional).',
   `upload_date` datetime COMMENT 'Date and time that this attachment was uploaded or written to server.',
   `created_id` int unsigned COMMENT 'FK to civicrm_contact, who uploaded this file',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_file_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_im
--- *
--- * IM information for a specific location.
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_im` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique IM ID',
   `contact_id` int unsigned COMMENT 'FK to Contact ID',
   `location_type_id` int unsigned COMMENT 'Which Location does this email belong to.',
   `name` varchar(64) COMMENT 'IM screen name',
   `provider_id` int unsigned COMMENT 'Which IM Provider does this screen name belong to.',
-  `is_primary` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this the primary IM for this contact and location.',
-  `is_billing` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this the billing?',
+  `is_primary` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this the primary IM for this contact and location.',
+  `is_billing` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this the billing?',
   PRIMARY KEY (`id`),
-  INDEX `index_location_type`(location_type_id),
-  INDEX `UI_provider_id`(provider_id),
-  INDEX `index_is_primary`(is_primary),
-  INDEX `index_is_billing`(is_billing),
-  CONSTRAINT FK_civicrm_im_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_job
--- *
--- * Scheduled job.
--- *
--- *******************************************************/
+  INDEX `index_location_type`(`location_type_id`),
+  INDEX `UI_provider_id`(`provider_id`),
+  INDEX `index_is_primary`(`is_primary`),
+  INDEX `index_is_billing`(`is_billing`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_job` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Job ID',
   `domain_id` int unsigned NOT NULL COMMENT 'Which Domain is this scheduled job for',
-  `run_frequency` varchar(8) DEFAULT "Daily" COMMENT 'Scheduled job run frequency.',
+  `run_frequency` varchar(8) DEFAULT 'Daily' COMMENT 'Scheduled job run frequency.',
   `last_run` timestamp NULL DEFAULT NULL COMMENT 'When was this cron entry last run',
+  `last_run_end` timestamp NULL DEFAULT NULL COMMENT 'When did this cron entry last finish running',
   `scheduled_run_date` timestamp NULL DEFAULT NULL COMMENT 'When is this cron entry scheduled to run',
   `name` varchar(255) COMMENT 'Title of the job',
   `description` varchar(255) COMMENT 'Description of the job',
   `api_entity` varchar(255) COMMENT 'Entity of the job api call',
   `api_action` varchar(255) COMMENT 'Action of the job api call',
   `parameters` text COMMENT 'List of parameters to the command.',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this job active?',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_job_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`)
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this job active?',
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_job_log
--- *
--- * Scheduled jobs log.
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_job_log` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Job log entry ID',
   `domain_id` int unsigned NOT NULL COMMENT 'Which Domain is this scheduled job for',
-  `run_time` timestamp COMMENT 'Log entry date',
+  `run_time` timestamp NULL COMMENT 'Log entry date',
   `job_id` int unsigned COMMENT 'Pointer to job id',
   `name` varchar(255) COMMENT 'Title of the job',
   `command` varchar(255) COMMENT 'Full path to file containing job script',
   `description` varchar(255) COMMENT 'Title line of log entry',
   `data` longtext COMMENT 'Potential extended data for specific job run (e.g. tracebacks).',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_loc_block` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique ID',
+  `address_id` int unsigned,
+  `email_id` int unsigned,
+  `phone_id` int unsigned,
+  `im_id` int unsigned,
+  `address_2_id` int unsigned,
+  `email_2_id` int unsigned,
+  `phone_2_id` int unsigned,
+  `im_2_id` int unsigned,
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_location_type` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Location Type ID',
+  `name` varchar(64) NOT NULL COMMENT 'Location Type Name.',
+  `display_name` varchar(64) NOT NULL COMMENT 'Location Type Display Name.',
+  `vcard_name` varchar(64) COMMENT 'vCard Location Type Name.',
+  `description` varchar(255) COMMENT 'Location Type Description.',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this location type a predefined system location?',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this property active?',
+  `is_default` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this location type the default?',
   PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_job_log_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
-  CONSTRAINT FK_civicrm_job_log_job_id FOREIGN KEY (`job_id`) REFERENCES `civicrm_job`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_log
--- *
--- * Log can be linked to any object in the application.
--- *
--- *******************************************************/
+  UNIQUE INDEX `UI_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_log` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Log ID',
   `entity_table` varchar(64) NOT NULL COMMENT 'Name of table where item being referenced is stored.',
@@ -1619,23 +1260,14 @@ CREATE TABLE `civicrm_log` (
   `modified_id` int unsigned COMMENT 'FK to Contact ID of person under whose credentials this data modification was made.',
   `modified_date` datetime COMMENT 'When was the referenced entity created or modified or deleted.',
   PRIMARY KEY (`id`),
-  INDEX `index_entity`(entity_table, entity_id),
-  CONSTRAINT FK_civicrm_log_modified_id FOREIGN KEY (`modified_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mail_settings
--- *
--- * Various email accounts for use by CiviMail (and its processor)
--- *
--- *******************************************************/
+  INDEX `index_entity`(`entity_table`, `entity_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_mail_settings` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
   `domain_id` int unsigned NOT NULL COMMENT 'Which Domain is this match entry for',
   `name` varchar(255) COMMENT 'name of this group of settings',
-  `is_default` tinyint NOT NULL DEFAULT 0 COMMENT 'whether this is the default set of settings for this domain',
+  `is_default` boolean NOT NULL DEFAULT FALSE COMMENT 'whether this is the default set of settings for this domain',
   `domain` varchar(255) COMMENT 'email address domain (the part after @)',
   `localpart` varchar(255) COMMENT 'optional local part (like civimail+ for addresses like civimail+s.1.2@example.com)',
   `return_path` varchar(255) COMMENT 'contents of the Return-Path header',
@@ -1644,30 +1276,42 @@ CREATE TABLE `civicrm_mail_settings` (
   `port` int unsigned COMMENT 'port to use when polling',
   `username` varchar(255) COMMENT 'username to use when polling',
   `password` varchar(255) COMMENT 'password to use when polling',
-  `is_ssl` tinyint NOT NULL DEFAULT 0 COMMENT 'whether to use SSL or not',
+  `is_ssl` boolean NOT NULL DEFAULT FALSE COMMENT 'whether to use SSL or not',
   `source` varchar(255) COMMENT 'folder to poll from when using IMAP, path to poll from when using Maildir, etc.',
   `activity_status` varchar(255) COMMENT 'Name of status to use when creating email to activity.',
-  `is_non_case_email_skipped` tinyint NOT NULL DEFAULT 0 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.',
-  `is_contact_creation_disabled_if_no_match` tinyint NOT NULL DEFAULT 0,
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Ignored for bounce processing, only for email-to-activity',
+  `is_non_case_email_skipped` boolean NOT NULL DEFAULT FALSE 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.',
+  `is_contact_creation_disabled_if_no_match` boolean NOT NULL DEFAULT FALSE COMMENT 'If this option is enabled, CiviCRM will not create new contacts when filing emails.',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Ignored for bounce processing, only for email-to-activity',
   `activity_type_id` int unsigned COMMENT 'Implicit FK to civicrm_option_value where option_group = activity_type',
   `campaign_id` int unsigned DEFAULT NULL COMMENT 'Foreign key to the Campaign.',
   `activity_source` varchar(4) COMMENT 'Which email recipient to add as the activity source (from, to, cc, bcc).',
   `activity_targets` varchar(16) COMMENT 'Which email recipients to add as the activity targets (from, to, cc, bcc).',
   `activity_assignees` varchar(16) COMMENT 'Which email recipients to add as the activity assignees (from, to, cc, bcc).',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_managed` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Surrogate Key',
+  `module` varchar(255) NOT NULL COMMENT 'Name of the module which declared this object (soft FK to civicrm_extension.full_name)',
+  `name` varchar(255) NOT NULL COMMENT 'Symbolic name used by the module to identify the object',
+  `entity_type` varchar(64) NOT NULL COMMENT 'API entity type',
+  `entity_id` int unsigned COMMENT 'Soft foreign key to the referenced item.',
+  `cleanup` varchar(16) NOT NULL DEFAULT 'always' COMMENT 'Policy on when to cleanup entity (always, never, unused)',
+  `entity_modified_date` timestamp NULL DEFAULT NULL COMMENT 'When the managed entity was changed from its original settings.',
+  PRIMARY KEY (`id`),
+  INDEX `UI_managed_module_name`(`module`, `name`),
+  INDEX `UI_managed_entity`(`entity_type`, `entity_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_mapping` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Mapping ID',
+  `name` varchar(64) NOT NULL COMMENT 'Unique name of Mapping',
+  `description` varchar(255) COMMENT 'Description of Mapping.',
+  `mapping_type_id` int unsigned COMMENT 'Mapping Type',
   PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mail_settings_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_mail_settings_campaign_id FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mapping_field
--- *
--- * Individual field mappings for Mapping
--- *
--- *******************************************************/
+  UNIQUE INDEX `UI_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_mapping_field` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Mapping Field ID',
   `mapping_id` int unsigned NOT NULL COMMENT 'Mapping to which this field belongs',
@@ -1680,23 +1324,12 @@ CREATE TABLE `civicrm_mapping_field` (
   `website_type_id` int unsigned COMMENT 'Which type of website does this site belong',
   `relationship_type_id` int unsigned COMMENT 'Relationship type, if required',
   `relationship_direction` varchar(6),
-  `grouping` int unsigned DEFAULT 1 COMMENT 'Used to group mapping_field records into related sets (e.g. for criteria sets in search builder\n      mappings).',
+  `grouping` int unsigned DEFAULT 1 COMMENT 'Used to group mapping_field records into related sets (e.g. for criteria sets in search builder mappings).',
   `operator` varchar(16) COMMENT 'SQL WHERE operator for search-builder mapping fields (search criteria).',
   `value` varchar(255) COMMENT 'SQL WHERE value for search-builder mapping fields.',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mapping_field_mapping_id FOREIGN KEY (`mapping_id`) REFERENCES `civicrm_mapping`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_mapping_field_location_type_id FOREIGN KEY (`location_type_id`) REFERENCES `civicrm_location_type`(`id`),
-  CONSTRAINT FK_civicrm_mapping_field_relationship_type_id FOREIGN KEY (`relationship_type_id`) REFERENCES `civicrm_relationship_type`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_menu
--- *
--- * Table to store menu items for all civicrm components.
--- *
--- *******************************************************/
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_menu` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `domain_id` int unsigned NOT NULL COMMENT 'Which Domain is this menu item for',
@@ -1711,184 +1344,339 @@ CREATE TABLE `civicrm_menu` (
   `return_url` varchar(255) COMMENT 'Url where a page should redirected to, if next url not known.',
   `return_url_args` varchar(255) COMMENT 'Arguments to pass to return_url',
   `component_id` int unsigned COMMENT 'Component that this menu item belongs to',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this menu item active?',
-  `is_public` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this menu accessible to the public?',
-  `is_exposed` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this menu exposed to the navigation system?',
-  `is_ssl` tinyint NOT NULL DEFAULT 1 COMMENT 'Should this menu be exposed via SSL if enabled?',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this menu item active?',
+  `is_public` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this menu accessible to the public?',
+  `is_exposed` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this menu exposed to the navigation system?',
+  `is_ssl` boolean NOT NULL DEFAULT TRUE COMMENT 'Should this menu be exposed via SSL if enabled?',
   `weight` int NOT NULL DEFAULT 1 COMMENT 'Ordering of the menu items in various blocks.',
   `type` int NOT NULL DEFAULT 1 COMMENT 'Drupal menu type.',
   `page_type` int NOT NULL DEFAULT 1 COMMENT 'CiviCRM menu type.',
-  `skipBreadcrumb` tinyint NOT NULL DEFAULT 0 COMMENT 'skip this url being exposed to breadcrumb',
+  `skipBreadcrumb` boolean NOT NULL DEFAULT FALSE COMMENT 'skip this url being exposed to breadcrumb',
   `module_data` text COMMENT 'All other menu metadata not stored in other fields',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_path_domain_id`(path, domain_id),
-  CONSTRAINT FK_civicrm_menu_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
-  CONSTRAINT FK_civicrm_menu_component_id FOREIGN KEY (`component_id`) REFERENCES `civicrm_component`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_navigation
--- *
--- * Table to store navigation.
--- *
--- *******************************************************/
+  UNIQUE INDEX `UI_path_domain_id`(`path`, `domain_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_msg_template` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Message Template ID',
+  `msg_title` varchar(255) COMMENT 'Descriptive title of message',
+  `msg_subject` text COMMENT 'Subject for email message.',
+  `msg_text` longtext COMMENT 'Text formatted message',
+  `msg_html` longtext COMMENT 'HTML formatted message',
+  `is_active` boolean NOT NULL DEFAULT TRUE,
+  `workflow_id` int unsigned COMMENT 'a pseudo-FK to civicrm_option_value',
+  `workflow_name` varchar(255),
+  `is_default` boolean NOT NULL DEFAULT TRUE COMMENT 'is this the default message template for the workflow referenced by workflow_id?',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE COMMENT 'is this the reserved message template which we ship for the workflow referenced by workflow_id?',
+  `is_sms` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this message template used for sms?',
+  `pdf_format_id` int unsigned COMMENT 'a pseudo-FK to civicrm_option_value containing PDF Page Format.',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_navigation` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `domain_id` int unsigned NOT NULL COMMENT 'Which Domain is this navigation item for',
   `label` varchar(255) COMMENT 'Navigation Title',
   `name` varchar(255) COMMENT 'Internal Name',
   `url` varchar(255) COMMENT 'url in case of custom navigation link',
-  `icon` varchar(255) NULL DEFAULT NULL COMMENT 'CSS class name for an icon',
+  `icon` varchar(255) DEFAULT NULL COMMENT 'CSS class name for an icon',
   `permission` varchar(255) COMMENT 'Permission(s) needed to access menu item',
   `permission_operator` varchar(3) COMMENT 'Operator to use if item has more than one permission',
   `parent_id` int unsigned COMMENT 'Parent navigation item, used for grouping',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this navigation item active?',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this navigation item active?',
   `has_separator` tinyint DEFAULT 0 COMMENT 'Place a separator either before or after this menu item.',
   `weight` int NOT NULL DEFAULT 0 COMMENT 'Ordering of the navigation items in various blocks.',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_navigation_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
-  CONSTRAINT FK_civicrm_navigation_parent_id FOREIGN KEY (`parent_id`) REFERENCES `civicrm_navigation`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_note
--- *
--- * Notes can be linked to any object in the application.
--- *
--- *******************************************************/
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_note` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Note ID',
   `entity_table` varchar(64) NOT NULL COMMENT 'Name of table where item being referenced is stored.',
   `entity_id` int unsigned NOT NULL COMMENT 'Foreign key to the referenced item.',
   `note` text COMMENT 'Note and/or Comment.',
   `contact_id` int unsigned COMMENT 'FK to Contact ID creator',
-  `note_date` timestamp DEFAULT CURRENT_TIMESTAMP COMMENT 'Date attached to the note',
+  `note_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Date attached to the note',
   `created_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When the note was created.',
-  `modified_date` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When was this note last modified/edited',
+  `modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When was this note last modified/edited',
   `subject` varchar(255) COMMENT 'subject of note description',
-  `privacy` varchar(255) NOT NULL DEFAULT 0 COMMENT 'Foreign Key to Note Privacy Level (which is an option value pair and hence an implicit FK)',
+  `privacy` varchar(255) NOT NULL DEFAULT '0' COMMENT 'Foreign Key to Note Privacy Level (which is an option value pair and hence an implicit FK)',
+  PRIMARY KEY (`id`),
+  INDEX `index_entity`(`entity_table`, `entity_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_openid` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique OpenID ID',
+  `contact_id` int unsigned COMMENT 'FK to Contact ID',
+  `location_type_id` int unsigned COMMENT 'Which Location does this email belong to.',
+  `openid` varchar(255) COMMENT 'the OpenID (or OpenID-style http://username.domain/) unique identifier for this contact mainly used for logging in to CiviCRM',
+  `allowed_to_login` boolean NOT NULL DEFAULT FALSE COMMENT 'Whether or not this user is allowed to login',
+  `is_primary` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this the primary email for this contact and location.',
+  PRIMARY KEY (`id`),
+  INDEX `index_location_type`(`location_type_id`),
+  UNIQUE INDEX `UI_openid`(`openid`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_option_group` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Option Group ID',
+  `name` varchar(64) NOT NULL COMMENT 'Option group name. Used as selection key by class properties which lookup options in civicrm_option_value.',
+  `title` varchar(255) COMMENT 'Option Group title.',
+  `description` text COMMENT 'Option group description.',
+  `data_type` varchar(128) COMMENT 'Type of data stored by this option group.',
+  `is_reserved` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this a predefined system option group (i.e. it can not be deleted)?',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this option group active?',
+  `is_locked` boolean NOT NULL DEFAULT FALSE COMMENT 'A lock to remove the ability to add new options via the UI.',
+  `option_value_fields` varchar(128) DEFAULT 'name,label,description' COMMENT 'Which optional columns from the option_value table are in use by this group.',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_option_value` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Option ID',
+  `option_group_id` int unsigned NOT NULL COMMENT 'Group which this option belongs to.',
+  `label` varchar(512) NOT NULL COMMENT 'Option string as displayed to users - e.g. the label in an HTML OPTION tag.',
+  `value` varchar(512) NOT NULL COMMENT 'The actual value stored (as a foreign key) in the data record. Functions which need lookup option_value.title should use civicrm_option_value.option_group_id plus civicrm_option_value.value as the key.',
+  `name` varchar(255) COMMENT 'Stores a fixed (non-translated) name for this option value. Lookup functions should use the name as the key for the option value row.',
+  `grouping` varchar(255) COMMENT 'Use to sort and/or set display properties for sub-set(s) of options within an option group. EXAMPLE: Use for college_interest field, to differentiate partners from non-partners.',
+  `filter` int unsigned DEFAULT 0 COMMENT 'Bitwise logic can be used to create subsets of options within an option_group for different uses.',
+  `is_default` boolean DEFAULT FALSE COMMENT 'Is this the default option for the group?',
+  `weight` int unsigned NOT NULL COMMENT 'Controls display sort order.',
+  `description` text COMMENT 'Optional description.',
+  `is_optgroup` boolean DEFAULT FALSE COMMENT 'Is this row simply a display header? Expected usage is to render these as OPTGROUP tags within a SELECT field list of options?',
+  `is_reserved` boolean DEFAULT FALSE COMMENT 'Is this a predefined system object?',
+  `is_active` boolean DEFAULT TRUE COMMENT 'Is this option active?',
+  `component_id` int unsigned COMMENT 'Component that this option value belongs/caters to.',
+  `domain_id` int unsigned COMMENT 'Which Domain is this option value for',
+  `visibility_id` int unsigned DEFAULT NULL,
+  `icon` varchar(255) DEFAULT NULL COMMENT 'crm-i icon class',
+  `color` varchar(255) DEFAULT NULL COMMENT 'Hex color value e.g. #ffffff',
+  PRIMARY KEY (`id`),
+  INDEX `index_option_group_id_value`(`value`(128), `option_group_id`),
+  INDEX `index_option_group_id_name`(`name`(128), `option_group_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_phone` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Phone ID',
+  `contact_id` int unsigned COMMENT 'FK to Contact ID',
+  `location_type_id` int unsigned COMMENT 'Which Location does this phone belong to.',
+  `is_primary` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this the primary phone for this contact and location.',
+  `is_billing` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this the billing?',
+  `mobile_provider_id` int unsigned COMMENT 'Which Mobile Provider does this phone belong to.',
+  `phone` varchar(32) COMMENT 'Complete phone number.',
+  `phone_ext` varchar(16) COMMENT 'Optional extension for a phone number.',
+  `phone_numeric` varchar(32) COMMENT 'Phone number stripped of all whitespace, letters, and punctuation.',
+  `phone_type_id` int unsigned COMMENT 'Which type of phone does this number belongs.',
+  PRIMARY KEY (`id`),
+  INDEX `index_location_type`(`location_type_id`),
+  INDEX `index_is_primary`(`is_primary`),
+  INDEX `index_is_billing`(`is_billing`),
+  INDEX `UI_mobile_provider_id`(`mobile_provider_id`),
+  INDEX `index_phone_numeric`(`phone_numeric`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_preferences_date` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(64) NOT NULL COMMENT 'The meta name for this date (fixed in code)',
+  `description` varchar(255) COMMENT 'Description of this date type.',
+  `start` int NOT NULL COMMENT 'The start offset relative to current year',
+  `end` int NOT NULL COMMENT 'The end offset relative to current year, can be negative',
+  `date_format` varchar(64) COMMENT 'The date type',
+  `time_format` varchar(64) COMMENT 'time format',
+  PRIMARY KEY (`id`),
+  INDEX `index_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_prevnext_cache` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `entity_table` varchar(64) COMMENT 'physical tablename for entity being joined to discount, e.g. civicrm_event',
+  `entity_id1` int unsigned NOT NULL COMMENT 'FK to entity table specified in entity_table column.',
+  `entity_id2` int unsigned COMMENT 'FK to entity table specified in entity_table column.',
+  `cachekey` varchar(255) COMMENT 'Unique path name for cache element of the searched item',
+  `data` longtext COMMENT 'cached snapshot of the serialized data',
+  `is_selected` boolean NOT NULL DEFAULT FALSE,
+  PRIMARY KEY (`id`),
+  INDEX `index_all`(`cachekey`, `entity_id1`, `entity_id2`, `entity_table`, `is_selected`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_print_label` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(255) COMMENT 'User title for this label layout',
+  `name` varchar(255) COMMENT 'variable name/programmatic handle for this field.',
+  `description` text COMMENT 'Description of this label layout',
+  `label_format_name` varchar(255) COMMENT 'This refers to name column of civicrm_option_value row in name_badge option group',
+  `label_type_id` int unsigned COMMENT 'Implicit FK to civicrm_option_value row in NEW label_type option group',
+  `data` longtext COMMENT 'contains json encode configurations options',
+  `is_default` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this default?',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this option active?',
+  `is_reserved` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this reserved label?',
+  `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this label layout',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_recurring_entity` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `parent_id` int unsigned NOT NULL COMMENT 'Recurring Entity Parent ID',
+  `entity_id` int unsigned COMMENT 'Recurring Entity Child ID',
+  `entity_table` varchar(64) NOT NULL COMMENT 'Physical tablename for entity, e.g. civicrm_event',
+  `mode` boolean NOT NULL DEFAULT TRUE COMMENT '1-this entity, 2-this and the following entities, 3-all the entities',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_setting` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) COMMENT 'Unique name for setting',
+  `value` text COMMENT 'data associated with this group / name combo',
+  `domain_id` int unsigned DEFAULT NULL COMMENT 'Which Domain does this setting belong to',
+  `contact_id` int unsigned COMMENT 'FK to Contact ID if the setting is localized to a contact',
+  `is_domain` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this setting per-domain or global?',
+  `component_id` int unsigned COMMENT 'Component that this menu item belongs to',
+  `created_date` datetime COMMENT 'When was the setting created',
+  `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this setting',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `index_domain_contact_name`(`domain_id`, `contact_id`, `name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_state_province` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'State/Province ID',
+  `name` varchar(64) COMMENT 'Name of State/Province',
+  `abbreviation` varchar(4) COMMENT '2-4 Character Abbreviation of State/Province',
+  `country_id` int unsigned NOT NULL COMMENT 'ID of Country that State/Province belong',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this StateProvince active?',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_name_country_id`(`name`, `country_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_status_pref` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Status Preference ID',
+  `domain_id` int unsigned NOT NULL COMMENT 'Which Domain is this Status Preference for',
+  `name` varchar(255) NOT NULL COMMENT 'Name of the status check this preference references.',
+  `hush_until` date DEFAULT NULL COMMENT 'expires ignore_severity. NULL never hushes.',
+  `ignore_severity` int unsigned DEFAULT 1 COMMENT 'Hush messages up to and including this severity.',
+  `prefs` varchar(255) COMMENT 'These settings are per-check, and can\'t be compared across checks.',
+  `check_info` varchar(255) COMMENT 'These values are per-check, and can\'t be compared across checks.',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this status check active?',
+  PRIMARY KEY (`id`),
+  INDEX `UI_status_pref_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_system_log` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key ID',
+  `message` varchar(128) NOT NULL COMMENT 'Standardized message',
+  `context` longtext COMMENT 'JSON encoded data',
+  `level` varchar(9) DEFAULT 'info' COMMENT 'error level per PSR3',
+  `timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Timestamp of when event occurred.',
+  `contact_id` int unsigned COMMENT 'Optional Contact ID that created the log. Not an FK as we keep this regardless',
+  `hostname` varchar(128) COMMENT 'Optional Name of logging host',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_tag` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Tag ID',
+  `name` varchar(64) NOT NULL COMMENT 'Unique machine name',
+  `label` varchar(64) NOT NULL COMMENT 'User-facing tag name',
+  `description` varchar(255) COMMENT 'Optional verbose description of the tag.',
+  `parent_id` int unsigned DEFAULT NULL COMMENT 'Optional parent id for this tag.',
+  `is_selectable` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this tag selectable / displayed',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE,
+  `is_tagset` boolean NOT NULL DEFAULT FALSE,
+  `used_for` varchar(64) DEFAULT NULL,
+  `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this tag',
+  `color` varchar(255) DEFAULT NULL COMMENT 'Hex color value e.g. #ffffff',
+  `created_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'Date and time that tag was created.',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_timezone` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Timezone ID',
+  `name` varchar(64) COMMENT 'Timezone full name',
+  `abbreviation` char(3) COMMENT 'ISO Code for timezone abbreviation',
+  `gmt` varchar(64) COMMENT 'GMT name of the timezone',
+  `offset` int,
+  `country_id` int unsigned NOT NULL COMMENT 'Country ID',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_translation` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique String ID',
+  `entity_table` varchar(64) NOT NULL COMMENT 'Table where referenced item is stored',
+  `entity_field` varchar(64) NOT NULL COMMENT 'Field where referenced item is stored',
+  `entity_id` int NOT NULL COMMENT 'ID of the relevant entity.',
+  `language` varchar(5) NOT NULL COMMENT 'Relevant language',
+  `status_id` tinyint NOT NULL DEFAULT 1 COMMENT 'Specify whether the string is active, draft, etc',
+  `string` longtext NOT NULL COMMENT 'Translated string',
+  PRIMARY KEY (`id`),
+  INDEX `index_entity_lang`(`entity_id`, `entity_table`, `language`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_uf_field` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique table ID',
+  `uf_group_id` int unsigned NOT NULL COMMENT 'Which form does this field belong to.',
+  `field_name` varchar(64) NOT NULL COMMENT 'Name for CiviCRM field which is being exposed for sharing.',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this field currently shareable? If FALSE, hide the field for all sharing contexts.',
+  `is_view` boolean NOT NULL DEFAULT FALSE COMMENT 'the field is view only and not editable in user forms.',
+  `is_required` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this field required when included in a user or registration form?',
+  `weight` int NOT NULL DEFAULT 1 COMMENT 'Controls field display order when user framework fields are displayed in registration and account editing forms.',
+  `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.',
+  `visibility` varchar(32) DEFAULT 'User and User Admin Only' COMMENT 'In what context(s) is this field visible.',
+  `in_selector` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this field included as a column in the selector table?',
+  `is_searchable` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this field included search form of profile?',
+  `location_type_id` int unsigned COMMENT 'Location type of this mapping, if required',
+  `phone_type_id` int unsigned COMMENT 'Phone Type ID, if required',
+  `website_type_id` int unsigned COMMENT 'Website Type ID, if required',
+  `label` varchar(255) NOT NULL COMMENT 'To save label for fields.',
+  `field_type` varchar(255) COMMENT 'This field saves field type (ie individual,household.. field etc).',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this field reserved for use by some other CiviCRM functionality?',
+  `is_multi_summary` boolean NOT NULL DEFAULT FALSE COMMENT 'Include in multi-record listing?',
+  PRIMARY KEY (`id`),
+  INDEX `IX_website_type_id`(`website_type_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_uf_group` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique table ID',
+  `name` varchar(64) NOT NULL COMMENT 'Name of the UF group for directly addressing it in the codebase',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this profile currently active? If FALSE, hide all related fields for all sharing contexts.',
+  `group_type` varchar(255) COMMENT 'Comma separated list of the type(s) of profile fields.',
+  `title` varchar(64) NOT NULL COMMENT 'Form title.',
+  `frontend_title` varchar(64) NOT NULL COMMENT 'Profile Form Public title',
+  `description` text COMMENT 'Optional verbose description of the profile.',
+  `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.',
+  `limit_listings_group_id` int unsigned COMMENT 'Group id, foreign key from civicrm_group',
+  `post_url` varchar(255) COMMENT 'Redirect to URL on submit.',
+  `add_to_group_id` int unsigned COMMENT 'foreign key to civicrm_group_id',
+  `add_captcha` boolean NOT NULL DEFAULT FALSE COMMENT 'Should a CAPTCHA widget be included this Profile form.',
+  `is_map` boolean NOT NULL DEFAULT FALSE COMMENT 'Do we want to map results from this profile.',
+  `is_edit_link` boolean NOT NULL DEFAULT FALSE COMMENT 'Should edit link display in profile selector',
+  `is_uf_link` boolean NOT NULL DEFAULT FALSE COMMENT 'Should we display a link to the website profile in profile selector',
+  `is_update_dupe` boolean NOT NULL DEFAULT FALSE COMMENT 'Should we update the contact record if we find a duplicate',
+  `cancel_url` varchar(255) COMMENT 'Redirect to URL when Cancel button clicked.',
+  `is_cms_user` boolean NOT NULL DEFAULT FALSE COMMENT 'Should we create a cms user for this profile',
+  `notify` text,
+  `is_reserved` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this group reserved for use by some other CiviCRM functionality?',
+  `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this UF group',
+  `created_date` datetime COMMENT 'Date and time this UF group was created.',
+  `is_proximity_search` boolean NOT NULL DEFAULT FALSE COMMENT 'Should we include proximity search feature in this profile search 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',
+  `add_cancel_button` boolean NOT NULL DEFAULT TRUE COMMENT 'Should a Cancel button be included in this Profile form.',
   PRIMARY KEY (`id`),
-  INDEX `index_entity`(entity_table, entity_id),
-  CONSTRAINT FK_civicrm_note_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
+  UNIQUE INDEX `UI_name`(`name`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_option_value
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_option_value` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Option ID',
-  `option_group_id` int unsigned NOT NULL COMMENT 'Group which this option belongs to.',
-  `label` varchar(512) NOT NULL COMMENT 'Option string as displayed to users - e.g. the label in an HTML OPTION tag.',
-  `value` varchar(512) NOT NULL COMMENT 'The actual value stored (as a foreign key) in the data record. Functions which need lookup option_value.title should use civicrm_option_value.option_group_id plus civicrm_option_value.value as the key.',
-  `name` varchar(255) COMMENT 'Stores a fixed (non-translated) name for this option value. Lookup functions should use the name as the key for the option value row.',
-  `grouping` varchar(255) COMMENT 'Use to sort and/or set display properties for sub-set(s) of options within an option group. EXAMPLE: Use for college_interest field, to differentiate partners from non-partners.',
-  `filter` int unsigned DEFAULT 0 COMMENT 'Bitwise logic can be used to create subsets of options within an option_group for different uses.',
-  `is_default` tinyint DEFAULT 0 COMMENT 'Is this the default option for the group?',
-  `weight` int unsigned NOT NULL COMMENT 'Controls display sort order.',
-  `description` text COMMENT 'Optional description.',
-  `is_optgroup` tinyint DEFAULT 0 COMMENT 'Is this row simply a display header? Expected usage is to render these as OPTGROUP tags within a SELECT field list of options?',
-  `is_reserved` tinyint DEFAULT 0 COMMENT 'Is this a predefined system object?',
-  `is_active` tinyint DEFAULT 1 COMMENT 'Is this option active?',
-  `component_id` int unsigned COMMENT 'Component that this option value belongs/caters to.',
-  `domain_id` int unsigned COMMENT 'Which Domain is this option value for',
-  `visibility_id` int unsigned DEFAULT NULL,
-  `icon` varchar(255) DEFAULT NULL COMMENT 'crm-i icon class',
-  `color` varchar(255) DEFAULT NULL COMMENT 'Hex color value e.g. #ffffff',
-  PRIMARY KEY (`id`),
-  INDEX `index_option_group_id_value`(value(128), option_group_id),
-  INDEX `index_option_group_id_name`(name(128), option_group_id),
-  CONSTRAINT FK_civicrm_option_value_option_group_id FOREIGN KEY (`option_group_id`) REFERENCES `civicrm_option_group`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_option_value_component_id FOREIGN KEY (`component_id`) REFERENCES `civicrm_component`(`id`),
-  CONSTRAINT FK_civicrm_option_value_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_phone
--- *
--- * Phone information for a specific location.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_phone` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Phone ID',
-  `contact_id` int unsigned COMMENT 'FK to Contact ID',
-  `location_type_id` int unsigned COMMENT 'Which Location does this phone belong to.',
-  `is_primary` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this the primary phone for this contact and location.',
-  `is_billing` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this the billing?',
-  `mobile_provider_id` int unsigned COMMENT 'Which Mobile Provider does this phone belong to.',
-  `phone` varchar(32) COMMENT 'Complete phone number.',
-  `phone_ext` varchar(16) COMMENT 'Optional extension for a phone number.',
-  `phone_numeric` varchar(32) COMMENT 'Phone number stripped of all whitespace, letters, and punctuation.',
-  `phone_type_id` int unsigned COMMENT 'Which type of phone does this number belongs.',
-  PRIMARY KEY (`id`),
-  INDEX `index_location_type`(location_type_id),
-  INDEX `index_is_primary`(is_primary),
-  INDEX `index_is_billing`(is_billing),
-  INDEX `UI_mobile_provider_id`(mobile_provider_id),
-  INDEX `index_phone_numeric`(phone_numeric),
-  CONSTRAINT FK_civicrm_phone_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_state_province
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_state_province` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'State/Province ID',
-  `name` varchar(64) COMMENT 'Name of State/Province',
-  `abbreviation` varchar(4) COMMENT '2-4 Character Abbreviation of State/Province',
-  `country_id` int unsigned NOT NULL COMMENT 'ID of Country that State/Province belong',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this StateProvince active?',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name_country_id`(name, country_id),
-  CONSTRAINT FK_civicrm_state_province_country_id FOREIGN KEY (`country_id`) REFERENCES `civicrm_country`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_tag
--- *
--- * Provides support for flat or hierarchical classification of various types of entities (contacts, groups, actions...).
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_tag` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Tag ID',
-  `name` varchar(64) NOT NULL COMMENT 'Unique machine name',
-  `label` varchar(64) NOT NULL COMMENT 'User-facing tag name',
-  `description` varchar(255) COMMENT 'Optional verbose description of the tag.',
-  `parent_id` int unsigned DEFAULT NULL COMMENT 'Optional parent id for this tag.',
-  `is_selectable` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this tag selectable / displayed',
-  `is_reserved` tinyint NOT NULL DEFAULT 0,
-  `is_tagset` tinyint NOT NULL DEFAULT 0,
-  `used_for` varchar(64) DEFAULT NULL,
-  `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this tag',
-  `color` varchar(255) DEFAULT NULL COMMENT 'Hex color value e.g. #ffffff',
-  `created_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'Date and time that tag was created.',
+CREATE TABLE `civicrm_uf_join` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique table ID',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this join currently active?',
+  `module` varchar(64) NOT NULL COMMENT 'Module which owns this uf_join instance, e.g. User Registration, CiviDonate, etc.',
+  `entity_table` varchar(64) COMMENT 'Name of table where item being referenced is stored. Modules which only need a single collection of uf_join instances may choose not to populate entity_table and entity_id.',
+  `entity_id` int unsigned COMMENT 'Foreign key to the referenced item.',
+  `weight` int NOT NULL DEFAULT 1 COMMENT 'Controls display order when multiple user framework groups are setup for concurrent display.',
+  `uf_group_id` int unsigned NOT NULL COMMENT 'Which form does this field belong to.',
+  `module_data` longtext COMMENT 'Json serialized array of data used by the ufjoin.module',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name),
-  CONSTRAINT FK_civicrm_tag_parent_id FOREIGN KEY (`parent_id`) REFERENCES `civicrm_tag`(`id`),
-  CONSTRAINT FK_civicrm_tag_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_uf_match
--- *
--- * The mapping from an user framework (UF) object to a CRM object.
--- *
--- *******************************************************/
+  INDEX `index_entity`(`entity_table`, `entity_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_uf_match` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'System generated ID.',
   `domain_id` int unsigned NOT NULL COMMENT 'Which Domain is this match entry for',
@@ -1897,22 +1685,12 @@ CREATE TABLE `civicrm_uf_match` (
   `contact_id` int unsigned COMMENT 'FK to Contact ID',
   `language` varchar(5) COMMENT 'UI language preferred by the given user/contact',
   PRIMARY KEY (`id`),
-  INDEX `I_civicrm_uf_match_uf_id`(uf_id),
-  INDEX `UI_uf_match_uf_id_domain_id`(uf_id, domain_id),
-  UNIQUE INDEX `UI_uf_name_domain_id`(uf_name, domain_id),
-  UNIQUE INDEX `UI_contact_domain_id`(contact_id, domain_id),
-  CONSTRAINT FK_civicrm_uf_match_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
-  CONSTRAINT FK_civicrm_uf_match_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_user_job
--- *
--- * Tracking for user jobs (eg. imports).
--- *
--- *******************************************************/
+  INDEX `I_civicrm_uf_match_uf_id`(`uf_id`),
+  INDEX `UI_uf_match_uf_id_domain_id`(`uf_id`, `domain_id`),
+  UNIQUE INDEX `UI_uf_name_domain_id`(`uf_name`, `domain_id`),
+  UNIQUE INDEX `UI_contact_domain_id`(`contact_id`, `domain_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_user_job` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Job ID',
   `name` varchar(64) COMMENT 'Unique name for job.',
@@ -1925,1143 +1703,428 @@ CREATE TABLE `civicrm_user_job` (
   `job_type` varchar(64) NOT NULL COMMENT 'Name of the job type, which will allow finding the correct class',
   `queue_id` int unsigned COMMENT 'FK to Queue',
   `metadata` text COMMENT 'Data pertaining to job configuration',
-  `is_template` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this a template configuration (for use by other/future jobs)?',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name),
-  CONSTRAINT FK_civicrm_user_job_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_user_job_queue_id FOREIGN KEY (`queue_id`) REFERENCES `civicrm_queue`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_timezone
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_timezone` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Timezone ID',
-  `name` varchar(64) COMMENT 'Timezone full name',
-  `abbreviation` char(3) COMMENT 'ISO Code for timezone abbreviation',
-  `gmt` varchar(64) COMMENT 'GMT name of the timezone',
-  `offset` int,
-  `country_id` int unsigned NOT NULL COMMENT 'Country ID',
+  `is_template` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this a template configuration (for use by other/future jobs)?',
   PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_timezone_country_id FOREIGN KEY (`country_id`) REFERENCES `civicrm_country`(`id`)
+  UNIQUE INDEX `UI_name`(`name`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_openid
--- *
--- * OpenID information for a specific location.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_openid` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique OpenID ID',
-  `contact_id` int unsigned COMMENT 'FK to Contact ID',
-  `location_type_id` int unsigned COMMENT 'Which Location does this email belong to.',
-  `openid` varchar(255) COMMENT 'the OpenID (or OpenID-style http://username.domain/) unique identifier for this contact mainly used for logging in to CiviCRM',
-  `allowed_to_login` tinyint NOT NULL DEFAULT 0 COMMENT 'Whether or not this user is allowed to login',
-  `is_primary` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this the primary email for this contact and location.',
-  PRIMARY KEY (`id`),
-  INDEX `index_location_type`(location_type_id),
-  UNIQUE INDEX `UI_openid`(openid),
-  CONSTRAINT FK_civicrm_openid_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_website
--- *
--- * Website information for a specific location.
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_website` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Website ID',
   `contact_id` int unsigned COMMENT 'FK to Contact ID',
   `url` varchar(255) COMMENT 'Website',
   `website_type_id` int unsigned COMMENT 'Which Website type does this website belong to.',
   PRIMARY KEY (`id`),
-  INDEX `UI_website_type_id`(website_type_id),
-  CONSTRAINT FK_civicrm_website_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_setting
--- *
--- * Table to store civicrm settings for civicrm core and components.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_setting` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) COMMENT 'Unique name for setting',
-  `value` text COMMENT 'data associated with this group / name combo',
-  `domain_id` int unsigned DEFAULT NULL COMMENT 'Which Domain does this setting belong to',
-  `contact_id` int unsigned COMMENT 'FK to Contact ID if the setting is localized to a contact',
-  `is_domain` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this setting per-domain or global?',
-  `component_id` int unsigned COMMENT 'Component that this menu item belongs to',
-  `created_date` datetime COMMENT 'When was the setting created',
-  `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this setting',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `index_domain_contact_name`(domain_id, contact_id, name),
-  CONSTRAINT FK_civicrm_setting_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_setting_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_setting_component_id FOREIGN KEY (`component_id`) REFERENCES `civicrm_component`(`id`),
-  CONSTRAINT FK_civicrm_setting_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_print_label
--- *
--- * Table to store the labels created by user.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_print_label` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `title` varchar(255) COMMENT 'User title for this label layout',
-  `name` varchar(255) COMMENT 'variable name/programmatic handle for this field.',
-  `description` text COMMENT 'Description of this label layout',
-  `label_format_name` varchar(255) COMMENT 'This refers to name column of civicrm_option_value row in name_badge option group',
-  `label_type_id` int unsigned COMMENT 'Implicit FK to civicrm_option_value row in NEW label_type option group',
-  `data` longtext COMMENT 'contains json encode configurations options',
-  `is_default` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this default?',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this option active?',
-  `is_reserved` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this reserved label?',
-  `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this label layout',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_print_label_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
+  INDEX `UI_website_type_id`(`website_type_id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_word_replacement
--- *
--- * Top-level hierarchy to support word replacement.
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_word_replacement` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Word replacement ID',
   `find_word` varchar(255) COLLATE utf8_bin COMMENT 'Word which need to be replaced',
   `replace_word` varchar(255) COLLATE utf8_bin COMMENT 'Word which will replace the word in find',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this entry active?',
-  `match_type` varchar(16) DEFAULT "wildcardMatch",
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this entry active?',
+  `match_type` varchar(16) DEFAULT 'wildcardMatch',
   `domain_id` int unsigned COMMENT 'FK to Domain ID. This is for Domain specific word replacement',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_domain_find`(domain_id, find_word),
-  CONSTRAINT FK_civicrm_word_replacement_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_status_pref
--- *
--- * Preferences controlling status checks called in system.check.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_status_pref` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Status Preference ID',
-  `domain_id` int unsigned NOT NULL COMMENT 'Which Domain is this Status Preference for',
-  `name` varchar(255) NOT NULL COMMENT 'Name of the status check this preference references.',
-  `hush_until` date DEFAULT NULL COMMENT 'expires ignore_severity.  NULL never hushes.',
-  `ignore_severity` int unsigned DEFAULT 1 COMMENT 'Hush messages up to and including this severity.',
-  `prefs` varchar(255) COMMENT 'These settings are per-check, and can\'t be compared across checks.',
-  `check_info` varchar(255) COMMENT 'These values are per-check, and can\'t be compared across checks.',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this status check active?',
-  PRIMARY KEY (`id`),
-  INDEX `UI_status_pref_name`(name),
-  CONSTRAINT FK_civicrm_status_pref_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_group
--- *
--- * Provide grouping of related contacts
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_group` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Group ID',
-  `name` varchar(64) NOT NULL COMMENT 'Internal name of Group.',
-  `title` varchar(255) NOT NULL COMMENT 'Name of Group.',
-  `description` text COMMENT 'Optional verbose description of the group.',
-  `source` varchar(64) COMMENT 'Module or process which created this group.',
-  `saved_search_id` int unsigned COMMENT 'FK to saved search table.',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this group active?',
-  `visibility` varchar(24) DEFAULT 'User and User Admin Only' COMMENT 'In what context(s) is this field visible.',
-  `where_clause` text COMMENT 'the sql where clause if a saved search acl',
-  `select_tables` text COMMENT 'the tables to be included in a select data',
-  `where_tables` text COMMENT 'the tables to be included in the count statement',
-  `group_type` varchar(128) COMMENT 'FK to group type',
-  `cache_date` timestamp NULL COMMENT 'Date when we created the cache for a smart group',
-  `cache_fill_took` double NULL COMMENT 'Seconds taken to fill smart group cache',
-  `refresh_date` timestamp NULL COMMENT 'Unused deprecated column.',
-  `parents` text COMMENT 'List of parent groups',
-  `children` text COMMENT 'List of child groups (calculated)',
-  `is_hidden` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this group hidden?',
-  `is_reserved` tinyint NOT NULL DEFAULT 0,
-  `created_id` int unsigned COMMENT 'FK to contact table.',
-  `modified_id` int unsigned COMMENT 'FK to contact table.',
-  `frontend_title` varchar(255) NOT NULL COMMENT 'Alternative public title for this Group.',
-  `frontend_description` text DEFAULT NULL COMMENT 'Alternative public description of the group.',
-  PRIMARY KEY (`id`),
-  INDEX `UI_cache_date`(cache_date),
-  INDEX `index_group_type`(group_type),
-  UNIQUE INDEX `UI_title`(title),
-  UNIQUE INDEX `UI_name`(name),
-  CONSTRAINT FK_civicrm_group_saved_search_id FOREIGN KEY (`saved_search_id`) REFERENCES `civicrm_saved_search`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_group_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_group_modified_id FOREIGN KEY (`modified_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_subscription_history
--- *
--- * History information of subscribe/unsubscribe actions
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_subscription_history` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Internal ID',
-  `contact_id` int unsigned NOT NULL COMMENT 'Contact ID',
-  `group_id` int unsigned COMMENT 'Group ID',
-  `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Date of the (un)subscription',
-  `method` varchar(8) COMMENT 'How the (un)subscription was triggered',
-  `status` varchar(8) COMMENT 'The state of the contact within the group',
-  `tracking` varchar(255) COMMENT 'IP address or other tracking info',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_subscription_history_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_subscription_history_group_id FOREIGN KEY (`group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_group_contact_cache
--- *
--- * Join table cache for 'static' groups.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_group_contact_cache` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
-  `group_id` int unsigned NOT NULL COMMENT 'FK to civicrm_group',
-  `contact_id` int unsigned NOT NULL COMMENT 'FK to civicrm_contact',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_contact_group`(contact_id, group_id),
-  CONSTRAINT FK_civicrm_group_contact_cache_group_id FOREIGN KEY (`group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_group_contact_cache_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_group_nesting
--- *
--- * Provide parent-child relationships for groups
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_group_nesting` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Relationship ID',
-  `child_group_id` int unsigned NOT NULL COMMENT 'ID of the child group',
-  `parent_group_id` int unsigned NOT NULL COMMENT 'ID of the parent group',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_group_nesting_child_group_id FOREIGN KEY (`child_group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_group_nesting_parent_group_id FOREIGN KEY (`parent_group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_group_organization
--- *
--- * Integrate Organization information into Groups
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_group_organization` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Relationship ID',
-  `group_id` int unsigned NOT NULL COMMENT 'ID of the group',
-  `organization_id` int unsigned NOT NULL COMMENT 'ID of the Organization Contact',
+  UNIQUE INDEX `UI_domain_find`(`domain_id`, `find_word`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_worldregion` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Country ID',
+  `name` varchar(128) COMMENT 'Region name to be associated with countries',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_cxn` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Connection ID',
+  `app_guid` varchar(128) COMMENT 'Application GUID',
+  `app_meta` text COMMENT 'Application Metadata (JSON)',
+  `cxn_guid` varchar(128) COMMENT 'Connection GUID',
+  `secret` text COMMENT 'Shared secret',
+  `perm` text COMMENT 'Permissions approved for the service (JSON)',
+  `options` text COMMENT 'Options for the service (JSON)',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is connection currently enabled?',
+  `created_date` timestamp NULL DEFAULT NULL COMMENT 'When was the connection was created.',
+  `modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When the connection was created or modified.',
+  `fetched_date` timestamp NULL DEFAULT NULL COMMENT 'The last time the application metadata was fetched.',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_group_organization`(group_id, organization_id),
-  CONSTRAINT FK_civicrm_group_organization_group_id FOREIGN KEY (`group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_group_organization_organization_id FOREIGN KEY (`organization_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_event_subscribe
--- *
--- * Tracks when a (new) contact subscribes to a group by email
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_mailing_event_subscribe` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `group_id` int unsigned NOT NULL COMMENT 'FK to Group',
-  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact',
-  `hash` varchar(255) NOT NULL COMMENT 'Security hash',
-  `time_stamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When this subscription event occurred.',
+  UNIQUE INDEX `UI_appid`(`app_guid`),
+  UNIQUE INDEX `UI_keypair_cxnid`(`cxn_guid`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_dedupe_exception` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique dedupe exception id',
+  `contact_id1` int unsigned NOT NULL COMMENT 'FK to Contact ID',
+  `contact_id2` int unsigned NOT NULL COMMENT 'FK to Contact ID',
   PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_event_subscribe_group_id FOREIGN KEY (`group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_mailing_event_subscribe_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_event_confirm
--- *
--- * Tracks when a subscription event is confirmed by email
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_mailing_event_confirm` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `event_subscribe_id` int unsigned NOT NULL COMMENT 'FK to civicrm_mailing_event_subscribe',
-  `time_stamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When this confirmation event occurred.',
+  UNIQUE INDEX `UI_contact_id1_contact_id2`(`contact_id1`, `contact_id2`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_dedupe_rule` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique dedupe rule id',
+  `dedupe_rule_group_id` int unsigned NOT NULL COMMENT 'The id of the rule group this rule belongs to',
+  `rule_table` varchar(64) NOT NULL COMMENT 'The name of the table this rule is about',
+  `rule_field` varchar(64) NOT NULL COMMENT 'The name of the field of the table referenced in rule_table',
+  `rule_length` int unsigned COMMENT 'The length of the matching substring',
+  `rule_weight` int NOT NULL COMMENT 'The weight of the rule',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_dedupe_rule_group` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique dedupe rule group id',
+  `contact_type` varchar(12) COMMENT 'The type of contacts this group applies to',
+  `threshold` int NOT NULL COMMENT 'The weight threshold the sum of the rule weights has to cross to consider two contacts the same',
+  `used` varchar(12) NOT NULL COMMENT 'Whether the rule should be used for cases where usage is Unsupervised, Supervised OR General(programatically)',
+  `name` varchar(255) COMMENT 'Unique name of rule group',
+  `title` varchar(255) COMMENT 'Label of the rule group',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this a reserved rule - a rule group that has been optimized and cannot be changed by the admin',
   PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_event_confirm_event_subscribe_id FOREIGN KEY (`event_subscribe_id`) REFERENCES `civicrm_mailing_event_subscribe`(`id`) ON DELETE CASCADE
+  UNIQUE INDEX `UI_name`(`name`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_contribution_page
--- *
--- * A Contribution object store meta information about a single customized contribution page
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_contribution_page` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Contribution ID',
-  `title` varchar(255) NOT NULL COMMENT 'Contribution Page title. For top of page display',
-  `frontend_title` varchar(255) NOT NULL COMMENT 'Contribution Page Public title',
-  `name` varchar(255) NOT NULL COMMENT 'Unique name for identifying contribution page',
-  `intro_text` text COMMENT 'Text and html allowed. Displayed below title.',
-  `financial_type_id` int unsigned COMMENT 'default financial type assigned to contributions submitted via this page, e.g. Contribution, Campaign Contribution',
-  `payment_processor` varchar(128) COMMENT 'Payment Processors configured for this contribution Page',
-  `is_credit_card_only` tinyint NOT NULL DEFAULT 0 COMMENT 'if true - processing logic must reject transaction at confirmation stage if pay method != credit card',
-  `is_monetary` tinyint NOT NULL DEFAULT 1 COMMENT 'if true - allows real-time monetary transactions otherwise non-monetary transactions',
-  `is_recur` tinyint NOT NULL DEFAULT 0 COMMENT 'if true - allows recurring contributions, valid only for PayPal_Standard',
-  `is_confirm_enabled` tinyint NOT NULL DEFAULT 1 COMMENT 'if false, the confirm page in contribution pages gets skipped',
-  `recur_frequency_unit` varchar(128) COMMENT 'Supported recurring frequency units.',
-  `is_recur_interval` tinyint NOT NULL DEFAULT 0 COMMENT 'if true - supports recurring intervals',
-  `is_recur_installments` tinyint NOT NULL DEFAULT 0 COMMENT 'if true - asks user for recurring installments',
-  `adjust_recur_start_date` tinyint NOT NULL DEFAULT 0 COMMENT 'if true - user is able to adjust payment start date',
-  `is_pay_later` tinyint NOT NULL DEFAULT 0 COMMENT 'if true - allows the user to send payment directly to the org later',
+CREATE TABLE `civicrm_event_carts` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Cart ID',
+  `user_id` int unsigned COMMENT 'FK to civicrm_contact who created this cart',
+  `completed` boolean NOT NULL DEFAULT FALSE,
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_event` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '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.',
+  `event_type_id` int unsigned DEFAULT 0 COMMENT 'Event Type ID.Implicit FK to civicrm_option_value where option_group = event_type.',
+  `participant_listing_id` int unsigned DEFAULT NULL COMMENT 'Should we expose the participant list? Implicit FK to civicrm_option_value where option_group = participant_listing.',
+  `is_public` boolean NOT NULL DEFAULT TRUE COMMENT 'Public events will be included in the iCal feeds. Access to private event information may be limited using ACLs.',
+  `start_date` datetime COMMENT 'Date and time that event starts.',
+  `end_date` datetime COMMENT 'Date and time that event ends. May be NULL if no defined end date/time',
+  `is_online_registration` boolean NOT NULL DEFAULT FALSE COMMENT 'If TRUE, include registration link on Event Info page.',
+  `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.',
+  `registration_start_date` datetime COMMENT 'Date and time that online registration starts.',
+  `registration_end_date` datetime COMMENT 'Date and time that online registration ends.',
+  `max_participants` int unsigned DEFAULT NULL COMMENT 'Maximum number of registered participants to allow. After max is reached, a custom Event Full message is displayed. If NULL, allow unlimited number of participants.',
+  `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.',
+  `is_monetary` boolean NOT NULL DEFAULT FALSE COMMENT 'If TRUE, one or more fee amounts must be set and a Payment Processor must be configured for Online Event Registration.',
+  `financial_type_id` int unsigned DEFAULT NULL COMMENT 'Financial type assigned to paid event registrations for this event. Required if is_monetary is true.',
+  `payment_processor` varchar(128) COMMENT 'Payment Processors configured for this Event (if is_monetary is true)',
+  `is_map` boolean NOT NULL DEFAULT FALSE COMMENT 'Include a map block on the Event Information page when geocode info is available and a mapping provider has been specified?',
+  `is_active` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this Event enabled or disabled/cancelled?',
+  `fee_label` varchar(255),
+  `is_show_location` boolean NOT NULL DEFAULT TRUE COMMENT 'If TRUE, show event location.',
+  `loc_block_id` int unsigned COMMENT 'FK to Location Block ID',
+  `default_role_id` int unsigned DEFAULT 1 COMMENT 'Participant role ID. Implicit FK to civicrm_option_value where option_group = participant_role.',
+  `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.',
+  `is_email_confirm` boolean NOT NULL DEFAULT FALSE COMMENT 'If TRUE, confirmation is automatically emailed to contact on successful registration.',
+  `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.',
+  `confirm_from_email` varchar(255) COMMENT 'FROM email address used for confirmation emails.',
+  `cc_confirm` varchar(255) COMMENT 'comma-separated list of email addresses to cc each time a confirmation is sent',
+  `bcc_confirm` varchar(255) COMMENT 'comma-separated list of email addresses to bcc each time a confirmation is sent',
+  `default_fee_id` int unsigned COMMENT 'FK to civicrm_option_value.',
+  `default_discount_fee_id` int unsigned COMMENT 'FK to civicrm_option_value.',
+  `thankyou_title` varchar(255) DEFAULT NULL COMMENT 'Title for ThankYou page.',
+  `thankyou_text` text COMMENT 'ThankYou Text.',
+  `thankyou_footer_text` text COMMENT 'Footer message.',
+  `is_pay_later` boolean NOT NULL DEFAULT FALSE COMMENT 'if true - allows the user to send payment directly to the org later',
   `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',
-  `is_partial_payment` tinyint DEFAULT 0 COMMENT 'is partial payment enabled for this online contribution page',
+  `is_partial_payment` boolean NOT NULL DEFAULT FALSE COMMENT 'is partial payment enabled for this event',
   `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',
   `min_initial_amount` decimal(20,2) COMMENT 'Minimum initial amount for partial payment',
-  `is_allow_other_amount` tinyint NOT NULL DEFAULT 0 COMMENT 'if true, page will include an input text field where user can enter their own amount',
-  `default_amount_id` int unsigned COMMENT 'FK to civicrm_option_value.',
-  `min_amount` decimal(20,2) COMMENT 'if other amounts allowed, user can configure minimum allowed.',
-  `max_amount` decimal(20,2) COMMENT 'if other amounts allowed, user can configure maximum allowed.',
-  `goal_amount` decimal(20,2) COMMENT 'The target goal for this page, allows people to build a goal meter',
-  `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.',
-  `is_email_receipt` tinyint NOT NULL DEFAULT 0 COMMENT 'if true, receipt is automatically emailed to contact on success',
-  `receipt_from_name` varchar(255) COMMENT 'FROM email name used for receipts generated by contributions to this contribution page.',
-  `receipt_from_email` varchar(255) COMMENT 'FROM email address used for receipts generated by contributions to this contribution page.',
-  `cc_receipt` varchar(255) COMMENT 'comma-separated list of email addresses to cc each time a receipt is sent',
-  `bcc_receipt` varchar(255) COMMENT 'comma-separated list of email addresses to bcc each time a receipt is sent',
-  `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',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this page active?',
-  `footer_text` text COMMENT 'Text and html allowed. Displayed at the bottom of the first page of the contribution wizard.',
-  `amount_block_is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this property active?',
-  `start_date` datetime COMMENT 'Date and time that this page starts.',
-  `end_date` datetime COMMENT 'Date and time that this page ends. May be NULL if no defined end date/time',
-  `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this contribution page',
-  `created_date` datetime COMMENT 'Date and time that contribution page was created.',
-  `currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.',
-  `campaign_id` int unsigned COMMENT 'The campaign for which we are collecting contributions with this page.',
-  `is_share` tinyint NOT NULL DEFAULT 1 COMMENT 'Can people share the contribution page through social media?',
-  `is_billing_required` tinyint NOT NULL DEFAULT 0 COMMENT 'if true - billing block is required for online contribution page',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name),
-  CONSTRAINT FK_civicrm_contribution_page_financial_type_id FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`),
-  CONSTRAINT FK_civicrm_contribution_page_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_contribution_page_campaign_id FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_product
--- *
--- * able - stores "product info" for premiums and can be used for non-incentive products 
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_product` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL COMMENT 'Required product/premium name',
-  `description` text COMMENT 'Optional description of the product/premium.',
-  `sku` varchar(50) COMMENT 'Optional product sku or code.',
-  `options` text COMMENT 'Store comma-delimited list of color, size, etc. options for the product.',
-  `image` varchar(255) COMMENT 'Full or relative URL to uploaded image - fullsize.',
-  `thumbnail` varchar(255) COMMENT 'Full or relative URL to image thumbnail.',
-  `price` decimal(20,2) COMMENT 'Sell price or market value for premiums. For tax-deductible contributions, this will be stored as non_deductible_amount in the contribution record.',
-  `currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.',
-  `financial_type_id` int unsigned DEFAULT NULL COMMENT 'FK to Financial Type.',
-  `min_contribution` decimal(20,2) COMMENT 'Minimum contribution required to be eligible to select this premium.',
-  `cost` decimal(20,2) COMMENT 'Actual cost of this product. Useful to determine net return from sale or using this as an incentive.',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Disabling premium removes it from the premiums_premium join table below.',
-  `period_type` varchar(8) DEFAULT 'rolling' COMMENT 'Rolling means we set start/end based on current day, fixed means we set start/end for current year or month\n      (e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006) ',
-  `fixed_period_start_day` int DEFAULT 0101 COMMENT 'Month and day (MMDD) that fixed period type subscription or membership starts.',
-  `duration_unit` varchar(8) DEFAULT 'year',
-  `duration_interval` int COMMENT 'Number of units for total duration of subscription, service, membership (e.g. 12 Months).',
-  `frequency_unit` varchar(8) DEFAULT 'month' COMMENT 'Frequency unit and interval allow option to store actual delivery frequency for a subscription or service.',
-  `frequency_interval` int COMMENT 'Number of units for delivery frequency of subscription, service, membership (e.g. every 3 Months).',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_product_financial_type_id FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_premiums_product
--- *
--- * joins premiums (settings) to individual product/premium items - determines which products are available for a given contribution page
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_premiums_product` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Contribution ID',
-  `premiums_id` int unsigned NOT NULL COMMENT 'Foreign key to premiums settings record.',
-  `product_id` int unsigned NOT NULL COMMENT 'Foreign key to each product object.',
-  `weight` int unsigned NOT NULL,
-  `financial_type_id` int unsigned DEFAULT NULL COMMENT 'FK to Financial Type.',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_premiums_product_premiums_id FOREIGN KEY (`premiums_id`) REFERENCES `civicrm_premiums`(`id`),
-  CONSTRAINT FK_civicrm_premiums_product_product_id FOREIGN KEY (`product_id`) REFERENCES `civicrm_product`(`id`),
-  CONSTRAINT FK_civicrm_premiums_product_financial_type_id FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_contribution_widget
--- *
--- * A Widget object to store meta information about a single customized contribution widget
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_contribution_widget` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Contribution ID',
-  `contribution_page_id` int unsigned COMMENT 'The Contribution Page which triggered this contribution',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this property active?',
-  `title` varchar(255) COMMENT 'Widget title.',
-  `url_logo` varchar(255) COMMENT 'URL to Widget logo',
-  `button_title` varchar(255) COMMENT 'Button title.',
-  `about` text COMMENT 'About description.',
-  `url_homepage` varchar(255) COMMENT 'URL to Homepage.',
-  `color_title` varchar(10),
-  `color_button` varchar(10),
-  `color_bar` varchar(10),
-  `color_main_text` varchar(10),
-  `color_main` varchar(10),
-  `color_main_bg` varchar(10),
-  `color_bg` varchar(10),
-  `color_about_link` varchar(10),
-  `color_homepage_link` varchar(10),
+  `is_multiple_registrations` boolean NOT NULL DEFAULT FALSE COMMENT 'if true - allows the user to register multiple participants for event',
+  `max_additional_participants` int unsigned DEFAULT 0 COMMENT 'Maximum number of additional participants that can be registered on a single booking',
+  `allow_same_participant_emails` boolean NOT NULL DEFAULT FALSE COMMENT 'if true - allows the user to register multiple registrations from same email address.',
+  `has_waitlist` boolean NOT NULL DEFAULT FALSE COMMENT 'Whether the event has waitlist support.',
+  `requires_approval` boolean NOT NULL DEFAULT FALSE COMMENT 'Whether participants require approval before they can finish registering.',
+  `expiration_time` int unsigned COMMENT 'Expire pending but unconfirmed registrations after this many hours.',
+  `allow_selfcancelxfer` boolean NOT NULL DEFAULT FALSE COMMENT 'Allow self service cancellation or transfer for event?',
+  `selfcancelxfer_time` int NOT NULL DEFAULT 0 COMMENT 'Number of hours prior to event start date to allow self-service cancellation or transfer.',
+  `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.',
+  `is_template` boolean NOT NULL DEFAULT FALSE COMMENT 'whether the event has template',
+  `template_title` varchar(255) COMMENT 'Event Template Title',
+  `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this event',
+  `created_date` datetime COMMENT 'Date and time that event was created.',
+  `currency` varchar(3) COMMENT '3 character string, value from config setting or input via user.',
+  `campaign_id` int unsigned COMMENT 'The campaign for which this event has been created.',
+  `is_share` boolean NOT NULL DEFAULT TRUE COMMENT 'Can people share the event through social media?',
+  `is_confirm_enabled` boolean NOT NULL DEFAULT TRUE COMMENT 'If FALSE, the event booking confirmation screen gets skipped',
+  `parent_event_id` int unsigned DEFAULT NULL COMMENT 'Implicit FK to civicrm_event: parent event',
+  `slot_label_id` int unsigned DEFAULT NULL COMMENT 'Needs to be moved to Event cart extension. Subevent slot label. Implicit FK to civicrm_option_value where option_group = conference_slot.',
+  `dedupe_rule_group_id` int unsigned DEFAULT NULL COMMENT 'Rule to use when matching registrations for this event',
+  `is_billing_required` boolean NOT NULL DEFAULT FALSE COMMENT 'if true than billing block is required this event',
+  `is_show_calendar_links` boolean NOT NULL DEFAULT TRUE COMMENT 'If true then calendar links are shown for this event.',
   PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_contribution_widget_contribution_page_id FOREIGN KEY (`contribution_page_id`) REFERENCES `civicrm_contribution_page`(`id`) ON DELETE CASCADE
+  INDEX `index_event_type_id`(`event_type_id`),
+  INDEX `index_participant_listing_id`(`participant_listing_id`),
+  INDEX `index_parent_event_id`(`parent_event_id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_payment_processor
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_payment_processor` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Payment Processor ID',
-  `domain_id` int unsigned NOT NULL COMMENT 'Which Domain is this match entry for',
-  `name` varchar(64) NOT NULL COMMENT 'Payment Processor Name.',
-  `title` varchar(255) NOT NULL COMMENT 'Name of processor when shown to CiviCRM administrators.',
-  `frontend_title` varchar(255) NOT NULL COMMENT 'Name of processor when shown to users making a payment.',
-  `description` varchar(255) COMMENT 'Additional processor information shown to administrators.',
-  `payment_processor_type_id` int unsigned NOT NULL,
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this processor active?',
-  `is_default` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this processor the default?',
-  `is_test` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this processor for a test site?',
-  `user_name` varchar(255),
-  `password` varchar(255),
-  `signature` text,
-  `url_site` varchar(255),
-  `url_api` varchar(255),
-  `url_recur` varchar(255),
-  `url_button` varchar(255),
-  `subject` varchar(255),
-  `class_name` varchar(255),
-  `billing_mode` int unsigned NOT NULL COMMENT 'Billing Mode (deprecated)',
-  `is_recur` tinyint NOT NULL DEFAULT 0 COMMENT 'Can process recurring contributions',
-  `payment_type` int unsigned DEFAULT 1 COMMENT 'Payment Type: Credit or Debit (deprecated)',
-  `payment_instrument_id` int unsigned DEFAULT 1 COMMENT 'Payment Instrument ID',
-  `accepted_credit_cards` text DEFAULT NULL COMMENT 'array of accepted credit card types',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name_test_domain_id`(name, is_test, domain_id),
-  CONSTRAINT FK_civicrm_payment_processor_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
-  CONSTRAINT FK_civicrm_payment_processor_payment_processor_type_id FOREIGN KEY (`payment_processor_type_id`) REFERENCES `civicrm_payment_processor_type`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_payment_token
--- *
--- * Payment Token
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_payment_token` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Payment Token ID',
-  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact ID for the owner of the token',
-  `payment_processor_id` int unsigned NOT NULL,
-  `token` varchar(255) NOT NULL COMMENT 'Externally provided token string',
-  `created_date` timestamp DEFAULT CURRENT_TIMESTAMP COMMENT 'Date created',
-  `created_id` int unsigned COMMENT 'Contact ID of token creator',
-  `expiry_date` datetime COMMENT 'Date this token expires',
-  `email` varchar(255) COMMENT 'Email at the time of token creation. Useful for fraud forensics',
-  `billing_first_name` varchar(255) COMMENT 'Billing first name at the time of token creation. Useful for fraud forensics',
-  `billing_middle_name` varchar(255) COMMENT 'Billing middle name at the time of token creation. Useful for fraud forensics',
-  `billing_last_name` varchar(255) COMMENT 'Billing last name at the time of token creation. Useful for fraud forensics',
-  `masked_account_number` varchar(255) COMMENT 'Holds the part of the card number or account details that may be retained or displayed',
-  `ip_address` varchar(255) COMMENT 'IP used when creating the token. Useful for fraud forensics',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_payment_token_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_payment_token_payment_processor_id FOREIGN KEY (`payment_processor_id`) REFERENCES `civicrm_payment_processor`(`id`) ON DELETE RESTRICT,
-  CONSTRAINT FK_civicrm_payment_token_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_sms_provider
--- *
--- * Table to add different sms providers 
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_sms_provider` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'SMS Provider ID',
-  `name` varchar(64) COMMENT 'Provider internal name points to option_value of option_group sms_provider_name',
-  `title` varchar(64) COMMENT 'Provider name visible to user',
-  `username` varchar(255),
-  `password` varchar(255),
-  `api_type` int unsigned NOT NULL COMMENT 'points to value in civicrm_option_value for group sms_api_type',
-  `api_url` varchar(128),
-  `api_params` text COMMENT 'the api params in xml, http or smtp format',
-  `is_default` tinyint NOT NULL DEFAULT 0,
-  `is_active` tinyint NOT NULL DEFAULT 1,
-  `domain_id` int unsigned COMMENT 'Which Domain is this sms provider for',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_sms_provider_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`) ON DELETE SET NULL
+CREATE TABLE `civicrm_events_in_carts` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Event In Cart ID',
+  `event_id` int unsigned COMMENT 'FK to Event ID',
+  `event_cart_id` int unsigned COMMENT 'FK to Event Cart ID',
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_membership_type
--- *
--- * Sites can configure multiple types of memberships. They encode the owner organization, fee, and the rules needed to set start and end (expire) dates when a member signs up for that type.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_membership_type` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Membership ID',
-  `domain_id` int unsigned NOT NULL COMMENT 'Which Domain is this match entry for',
-  `name` varchar(128) NOT NULL COMMENT 'Name of Membership Type',
-  `description` varchar(255) COMMENT 'Description of Membership Type',
-  `member_of_contact_id` int unsigned NOT NULL COMMENT 'Owner organization for this membership type. FK to Contact ID',
-  `financial_type_id` int unsigned NOT NULL COMMENT 'If membership is paid by a contribution - what financial type should be used. FK to civicrm_financial_type.id',
-  `minimum_fee` decimal(18,9) DEFAULT 0 COMMENT 'Minimum fee for this membership (0 for free/complimentary memberships).',
-  `duration_unit` varchar(8) NOT NULL COMMENT 'Unit in which membership period is expressed.',
-  `duration_interval` int COMMENT 'Number of duration units in membership period (e.g. 1 year, 12 months).',
-  `period_type` varchar(8) NOT NULL COMMENT 'Rolling membership period starts on signup date. Fixed membership periods start on fixed_period_start_day.',
-  `fixed_period_start_day` int COMMENT 'For fixed period memberships, month and day (mmdd) on which subscription/membership will start. Period start is back-dated unless after rollover day.',
-  `fixed_period_rollover_day` int COMMENT 'For fixed period memberships, signups after this day (mmdd) rollover to next period.',
-  `relationship_type_id` varchar(64) COMMENT 'FK to Relationship Type ID',
-  `relationship_direction` varchar(128),
-  `max_related` int COMMENT 'Maximum number of related memberships.',
-  `visibility` varchar(64),
-  `weight` int,
-  `receipt_text_signup` varchar(255) COMMENT 'Receipt Text for membership signup',
-  `receipt_text_renewal` varchar(255) COMMENT 'Receipt Text for membership renewal',
-  `auto_renew` tinyint DEFAULT 0 COMMENT '0 = No auto-renew option; 1 = Give option, but not required; 2 = Auto-renew required;',
-  `is_active` tinyint DEFAULT 1 COMMENT 'Is this membership_type enabled',
-  PRIMARY KEY (`id`),
-  INDEX `index_relationship_type_id`(relationship_type_id),
-  CONSTRAINT FK_civicrm_membership_type_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
-  CONSTRAINT FK_civicrm_membership_type_member_of_contact_id FOREIGN KEY (`member_of_contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE RESTRICT,
-  CONSTRAINT FK_civicrm_membership_type_financial_type_id FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_membership_block
--- *
--- * A Membership Block stores admin configurable status options and rules
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_membership_block` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Membership ID',
-  `entity_table` varchar(64) COMMENT 'Name for Membership Status',
-  `entity_id` int unsigned NOT NULL COMMENT 'FK to civicrm_contribution_page.id',
-  `membership_types` varchar(1024) COMMENT 'Membership types to be exposed by this block',
-  `membership_type_default` int unsigned COMMENT 'Optional foreign key to membership_type',
-  `display_min_fee` tinyint NOT NULL DEFAULT 1 COMMENT 'Display minimum membership fee',
-  `is_separate_payment` tinyint NOT NULL DEFAULT 1 COMMENT 'Should membership transactions be processed separately',
-  `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',
-  `is_required` tinyint NOT NULL DEFAULT 0 COMMENT 'Is membership sign up optional',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this membership_block enabled',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_membership_block_entity_id FOREIGN KEY (`entity_id`) REFERENCES `civicrm_contribution_page`(`id`),
-  CONSTRAINT FK_civicrm_membership_block_membership_type_default FOREIGN KEY (`membership_type_default`) REFERENCES `civicrm_membership_type`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_case
--- *
--- * This table stores information about cases grouping activities.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_case` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Case ID',
-  `case_type_id` int unsigned NOT NULL COMMENT 'FK to civicrm_case_type.id',
-  `subject` varchar(128) COMMENT 'Short name of the case.',
-  `start_date` date COMMENT 'Date on which given case starts.',
-  `end_date` date COMMENT 'Date on which given case ends.',
-  `details` text COMMENT 'Details populated from Open Case. Only used in the CiviCase extension.',
-  `status_id` int unsigned NOT NULL COMMENT 'ID of case status.',
-  `is_deleted` tinyint NOT NULL DEFAULT 0,
-  `created_date` timestamp NULL DEFAULT NULL COMMENT 'When was the case was created.',
-  `modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When was the case (or closely related entity) was created or modified or deleted.',
-  PRIMARY KEY (`id`),
-  INDEX `index_case_type_id`(case_type_id),
-  INDEX `index_is_deleted`(is_deleted),
-  CONSTRAINT FK_civicrm_case_case_type_id FOREIGN KEY (`case_type_id`) REFERENCES `civicrm_case_type`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_case_contact
--- *
--- * Joining table for case-contact associations.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_case_contact` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique case-contact association id',
-  `case_id` int unsigned NOT NULL COMMENT 'Case ID of case-contact association.',
-  `contact_id` int unsigned NOT NULL COMMENT 'Contact ID of contact record given case belongs to.',
+CREATE TABLE `civicrm_participant` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Participant ID',
+  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact ID',
+  `event_id` int unsigned NOT NULL COMMENT 'FK to Event ID',
+  `status_id` int unsigned NOT NULL DEFAULT 1 COMMENT 'Participant status ID. FK to civicrm_participant_status_type. Default of 1 should map to status = Registered.',
+  `role_id` varchar(128) DEFAULT NULL COMMENT 'Participant role ID. Implicit FK to civicrm_option_value where option_group = participant_role.',
+  `register_date` datetime COMMENT 'When did contact register for event?',
+  `source` varchar(128) COMMENT 'Source of this event registration.',
+  `fee_level` text COMMENT 'Populate with the label (text) associated with a fee level for paid events with multiple levels. Note that we store the label value and not the key',
+  `is_test` boolean NOT NULL DEFAULT FALSE,
+  `is_pay_later` boolean NOT NULL DEFAULT FALSE,
+  `fee_amount` decimal(20,2) COMMENT 'actual processor fee if known - may be 0.',
+  `registered_by_id` int unsigned DEFAULT NULL COMMENT 'FK to Participant ID',
+  `discount_id` int unsigned DEFAULT NULL COMMENT 'FK to Discount ID',
+  `fee_currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value derived from config setting.',
+  `campaign_id` int unsigned COMMENT 'The campaign for which this participant has been registered.',
+  `discount_amount` int unsigned COMMENT 'Discount Amount',
+  `cart_id` int unsigned COMMENT 'FK to civicrm_event_carts',
+  `must_wait` int COMMENT 'On Waiting List',
+  `transferred_to_contact_id` int unsigned DEFAULT NULL COMMENT 'FK to Contact ID',
+  `created_id` int unsigned COMMENT 'Contact responsible for registering this participant',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_case_contact_id`(case_id, contact_id),
-  CONSTRAINT FK_civicrm_case_contact_case_id FOREIGN KEY (`case_id`) REFERENCES `civicrm_case`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_case_contact_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
+  INDEX `index_status_id`(`status_id`),
+  INDEX `index_role_id`(`role_id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_pledge
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_pledge` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Pledge ID',
-  `contact_id` int unsigned NOT NULL COMMENT 'Foreign key to civicrm_contact.id .',
-  `financial_type_id` int unsigned COMMENT 'FK to Financial Type',
-  `contribution_page_id` int unsigned COMMENT 'The Contribution Page which triggered this contribution',
-  `amount` decimal(20,2) NOT NULL COMMENT 'Total pledged amount.',
-  `original_installment_amount` decimal(20,2) NOT NULL COMMENT 'Original amount for each of the installments.',
-  `currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.',
-  `frequency_unit` varchar(8) NOT NULL DEFAULT 'month' COMMENT 'Time units for recurrence of pledge payments.',
-  `frequency_interval` int unsigned NOT NULL DEFAULT 1 COMMENT 'Number of time units for recurrence of pledge payments.',
-  `frequency_day` int unsigned NOT NULL DEFAULT 3 COMMENT 'Day in the period when the pledge payment is due e.g. 1st of month, 15th etc. Use this to set the scheduled dates for pledge payments.',
-  `installments` int unsigned NOT NULL DEFAULT 1 COMMENT 'Total number of payments to be made.',
-  `start_date` datetime NOT NULL COMMENT 'The date the first scheduled pledge occurs.',
-  `create_date` datetime NOT NULL COMMENT 'When this pledge record was created.',
-  `acknowledge_date` datetime COMMENT 'When a pledge acknowledgement message was sent to the contributor.',
-  `modified_date` datetime COMMENT 'Last updated date for this pledge record.',
-  `cancel_date` datetime COMMENT 'Date this pledge was cancelled by contributor.',
-  `end_date` datetime COMMENT 'Date this pledge finished successfully (total pledge payments equal to or greater than pledged amount).',
-  `max_reminders` int unsigned DEFAULT 1 COMMENT 'The maximum number of payment reminders to send for any given payment.',
-  `initial_reminder_day` int unsigned DEFAULT 5 COMMENT 'Send initial reminder this many days prior to the payment due date.',
-  `additional_reminder_day` int unsigned DEFAULT 5 COMMENT 'Send additional reminder this many days after last one sent, up to maximum number of reminders.',
-  `status_id` int unsigned NOT NULL COMMENT 'Implicit foreign key to civicrm_option_values in the pledge_status option group.',
-  `is_test` tinyint NOT NULL DEFAULT 0,
-  `campaign_id` int unsigned COMMENT 'The campaign for which this pledge has been initiated.',
-  PRIMARY KEY (`id`),
-  INDEX `index_status`(status_id),
-  CONSTRAINT FK_civicrm_pledge_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_pledge_financial_type_id FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`),
-  CONSTRAINT FK_civicrm_pledge_contribution_page_id FOREIGN KEY (`contribution_page_id`) REFERENCES `civicrm_contribution_page`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_pledge_campaign_id FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_report_instance
--- *
--- * Users can save their report instance and put in a cron tab etc.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_report_instance` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Report Instance ID',
-  `domain_id` int unsigned NOT NULL COMMENT 'Which Domain is this instance for',
-  `title` varchar(255) COMMENT 'Report Instance Title.',
-  `report_id` varchar(512) NOT NULL COMMENT 'FK to civicrm_option_value for the report template',
-  `name` varchar(255) COMMENT 'when combined with report_id/template uniquely identifies the instance',
-  `args` varchar(255) COMMENT 'arguments that are passed in the url when invoking the instance',
-  `description` varchar(255) COMMENT 'Report Instance description.',
-  `permission` varchar(255) COMMENT 'permission required to be able to run this instance',
-  `grouprole` varchar(1024) COMMENT 'role required to be able to run this instance',
-  `form_values` longtext COMMENT 'Submitted form values for this report',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this entry active?',
-  `created_id` int unsigned COMMENT 'FK to contact table.',
-  `owner_id` int unsigned COMMENT 'FK to contact table.',
-  `email_subject` varchar(255) COMMENT 'Subject of email',
-  `email_to` text COMMENT 'comma-separated list of email addresses to send the report to',
-  `email_cc` text COMMENT 'comma-separated list of email addresses to send the report to',
-  `header` text COMMENT 'comma-separated list of email addresses to send the report to',
-  `footer` text COMMENT 'comma-separated list of email addresses to send the report to',
-  `navigation_id` int unsigned COMMENT 'FK to navigation ID',
-  `drilldown_id` int unsigned COMMENT 'FK to instance ID drilldown to',
-  `is_reserved` tinyint NOT NULL DEFAULT 0,
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_report_instance_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
-  CONSTRAINT FK_civicrm_report_instance_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_report_instance_owner_id FOREIGN KEY (`owner_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_report_instance_navigation_id FOREIGN KEY (`navigation_id`) REFERENCES `civicrm_navigation`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_report_instance_drilldown_id FOREIGN KEY (`drilldown_id`) REFERENCES `civicrm_report_instance`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_price_set
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_price_set` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Price Set',
-  `domain_id` int unsigned COMMENT 'Which Domain is this price-set for',
-  `name` varchar(255) NOT NULL COMMENT 'Variable name/programmatic handle for this set of price fields.',
-  `title` varchar(255) NOT NULL COMMENT 'Displayed title for the Price Set.',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this price set active',
-  `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.',
-  `javascript` varchar(64) COMMENT 'Optional Javascript script function(s) included on the form with this price_set. Can be used for conditional',
-  `extends` varchar(255) NOT NULL COMMENT 'What components are using this price set?',
-  `financial_type_id` int unsigned DEFAULT NULL COMMENT 'FK to Financial Type(for membership price sets only).',
-  `is_quick_config` tinyint NOT NULL DEFAULT 0 COMMENT 'Is set if edited on Contribution or Event Page rather than through Manage Price Sets',
-  `is_reserved` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this a predefined system price set  (i.e. it can not be deleted, edited)?',
-  `min_amount` decimal(20,2) DEFAULT 0.0 COMMENT 'Minimum Amount required for this set.',
+CREATE TABLE `civicrm_participant_payment` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Participant Payment ID',
+  `participant_id` int unsigned NOT NULL COMMENT 'Participant ID (FK)',
+  `contribution_id` int unsigned NOT NULL COMMENT 'FK to contribution table.',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name),
-  CONSTRAINT FK_civicrm_price_set_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
-  CONSTRAINT FK_civicrm_price_set_financial_type_id FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL
+  UNIQUE INDEX `UI_contribution_participant`(`contribution_id`, `participant_id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_price_set_entity
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_price_set_entity` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Price Set Entity',
-  `entity_table` varchar(64) NOT NULL COMMENT 'Table which uses this price set',
-  `entity_id` int unsigned NOT NULL COMMENT 'Item in table',
-  `price_set_id` int unsigned NOT NULL COMMENT 'price set being used',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_entity`(entity_table, entity_id),
-  CONSTRAINT FK_civicrm_price_set_entity_price_set_id FOREIGN KEY (`price_set_id`) REFERENCES `civicrm_price_set`(`id`)
+CREATE TABLE `civicrm_participant_status_type` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'unique participant status type id',
+  `name` varchar(64) COMMENT 'non-localized name of the status type',
+  `label` varchar(255) COMMENT 'localized label for display of this status type',
+  `class` varchar(8) COMMENT 'the general group of status type this one belongs to',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE COMMENT 'whether this is a status type required by the system',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'whether this status type is active',
+  `is_counted` boolean NOT NULL DEFAULT FALSE COMMENT 'whether this status type is counted against event size limit',
+  `weight` int unsigned NOT NULL COMMENT 'controls sort order',
+  `visibility_id` int unsigned COMMENT 'whether the status type is visible to the public, an implicit foreign key to option_value.value related to the `visibility` option_group',
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_county
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_county` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'County ID',
-  `name` varchar(64) COMMENT 'Name of County',
-  `abbreviation` varchar(4) COMMENT '2-4 Character Abbreviation of County',
-  `state_province_id` int unsigned NOT NULL COMMENT 'ID of State/Province that County belongs',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this County active?',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name_state_id`(name, state_province_id),
-  CONSTRAINT FK_civicrm_county_state_province_id FOREIGN KEY (`state_province_id`) REFERENCES `civicrm_state_province`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_dashboard
--- *
--- * Table to store dashboard.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_dashboard` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `domain_id` int unsigned NOT NULL COMMENT 'Domain for dashboard',
-  `name` varchar(64) COMMENT 'Internal name of dashlet.',
-  `label` varchar(255) COMMENT 'dashlet title',
-  `url` varchar(255) COMMENT 'url in case of external dashlet',
-  `permission` varchar(255) COMMENT 'Permission for the dashlet',
-  `permission_operator` varchar(3) COMMENT 'Permission Operator',
-  `fullscreen_url` varchar(255) COMMENT 'fullscreen url for dashlet',
-  `is_active` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this dashlet active?',
-  `is_reserved` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this dashlet reserved?',
-  `cache_minutes` int unsigned NOT NULL DEFAULT 60 COMMENT 'Number of minutes to cache dashlet content in browser localStorage.',
-  `directive` varchar(255) COMMENT 'Element name of angular directive to invoke (lowercase hyphenated format)',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_dashboard_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`) ON DELETE CASCADE
+CREATE TABLE `civicrm_currency` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Currency ID',
+  `name` varchar(64) COMMENT 'Currency Name',
+  `symbol` varchar(8) COMMENT 'Currency Symbol',
+  `numeric_code` varchar(3) COMMENT 'Numeric currency code',
+  `full_name` varchar(64) COMMENT 'Full currency name',
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_discount
--- *
--- * Stores discounts for events on the basis of date
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_discount` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
-  `entity_table` varchar(64) NOT NULL COMMENT 'physical tablename for entity being joined to discount, e.g. civicrm_event',
-  `entity_id` int unsigned NOT NULL COMMENT 'FK to entity table specified in entity_table column.',
-  `price_set_id` int unsigned NOT NULL COMMENT 'FK to civicrm_price_set',
-  `start_date` date COMMENT 'Date when discount starts.',
-  `end_date` date COMMENT 'Date when discount ends.',
+CREATE TABLE `civicrm_entity_financial_account` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `entity_table` varchar(64) NOT NULL COMMENT 'Links to an entity_table like civicrm_financial_type',
+  `entity_id` int unsigned NOT NULL COMMENT 'Links to an id in the entity_table, such as vid in civicrm_financial_type',
+  `account_relationship` int unsigned NOT NULL COMMENT 'FK to a new civicrm_option_value (account_relationship)',
+  `financial_account_id` int unsigned NOT NULL COMMENT 'FK to the financial_account_id',
   PRIMARY KEY (`id`),
-  INDEX `index_entity`(entity_table, entity_id),
-  INDEX `index_entity_option_id`(entity_table, entity_id, price_set_id),
-  CONSTRAINT FK_civicrm_discount_price_set_id FOREIGN KEY (`price_set_id`) REFERENCES `civicrm_price_set`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_entity_file
--- *
--- * Attaches (joins) uploaded files (images, documents, etc.) to entities (Contacts, Groups, Actions).
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_entity_file` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
-  `entity_table` varchar(64) NOT NULL COMMENT 'physical tablename for entity being joined to file, e.g. civicrm_contact',
-  `entity_id` int unsigned NOT NULL COMMENT 'FK to entity table specified in entity_table column.',
-  `file_id` int unsigned NOT NULL COMMENT 'FK to civicrm_file',
+  UNIQUE INDEX `index_entity_id_entity_table_account_relationship`(`entity_id`, `entity_table`, `account_relationship`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_entity_financial_trxn` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `entity_table` varchar(64) NOT NULL COMMENT 'May contain civicrm_financial_item, civicrm_contribution, civicrm_financial_trxn, civicrm_grant, etc',
+  `entity_id` int unsigned NOT NULL,
+  `financial_trxn_id` int unsigned,
+  `amount` decimal(20,2) NOT NULL COMMENT 'allocated amount of transaction to this entity',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_entity_id_entity_table_file_id`(entity_id, entity_table, file_id),
-  CONSTRAINT FK_civicrm_entity_file_file_id FOREIGN KEY (`file_id`) REFERENCES `civicrm_file`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_entity_tag
--- *
--- * Tag entities (Contacts, Groups, Actions) to categories.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_entity_tag` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
-  `entity_table` varchar(64) COMMENT 'physical tablename for entity being joined to file, e.g. civicrm_contact',
-  `entity_id` int unsigned NOT NULL COMMENT 'FK to entity table specified in entity_table column.',
-  `tag_id` int unsigned NOT NULL COMMENT 'FK to civicrm_tag',
+  INDEX `UI_entity_financial_trxn_entity_table`(`entity_table`),
+  INDEX `UI_entity_financial_trxn_entity_id`(`entity_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_financial_account` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `name` varchar(255) NOT NULL COMMENT 'Financial Account Name.',
+  `contact_id` int unsigned COMMENT 'FK to Contact ID that is responsible for the funds in this account',
+  `financial_account_type_id` int unsigned NOT NULL DEFAULT 3 COMMENT 'pseudo FK into civicrm_option_value.',
+  `accounting_code` varchar(64) COMMENT 'Optional value for mapping monies owed and received to accounting system codes.',
+  `account_type_code` varchar(64) COMMENT 'Optional value for mapping account types to accounting system account categories (QuickBooks Account Type Codes for example).',
+  `description` varchar(255) COMMENT 'Financial Type Description.',
+  `parent_id` int unsigned COMMENT 'Parent ID in account hierarchy',
+  `is_header_account` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this a header account which does not allow transactions to be posted against it directly, but only to its sub-accounts?',
+  `is_deductible` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this account tax-deductible?',
+  `is_tax` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this account for taxes?',
+  `tax_rate` decimal(10,8) COMMENT 'The percentage of the total_amount that is due for this tax.',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this a predefined system object?',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this property active?',
+  `is_default` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this account the default one (or default tax one) for its financial_account_type?',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_entity_id_entity_table_tag_id`(entity_id, entity_table, tag_id),
-  CONSTRAINT FK_civicrm_entity_tag_tag_id FOREIGN KEY (`tag_id`) REFERENCES `civicrm_tag`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_uf_group
--- *
--- * User framework groups. Each group represents a form which encompasses a set of fields defined in civicrm_uf_fields table. Initially will be used for CiviCRM Profile form(s). Subsequently we anticipate using this to define other public facing forms (e.g. online donation solicitation forms, mailing list preferences, etc.).
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_uf_group` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique table ID',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this profile currently active? If false, hide all related fields for all sharing contexts.',
-  `group_type` varchar(255) COMMENT 'Comma separated list of the type(s) of profile fields.',
-  `title` varchar(64) NOT NULL COMMENT 'Form title.',
-  `frontend_title` varchar(64) COMMENT 'Profile Form Public title',
-  `description` text COMMENT 'Optional verbose description of the profile.',
-  `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.',
-  `limit_listings_group_id` int unsigned COMMENT 'Group id, foreign key from civicrm_group',
-  `post_url` varchar(255) COMMENT 'Redirect to URL on submit.',
-  `add_to_group_id` int unsigned COMMENT 'foreign key to civicrm_group_id',
-  `add_captcha` tinyint NOT NULL DEFAULT 0 COMMENT 'Should a CAPTCHA widget be included this Profile form.',
-  `is_map` tinyint NOT NULL DEFAULT 0 COMMENT 'Do we want to map results from this profile.',
-  `is_edit_link` tinyint NOT NULL DEFAULT 0 COMMENT 'Should edit link display in profile selector',
-  `is_uf_link` tinyint NOT NULL DEFAULT 0 COMMENT 'Should we display a link to the website profile in profile selector',
-  `is_update_dupe` tinyint NOT NULL DEFAULT 0 COMMENT 'Should we update the contact record if we find a duplicate',
-  `cancel_url` varchar(255) COMMENT 'Redirect to URL when Cancel button clicked.',
-  `is_cms_user` tinyint NOT NULL DEFAULT 0 COMMENT 'Should we create a cms user for this profile ',
-  `notify` text,
-  `is_reserved` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this group reserved for use by some other CiviCRM functionality?',
-  `name` varchar(64) COMMENT 'Name of the UF group for directly addressing it in the codebase',
-  `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this UF group',
-  `created_date` datetime COMMENT 'Date and time this UF group was created.',
-  `is_proximity_search` tinyint NOT NULL DEFAULT 0 COMMENT 'Should we include proximity search feature in this profile search 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',
-  `add_cancel_button` tinyint NOT NULL DEFAULT 1 COMMENT 'Should a Cancel button be included in this Profile form.',
+  UNIQUE INDEX `UI_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_financial_item` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `created_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Date and time the item was created',
+  `transaction_date` datetime NOT NULL COMMENT 'Date and time of the source transaction',
+  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact ID of contact the item is from',
+  `description` varchar(255) COMMENT 'Human readable description of this item, to ease display without lookup of source item.',
+  `amount` decimal(20,2) NOT NULL DEFAULT '0' COMMENT 'Total amount of this item',
+  `currency` varchar(3) COMMENT 'Currency for the amount',
+  `financial_account_id` int unsigned COMMENT 'FK to civicrm_financial_account',
+  `status_id` int unsigned COMMENT 'Payment status: test, paid, part_paid, unpaid (if empty assume unpaid)',
+  `entity_table` varchar(64) COMMENT 'May contain civicrm_line_item, civicrm_financial_trxn etc',
+  `entity_id` int unsigned COMMENT 'The specific source item that is responsible for the creation of this financial_item',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name),
-  CONSTRAINT FK_civicrm_uf_group_limit_listings_group_id FOREIGN KEY (`limit_listings_group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_uf_group_add_to_group_id FOREIGN KEY (`add_to_group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_uf_group_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_uf_field
--- *
--- * User Framework fields and their properties.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_uf_field` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique table ID',
-  `uf_group_id` int unsigned NOT NULL COMMENT 'Which form does this field belong to.',
-  `field_name` varchar(64) NOT NULL COMMENT 'Name for CiviCRM field which is being exposed for sharing.',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this field currently shareable? If false, hide the field for all sharing contexts.',
-  `is_view` tinyint NOT NULL DEFAULT 0 COMMENT 'the field is view only and not editable in user forms.',
-  `is_required` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this field required when included in a user or registration form?',
-  `weight` int NOT NULL DEFAULT 1 COMMENT 'Controls field display order when user framework fields are displayed in registration and account editing forms.',
-  `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.',
-  `visibility` varchar(32) DEFAULT 'User and User Admin Only' COMMENT 'In what context(s) is this field visible.',
-  `in_selector` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this field included as a column in the selector table?',
-  `is_searchable` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this field included search form of profile?',
-  `location_type_id` int unsigned COMMENT 'Location type of this mapping, if required',
-  `phone_type_id` int unsigned COMMENT 'Phone Type ID, if required',
-  `website_type_id` int unsigned COMMENT 'Website Type ID, if required',
-  `label` varchar(255) NOT NULL COMMENT 'To save label for fields.',
-  `field_type` varchar(255) COMMENT 'This field saves field type (ie individual,household.. field etc).',
-  `is_reserved` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this field reserved for use by some other CiviCRM functionality?',
-  `is_multi_summary` tinyint NOT NULL DEFAULT 0 COMMENT 'Include in multi-record listing?',
+  INDEX `IX_created_date`(`created_date`),
+  INDEX `IX_transaction_date`(`transaction_date`),
+  INDEX `index_entity_id_entity_table`(`entity_id`, `entity_table`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_financial_trxn` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `from_financial_account_id` int unsigned COMMENT 'FK to financial_account table.',
+  `to_financial_account_id` int unsigned COMMENT 'FK to financial_financial_account table.',
+  `trxn_date` datetime DEFAULT NULL COMMENT 'date transaction occurred',
+  `total_amount` decimal(20,2) NOT NULL COMMENT 'amount of transaction',
+  `fee_amount` decimal(20,2) COMMENT 'actual processor fee if known - may be 0.',
+  `net_amount` decimal(20,2) COMMENT 'actual funds transfer amount. total less fees. if processor does not report actual fee during transaction, this is set to total_amount.',
+  `currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.',
+  `is_payment` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this entry either a payment or a reversal of a payment?',
+  `trxn_id` varchar(255) COMMENT 'Transaction id supplied by external processor. This may not be unique.',
+  `trxn_result_code` varchar(255) COMMENT 'processor result code',
+  `status_id` int unsigned COMMENT 'pseudo FK to civicrm_option_value of contribution_status_id option_group',
+  `payment_processor_id` int unsigned COMMENT 'Payment Processor for this financial transaction',
+  `payment_instrument_id` int unsigned COMMENT 'FK to payment_instrument option group values',
+  `card_type_id` int unsigned COMMENT 'FK to accept_creditcard option group values',
+  `check_number` varchar(255) COMMENT 'Check number',
+  `pan_truncation` varchar(4) COMMENT 'Last 4 digits of credit card',
+  `order_reference` varchar(255) COMMENT 'Payment Processor external order reference',
   PRIMARY KEY (`id`),
-  INDEX `IX_website_type_id`(website_type_id),
-  CONSTRAINT FK_civicrm_uf_field_uf_group_id FOREIGN KEY (`uf_group_id`) REFERENCES `civicrm_uf_group`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_uf_field_location_type_id FOREIGN KEY (`location_type_id`) REFERENCES `civicrm_location_type`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_uf_join
--- *
--- * User framework join table. This links various internal civicrm object with a profile. Initial use cases are the donation object and the user module
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_uf_join` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique table ID',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this join currently active?',
-  `module` varchar(64) NOT NULL COMMENT 'Module which owns this uf_join instance, e.g. User Registration, CiviDonate, etc.',
-  `entity_table` varchar(64) COMMENT 'Name of table where item being referenced is stored. Modules which only need a single collection of uf_join instances may choose not to populate entity_table and entity_id.',
-  `entity_id` int unsigned COMMENT 'Foreign key to the referenced item.',
-  `weight` int NOT NULL DEFAULT 1 COMMENT 'Controls display order when multiple user framework groups are setup for concurrent display.',
-  `uf_group_id` int unsigned NOT NULL COMMENT 'Which form does this field belong to.',
-  `module_data` longtext COMMENT 'Json serialized array of data used by the ufjoin.module',
+  INDEX `UI_ftrxn_trxn_id`(`trxn_id`),
+  INDEX `UI_ftrxn_payment_instrument_id`(`payment_instrument_id`),
+  INDEX `UI_ftrxn_check_number`(`check_number`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_financial_type` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID of original financial_type so you can search this table by the financial_type.id and then select the relevant version based on the timestamp',
+  `name` varchar(64) NOT NULL COMMENT 'Financial Type Name.',
+  `description` varchar(255) COMMENT 'Financial Type Description.',
+  `is_deductible` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this financial type tax-deductible? If TRUE, contributions of this type may be fully OR partially deductible - non-deductible amount is stored in the Contribution record.',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this a predefined system object?',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this property active?',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_payment_processor` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Payment Processor ID',
+  `domain_id` int unsigned NOT NULL COMMENT 'Which Domain is this match entry for',
+  `name` varchar(64) NOT NULL COMMENT 'Payment Processor Name.',
+  `title` varchar(255) NOT NULL COMMENT 'Name of processor when shown to CiviCRM administrators.',
+  `frontend_title` varchar(255) NOT NULL COMMENT 'Name of processor when shown to users making a payment.',
+  `description` varchar(255) COMMENT 'Additional processor information shown to administrators.',
+  `payment_processor_type_id` int unsigned NOT NULL,
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this processor active?',
+  `is_default` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this processor the default?',
+  `is_test` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this processor for a test site?',
+  `user_name` varchar(255),
+  `password` varchar(255),
+  `signature` text,
+  `url_site` varchar(255),
+  `url_api` varchar(255),
+  `url_recur` varchar(255),
+  `url_button` varchar(255),
+  `subject` varchar(255),
+  `class_name` varchar(255),
+  `billing_mode` int unsigned NOT NULL COMMENT 'Billing Mode (deprecated)',
+  `is_recur` boolean NOT NULL DEFAULT FALSE COMMENT 'Can process recurring contributions',
+  `payment_type` int unsigned DEFAULT 1 COMMENT 'Payment Type: Credit or Debit (deprecated)',
+  `payment_instrument_id` int unsigned DEFAULT 1 COMMENT 'Payment Instrument ID',
+  `accepted_credit_cards` text DEFAULT NULL COMMENT 'array of accepted credit card types',
   PRIMARY KEY (`id`),
-  INDEX `index_entity`(entity_table, entity_id),
-  CONSTRAINT FK_civicrm_uf_join_uf_group_id FOREIGN KEY (`uf_group_id`) REFERENCES `civicrm_uf_group`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_action_schedule
--- *
--- * Table to store the reminders.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_action_schedule` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) NOT NULL COMMENT 'Name of the scheduled action',
-  `title` varchar(64) COMMENT 'Title of the action(reminder)',
-  `recipient` varchar(64) COMMENT 'Recipient',
-  `limit_to` int COMMENT 'Is this the recipient criteria limited to OR in addition to?',
-  `entity_value` varchar(255) COMMENT 'Entity value',
-  `entity_status` varchar(64) COMMENT 'Entity status',
-  `start_action_offset` int unsigned DEFAULT 0 COMMENT 'Reminder Interval.',
-  `start_action_unit` varchar(8) COMMENT 'Time units for reminder.',
-  `start_action_condition` varchar(64) COMMENT 'Reminder Action',
-  `start_action_date` varchar(64) COMMENT 'Entity date',
-  `is_repeat` tinyint NOT NULL DEFAULT 0,
-  `repetition_frequency_unit` varchar(8) COMMENT 'Time units for repetition of reminder.',
-  `repetition_frequency_interval` int unsigned DEFAULT 0 COMMENT 'Time interval for repeating the reminder.',
-  `end_frequency_unit` varchar(8) COMMENT 'Time units till repetition of reminder.',
-  `end_frequency_interval` int unsigned DEFAULT 0 COMMENT 'Time interval till repeating the reminder.',
-  `end_action` varchar(32) COMMENT 'Reminder Action till repeating the reminder.',
-  `end_date` varchar(64) COMMENT 'Entity end date',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this option active?',
-  `recipient_manual` varchar(128) COMMENT 'Contact IDs to which reminder should be sent.',
-  `recipient_listing` varchar(128) COMMENT 'listing based on recipient field.',
-  `body_text` longtext COMMENT 'Body of the mailing in text format.',
-  `body_html` longtext COMMENT 'Body of the mailing in html format.',
-  `sms_body_text` longtext COMMENT 'Content of the SMS text.',
-  `subject` varchar(128) COMMENT 'Subject of mailing',
-  `record_activity` tinyint NOT NULL DEFAULT 0 COMMENT 'Record Activity for this reminder?',
-  `mapping_id` varchar(64) COMMENT 'Name/ID of the mapping to use on this table',
-  `group_id` int unsigned COMMENT 'FK to Group',
-  `msg_template_id` int unsigned COMMENT 'FK to the message template.',
-  `sms_template_id` int unsigned COMMENT 'FK to the message template.',
-  `absolute_date` date COMMENT 'Date on which the reminder be sent.',
-  `from_name` varchar(255) COMMENT 'Name in \"from\" field',
-  `from_email` varchar(255) COMMENT 'Email address in \"from\" field',
-  `mode` varchar(128) DEFAULT "Email" COMMENT 'Send the message as email or sms or both.',
-  `sms_provider_id` int unsigned,
-  `used_for` varchar(64) COMMENT 'Used for repeating entity',
-  `filter_contact_language` varchar(128) COMMENT 'Used for multilingual installation',
-  `communication_language` varchar(8) COMMENT 'Used for multilingual installation',
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When was the scheduled reminder created.',
-  `modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When the reminder was created or modified.',
-  `effective_start_date` timestamp NULL COMMENT 'Earliest date to consider start events from.',
-  `effective_end_date` timestamp NULL COMMENT 'Latest date to consider end events from.',
+  UNIQUE INDEX `UI_name_test_domain_id`(`name`, `is_test`, `domain_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_payment_processor_type` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Payment Processor Type ID',
+  `name` varchar(64) NOT NULL COMMENT 'Payment Processor Type Name.',
+  `title` varchar(127) NOT NULL COMMENT 'Payment Processor Type Title.',
+  `description` varchar(255) COMMENT 'Payment Processor Description.',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this processor active?',
+  `is_default` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this processor the default?',
+  `user_name_label` varchar(255),
+  `password_label` varchar(255),
+  `signature_label` varchar(255),
+  `subject_label` varchar(255),
+  `class_name` varchar(255) NOT NULL,
+  `url_site_default` varchar(255),
+  `url_api_default` varchar(255),
+  `url_recur_default` varchar(255),
+  `url_button_default` varchar(255),
+  `url_site_test_default` varchar(255),
+  `url_api_test_default` varchar(255),
+  `url_recur_test_default` varchar(255),
+  `url_button_test_default` varchar(255),
+  `billing_mode` int unsigned NOT NULL COMMENT 'Billing Mode (deprecated)',
+  `is_recur` boolean NOT NULL DEFAULT FALSE COMMENT 'Can process recurring contributions',
+  `payment_type` int unsigned DEFAULT 1 COMMENT 'Payment Type: Credit or Debit (deprecated)',
+  `payment_instrument_id` int unsigned DEFAULT 1 COMMENT 'Payment Instrument ID',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_name`(name),
-  CONSTRAINT FK_civicrm_action_schedule_group_id FOREIGN KEY (`group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_action_schedule_msg_template_id FOREIGN KEY (`msg_template_id`) REFERENCES `civicrm_msg_template`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_action_schedule_sms_template_id FOREIGN KEY (`sms_template_id`) REFERENCES `civicrm_msg_template`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_action_schedule_sms_provider_id FOREIGN KEY (`sms_provider_id`) REFERENCES `civicrm_sms_provider`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_action_log
--- *
--- * Table to store log for the reminder.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_action_log` (
+  UNIQUE INDEX `UI_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_payment_token` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Payment Token ID',
+  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact ID for the owner of the token',
+  `payment_processor_id` int unsigned NOT NULL,
+  `token` varchar(255) NOT NULL COMMENT 'Externally provided token string',
+  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Date created',
+  `created_id` int unsigned COMMENT 'Contact ID of token creator',
+  `expiry_date` datetime COMMENT 'Date this token expires',
+  `email` varchar(255) COMMENT 'Email at the time of token creation. Useful for fraud forensics',
+  `billing_first_name` varchar(255) COMMENT 'Billing first name at the time of token creation. Useful for fraud forensics',
+  `billing_middle_name` varchar(255) COMMENT 'Billing middle name at the time of token creation. Useful for fraud forensics',
+  `billing_last_name` varchar(255) COMMENT 'Billing last name at the time of token creation. Useful for fraud forensics',
+  `masked_account_number` varchar(255) COMMENT 'Holds the part of the card number or account details that may be retained or displayed',
+  `ip_address` varchar(255) COMMENT 'IP used when creating the token. Useful for fraud forensics',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_tell_friend` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Friend ID',
+  `entity_table` varchar(64) NOT NULL COMMENT 'Name of table where item being referenced is stored.',
+  `entity_id` int unsigned NOT NULL COMMENT 'Foreign key to the referenced item.',
+  `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.',
+  `general_link` varchar(255) COMMENT 'URL for general info about the organization - included in the email sent to friends.',
+  `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.',
+  `is_active` boolean NOT NULL DEFAULT TRUE,
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_mailing_bounce_pattern` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `contact_id` int unsigned COMMENT 'FK to Contact ID',
-  `entity_id` int unsigned NOT NULL COMMENT 'FK to id of the entity that the action was performed on. Pseudo - FK.',
-  `entity_table` varchar(255) COMMENT 'name of the entity table for the above id, e.g. civicrm_activity, civicrm_participant',
-  `action_schedule_id` int unsigned NOT NULL COMMENT 'FK to the action schedule that this action originated from.',
-  `action_date_time` datetime COMMENT 'date time that the action was performed on.',
-  `is_error` tinyint NOT NULL DEFAULT 0 COMMENT 'Was there any error sending the reminder?',
-  `message` text COMMENT 'Description / text in case there was an error encountered.',
-  `repetition_number` int unsigned COMMENT 'Keeps track of the sequence number of this repetition.',
-  `reference_date` datetime DEFAULT NULL COMMENT 'Stores the date from the entity which triggered this reminder action (e.g. membership.end_date for most membership renewal reminders)',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_action_log_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_action_log_action_schedule_id FOREIGN KEY (`action_schedule_id`) REFERENCES `civicrm_action_schedule`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_dashboard_contact
--- *
--- * Table to store dashboard for each contact.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_dashboard_contact` (
+  `bounce_type_id` int unsigned NOT NULL COMMENT 'Type of bounce',
+  `pattern` varchar(255) COMMENT 'A regexp to match a message to a bounce type',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_mailing_bounce_type` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `dashboard_id` int unsigned NOT NULL COMMENT 'Dashboard ID',
-  `contact_id` int unsigned NOT NULL COMMENT 'Contact ID',
-  `column_no` int DEFAULT 0 COMMENT 'column no for this widget',
-  `is_active` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this widget active?',
-  `weight` int DEFAULT 0 COMMENT 'Ordering of the widgets.',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `index_dashboard_id_contact_id`(dashboard_id, contact_id),
-  CONSTRAINT FK_civicrm_dashboard_contact_dashboard_id FOREIGN KEY (`dashboard_id`) REFERENCES `civicrm_dashboard`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_dashboard_contact_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_relationship
--- *
--- * Relationship between any 2 types of contacts.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_relationship` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Relationship ID',
-  `contact_id_a` int unsigned NOT NULL COMMENT 'id of the first contact',
-  `contact_id_b` int unsigned NOT NULL COMMENT 'id of the second contact',
-  `relationship_type_id` int unsigned NOT NULL COMMENT 'Type of relationship',
-  `start_date` date COMMENT 'date when the relationship started',
-  `end_date` date COMMENT 'date when the relationship ended',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'is the relationship active ?',
-  `description` varchar(255) COMMENT 'Optional verbose description for the relationship.',
-  `is_permission_a_b` int unsigned NOT NULL DEFAULT 0 COMMENT 'Permission that Contact A has to view/update Contact B',
-  `is_permission_b_a` int unsigned NOT NULL DEFAULT 0 COMMENT 'Permission that Contact B has to view/update Contact A',
-  `case_id` int unsigned DEFAULT NULL COMMENT 'FK to civicrm_case',
-  `created_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Relationship created date.',
-  `modified_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Relationship last modified.',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_relationship_contact_id_a FOREIGN KEY (`contact_id_a`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_relationship_contact_id_b FOREIGN KEY (`contact_id_b`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_relationship_relationship_type_id FOREIGN KEY (`relationship_type_id`) REFERENCES `civicrm_relationship_type`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_relationship_case_id FOREIGN KEY (`case_id`) REFERENCES `civicrm_case`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_relationship_cache
--- *
--- * The cache permutes information from the relationship table to facilitate querying. Every relationship is mapped to multiple records in the cache. Joins should begin on the near side and extract info from the far side.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_relationship_cache` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Relationship Cache ID',
-  `relationship_id` int unsigned NOT NULL COMMENT 'id of the relationship (FK to civicrm_relationship.id)',
-  `relationship_type_id` int unsigned NOT NULL COMMENT 'id of the relationship type',
-  `orientation` char(3) NOT NULL COMMENT 'The cache record is a permutation of the original relationship record. The orientation indicates whether it is forward (a_b) or reverse (b_a) relationship.',
-  `near_contact_id` int unsigned NOT NULL COMMENT 'id of the first contact',
-  `near_relation` varchar(64) COMMENT 'name for relationship of near_contact to far_contact.',
-  `far_contact_id` int unsigned NOT NULL COMMENT 'id of the second contact',
-  `far_relation` varchar(64) COMMENT 'name for relationship of far_contact to near_contact.',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'is the relationship active ?',
-  `start_date` date COMMENT 'date when the relationship started',
-  `end_date` date COMMENT 'date when the relationship ended',
-  `case_id` int unsigned DEFAULT NULL COMMENT 'FK to civicrm_case',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_relationship`(relationship_id, orientation),
-  INDEX `index_nearid_nearrelation`(near_contact_id, near_relation),
-  INDEX `index_nearid_farrelation`(near_contact_id, far_relation),
-  INDEX `index_near_relation`(near_relation),
-  CONSTRAINT FK_civicrm_relationship_cache_relationship_id FOREIGN KEY (`relationship_id`) REFERENCES `civicrm_relationship`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_relationship_cache_relationship_type_id FOREIGN KEY (`relationship_type_id`) REFERENCES `civicrm_relationship_type`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_relationship_cache_near_contact_id FOREIGN KEY (`near_contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_relationship_cache_far_contact_id FOREIGN KEY (`far_contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_relationship_cache_case_id FOREIGN KEY (`case_id`) REFERENCES `civicrm_case`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing
--- *
--- * Stores information about a mailing.
--- *
--- *******************************************************/
+  `name` varchar(255) NOT NULL COMMENT 'Type of bounce',
+  `description` varchar(2048) COMMENT 'A description of this bounce type',
+  `hold_threshold` int unsigned NOT NULL COMMENT 'Number of bounces of this type required before the email address is put on bounce hold',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_mailing` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `domain_id` int unsigned COMMENT 'Which site is this mailing for',
@@ -3081,13 +2144,13 @@ CREATE TABLE `civicrm_mailing` (
   `subject` varchar(128) COMMENT 'Subject of mailing',
   `body_text` longtext COMMENT 'Body of the mailing in text format.',
   `body_html` longtext COMMENT 'Body of the mailing in html format.',
-  `url_tracking` tinyint NOT NULL DEFAULT 0 COMMENT 'Should we track URL click-throughs for this mailing?',
-  `forward_replies` tinyint NOT NULL DEFAULT 0 COMMENT 'Should we forward replies back to the author?',
-  `auto_responder` tinyint NOT NULL DEFAULT 0 COMMENT 'Should we enable the auto-responder?',
-  `open_tracking` tinyint NOT NULL DEFAULT 0 COMMENT 'Should we track when recipients open/read this mailing?',
-  `is_completed` tinyint NOT NULL DEFAULT 0 COMMENT 'Has at least one job associated with this mailing finished?',
+  `url_tracking` boolean NOT NULL DEFAULT FALSE COMMENT 'Should we track URL click-throughs for this mailing?',
+  `forward_replies` boolean NOT NULL DEFAULT FALSE COMMENT 'Should we forward replies back to the author?',
+  `auto_responder` boolean NOT NULL DEFAULT FALSE COMMENT 'Should we enable the auto-responder?',
+  `open_tracking` boolean NOT NULL DEFAULT FALSE COMMENT 'Should we track when recipients open/read this mailing?',
+  `is_completed` boolean NOT NULL DEFAULT FALSE COMMENT 'Has at least one job associated with this mailing finished?',
   `msg_template_id` int unsigned COMMENT 'FK to the message template.',
-  `override_verp` tinyint NOT NULL DEFAULT 0 COMMENT 'Overwrite the VERP address in Reply-To',
+  `override_verp` boolean NOT NULL DEFAULT FALSE COMMENT 'Overwrite the VERP address in Reply-To',
   `created_id` int unsigned COMMENT 'FK to Contact ID who first created this mailing',
   `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Date and time this mailing was created.',
   `modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When the mailing (or closely related entity) was created or modified or deleted.',
@@ -3097,369 +2160,185 @@ CREATE TABLE `civicrm_mailing` (
   `approval_date` timestamp NULL DEFAULT NULL COMMENT 'Date and time this mailing was approved.',
   `approval_status_id` int unsigned COMMENT 'The status of this mailing. Values: none, approved, rejected',
   `approval_note` longtext COMMENT 'Note behind the decision.',
-  `is_archived` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this mailing archived?',
+  `is_archived` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this mailing archived?',
   `visibility` varchar(40) DEFAULT 'Public Pages' COMMENT 'In what context(s) is the mailing contents visible (online viewing)',
   `campaign_id` int unsigned COMMENT 'The campaign for which this mailing has been initiated.',
-  `dedupe_email` tinyint NOT NULL DEFAULT 0 COMMENT 'Remove duplicate emails?',
+  `dedupe_email` boolean NOT NULL DEFAULT FALSE COMMENT 'Remove duplicate emails?',
   `sms_provider_id` int unsigned,
   `hash` varchar(16) COMMENT 'Key for validating requests related to this mailing.',
   `location_type_id` int unsigned COMMENT 'With email_selection_method, determines which email address to use',
   `email_selection_method` varchar(20) DEFAULT 'automatic' COMMENT 'With location_type_id, determine how to choose the email address to use.',
   `language` varchar(5) COMMENT 'Language of the content of the mailing. Useful for tokens.',
   PRIMARY KEY (`id`),
-  INDEX `index_hash`(hash),
-  CONSTRAINT FK_civicrm_mailing_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_header_id FOREIGN KEY (`header_id`) REFERENCES `civicrm_mailing_component`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_footer_id FOREIGN KEY (`footer_id`) REFERENCES `civicrm_mailing_component`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_reply_id FOREIGN KEY (`reply_id`) REFERENCES `civicrm_mailing_component`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_unsubscribe_id FOREIGN KEY (`unsubscribe_id`) REFERENCES `civicrm_mailing_component`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_optout_id FOREIGN KEY (`optout_id`) REFERENCES `civicrm_mailing_component`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_msg_template_id FOREIGN KEY (`msg_template_id`) REFERENCES `civicrm_msg_template`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_scheduled_id FOREIGN KEY (`scheduled_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_approver_id FOREIGN KEY (`approver_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_campaign_id FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_sms_provider_id FOREIGN KEY (`sms_provider_id`) REFERENCES `civicrm_sms_provider`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_location_type_id FOREIGN KEY (`location_type_id`) REFERENCES `civicrm_location_type`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_group
--- *
--- * Stores information about the groups that participate in this mailing..
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_mailing_group` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `mailing_id` int unsigned NOT NULL COMMENT 'The ID of a previous mailing to include/exclude recipients.',
-  `group_type` varchar(8) COMMENT 'Are the members of the group included or excluded?.',
-  `entity_table` varchar(64) NOT NULL COMMENT 'Name of table where item being referenced is stored.',
-  `entity_id` int unsigned NOT NULL COMMENT 'Foreign key to the referenced item.',
-  `search_id` int COMMENT 'The filtering search. custom search id or -1 for civicrm api search',
-  `search_args` text COMMENT 'The arguments to be sent to the search function',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_group_mailing_id FOREIGN KEY (`mailing_id`) REFERENCES `civicrm_mailing`(`id`) ON DELETE CASCADE
+  INDEX `index_hash`(`hash`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_trackable_url
--- *
--- * Stores URLs for which we should track click-throughs from mailings
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_mailing_trackable_url` (
+CREATE TABLE `civicrm_mailing_abtest` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `url` text NOT NULL COMMENT 'The URL to be tracked.',
-  `mailing_id` int unsigned NOT NULL COMMENT 'FK to the mailing',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_trackable_url_mailing_id FOREIGN KEY (`mailing_id`) REFERENCES `civicrm_mailing`(`id`) ON DELETE CASCADE
+  `name` varchar(128) COMMENT 'Name of the A/B test',
+  `status` varchar(32) COMMENT 'Status',
+  `mailing_id_a` int unsigned COMMENT 'The first experimental mailing (\"A\" condition)',
+  `mailing_id_b` int unsigned COMMENT 'The second experimental mailing (\"B\" condition)',
+  `mailing_id_c` int unsigned COMMENT 'The final, general mailing (derived from A or B)',
+  `domain_id` int unsigned NOT NULL COMMENT 'Which site is this mailing for',
+  `testing_criteria` varchar(32),
+  `winner_criteria` varchar(32),
+  `specific_url` varchar(255) COMMENT 'What specific url to track',
+  `declare_winning_time` datetime COMMENT 'In how much time to declare winner',
+  `group_percentage` int unsigned,
+  `created_id` int unsigned COMMENT 'FK to Contact ID',
+  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When was this item created',
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_job
--- *
--- * Stores information about the job that executes this mailing
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_mailing_job` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `mailing_id` int unsigned NOT NULL COMMENT 'The ID of the mailing this Job will send.',
-  `scheduled_date` timestamp NULL DEFAULT NULL COMMENT 'date on which this job was scheduled.',
-  `start_date` timestamp NULL DEFAULT NULL COMMENT 'date on which this job was started.',
-  `end_date` timestamp NULL DEFAULT NULL COMMENT 'date on which this job ended.',
-  `status` varchar(12) COMMENT 'The state of this job',
-  `is_test` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this job for a test mail?',
-  `job_type` varchar(255) COMMENT 'Type of mailling job: null | child ',
-  `parent_id` int unsigned DEFAULT NULL COMMENT 'Parent job id',
-  `job_offset` int DEFAULT 0 COMMENT 'Offset of the child job',
-  `job_limit` int DEFAULT 0 COMMENT 'Queue size limit for each child job',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_job_mailing_id FOREIGN KEY (`mailing_id`) REFERENCES `civicrm_mailing`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_mailing_job_parent_id FOREIGN KEY (`parent_id`) REFERENCES `civicrm_mailing_job`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_recipients
--- *
--- * Stores information about the recipients of a mailing.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_mailing_recipients` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `mailing_id` int unsigned NOT NULL COMMENT 'The ID of the mailing this Job will send.',
-  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact',
-  `email_id` int unsigned DEFAULT NULL COMMENT 'FK to Email',
-  `phone_id` int unsigned DEFAULT NULL COMMENT 'FK to Phone',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_recipients_mailing_id FOREIGN KEY (`mailing_id`) REFERENCES `civicrm_mailing`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_mailing_recipients_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_mailing_recipients_email_id FOREIGN KEY (`email_id`) REFERENCES `civicrm_email`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_recipients_phone_id FOREIGN KEY (`phone_id`) REFERENCES `civicrm_phone`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_spool
--- *
--- * Stores the outbond mails
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_mailing_spool` (
+CREATE TABLE `civicrm_mailing_component` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `job_id` int unsigned NOT NULL COMMENT 'The ID of the Job .',
-  `recipient_email` text COMMENT 'The email of the recipients this mail is to be sent.',
-  `headers` text COMMENT 'The header information of this mailing .',
-  `body` text COMMENT 'The body of this mailing.',
-  `added_at` timestamp NULL DEFAULT NULL COMMENT 'date on which this job was added.',
-  `removed_at` timestamp NULL DEFAULT NULL COMMENT 'date on which this job was removed.',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_spool_job_id FOREIGN KEY (`job_id`) REFERENCES `civicrm_mailing_job`(`id`) ON DELETE CASCADE
+  `name` varchar(64) COMMENT 'The name of this component',
+  `component_type` varchar(12) COMMENT 'Type of Component.',
+  `subject` varchar(255),
+  `body_html` text COMMENT 'Body of the component in html format.',
+  `body_text` text COMMENT 'Body of the component in text format.',
+  `is_default` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this the default component for this component_type?',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this property active?',
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_event_queue
--- *
--- * A collection of all intended recipients of a job
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_mailing_event_queue` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `job_id` int unsigned NULL COMMENT 'Mailing Job',
-  `mailing_id` int unsigned NULL COMMENT 'Related mailing. Used for reporting on mailing success, if present.',
-  `is_test` tinyint NOT NULL DEFAULT 0,
-  `email_id` int unsigned DEFAULT NULL COMMENT 'FK to Email',
-  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact',
-  `hash` varchar(255) NOT NULL COMMENT 'Security hash',
-  `phone_id` int unsigned DEFAULT NULL COMMENT 'FK to Phone',
-  PRIMARY KEY (`id`),
-  INDEX `index_hash`(hash),
-  CONSTRAINT FK_civicrm_mailing_event_queue_job_id FOREIGN KEY (`job_id`) REFERENCES `civicrm_mailing_job`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_event_queue_mailing_id FOREIGN KEY (`mailing_id`) REFERENCES `civicrm_mailing`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_event_queue_email_id FOREIGN KEY (`email_id`) REFERENCES `civicrm_email`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_mailing_event_queue_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_mailing_event_queue_phone_id FOREIGN KEY (`phone_id`) REFERENCES `civicrm_phone`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_event_bounce
--- *
--- * Tracks when and why an email bounced.
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_mailing_event_bounce` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `event_queue_id` int unsigned NOT NULL COMMENT 'FK to EventQueue',
   `bounce_type_id` int unsigned COMMENT 'What type of bounce was it?',
   `bounce_reason` varchar(255) COMMENT 'The reason the email bounced.',
   `time_stamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When this bounce event occurred.',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_event_bounce_event_queue_id FOREIGN KEY (`event_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE CASCADE
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_mailing_event_confirm` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `event_subscribe_id` int unsigned NOT NULL COMMENT 'FK to civicrm_mailing_event_subscribe',
+  `time_stamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When this confirmation event occurred.',
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_event_delivered
--- *
--- * Tracks when a queued email is actually delivered to the MTA
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_mailing_event_delivered` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `event_queue_id` int unsigned NOT NULL COMMENT 'FK to EventQueue',
   `time_stamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When this delivery event occurred.',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_event_delivered_event_queue_id FOREIGN KEY (`event_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE CASCADE
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_event_forward
--- *
--- * Tracks when a contact forwards a mailing to a (new) contact
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_mailing_event_forward` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `event_queue_id` int unsigned NOT NULL COMMENT 'FK to EventQueue',
   `dest_queue_id` int unsigned COMMENT 'FK to EventQueue for destination',
   `time_stamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When this forward event occurred.',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_event_forward_event_queue_id FOREIGN KEY (`event_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_mailing_event_forward_dest_queue_id FOREIGN KEY (`dest_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_event_opened
--- *
--- * Tracks when a delivered email is opened by the recipient
--- *
--- *******************************************************/
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_mailing_event_opened` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `event_queue_id` int unsigned NOT NULL COMMENT 'FK to EventQueue',
   `time_stamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When this open event occurred.',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_mailing_event_queue` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `job_id` int unsigned COMMENT 'Mailing Job',
+  `mailing_id` int unsigned COMMENT 'Related mailing. Used for reporting on mailing success, if present.',
+  `is_test` boolean NOT NULL DEFAULT FALSE,
+  `email_id` int unsigned DEFAULT NULL COMMENT 'FK to Email',
+  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact',
+  `hash` varchar(255) NOT NULL COMMENT 'Security hash',
+  `phone_id` int unsigned DEFAULT NULL COMMENT 'FK to Phone',
   PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_event_opened_event_queue_id FOREIGN KEY (`event_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE CASCADE
+  INDEX `index_hash`(`hash`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_event_reply
--- *
--- * Tracks when a contact replies to a mailing
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_mailing_event_reply` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `event_queue_id` int unsigned NOT NULL COMMENT 'FK to EventQueue',
   `time_stamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When this reply event occurred.',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_event_reply_event_queue_id FOREIGN KEY (`event_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE CASCADE
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_mailing_event_subscribe` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `group_id` int unsigned NOT NULL COMMENT 'FK to Group',
+  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact',
+  `hash` varchar(255) NOT NULL COMMENT 'Security hash',
+  `time_stamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When this subscription event occurred.',
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_event_trackable_url_open
--- *
--- * Tracks when a TrackableURL is clicked by a recipient.
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_mailing_event_trackable_url_open` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `event_queue_id` int unsigned NOT NULL COMMENT 'FK to EventQueue',
   `trackable_url_id` int unsigned NOT NULL COMMENT 'FK to TrackableURL',
   `time_stamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When this trackable URL open occurred.',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_event_trackable_url_open_event_queue_id FOREIGN KEY (`event_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_mailing_event_trackable_url_open_trackable_url_id FOREIGN KEY (`trackable_url_id`) REFERENCES `civicrm_mailing_trackable_url`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_mailing_event_unsubscribe
--- *
--- * Tracks when a recipient unsubscribes from a group/domain
--- *
--- *******************************************************/
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_mailing_event_unsubscribe` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `event_queue_id` int unsigned NOT NULL COMMENT 'FK to EventQueue',
-  `org_unsubscribe` tinyint NOT NULL COMMENT 'Unsubscribe at org- or group-level',
+  `org_unsubscribe` boolean NOT NULL DEFAULT FALSE COMMENT 'Unsubscribe at org- or group-level',
   `time_stamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When this delivery event occurred.',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_mailing_event_unsubscribe_event_queue_id FOREIGN KEY (`event_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE CASCADE
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_contribution_recur
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_contribution_recur` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Contribution Recur ID',
-  `contact_id` int unsigned NOT NULL COMMENT 'Foreign key to civicrm_contact.id.',
-  `amount` decimal(20,2) NOT NULL COMMENT 'Amount to be collected (including any sales tax) by payment processor each recurrence.',
-  `currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.',
-  `frequency_unit` varchar(8) DEFAULT 'month' COMMENT 'Time units for recurrence of payment.',
-  `frequency_interval` int unsigned NOT NULL DEFAULT 1 COMMENT 'Number of time units for recurrence of payment.',
-  `installments` int unsigned COMMENT 'Total number of payments to be made. Set this to 0 if this is an open-ended commitment i.e. no set end date.',
-  `start_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'The date the first scheduled recurring contribution occurs.',
-  `create_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When this recurring contribution record was created.',
-  `modified_date` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Last updated date for this record. mostly the last time a payment was received',
-  `cancel_date` datetime COMMENT 'Date this recurring contribution was cancelled by contributor- if we can get access to it',
-  `cancel_reason` text COMMENT 'Free text field for a reason for cancelling',
-  `end_date` datetime COMMENT 'Date this recurring contribution finished successfully',
-  `processor_id` varchar(255) COMMENT 'Possibly needed to store a unique identifier for this recurring payment order - if this is available from the processor??',
-  `payment_token_id` int unsigned COMMENT 'Optionally used to store a link to a payment token used for this recurring contribution.',
-  `trxn_id` varchar(255) COMMENT 'unique transaction id (deprecated - use processor_id)',
-  `invoice_id` varchar(255) COMMENT 'unique invoice id, system generated or passed in',
-  `contribution_status_id` int unsigned DEFAULT 2,
-  `is_test` tinyint NOT NULL DEFAULT 0,
-  `cycle_day` int unsigned NOT NULL DEFAULT 1 COMMENT 'Day in the period when the payment should be charged e.g. 1st of month, 15th etc.',
-  `next_sched_contribution_date` datetime COMMENT 'Next scheduled date',
-  `failure_count` int unsigned DEFAULT 0 COMMENT 'Number of failed charge attempts since last success. Business rule could be set to deactivate on more than x failures.',
-  `failure_retry_date` datetime COMMENT 'Date to retry failed attempt',
-  `auto_renew` tinyint NOT NULL DEFAULT 0 COMMENT 'Some systems allow contributor to set a number of installments - but then auto-renew the subscription or commitment if they do not cancel.',
-  `payment_processor_id` int unsigned COMMENT 'Foreign key to civicrm_payment_processor.id',
-  `financial_type_id` int unsigned COMMENT 'FK to Financial Type',
-  `payment_instrument_id` int unsigned COMMENT 'FK to Payment Instrument',
-  `campaign_id` int unsigned COMMENT 'The campaign for which this contribution has been triggered.',
-  `is_email_receipt` tinyint NOT NULL DEFAULT 1 COMMENT 'if true, receipt is automatically emailed to contact on each successful payment',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_contrib_trxn_id`(trxn_id),
-  UNIQUE INDEX `UI_contrib_invoice_id`(invoice_id),
-  INDEX `index_contribution_status`(contribution_status_id),
-  INDEX `UI_contribution_recur_payment_instrument_id`(payment_instrument_id),
-  CONSTRAINT FK_civicrm_contribution_recur_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_contribution_recur_payment_token_id FOREIGN KEY (`payment_token_id`) REFERENCES `civicrm_payment_token`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_contribution_recur_payment_processor_id FOREIGN KEY (`payment_processor_id`) REFERENCES `civicrm_payment_processor`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_contribution_recur_financial_type_id FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_contribution_recur_campaign_id FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_financial_trxn
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_financial_trxn` (
+CREATE TABLE `civicrm_mailing_group` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `from_financial_account_id` int unsigned COMMENT 'FK to financial_account table.',
-  `to_financial_account_id` int unsigned COMMENT 'FK to financial_financial_account table.',
-  `trxn_date` datetime DEFAULT NULL COMMENT 'date transaction occurred',
-  `total_amount` decimal(20,2) NOT NULL COMMENT 'amount of transaction',
-  `fee_amount` decimal(20,2) COMMENT 'actual processor fee if known - may be 0.',
-  `net_amount` decimal(20,2) COMMENT 'actual funds transfer amount. total less fees. if processor does not report actual fee during transaction, this is set to total_amount.',
-  `currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.',
-  `is_payment` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this entry either a payment or a reversal of a payment?',
-  `trxn_id` varchar(255) COMMENT 'Transaction id supplied by external processor. This may not be unique.',
-  `trxn_result_code` varchar(255) COMMENT 'processor result code',
-  `status_id` int unsigned COMMENT 'pseudo FK to civicrm_option_value of contribution_status_id option_group',
-  `payment_processor_id` int unsigned COMMENT 'Payment Processor for this financial transaction',
-  `payment_instrument_id` int unsigned COMMENT 'FK to payment_instrument option group values',
-  `card_type_id` int unsigned COMMENT 'FK to accept_creditcard option group values',
-  `check_number` varchar(255) COMMENT 'Check number',
-  `pan_truncation` varchar(4) COMMENT 'Last 4 digits of credit card',
-  `order_reference` varchar(255) COMMENT 'Payment Processor external order reference',
-  PRIMARY KEY (`id`),
-  INDEX `UI_ftrxn_trxn_id`(trxn_id),
-  INDEX `UI_ftrxn_payment_instrument_id`(payment_instrument_id),
-  INDEX `UI_ftrxn_check_number`(check_number),
-  CONSTRAINT FK_civicrm_financial_trxn_from_financial_account_id FOREIGN KEY (`from_financial_account_id`) REFERENCES `civicrm_financial_account`(`id`),
-  CONSTRAINT FK_civicrm_financial_trxn_to_financial_account_id FOREIGN KEY (`to_financial_account_id`) REFERENCES `civicrm_financial_account`(`id`),
-  CONSTRAINT FK_civicrm_financial_trxn_payment_processor_id FOREIGN KEY (`payment_processor_id`) REFERENCES `civicrm_payment_processor`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_membership
--- *
--- * Contact Membership records.
--- *
--- *******************************************************/
+  `mailing_id` int unsigned NOT NULL COMMENT 'The ID of a previous mailing to include/exclude recipients.',
+  `group_type` varchar(8) COMMENT 'Are the members of the group included or excluded?.',
+  `entity_table` varchar(64) NOT NULL COMMENT 'Name of table where item being referenced is stored.',
+  `entity_id` int unsigned NOT NULL COMMENT 'Foreign key to the referenced item.',
+  `search_id` int COMMENT 'The filtering search. custom search id or -1 for civicrm api search',
+  `search_args` text COMMENT 'The arguments to be sent to the search function',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_mailing_job` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `mailing_id` int unsigned NOT NULL COMMENT 'The ID of the mailing this Job will send.',
+  `scheduled_date` timestamp NULL DEFAULT NULL COMMENT 'date on which this job was scheduled.',
+  `start_date` timestamp NULL DEFAULT NULL COMMENT 'date on which this job was started.',
+  `end_date` timestamp NULL DEFAULT NULL COMMENT 'date on which this job ended.',
+  `status` varchar(12) COMMENT 'The state of this job',
+  `is_test` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this job for a test mail?',
+  `job_type` varchar(255) COMMENT 'Type of mailling job: null | child',
+  `parent_id` int unsigned DEFAULT NULL COMMENT 'Parent job id',
+  `job_offset` int DEFAULT 0 COMMENT 'Offset of the child job',
+  `job_limit` int DEFAULT 0 COMMENT 'Queue size limit for each child job',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_mailing_recipients` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `mailing_id` int unsigned NOT NULL COMMENT 'The ID of the mailing this Job will send.',
+  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact',
+  `email_id` int unsigned DEFAULT NULL COMMENT 'FK to Email',
+  `phone_id` int unsigned DEFAULT NULL COMMENT 'FK to Phone',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_mailing_trackable_url` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `url` text NOT NULL COMMENT 'The URL to be tracked.',
+  `mailing_id` int unsigned NOT NULL COMMENT 'FK to the mailing',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_mailing_spool` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `job_id` int unsigned NOT NULL COMMENT 'The ID of the Job .',
+  `recipient_email` text COMMENT 'The email of the recipients this mail is to be sent.',
+  `headers` text COMMENT 'The header information of this mailing .',
+  `body` text COMMENT 'The body of this mailing.',
+  `added_at` timestamp NULL DEFAULT NULL COMMENT 'date on which this job was added.',
+  `removed_at` timestamp NULL DEFAULT NULL COMMENT 'date on which this job was removed.',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_membership` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Membership ID',
   `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact ID',
@@ -3469,32 +2348,35 @@ CREATE TABLE `civicrm_membership` (
   `end_date` date COMMENT 'Current membership period expire date.',
   `source` varchar(128),
   `status_id` int unsigned NOT NULL COMMENT 'FK to Membership Status',
-  `is_override` tinyint NOT NULL DEFAULT 0 COMMENT 'Admin users may set a manual status which overrides the calculated status. When this flag is true, automated status update scripts should NOT modify status for the record.',
+  `is_override` boolean NOT NULL DEFAULT FALSE COMMENT 'Admin users may set a manual status which overrides the calculated status. When this flag is TRUE, automated status update scripts should NOT modify status for the record.',
   `status_override_end_date` date DEFAULT NULL COMMENT 'Then end date of membership status override if \'Override until selected date\' override type is selected.',
   `owner_membership_id` int unsigned COMMENT 'Optional FK to Parent Membership.',
   `max_related` int COMMENT 'Maximum number of related memberships (membership_type override).',
-  `is_test` tinyint NOT NULL DEFAULT 0,
-  `is_pay_later` tinyint NOT NULL DEFAULT 0,
+  `is_test` boolean NOT NULL DEFAULT FALSE,
+  `is_pay_later` boolean NOT NULL DEFAULT FALSE,
   `contribution_recur_id` int unsigned COMMENT 'Conditional foreign key to civicrm_contribution_recur id. Each membership in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events.',
   `campaign_id` int unsigned COMMENT 'The campaign for which this membership is attached.',
   PRIMARY KEY (`id`),
-  INDEX `index_owner_membership_id`(owner_membership_id),
-  CONSTRAINT FK_civicrm_membership_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_membership_membership_type_id FOREIGN KEY (`membership_type_id`) REFERENCES `civicrm_membership_type`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_membership_status_id FOREIGN KEY (`status_id`) REFERENCES `civicrm_membership_status`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_membership_owner_membership_id FOREIGN KEY (`owner_membership_id`) REFERENCES `civicrm_membership`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_membership_contribution_recur_id FOREIGN KEY (`contribution_recur_id`) REFERENCES `civicrm_contribution_recur`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_membership_campaign_id FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_membership_log
--- *
--- * Logs actions which affect a Membership record (signup, status override, renewal, etc.)
--- *
--- *******************************************************/
+  INDEX `index_owner_membership_id`(`owner_membership_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_membership_block` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Membership ID',
+  `entity_table` varchar(64) COMMENT 'Name for Membership Status',
+  `entity_id` int unsigned NOT NULL COMMENT 'FK to civicrm_contribution_page.id',
+  `membership_types` varchar(1024) COMMENT 'Membership types to be exposed by this block',
+  `membership_type_default` int unsigned COMMENT 'Optional foreign key to membership_type',
+  `display_min_fee` boolean NOT NULL DEFAULT TRUE COMMENT 'Display minimum membership fee',
+  `is_separate_payment` boolean NOT NULL DEFAULT TRUE COMMENT 'Should membership transactions be processed separately',
+  `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',
+  `is_required` boolean NOT NULL DEFAULT FALSE COMMENT 'Is membership sign up optional',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this membership_block enabled',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_membership_log` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `membership_id` int unsigned NOT NULL COMMENT 'FK to Membership table',
@@ -3505,597 +2387,143 @@ CREATE TABLE `civicrm_membership_log` (
   `modified_date` date COMMENT 'Date this membership modification action was logged.',
   `membership_type_id` int unsigned COMMENT 'FK to Membership Type.',
   `max_related` int COMMENT 'Maximum number of related memberships.',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_membership_payment` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `membership_id` int unsigned NOT NULL COMMENT 'FK to Membership table',
+  `contribution_id` int unsigned COMMENT 'FK to contribution table.',
   PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_membership_log_membership_id FOREIGN KEY (`membership_id`) REFERENCES `civicrm_membership`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_membership_log_status_id FOREIGN KEY (`status_id`) REFERENCES `civicrm_membership_status`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_membership_log_modified_id FOREIGN KEY (`modified_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_membership_log_membership_type_id FOREIGN KEY (`membership_type_id`) REFERENCES `civicrm_membership_type`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_activity
--- *
--- * Other Activity details stored here include contact, location, details.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_activity` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique  Other Activity ID',
-  `source_record_id` int unsigned COMMENT 'Artificial FK to original transaction (e.g. contribution) IF it is not an Activity. Entity table is discovered by filtering by the appropriate activity_type_id.',
-  `activity_type_id` int unsigned NOT NULL DEFAULT 1 COMMENT 'FK to civicrm_option_value.id, that has to be valid, registered activity type.',
-  `subject` varchar(255) COMMENT 'The subject/purpose/short description of the activity.',
-  `activity_date_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Date and time this activity is scheduled to occur. Formerly named scheduled_date_time.',
-  `duration` int unsigned COMMENT 'Planned or actual duration of activity expressed in minutes. Conglomerate of former duration_hours and duration_minutes.',
-  `location` varchar(255) COMMENT 'Location of the activity (optional, open text).',
-  `phone_id` int unsigned COMMENT 'Phone ID of the number called (optional - used if an existing phone number is selected).',
-  `phone_number` varchar(64) COMMENT 'Phone number in case the number does not exist in the civicrm_phone table.',
-  `details` longtext COMMENT 'Details about the activity (agenda, notes, etc).',
-  `status_id` int unsigned COMMENT 'ID of the status this activity is currently in. Foreign key to civicrm_option_value.',
-  `priority_id` int unsigned COMMENT 'ID of the priority given to this activity. Foreign key to civicrm_option_value.',
-  `parent_id` int unsigned COMMENT 'Parent meeting ID (if this is a follow-up item).',
-  `is_test` tinyint NOT NULL DEFAULT 0,
-  `medium_id` int unsigned DEFAULT NULL COMMENT 'Activity Medium, Implicit FK to civicrm_option_value where option_group = encounter_medium.',
-  `is_auto` tinyint NOT NULL DEFAULT 0,
-  `relationship_id` int unsigned DEFAULT NULL COMMENT 'FK to Relationship ID',
-  `is_current_revision` tinyint NOT NULL DEFAULT 1 COMMENT 'Unused deprecated column.',
-  `original_id` int unsigned COMMENT 'Unused deprecated column.',
-  `result` varchar(255) COMMENT 'Currently being used to store result id for survey activity, FK to option value.',
-  `is_deleted` tinyint NOT NULL DEFAULT 0,
-  `campaign_id` int unsigned COMMENT 'The campaign for which this activity has been triggered.',
-  `engagement_level` int unsigned COMMENT 'Assign a specific level of engagement to this activity. Used for tracking constituents in ladder of engagement.',
+  UNIQUE INDEX `UI_contribution_membership`(`contribution_id`, `membership_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_membership_status` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Membership ID',
+  `name` varchar(128) NOT NULL COMMENT 'Name for Membership Status',
+  `label` varchar(128) COMMENT 'Label for Membership Status',
+  `start_event` varchar(12) COMMENT 'Event when this status starts.',
+  `start_event_adjust_unit` varchar(8) COMMENT 'Unit used for adjusting from start_event.',
+  `start_event_adjust_interval` int COMMENT 'Status range begins this many units from start_event.',
+  `end_event` varchar(12) COMMENT 'Event after which this status ends.',
+  `end_event_adjust_unit` varchar(8) COMMENT 'Unit used for adjusting from the ending event.',
+  `end_event_adjust_interval` int COMMENT 'Status range ends this many units from end_event.',
+  `is_current_member` boolean NOT NULL DEFAULT FALSE COMMENT 'Does this status aggregate to current members (e.g. New, Renewed, Grace might all be TRUE... while Unrenewed, Lapsed, Inactive would be FALSE).',
+  `is_admin` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this status for admin/manual assignment only.',
   `weight` int,
-  `is_star` tinyint NOT NULL DEFAULT 0 COMMENT 'Activity marked as favorite.',
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'When was the activity was created.',
-  `modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When was the activity (or closely related entity) was created or modified or deleted.',
-  PRIMARY KEY (`id`),
-  INDEX `UI_source_record_id`(source_record_id),
-  INDEX `UI_activity_type_id`(activity_type_id),
-  INDEX `index_activity_date_time`(activity_date_time),
-  INDEX `index_status_id`(status_id),
-  INDEX `index_is_current_revision`(is_current_revision),
-  INDEX `index_is_deleted`(is_deleted),
-  CONSTRAINT FK_civicrm_activity_phone_id FOREIGN KEY (`phone_id`) REFERENCES `civicrm_phone`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_activity_parent_id FOREIGN KEY (`parent_id`) REFERENCES `civicrm_activity`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_activity_relationship_id FOREIGN KEY (`relationship_id`) REFERENCES `civicrm_relationship`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_activity_original_id FOREIGN KEY (`original_id`) REFERENCES `civicrm_activity`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_activity_campaign_id FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_activity_contact
--- *
--- * Activity Contact
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_activity_contact` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Activity contact id',
-  `activity_id` int unsigned NOT NULL COMMENT 'Foreign key to the activity for this record.',
-  `contact_id` int unsigned NOT NULL COMMENT 'Foreign key to the contact for this record.',
-  `record_type_id` int unsigned COMMENT 'Determines the contact\'s role in the activity (source, target, or assignee).',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_activity_contact`(contact_id, activity_id, record_type_id),
-  INDEX `index_record_type`(activity_id, record_type_id),
-  CONSTRAINT FK_civicrm_activity_contact_activity_id FOREIGN KEY (`activity_id`) REFERENCES `civicrm_activity`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_activity_contact_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_case_activity
--- *
--- * Joining table for case-activity associations.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_case_activity` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique case-activity association id',
-  `case_id` int unsigned NOT NULL COMMENT 'Case ID of case-activity association.',
-  `activity_id` int unsigned NOT NULL COMMENT 'Activity ID of case-activity association.',
-  PRIMARY KEY (`id`),
-  INDEX `UI_case_activity_id`(case_id, activity_id),
-  CONSTRAINT FK_civicrm_case_activity_case_id FOREIGN KEY (`case_id`) REFERENCES `civicrm_case`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_case_activity_activity_id FOREIGN KEY (`activity_id`) REFERENCES `civicrm_activity`(`id`) ON DELETE CASCADE
+  `is_default` boolean NOT NULL DEFAULT FALSE COMMENT 'Assign this status to a membership record if no other status match is found.',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this membership_status enabled.',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this membership_status reserved.',
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_price_field
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_price_field` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Price Field',
-  `price_set_id` int unsigned NOT NULL COMMENT 'FK to civicrm_price_set',
-  `name` varchar(255) NOT NULL COMMENT 'Variable name/programmatic handle for this field.',
-  `label` varchar(255) NOT NULL COMMENT 'Text for form field label (also friendly name for administering this field).',
-  `html_type` varchar(12) NOT NULL,
-  `is_enter_qty` tinyint NOT NULL DEFAULT 0 COMMENT 'Enter a quantity for 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.',
-  `weight` int DEFAULT 1 COMMENT 'Order in which the fields should appear',
-  `is_display_amounts` tinyint NOT NULL DEFAULT 1 COMMENT 'Should the price be displayed next to the label for each option?',
-  `options_per_line` int unsigned DEFAULT 1 COMMENT 'number of options per line for checkbox and radio',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this price field active',
-  `is_required` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this price field required (value must be > 1)',
-  `active_on` datetime DEFAULT NULL COMMENT 'If non-zero, do not show this field before the date specified',
-  `expire_on` datetime DEFAULT NULL COMMENT 'If non-zero, do not show this field after the date specified',
-  `javascript` varchar(255) COMMENT 'Optional scripting attributes for field',
-  `visibility_id` int unsigned DEFAULT 1 COMMENT 'Implicit FK to civicrm_option_group with name = \'visibility\'',
+CREATE TABLE `civicrm_membership_type` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Membership ID',
+  `domain_id` int unsigned NOT NULL COMMENT 'Which Domain is this match entry for',
+  `name` varchar(128) NOT NULL COMMENT 'Name of Membership Type',
+  `description` varchar(255) COMMENT 'Description of Membership Type',
+  `member_of_contact_id` int unsigned NOT NULL COMMENT 'Owner organization for this membership type. FK to Contact ID',
+  `financial_type_id` int unsigned NOT NULL COMMENT 'If membership is paid by a contribution - what financial type should be used. FK to civicrm_financial_type.id',
+  `minimum_fee` decimal(18,9) DEFAULT '0' COMMENT 'Minimum fee for this membership (0 for free/complimentary memberships).',
+  `duration_unit` varchar(8) NOT NULL COMMENT 'Unit in which membership period is expressed.',
+  `duration_interval` int COMMENT 'Number of duration units in membership period (e.g. 1 year, 12 months).',
+  `period_type` varchar(8) NOT NULL COMMENT 'Rolling membership period starts on signup date. Fixed membership periods start on fixed_period_start_day.',
+  `fixed_period_start_day` int COMMENT 'For fixed period memberships, month and day (mmdd) on which subscription/membership will start. Period start is back-dated unless after rollover day.',
+  `fixed_period_rollover_day` int COMMENT 'For fixed period memberships, signups after this day (mmdd) rollover to next period.',
+  `relationship_type_id` varchar(64) COMMENT 'FK to Relationship Type ID',
+  `relationship_direction` varchar(128),
+  `max_related` int COMMENT 'Maximum number of related memberships.',
+  `visibility` varchar(64),
+  `weight` int,
+  `receipt_text_signup` varchar(255) COMMENT 'Receipt Text for membership signup',
+  `receipt_text_renewal` varchar(255) COMMENT 'Receipt Text for membership renewal',
+  `auto_renew` tinyint DEFAULT 0 COMMENT '0 = No auto-renew option; 1 = Give option, but not required; 2 = Auto-renew required;',
+  `is_active` boolean DEFAULT TRUE COMMENT 'Is this membership_type enabled',
   PRIMARY KEY (`id`),
-  INDEX `index_name`(name),
-  CONSTRAINT FK_civicrm_price_field_price_set_id FOREIGN KEY (`price_set_id`) REFERENCES `civicrm_price_set`(`id`)
+  INDEX `index_relationship_type_id`(`relationship_type_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_pcp` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Personal Campaign Page ID',
+  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact ID',
+  `status_id` int unsigned NOT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `intro_text` text DEFAULT NULL,
+  `page_text` text DEFAULT NULL,
+  `donate_link_text` varchar(255) DEFAULT NULL,
+  `page_id` int unsigned NOT NULL COMMENT 'The Contribution or Event Page which triggered this pcp',
+  `page_type` varchar(64) DEFAULT 'contribute' COMMENT 'The type of PCP this is: contribute or event',
+  `pcp_block_id` int unsigned NOT NULL COMMENT 'The pcp block that this pcp page was created from',
+  `is_thermometer` int unsigned DEFAULT 0,
+  `is_honor_roll` int unsigned DEFAULT 0,
+  `goal_amount` decimal(20,2) COMMENT 'Goal amount of this Personal Campaign Page.',
+  `currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is Personal Campaign Page enabled/active?',
+  `is_notify` boolean NOT NULL DEFAULT FALSE COMMENT 'Notify owner via email when someone donates to page?',
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_price_field_value
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_price_field_value` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Price Field Value',
-  `price_field_id` int unsigned NOT NULL COMMENT 'FK to civicrm_price_field',
-  `name` varchar(255) DEFAULT NULL COMMENT 'Price field option name',
-  `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.',
-  `amount` decimal(18,9) NOT NULL COMMENT 'Price field option amount',
-  `count` int unsigned DEFAULT NULL COMMENT 'Number of participants per field option',
-  `max_value` int unsigned DEFAULT NULL COMMENT 'Max number of participants per field options',
-  `weight` int DEFAULT 1 COMMENT 'Order in which the field options should appear',
-  `membership_type_id` int unsigned DEFAULT NULL COMMENT 'FK to Membership Type',
-  `membership_num_terms` int unsigned DEFAULT NULL COMMENT 'Number of terms for this membership',
-  `is_default` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this default price field option',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this price field value active',
-  `financial_type_id` int unsigned DEFAULT NULL COMMENT 'FK to Financial Type.',
-  `non_deductible_amount` decimal(20,2) NOT NULL DEFAULT 0.0 COMMENT 'Portion of total amount which is NOT tax deductible.',
-  `visibility_id` int unsigned DEFAULT 1 COMMENT 'Implicit FK to civicrm_option_group with name = \'visibility\'',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_price_field_value_price_field_id FOREIGN KEY (`price_field_id`) REFERENCES `civicrm_price_field`(`id`),
-  CONSTRAINT FK_civicrm_price_field_value_membership_type_id FOREIGN KEY (`membership_type_id`) REFERENCES `civicrm_membership_type`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_price_field_value_financial_type_id FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_pcp_block
--- *
--- * A Personal Campaign Page Block stores admin configurable status options and rules
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_pcp_block` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'PCP block ID',
   `entity_table` varchar(64),
   `entity_id` int unsigned NOT NULL COMMENT 'FK to civicrm_contribution_page.id OR civicrm_event.id',
-  `target_entity_type` varchar(255) NOT NULL DEFAULT 'contribute' COMMENT 'The type of entity that this pcp targets',
-  `target_entity_id` int unsigned NOT NULL COMMENT 'The entity that this pcp targets',
-  `supporter_profile_id` int unsigned DEFAULT NULL COMMENT 'FK to civicrm_uf_group.id. Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)?',
-  `owner_notify_id` int unsigned DEFAULT 0 COMMENT 'FK to civicrm_option_group with name = PCP owner notifications',
-  `is_approval_needed` tinyint NOT NULL DEFAULT 0 COMMENT 'Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)?',
-  `is_tellfriend_enabled` tinyint NOT NULL DEFAULT 0 COMMENT 'Does Personal Campaign Page allow using tell a friend?',
-  `tellfriend_limit` int unsigned DEFAULT NULL COMMENT 'Maximum recipient fields allowed in tell a friend',
-  `link_text` varchar(255) DEFAULT NULL COMMENT 'Link text for PCP.',
-  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Is Personal Campaign Page Block enabled/active?',
-  `notify_email` varchar(255) DEFAULT NULL COMMENT 'If set, notification is automatically emailed to this email-address on create/update Personal Campaign Page',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_pcp_block_supporter_profile_id FOREIGN KEY (`supporter_profile_id`) REFERENCES `civicrm_uf_group`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_address
--- *
--- * Stores the physical street / mailing address. This format should be capable of storing ALL international addresses.
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_address` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique Address ID',
-  `contact_id` int unsigned COMMENT 'FK to Contact ID',
-  `location_type_id` int unsigned COMMENT 'Which Location does this address belong to.',
-  `is_primary` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this the primary address.',
-  `is_billing` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this the billing address.',
-  `street_address` varchar(96) COMMENT 'Concatenation of all routable street address components (prefix, street number, street name, suffix, unit\n      number OR P.O. Box). Apps should be able to determine physical location with this data (for mapping, mail\n      delivery, etc.).',
-  `street_number` int COMMENT 'Numeric portion of address number on the street, e.g. For 112A Main St, the street_number = 112.',
-  `street_number_suffix` varchar(8) COMMENT 'Non-numeric portion of address number on the street, e.g. For 112A Main St, the street_number_suffix = A',
-  `street_number_predirectional` varchar(8) COMMENT 'Directional prefix, e.g. SE Main St, SE is the prefix.',
-  `street_name` varchar(64) COMMENT 'Actual street name, excluding St, Dr, Rd, Ave, e.g. For 112 Main St, the street_name = Main.',
-  `street_type` varchar(8) COMMENT 'St, Rd, Dr, etc.',
-  `street_number_postdirectional` varchar(8) COMMENT 'Directional prefix, e.g. Main St S, S is the suffix.',
-  `street_unit` varchar(16) COMMENT 'Secondary unit designator, e.g. Apt 3 or Unit # 14, or Bldg 1200',
-  `supplemental_address_1` varchar(96) COMMENT 'Supplemental Address Information, Line 1',
-  `supplemental_address_2` varchar(96) COMMENT 'Supplemental Address Information, Line 2',
-  `supplemental_address_3` varchar(96) COMMENT 'Supplemental Address Information, Line 3',
-  `city` varchar(64) COMMENT 'City, Town or Village Name.',
-  `county_id` int unsigned COMMENT 'Which County does this address belong to.',
-  `state_province_id` int unsigned COMMENT 'Which State_Province does this address belong to.',
-  `postal_code_suffix` varchar(12) COMMENT 'Store the suffix, like the +4 part in the USPS system.',
-  `postal_code` varchar(64) COMMENT 'Store both US (zip5) AND international postal codes. App is responsible for country/region appropriate validation.',
-  `usps_adc` varchar(32) COMMENT 'USPS Bulk mailing code.',
-  `country_id` int unsigned COMMENT 'Which Country does this address belong to.',
-  `geo_code_1` double COMMENT 'Latitude',
-  `geo_code_2` double COMMENT 'Longitude',
-  `manual_geo_code` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this a manually entered geo code',
-  `timezone` varchar(8) COMMENT 'Timezone expressed as a UTC offset - e.g. United States CST would be written as \"UTC-6\".',
-  `name` varchar(255),
-  `master_id` int unsigned COMMENT 'FK to Address ID',
-  PRIMARY KEY (`id`),
-  INDEX `index_location_type`(location_type_id),
-  INDEX `index_is_primary`(is_primary),
-  INDEX `index_is_billing`(is_billing),
-  INDEX `index_street_name`(street_name),
-  INDEX `index_city`(city),
-  INDEX `index_geo_code_1_geo_code_2`(geo_code_1, geo_code_2),
-  CONSTRAINT FK_civicrm_address_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_address_county_id FOREIGN KEY (`county_id`) REFERENCES `civicrm_county`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_address_state_province_id FOREIGN KEY (`state_province_id`) REFERENCES `civicrm_state_province`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_address_country_id FOREIGN KEY (`country_id`) REFERENCES `civicrm_country`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_address_master_id FOREIGN KEY (`master_id`) REFERENCES `civicrm_address`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_loc_block
--- *
--- * Define location specific properties
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_loc_block` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique ID',
-  `address_id` int unsigned,
-  `email_id` int unsigned,
-  `phone_id` int unsigned,
-  `im_id` int unsigned,
-  `address_2_id` int unsigned,
-  `email_2_id` int unsigned,
-  `phone_2_id` int unsigned,
-  `im_2_id` int unsigned,
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_loc_block_address_id FOREIGN KEY (`address_id`) REFERENCES `civicrm_address`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_loc_block_email_id FOREIGN KEY (`email_id`) REFERENCES `civicrm_email`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_loc_block_phone_id FOREIGN KEY (`phone_id`) REFERENCES `civicrm_phone`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_loc_block_im_id FOREIGN KEY (`im_id`) REFERENCES `civicrm_im`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_loc_block_address_2_id FOREIGN KEY (`address_2_id`) REFERENCES `civicrm_address`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_loc_block_email_2_id FOREIGN KEY (`email_2_id`) REFERENCES `civicrm_email`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_loc_block_phone_2_id FOREIGN KEY (`phone_2_id`) REFERENCES `civicrm_phone`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_loc_block_im_2_id FOREIGN KEY (`im_2_id`) REFERENCES `civicrm_im`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_group_contact
--- *
--- * Join table sets membership for 'static' groups. Also used to store 'opt-out' entries for 'query' type groups (status = 'OUT') 
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_group_contact` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
-  `group_id` int unsigned NOT NULL COMMENT 'FK to civicrm_group',
-  `contact_id` int unsigned NOT NULL COMMENT 'FK to civicrm_contact',
-  `status` varchar(8) COMMENT 'status of contact relative to membership in group',
-  `location_id` int unsigned COMMENT 'Optional location to associate with this membership',
-  `email_id` int unsigned COMMENT 'Optional email to associate with this membership',
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_contact_group`(contact_id, group_id),
-  CONSTRAINT FK_civicrm_group_contact_group_id FOREIGN KEY (`group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_group_contact_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_group_contact_location_id FOREIGN KEY (`location_id`) REFERENCES `civicrm_loc_block`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_group_contact_email_id FOREIGN KEY (`email_id`) REFERENCES `civicrm_email`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_contribution
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_contribution` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Contribution ID',
-  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact ID',
-  `financial_type_id` int unsigned COMMENT 'FK to Financial Type for (total_amount - non_deductible_amount).',
-  `contribution_page_id` int unsigned COMMENT 'The Contribution Page which triggered this contribution',
-  `payment_instrument_id` int unsigned COMMENT 'FK to Payment Instrument',
-  `receive_date` datetime,
-  `non_deductible_amount` decimal(20,2) DEFAULT 0 COMMENT 'Portion of total amount which is NOT tax deductible. Equal to total_amount for non-deductible financial types.',
-  `total_amount` decimal(20,2) NOT NULL COMMENT 'Total amount of this contribution. Use market value for non-monetary gifts.',
-  `fee_amount` decimal(20,2) COMMENT 'actual processor fee if known - may be 0.',
-  `net_amount` decimal(20,2) COMMENT 'actual funds transfer amount. total less fees. if processor does not report actual fee during transaction, this is set to total_amount.',
-  `trxn_id` varchar(255) COMMENT 'unique transaction id. may be processor id, bank id + trans id, or account number + check number... depending on payment_method',
-  `invoice_id` varchar(255) COMMENT 'unique invoice id, system generated or passed in',
-  `invoice_number` varchar(255) COMMENT 'Human readable invoice number',
-  `currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.',
-  `cancel_date` datetime COMMENT 'when was gift cancelled',
-  `cancel_reason` text,
-  `receipt_date` datetime COMMENT 'when (if) receipt was sent. populated automatically for online donations w/ automatic receipting',
-  `thankyou_date` datetime COMMENT 'when (if) was donor thanked',
-  `source` varchar(255) COMMENT 'Origin of this Contribution.',
-  `amount_level` text,
-  `contribution_recur_id` int unsigned COMMENT 'Conditional foreign key to civicrm_contribution_recur id. Each contribution made in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events.',
-  `is_test` tinyint NOT NULL DEFAULT 0,
-  `is_pay_later` tinyint NOT NULL DEFAULT 0,
-  `contribution_status_id` int unsigned DEFAULT 1,
-  `address_id` int unsigned COMMENT 'Conditional foreign key to civicrm_address.id. We insert an address record for each contribution when we have associated billing name and address data.',
-  `check_number` varchar(255),
-  `campaign_id` int unsigned COMMENT 'The campaign for which this contribution has been triggered.',
-  `creditnote_id` varchar(255) COMMENT 'unique credit note id, system generated or passed in',
-  `tax_amount` decimal(20,2) NOT NULL DEFAULT 0 COMMENT 'Total tax amount of this contribution.',
-  `revenue_recognition_date` datetime COMMENT 'Stores the date when revenue should be recognized.',
-  `is_template` tinyint NOT NULL DEFAULT 0 COMMENT 'Shows this is a template for recurring contributions.',
-  PRIMARY KEY (`id`),
-  INDEX `UI_contrib_payment_instrument_id`(payment_instrument_id),
-  INDEX `index_total_amount_receive_date`(total_amount, receive_date),
-  INDEX `index_source`(source),
-  UNIQUE INDEX `UI_contrib_trxn_id`(trxn_id),
-  UNIQUE INDEX `UI_contrib_invoice_id`(invoice_id),
-  INDEX `index_contribution_status`(contribution_status_id),
-  INDEX `received_date`(receive_date),
-  INDEX `check_number`(check_number),
-  INDEX `index_creditnote_id`(creditnote_id),
-  CONSTRAINT FK_civicrm_contribution_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_contribution_financial_type_id FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`),
-  CONSTRAINT FK_civicrm_contribution_contribution_page_id FOREIGN KEY (`contribution_page_id`) REFERENCES `civicrm_contribution_page`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_contribution_contribution_recur_id FOREIGN KEY (`contribution_recur_id`) REFERENCES `civicrm_contribution_recur`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_contribution_address_id FOREIGN KEY (`address_id`) REFERENCES `civicrm_address`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_contribution_campaign_id FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_contribution_product
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_contribution_product` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `product_id` int unsigned NOT NULL,
-  `contribution_id` int unsigned NOT NULL,
-  `product_option` varchar(255) COMMENT 'Option value selected if applicable - e.g. color, size etc.',
-  `quantity` int,
-  `fulfilled_date` date COMMENT 'Optional. Can be used to record the date this product was fulfilled or shipped.',
-  `start_date` date COMMENT 'Actual start date for a time-delimited premium (subscription, service or membership)',
-  `end_date` date COMMENT 'Actual end date for a time-delimited premium (subscription, service or membership)',
-  `comment` text,
-  `financial_type_id` int unsigned DEFAULT NULL COMMENT 'FK to Financial Type(for membership price sets only).',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_contribution_product_product_id FOREIGN KEY (`product_id`) REFERENCES `civicrm_product`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_contribution_product_contribution_id FOREIGN KEY (`contribution_id`) REFERENCES `civicrm_contribution`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_contribution_product_financial_type_id FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL
+  `target_entity_type` varchar(255) NOT NULL DEFAULT 'contribute' COMMENT 'The type of entity that this pcp targets',
+  `target_entity_id` int unsigned NOT NULL COMMENT 'The entity that this pcp targets',
+  `supporter_profile_id` int unsigned DEFAULT NULL COMMENT 'FK to civicrm_uf_group.id. Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)?',
+  `owner_notify_id` int unsigned DEFAULT 0 COMMENT 'FK to civicrm_option_group with name = PCP owner notifications',
+  `is_approval_needed` boolean NOT NULL DEFAULT FALSE COMMENT 'Does Personal Campaign Page require manual activation by administrator? (is inactive by default after setup)?',
+  `is_tellfriend_enabled` boolean NOT NULL DEFAULT FALSE COMMENT 'Does Personal Campaign Page allow using tell a friend?',
+  `tellfriend_limit` int unsigned DEFAULT NULL COMMENT 'Maximum recipient fields allowed in tell a friend',
+  `link_text` varchar(255) DEFAULT NULL COMMENT 'Link text for PCP.',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is Personal Campaign Page Block enabled/active?',
+  `notify_email` varchar(255) DEFAULT NULL COMMENT 'If set, notification is automatically emailed to this email-address on create/update Personal Campaign Page',
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_contribution_soft
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_contribution_soft` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Soft Credit ID',
-  `contribution_id` int unsigned NOT NULL COMMENT 'FK to contribution table.',
-  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact ID',
-  `amount` decimal(20,2) NOT NULL COMMENT 'Amount of this soft credit.',
+CREATE TABLE `civicrm_pledge` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Pledge ID',
+  `contact_id` int unsigned NOT NULL COMMENT 'Foreign key to civicrm_contact.id .',
+  `financial_type_id` int unsigned COMMENT 'FK to Financial Type',
+  `contribution_page_id` int unsigned COMMENT 'The Contribution Page which triggered this contribution',
+  `amount` decimal(20,2) NOT NULL COMMENT 'Total pledged amount.',
+  `original_installment_amount` decimal(20,2) NOT NULL COMMENT 'Original amount for each of the installments.',
   `currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value from config setting or input via user.',
-  `pcp_id` int unsigned DEFAULT NULL COMMENT 'FK to civicrm_pcp.id',
-  `pcp_display_in_roll` tinyint NOT NULL DEFAULT 0,
-  `pcp_roll_nickname` varchar(255) DEFAULT NULL,
-  `pcp_personal_note` varchar(255) DEFAULT NULL,
-  `soft_credit_type_id` int unsigned DEFAULT NULL COMMENT 'Soft Credit Type ID.Implicit FK to civicrm_option_value where option_group = soft_credit_type.',
-  PRIMARY KEY (`id`),
-  INDEX `index_id`(pcp_id),
-  CONSTRAINT FK_civicrm_contribution_soft_contribution_id FOREIGN KEY (`contribution_id`) REFERENCES `civicrm_contribution`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_contribution_soft_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_contribution_soft_pcp_id FOREIGN KEY (`pcp_id`) REFERENCES `civicrm_pcp`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_entity_financial_trxn
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_entity_financial_trxn` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
-  `entity_table` varchar(64) NOT NULL COMMENT 'May contain civicrm_financial_item, civicrm_contribution, civicrm_financial_trxn, civicrm_grant, etc',
-  `entity_id` int unsigned NOT NULL,
-  `financial_trxn_id` int unsigned,
-  `amount` decimal(20,2) NOT NULL COMMENT 'allocated amount of transaction to this entity',
-  PRIMARY KEY (`id`),
-  INDEX `UI_entity_financial_trxn_entity_table`(entity_table),
-  INDEX `UI_entity_financial_trxn_entity_id`(entity_id),
-  CONSTRAINT FK_civicrm_entity_financial_trxn_financial_trxn_id FOREIGN KEY (`financial_trxn_id`) REFERENCES `civicrm_financial_trxn`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_membership_payment
--- *
--- * Membership Payment
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_membership_payment` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `membership_id` int unsigned NOT NULL COMMENT 'FK to Membership table',
-  `contribution_id` int unsigned COMMENT 'FK to contribution table.',
+  `frequency_unit` varchar(8) NOT NULL DEFAULT 'month' COMMENT 'Time units for recurrence of pledge payments.',
+  `frequency_interval` int unsigned NOT NULL DEFAULT 1 COMMENT 'Number of time units for recurrence of pledge payments.',
+  `frequency_day` int unsigned NOT NULL DEFAULT 3 COMMENT 'Day in the period when the pledge payment is due e.g. 1st of month, 15th etc. Use this to set the scheduled dates for pledge payments.',
+  `installments` int unsigned NOT NULL DEFAULT 1 COMMENT 'Total number of payments to be made.',
+  `start_date` datetime NOT NULL COMMENT 'The date the first scheduled pledge occurs.',
+  `create_date` datetime NOT NULL COMMENT 'When this pledge record was created.',
+  `acknowledge_date` datetime COMMENT 'When a pledge acknowledgement message was sent to the contributor.',
+  `modified_date` datetime COMMENT 'Last updated date for this pledge record.',
+  `cancel_date` datetime COMMENT 'Date this pledge was cancelled by contributor.',
+  `end_date` datetime COMMENT 'Date this pledge finished successfully (total pledge payments equal to or greater than pledged amount).',
+  `max_reminders` int unsigned DEFAULT 1 COMMENT 'The maximum number of payment reminders to send for any given payment.',
+  `initial_reminder_day` int unsigned DEFAULT 5 COMMENT 'Send initial reminder this many days prior to the payment due date.',
+  `additional_reminder_day` int unsigned DEFAULT 5 COMMENT 'Send additional reminder this many days after last one sent, up to maximum number of reminders.',
+  `status_id` int unsigned NOT NULL COMMENT 'Implicit foreign key to civicrm_option_values in the pledge_status option group.',
+  `is_test` boolean NOT NULL DEFAULT FALSE,
+  `campaign_id` int unsigned COMMENT 'The campaign for which this pledge has been initiated.',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_contribution_membership`(contribution_id, membership_id),
-  CONSTRAINT FK_civicrm_membership_payment_membership_id FOREIGN KEY (`membership_id`) REFERENCES `civicrm_membership`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_membership_payment_contribution_id FOREIGN KEY (`contribution_id`) REFERENCES `civicrm_contribution`(`id`) ON DELETE CASCADE
+  INDEX `index_status`(`status_id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_event
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_event` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '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.',
-  `event_type_id` int unsigned DEFAULT 0 COMMENT 'Event Type ID.Implicit FK to civicrm_option_value where option_group = event_type.',
-  `participant_listing_id` int unsigned DEFAULT NULL COMMENT 'Should we expose the participant list? Implicit FK to civicrm_option_value where option_group = participant_listing.',
-  `is_public` tinyint NOT NULL DEFAULT 1 COMMENT 'Public events will be included in the iCal feeds. Access to private event information may be limited using ACLs.',
-  `start_date` datetime COMMENT 'Date and time that event starts.',
-  `end_date` datetime COMMENT 'Date and time that event ends. May be NULL if no defined end date/time',
-  `is_online_registration` tinyint NOT NULL DEFAULT 0 COMMENT 'If true, include registration link on Event Info page.',
-  `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.',
-  `registration_start_date` datetime COMMENT 'Date and time that online registration starts.',
-  `registration_end_date` datetime COMMENT 'Date and time that online registration ends.',
-  `max_participants` int unsigned DEFAULT NULL COMMENT 'Maximum number of registered participants to allow. After max is reached, a custom Event Full message is displayed. If NULL, allow unlimited number of participants.',
-  `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.',
-  `is_monetary` tinyint NOT NULL DEFAULT 0 COMMENT 'If true, one or more fee amounts must be set and a Payment Processor must be configured for Online Event Registration.',
-  `financial_type_id` int unsigned DEFAULT NULL COMMENT 'Financial type assigned to paid event registrations for this event. Required if is_monetary is true.',
-  `payment_processor` varchar(128) COMMENT 'Payment Processors configured for this Event (if is_monetary is true)',
-  `is_map` tinyint NOT NULL DEFAULT 0 COMMENT 'Include a map block on the Event Information page when geocode info is available and a mapping provider has been specified?',
-  `is_active` tinyint NOT NULL DEFAULT 0 COMMENT 'Is this Event enabled or disabled/cancelled?',
-  `fee_label` varchar(255),
-  `is_show_location` tinyint NOT NULL DEFAULT 1 COMMENT 'If true, show event location.',
-  `loc_block_id` int unsigned COMMENT 'FK to Location Block ID',
-  `default_role_id` int unsigned DEFAULT 1 COMMENT 'Participant role ID. Implicit FK to civicrm_option_value where option_group = participant_role.',
-  `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.',
-  `is_email_confirm` tinyint NOT NULL DEFAULT 0 COMMENT 'If true, confirmation is automatically emailed to contact on successful registration.',
-  `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.',
-  `confirm_from_email` varchar(255) COMMENT 'FROM email address used for confirmation emails.',
-  `cc_confirm` varchar(255) COMMENT 'comma-separated list of email addresses to cc each time a confirmation is sent',
-  `bcc_confirm` varchar(255) COMMENT 'comma-separated list of email addresses to bcc each time a confirmation is sent',
-  `default_fee_id` int unsigned COMMENT 'FK to civicrm_option_value.',
-  `default_discount_fee_id` int unsigned COMMENT 'FK to civicrm_option_value.',
-  `thankyou_title` varchar(255) DEFAULT NULL COMMENT 'Title for ThankYou page.',
-  `thankyou_text` text COMMENT 'ThankYou Text.',
-  `thankyou_footer_text` text COMMENT 'Footer message.',
-  `is_pay_later` tinyint NOT NULL DEFAULT 0 COMMENT 'if true - allows the user to send payment directly to the org later',
-  `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',
-  `is_partial_payment` tinyint NOT NULL DEFAULT 0 COMMENT 'is partial payment enabled for this event',
-  `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',
-  `min_initial_amount` decimal(20,2) COMMENT 'Minimum initial amount for partial payment',
-  `is_multiple_registrations` tinyint NOT NULL DEFAULT 0 COMMENT 'if true - allows the user to register multiple participants for event',
-  `max_additional_participants` int unsigned DEFAULT 0 COMMENT 'Maximum number of additional participants that can be registered on a single booking',
-  `allow_same_participant_emails` tinyint NOT NULL DEFAULT 0 COMMENT 'if true - allows the user to register multiple registrations from same email address.',
-  `has_waitlist` tinyint NOT NULL DEFAULT 0 COMMENT 'Whether the event has waitlist support.',
-  `requires_approval` tinyint NOT NULL DEFAULT 0 COMMENT 'Whether participants require approval before they can finish registering.',
-  `expiration_time` int unsigned COMMENT 'Expire pending but unconfirmed registrations after this many hours.',
-  `allow_selfcancelxfer` tinyint NOT NULL DEFAULT 0 COMMENT 'Allow self service cancellation or transfer for event?',
-  `selfcancelxfer_time` int DEFAULT 0 COMMENT 'Number of hours prior to event start date to allow self-service cancellation or transfer.',
-  `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.',
-  `is_template` tinyint NOT NULL DEFAULT 0 COMMENT 'whether the event has template',
-  `template_title` varchar(255) COMMENT 'Event Template Title',
-  `created_id` int unsigned COMMENT 'FK to civicrm_contact, who created this event',
-  `created_date` datetime COMMENT 'Date and time that event was created.',
-  `currency` varchar(3) COMMENT '3 character string, value from config setting or input via user.',
-  `campaign_id` int unsigned COMMENT 'The campaign for which this event has been created.',
-  `is_share` tinyint NOT NULL DEFAULT 1 COMMENT 'Can people share the event through social media?',
-  `is_confirm_enabled` tinyint NOT NULL DEFAULT 1 COMMENT 'If false, the event booking confirmation screen gets skipped',
-  `parent_event_id` int unsigned DEFAULT NULL COMMENT 'Implicit FK to civicrm_event: parent event',
-  `slot_label_id` int unsigned DEFAULT NULL COMMENT 'Needs to be moved to Event cart extension. Subevent slot label. Implicit FK to civicrm_option_value where option_group = conference_slot.',
-  `dedupe_rule_group_id` int unsigned DEFAULT NULL COMMENT 'Rule to use when matching registrations for this event',
-  `is_billing_required` tinyint NOT NULL DEFAULT 0 COMMENT 'if true than billing block is required this event',
-  `is_show_calendar_links` tinyint NOT NULL DEFAULT 1 COMMENT 'If true then calendar links are shown for this event.',
-  PRIMARY KEY (`id`),
-  INDEX `index_event_type_id`(event_type_id),
-  INDEX `index_participant_listing_id`(participant_listing_id),
-  INDEX `index_parent_event_id`(parent_event_id),
-  CONSTRAINT FK_civicrm_event_loc_block_id FOREIGN KEY (`loc_block_id`) REFERENCES `civicrm_loc_block`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_event_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_event_campaign_id FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_event_dedupe_rule_group_id FOREIGN KEY (`dedupe_rule_group_id`) REFERENCES `civicrm_dedupe_rule_group`(`id`)
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_participant
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_participant` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Participant ID',
-  `contact_id` int unsigned NOT NULL COMMENT 'FK to Contact ID',
-  `event_id` int unsigned NOT NULL COMMENT 'FK to Event ID',
-  `status_id` int unsigned NOT NULL DEFAULT 1 COMMENT 'Participant status ID. FK to civicrm_participant_status_type. Default of 1 should map to status = Registered.',
-  `role_id` varchar(128) DEFAULT NULL COMMENT 'Participant role ID. Implicit FK to civicrm_option_value where option_group = participant_role.',
-  `register_date` datetime COMMENT 'When did contact register for event?',
-  `source` varchar(128) COMMENT 'Source of this event registration.',
-  `fee_level` text COMMENT 'Populate with the label (text) associated with a fee level for paid events with multiple levels. Note that\n      we store the label value and not the key',
-  `is_test` tinyint NOT NULL DEFAULT 0,
-  `is_pay_later` tinyint NOT NULL DEFAULT 0,
-  `fee_amount` decimal(20,2) COMMENT 'actual processor fee if known - may be 0.',
-  `registered_by_id` int unsigned DEFAULT NULL COMMENT 'FK to Participant ID',
-  `discount_id` int unsigned DEFAULT NULL COMMENT 'FK to Discount ID',
-  `fee_currency` varchar(3) DEFAULT NULL COMMENT '3 character string, value derived from config setting.',
-  `campaign_id` int unsigned COMMENT 'The campaign for which this participant has been registered.',
-  `discount_amount` int unsigned COMMENT 'Discount Amount',
-  `cart_id` int unsigned COMMENT 'FK to civicrm_event_carts',
-  `must_wait` int COMMENT 'On Waiting List',
-  `transferred_to_contact_id` int unsigned DEFAULT NULL COMMENT 'FK to Contact ID',
-  `created_id` int unsigned COMMENT 'Contact responsible for registering this participant',
-  PRIMARY KEY (`id`),
-  INDEX `index_status_id`(status_id),
-  INDEX `index_role_id`(role_id),
-  CONSTRAINT FK_civicrm_participant_contact_id FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_participant_event_id FOREIGN KEY (`event_id`) REFERENCES `civicrm_event`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_participant_status_id FOREIGN KEY (`status_id`) REFERENCES `civicrm_participant_status_type`(`id`),
-  CONSTRAINT FK_civicrm_participant_registered_by_id FOREIGN KEY (`registered_by_id`) REFERENCES `civicrm_participant`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_participant_discount_id FOREIGN KEY (`discount_id`) REFERENCES `civicrm_discount`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_participant_campaign_id FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_participant_cart_id FOREIGN KEY (`cart_id`) REFERENCES `civicrm_event_carts`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_participant_transferred_to_contact_id FOREIGN KEY (`transferred_to_contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_participant_created_id FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_participant_payment
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_participant_payment` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Participant Payment ID',
-  `participant_id` int unsigned NOT NULL COMMENT 'Participant ID (FK)',
-  `contribution_id` int unsigned NOT NULL COMMENT 'FK to contribution table.',
+CREATE TABLE `civicrm_pledge_block` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Pledge ID',
+  `entity_table` varchar(64) COMMENT 'physical tablename for entity being joined to pledge, e.g. civicrm_contact',
+  `entity_id` int unsigned NOT NULL COMMENT 'FK to entity table specified in entity_table column.',
+  `pledge_frequency_unit` varchar(128) COMMENT 'Delimited list of supported frequency units',
+  `is_pledge_interval` boolean NOT NULL DEFAULT FALSE COMMENT 'Is frequency interval exposed on the contribution form.',
+  `max_reminders` int unsigned DEFAULT 1 COMMENT 'The maximum number of payment reminders to send for any given payment.',
+  `initial_reminder_day` int unsigned DEFAULT 5 COMMENT 'Send initial reminder this many days prior to the payment due date.',
+  `additional_reminder_day` int unsigned DEFAULT 5 COMMENT 'Send additional reminder this many days after last one sent, up to maximum number of reminders.',
+  `pledge_start_date` varchar(64) COMMENT 'The date the first scheduled pledge occurs.',
+  `is_pledge_start_date_visible` boolean NOT NULL DEFAULT FALSE COMMENT 'If true - recurring start date is shown.',
+  `is_pledge_start_date_editable` boolean NOT NULL DEFAULT FALSE COMMENT 'If true - recurring start date is editable.',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_contribution_participant`(contribution_id, participant_id),
-  CONSTRAINT FK_civicrm_participant_payment_participant_id FOREIGN KEY (`participant_id`) REFERENCES `civicrm_participant`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_participant_payment_contribution_id FOREIGN KEY (`contribution_id`) REFERENCES `civicrm_contribution`(`id`) ON DELETE CASCADE
+  INDEX `index_entity`(`entity_table`, `entity_id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_events_in_carts
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_events_in_carts` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Event In Cart ID',
-  `event_id` int unsigned COMMENT 'FK to Event ID',
-  `event_cart_id` int unsigned COMMENT 'FK to Event Cart ID',
-  PRIMARY KEY (`id`),
-  CONSTRAINT FK_civicrm_events_in_carts_event_id FOREIGN KEY (`event_id`) REFERENCES `civicrm_event`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_events_in_carts_event_cart_id FOREIGN KEY (`event_cart_id`) REFERENCES `civicrm_event_carts`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_pledge_payment
--- *
--- * Pledge Payment
--- *
--- *******************************************************/
 CREATE TABLE `civicrm_pledge_payment` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `pledge_id` int unsigned NOT NULL COMMENT 'FK to Pledge table',
@@ -4108,18 +2536,10 @@ CREATE TABLE `civicrm_pledge_payment` (
   `reminder_count` int unsigned DEFAULT 0 COMMENT 'The number of payment reminders sent.',
   `status_id` int unsigned,
   PRIMARY KEY (`id`),
-  INDEX `index_contribution_pledge`(contribution_id, pledge_id),
-  INDEX `index_status`(status_id),
-  CONSTRAINT FK_civicrm_pledge_payment_pledge_id FOREIGN KEY (`pledge_id`) REFERENCES `civicrm_pledge`(`id`) ON DELETE CASCADE,
-  CONSTRAINT FK_civicrm_pledge_payment_contribution_id FOREIGN KEY (`contribution_id`) REFERENCES `civicrm_contribution`(`id`) ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
-
--- /*******************************************************
--- *
--- * civicrm_line_item
--- *
--- *******************************************************/
+  INDEX `index_contribution_pledge`(`contribution_id`, `pledge_id`),
+  INDEX `index_status`(`status_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 CREATE TABLE `civicrm_line_item` (
   `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Line Item',
   `entity_table` varchar(64) NOT NULL COMMENT 'May contain civicrm_contribution, civicrm_participant or civicrm_membership',
@@ -4133,14 +2553,543 @@ CREATE TABLE `civicrm_line_item` (
   `participant_count` int unsigned DEFAULT NULL COMMENT 'Participant count for field',
   `price_field_value_id` int unsigned DEFAULT NULL COMMENT 'FK to civicrm_price_field_value',
   `financial_type_id` int unsigned DEFAULT NULL COMMENT 'FK to Financial Type.',
-  `non_deductible_amount` decimal(20,2) NOT NULL DEFAULT 0.0 COMMENT 'Portion of total amount which is NOT tax deductible.',
-  `tax_amount` decimal(20,2) NOT NULL DEFAULT 0 COMMENT 'tax of each item',
+  `non_deductible_amount` decimal(20,2) NOT NULL DEFAULT '0.0' COMMENT 'Portion of total amount which is NOT tax deductible.',
+  `tax_amount` decimal(20,2) NOT NULL DEFAULT '0' COMMENT 'tax of each item',
   `membership_num_terms` int unsigned DEFAULT NULL COMMENT 'Number of terms for this membership (only supported in Order->Payment flow). If the field is NULL it means unknown and it will be assumed to be 1 during payment.create if entity_table is civicrm_membership',
   PRIMARY KEY (`id`),
-  UNIQUE INDEX `UI_line_item_value`(entity_id, entity_table, contribution_id, price_field_value_id, price_field_id),
-  CONSTRAINT FK_civicrm_line_item_contribution_id FOREIGN KEY (`contribution_id`) REFERENCES `civicrm_contribution`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_line_item_price_field_id FOREIGN KEY (`price_field_id`) REFERENCES `civicrm_price_field`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_line_item_price_field_value_id FOREIGN KEY (`price_field_value_id`) REFERENCES `civicrm_price_field_value`(`id`) ON DELETE SET NULL,
-  CONSTRAINT FK_civicrm_line_item_financial_type_id FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL
+  UNIQUE INDEX `UI_line_item_value`(`entity_id`, `entity_table`, `contribution_id`, `price_field_value_id`, `price_field_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_price_field` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Price Field',
+  `price_set_id` int unsigned NOT NULL COMMENT 'FK to civicrm_price_set',
+  `name` varchar(255) NOT NULL COMMENT 'Variable name/programmatic handle for this field.',
+  `label` varchar(255) NOT NULL COMMENT 'Text for form field label (also friendly name for administering this field).',
+  `html_type` varchar(12) NOT NULL,
+  `is_enter_qty` boolean NOT NULL DEFAULT FALSE COMMENT 'Enter a quantity for 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.',
+  `weight` int DEFAULT 1 COMMENT 'Order in which the fields should appear',
+  `is_display_amounts` boolean NOT NULL DEFAULT TRUE COMMENT 'Should the price be displayed next to the label for each option?',
+  `options_per_line` int unsigned DEFAULT 1 COMMENT 'number of options per line for checkbox and radio',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this price field active',
+  `is_required` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this price field required (value must be > 1)',
+  `active_on` datetime DEFAULT NULL COMMENT 'If non-zero, do not show this field before the date specified',
+  `expire_on` datetime DEFAULT NULL COMMENT 'If non-zero, do not show this field after the date specified',
+  `javascript` varchar(255) COMMENT 'Optional scripting attributes for field',
+  `visibility_id` int unsigned DEFAULT 1 COMMENT 'Implicit FK to civicrm_option_group with name = \'visibility\'',
+  PRIMARY KEY (`id`),
+  INDEX `index_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_price_field_value` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Price Field Value',
+  `price_field_id` int unsigned NOT NULL COMMENT 'FK to civicrm_price_field',
+  `name` varchar(255) DEFAULT NULL COMMENT 'Price field option name',
+  `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.',
+  `amount` decimal(18,9) NOT NULL COMMENT 'Price field option amount',
+  `count` int unsigned DEFAULT NULL COMMENT 'Number of participants per field option',
+  `max_value` int unsigned DEFAULT NULL COMMENT 'Max number of participants per field options',
+  `weight` int DEFAULT 1 COMMENT 'Order in which the field options should appear',
+  `membership_type_id` int unsigned DEFAULT NULL COMMENT 'FK to Membership Type',
+  `membership_num_terms` int unsigned DEFAULT NULL COMMENT 'Number of terms for this membership',
+  `is_default` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this default price field option',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this price field value active',
+  `financial_type_id` int unsigned DEFAULT NULL COMMENT 'FK to Financial Type.',
+  `non_deductible_amount` decimal(20,2) NOT NULL DEFAULT '0.0' COMMENT 'Portion of total amount which is NOT tax deductible.',
+  `visibility_id` int unsigned DEFAULT 1 COMMENT 'Implicit FK to civicrm_option_group with name = \'visibility\'',
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_price_set` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Price Set',
+  `domain_id` int unsigned COMMENT 'Which Domain is this price-set for',
+  `name` varchar(255) NOT NULL COMMENT 'Variable name/programmatic handle for this set of price fields.',
+  `title` varchar(255) NOT NULL COMMENT 'Displayed title for the Price Set.',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this price set active',
+  `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.',
+  `javascript` varchar(64) COMMENT 'Optional Javascript script function(s) included on the form with this price_set. Can be used for conditional',
+  `extends` varchar(255) NOT NULL COMMENT 'What components are using this price set?',
+  `financial_type_id` int unsigned DEFAULT NULL COMMENT 'FK to Financial Type(for membership price sets only).',
+  `is_quick_config` boolean NOT NULL DEFAULT FALSE COMMENT 'Is set if edited on Contribution or Event Page rather than through Manage Price Sets',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this a predefined system price set (i.e. it can not be deleted, edited)?',
+  `min_amount` decimal(20,2) DEFAULT '0.0' COMMENT 'Minimum Amount required for this set.',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_price_set_entity` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Price Set Entity',
+  `entity_table` varchar(64) NOT NULL COMMENT 'Table which uses this price set',
+  `entity_id` int unsigned NOT NULL COMMENT 'Item in table',
+  `price_set_id` int unsigned NOT NULL COMMENT 'price set being used',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_entity`(`entity_table`, `entity_id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_queue` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(64) NOT NULL COMMENT 'Name of the queue',
+  `type` varchar(64) NOT NULL COMMENT 'Type of the queue',
+  `runner` varchar(64) COMMENT 'Name of the task runner',
+  `batch_limit` int unsigned NOT NULL DEFAULT 1 COMMENT 'Maximum number of items in a batch.',
+  `lease_time` int unsigned NOT NULL DEFAULT 3600 COMMENT 'When claiming an item (or batch of items) for work, how long should the item(s) be reserved. (Seconds)',
+  `retry_limit` int NOT NULL DEFAULT 0 COMMENT 'Number of permitted retries. Set to zero (0) to disable.',
+  `retry_interval` int COMMENT 'Number of seconds to wait before retrying a failed execution.',
+  `status` varchar(16) DEFAULT 'active' COMMENT 'Execution status',
+  `error` varchar(16) COMMENT 'Fallback behavior for unhandled errors',
+  `is_template` boolean NOT NULL DEFAULT FALSE COMMENT 'Is this a template configuration (for use by other/future queues)?',
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UI_name`(`name`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_queue_item` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `queue_name` varchar(64) NOT NULL COMMENT 'Name of the queue which includes this item',
+  `weight` int NOT NULL,
+  `submit_time` timestamp NOT NULL COMMENT 'date on which this item was submitted to the queue',
+  `release_time` timestamp NULL DEFAULT NULL COMMENT 'date on which this job becomes available; null if ASAP',
+  `run_count` int NOT NULL DEFAULT 0 COMMENT 'Number of times execution has been attempted.',
+  `data` longtext COMMENT 'Serialized queue data',
+  PRIMARY KEY (`id`),
+  INDEX `index_queueids`(`queue_name`, `weight`, `id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_report_instance` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Report Instance ID',
+  `domain_id` int unsigned NOT NULL COMMENT 'Which Domain is this instance for',
+  `title` varchar(255) COMMENT 'Report Instance Title.',
+  `report_id` varchar(512) NOT NULL COMMENT 'FK to civicrm_option_value for the report template',
+  `name` varchar(255) COMMENT 'when combined with report_id/template uniquely identifies the instance',
+  `args` varchar(255) COMMENT 'arguments that are passed in the url when invoking the instance',
+  `description` varchar(255) COMMENT 'Report Instance description.',
+  `permission` varchar(255) COMMENT 'permission required to be able to run this instance',
+  `grouprole` varchar(1024) COMMENT 'role required to be able to run this instance',
+  `form_values` longtext COMMENT 'Submitted form values for this report',
+  `is_active` boolean NOT NULL DEFAULT TRUE COMMENT 'Is this entry active?',
+  `created_id` int unsigned COMMENT 'FK to contact table.',
+  `owner_id` int unsigned COMMENT 'FK to contact table.',
+  `email_subject` varchar(255) COMMENT 'Subject of email',
+  `email_to` text COMMENT 'comma-separated list of email addresses to send the report to',
+  `email_cc` text COMMENT 'comma-separated list of email addresses to send the report to',
+  `header` text COMMENT 'comma-separated list of email addresses to send the report to',
+  `footer` text COMMENT 'comma-separated list of email addresses to send the report to',
+  `navigation_id` int unsigned COMMENT 'FK to navigation ID',
+  `drilldown_id` int unsigned COMMENT 'FK to instance ID drilldown to',
+  `is_reserved` boolean NOT NULL DEFAULT FALSE,
+  PRIMARY KEY (`id`)
+)
+ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `civicrm_sms_provider` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'SMS Provider ID',
+  `name` varchar(64) COMMENT 'Provider internal name points to option_value of option_group sms_provider_name',
+  `title` varchar(64) COMMENT 'Provider name visible to user',
+  `username` varchar(255),
+  `password` varchar(255),
+  `api_type` int unsigned NOT NULL COMMENT 'points to value in civicrm_option_value for group sms_api_type',
+  `api_url` varchar(128),
+  `api_params` text COMMENT 'the api params in xml, http or smtp format',
+  `is_default` boolean NOT NULL DEFAULT FALSE,
+  `is_active` boolean NOT NULL DEFAULT TRUE,
+  `domain_id` int unsigned COMMENT 'Which Domain is this sms provider for',
+  PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+ALTER TABLE `civicrm_acl_cache`
+  ADD CONSTRAINT `FK_civicrm_acl_cache_acl_id` FOREIGN KEY (`acl_id`) REFERENCES `civicrm_acl`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_activity`
+  ADD CONSTRAINT `FK_civicrm_activity_phone_id` FOREIGN KEY (`phone_id`) REFERENCES `civicrm_phone`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_activity_parent_id` FOREIGN KEY (`parent_id`) REFERENCES `civicrm_activity`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_activity_relationship_id` FOREIGN KEY (`relationship_id`) REFERENCES `civicrm_relationship`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_activity_original_id` FOREIGN KEY (`original_id`) REFERENCES `civicrm_activity`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_activity_campaign_id` FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_activity_contact`
+  ADD CONSTRAINT `FK_civicrm_activity_contact_activity_id` FOREIGN KEY (`activity_id`) REFERENCES `civicrm_activity`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_activity_contact_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_batch`
+  ADD CONSTRAINT `FK_civicrm_batch_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_batch_modified_id` FOREIGN KEY (`modified_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_batch_saved_search_id` FOREIGN KEY (`saved_search_id`) REFERENCES `civicrm_saved_search`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_entity_batch`
+  ADD CONSTRAINT `FK_civicrm_entity_batch_batch_id` FOREIGN KEY (`batch_id`) REFERENCES `civicrm_batch`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_campaign`
+  ADD CONSTRAINT `FK_civicrm_campaign_parent_id` FOREIGN KEY (`parent_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_campaign_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_campaign_last_modified_id` FOREIGN KEY (`last_modified_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_campaign_group`
+  ADD CONSTRAINT `FK_civicrm_campaign_group_campaign_id` FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_survey`
+  ADD CONSTRAINT `FK_civicrm_survey_campaign_id` FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_survey_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_survey_last_modified_id` FOREIGN KEY (`last_modified_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_case`
+  ADD CONSTRAINT `FK_civicrm_case_case_type_id` FOREIGN KEY (`case_type_id`) REFERENCES `civicrm_case_type`(`id`);
+ALTER TABLE `civicrm_case_activity`
+  ADD CONSTRAINT `FK_civicrm_case_activity_case_id` FOREIGN KEY (`case_id`) REFERENCES `civicrm_case`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_case_activity_activity_id` FOREIGN KEY (`activity_id`) REFERENCES `civicrm_activity`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_case_contact`
+  ADD CONSTRAINT `FK_civicrm_case_contact_case_id` FOREIGN KEY (`case_id`) REFERENCES `civicrm_case`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_case_contact_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_contact`
+  ADD CONSTRAINT `FK_civicrm_contact_primary_contact_id` FOREIGN KEY (`primary_contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_contact_employer_id` FOREIGN KEY (`employer_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_contact_type`
+  ADD CONSTRAINT `FK_civicrm_contact_type_parent_id` FOREIGN KEY (`parent_id`) REFERENCES `civicrm_contact_type`(`id`);
+ALTER TABLE `civicrm_dashboard_contact`
+  ADD CONSTRAINT `FK_civicrm_dashboard_contact_dashboard_id` FOREIGN KEY (`dashboard_id`) REFERENCES `civicrm_dashboard`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_dashboard_contact_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_group`
+  ADD CONSTRAINT `FK_civicrm_group_saved_search_id` FOREIGN KEY (`saved_search_id`) REFERENCES `civicrm_saved_search`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_group_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_group_modified_id` FOREIGN KEY (`modified_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_group_contact`
+  ADD CONSTRAINT `FK_civicrm_group_contact_group_id` FOREIGN KEY (`group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_group_contact_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_group_contact_location_id` FOREIGN KEY (`location_id`) REFERENCES `civicrm_loc_block`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_group_contact_email_id` FOREIGN KEY (`email_id`) REFERENCES `civicrm_email`(`id`);
+ALTER TABLE `civicrm_group_contact_cache`
+  ADD CONSTRAINT `FK_civicrm_group_contact_cache_group_id` FOREIGN KEY (`group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_group_contact_cache_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_group_nesting`
+  ADD CONSTRAINT `FK_civicrm_group_nesting_child_group_id` FOREIGN KEY (`child_group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_group_nesting_parent_group_id` FOREIGN KEY (`parent_group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_group_organization`
+  ADD CONSTRAINT `FK_civicrm_group_organization_group_id` FOREIGN KEY (`group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_group_organization_organization_id` FOREIGN KEY (`organization_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_relationship`
+  ADD CONSTRAINT `FK_civicrm_relationship_contact_id_a` FOREIGN KEY (`contact_id_a`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_relationship_contact_id_b` FOREIGN KEY (`contact_id_b`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_relationship_relationship_type_id` FOREIGN KEY (`relationship_type_id`) REFERENCES `civicrm_relationship_type`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_relationship_case_id` FOREIGN KEY (`case_id`) REFERENCES `civicrm_case`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_relationship_cache`
+  ADD CONSTRAINT `FK_civicrm_relationship_cache_relationship_id` FOREIGN KEY (`relationship_id`) REFERENCES `civicrm_relationship`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_relationship_cache_relationship_type_id` FOREIGN KEY (`relationship_type_id`) REFERENCES `civicrm_relationship_type`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_relationship_cache_near_contact_id` FOREIGN KEY (`near_contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_relationship_cache_far_contact_id` FOREIGN KEY (`far_contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_relationship_cache_case_id` FOREIGN KEY (`case_id`) REFERENCES `civicrm_case`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_saved_search`
+  ADD CONSTRAINT `FK_civicrm_saved_search_mapping_id` FOREIGN KEY (`mapping_id`) REFERENCES `civicrm_mapping`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_saved_search_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_saved_search_modified_id` FOREIGN KEY (`modified_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_subscription_history`
+  ADD CONSTRAINT `FK_civicrm_subscription_history_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_subscription_history_group_id` FOREIGN KEY (`group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_contribution`
+  ADD CONSTRAINT `FK_civicrm_contribution_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_contribution_financial_type_id` FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`),
+  ADD CONSTRAINT `FK_civicrm_contribution_contribution_page_id` FOREIGN KEY (`contribution_page_id`) REFERENCES `civicrm_contribution_page`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_contribution_contribution_recur_id` FOREIGN KEY (`contribution_recur_id`) REFERENCES `civicrm_contribution_recur`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_contribution_address_id` FOREIGN KEY (`address_id`) REFERENCES `civicrm_address`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_contribution_campaign_id` FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_contribution_page`
+  ADD CONSTRAINT `FK_civicrm_contribution_page_financial_type_id` FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`),
+  ADD CONSTRAINT `FK_civicrm_contribution_page_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_contribution_page_campaign_id` FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_contribution_product`
+  ADD CONSTRAINT `FK_civicrm_contribution_product_product_id` FOREIGN KEY (`product_id`) REFERENCES `civicrm_product`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_contribution_product_contribution_id` FOREIGN KEY (`contribution_id`) REFERENCES `civicrm_contribution`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_contribution_product_financial_type_id` FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_contribution_recur`
+  ADD CONSTRAINT `FK_civicrm_contribution_recur_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_contribution_recur_payment_token_id` FOREIGN KEY (`payment_token_id`) REFERENCES `civicrm_payment_token`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_contribution_recur_payment_processor_id` FOREIGN KEY (`payment_processor_id`) REFERENCES `civicrm_payment_processor`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_contribution_recur_financial_type_id` FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_contribution_recur_campaign_id` FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_contribution_soft`
+  ADD CONSTRAINT `FK_civicrm_contribution_soft_contribution_id` FOREIGN KEY (`contribution_id`) REFERENCES `civicrm_contribution`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_contribution_soft_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_contribution_soft_pcp_id` FOREIGN KEY (`pcp_id`) REFERENCES `civicrm_pcp`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_premiums_product`
+  ADD CONSTRAINT `FK_civicrm_premiums_product_premiums_id` FOREIGN KEY (`premiums_id`) REFERENCES `civicrm_premiums`(`id`),
+  ADD CONSTRAINT `FK_civicrm_premiums_product_product_id` FOREIGN KEY (`product_id`) REFERENCES `civicrm_product`(`id`),
+  ADD CONSTRAINT `FK_civicrm_premiums_product_financial_type_id` FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_product`
+  ADD CONSTRAINT `FK_civicrm_product_financial_type_id` FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_contribution_widget`
+  ADD CONSTRAINT `FK_civicrm_contribution_widget_contribution_page_id` FOREIGN KEY (`contribution_page_id`) REFERENCES `civicrm_contribution_page`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_action_log`
+  ADD CONSTRAINT `FK_civicrm_action_log_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_action_log_action_schedule_id` FOREIGN KEY (`action_schedule_id`) REFERENCES `civicrm_action_schedule`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_action_schedule`
+  ADD CONSTRAINT `FK_civicrm_action_schedule_group_id` FOREIGN KEY (`group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_action_schedule_msg_template_id` FOREIGN KEY (`msg_template_id`) REFERENCES `civicrm_msg_template`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_action_schedule_sms_template_id` FOREIGN KEY (`sms_template_id`) REFERENCES `civicrm_msg_template`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_action_schedule_sms_provider_id` FOREIGN KEY (`sms_provider_id`) REFERENCES `civicrm_sms_provider`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_address`
+  ADD CONSTRAINT `FK_civicrm_address_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_address_county_id` FOREIGN KEY (`county_id`) REFERENCES `civicrm_county`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_address_state_province_id` FOREIGN KEY (`state_province_id`) REFERENCES `civicrm_state_province`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_address_country_id` FOREIGN KEY (`country_id`) REFERENCES `civicrm_country`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_address_master_id` FOREIGN KEY (`master_id`) REFERENCES `civicrm_address`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_cache`
+  ADD CONSTRAINT `FK_civicrm_cache_component_id` FOREIGN KEY (`component_id`) REFERENCES `civicrm_component`(`id`);
+ALTER TABLE `civicrm_country`
+  ADD CONSTRAINT `FK_civicrm_country_address_format_id` FOREIGN KEY (`address_format_id`) REFERENCES `civicrm_address_format`(`id`),
+  ADD CONSTRAINT `FK_civicrm_country_region_id` FOREIGN KEY (`region_id`) REFERENCES `civicrm_worldregion`(`id`);
+ALTER TABLE `civicrm_county`
+  ADD CONSTRAINT `FK_civicrm_county_state_province_id` FOREIGN KEY (`state_province_id`) REFERENCES `civicrm_state_province`(`id`);
+ALTER TABLE `civicrm_custom_field`
+  ADD CONSTRAINT `FK_civicrm_custom_field_custom_group_id` FOREIGN KEY (`custom_group_id`) REFERENCES `civicrm_custom_group`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_custom_field_option_group_id` FOREIGN KEY (`option_group_id`) REFERENCES `civicrm_option_group`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_custom_group`
+  ADD CONSTRAINT `FK_civicrm_custom_group_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_dashboard`
+  ADD CONSTRAINT `FK_civicrm_dashboard_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_discount`
+  ADD CONSTRAINT `FK_civicrm_discount_price_set_id` FOREIGN KEY (`price_set_id`) REFERENCES `civicrm_price_set`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_domain`
+  ADD CONSTRAINT `FK_civicrm_domain_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`);
+ALTER TABLE `civicrm_email`
+  ADD CONSTRAINT `FK_civicrm_email_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_entity_file`
+  ADD CONSTRAINT `FK_civicrm_entity_file_file_id` FOREIGN KEY (`file_id`) REFERENCES `civicrm_file`(`id`);
+ALTER TABLE `civicrm_entity_tag`
+  ADD CONSTRAINT `FK_civicrm_entity_tag_tag_id` FOREIGN KEY (`tag_id`) REFERENCES `civicrm_tag`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_file`
+  ADD CONSTRAINT `FK_civicrm_file_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_im`
+  ADD CONSTRAINT `FK_civicrm_im_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_job`
+  ADD CONSTRAINT `FK_civicrm_job_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`);
+ALTER TABLE `civicrm_job_log`
+  ADD CONSTRAINT `FK_civicrm_job_log_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
+  ADD CONSTRAINT `FK_civicrm_job_log_job_id` FOREIGN KEY (`job_id`) REFERENCES `civicrm_job`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_loc_block`
+  ADD CONSTRAINT `FK_civicrm_loc_block_address_id` FOREIGN KEY (`address_id`) REFERENCES `civicrm_address`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_loc_block_email_id` FOREIGN KEY (`email_id`) REFERENCES `civicrm_email`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_loc_block_phone_id` FOREIGN KEY (`phone_id`) REFERENCES `civicrm_phone`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_loc_block_im_id` FOREIGN KEY (`im_id`) REFERENCES `civicrm_im`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_loc_block_address_2_id` FOREIGN KEY (`address_2_id`) REFERENCES `civicrm_address`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_loc_block_email_2_id` FOREIGN KEY (`email_2_id`) REFERENCES `civicrm_email`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_loc_block_phone_2_id` FOREIGN KEY (`phone_2_id`) REFERENCES `civicrm_phone`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_loc_block_im_2_id` FOREIGN KEY (`im_2_id`) REFERENCES `civicrm_im`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_log`
+  ADD CONSTRAINT `FK_civicrm_log_modified_id` FOREIGN KEY (`modified_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_mail_settings`
+  ADD CONSTRAINT `FK_civicrm_mail_settings_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_mail_settings_campaign_id` FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_mapping_field`
+  ADD CONSTRAINT `FK_civicrm_mapping_field_mapping_id` FOREIGN KEY (`mapping_id`) REFERENCES `civicrm_mapping`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_mapping_field_location_type_id` FOREIGN KEY (`location_type_id`) REFERENCES `civicrm_location_type`(`id`),
+  ADD CONSTRAINT `FK_civicrm_mapping_field_relationship_type_id` FOREIGN KEY (`relationship_type_id`) REFERENCES `civicrm_relationship_type`(`id`);
+ALTER TABLE `civicrm_menu`
+  ADD CONSTRAINT `FK_civicrm_menu_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
+  ADD CONSTRAINT `FK_civicrm_menu_component_id` FOREIGN KEY (`component_id`) REFERENCES `civicrm_component`(`id`);
+ALTER TABLE `civicrm_navigation`
+  ADD CONSTRAINT `FK_civicrm_navigation_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
+  ADD CONSTRAINT `FK_civicrm_navigation_parent_id` FOREIGN KEY (`parent_id`) REFERENCES `civicrm_navigation`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_note`
+  ADD CONSTRAINT `FK_civicrm_note_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_openid`
+  ADD CONSTRAINT `FK_civicrm_openid_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_option_value`
+  ADD CONSTRAINT `FK_civicrm_option_value_option_group_id` FOREIGN KEY (`option_group_id`) REFERENCES `civicrm_option_group`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_option_value_component_id` FOREIGN KEY (`component_id`) REFERENCES `civicrm_component`(`id`),
+  ADD CONSTRAINT `FK_civicrm_option_value_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`);
+ALTER TABLE `civicrm_phone`
+  ADD CONSTRAINT `FK_civicrm_phone_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_print_label`
+  ADD CONSTRAINT `FK_civicrm_print_label_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_setting`
+  ADD CONSTRAINT `FK_civicrm_setting_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_setting_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_setting_component_id` FOREIGN KEY (`component_id`) REFERENCES `civicrm_component`(`id`),
+  ADD CONSTRAINT `FK_civicrm_setting_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_state_province`
+  ADD CONSTRAINT `FK_civicrm_state_province_country_id` FOREIGN KEY (`country_id`) REFERENCES `civicrm_country`(`id`);
+ALTER TABLE `civicrm_status_pref`
+  ADD CONSTRAINT `FK_civicrm_status_pref_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`);
+ALTER TABLE `civicrm_tag`
+  ADD CONSTRAINT `FK_civicrm_tag_parent_id` FOREIGN KEY (`parent_id`) REFERENCES `civicrm_tag`(`id`),
+  ADD CONSTRAINT `FK_civicrm_tag_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_timezone`
+  ADD CONSTRAINT `FK_civicrm_timezone_country_id` FOREIGN KEY (`country_id`) REFERENCES `civicrm_country`(`id`);
+ALTER TABLE `civicrm_uf_field`
+  ADD CONSTRAINT `FK_civicrm_uf_field_uf_group_id` FOREIGN KEY (`uf_group_id`) REFERENCES `civicrm_uf_group`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_uf_field_location_type_id` FOREIGN KEY (`location_type_id`) REFERENCES `civicrm_location_type`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_uf_group`
+  ADD CONSTRAINT `FK_civicrm_uf_group_limit_listings_group_id` FOREIGN KEY (`limit_listings_group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_uf_group_add_to_group_id` FOREIGN KEY (`add_to_group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_uf_group_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_uf_join`
+  ADD CONSTRAINT `FK_civicrm_uf_join_uf_group_id` FOREIGN KEY (`uf_group_id`) REFERENCES `civicrm_uf_group`(`id`);
+ALTER TABLE `civicrm_uf_match`
+  ADD CONSTRAINT `FK_civicrm_uf_match_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
+  ADD CONSTRAINT `FK_civicrm_uf_match_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_user_job`
+  ADD CONSTRAINT `FK_civicrm_user_job_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_user_job_queue_id` FOREIGN KEY (`queue_id`) REFERENCES `civicrm_queue`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_website`
+  ADD CONSTRAINT `FK_civicrm_website_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_word_replacement`
+  ADD CONSTRAINT `FK_civicrm_word_replacement_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`);
+ALTER TABLE `civicrm_dedupe_exception`
+  ADD CONSTRAINT `FK_civicrm_dedupe_exception_contact_id1` FOREIGN KEY (`contact_id1`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_dedupe_exception_contact_id2` FOREIGN KEY (`contact_id2`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_dedupe_rule`
+  ADD CONSTRAINT `FK_civicrm_dedupe_rule_dedupe_rule_group_id` FOREIGN KEY (`dedupe_rule_group_id`) REFERENCES `civicrm_dedupe_rule_group`(`id`);
+ALTER TABLE `civicrm_event_carts`
+  ADD CONSTRAINT `FK_civicrm_event_carts_user_id` FOREIGN KEY (`user_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_event`
+  ADD CONSTRAINT `FK_civicrm_event_loc_block_id` FOREIGN KEY (`loc_block_id`) REFERENCES `civicrm_loc_block`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_event_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_event_campaign_id` FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_event_dedupe_rule_group_id` FOREIGN KEY (`dedupe_rule_group_id`) REFERENCES `civicrm_dedupe_rule_group`(`id`);
+ALTER TABLE `civicrm_events_in_carts`
+  ADD CONSTRAINT `FK_civicrm_events_in_carts_event_id` FOREIGN KEY (`event_id`) REFERENCES `civicrm_event`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_events_in_carts_event_cart_id` FOREIGN KEY (`event_cart_id`) REFERENCES `civicrm_event_carts`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_participant`
+  ADD CONSTRAINT `FK_civicrm_participant_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_participant_event_id` FOREIGN KEY (`event_id`) REFERENCES `civicrm_event`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_participant_status_id` FOREIGN KEY (`status_id`) REFERENCES `civicrm_participant_status_type`(`id`),
+  ADD CONSTRAINT `FK_civicrm_participant_registered_by_id` FOREIGN KEY (`registered_by_id`) REFERENCES `civicrm_participant`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_participant_discount_id` FOREIGN KEY (`discount_id`) REFERENCES `civicrm_discount`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_participant_campaign_id` FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_participant_cart_id` FOREIGN KEY (`cart_id`) REFERENCES `civicrm_event_carts`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_participant_transferred_to_contact_id` FOREIGN KEY (`transferred_to_contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_participant_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_participant_payment`
+  ADD CONSTRAINT `FK_civicrm_participant_payment_participant_id` FOREIGN KEY (`participant_id`) REFERENCES `civicrm_participant`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_participant_payment_contribution_id` FOREIGN KEY (`contribution_id`) REFERENCES `civicrm_contribution`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_entity_financial_account`
+  ADD CONSTRAINT `FK_civicrm_entity_financial_account_financial_account_id` FOREIGN KEY (`financial_account_id`) REFERENCES `civicrm_financial_account`(`id`) ON DELETE RESTRICT;
+ALTER TABLE `civicrm_entity_financial_trxn`
+  ADD CONSTRAINT `FK_civicrm_entity_financial_trxn_financial_trxn_id` FOREIGN KEY (`financial_trxn_id`) REFERENCES `civicrm_financial_trxn`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_financial_account`
+  ADD CONSTRAINT `FK_civicrm_financial_account_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_financial_account_parent_id` FOREIGN KEY (`parent_id`) REFERENCES `civicrm_financial_account`(`id`);
+ALTER TABLE `civicrm_financial_item`
+  ADD CONSTRAINT `FK_civicrm_financial_item_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_financial_item_financial_account_id` FOREIGN KEY (`financial_account_id`) REFERENCES `civicrm_financial_account`(`id`);
+ALTER TABLE `civicrm_financial_trxn`
+  ADD CONSTRAINT `FK_civicrm_financial_trxn_from_financial_account_id` FOREIGN KEY (`from_financial_account_id`) REFERENCES `civicrm_financial_account`(`id`),
+  ADD CONSTRAINT `FK_civicrm_financial_trxn_to_financial_account_id` FOREIGN KEY (`to_financial_account_id`) REFERENCES `civicrm_financial_account`(`id`),
+  ADD CONSTRAINT `FK_civicrm_financial_trxn_payment_processor_id` FOREIGN KEY (`payment_processor_id`) REFERENCES `civicrm_payment_processor`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_payment_processor`
+  ADD CONSTRAINT `FK_civicrm_payment_processor_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
+  ADD CONSTRAINT `FK_civicrm_payment_processor_payment_processor_type_id` FOREIGN KEY (`payment_processor_type_id`) REFERENCES `civicrm_payment_processor_type`(`id`);
+ALTER TABLE `civicrm_payment_token`
+  ADD CONSTRAINT `FK_civicrm_payment_token_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_payment_token_payment_processor_id` FOREIGN KEY (`payment_processor_id`) REFERENCES `civicrm_payment_processor`(`id`) ON DELETE RESTRICT,
+  ADD CONSTRAINT `FK_civicrm_payment_token_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_mailing_bounce_pattern`
+  ADD CONSTRAINT `FK_civicrm_mailing_bounce_pattern_bounce_type_id` FOREIGN KEY (`bounce_type_id`) REFERENCES `civicrm_mailing_bounce_type`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_mailing`
+  ADD CONSTRAINT `FK_civicrm_mailing_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_header_id` FOREIGN KEY (`header_id`) REFERENCES `civicrm_mailing_component`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_footer_id` FOREIGN KEY (`footer_id`) REFERENCES `civicrm_mailing_component`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_reply_id` FOREIGN KEY (`reply_id`) REFERENCES `civicrm_mailing_component`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_unsubscribe_id` FOREIGN KEY (`unsubscribe_id`) REFERENCES `civicrm_mailing_component`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_optout_id` FOREIGN KEY (`optout_id`) REFERENCES `civicrm_mailing_component`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_msg_template_id` FOREIGN KEY (`msg_template_id`) REFERENCES `civicrm_msg_template`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_scheduled_id` FOREIGN KEY (`scheduled_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_approver_id` FOREIGN KEY (`approver_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_campaign_id` FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_sms_provider_id` FOREIGN KEY (`sms_provider_id`) REFERENCES `civicrm_sms_provider`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_location_type_id` FOREIGN KEY (`location_type_id`) REFERENCES `civicrm_location_type`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_mailing_abtest`
+  ADD CONSTRAINT `FK_civicrm_mailing_abtest_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_mailing_event_bounce`
+  ADD CONSTRAINT `FK_civicrm_mailing_event_bounce_event_queue_id` FOREIGN KEY (`event_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_mailing_event_confirm`
+  ADD CONSTRAINT `FK_civicrm_mailing_event_confirm_event_subscribe_id` FOREIGN KEY (`event_subscribe_id`) REFERENCES `civicrm_mailing_event_subscribe`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_mailing_event_delivered`
+  ADD CONSTRAINT `FK_civicrm_mailing_event_delivered_event_queue_id` FOREIGN KEY (`event_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_mailing_event_forward`
+  ADD CONSTRAINT `FK_civicrm_mailing_event_forward_event_queue_id` FOREIGN KEY (`event_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_mailing_event_forward_dest_queue_id` FOREIGN KEY (`dest_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_mailing_event_opened`
+  ADD CONSTRAINT `FK_civicrm_mailing_event_opened_event_queue_id` FOREIGN KEY (`event_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_mailing_event_queue`
+  ADD CONSTRAINT `FK_civicrm_mailing_event_queue_job_id` FOREIGN KEY (`job_id`) REFERENCES `civicrm_mailing_job`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_event_queue_mailing_id` FOREIGN KEY (`mailing_id`) REFERENCES `civicrm_mailing`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_event_queue_email_id` FOREIGN KEY (`email_id`) REFERENCES `civicrm_email`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_event_queue_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_mailing_event_queue_phone_id` FOREIGN KEY (`phone_id`) REFERENCES `civicrm_phone`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_mailing_event_reply`
+  ADD CONSTRAINT `FK_civicrm_mailing_event_reply_event_queue_id` FOREIGN KEY (`event_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_mailing_event_subscribe`
+  ADD CONSTRAINT `FK_civicrm_mailing_event_subscribe_group_id` FOREIGN KEY (`group_id`) REFERENCES `civicrm_group`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_mailing_event_subscribe_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_mailing_event_trackable_url_open`
+  ADD CONSTRAINT `FK_civicrm_mailing_event_trackable_url_open_event_queue_id` FOREIGN KEY (`event_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_mailing_event_trackable_url_open_trackable_url_id` FOREIGN KEY (`trackable_url_id`) REFERENCES `civicrm_mailing_trackable_url`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_mailing_event_unsubscribe`
+  ADD CONSTRAINT `FK_civicrm_mailing_event_unsubscribe_event_queue_id` FOREIGN KEY (`event_queue_id`) REFERENCES `civicrm_mailing_event_queue`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_mailing_group`
+  ADD CONSTRAINT `FK_civicrm_mailing_group_mailing_id` FOREIGN KEY (`mailing_id`) REFERENCES `civicrm_mailing`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_mailing_job`
+  ADD CONSTRAINT `FK_civicrm_mailing_job_mailing_id` FOREIGN KEY (`mailing_id`) REFERENCES `civicrm_mailing`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_mailing_job_parent_id` FOREIGN KEY (`parent_id`) REFERENCES `civicrm_mailing_job`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_mailing_recipients`
+  ADD CONSTRAINT `FK_civicrm_mailing_recipients_mailing_id` FOREIGN KEY (`mailing_id`) REFERENCES `civicrm_mailing`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_mailing_recipients_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_mailing_recipients_email_id` FOREIGN KEY (`email_id`) REFERENCES `civicrm_email`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_mailing_recipients_phone_id` FOREIGN KEY (`phone_id`) REFERENCES `civicrm_phone`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_mailing_trackable_url`
+  ADD CONSTRAINT `FK_civicrm_mailing_trackable_url_mailing_id` FOREIGN KEY (`mailing_id`) REFERENCES `civicrm_mailing`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_mailing_spool`
+  ADD CONSTRAINT `FK_civicrm_mailing_spool_job_id` FOREIGN KEY (`job_id`) REFERENCES `civicrm_mailing_job`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_membership`
+  ADD CONSTRAINT `FK_civicrm_membership_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_membership_membership_type_id` FOREIGN KEY (`membership_type_id`) REFERENCES `civicrm_membership_type`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_membership_status_id` FOREIGN KEY (`status_id`) REFERENCES `civicrm_membership_status`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_membership_owner_membership_id` FOREIGN KEY (`owner_membership_id`) REFERENCES `civicrm_membership`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_membership_contribution_recur_id` FOREIGN KEY (`contribution_recur_id`) REFERENCES `civicrm_contribution_recur`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_membership_campaign_id` FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_membership_block`
+  ADD CONSTRAINT `FK_civicrm_membership_block_entity_id` FOREIGN KEY (`entity_id`) REFERENCES `civicrm_contribution_page`(`id`),
+  ADD CONSTRAINT `FK_civicrm_membership_block_membership_type_default` FOREIGN KEY (`membership_type_default`) REFERENCES `civicrm_membership_type`(`id`);
+ALTER TABLE `civicrm_membership_log`
+  ADD CONSTRAINT `FK_civicrm_membership_log_membership_id` FOREIGN KEY (`membership_id`) REFERENCES `civicrm_membership`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_membership_log_status_id` FOREIGN KEY (`status_id`) REFERENCES `civicrm_membership_status`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_membership_log_modified_id` FOREIGN KEY (`modified_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_membership_log_membership_type_id` FOREIGN KEY (`membership_type_id`) REFERENCES `civicrm_membership_type`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_membership_payment`
+  ADD CONSTRAINT `FK_civicrm_membership_payment_membership_id` FOREIGN KEY (`membership_id`) REFERENCES `civicrm_membership`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_membership_payment_contribution_id` FOREIGN KEY (`contribution_id`) REFERENCES `civicrm_contribution`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_membership_type`
+  ADD CONSTRAINT `FK_civicrm_membership_type_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
+  ADD CONSTRAINT `FK_civicrm_membership_type_member_of_contact_id` FOREIGN KEY (`member_of_contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE RESTRICT,
+  ADD CONSTRAINT `FK_civicrm_membership_type_financial_type_id` FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`);
+ALTER TABLE `civicrm_pcp`
+  ADD CONSTRAINT `FK_civicrm_pcp_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_pcp_block`
+  ADD CONSTRAINT `FK_civicrm_pcp_block_supporter_profile_id` FOREIGN KEY (`supporter_profile_id`) REFERENCES `civicrm_uf_group`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_pledge`
+  ADD CONSTRAINT `FK_civicrm_pledge_contact_id` FOREIGN KEY (`contact_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_pledge_financial_type_id` FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`),
+  ADD CONSTRAINT `FK_civicrm_pledge_contribution_page_id` FOREIGN KEY (`contribution_page_id`) REFERENCES `civicrm_contribution_page`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_pledge_campaign_id` FOREIGN KEY (`campaign_id`) REFERENCES `civicrm_campaign`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_pledge_payment`
+  ADD CONSTRAINT `FK_civicrm_pledge_payment_pledge_id` FOREIGN KEY (`pledge_id`) REFERENCES `civicrm_pledge`(`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `FK_civicrm_pledge_payment_contribution_id` FOREIGN KEY (`contribution_id`) REFERENCES `civicrm_contribution`(`id`) ON DELETE CASCADE;
+ALTER TABLE `civicrm_line_item`
+  ADD CONSTRAINT `FK_civicrm_line_item_contribution_id` FOREIGN KEY (`contribution_id`) REFERENCES `civicrm_contribution`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_line_item_price_field_id` FOREIGN KEY (`price_field_id`) REFERENCES `civicrm_price_field`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_line_item_price_field_value_id` FOREIGN KEY (`price_field_value_id`) REFERENCES `civicrm_price_field_value`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_line_item_financial_type_id` FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_price_field`
+  ADD CONSTRAINT `FK_civicrm_price_field_price_set_id` FOREIGN KEY (`price_set_id`) REFERENCES `civicrm_price_set`(`id`);
+ALTER TABLE `civicrm_price_field_value`
+  ADD CONSTRAINT `FK_civicrm_price_field_value_price_field_id` FOREIGN KEY (`price_field_id`) REFERENCES `civicrm_price_field`(`id`),
+  ADD CONSTRAINT `FK_civicrm_price_field_value_membership_type_id` FOREIGN KEY (`membership_type_id`) REFERENCES `civicrm_membership_type`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_price_field_value_financial_type_id` FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_price_set`
+  ADD CONSTRAINT `FK_civicrm_price_set_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
+  ADD CONSTRAINT `FK_civicrm_price_set_financial_type_id` FOREIGN KEY (`financial_type_id`) REFERENCES `civicrm_financial_type`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_price_set_entity`
+  ADD CONSTRAINT `FK_civicrm_price_set_entity_price_set_id` FOREIGN KEY (`price_set_id`) REFERENCES `civicrm_price_set`(`id`);
+ALTER TABLE `civicrm_report_instance`
+  ADD CONSTRAINT `FK_civicrm_report_instance_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`),
+  ADD CONSTRAINT `FK_civicrm_report_instance_created_id` FOREIGN KEY (`created_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_report_instance_owner_id` FOREIGN KEY (`owner_id`) REFERENCES `civicrm_contact`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_report_instance_navigation_id` FOREIGN KEY (`navigation_id`) REFERENCES `civicrm_navigation`(`id`) ON DELETE SET NULL,
+  ADD CONSTRAINT `FK_civicrm_report_instance_drilldown_id` FOREIGN KEY (`drilldown_id`) REFERENCES `civicrm_report_instance`(`id`) ON DELETE SET NULL;
+ALTER TABLE `civicrm_sms_provider`
+  ADD CONSTRAINT `FK_civicrm_sms_provider_domain_id` FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`) ON DELETE SET NULL;
diff --git a/www/modules/civicrm/sql/civicrm_data.mysql b/www/modules/civicrm/sql/civicrm_data.mysql
index c0a43c2f9..bb291161a 100644
--- a/www/modules/civicrm/sql/civicrm_data.mysql
+++ b/www/modules/civicrm/sql/civicrm_data.mysql
@@ -277,6 +277,7 @@ INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated
 INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1251", "Kosovo", "XK", "1", "0");
 INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1252", "Saint Barthélemy", "BL", "2", "0");
 INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1253", "Saint Martin (French part)", "MF", "2", "0");
+
 -- +--------------------------------------------------------------------+
 -- | Copyright CiviCRM LLC. All rights reserved.                        |
 -- |                                                                    |
@@ -4369,6 +4370,7 @@ INSERT INTO civicrm_state_province (country_id, abbreviation, name) VALUES
 (1016, "14", "Al Janūbīyah"),
 (1016, "16", "Al Wusţá"),
 (1016, "17", "Ash Sham�līyah");
+
 -- +--------------------------------------------------------------------+
 -- | Copyright CiviCRM LLC. All rights reserved.                        |
 -- |                                                                    |
@@ -4556,6 +4558,7 @@ INSERT INTO civicrm_currency (id, name, symbol, numeric_code, full_name) VALUES
 (183, "YER",  "ï·¼", "886", "Yemeni Rial"),
 (184, "ZMK", NULL, "894", "Zambian Kwacha"),
 (185, "ZWD", "Z$", "716", "Zimbabwe Dollar");
+
 -- +--------------------------------------------------------------------+
 -- | Copyright CiviCRM LLC. All rights reserved.                        |
 -- |                                                                    |
@@ -6210,6 +6213,7 @@ VALUES
   (@option_group_id_languages, 0, 0, 'yo_NG', 'yo', 'Yoruba', @counter := @counter + 1),
   (@option_group_id_languages, 0, 0, 'za_CN', 'za', 'Zhuang, Chuang', @counter := @counter + 1),
   (@option_group_id_languages, 0, 0, 'zu_ZA', 'zu', 'Zulu', @counter := @counter + 1);
+
 INSERT INTO civicrm_option_group (`description`,`is_active`,`is_reserved`,`name`,`option_value_fields`,`title`) VALUES
 ("Encounter medium for case activities (e.g. In Person, By Phone, etc.)","1","1","encounter_medium","name,label,description","Encounter Medium")
 ;
@@ -6818,47 +6822,7 @@ INSERT INTO civicrm_option_group
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Cases - Send Copy of an Activity', '{if !empty($idHash)}[case #{$idHash}]{/if} {$activitySubject}
-', '===========================================================
-{ts}Activity Summary{/ts} - {$activityTypeName}
-===========================================================
-{if !empty($isCaseActivity)}
-{ts}Your Case Role(s){/ts} : {$contact.role|default:\'\'}
-{if !empty($manageCaseURL)}
-{ts}Manage Case{/ts} : {$manageCaseURL}
-{/if}
-{/if}
-
-{if !empty($editActURL)}
-{ts}Edit activity{/ts} : {$editActURL}
-{/if}
-{if !empty($viewActURL)}
-{ts}View activity{/ts} : {$viewActURL}
-{/if}
-
-{foreach from=$activity.fields item=field}
-{if $field.type eq \'Date\'}
-{$field.label} : {$field.value|crmDate:$config->dateformatDatetime}
-{else}
-{$field.label} : {$field.value}
-{/if}
-{/foreach}
-
-{if !empty($activity.customGroups)}
-{foreach from=$activity.customGroups key=customGroupName item=customGroup}
-==========================================================
-{$customGroupName}
-==========================================================
-{foreach from=$customGroup item=field}
-{if $field.type eq \'Date\'}
-{$field.label} : {$field.value|crmDate:$config->dateformatDatetime}
-{else}
-{$field.label} : {$field.value}
-{/if}
-{/foreach}
-
-{/foreach}
-{/if}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -6883,7 +6847,7 @@ INSERT INTO civicrm_option_group
           <table style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;">
             <tr>
               <th {$headerStyle}>
-                {ts}Activity Summary{/ts} - {$activityTypeName}
+                {ts}Activity Summary{/ts} - {activity.activity_type_id:label}
               </th>
             </tr>
             {if !empty($isCaseActivity)}
@@ -6967,47 +6931,7 @@ INSERT INTO civicrm_option_group
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Cases - Send Copy of an Activity', '{if !empty($idHash)}[case #{$idHash}]{/if} {$activitySubject}
-', '===========================================================
-{ts}Activity Summary{/ts} - {$activityTypeName}
-===========================================================
-{if !empty($isCaseActivity)}
-{ts}Your Case Role(s){/ts} : {$contact.role|default:\'\'}
-{if !empty($manageCaseURL)}
-{ts}Manage Case{/ts} : {$manageCaseURL}
-{/if}
-{/if}
-
-{if !empty($editActURL)}
-{ts}Edit activity{/ts} : {$editActURL}
-{/if}
-{if !empty($viewActURL)}
-{ts}View activity{/ts} : {$viewActURL}
-{/if}
-
-{foreach from=$activity.fields item=field}
-{if $field.type eq \'Date\'}
-{$field.label} : {$field.value|crmDate:$config->dateformatDatetime}
-{else}
-{$field.label} : {$field.value}
-{/if}
-{/foreach}
-
-{if !empty($activity.customGroups)}
-{foreach from=$activity.customGroups key=customGroupName item=customGroup}
-==========================================================
-{$customGroupName}
-==========================================================
-{foreach from=$customGroup item=field}
-{if $field.type eq \'Date\'}
-{$field.label} : {$field.value|crmDate:$config->dateformatDatetime}
-{else}
-{$field.label} : {$field.value}
-{/if}
-{/foreach}
-
-{/foreach}
-{/if}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -7032,7 +6956,7 @@ INSERT INTO civicrm_option_group
           <table style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;">
             <tr>
               <th {$headerStyle}>
-                {ts}Activity Summary{/ts} - {$activityTypeName}
+                {ts}Activity Summary{/ts} - {activity.activity_type_id:label}
               </th>
             </tr>
             {if !empty($isCaseActivity)}
@@ -7120,24 +7044,7 @@ INSERT INTO civicrm_option_group
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Contributions - Duplicate Organization Alert', '{ts}CiviContribute Alert: Possible Duplicate Contact Record{/ts} - {contact.display_name}
-', '{ts}A contribution / membership signup was made on behalf of the organization listed below.{/ts}
-{ts}The information provided matched multiple existing database records based on the configured Duplicate Matching Rules for your site.{/ts}
-
-{ts}Organization Name{/ts}: {$onBehalfName}
-{ts}Organization Email{/ts}: {$onBehalfEmail}
-{ts}Organization Contact ID{/ts}: {$onBehalfID}
-
-{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}
-
-{if $receiptMessage}
-###########################################################
-{ts}Copy of Contribution Receipt{/ts}
-
-###########################################################
-{$receiptMessage}
-
-{/if}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -7226,24 +7133,7 @@ INSERT INTO civicrm_option_group
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Contributions - Duplicate Organization Alert', '{ts}CiviContribute Alert: Possible Duplicate Contact Record{/ts} - {contact.display_name}
-', '{ts}A contribution / membership signup was made on behalf of the organization listed below.{/ts}
-{ts}The information provided matched multiple existing database records based on the configured Duplicate Matching Rules for your site.{/ts}
-
-{ts}Organization Name{/ts}: {$onBehalfName}
-{ts}Organization Email{/ts}: {$onBehalfEmail}
-{ts}Organization Contact ID{/ts}: {$onBehalfID}
-
-{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}
-
-{if $receiptMessage}
-###########################################################
-{ts}Copy of Contribution Receipt{/ts}
-
-###########################################################
-{$receiptMessage}
-
-{/if}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -7336,122 +7226,7 @@ INSERT INTO civicrm_option_group
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Contributions - Receipt (off-line)', '{ts}Contribution Receipt{/ts} - {contact.display_name}
-', '{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{if {contribution.contribution_page_id.receipt_text|boolean}}
-{contribution.contribution_page_id.receipt_text}
-{elseif {contribution.paid_amount|boolean}} {ts}Below you will find a receipt for this contribution.{/ts}
-{/if}
-
-===========================================================
-{ts}Contribution Information{/ts}
-
-===========================================================
-{ts}Contributor{/ts}: {contact.display_name}
-{if \'{contribution.financial_type_id}\'}
-{ts}Financial Type{/ts}: {contribution.financial_type_id:label}
-{/if}
-{if $isShowLineItems}
----------------------------------------------------------
-{capture assign=ts_item}{ts}Item{/ts}{/capture}
-{capture assign=ts_qty}{ts}Qty{/ts}{/capture}
-{capture assign=ts_each}{ts}Each{/ts}{/capture}
-{if $isShowTax && {contribution.tax_amount|boolean}}
-{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}
-{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}
-{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}
-{/if}
-{capture assign=ts_total}{ts}Total{/ts}{/capture}
-{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $isShowTax && {contribution.tax_amount|boolean}} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"}
-----------------------------------------------------------
-{foreach from=$lineItems item=line}
-{capture assign=ts_item}{$line.title}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.qty|string_format:"%5s"} {$line.unit_price|crmMoney:\'{contribution.currency}\'|string_format:"%10s"} {if $isShowTax && {contribution.tax_amount|boolean}}{$line.line_total|crmMoney:\'{contribution.currency}\'|string_format:"%10s"} {if $line.tax_rate || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} %   {$line.tax_amount|crmMoney:\'{contribution.currency}\'|string_format:"%10s"} {else}                  {/if} {/if}   {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'|string_format:"%10s"}
-{/foreach}
-{/if}
-
-
-{if $isShowTax && {contribution.tax_amount|boolean}}
-{ts}Amount before Tax{/ts} : {contribution.tax_exclusive_amount}
-{/if}
-{foreach from=$taxRateBreakdown item=taxDetail key=taxRate}
-{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if} : {$taxDetail.amount|crmMoney:\'{contribution.currency}\'}
-{/foreach}
-
-{if $isShowTax}
-{ts}Total Tax Amount{/ts} : {contribution.tax_amount}
-{/if}
-{ts}Total Amount{/ts} : {contribution.total_amount}
-{if \'{contribution.receive_date}\'}
-{ts}Contribution Date{/ts}: {contribution.receive_date|crmDate:"shortdate"}
-{/if}
-{if \'{contribution.receipt_date}\'}
-{ts}Receipt Date{/ts}: {contribution.receipt_date|crmDate:"shortdate"}
-{/if}
-{if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}
-{ts}Paid By{/ts}: {contribution.payment_instrument_id:label}
-{if \'{contribution.check_number}\'}
-{ts}Check Number{/ts}: {contribution.check_number}
-{/if}
-{/if}
-{if \'{contribution.trxn_id}\'}
-{ts}Transaction ID{/ts}: {contribution.trxn_id}
-{/if}
-
-{if !empty($ccContribution)}
-===========================================================
-{ts}Billing Name and Address{/ts}
-
-===========================================================
-{$billingName}
-{$address}
-
-===========================================================
-{ts}Credit Card Information{/ts}
-
-===========================================================
-{$credit_card_type}
-{$credit_card_number}
-{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}
-{/if}
-{if !empty($customGroup)}
-{foreach from=$customGroup item=value key=customName}
-===========================================================
-{$customName}
-===========================================================
-{foreach from=$value item=v key=n}
-{$n}: {$v}
-{/foreach}
-{/foreach}
-{/if}
-
-{if !empty($softCreditTypes) and !empty($softCredits)}
-{foreach from=$softCreditTypes item=softCreditType key=n}
-===========================================================
-{$softCreditType}
-===========================================================
-{foreach from=$softCredits.$n item=value key=label}
-{$label}: {$value}
-{/foreach}
-{/foreach}
-{/if}
-
-{if !empty($formValues.product_name)}
-===========================================================
-{ts}Premium Information{/ts}
-
-===========================================================
-{$formValues.product_name}
-{if $formValues.product_option}
-{ts}Option{/ts}: {$formValues.product_option}
-{/if}
-{if $formValues.product_sku}
-{ts}SKU{/ts}: {$formValues.product_sku}
-{/if}
-{if !empty($fulfilled_date)}
-{ts}Sent{/ts}: {$fulfilled_date|crmDate}
-{/if}
-{/if}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -7774,122 +7549,7 @@ INSERT INTO civicrm_option_group
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Contributions - Receipt (off-line)', '{ts}Contribution Receipt{/ts} - {contact.display_name}
-', '{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{if {contribution.contribution_page_id.receipt_text|boolean}}
-{contribution.contribution_page_id.receipt_text}
-{elseif {contribution.paid_amount|boolean}} {ts}Below you will find a receipt for this contribution.{/ts}
-{/if}
-
-===========================================================
-{ts}Contribution Information{/ts}
-
-===========================================================
-{ts}Contributor{/ts}: {contact.display_name}
-{if \'{contribution.financial_type_id}\'}
-{ts}Financial Type{/ts}: {contribution.financial_type_id:label}
-{/if}
-{if $isShowLineItems}
----------------------------------------------------------
-{capture assign=ts_item}{ts}Item{/ts}{/capture}
-{capture assign=ts_qty}{ts}Qty{/ts}{/capture}
-{capture assign=ts_each}{ts}Each{/ts}{/capture}
-{if $isShowTax && {contribution.tax_amount|boolean}}
-{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}
-{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}
-{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}
-{/if}
-{capture assign=ts_total}{ts}Total{/ts}{/capture}
-{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $isShowTax && {contribution.tax_amount|boolean}} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"}
-----------------------------------------------------------
-{foreach from=$lineItems item=line}
-{capture assign=ts_item}{$line.title}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.qty|string_format:"%5s"} {$line.unit_price|crmMoney:\'{contribution.currency}\'|string_format:"%10s"} {if $isShowTax && {contribution.tax_amount|boolean}}{$line.line_total|crmMoney:\'{contribution.currency}\'|string_format:"%10s"} {if $line.tax_rate || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} %   {$line.tax_amount|crmMoney:\'{contribution.currency}\'|string_format:"%10s"} {else}                  {/if} {/if}   {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'|string_format:"%10s"}
-{/foreach}
-{/if}
-
-
-{if $isShowTax && {contribution.tax_amount|boolean}}
-{ts}Amount before Tax{/ts} : {contribution.tax_exclusive_amount}
-{/if}
-{foreach from=$taxRateBreakdown item=taxDetail key=taxRate}
-{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if} : {$taxDetail.amount|crmMoney:\'{contribution.currency}\'}
-{/foreach}
-
-{if $isShowTax}
-{ts}Total Tax Amount{/ts} : {contribution.tax_amount}
-{/if}
-{ts}Total Amount{/ts} : {contribution.total_amount}
-{if \'{contribution.receive_date}\'}
-{ts}Contribution Date{/ts}: {contribution.receive_date|crmDate:"shortdate"}
-{/if}
-{if \'{contribution.receipt_date}\'}
-{ts}Receipt Date{/ts}: {contribution.receipt_date|crmDate:"shortdate"}
-{/if}
-{if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}
-{ts}Paid By{/ts}: {contribution.payment_instrument_id:label}
-{if \'{contribution.check_number}\'}
-{ts}Check Number{/ts}: {contribution.check_number}
-{/if}
-{/if}
-{if \'{contribution.trxn_id}\'}
-{ts}Transaction ID{/ts}: {contribution.trxn_id}
-{/if}
-
-{if !empty($ccContribution)}
-===========================================================
-{ts}Billing Name and Address{/ts}
-
-===========================================================
-{$billingName}
-{$address}
-
-===========================================================
-{ts}Credit Card Information{/ts}
-
-===========================================================
-{$credit_card_type}
-{$credit_card_number}
-{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}
-{/if}
-{if !empty($customGroup)}
-{foreach from=$customGroup item=value key=customName}
-===========================================================
-{$customName}
-===========================================================
-{foreach from=$value item=v key=n}
-{$n}: {$v}
-{/foreach}
-{/foreach}
-{/if}
-
-{if !empty($softCreditTypes) and !empty($softCredits)}
-{foreach from=$softCreditTypes item=softCreditType key=n}
-===========================================================
-{$softCreditType}
-===========================================================
-{foreach from=$softCredits.$n item=value key=label}
-{$label}: {$value}
-{/foreach}
-{/foreach}
-{/if}
-
-{if !empty($formValues.product_name)}
-===========================================================
-{ts}Premium Information{/ts}
-
-===========================================================
-{$formValues.product_name}
-{if $formValues.product_option}
-{ts}Option{/ts}: {$formValues.product_option}
-{/if}
-{if $formValues.product_sku}
-{ts}SKU{/ts}: {$formValues.product_sku}
-{/if}
-{if !empty($fulfilled_date)}
-{ts}Sent{/ts}: {$fulfilled_date|crmDate}
-{/if}
-{/if}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -9131,8 +8791,7 @@ INSERT INTO civicrm_option_group
   {ts}Invoice{/ts}
 {/if}
  - {contact.display_name}
-', '{ts}Contribution Invoice{/ts}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -9160,14 +8819,14 @@ INSERT INTO civicrm_option_group
       </tr>
       <tr>
         <td><font size="1" align="center">{contact.display_name}{if \'{contact.current_employer}\'} ({contact.current_employer}){/if}</font></td>
-        <td><font size="1" align="right">{$invoice_date}</font></td>
+        <td><font size="1" align="right">{contribution.receive_date|crmDate:"Full"}</font></td>
         <td style="white-space: nowrap"><font size="1" align="right">
           {domain.street_address}
           {domain.supplemental_address_1}
         </font></td>
       </tr>
       <tr>
-        <td><font size="1" align="center">{$street_address} {$supplemental_address_1}</font></td>
+        <td><font size="1" align="center">{contact.address_billing.street_address} {contact.address_billing.supplemental_address_1}</font></td>
         <td><b><font size="1" align="right">{ts}Invoice Number:{/ts}</font></b></td>
         <td><font size="1" align="right">
           {domain.supplemental_address_2}
@@ -9175,7 +8834,7 @@ INSERT INTO civicrm_option_group
         </font></td>
       </tr>
       <tr>
-        <td><font size="1" align="center">{$supplemental_address_2} {$stateProvinceAbbreviation}</font></td>
+        <td><font size="1" align="center">{contact.address_billing.supplemental_address_2} {contact.address_billing.state_province_id:abbr}</font></td>
         <td><font size="1" align="right">{contribution.invoice_number}</font></td>
         <td style="white-space: nowrap"><font size="1" align="right">
           {domain.city}
@@ -9183,12 +8842,12 @@ INSERT INTO civicrm_option_group
         </font></td>
       </tr>
       <tr>
-        <td><font size="1" align="right">{$city}  {$postal_code}</font></td>
+        <td><font size="1" align="right">{contact.address_billing.city}  {contact.address_billing.postal_code}</font></td>
         <td height="10"><b><font size="1" align="right">{ts}Reference:{/ts}</font></b></td>
         <td><font size="1" align="right">{domain.country_id:label}</font></td>
       </tr>
       <tr>
-        <td><font size="1" align="right"> {$country}</font></td>
+        <td><font size="1" align="right"> {contact.address_billing.country_id:label}</font></td>
         <td><font size="1" align="right">{contribution.source}</font></td>
         <td valign="top" style="white-space: nowrap"><font size="1" align="right">{domain.email}</font> </td>
       </tr>
@@ -9205,7 +8864,7 @@ INSERT INTO civicrm_option_group
         <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{ts}Quantity{/ts}</font></th>
         <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{ts}Unit Price{/ts}</font></th>
         <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{domain.tax_term}</font></th>
-        <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{ts 1=$currency}Amount %1{/ts}</font></th>
+        <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{ts 1=\'{contribution.currency}\'}Amount %1{/ts}</font></th>
       </tr>
       {foreach from=$lineItems item=line}
         <tr>
@@ -9225,7 +8884,7 @@ INSERT INTO civicrm_option_group
       <tr>
         <td colspan="3"></td>
         <td style="text-align:right;"><font size="1">{ts}Sub Total{/ts}</font></td>
-        <td style="text-align:right;"><font size="1">{$subTotal|crmMoney:$currency}</font></td>
+        <td style="text-align:right;"><font size="1">{contribution.tax_exclusive_amount}</font></td>
       </tr>
       {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}
         {if $taxRate != 0}
@@ -9238,8 +8897,8 @@ INSERT INTO civicrm_option_group
       {/foreach}
       <tr>
         <td colspan="3"></td>
-        <td style="text-align:right;white-space: nowrap"><b><font size="1">{ts 1=$currency}TOTAL %1{/ts}</font></b></td>
-        <td style="text-align:right;"><font size="1">{$amount|crmMoney:$currency}</font></td>
+        <td style="text-align:right;white-space: nowrap"><b><font size="1">{ts 1=\'{contribution.currency}\'}TOTAL %1{/ts}</font></b></td>
+        <td style="text-align:right;"><font size="1">{contribution.total_amount}</font></td>
       </tr>
       <tr>
         <td colspan="3"></td>
@@ -9250,7 +8909,7 @@ INSERT INTO civicrm_option_group
             {ts}Amount Paid{/ts}
           {/if}
         </font></td>
-        <td style="text-align:right;"><font size="1">{$amountPaid|crmMoney:$currency}</font></td>
+        <td style="text-align:right;"><font size="1">{contribution.paid_amount}</font></td>
       </tr>
       <tr>
         <td colspan="3"></td>
@@ -9259,7 +8918,7 @@ INSERT INTO civicrm_option_group
       <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>
+        <td style="text-align:right;"><b><font size="1">{contribution.balance_amount}</font></b></td>
       </tr>
       <tr>
         <td colspan="5"></td>
@@ -9304,15 +8963,15 @@ INSERT INTO civicrm_option_group
                 <td><font size="1" align="right">{contribution.invoice_number}</font></td>
               </tr>
               <tr><td colspan="5" style="color:#F5F5F5;"><hr></td></tr>
-              {if $is_pay_later == 1}
+              {if {contribution.is_pay_later|boolean}}
                 <tr>
                   <td><font size="1" align="right" style="font-weight:bold;">{ts}Amount Due:{/ts}</font></td>
-                  <td><font size="1" align="right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td>
+                  <td><font size="1" align="right" style="font-weight:bold;">{contribution.total_amount}</font></td>
                 </tr>
               {else}
                 <tr>
                   <td><font size="1" align="right" style="font-weight:bold;">{ts}Amount Due:{/ts}</font></td>
-                  <td><font size="1" align="right" style="font-weight:bold;">{$amountDue|crmMoney:$currency}</font></td>
+                  <td><font size="1" align="right" style="font-weight:bold;">{contribution.paid_amount}</font></td>
                 </tr>
               {/if}
               <tr>
@@ -9345,14 +9004,14 @@ INSERT INTO civicrm_option_group
       </tr>
       <tr>
         <td style="padding-left:17px;"><font size="1" align="center">{contact.display_name}{if \'{contact.current_employer}\'} ({contact.current_employer}){/if}</font></td>
-        <td style="padding-left:30px;"><font size="1" align="right">{$invoice_date}</font></td>
+        <td style="padding-left:30px;"><font size="1" align="right">{contribution.receive_date|crmDate:"Full"}</font></td>
         <td><font size="1" align="right">
           {domain.street_address}
           {domain.supplemental_address_1}
          </font></td>
       </tr>
       <tr>
-        <td style="padding-left:17px;"><font size="1" align="center">{$street_address}   {$supplemental_address_1}</font></td>
+        <td style="padding-left:17px;"><font size="1" align="center">{contact.address_billing.street_address}   {contact.address_billing.supplemental_address_1}</font></td>
         <td style="padding-left:30px;"><b><font size="1" align="right">{ts}Credit Note Number:{/ts}</font></b></td>
         <td><font size="1" align="right">
           {domain.supplemental_address_2}
@@ -9360,7 +9019,7 @@ INSERT INTO civicrm_option_group
         </font></td>
       </tr>
       <tr>
-        <td style="padding-left:17px;"><font size="1" align="center">{$supplemental_address_2}  {$stateProvinceAbbreviation}</font></td>
+        <td style="padding-left:17px;"><font size="1" align="center">{contact.address_billing.supplemental_address_2} {contact.address_billing.state_province_id:abbr}</font></td>
         <td style="padding-left:30px;"><font size="1" align="right">{contribution.creditnote_id}</font></td>
         <td><font size="1" align="right">
           {domain.city}
@@ -9368,7 +9027,7 @@ INSERT INTO civicrm_option_group
         </font></td>
       </tr>
       <tr>
-        <td style="padding-left:17px;"><font size="1" align="right">{$city}  {$postal_code}</font></td>
+        <td style="padding-left:17px;"><font size="1" align="right">{contact.address_billing.city}  {contact.address_billing.postal_code}</font></td>
         <td height="10" style="padding-left:30px;"><b><font size="1" align="right">{ts}Reference:{/ts}</font></b></td>
         <td><font size="1" align="right">
           {domain.country_id:label}
@@ -9399,7 +9058,7 @@ INSERT INTO civicrm_option_group
               <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{ts}Quantity{/ts}</font></th>
               <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{ts}Unit Price{/ts}</font></th>
               <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{domain.tax_term}</font></th>
-              <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{ts 1=$currency}Amount %1{/ts}</font></th>
+              <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{ts 1="{contribution.currency}"}Amount %1{/ts}</font></th>
             </tr>
             {foreach from=$lineItems item=line key=index}
               <tr><td colspan="5"><hr {if $index == 0}size="3" style="color:#000;"{else}style="color:#F5F5F5;"{/if}></hr></td></tr>
@@ -9408,7 +9067,7 @@ INSERT INTO civicrm_option_group
                   {$line.title}
                 </font></td>
                 <td style="padding-left:28px;text-align:right;"><font size="1">{$line.qty}</font></td>
-                <td style="padding-left:28px;text-align:right;"><font size="1">{$line.unit_price|crmMoney:$currency}</font></td>
+                <td style="padding-left:28px;text-align:right;"><font size="1">{$line.unit_price|crmMoney:\'{contribution.currency}\'}</font></td>
                 {if $line.tax_amount != \'\'}
                   <td style="padding-left:28px;text-align:right;"><font size="1">{if $line.tax_rate}{$line.tax_rate|crmNumberFormat}%{/if}</font></td>
                 {else}
@@ -9421,7 +9080,7 @@ INSERT INTO civicrm_option_group
             <tr>
               <td colspan="3"></td>
               <td style="padding-left:28px;text-align:right;"><font size="1">{ts}Sub Total{/ts}</font></td>
-              <td style="padding-left:28px;text-align:right;"><font size="1">{$subTotal|crmMoney:$currency}</font></td>
+              <td style="padding-left:28px;text-align:right;"><font size="1">{contribution.tax_exclusive_amount}</font></td>
             </tr>
             {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}
                 {if $taxRate != 0}
@@ -9438,14 +9097,14 @@ INSERT INTO civicrm_option_group
             </tr>
             <tr>
               <td colspan="3"></td>
-              <td style="padding-left:28px;text-align:right;"><b><font size="1">{ts 1=$currency}TOTAL %1{/ts}</font></b></td>
-              <td style="padding-left:28px;text-align:right;"><font size="1">{$amount|crmMoney:$currency}</font></td>
+              <td style="padding-left:28px;text-align:right;"><b><font size="1">{ts 1=\'{contribution.currency}\'}TOTAL %1{/ts}</font></b></td>
+              <td style="padding-left:28px;text-align:right;"><font size="1">{contribution.total_amount}</font></td>
             </tr>
-            {if \'{contribution.is_pay_later}\' == 0}
+            {if !\'{contribution.is_pay_later|boolean}\'}
               <tr>
                 <td colspan="3"></td>
                 <td style="padding-left:28px;text-align:right;"><font size="1">{ts}LESS Credit to invoice(s){/ts}</font></td>
-                <td style="padding-left:28px;text-align:right;"><font size="1">{$amount|crmMoney:$currency}</font></td>
+                <td style="padding-left:28px;text-align:right;"><font size="1">{contribution.total_amount}</font></td>
               </tr>
               <tr>
                 <td colspan="3"></td>
@@ -9454,7 +9113,7 @@ INSERT INTO civicrm_option_group
               <tr>
                 <td colspan="3"></td>
                 <td style="padding-left:28px;text-align:right;"><b><font size="1">{ts}REMAINING CREDIT{/ts}</font></b></td>
-                <td style="padding-left:28px;text-align:right;"><b><font size="1">{$amountDue|crmMoney:$currency}</font></b></td>
+                <td style="padding-left:28px;text-align:right;"><b><font size="1">{contribution.balance_amount}</font></b></td>
                 <td style="padding-left:28px;"><font size="1" align="right"></font></td>
               </tr>
             {/if}
@@ -9496,7 +9155,7 @@ INSERT INTO civicrm_option_group
             <tr>
               <td colspan="2"></td>
               <td><font size="1" align="right" style="font-weight:bold;">{ts}Credit Amount:{/ts}</font></td>
-              <td width=\'50px\'><font size="1" align="right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td>
+              <td width=\'50px\'><font size="1" align="right" style="font-weight:bold;">{contribution.total_amount}</font></td>
             </tr>
           </table>
         </td>
@@ -9524,8 +9183,7 @@ INSERT INTO civicrm_option_group
   {ts}Invoice{/ts}
 {/if}
  - {contact.display_name}
-', '{ts}Contribution Invoice{/ts}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -9553,14 +9211,14 @@ INSERT INTO civicrm_option_group
       </tr>
       <tr>
         <td><font size="1" align="center">{contact.display_name}{if \'{contact.current_employer}\'} ({contact.current_employer}){/if}</font></td>
-        <td><font size="1" align="right">{$invoice_date}</font></td>
+        <td><font size="1" align="right">{contribution.receive_date|crmDate:"Full"}</font></td>
         <td style="white-space: nowrap"><font size="1" align="right">
           {domain.street_address}
           {domain.supplemental_address_1}
         </font></td>
       </tr>
       <tr>
-        <td><font size="1" align="center">{$street_address} {$supplemental_address_1}</font></td>
+        <td><font size="1" align="center">{contact.address_billing.street_address} {contact.address_billing.supplemental_address_1}</font></td>
         <td><b><font size="1" align="right">{ts}Invoice Number:{/ts}</font></b></td>
         <td><font size="1" align="right">
           {domain.supplemental_address_2}
@@ -9568,7 +9226,7 @@ INSERT INTO civicrm_option_group
         </font></td>
       </tr>
       <tr>
-        <td><font size="1" align="center">{$supplemental_address_2} {$stateProvinceAbbreviation}</font></td>
+        <td><font size="1" align="center">{contact.address_billing.supplemental_address_2} {contact.address_billing.state_province_id:abbr}</font></td>
         <td><font size="1" align="right">{contribution.invoice_number}</font></td>
         <td style="white-space: nowrap"><font size="1" align="right">
           {domain.city}
@@ -9576,12 +9234,12 @@ INSERT INTO civicrm_option_group
         </font></td>
       </tr>
       <tr>
-        <td><font size="1" align="right">{$city}  {$postal_code}</font></td>
+        <td><font size="1" align="right">{contact.address_billing.city}  {contact.address_billing.postal_code}</font></td>
         <td height="10"><b><font size="1" align="right">{ts}Reference:{/ts}</font></b></td>
         <td><font size="1" align="right">{domain.country_id:label}</font></td>
       </tr>
       <tr>
-        <td><font size="1" align="right"> {$country}</font></td>
+        <td><font size="1" align="right"> {contact.address_billing.country_id:label}</font></td>
         <td><font size="1" align="right">{contribution.source}</font></td>
         <td valign="top" style="white-space: nowrap"><font size="1" align="right">{domain.email}</font> </td>
       </tr>
@@ -9598,7 +9256,7 @@ INSERT INTO civicrm_option_group
         <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{ts}Quantity{/ts}</font></th>
         <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{ts}Unit Price{/ts}</font></th>
         <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{domain.tax_term}</font></th>
-        <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{ts 1=$currency}Amount %1{/ts}</font></th>
+        <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{ts 1=\'{contribution.currency}\'}Amount %1{/ts}</font></th>
       </tr>
       {foreach from=$lineItems item=line}
         <tr>
@@ -9618,7 +9276,7 @@ INSERT INTO civicrm_option_group
       <tr>
         <td colspan="3"></td>
         <td style="text-align:right;"><font size="1">{ts}Sub Total{/ts}</font></td>
-        <td style="text-align:right;"><font size="1">{$subTotal|crmMoney:$currency}</font></td>
+        <td style="text-align:right;"><font size="1">{contribution.tax_exclusive_amount}</font></td>
       </tr>
       {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}
         {if $taxRate != 0}
@@ -9631,8 +9289,8 @@ INSERT INTO civicrm_option_group
       {/foreach}
       <tr>
         <td colspan="3"></td>
-        <td style="text-align:right;white-space: nowrap"><b><font size="1">{ts 1=$currency}TOTAL %1{/ts}</font></b></td>
-        <td style="text-align:right;"><font size="1">{$amount|crmMoney:$currency}</font></td>
+        <td style="text-align:right;white-space: nowrap"><b><font size="1">{ts 1=\'{contribution.currency}\'}TOTAL %1{/ts}</font></b></td>
+        <td style="text-align:right;"><font size="1">{contribution.total_amount}</font></td>
       </tr>
       <tr>
         <td colspan="3"></td>
@@ -9643,7 +9301,7 @@ INSERT INTO civicrm_option_group
             {ts}Amount Paid{/ts}
           {/if}
         </font></td>
-        <td style="text-align:right;"><font size="1">{$amountPaid|crmMoney:$currency}</font></td>
+        <td style="text-align:right;"><font size="1">{contribution.paid_amount}</font></td>
       </tr>
       <tr>
         <td colspan="3"></td>
@@ -9652,7 +9310,7 @@ INSERT INTO civicrm_option_group
       <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>
+        <td style="text-align:right;"><b><font size="1">{contribution.balance_amount}</font></b></td>
       </tr>
       <tr>
         <td colspan="5"></td>
@@ -9697,15 +9355,15 @@ INSERT INTO civicrm_option_group
                 <td><font size="1" align="right">{contribution.invoice_number}</font></td>
               </tr>
               <tr><td colspan="5" style="color:#F5F5F5;"><hr></td></tr>
-              {if $is_pay_later == 1}
+              {if {contribution.is_pay_later|boolean}}
                 <tr>
                   <td><font size="1" align="right" style="font-weight:bold;">{ts}Amount Due:{/ts}</font></td>
-                  <td><font size="1" align="right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td>
+                  <td><font size="1" align="right" style="font-weight:bold;">{contribution.total_amount}</font></td>
                 </tr>
               {else}
                 <tr>
                   <td><font size="1" align="right" style="font-weight:bold;">{ts}Amount Due:{/ts}</font></td>
-                  <td><font size="1" align="right" style="font-weight:bold;">{$amountDue|crmMoney:$currency}</font></td>
+                  <td><font size="1" align="right" style="font-weight:bold;">{contribution.paid_amount}</font></td>
                 </tr>
               {/if}
               <tr>
@@ -9738,14 +9396,14 @@ INSERT INTO civicrm_option_group
       </tr>
       <tr>
         <td style="padding-left:17px;"><font size="1" align="center">{contact.display_name}{if \'{contact.current_employer}\'} ({contact.current_employer}){/if}</font></td>
-        <td style="padding-left:30px;"><font size="1" align="right">{$invoice_date}</font></td>
+        <td style="padding-left:30px;"><font size="1" align="right">{contribution.receive_date|crmDate:"Full"}</font></td>
         <td><font size="1" align="right">
           {domain.street_address}
           {domain.supplemental_address_1}
          </font></td>
       </tr>
       <tr>
-        <td style="padding-left:17px;"><font size="1" align="center">{$street_address}   {$supplemental_address_1}</font></td>
+        <td style="padding-left:17px;"><font size="1" align="center">{contact.address_billing.street_address}   {contact.address_billing.supplemental_address_1}</font></td>
         <td style="padding-left:30px;"><b><font size="1" align="right">{ts}Credit Note Number:{/ts}</font></b></td>
         <td><font size="1" align="right">
           {domain.supplemental_address_2}
@@ -9753,7 +9411,7 @@ INSERT INTO civicrm_option_group
         </font></td>
       </tr>
       <tr>
-        <td style="padding-left:17px;"><font size="1" align="center">{$supplemental_address_2}  {$stateProvinceAbbreviation}</font></td>
+        <td style="padding-left:17px;"><font size="1" align="center">{contact.address_billing.supplemental_address_2} {contact.address_billing.state_province_id:abbr}</font></td>
         <td style="padding-left:30px;"><font size="1" align="right">{contribution.creditnote_id}</font></td>
         <td><font size="1" align="right">
           {domain.city}
@@ -9761,7 +9419,7 @@ INSERT INTO civicrm_option_group
         </font></td>
       </tr>
       <tr>
-        <td style="padding-left:17px;"><font size="1" align="right">{$city}  {$postal_code}</font></td>
+        <td style="padding-left:17px;"><font size="1" align="right">{contact.address_billing.city}  {contact.address_billing.postal_code}</font></td>
         <td height="10" style="padding-left:30px;"><b><font size="1" align="right">{ts}Reference:{/ts}</font></b></td>
         <td><font size="1" align="right">
           {domain.country_id:label}
@@ -9792,7 +9450,7 @@ INSERT INTO civicrm_option_group
               <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{ts}Quantity{/ts}</font></th>
               <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{ts}Unit Price{/ts}</font></th>
               <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{domain.tax_term}</font></th>
-              <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{ts 1=$currency}Amount %1{/ts}</font></th>
+              <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{ts 1="{contribution.currency}"}Amount %1{/ts}</font></th>
             </tr>
             {foreach from=$lineItems item=line key=index}
               <tr><td colspan="5"><hr {if $index == 0}size="3" style="color:#000;"{else}style="color:#F5F5F5;"{/if}></hr></td></tr>
@@ -9801,7 +9459,7 @@ INSERT INTO civicrm_option_group
                   {$line.title}
                 </font></td>
                 <td style="padding-left:28px;text-align:right;"><font size="1">{$line.qty}</font></td>
-                <td style="padding-left:28px;text-align:right;"><font size="1">{$line.unit_price|crmMoney:$currency}</font></td>
+                <td style="padding-left:28px;text-align:right;"><font size="1">{$line.unit_price|crmMoney:\'{contribution.currency}\'}</font></td>
                 {if $line.tax_amount != \'\'}
                   <td style="padding-left:28px;text-align:right;"><font size="1">{if $line.tax_rate}{$line.tax_rate|crmNumberFormat}%{/if}</font></td>
                 {else}
@@ -9814,7 +9472,7 @@ INSERT INTO civicrm_option_group
             <tr>
               <td colspan="3"></td>
               <td style="padding-left:28px;text-align:right;"><font size="1">{ts}Sub Total{/ts}</font></td>
-              <td style="padding-left:28px;text-align:right;"><font size="1">{$subTotal|crmMoney:$currency}</font></td>
+              <td style="padding-left:28px;text-align:right;"><font size="1">{contribution.tax_exclusive_amount}</font></td>
             </tr>
             {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}
                 {if $taxRate != 0}
@@ -9831,14 +9489,14 @@ INSERT INTO civicrm_option_group
             </tr>
             <tr>
               <td colspan="3"></td>
-              <td style="padding-left:28px;text-align:right;"><b><font size="1">{ts 1=$currency}TOTAL %1{/ts}</font></b></td>
-              <td style="padding-left:28px;text-align:right;"><font size="1">{$amount|crmMoney:$currency}</font></td>
+              <td style="padding-left:28px;text-align:right;"><b><font size="1">{ts 1=\'{contribution.currency}\'}TOTAL %1{/ts}</font></b></td>
+              <td style="padding-left:28px;text-align:right;"><font size="1">{contribution.total_amount}</font></td>
             </tr>
-            {if \'{contribution.is_pay_later}\' == 0}
+            {if !\'{contribution.is_pay_later|boolean}\'}
               <tr>
                 <td colspan="3"></td>
                 <td style="padding-left:28px;text-align:right;"><font size="1">{ts}LESS Credit to invoice(s){/ts}</font></td>
-                <td style="padding-left:28px;text-align:right;"><font size="1">{$amount|crmMoney:$currency}</font></td>
+                <td style="padding-left:28px;text-align:right;"><font size="1">{contribution.total_amount}</font></td>
               </tr>
               <tr>
                 <td colspan="3"></td>
@@ -9847,7 +9505,7 @@ INSERT INTO civicrm_option_group
               <tr>
                 <td colspan="3"></td>
                 <td style="padding-left:28px;text-align:right;"><b><font size="1">{ts}REMAINING CREDIT{/ts}</font></b></td>
-                <td style="padding-left:28px;text-align:right;"><b><font size="1">{$amountDue|crmMoney:$currency}</font></b></td>
+                <td style="padding-left:28px;text-align:right;"><b><font size="1">{contribution.balance_amount}</font></b></td>
                 <td style="padding-left:28px;"><font size="1" align="right"></font></td>
               </tr>
             {/if}
@@ -9889,7 +9547,7 @@ INSERT INTO civicrm_option_group
             <tr>
               <td colspan="2"></td>
               <td><font size="1" align="right" style="font-weight:bold;">{ts}Credit Amount:{/ts}</font></td>
-              <td width=\'50px\'><font size="1" align="right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td>
+              <td width=\'50px\'><font size="1" align="right" style="font-weight:bold;">{contribution.total_amount}</font></td>
             </tr>
           </table>
         </td>
@@ -10412,15 +10070,7 @@ INSERT INTO civicrm_option_group
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Contributions - Recurring Updates', '{ts}Recurring Contribution Update Notification{/ts} - {contact.display_name}
-', '{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{ts}Your recurring contribution has been updated as requested:{/ts}
-
-{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}
-
-{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10460,15 +10110,7 @@ INSERT INTO civicrm_option_group
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Contributions - Recurring Updates', '{ts}Recurring Contribution Update Notification{/ts} - {contact.display_name}
-', '{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{ts}Your recurring contribution has been updated as requested:{/ts}
-
-{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}
-
-{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -11052,29 +10694,7 @@ INSERT INTO civicrm_option_group
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Personal Campaign Pages - Owner Notification', '{ts}Someone has just donated to your personal campaign page{/ts} - {contact.display_name}
-', '===========================================================
-{ts}Personal Campaign Page Owner Notification{/ts}
-
-===========================================================
-{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{ts}You have received a donation at your personal page{/ts}: {$page_title}
->> {$pcpInfoURL}
-
-{ts}Your fundraising total has been updated.{/ts}
-{ts}The donor\'s information is listed below.  You can choose to contact them and convey your thanks if you wish.{/ts}
-{if $is_honor_roll_enabled}
-    {ts}The donor\'s name has been added to your honor roll unless they asked not to be included.{/ts}
-{/if}
-
-{ts}Contribution Date{/ts}: {$receive_date|crmDate}
-
-{ts}Amount{/ts}: {$total_amount|crmMoney:$currency}
-
-{ts}Name{/ts}: {$donors_display_name}
-
-{ts}Email{/ts}: {$donors_email}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -11108,29 +10728,7 @@ INSERT INTO civicrm_option_group
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Personal Campaign Pages - Owner Notification', '{ts}Someone has just donated to your personal campaign page{/ts} - {contact.display_name}
-', '===========================================================
-{ts}Personal Campaign Page Owner Notification{/ts}
-
-===========================================================
-{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{ts}You have received a donation at your personal page{/ts}: {$page_title}
->> {$pcpInfoURL}
-
-{ts}Your fundraising total has been updated.{/ts}
-{ts}The donor\'s information is listed below.  You can choose to contact them and convey your thanks if you wish.{/ts}
-{if $is_honor_roll_enabled}
-    {ts}The donor\'s name has been added to your honor roll unless they asked not to be included.{/ts}
-{/if}
-
-{ts}Contribution Date{/ts}: {$receive_date|crmDate}
-
-{ts}Amount{/ts}: {$total_amount|crmMoney:$currency}
-
-{ts}Name{/ts}: {$donors_display_name}
-
-{ts}Email{/ts}: {$donors_email}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -12641,9 +12239,9 @@ INSERT INTO civicrm_option_group
         <p>{event.confirm_email_text}</p>
       {else}
         <p>{ts}Thank you for your registration.{/ts}
-            {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}
+            {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}
             {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}
+              {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}
@@ -12963,7 +12561,7 @@ INSERT INTO civicrm_option_group
                     {ts}Transaction #{/ts}
                   </td>
                   <td {$valueStyle}>
-                    {contribution.trxn_id|boolean}
+                    {contribution.trxn_id}
                   </td>
                 </tr>
               {/if}
@@ -13122,9 +12720,9 @@ INSERT INTO civicrm_option_group
         <p>{event.confirm_email_text}</p>
       {else}
         <p>{ts}Thank you for your registration.{/ts}
-            {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}
+            {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}
             {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}
+              {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}
@@ -13444,7 +13042,7 @@ INSERT INTO civicrm_option_group
                     {ts}Transaction #{/ts}
                   </td>
                   <td {$valueStyle}>
-                    {contribution.trxn_id|boolean}
+                    {contribution.trxn_id}
                   </td>
                 </tr>
               {/if}
@@ -13990,71 +13588,72 @@ INSERT INTO civicrm_option_group
        {participant.role_id:label}
       </td>
      </tr>
+    {if {event.is_show_location|boolean}}
+        <tr>
+          <td colspan="2" {$valueStyle}>
+            {event.location}
+          </td>
+        </tr>
+      {/if}
+
+    {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}
+        <tr>
+          <td colspan="2" {$labelStyle}>
+            {ts}Event Contacts:{/ts}
+          </td>
+        </tr>
 
-    {if !empty($isShowLocation)}
+        {if {event.loc_block_id.phone_id.phone|boolean}}
           <tr>
-            <td colspan="2" {$valueStyle}>
-                {event.location}
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+        {if {event.loc_block_id.phone_2_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_2_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}
             </td>
           </tr>
         {/if}
 
-    {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}
+        {if {event.loc_block_id.email_id.email|boolean}}
           <tr>
-            <td colspan="2" {$labelStyle}>
-                {ts}Event Contacts:{/ts}
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_id.email}
             </td>
           </tr>
+        {/if}
 
-            {if {event.loc_block_id.phone_id.phone|boolean}}
-              <tr>
-                <td {$labelStyle}>
-                    {if {event.loc_block_id.phone_id.phone_type_id|boolean}}
-                        {event.loc_block_id.phone_id.phone_type_id:label}
-                    {else}
-                        {ts}Phone{/ts}
-                    {/if}
-                </td>
-                <td {$valueStyle}>
-                    {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}
-                </td>
-              </tr>
-            {/if}
-            {if {event.loc_block_id.phone_2_id.phone|boolean}}
-              <tr>
-                <td {$labelStyle}>
-                    {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}
-                        {event.loc_block_id.phone_2_id.phone_type_id:label}
-                    {else}
-                        {ts}Phone{/ts}
-                    {/if}
-                </td>
-                <td {$valueStyle}>
-                    {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}
-                </td>
-              </tr>
-            {/if}
-            {if {event.loc_block_id.email_id.email|boolean}}
-              <tr>
-                <td {$labelStyle}>
-                    {ts}Email{/ts}
-                </td>
-                <td {$valueStyle}>
-                    {event.loc_block_id.email_id.email}
-                </td>
-              </tr>
-            {/if}
-            {if {event.loc_block_id.email_2_id.email|boolean}}
-              <tr>
-                <td {$labelStyle}>
-                    {ts}Email{/ts}
-                </td>
-                <td {$valueStyle}>
-                    {event.loc_block_id.email_2_id.email}
-                </td>
-              </tr>
-            {/if}
+        {if {event.loc_block_id.email_2_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_2_id.email}
+            </td>
+          </tr>
         {/if}
+      {/if}
 
     {if \'{contact.email}\'}
       <tr>
@@ -14148,71 +13747,72 @@ INSERT INTO civicrm_option_group
        {participant.role_id:label}
       </td>
      </tr>
+    {if {event.is_show_location|boolean}}
+        <tr>
+          <td colspan="2" {$valueStyle}>
+            {event.location}
+          </td>
+        </tr>
+      {/if}
+
+    {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}
+        <tr>
+          <td colspan="2" {$labelStyle}>
+            {ts}Event Contacts:{/ts}
+          </td>
+        </tr>
 
-    {if !empty($isShowLocation)}
+        {if {event.loc_block_id.phone_id.phone|boolean}}
           <tr>
-            <td colspan="2" {$valueStyle}>
-                {event.location}
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+        {if {event.loc_block_id.phone_2_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_2_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}
             </td>
           </tr>
         {/if}
 
-    {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}
+        {if {event.loc_block_id.email_id.email|boolean}}
           <tr>
-            <td colspan="2" {$labelStyle}>
-                {ts}Event Contacts:{/ts}
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_id.email}
             </td>
           </tr>
+        {/if}
 
-            {if {event.loc_block_id.phone_id.phone|boolean}}
-              <tr>
-                <td {$labelStyle}>
-                    {if {event.loc_block_id.phone_id.phone_type_id|boolean}}
-                        {event.loc_block_id.phone_id.phone_type_id:label}
-                    {else}
-                        {ts}Phone{/ts}
-                    {/if}
-                </td>
-                <td {$valueStyle}>
-                    {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}
-                </td>
-              </tr>
-            {/if}
-            {if {event.loc_block_id.phone_2_id.phone|boolean}}
-              <tr>
-                <td {$labelStyle}>
-                    {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}
-                        {event.loc_block_id.phone_2_id.phone_type_id:label}
-                    {else}
-                        {ts}Phone{/ts}
-                    {/if}
-                </td>
-                <td {$valueStyle}>
-                    {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}
-                </td>
-              </tr>
-            {/if}
-            {if {event.loc_block_id.email_id.email|boolean}}
-              <tr>
-                <td {$labelStyle}>
-                    {ts}Email{/ts}
-                </td>
-                <td {$valueStyle}>
-                    {event.loc_block_id.email_id.email}
-                </td>
-              </tr>
-            {/if}
-            {if {event.loc_block_id.email_2_id.email|boolean}}
-              <tr>
-                <td {$labelStyle}>
-                    {ts}Email{/ts}
-                </td>
-                <td {$valueStyle}>
-                    {event.loc_block_id.email_2_id.email}
-                </td>
-              </tr>
-            {/if}
+        {if {event.loc_block_id.email_2_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_2_id.email}
+            </td>
+          </tr>
         {/if}
+      {/if}
 
     {if \'{contact.email}\'}
       <tr>
@@ -14287,7 +13887,7 @@ INSERT INTO civicrm_option_group
     <p>{ts}This is an invitation to complete your registration that was initially waitlisted.{/ts}</p>
    </td>
   </tr>
-  {if !$isAdditional and $participant.id}
+  {if !$isAdditional and {participant.id|boolean}}
    <tr>
     <th {$headerStyle}>
      {ts}Confirm Your Registration{/ts}
@@ -14295,14 +13895,14 @@ INSERT INTO civicrm_option_group
    </tr>
    <tr>
     <td colspan="2" {$valueStyle}>
-     {capture assign=confirmUrl}{crmURL p=\'civicrm/event/confirm\' q="reset=1&participantId=`$participant.id`&cs=`$checksumValue`" a=true h=0 fe=1}{/capture}
+     {capture assign=confirmUrl}{crmURL p=\'civicrm/event/confirm\' q="reset=1&participantId={participant.id}&cs=`$checksumValue`" a=true h=0 fe=1}{/capture}
      <a href="{$confirmUrl}">{ts}Click here to confirm and complete your registration{/ts}</a>
     </td>
    </tr>
   {/if}
-  {if $event.allow_selfcancelxfer}
+  {if {event.allow_selfcancelxfer|boolean}}
   {ts}This event allows for{/ts}
-  {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q="reset=1&pid=`$participant.id`&{contact.checksum}" h=0 a=1 fe=1}{/capture}
+  {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}self service cancel or transfer{/ts}</a>
   {/if}
 
@@ -14316,8 +13916,8 @@ INSERT INTO civicrm_option_group
      </tr>
      <tr>
       <td colspan="2" {$valueStyle}>
-       {$event.event_title}<br />
-       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|crmDate:"%Y%m%d" == $event.event_start_date|crmDate:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}
+       {event.title}<br />
+       {event.start_date|crmDate:"%A"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:"%Y%m%d"}\' === \'{event.start_date|crmDate:"%Y%m%d"}\'}{event.end_date|crmDate:"Time"}{else}{event.end_date|crmDate:"%A"} {event.end_date|crmDate}{/if}{/if}
       </td>
      </tr>
      <tr>
@@ -14325,60 +13925,86 @@ INSERT INTO civicrm_option_group
        {ts}Participant Role{/ts}:
       </td>
       <td {$valueStyle}>
-       {$participant.role}
+        {participant.role_id:label}
       </td>
      </tr>
-
-     {if $isShowLocation}
-      <tr>
-       <td colspan="2" {$valueStyle}>
-        {$event.location.address.1.display|nl2br}
-       </td>
-      </tr>
-     {/if}
-
-     {if $event.location.phone.1.phone || $event.location.email.1.email}
-      <tr>
-       <td colspan="2" {$labelStyle}>
-        {ts}Event Contacts:{/ts}
-       </td>
-      </tr>
-      {foreach from=$event.location.phone item=phone}
-       {if $phone.phone}
+     {if {event.is_show_location|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}
-         </td>
-         <td {$valueStyle}>
-          {$phone.phone}
-         </td>
+          <td colspan="2" {$valueStyle}>
+            {event.location}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-      {foreach from=$event.location.email item=eventEmail}
-       {if $eventEmail.email}
+      {/if}
+
+     {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {ts}Email{/ts}
-         </td>
-         <td {$valueStyle}>
-          {$eventEmail.email}
-         </td>
+          <td colspan="2" {$labelStyle}>
+            {ts}Event Contacts:{/ts}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-     {/if}
 
-     {if $event.is_public}
+        {if {event.loc_block_id.phone_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+        {if {event.loc_block_id.phone_2_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_2_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_id.email}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_2_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_2_id.email}
+            </td>
+          </tr>
+        {/if}
+      {/if}
+
+     {if {event.is_public|boolean}}
      <tr>
        <td colspan="2" {$valueStyle}>
-           {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
+           {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q="reset=1&id={event.id}" h=0 a=1 fe=1}{/capture}
          <a href="{$icalFeed}">{ts}Download iCalendar entry for this event.{/ts}</a>
        </td>
      </tr>
      <tr>
        <td colspan="2" {$valueStyle}>
-           {capture assign=gCalendar}{crmURL p=\'civicrm/event/ical\' q="gCalendar=1&reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
+           {capture assign=gCalendar}{crmURL p=\'civicrm/event/ical\' q="gCalendar=1&reset=1&id={event.id}" h=0 a=1 fe=1}{/capture}
          <a href="{$gCalendar}">{ts}Add event to Google Calendar{/ts}</a>
        </td>
      </tr>
@@ -14397,13 +14023,13 @@ INSERT INTO civicrm_option_group
       </tr>
      {/if}
 
-     {if $register_date}
+     {if {participant.register_date|boolean}}
       <tr>
        <td {$labelStyle}>
         {ts}Registration Date{/ts}
        </td>
        <td {$valueStyle}>
-        {$participant.register_date|crmDate}
+         {participant.register_date}
        </td>
       </tr>
      {/if}
@@ -14411,11 +14037,11 @@ INSERT INTO civicrm_option_group
     </table>
    </td>
   </tr>
-  {if $event.allow_selfcancelxfer}
+  {if {event.allow_selfcancelxfer|boolean}}
    <tr>
      <td colspan="2" {$valueStyle}>
-       {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}
+       {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}<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>
    </tr>
@@ -14461,7 +14087,7 @@ INSERT INTO civicrm_option_group
     <p>{ts}This is an invitation to complete your registration that was initially waitlisted.{/ts}</p>
    </td>
   </tr>
-  {if !$isAdditional and $participant.id}
+  {if !$isAdditional and {participant.id|boolean}}
    <tr>
     <th {$headerStyle}>
      {ts}Confirm Your Registration{/ts}
@@ -14469,14 +14095,14 @@ INSERT INTO civicrm_option_group
    </tr>
    <tr>
     <td colspan="2" {$valueStyle}>
-     {capture assign=confirmUrl}{crmURL p=\'civicrm/event/confirm\' q="reset=1&participantId=`$participant.id`&cs=`$checksumValue`" a=true h=0 fe=1}{/capture}
+     {capture assign=confirmUrl}{crmURL p=\'civicrm/event/confirm\' q="reset=1&participantId={participant.id}&cs=`$checksumValue`" a=true h=0 fe=1}{/capture}
      <a href="{$confirmUrl}">{ts}Click here to confirm and complete your registration{/ts}</a>
     </td>
    </tr>
   {/if}
-  {if $event.allow_selfcancelxfer}
+  {if {event.allow_selfcancelxfer|boolean}}
   {ts}This event allows for{/ts}
-  {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q="reset=1&pid=`$participant.id`&{contact.checksum}" h=0 a=1 fe=1}{/capture}
+  {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}self service cancel or transfer{/ts}</a>
   {/if}
 
@@ -14490,8 +14116,8 @@ INSERT INTO civicrm_option_group
      </tr>
      <tr>
       <td colspan="2" {$valueStyle}>
-       {$event.event_title}<br />
-       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|crmDate:"%Y%m%d" == $event.event_start_date|crmDate:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}
+       {event.title}<br />
+       {event.start_date|crmDate:"%A"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:"%Y%m%d"}\' === \'{event.start_date|crmDate:"%Y%m%d"}\'}{event.end_date|crmDate:"Time"}{else}{event.end_date|crmDate:"%A"} {event.end_date|crmDate}{/if}{/if}
       </td>
      </tr>
      <tr>
@@ -14499,60 +14125,86 @@ INSERT INTO civicrm_option_group
        {ts}Participant Role{/ts}:
       </td>
       <td {$valueStyle}>
-       {$participant.role}
+        {participant.role_id:label}
       </td>
      </tr>
-
-     {if $isShowLocation}
-      <tr>
-       <td colspan="2" {$valueStyle}>
-        {$event.location.address.1.display|nl2br}
-       </td>
-      </tr>
-     {/if}
-
-     {if $event.location.phone.1.phone || $event.location.email.1.email}
-      <tr>
-       <td colspan="2" {$labelStyle}>
-        {ts}Event Contacts:{/ts}
-       </td>
-      </tr>
-      {foreach from=$event.location.phone item=phone}
-       {if $phone.phone}
+     {if {event.is_show_location|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}
-         </td>
-         <td {$valueStyle}>
-          {$phone.phone}
-         </td>
+          <td colspan="2" {$valueStyle}>
+            {event.location}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-      {foreach from=$event.location.email item=eventEmail}
-       {if $eventEmail.email}
+      {/if}
+
+     {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {ts}Email{/ts}
-         </td>
-         <td {$valueStyle}>
-          {$eventEmail.email}
-         </td>
+          <td colspan="2" {$labelStyle}>
+            {ts}Event Contacts:{/ts}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-     {/if}
 
-     {if $event.is_public}
+        {if {event.loc_block_id.phone_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+        {if {event.loc_block_id.phone_2_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_2_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_id.email}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_2_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_2_id.email}
+            </td>
+          </tr>
+        {/if}
+      {/if}
+
+     {if {event.is_public|boolean}}
      <tr>
        <td colspan="2" {$valueStyle}>
-           {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
+           {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q="reset=1&id={event.id}" h=0 a=1 fe=1}{/capture}
          <a href="{$icalFeed}">{ts}Download iCalendar entry for this event.{/ts}</a>
        </td>
      </tr>
      <tr>
        <td colspan="2" {$valueStyle}>
-           {capture assign=gCalendar}{crmURL p=\'civicrm/event/ical\' q="gCalendar=1&reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
+           {capture assign=gCalendar}{crmURL p=\'civicrm/event/ical\' q="gCalendar=1&reset=1&id={event.id}" h=0 a=1 fe=1}{/capture}
          <a href="{$gCalendar}">{ts}Add event to Google Calendar{/ts}</a>
        </td>
      </tr>
@@ -14571,13 +14223,13 @@ INSERT INTO civicrm_option_group
       </tr>
      {/if}
 
-     {if $register_date}
+     {if {participant.register_date|boolean}}
       <tr>
        <td {$labelStyle}>
         {ts}Registration Date{/ts}
        </td>
        <td {$valueStyle}>
-        {$participant.register_date|crmDate}
+         {participant.register_date}
        </td>
       </tr>
      {/if}
@@ -14585,11 +14237,11 @@ INSERT INTO civicrm_option_group
     </table>
    </td>
   </tr>
-  {if $event.allow_selfcancelxfer}
+  {if {event.allow_selfcancelxfer|boolean}}
    <tr>
      <td colspan="2" {$valueStyle}>
-       {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}
+       {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}<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>
    </tr>
@@ -14637,7 +14289,7 @@ INSERT INTO civicrm_option_group
   <tr>
    <td>
     {assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}<p>{$greeting},</p>{/if}
-    <p>{ts 1=$event.event_title}Your pending event registration for %1 has expired
+    <p>{ts 1="{event.title}"}Your pending event registration for %1 has expired
 because you did not confirm your registration.{/ts}</p>
     <p>{ts 1=\'{domain.phone}\' 2=\'{domain.email}\'}Please contact us at %1 or send email to %2 if you have questions
 or want to inquire about reinstating your registration for this event.{/ts}</p>
@@ -14653,8 +14305,8 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
      </tr>
      <tr>
       <td colspan="2" {$valueStyle}>
-       {$event.event_title}<br />
-       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|crmDate:"%Y%m%d" == $event.event_start_date|crmDate:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}
+       {event.title}<br />
+       {event.start_date|crmDate:"%A"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:"%Y%m%d"}\' === \'{event.start_date|crmDate:"%Y%m%d"}\'}{event.end_date|crmDate:"Time"}{else}{event.end_date|crmDate:"%A"} {event.end_date|crmDate}{/if}{/if}
       </td>
      </tr>
      <tr>
@@ -14662,70 +14314,84 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
        {ts}Participant Role{/ts}:
       </td>
       <td {$valueStyle}>
-       {$participant.role}
+        {participant.role_id:label}
       </td>
      </tr>
 
-     {if $isShowLocation}
-      <tr>
-       <td colspan="2" {$valueStyle}>
-        {$event.location.address.1.display|nl2br}
-       </td>
-      </tr>
-     {/if}
-
-     {if !empty($event.location.phone.1.phone) || !empty($event.location.email.1.email)}
-      <tr>
-       <td colspan="2" {$labelStyle}>
-        {ts}Event Contacts:{/ts}
-       </td>
-      </tr>
-      {foreach from=$event.location.phone item=phone}
-       {if $phone.phone}
+    {if {event.is_show_location|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}
-         </td>
-         <td {$valueStyle}>
-          {$phone.phone}
-         </td>
+          <td colspan="2" {$valueStyle}>
+            {event.location}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-      {foreach from=$event.location.email item=eventEmail}
-       {if $eventEmail.email}
+      {/if}
+
+    {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {ts}Email{/ts}
-         </td>
-         <td {$valueStyle}>
-          {$eventEmail.email}
-         </td>
+          <td colspan="2" {$labelStyle}>
+            {ts}Event Contacts:{/ts}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-     {/if}
 
-     {if \'{contact.email}\'}
-      <tr>
-       <th {$headerStyle}>
-        {ts}Registered Email{/ts}
-       </th>
-      </tr>
-      <tr>
-       <td colspan="2" {$valueStyle}>
-        {contact.email}
-       </td>
-      </tr>
-     {/if}
+        {if {event.loc_block_id.phone_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+        {if {event.loc_block_id.phone_2_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_2_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_id.email}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_2_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_2_id.email}
+            </td>
+          </tr>
+        {/if}
+      {/if}
 
-     {if $register_date}
+    {if {participant.register_date|boolean}}
       <tr>
        <td {$labelStyle}>
         {ts}Registration Date{/ts}
        </td>
        <td {$valueStyle}>
-        {$participant.register_date|crmDate}
+        {participant.register_date}
        </td>
       </tr>
      {/if}
@@ -14773,7 +14439,7 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
   <tr>
    <td>
     {assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}<p>{$greeting},</p>{/if}
-    <p>{ts 1=$event.event_title}Your pending event registration for %1 has expired
+    <p>{ts 1="{event.title}"}Your pending event registration for %1 has expired
 because you did not confirm your registration.{/ts}</p>
     <p>{ts 1=\'{domain.phone}\' 2=\'{domain.email}\'}Please contact us at %1 or send email to %2 if you have questions
 or want to inquire about reinstating your registration for this event.{/ts}</p>
@@ -14789,8 +14455,8 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
      </tr>
      <tr>
       <td colspan="2" {$valueStyle}>
-       {$event.event_title}<br />
-       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|crmDate:"%Y%m%d" == $event.event_start_date|crmDate:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}
+       {event.title}<br />
+       {event.start_date|crmDate:"%A"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:"%Y%m%d"}\' === \'{event.start_date|crmDate:"%Y%m%d"}\'}{event.end_date|crmDate:"Time"}{else}{event.end_date|crmDate:"%A"} {event.end_date|crmDate}{/if}{/if}
       </td>
      </tr>
      <tr>
@@ -14798,70 +14464,84 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
        {ts}Participant Role{/ts}:
       </td>
       <td {$valueStyle}>
-       {$participant.role}
+        {participant.role_id:label}
       </td>
      </tr>
 
-     {if $isShowLocation}
-      <tr>
-       <td colspan="2" {$valueStyle}>
-        {$event.location.address.1.display|nl2br}
-       </td>
-      </tr>
-     {/if}
-
-     {if !empty($event.location.phone.1.phone) || !empty($event.location.email.1.email)}
-      <tr>
-       <td colspan="2" {$labelStyle}>
-        {ts}Event Contacts:{/ts}
-       </td>
-      </tr>
-      {foreach from=$event.location.phone item=phone}
-       {if $phone.phone}
+    {if {event.is_show_location|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}
-         </td>
-         <td {$valueStyle}>
-          {$phone.phone}
-         </td>
+          <td colspan="2" {$valueStyle}>
+            {event.location}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-      {foreach from=$event.location.email item=eventEmail}
-       {if $eventEmail.email}
+      {/if}
+
+    {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {ts}Email{/ts}
-         </td>
-         <td {$valueStyle}>
-          {$eventEmail.email}
-         </td>
+          <td colspan="2" {$labelStyle}>
+            {ts}Event Contacts:{/ts}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-     {/if}
 
-     {if \'{contact.email}\'}
-      <tr>
-       <th {$headerStyle}>
-        {ts}Registered Email{/ts}
-       </th>
-      </tr>
-      <tr>
-       <td colspan="2" {$valueStyle}>
-        {contact.email}
-       </td>
-      </tr>
-     {/if}
+        {if {event.loc_block_id.phone_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+        {if {event.loc_block_id.phone_2_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_2_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
 
-     {if $register_date}
+        {if {event.loc_block_id.email_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_id.email}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_2_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_2_id.email}
+            </td>
+          </tr>
+        {/if}
+      {/if}
+
+    {if {participant.register_date|boolean}}
       <tr>
        <td {$labelStyle}>
         {ts}Registration Date{/ts}
        </td>
        <td {$valueStyle}>
-        {$participant.register_date|crmDate}
+        {participant.register_date}
        </td>
       </tr>
      {/if}
@@ -14926,8 +14606,8 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
      </tr>
      <tr>
       <td colspan="2" {$valueStyle}>
-       {$event.event_title}<br />
-       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|crmDate:"%Y%m%d" == $event.event_start_date|crmDate:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}
+       {event.title}<br />
+       {event.start_date|crmDate:"%A"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:"%Y%m%d"}\' === \'{event.start_date|crmDate:"%Y%m%d"}\'}{event.end_date|crmDate:"Time"}{else}{event.end_date|crmDate:"%A"} {event.end_date|crmDate}{/if}{/if}
       </td>
      </tr>
      <tr>
@@ -14935,49 +14615,76 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
        {ts}Participant Role{/ts}:
       </td>
       <td {$valueStyle}>
-       {$participant.role}
+       {participant.role_id:label}
       </td>
      </tr>
 
-     {if $isShowLocation}
-      <tr>
-       <td colspan="2" {$valueStyle}>
-        {$event.location.address.1.display|nl2br}
-       </td>
-      </tr>
-     {/if}
-
-     {if !empty($event.location.phone.1.phone) || !empty($event.location.email.1.email)}
-      <tr>
-       <td colspan="2" {$labelStyle}>
-        {ts}Event Contacts:{/ts}
-       </td>
-      </tr>
-      {foreach from=$event.location.phone item=phone}
-       {if $phone.phone}
+     {if {event.is_show_location|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}
-         </td>
-         <td {$valueStyle}>
-          {$phone.phone}
-         </td>
+          <td colspan="2" {$valueStyle}>
+            {event.location}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-      {foreach from=$event.location.email item=eventEmail}
-       {if $eventEmail.email}
+      {/if}
+
+     {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {ts}Email{/ts}
-         </td>
-         <td {$valueStyle}>
-          {$eventEmail.email}
-         </td>
+          <td colspan="2" {$labelStyle}>
+            {ts}Event Contacts:{/ts}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-     {/if}
+
+        {if {event.loc_block_id.phone_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+        {if {event.loc_block_id.phone_2_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_2_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_id.email}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_2_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_2_id.email}
+            </td>
+          </tr>
+        {/if}
+      {/if}
 
      {if \'{contact.email}\'}
       <tr>
@@ -14992,13 +14699,13 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
       </tr>
      {/if}
 
-     {if $register_date}
+      {if {participant.register_date|boolean}}
       <tr>
        <td {$labelStyle}>
         {ts}Registration Date{/ts}
        </td>
        <td {$valueStyle}>
-        {$participant.register_date|crmDate}
+        {participant.register_date}
        </td>
       </tr>
      {/if}
@@ -15059,8 +14766,8 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
      </tr>
      <tr>
       <td colspan="2" {$valueStyle}>
-       {$event.event_title}<br />
-       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|crmDate:"%Y%m%d" == $event.event_start_date|crmDate:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}
+       {event.title}<br />
+       {event.start_date|crmDate:"%A"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:"%Y%m%d"}\' === \'{event.start_date|crmDate:"%Y%m%d"}\'}{event.end_date|crmDate:"Time"}{else}{event.end_date|crmDate:"%A"} {event.end_date|crmDate}{/if}{/if}
       </td>
      </tr>
      <tr>
@@ -15068,49 +14775,76 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
        {ts}Participant Role{/ts}:
       </td>
       <td {$valueStyle}>
-       {$participant.role}
+       {participant.role_id:label}
       </td>
      </tr>
 
-     {if $isShowLocation}
-      <tr>
-       <td colspan="2" {$valueStyle}>
-        {$event.location.address.1.display|nl2br}
-       </td>
-      </tr>
-     {/if}
-
-     {if !empty($event.location.phone.1.phone) || !empty($event.location.email.1.email)}
-      <tr>
-       <td colspan="2" {$labelStyle}>
-        {ts}Event Contacts:{/ts}
-       </td>
-      </tr>
-      {foreach from=$event.location.phone item=phone}
-       {if $phone.phone}
+     {if {event.is_show_location|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}
-         </td>
-         <td {$valueStyle}>
-          {$phone.phone}
-         </td>
+          <td colspan="2" {$valueStyle}>
+            {event.location}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-      {foreach from=$event.location.email item=eventEmail}
-       {if $eventEmail.email}
+      {/if}
+
+     {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {ts}Email{/ts}
-         </td>
-         <td {$valueStyle}>
-          {$eventEmail.email}
-         </td>
+          <td colspan="2" {$labelStyle}>
+            {ts}Event Contacts:{/ts}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-     {/if}
+
+        {if {event.loc_block_id.phone_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+        {if {event.loc_block_id.phone_2_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_2_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_id.email}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_2_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_2_id.email}
+            </td>
+          </tr>
+        {/if}
+      {/if}
 
      {if \'{contact.email}\'}
       <tr>
@@ -15125,13 +14859,13 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
       </tr>
      {/if}
 
-     {if $register_date}
+      {if {participant.register_date|boolean}}
       <tr>
        <td {$labelStyle}>
         {ts}Registration Date{/ts}
        </td>
        <td {$valueStyle}>
-        {$participant.register_date|crmDate}
+        {participant.register_date}
        </td>
       </tr>
      {/if}
@@ -15160,22 +14894,7 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Tell-a-Friend Email', '{ts 1=$senderContactName 2=$title}%1 wants you to know about %2{/ts}
-', '{$senderMessage}
-
-{if $generalLink}{ts}For more information, visit:{/ts}
->> {$generalLink}
-
-{/if}
-{if $contribute}{ts}To make a contribution, go to:{/ts}
->> {$pageURL}
-
-{/if}
-{if $event}{ts}To find out more about this event, go to:{/ts}
->> {$pageURL}
-{/if}
-
-
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -15219,22 +14938,7 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Tell-a-Friend Email', '{ts 1=$senderContactName 2=$title}%1 wants you to know about %2{/ts}
-', '{$senderMessage}
-
-{if $generalLink}{ts}For more information, visit:{/ts}
->> {$generalLink}
-
-{/if}
-{if $contribute}{ts}To make a contribution, go to:{/ts}
->> {$pageURL}
-
-{/if}
-{if $event}{ts}To find out more about this event, go to:{/ts}
->> {$pageURL}
-{/if}
-
-
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -15286,110 +14990,7 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
 {elseif $receiptType EQ \'membership renewal\'}
 {ts}Membership Renewal Confirmation and Receipt{/ts}
 {/if} - {contact.display_name}
-', '{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{if $userTextPlain}
-{$userTextPlain}
-{else}{ts}Thank you for this contribution.{/ts}{/if}
-
-{if !$isShowLineItems}
-===========================================================
-{ts}Membership Information{/ts}
-
-===========================================================
-{ts}Membership Type{/ts}: {membership.membership_type_id:name}
-{/if}
-{if \'{membership.status_id:name}\' !== \'Cancelled\'}
-{if !$isShowLineItems}
-{ts}Membership Start Date{/ts}: {membership.start_date|crmDate:"Full"}
-{ts}Membership Expiration Date{/ts}: {membership.end_date|crmDate:"Full"}
-{/if}
-
-{if {contribution.total_amount|boolean}}
-===========================================================
-{ts}Membership Fee{/ts}
-
-===========================================================
-{if {contribution.financial_type_id|boolean}}
-{ts}Financial Type{/ts}: {contribution.financial_type_id:label}
-{/if}
-{if $isShowLineItems}
-{capture assign=ts_item}{ts}Item{/ts}{/capture}
-{capture assign=ts_total}{ts}Fee{/ts}{/capture}
-{if $isShowTax && \'{contribution.tax_amount|boolean}\'}
-{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}
-{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}
-{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}
-{capture assign=ts_total}{ts}Total{/ts}{/capture}
-{/if}
-{capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture}
-{capture assign=ts_end_date}{ts}Membership Expiration Date{/ts}{/capture}
-{$ts_item|string_format:"%-30s"} {$ts_total|string_format:"%10s"} {if $isShowTax && {contribution.tax_amount|boolean}} {$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"}
---------------------------------------------------------------------------------------------------
-
-{foreach from=$lineItems item=line}
-{line.title} {$line.line_total|crmMoney|string_format:"%10s"}  {if $isShowTax && {contribution.tax_amount|boolean}} {$line.line_total|crmMoney:\'{contribution.currency}\'|string_format:"%10s"} {if $line.tax_rate || $line.tax_amount != ""}  {$line.tax_rate|string_format:"%.2f"} %  {$line.tax_amount|crmMoney:\'{contribution.currency}\'|string_format:"%10s"}  {else}                  {/if}   {$line.line_total_inclusive|crmMoney|string_format:"%10s"} {/if} {$line.membership.start_date|string_format:"%20s"} {$line.membership.end_date|string_format:"%20s"}
-{/foreach}
-
-{if $isShowTax && {contribution.tax_amount|boolean}}
-{ts}Amount before Tax:{/ts} {contribution.tax_exclusive_amount}
-
-{foreach from=$taxRateBreakdown item=taxDetail key=taxRate}
-{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else} {$taxTerm} {$taxDetail.percentage}%{/if}: {$taxDetail.amount|crmMoney:\'{contribution.currency}\'}
-{/foreach}
-{/if}
---------------------------------------------------------------------------------------------------
-{/if}
-
-{if {contribution.tax_amount|boolean}}
-{ts}Total Tax Amount{/ts}: {contribution.tax_amount}
-{/if}
-
-{ts}Amount{/ts}: {contribution.total_amount}
-{if {contribution.receive_date|boolean}}
-{ts}Contribution Date{/ts}: {contribution.receive_date}
-{/if}
-{if {contribution.payment_instrument_id|boolean}}
-{ts}Paid By{/ts}: {contribution.payment_instrument_id:label}
-{if {contribution.check_number|boolean}}
-{ts}Check Number{/ts}: {contribution.check_number|boolean}
-{/if}
-{/if}
-{/if}
-{/if}
-
-{if !empty($isPrimary)}
-{if !empty($billingName)}
-
-===========================================================
-{ts}Billing Name and Address{/ts}
-
-===========================================================
-{$billingName}
-{$address}
-{/if}
-
-{if !empty($credit_card_type)}
-===========================================================
-{ts}Credit Card Information{/ts}
-
-===========================================================
-{$credit_card_type}
-{$credit_card_number}
-{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}
-{/if}
-{/if}
-
-{if !empty($customValues)}
-===========================================================
-{ts}Membership Options{/ts}
-
-===========================================================
-{foreach from=$customValues item=value key=customName}
- {$customName} : {$value}
-{/foreach}
-{/if}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -15683,110 +15284,7 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
 {elseif $receiptType EQ \'membership renewal\'}
 {ts}Membership Renewal Confirmation and Receipt{/ts}
 {/if} - {contact.display_name}
-', '{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{if $userTextPlain}
-{$userTextPlain}
-{else}{ts}Thank you for this contribution.{/ts}{/if}
-
-{if !$isShowLineItems}
-===========================================================
-{ts}Membership Information{/ts}
-
-===========================================================
-{ts}Membership Type{/ts}: {membership.membership_type_id:name}
-{/if}
-{if \'{membership.status_id:name}\' !== \'Cancelled\'}
-{if !$isShowLineItems}
-{ts}Membership Start Date{/ts}: {membership.start_date|crmDate:"Full"}
-{ts}Membership Expiration Date{/ts}: {membership.end_date|crmDate:"Full"}
-{/if}
-
-{if {contribution.total_amount|boolean}}
-===========================================================
-{ts}Membership Fee{/ts}
-
-===========================================================
-{if {contribution.financial_type_id|boolean}}
-{ts}Financial Type{/ts}: {contribution.financial_type_id:label}
-{/if}
-{if $isShowLineItems}
-{capture assign=ts_item}{ts}Item{/ts}{/capture}
-{capture assign=ts_total}{ts}Fee{/ts}{/capture}
-{if $isShowTax && \'{contribution.tax_amount|boolean}\'}
-{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}
-{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}
-{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}
-{capture assign=ts_total}{ts}Total{/ts}{/capture}
-{/if}
-{capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture}
-{capture assign=ts_end_date}{ts}Membership Expiration Date{/ts}{/capture}
-{$ts_item|string_format:"%-30s"} {$ts_total|string_format:"%10s"} {if $isShowTax && {contribution.tax_amount|boolean}} {$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"}
---------------------------------------------------------------------------------------------------
-
-{foreach from=$lineItems item=line}
-{line.title} {$line.line_total|crmMoney|string_format:"%10s"}  {if $isShowTax && {contribution.tax_amount|boolean}} {$line.line_total|crmMoney:\'{contribution.currency}\'|string_format:"%10s"} {if $line.tax_rate || $line.tax_amount != ""}  {$line.tax_rate|string_format:"%.2f"} %  {$line.tax_amount|crmMoney:\'{contribution.currency}\'|string_format:"%10s"}  {else}                  {/if}   {$line.line_total_inclusive|crmMoney|string_format:"%10s"} {/if} {$line.membership.start_date|string_format:"%20s"} {$line.membership.end_date|string_format:"%20s"}
-{/foreach}
-
-{if $isShowTax && {contribution.tax_amount|boolean}}
-{ts}Amount before Tax:{/ts} {contribution.tax_exclusive_amount}
-
-{foreach from=$taxRateBreakdown item=taxDetail key=taxRate}
-{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else} {$taxTerm} {$taxDetail.percentage}%{/if}: {$taxDetail.amount|crmMoney:\'{contribution.currency}\'}
-{/foreach}
-{/if}
---------------------------------------------------------------------------------------------------
-{/if}
-
-{if {contribution.tax_amount|boolean}}
-{ts}Total Tax Amount{/ts}: {contribution.tax_amount}
-{/if}
-
-{ts}Amount{/ts}: {contribution.total_amount}
-{if {contribution.receive_date|boolean}}
-{ts}Contribution Date{/ts}: {contribution.receive_date}
-{/if}
-{if {contribution.payment_instrument_id|boolean}}
-{ts}Paid By{/ts}: {contribution.payment_instrument_id:label}
-{if {contribution.check_number|boolean}}
-{ts}Check Number{/ts}: {contribution.check_number|boolean}
-{/if}
-{/if}
-{/if}
-{/if}
-
-{if !empty($isPrimary)}
-{if !empty($billingName)}
-
-===========================================================
-{ts}Billing Name and Address{/ts}
-
-===========================================================
-{$billingName}
-{$address}
-{/if}
-
-{if !empty($credit_card_type)}
-===========================================================
-{ts}Credit Card Information{/ts}
-
-===========================================================
-{$credit_card_type}
-{$credit_card_number}
-{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}
-{/if}
-{/if}
-
-{if !empty($customValues)}
-===========================================================
-{ts}Membership Options{/ts}
-
-===========================================================
-{foreach from=$customValues item=value key=customName}
- {$customName} : {$value}
-{/foreach}
-{/if}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -16103,9 +15601,11 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
   <tr>
    <td>
      {assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}<p>{$greeting},</p>{/if}
-    {if $userText}
-     <p>{$userText}</p>
-    {/if}
+     {if $userText}
+       <p>{$userText}</p>
+     {elseif {contribution.contribution_page_id.receipt_text|boolean}}
+       <p>{contribution.contribution_page_id.receipt_text}</p>
+     {/if}
     {if {contribution.balance_amount|boolean} && {contribution.is_pay_later|boolean}}
       <p>{contribution.contribution_page_id.pay_later_receipt}</p>
     {/if}
@@ -16544,9 +16044,11 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
   <tr>
    <td>
      {assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}<p>{$greeting},</p>{/if}
-    {if $userText}
-     <p>{$userText}</p>
-    {/if}
+     {if $userText}
+       <p>{$userText}</p>
+     {elseif {contribution.contribution_page_id.receipt_text|boolean}}
+       <p>{contribution.contribution_page_id.receipt_text}</p>
+     {/if}
     {if {contribution.balance_amount|boolean} && {contribution.is_pay_later|boolean}}
       <p>{contribution.contribution_page_id.pay_later_receipt}</p>
     {/if}
@@ -16966,21 +16468,7 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Memberships - Auto-renew Cancellation Notification', '{ts}Autorenew Membership Cancellation Notification{/ts} - {contact.display_name}
-', '{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{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}
-
-===========================================================
-{ts}Membership Information{/ts}
-
-===========================================================
-{ts}Membership Status{/ts}: {$membership_status}
-{if $mem_start_date}{ts}Membership Start Date{/ts}: {$mem_start_date|crmDate}
-{/if}
-{if $mem_end_date}{ts}Membership Expiration Date{/ts}: {$mem_end_date|crmDate}
-{/if}
-
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -17054,21 +16542,7 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Memberships - Auto-renew Cancellation Notification', '{ts}Autorenew Membership Cancellation Notification{/ts} - {contact.display_name}
-', '{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{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}
-
-===========================================================
-{ts}Membership Information{/ts}
-
-===========================================================
-{ts}Membership Status{/ts}: {$membership_status}
-{if $mem_start_date}{ts}Membership Start Date{/ts}: {$mem_start_date|crmDate}
-{/if}
-{if $mem_end_date}{ts}Membership Expiration Date{/ts}: {$mem_end_date|crmDate}
-{/if}
-
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -17146,30 +16620,7 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Memberships - Auto-renew Billing Updates', '{ts}Membership Autorenewal Billing Updates{/ts} - {contact.display_name}
-', '{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts}
-
-===========================================================
-{ts}Billing Name and Address{/ts}
-
-===========================================================
-{$billingName}
-{$address}
-
-{$email}
-
-===========================================================
-{ts}Credit Card Information{/ts}
-
-===========================================================
-{$credit_card_type}
-{$credit_card_number}
-{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}
-
-
-{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -17239,30 +16690,7 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
     ('Memberships - Auto-renew Billing Updates', '{ts}Membership Autorenewal Billing Updates{/ts} - {contact.display_name}
-', '{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts}
-
-===========================================================
-{ts}Billing Name and Address{/ts}
-
-===========================================================
-{$billingName}
-{$address}
-
-{$email}
-
-===========================================================
-{ts}Credit Card Information{/ts}
-
-===========================================================
-{$credit_card_type}
-{$credit_card_number}
-{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}
-
-
-{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}
-', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -17839,7 +17267,7 @@ or need to modify your payment schedule.{/ts}</p>
     INSERT INTO civicrm_msg_template
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
-    ('Profiles - Admin Notification', '{$grouptitle} {ts 1=$displayName}Submitted by %1{/ts} - {contact.display_name}
+    ('Profiles - Admin Notification', '{$grouptitle} {ts 1=$userDisplayName}Submitted by %1{/ts} - {contact.display_name}
 ', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -17868,7 +17296,7 @@ or need to modify your payment schedule.{/ts}</p>
        {ts}Submitted For{/ts}
       </td>
       <td {$valueStyle}>
-       {$displayName}
+       {contact.display_name}
       </td>
      </tr>
      <tr>
@@ -17876,7 +17304,7 @@ or need to modify your payment schedule.{/ts}</p>
        {ts}Date{/ts}
       </td>
       <td {$valueStyle}>
-       {$currentDate}
+       {domain.now|crmDate:"Full"}
       </td>
      </tr>
      <tr>
@@ -17917,7 +17345,7 @@ or need to modify your payment schedule.{/ts}</p>
     INSERT INTO civicrm_msg_template
     (msg_title, msg_subject, msg_text, msg_html, workflow_name, workflow_id, is_default, is_reserved)
     VALUES
-    ('Profiles - Admin Notification', '{$grouptitle} {ts 1=$displayName}Submitted by %1{/ts} - {contact.display_name}
+    ('Profiles - Admin Notification', '{$grouptitle} {ts 1=$userDisplayName}Submitted by %1{/ts} - {contact.display_name}
 ', '', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -17946,7 +17374,7 @@ or need to modify your payment schedule.{/ts}</p>
        {ts}Submitted For{/ts}
       </td>
       <td {$valueStyle}>
-       {$displayName}
+       {contact.display_name}
       </td>
      </tr>
      <tr>
@@ -17954,7 +17382,7 @@ or need to modify your payment schedule.{/ts}</p>
        {ts}Date{/ts}
       </td>
       <td {$valueStyle}>
-       {$currentDate}
+       {domain.now|crmDate:"Full"}
       </td>
      </tr>
      <tr>
@@ -19559,6 +18987,7 @@ INSERT INTO civicrm_option_value (`color`,`component_id`,`description`,`domain_i
 (NULL,NULL,"",NULL,NULL,NULL,NULL,"1","0","0","1","Campaigns","Campaign",@this_option_group_id,"Campaign",NULL,"1")
 ;
 
+
 -- +--------------------------------------------------------------------+
 -- | Copyright CiviCRM LLC. All rights reserved.                        |
 -- |                                                                    |
@@ -19715,7 +19144,7 @@ VALUES
     ( @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/report/list?compid=1&reset=1', 'Event Reports', 'Event Reports', 'access CiviEvent', '', @eventlastID, '1', 1,    4 ),
-    ( @domainID, 'civicrm/event/import?reset=1',                            'Import Participants','Import Participants',  'access CiviEvent,edit event participants', 'AND',    @eventlastID, '1', '1',  5 ),
+    ( @domainID, 'civicrm/import/participant?reset=1',                            'Import Participants','Import Participants',  'access CiviEvent,edit event participants', 'AND',    @eventlastID, '1', '1',  5 ),
     ( @domainID, 'civicrm/event/add?reset=1&action=add',                    'New Event',          'New Event',            'access CiviEvent,edit all events', 'AND',    @eventlastID, '0', NULL, 6 ),
     ( @domainID, 'civicrm/event/manage?reset=1',                            'Manage Events',      'Manage Events',        'access CiviEvent,edit all events', 'AND',    @eventlastID, '1', 1, 7 ),
     ( @domainID, 'civicrm/admin/pcp?reset=1&page_type=event',               'Personal Campaign Pages',    'Personal Campaign Pages',   'access CiviEvent,administer CiviCRM', 'AND', @eventlastID, '1', 1, 8 ),
@@ -19759,7 +19188,7 @@ VALUES
     ( @domainID, 'civicrm/member/search?reset=1',                       'Find Memberships',    'Find Memberships','access CiviMember', '', @memberlastID, '1', NULL, 3 ),
     ( @domainID, 'civicrm/report/list?compid=3&reset=1',                'Membership Reports',  'Membership Reports', 'access CiviMember', '', @memberlastID, '1', 1,    4 ),
     ( @domainID, 'civicrm/batch?reset=1',                               'Batch Data Entry',     'Batch Data Entry','access CiviContribute', '', @memberlastID, '1', NULL, 5 ),
-    ( @domainID, 'civicrm/member/import?reset=1',                       'Import Memberships',  'Import Members',  'access CiviMember,edit memberships', 'AND', @memberlastID, '1', 1, 6 ),
+    ( @domainID, 'civicrm/import/membership?reset=1',                       'Import Memberships',  'Import Members',  'access CiviMember,edit memberships', 'AND', @memberlastID, '1', 1, 6 ),
     ( @domainID, 'civicrm/admin/price/edit?reset=1&action=add',         'New Price Set',       'New Price Set',   'access CiviMember,administer CiviCRM', 'AND',  @memberlastID, '0', NULL, 7 ),
     ( @domainID, 'civicrm/admin/price?reset=1',                         'Manage Price Sets',   'Manage Price Sets', 'access CiviMember,administer CiviCRM', 'AND',  @memberlastID, '1', NULL, 8 );
 
@@ -20088,7 +19517,7 @@ 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
-    ( @domainID, 'civicrm/report/list?compid=99&reset=1', 'Contact Reports', 'Contact Reports', 'administer CiviCRM', '', @reportlastID, '1', 0,    1 );
+    ( @domainID, 'civicrm/report/list?compid=99&reset=1', 'Contact Reports', 'Contact Reports', 'access CiviReport', '', @reportlastID, '1', 0,    1 );
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
 VALUES
@@ -20304,4 +19733,6 @@ INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
 VALUES
     (  @domainID, 'Survey Details', 'survey/detail', 'Detailed report for canvassing, phone-banking, walk lists or other surveys.', 'access CiviReport', 'a:39:{s:6:"fields";a:2:{s:9:"sort_name";s:1:"1";s:6:"result";s:1:"1";}s:22:"assignee_contact_id_op";s:2:"eq";s:25:"assignee_contact_id_value";s:0:"";s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s: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: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:12:"survey_id_op";s:2:"in";s:15:"survey_id_value";a:0:{}s:12:"status_id_op";s:2:"eq";s:15:"status_id_value";s:1:"1";s:11:"custom_1_op";s:2:"in";s:14:"custom_1_value";a:0:{}s:11:"custom_2_op";s:2:"in";s:14:"custom_2_value";a:0:{}s:17:"custom_3_relative";s:1:"0";s:13:"custom_3_from";s:0:"";s:11:"custom_3_to";s:0:"";s:11:"description";s:75:"Detailed report for canvassing, phone-banking, walk lists or other surveys.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviReport";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
-UPDATE civicrm_domain SET version = '5.70.2';
+
+UPDATE civicrm_domain SET version = '5.74.4';
+
diff --git a/www/modules/civicrm/sql/civicrm_drop.mysql b/www/modules/civicrm/sql/civicrm_drop.mysql
index 43dd062fd..ee4eb4551 100644
--- a/www/modules/civicrm/sql/civicrm_drop.mysql
+++ b/www/modules/civicrm/sql/civicrm_drop.mysql
@@ -1,174 +1,155 @@
--- +--------------------------------------------------------------------+
--- | 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       |
--- +--------------------------------------------------------------------+
---
--- Generated from drop.tpl
--- DO NOT EDIT.  Generated by CRM_Core_CodeGen
---
--- /*******************************************************
--- *
--- * Clean up the existing tables
--- *
--- *******************************************************/
-
 SET FOREIGN_KEY_CHECKS=0;
-
-DROP TABLE IF EXISTS `civicrm_line_item`;
-DROP TABLE IF EXISTS `civicrm_pledge_payment`;
-DROP TABLE IF EXISTS `civicrm_events_in_carts`;
-DROP TABLE IF EXISTS `civicrm_participant_payment`;
-DROP TABLE IF EXISTS `civicrm_participant`;
-DROP TABLE IF EXISTS `civicrm_event`;
-DROP TABLE IF EXISTS `civicrm_membership_payment`;
-DROP TABLE IF EXISTS `civicrm_entity_financial_trxn`;
-DROP TABLE IF EXISTS `civicrm_contribution_soft`;
-DROP TABLE IF EXISTS `civicrm_contribution_product`;
-DROP TABLE IF EXISTS `civicrm_contribution`;
-DROP TABLE IF EXISTS `civicrm_group_contact`;
-DROP TABLE IF EXISTS `civicrm_loc_block`;
-DROP TABLE IF EXISTS `civicrm_address`;
-DROP TABLE IF EXISTS `civicrm_pcp_block`;
-DROP TABLE IF EXISTS `civicrm_price_field_value`;
-DROP TABLE IF EXISTS `civicrm_price_field`;
-DROP TABLE IF EXISTS `civicrm_case_activity`;
-DROP TABLE IF EXISTS `civicrm_activity_contact`;
+DROP TABLE IF EXISTS `civicrm_acl`;
+DROP TABLE IF EXISTS `civicrm_acl_cache`;
+DROP TABLE IF EXISTS `civicrm_acl_entity_role`;
 DROP TABLE IF EXISTS `civicrm_activity`;
-DROP TABLE IF EXISTS `civicrm_membership_log`;
-DROP TABLE IF EXISTS `civicrm_membership`;
-DROP TABLE IF EXISTS `civicrm_financial_trxn`;
-DROP TABLE IF EXISTS `civicrm_contribution_recur`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_unsubscribe`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_trackable_url_open`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_reply`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_opened`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_forward`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_delivered`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_bounce`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_queue`;
-DROP TABLE IF EXISTS `civicrm_mailing_spool`;
-DROP TABLE IF EXISTS `civicrm_mailing_recipients`;
-DROP TABLE IF EXISTS `civicrm_mailing_job`;
-DROP TABLE IF EXISTS `civicrm_mailing_trackable_url`;
-DROP TABLE IF EXISTS `civicrm_mailing_group`;
-DROP TABLE IF EXISTS `civicrm_mailing`;
-DROP TABLE IF EXISTS `civicrm_relationship_cache`;
-DROP TABLE IF EXISTS `civicrm_relationship`;
+DROP TABLE IF EXISTS `civicrm_activity_contact`;
+DROP TABLE IF EXISTS `civicrm_batch`;
+DROP TABLE IF EXISTS `civicrm_entity_batch`;
+DROP TABLE IF EXISTS `civicrm_campaign`;
+DROP TABLE IF EXISTS `civicrm_campaign_group`;
+DROP TABLE IF EXISTS `civicrm_survey`;
+DROP TABLE IF EXISTS `civicrm_case`;
+DROP TABLE IF EXISTS `civicrm_case_activity`;
+DROP TABLE IF EXISTS `civicrm_case_contact`;
+DROP TABLE IF EXISTS `civicrm_case_type`;
+DROP TABLE IF EXISTS `civicrm_acl_contact_cache`;
+DROP TABLE IF EXISTS `civicrm_contact`;
+DROP TABLE IF EXISTS `civicrm_contact_type`;
 DROP TABLE IF EXISTS `civicrm_dashboard_contact`;
+DROP TABLE IF EXISTS `civicrm_group`;
+DROP TABLE IF EXISTS `civicrm_group_contact`;
+DROP TABLE IF EXISTS `civicrm_group_contact_cache`;
+DROP TABLE IF EXISTS `civicrm_group_nesting`;
+DROP TABLE IF EXISTS `civicrm_group_organization`;
+DROP TABLE IF EXISTS `civicrm_relationship`;
+DROP TABLE IF EXISTS `civicrm_relationship_cache`;
+DROP TABLE IF EXISTS `civicrm_relationship_type`;
+DROP TABLE IF EXISTS `civicrm_saved_search`;
+DROP TABLE IF EXISTS `civicrm_subscription_history`;
+DROP TABLE IF EXISTS `civicrm_contribution`;
+DROP TABLE IF EXISTS `civicrm_contribution_page`;
+DROP TABLE IF EXISTS `civicrm_contribution_product`;
+DROP TABLE IF EXISTS `civicrm_contribution_recur`;
+DROP TABLE IF EXISTS `civicrm_contribution_soft`;
+DROP TABLE IF EXISTS `civicrm_premiums`;
+DROP TABLE IF EXISTS `civicrm_premiums_product`;
+DROP TABLE IF EXISTS `civicrm_product`;
+DROP TABLE IF EXISTS `civicrm_contribution_widget`;
 DROP TABLE IF EXISTS `civicrm_action_log`;
 DROP TABLE IF EXISTS `civicrm_action_schedule`;
-DROP TABLE IF EXISTS `civicrm_uf_join`;
-DROP TABLE IF EXISTS `civicrm_uf_field`;
-DROP TABLE IF EXISTS `civicrm_uf_group`;
-DROP TABLE IF EXISTS `civicrm_entity_tag`;
-DROP TABLE IF EXISTS `civicrm_entity_file`;
-DROP TABLE IF EXISTS `civicrm_discount`;
-DROP TABLE IF EXISTS `civicrm_dashboard`;
+DROP TABLE IF EXISTS `civicrm_address`;
+DROP TABLE IF EXISTS `civicrm_address_format`;
+DROP TABLE IF EXISTS `civicrm_cache`;
+DROP TABLE IF EXISTS `civicrm_component`;
+DROP TABLE IF EXISTS `civicrm_country`;
 DROP TABLE IF EXISTS `civicrm_county`;
-DROP TABLE IF EXISTS `civicrm_price_set_entity`;
-DROP TABLE IF EXISTS `civicrm_price_set`;
-DROP TABLE IF EXISTS `civicrm_report_instance`;
-DROP TABLE IF EXISTS `civicrm_pledge`;
-DROP TABLE IF EXISTS `civicrm_case_contact`;
-DROP TABLE IF EXISTS `civicrm_case`;
-DROP TABLE IF EXISTS `civicrm_membership_block`;
-DROP TABLE IF EXISTS `civicrm_membership_type`;
-DROP TABLE IF EXISTS `civicrm_sms_provider`;
-DROP TABLE IF EXISTS `civicrm_payment_token`;
-DROP TABLE IF EXISTS `civicrm_payment_processor`;
-DROP TABLE IF EXISTS `civicrm_contribution_widget`;
-DROP TABLE IF EXISTS `civicrm_premiums_product`;
-DROP TABLE IF EXISTS `civicrm_product`;
-DROP TABLE IF EXISTS `civicrm_contribution_page`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_confirm`;
-DROP TABLE IF EXISTS `civicrm_mailing_event_subscribe`;
-DROP TABLE IF EXISTS `civicrm_group_organization`;
-DROP TABLE IF EXISTS `civicrm_group_nesting`;
-DROP TABLE IF EXISTS `civicrm_group_contact_cache`;
-DROP TABLE IF EXISTS `civicrm_subscription_history`;
-DROP TABLE IF EXISTS `civicrm_group`;
-DROP TABLE IF EXISTS `civicrm_status_pref`;
-DROP TABLE IF EXISTS `civicrm_word_replacement`;
+DROP TABLE IF EXISTS `civicrm_custom_field`;
+DROP TABLE IF EXISTS `civicrm_custom_group`;
+DROP TABLE IF EXISTS `civicrm_dashboard`;
+DROP TABLE IF EXISTS `civicrm_discount`;
+DROP TABLE IF EXISTS `civicrm_domain`;
+DROP TABLE IF EXISTS `civicrm_email`;
+DROP TABLE IF EXISTS `civicrm_entity_file`;
+DROP TABLE IF EXISTS `civicrm_entity_tag`;
+DROP TABLE IF EXISTS `civicrm_extension`;
+DROP TABLE IF EXISTS `civicrm_file`;
+DROP TABLE IF EXISTS `civicrm_im`;
+DROP TABLE IF EXISTS `civicrm_job`;
+DROP TABLE IF EXISTS `civicrm_job_log`;
+DROP TABLE IF EXISTS `civicrm_loc_block`;
+DROP TABLE IF EXISTS `civicrm_location_type`;
+DROP TABLE IF EXISTS `civicrm_log`;
+DROP TABLE IF EXISTS `civicrm_mail_settings`;
+DROP TABLE IF EXISTS `civicrm_managed`;
+DROP TABLE IF EXISTS `civicrm_mapping`;
+DROP TABLE IF EXISTS `civicrm_mapping_field`;
+DROP TABLE IF EXISTS `civicrm_menu`;
+DROP TABLE IF EXISTS `civicrm_msg_template`;
+DROP TABLE IF EXISTS `civicrm_navigation`;
+DROP TABLE IF EXISTS `civicrm_note`;
+DROP TABLE IF EXISTS `civicrm_openid`;
+DROP TABLE IF EXISTS `civicrm_option_group`;
+DROP TABLE IF EXISTS `civicrm_option_value`;
+DROP TABLE IF EXISTS `civicrm_phone`;
+DROP TABLE IF EXISTS `civicrm_preferences_date`;
+DROP TABLE IF EXISTS `civicrm_prevnext_cache`;
 DROP TABLE IF EXISTS `civicrm_print_label`;
+DROP TABLE IF EXISTS `civicrm_recurring_entity`;
 DROP TABLE IF EXISTS `civicrm_setting`;
-DROP TABLE IF EXISTS `civicrm_website`;
-DROP TABLE IF EXISTS `civicrm_openid`;
+DROP TABLE IF EXISTS `civicrm_state_province`;
+DROP TABLE IF EXISTS `civicrm_status_pref`;
+DROP TABLE IF EXISTS `civicrm_system_log`;
+DROP TABLE IF EXISTS `civicrm_tag`;
 DROP TABLE IF EXISTS `civicrm_timezone`;
-DROP TABLE IF EXISTS `civicrm_user_job`;
+DROP TABLE IF EXISTS `civicrm_translation`;
+DROP TABLE IF EXISTS `civicrm_uf_field`;
+DROP TABLE IF EXISTS `civicrm_uf_group`;
+DROP TABLE IF EXISTS `civicrm_uf_join`;
 DROP TABLE IF EXISTS `civicrm_uf_match`;
-DROP TABLE IF EXISTS `civicrm_tag`;
-DROP TABLE IF EXISTS `civicrm_state_province`;
-DROP TABLE IF EXISTS `civicrm_phone`;
-DROP TABLE IF EXISTS `civicrm_option_value`;
-DROP TABLE IF EXISTS `civicrm_note`;
-DROP TABLE IF EXISTS `civicrm_navigation`;
-DROP TABLE IF EXISTS `civicrm_menu`;
-DROP TABLE IF EXISTS `civicrm_mapping_field`;
-DROP TABLE IF EXISTS `civicrm_mail_settings`;
-DROP TABLE IF EXISTS `civicrm_log`;
-DROP TABLE IF EXISTS `civicrm_job_log`;
-DROP TABLE IF EXISTS `civicrm_job`;
-DROP TABLE IF EXISTS `civicrm_im`;
-DROP TABLE IF EXISTS `civicrm_file`;
-DROP TABLE IF EXISTS `civicrm_email`;
-DROP TABLE IF EXISTS `civicrm_domain`;
-DROP TABLE IF EXISTS `civicrm_custom_field`;
-DROP TABLE IF EXISTS `civicrm_custom_group`;
-DROP TABLE IF EXISTS `civicrm_country`;
-DROP TABLE IF EXISTS `civicrm_cache`;
+DROP TABLE IF EXISTS `civicrm_user_job`;
+DROP TABLE IF EXISTS `civicrm_website`;
+DROP TABLE IF EXISTS `civicrm_word_replacement`;
+DROP TABLE IF EXISTS `civicrm_worldregion`;
 DROP TABLE IF EXISTS `civicrm_cxn`;
-DROP TABLE IF EXISTS `civicrm_pcp`;
-DROP TABLE IF EXISTS `civicrm_queue_item`;
-DROP TABLE IF EXISTS `civicrm_queue`;
-DROP TABLE IF EXISTS `civicrm_pledge_block`;
-DROP TABLE IF EXISTS `civicrm_tell_friend`;
-DROP TABLE IF EXISTS `civicrm_case_type`;
 DROP TABLE IF EXISTS `civicrm_dedupe_exception`;
 DROP TABLE IF EXISTS `civicrm_dedupe_rule`;
 DROP TABLE IF EXISTS `civicrm_dedupe_rule_group`;
 DROP TABLE IF EXISTS `civicrm_event_carts`;
+DROP TABLE IF EXISTS `civicrm_event`;
+DROP TABLE IF EXISTS `civicrm_events_in_carts`;
+DROP TABLE IF EXISTS `civicrm_participant`;
+DROP TABLE IF EXISTS `civicrm_participant_payment`;
 DROP TABLE IF EXISTS `civicrm_participant_status_type`;
-DROP TABLE IF EXISTS `civicrm_survey`;
-DROP TABLE IF EXISTS `civicrm_campaign_group`;
-DROP TABLE IF EXISTS `civicrm_campaign`;
-DROP TABLE IF EXISTS `civicrm_membership_status`;
-DROP TABLE IF EXISTS `civicrm_financial_item`;
+DROP TABLE IF EXISTS `civicrm_currency`;
 DROP TABLE IF EXISTS `civicrm_entity_financial_account`;
+DROP TABLE IF EXISTS `civicrm_entity_financial_trxn`;
+DROP TABLE IF EXISTS `civicrm_financial_account`;
+DROP TABLE IF EXISTS `civicrm_financial_item`;
+DROP TABLE IF EXISTS `civicrm_financial_trxn`;
 DROP TABLE IF EXISTS `civicrm_financial_type`;
+DROP TABLE IF EXISTS `civicrm_payment_processor`;
 DROP TABLE IF EXISTS `civicrm_payment_processor_type`;
-DROP TABLE IF EXISTS `civicrm_financial_account`;
-DROP TABLE IF EXISTS `civicrm_currency`;
-DROP TABLE IF EXISTS `civicrm_premiums`;
+DROP TABLE IF EXISTS `civicrm_payment_token`;
+DROP TABLE IF EXISTS `civicrm_tell_friend`;
 DROP TABLE IF EXISTS `civicrm_mailing_bounce_pattern`;
 DROP TABLE IF EXISTS `civicrm_mailing_bounce_type`;
+DROP TABLE IF EXISTS `civicrm_mailing`;
 DROP TABLE IF EXISTS `civicrm_mailing_abtest`;
 DROP TABLE IF EXISTS `civicrm_mailing_component`;
-DROP TABLE IF EXISTS `civicrm_entity_batch`;
-DROP TABLE IF EXISTS `civicrm_batch`;
-DROP TABLE IF EXISTS `civicrm_contact_type`;
-DROP TABLE IF EXISTS `civicrm_saved_search`;
-DROP TABLE IF EXISTS `civicrm_relationship_type`;
-DROP TABLE IF EXISTS `civicrm_acl_contact_cache`;
-DROP TABLE IF EXISTS `civicrm_contact`;
-DROP TABLE IF EXISTS `civicrm_acl_entity_role`;
-DROP TABLE IF EXISTS `civicrm_acl_cache`;
-DROP TABLE IF EXISTS `civicrm_acl`;
-DROP TABLE IF EXISTS `civicrm_recurring_entity`;
-DROP TABLE IF EXISTS `civicrm_prevnext_cache`;
-DROP TABLE IF EXISTS `civicrm_component`;
-DROP TABLE IF EXISTS `civicrm_worldregion`;
-DROP TABLE IF EXISTS `civicrm_translation`;
-DROP TABLE IF EXISTS `civicrm_system_log`;
-DROP TABLE IF EXISTS `civicrm_preferences_date`;
-DROP TABLE IF EXISTS `civicrm_option_group`;
-DROP TABLE IF EXISTS `civicrm_msg_template`;
-DROP TABLE IF EXISTS `civicrm_mapping`;
-DROP TABLE IF EXISTS `civicrm_managed`;
-DROP TABLE IF EXISTS `civicrm_location_type`;
-DROP TABLE IF EXISTS `civicrm_extension`;
-DROP TABLE IF EXISTS `civicrm_address_format`;
-
+DROP TABLE IF EXISTS `civicrm_mailing_event_bounce`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_confirm`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_delivered`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_forward`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_opened`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_queue`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_reply`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_subscribe`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_trackable_url_open`;
+DROP TABLE IF EXISTS `civicrm_mailing_event_unsubscribe`;
+DROP TABLE IF EXISTS `civicrm_mailing_group`;
+DROP TABLE IF EXISTS `civicrm_mailing_job`;
+DROP TABLE IF EXISTS `civicrm_mailing_recipients`;
+DROP TABLE IF EXISTS `civicrm_mailing_trackable_url`;
+DROP TABLE IF EXISTS `civicrm_mailing_spool`;
+DROP TABLE IF EXISTS `civicrm_membership`;
+DROP TABLE IF EXISTS `civicrm_membership_block`;
+DROP TABLE IF EXISTS `civicrm_membership_log`;
+DROP TABLE IF EXISTS `civicrm_membership_payment`;
+DROP TABLE IF EXISTS `civicrm_membership_status`;
+DROP TABLE IF EXISTS `civicrm_membership_type`;
+DROP TABLE IF EXISTS `civicrm_pcp`;
+DROP TABLE IF EXISTS `civicrm_pcp_block`;
+DROP TABLE IF EXISTS `civicrm_pledge`;
+DROP TABLE IF EXISTS `civicrm_pledge_block`;
+DROP TABLE IF EXISTS `civicrm_pledge_payment`;
+DROP TABLE IF EXISTS `civicrm_line_item`;
+DROP TABLE IF EXISTS `civicrm_price_field`;
+DROP TABLE IF EXISTS `civicrm_price_field_value`;
+DROP TABLE IF EXISTS `civicrm_price_set`;
+DROP TABLE IF EXISTS `civicrm_price_set_entity`;
+DROP TABLE IF EXISTS `civicrm_queue`;
+DROP TABLE IF EXISTS `civicrm_queue_item`;
+DROP TABLE IF EXISTS `civicrm_report_instance`;
+DROP TABLE IF EXISTS `civicrm_sms_provider`;
 SET FOREIGN_KEY_CHECKS=1;
diff --git a/www/modules/civicrm/sql/civicrm_generated.mysql b/www/modules/civicrm/sql/civicrm_generated.mysql
index 2190f7fc9..2eb8d3786 100644
--- a/www/modules/civicrm/sql/civicrm_generated.mysql
+++ b/www/modules/civicrm/sql/civicrm_generated.mysql
@@ -1,15 +1,16 @@
--- MariaDB dump 10.19  Distrib 10.5.15-MariaDB, for debian-linux-gnu (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.36, for Linux (x86_64)
 --
--- Host: database    Database: dmastercivicrm
+-- Host: 127.0.0.1    Database: db
 -- ------------------------------------------------------
--- Server version	10.4.32-MariaDB-1:10.4.32+maria~ubu2004
+-- Server version	8.0.36
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8mb4 */;
+/*!50503 SET NAMES utf8mb4 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
@@ -81,647 +82,647 @@ 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,56,'Subject for Interview','2023-12-08 20:02:13',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (2,NULL,1,'Subject for Meeting','2023-08-31 16:31:31',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (3,NULL,9,'Subject for Tell a Friend','2023-04-20 23:09:00',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (4,NULL,56,'Subject for Interview','2023-11-19 20:00:13',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (5,NULL,1,'Subject for Meeting','2023-05-22 16:08:47',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (6,NULL,1,'Subject for Meeting','2023-07-03 00:18:29',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (7,NULL,56,'Subject for Interview','2023-01-08 23:17:12',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (8,NULL,2,'Subject for Phone Call','2023-08-23 04:58:41',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (9,NULL,2,'Subject for Phone Call','2023-04-24 18:50:53',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (10,NULL,2,'Subject for Phone Call','2023-09-06 03:25:21',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (11,NULL,2,'Subject for Phone Call','2023-02-21 14:47:42',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (12,NULL,56,'Subject for Interview','2023-07-14 16:07:39',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (13,NULL,1,'Subject for Meeting','2023-08-11 12:02:39',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (14,NULL,56,'Subject for Interview','2023-03-01 02:51:35',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (15,NULL,22,'Subject for Print/Merge Document','2023-01-19 19:44:22',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (16,NULL,1,'Subject for Meeting','2023-10-15 10:14:27',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (17,NULL,56,'Subject for Interview','2023-08-12 17:24:05',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (18,NULL,2,'Subject for Phone Call','2023-04-02 02:08:57',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (19,NULL,22,'Subject for Print/Merge Document','2023-04-23 04:59:41',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (20,NULL,22,'Subject for Print/Merge Document','2023-09-15 15:19:37',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (21,NULL,56,'Subject for Interview','2023-02-26 08:45:07',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (22,NULL,2,'Subject for Phone Call','2023-08-09 12:36:10',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (23,NULL,22,'Subject for Print/Merge Document','2023-05-24 05:18:06',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (24,NULL,1,'Subject for Meeting','2023-07-11 11:44:25',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (25,NULL,56,'Subject for Interview','2023-11-27 21:29:46',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (26,NULL,9,'Subject for Tell a Friend','2023-07-23 11:15:38',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (27,NULL,22,'Subject for Print/Merge Document','2023-06-14 05:21:52',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (28,NULL,2,'Subject for Phone Call','2023-07-18 10:21:10',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (29,NULL,22,'Subject for Print/Merge Document','2023-06-30 05:54:30',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (30,NULL,2,'Subject for Phone Call','2023-01-13 16:17:40',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (31,NULL,2,'Subject for Phone Call','2023-01-12 21:50:25',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (32,NULL,9,'Subject for Tell a Friend','2023-07-30 22:12:41',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (33,NULL,2,'Subject for Phone Call','2023-01-14 13:39:32',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (34,NULL,1,'Subject for Meeting','2023-10-30 12:32:29',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (35,NULL,1,'Subject for Meeting','2023-05-18 11:51:15',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (36,NULL,22,'Subject for Print/Merge Document','2023-11-04 20:51:54',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (37,NULL,1,'Subject for Meeting','2023-02-18 10:23:44',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (38,NULL,9,'Subject for Tell a Friend','2023-06-13 15:33:53',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (39,NULL,2,'Subject for Phone Call','2023-06-03 05:16:11',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (40,NULL,1,'Subject for Meeting','2023-12-16 19:06:33',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (41,NULL,9,'Subject for Tell a Friend','2023-10-31 06:34:52',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (42,NULL,9,'Subject for Tell a Friend','2023-05-10 21:32:51',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (43,NULL,2,'Subject for Phone Call','2023-05-16 09:11:00',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (44,NULL,1,'Subject for Meeting','2023-07-01 03:37:49',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (45,NULL,22,'Subject for Print/Merge Document','2023-10-06 19:18:08',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (46,NULL,22,'Subject for Print/Merge Document','2023-06-09 14:58:32',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (47,NULL,22,'Subject for Print/Merge Document','2023-08-24 07:29:01',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (48,NULL,56,'Subject for Interview','2023-06-14 20:22:18',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (49,NULL,9,'Subject for Tell a Friend','2023-12-05 22:26:45',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (50,NULL,1,'Subject for Meeting','2023-02-02 17:44:30',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (51,NULL,22,'Subject for Print/Merge Document','2023-04-18 03:00:32',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (52,NULL,9,'Subject for Tell a Friend','2023-04-24 08:38:24',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (53,NULL,9,'Subject for Tell a Friend','2023-12-24 17:45:23',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (54,NULL,1,'Subject for Meeting','2023-08-29 00:00:35',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (55,NULL,1,'Subject for Meeting','2023-06-28 12:35:52',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (56,NULL,22,'Subject for Print/Merge Document','2023-11-22 23:47:26',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (57,NULL,9,'Subject for Tell a Friend','2023-12-11 12:58:23',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (58,NULL,2,'Subject for Phone Call','2023-09-14 13:41:44',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (59,NULL,1,'Subject for Meeting','2023-06-23 01:24:08',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (60,NULL,1,'Subject for Meeting','2023-03-07 18:42:07',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (61,NULL,9,'Subject for Tell a Friend','2023-07-07 20:26:44',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (62,NULL,2,'Subject for Phone Call','2023-05-19 08:48:03',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (63,NULL,22,'Subject for Print/Merge Document','2023-05-28 01:15:31',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (64,NULL,9,'Subject for Tell a Friend','2023-11-03 08:48:20',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (65,NULL,9,'Subject for Tell a Friend','2023-12-18 22:10:31',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (66,NULL,2,'Subject for Phone Call','2023-03-18 12:22:54',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (67,NULL,56,'Subject for Interview','2023-11-01 14:07:03',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (68,NULL,9,'Subject for Tell a Friend','2023-07-25 15:05:26',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (69,NULL,2,'Subject for Phone Call','2023-08-15 22:47:24',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (70,NULL,2,'Subject for Phone Call','2023-11-04 22:54:46',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (71,NULL,1,'Subject for Meeting','2023-11-13 07:02:14',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (72,NULL,56,'Subject for Interview','2023-04-25 17:46:30',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (73,NULL,1,'Subject for Meeting','2023-11-17 13:13:09',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (74,NULL,1,'Subject for Meeting','2023-04-01 10:12:35',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (75,NULL,2,'Subject for Phone Call','2023-11-28 06:57:38',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (76,NULL,22,'Subject for Print/Merge Document','2023-11-12 19:32:46',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (77,NULL,56,'Subject for Interview','2023-04-12 13:49:37',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (78,NULL,9,'Subject for Tell a Friend','2023-12-30 12:22:18',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (79,NULL,9,'Subject for Tell a Friend','2023-10-10 06:23:36',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (80,NULL,22,'Subject for Print/Merge Document','2023-05-12 12:26:32',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (81,NULL,22,'Subject for Print/Merge Document','2023-06-29 19:34:27',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (82,NULL,22,'Subject for Print/Merge Document','2023-04-27 14:41:22',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (83,NULL,22,'Subject for Print/Merge Document','2023-07-31 08:04:26',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (84,NULL,22,'Subject for Print/Merge Document','2023-02-24 05:24:59',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (85,NULL,22,'Subject for Print/Merge Document','2023-10-07 14:20:53',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (86,NULL,9,'Subject for Tell a Friend','2023-08-18 05:18:02',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (87,NULL,1,'Subject for Meeting','2023-05-14 18:32:35',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (88,NULL,2,'Subject for Phone Call','2023-05-16 07:58:55',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (89,NULL,2,'Subject for Phone Call','2023-06-13 14:52:36',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (90,NULL,22,'Subject for Print/Merge Document','2023-05-02 12:12:45',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (91,NULL,2,'Subject for Phone Call','2023-11-03 02:04:27',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (92,NULL,9,'Subject for Tell a Friend','2023-07-11 05:11:15',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (93,NULL,22,'Subject for Print/Merge Document','2023-12-16 11:33:40',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (94,NULL,9,'Subject for Tell a Friend','2023-06-07 10:52:05',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (95,NULL,56,'Subject for Interview','2023-03-23 08:11:38',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (96,NULL,1,'Subject for Meeting','2023-07-23 07:30:25',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (97,NULL,9,'Subject for Tell a Friend','2023-09-28 21:51:25',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (98,NULL,1,'Subject for Meeting','2023-09-03 15:08:29',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (99,NULL,1,'Subject for Meeting','2023-07-30 07:52:57',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (100,NULL,56,'Subject for Interview','2023-10-12 23:10:13',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (101,NULL,1,'Subject for Meeting','2023-04-19 03:03:37',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (102,NULL,9,'Subject for Tell a Friend','2023-09-01 18:40:23',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (103,NULL,56,'Subject for Interview','2023-08-29 02:50:54',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (104,NULL,2,'Subject for Phone Call','2023-05-23 19:43:49',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (105,NULL,2,'Subject for Phone Call','2023-12-28 10:55:33',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (106,NULL,56,'Subject for Interview','2023-08-26 04:12:32',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (107,NULL,56,'Subject for Interview','2023-09-08 19:07:13',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (108,NULL,1,'Subject for Meeting','2023-06-28 20:12:54',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (109,NULL,9,'Subject for Tell a Friend','2023-04-14 10:25:54',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (110,NULL,9,'Subject for Tell a Friend','2023-04-20 21:54:39',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (111,NULL,2,'Subject for Phone Call','2023-01-28 09:06:15',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (112,NULL,22,'Subject for Print/Merge Document','2023-08-30 11:18:02',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (113,NULL,1,'Subject for Meeting','2023-04-04 17:04:46',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (114,NULL,9,'Subject for Tell a Friend','2023-03-29 22:31:52',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (115,NULL,56,'Subject for Interview','2023-07-30 18:24:47',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (116,NULL,56,'Subject for Interview','2023-08-31 03:05:18',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (117,NULL,1,'Subject for Meeting','2023-09-28 23:55:34',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (118,NULL,56,'Subject for Interview','2023-02-01 05:10:50',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (119,NULL,56,'Subject for Interview','2023-07-02 17:10:17',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (120,NULL,56,'Subject for Interview','2023-10-22 11:00:34',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (121,NULL,22,'Subject for Print/Merge Document','2023-05-07 03:59:51',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (122,NULL,1,'Subject for Meeting','2023-06-05 13:00:47',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (123,NULL,2,'Subject for Phone Call','2023-06-05 11:37:22',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (124,NULL,1,'Subject for Meeting','2023-03-05 09:21:15',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (125,NULL,56,'Subject for Interview','2023-07-07 16:43:28',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (126,NULL,2,'Subject for Phone Call','2023-06-19 13:52:02',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (127,NULL,1,'Subject for Meeting','2023-02-15 16:12:59',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (128,NULL,56,'Subject for Interview','2023-03-07 22:10:09',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (129,NULL,56,'Subject for Interview','2023-01-25 03:39:41',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (130,NULL,1,'Subject for Meeting','2023-03-22 17:19:17',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (131,NULL,1,'Subject for Meeting','2023-03-11 07:40:17',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (132,NULL,1,'Subject for Meeting','2023-01-18 09:59:06',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (133,NULL,1,'Subject for Meeting','2023-10-05 13:03:16',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (134,NULL,1,'Subject for Meeting','2023-07-25 18:18:45',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (135,NULL,22,'Subject for Print/Merge Document','2023-02-23 06:08:35',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (136,NULL,2,'Subject for Phone Call','2023-12-19 21:49:00',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (137,NULL,56,'Subject for Interview','2023-06-03 05:53:24',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (138,NULL,9,'Subject for Tell a Friend','2023-04-10 21:32:25',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (139,NULL,1,'Subject for Meeting','2023-09-29 08:44:45',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (140,NULL,9,'Subject for Tell a Friend','2023-04-25 19:53:07',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (141,NULL,9,'Subject for Tell a Friend','2023-09-04 03:55:59',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (142,NULL,9,'Subject for Tell a Friend','2023-05-09 03:50:41',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (143,NULL,2,'Subject for Phone Call','2023-02-20 06:36:19',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (144,NULL,9,'Subject for Tell a Friend','2023-02-28 02:42:30',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (145,NULL,9,'Subject for Tell a Friend','2023-05-07 10:21:13',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (146,NULL,56,'Subject for Interview','2023-10-09 17:48:12',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (147,NULL,1,'Subject for Meeting','2023-03-24 01:57:47',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (148,NULL,2,'Subject for Phone Call','2023-09-21 17:11:04',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (149,NULL,56,'Subject for Interview','2023-12-18 16:15:15',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (150,NULL,1,'Subject for Meeting','2023-05-30 02:05:26',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (151,NULL,1,'Subject for Meeting','2023-07-23 16:49:15',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (152,NULL,1,'Subject for Meeting','2023-11-25 16:54:44',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (153,NULL,22,'Subject for Print/Merge Document','2023-12-31 10:09:30',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (154,NULL,56,'Subject for Interview','2023-06-17 07:12:05',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (155,NULL,1,'Subject for Meeting','2023-10-26 07:29:22',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (156,NULL,56,'Subject for Interview','2023-11-20 08:33:00',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (157,NULL,56,'Subject for Interview','2023-12-09 16:37:17',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (158,NULL,9,'Subject for Tell a Friend','2024-01-01 09:40:28',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (159,NULL,9,'Subject for Tell a Friend','2023-01-19 22:41:51',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (160,NULL,1,'Subject for Meeting','2023-03-20 08:29:19',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (161,NULL,9,'Subject for Tell a Friend','2023-12-03 21:05:24',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (162,NULL,22,'Subject for Print/Merge Document','2023-02-03 12:17:32',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (163,NULL,2,'Subject for Phone Call','2023-07-26 12:16:33',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (164,NULL,2,'Subject for Phone Call','2023-12-27 01:31:10',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (165,NULL,56,'Subject for Interview','2023-05-01 03:48:45',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (166,NULL,2,'Subject for Phone Call','2023-04-20 15:02:33',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (167,NULL,1,'Subject for Meeting','2023-08-12 06:07:22',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (168,NULL,2,'Subject for Phone Call','2023-05-10 04:17:33',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (169,NULL,22,'Subject for Print/Merge Document','2023-01-22 06:32:25',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (170,NULL,9,'Subject for Tell a Friend','2023-08-08 10:23:42',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (171,NULL,9,'Subject for Tell a Friend','2023-03-17 09:45:13',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (172,NULL,22,'Subject for Print/Merge Document','2023-08-06 17:03:42',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (173,NULL,9,'Subject for Tell a Friend','2023-11-22 23:11:34',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (174,NULL,2,'Subject for Phone Call','2023-12-03 01:03:45',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (175,NULL,22,'Subject for Print/Merge Document','2023-07-02 11:17:57',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (176,NULL,1,'Subject for Meeting','2023-09-22 01:12:31',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (177,NULL,2,'Subject for Phone Call','2023-07-16 00:45:01',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (178,NULL,9,'Subject for Tell a Friend','2023-07-29 22:06:27',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (179,NULL,1,'Subject for Meeting','2023-11-23 09:55:47',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (180,NULL,22,'Subject for Print/Merge Document','2023-09-12 09:44:53',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (181,NULL,2,'Subject for Phone Call','2023-11-16 11:10:21',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (182,NULL,2,'Subject for Phone Call','2023-01-18 02:46:06',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (183,NULL,56,'Subject for Interview','2023-06-11 10:04:13',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (184,NULL,56,'Subject for Interview','2023-02-05 16:20:44',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29'),
- (185,NULL,56,'Subject for Interview','2023-06-11 22:09:04',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (186,NULL,22,'Subject for Print/Merge Document','2023-06-27 13:37:04',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (187,NULL,56,'Subject for Interview','2023-02-12 02:40:53',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (188,NULL,2,'Subject for Phone Call','2023-03-07 10:52:39',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (189,NULL,1,'Subject for Meeting','2023-03-14 07:12:00',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (190,NULL,9,'Subject for Tell a Friend','2023-03-25 01:23:11',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (191,NULL,9,'Subject for Tell a Friend','2023-02-16 01:57:20',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (192,NULL,9,'Subject for Tell a Friend','2023-08-07 10:00:15',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (193,NULL,9,'Subject for Tell a Friend','2023-06-19 14:56:07',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (194,NULL,1,'Subject for Meeting','2023-08-08 13:48:36',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (195,NULL,2,'Subject for Phone Call','2023-10-07 15:52:20',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (196,NULL,9,'Subject for Tell a Friend','2023-07-21 23:53:01',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (197,NULL,1,'Subject for Meeting','2023-04-21 06:18:03',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (198,NULL,22,'Subject for Print/Merge Document','2023-11-17 10:27:15',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (199,NULL,2,'Subject for Phone Call','2023-09-29 03:50:04',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (200,NULL,9,'Subject for Tell a Friend','2023-08-08 07:24:11',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (201,NULL,1,'Subject for Meeting','2023-07-17 08:01:39',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (202,NULL,1,'Subject for Meeting','2023-06-21 16:58:34',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (203,NULL,56,'Subject for Interview','2023-10-03 05:05:50',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (204,NULL,56,'Subject for Interview','2023-04-06 21:45:30',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (205,NULL,22,'Subject for Print/Merge Document','2023-02-08 04:12:52',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (206,NULL,56,'Subject for Interview','2023-04-21 23:57:21',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (207,NULL,1,'Subject for Meeting','2023-01-09 06:20:34',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (208,NULL,22,'Subject for Print/Merge Document','2023-06-06 15:09:23',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (209,NULL,22,'Subject for Print/Merge Document','2023-04-09 17:17:10',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (210,NULL,2,'Subject for Phone Call','2023-07-23 13:14:55',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (211,NULL,56,'Subject for Interview','2023-12-27 08:47:27',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (212,NULL,22,'Subject for Print/Merge Document','2024-01-02 04:11:54',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (213,NULL,2,'Subject for Phone Call','2023-10-21 15:23:47',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (214,NULL,1,'Subject for Meeting','2024-01-03 18:15:04',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (215,NULL,22,'Subject for Print/Merge Document','2023-04-25 20:47:03',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (216,NULL,22,'Subject for Print/Merge Document','2023-08-05 00:54:31',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (217,NULL,9,'Subject for Tell a Friend','2023-02-24 10:44:26',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (218,NULL,56,'Subject for Interview','2023-11-27 18:58:41',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (219,NULL,2,'Subject for Phone Call','2023-12-19 03:16:32',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (220,NULL,2,'Subject for Phone Call','2023-09-05 13:58:02',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (221,NULL,1,'Subject for Meeting','2023-12-11 23:27:28',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (222,NULL,2,'Subject for Phone Call','2023-07-23 13:18:31',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (223,NULL,22,'Subject for Print/Merge Document','2023-10-15 09:56:59',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (224,NULL,9,'Subject for Tell a Friend','2023-04-29 11:21:59',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (225,NULL,9,'Subject for Tell a Friend','2023-03-28 22:22:11',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (226,NULL,56,'Subject for Interview','2023-06-30 03:16:21',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (227,NULL,22,'Subject for Print/Merge Document','2023-12-23 12:09:55',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (228,NULL,9,'Subject for Tell a Friend','2023-01-12 05:47:14',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (229,NULL,56,'Subject for Interview','2023-09-05 01:28:02',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (230,NULL,1,'Subject for Meeting','2023-06-08 17:56:57',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (231,NULL,56,'Subject for Interview','2023-05-15 06:51:05',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (232,NULL,56,'Subject for Interview','2023-06-11 08:57:11',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (233,NULL,2,'Subject for Phone Call','2023-12-22 23:33:21',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (234,NULL,56,'Subject for Interview','2023-10-17 11:38:23',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (235,NULL,2,'Subject for Phone Call','2023-09-06 13:27:16',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (236,NULL,9,'Subject for Tell a Friend','2023-02-15 23:58:49',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (237,NULL,9,'Subject for Tell a Friend','2023-05-06 18:48:05',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (238,NULL,22,'Subject for Print/Merge Document','2024-01-01 21:18:07',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (239,NULL,1,'Subject for Meeting','2023-11-22 20:36:56',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (240,NULL,1,'Subject for Meeting','2023-08-16 21:19:14',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (241,NULL,56,'Subject for Interview','2023-08-08 03:41:44',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (242,NULL,22,'Subject for Print/Merge Document','2023-05-30 09:31:44',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (243,NULL,1,'Subject for Meeting','2023-10-25 03:28:04',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (244,NULL,2,'Subject for Phone Call','2023-05-04 19:47:23',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (245,NULL,2,'Subject for Phone Call','2023-03-20 16:29:44',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (246,NULL,1,'Subject for Meeting','2023-10-04 20:39:36',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (247,NULL,1,'Subject for Meeting','2023-08-23 16:16:44',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (248,NULL,1,'Subject for Meeting','2023-09-17 20:05:45',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (249,NULL,1,'Subject for Meeting','2023-08-17 02:08:44',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (250,NULL,22,'Subject for Print/Merge Document','2023-02-08 15:00:45',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (251,NULL,1,'Subject for Meeting','2023-11-03 07:55:22',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (252,NULL,1,'Subject for Meeting','2023-03-01 22:12:29',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (253,NULL,22,'Subject for Print/Merge Document','2023-11-26 04:46:58',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (254,NULL,1,'Subject for Meeting','2023-02-13 05:24:44',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (255,NULL,2,'Subject for Phone Call','2023-12-27 02:40:50',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (256,NULL,9,'Subject for Tell a Friend','2023-08-04 20:19:15',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (257,NULL,9,'Subject for Tell a Friend','2023-11-02 14:50:10',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (258,NULL,1,'Subject for Meeting','2023-02-13 03:00:11',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (259,NULL,2,'Subject for Phone Call','2023-02-27 22:39:06',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (260,NULL,56,'Subject for Interview','2023-02-21 19:09:48',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (261,NULL,56,'Subject for Interview','2023-04-28 16:18:34',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (262,NULL,22,'Subject for Print/Merge Document','2023-10-23 00:51:03',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (263,NULL,2,'Subject for Phone Call','2023-01-20 00:58:31',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (264,NULL,1,'Subject for Meeting','2023-01-29 14:16:12',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (265,NULL,1,'Subject for Meeting','2023-08-30 00:26:44',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (266,NULL,9,'Subject for Tell a Friend','2024-01-02 00:35:33',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (267,NULL,9,'Subject for Tell a Friend','2023-10-10 09:49:12',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (268,NULL,1,'Subject for Meeting','2023-11-01 11:12:31',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (269,NULL,56,'Subject for Interview','2023-12-22 04:12:25',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (270,NULL,1,'Subject for Meeting','2023-06-16 23:56:32',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (271,NULL,9,'Subject for Tell a Friend','2023-08-09 02:39:12',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (272,NULL,2,'Subject for Phone Call','2023-05-04 02:37:06',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (273,NULL,9,'Subject for Tell a Friend','2023-04-21 19:03:34',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (274,NULL,2,'Subject for Phone Call','2023-02-07 12:09:39',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (275,NULL,1,'Subject for Meeting','2023-09-21 08:37:11',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (276,NULL,9,'Subject for Tell a Friend','2023-04-28 01:58:30',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (277,NULL,1,'Subject for Meeting','2023-08-02 09:27:10',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (278,NULL,9,'Subject for Tell a Friend','2023-11-21 11:15:13',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (279,NULL,22,'Subject for Print/Merge Document','2023-04-20 16:17:40',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (280,NULL,22,'Subject for Print/Merge Document','2023-05-08 14:23:39',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (281,NULL,1,'Subject for Meeting','2023-05-15 16:18:09',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (282,NULL,9,'Subject for Tell a Friend','2023-05-25 07:58:36',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (283,NULL,22,'Subject for Print/Merge Document','2023-08-28 19:56:46',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (284,NULL,1,'Subject for Meeting','2023-05-18 09:32:41',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (285,NULL,9,'Subject for Tell a Friend','2023-01-09 00:16:12',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (286,NULL,2,'Subject for Phone Call','2023-06-12 05:53:19',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (287,NULL,2,'Subject for Phone Call','2023-02-10 05:05:26',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (288,NULL,9,'Subject for Tell a Friend','2023-11-30 14:20:29',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (289,NULL,9,'Subject for Tell a Friend','2023-03-14 06:12:03',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (290,NULL,22,'Subject for Print/Merge Document','2023-02-18 19:10:08',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (291,NULL,22,'Subject for Print/Merge Document','2023-10-03 19:17:29',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (292,NULL,56,'Subject for Interview','2023-01-23 06:16:26',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (293,NULL,56,'Subject for Interview','2023-11-03 18:10:56',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (294,NULL,1,'Subject for Meeting','2023-11-28 21:07:57',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (295,NULL,22,'Subject for Print/Merge Document','2023-10-09 12:09:02',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (296,NULL,9,'Subject for Tell a Friend','2023-12-08 00:44:30',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (297,NULL,22,'Subject for Print/Merge Document','2023-09-29 20:01:38',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (298,NULL,56,'Subject for Interview','2023-09-08 07:16:13',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (299,NULL,56,'Subject for Interview','2023-07-29 16:03:01',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (300,NULL,1,'Subject for Meeting','2023-02-21 23:11:19',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (301,NULL,22,'Subject for Print/Merge Document','2023-03-19 10:12:26',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (302,NULL,1,'Subject for Meeting','2023-08-27 16:32:17',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (303,NULL,1,'Subject for Meeting','2023-10-21 07:30:14',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (304,NULL,1,'Subject for Meeting','2023-01-25 12:51:49',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (305,NULL,22,'Subject for Print/Merge Document','2023-10-09 08:00:54',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (306,NULL,2,'Subject for Phone Call','2023-10-10 06:36:53',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (307,NULL,56,'Subject for Interview','2023-11-18 10:23:59',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (308,NULL,9,'Subject for Tell a Friend','2023-07-06 00:43:52',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (309,NULL,9,'Subject for Tell a Friend','2023-08-07 11:08:12',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (310,NULL,1,'Subject for Meeting','2023-12-23 20:35:21',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (311,NULL,9,'Subject for Tell a Friend','2023-04-22 15:23:52',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (312,NULL,56,'Subject for Interview','2023-12-11 17:21:17',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (313,NULL,9,'Subject for Tell a Friend','2024-01-04 02:52:31',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (314,NULL,9,'Subject for Tell a Friend','2023-03-17 14:01:54',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (315,NULL,1,'Subject for Meeting','2023-10-08 01:36:00',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (316,NULL,1,'Subject for Meeting','2023-04-04 08:13:49',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (317,NULL,1,'Subject for Meeting','2023-05-03 17:35:14',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (318,NULL,9,'Subject for Tell a Friend','2023-09-17 13:10:20',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (319,NULL,22,'Subject for Print/Merge Document','2023-01-12 04:48:40',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (320,NULL,1,'Subject for Meeting','2023-03-28 17:30:18',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (321,NULL,22,'Subject for Print/Merge Document','2023-05-22 09:35:54',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (322,NULL,56,'Subject for Interview','2023-04-08 20:27:55',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (323,NULL,2,'Subject for Phone Call','2023-02-05 18:46:47',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (324,NULL,9,'Subject for Tell a Friend','2023-06-28 16:07:33',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (325,NULL,2,'Subject for Phone Call','2023-05-09 19:30:35',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (326,NULL,22,'Subject for Print/Merge Document','2023-02-08 22:13:41',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (327,NULL,56,'Subject for Interview','2023-10-01 01:38:47',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (328,NULL,56,'Subject for Interview','2023-01-08 05:09:48',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (329,NULL,9,'Subject for Tell a Friend','2023-04-26 21:59:12',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (330,NULL,22,'Subject for Print/Merge Document','2023-04-20 22:55:32',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (331,NULL,1,'Subject for Meeting','2023-07-02 23:06:49',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (332,NULL,22,'Subject for Print/Merge Document','2023-05-16 12:17:42',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (333,NULL,9,'Subject for Tell a Friend','2023-07-03 04:22:07',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (334,NULL,2,'Subject for Phone Call','2023-12-24 17:51:09',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (335,NULL,1,'Subject for Meeting','2023-03-31 11:25:08',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (336,NULL,56,'Subject for Interview','2023-06-10 15:37:30',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (337,NULL,2,'Subject for Phone Call','2023-10-14 18:36:53',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (338,NULL,22,'Subject for Print/Merge Document','2023-02-25 11:36:05',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (339,NULL,22,'Subject for Print/Merge Document','2023-12-21 18:51:11',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (340,NULL,22,'Subject for Print/Merge Document','2023-08-06 04:47:06',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (341,NULL,9,'Subject for Tell a Friend','2023-01-11 08:02:41',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (342,NULL,1,'Subject for Meeting','2023-06-18 02:03:07',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (343,NULL,2,'Subject for Phone Call','2023-05-24 07:07:01',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (344,NULL,56,'Subject for Interview','2023-12-23 04:46:49',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (345,NULL,9,'Subject for Tell a Friend','2023-02-06 01:43:17',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (346,NULL,22,'Subject for Print/Merge Document','2023-11-18 14:02:58',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (347,NULL,9,'Subject for Tell a Friend','2023-09-17 22:43:11',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (348,NULL,9,'Subject for Tell a Friend','2023-09-12 21:37:27',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (349,NULL,9,'Subject for Tell a Friend','2023-10-02 21:18:48',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (350,NULL,1,'Subject for Meeting','2023-06-07 12:25:15',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (351,NULL,56,'Subject for Interview','2023-09-23 18:49:33',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (352,NULL,2,'Subject for Phone Call','2023-07-18 22:18:48',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (353,NULL,1,'Subject for Meeting','2023-03-14 09:17:30',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (354,NULL,56,'Subject for Interview','2023-06-27 05:12:45',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (355,NULL,1,'Subject for Meeting','2023-10-29 14:21:13',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (356,NULL,22,'Subject for Print/Merge Document','2023-11-13 07:07:12',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (357,NULL,22,'Subject for Print/Merge Document','2023-12-26 21:40:50',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (358,NULL,22,'Subject for Print/Merge Document','2023-11-27 17:22:08',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (359,NULL,1,'Subject for Meeting','2023-10-27 09:43:26',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (360,NULL,1,'Subject for Meeting','2023-04-27 21:02:14',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (361,NULL,2,'Subject for Phone Call','2023-04-17 10:53:36',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (362,NULL,1,'Subject for Meeting','2023-06-04 15:41:18',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (363,NULL,9,'Subject for Tell a Friend','2023-09-12 02:02:17',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (364,NULL,2,'Subject for Phone Call','2023-11-30 21:20:54',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (365,NULL,9,'Subject for Tell a Friend','2023-11-25 02:40:53',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (366,NULL,2,'Subject for Phone Call','2023-10-09 02:33:27',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (367,NULL,56,'Subject for Interview','2023-01-07 11:54:54',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (368,NULL,22,'Subject for Print/Merge Document','2023-06-15 18:13:13',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (369,NULL,1,'Subject for Meeting','2023-03-07 13:27:43',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (370,NULL,9,'Subject for Tell a Friend','2023-02-09 09:40:27',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (371,NULL,1,'Subject for Meeting','2023-08-19 07:29:44',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (372,NULL,1,'Subject for Meeting','2023-03-23 14:37:14',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (373,NULL,22,'Subject for Print/Merge Document','2023-12-01 22:07:50',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (374,NULL,9,'Subject for Tell a Friend','2023-02-13 18:28:42',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (375,NULL,2,'Subject for Phone Call','2023-01-18 16:09:05',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (376,NULL,9,'Subject for Tell a Friend','2023-01-17 12:40:56',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (377,NULL,1,'Subject for Meeting','2023-09-25 03:21:41',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (378,NULL,22,'Subject for Print/Merge Document','2023-11-23 04:33:41',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (379,NULL,2,'Subject for Phone Call','2023-07-27 21:33:12',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (380,NULL,2,'Subject for Phone Call','2023-03-15 00:45:36',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (381,NULL,9,'Subject for Tell a Friend','2023-04-13 15:32:28',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (382,NULL,56,'Subject for Interview','2023-02-11 11:21:57',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (383,NULL,56,'Subject for Interview','2023-12-02 19:02:23',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (384,NULL,22,'Subject for Print/Merge Document','2023-05-27 17:40:45',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (385,NULL,9,'Subject for Tell a Friend','2023-05-04 06:27:40',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (386,NULL,56,'Subject for Interview','2024-01-02 09:28:03',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (387,NULL,9,'Subject for Tell a Friend','2023-04-16 21:31:56',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (388,NULL,9,'Subject for Tell a Friend','2023-09-30 20:46:57',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (389,NULL,9,'Subject for Tell a Friend','2023-01-23 21:27:00',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (390,NULL,22,'Subject for Print/Merge Document','2023-04-19 04:42:14',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (391,NULL,56,'Subject for Interview','2023-10-14 22:23:21',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (392,NULL,56,'Subject for Interview','2023-11-03 01:16:18',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (393,NULL,1,'Subject for Meeting','2023-03-21 15:54:34',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (394,NULL,9,'Subject for Tell a Friend','2023-08-22 17:26:31',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (395,NULL,9,'Subject for Tell a Friend','2023-07-23 14:57:41',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (396,NULL,1,'Subject for Meeting','2023-10-03 22:22:48',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (397,NULL,1,'Subject for Meeting','2023-09-17 18:19:05',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (398,NULL,56,'Subject for Interview','2023-08-12 11:55:32',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (399,NULL,1,'Subject for Meeting','2023-10-31 11:34:24',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (400,NULL,1,'Subject for Meeting','2023-12-05 18:46:20',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (401,NULL,22,'Subject for Print/Merge Document','2023-05-26 12:29:20',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (402,NULL,2,'Subject for Phone Call','2023-04-20 20:26:49',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (403,NULL,22,'Subject for Print/Merge Document','2023-11-05 19:48:57',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (404,NULL,22,'Subject for Print/Merge Document','2023-09-27 18:46:37',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (405,NULL,56,'Subject for Interview','2023-08-11 16:45:27',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (406,NULL,22,'Subject for Print/Merge Document','2023-02-15 04:45:26',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (407,NULL,1,'Subject for Meeting','2023-10-30 00:03:34',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (408,NULL,2,'Subject for Phone Call','2023-10-18 04:20:02',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (409,NULL,56,'Subject for Interview','2023-09-25 11:35:31',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (410,NULL,56,'Subject for Interview','2023-01-22 11:32:12',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (411,NULL,2,'Subject for Phone Call','2023-07-10 14:35:14',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (412,NULL,2,'Subject for Phone Call','2023-06-20 18:32:11',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (413,NULL,9,'Subject for Tell a Friend','2023-02-12 16:05:09',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (414,NULL,22,'Subject for Print/Merge Document','2023-12-14 02:02:02',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (415,NULL,9,'Subject for Tell a Friend','2023-02-22 17:43:41',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (416,NULL,2,'Subject for Phone Call','2023-05-03 04:10:54',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (417,NULL,9,'Subject for Tell a Friend','2023-06-19 17:53:42',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (418,NULL,9,'Subject for Tell a Friend','2023-04-29 11:50:49',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (419,NULL,9,'Subject for Tell a Friend','2023-05-22 10:56:35',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (420,NULL,56,'Subject for Interview','2023-12-30 17:18:56',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (421,NULL,56,'Subject for Interview','2023-03-03 13:25:21',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (422,NULL,2,'Subject for Phone Call','2023-10-26 17:43:09',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (423,NULL,2,'Subject for Phone Call','2023-11-01 20:33:08',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (424,NULL,9,'Subject for Tell a Friend','2023-06-25 07:37:18',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (425,NULL,1,'Subject for Meeting','2023-09-11 05:16:59',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (426,NULL,9,'Subject for Tell a Friend','2023-12-15 22:30:04',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (427,NULL,2,'Subject for Phone Call','2023-10-21 04:59:02',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (428,NULL,1,'Subject for Meeting','2023-09-20 15:39:35',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (429,NULL,22,'Subject for Print/Merge Document','2023-03-06 12:14:37',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (430,NULL,56,'Subject for Interview','2023-11-26 23:03:37',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (431,NULL,9,'Subject for Tell a Friend','2023-05-10 01:00:35',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (432,NULL,56,'Subject for Interview','2023-12-28 00:20:07',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (433,NULL,22,'Subject for Print/Merge Document','2023-02-28 13:04:58',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (434,NULL,2,'Subject for Phone Call','2023-12-25 22:04:10',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (435,NULL,22,'Subject for Print/Merge Document','2023-03-09 11:58:28',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (436,NULL,56,'Subject for Interview','2023-07-27 00:17:36',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (437,NULL,9,'Subject for Tell a Friend','2023-01-27 01:46:42',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (438,NULL,22,'Subject for Print/Merge Document','2023-08-11 18:33:31',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (439,NULL,2,'Subject for Phone Call','2023-08-09 21:52:27',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (440,NULL,22,'Subject for Print/Merge Document','2023-02-13 23:19:46',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (441,NULL,9,'Subject for Tell a Friend','2023-07-30 23:37:16',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (442,NULL,1,'Subject for Meeting','2023-12-31 21:26:28',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (443,NULL,22,'Subject for Print/Merge Document','2023-02-19 00:27:08',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (444,NULL,22,'Subject for Print/Merge Document','2023-12-23 13:41:15',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (445,NULL,22,'Subject for Print/Merge Document','2023-06-28 11:16:44',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (446,NULL,2,'Subject for Phone Call','2023-07-08 19:24:53',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (447,NULL,22,'Subject for Print/Merge Document','2023-10-14 09:33:18',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (448,NULL,22,'Subject for Print/Merge Document','2023-04-28 06:28:06',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (449,NULL,22,'Subject for Print/Merge Document','2023-12-30 16:12:06',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (450,NULL,22,'Subject for Print/Merge Document','2023-05-07 12:23:14',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (451,1,6,'$ 125 April Mailer 1','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (452,2,6,'$ 50 Online: Save the Penguins','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (453,3,6,'£ 25 April Mailer 1','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (454,4,6,'$ 50 Online: Save the Penguins','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (455,5,6,'$ 50 Online: Save the Penguins','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (456,6,6,'$ 500 April Mailer 1','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (457,7,6,'$ 1750 Online: Save the Penguins','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (458,8,6,'$ 50 Online: Save the Penguins','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (459,9,6,'$ 10 Online: Help CiviCRM','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (460,10,6,'$ 250 Online: Help CiviCRM','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (461,11,6,'Â¥ 500 ','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (462,12,6,'$ 50 Online: Save the Penguins','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (463,13,6,'$ 50 ','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (464,14,6,'$ 50 ','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (465,15,6,'$ 25 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (466,16,6,'$ 25 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (467,17,6,'$ 25 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (468,18,6,'$ 25 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (469,19,6,'$ 25 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (470,20,6,'$ 25 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (471,21,6,'$ 25 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (472,22,6,'$ 25 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (473,23,6,'$ 25 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (474,24,6,'$ 25 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (475,25,6,'$ 25 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (476,26,6,'$ 10 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (477,27,6,'$ 10 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (478,28,6,'$ 10 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (479,29,6,'$ 10 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (480,30,6,'$ 10 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (481,31,6,'€ 5 Recurring contribution','2024-03-06 04:30:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (482,1,7,'General','2024-01-06 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (483,2,7,'Student','2024-01-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (484,3,7,'General','2024-01-04 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (485,4,7,'Student','2024-01-03 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (486,5,7,'General','2021-12-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (487,6,7,'Student','2024-01-01 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (488,7,7,'General','2023-12-31 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (489,8,7,'Student','2023-12-30 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (490,9,7,'General','2023-12-29 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (491,10,7,'Student','2022-12-28 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (492,11,7,'Lifetime','2023-12-27 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (493,12,7,'Student','2023-12-26 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (494,13,7,'General','2023-12-25 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (495,14,7,'Student','2023-12-24 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (496,15,7,'General','2021-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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (497,16,7,'Student','2023-12-22 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (498,17,7,'General','2023-12-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (499,18,7,'Student','2023-12-20 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (500,19,7,'General','2023-12-19 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (501,20,7,'Student','2022-12-18 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (502,21,7,'General','2023-12-17 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (503,22,7,'Lifetime','2023-12-16 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (504,23,7,'General','2023-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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (505,24,7,'Student','2023-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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (506,25,7,'Student','2022-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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (507,26,7,'Student','2023-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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (508,27,7,'General','2023-12-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (509,28,7,'Student','2023-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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (510,29,7,'General','2023-12-09 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (511,30,7,'General','2021-05-19 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (512,32,6,'$ 100.00 - General Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (513,33,6,'$ 50.00 - Student Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (514,34,6,'$ 100.00 - General Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (515,35,6,'$ 50.00 - Student Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (516,36,6,'$ 100.00 - General Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (517,37,6,'$ 50.00 - Student Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (518,38,6,'$ 100.00 - General Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (519,39,6,'$ 50.00 - Student Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (520,40,6,'$ 100.00 - General Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (521,41,6,'$ 50.00 - Student Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (522,42,6,'$ 1200.00 - Lifetime Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (523,43,6,'$ 50.00 - Student Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (524,44,6,'$ 100.00 - General Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (525,45,6,'$ 50.00 - Student Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (526,46,6,'$ 100.00 - General Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (527,47,6,'$ 50.00 - Student Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (528,48,6,'$ 100.00 - General Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (529,49,6,'$ 50.00 - Student Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (530,50,6,'$ 100.00 - General Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (531,51,6,'$ 50.00 - Student Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (532,52,6,'$ 100.00 - General Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (533,53,6,'$ 1200.00 - Lifetime Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (534,54,6,'$ 100.00 - General Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (535,55,6,'$ 50.00 - Student Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (536,56,6,'$ 50.00 - Student Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (537,57,6,'$ 50.00 - Student Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (538,58,6,'$ 100.00 - General Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (539,59,6,'$ 50.00 - Student Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (540,60,6,'$ 100.00 - General Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (541,61,6,'$ 100.00 - General Membership: Offline signup','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (543,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (544,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (545,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (546,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (547,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (548,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (549,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (550,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (551,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (552,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (553,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (554,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (555,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (556,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (557,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (558,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (559,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (560,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (561,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (562,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (563,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (564,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (565,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (566,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (567,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (568,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (569,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (570,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (571,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (572,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (573,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (574,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (575,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (576,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (577,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (578,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (579,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (580,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (581,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (582,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (583,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (584,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (585,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (586,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (587,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (588,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (589,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (590,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (591,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (592,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,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (593,63,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (594,64,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (595,65,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (596,66,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (597,67,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (598,68,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (599,69,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (600,70,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (601,71,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (602,72,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (603,73,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (604,74,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (605,75,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (606,76,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (607,77,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (608,78,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (609,79,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (610,80,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (611,81,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (612,82,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (613,83,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (614,84,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (615,85,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (616,86,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (617,87,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (618,88,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (619,89,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (620,90,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (621,91,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (622,92,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (623,93,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (624,94,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (625,95,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (626,96,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (627,97,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (628,98,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (629,99,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (630,100,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (631,101,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (632,102,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (633,103,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (634,104,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (635,105,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (636,106,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (637,107,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (638,108,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (639,109,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (640,110,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (641,111,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30'),
- (642,112,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-01-06 04:30:30',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-01-06 04:30:30','2024-01-06 04:30:30');
+ (1,NULL,22,'Subject for Print/Merge Document','2023-06-23 04:02:21',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (2,NULL,56,'Subject for Interview','2024-02-12 00:53:28',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (3,NULL,9,'Subject for Tell a Friend','2023-11-03 09:34:31',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (4,NULL,9,'Subject for Tell a Friend','2023-04-28 07:23:29',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (5,NULL,22,'Subject for Print/Merge Document','2023-09-28 09:27:04',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (6,NULL,22,'Subject for Print/Merge Document','2023-10-31 18:57:35',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (7,NULL,22,'Subject for Print/Merge Document','2024-02-11 22:14:37',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (8,NULL,1,'Subject for Meeting','2023-05-01 03:52:43',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (9,NULL,9,'Subject for Tell a Friend','2023-06-01 22:15:17',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (10,NULL,22,'Subject for Print/Merge Document','2023-10-04 10:31:38',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (11,NULL,22,'Subject for Print/Merge Document','2023-10-28 00:47:25',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (12,NULL,22,'Subject for Print/Merge Document','2023-07-20 12:52:42',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (13,NULL,1,'Subject for Meeting','2024-04-10 19:16:44',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (14,NULL,2,'Subject for Phone Call','2024-03-22 17:21:34',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (15,NULL,22,'Subject for Print/Merge Document','2023-08-06 07:52:22',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (16,NULL,1,'Subject for Meeting','2024-01-27 14:03:32',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (17,NULL,2,'Subject for Phone Call','2023-09-22 16:38:28',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (18,NULL,1,'Subject for Meeting','2024-02-07 11:39:45',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (19,NULL,1,'Subject for Meeting','2023-12-21 00:53:27',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (20,NULL,9,'Subject for Tell a Friend','2024-01-15 15:55:10',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (21,NULL,9,'Subject for Tell a Friend','2023-12-22 13:38:15',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (22,NULL,1,'Subject for Meeting','2024-03-26 23:45:44',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (23,NULL,9,'Subject for Tell a Friend','2023-08-21 01:19:54',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (24,NULL,2,'Subject for Phone Call','2023-11-25 17:39:47',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (25,NULL,56,'Subject for Interview','2024-03-23 02:36:33',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (26,NULL,9,'Subject for Tell a Friend','2023-09-20 08:31:32',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (27,NULL,2,'Subject for Phone Call','2023-04-30 17:18:44',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (28,NULL,56,'Subject for Interview','2023-11-15 09:06:01',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (29,NULL,22,'Subject for Print/Merge Document','2023-09-21 01:01:18',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (30,NULL,9,'Subject for Tell a Friend','2023-12-17 22:03:16',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (31,NULL,9,'Subject for Tell a Friend','2024-02-08 21:17:51',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (32,NULL,2,'Subject for Phone Call','2023-10-07 18:20:42',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (33,NULL,2,'Subject for Phone Call','2024-03-22 02:53:11',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (34,NULL,22,'Subject for Print/Merge Document','2024-03-14 13:51:01',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (35,NULL,56,'Subject for Interview','2023-09-11 02:03:54',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (36,NULL,1,'Subject for Meeting','2023-08-31 22:02:36',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (37,NULL,9,'Subject for Tell a Friend','2024-03-17 21:33:48',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (38,NULL,22,'Subject for Print/Merge Document','2024-03-17 06:48:15',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (39,NULL,2,'Subject for Phone Call','2024-02-27 08:46:25',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (40,NULL,9,'Subject for Tell a Friend','2023-07-28 01:25:17',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (41,NULL,56,'Subject for Interview','2023-10-21 16:08:13',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (42,NULL,56,'Subject for Interview','2024-03-22 01:54:10',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (43,NULL,56,'Subject for Interview','2023-08-01 05:35:08',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (44,NULL,2,'Subject for Phone Call','2023-11-21 15:18:25',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (45,NULL,56,'Subject for Interview','2024-03-22 15:22:47',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (46,NULL,22,'Subject for Print/Merge Document','2023-07-19 20:26:40',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (47,NULL,1,'Subject for Meeting','2023-10-31 07:08:31',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (48,NULL,2,'Subject for Phone Call','2024-01-25 16:08:22',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (49,NULL,1,'Subject for Meeting','2023-05-12 20:29:42',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (50,NULL,56,'Subject for Interview','2024-02-08 11:50:43',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (51,NULL,56,'Subject for Interview','2023-05-24 22:43:29',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (52,NULL,2,'Subject for Phone Call','2024-02-04 19:37:28',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (53,NULL,2,'Subject for Phone Call','2023-08-14 01:42:10',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (54,NULL,22,'Subject for Print/Merge Document','2023-10-20 06:24:34',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (55,NULL,1,'Subject for Meeting','2024-02-18 09:55:53',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (56,NULL,2,'Subject for Phone Call','2023-12-19 08:57:40',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (57,NULL,2,'Subject for Phone Call','2024-01-01 04:33:12',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (58,NULL,9,'Subject for Tell a Friend','2024-04-10 10:05:45',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (59,NULL,56,'Subject for Interview','2023-12-15 19:51:33',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (60,NULL,56,'Subject for Interview','2023-05-08 11:22:07',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (61,NULL,22,'Subject for Print/Merge Document','2023-11-30 11:09:58',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (62,NULL,1,'Subject for Meeting','2023-12-13 23:48:08',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (63,NULL,56,'Subject for Interview','2023-12-27 03:07:06',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (64,NULL,2,'Subject for Phone Call','2024-02-07 04:15:22',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (65,NULL,9,'Subject for Tell a Friend','2024-03-23 16:51:46',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (66,NULL,56,'Subject for Interview','2024-04-20 02:24:17',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (67,NULL,2,'Subject for Phone Call','2024-04-10 12:26:34',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (68,NULL,1,'Subject for Meeting','2023-12-28 16:43:53',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (69,NULL,1,'Subject for Meeting','2024-03-30 00:27:10',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (70,NULL,2,'Subject for Phone Call','2023-08-28 12:37:11',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (71,NULL,9,'Subject for Tell a Friend','2023-08-14 16:51:41',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (72,NULL,22,'Subject for Print/Merge Document','2023-05-26 02:45:32',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (73,NULL,1,'Subject for Meeting','2023-10-21 01:03:30',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (74,NULL,22,'Subject for Print/Merge Document','2023-06-27 04:43:12',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (75,NULL,22,'Subject for Print/Merge Document','2023-11-05 22:03:32',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (76,NULL,56,'Subject for Interview','2023-06-28 08:41:14',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (77,NULL,2,'Subject for Phone Call','2023-12-10 01:46:08',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (78,NULL,56,'Subject for Interview','2024-01-10 06:43:14',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (79,NULL,22,'Subject for Print/Merge Document','2023-11-14 06:33:30',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (80,NULL,1,'Subject for Meeting','2023-06-17 21:06:50',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (81,NULL,9,'Subject for Tell a Friend','2023-05-13 20:55:12',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (82,NULL,9,'Subject for Tell a Friend','2023-08-23 05:40:53',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (83,NULL,9,'Subject for Tell a Friend','2023-11-03 20:30:07',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (84,NULL,9,'Subject for Tell a Friend','2023-10-27 10:07:11',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (85,NULL,56,'Subject for Interview','2023-06-28 12:28:39',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (86,NULL,56,'Subject for Interview','2023-10-31 17:49:38',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (87,NULL,56,'Subject for Interview','2024-03-01 15:21:23',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (88,NULL,1,'Subject for Meeting','2023-10-12 18:01:53',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (89,NULL,56,'Subject for Interview','2023-11-10 02:32:19',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (90,NULL,22,'Subject for Print/Merge Document','2024-01-02 22:17:04',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (91,NULL,2,'Subject for Phone Call','2023-07-30 16:50:23',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (92,NULL,22,'Subject for Print/Merge Document','2023-10-13 03:54:04',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (93,NULL,1,'Subject for Meeting','2023-06-08 23:52:27',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (94,NULL,56,'Subject for Interview','2023-11-17 10:50:00',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (95,NULL,56,'Subject for Interview','2023-12-25 01:05:43',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (96,NULL,2,'Subject for Phone Call','2024-02-25 02:30:22',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (97,NULL,1,'Subject for Meeting','2023-06-16 09:20:12',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (98,NULL,9,'Subject for Tell a Friend','2023-08-05 22:26:56',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (99,NULL,1,'Subject for Meeting','2024-01-17 21:59:06',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (100,NULL,56,'Subject for Interview','2023-05-07 23:00:37',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (101,NULL,1,'Subject for Meeting','2023-05-04 19:21:59',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (102,NULL,56,'Subject for Interview','2024-02-12 06:02:36',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (103,NULL,2,'Subject for Phone Call','2023-10-24 23:18:28',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (104,NULL,22,'Subject for Print/Merge Document','2024-03-18 23:12:52',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (105,NULL,22,'Subject for Print/Merge Document','2023-10-01 13:03:00',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (106,NULL,56,'Subject for Interview','2023-07-14 13:36:03',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (107,NULL,22,'Subject for Print/Merge Document','2023-07-13 18:45:58',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (108,NULL,9,'Subject for Tell a Friend','2024-03-15 21:05:42',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (109,NULL,2,'Subject for Phone Call','2024-04-21 09:57:07',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (110,NULL,22,'Subject for Print/Merge Document','2023-10-26 00:02:43',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (111,NULL,2,'Subject for Phone Call','2023-07-18 03:46:29',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (112,NULL,2,'Subject for Phone Call','2024-04-16 13:00:42',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (113,NULL,22,'Subject for Print/Merge Document','2023-08-17 10:42:47',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (114,NULL,9,'Subject for Tell a Friend','2024-03-11 09:53:47',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (115,NULL,9,'Subject for Tell a Friend','2023-10-29 19:59:09',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (116,NULL,9,'Subject for Tell a Friend','2023-07-18 07:29:19',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (117,NULL,1,'Subject for Meeting','2023-08-22 14:52:20',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (118,NULL,22,'Subject for Print/Merge Document','2023-07-23 05:56:20',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (119,NULL,22,'Subject for Print/Merge Document','2024-01-17 05:37:23',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (120,NULL,22,'Subject for Print/Merge Document','2023-07-30 04:28:20',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (121,NULL,56,'Subject for Interview','2023-12-26 20:03:03',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (122,NULL,2,'Subject for Phone Call','2023-11-15 11:16:04',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (123,NULL,56,'Subject for Interview','2024-02-16 17:03:32',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (124,NULL,22,'Subject for Print/Merge Document','2023-05-15 06:07:32',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (125,NULL,1,'Subject for Meeting','2023-05-15 02:11:32',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (126,NULL,2,'Subject for Phone Call','2023-09-09 22:18:46',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (127,NULL,22,'Subject for Print/Merge Document','2023-08-08 10:14:37',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (128,NULL,56,'Subject for Interview','2023-09-20 14:49:48',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (129,NULL,22,'Subject for Print/Merge Document','2023-06-03 21:41:39',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (130,NULL,56,'Subject for Interview','2023-09-28 17:44:01',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (131,NULL,2,'Subject for Phone Call','2023-09-25 11:49:08',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (132,NULL,9,'Subject for Tell a Friend','2024-01-03 14:35:46',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (133,NULL,56,'Subject for Interview','2023-05-16 22:04:48',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (134,NULL,9,'Subject for Tell a Friend','2023-12-11 13:59:37',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (135,NULL,9,'Subject for Tell a Friend','2023-12-22 01:36:44',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (136,NULL,9,'Subject for Tell a Friend','2024-01-13 20:45:26',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (137,NULL,9,'Subject for Tell a Friend','2024-01-07 22:54:25',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (138,NULL,2,'Subject for Phone Call','2024-01-04 11:05:26',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (139,NULL,2,'Subject for Phone Call','2023-11-13 22:18:27',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (140,NULL,22,'Subject for Print/Merge Document','2024-01-01 23:40:04',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (141,NULL,2,'Subject for Phone Call','2023-06-12 15:06:25',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (142,NULL,1,'Subject for Meeting','2023-11-16 12:04:03',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (143,NULL,1,'Subject for Meeting','2023-12-02 03:59:07',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (144,NULL,1,'Subject for Meeting','2024-01-19 17:54:31',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (145,NULL,9,'Subject for Tell a Friend','2023-05-31 07:59:31',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (146,NULL,56,'Subject for Interview','2023-05-26 09:22:28',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (147,NULL,2,'Subject for Phone Call','2023-06-29 07:57:53',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (148,NULL,9,'Subject for Tell a Friend','2023-05-21 23:35:27',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (149,NULL,56,'Subject for Interview','2024-03-22 03:46:25',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (150,NULL,56,'Subject for Interview','2023-09-14 08:16:55',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (151,NULL,22,'Subject for Print/Merge Document','2023-05-09 09:36:51',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (152,NULL,1,'Subject for Meeting','2023-11-22 09:19:42',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (153,NULL,2,'Subject for Phone Call','2023-12-23 00:10:53',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (154,NULL,9,'Subject for Tell a Friend','2024-03-30 07:03:40',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (155,NULL,1,'Subject for Meeting','2023-09-01 05:46:47',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (156,NULL,9,'Subject for Tell a Friend','2024-02-17 08:02:21',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (157,NULL,22,'Subject for Print/Merge Document','2023-07-14 13:53:15',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (158,NULL,1,'Subject for Meeting','2023-07-21 02:48:35',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (159,NULL,22,'Subject for Print/Merge Document','2024-02-24 12:43:17',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (160,NULL,22,'Subject for Print/Merge Document','2023-07-22 01:36:33',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (161,NULL,22,'Subject for Print/Merge Document','2024-02-17 21:23:47',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (162,NULL,1,'Subject for Meeting','2023-09-16 02:06:39',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (163,NULL,1,'Subject for Meeting','2024-03-25 02:42:24',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (164,NULL,9,'Subject for Tell a Friend','2023-06-20 06:35:00',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (165,NULL,9,'Subject for Tell a Friend','2024-02-07 10:41:29',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (166,NULL,2,'Subject for Phone Call','2023-10-08 21:37:33',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (167,NULL,9,'Subject for Tell a Friend','2023-12-28 07:57:59',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (168,NULL,2,'Subject for Phone Call','2023-11-10 05:40:07',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (169,NULL,22,'Subject for Print/Merge Document','2023-12-03 01:49:22',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (170,NULL,56,'Subject for Interview','2024-01-21 20:31:06',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (171,NULL,2,'Subject for Phone Call','2023-11-18 02:37:21',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (172,NULL,22,'Subject for Print/Merge Document','2023-12-30 20:09:50',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (173,NULL,56,'Subject for Interview','2023-11-01 08:53:40',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (174,NULL,9,'Subject for Tell a Friend','2023-11-21 08:34:03',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (175,NULL,9,'Subject for Tell a Friend','2023-12-12 03:01:03',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (176,NULL,2,'Subject for Phone Call','2023-05-12 15:41:04',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (177,NULL,9,'Subject for Tell a Friend','2024-02-12 06:13:41',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (178,NULL,56,'Subject for Interview','2024-01-16 21:47:21',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (179,NULL,2,'Subject for Phone Call','2023-05-20 08:02:01',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (180,NULL,9,'Subject for Tell a Friend','2023-07-09 00:09:17',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (181,NULL,2,'Subject for Phone Call','2024-02-12 10:28:08',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (182,NULL,22,'Subject for Print/Merge Document','2024-03-04 21:50:51',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (183,NULL,2,'Subject for Phone Call','2024-01-21 02:43:43',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (184,NULL,2,'Subject for Phone Call','2023-11-26 13:41:35',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (185,NULL,56,'Subject for Interview','2024-04-05 10:55:53',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (186,NULL,56,'Subject for Interview','2023-10-03 01:35:11',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (187,NULL,2,'Subject for Phone Call','2023-06-04 16:29:21',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (188,NULL,1,'Subject for Meeting','2023-11-23 09:17:55',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (189,NULL,56,'Subject for Interview','2023-12-27 05:11:26',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (190,NULL,9,'Subject for Tell a Friend','2023-06-01 13:45:09',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (191,NULL,22,'Subject for Print/Merge Document','2023-06-04 18:57:32',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (192,NULL,1,'Subject for Meeting','2023-06-23 14:04:07',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (193,NULL,22,'Subject for Print/Merge Document','2023-08-28 02:26:09',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (194,NULL,2,'Subject for Phone Call','2023-07-20 16:50:08',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (195,NULL,22,'Subject for Print/Merge Document','2023-07-29 01:23:15',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (196,NULL,56,'Subject for Interview','2023-12-07 13:25:48',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (197,NULL,56,'Subject for Interview','2023-12-25 11:13:40',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (198,NULL,9,'Subject for Tell a Friend','2023-07-22 09:47:22',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (199,NULL,56,'Subject for Interview','2023-08-06 01:20:14',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (200,NULL,2,'Subject for Phone Call','2023-08-26 20:59:44',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10'),
+ (201,NULL,22,'Subject for Print/Merge Document','2024-03-16 22:43:37',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (202,NULL,1,'Subject for Meeting','2023-08-19 19:31:57',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (203,NULL,2,'Subject for Phone Call','2023-07-25 09:13:46',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (204,NULL,1,'Subject for Meeting','2023-12-14 04:44:53',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (205,NULL,1,'Subject for Meeting','2023-05-17 07:58:34',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (206,NULL,56,'Subject for Interview','2023-06-20 12:02:03',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (207,NULL,56,'Subject for Interview','2024-01-25 15:55:41',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (208,NULL,56,'Subject for Interview','2024-03-07 06:01:47',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (209,NULL,9,'Subject for Tell a Friend','2024-01-23 13:12:28',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (210,NULL,56,'Subject for Interview','2024-03-16 00:30:29',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (211,NULL,9,'Subject for Tell a Friend','2023-10-23 10:23:44',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (212,NULL,22,'Subject for Print/Merge Document','2023-09-04 12:03:13',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (213,NULL,1,'Subject for Meeting','2023-08-30 01:38:39',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (214,NULL,9,'Subject for Tell a Friend','2023-12-09 21:56:59',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (215,NULL,2,'Subject for Phone Call','2023-06-01 01:24:12',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (216,NULL,2,'Subject for Phone Call','2023-08-15 23:23:03',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (217,NULL,22,'Subject for Print/Merge Document','2024-01-11 13:47:09',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (218,NULL,56,'Subject for Interview','2024-03-02 21:14:29',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (219,NULL,1,'Subject for Meeting','2023-11-21 19:19:05',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (220,NULL,9,'Subject for Tell a Friend','2023-05-16 04:31:39',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (221,NULL,56,'Subject for Interview','2024-01-01 19:54:41',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (222,NULL,1,'Subject for Meeting','2024-04-08 16:19:01',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (223,NULL,9,'Subject for Tell a Friend','2023-10-07 16:32:28',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (224,NULL,56,'Subject for Interview','2023-09-18 05:40:32',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (225,NULL,56,'Subject for Interview','2024-03-04 03:20:19',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (226,NULL,2,'Subject for Phone Call','2023-10-12 22:42:56',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (227,NULL,56,'Subject for Interview','2023-11-30 14:03:35',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (228,NULL,56,'Subject for Interview','2023-12-30 19:31:07',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (229,NULL,9,'Subject for Tell a Friend','2023-09-26 04:28:58',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (230,NULL,1,'Subject for Meeting','2023-08-29 09:57:57',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (231,NULL,56,'Subject for Interview','2023-10-25 12:59:51',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (232,NULL,2,'Subject for Phone Call','2023-10-22 04:26:29',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (233,NULL,56,'Subject for Interview','2024-02-15 19:36:53',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (234,NULL,9,'Subject for Tell a Friend','2024-03-29 04:13:40',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (235,NULL,1,'Subject for Meeting','2023-07-23 20:38:39',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (236,NULL,9,'Subject for Tell a Friend','2023-07-28 15:29:33',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (237,NULL,2,'Subject for Phone Call','2023-09-21 01:08:44',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (238,NULL,9,'Subject for Tell a Friend','2023-08-13 05:25:09',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (239,NULL,1,'Subject for Meeting','2023-11-24 21:23:53',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (240,NULL,22,'Subject for Print/Merge Document','2024-03-05 11:50:05',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (241,NULL,9,'Subject for Tell a Friend','2024-03-23 15:14:42',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (242,NULL,1,'Subject for Meeting','2024-03-18 21:35:15',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (243,NULL,1,'Subject for Meeting','2024-02-21 18:06:32',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (244,NULL,22,'Subject for Print/Merge Document','2023-06-06 01:48:03',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (245,NULL,1,'Subject for Meeting','2023-11-27 11:07:34',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (246,NULL,1,'Subject for Meeting','2024-02-15 19:15:59',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (247,NULL,1,'Subject for Meeting','2023-06-19 07:19:01',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (248,NULL,9,'Subject for Tell a Friend','2024-01-03 05:20:59',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (249,NULL,9,'Subject for Tell a Friend','2023-06-16 11:28:14',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (250,NULL,9,'Subject for Tell a Friend','2023-07-26 06:01:15',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (251,NULL,56,'Subject for Interview','2023-11-30 17:02:40',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (252,NULL,9,'Subject for Tell a Friend','2023-07-02 22:30:55',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (253,NULL,9,'Subject for Tell a Friend','2024-04-13 04:19:05',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (254,NULL,56,'Subject for Interview','2024-02-28 08:36:06',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (255,NULL,56,'Subject for Interview','2023-07-26 06:01:25',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (256,NULL,22,'Subject for Print/Merge Document','2023-12-08 00:42:43',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (257,NULL,56,'Subject for Interview','2023-05-16 03:16:57',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (258,NULL,56,'Subject for Interview','2024-01-06 11:55:25',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (259,NULL,1,'Subject for Meeting','2023-11-21 04:10:21',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (260,NULL,9,'Subject for Tell a Friend','2023-12-02 15:10:24',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (261,NULL,9,'Subject for Tell a Friend','2024-02-12 05:56:13',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (262,NULL,1,'Subject for Meeting','2023-10-11 19:35:21',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (263,NULL,1,'Subject for Meeting','2024-02-01 12:30:24',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (264,NULL,56,'Subject for Interview','2023-06-03 19:01:55',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (265,NULL,22,'Subject for Print/Merge Document','2024-03-16 20:51:23',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (266,NULL,22,'Subject for Print/Merge Document','2023-07-01 03:21:08',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (267,NULL,22,'Subject for Print/Merge Document','2024-04-03 06:08:01',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (268,NULL,2,'Subject for Phone Call','2024-03-18 20:27:50',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (269,NULL,1,'Subject for Meeting','2023-10-25 14:07:52',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (270,NULL,9,'Subject for Tell a Friend','2023-04-29 03:40:00',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (271,NULL,2,'Subject for Phone Call','2023-05-18 12:48:25',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (272,NULL,1,'Subject for Meeting','2023-10-28 21:40:44',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (273,NULL,9,'Subject for Tell a Friend','2023-07-24 20:36:10',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (274,NULL,56,'Subject for Interview','2024-02-09 22:46:37',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (275,NULL,22,'Subject for Print/Merge Document','2023-06-24 04:22:13',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (276,NULL,9,'Subject for Tell a Friend','2023-11-25 16:28:13',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (277,NULL,1,'Subject for Meeting','2023-09-10 14:22:40',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (278,NULL,2,'Subject for Phone Call','2023-09-13 08:27:21',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (279,NULL,56,'Subject for Interview','2023-09-02 16:47:13',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (280,NULL,56,'Subject for Interview','2024-03-12 19:11:40',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (281,NULL,56,'Subject for Interview','2024-02-08 17:45:56',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (282,NULL,2,'Subject for Phone Call','2024-02-25 03:49:38',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (283,NULL,22,'Subject for Print/Merge Document','2023-11-30 11:43:10',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (284,NULL,9,'Subject for Tell a Friend','2023-11-28 01:24:29',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (285,NULL,9,'Subject for Tell a Friend','2023-12-22 20:17:40',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (286,NULL,1,'Subject for Meeting','2023-07-05 03:05:00',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (287,NULL,56,'Subject for Interview','2024-01-07 20:16:04',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (288,NULL,1,'Subject for Meeting','2023-09-23 17:50:42',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (289,NULL,1,'Subject for Meeting','2023-12-08 11:32:43',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (290,NULL,2,'Subject for Phone Call','2023-09-03 15:10:49',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (291,NULL,1,'Subject for Meeting','2023-11-22 16:43:12',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (292,NULL,9,'Subject for Tell a Friend','2024-03-22 05:23:13',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (293,NULL,56,'Subject for Interview','2024-04-14 06:08:44',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (294,NULL,22,'Subject for Print/Merge Document','2023-12-17 13:13:42',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (295,NULL,22,'Subject for Print/Merge Document','2023-10-21 04:23:24',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (296,NULL,9,'Subject for Tell a Friend','2024-02-22 13:01:19',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (297,NULL,9,'Subject for Tell a Friend','2023-12-10 04:41:04',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (298,NULL,56,'Subject for Interview','2023-09-10 00:14:10',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (299,NULL,22,'Subject for Print/Merge Document','2023-07-13 12:32:29',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (300,NULL,56,'Subject for Interview','2023-05-25 17:54:05',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (301,NULL,56,'Subject for Interview','2023-05-07 00:14:51',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (302,NULL,9,'Subject for Tell a Friend','2023-09-12 15:22:36',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (303,NULL,2,'Subject for Phone Call','2023-07-16 12:18:26',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (304,NULL,1,'Subject for Meeting','2023-11-17 07:00:15',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (305,NULL,9,'Subject for Tell a Friend','2023-08-31 08:58:52',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (306,NULL,2,'Subject for Phone Call','2023-12-03 08:43:13',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (307,NULL,1,'Subject for Meeting','2024-03-18 09:03:53',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (308,NULL,56,'Subject for Interview','2024-01-04 22:57:06',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (309,NULL,2,'Subject for Phone Call','2023-09-04 16:09:33',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (310,NULL,56,'Subject for Interview','2024-03-21 01:56:57',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (311,NULL,9,'Subject for Tell a Friend','2023-05-17 11:23:19',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (312,NULL,1,'Subject for Meeting','2024-04-07 17:53:00',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (313,NULL,56,'Subject for Interview','2023-07-24 12:35:02',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (314,NULL,9,'Subject for Tell a Friend','2024-04-18 06:55:10',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (315,NULL,9,'Subject for Tell a Friend','2024-02-28 14:35:10',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (316,NULL,1,'Subject for Meeting','2023-11-12 18:36:11',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (317,NULL,22,'Subject for Print/Merge Document','2023-11-20 03:14:20',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (318,NULL,9,'Subject for Tell a Friend','2023-08-23 18:19:36',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (319,NULL,22,'Subject for Print/Merge Document','2023-10-07 15:29:06',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (320,NULL,56,'Subject for Interview','2023-08-31 12:09:20',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (321,NULL,9,'Subject for Tell a Friend','2023-09-13 15:53:50',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (322,NULL,2,'Subject for Phone Call','2023-12-28 04:00:43',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (323,NULL,2,'Subject for Phone Call','2023-07-19 04:00:18',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (324,NULL,9,'Subject for Tell a Friend','2023-08-12 07:46:13',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (325,NULL,22,'Subject for Print/Merge Document','2023-10-04 17:02:27',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (326,NULL,2,'Subject for Phone Call','2023-10-11 02:37:01',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (327,NULL,22,'Subject for Print/Merge Document','2024-01-24 00:07:08',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (328,NULL,1,'Subject for Meeting','2024-01-01 04:58:25',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (329,NULL,1,'Subject for Meeting','2023-08-09 11:36:36',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (330,NULL,1,'Subject for Meeting','2023-06-16 14:16:34',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (331,NULL,56,'Subject for Interview','2024-01-13 01:16:17',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (332,NULL,1,'Subject for Meeting','2023-06-28 01:57:33',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (333,NULL,56,'Subject for Interview','2023-06-22 09:35:46',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (334,NULL,2,'Subject for Phone Call','2024-02-02 15:43:56',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (335,NULL,56,'Subject for Interview','2023-09-19 20:06:43',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (336,NULL,2,'Subject for Phone Call','2023-06-06 02:11:50',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (337,NULL,1,'Subject for Meeting','2023-07-31 22:10:31',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (338,NULL,22,'Subject for Print/Merge Document','2023-12-26 01:16:38',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (339,NULL,9,'Subject for Tell a Friend','2023-09-22 03:47:38',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (340,NULL,2,'Subject for Phone Call','2024-03-28 17:09:19',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (341,NULL,22,'Subject for Print/Merge Document','2023-04-30 10:17:01',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (342,NULL,22,'Subject for Print/Merge Document','2024-04-17 22:21:06',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (343,NULL,2,'Subject for Phone Call','2023-09-12 00:42:50',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (344,NULL,22,'Subject for Print/Merge Document','2024-01-29 16:49:42',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (345,NULL,1,'Subject for Meeting','2024-01-12 11:59:51',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (346,NULL,56,'Subject for Interview','2023-08-30 23:46:34',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (347,NULL,9,'Subject for Tell a Friend','2023-11-10 17:37:32',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (348,NULL,22,'Subject for Print/Merge Document','2023-09-21 01:11:47',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (349,NULL,2,'Subject for Phone Call','2023-10-23 01:54:29',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (350,NULL,2,'Subject for Phone Call','2024-02-02 10:11:13',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (351,NULL,9,'Subject for Tell a Friend','2023-07-03 19:30:21',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (352,NULL,9,'Subject for Tell a Friend','2023-10-13 11:55:33',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (353,NULL,1,'Subject for Meeting','2024-02-29 10:25:03',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (354,NULL,9,'Subject for Tell a Friend','2024-03-19 23:47:05',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (355,NULL,56,'Subject for Interview','2024-01-22 10:26:24',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (356,NULL,56,'Subject for Interview','2023-08-09 02:01:16',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (357,NULL,2,'Subject for Phone Call','2024-04-06 14:56:18',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (358,NULL,22,'Subject for Print/Merge Document','2023-05-03 15:27:26',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (359,NULL,2,'Subject for Phone Call','2023-05-19 15:57:50',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (360,NULL,1,'Subject for Meeting','2023-04-30 09:35:16',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (361,NULL,2,'Subject for Phone Call','2023-08-30 09:29:05',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (362,NULL,56,'Subject for Interview','2023-09-19 07:16:21',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (363,NULL,2,'Subject for Phone Call','2024-03-26 05:45:50',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (364,NULL,2,'Subject for Phone Call','2023-06-23 18:46:55',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (365,NULL,2,'Subject for Phone Call','2023-09-03 18:26:51',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (366,NULL,9,'Subject for Tell a Friend','2023-10-12 14:19:55',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (367,NULL,22,'Subject for Print/Merge Document','2023-08-06 18:47:42',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (368,NULL,22,'Subject for Print/Merge Document','2023-07-21 14:25:27',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (369,NULL,22,'Subject for Print/Merge Document','2023-09-22 09:32:37',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (370,NULL,9,'Subject for Tell a Friend','2024-01-24 08:09:48',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (371,NULL,56,'Subject for Interview','2023-12-31 15:04:09',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (372,NULL,9,'Subject for Tell a Friend','2024-02-14 15:18:15',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (373,NULL,9,'Subject for Tell a Friend','2023-11-02 16:48:11',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (374,NULL,1,'Subject for Meeting','2023-11-29 13:31:26',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (375,NULL,1,'Subject for Meeting','2023-06-22 18:20:04',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (376,NULL,22,'Subject for Print/Merge Document','2024-02-20 05:06:58',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (377,NULL,22,'Subject for Print/Merge Document','2023-11-25 08:11:41',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (378,NULL,2,'Subject for Phone Call','2023-11-04 16:45:23',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (379,NULL,22,'Subject for Print/Merge Document','2023-05-27 19:03:22',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (380,NULL,56,'Subject for Interview','2023-05-06 21:42:36',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (381,NULL,2,'Subject for Phone Call','2023-09-23 16:24:18',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (382,NULL,9,'Subject for Tell a Friend','2023-10-03 12:58:23',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (383,NULL,1,'Subject for Meeting','2024-01-19 16:00:06',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (384,NULL,1,'Subject for Meeting','2023-12-05 17:47:13',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (385,NULL,1,'Subject for Meeting','2023-09-21 05:44:05',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (386,NULL,1,'Subject for Meeting','2023-12-16 21:04:22',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (387,NULL,9,'Subject for Tell a Friend','2023-07-16 06:05:53',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (388,NULL,56,'Subject for Interview','2023-05-28 10:26:03',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (389,NULL,1,'Subject for Meeting','2023-08-19 07:14:29',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (390,NULL,1,'Subject for Meeting','2024-04-12 16:16:23',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (391,NULL,56,'Subject for Interview','2023-08-03 08:57:42',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (392,NULL,1,'Subject for Meeting','2023-06-28 16:58:29',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (393,NULL,56,'Subject for Interview','2024-03-28 21:24:40',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (394,NULL,22,'Subject for Print/Merge Document','2023-05-10 06:02:25',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (395,NULL,2,'Subject for Phone Call','2023-06-27 00:51:53',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (396,NULL,56,'Subject for Interview','2023-05-14 00:58:32',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (397,NULL,2,'Subject for Phone Call','2023-09-24 11:06:01',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (398,NULL,2,'Subject for Phone Call','2024-04-07 16:50:44',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (399,NULL,1,'Subject for Meeting','2024-03-31 18:06:05',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (400,NULL,1,'Subject for Meeting','2023-07-14 16:17:22',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (401,NULL,1,'Subject for Meeting','2024-04-08 09:28:46',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (402,NULL,1,'Subject for Meeting','2023-07-28 12:02:44',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (403,NULL,22,'Subject for Print/Merge Document','2023-07-15 05:21:19',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (404,NULL,1,'Subject for Meeting','2023-12-09 23:30:50',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (405,NULL,22,'Subject for Print/Merge Document','2023-06-15 00:44:59',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (406,NULL,9,'Subject for Tell a Friend','2023-10-30 00:59:40',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (407,NULL,22,'Subject for Print/Merge Document','2023-11-21 03:14:02',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (408,NULL,22,'Subject for Print/Merge Document','2024-04-25 01:32:05',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (409,NULL,9,'Subject for Tell a Friend','2023-10-27 13:04:56',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (410,NULL,1,'Subject for Meeting','2024-01-21 09:17:42',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (411,NULL,1,'Subject for Meeting','2024-03-07 19:33:45',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (412,NULL,22,'Subject for Print/Merge Document','2023-09-16 04:14:10',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (413,NULL,2,'Subject for Phone Call','2023-10-17 01:28:03',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (414,NULL,9,'Subject for Tell a Friend','2023-05-10 07:47:38',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (415,NULL,22,'Subject for Print/Merge Document','2023-06-22 15:12:47',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (416,NULL,2,'Subject for Phone Call','2023-06-01 23:05:47',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (417,NULL,1,'Subject for Meeting','2023-06-06 16:03:23',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (418,NULL,1,'Subject for Meeting','2023-11-28 22:07:28',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (419,NULL,22,'Subject for Print/Merge Document','2024-01-29 22:15:55',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (420,NULL,56,'Subject for Interview','2024-01-05 14:54:52',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (421,NULL,9,'Subject for Tell a Friend','2023-11-24 22:46:55',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (422,NULL,22,'Subject for Print/Merge Document','2023-08-19 17:38:59',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (423,NULL,9,'Subject for Tell a Friend','2023-06-29 12:52:32',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (424,NULL,22,'Subject for Print/Merge Document','2023-12-27 03:50:38',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (425,NULL,9,'Subject for Tell a Friend','2023-10-22 13:19:52',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (426,NULL,22,'Subject for Print/Merge Document','2024-04-17 13:38:13',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (427,NULL,2,'Subject for Phone Call','2023-05-10 02:32:05',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (428,NULL,56,'Subject for Interview','2023-09-28 16:55:29',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (429,NULL,56,'Subject for Interview','2023-06-24 16:03:31',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (430,NULL,1,'Subject for Meeting','2023-04-28 06:06:45',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (431,NULL,9,'Subject for Tell a Friend','2023-09-25 09:09:47',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (432,NULL,9,'Subject for Tell a Friend','2023-12-11 09:41:18',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (433,NULL,9,'Subject for Tell a Friend','2024-03-26 00:16:53',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (434,NULL,2,'Subject for Phone Call','2024-01-23 01:54:53',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (435,NULL,1,'Subject for Meeting','2023-05-26 06:58:19',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (436,NULL,1,'Subject for Meeting','2023-12-18 06:53:14',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (437,NULL,56,'Subject for Interview','2023-12-27 03:02:26',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (438,NULL,9,'Subject for Tell a Friend','2024-04-16 21:30:08',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (439,NULL,56,'Subject for Interview','2023-08-25 17:31:51',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (440,NULL,22,'Subject for Print/Merge Document','2023-10-14 18:16:01',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (441,NULL,1,'Subject for Meeting','2023-11-26 09:05:50',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (442,NULL,1,'Subject for Meeting','2024-02-07 05:03:56',4,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (443,NULL,22,'Subject for Print/Merge Document','2023-07-21 20:17:13',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (444,NULL,56,'Subject for Interview','2024-04-24 17:52:33',6,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (445,NULL,56,'Subject for Interview','2023-12-11 13:17:57',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (446,NULL,2,'Subject for Phone Call','2023-08-13 12:04:26',2,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (447,NULL,9,'Subject for Tell a Friend','2023-10-10 01:20:11',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (448,NULL,9,'Subject for Tell a Friend','2024-04-08 15:29:14',1,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (449,NULL,1,'Subject for Meeting','2023-09-14 11:19:51',3,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (450,NULL,22,'Subject for Print/Merge Document','2023-12-01 05:05:39',5,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (451,1,6,'$ 125 April Mailer 1','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (452,2,6,'$ 50 Online: Save the Penguins','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (453,3,6,'£ 25 April Mailer 1','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (454,4,6,'$ 50 Online: Save the Penguins','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (455,5,6,'$ 50 Online: Save the Penguins','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (456,6,6,'$ 500 April Mailer 1','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (457,7,6,'$ 1750 Online: Save the Penguins','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (458,8,6,'$ 50 Online: Save the Penguins','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (459,9,6,'$ 10 Online: Help CiviCRM','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (460,10,6,'$ 250 Online: Help CiviCRM','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (461,11,6,'Â¥ 500 ','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (462,12,6,'$ 50 Online: Save the Penguins','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (463,13,6,'$ 50 ','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (464,14,6,'$ 50 ','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (465,15,6,'$ 25 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (466,16,6,'$ 25 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (467,17,6,'$ 25 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (468,18,6,'$ 25 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (469,19,6,'$ 25 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (470,20,6,'$ 25 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (471,21,6,'$ 25 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (472,22,6,'$ 25 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (473,23,6,'$ 25 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (474,24,6,'$ 25 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (475,25,6,'$ 25 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (476,26,6,'$ 10 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (477,27,6,'$ 10 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (478,28,6,'$ 10 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (479,29,6,'$ 10 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (480,30,6,'$ 10 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (481,31,6,'€ 5 Recurring contribution','2024-06-26 15:50:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (482,1,7,'General','2024-04-26 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (483,2,7,'Student','2024-04-25 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (484,3,7,'General','2024-04-24 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (485,4,7,'Student','2024-04-23 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (486,5,7,'Student','2023-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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (487,6,7,'Student','2024-04-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (488,7,7,'General','2024-04-20 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (489,8,7,'Student','2024-04-19 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (490,9,7,'General','2024-04-18 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (491,10,7,'General','2022-02-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (492,11,7,'Lifetime','2024-04-16 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (493,12,7,'Student','2024-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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (494,13,7,'General','2024-04-14 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (495,14,7,'Student','2024-04-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (496,15,7,'General','2022-01-04 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (497,16,7,'Student','2024-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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (498,17,7,'General','2024-04-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (499,18,7,'Student','2024-04-09 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (500,19,7,'General','2024-04-08 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (501,20,7,'General','2021-11-25 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (502,21,7,'General','2024-04-06 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (503,22,7,'Lifetime','2024-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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (504,23,7,'General','2024-04-04 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (505,24,7,'Student','2024-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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (506,25,7,'Student','2023-04-02 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (507,26,7,'Student','2024-04-01 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (508,27,7,'General','2024-03-31 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (509,28,7,'Student','2024-03-30 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (510,29,7,'General','2024-03-29 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (511,30,7,'Student','2023-03-28 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (512,32,6,'$ 100.00 - General Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (513,33,6,'$ 50.00 - Student Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (514,34,6,'$ 100.00 - General Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (515,35,6,'$ 50.00 - Student Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (516,36,6,'$ 50.00 - Student Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (517,37,6,'$ 50.00 - Student Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (518,38,6,'$ 100.00 - General Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (519,39,6,'$ 50.00 - Student Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (520,40,6,'$ 100.00 - General Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (521,41,6,'$ 100.00 - General Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (522,42,6,'$ 1200.00 - Lifetime Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (523,43,6,'$ 50.00 - Student Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (524,44,6,'$ 100.00 - General Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (525,45,6,'$ 50.00 - Student Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (526,46,6,'$ 100.00 - General Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (527,47,6,'$ 50.00 - Student Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (528,48,6,'$ 100.00 - General Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (529,49,6,'$ 50.00 - Student Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (530,50,6,'$ 100.00 - General Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (531,51,6,'$ 100.00 - General Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (532,52,6,'$ 100.00 - General Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (533,53,6,'$ 1200.00 - Lifetime Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (534,54,6,'$ 100.00 - General Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (535,55,6,'$ 50.00 - Student Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (536,56,6,'$ 50.00 - Student Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (537,57,6,'$ 50.00 - Student Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (538,58,6,'$ 100.00 - General Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (539,59,6,'$ 50.00 - Student Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (540,60,6,'$ 100.00 - General Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (541,61,6,'$ 50.00 - Student Membership: Offline signup','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (543,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (544,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (545,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (546,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (547,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (548,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (549,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (550,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (551,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (552,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (553,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (554,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (555,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (556,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (557,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (558,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (559,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (560,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (561,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (562,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (563,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (564,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (565,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (566,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (567,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (568,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (569,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (570,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (571,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (572,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (573,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (574,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (575,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (576,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (577,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (578,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (579,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (580,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (581,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (582,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (583,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (584,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (585,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (586,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (587,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (588,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (589,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (590,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (591,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (592,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,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (593,63,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (594,64,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (595,65,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (596,66,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (597,67,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (598,68,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (599,69,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (600,70,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (601,71,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (602,72,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (603,73,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (604,74,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (605,75,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (606,76,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (607,77,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (608,78,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (609,79,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (610,80,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (611,81,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (612,82,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (613,83,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (614,84,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (615,85,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (616,86,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (617,87,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (618,88,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (619,89,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (620,90,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (621,91,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (622,92,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (623,93,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (624,94,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (625,95,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (626,96,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (627,97,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (628,98,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (629,99,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (630,100,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (631,101,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (632,102,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (633,103,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (634,104,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (635,105,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (636,106,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (637,107,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (638,108,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (639,109,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (640,110,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (641,111,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11'),
+ (642,112,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2024-04-26 15:50:11',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2024-04-26 15:50:11','2024-04-26 15:50:11');
 /*!40000 ALTER TABLE `civicrm_activity` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -732,958 +733,960 @@ 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
- (33,17,1,3),
- (663,365,1,3),
- (563,309,2,3),
- (593,325,2,3),
- (779,428,2,3),
- (812,451,2,2),
- (946,585,2,2),
- (41,22,3,3),
- (433,237,3,3),
- (707,389,3,3),
- (853,492,3,2),
- (873,522,3,2),
- (144,79,4,3),
- (174,98,4,3),
- (813,452,4,2),
- (816,455,4,2),
- (865,504,4,2),
- (874,534,4,2),
- (161,91,5,3),
- (724,398,5,3),
- (62,34,6,3),
- (117,65,6,3),
- (133,73,6,3),
- (198,110,6,3),
- (814,453,6,2),
- (928,567,6,2),
- (75,41,7,3),
- (936,575,7,2),
- (142,78,8,3),
- (194,108,8,3),
- (224,124,8,3),
- (463,254,8,3),
- (486,266,8,3),
- (815,454,8,2),
- (425,233,9,3),
- (469,257,9,3),
- (863,502,9,2),
- (875,532,9,2),
- (20,10,10,3),
- (265,145,10,3),
- (415,228,10,3),
- (540,296,10,3),
- (661,364,10,3),
- (740,408,10,3),
- (238,131,11,3),
- (561,308,11,3),
- (731,402,11,3),
- (771,424,11,3),
- (854,493,11,2),
- (876,523,11,2),
- (16,8,12,3),
- (168,95,12,3),
- (284,155,12,3),
- (405,222,12,3),
- (447,245,12,3),
- (638,351,12,3),
- (949,588,12,2),
- (56,31,13,3),
- (67,37,13,3),
- (465,255,13,3),
- (784,431,13,3),
- (399,219,14,3),
- (703,387,14,3),
- (104,58,15,3),
- (222,123,15,3),
- (714,393,15,3),
- (750,413,15,3),
- (944,583,15,2),
- (71,39,16,3),
- (123,68,16,3),
- (354,193,16,3),
- (573,314,16,3),
- (581,318,16,3),
- (782,430,16,3),
- (817,456,16,2),
- (242,133,17,3),
- (674,371,17,3),
- (777,427,17,3),
- (48,26,18,3),
- (97,54,18,3),
- (203,113,18,3),
- (335,183,18,3),
- (679,374,18,3),
- (683,376,18,3),
- (773,425,18,3),
- (935,574,18,2),
- (112,62,19,3),
- (449,246,19,3),
- (484,265,19,3),
- (545,299,19,3),
- (818,457,19,2),
- (14,7,20,3),
- (182,102,20,3),
- (190,106,20,3),
- (735,405,20,3),
- (755,416,20,3),
- (4,2,21,3),
- (64,35,21,3),
- (125,69,21,3),
- (180,101,21,3),
- (342,187,21,3),
- (356,194,21,3),
- (362,197,21,3),
- (371,202,21,3),
- (477,261,21,3),
- (482,264,21,3),
- (373,203,22,3),
- (767,422,22,3),
- (775,426,22,3),
- (849,488,22,2),
- (877,518,22,2),
- (88,49,23,3),
- (521,285,23,3),
- (565,310,23,3),
- (608,334,23,3),
- (119,66,24,3),
- (166,94,24,3),
- (244,134,24,3),
- (699,385,24,3),
- (871,510,24,2),
- (878,540,24,2),
- (907,546,24,2),
- (99,55,25,3),
- (257,141,25,3),
- (263,144,25,3),
- (397,218,25,3),
- (942,581,25,2),
- (121,67,26,3),
- (253,139,26,3),
- (271,148,26,3),
- (475,260,26,3),
- (672,370,26,3),
- (688,379,26,3),
- (712,392,26,3),
- (527,288,27,3),
- (554,304,27,3),
- (596,327,27,3),
- (646,355,27,3),
- (738,407,27,3),
- (742,409,27,3),
- (870,509,27,2),
- (879,539,27,2),
- (261,143,28,3),
- (575,315,28,3),
- (869,508,28,2),
- (880,538,28,2),
- (296,161,29,3),
- (508,277,29,3),
- (176,99,30,3),
- (480,263,30,3),
- (337,184,31,3),
- (344,188,31,3),
- (794,437,31,3),
- (163,92,32,3),
- (352,192,32,3),
- (792,436,32,3),
- (824,463,32,2),
- (825,464,32,2),
- (941,580,32,2),
- (188,105,33,3),
- (348,190,33,3),
- (705,388,33,3),
- (718,395,33,3),
- (769,423,33,3),
- (299,163,34,3),
- (765,421,34,3),
- (800,441,34,3),
- (821,460,34,2),
- (391,214,35,3),
- (429,235,35,3),
- (453,248,35,3),
- (627,345,35,3),
- (685,377,35,3),
- (867,506,35,2),
- (881,536,35,2),
- (292,159,36,3),
- (500,273,36,3),
- (603,331,36,3),
- (612,336,36,3),
- (200,111,37,3),
- (331,181,37,3),
- (403,221,37,3),
- (910,549,37,2),
- (60,33,38,3),
- (378,206,38,3),
- (861,500,38,2),
- (882,530,38,2),
- (932,571,38,2),
- (236,130,39,3),
- (303,165,39,3),
- (384,210,39,3),
- (473,259,39,3),
- (502,274,39,3),
- (634,349,39,3),
- (694,382,39,3),
- (423,232,40,3),
- (205,114,41,3),
- (569,312,41,3),
- (848,487,41,2),
- (883,517,41,2),
- (923,562,41,2),
- (131,72,42,3),
- (386,211,42,3),
- (421,231,42,3),
- (753,415,42,3),
- (802,442,42,3),
- (855,494,42,2),
- (884,524,42,2),
- (249,137,43,3),
- (823,462,43,2),
- (589,323,44,3),
- (623,343,44,3),
- (625,344,44,3),
- (8,4,45,3),
- (93,52,45,3),
- (273,149,45,3),
- (301,164,45,3),
- (350,191,45,3),
- (621,342,45,3),
- (681,375,45,3),
- (234,129,46,3),
- (339,185,46,3),
- (720,396,46,3),
- (952,591,46,2),
- (360,196,47,3),
- (577,316,47,3),
- (692,381,47,3),
- (759,418,47,3),
- (920,559,47,2),
- (215,119,48,3),
- (494,270,48,3),
- (498,272,48,3),
- (135,74,49,3),
- (213,118,49,3),
- (317,173,49,3),
- (488,267,49,3),
- (529,289,49,3),
- (746,411,49,3),
- (319,174,50,3),
- (443,243,50,3),
- (445,244,50,3),
- (552,303,50,3),
- (940,579,50,2),
- (358,195,51,3),
- (419,230,51,3),
- (490,268,51,3),
- (110,61,52,3),
- (6,3,53,3),
- (192,107,53,3),
- (230,127,53,3),
- (251,138,53,3),
- (286,156,53,3),
- (314,171,54,3),
- (510,278,54,3),
- (667,367,54,3),
- (18,9,55,3),
- (127,70,55,3),
- (375,204,55,3),
- (170,96,56,3),
- (172,97,56,3),
- (196,109,56,3),
- (267,146,56,3),
- (651,359,56,3),
- (710,391,56,3),
- (845,484,56,2),
- (885,514,56,2),
- (22,11,57,3),
- (95,53,57,3),
- (178,100,57,3),
- (276,151,57,2),
- (278,152,57,2),
- (280,153,57,2),
- (281,154,57,2),
- (283,155,57,2),
- (285,156,57,2),
- (287,157,57,2),
- (289,158,57,2),
- (291,159,57,2),
- (293,160,57,2),
- (295,161,57,2),
- (297,162,57,2),
- (298,163,57,2),
- (300,164,57,2),
- (302,165,57,2),
- (304,166,57,2),
- (306,167,57,2),
- (308,168,57,2),
- (310,169,57,2),
- (311,170,57,2),
- (313,171,57,2),
- (315,172,57,2),
- (316,173,57,2),
- (318,174,57,2),
- (320,175,57,2),
- (321,176,57,2),
- (323,177,57,2),
- (325,178,57,2),
- (327,179,57,2),
- (329,180,57,2),
- (330,181,57,2),
- (332,182,57,2),
- (334,183,57,2),
- (336,184,57,2),
- (338,185,57,2),
- (340,186,57,2),
- (341,187,57,2),
- (343,188,57,2),
- (345,189,57,2),
- (347,190,57,2),
- (349,191,57,2),
- (351,192,57,2),
- (353,193,57,2),
- (355,194,57,2),
- (357,195,57,2),
- (359,196,57,2),
- (361,197,57,2),
- (363,198,57,2),
- (364,199,57,2),
- (366,200,57,2),
- (368,201,57,2),
- (370,202,57,2),
- (372,203,57,2),
- (374,204,57,2),
- (376,205,57,2),
- (377,206,57,2),
- (379,207,57,2),
- (381,208,57,2),
- (382,209,57,2),
- (383,210,57,2),
- (385,211,57,2),
- (387,212,57,2),
- (388,213,57,2),
- (390,214,57,2),
- (392,215,57,2),
- (393,216,57,2),
- (394,217,57,2),
- (396,218,57,2),
- (398,219,57,2),
- (400,220,57,2),
- (402,221,57,2),
- (404,222,57,2),
- (406,223,57,2),
- (407,224,57,2),
- (409,225,57,2),
- (410,225,57,3),
- (411,226,57,2),
- (413,227,57,2),
- (414,228,57,2),
- (416,229,57,2),
- (418,230,57,2),
- (420,231,57,2),
- (422,232,57,2),
- (424,233,57,2),
- (426,234,57,2),
- (428,235,57,2),
- (430,236,57,2),
- (432,237,57,2),
- (434,238,57,2),
- (435,239,57,2),
- (437,240,57,2),
- (439,241,57,2),
- (441,242,57,2),
- (442,243,57,2),
- (444,244,57,2),
- (446,245,57,2),
- (448,246,57,2),
- (450,247,57,2),
- (452,248,57,2),
- (454,249,57,2),
- (456,250,57,2),
- (457,251,57,2),
- (459,252,57,2),
- (461,253,57,2),
- (462,254,57,2),
- (464,255,57,2),
- (466,256,57,2),
- (468,257,57,2),
- (470,258,57,2),
- (472,259,57,2),
- (474,260,57,2),
- (476,261,57,2),
- (478,262,57,2),
- (479,263,57,2),
- (481,264,57,2),
- (483,265,57,2),
- (485,266,57,2),
- (487,267,57,2),
- (489,268,57,2),
- (491,269,57,2),
- (493,270,57,2),
- (495,271,57,2),
- (497,272,57,2),
- (499,273,57,2),
- (501,274,57,2),
- (503,275,57,2),
- (505,276,57,2),
- (507,277,57,2),
- (509,278,57,2),
- (511,279,57,2),
- (512,280,57,2),
- (513,281,57,2),
- (515,282,57,2),
- (517,283,57,2),
- (518,284,57,2),
- (520,285,57,2),
- (522,286,57,2),
- (524,287,57,2),
- (526,288,57,2),
- (528,289,57,2),
- (530,290,57,2),
- (531,291,57,2),
- (532,292,57,2),
- (534,293,57,2),
- (536,294,57,2),
- (538,295,57,2),
- (539,296,57,2),
- (541,297,57,2),
- (542,298,57,2),
- (544,299,57,2),
- (546,300,57,2),
- (598,328,57,3),
- (220,122,58,3),
- (467,256,58,3),
- (523,286,58,3),
- (571,313,58,3),
- (58,32,59,3),
- (460,252,59,3),
- (826,465,59,2),
- (827,466,59,2),
- (828,467,59,2),
- (829,468,59,2),
- (830,469,59,2),
- (831,470,59,2),
- (832,471,59,2),
- (833,472,59,2),
- (834,473,59,2),
- (835,474,59,2),
- (836,475,59,2),
- (81,44,60,3),
- (137,75,60,3),
- (184,103,62,3),
- (269,147,62,3),
- (535,293,62,3),
- (690,380,62,3),
- (911,550,62,2),
- (158,89,63,3),
- (217,120,63,3),
- (427,234,63,3),
- (655,361,63,3),
- (676,372,63,3),
- (701,386,63,3),
- (417,229,64,3),
- (492,269,64,3),
- (548,301,64,2),
- (549,302,64,2),
- (551,303,64,2),
- (553,304,64,2),
- (555,305,64,2),
- (556,306,64,2),
- (558,307,64,2),
- (560,308,64,2),
- (562,309,64,2),
- (564,310,64,2),
- (566,311,64,2),
- (568,312,64,2),
- (570,313,64,2),
- (572,314,64,2),
- (574,315,64,2),
- (576,316,64,2),
- (578,317,64,2),
- (580,318,64,2),
- (582,319,64,2),
- (583,320,64,2),
- (585,321,64,2),
- (586,322,64,2),
- (588,323,64,2),
- (590,324,64,2),
- (592,325,64,2),
- (594,326,64,2),
- (595,327,64,2),
- (597,328,64,2),
- (599,329,64,2),
- (601,330,64,2),
- (602,331,64,2),
- (604,332,64,2),
- (605,333,64,2),
- (607,334,64,2),
- (609,335,64,2),
- (611,336,64,2),
- (613,337,64,2),
- (615,338,64,2),
- (616,339,64,2),
- (617,340,64,2),
- (618,341,64,2),
- (620,342,64,2),
- (622,343,64,2),
- (624,344,64,2),
- (626,345,64,2),
- (628,346,64,2),
- (629,347,64,2),
- (631,348,64,2),
- (633,349,64,2),
- (635,350,64,2),
- (637,351,64,2),
- (639,352,64,2),
- (641,353,64,2),
- (643,354,64,2),
- (645,355,64,2),
- (647,356,64,2),
- (648,357,64,2),
- (649,358,64,2),
- (650,359,64,2),
- (652,360,64,2),
- (654,361,64,2),
- (656,362,64,2),
- (658,363,64,2),
- (660,364,64,2),
- (662,365,64,2),
- (664,366,64,2),
- (666,367,64,2),
- (668,368,64,2),
- (669,369,64,2),
- (671,370,64,2),
- (673,371,64,2),
- (675,372,64,2),
- (677,373,64,2),
- (678,374,64,2),
- (680,375,64,2),
- (682,376,64,2),
- (684,377,64,2),
- (686,378,64,2),
- (687,379,64,2),
- (689,380,64,2),
- (691,381,64,2),
- (693,382,64,2),
- (695,383,64,2),
- (697,384,64,2),
- (698,385,64,2),
- (700,386,64,2),
- (702,387,64,2),
- (704,388,64,2),
- (706,389,64,2),
- (708,390,64,2),
- (709,391,64,2),
- (711,392,64,2),
- (713,393,64,2),
- (715,394,64,2),
- (717,395,64,2),
- (719,396,64,2),
- (721,397,64,2),
- (723,398,64,2),
- (725,399,64,2),
- (727,400,64,2),
- (729,401,64,2),
- (730,402,64,2),
- (732,403,64,2),
- (733,404,64,2),
- (734,405,64,2),
- (736,406,64,2),
- (737,407,64,2),
- (739,408,64,2),
- (741,409,64,2),
- (743,410,64,2),
- (745,411,64,2),
- (747,412,64,2),
- (749,413,64,2),
- (751,414,64,2),
- (752,415,64,2),
- (754,416,64,2),
- (756,417,64,2),
- (758,418,64,2),
- (760,419,64,2),
- (762,420,64,2),
- (764,421,64,2),
- (766,422,64,2),
- (768,423,64,2),
- (770,424,64,2),
- (772,425,64,2),
- (774,426,64,2),
- (776,427,64,2),
- (778,428,64,2),
- (780,429,64,2),
- (781,430,64,2),
- (783,431,64,2),
- (785,432,64,2),
- (787,433,64,2),
- (788,434,64,2),
- (790,435,64,2),
- (791,436,64,2),
- (793,437,64,2),
- (795,438,64,2),
- (796,439,64,2),
- (798,440,64,2),
- (799,441,64,2),
- (801,442,64,2),
- (803,443,64,2),
- (804,444,64,2),
- (805,445,64,2),
- (806,446,64,2),
- (808,447,64,2),
- (809,448,64,2),
- (810,449,64,2),
- (811,450,64,2),
- (247,136,65,3),
- (504,275,65,3),
- (506,276,65,3),
- (857,496,65,2),
- (886,526,65,2),
- (938,577,65,2),
- (39,21,66,3),
- (77,42,66,3),
- (140,77,66,3),
- (438,240,66,3),
- (728,400,66,3),
- (868,507,66,2),
- (887,537,66,2),
- (943,582,66,2),
- (10,5,67,3),
- (69,38,67,3),
- (186,104,67,3),
- (228,126,67,3),
- (259,142,67,3),
- (389,213,67,3),
- (610,335,67,3),
- (908,547,67,2),
- (211,117,68,3),
- (305,166,68,3),
- (431,236,68,3),
- (630,347,68,3),
- (79,43,69,3),
- (408,224,69,3),
- (559,307,69,3),
- (2,1,70,3),
- (26,13,70,3),
- (232,128,70,3),
- (322,176,70,3),
- (12,6,71,3),
- (279,152,71,3),
- (401,220,71,3),
- (644,354,71,3),
- (822,461,71,2),
- (207,115,72,3),
- (294,160,72,3),
- (380,207,72,3),
- (934,573,72,2),
- (115,64,73,3),
- (275,150,73,3),
- (324,177,73,3),
- (642,353,73,3),
- (761,419,74,3),
- (312,170,75,3),
- (326,178,75,3),
- (471,258,75,3),
- (757,417,75,3),
- (909,548,75,2),
- (152,86,76,3),
- (255,140,76,3),
- (309,168,76,3),
- (369,201,76,3),
- (557,306,76,3),
- (636,350,76,3),
- (716,394,76,3),
- (333,182,77,3),
- (458,251,77,3),
- (619,341,77,3),
- (930,569,77,2),
- (73,40,78,3),
- (862,501,78,2),
- (888,531,78,2),
- (665,366,79,3),
- (28,14,80,3),
- (31,16,80,3),
- (451,247,80,3),
- (579,317,80,3),
- (640,352,80,3),
- (913,552,80,2),
- (600,329,81,3),
- (670,369,81,3),
- (789,434,81,3),
- (395,217,82,3),
- (455,249,82,3),
- (547,300,82,3),
- (657,362,82,3),
- (819,458,82,2),
- (108,60,83,3),
- (290,158,83,3),
- (797,439,84,3),
- (44,24,85,3),
- (46,25,85,3),
- (102,57,85,3),
- (367,200,85,3),
- (496,271,85,3),
- (550,302,85,3),
- (763,420,85,3),
- (748,412,86,3),
- (24,12,87,3),
- (744,410,87,3),
- (926,565,87,2),
- (346,189,88,3),
- (567,311,88,3),
- (591,324,88,3),
- (90,50,89,3),
- (154,87,89,3),
- (226,125,89,3),
- (277,151,89,3),
- (919,558,89,2),
- (35,18,91,3),
- (51,28,91,3),
- (86,48,91,3),
- (307,167,91,3),
- (659,363,91,3),
- (807,446,91,3),
- (726,399,92,3),
- (820,459,92,2),
- (129,71,93,3),
- (519,284,93,3),
- (533,292,93,3),
- (587,322,93,3),
- (606,333,93,3),
- (786,432,93,3),
- (856,495,93,2),
- (889,525,93,2),
- (282,154,94,3),
- (866,505,94,2),
- (890,535,94,2),
- (904,543,94,2),
- (240,132,95,3),
- (440,241,95,3),
- (584,320,95,3),
- (696,383,95,3),
- (722,397,95,3),
- (106,59,96,3),
- (365,199,96,3),
- (514,281,96,3),
- (525,287,96,3),
+ (426,236,1,3),
+ (484,268,1,3),
+ (678,374,1,3),
+ (806,446,1,3),
+ (372,208,2,3),
+ (569,313,2,3),
+ (754,417,2,3),
+ (761,421,2,3),
+ (814,451,2,2),
+ (71,41,3,3),
+ (374,209,3,3),
+ (632,349,3,3),
+ (672,371,3,3),
+ (947,584,3,2),
+ (148,83,4,3),
+ (622,343,4,3),
+ (638,352,4,3),
+ (697,385,4,3),
+ (815,452,4,2),
+ (818,455,4,2),
+ (856,493,4,2),
+ (886,523,4,2),
+ (326,183,5,3),
+ (849,486,5,2),
+ (879,516,5,2),
+ (287,162,6,3),
+ (661,364,6,3),
+ (816,453,6,2),
+ (941,578,6,2),
+ (84,48,7,3),
+ (124,69,7,3),
+ (137,77,7,3),
+ (648,357,7,3),
+ (7,4,8,3),
+ (86,49,8,3),
+ (776,430,8,3),
+ (817,454,8,2),
+ (928,565,8,2),
+ (437,242,9,3),
+ (716,395,9,3),
+ (258,145,10,3),
+ (428,237,10,3),
+ (925,562,10,2),
+ (103,58,11,3),
+ (144,81,11,3),
+ (163,91,11,3),
+ (378,211,11,3),
+ (923,560,11,2),
+ (90,51,12,3),
+ (262,147,12,3),
+ (674,372,12,3),
+ (486,269,13,3),
+ (494,273,13,3),
+ (812,449,13,3),
+ (850,487,13,2),
+ (880,517,13,2),
+ (330,185,14,3),
+ (524,289,14,3),
+ (532,293,14,3),
+ (724,399,14,3),
+ (819,456,16,2),
+ (42,25,17,3),
+ (293,165,17,3),
+ (522,288,17,3),
+ (747,413,17,3),
+ (135,76,18,3),
+ (218,123,18,3),
+ (311,175,18,3),
+ (406,226,18,3),
+ (613,337,18,3),
+ (950,587,18,2),
+ (67,39,19,3),
+ (176,98,19,3),
+ (820,457,19,2),
+ (402,224,20,3),
+ (861,498,20,2),
+ (891,528,20,2),
+ (955,592,20,2),
+ (150,84,21,3),
+ (178,99,21,3),
+ (273,153,21,3),
+ (744,411,21,3),
+ (767,425,21,3),
+ (944,581,21,2),
+ (14,9,22,3),
+ (118,66,22,3),
+ (931,568,22,2),
+ (170,95,24,3),
+ (239,135,24,3),
+ (592,326,24,3),
+ (784,434,24,3),
+ (112,63,25,3),
+ (209,117,25,3),
+ (268,150,25,3),
+ (383,214,25,3),
+ (538,297,25,3),
+ (526,290,26,3),
+ (680,375,26,3),
+ (935,572,26,2),
+ (38,23,27,3),
+ (229,130,27,3),
+ (231,131,27,3),
+ (808,447,27,3),
+ (82,47,28,3),
+ (245,138,28,3),
+ (469,259,28,3),
+ (496,274,28,3),
+ (810,448,28,3),
+ (939,576,28,2),
+ (21,14,29,3),
+ (57,33,29,3),
+ (553,305,29,3),
+ (152,85,30,3),
+ (291,164,30,3),
+ (299,168,30,3),
+ (505,279,30,3),
+ (778,431,30,3),
+ (302,170,31,3),
+ (410,228,31,3),
+ (511,282,32,3),
+ (547,302,32,3),
+ (826,463,32,2),
+ (827,464,32,2),
+ (53,31,33,3),
+ (69,40,33,3),
+ (381,213,33,3),
+ (460,254,33,3),
+ (475,262,33,3),
+ (625,345,33,3),
+ (670,370,33,3),
+ (726,400,33,3),
+ (338,189,34,3),
+ (398,222,34,3),
+ (823,460,34,2),
+ (907,544,34,2),
+ (131,73,35,3),
+ (687,380,35,3),
+ (912,549,35,2),
+ (60,35,36,3),
+ (277,155,36,3),
+ (543,300,36,3),
+ (693,383,36,3),
+ (728,401,36,3),
+ (730,402,36,3),
+ (250,141,37,3),
+ (256,144,37,3),
+ (404,225,37,3),
+ (699,386,37,3),
+ (736,406,37,3),
+ (12,8,38,3),
+ (116,65,38,3),
+ (271,152,38,3),
+ (444,246,38,3),
+ (571,314,38,3),
+ (629,347,38,3),
+ (186,103,39,3),
+ (422,234,39,3),
+ (555,306,39,3),
+ (618,340,39,3),
+ (870,507,39,2),
+ (900,537,39,2),
+ (94,53,40,3),
+ (128,71,40,3),
+ (400,223,40,3),
+ (99,56,41,3),
+ (368,206,41,3),
+ (385,215,41,3),
+ (452,250,41,3),
+ (733,404,41,3),
+ (740,409,41,3),
+ (943,580,41,2),
+ (203,114,42,3),
+ (205,115,42,3),
+ (439,243,42,3),
+ (488,270,42,3),
+ (567,312,42,3),
+ (627,346,42,3),
+ (665,366,42,3),
+ (709,391,42,3),
+ (711,392,42,3),
+ (64,37,43,3),
+ (172,96,43,3),
+ (462,255,43,3),
+ (825,462,43,2),
+ (855,492,43,2),
+ (885,522,43,2),
+ (24,16,44,3),
+ (36,22,44,3),
+ (120,67,44,3),
+ (237,134,44,3),
+ (351,197,44,3),
+ (786,435,44,3),
+ (634,350,45,3),
+ (77,44,46,3),
+ (195,109,46,3),
+ (718,396,46,3),
+ (756,418,46,3),
+ (139,78,47,3),
+ (275,154,47,3),
+ (465,257,47,3),
+ (595,328,47,3),
+ (644,355,47,3),
+ (343,192,48,3),
+ (545,301,48,3),
+ (349,196,49,3),
+ (551,304,49,3),
+ (689,381,49,3),
+ (44,26,50,3),
+ (223,126,50,3),
+ (254,143,50,3),
+ (655,361,50,3),
+ (874,511,50,2),
+ (904,541,50,2),
+ (266,149,51,3),
+ (319,179,51,3),
+ (364,204,51,3),
+ (601,331,51,3),
+ (636,351,51,3),
+ (691,382,51,3),
+ (906,543,51,2),
+ (190,106,52,3),
+ (260,146,52,3),
+ (573,315,52,3),
+ (607,334,52,3),
+ (780,432,53,3),
+ (609,335,54,3),
+ (916,553,54,2),
+ (166,93,55,3),
+ (315,177,55,3),
+ (530,292,55,3),
+ (295,166,56,3),
+ (456,252,56,3),
+ (79,45,57,3),
+ (336,188,57,3),
+ (420,233,57,3),
+ (492,272,57,3),
+ (722,398,57,3),
+ (742,410,57,3),
+ (749,414,57,3),
+ (938,575,57,2),
+ (182,101,58,3),
+ (458,253,58,3),
+ (802,444,58,3),
+ (107,60,59,3),
+ (114,64,59,3),
+ (828,465,59,2),
+ (829,466,59,2),
+ (830,467,59,2),
+ (831,468,59,2),
+ (832,469,59,2),
+ (833,470,59,2),
+ (834,471,59,2),
+ (835,472,59,2),
+ (836,473,59,2),
+ (837,474,59,2),
+ (838,475,59,2),
+ (51,30,60,3),
+ (174,97,60,3),
+ (184,102,60,3),
+ (198,111,60,3),
+ (390,218,60,3),
+ (450,249,60,3),
+ (528,291,60,3),
+ (703,388,60,3),
+ (847,484,60,2),
+ (877,514,60,2),
+ (932,569,60,2),
+ (282,158,61,3),
+ (394,220,61,3),
+ (501,277,61,3),
+ (605,333,61,3),
+ (792,438,61,3),
+ (207,116,62,3),
+ (321,180,62,3),
+ (479,264,62,3),
+ (788,436,62,3),
+ (865,502,62,2),
+ (895,532,62,2),
+ (910,547,62,2),
+ (499,276,63,3),
+ (19,13,64,3),
+ (46,27,64,3),
+ (328,184,64,3),
+ (392,219,64,3),
+ (430,238,64,3),
+ (30,19,65,3),
+ (247,139,65,3),
+ (536,296,65,3),
+ (705,389,65,3),
+ (859,496,65,2),
+ (889,526,65,2),
+ (34,21,66,3),
+ (156,87,66,3),
+ (233,132,66,3),
+ (264,148,66,3),
+ (340,190,66,3),
+ (589,324,66,3),
+ (611,336,66,3),
+ (355,199,67,3),
+ (518,286,67,3),
+ (707,390,67,3),
+ (954,591,67,2),
+ (88,50,68,3),
+ (376,210,68,3),
+ (597,329,68,3),
+ (713,393,68,3),
+ (770,427,68,3),
+ (3,2,69,3),
+ (40,24,69,3),
+ (105,59,69,3),
+ (221,125,69,3),
+ (759,420,69,3),
+ (797,441,69,3),
+ (146,82,70,3),
+ (408,227,70,3),
+ (516,285,70,3),
+ (559,308,70,3),
+ (720,397,70,3),
+ (937,574,70,2),
+ (122,68,71,3),
+ (243,137,71,3),
+ (366,205,71,3),
+ (752,416,71,3),
+ (824,461,71,2),
+ (869,506,71,2),
+ (899,536,71,2),
+ (73,42,72,3),
+ (252,142,72,3),
+ (782,433,72,3),
+ (945,582,72,2),
+ (32,20,73,3),
+ (110,62,74,3),
+ (168,94,74,3),
+ (334,187,74,3),
+ (790,437,74,3),
+ (62,36,75,3),
+ (241,136,75,3),
+ (304,171,75,3),
+ (701,387,75,3),
+ (772,428,75,3),
+ (867,504,75,2),
+ (897,534,75,2),
+ (915,552,75,2),
+ (180,100,76,3),
+ (446,247,76,3),
+ (695,384,76,3),
+ (193,108,77,3),
+ (226,128,77,3),
+ (424,235,77,3),
+ (583,321,77,3),
+ (764,423,77,3),
+ (414,230,78,3),
+ (490,271,78,3),
+ (657,362,78,3),
+ (953,590,78,2),
+ (26,17,79,3),
+ (307,173,79,3),
+ (313,176,79,3),
+ (477,263,79,3),
+ (514,284,79,3),
+ (936,573,79,2),
+ (370,207,80,3),
+ (587,323,80,3),
+ (616,339,80,3),
+ (799,442,80,3),
+ (154,86,81,3),
+ (235,133,81,3),
+ (387,216,81,3),
+ (442,245,81,3),
+ (471,260,81,3),
+ (914,551,81,2),
+ (5,3,82,3),
+ (642,354,82,3),
+ (821,458,82,2),
+ (160,89,83,3),
+ (578,318,84,3),
+ (585,322,84,3),
+ (200,112,85,3),
+ (684,378,85,3),
+ (55,32,86,3),
+ (75,43,86,3),
+ (317,178,86,3),
+ (362,203,86,3),
+ (432,239,86,3),
+ (214,121,87,3),
+ (507,280,87,3),
+ (520,287,87,3),
+ (846,483,87,2),
+ (876,513,87,2),
+ (924,561,87,2),
+ (216,122,88,3),
+ (599,330,88,3),
+ (158,88,89,3),
+ (396,221,89,3),
+ (435,241,89,3),
+ (603,332,89,3),
+ (28,18,90,3),
+ (509,281,90,3),
+ (563,310,90,3),
+ (575,316,90,3),
+ (646,356,90,3),
+ (323,181,91,3),
+ (540,298,91,3),
+ (332,186,92,3),
+ (794,439,92,3),
+ (822,459,92,2),
+ (142,80,93,3),
+ (289,163,93,3),
+ (930,567,93,2),
+ (92,52,94,3),
+ (297,167,94,3),
+ (467,258,94,3),
+ (473,261,94,3),
+ (774,429,94,3),
+ (101,57,95,3),
+ (360,202,95,3),
+ (418,232,95,3),
+ (561,309,95,3),
+ (581,320,95,3),
+ (913,550,95,2),
+ (279,156,96,3),
+ (357,200,96,3),
+ (412,229,96,3),
+ (416,231,96,3),
  (653,360,96,3),
- (209,116,97,3),
- (436,239,98,3),
- (516,282,98,3),
- (537,294,98,3),
- (921,560,98,2),
- (288,157,99,3),
- (543,298,99,3),
- (837,476,99,2),
- (838,477,99,2),
- (839,478,99,2),
- (840,479,99,2),
- (841,480,99,2),
- (412,226,100,3),
- (632,348,100,3),
- (54,30,101,3),
- (156,88,101,3),
- (328,179,101,3),
- (614,337,101,3),
- (929,568,101,2),
- (847,486,102,2),
- (891,516,102,2),
- (842,481,103,2),
- (912,551,103,2),
- (915,554,111,2),
- (916,555,114,2),
- (924,563,118,2),
- (1,1,121,2),
- (3,2,121,2),
- (5,3,121,2),
- (7,4,121,2),
- (9,5,121,2),
- (11,6,121,2),
- (13,7,121,2),
- (15,8,121,2),
- (17,9,121,2),
- (19,10,121,2),
- (21,11,121,2),
- (23,12,121,2),
- (25,13,121,2),
- (27,14,121,2),
- (29,15,121,2),
- (30,16,121,2),
- (32,17,121,2),
- (34,18,121,2),
- (36,19,121,2),
- (37,20,121,2),
- (38,21,121,2),
- (40,22,121,2),
- (42,23,121,2),
- (43,24,121,2),
- (45,25,121,2),
- (47,26,121,2),
- (49,27,121,2),
- (50,28,121,2),
- (52,29,121,2),
- (53,30,121,2),
- (55,31,121,2),
- (57,32,121,2),
- (59,33,121,2),
- (61,34,121,2),
- (63,35,121,2),
- (65,36,121,2),
- (66,37,121,2),
- (68,38,121,2),
- (70,39,121,2),
- (72,40,121,2),
- (74,41,121,2),
- (76,42,121,2),
- (78,43,121,2),
- (80,44,121,2),
- (82,45,121,2),
- (83,46,121,2),
- (84,47,121,2),
- (85,48,121,2),
- (87,49,121,2),
- (89,50,121,2),
- (91,51,121,2),
- (92,52,121,2),
- (94,53,121,2),
- (96,54,121,2),
- (98,55,121,2),
- (100,56,121,2),
- (101,57,121,2),
- (103,58,121,2),
- (105,59,121,2),
- (107,60,121,2),
- (109,61,121,2),
- (111,62,121,2),
- (113,63,121,2),
- (114,64,121,2),
- (116,65,121,2),
- (118,66,121,2),
- (120,67,121,2),
- (122,68,121,2),
- (124,69,121,2),
- (126,70,121,2),
- (128,71,121,2),
- (130,72,121,2),
- (132,73,121,2),
- (134,74,121,2),
- (136,75,121,2),
- (138,76,121,2),
- (139,77,121,2),
- (141,78,121,2),
- (143,79,121,2),
- (145,80,121,2),
- (146,81,121,2),
- (147,82,121,2),
- (148,83,121,2),
- (149,84,121,2),
- (150,85,121,2),
- (151,86,121,2),
- (153,87,121,2),
- (155,88,121,2),
- (157,89,121,2),
- (159,90,121,2),
- (160,91,121,2),
- (162,92,121,2),
- (164,93,121,2),
- (165,94,121,2),
- (167,95,121,2),
- (169,96,121,2),
- (171,97,121,2),
- (173,98,121,2),
- (175,99,121,2),
- (177,100,121,2),
- (179,101,121,2),
- (181,102,121,2),
- (183,103,121,2),
- (185,104,121,2),
- (187,105,121,2),
- (189,106,121,2),
- (191,107,121,2),
- (193,108,121,2),
- (195,109,121,2),
- (197,110,121,2),
- (199,111,121,2),
- (201,112,121,2),
- (202,113,121,2),
- (204,114,121,2),
- (206,115,121,2),
- (208,116,121,2),
- (210,117,121,2),
- (212,118,121,2),
- (214,119,121,2),
- (216,120,121,2),
- (218,121,121,2),
- (219,122,121,2),
- (221,123,121,2),
- (223,124,121,2),
- (225,125,121,2),
- (227,126,121,2),
- (229,127,121,2),
- (231,128,121,2),
- (233,129,121,2),
- (235,130,121,2),
- (237,131,121,2),
- (239,132,121,2),
- (241,133,121,2),
- (243,134,121,2),
- (245,135,121,2),
- (246,136,121,2),
- (248,137,121,2),
- (250,138,121,2),
- (252,139,121,2),
- (254,140,121,2),
- (256,141,121,2),
- (258,142,121,2),
- (260,143,121,2),
- (262,144,121,2),
- (264,145,121,2),
- (266,146,121,2),
- (268,147,121,2),
- (270,148,121,2),
- (272,149,121,2),
- (274,150,121,2),
- (860,499,123,2),
- (892,529,123,2),
- (951,590,125,2),
- (852,491,129,2),
- (893,521,129,2),
- (905,544,138,2),
- (864,503,139,2),
- (894,533,139,2),
- (933,572,144,2),
- (953,592,147,2),
- (917,556,148,2),
- (851,490,150,2),
- (895,520,150,2),
- (947,586,152,2),
- (846,485,157,2),
- (896,515,157,2),
- (859,498,159,2),
- (897,528,159,2),
- (844,483,160,2),
- (898,513,160,2),
- (914,553,161,2),
- (945,584,162,2),
- (850,489,165,2),
- (899,519,165,2),
- (950,589,167,2),
- (843,482,183,2),
- (900,512,183,2),
- (906,545,183,2),
- (918,557,184,2),
- (939,578,185,2),
- (925,564,187,2),
- (872,511,188,2),
- (901,541,188,2),
- (937,576,189,2),
- (927,566,190,2),
- (922,561,192,2),
- (931,570,201,2),
- (858,497,202,2),
- (902,527,202,2),
- (948,587,202,2);
+ (663,365,96,3),
+ (97,55,97,3),
+ (549,303,97,3),
+ (640,353,97,3),
+ (651,359,97,3),
+ (676,373,97,3),
+ (48,28,98,3),
+ (448,248,98,3),
+ (503,278,98,3),
+ (557,307,98,3),
+ (659,363,98,3),
+ (309,174,99,3),
+ (353,198,99,3),
+ (565,311,99,3),
+ (839,476,99,2),
+ (840,477,99,2),
+ (841,478,99,2),
+ (842,479,99,2),
+ (843,480,99,2),
+ (346,194,100,3),
+ (126,70,101,3),
+ (454,251,101,3),
+ (804,445,101,3),
+ (920,557,101,2),
+ (844,481,103,2),
+ (871,508,107,2),
+ (901,538,107,2),
+ (851,488,112,2),
+ (881,518,112,2),
+ (917,554,113,2),
+ (942,579,114,2),
+ (269,151,115,2),
+ (270,152,115,2),
+ (272,153,115,2),
+ (274,154,115,2),
+ (276,155,115,2),
+ (278,156,115,2),
+ (280,157,115,2),
+ (281,158,115,2),
+ (283,159,115,2),
+ (284,160,115,2),
+ (285,161,115,2),
+ (286,162,115,2),
+ (288,163,115,2),
+ (290,164,115,2),
+ (292,165,115,2),
+ (294,166,115,2),
+ (296,167,115,2),
+ (298,168,115,2),
+ (300,169,115,2),
+ (301,170,115,2),
+ (303,171,115,2),
+ (305,172,115,2),
+ (306,173,115,2),
+ (308,174,115,2),
+ (310,175,115,2),
+ (312,176,115,2),
+ (314,177,115,2),
+ (316,178,115,2),
+ (318,179,115,2),
+ (320,180,115,2),
+ (322,181,115,2),
+ (324,182,115,2),
+ (325,183,115,2),
+ (327,184,115,2),
+ (329,185,115,2),
+ (331,186,115,2),
+ (333,187,115,2),
+ (335,188,115,2),
+ (337,189,115,2),
+ (339,190,115,2),
+ (341,191,115,2),
+ (342,192,115,2),
+ (344,193,115,2),
+ (345,194,115,2),
+ (347,195,115,2),
+ (348,196,115,2),
+ (350,197,115,2),
+ (352,198,115,2),
+ (354,199,115,2),
+ (356,200,115,2),
+ (358,201,115,2),
+ (359,202,115,2),
+ (361,203,115,2),
+ (363,204,115,2),
+ (365,205,115,2),
+ (367,206,115,2),
+ (369,207,115,2),
+ (371,208,115,2),
+ (373,209,115,2),
+ (375,210,115,2),
+ (377,211,115,2),
+ (379,212,115,2),
+ (380,213,115,2),
+ (382,214,115,2),
+ (384,215,115,2),
+ (386,216,115,2),
+ (388,217,115,2),
+ (389,218,115,2),
+ (391,219,115,2),
+ (393,220,115,2),
+ (395,221,115,2),
+ (397,222,115,2),
+ (399,223,115,2),
+ (401,224,115,2),
+ (403,225,115,2),
+ (405,226,115,2),
+ (407,227,115,2),
+ (409,228,115,2),
+ (411,229,115,2),
+ (413,230,115,2),
+ (415,231,115,2),
+ (417,232,115,2),
+ (419,233,115,2),
+ (421,234,115,2),
+ (423,235,115,2),
+ (425,236,115,2),
+ (427,237,115,2),
+ (429,238,115,2),
+ (431,239,115,2),
+ (433,240,115,2),
+ (434,241,115,2),
+ (436,242,115,2),
+ (438,243,115,2),
+ (440,244,115,2),
+ (441,245,115,2),
+ (443,246,115,2),
+ (445,247,115,2),
+ (447,248,115,2),
+ (449,249,115,2),
+ (451,250,115,2),
+ (453,251,115,2),
+ (455,252,115,2),
+ (457,253,115,2),
+ (459,254,115,2),
+ (461,255,115,2),
+ (463,256,115,2),
+ (464,257,115,2),
+ (466,258,115,2),
+ (468,259,115,2),
+ (470,260,115,2),
+ (472,261,115,2),
+ (474,262,115,2),
+ (476,263,115,2),
+ (478,264,115,2),
+ (480,265,115,2),
+ (481,266,115,2),
+ (482,267,115,2),
+ (483,268,115,2),
+ (485,269,115,2),
+ (487,270,115,2),
+ (489,271,115,2),
+ (491,272,115,2),
+ (493,273,115,2),
+ (495,274,115,2),
+ (497,275,115,2),
+ (498,276,115,2),
+ (500,277,115,2),
+ (502,278,115,2),
+ (504,279,115,2),
+ (506,280,115,2),
+ (508,281,115,2),
+ (510,282,115,2),
+ (512,283,115,2),
+ (513,284,115,2),
+ (515,285,115,2),
+ (517,286,115,2),
+ (519,287,115,2),
+ (521,288,115,2),
+ (523,289,115,2),
+ (525,290,115,2),
+ (527,291,115,2),
+ (529,292,115,2),
+ (531,293,115,2),
+ (533,294,115,2),
+ (534,295,115,2),
+ (535,296,115,2),
+ (537,297,115,2),
+ (539,298,115,2),
+ (541,299,115,2),
+ (542,300,115,2),
+ (852,489,115,2),
+ (882,519,115,2),
+ (872,509,116,2),
+ (902,539,116,2),
+ (862,499,120,2),
+ (892,529,120,2),
+ (544,301,123,2),
+ (546,302,123,2),
+ (548,303,123,2),
+ (550,304,123,2),
+ (552,305,123,2),
+ (554,306,123,2),
+ (556,307,123,2),
+ (558,308,123,2),
+ (560,309,123,2),
+ (562,310,123,2),
+ (564,311,123,2),
+ (566,312,123,2),
+ (568,313,123,2),
+ (570,314,123,2),
+ (572,315,123,2),
+ (574,316,123,2),
+ (576,317,123,2),
+ (577,318,123,2),
+ (579,319,123,2),
+ (580,320,123,2),
+ (582,321,123,2),
+ (584,322,123,2),
+ (586,323,123,2),
+ (588,324,123,2),
+ (590,325,123,2),
+ (591,326,123,2),
+ (593,327,123,2),
+ (594,328,123,2),
+ (596,329,123,2),
+ (598,330,123,2),
+ (600,331,123,2),
+ (602,332,123,2),
+ (604,333,123,2),
+ (606,334,123,2),
+ (608,335,123,2),
+ (610,336,123,2),
+ (612,337,123,2),
+ (614,338,123,2),
+ (615,339,123,2),
+ (617,340,123,2),
+ (619,341,123,2),
+ (620,342,123,2),
+ (621,343,123,2),
+ (623,344,123,2),
+ (624,345,123,2),
+ (626,346,123,2),
+ (628,347,123,2),
+ (630,348,123,2),
+ (631,349,123,2),
+ (633,350,123,2),
+ (635,351,123,2),
+ (637,352,123,2),
+ (639,353,123,2),
+ (641,354,123,2),
+ (643,355,123,2),
+ (645,356,123,2),
+ (647,357,123,2),
+ (649,358,123,2),
+ (650,359,123,2),
+ (652,360,123,2),
+ (654,361,123,2),
+ (656,362,123,2),
+ (658,363,123,2),
+ (660,364,123,2),
+ (662,365,123,2),
+ (664,366,123,2),
+ (666,367,123,2),
+ (667,368,123,2),
+ (668,369,123,2),
+ (669,370,123,2),
+ (671,371,123,2),
+ (673,372,123,2),
+ (675,373,123,2),
+ (677,374,123,2),
+ (679,375,123,2),
+ (681,376,123,2),
+ (682,377,123,2),
+ (683,378,123,2),
+ (685,379,123,2),
+ (686,380,123,2),
+ (688,381,123,2),
+ (690,382,123,2),
+ (692,383,123,2),
+ (694,384,123,2),
+ (696,385,123,2),
+ (698,386,123,2),
+ (700,387,123,2),
+ (702,388,123,2),
+ (704,389,123,2),
+ (706,390,123,2),
+ (708,391,123,2),
+ (710,392,123,2),
+ (712,393,123,2),
+ (714,394,123,2),
+ (715,395,123,2),
+ (717,396,123,2),
+ (719,397,123,2),
+ (721,398,123,2),
+ (723,399,123,2),
+ (725,400,123,2),
+ (727,401,123,2),
+ (729,402,123,2),
+ (731,403,123,2),
+ (732,404,123,2),
+ (734,405,123,2),
+ (735,406,123,2),
+ (737,407,123,2),
+ (738,408,123,2),
+ (739,409,123,2),
+ (741,410,123,2),
+ (743,411,123,2),
+ (745,412,123,2),
+ (746,413,123,2),
+ (748,414,123,2),
+ (750,415,123,2),
+ (751,416,123,2),
+ (753,417,123,2),
+ (755,418,123,2),
+ (757,419,123,2),
+ (758,420,123,2),
+ (760,421,123,2),
+ (762,422,123,2),
+ (763,423,123,2),
+ (765,424,123,2),
+ (766,425,123,2),
+ (768,426,123,2),
+ (769,427,123,2),
+ (771,428,123,2),
+ (773,429,123,2),
+ (775,430,123,2),
+ (777,431,123,2),
+ (779,432,123,2),
+ (781,433,123,2),
+ (783,434,123,2),
+ (785,435,123,2),
+ (787,436,123,2),
+ (789,437,123,2),
+ (791,438,123,2),
+ (793,439,123,2),
+ (795,440,123,2),
+ (796,441,123,2),
+ (798,442,123,2),
+ (800,443,123,2),
+ (801,444,123,2),
+ (803,445,123,2),
+ (805,446,123,2),
+ (807,447,123,2),
+ (809,448,123,2),
+ (811,449,123,2),
+ (813,450,123,2),
+ (919,556,123,2),
+ (854,491,128,2),
+ (884,521,128,2),
+ (927,564,129,2),
+ (911,548,132,2),
+ (864,501,140,2),
+ (894,531,140,2),
+ (857,494,142,2),
+ (887,524,142,2),
+ (921,558,146,2),
+ (934,571,152,2),
+ (909,546,153,2),
+ (866,503,155,2),
+ (896,533,155,2),
+ (918,555,156,2),
+ (929,566,158,2),
+ (860,497,159,2),
+ (890,527,159,2),
+ (858,495,160,2),
+ (888,525,160,2),
+ (922,559,163,2),
+ (873,510,166,2),
+ (903,540,166,2),
+ (946,583,171,2),
+ (949,586,176,2),
+ (948,585,177,2),
+ (1,1,181,2),
+ (2,2,181,2),
+ (4,3,181,2),
+ (6,4,181,2),
+ (8,5,181,2),
+ (9,6,181,2),
+ (10,7,181,2),
+ (11,8,181,2),
+ (13,9,181,2),
+ (15,10,181,2),
+ (16,11,181,2),
+ (17,12,181,2),
+ (18,13,181,2),
+ (20,14,181,2),
+ (22,15,181,2),
+ (23,16,181,2),
+ (25,17,181,2),
+ (27,18,181,2),
+ (29,19,181,2),
+ (31,20,181,2),
+ (33,21,181,2),
+ (35,22,181,2),
+ (37,23,181,2),
+ (39,24,181,2),
+ (41,25,181,2),
+ (43,26,181,2),
+ (45,27,181,2),
+ (47,28,181,2),
+ (49,29,181,2),
+ (50,30,181,2),
+ (52,31,181,2),
+ (54,32,181,2),
+ (56,33,181,2),
+ (58,34,181,2),
+ (59,35,181,2),
+ (61,36,181,2),
+ (63,37,181,2),
+ (65,38,181,2),
+ (66,39,181,2),
+ (68,40,181,2),
+ (70,41,181,2),
+ (72,42,181,2),
+ (74,43,181,2),
+ (76,44,181,2),
+ (78,45,181,2),
+ (80,46,181,2),
+ (81,47,181,2),
+ (83,48,181,2),
+ (85,49,181,2),
+ (87,50,181,2),
+ (89,51,181,2),
+ (91,52,181,2),
+ (93,53,181,2),
+ (95,54,181,2),
+ (96,55,181,2),
+ (98,56,181,2),
+ (100,57,181,2),
+ (102,58,181,2),
+ (104,59,181,2),
+ (106,60,181,2),
+ (108,61,181,2),
+ (109,62,181,2),
+ (111,63,181,2),
+ (113,64,181,2),
+ (115,65,181,2),
+ (117,66,181,2),
+ (119,67,181,2),
+ (121,68,181,2),
+ (123,69,181,2),
+ (125,70,181,2),
+ (127,71,181,2),
+ (129,72,181,2),
+ (130,73,181,2),
+ (132,74,181,2),
+ (133,75,181,2),
+ (134,76,181,2),
+ (136,77,181,2),
+ (138,78,181,2),
+ (140,79,181,2),
+ (141,80,181,2),
+ (143,81,181,2),
+ (145,82,181,2),
+ (147,83,181,2),
+ (149,84,181,2),
+ (151,85,181,2),
+ (153,86,181,2),
+ (155,87,181,2),
+ (157,88,181,2),
+ (159,89,181,2),
+ (161,90,181,2),
+ (162,91,181,2),
+ (164,92,181,2),
+ (165,93,181,2),
+ (167,94,181,2),
+ (169,95,181,2),
+ (171,96,181,2),
+ (173,97,181,2),
+ (175,98,181,2),
+ (177,99,181,2),
+ (179,100,181,2),
+ (181,101,181,2),
+ (183,102,181,2),
+ (185,103,181,2),
+ (187,104,181,2),
+ (188,105,181,2),
+ (189,106,181,2),
+ (191,107,181,2),
+ (192,108,181,2),
+ (194,109,181,2),
+ (196,110,181,2),
+ (197,111,181,2),
+ (199,112,181,2),
+ (201,113,181,2),
+ (202,114,181,2),
+ (204,115,181,2),
+ (206,116,181,2),
+ (208,117,181,2),
+ (210,118,181,2),
+ (211,119,181,2),
+ (212,120,181,2),
+ (213,121,181,2),
+ (215,122,181,2),
+ (217,123,181,2),
+ (219,124,181,2),
+ (220,125,181,2),
+ (222,126,181,2),
+ (224,127,181,2),
+ (225,128,181,2),
+ (227,129,181,2),
+ (228,130,181,2),
+ (230,131,181,2),
+ (232,132,181,2),
+ (234,133,181,2),
+ (236,134,181,2),
+ (238,135,181,2),
+ (240,136,181,2),
+ (242,137,181,2),
+ (244,138,181,2),
+ (246,139,181,2),
+ (248,140,181,2),
+ (249,141,181,2),
+ (251,142,181,2),
+ (253,143,181,2),
+ (255,144,181,2),
+ (257,145,181,2),
+ (259,146,181,2),
+ (261,147,181,2),
+ (263,148,181,2),
+ (265,149,181,2),
+ (267,150,181,2),
+ (952,589,181,2),
+ (933,570,182,2),
+ (940,577,186,2),
+ (848,485,190,2),
+ (878,515,190,2),
+ (908,545,193,2),
+ (845,482,194,2),
+ (875,512,194,2),
+ (951,588,194,2),
+ (926,563,195,2),
+ (863,500,200,2),
+ (893,530,200,2),
+ (853,490,201,2),
+ (883,520,201,2),
+ (868,505,202,2),
+ (898,535,202,2);
 /*!40000 ALTER TABLE `civicrm_activity_contact` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1694,186 +1697,188 @@ 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,130,1,1,0,'355I Dowlen Rd E',355,'I',NULL,'Dowlen','Rd','E',NULL,NULL,NULL,NULL,'Clarkston',1,1021,NULL,'48346',NULL,1228,42.720966,-83.4044,0,NULL,NULL,NULL),
- (2,99,1,1,0,'335E Northpoint Pl S',335,'E',NULL,'Northpoint','Pl','S',NULL,NULL,NULL,NULL,'Waterloo',1,1014,NULL,'50706',NULL,1228,42.407588,-92.26657,0,NULL,NULL,NULL),
- (3,92,1,1,0,'652I College Ave S',652,'I',NULL,'College','Ave','S',NULL,NULL,NULL,NULL,'Cass',1,1047,NULL,'24927',NULL,1228,38.380196,-79.93278,0,NULL,NULL,NULL),
- (4,53,1,1,0,'305C Maple Ave SW',305,'C',NULL,'Maple','Ave','SW',NULL,NULL,NULL,NULL,'Cleveland',1,1045,NULL,'24225',NULL,1228,36.968491,-82.1623,0,NULL,NULL,NULL),
- (5,46,1,1,0,'945X El Camino Dr SE',945,'X',NULL,'El Camino','Dr','SE',NULL,NULL,NULL,NULL,'Spring Creek',1,1041,NULL,'38378',NULL,1228,35.764637,-88.685,0,NULL,NULL,NULL),
- (6,137,1,1,0,'271U Jackson Blvd E',271,'U',NULL,'Jackson','Blvd','E',NULL,NULL,NULL,NULL,'Monticello',1,1008,NULL,'32345',NULL,1228,30.342161,-83.840177,0,NULL,NULL,NULL),
- (7,183,1,1,0,'993B Cadell Blvd NW',993,'B',NULL,'Cadell','Blvd','NW',NULL,NULL,NULL,NULL,'Mears',1,1021,NULL,'49436',NULL,1228,43.678258,-86.46576,0,NULL,NULL,NULL),
- (8,176,1,1,0,'409O Dowlen Dr N',409,'O',NULL,'Dowlen','Dr','N',NULL,NULL,NULL,NULL,'Port Alsworth',1,1001,NULL,'99653',NULL,1228,60.102331,-154.55708,0,NULL,NULL,NULL),
- (9,110,1,1,0,'986N Martin Luther King Way S',986,'N',NULL,'Martin Luther King','Way','S',NULL,NULL,NULL,NULL,'Tuscola',1,1021,NULL,'48769',NULL,1228,43.327048,-83.657355,0,NULL,NULL,NULL),
- (10,85,1,1,0,'781F Beech Rd N',781,'F',NULL,'Beech','Rd','N',NULL,NULL,NULL,NULL,'Valley Village',1,1004,NULL,'91607',NULL,1228,34.165706,-118.39986,0,NULL,NULL,NULL),
- (11,193,1,1,0,'391P Beech Pl N',391,'P',NULL,'Beech','Pl','N',NULL,NULL,NULL,NULL,'Weymouth',1,1020,NULL,'02190',NULL,1228,42.1711,-70.94597,0,NULL,NULL,NULL),
- (12,50,1,1,0,'429F Second Dr SW',429,'F',NULL,'Second','Dr','SW',NULL,NULL,NULL,NULL,'Plano',1,1042,NULL,'76025',NULL,1228,33.104374,-96.766109,0,NULL,NULL,NULL),
- (13,67,1,1,0,'307U Maple Rd SW',307,'U',NULL,'Maple','Rd','SW',NULL,NULL,NULL,NULL,'Tampa',1,1008,NULL,'33613',NULL,1228,28.077994,-82.44989,0,NULL,NULL,NULL),
- (14,121,1,1,0,'795M States Ave S',795,'M',NULL,'States','Ave','S',NULL,NULL,NULL,NULL,'Lansing',1,1021,NULL,'48937',NULL,1228,42.748734,-84.559029,0,NULL,NULL,NULL),
- (15,75,1,1,0,'82B Woodbridge Dr W',82,'B',NULL,'Woodbridge','Dr','W',NULL,NULL,NULL,NULL,'Verona',1,1024,NULL,'65769',NULL,1228,36.935443,-93.78328,0,NULL,NULL,NULL),
- (16,19,1,1,0,'37N Green Dr SE',37,'N',NULL,'Green','Dr','SE',NULL,NULL,NULL,NULL,'Arvonia',1,1045,NULL,'23004',NULL,1228,37.673369,-78.38899,0,NULL,NULL,NULL),
- (17,106,1,1,0,'198N Woodbridge Ave NE',198,'N',NULL,'Woodbridge','Ave','NE',NULL,NULL,NULL,NULL,'Sunbury',1,1032,NULL,'27979',NULL,1228,36.440509,-76.60411,0,NULL,NULL,NULL),
- (18,13,1,1,0,'51L Second Path N',51,'L',NULL,'Second','Path','N',NULL,NULL,NULL,NULL,'Manistique',1,1021,NULL,'49854',NULL,1228,46.042121,-86.33946,0,NULL,NULL,NULL),
- (19,14,1,1,0,'479F Jackson Ave S',479,'F',NULL,'Jackson','Ave','S',NULL,NULL,NULL,NULL,'Mikana',1,1048,NULL,'54857',NULL,1228,45.591546,-91.60046,0,NULL,NULL,NULL),
- (20,88,1,1,0,'523K Beech St W',523,'K',NULL,'Beech','St','W',NULL,NULL,NULL,NULL,'Harford',1,1037,NULL,'18823',NULL,1228,41.784395,-75.70091,0,NULL,NULL,NULL),
- (21,163,1,1,0,'826C Main Path N',826,'C',NULL,'Main','Path','N',NULL,NULL,NULL,NULL,'Goodland',1,1008,NULL,'34154',NULL,1228,25.925446,-81.644387,0,NULL,NULL,NULL),
- (22,27,1,1,0,'120W El Camino St E',120,'W',NULL,'El Camino','St','E',NULL,NULL,NULL,NULL,'Selkirk',1,1031,NULL,'12158',NULL,1228,42.539822,-73.81545,0,NULL,NULL,NULL),
- (23,4,1,1,0,'62U Lincoln Ave NE',62,'U',NULL,'Lincoln','Ave','NE',NULL,NULL,NULL,NULL,'Douglas',1,1049,NULL,'82633',NULL,1228,42.935874,-105.37303,0,NULL,NULL,NULL),
- (24,168,1,1,0,'937E Pine Way S',937,'E',NULL,'Pine','Way','S',NULL,NULL,NULL,NULL,'Canadensis',1,1037,NULL,'18325',NULL,1228,41.205738,-75.24344,0,NULL,NULL,NULL),
- (25,198,1,1,0,'514X Jackson Ln SW',514,'X',NULL,'Jackson','Ln','SW',NULL,NULL,NULL,NULL,'Houston',1,1024,NULL,'65483',NULL,1228,37.316088,-91.95471,0,NULL,NULL,NULL),
- (26,91,1,1,0,'300M Martin Luther King Dr W',300,'M',NULL,'Martin Luther King','Dr','W',NULL,NULL,NULL,NULL,'Uehling',1,1026,NULL,'68063',NULL,1228,41.733433,-96.50454,0,NULL,NULL,NULL),
- (27,60,1,1,0,'948G Lincoln Blvd NE',948,'G',NULL,'Lincoln','Blvd','NE',NULL,NULL,NULL,NULL,'Topeka',1,1015,NULL,'66647',NULL,1228,39.042939,-95.769657,0,NULL,NULL,NULL),
- (28,172,1,1,0,'972L Beech Ave SE',972,'L',NULL,'Beech','Ave','SE',NULL,NULL,NULL,NULL,'Winfield',1,1037,NULL,'17889',NULL,1228,40.884501,-76.91202,0,NULL,NULL,NULL),
- (29,102,1,1,0,'747R Second Pl E',747,'R',NULL,'Second','Pl','E',NULL,NULL,NULL,NULL,'Mooresville',1,1024,NULL,'64664',NULL,1228,39.743993,-93.71189,0,NULL,NULL,NULL),
- (30,128,1,1,0,'743S Lincoln Blvd N',743,'S',NULL,'Lincoln','Blvd','N',NULL,NULL,NULL,NULL,'Chase',1,1021,NULL,'49623',NULL,1228,43.889404,-85.67131,0,NULL,NULL,NULL),
- (31,52,1,1,0,'95E El Camino Pl SW',95,'E',NULL,'El Camino','Pl','SW',NULL,NULL,NULL,NULL,'Washington',1,1028,NULL,'03280',NULL,1228,43.173046,-72.09755,0,NULL,NULL,NULL),
- (32,76,1,1,0,'231Q Martin Luther King Rd NW',231,'Q',NULL,'Martin Luther King','Rd','NW',NULL,NULL,NULL,NULL,'Boise',1,1011,NULL,'83716',NULL,1228,43.601772,-116.02721,0,NULL,NULL,NULL),
- (33,17,1,1,0,'816H Main Way SW',816,'H',NULL,'Main','Way','SW',NULL,NULL,NULL,NULL,'Avondale',1,1005,NULL,'81022',NULL,1228,38.089719,-104.37807,0,NULL,NULL,NULL),
- (34,159,1,1,0,'775L Bay Way SW',775,'L',NULL,'Bay','Way','SW',NULL,NULL,NULL,NULL,'Springport',1,1021,NULL,'49284',NULL,1228,42.38806,-84.70868,0,NULL,NULL,NULL),
- (35,30,1,1,0,'172W Woodbridge St S',172,'W',NULL,'Woodbridge','St','S',NULL,NULL,NULL,NULL,'Omaha',1,1003,NULL,'72662',NULL,1228,36.427675,-93.19473,0,NULL,NULL,NULL),
- (36,109,1,1,0,'171S Maple Pl SW',171,'S',NULL,'Maple','Pl','SW',NULL,NULL,NULL,NULL,'Cripple Creek',1,1005,NULL,'80813',NULL,1228,38.75604,-105.1497,0,NULL,NULL,NULL),
- (37,90,1,1,0,'743Q Caulder Way SE',743,'Q',NULL,'Caulder','Way','SE',NULL,NULL,NULL,NULL,'Cochranton',1,1037,NULL,'16314',NULL,1228,41.517339,-80.05761,0,NULL,NULL,NULL),
- (38,155,1,1,0,'601H Northpoint St NE',601,'H',NULL,'Northpoint','St','NE',NULL,NULL,NULL,NULL,'Lansing',1,1021,NULL,'48924',NULL,1228,42.599184,-84.371973,0,NULL,NULL,NULL),
- (39,148,1,1,0,'419L Martin Luther King St E',419,'L',NULL,'Martin Luther King','St','E',NULL,NULL,NULL,NULL,'Tupman',1,1004,NULL,'93276',NULL,1228,35.305512,-119.38925,0,NULL,NULL,NULL),
- (40,125,1,1,0,'77T Dowlen Dr NW',77,'T',NULL,'Dowlen','Dr','NW',NULL,NULL,NULL,NULL,'Rainbow',1,1042,NULL,'76077',NULL,1228,32.28122,-97.70927,0,NULL,NULL,NULL),
- (41,189,1,1,0,'834D Jackson Rd NW',834,'D',NULL,'Jackson','Rd','NW',NULL,NULL,NULL,NULL,'Charlotte',1,1044,NULL,'05445',NULL,1228,44.309241,-73.23504,0,NULL,NULL,NULL),
- (42,57,1,1,0,'756S Bay Pl E',756,'S',NULL,'Bay','Pl','E',NULL,NULL,NULL,NULL,'Elkland',1,1037,NULL,'16920',NULL,1228,41.989863,-77.31123,0,NULL,NULL,NULL),
- (43,64,1,1,0,'850G College Rd SW',850,'G',NULL,'College','Rd','SW',NULL,NULL,NULL,NULL,'Roaring River',1,1032,NULL,'28669',NULL,1228,36.229983,-80.99639,0,NULL,NULL,NULL),
- (44,83,1,1,0,'440B El Camino Rd N',440,'B',NULL,'El Camino','Rd','N',NULL,NULL,NULL,NULL,'Bat Cave',1,1032,NULL,'28710',NULL,1228,35.464897,-82.28307,0,NULL,NULL,NULL),
- (45,152,1,1,0,'358X Lincoln Ave SW',358,'X',NULL,'Lincoln','Ave','SW',NULL,NULL,NULL,NULL,'Point Lay',1,1001,NULL,'99759',NULL,1228,69.741023,-163.00861,0,NULL,NULL,NULL),
- (46,89,1,1,0,'678D Beech Rd SW',678,'D',NULL,'Beech','Rd','SW',NULL,NULL,NULL,NULL,'Plymouth',1,1048,NULL,'53073',NULL,1228,43.758674,-87.98005,0,NULL,NULL,NULL),
- (47,177,1,1,0,'168N Main Blvd N',168,'N',NULL,'Main','Blvd','N',NULL,NULL,NULL,NULL,'Earth City',1,1024,NULL,'63045',NULL,1228,38.638318,-90.427118,0,NULL,NULL,NULL),
- (48,167,1,1,0,'108J Main Pl NW',108,'J',NULL,'Main','Pl','NW',NULL,NULL,NULL,NULL,'Stone Mountain',1,1009,NULL,'30088',NULL,1228,33.762106,-84.17938,0,NULL,NULL,NULL),
- (49,115,1,1,0,'63J Caulder Pl W',63,'J',NULL,'Caulder','Pl','W',NULL,NULL,NULL,NULL,'Salisbury',1,1032,NULL,'28146',NULL,1228,35.614422,-80.43115,0,NULL,NULL,NULL),
- (50,147,1,1,0,'665V Pine Ln SE',665,'V',NULL,'Pine','Ln','SE',NULL,NULL,NULL,NULL,'Pleasant Hill',1,1004,NULL,'94523',NULL,1228,37.951672,-122.07317,0,NULL,NULL,NULL),
- (51,161,1,1,0,'826F Pine Blvd NE',826,'F',NULL,'Pine','Blvd','NE',NULL,NULL,NULL,NULL,'Smith Mills',1,1016,NULL,'42457',NULL,1228,37.801347,-87.76586,0,NULL,NULL,NULL),
- (52,127,1,1,0,'13G Green Dr S',13,'G',NULL,'Green','Dr','S',NULL,NULL,NULL,NULL,'Spivey',1,1015,NULL,'67142',NULL,1228,37.468889,-98.21584,0,NULL,NULL,NULL),
- (53,6,1,1,0,'849L Van Ness Dr NE',849,'L',NULL,'Van Ness','Dr','NE',NULL,NULL,NULL,NULL,'Irving',1,1042,NULL,'75017',NULL,1228,32.767268,-96.777626,0,NULL,NULL,NULL),
- (54,5,1,1,0,'260S Martin Luther King Path SE',260,'S',NULL,'Martin Luther King','Path','SE',NULL,NULL,NULL,NULL,'Minneapolis',1,1022,NULL,'55483',NULL,1228,45.015914,-93.47188,0,NULL,NULL,NULL),
- (55,174,1,1,0,'545Y States Pl SE',545,'Y',NULL,'States','Pl','SE',NULL,NULL,NULL,NULL,'Bliss',1,1011,NULL,'83314',NULL,1228,42.937947,-114.95287,0,NULL,NULL,NULL),
- (56,80,1,1,0,'452E Pine Ln E',452,'E',NULL,'Pine','Ln','E',NULL,NULL,NULL,NULL,'Marion',1,1034,NULL,'43307',NULL,1228,40.56941,-83.139341,0,NULL,NULL,NULL),
- (57,55,1,1,0,'962V Jackson Dr SE',962,'V',NULL,'Jackson','Dr','SE',NULL,NULL,NULL,NULL,'Buxton',1,1036,NULL,'97109',NULL,1228,45.729085,-123.20234,0,NULL,NULL,NULL),
- (58,171,1,1,0,'953Q College Rd SE',953,'Q',NULL,'College','Rd','SE',NULL,NULL,NULL,NULL,'Des Moines',1,1014,NULL,'50396',NULL,1228,41.672687,-93.572173,0,NULL,NULL,NULL),
- (59,182,1,1,0,'87O States Path W',87,'O',NULL,'States','Path','W',NULL,NULL,NULL,NULL,'Lower Brule',1,1040,NULL,'57548',NULL,1228,44.057302,-99.54871,0,NULL,NULL,NULL),
- (60,45,1,1,0,'395Y Martin Luther King St N',395,'Y',NULL,'Martin Luther King','St','N',NULL,NULL,NULL,NULL,'La Vernia',1,1042,NULL,'78121',NULL,1228,29.351202,-98.11528,0,NULL,NULL,NULL),
- (61,156,1,1,0,'376N Cadell Pl E',376,'N',NULL,'Cadell','Pl','E',NULL,NULL,NULL,NULL,'Brittany',1,1017,NULL,'70718',NULL,1228,30.201004,-90.868876,0,NULL,NULL,NULL),
- (62,131,1,1,0,'435Y Jackson Ave W',435,'Y',NULL,'Jackson','Ave','W',NULL,NULL,NULL,NULL,'Fargo',1,1033,NULL,'58121',NULL,1228,46.934596,-97.229718,0,NULL,NULL,NULL),
- (63,116,1,1,0,'442U Dowlen Pl W',442,'U',NULL,'Dowlen','Pl','W',NULL,NULL,NULL,NULL,'Houston',1,1042,NULL,'77088',NULL,1228,29.879213,-95.45028,0,NULL,NULL,NULL),
- (64,184,1,1,0,'2Y Maple Pl NE',2,'Y',NULL,'Maple','Pl','NE',NULL,NULL,NULL,NULL,'Butler',1,1048,NULL,'53007',NULL,1228,43.10836,-88.06893,0,NULL,NULL,NULL),
- (65,21,3,1,0,'310F Woodbridge Path W',310,'F',NULL,'Woodbridge','Path','W',NULL,'Community Relations',NULL,NULL,'Longstreet',1,1017,NULL,'71050',NULL,1228,32.117539,-93.913834,0,NULL,NULL,NULL),
- (66,46,2,0,0,'310F Woodbridge Path W',310,'F',NULL,'Woodbridge','Path','W',NULL,'Community Relations',NULL,NULL,'Longstreet',1,1017,NULL,'71050',NULL,1228,32.117539,-93.913834,0,NULL,NULL,65),
- (67,51,3,1,0,'280C Dowlen Ln N',280,'C',NULL,'Dowlen','Ln','N',NULL,'c/o PO Plus',NULL,NULL,'South Montrose',1,1037,NULL,'18843',NULL,1228,41.8237,-75.88314,0,NULL,NULL,NULL),
- (68,57,2,0,0,'280C Dowlen Ln N',280,'C',NULL,'Dowlen','Ln','N',NULL,'c/o PO Plus',NULL,NULL,'South Montrose',1,1037,NULL,'18843',NULL,1228,41.8237,-75.88314,0,NULL,NULL,67),
- (69,87,3,1,0,'356W Woodbridge St N',356,'W',NULL,'Woodbridge','St','N',NULL,'Editorial Dept',NULL,NULL,'Prescott',1,1021,NULL,'48756',NULL,1228,44.206123,-83.99306,0,NULL,NULL,NULL),
- (70,50,2,0,0,'356W Woodbridge St N',356,'W',NULL,'Woodbridge','St','N',NULL,'Editorial Dept',NULL,NULL,'Prescott',1,1021,NULL,'48756',NULL,1228,44.206123,-83.99306,0,NULL,NULL,69),
- (71,154,3,1,0,'368U Caulder Ln SE',368,'U',NULL,'Caulder','Ln','SE',NULL,'Payables Dept.',NULL,NULL,'Graton',1,1004,NULL,'95444',NULL,1228,38.434663,-122.8689,0,NULL,NULL,NULL),
- (72,141,2,1,0,'368U Caulder Ln SE',368,'U',NULL,'Caulder','Ln','SE',NULL,'Payables Dept.',NULL,NULL,'Graton',1,1004,NULL,'95444',NULL,1228,38.434663,-122.8689,0,NULL,NULL,71),
- (73,138,3,1,0,'385G Beech St NW',385,'G',NULL,'Beech','St','NW',NULL,'Editorial Dept',NULL,NULL,'New Castle',1,1037,NULL,'16107',NULL,1228,40.989662,-80.308376,0,NULL,NULL,NULL),
- (74,82,2,1,0,'385G Beech St NW',385,'G',NULL,'Beech','St','NW',NULL,'Editorial Dept',NULL,NULL,'New Castle',1,1037,NULL,'16107',NULL,1228,40.989662,-80.308376,0,NULL,NULL,73),
- (75,135,3,1,0,'411H Cadell Ln NW',411,'H',NULL,'Cadell','Ln','NW',NULL,'Churchgate',NULL,NULL,'Corinth',1,1023,NULL,'38835',NULL,1228,34.920451,-88.521772,0,NULL,NULL,NULL),
- (76,100,3,1,0,'352G Jackson Ave S',352,'G',NULL,'Jackson','Ave','S',NULL,'Attn: Development',NULL,NULL,'Belleville',1,1015,NULL,'67630',NULL,1228,37.097273,-96.100176,0,NULL,NULL,NULL),
- (77,48,3,1,0,'734G El Camino Pl N',734,'G',NULL,'El Camino','Pl','N',NULL,'Attn: Accounting',NULL,NULL,'Maywood',1,1012,NULL,'60153',NULL,1228,41.880281,-87.84455,0,NULL,NULL,NULL),
- (78,165,2,1,0,'734G El Camino Pl N',734,'G',NULL,'El Camino','Pl','N',NULL,'Attn: Accounting',NULL,NULL,'Maywood',1,1012,NULL,'60153',NULL,1228,41.880281,-87.84455,0,NULL,NULL,77),
- (79,122,3,1,0,'708M Main Ln S',708,'M',NULL,'Main','Ln','S',NULL,'Editorial Dept',NULL,NULL,'Des Plaines',1,1012,NULL,'60018',NULL,1228,42.008429,-87.89234,0,NULL,NULL,NULL),
- (80,110,2,0,0,'708M Main Ln S',708,'M',NULL,'Main','Ln','S',NULL,'Editorial Dept',NULL,NULL,'Des Plaines',1,1012,NULL,'60018',NULL,1228,42.008429,-87.89234,0,NULL,NULL,79),
- (81,73,3,1,0,'41V Lincoln Way SW',41,'V',NULL,'Lincoln','Way','SW',NULL,'Cuffe Parade',NULL,NULL,'Anchorage',1,1001,NULL,'99519',NULL,1228,61.108864,-149.440311,0,NULL,NULL,NULL),
- (82,139,2,1,0,'41V Lincoln Way SW',41,'V',NULL,'Lincoln','Way','SW',NULL,'Cuffe Parade',NULL,NULL,'Anchorage',1,1001,NULL,'99519',NULL,1228,61.108864,-149.440311,0,NULL,NULL,81),
- (83,40,3,1,0,'459F Cadell Rd SE',459,'F',NULL,'Cadell','Rd','SE',NULL,'Attn: Accounting',NULL,NULL,'Ong',1,1026,NULL,'68452',NULL,1228,40.394354,-97.84507,0,NULL,NULL,NULL),
- (84,187,3,1,0,'321O Green St E',321,'O',NULL,'Green','St','E',NULL,'Churchgate',NULL,NULL,'Spencer',1,1034,NULL,'44275',NULL,1228,41.101909,-82.10234,0,NULL,NULL,NULL),
- (85,142,3,1,0,'274S Main Dr SW',274,'S',NULL,'Main','Dr','SW',NULL,'Editorial Dept',NULL,NULL,'Sparta',1,1045,NULL,'22552',NULL,1228,38.009438,-77.225139,0,NULL,NULL,NULL),
- (86,44,3,1,0,'145H Jackson Pl W',145,'H',NULL,'Jackson','Pl','W',NULL,'Attn: Development',NULL,NULL,'Maple Plain',1,1022,NULL,'55359',NULL,1228,45.002212,-93.69319,0,NULL,NULL,NULL),
- (87,145,3,1,0,'283F Lincoln Rd NW',283,'F',NULL,'Lincoln','Rd','NW',NULL,'Community Relations',NULL,NULL,'Little Rock',1,1003,NULL,'72221',NULL,1228,34.751918,-92.392487,0,NULL,NULL,NULL),
- (88,103,2,1,0,'283F Lincoln Rd NW',283,'F',NULL,'Lincoln','Rd','NW',NULL,'Community Relations',NULL,NULL,'Little Rock',1,1003,NULL,'72221',NULL,1228,34.751918,-92.392487,0,NULL,NULL,87),
- (89,173,3,1,0,'354V Caulder Way W',354,'V',NULL,'Caulder','Way','W',NULL,'Mailstop 101',NULL,NULL,'Verbena',1,1000,NULL,'36091',NULL,1228,32.759543,-86.51111,0,NULL,NULL,NULL),
- (90,160,2,1,0,'354V Caulder Way W',354,'V',NULL,'Caulder','Way','W',NULL,'Mailstop 101',NULL,NULL,'Verbena',1,1000,NULL,'36091',NULL,1228,32.759543,-86.51111,0,NULL,NULL,89),
- (91,180,3,1,0,'367R Jackson Way S',367,'R',NULL,'Jackson','Way','S',NULL,'c/o OPDC',NULL,NULL,'Forestport',1,1031,NULL,'13338',NULL,1228,43.506153,-75.07355,0,NULL,NULL,NULL),
- (92,109,2,0,0,'367R Jackson Way S',367,'R',NULL,'Jackson','Way','S',NULL,'c/o OPDC',NULL,NULL,'Forestport',1,1031,NULL,'13338',NULL,1228,43.506153,-75.07355,0,NULL,NULL,91),
- (93,118,3,1,0,'737P Caulder Ave SW',737,'P',NULL,'Caulder','Ave','SW',NULL,'Community Relations',NULL,NULL,'Charleston',1,1041,NULL,'37310',NULL,1228,35.275808,-84.76927,0,NULL,NULL,NULL),
- (94,52,2,0,0,'737P Caulder Ave SW',737,'P',NULL,'Caulder','Ave','SW',NULL,'Community Relations',NULL,NULL,'Charleston',1,1041,NULL,'37310',NULL,1228,35.275808,-84.76927,0,NULL,NULL,93),
- (95,36,3,1,0,'126J Jackson Ave NE',126,'J',NULL,'Jackson','Ave','NE',NULL,'Attn: Development',NULL,NULL,'Youngstown',1,1034,NULL,'44512',NULL,1228,41.032675,-80.66467,0,NULL,NULL,NULL),
- (96,49,2,1,0,'126J Jackson Ave NE',126,'J',NULL,'Jackson','Ave','NE',NULL,'Attn: Development',NULL,NULL,'Youngstown',1,1034,NULL,'44512',NULL,1228,41.032675,-80.66467,0,NULL,NULL,95),
- (97,170,3,1,0,'204E Beech Way SE',204,'E',NULL,'Beech','Way','SE',NULL,'Payables Dept.',NULL,NULL,'New Concord',1,1034,NULL,'43762',NULL,1228,40.018953,-81.73657,0,NULL,NULL,NULL),
- (98,114,1,1,0,'358X Lincoln Ave SW',358,'X',NULL,'Lincoln','Ave','SW',NULL,NULL,NULL,NULL,'Point Lay',1,1001,NULL,'99759',NULL,1228,69.741023,-163.00861,0,NULL,NULL,45),
- (99,175,1,1,0,'358X Lincoln Ave SW',358,'X',NULL,'Lincoln','Ave','SW',NULL,NULL,NULL,NULL,'Point Lay',1,1001,NULL,'99759',NULL,1228,69.741023,-163.00861,0,NULL,NULL,45),
- (100,49,1,0,0,'358X Lincoln Ave SW',358,'X',NULL,'Lincoln','Ave','SW',NULL,NULL,NULL,NULL,'Point Lay',1,1001,NULL,'99759',NULL,1228,69.741023,-163.00861,0,NULL,NULL,45),
- (101,83,1,0,0,'340G Woodbridge Rd NW',340,'G',NULL,'Woodbridge','Rd','NW',NULL,NULL,NULL,NULL,'Long Lake',1,1031,NULL,'12847',NULL,1228,43.97643,-74.56669,0,NULL,NULL,NULL),
- (102,3,1,1,0,'678D Beech Rd SW',678,'D',NULL,'Beech','Rd','SW',NULL,NULL,NULL,NULL,'Plymouth',1,1048,NULL,'53073',NULL,1228,43.758674,-87.98005,0,NULL,NULL,46),
- (103,68,1,1,0,'678D Beech Rd SW',678,'D',NULL,'Beech','Rd','SW',NULL,NULL,NULL,NULL,'Plymouth',1,1048,NULL,'53073',NULL,1228,43.758674,-87.98005,0,NULL,NULL,46),
- (104,69,1,1,0,'678D Beech Rd SW',678,'D',NULL,'Beech','Rd','SW',NULL,NULL,NULL,NULL,'Plymouth',1,1048,NULL,'53073',NULL,1228,43.758674,-87.98005,0,NULL,NULL,46),
- (105,124,1,1,0,'742C Beech Blvd W',742,'C',NULL,'Beech','Blvd','W',NULL,NULL,NULL,NULL,'Marksville',1,1017,NULL,'71351',NULL,1228,31.140727,-92.08056,0,NULL,NULL,NULL),
- (106,2,1,1,0,'168N Main Blvd N',168,'N',NULL,'Main','Blvd','N',NULL,NULL,NULL,NULL,'Earth City',1,1024,NULL,'63045',NULL,1228,38.638318,-90.427118,0,NULL,NULL,47),
- (107,56,1,1,0,'168N Main Blvd N',168,'N',NULL,'Main','Blvd','N',NULL,NULL,NULL,NULL,'Earth City',1,1024,NULL,'63045',NULL,1228,38.638318,-90.427118,0,NULL,NULL,47),
- (108,140,1,1,0,'168N Main Blvd N',168,'N',NULL,'Main','Blvd','N',NULL,NULL,NULL,NULL,'Earth City',1,1024,NULL,'63045',NULL,1228,38.638318,-90.427118,0,NULL,NULL,47),
- (109,58,1,1,0,'912O Pine St NE',912,'O',NULL,'Pine','St','NE',NULL,NULL,NULL,NULL,'Eureka',1,1004,NULL,'95503',NULL,1228,40.757091,-124.1513,0,NULL,NULL,NULL),
- (110,24,1,1,0,'108J Main Pl NW',108,'J',NULL,'Main','Pl','NW',NULL,NULL,NULL,NULL,'Stone Mountain',1,1009,NULL,'30088',NULL,1228,33.762106,-84.17938,0,NULL,NULL,48),
- (111,107,1,1,0,'108J Main Pl NW',108,'J',NULL,'Main','Pl','NW',NULL,NULL,NULL,NULL,'Stone Mountain',1,1009,NULL,'30088',NULL,1228,33.762106,-84.17938,0,NULL,NULL,48),
- (112,134,1,1,0,'108J Main Pl NW',108,'J',NULL,'Main','Pl','NW',NULL,NULL,NULL,NULL,'Stone Mountain',1,1009,NULL,'30088',NULL,1228,33.762106,-84.17938,0,NULL,NULL,48),
- (113,38,1,1,0,'108J Main Pl NW',108,'J',NULL,'Main','Pl','NW',NULL,NULL,NULL,NULL,'Stone Mountain',1,1009,NULL,'30088',NULL,1228,33.762106,-84.17938,0,NULL,NULL,48),
- (114,123,1,1,0,'63J Caulder Pl W',63,'J',NULL,'Caulder','Pl','W',NULL,NULL,NULL,NULL,'Salisbury',1,1032,NULL,'28146',NULL,1228,35.614422,-80.43115,0,NULL,NULL,49),
- (115,79,1,1,0,'63J Caulder Pl W',63,'J',NULL,'Caulder','Pl','W',NULL,NULL,NULL,NULL,'Salisbury',1,1032,NULL,'28146',NULL,1228,35.614422,-80.43115,0,NULL,NULL,49),
- (116,32,1,1,0,'63J Caulder Pl W',63,'J',NULL,'Caulder','Pl','W',NULL,NULL,NULL,NULL,'Salisbury',1,1032,NULL,'28146',NULL,1228,35.614422,-80.43115,0,NULL,NULL,49),
- (117,149,1,1,0,'63J Caulder Pl W',63,'J',NULL,'Caulder','Pl','W',NULL,NULL,NULL,NULL,'Salisbury',1,1032,NULL,'28146',NULL,1228,35.614422,-80.43115,0,NULL,NULL,49),
- (118,143,1,1,0,'665V Pine Ln SE',665,'V',NULL,'Pine','Ln','SE',NULL,NULL,NULL,NULL,'Pleasant Hill',1,1004,NULL,'94523',NULL,1228,37.951672,-122.07317,0,NULL,NULL,50),
- (119,132,1,1,0,'665V Pine Ln SE',665,'V',NULL,'Pine','Ln','SE',NULL,NULL,NULL,NULL,'Pleasant Hill',1,1004,NULL,'94523',NULL,1228,37.951672,-122.07317,0,NULL,NULL,50),
- (120,199,1,1,0,'665V Pine Ln SE',665,'V',NULL,'Pine','Ln','SE',NULL,NULL,NULL,NULL,'Pleasant Hill',1,1004,NULL,'94523',NULL,1228,37.951672,-122.07317,0,NULL,NULL,50),
- (121,42,1,1,0,'665V Pine Ln SE',665,'V',NULL,'Pine','Ln','SE',NULL,NULL,NULL,NULL,'Pleasant Hill',1,1004,NULL,'94523',NULL,1228,37.951672,-122.07317,0,NULL,NULL,50),
- (122,160,1,0,0,'826F Pine Blvd NE',826,'F',NULL,'Pine','Blvd','NE',NULL,NULL,NULL,NULL,'Smith Mills',1,1016,NULL,'42457',NULL,1228,37.801347,-87.76586,0,NULL,NULL,51),
- (123,188,1,1,0,'826F Pine Blvd NE',826,'F',NULL,'Pine','Blvd','NE',NULL,NULL,NULL,NULL,'Smith Mills',1,1016,NULL,'42457',NULL,1228,37.801347,-87.76586,0,NULL,NULL,51),
- (124,8,1,1,0,'826F Pine Blvd NE',826,'F',NULL,'Pine','Blvd','NE',NULL,NULL,NULL,NULL,'Smith Mills',1,1016,NULL,'42457',NULL,1228,37.801347,-87.76586,0,NULL,NULL,51),
- (125,144,1,1,0,'324T Woodbridge St SE',324,'T',NULL,'Woodbridge','St','SE',NULL,NULL,NULL,NULL,'Campton',1,1028,NULL,'03223',NULL,1228,43.887682,-71.65161,0,NULL,NULL,NULL),
- (126,11,1,1,0,'13G Green Dr S',13,'G',NULL,'Green','Dr','S',NULL,NULL,NULL,NULL,'Spivey',1,1015,NULL,'67142',NULL,1228,37.468889,-98.21584,0,NULL,NULL,52),
- (127,185,1,1,0,'13G Green Dr S',13,'G',NULL,'Green','Dr','S',NULL,NULL,NULL,NULL,'Spivey',1,1015,NULL,'67142',NULL,1228,37.468889,-98.21584,0,NULL,NULL,52),
- (128,158,1,1,0,'13G Green Dr S',13,'G',NULL,'Green','Dr','S',NULL,NULL,NULL,NULL,'Spivey',1,1015,NULL,'67142',NULL,1228,37.468889,-98.21584,0,NULL,NULL,52),
- (129,96,1,1,0,'13G Green Dr S',13,'G',NULL,'Green','Dr','S',NULL,NULL,NULL,NULL,'Spivey',1,1015,NULL,'67142',NULL,1228,37.468889,-98.21584,0,NULL,NULL,52),
- (130,103,1,0,0,'849L Van Ness Dr NE',849,'L',NULL,'Van Ness','Dr','NE',NULL,NULL,NULL,NULL,'Irving',1,1042,NULL,'75017',NULL,1228,32.767268,-96.777626,0,NULL,NULL,53),
- (131,112,1,1,0,'849L Van Ness Dr NE',849,'L',NULL,'Van Ness','Dr','NE',NULL,NULL,NULL,NULL,'Irving',1,1042,NULL,'75017',NULL,1228,32.767268,-96.777626,0,NULL,NULL,53),
- (132,150,1,1,0,'849L Van Ness Dr NE',849,'L',NULL,'Van Ness','Dr','NE',NULL,NULL,NULL,NULL,'Irving',1,1042,NULL,'75017',NULL,1228,32.767268,-96.777626,0,NULL,NULL,53),
- (133,119,1,1,0,'849L Van Ness Dr NE',849,'L',NULL,'Van Ness','Dr','NE',NULL,NULL,NULL,NULL,'Irving',1,1042,NULL,'75017',NULL,1228,32.767268,-96.777626,0,NULL,NULL,53),
- (134,108,1,1,0,'260S Martin Luther King Path SE',260,'S',NULL,'Martin Luther King','Path','SE',NULL,NULL,NULL,NULL,'Minneapolis',1,1022,NULL,'55483',NULL,1228,45.015914,-93.47188,0,NULL,NULL,54),
- (135,191,1,1,0,'260S Martin Luther King Path SE',260,'S',NULL,'Martin Luther King','Path','SE',NULL,NULL,NULL,NULL,'Minneapolis',1,1022,NULL,'55483',NULL,1228,45.015914,-93.47188,0,NULL,NULL,54),
- (136,105,1,1,0,'260S Martin Luther King Path SE',260,'S',NULL,'Martin Luther King','Path','SE',NULL,NULL,NULL,NULL,'Minneapolis',1,1022,NULL,'55483',NULL,1228,45.015914,-93.47188,0,NULL,NULL,54),
- (137,95,1,1,0,'260S Martin Luther King Path SE',260,'S',NULL,'Martin Luther King','Path','SE',NULL,NULL,NULL,NULL,'Minneapolis',1,1022,NULL,'55483',NULL,1228,45.015914,-93.47188,0,NULL,NULL,54),
- (138,33,1,1,0,'545Y States Pl SE',545,'Y',NULL,'States','Pl','SE',NULL,NULL,NULL,NULL,'Bliss',1,1011,NULL,'83314',NULL,1228,42.937947,-114.95287,0,NULL,NULL,55),
- (139,104,1,1,0,'545Y States Pl SE',545,'Y',NULL,'States','Pl','SE',NULL,NULL,NULL,NULL,'Bliss',1,1011,NULL,'83314',NULL,1228,42.937947,-114.95287,0,NULL,NULL,55),
- (140,151,1,1,0,'545Y States Pl SE',545,'Y',NULL,'States','Pl','SE',NULL,NULL,NULL,NULL,'Bliss',1,1011,NULL,'83314',NULL,1228,42.937947,-114.95287,0,NULL,NULL,55),
- (141,153,1,1,0,'545Y States Pl SE',545,'Y',NULL,'States','Pl','SE',NULL,NULL,NULL,NULL,'Bliss',1,1011,NULL,'83314',NULL,1228,42.937947,-114.95287,0,NULL,NULL,55),
- (142,29,1,1,0,'452E Pine Ln E',452,'E',NULL,'Pine','Ln','E',NULL,NULL,NULL,NULL,'Marion',1,1034,NULL,'43307',NULL,1228,40.56941,-83.139341,0,NULL,NULL,56),
- (143,65,1,1,0,'452E Pine Ln E',452,'E',NULL,'Pine','Ln','E',NULL,NULL,NULL,NULL,'Marion',1,1034,NULL,'43307',NULL,1228,40.56941,-83.139341,0,NULL,NULL,56),
- (144,43,1,1,0,'452E Pine Ln E',452,'E',NULL,'Pine','Ln','E',NULL,NULL,NULL,NULL,'Marion',1,1034,NULL,'43307',NULL,1228,40.56941,-83.139341,0,NULL,NULL,56),
- (145,7,1,1,0,'452E Pine Ln E',452,'E',NULL,'Pine','Ln','E',NULL,NULL,NULL,NULL,'Marion',1,1034,NULL,'43307',NULL,1228,40.56941,-83.139341,0,NULL,NULL,56),
- (146,9,1,1,0,'962V Jackson Dr SE',962,'V',NULL,'Jackson','Dr','SE',NULL,NULL,NULL,NULL,'Buxton',1,1036,NULL,'97109',NULL,1228,45.729085,-123.20234,0,NULL,NULL,57),
- (147,179,1,1,0,'962V Jackson Dr SE',962,'V',NULL,'Jackson','Dr','SE',NULL,NULL,NULL,NULL,'Buxton',1,1036,NULL,'97109',NULL,1228,45.729085,-123.20234,0,NULL,NULL,57),
- (148,39,1,1,0,'962V Jackson Dr SE',962,'V',NULL,'Jackson','Dr','SE',NULL,NULL,NULL,NULL,'Buxton',1,1036,NULL,'97109',NULL,1228,45.729085,-123.20234,0,NULL,NULL,57),
- (149,197,1,1,0,'962V Jackson Dr SE',962,'V',NULL,'Jackson','Dr','SE',NULL,NULL,NULL,NULL,'Buxton',1,1036,NULL,'97109',NULL,1228,45.729085,-123.20234,0,NULL,NULL,57),
- (150,169,1,1,0,'953Q College Rd SE',953,'Q',NULL,'College','Rd','SE',NULL,NULL,NULL,NULL,'Des Moines',1,1014,NULL,'50396',NULL,1228,41.672687,-93.572173,0,NULL,NULL,58),
- (151,20,1,1,0,'953Q College Rd SE',953,'Q',NULL,'College','Rd','SE',NULL,NULL,NULL,NULL,'Des Moines',1,1014,NULL,'50396',NULL,1228,41.672687,-93.572173,0,NULL,NULL,58),
- (152,25,1,1,0,'953Q College Rd SE',953,'Q',NULL,'College','Rd','SE',NULL,NULL,NULL,NULL,'Des Moines',1,1014,NULL,'50396',NULL,1228,41.672687,-93.572173,0,NULL,NULL,58),
- (153,162,1,1,0,'953Q College Rd SE',953,'Q',NULL,'College','Rd','SE',NULL,NULL,NULL,NULL,'Des Moines',1,1014,NULL,'50396',NULL,1228,41.672687,-93.572173,0,NULL,NULL,58),
- (154,18,1,1,0,'87O States Path W',87,'O',NULL,'States','Path','W',NULL,NULL,NULL,NULL,'Lower Brule',1,1040,NULL,'57548',NULL,1228,44.057302,-99.54871,0,NULL,NULL,59),
- (155,61,1,1,0,'87O States Path W',87,'O',NULL,'States','Path','W',NULL,NULL,NULL,NULL,'Lower Brule',1,1040,NULL,'57548',NULL,1228,44.057302,-99.54871,0,NULL,NULL,59),
- (156,35,1,1,0,'87O States Path W',87,'O',NULL,'States','Path','W',NULL,NULL,NULL,NULL,'Lower Brule',1,1040,NULL,'57548',NULL,1228,44.057302,-99.54871,0,NULL,NULL,59),
- (157,97,1,1,0,'833Y Main Path S',833,'Y',NULL,'Main','Path','S',NULL,NULL,NULL,NULL,'Norene',1,1041,NULL,'37136',NULL,1228,36.156231,-86.304922,0,NULL,NULL,NULL),
- (158,178,1,1,0,'395Y Martin Luther King St N',395,'Y',NULL,'Martin Luther King','St','N',NULL,NULL,NULL,NULL,'La Vernia',1,1042,NULL,'78121',NULL,1228,29.351202,-98.11528,0,NULL,NULL,60),
- (159,31,1,1,0,'395Y Martin Luther King St N',395,'Y',NULL,'Martin Luther King','St','N',NULL,NULL,NULL,NULL,'La Vernia',1,1042,NULL,'78121',NULL,1228,29.351202,-98.11528,0,NULL,NULL,60),
- (160,74,1,1,0,'395Y Martin Luther King St N',395,'Y',NULL,'Martin Luther King','St','N',NULL,NULL,NULL,NULL,'La Vernia',1,1042,NULL,'78121',NULL,1228,29.351202,-98.11528,0,NULL,NULL,60),
- (161,111,1,1,0,'757P Woodbridge Pl S',757,'P',NULL,'Woodbridge','Pl','S',NULL,NULL,NULL,NULL,'Shandon',1,1004,NULL,'93461',NULL,1228,35.636185,-120.27185,0,NULL,NULL,NULL),
- (162,186,1,1,0,'376N Cadell Pl E',376,'N',NULL,'Cadell','Pl','E',NULL,NULL,NULL,NULL,'Brittany',1,1017,NULL,'70718',NULL,1228,30.201004,-90.868876,0,NULL,NULL,61),
- (163,26,1,1,0,'376N Cadell Pl E',376,'N',NULL,'Cadell','Pl','E',NULL,NULL,NULL,NULL,'Brittany',1,1017,NULL,'70718',NULL,1228,30.201004,-90.868876,0,NULL,NULL,61),
- (164,139,1,0,0,'376N Cadell Pl E',376,'N',NULL,'Cadell','Pl','E',NULL,NULL,NULL,NULL,'Brittany',1,1017,NULL,'70718',NULL,1228,30.201004,-90.868876,0,NULL,NULL,61),
- (165,126,1,1,0,'376N Cadell Pl E',376,'N',NULL,'Cadell','Pl','E',NULL,NULL,NULL,NULL,'Brittany',1,1017,NULL,'70718',NULL,1228,30.201004,-90.868876,0,NULL,NULL,61),
- (166,194,1,1,0,'435Y Jackson Ave W',435,'Y',NULL,'Jackson','Ave','W',NULL,NULL,NULL,NULL,'Fargo',1,1033,NULL,'58121',NULL,1228,46.934596,-97.229718,0,NULL,NULL,62),
- (167,28,1,1,0,'435Y Jackson Ave W',435,'Y',NULL,'Jackson','Ave','W',NULL,NULL,NULL,NULL,'Fargo',1,1033,NULL,'58121',NULL,1228,46.934596,-97.229718,0,NULL,NULL,62),
- (168,72,1,1,0,'435Y Jackson Ave W',435,'Y',NULL,'Jackson','Ave','W',NULL,NULL,NULL,NULL,'Fargo',1,1033,NULL,'58121',NULL,1228,46.934596,-97.229718,0,NULL,NULL,62),
- (169,201,1,1,0,'435Y Jackson Ave W',435,'Y',NULL,'Jackson','Ave','W',NULL,NULL,NULL,NULL,'Fargo',1,1033,NULL,'58121',NULL,1228,46.934596,-97.229718,0,NULL,NULL,62),
- (170,136,1,1,0,'442U Dowlen Pl W',442,'U',NULL,'Dowlen','Pl','W',NULL,NULL,NULL,NULL,'Houston',1,1042,NULL,'77088',NULL,1228,29.879213,-95.45028,0,NULL,NULL,63),
- (171,81,1,1,0,'442U Dowlen Pl W',442,'U',NULL,'Dowlen','Pl','W',NULL,NULL,NULL,NULL,'Houston',1,1042,NULL,'77088',NULL,1228,29.879213,-95.45028,0,NULL,NULL,63),
- (172,78,1,1,0,'442U Dowlen Pl W',442,'U',NULL,'Dowlen','Pl','W',NULL,NULL,NULL,NULL,'Houston',1,1042,NULL,'77088',NULL,1228,29.879213,-95.45028,0,NULL,NULL,63),
- (173,12,1,1,0,'879N Van Ness Pl NW',879,'N',NULL,'Van Ness','Pl','NW',NULL,NULL,NULL,NULL,'Leesburg',1,1008,NULL,'34788',NULL,1228,28.857425,-81.7845,0,NULL,NULL,NULL),
- (174,94,1,1,0,'2Y Maple Pl NE',2,'Y',NULL,'Maple','Pl','NE',NULL,NULL,NULL,NULL,'Butler',1,1048,NULL,'53007',NULL,1228,43.10836,-88.06893,0,NULL,NULL,64),
- (175,157,1,1,0,'2Y Maple Pl NE',2,'Y',NULL,'Maple','Pl','NE',NULL,NULL,NULL,NULL,'Butler',1,1048,NULL,'53007',NULL,1228,43.10836,-88.06893,0,NULL,NULL,64),
- (176,82,1,0,0,'2Y Maple Pl NE',2,'Y',NULL,'Maple','Pl','NE',NULL,NULL,NULL,NULL,'Butler',1,1048,NULL,'53007',NULL,1228,43.10836,-88.06893,0,NULL,NULL,64),
- (177,54,1,1,0,'547X Martin Luther King Way S',547,'X',NULL,'Martin Luther King','Way','S',NULL,NULL,NULL,NULL,'Neptune',1,1029,NULL,'07754',NULL,1228,40.302718,-74.24928,0,NULL,NULL,NULL),
- (178,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),
- (179,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),
- (180,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);
+ (1,8,1,1,0,'20N Northpoint Dr SE',20,'N',NULL,'Northpoint','Dr','SE',NULL,NULL,NULL,NULL,'Kremlin',1,1035,NULL,'73753',NULL,1228,36.56225,-97.83368,0,NULL,NULL,NULL),
+ (2,95,1,1,0,'65W Woodbridge Dr E',65,'W',NULL,'Woodbridge','Dr','E',NULL,NULL,NULL,NULL,'Glencross',1,1040,NULL,'57630',NULL,1228,45.098685,-100.879214,0,NULL,NULL,NULL),
+ (3,73,1,1,0,'666C Maple Blvd NW',666,'C',NULL,'Maple','Blvd','NW',NULL,NULL,NULL,NULL,'Midland',1,1021,NULL,'48674',NULL,1228,43.612884,-84.197125,0,NULL,NULL,NULL),
+ (4,85,1,1,0,'979K Northpoint Ln SW',979,'K',NULL,'Northpoint','Ln','SW',NULL,NULL,NULL,NULL,'Bishop',1,1009,NULL,'30621',NULL,1228,33.804849,-83.48164,0,NULL,NULL,NULL),
+ (5,200,1,1,0,'26X Van Ness Pl S',26,'X',NULL,'Van Ness','Pl','S',NULL,NULL,NULL,NULL,'Indianapolis',1,1013,NULL,'46205',NULL,1228,39.824858,-86.13817,0,NULL,NULL,NULL),
+ (6,20,1,1,0,'202O Woodbridge Path SW',202,'O',NULL,'Woodbridge','Path','SW',NULL,NULL,NULL,NULL,'Sweetwater',1,1035,NULL,'73666',NULL,1228,35.458562,-99.87143,0,NULL,NULL,NULL),
+ (7,111,1,1,0,'904Z Caulder Dr NE',904,'Z',NULL,'Caulder','Dr','NE',NULL,NULL,NULL,NULL,'Toledo',1,1036,NULL,'97391',NULL,1228,44.626888,-123.91515,0,NULL,NULL,NULL),
+ (8,42,1,1,0,'305G Lincoln Dr E',305,'G',NULL,'Lincoln','Dr','E',NULL,NULL,NULL,NULL,'Kaleva',1,1021,NULL,'49645',NULL,1228,44.371587,-86.0122,0,NULL,NULL,NULL),
+ (9,198,1,1,0,'811K Woodbridge Ave S',811,'K',NULL,'Woodbridge','Ave','S',NULL,NULL,NULL,NULL,'Scottsdale',1,1002,NULL,'85257',NULL,1228,33.467347,-111.91741,0,NULL,NULL,NULL),
+ (10,196,1,1,0,'808I El Camino Rd S',808,'I',NULL,'El Camino','Rd','S',NULL,NULL,NULL,NULL,'Geneva',1,1034,NULL,'44041',NULL,1228,41.802618,-80.94645,0,NULL,NULL,NULL),
+ (11,36,1,1,0,'185Y Pine Rd SW',185,'Y',NULL,'Pine','Rd','SW',NULL,NULL,NULL,NULL,'Blue Hill',1,1018,NULL,'04614',NULL,1228,44.413056,-68.58156,0,NULL,NULL,NULL),
+ (12,13,1,1,0,'787G College Ln W',787,'G',NULL,'College','Ln','W',NULL,NULL,NULL,NULL,'Phillipsville',1,1004,NULL,'95559',NULL,1228,40.196116,-123.77315,0,NULL,NULL,NULL),
+ (13,177,1,1,0,'528S Main Rd NE',528,'S',NULL,'Main','Rd','NE',NULL,NULL,NULL,NULL,'Anniston',1,1000,NULL,'36206',NULL,1228,33.719701,-85.83166,0,NULL,NULL,NULL),
+ (14,21,1,1,0,'599J Pine St SW',599,'J',NULL,'Pine','St','SW',NULL,NULL,NULL,NULL,'Bailey',1,1005,NULL,'80421',NULL,1228,39.460306,-105.476,0,NULL,NULL,NULL),
+ (15,58,1,1,0,'158U Jackson Path NE',158,'U',NULL,'Jackson','Path','NE',NULL,NULL,NULL,NULL,'Minturn',1,1005,NULL,'81645',NULL,1228,39.459323,-106.37859,0,NULL,NULL,NULL),
+ (16,22,1,1,0,'498T El Camino Ln S',498,'T',NULL,'El Camino','Ln','S',NULL,NULL,NULL,NULL,'Milton',1,1048,NULL,'53563',NULL,1228,42.778497,-88.95595,0,NULL,NULL,NULL),
+ (17,166,1,1,0,'309N Pine St N',309,'N',NULL,'Pine','St','N',NULL,NULL,NULL,NULL,'Baldwin Place',1,1031,NULL,'10505',NULL,1228,41.33431,-73.749244,0,NULL,NULL,NULL),
+ (18,4,1,1,0,'718M El Camino Ave NE',718,'M',NULL,'El Camino','Ave','NE',NULL,NULL,NULL,NULL,'Greenfield',1,1014,NULL,'50849',NULL,1228,41.308843,-94.42424,0,NULL,NULL,NULL),
+ (19,94,1,1,0,'764U Maple Dr E',764,'U',NULL,'Maple','Dr','E',NULL,NULL,NULL,NULL,'Shrewsbury',1,1020,NULL,'01546',NULL,1228,42.364807,-71.896868,0,NULL,NULL,NULL),
+ (20,74,1,1,0,'743L Lincoln Rd SE',743,'L',NULL,'Lincoln','Rd','SE',NULL,NULL,NULL,NULL,'Kewanee',1,1024,NULL,'63860',NULL,1228,36.67088,-89.57338,0,NULL,NULL,NULL),
+ (21,96,1,1,0,'598C Dowlen Path S',598,'C',NULL,'Dowlen','Path','S',NULL,NULL,NULL,NULL,'Great River',1,1031,NULL,'11739',NULL,1228,40.922326,-72.637078,0,NULL,NULL,NULL),
+ (22,35,1,1,0,'942Y Northpoint Blvd W',942,'Y',NULL,'Northpoint','Blvd','W',NULL,NULL,NULL,NULL,'Lopez Island',1,1046,NULL,'98261',NULL,1228,48.481655,-122.88271,0,NULL,NULL,NULL),
+ (23,76,1,1,0,'101Y Northpoint Dr NE',101,'Y',NULL,'Northpoint','Dr','NE',NULL,NULL,NULL,NULL,'Atomic City',1,1011,NULL,'83215',NULL,1228,43.442618,-112.81316,0,NULL,NULL,NULL),
+ (24,187,1,1,0,'812N Jackson Ln E',812,'N',NULL,'Jackson','Ln','E',NULL,NULL,NULL,NULL,'Kennewick',1,1046,NULL,'99338',NULL,1228,46.192356,-119.23982,0,NULL,NULL,NULL),
+ (25,122,1,1,0,'943G Dowlen Blvd N',943,'G',NULL,'Dowlen','Blvd','N',NULL,NULL,NULL,NULL,'Lexington',1,1016,NULL,'40579',NULL,1228,38.028269,-84.471505,0,NULL,NULL,NULL),
+ (26,93,1,1,0,'281Y Bay Rd W',281,'Y',NULL,'Bay','Rd','W',NULL,NULL,NULL,NULL,'State Line',1,1013,NULL,'47982',NULL,1228,40.196628,-87.5271,0,NULL,NULL,NULL),
+ (27,60,1,1,0,'754E Cadell Pl SE',754,'E',NULL,'Cadell','Pl','SE',NULL,NULL,NULL,NULL,'Mabton',1,1046,NULL,'98935',NULL,1228,46.177732,-120.02966,0,NULL,NULL,NULL),
+ (28,197,1,1,0,'28X Main Dr N',28,'X',NULL,'Main','Dr','N',NULL,NULL,NULL,NULL,'Poland',1,1013,NULL,'47868',NULL,1228,39.414547,-86.90202,0,NULL,NULL,NULL),
+ (29,66,1,1,0,'949N College Ave NE',949,'N',NULL,'College','Ave','NE',NULL,NULL,NULL,NULL,'Guaynabo',1,1054,NULL,'00971',NULL,1228,18.329688,-66.11876,0,NULL,NULL,NULL),
+ (30,131,1,1,0,'124G Caulder Pl S',124,'G',NULL,'Caulder','Pl','S',NULL,NULL,NULL,NULL,'Beaver',1,1036,NULL,'97108',NULL,1228,45.284763,-123.6908,0,NULL,NULL,NULL),
+ (31,128,1,1,0,'844L El Camino Dr S',844,'L',NULL,'El Camino','Dr','S',NULL,NULL,NULL,NULL,'Silver Creek',1,1026,NULL,'68663',NULL,1228,41.306574,-97.70019,0,NULL,NULL,NULL),
+ (32,201,1,1,0,'55X Martin Luther King Path SW',55,'X',NULL,'Martin Luther King','Path','SW',NULL,NULL,NULL,NULL,'Winnebago',1,1048,NULL,'54985',NULL,1228,44.075084,-88.51758,0,NULL,NULL,NULL),
+ (33,5,1,1,0,'526Q Martin Luther King Way E',526,'Q',NULL,'Martin Luther King','Way','E',NULL,NULL,NULL,NULL,'Spencerville',1,1034,NULL,'45887',NULL,1228,40.711394,-84.35509,0,NULL,NULL,NULL),
+ (34,112,1,1,0,'785A Main Ln SW',785,'A',NULL,'Main','Ln','SW',NULL,NULL,NULL,NULL,'Kennard',1,1042,NULL,'75847',NULL,1228,31.355453,-95.15421,0,NULL,NULL,NULL),
+ (35,194,1,1,0,'53V Van Ness Ln NE',53,'V',NULL,'Van Ness','Ln','NE',NULL,NULL,NULL,NULL,'Pittsburgh',1,1037,NULL,'15257',NULL,1228,40.434436,-80.024817,0,NULL,NULL,NULL),
+ (36,145,1,1,0,'625U Jackson Rd NE',625,'U',NULL,'Jackson','Rd','NE',NULL,NULL,NULL,NULL,'Henderson',1,1032,NULL,'27537',NULL,1228,36.33705,-78.387374,0,NULL,NULL,NULL),
+ (37,88,1,1,0,'944C College Ln NE',944,'C',NULL,'College','Ln','NE',NULL,NULL,NULL,NULL,'French Camp',1,1004,NULL,'95231',NULL,1228,37.882742,-121.27978,0,NULL,NULL,NULL),
+ (38,99,1,1,0,'426K Lincoln Blvd SW',426,'K',NULL,'Lincoln','Blvd','SW',NULL,NULL,NULL,NULL,'Minong',1,1048,NULL,'54859',NULL,1228,46.127976,-91.84389,0,NULL,NULL,NULL),
+ (39,125,1,1,0,'953F College Dr N',953,'F',NULL,'College','Dr','N',NULL,NULL,NULL,NULL,'Glouster',1,1034,NULL,'45732',NULL,1228,39.506243,-82.0779,0,NULL,NULL,NULL),
+ (40,189,1,1,0,'963B Martin Luther King Dr S',963,'B',NULL,'Martin Luther King','Dr','S',NULL,NULL,NULL,NULL,'Clintondale',1,1031,NULL,'12515',NULL,1228,41.681096,-74.06421,0,NULL,NULL,NULL),
+ (41,179,1,1,0,'684I Van Ness Rd SE',684,'I',NULL,'Van Ness','Rd','SE',NULL,NULL,NULL,NULL,'Washington',1,1050,NULL,'20411',NULL,1228,38.883962,-77.022098,0,NULL,NULL,NULL),
+ (42,65,1,1,0,'349I Maple Rd E',349,'I',NULL,'Maple','Rd','E',NULL,NULL,NULL,NULL,'Defuniak Springs',1,1008,NULL,'32435',NULL,1228,30.603777,-86.12111,0,NULL,NULL,NULL),
+ (43,114,1,1,0,'39O Maple Rd N',39,'O',NULL,'Maple','Rd','N',NULL,NULL,NULL,NULL,'Dewitt',1,1016,NULL,'40930',NULL,1228,36.855044,-83.739,0,NULL,NULL,NULL),
+ (44,54,1,1,0,'493K Second Ln W',493,'K',NULL,'Second','Ln','W',NULL,NULL,NULL,NULL,'Tioga',1,1042,NULL,'76271',NULL,1228,33.469076,-96.91632,0,NULL,NULL,NULL),
+ (45,52,1,1,0,'446N States St N',446,'N',NULL,'States','St','N',NULL,NULL,NULL,NULL,'Dearborn',1,1021,NULL,'48123',NULL,1228,42.239933,-83.150823,0,NULL,NULL,NULL),
+ (46,32,1,1,0,'558H Cadell St SE',558,'H',NULL,'Cadell','St','SE',NULL,NULL,NULL,NULL,'Angleton',1,1042,NULL,'77515',NULL,1228,29.16866,-95.44541,0,NULL,NULL,NULL),
+ (47,43,1,1,0,'300P Second Way W',300,'P',NULL,'Second','Way','W',NULL,NULL,NULL,NULL,'Providence',1,1038,NULL,'02909',NULL,1228,41.8191,-71.44775,0,NULL,NULL,NULL),
+ (48,19,1,1,0,'976N Lincoln Ave E',976,'N',NULL,'Lincoln','Ave','E',NULL,NULL,NULL,NULL,'Jackson',1,1023,NULL,'39217',NULL,1228,32.297396,-90.208088,0,NULL,NULL,NULL),
+ (49,162,1,1,0,'430S Bay Way S',430,'S',NULL,'Bay','Way','S',NULL,NULL,NULL,NULL,'Warne',1,1032,NULL,'28909',NULL,1228,34.994752,-83.90161,0,NULL,NULL,NULL),
+ (50,80,1,1,0,'513L Lincoln Ln NE',513,'L',NULL,'Lincoln','Ln','NE',NULL,NULL,NULL,NULL,'Allenhurst',1,1009,NULL,'31301',NULL,1228,31.764663,-81.6098,0,NULL,NULL,NULL),
+ (51,137,1,1,0,'537I Woodbridge Ln E',537,'I',NULL,'Woodbridge','Ln','E',NULL,NULL,NULL,NULL,'Ponce',1,1054,NULL,'00716',NULL,1228,17.999066,-66.59965,0,NULL,NULL,NULL),
+ (52,141,1,1,0,'691J College Rd NW',691,'J',NULL,'College','Rd','NW',NULL,NULL,NULL,NULL,'Champlain',1,1045,NULL,'22438',NULL,1228,38.041706,-77.005,0,NULL,NULL,NULL),
+ (53,98,1,1,0,'315A College Ave SW',315,'A',NULL,'College','Ave','SW',NULL,NULL,NULL,NULL,'Thonotosassa',1,1008,NULL,'33592',NULL,1228,28.077843,-82.29837,0,NULL,NULL,NULL),
+ (54,161,1,1,0,'291U College Dr SE',291,'U',NULL,'College','Dr','SE',NULL,NULL,NULL,NULL,'Musselshell',1,1025,NULL,'59059',NULL,1228,46.455469,-108.0903,0,NULL,NULL,NULL),
+ (55,10,1,1,0,'955T Caulder Ave NW',955,'T',NULL,'Caulder','Ave','NW',NULL,NULL,NULL,NULL,'Osborne',1,1015,NULL,'67473',NULL,1228,39.409385,-98.7059,0,NULL,NULL,NULL),
+ (56,199,1,1,0,'653Y Beech Pl SW',653,'Y',NULL,'Beech','Pl','SW',NULL,NULL,NULL,NULL,'Houston',1,1042,NULL,'77261',NULL,1228,29.83399,-95.434241,0,NULL,NULL,NULL),
+ (57,29,1,1,0,'653J Second Rd SE',653,'J',NULL,'Second','Rd','SE',NULL,NULL,NULL,NULL,'Wauconda',1,1012,NULL,'60084',NULL,1228,42.263181,-88.14328,0,NULL,NULL,NULL),
+ (58,59,1,1,0,'672E Main Dr NE',672,'E',NULL,'Main','Dr','NE',NULL,NULL,NULL,NULL,'Greenview',1,1004,NULL,'96037',NULL,1228,41.53101,-122.95666,0,NULL,NULL,NULL),
+ (59,46,1,1,0,'956N Beech Rd W',956,'N',NULL,'Beech','Rd','W',NULL,NULL,NULL,NULL,'Houston',1,1042,NULL,'77039',NULL,1228,29.909123,-95.33683,0,NULL,NULL,NULL),
+ (60,11,1,1,0,'878K Lincoln Ln N',878,'K',NULL,'Lincoln','Ln','N',NULL,NULL,NULL,NULL,'Ontario',1,1004,NULL,'91758',NULL,1228,34.839964,-115.967051,0,NULL,NULL,NULL),
+ (61,170,1,1,0,'547B Main Dr SE',547,'B',NULL,'Main','Dr','SE',NULL,NULL,NULL,NULL,'Marks',1,1023,NULL,'38646',NULL,1228,34.261893,-90.27443,0,NULL,NULL,NULL),
+ (62,41,1,1,0,'323I El Camino Dr SE',323,'I',NULL,'El Camino','Dr','SE',NULL,NULL,NULL,NULL,'Huggins',1,1024,NULL,'65484',NULL,1228,37.366219,-92.20608,0,NULL,NULL,NULL),
+ (63,102,1,1,0,'237N Maple Ln E',237,'N',NULL,'Maple','Ln','E',NULL,NULL,NULL,NULL,'McLain',1,1023,NULL,'39456',NULL,1228,31.072789,-88.80915,0,NULL,NULL,NULL),
+ (64,86,1,1,0,'731B Lincoln St N',731,'B',NULL,'Lincoln','St','N',NULL,NULL,NULL,NULL,'Pfeifer',1,1015,NULL,'67660',NULL,1228,38.704467,-99.1815,0,NULL,NULL,NULL),
+ (65,132,1,1,0,'23K Northpoint Rd SW',23,'K',NULL,'Northpoint','Rd','SW',NULL,NULL,NULL,NULL,'Tampa',1,1008,NULL,'33631',NULL,1228,27.871964,-82.438841,0,NULL,NULL,NULL),
+ (66,178,1,1,0,'150T Bay Pl E',150,'T',NULL,'Bay','Pl','E',NULL,NULL,NULL,NULL,'Fairfield',1,1033,NULL,'58627',NULL,1228,47.219032,-103.23327,0,NULL,NULL,NULL),
+ (67,152,1,1,0,'307H Cadell Pl N',307,'H',NULL,'Cadell','Pl','N',NULL,NULL,NULL,NULL,'Plano',1,1042,NULL,'75093',NULL,1228,33.03505,-96.80492,0,NULL,NULL,NULL),
+ (68,18,1,1,0,'252L Woodbridge St SE',252,'L',NULL,'Woodbridge','St','SE',NULL,NULL,NULL,NULL,'Mozelle',1,1016,NULL,'40858',NULL,1228,37.018413,-83.39768,0,NULL,NULL,NULL),
+ (69,193,3,1,0,'241B College Ln N',241,'B',NULL,'College','Ln','N',NULL,'Payables Dept.',NULL,NULL,'Shallowater',1,1042,NULL,'79363',NULL,1228,33.701024,-102.01948,0,NULL,NULL,NULL),
+ (70,108,2,1,0,'241B College Ln N',241,'B',NULL,'College','Ln','N',NULL,'Payables Dept.',NULL,NULL,'Shallowater',1,1042,NULL,'79363',NULL,1228,33.701024,-102.01948,0,NULL,NULL,69),
+ (71,17,3,1,0,'899M College Way NW',899,'M',NULL,'College','Way','NW',NULL,'Cuffe Parade',NULL,NULL,'Minneapolis',1,1022,NULL,'55431',NULL,1228,44.829564,-93.30982,0,NULL,NULL,NULL),
+ (72,78,2,1,0,'899M College Way NW',899,'M',NULL,'College','Way','NW',NULL,'Cuffe Parade',NULL,NULL,'Minneapolis',1,1022,NULL,'55431',NULL,1228,44.829564,-93.30982,0,NULL,NULL,71),
+ (73,9,3,1,0,'217H Main Dr NE',217,'H',NULL,'Main','Dr','NE',NULL,'Cuffe Parade',NULL,NULL,'Parks',1,1003,NULL,'72950',NULL,1228,34.779465,-93.90077,0,NULL,NULL,NULL),
+ (74,60,2,0,0,'217H Main Dr NE',217,'H',NULL,'Main','Dr','NE',NULL,'Cuffe Parade',NULL,NULL,'Parks',1,1003,NULL,'72950',NULL,1228,34.779465,-93.90077,0,NULL,NULL,73),
+ (75,23,3,1,0,'744L States Way W',744,'L',NULL,'States','Way','W',NULL,'Cuffe Parade',NULL,NULL,'Carlisle',1,1031,NULL,'12031',NULL,1228,42.770985,-74.44694,0,NULL,NULL,NULL),
+ (76,144,3,1,0,'457I El Camino Rd N',457,'I',NULL,'El Camino','Rd','N',NULL,'Churchgate',NULL,NULL,'Wyndmere',1,1033,NULL,'58081',NULL,1228,46.282064,-97.13477,0,NULL,NULL,NULL),
+ (77,129,3,1,0,'498U Cadell St W',498,'U',NULL,'Cadell','St','W',NULL,'Disbursements',NULL,NULL,'Valliant',1,1035,NULL,'74764',NULL,1228,34.038794,-95.07793,0,NULL,NULL,NULL),
+ (78,138,2,1,0,'498U Cadell St W',498,'U',NULL,'Cadell','St','W',NULL,'Disbursements',NULL,NULL,'Valliant',1,1035,NULL,'74764',NULL,1228,34.038794,-95.07793,0,NULL,NULL,77),
+ (79,174,3,1,0,'37M Caulder Blvd NE',37,'M',NULL,'Caulder','Blvd','NE',NULL,'Receiving',NULL,NULL,'Water Valley',1,1023,NULL,'38695',NULL,1228,34.164116,-89.625197,0,NULL,NULL,NULL),
+ (80,169,3,1,0,'239H Van Ness Rd S',239,'H',NULL,'Van Ness','Rd','S',NULL,'Editorial Dept',NULL,NULL,'Pocono Summit',1,1037,NULL,'18346',NULL,1228,41.118226,-75.39631,0,NULL,NULL,NULL),
+ (81,32,2,0,0,'239H Van Ness Rd S',239,'H',NULL,'Van Ness','Rd','S',NULL,'Editorial Dept',NULL,NULL,'Pocono Summit',1,1037,NULL,'18346',NULL,1228,41.118226,-75.39631,0,NULL,NULL,80),
+ (82,49,3,1,0,'400K Woodbridge Ln E',400,'K',NULL,'Woodbridge','Ln','E',NULL,'Urgent',NULL,NULL,'Toledo',1,1034,NULL,'43660',NULL,1228,41.654649,-83.532883,0,NULL,NULL,NULL),
+ (83,158,2,1,0,'400K Woodbridge Ln E',400,'K',NULL,'Woodbridge','Ln','E',NULL,'Urgent',NULL,NULL,'Toledo',1,1034,NULL,'43660',NULL,1228,41.654649,-83.532883,0,NULL,NULL,82),
+ (84,90,3,1,0,'276B Jackson Ln N',276,'B',NULL,'Jackson','Ln','N',NULL,'Community Relations',NULL,NULL,'Potsdam',1,1031,NULL,'13676',NULL,1228,44.651265,-74.95289,0,NULL,NULL,NULL),
+ (85,40,3,1,0,'206N Green Path S',206,'N',NULL,'Green','Path','S',NULL,'Community Relations',NULL,NULL,'Auxvasse',1,1024,NULL,'65231',NULL,1228,39.0159,-91.8983,0,NULL,NULL,NULL),
+ (86,146,2,1,0,'206N Green Path S',206,'N',NULL,'Green','Path','S',NULL,'Community Relations',NULL,NULL,'Auxvasse',1,1024,NULL,'65231',NULL,1228,39.0159,-91.8983,0,NULL,NULL,85),
+ (87,192,3,1,0,'366L Northpoint Rd SW',366,'L',NULL,'Northpoint','Rd','SW',NULL,'Community Relations',NULL,NULL,'Mobile',1,1000,NULL,'36693',NULL,1228,30.630441,-88.15397,0,NULL,NULL,NULL),
+ (88,121,3,1,0,'442N Pine Way S',442,'N',NULL,'Pine','Way','S',NULL,'Editorial Dept',NULL,NULL,'Meridian',1,1023,NULL,'39309',NULL,1228,32.337389,-88.726474,0,NULL,NULL,NULL),
+ (89,52,2,0,0,'442N Pine Way S',442,'N',NULL,'Pine','Way','S',NULL,'Editorial Dept',NULL,NULL,'Meridian',1,1023,NULL,'39309',NULL,1228,32.337389,-88.726474,0,NULL,NULL,88),
+ (90,184,3,1,0,'992Y Cadell Dr SW',992,'Y',NULL,'Cadell','Dr','SW',NULL,'Receiving',NULL,NULL,'Sunland Park',1,1030,NULL,'88063',NULL,1228,31.799253,-106.57771,0,NULL,NULL,NULL),
+ (91,130,3,1,0,'815B Second Ln SE',815,'B',NULL,'Second','Ln','SE',NULL,'Cuffe Parade',NULL,NULL,'Kenedy',1,1042,NULL,'78119',NULL,1228,28.779344,-97.85626,0,NULL,NULL,NULL),
+ (92,34,2,1,0,'815B Second Ln SE',815,'B',NULL,'Second','Ln','SE',NULL,'Cuffe Parade',NULL,NULL,'Kenedy',1,1042,NULL,'78119',NULL,1228,28.779344,-97.85626,0,NULL,NULL,91),
+ (93,124,3,1,0,'266Q Woodbridge Dr NW',266,'Q',NULL,'Woodbridge','Dr','NW',NULL,'Churchgate',NULL,NULL,'Saint Paul',1,1022,NULL,'55191',NULL,1228,45.005902,-93.105869,0,NULL,NULL,NULL),
+ (94,135,3,1,0,'263A Caulder Ave SW',263,'A',NULL,'Caulder','Ave','SW',NULL,'Payables Dept.',NULL,NULL,'Greensboro',1,1013,NULL,'47344',NULL,1228,39.876764,-85.46546,0,NULL,NULL,NULL),
+ (95,84,3,1,0,'21H El Camino Pl NE',21,'H',NULL,'El Camino','Pl','NE',NULL,'Mailstop 101',NULL,NULL,'Natchitoches',1,1017,NULL,'71497',NULL,1228,31.747563,-93.079055,0,NULL,NULL,NULL),
+ (96,166,2,0,0,'21H El Camino Pl NE',21,'H',NULL,'El Camino','Pl','NE',NULL,'Mailstop 101',NULL,NULL,'Natchitoches',1,1017,NULL,'71497',NULL,1228,31.747563,-93.079055,0,NULL,NULL,95),
+ (97,14,3,1,0,'197N Main Ave N',197,'N',NULL,'Main','Ave','N',NULL,'Attn: Accounting',NULL,NULL,'Memphis',1,1041,NULL,'38150',NULL,1228,35.201738,-89.971538,0,NULL,NULL,NULL),
+ (98,69,3,1,0,'848V Dowlen Path E',848,'V',NULL,'Dowlen','Path','E',NULL,'Attn: Development',NULL,NULL,'Lexington',1,1020,NULL,'02420',NULL,1228,42.452895,-71.21619,0,NULL,NULL,NULL),
+ (99,155,2,1,0,'848V Dowlen Path E',848,'V',NULL,'Dowlen','Path','E',NULL,'Attn: Development',NULL,NULL,'Lexington',1,1020,NULL,'02420',NULL,1228,42.452895,-71.21619,0,NULL,NULL,98),
+ (100,156,1,1,0,'430S Bay Way S',430,'S',NULL,'Bay','Way','S',NULL,NULL,NULL,NULL,'Warne',1,1032,NULL,'28909',NULL,1228,34.994752,-83.90161,0,NULL,NULL,49),
+ (101,77,1,1,0,'430S Bay Way S',430,'S',NULL,'Bay','Way','S',NULL,NULL,NULL,NULL,'Warne',1,1032,NULL,'28909',NULL,1228,34.994752,-83.90161,0,NULL,NULL,49),
+ (102,127,1,1,0,'430S Bay Way S',430,'S',NULL,'Bay','Way','S',NULL,NULL,NULL,NULL,'Warne',1,1032,NULL,'28909',NULL,1228,34.994752,-83.90161,0,NULL,NULL,49),
+ (103,67,1,1,0,'459D Green Way N',459,'D',NULL,'Green','Way','N',NULL,NULL,NULL,NULL,'Middlefield',1,1006,NULL,'06455',NULL,1228,41.514383,-72.7183,0,NULL,NULL,NULL),
+ (104,182,1,1,0,'513L Lincoln Ln NE',513,'L',NULL,'Lincoln','Ln','NE',NULL,NULL,NULL,NULL,'Allenhurst',1,1009,NULL,'31301',NULL,1228,31.764663,-81.6098,0,NULL,NULL,50),
+ (105,176,1,1,0,'513L Lincoln Ln NE',513,'L',NULL,'Lincoln','Ln','NE',NULL,NULL,NULL,NULL,'Allenhurst',1,1009,NULL,'31301',NULL,1228,31.764663,-81.6098,0,NULL,NULL,50),
+ (106,56,1,1,0,'513L Lincoln Ln NE',513,'L',NULL,'Lincoln','Ln','NE',NULL,NULL,NULL,NULL,'Allenhurst',1,1009,NULL,'31301',NULL,1228,31.764663,-81.6098,0,NULL,NULL,50),
+ (107,70,1,1,0,'66D Second Pl S',66,'D',NULL,'Second','Pl','S',NULL,NULL,NULL,NULL,'Bronx',1,1031,NULL,'10472',NULL,1228,40.830409,-73.86845,0,NULL,NULL,NULL),
+ (108,173,1,1,0,'537I Woodbridge Ln E',537,'I',NULL,'Woodbridge','Ln','E',NULL,NULL,NULL,NULL,'Ponce',1,1054,NULL,'00716',NULL,1228,17.999066,-66.59965,0,NULL,NULL,51),
+ (109,53,1,1,0,'537I Woodbridge Ln E',537,'I',NULL,'Woodbridge','Ln','E',NULL,NULL,NULL,NULL,'Ponce',1,1054,NULL,'00716',NULL,1228,17.999066,-66.59965,0,NULL,NULL,51),
+ (110,151,1,1,0,'537I Woodbridge Ln E',537,'I',NULL,'Woodbridge','Ln','E',NULL,NULL,NULL,NULL,'Ponce',1,1054,NULL,'00716',NULL,1228,17.999066,-66.59965,0,NULL,NULL,51),
+ (111,153,1,1,0,'537I Woodbridge Ln E',537,'I',NULL,'Woodbridge','Ln','E',NULL,NULL,NULL,NULL,'Ponce',1,1054,NULL,'00716',NULL,1228,17.999066,-66.59965,0,NULL,NULL,51),
+ (112,109,1,1,0,'691J College Rd NW',691,'J',NULL,'College','Rd','NW',NULL,NULL,NULL,NULL,'Champlain',1,1045,NULL,'22438',NULL,1228,38.041706,-77.005,0,NULL,NULL,52),
+ (113,51,1,1,0,'691J College Rd NW',691,'J',NULL,'College','Rd','NW',NULL,NULL,NULL,NULL,'Champlain',1,1045,NULL,'22438',NULL,1228,38.041706,-77.005,0,NULL,NULL,52),
+ (114,7,1,1,0,'691J College Rd NW',691,'J',NULL,'College','Rd','NW',NULL,NULL,NULL,NULL,'Champlain',1,1045,NULL,'22438',NULL,1228,38.041706,-77.005,0,NULL,NULL,52),
+ (115,101,1,1,0,'691J College Rd NW',691,'J',NULL,'College','Rd','NW',NULL,NULL,NULL,NULL,'Champlain',1,1045,NULL,'22438',NULL,1228,38.041706,-77.005,0,NULL,NULL,52),
+ (116,57,1,1,0,'315A College Ave SW',315,'A',NULL,'College','Ave','SW',NULL,NULL,NULL,NULL,'Thonotosassa',1,1008,NULL,'33592',NULL,1228,28.077843,-82.29837,0,NULL,NULL,53),
+ (117,62,1,1,0,'315A College Ave SW',315,'A',NULL,'College','Ave','SW',NULL,NULL,NULL,NULL,'Thonotosassa',1,1008,NULL,'33592',NULL,1228,28.077843,-82.29837,0,NULL,NULL,53),
+ (118,33,1,1,0,'315A College Ave SW',315,'A',NULL,'College','Ave','SW',NULL,NULL,NULL,NULL,'Thonotosassa',1,1008,NULL,'33592',NULL,1228,28.077843,-82.29837,0,NULL,NULL,53),
+ (119,24,1,1,0,'315A College Ave SW',315,'A',NULL,'College','Ave','SW',NULL,NULL,NULL,NULL,'Thonotosassa',1,1008,NULL,'33592',NULL,1228,28.077843,-82.29837,0,NULL,NULL,53),
+ (120,97,1,1,0,'291U College Dr SE',291,'U',NULL,'College','Dr','SE',NULL,NULL,NULL,NULL,'Musselshell',1,1025,NULL,'59059',NULL,1228,46.455469,-108.0903,0,NULL,NULL,54),
+ (121,106,1,1,0,'291U College Dr SE',291,'U',NULL,'College','Dr','SE',NULL,NULL,NULL,NULL,'Musselshell',1,1025,NULL,'59059',NULL,1228,46.455469,-108.0903,0,NULL,NULL,54),
+ (122,91,1,1,0,'291U College Dr SE',291,'U',NULL,'College','Dr','SE',NULL,NULL,NULL,NULL,'Musselshell',1,1025,NULL,'59059',NULL,1228,46.455469,-108.0903,0,NULL,NULL,54),
+ (123,191,1,1,0,'655R Jackson Ln NE',655,'R',NULL,'Jackson','Ln','NE',NULL,NULL,NULL,NULL,'Greenwood',1,1026,NULL,'68366',NULL,1228,40.974167,-96.43555,0,NULL,NULL,NULL),
+ (124,155,1,0,0,'955T Caulder Ave NW',955,'T',NULL,'Caulder','Ave','NW',NULL,NULL,NULL,NULL,'Osborne',1,1015,NULL,'67473',NULL,1228,39.409385,-98.7059,0,NULL,NULL,55),
+ (125,25,1,1,0,'955T Caulder Ave NW',955,'T',NULL,'Caulder','Ave','NW',NULL,NULL,NULL,NULL,'Osborne',1,1015,NULL,'67473',NULL,1228,39.409385,-98.7059,0,NULL,NULL,55),
+ (126,157,1,1,0,'955T Caulder Ave NW',955,'T',NULL,'Caulder','Ave','NW',NULL,NULL,NULL,NULL,'Osborne',1,1015,NULL,'67473',NULL,1228,39.409385,-98.7059,0,NULL,NULL,55),
+ (127,39,1,1,0,'955T Caulder Ave NW',955,'T',NULL,'Caulder','Ave','NW',NULL,NULL,NULL,NULL,'Osborne',1,1015,NULL,'67473',NULL,1228,39.409385,-98.7059,0,NULL,NULL,55),
+ (128,133,1,1,0,'653Y Beech Pl SW',653,'Y',NULL,'Beech','Pl','SW',NULL,NULL,NULL,NULL,'Houston',1,1042,NULL,'77261',NULL,1228,29.83399,-95.434241,0,NULL,NULL,56),
+ (129,50,1,1,0,'653Y Beech Pl SW',653,'Y',NULL,'Beech','Pl','SW',NULL,NULL,NULL,NULL,'Houston',1,1042,NULL,'77261',NULL,1228,29.83399,-95.434241,0,NULL,NULL,56),
+ (130,190,1,1,0,'653Y Beech Pl SW',653,'Y',NULL,'Beech','Pl','SW',NULL,NULL,NULL,NULL,'Houston',1,1042,NULL,'77261',NULL,1228,29.83399,-95.434241,0,NULL,NULL,56),
+ (131,148,1,1,0,'653Y Beech Pl SW',653,'Y',NULL,'Beech','Pl','SW',NULL,NULL,NULL,NULL,'Houston',1,1042,NULL,'77261',NULL,1228,29.83399,-95.434241,0,NULL,NULL,56),
+ (132,2,1,1,0,'653J Second Rd SE',653,'J',NULL,'Second','Rd','SE',NULL,NULL,NULL,NULL,'Wauconda',1,1012,NULL,'60084',NULL,1228,42.263181,-88.14328,0,NULL,NULL,57),
+ (133,117,1,1,0,'653J Second Rd SE',653,'J',NULL,'Second','Rd','SE',NULL,NULL,NULL,NULL,'Wauconda',1,1012,NULL,'60084',NULL,1228,42.263181,-88.14328,0,NULL,NULL,57),
+ (134,188,1,1,0,'653J Second Rd SE',653,'J',NULL,'Second','Rd','SE',NULL,NULL,NULL,NULL,'Wauconda',1,1012,NULL,'60084',NULL,1228,42.263181,-88.14328,0,NULL,NULL,57),
+ (135,16,1,1,0,'653J Second Rd SE',653,'J',NULL,'Second','Rd','SE',NULL,NULL,NULL,NULL,'Wauconda',1,1012,NULL,'60084',NULL,1228,42.263181,-88.14328,0,NULL,NULL,57),
+ (136,195,1,1,0,'672E Main Dr NE',672,'E',NULL,'Main','Dr','NE',NULL,NULL,NULL,NULL,'Greenview',1,1004,NULL,'96037',NULL,1228,41.53101,-122.95666,0,NULL,NULL,58),
+ (137,113,1,1,0,'672E Main Dr NE',672,'E',NULL,'Main','Dr','NE',NULL,NULL,NULL,NULL,'Greenview',1,1004,NULL,'96037',NULL,1228,41.53101,-122.95666,0,NULL,NULL,58),
+ (138,44,1,1,0,'672E Main Dr NE',672,'E',NULL,'Main','Dr','NE',NULL,NULL,NULL,NULL,'Greenview',1,1004,NULL,'96037',NULL,1228,41.53101,-122.95666,0,NULL,NULL,58),
+ (139,146,1,0,0,'734Q Maple Dr NW',734,'Q',NULL,'Maple','Dr','NW',NULL,NULL,NULL,NULL,'Weirton',1,1047,NULL,'26062',NULL,1228,40.412067,-80.57542,0,NULL,NULL,NULL),
+ (140,163,1,1,0,'956N Beech Rd W',956,'N',NULL,'Beech','Rd','W',NULL,NULL,NULL,NULL,'Houston',1,1042,NULL,'77039',NULL,1228,29.909123,-95.33683,0,NULL,NULL,59),
+ (141,82,1,1,0,'956N Beech Rd W',956,'N',NULL,'Beech','Rd','W',NULL,NULL,NULL,NULL,'Houston',1,1042,NULL,'77039',NULL,1228,29.909123,-95.33683,0,NULL,NULL,59),
+ (142,172,1,1,0,'956N Beech Rd W',956,'N',NULL,'Beech','Rd','W',NULL,NULL,NULL,NULL,'Houston',1,1042,NULL,'77039',NULL,1228,29.909123,-95.33683,0,NULL,NULL,59),
+ (143,110,1,1,0,'956N Beech Rd W',956,'N',NULL,'Beech','Rd','W',NULL,NULL,NULL,NULL,'Houston',1,1042,NULL,'77039',NULL,1228,29.909123,-95.33683,0,NULL,NULL,59),
+ (144,147,1,1,0,'878K Lincoln Ln N',878,'K',NULL,'Lincoln','Ln','N',NULL,NULL,NULL,NULL,'Ontario',1,1004,NULL,'91758',NULL,1228,34.839964,-115.967051,0,NULL,NULL,60),
+ (145,47,1,1,0,'878K Lincoln Ln N',878,'K',NULL,'Lincoln','Ln','N',NULL,NULL,NULL,NULL,'Ontario',1,1004,NULL,'91758',NULL,1228,34.839964,-115.967051,0,NULL,NULL,60),
+ (146,140,1,1,0,'878K Lincoln Ln N',878,'K',NULL,'Lincoln','Ln','N',NULL,NULL,NULL,NULL,'Ontario',1,1004,NULL,'91758',NULL,1228,34.839964,-115.967051,0,NULL,NULL,60),
+ (147,12,1,1,0,'878K Lincoln Ln N',878,'K',NULL,'Lincoln','Ln','N',NULL,NULL,NULL,NULL,'Ontario',1,1004,NULL,'91758',NULL,1228,34.839964,-115.967051,0,NULL,NULL,60),
+ (148,149,1,1,0,'547B Main Dr SE',547,'B',NULL,'Main','Dr','SE',NULL,NULL,NULL,NULL,'Marks',1,1023,NULL,'38646',NULL,1228,34.261893,-90.27443,0,NULL,NULL,61),
+ (149,38,1,1,0,'547B Main Dr SE',547,'B',NULL,'Main','Dr','SE',NULL,NULL,NULL,NULL,'Marks',1,1023,NULL,'38646',NULL,1228,34.261893,-90.27443,0,NULL,NULL,61),
+ (150,108,1,0,0,'547B Main Dr SE',547,'B',NULL,'Main','Dr','SE',NULL,NULL,NULL,NULL,'Marks',1,1023,NULL,'38646',NULL,1228,34.261893,-90.27443,0,NULL,NULL,61),
+ (151,48,1,1,0,'912Q States Path W',912,'Q',NULL,'States','Path','W',NULL,NULL,NULL,NULL,'Roanoke',1,1045,NULL,'24044',NULL,1228,37.274175,-79.95786,0,NULL,NULL,NULL),
+ (152,34,1,0,0,'323I El Camino Dr SE',323,'I',NULL,'El Camino','Dr','SE',NULL,NULL,NULL,NULL,'Huggins',1,1024,NULL,'65484',NULL,1228,37.366219,-92.20608,0,NULL,NULL,62),
+ (153,75,1,1,0,'323I El Camino Dr SE',323,'I',NULL,'El Camino','Dr','SE',NULL,NULL,NULL,NULL,'Huggins',1,1024,NULL,'65484',NULL,1228,37.366219,-92.20608,0,NULL,NULL,62),
+ (154,27,1,1,0,'323I El Camino Dr SE',323,'I',NULL,'El Camino','Dr','SE',NULL,NULL,NULL,NULL,'Huggins',1,1024,NULL,'65484',NULL,1228,37.366219,-92.20608,0,NULL,NULL,62),
+ (155,26,1,1,0,'323I El Camino Dr SE',323,'I',NULL,'El Camino','Dr','SE',NULL,NULL,NULL,NULL,'Huggins',1,1024,NULL,'65484',NULL,1228,37.366219,-92.20608,0,NULL,NULL,62),
+ (156,150,1,1,0,'237N Maple Ln E',237,'N',NULL,'Maple','Ln','E',NULL,NULL,NULL,NULL,'McLain',1,1023,NULL,'39456',NULL,1228,31.072789,-88.80915,0,NULL,NULL,63),
+ (157,168,1,1,0,'237N Maple Ln E',237,'N',NULL,'Maple','Ln','E',NULL,NULL,NULL,NULL,'McLain',1,1023,NULL,'39456',NULL,1228,31.072789,-88.80915,0,NULL,NULL,63),
+ (158,31,1,1,0,'237N Maple Ln E',237,'N',NULL,'Maple','Ln','E',NULL,NULL,NULL,NULL,'McLain',1,1023,NULL,'39456',NULL,1228,31.072789,-88.80915,0,NULL,NULL,63),
+ (159,83,1,1,0,'746F Pine Ave NE',746,'F',NULL,'Pine','Ave','NE',NULL,NULL,NULL,NULL,'Mineola',1,1042,NULL,'75773',NULL,1228,32.674657,-95.46982,0,NULL,NULL,NULL),
+ (160,64,1,1,0,'731B Lincoln St N',731,'B',NULL,'Lincoln','St','N',NULL,NULL,NULL,NULL,'Pfeifer',1,1015,NULL,'67660',NULL,1228,38.704467,-99.1815,0,NULL,NULL,64),
+ (161,72,1,1,0,'731B Lincoln St N',731,'B',NULL,'Lincoln','St','N',NULL,NULL,NULL,NULL,'Pfeifer',1,1015,NULL,'67660',NULL,1228,38.704467,-99.1815,0,NULL,NULL,64),
+ (162,15,1,1,0,'731B Lincoln St N',731,'B',NULL,'Lincoln','St','N',NULL,NULL,NULL,NULL,'Pfeifer',1,1015,NULL,'67660',NULL,1228,38.704467,-99.1815,0,NULL,NULL,64),
+ (163,183,1,1,0,'731B Lincoln St N',731,'B',NULL,'Lincoln','St','N',NULL,NULL,NULL,NULL,'Pfeifer',1,1015,NULL,'67660',NULL,1228,38.704467,-99.1815,0,NULL,NULL,64),
+ (164,71,1,1,0,'23K Northpoint Rd SW',23,'K',NULL,'Northpoint','Rd','SW',NULL,NULL,NULL,NULL,'Tampa',1,1008,NULL,'33631',NULL,1228,27.871964,-82.438841,0,NULL,NULL,65),
+ (165,181,1,1,0,'23K Northpoint Rd SW',23,'K',NULL,'Northpoint','Rd','SW',NULL,NULL,NULL,NULL,'Tampa',1,1008,NULL,'33631',NULL,1228,27.871964,-82.438841,0,NULL,NULL,65),
+ (166,175,1,1,0,'23K Northpoint Rd SW',23,'K',NULL,'Northpoint','Rd','SW',NULL,NULL,NULL,NULL,'Tampa',1,1008,NULL,'33631',NULL,1228,27.871964,-82.438841,0,NULL,NULL,65),
+ (167,115,1,1,0,'995Q Main St W',995,'Q',NULL,'Main','St','W',NULL,NULL,NULL,NULL,'Columbia',1,1039,NULL,'29233',NULL,1228,34.091966,-80.87343,0,NULL,NULL,NULL),
+ (168,87,1,1,0,'150T Bay Pl E',150,'T',NULL,'Bay','Pl','E',NULL,NULL,NULL,NULL,'Fairfield',1,1033,NULL,'58627',NULL,1228,47.219032,-103.23327,0,NULL,NULL,66),
+ (169,3,1,1,0,'150T Bay Pl E',150,'T',NULL,'Bay','Pl','E',NULL,NULL,NULL,NULL,'Fairfield',1,1033,NULL,'58627',NULL,1228,47.219032,-103.23327,0,NULL,NULL,66),
+ (170,103,1,1,0,'150T Bay Pl E',150,'T',NULL,'Bay','Pl','E',NULL,NULL,NULL,NULL,'Fairfield',1,1033,NULL,'58627',NULL,1228,47.219032,-103.23327,0,NULL,NULL,66),
+ (171,180,1,1,0,'150T Bay Pl E',150,'T',NULL,'Bay','Pl','E',NULL,NULL,NULL,NULL,'Fairfield',1,1033,NULL,'58627',NULL,1228,47.219032,-103.23327,0,NULL,NULL,66),
+ (172,126,1,1,0,'307H Cadell Pl N',307,'H',NULL,'Cadell','Pl','N',NULL,NULL,NULL,NULL,'Plano',1,1042,NULL,'75093',NULL,1228,33.03505,-96.80492,0,NULL,NULL,67),
+ (173,120,1,1,0,'307H Cadell Pl N',307,'H',NULL,'Cadell','Pl','N',NULL,NULL,NULL,NULL,'Plano',1,1042,NULL,'75093',NULL,1228,33.03505,-96.80492,0,NULL,NULL,67),
+ (174,164,1,1,0,'307H Cadell Pl N',307,'H',NULL,'Cadell','Pl','N',NULL,NULL,NULL,NULL,'Plano',1,1042,NULL,'75093',NULL,1228,33.03505,-96.80492,0,NULL,NULL,67),
+ (175,165,1,1,0,'297K El Camino Blvd NW',297,'K',NULL,'El Camino','Blvd','NW',NULL,NULL,NULL,NULL,'Kunkle',1,1034,NULL,'43531',NULL,1228,41.635979,-84.49453,0,NULL,NULL,NULL),
+ (176,139,1,1,0,'252L Woodbridge St SE',252,'L',NULL,'Woodbridge','St','SE',NULL,NULL,NULL,NULL,'Mozelle',1,1016,NULL,'40858',NULL,1228,37.018413,-83.39768,0,NULL,NULL,68),
+ (177,119,1,1,0,'252L Woodbridge St SE',252,'L',NULL,'Woodbridge','St','SE',NULL,NULL,NULL,NULL,'Mozelle',1,1016,NULL,'40858',NULL,1228,37.018413,-83.39768,0,NULL,NULL,68),
+ (178,45,1,1,0,'252L Woodbridge St SE',252,'L',NULL,'Woodbridge','St','SE',NULL,NULL,NULL,NULL,'Mozelle',1,1016,NULL,'40858',NULL,1228,37.018413,-83.39768,0,NULL,NULL,68),
+ (179,104,1,1,0,'252L Woodbridge St SE',252,'L',NULL,'Woodbridge','St','SE',NULL,NULL,NULL,NULL,'Mozelle',1,1016,NULL,'40858',NULL,1228,37.018413,-83.39768,0,NULL,NULL,68),
+ (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);
 /*!40000 ALTER TABLE `civicrm_address` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1983,208 +1988,208 @@ UNLOCK TABLES;
 LOCK TABLES `civicrm_contact` WRITE;
 /*!40000 ALTER TABLE `civicrm_contact` DISABLE KEYS */;
 INSERT INTO `civicrm_contact` (`id`, `contact_type`, `external_identifier`, `display_name`, `organization_name`, `contact_sub_type`, `first_name`, `middle_name`, `last_name`, `do_not_email`, `do_not_phone`, `do_not_mail`, `do_not_sms`, `do_not_trade`, `is_opt_out`, `legal_identifier`, `sort_name`, `nick_name`, `legal_name`, `image_URL`, `preferred_communication_method`, `preferred_language`, `hash`, `api_key`, `source`, `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`, `sic_code`, `user_unique_id`, `employer_id`, `is_deleted`, `created_date`, `modified_date`, `preferred_mail_format`) VALUES
- (1,'Organization',NULL,'Default Organization','Default Organization',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Default Organization',NULL,'Default Organization',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,NULL,NULL,NULL,0,NULL,'2024-01-06 04:30:24','Both'),
- (2,'Individual',NULL,'Herminia Roberts',NULL,NULL,'Herminia','','Roberts',0,1,0,0,0,0,NULL,'Roberts, Herminia',NULL,NULL,NULL,'
2
',NULL,'3243130524',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Herminia',1,NULL,'Dear Herminia',1,NULL,'Herminia Roberts',NULL,NULL,'1973-10-30',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (3,'Individual',NULL,'brigettej90@lol.co.uk','Friends Legal Alliance',NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'brigettej90@lol.co.uk',NULL,NULL,NULL,NULL,NULL,'3060896841',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear brigettej90@lol.co.uk',1,NULL,'Dear brigettej90@lol.co.uk',1,NULL,'brigettej90@lol.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,40,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (4,'Individual',NULL,'Mrs. Kiara Wilson',NULL,NULL,'Kiara','Q','Wilson',1,0,0,0,1,0,NULL,'Wilson, Kiara',NULL,NULL,NULL,NULL,NULL,'3345517320',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Kiara',1,NULL,'Dear Kiara',1,NULL,'Mrs. Kiara Wilson',NULL,NULL,'1946-11-26',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (5,'Household',NULL,'Barkley-Yadav family',NULL,NULL,NULL,NULL,NULL,1,1,0,0,1,0,NULL,'Barkley-Yadav family',NULL,NULL,NULL,'
3
',NULL,'198512894',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Barkley-Yadav family',5,NULL,'Dear Barkley-Yadav family',2,NULL,'Barkley-Yadav family',NULL,NULL,NULL,0,NULL,'Barkley-Yadav family',NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (6,'Household',NULL,'Díaz family',NULL,NULL,NULL,NULL,NULL,0,1,0,0,0,0,NULL,'Díaz family',NULL,NULL,NULL,'
3
',NULL,'2169249835',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Díaz family',5,NULL,'Dear Díaz family',2,NULL,'Díaz family',NULL,NULL,NULL,0,NULL,'Díaz family',NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (7,'Individual',NULL,'Rolando Robertson Sr.',NULL,NULL,'Rolando','','Robertson',1,0,0,0,1,0,NULL,'Robertson, Rolando',NULL,NULL,NULL,NULL,NULL,'865252280',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Rolando',1,NULL,'Dear Rolando',1,NULL,'Rolando Robertson Sr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (8,'Individual',NULL,'Shauna Blackwell',NULL,NULL,'Shauna','','Blackwell',0,1,0,0,0,0,NULL,'Blackwell, Shauna',NULL,NULL,NULL,'
1
',NULL,'1849682656',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Shauna',1,NULL,'Dear Shauna',1,NULL,'Shauna Blackwell',NULL,1,'1986-11-03',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (9,'Individual',NULL,'Ms. Juliann Yadav',NULL,NULL,'Juliann','','Yadav',1,0,0,0,1,0,NULL,'Yadav, Juliann',NULL,NULL,NULL,NULL,NULL,'4000352657',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear Juliann',1,NULL,'Dear Juliann',1,NULL,'Ms. Juliann Yadav',NULL,1,'1988-05-19',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (10,'Individual',NULL,'Dr. Elizabeth Wagner',NULL,NULL,'Elizabeth','K','Wagner',0,0,0,0,0,0,NULL,'Wagner, Elizabeth',NULL,NULL,NULL,NULL,NULL,'1723956436',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Elizabeth',1,NULL,'Dear Elizabeth',1,NULL,'Dr. Elizabeth Wagner',NULL,1,'1955-07-19',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (11,'Individual',NULL,'Kenny Jensen',NULL,NULL,'Kenny','','Jensen',0,0,0,0,0,0,NULL,'Jensen, Kenny',NULL,NULL,NULL,NULL,NULL,'1218055932',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Kenny',1,NULL,'Dear Kenny',1,NULL,'Kenny Jensen',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (12,'Individual',NULL,'Bryon Zope',NULL,NULL,'Bryon','M','Zope',0,1,0,0,1,0,NULL,'Zope, Bryon',NULL,NULL,NULL,NULL,NULL,'1177115571',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Bryon',1,NULL,'Dear Bryon',1,NULL,'Bryon Zope',NULL,NULL,'1989-05-13',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (13,'Individual',NULL,'Dr. Jacob Grant Jr.',NULL,NULL,'Jacob','M','Grant',0,0,0,0,0,0,NULL,'Grant, Jacob',NULL,NULL,NULL,'
4
',NULL,'2396937477',NULL,'Sample Data',4,1,NULL,NULL,1,NULL,'Dear Jacob',1,NULL,'Dear Jacob',1,NULL,'Dr. Jacob Grant Jr.',NULL,NULL,'1981-04-14',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (14,'Individual',NULL,'Ivey Roberts',NULL,NULL,'Ivey','','Roberts',0,0,0,0,0,0,NULL,'Roberts, Ivey',NULL,NULL,NULL,'
3
',NULL,'507631333',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Ivey',1,NULL,'Dear Ivey',1,NULL,'Ivey Roberts',NULL,1,'1949-01-31',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (15,'Individual',NULL,'Lou Reynolds Jr.',NULL,NULL,'Lou','A','Reynolds',0,0,0,0,0,0,NULL,'Reynolds, Lou',NULL,NULL,NULL,'
4
',NULL,'1967816777',NULL,'Sample Data',NULL,1,NULL,NULL,1,NULL,'Dear Lou',1,NULL,'Dear Lou',1,NULL,'Lou Reynolds Jr.',NULL,2,'1939-10-24',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (16,'Individual',NULL,'Brzęczysław Jameson Jr.',NULL,NULL,'Brzęczysław','D','Jameson',0,0,0,0,1,0,NULL,'Jameson, Brzęczysław',NULL,NULL,NULL,'
2
',NULL,'3238208659',NULL,'Sample Data',NULL,1,NULL,NULL,1,NULL,'Dear Brzęczysław',1,NULL,'Dear Brzęczysław',1,NULL,'Brzęczysław Jameson Jr.',NULL,2,'1991-06-09',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (17,'Individual',NULL,'Lashawnda Jones',NULL,NULL,'Lashawnda','','Jones',0,0,0,0,1,0,NULL,'Jones, Lashawnda',NULL,NULL,NULL,'
3
',NULL,'3527587829',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Lashawnda',1,NULL,'Dear Lashawnda',1,NULL,'Lashawnda Jones',NULL,1,'1973-11-05',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (18,'Individual',NULL,'Dr. Elbert Terrell',NULL,NULL,'Elbert','M','Terrell',0,0,0,0,1,0,NULL,'Terrell, Elbert',NULL,NULL,NULL,'
3
',NULL,'1862258278',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Elbert',1,NULL,'Dear Elbert',1,NULL,'Dr. Elbert Terrell',NULL,2,'1970-10-27',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (19,'Individual',NULL,'Dr. Ashley Prentice III',NULL,NULL,'Ashley','','Prentice',0,0,0,0,0,0,NULL,'Prentice, Ashley',NULL,NULL,NULL,'
4
',NULL,'3283878025',NULL,'Sample Data',4,4,NULL,NULL,1,NULL,'Dear Ashley',1,NULL,'Dear Ashley',1,NULL,'Dr. Ashley Prentice III',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (20,'Individual',NULL,'Esta Dimitrov-Bachman',NULL,NULL,'Esta','X','Dimitrov-Bachman',0,0,0,0,0,0,NULL,'Dimitrov-Bachman, Esta',NULL,NULL,NULL,'
3
',NULL,'1702288138',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Esta',1,NULL,'Dear Esta',1,NULL,'Esta Dimitrov-Bachman',NULL,NULL,'1979-01-26',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (21,'Organization',NULL,'Louisiana Wellness Association','Louisiana Wellness Association',NULL,NULL,NULL,NULL,0,0,0,0,1,0,NULL,'Louisiana Wellness Association',NULL,NULL,NULL,NULL,NULL,'3053407297',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Louisiana Wellness Association',NULL,NULL,NULL,0,NULL,NULL,46,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (22,'Individual',NULL,'deforest.d.elbert31@notmail.co.uk',NULL,NULL,NULL,NULL,NULL,1,1,0,0,0,0,NULL,'deforest.d.elbert31@notmail.co.uk',NULL,NULL,NULL,'
5
',NULL,'1278238827',NULL,'Sample Data',NULL,3,NULL,NULL,1,NULL,'Dear deforest.d.elbert31@notmail.co.uk',1,NULL,'Dear deforest.d.elbert31@notmail.co.uk',1,NULL,'deforest.d.elbert31@notmail.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (23,'Individual',NULL,'Dr. Alexia Reynolds',NULL,NULL,'Alexia','','Reynolds',0,0,0,0,1,0,NULL,'Reynolds, Alexia',NULL,NULL,NULL,NULL,NULL,'1389353396',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Alexia',1,NULL,'Dear Alexia',1,NULL,'Dr. Alexia Reynolds',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (24,'Individual',NULL,'Mrs. Valene González',NULL,NULL,'Valene','','González',0,0,0,0,1,0,NULL,'González, Valene',NULL,NULL,NULL,NULL,NULL,'970849646',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Valene',1,NULL,'Dear Valene',1,NULL,'Mrs. Valene González',NULL,1,'1958-10-28',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (25,'Individual',NULL,'Teddy Dimitrov-Bachman',NULL,NULL,'Teddy','','Dimitrov-Bachman',0,0,0,0,0,0,NULL,'Dimitrov-Bachman, Teddy',NULL,NULL,NULL,'
2
',NULL,'1388861588',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Teddy',1,NULL,'Dear Teddy',1,NULL,'Teddy Dimitrov-Bachman',NULL,2,'2021-11-28',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (26,'Individual',NULL,'Lawerence Bachman Jr.',NULL,NULL,'Lawerence','W','Bachman',0,0,0,0,0,0,NULL,'Bachman, Lawerence',NULL,NULL,NULL,'
3
',NULL,'2961144560',NULL,'Sample Data',NULL,1,NULL,NULL,1,NULL,'Dear Lawerence',1,NULL,'Dear Lawerence',1,NULL,'Lawerence Bachman Jr.',NULL,2,'2016-02-24',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (27,'Individual',NULL,'lb.gonzlez@testmail.co.nz',NULL,NULL,NULL,NULL,NULL,0,0,0,0,1,0,NULL,'lb.gonzlez@testmail.co.nz',NULL,NULL,NULL,'
4
',NULL,'2501279014',NULL,'Sample Data',3,3,NULL,NULL,1,NULL,'Dear lb.gonzlez@testmail.co.nz',1,NULL,'Dear lb.gonzlez@testmail.co.nz',1,NULL,'lb.gonzlez@testmail.co.nz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (28,'Individual',NULL,'Ashley Deforest-Roberts',NULL,NULL,'Ashley','','Deforest-Roberts',0,0,0,0,0,0,NULL,'Deforest-Roberts, Ashley',NULL,NULL,NULL,NULL,NULL,'855556630',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Ashley',1,NULL,'Dear Ashley',1,NULL,'Ashley Deforest-Roberts',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (29,'Individual',NULL,'Mr. Jackson Samuels-Robertson Jr.',NULL,NULL,'Jackson','X','Samuels-Robertson',1,1,0,0,0,0,NULL,'Samuels-Robertson, Jackson',NULL,NULL,NULL,NULL,NULL,'2567013134',NULL,'Sample Data',3,1,NULL,NULL,1,NULL,'Dear Jackson',1,NULL,'Dear Jackson',1,NULL,'Mr. Jackson Samuels-Robertson Jr.',NULL,NULL,'1990-05-12',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (30,'Individual',NULL,'Mr. Jacob Díaz',NULL,NULL,'Jacob','C','Díaz',0,0,0,0,0,0,NULL,'Díaz, Jacob',NULL,NULL,NULL,NULL,NULL,'3488947578',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Jacob',1,NULL,'Dear Jacob',1,NULL,'Mr. Jacob Díaz',NULL,2,'1976-02-19',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (31,'Individual',NULL,'Mr. Lincoln Ivanov-Olsen',NULL,NULL,'Lincoln','','Ivanov-Olsen',0,1,0,0,0,0,NULL,'Ivanov-Olsen, Lincoln',NULL,NULL,NULL,NULL,NULL,'1801038911',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Lincoln',1,NULL,'Dear Lincoln',1,NULL,'Mr. Lincoln Ivanov-Olsen',NULL,NULL,'2002-10-28',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (32,'Individual',NULL,'Teresa Robertson',NULL,NULL,'Teresa','M','Robertson',0,0,0,0,1,0,NULL,'Robertson, Teresa',NULL,NULL,NULL,'
4
',NULL,'988071547',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Teresa',1,NULL,'Dear Teresa',1,NULL,'Teresa Robertson',NULL,1,'1988-01-24',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (33,'Individual',NULL,'Arlyne Wilson',NULL,NULL,'Arlyne','','Wilson',1,0,0,0,0,0,NULL,'Wilson, Arlyne',NULL,NULL,NULL,'
5
',NULL,'785003749',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Arlyne',1,NULL,'Dear Arlyne',1,NULL,'Arlyne Wilson',NULL,1,'1993-05-29',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (34,'Individual',NULL,'Andrew González',NULL,NULL,'Andrew','S','González',0,0,0,0,0,0,NULL,'González, Andrew',NULL,NULL,NULL,NULL,NULL,'1775136005',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Andrew',1,NULL,'Dear Andrew',1,NULL,'Andrew González',NULL,2,'1943-08-26',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (35,'Individual',NULL,'Bob Terrell II',NULL,NULL,'Bob','H','Terrell',0,0,0,0,1,0,NULL,'Terrell, Bob',NULL,NULL,NULL,'
4
',NULL,'1949116278',NULL,'Sample Data',NULL,3,NULL,NULL,1,NULL,'Dear Bob',1,NULL,'Dear Bob',1,NULL,'Bob Terrell II',NULL,2,'1983-01-15',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (36,'Organization',NULL,'Ohio Software Partnership','Ohio Software Partnership',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Ohio Software Partnership',NULL,NULL,NULL,'
2
',NULL,'837016851',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Ohio Software Partnership',NULL,NULL,NULL,0,NULL,NULL,49,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (37,'Individual',NULL,'Dr. Allen Barkley II',NULL,NULL,'Allen','K','Barkley',1,0,0,0,0,0,NULL,'Barkley, Allen',NULL,NULL,NULL,NULL,NULL,'2669831068',NULL,'Sample Data',4,3,NULL,NULL,1,NULL,'Dear Allen',1,NULL,'Dear Allen',1,NULL,'Dr. Allen Barkley II',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (38,'Individual',NULL,'Dr. Miguel González II',NULL,NULL,'Miguel','','González',1,0,0,0,0,0,NULL,'González, Miguel',NULL,NULL,NULL,'
2
',NULL,'833815017',NULL,'Sample Data',4,3,NULL,NULL,1,NULL,'Dear Miguel',1,NULL,'Dear Miguel',1,NULL,'Dr. Miguel González II',NULL,2,'1977-09-01',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (39,'Individual',NULL,'Dr. Lawerence Cooper-Yadav',NULL,NULL,'Lawerence','','Cooper-Yadav',1,1,0,0,0,0,NULL,'Cooper-Yadav, Lawerence',NULL,NULL,NULL,NULL,NULL,'2440615526',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Lawerence',1,NULL,'Dear Lawerence',1,NULL,'Dr. Lawerence Cooper-Yadav',NULL,NULL,'1978-07-08',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (40,'Organization',NULL,'Friends Legal Alliance','Friends Legal Alliance',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Friends Legal Alliance',NULL,NULL,NULL,'
2
',NULL,'3531958958',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Friends Legal Alliance',NULL,NULL,NULL,0,NULL,NULL,3,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (41,'Individual',NULL,'arlyney@mymail.co.pl',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'arlyney@mymail.co.pl',NULL,NULL,NULL,'
3
',NULL,'545941080',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear arlyney@mymail.co.pl',1,NULL,'Dear arlyney@mymail.co.pl',1,NULL,'arlyney@mymail.co.pl',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (42,'Individual',NULL,'Bob Reynolds',NULL,NULL,'Bob','N','Reynolds',0,0,0,0,1,0,NULL,'Reynolds, Bob',NULL,NULL,NULL,'
3
',NULL,'4228327556',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Bob',1,NULL,'Dear Bob',1,NULL,'Bob Reynolds',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (43,'Individual',NULL,'Irvin Robertson',NULL,NULL,'Irvin','','Robertson',0,0,0,0,0,0,NULL,'Robertson, Irvin',NULL,NULL,NULL,'
3
',NULL,'3287904826',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Irvin',1,NULL,'Dear Irvin',1,NULL,'Irvin Robertson',NULL,2,'2015-11-26',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (44,'Organization',NULL,'Rural Wellness School','Rural Wellness School',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Rural Wellness School',NULL,NULL,NULL,NULL,NULL,'4052457731',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Rural Wellness School',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (45,'Household',NULL,'Ivanov-Olsen family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Ivanov-Olsen family',NULL,NULL,NULL,'
2
',NULL,'2664824787',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Ivanov-Olsen family',5,NULL,'Dear Ivanov-Olsen family',2,NULL,'Ivanov-Olsen family',NULL,NULL,NULL,0,NULL,'Ivanov-Olsen family',NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (46,'Individual',NULL,'Kandace Roberts','Louisiana Wellness Association',NULL,'Kandace','','Roberts',0,1,0,0,0,0,NULL,'Roberts, Kandace',NULL,NULL,NULL,NULL,NULL,'3760408869',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Kandace',1,NULL,'Dear Kandace',1,NULL,'Kandace Roberts',NULL,1,'1990-11-16',0,NULL,NULL,NULL,NULL,NULL,21,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (47,'Individual',NULL,'Mrs. Tanya Bachman',NULL,NULL,'Tanya','','Bachman',0,0,0,0,0,0,NULL,'Bachman, Tanya',NULL,NULL,NULL,'
4
',NULL,'2047603331',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Tanya',1,NULL,'Dear Tanya',1,NULL,'Mrs. Tanya Bachman',NULL,1,'1982-04-27',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (48,'Organization',NULL,'Urban Software Initiative','Urban Software Initiative',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Urban Software Initiative',NULL,NULL,NULL,NULL,NULL,'560302493',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Urban Software Initiative',NULL,NULL,NULL,0,NULL,NULL,165,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (49,'Individual',NULL,'Mr. Maria Parker III','Ohio Software Partnership',NULL,'Maria','G','Parker',0,1,0,0,0,0,NULL,'Parker, Maria',NULL,NULL,NULL,'
2
',NULL,'930508921',NULL,'Sample Data',3,4,NULL,NULL,1,NULL,'Dear Maria',1,NULL,'Dear Maria',1,NULL,'Mr. Maria Parker III',NULL,2,'1992-05-29',0,NULL,NULL,NULL,NULL,NULL,36,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (50,'Individual',NULL,'nielsen.q.ivey73@fishmail.org','Sierra Food Trust',NULL,NULL,NULL,NULL,0,0,0,0,1,0,NULL,'nielsen.q.ivey73@fishmail.org',NULL,NULL,NULL,NULL,NULL,'2842228638',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear nielsen.q.ivey73@fishmail.org',1,NULL,'Dear nielsen.q.ivey73@fishmail.org',1,NULL,'nielsen.q.ivey73@fishmail.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,87,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (51,'Organization',NULL,'Pennsylvania Poetry Fund','Pennsylvania Poetry Fund',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Pennsylvania Poetry Fund',NULL,NULL,NULL,NULL,NULL,'3714029261',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Pennsylvania Poetry Fund',NULL,NULL,NULL,0,NULL,NULL,57,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (52,'Individual',NULL,'Mrs. Laree Jacobs','Tennessee Agriculture Solutions',NULL,'Laree','J','Jacobs',0,0,0,0,0,0,NULL,'Jacobs, Laree',NULL,NULL,NULL,NULL,NULL,'3788424198',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Laree',1,NULL,'Dear Laree',1,NULL,'Mrs. Laree Jacobs',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,118,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (53,'Individual',NULL,'Barry Reynolds Jr.',NULL,NULL,'Barry','','Reynolds',1,0,0,0,0,0,NULL,'Reynolds, Barry',NULL,NULL,NULL,'
3
',NULL,'3819576802',NULL,'Sample Data',NULL,1,NULL,NULL,1,NULL,'Dear Barry',1,NULL,'Dear Barry',1,NULL,'Barry Reynolds Jr.',NULL,NULL,'1948-01-02',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (54,'Individual',NULL,'Mr. Toby Blackwell',NULL,NULL,'Toby','','Blackwell',1,0,0,0,1,0,NULL,'Blackwell, Toby',NULL,NULL,NULL,'
3
',NULL,'3987770403',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Toby',1,NULL,'Dear Toby',1,NULL,'Mr. Toby Blackwell',NULL,NULL,'1972-12-06',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (55,'Household',NULL,'Cooper-Yadav family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Cooper-Yadav family',NULL,NULL,NULL,NULL,NULL,'3543369444',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Cooper-Yadav family',5,NULL,'Dear Cooper-Yadav family',2,NULL,'Cooper-Yadav family',NULL,NULL,NULL,0,NULL,'Cooper-Yadav family',NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (56,'Individual',NULL,'Ashley Roberts II',NULL,NULL,'Ashley','I','Roberts',0,0,0,0,0,0,NULL,'Roberts, Ashley',NULL,NULL,NULL,NULL,NULL,'4027031255',NULL,'Sample Data',NULL,3,NULL,NULL,1,NULL,'Dear Ashley',1,NULL,'Dear Ashley',1,NULL,'Ashley Roberts II',NULL,2,'1994-07-24',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (57,'Individual',NULL,'Brzęczysław Adams Sr.','Pennsylvania Poetry Fund',NULL,'Brzęczysław','Z','Adams',0,1,0,0,1,0,NULL,'Adams, Brzęczysław',NULL,NULL,NULL,NULL,NULL,'3378454317',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Brzęczysław',1,NULL,'Dear Brzęczysław',1,NULL,'Brzęczysław Adams Sr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,51,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (58,'Individual',NULL,'Claudio Roberts Sr.',NULL,NULL,'Claudio','','Roberts',0,0,0,0,1,0,NULL,'Roberts, Claudio',NULL,NULL,NULL,NULL,NULL,'425095368',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Claudio',1,NULL,'Dear Claudio',1,NULL,'Claudio Roberts Sr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (59,'Individual',NULL,'Allan Zope',NULL,NULL,'Allan','','Zope',0,0,0,0,0,0,NULL,'Zope, Allan',NULL,NULL,NULL,'
1
',NULL,'891375066',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Allan',1,NULL,'Dear Allan',1,NULL,'Allan Zope',NULL,2,'1993-02-21',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (60,'Individual',NULL,'Mrs. Elina Lee',NULL,NULL,'Elina','C','Lee',0,1,0,0,0,0,NULL,'Lee, Elina',NULL,NULL,NULL,NULL,NULL,'2171390840',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Elina',1,NULL,'Dear Elina',1,NULL,'Mrs. Elina Lee',NULL,NULL,'1991-06-10',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (61,'Individual',NULL,'Billy Terrell',NULL,NULL,'Billy','','Terrell',0,0,0,0,0,0,NULL,'Terrell, Billy',NULL,NULL,NULL,NULL,NULL,'1389531692',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Billy',1,NULL,'Dear Billy',1,NULL,'Billy Terrell',NULL,2,'2004-10-26',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (62,'Individual',NULL,'Dr. Bernadette Grant',NULL,NULL,'Bernadette','','Grant',0,0,0,0,0,0,NULL,'Grant, Bernadette',NULL,NULL,NULL,'
5
',NULL,'2386715823',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Bernadette',1,NULL,'Dear Bernadette',1,NULL,'Dr. Bernadette Grant',NULL,1,'1942-05-19',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (63,'Individual',NULL,'Dr. Billy Jensen III',NULL,NULL,'Billy','','Jensen',0,0,0,0,0,0,NULL,'Jensen, Billy',NULL,NULL,NULL,NULL,NULL,'1055811033',NULL,'Sample Data',4,4,NULL,NULL,1,NULL,'Dear Billy',1,NULL,'Dear Billy',1,NULL,'Dr. Billy Jensen III',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (64,'Individual',NULL,'Mrs. Kathleen Adams',NULL,NULL,'Kathleen','','Adams',1,0,0,0,0,0,NULL,'Adams, Kathleen',NULL,NULL,NULL,NULL,NULL,'163700750',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Kathleen',1,NULL,'Dear Kathleen',1,NULL,'Mrs. Kathleen Adams',NULL,1,'1967-11-27',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (65,'Individual',NULL,'Scott Robertson Jr.',NULL,NULL,'Scott','O','Robertson',0,0,0,0,0,0,NULL,'Robertson, Scott',NULL,NULL,NULL,NULL,NULL,'284541050',NULL,'Sample Data',NULL,1,NULL,NULL,1,NULL,'Dear Scott',1,NULL,'Dear Scott',1,NULL,'Scott Robertson Jr.',NULL,2,'1986-04-16',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (66,'Individual',NULL,'Mrs. Heidi Zope',NULL,NULL,'Heidi','','Zope',0,1,0,0,0,0,NULL,'Zope, Heidi',NULL,NULL,NULL,NULL,NULL,'2699150124',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Heidi',1,NULL,'Dear Heidi',1,NULL,'Mrs. Heidi Zope',NULL,1,'1984-08-07',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (67,'Individual',NULL,'Truman Grant',NULL,NULL,'Truman','Z','Grant',0,1,0,0,0,0,NULL,'Grant, Truman',NULL,NULL,NULL,NULL,NULL,'1269532759',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Truman',1,NULL,'Dear Truman',1,NULL,'Truman Grant',NULL,NULL,'1940-08-12',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (68,'Individual',NULL,'Alida Jones','Ohio Health Initiative',NULL,'Alida','Z','Jones',0,0,0,0,0,0,NULL,'Jones, Alida',NULL,NULL,NULL,'
3
',NULL,'4267244805',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Alida',1,NULL,'Dear Alida',1,NULL,'Alida Jones',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,187,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (69,'Individual',NULL,'Norris Jones',NULL,NULL,'Norris','','Jones',0,1,0,0,0,0,NULL,'Jones, Norris',NULL,NULL,NULL,'
5
',NULL,'2315660840',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Norris Jones',NULL,2,'2019-04-07',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (70,'Individual',NULL,'Mr. Landon Samson',NULL,NULL,'Landon','Z','Samson',1,0,0,0,1,0,NULL,'Samson, Landon',NULL,NULL,NULL,'
5
',NULL,'1562429969',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Landon',1,NULL,'Dear Landon',1,NULL,'Mr. Landon Samson',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (71,'Individual',NULL,'Valene Díaz',NULL,NULL,'Valene','','Díaz',0,1,0,0,0,0,NULL,'Díaz, Valene',NULL,NULL,NULL,NULL,NULL,'3532656393',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Valene',1,NULL,'Dear Valene',1,NULL,'Valene Díaz',NULL,1,'1950-12-24',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (72,'Individual',NULL,'Ms. Kacey Deforest-Roberts',NULL,NULL,'Kacey','','Deforest-Roberts',1,0,0,0,0,0,NULL,'Deforest-Roberts, Kacey',NULL,NULL,NULL,NULL,NULL,'1358039585',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear Kacey',1,NULL,'Dear Kacey',1,NULL,'Ms. Kacey Deforest-Roberts',NULL,1,'1977-10-02',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (73,'Organization',NULL,'Anchorage Sports Center','Anchorage Sports Center',NULL,NULL,NULL,NULL,1,0,0,0,1,0,NULL,'Anchorage Sports Center',NULL,NULL,NULL,NULL,NULL,'2956120288',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Anchorage Sports Center',NULL,NULL,NULL,0,NULL,NULL,139,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (74,'Individual',NULL,'Omar Ivanov-Olsen',NULL,NULL,'Omar','','Ivanov-Olsen',1,0,0,0,1,0,NULL,'Ivanov-Olsen, Omar',NULL,NULL,NULL,NULL,NULL,'1816789676',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Omar',1,NULL,'Dear Omar',1,NULL,'Omar Ivanov-Olsen',NULL,2,'2020-04-01',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (75,'Individual',NULL,'Omar Ivanov',NULL,NULL,'Omar','B','Ivanov',0,0,0,0,0,0,NULL,'Ivanov, Omar',NULL,NULL,NULL,'
2
',NULL,'474284391',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Omar',1,NULL,'Dear Omar',1,NULL,'Omar Ivanov',NULL,2,'1955-11-25',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (76,'Individual',NULL,'Ms. Felisha Cruz',NULL,NULL,'Felisha','T','Cruz',0,0,0,0,0,0,NULL,'Cruz, Felisha',NULL,NULL,NULL,NULL,NULL,'2429011594',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear Felisha',1,NULL,'Dear Felisha',1,NULL,'Ms. Felisha Cruz',NULL,NULL,'1951-09-21',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (77,'Individual',NULL,'Mr. Teddy �ąchowski',NULL,NULL,'Teddy','O','�ąchowski',0,1,0,0,0,0,NULL,'�ąchowski, Teddy',NULL,NULL,NULL,'
3
',NULL,'4255944896',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Teddy',1,NULL,'Dear Teddy',1,NULL,'Mr. Teddy �ąchowski',NULL,2,'1976-06-23',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (78,'Individual',NULL,'zope-jensen.a.scott@example.org',NULL,NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'zope-jensen.a.scott@example.org',NULL,NULL,NULL,'
4
',NULL,'260430495',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear zope-jensen.a.scott@example.org',1,NULL,'Dear zope-jensen.a.scott@example.org',1,NULL,'zope-jensen.a.scott@example.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (79,'Individual',NULL,'Mr. Elbert Robertson III',NULL,NULL,'Elbert','A','Robertson',0,0,0,0,0,0,NULL,'Robertson, Elbert',NULL,NULL,NULL,'
4
',NULL,'3684824833',NULL,'Sample Data',3,4,NULL,NULL,1,NULL,'Dear Elbert',1,NULL,'Dear Elbert',1,NULL,'Mr. Elbert Robertson III',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (80,'Household',NULL,'Robertson family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Robertson family',NULL,NULL,NULL,NULL,NULL,'3444393980',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Robertson family',5,NULL,'Dear Robertson family',2,NULL,'Robertson family',NULL,NULL,NULL,0,NULL,'Robertson family',NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (81,'Individual',NULL,'Clint Zope-Jensen III',NULL,NULL,'Clint','','Zope-Jensen',0,1,0,0,0,0,NULL,'Zope-Jensen, Clint',NULL,NULL,NULL,NULL,NULL,'4059964574',NULL,'Sample Data',NULL,4,NULL,NULL,1,NULL,'Dear Clint',1,NULL,'Dear Clint',1,NULL,'Clint Zope-Jensen III',NULL,2,'1995-05-13',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (82,'Individual',NULL,'Scott Blackwell-McReynolds','Pennsylvania Family Partnership',NULL,'Scott','J','Blackwell-McReynolds',0,0,0,0,0,0,NULL,'Blackwell-McReynolds, Scott',NULL,NULL,NULL,NULL,NULL,'392643299',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Scott',1,NULL,'Dear Scott',1,NULL,'Scott Blackwell-McReynolds',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,138,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (83,'Individual',NULL,'Mrs. Brigette Cruz',NULL,NULL,'Brigette','C','Cruz',1,0,0,0,0,0,NULL,'Cruz, Brigette',NULL,NULL,NULL,'
3
',NULL,'2081611913',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Mrs. Brigette Cruz',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (84,'Individual',NULL,'Miguel McReynolds III',NULL,NULL,'Miguel','','McReynolds',1,0,0,0,0,0,NULL,'McReynolds, Miguel',NULL,NULL,NULL,NULL,NULL,'2143406543',NULL,'Sample Data',NULL,4,NULL,NULL,1,NULL,'Dear Miguel',1,NULL,'Dear Miguel',1,NULL,'Miguel McReynolds III',NULL,2,'1983-12-18',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (85,'Individual',NULL,'Mrs. Justina Barkley',NULL,NULL,'Justina','Q','Barkley',0,0,0,0,0,0,NULL,'Barkley, Justina',NULL,NULL,NULL,NULL,NULL,'2698595915',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Justina',1,NULL,'Dear Justina',1,NULL,'Mrs. Justina Barkley',NULL,1,'1965-07-02',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (86,'Individual',NULL,'Jina Zope',NULL,NULL,'Jina','D','Zope',1,0,0,0,1,0,NULL,'Zope, Jina',NULL,NULL,NULL,'
3
',NULL,'2020833032',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Jina',1,NULL,'Dear Jina',1,NULL,'Jina Zope',NULL,1,'1999-04-05',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (87,'Organization',NULL,'Sierra Food Trust','Sierra Food Trust',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Sierra Food Trust',NULL,NULL,NULL,NULL,NULL,'3441880548',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Sierra Food Trust',NULL,NULL,NULL,0,NULL,NULL,50,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (88,'Individual',NULL,'Norris McReynolds',NULL,NULL,'Norris','','McReynolds',0,0,0,0,0,0,NULL,'McReynolds, Norris',NULL,NULL,NULL,NULL,NULL,'891338000',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Norris McReynolds',NULL,2,'1974-06-19',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (89,'Household',NULL,'Jones family',NULL,NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'Jones family',NULL,NULL,NULL,'
3
',NULL,'1110516799',NULL,'Sample Data',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,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (90,'Individual',NULL,'Ms. Heidi Smith',NULL,NULL,'Heidi','Z','Smith',0,0,0,0,1,0,NULL,'Smith, Heidi',NULL,NULL,NULL,NULL,NULL,'837834326',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear Heidi',1,NULL,'Dear Heidi',1,NULL,'Ms. Heidi Smith',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (91,'Individual',NULL,'Ivey McReynolds',NULL,NULL,'Ivey','','McReynolds',1,0,0,0,0,0,NULL,'McReynolds, Ivey',NULL,NULL,NULL,NULL,NULL,'3543287446',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Ivey',1,NULL,'Dear Ivey',1,NULL,'Ivey McReynolds',NULL,1,'1982-05-11',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (92,'Individual',NULL,'Clint Blackwell Sr.',NULL,NULL,'Clint','','Blackwell',1,0,0,0,0,0,NULL,'Blackwell, Clint',NULL,NULL,NULL,'
4
',NULL,'3997373533',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Clint',1,NULL,'Dear Clint',1,NULL,'Clint Blackwell Sr.',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (93,'Individual',NULL,'Mr. Carlos Olsen Jr.',NULL,NULL,'Carlos','Q','Olsen',0,1,0,0,0,0,NULL,'Olsen, Carlos',NULL,NULL,NULL,'
4
',NULL,'2601969506',NULL,'Sample Data',3,1,NULL,NULL,1,NULL,'Dear Carlos',1,NULL,'Dear Carlos',1,NULL,'Mr. Carlos Olsen Jr.',NULL,2,'1955-02-27',1,'2024-01-04',NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (94,'Individual',NULL,'Tanya McReynolds',NULL,NULL,'Tanya','B','McReynolds',0,0,0,0,0,0,NULL,'McReynolds, Tanya',NULL,NULL,NULL,NULL,NULL,'2833475968',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Tanya',1,NULL,'Dear Tanya',1,NULL,'Tanya McReynolds',NULL,NULL,'1984-07-06',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (95,'Individual',NULL,'Barry Barkley Sr.',NULL,NULL,'Barry','','Barkley',0,0,0,0,0,0,NULL,'Barkley, Barry',NULL,NULL,NULL,NULL,NULL,'3120582330',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Barry',1,NULL,'Dear Barry',1,NULL,'Barry Barkley Sr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (96,'Individual',NULL,'Dr. Kenny Wilson',NULL,NULL,'Kenny','E','Wilson',1,0,0,0,0,0,NULL,'Wilson, Kenny',NULL,NULL,NULL,'
1
',NULL,'1945745030',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Kenny',1,NULL,'Dear Kenny',1,NULL,'Dr. Kenny Wilson',NULL,2,'1961-10-03',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (97,'Individual',NULL,'Dr. Maria Terrell',NULL,NULL,'Maria','E','Terrell',0,0,0,0,0,0,NULL,'Terrell, Maria',NULL,NULL,NULL,NULL,NULL,'1838534523',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Maria',1,NULL,'Dear Maria',1,NULL,'Dr. Maria Terrell',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (98,'Individual',NULL,'fw.wagner22@notmail.co.nz',NULL,NULL,NULL,NULL,NULL,1,0,0,0,1,0,NULL,'fw.wagner22@notmail.co.nz',NULL,NULL,NULL,NULL,NULL,'2789997126',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear fw.wagner22@notmail.co.nz',1,NULL,'Dear fw.wagner22@notmail.co.nz',1,NULL,'fw.wagner22@notmail.co.nz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (99,'Individual',NULL,'Margaret Blackwell',NULL,NULL,'Margaret','','Blackwell',0,0,0,0,0,0,NULL,'Blackwell, Margaret',NULL,NULL,NULL,NULL,NULL,'894595567',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Margaret',1,NULL,'Dear Margaret',1,NULL,'Margaret Blackwell',NULL,1,'1960-06-02',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (100,'Organization',NULL,'Global Music Alliance','Global Music Alliance',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Global Music Alliance',NULL,NULL,NULL,NULL,NULL,'1774451517',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Global Music Alliance',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (101,'Individual',NULL,'Dr. Valene Zope',NULL,NULL,'Valene','','Zope',0,0,0,0,0,0,NULL,'Zope, Valene',NULL,NULL,NULL,NULL,NULL,'1755528851',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Valene',1,NULL,'Dear Valene',1,NULL,'Dr. Valene Zope',NULL,1,'1980-12-22',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (102,'Individual',NULL,'Beula Roberts',NULL,NULL,'Beula','','Roberts',0,0,0,0,0,0,NULL,'Roberts, Beula',NULL,NULL,NULL,'
5
',NULL,'640050534',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Beula',1,NULL,'Dear Beula',1,NULL,'Beula Roberts',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (103,'Individual',NULL,'Sharyn Díaz','Little Rock Sustainability Network',NULL,'Sharyn','T','Díaz',0,0,0,0,0,0,NULL,'Díaz, Sharyn',NULL,NULL,NULL,'
1
',NULL,'4129279229',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Sharyn',1,NULL,'Dear Sharyn',1,NULL,'Sharyn Díaz',NULL,1,'1966-10-08',0,NULL,NULL,NULL,NULL,NULL,145,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (104,'Individual',NULL,'Dr. Alexia Wilson',NULL,NULL,'Alexia','G','Wilson',1,0,0,0,0,0,NULL,'Wilson, Alexia',NULL,NULL,NULL,'
1
',NULL,'3321653861',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Alexia',1,NULL,'Dear Alexia',1,NULL,'Dr. Alexia Wilson',NULL,1,'1984-04-08',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (105,'Individual',NULL,'Troy Barkley-Yadav III',NULL,NULL,'Troy','T','Barkley-Yadav',1,0,0,0,0,0,NULL,'Barkley-Yadav, Troy',NULL,NULL,NULL,'
4
',NULL,'1255959985',NULL,'Sample Data',NULL,4,NULL,NULL,1,NULL,'Dear Troy',1,NULL,'Dear Troy',1,NULL,'Troy Barkley-Yadav III',NULL,NULL,'1999-02-18',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (106,'Individual',NULL,'Angelika Olsen',NULL,NULL,'Angelika','X','Olsen',0,0,0,0,0,0,NULL,'Olsen, Angelika',NULL,NULL,NULL,NULL,NULL,'2107775792',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Angelika',1,NULL,'Dear Angelika',1,NULL,'Angelika Olsen',NULL,NULL,'1975-07-19',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (107,'Individual',NULL,'Jay González',NULL,NULL,'Jay','W','González',0,1,0,0,1,0,NULL,'González, Jay',NULL,NULL,NULL,'
5
',NULL,'431469491',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Jay',1,NULL,'Dear Jay',1,NULL,'Jay González',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (108,'Individual',NULL,'Dr. Jina Yadav',NULL,NULL,'Jina','','Yadav',1,0,0,0,0,0,NULL,'Yadav, Jina',NULL,NULL,NULL,NULL,NULL,'132914631',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Jina',1,NULL,'Dear Jina',1,NULL,'Dr. Jina Yadav',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (109,'Individual',NULL,'Mei Jones','Jackson Arts Collective',NULL,'Mei','','Jones',0,1,0,0,0,0,NULL,'Jones, Mei',NULL,NULL,NULL,'
2
',NULL,'2285120120',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Mei',1,NULL,'Dear Mei',1,NULL,'Mei Jones',NULL,NULL,'1953-10-19',0,NULL,NULL,NULL,NULL,NULL,180,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (110,'Individual',NULL,'Dr. Tanya Samuels','Creative Environmental Solutions',NULL,'Tanya','','Samuels',0,0,0,0,0,0,NULL,'Samuels, Tanya',NULL,NULL,NULL,NULL,NULL,'147060242',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Tanya',1,NULL,'Dear Tanya',1,NULL,'Dr. Tanya Samuels',NULL,1,'1990-08-04',0,NULL,NULL,NULL,NULL,NULL,122,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (111,'Individual',NULL,'Dr. Sanford Ivanov',NULL,NULL,'Sanford','','Ivanov',0,0,0,0,0,0,NULL,'Ivanov, Sanford',NULL,NULL,NULL,'
1
',NULL,'868143877',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Sanford',1,NULL,'Dear Sanford',1,NULL,'Dr. Sanford Ivanov',NULL,2,'1961-01-02',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (112,'Individual',NULL,'np.daz21@spamalot.co.nz',NULL,NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'np.daz21@spamalot.co.nz',NULL,NULL,NULL,NULL,NULL,'556623817',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear np.daz21@spamalot.co.nz',1,NULL,'Dear np.daz21@spamalot.co.nz',1,NULL,'np.daz21@spamalot.co.nz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (113,'Individual',NULL,'Mr. Miguel Ivanov',NULL,NULL,'Miguel','','Ivanov',0,0,0,0,1,0,NULL,'Ivanov, Miguel',NULL,NULL,NULL,NULL,NULL,'3632283471',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Miguel',1,NULL,'Dear Miguel',1,NULL,'Mr. Miguel Ivanov',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (114,'Individual',NULL,'Angelika Parker',NULL,NULL,'Angelika','','Parker',0,0,0,0,0,0,NULL,'Parker, Angelika',NULL,NULL,NULL,'
2
',NULL,'216332122',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Angelika',1,NULL,'Dear Angelika',1,NULL,'Angelika Parker',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (115,'Household',NULL,'Robertson family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Robertson family',NULL,NULL,NULL,'
3
',NULL,'3444393980',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Robertson family',5,NULL,'Dear Robertson family',2,NULL,'Robertson family',NULL,NULL,NULL,0,NULL,'Robertson family',NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (116,'Household',NULL,'Zope-Jensen family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Zope-Jensen family',NULL,NULL,NULL,NULL,NULL,'2691015333',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Zope-Jensen family',5,NULL,'Dear Zope-Jensen family',2,NULL,'Zope-Jensen family',NULL,NULL,NULL,0,NULL,'Zope-Jensen family',NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (117,'Individual',NULL,'Dr. Princess Cooper',NULL,NULL,'Princess','','Cooper',1,1,0,0,0,0,NULL,'Cooper, Princess',NULL,NULL,NULL,NULL,NULL,'3515918144',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Princess',1,NULL,'Dear Princess',1,NULL,'Dr. Princess Cooper',NULL,1,'1960-04-12',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (118,'Organization',NULL,'Tennessee Agriculture Solutions','Tennessee Agriculture Solutions',NULL,NULL,NULL,NULL,0,1,0,0,0,0,NULL,'Tennessee Agriculture Solutions',NULL,NULL,NULL,NULL,NULL,'2741641450',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Tennessee Agriculture Solutions',NULL,NULL,NULL,0,NULL,NULL,52,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (119,'Individual',NULL,'daz.jay60@airmail.info',NULL,NULL,NULL,NULL,NULL,0,0,0,0,1,0,NULL,'daz.jay60@airmail.info',NULL,NULL,NULL,'
4
',NULL,'3037318446',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear daz.jay60@airmail.info',1,NULL,'Dear daz.jay60@airmail.info',1,NULL,'daz.jay60@airmail.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (120,'Individual',NULL,'Dr. Lou Blackwell III',NULL,NULL,'Lou','','Blackwell',0,0,0,0,0,0,NULL,'Blackwell, Lou',NULL,NULL,NULL,'
2
',NULL,'2525168848',NULL,'Sample Data',4,4,NULL,NULL,1,NULL,'Dear Lou',1,NULL,'Dear Lou',1,NULL,'Dr. Lou Blackwell III',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (121,'Individual',NULL,'Brittney Adams',NULL,NULL,'Brittney','Q','Adams',0,0,0,0,0,0,NULL,'Adams, Brittney',NULL,NULL,NULL,'
1
',NULL,'1087046630',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Brittney',1,NULL,'Dear Brittney',1,NULL,'Brittney Adams',NULL,1,'1991-03-15',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (122,'Organization',NULL,'Creative Environmental Solutions','Creative Environmental Solutions',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Creative Environmental Solutions',NULL,NULL,NULL,'
2
',NULL,'2917266163',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Creative Environmental Solutions',NULL,NULL,NULL,0,NULL,NULL,110,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (123,'Individual',NULL,'Brittney Robertson',NULL,NULL,'Brittney','','Robertson',0,1,0,0,0,0,NULL,'Robertson, Brittney',NULL,NULL,NULL,'
2
',NULL,'1961955547',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Brittney',1,NULL,'Dear Brittney',1,NULL,'Brittney Robertson',NULL,1,'1996-01-17',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (124,'Individual',NULL,'Dr. Irvin Jones II',NULL,NULL,'Irvin','','Jones',1,1,0,0,0,0,NULL,'Jones, Irvin',NULL,NULL,NULL,NULL,NULL,'1283789305',NULL,'Sample Data',4,3,NULL,NULL,1,NULL,'Dear Irvin',1,NULL,'Dear Irvin',1,NULL,'Dr. Irvin Jones II',NULL,2,'1950-04-26',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (125,'Individual',NULL,'Kathleen Jacobs',NULL,NULL,'Kathleen','O','Jacobs',0,0,0,0,0,0,NULL,'Jacobs, Kathleen',NULL,NULL,NULL,NULL,NULL,'2367611893',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Kathleen',1,NULL,'Dear Kathleen',1,NULL,'Kathleen Jacobs',NULL,1,'1985-10-05',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (126,'Individual',NULL,'Sanford Bachman Jr.',NULL,NULL,'Sanford','E','Bachman',0,0,0,0,0,0,NULL,'Bachman, Sanford',NULL,NULL,NULL,NULL,NULL,'2454837812',NULL,'Sample Data',NULL,1,NULL,NULL,1,NULL,'Dear Sanford',1,NULL,'Dear Sanford',1,NULL,'Sanford Bachman Jr.',NULL,2,'1974-01-29',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (127,'Household',NULL,'Wilson-Jensen family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Wilson-Jensen family',NULL,NULL,NULL,NULL,NULL,'16190207',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Wilson-Jensen family',5,NULL,'Dear Wilson-Jensen family',2,NULL,'Wilson-Jensen family',NULL,NULL,NULL,0,NULL,'Wilson-Jensen family',NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (128,'Individual',NULL,'Mrs. Arlyne Cooper',NULL,NULL,'Arlyne','B','Cooper',1,0,0,0,1,0,NULL,'Cooper, Arlyne',NULL,NULL,NULL,NULL,NULL,'1117506834',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Arlyne',1,NULL,'Dear Arlyne',1,NULL,'Mrs. Arlyne Cooper',NULL,NULL,'1962-07-01',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (129,'Individual',NULL,'Rodrigo �ąchowski III',NULL,NULL,'Rodrigo','','�ąchowski',0,0,0,0,1,0,NULL,'�ąchowski, Rodrigo',NULL,NULL,NULL,'
4
',NULL,'646092703',NULL,'Sample Data',NULL,4,NULL,NULL,1,NULL,'Dear Rodrigo',1,NULL,'Dear Rodrigo',1,NULL,'Rodrigo �ąchowski III',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (130,'Individual',NULL,'Dr. Nicole Patel','Mississippi Poetry Alliance',NULL,'Nicole','','Patel',0,0,0,0,0,0,NULL,'Patel, Nicole',NULL,NULL,NULL,'
2
',NULL,'687315016',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Nicole',1,NULL,'Dear Nicole',1,NULL,'Dr. Nicole Patel',NULL,1,'1981-09-24',0,NULL,NULL,NULL,NULL,NULL,135,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (131,'Household',NULL,'Deforest-Roberts family',NULL,NULL,NULL,NULL,NULL,0,1,0,0,1,0,NULL,'Deforest-Roberts family',NULL,NULL,NULL,NULL,NULL,'1403076518',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Deforest-Roberts family',5,NULL,'Dear Deforest-Roberts family',2,NULL,'Deforest-Roberts family',NULL,NULL,NULL,0,NULL,'Deforest-Roberts family',NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (132,'Individual',NULL,'Craig Reynolds Sr.',NULL,NULL,'Craig','','Reynolds',0,0,0,0,0,0,NULL,'Reynolds, Craig',NULL,NULL,NULL,NULL,NULL,'3510577139',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Craig',1,NULL,'Dear Craig',1,NULL,'Craig Reynolds Sr.',NULL,NULL,'1980-07-22',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (133,'Individual',NULL,'Norris Wilson',NULL,NULL,'Norris','','Wilson',0,1,0,0,0,0,NULL,'Wilson, Norris',NULL,NULL,NULL,'
4
',NULL,'1089092056',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Norris Wilson',NULL,2,'1997-08-05',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (134,'Individual',NULL,'Mrs. Ashlie González',NULL,NULL,'Ashlie','','González',0,1,0,0,0,0,NULL,'González, Ashlie',NULL,NULL,NULL,'
5
',NULL,'4074516912',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Ashlie',1,NULL,'Dear Ashlie',1,NULL,'Mrs. Ashlie González',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (135,'Organization',NULL,'Mississippi Poetry Alliance','Mississippi Poetry Alliance',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Mississippi Poetry Alliance',NULL,NULL,NULL,'
1
',NULL,'3581684219',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Mississippi Poetry Alliance',NULL,NULL,NULL,0,NULL,NULL,130,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (136,'Individual',NULL,'Mrs. Kandace Jensen',NULL,NULL,'Kandace','C','Jensen',0,0,0,0,1,0,NULL,'Jensen, Kandace',NULL,NULL,NULL,NULL,NULL,'2339972314',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Kandace',1,NULL,'Dear Kandace',1,NULL,'Mrs. Kandace Jensen',NULL,1,'1984-11-20',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (137,'Individual',NULL,'Brent Samuels II',NULL,NULL,'Brent','K','Samuels',1,0,0,0,0,0,NULL,'Samuels, Brent',NULL,NULL,NULL,NULL,NULL,'3250906077',NULL,'Sample Data',NULL,3,NULL,NULL,1,NULL,'Dear Brent',1,NULL,'Dear Brent',1,NULL,'Brent Samuels II',NULL,NULL,'1986-05-13',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (138,'Organization',NULL,'Pennsylvania Family Partnership','Pennsylvania Family Partnership',NULL,NULL,NULL,NULL,0,0,0,0,1,0,NULL,'Pennsylvania Family Partnership',NULL,NULL,NULL,'
2
',NULL,'399929164',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Pennsylvania Family Partnership',NULL,NULL,NULL,0,NULL,NULL,82,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (139,'Individual',NULL,'Mr. Ray Bachman Jr.','Anchorage Sports Center',NULL,'Ray','U','Bachman',0,0,0,0,0,0,NULL,'Bachman, Ray',NULL,NULL,NULL,NULL,NULL,'560571069',NULL,'Sample Data',3,1,NULL,NULL,1,NULL,'Dear Ray',1,NULL,'Dear Ray',1,NULL,'Mr. Ray Bachman Jr.',NULL,2,'1986-04-13',0,NULL,NULL,NULL,NULL,NULL,73,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (140,'Individual',NULL,'Dr. Scarlet Roberts',NULL,NULL,'Scarlet','B','Roberts',1,0,0,0,0,0,NULL,'Roberts, Scarlet',NULL,NULL,NULL,NULL,NULL,'986362162',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Scarlet',1,NULL,'Dear Scarlet',1,NULL,'Dr. Scarlet Roberts',NULL,NULL,'1984-01-08',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (141,'Individual',NULL,'Dr. Craig Wagner','Graton Software Solutions',NULL,'Craig','P','Wagner',0,0,0,0,0,0,NULL,'Wagner, Craig',NULL,NULL,NULL,NULL,NULL,'2031234016',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Craig',1,NULL,'Dear Craig',1,NULL,'Dr. Craig Wagner',NULL,2,'1950-10-29',0,NULL,NULL,NULL,NULL,NULL,154,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (142,'Organization',NULL,'Main Family Partners','Main Family Partners',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Main Family Partners',NULL,NULL,NULL,NULL,NULL,'2920270390',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Main Family Partners',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (143,'Individual',NULL,'Nicole Reynolds',NULL,NULL,'Nicole','','Reynolds',1,0,0,0,0,0,NULL,'Reynolds, Nicole',NULL,NULL,NULL,NULL,NULL,'761347684',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Nicole',1,NULL,'Dear Nicole',1,NULL,'Nicole Reynolds',NULL,NULL,'1954-11-22',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (144,'Individual',NULL,'Dr. Andrew Blackwell',NULL,NULL,'Andrew','U','Blackwell',0,1,0,0,0,0,NULL,'Blackwell, Andrew',NULL,NULL,NULL,NULL,NULL,'2328901373',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Andrew',1,NULL,'Dear Andrew',1,NULL,'Dr. Andrew Blackwell',NULL,2,'1956-12-29',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (145,'Organization',NULL,'Little Rock Sustainability Network','Little Rock Sustainability Network',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Little Rock Sustainability Network',NULL,NULL,NULL,NULL,NULL,'3227790967',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Little Rock Sustainability Network',NULL,NULL,NULL,0,NULL,NULL,103,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (146,'Individual',NULL,'Jay �ąchowski',NULL,NULL,'Jay','','�ąchowski',0,0,0,0,0,0,NULL,'�ąchowski, Jay',NULL,NULL,NULL,'
4
',NULL,'2087696859',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Jay',1,NULL,'Dear Jay',1,NULL,'Jay �ąchowski',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (147,'Household',NULL,'Reynolds family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Reynolds family',NULL,NULL,NULL,'
3
',NULL,'4119726021',NULL,'Sample Data',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,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (148,'Individual',NULL,'lareeb@spamalot.biz',NULL,NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'lareeb@spamalot.biz',NULL,NULL,NULL,NULL,NULL,'2680875030',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear lareeb@spamalot.biz',1,NULL,'Dear lareeb@spamalot.biz',1,NULL,'lareeb@spamalot.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (149,'Individual',NULL,'Ivey Robertson',NULL,NULL,'Ivey','','Robertson',0,0,0,0,0,0,NULL,'Robertson, Ivey',NULL,NULL,NULL,NULL,NULL,'2177307295',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Ivey',1,NULL,'Dear Ivey',1,NULL,'Ivey Robertson',NULL,NULL,'1964-07-05',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (150,'Individual',NULL,'Mr. Lou Díaz Jr.',NULL,NULL,'Lou','','Díaz',0,0,0,0,0,0,NULL,'Díaz, Lou',NULL,NULL,NULL,NULL,NULL,'1546158286',NULL,'Sample Data',3,1,NULL,NULL,1,NULL,'Dear Lou',1,NULL,'Dear Lou',1,NULL,'Mr. Lou Díaz Jr.',NULL,2,'1989-07-13',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (151,'Individual',NULL,'Ms. Princess Wilson','New Concord Wellness Trust',NULL,'Princess','','Wilson',0,0,0,0,1,0,NULL,'Wilson, Princess',NULL,NULL,NULL,'
4
',NULL,'1309472467',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear Princess',1,NULL,'Dear Princess',1,NULL,'Ms. Princess Wilson',NULL,NULL,'1988-04-10',0,NULL,NULL,NULL,NULL,NULL,170,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (152,'Household',NULL,'Parker family',NULL,NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'Parker family',NULL,NULL,NULL,'
4
',NULL,'425242179',NULL,'Sample Data',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,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (153,'Individual',NULL,'russellwilson25@lol.biz',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'russellwilson25@lol.biz',NULL,NULL,NULL,'
4
',NULL,'1779359194',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear russellwilson25@lol.biz',1,NULL,'Dear russellwilson25@lol.biz',1,NULL,'russellwilson25@lol.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (154,'Organization',NULL,'Graton Software Solutions','Graton Software Solutions',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Graton Software Solutions',NULL,NULL,NULL,'
1
',NULL,'1330180338',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Graton Software Solutions',NULL,NULL,NULL,0,NULL,NULL,141,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (155,'Individual',NULL,'Mrs. Nicole Ivanov',NULL,NULL,'Nicole','','Ivanov',1,0,0,0,1,0,NULL,'Ivanov, Nicole',NULL,NULL,NULL,NULL,NULL,'1759117309',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Nicole',1,NULL,'Dear Nicole',1,NULL,'Mrs. Nicole Ivanov',NULL,1,'1994-07-18',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (156,'Household',NULL,'Bachman family',NULL,NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'Bachman family',NULL,NULL,NULL,'
5
',NULL,'1714131215',NULL,'Sample Data',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,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (157,'Individual',NULL,'Herminia Blackwell-McReynolds',NULL,NULL,'Herminia','C','Blackwell-McReynolds',0,0,0,0,0,0,NULL,'Blackwell-McReynolds, Herminia',NULL,NULL,NULL,'
2
',NULL,'3145038393',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Herminia',1,NULL,'Dear Herminia',1,NULL,'Herminia Blackwell-McReynolds',NULL,1,'2007-09-07',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (158,'Individual',NULL,'Elbert Wilson-Jensen',NULL,NULL,'Elbert','M','Wilson-Jensen',1,0,0,0,0,0,NULL,'Wilson-Jensen, Elbert',NULL,NULL,NULL,'
4
',NULL,'1113922806',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Elbert',1,NULL,'Dear Elbert',1,NULL,'Elbert Wilson-Jensen',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (159,'Individual',NULL,'mw.jones@sample.org',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'mw.jones@sample.org',NULL,NULL,NULL,NULL,NULL,'3650198856',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear mw.jones@sample.org',1,NULL,'Dear mw.jones@sample.org',1,NULL,'mw.jones@sample.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (160,'Individual',NULL,'Mr. Brzęczysław Blackwell','Alabama Education Services',NULL,'Brzęczysław','','Blackwell',1,0,0,0,0,0,NULL,'Blackwell, Brzęczysław',NULL,NULL,NULL,NULL,NULL,'3382098014',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Brzęczysław',1,NULL,'Dear Brzęczysław',1,NULL,'Mr. Brzęczysław Blackwell',NULL,2,'1987-06-13',0,NULL,NULL,NULL,NULL,NULL,173,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (161,'Household',NULL,'Blackwell family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Blackwell family',NULL,NULL,NULL,NULL,NULL,'3218641510',NULL,'Sample Data',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,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (162,'Individual',NULL,'Dr. Jackson Dimitrov',NULL,NULL,'Jackson','O','Dimitrov',0,0,0,0,0,0,NULL,'Dimitrov, Jackson',NULL,NULL,NULL,'
1
',NULL,'2271911049',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Jackson',1,NULL,'Dear Jackson',1,NULL,'Dr. Jackson Dimitrov',NULL,2,'1991-10-11',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (163,'Individual',NULL,'Ms. Betty Wagner',NULL,NULL,'Betty','S','Wagner',0,0,0,0,1,0,NULL,'Wagner, Betty',NULL,NULL,NULL,NULL,NULL,'2519883154',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear Betty',1,NULL,'Dear Betty',1,NULL,'Ms. Betty Wagner',NULL,1,'1941-02-19',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (164,'Individual',NULL,'Ms. Merrie Grant',NULL,NULL,'Merrie','Z','Grant',0,0,0,0,0,0,NULL,'Grant, Merrie',NULL,NULL,NULL,'
5
',NULL,'1746149346',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear Merrie',1,NULL,'Dear Merrie',1,NULL,'Ms. Merrie Grant',NULL,1,'1947-03-06',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (165,'Individual',NULL,'Dr. Lincoln Cooper III','Urban Software Initiative',NULL,'Lincoln','R','Cooper',1,0,0,0,1,0,NULL,'Cooper, Lincoln',NULL,NULL,NULL,NULL,NULL,'374468394',NULL,'Sample Data',4,4,NULL,NULL,1,NULL,'Dear Lincoln',1,NULL,'Dear Lincoln',1,NULL,'Dr. Lincoln Cooper III',NULL,2,'1973-11-12',0,NULL,NULL,NULL,NULL,NULL,48,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (166,'Individual',NULL,'Jina Zope',NULL,NULL,'Jina','','Zope',0,0,0,0,1,0,NULL,'Zope, Jina',NULL,NULL,NULL,'
3
',NULL,'2020833032',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Jina',1,NULL,'Dear Jina',1,NULL,'Jina Zope',NULL,1,'1961-07-29',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (167,'Household',NULL,'González family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'González family',NULL,NULL,NULL,NULL,NULL,'3263723758',NULL,'Sample Data',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,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (168,'Individual',NULL,'Dr. Betty Zope',NULL,NULL,'Betty','E','Zope',0,0,0,0,0,0,NULL,'Zope, Betty',NULL,NULL,NULL,NULL,NULL,'2849696155',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Betty',1,NULL,'Dear Betty',1,NULL,'Dr. Betty Zope',NULL,1,'1984-04-24',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (169,'Individual',NULL,'Dr. Junko Bachman',NULL,NULL,'Junko','','Bachman',0,0,0,0,0,0,NULL,'Bachman, Junko',NULL,NULL,NULL,NULL,NULL,'3857467004',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Junko',1,NULL,'Dear Junko',1,NULL,'Dr. Junko Bachman',NULL,1,'1977-11-05',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (170,'Organization',NULL,'New Concord Wellness Trust','New Concord Wellness Trust',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'New Concord Wellness Trust',NULL,NULL,NULL,NULL,NULL,'747492774',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'New Concord Wellness Trust',NULL,NULL,NULL,0,NULL,NULL,151,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (171,'Household',NULL,'Dimitrov-Bachman family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Dimitrov-Bachman family',NULL,NULL,NULL,NULL,NULL,'538828243',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Dimitrov-Bachman family',5,NULL,'Dear Dimitrov-Bachman family',2,NULL,'Dimitrov-Bachman family',NULL,NULL,NULL,0,NULL,'Dimitrov-Bachman family',NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (172,'Individual',NULL,'Carlos Terrell Sr.',NULL,NULL,'Carlos','U','Terrell',0,0,0,0,0,0,NULL,'Terrell, Carlos',NULL,NULL,NULL,'
3
',NULL,'2130082917',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Carlos',1,NULL,'Dear Carlos',1,NULL,'Carlos Terrell Sr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (173,'Organization',NULL,'Alabama Education Services','Alabama Education Services',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Alabama Education Services',NULL,NULL,NULL,'
5
',NULL,'117038200',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Alabama Education Services',NULL,NULL,NULL,0,NULL,NULL,160,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (174,'Household',NULL,'Wilson family',NULL,NULL,NULL,NULL,NULL,0,1,0,0,0,0,NULL,'Wilson family',NULL,NULL,NULL,'
5
',NULL,'350510798',NULL,'Sample Data',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,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (175,'Individual',NULL,'Dr. Omar Parker',NULL,NULL,'Omar','','Parker',0,0,0,0,0,0,NULL,'Parker, Omar',NULL,NULL,NULL,NULL,NULL,'3921166397',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Omar',1,NULL,'Dear Omar',1,NULL,'Dr. Omar Parker',NULL,2,'1992-08-09',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (176,'Individual',NULL,'Mrs. Kathlyn Terry',NULL,NULL,'Kathlyn','W','Terry',0,0,0,0,0,0,NULL,'Terry, Kathlyn',NULL,NULL,NULL,NULL,NULL,'1733215709',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Kathlyn',1,NULL,'Dear Kathlyn',1,NULL,'Mrs. Kathlyn Terry',NULL,1,'1942-04-17',1,'2023-07-13',NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (177,'Household',NULL,'Roberts family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Roberts family',NULL,NULL,NULL,'
5
',NULL,'2097305882',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Roberts family',5,NULL,'Dear Roberts family',2,NULL,'Roberts family',NULL,NULL,NULL,0,NULL,'Roberts family',NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (178,'Individual',NULL,'Tanya Olsen',NULL,NULL,'Tanya','','Olsen',0,0,0,0,0,0,NULL,'Olsen, Tanya',NULL,NULL,NULL,NULL,NULL,'1790867456',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Tanya',1,NULL,'Dear Tanya',1,NULL,'Tanya Olsen',NULL,NULL,'1958-07-22',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (179,'Individual',NULL,'Elbert Cooper-Yadav',NULL,NULL,'Elbert','S','Cooper-Yadav',0,0,0,0,0,0,NULL,'Cooper-Yadav, Elbert',NULL,NULL,NULL,'
1
',NULL,'3369275798',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Elbert',1,NULL,'Dear Elbert',1,NULL,'Elbert Cooper-Yadav',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (180,'Organization',NULL,'Jackson Arts Collective','Jackson Arts Collective',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Jackson Arts Collective',NULL,NULL,NULL,'
4
',NULL,'2925724970',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Jackson Arts Collective',NULL,NULL,NULL,0,NULL,NULL,109,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (181,'Individual',NULL,'Lincoln Wilson',NULL,NULL,'Lincoln','G','Wilson',0,1,0,0,0,0,NULL,'Wilson, Lincoln',NULL,NULL,NULL,'
4
',NULL,'904190316',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Lincoln',1,NULL,'Dear Lincoln',1,NULL,'Lincoln Wilson',NULL,2,'1956-12-20',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (182,'Household',NULL,'Terrell family',NULL,NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'Terrell family',NULL,NULL,NULL,'
3
',NULL,'1136333121',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Terrell family',5,NULL,'Dear Terrell family',2,NULL,'Terrell family',NULL,NULL,NULL,0,NULL,'Terrell family',NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (183,'Individual',NULL,'zopel@testmail.co.uk',NULL,NULL,NULL,NULL,NULL,1,1,0,0,0,0,NULL,'zopel@testmail.co.uk',NULL,NULL,NULL,'
5
',NULL,'2393052870',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear zopel@testmail.co.uk',1,NULL,'Dear zopel@testmail.co.uk',1,NULL,'zopel@testmail.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (184,'Household',NULL,'Blackwell-McReynolds family',NULL,NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'Blackwell-McReynolds family',NULL,NULL,NULL,'
2
',NULL,'3403662693',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Blackwell-McReynolds family',5,NULL,'Dear Blackwell-McReynolds family',2,NULL,'Blackwell-McReynolds family',NULL,NULL,NULL,0,NULL,'Blackwell-McReynolds family',NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (185,'Individual',NULL,'Alida Wilson-Jensen',NULL,NULL,'Alida','','Wilson-Jensen',0,1,0,0,0,0,NULL,'Wilson-Jensen, Alida',NULL,NULL,NULL,NULL,NULL,'3164525509',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Alida',1,NULL,'Dear Alida',1,NULL,'Alida Wilson-Jensen',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (186,'Individual',NULL,'Carylon Bachman',NULL,NULL,'Carylon','','Bachman',0,0,0,0,0,0,NULL,'Bachman, Carylon',NULL,NULL,NULL,'
5
',NULL,'1159348459',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Carylon',1,NULL,'Dear Carylon',1,NULL,'Carylon Bachman',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (187,'Organization',NULL,'Ohio Health Initiative','Ohio Health Initiative',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Ohio Health Initiative',NULL,NULL,NULL,'
3
',NULL,'1613074060',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Ohio Health Initiative',NULL,NULL,NULL,0,NULL,NULL,68,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (188,'Individual',NULL,'Maxwell Blackwell',NULL,NULL,'Maxwell','T','Blackwell',0,0,0,0,1,0,NULL,'Blackwell, Maxwell',NULL,NULL,NULL,NULL,NULL,'1485702627',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Maxwell',1,NULL,'Dear Maxwell',1,NULL,'Maxwell Blackwell',NULL,2,'2002-01-26',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (189,'Individual',NULL,'Dr. Beula Wattson',NULL,NULL,'Beula','','Wattson',0,0,0,0,1,0,NULL,'Wattson, Beula',NULL,NULL,NULL,'
5
',NULL,'4074227652',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Beula',1,NULL,'Dear Beula',1,NULL,'Dr. Beula Wattson',NULL,1,'1940-05-09',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (190,'Individual',NULL,'Bernadette Grant',NULL,NULL,'Bernadette','','Grant',0,0,0,0,0,0,NULL,'Grant, Bernadette',NULL,NULL,NULL,'
5
',NULL,'2386715823',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Bernadette',1,NULL,'Dear Bernadette',1,NULL,'Bernadette Grant',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (191,'Individual',NULL,'Dr. Betty Barkley-Yadav',NULL,NULL,'Betty','','Barkley-Yadav',0,0,0,0,0,0,NULL,'Barkley-Yadav, Betty',NULL,NULL,NULL,'
3
',NULL,'3225700026',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Betty',1,NULL,'Dear Betty',1,NULL,'Dr. Betty Barkley-Yadav',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (192,'Individual',NULL,'Mr. Brzęczysław Terrell III',NULL,NULL,'Brzęczysław','M','Terrell',0,0,0,0,0,0,NULL,'Terrell, Brzęczysław',NULL,NULL,NULL,'
5
',NULL,'2155865046',NULL,'Sample Data',3,4,NULL,NULL,1,NULL,'Dear Brzęczysław',1,NULL,'Dear Brzęczysław',1,NULL,'Mr. Brzęczysław Terrell III',NULL,NULL,'1941-09-10',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (193,'Individual',NULL,'Mr. Elbert Patel',NULL,NULL,'Elbert','','Patel',1,0,0,0,0,0,NULL,'Patel, Elbert',NULL,NULL,NULL,NULL,NULL,'2164922981',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Elbert',1,NULL,'Dear Elbert',1,NULL,'Mr. Elbert Patel',NULL,NULL,'1959-02-18',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (194,'Individual',NULL,'Kathleen Roberts',NULL,NULL,'Kathleen','Q','Roberts',0,0,0,0,0,0,NULL,'Roberts, Kathleen',NULL,NULL,NULL,NULL,NULL,'2729851983',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Kathleen',1,NULL,'Dear Kathleen',1,NULL,'Kathleen Roberts',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (195,'Individual',NULL,'Shad Prentice',NULL,NULL,'Shad','T','Prentice',0,0,0,0,0,0,NULL,'Prentice, Shad',NULL,NULL,NULL,NULL,NULL,'237577358',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Shad',1,NULL,'Dear Shad',1,NULL,'Shad Prentice',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (196,'Individual',NULL,'Santina Díaz',NULL,NULL,'Santina','','Díaz',0,1,0,0,0,0,NULL,'Díaz, Santina',NULL,NULL,NULL,'
5
',NULL,'3076461979',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Santina',1,NULL,'Dear Santina',1,NULL,'Santina Díaz',NULL,NULL,'1953-08-22',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (197,'Individual',NULL,'Dr. Elbert Cooper III',NULL,NULL,'Elbert','M','Cooper',0,0,0,0,1,0,NULL,'Cooper, Elbert',NULL,NULL,NULL,'
2
',NULL,'2147415663',NULL,'Sample Data',4,4,NULL,NULL,1,NULL,'Dear Elbert',1,NULL,'Dear Elbert',1,NULL,'Dr. Elbert Cooper III',NULL,NULL,'1991-10-29',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (198,'Individual',NULL,'Landon Samson',NULL,NULL,'Landon','M','Samson',0,0,0,0,0,0,NULL,'Samson, Landon',NULL,NULL,NULL,NULL,NULL,'1562429969',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Landon',1,NULL,'Dear Landon',1,NULL,'Landon Samson',NULL,2,'1957-05-28',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (199,'Individual',NULL,'Dr. Billy Reynolds Sr.',NULL,NULL,'Billy','','Reynolds',0,0,0,0,1,0,NULL,'Reynolds, Billy',NULL,NULL,NULL,'
1
',NULL,'3840378024',NULL,'Sample Data',4,2,NULL,NULL,1,NULL,'Dear Billy',1,NULL,'Dear Billy',1,NULL,'Dr. Billy Reynolds Sr.',NULL,2,'1999-08-16',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (200,'Individual',NULL,'Dr. Ashley Samuels II',NULL,NULL,'Ashley','K','Samuels',0,0,0,0,1,0,NULL,'Samuels, Ashley',NULL,NULL,NULL,NULL,NULL,'448477218',NULL,'Sample Data',4,3,NULL,NULL,1,NULL,'Dear Ashley',1,NULL,'Dear Ashley',1,NULL,'Dr. Ashley Samuels II',NULL,2,'1983-10-26',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:27','Both'),
- (201,'Individual',NULL,'deforestr@testmail.net',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'deforestr@testmail.net',NULL,NULL,NULL,NULL,NULL,'2990278986',NULL,'Sample Data',NULL,4,NULL,NULL,1,NULL,'Dear deforestr@testmail.net',1,NULL,'Dear deforestr@testmail.net',1,NULL,'deforestr@testmail.net',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:27','2024-01-06 04:30:28','Both'),
- (202,'Individual',NULL,'Jenny Lee',NULL,NULL,'Jenny',NULL,'Lee',0,0,0,0,0,0,NULL,'Lee, Jenny',NULL,NULL,NULL,NULL,'en_US','a04bf00bd1ad1fab82bd4cffa9ad39dd',NULL,NULL,NULL,NULL,NULL,1,1,NULL,'Dear Jenny',1,NULL,'Dear Jenny',1,NULL,'Jenny Lee','Volunteer coordinator',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-01-06 04:30:29','2024-01-06 04:30:29','Both');
+ (1,'Organization',NULL,'Default Organization','Default Organization',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Default Organization',NULL,'Default Organization',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,NULL,NULL,NULL,0,NULL,'2024-04-26 15:50:04','Both'),
+ (2,'Individual',NULL,'Betty Samson',NULL,NULL,'Betty','U','Samson',0,0,0,0,0,0,NULL,'Samson, Betty',NULL,NULL,NULL,NULL,NULL,'3629042466',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Betty',1,NULL,'Dear Betty',1,NULL,'Betty Samson',NULL,1,'1970-07-15',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (3,'Individual',NULL,'Justina Samuels-Samson',NULL,NULL,'Justina','J','Samuels-Samson',0,0,0,0,0,0,NULL,'Samuels-Samson, Justina',NULL,NULL,NULL,'
1
',NULL,'2669772966',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Justina',1,NULL,'Dear Justina',1,NULL,'Justina Samuels-Samson',NULL,1,'2007-01-05',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (4,'Individual',NULL,'Mrs. Rebekah Robertson',NULL,NULL,'Rebekah','Q','Robertson',0,0,0,0,0,0,NULL,'Robertson, Rebekah',NULL,NULL,NULL,'
1
',NULL,'1199774437',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Rebekah',1,NULL,'Dear Rebekah',1,NULL,'Mrs. Rebekah Robertson',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (5,'Individual',NULL,'Maxwell Wagner',NULL,NULL,'Maxwell','','Wagner',0,0,0,0,0,0,NULL,'Wagner, Maxwell',NULL,NULL,NULL,'
2
',NULL,'899179200',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Maxwell',1,NULL,'Dear Maxwell',1,NULL,'Maxwell Wagner',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (6,'Individual',NULL,'Irvin Prentice',NULL,NULL,'Irvin','W','Prentice',0,0,0,0,1,0,NULL,'Prentice, Irvin',NULL,NULL,NULL,NULL,NULL,'3409303473',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Irvin',1,NULL,'Dear Irvin',1,NULL,'Irvin Prentice',NULL,2,'1995-10-19',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (7,'Individual',NULL,'Dr. Jay Patel',NULL,NULL,'Jay','','Patel',0,0,0,0,1,0,NULL,'Patel, Jay',NULL,NULL,NULL,'
1
',NULL,'320192131',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Jay',1,NULL,'Dear Jay',1,NULL,'Dr. Jay Patel',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (8,'Individual',NULL,'Magan Ivanov',NULL,NULL,'Magan','W','Ivanov',1,0,0,0,0,0,NULL,'Ivanov, Magan',NULL,NULL,NULL,'
5
',NULL,'4273390544',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Magan',1,NULL,'Dear Magan',1,NULL,'Magan Ivanov',NULL,NULL,'1950-08-29',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (9,'Organization',NULL,'Sierra Legal Systems','Sierra Legal Systems',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Sierra Legal Systems',NULL,NULL,NULL,NULL,NULL,'3171068980',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Sierra Legal Systems',NULL,NULL,NULL,0,NULL,NULL,60,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (10,'Household',NULL,'Samson family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Samson family',NULL,NULL,NULL,NULL,NULL,'333421926',NULL,'Sample Data',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,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (11,'Household',NULL,'Reynolds-Dimitrov family',NULL,NULL,NULL,NULL,NULL,1,0,0,0,1,0,NULL,'Reynolds-Dimitrov family',NULL,NULL,NULL,NULL,NULL,'1192435882',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Reynolds-Dimitrov family',5,NULL,'Dear Reynolds-Dimitrov family',2,NULL,'Reynolds-Dimitrov family',NULL,NULL,NULL,0,NULL,'Reynolds-Dimitrov family',NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (12,'Individual',NULL,'Dr. Shad Reynolds Jr.',NULL,NULL,'Shad','','Reynolds',0,0,0,0,0,0,NULL,'Reynolds, Shad',NULL,NULL,NULL,'
1
',NULL,'3023273825',NULL,'Sample Data',4,1,NULL,NULL,1,NULL,'Dear Shad',1,NULL,'Dear Shad',1,NULL,'Dr. Shad Reynolds Jr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (13,'Individual',NULL,'Landon Parker II',NULL,NULL,'Landon','','Parker',0,0,0,0,0,0,NULL,'Parker, Landon',NULL,NULL,NULL,'
3
',NULL,'372152677',NULL,'Sample Data',NULL,3,NULL,NULL,1,NULL,'Dear Landon',1,NULL,'Dear Landon',1,NULL,'Landon Parker II',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (14,'Organization',NULL,'Creative Technology Solutions','Creative Technology Solutions',NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'Creative Technology Solutions',NULL,NULL,NULL,'
2
',NULL,'1579374956',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Creative Technology Solutions',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (15,'Individual',NULL,'Bryon Reynolds',NULL,NULL,'Bryon','','Reynolds',1,1,0,0,0,0,NULL,'Reynolds, Bryon',NULL,NULL,NULL,NULL,NULL,'3521962921',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Bryon',1,NULL,'Dear Bryon',1,NULL,'Bryon Reynolds',NULL,2,'1983-01-11',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (16,'Individual',NULL,'samsont@fishmail.co.in',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'samsont@fishmail.co.in',NULL,NULL,NULL,'
4
',NULL,'571364509',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear samsont@fishmail.co.in',1,NULL,'Dear samsont@fishmail.co.in',1,NULL,'samsont@fishmail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (17,'Organization',NULL,'Community Peace Solutions','Community Peace Solutions',NULL,NULL,NULL,NULL,0,0,0,0,1,0,NULL,'Community Peace Solutions',NULL,NULL,NULL,'
4
',NULL,'2355790404',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Community Peace Solutions',NULL,NULL,NULL,0,NULL,NULL,78,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (18,'Household',NULL,'McReynolds family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'McReynolds family',NULL,NULL,NULL,'
3
',NULL,'3032680972',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear McReynolds family',5,NULL,'Dear McReynolds family',2,NULL,'McReynolds family',NULL,NULL,NULL,0,NULL,'McReynolds family',NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (19,'Individual',NULL,'Ms. Shauna Jones',NULL,NULL,'Shauna','N','Jones',1,0,0,0,0,0,NULL,'Jones, Shauna',NULL,NULL,NULL,NULL,NULL,'2088102406',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear Shauna',1,NULL,'Dear Shauna',1,NULL,'Ms. Shauna Jones',NULL,NULL,'1976-02-17',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (20,'Individual',NULL,'Dr. Jed Parker Sr.',NULL,NULL,'Jed','C','Parker',1,1,0,0,1,0,NULL,'Parker, Jed',NULL,NULL,NULL,'
3
',NULL,'1794622526',NULL,'Sample Data',4,2,NULL,NULL,1,NULL,'Dear Jed',1,NULL,'Dear Jed',1,NULL,'Dr. Jed Parker Sr.',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (21,'Individual',NULL,'Kenny Wattson Sr.',NULL,NULL,'Kenny','','Wattson',1,0,0,0,0,0,NULL,'Wattson, Kenny',NULL,NULL,NULL,'
2
',NULL,'3471709168',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Kenny',1,NULL,'Dear Kenny',1,NULL,'Kenny Wattson Sr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (22,'Individual',NULL,'Mr. Jerome Grant III',NULL,NULL,'Jerome','','Grant',0,0,0,0,0,0,NULL,'Grant, Jerome',NULL,NULL,NULL,'
2
',NULL,'92527229',NULL,'Sample Data',3,4,NULL,NULL,1,NULL,'Dear Jerome',1,NULL,'Dear Jerome',1,NULL,'Mr. Jerome Grant III',NULL,NULL,'1985-02-18',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (23,'Organization',NULL,'Creative Advocacy Alliance','Creative Advocacy Alliance',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Creative Advocacy Alliance',NULL,NULL,NULL,NULL,NULL,'2743465698',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Creative Advocacy Alliance',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (24,'Individual',NULL,'Rebekah Parker',NULL,NULL,'Rebekah','','Parker',0,1,0,0,0,0,NULL,'Parker, Rebekah',NULL,NULL,NULL,'
5
',NULL,'4245169755',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Rebekah',1,NULL,'Dear Rebekah',1,NULL,'Rebekah Parker',NULL,NULL,'1981-09-01',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (25,'Individual',NULL,'Elbert Samson Sr.',NULL,NULL,'Elbert','','Samson',0,0,0,0,0,0,NULL,'Samson, Elbert',NULL,NULL,NULL,'
5
',NULL,'3416596353',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Elbert',1,NULL,'Dear Elbert',1,NULL,'Elbert Samson Sr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (26,'Individual',NULL,'Errol Jameson II',NULL,NULL,'Errol','A','Jameson',0,0,0,0,0,0,NULL,'Jameson, Errol',NULL,NULL,NULL,'
4
',NULL,'4067151192',NULL,'Sample Data',NULL,3,NULL,NULL,1,NULL,'Dear Errol',1,NULL,'Dear Errol',1,NULL,'Errol Jameson II',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (27,'Individual',NULL,'Elina Jameson-Patel',NULL,NULL,'Elina','','Jameson-Patel',0,0,0,0,1,0,NULL,'Jameson-Patel, Elina',NULL,NULL,NULL,'
5
',NULL,'3135054930',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Elina',1,NULL,'Dear Elina',1,NULL,'Elina Jameson-Patel',NULL,1,'1985-03-24',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (28,'Individual',NULL,'Sonny Olsen Sr.',NULL,NULL,'Sonny','','Olsen',0,0,0,0,0,0,NULL,'Olsen, Sonny',NULL,NULL,NULL,'
3
',NULL,'783208419',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Sonny',1,NULL,'Dear Sonny',1,NULL,'Sonny Olsen Sr.',NULL,2,'1975-04-13',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (29,'Household',NULL,'Samson family',NULL,NULL,NULL,NULL,NULL,0,1,0,0,0,0,NULL,'Samson family',NULL,NULL,NULL,NULL,NULL,'333421926',NULL,'Sample Data',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,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (30,'Individual',NULL,'Laree Barkley',NULL,NULL,'Laree','V','Barkley',0,0,0,0,0,0,NULL,'Barkley, Laree',NULL,NULL,NULL,NULL,NULL,'347219970',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Laree',1,NULL,'Dear Laree',1,NULL,'Laree Barkley',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (31,'Individual',NULL,'Allen Barkley-Grant Sr.',NULL,NULL,'Allen','','Barkley-Grant',0,0,0,0,0,0,NULL,'Barkley-Grant, Allen',NULL,NULL,NULL,'
1
',NULL,'2438707263',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Allen',1,NULL,'Dear Allen',1,NULL,'Allen Barkley-Grant Sr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (32,'Individual',NULL,'wattson.truman@fakemail.info','Pocono Summit Legal Trust',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'wattson.truman@fakemail.info',NULL,NULL,NULL,NULL,NULL,'832973249',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear wattson.truman@fakemail.info',1,NULL,'Dear wattson.truman@fakemail.info',1,NULL,'wattson.truman@fakemail.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,169,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (33,'Individual',NULL,'Mei Parker',NULL,NULL,'Mei','Z','Parker',0,1,0,0,1,0,NULL,'Parker, Mei',NULL,NULL,NULL,NULL,NULL,'285847046',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Mei',1,NULL,'Dear Mei',1,NULL,'Mei Parker',NULL,1,'1979-02-24',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (34,'Individual',NULL,'Bob Patel','Second Legal Partnership',NULL,'Bob','','Patel',1,0,0,0,0,0,NULL,'Patel, Bob',NULL,NULL,NULL,NULL,NULL,'165677913',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Bob',1,NULL,'Dear Bob',1,NULL,'Bob Patel',NULL,NULL,'1968-04-13',0,NULL,NULL,NULL,NULL,NULL,130,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (35,'Individual',NULL,'Beula Yadav',NULL,NULL,'Beula','','Yadav',0,0,0,0,0,0,NULL,'Yadav, Beula',NULL,NULL,NULL,NULL,NULL,'852214760',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Beula',1,NULL,'Dear Beula',1,NULL,'Beula Yadav',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (36,'Individual',NULL,'Rebekah Müller',NULL,NULL,'Rebekah','X','Müller',0,0,0,0,0,0,NULL,'Müller, Rebekah',NULL,NULL,NULL,NULL,NULL,'3543648262',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Rebekah',1,NULL,'Dear Rebekah',1,NULL,'Rebekah Müller',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (37,'Individual',NULL,'chowski.craig26@mymail.co.uk',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'chowski.craig26@mymail.co.uk',NULL,NULL,NULL,'
1
',NULL,'1157647853',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear chowski.craig26@mymail.co.uk',1,NULL,'Dear chowski.craig26@mymail.co.uk',1,NULL,'chowski.craig26@mymail.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (38,'Individual',NULL,'wagnerk94@fishmail.com',NULL,NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'wagnerk94@fishmail.com',NULL,NULL,NULL,'
1
',NULL,'1454011803',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear wagnerk94@fishmail.com',1,NULL,'Dear wagnerk94@fishmail.com',1,NULL,'wagnerk94@fishmail.com',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (39,'Individual',NULL,'Mr. Ray Samson',NULL,NULL,'Ray','C','Samson',0,0,0,0,0,0,NULL,'Samson, Ray',NULL,NULL,NULL,'
4
',NULL,'3926508474',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Ray',1,NULL,'Dear Ray',1,NULL,'Mr. Ray Samson',NULL,2,'1980-02-05',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (40,'Organization',NULL,'Global Development Academy','Global Development Academy',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Global Development Academy',NULL,NULL,NULL,NULL,NULL,'579548672',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Global Development Academy',NULL,NULL,NULL,0,NULL,NULL,146,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (41,'Household',NULL,'Jameson-Patel family',NULL,NULL,NULL,NULL,NULL,1,0,0,0,1,0,NULL,'Jameson-Patel family',NULL,NULL,NULL,NULL,NULL,'165393186',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Jameson-Patel family',5,NULL,'Dear Jameson-Patel family',2,NULL,'Jameson-Patel family',NULL,NULL,NULL,0,NULL,'Jameson-Patel family',NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (42,'Individual',NULL,'Ms. Jina Wattson',NULL,NULL,'Jina','X','Wattson',0,0,0,0,1,0,NULL,'Wattson, Jina',NULL,NULL,NULL,'
1
',NULL,'2709822648',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear Jina',1,NULL,'Dear Jina',1,NULL,'Ms. Jina Wattson',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (43,'Individual',NULL,'Jina Prentice',NULL,NULL,'Jina','R','Prentice',0,0,0,0,0,0,NULL,'Prentice, Jina',NULL,NULL,NULL,NULL,NULL,'3574120172',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Jina',1,NULL,'Dear Jina',1,NULL,'Jina Prentice',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (44,'Individual',NULL,'Irvin Jacobs',NULL,NULL,'Irvin','','Jacobs',0,0,0,0,0,0,NULL,'Jacobs, Irvin',NULL,NULL,NULL,NULL,NULL,'1475120479',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Irvin',1,NULL,'Dear Irvin',1,NULL,'Irvin Jacobs',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (45,'Individual',NULL,'Troy McReynolds',NULL,NULL,'Troy','','McReynolds',0,1,0,0,0,0,NULL,'McReynolds, Troy',NULL,NULL,NULL,'
2
',NULL,'2359789954',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Troy',1,NULL,'Dear Troy',1,NULL,'Troy McReynolds',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (46,'Household',NULL,'McReynolds family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'McReynolds family',NULL,NULL,NULL,NULL,NULL,'3032680972',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear McReynolds family',5,NULL,'Dear McReynolds family',2,NULL,'McReynolds family',NULL,NULL,NULL,0,NULL,'McReynolds family',NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (47,'Individual',NULL,'Valene Reynolds-Dimitrov',NULL,NULL,'Valene','V','Reynolds-Dimitrov',0,0,0,0,0,0,NULL,'Reynolds-Dimitrov, Valene',NULL,NULL,NULL,NULL,NULL,'1223287743',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Valene',1,NULL,'Dear Valene',1,NULL,'Valene Reynolds-Dimitrov',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (48,'Individual',NULL,'Margaret Wagner',NULL,NULL,'Margaret','','Wagner',0,1,0,0,0,0,NULL,'Wagner, Margaret',NULL,NULL,NULL,'
4
',NULL,'2539132666',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Margaret',1,NULL,'Dear Margaret',1,NULL,'Margaret Wagner',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (49,'Organization',NULL,'Toledo Technology Network','Toledo Technology Network',NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'Toledo Technology Network',NULL,NULL,NULL,'
5
',NULL,'1632686929',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Toledo Technology Network',NULL,NULL,NULL,0,NULL,NULL,158,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (50,'Individual',NULL,'Mrs. Justina González-Grant',NULL,NULL,'Justina','','González-Grant',0,1,0,0,0,0,NULL,'González-Grant, Justina',NULL,NULL,NULL,NULL,NULL,'1458338150',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Justina',1,NULL,'Dear Justina',1,NULL,'Mrs. Justina González-Grant',NULL,NULL,'1987-09-12',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (51,'Individual',NULL,'Dr. Junko Patel',NULL,NULL,'Junko','','Patel',0,1,0,0,0,0,NULL,'Patel, Junko',NULL,NULL,NULL,'
5
',NULL,'3770216305',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Junko',1,NULL,'Dear Junko',1,NULL,'Dr. Junko Patel',NULL,1,'2000-03-12',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (52,'Individual',NULL,'Dr. Winford Prentice Jr.','Mississippi Music Partnership',NULL,'Winford','','Prentice',1,0,0,0,0,0,NULL,'Prentice, Winford',NULL,NULL,NULL,NULL,NULL,'2762411160',NULL,'Sample Data',4,1,NULL,NULL,1,NULL,'Dear Winford',1,NULL,'Dear Winford',1,NULL,'Dr. Winford Prentice Jr.',NULL,2,'1959-09-18',0,NULL,NULL,NULL,NULL,NULL,121,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (53,'Individual',NULL,'Miguel Parker',NULL,NULL,'Miguel','','Parker',0,0,0,0,0,0,NULL,'Parker, Miguel',NULL,NULL,NULL,'
2
',NULL,'2567900778',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Miguel',1,NULL,'Dear Miguel',1,NULL,'Miguel Parker',NULL,2,'1987-11-12',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (54,'Individual',NULL,'Mr. Maxwell Patel',NULL,NULL,'Maxwell','B','Patel',0,1,0,0,1,0,NULL,'Patel, Maxwell',NULL,NULL,NULL,'
2
',NULL,'1864121617',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Maxwell',1,NULL,'Dear Maxwell',1,NULL,'Mr. Maxwell Patel',NULL,NULL,'1988-11-26',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (55,'Individual',NULL,'tobya11@mymail.biz',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'tobya11@mymail.biz',NULL,NULL,NULL,NULL,NULL,'785708970',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear tobya11@mymail.biz',1,NULL,'Dear tobya11@mymail.biz',1,NULL,'tobya11@mymail.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (56,'Individual',NULL,'Jay Olsen',NULL,NULL,'Jay','','Olsen',0,0,0,0,0,0,NULL,'Olsen, Jay',NULL,NULL,NULL,'
3
',NULL,'1945250723',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Jay',1,NULL,'Dear Jay',1,NULL,'Jay Olsen',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (57,'Individual',NULL,'Mr. Allan Parker Jr.',NULL,NULL,'Allan','','Parker',0,0,0,0,0,0,NULL,'Parker, Allan',NULL,NULL,NULL,NULL,NULL,'1311923270',NULL,'Sample Data',3,1,NULL,NULL,1,NULL,'Dear Allan',1,NULL,'Dear Allan',1,NULL,'Mr. Allan Parker Jr.',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (58,'Individual',NULL,'Maria Cruz',NULL,NULL,'Maria','K','Cruz',0,0,0,0,1,0,NULL,'Cruz, Maria',NULL,NULL,NULL,NULL,NULL,'2760046395',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Maria',1,NULL,'Dear Maria',1,NULL,'Maria Cruz',NULL,2,'1993-11-18',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (59,'Household',NULL,'Jacobs family',NULL,NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'Jacobs family',NULL,NULL,NULL,NULL,NULL,'1498986649',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Jacobs family',5,NULL,'Dear Jacobs family',2,NULL,'Jacobs family',NULL,NULL,NULL,0,NULL,'Jacobs family',NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (60,'Individual',NULL,'Dr. Scott Cruz','Sierra Legal Systems',NULL,'Scott','','Cruz',0,0,0,0,0,0,NULL,'Cruz, Scott',NULL,NULL,NULL,NULL,NULL,'1460973191',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Scott',1,NULL,'Dear Scott',1,NULL,'Dr. Scott Cruz',NULL,2,'1935-02-25',0,NULL,NULL,NULL,NULL,NULL,9,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (61,'Individual',NULL,'Dr. Toby Olsen Sr.',NULL,NULL,'Toby','','Olsen',0,0,0,0,0,0,NULL,'Olsen, Toby',NULL,NULL,NULL,NULL,NULL,'2803490896',NULL,'Sample Data',4,2,NULL,NULL,1,NULL,'Dear Toby',1,NULL,'Dear Toby',1,NULL,'Dr. Toby Olsen Sr.',NULL,NULL,'1973-11-17',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (62,'Individual',NULL,'Tanya Parker',NULL,NULL,'Tanya','','Parker',0,1,0,0,0,0,NULL,'Parker, Tanya',NULL,NULL,NULL,NULL,NULL,'91803087',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Tanya',1,NULL,'Dear Tanya',1,NULL,'Tanya Parker',NULL,1,'1999-12-15',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (63,'Individual',NULL,'Mr. Maria Jones',NULL,NULL,'Maria','','Jones',1,0,0,0,0,0,NULL,'Jones, Maria',NULL,NULL,NULL,NULL,NULL,'1814034949',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Maria',1,NULL,'Dear Maria',1,NULL,'Mr. Maria Jones',NULL,NULL,'1937-09-10',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (64,'Individual',NULL,'Mrs. Scarlet Barkley-Reynolds',NULL,NULL,'Scarlet','O','Barkley-Reynolds',0,0,0,0,0,0,NULL,'Barkley-Reynolds, Scarlet',NULL,NULL,NULL,'
4
',NULL,'2467351420',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Scarlet',1,NULL,'Dear Scarlet',1,NULL,'Mrs. Scarlet Barkley-Reynolds',NULL,1,'1991-06-18',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (65,'Individual',NULL,'Ms. Merrie Samson',NULL,NULL,'Merrie','','Samson',0,1,0,0,0,0,NULL,'Samson, Merrie',NULL,NULL,NULL,NULL,NULL,'2685466271',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear Merrie',1,NULL,'Dear Merrie',1,NULL,'Ms. Merrie Samson',NULL,1,'1952-05-27',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (66,'Individual',NULL,'deforest.jacob@mymail.info',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'deforest.jacob@mymail.info',NULL,NULL,NULL,NULL,NULL,'3371431716',NULL,'Sample Data',4,4,NULL,NULL,1,NULL,'Dear deforest.jacob@mymail.info',1,NULL,'Dear deforest.jacob@mymail.info',1,NULL,'deforest.jacob@mymail.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (67,'Individual',NULL,'Herminia Cruz',NULL,NULL,'Herminia','M','Cruz',0,0,0,0,0,0,NULL,'Cruz, Herminia',NULL,NULL,NULL,'
2
',NULL,'3479995875',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Herminia',1,NULL,'Dear Herminia',1,NULL,'Herminia Cruz',NULL,1,'1943-04-20',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (68,'Individual',NULL,'Mrs. Jina �ąchowski',NULL,NULL,'Jina','F','�ąchowski',0,0,0,0,1,0,NULL,'�ąchowski, Jina',NULL,NULL,NULL,'
3
',NULL,'4065988488',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Jina',1,NULL,'Dear Jina',1,NULL,'Mrs. Jina �ąchowski',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (69,'Organization',NULL,'Dowlen Empowerment Network','Dowlen Empowerment Network',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Dowlen Empowerment Network',NULL,NULL,NULL,NULL,NULL,'1598124399',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Dowlen Empowerment Network',NULL,NULL,NULL,0,NULL,NULL,155,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (70,'Individual',NULL,'Rolando Olsen',NULL,NULL,'Rolando','','Olsen',0,0,0,0,0,0,NULL,'Olsen, Rolando',NULL,NULL,NULL,'
1
',NULL,'2121296962',NULL,'Sample Data',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,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (71,'Individual',NULL,'Dr. Rolando Deforest',NULL,NULL,'Rolando','','Deforest',0,0,0,0,0,0,NULL,'Deforest, Rolando',NULL,NULL,NULL,NULL,NULL,'2111431300',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Rolando',1,NULL,'Dear Rolando',1,NULL,'Dr. Rolando Deforest',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (72,'Individual',NULL,'Winford Reynolds II',NULL,NULL,'Winford','','Reynolds',0,0,0,0,0,0,NULL,'Reynolds, Winford',NULL,NULL,NULL,NULL,NULL,'2721375834',NULL,'Sample Data',NULL,3,NULL,NULL,1,NULL,'Dear Winford',1,NULL,'Dear Winford',1,NULL,'Winford Reynolds II',NULL,2,'2001-07-31',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (73,'Individual',NULL,'Scarlet Dimitrov','Community Development Services',NULL,'Scarlet','E','Dimitrov',0,0,0,0,0,0,NULL,'Dimitrov, Scarlet',NULL,NULL,NULL,'
2
',NULL,'2143443543',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Scarlet',1,NULL,'Dear Scarlet',1,NULL,'Scarlet Dimitrov',NULL,1,'1954-01-03',0,NULL,NULL,NULL,NULL,NULL,174,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (74,'Individual',NULL,'terrella@testing.info','Urban Culture Fellowship',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'terrella@testing.info',NULL,NULL,NULL,'
1
',NULL,'786093458',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear terrella@testing.info',1,NULL,'Dear terrella@testing.info',1,NULL,'terrella@testing.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,144,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (75,'Individual',NULL,'Bob Jameson-Patel',NULL,NULL,'Bob','','Jameson-Patel',0,1,0,0,0,0,NULL,'Jameson-Patel, Bob',NULL,NULL,NULL,'
5
',NULL,'2741916997',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Bob',1,NULL,'Dear Bob',1,NULL,'Bob Jameson-Patel',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (76,'Individual',NULL,'Dr. Barry Lee Jr.',NULL,NULL,'Barry','','Lee',0,0,0,0,0,0,NULL,'Lee, Barry',NULL,NULL,NULL,NULL,NULL,'609109551',NULL,'Sample Data',4,1,NULL,NULL,1,NULL,'Dear Barry',1,NULL,'Dear Barry',1,NULL,'Dr. Barry Lee Jr.',NULL,2,'1949-12-05',1,'2024-04-06',NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (77,'Individual',NULL,'Shad Terrell',NULL,NULL,'Shad','I','Terrell',1,0,0,0,0,0,NULL,'Terrell, Shad',NULL,NULL,NULL,'
4
',NULL,'3876111966',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Shad',1,NULL,'Dear Shad',1,NULL,'Shad Terrell',NULL,2,'1996-06-12',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (78,'Individual',NULL,'olsen.brigette@notmail.co.in','Community Peace Solutions',NULL,NULL,NULL,NULL,0,0,0,0,1,0,NULL,'olsen.brigette@notmail.co.in',NULL,NULL,NULL,'
3
',NULL,'2774054750',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear olsen.brigette@notmail.co.in',1,NULL,'Dear olsen.brigette@notmail.co.in',1,NULL,'olsen.brigette@notmail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,17,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (79,'Individual',NULL,'Alexia Reynolds',NULL,NULL,'Alexia','K','Reynolds',0,0,0,0,0,0,NULL,'Reynolds, Alexia',NULL,NULL,NULL,NULL,NULL,'1389353396',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Alexia',1,NULL,'Dear Alexia',1,NULL,'Alexia Reynolds',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (80,'Household',NULL,'Olsen family',NULL,NULL,NULL,NULL,NULL,0,1,0,0,0,0,NULL,'Olsen family',NULL,NULL,NULL,'
1
',NULL,'1990073228',NULL,'Sample Data',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,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (81,'Individual',NULL,'Carylon Jameson',NULL,NULL,'Carylon','','Jameson',1,0,0,0,0,0,NULL,'Jameson, Carylon',NULL,NULL,NULL,NULL,NULL,'232914878',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Carylon',1,NULL,'Dear Carylon',1,NULL,'Carylon Jameson',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (82,'Individual',NULL,'Josefa McReynolds',NULL,NULL,'Josefa','','McReynolds',0,0,0,0,0,0,NULL,'McReynolds, Josefa',NULL,NULL,NULL,NULL,NULL,'2068135953',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Josefa',1,NULL,'Dear Josefa',1,NULL,'Josefa McReynolds',NULL,1,'1997-05-28',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (83,'Individual',NULL,'Errol Barkley Sr.','Sunland Park Action Fund',NULL,'Errol','','Barkley',0,0,0,0,1,0,NULL,'Barkley, Errol',NULL,NULL,NULL,NULL,NULL,'3627934252',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Errol',1,NULL,'Dear Errol',1,NULL,'Errol Barkley Sr.',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,184,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (84,'Organization',NULL,'El Camino Family School','El Camino Family School',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'El Camino Family School',NULL,NULL,NULL,'
2
',NULL,'2945176728',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'El Camino Family School',NULL,NULL,NULL,0,NULL,NULL,166,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (85,'Individual',NULL,'Mr. Norris Wattson',NULL,NULL,'Norris','R','Wattson',0,0,0,0,0,0,NULL,'Wattson, Norris',NULL,NULL,NULL,'
3
',NULL,'4180802164',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Mr. Norris Wattson',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (86,'Household',NULL,'Reynolds family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Reynolds family',NULL,NULL,NULL,NULL,NULL,'4119726021',NULL,'Sample Data',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,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (87,'Individual',NULL,'Dr. Brigette Samson',NULL,NULL,'Brigette','L','Samson',0,0,0,0,0,0,NULL,'Samson, Brigette',NULL,NULL,NULL,'
4
',NULL,'2016376463',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Dr. Brigette Samson',NULL,1,'1997-08-12',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (88,'Individual',NULL,'Bob Jacobs',NULL,NULL,'Bob','O','Jacobs',1,0,0,0,1,0,NULL,'Jacobs, Bob',NULL,NULL,NULL,'
2
',NULL,'171700629',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Bob',1,NULL,'Dear Bob',1,NULL,'Bob Jacobs',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (89,'Individual',NULL,'Ray Dimitrov Sr.',NULL,NULL,'Ray','G','Dimitrov',0,1,0,0,0,0,NULL,'Dimitrov, Ray',NULL,NULL,NULL,NULL,NULL,'213044700',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Ray',1,NULL,'Dear Ray',1,NULL,'Ray Dimitrov Sr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (90,'Organization',NULL,'Global Poetry Alliance','Global Poetry Alliance',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Global Poetry Alliance',NULL,NULL,NULL,NULL,NULL,'1479131401',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Global Poetry Alliance',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (91,'Individual',NULL,'Maria Roberts Sr.',NULL,NULL,'Maria','','Roberts',0,0,0,0,0,0,NULL,'Roberts, Maria',NULL,NULL,NULL,'
4
',NULL,'1395427104',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Maria',1,NULL,'Dear Maria',1,NULL,'Maria Roberts Sr.',NULL,2,'2016-12-11',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (92,'Individual',NULL,'Dr. Elbert González Jr.',NULL,NULL,'Elbert','','González',0,0,0,0,1,0,NULL,'González, Elbert',NULL,NULL,NULL,'
2
',NULL,'672613238',NULL,'Sample Data',4,1,NULL,NULL,1,NULL,'Dear Elbert',1,NULL,'Dear Elbert',1,NULL,'Dr. Elbert González Jr.',NULL,2,'1972-05-05',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (93,'Individual',NULL,'Josefa Zope',NULL,NULL,'Josefa','Z','Zope',0,0,0,0,0,0,NULL,'Zope, Josefa',NULL,NULL,NULL,NULL,NULL,'1682525130',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Josefa',1,NULL,'Dear Josefa',1,NULL,'Josefa Zope',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (94,'Individual',NULL,'Delana Terry',NULL,NULL,'Delana','B','Terry',0,0,0,0,0,0,NULL,'Terry, Delana',NULL,NULL,NULL,NULL,NULL,'588631021',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Delana',1,NULL,'Dear Delana',1,NULL,'Delana Terry',NULL,NULL,'1952-05-05',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (95,'Individual',NULL,'Bryon Barkley Jr.',NULL,NULL,'Bryon','G','Barkley',0,0,0,0,0,0,NULL,'Barkley, Bryon',NULL,NULL,NULL,'
3
',NULL,'2286334193',NULL,'Sample Data',NULL,1,NULL,NULL,1,NULL,'Dear Bryon',1,NULL,'Dear Bryon',1,NULL,'Bryon Barkley Jr.',NULL,2,'1937-07-07',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (96,'Individual',NULL,'Dr. Kandace Terry',NULL,NULL,'Kandace','B','Terry',0,0,0,0,0,0,NULL,'Terry, Kandace',NULL,NULL,NULL,'
2
',NULL,'686769478',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Kandace',1,NULL,'Dear Kandace',1,NULL,'Dr. Kandace Terry',NULL,1,'1983-10-25',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (97,'Individual',NULL,'Margaret Parker-Roberts',NULL,NULL,'Margaret','M','Parker-Roberts',0,1,0,0,0,0,NULL,'Parker-Roberts, Margaret',NULL,NULL,NULL,NULL,NULL,'3621696856',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Margaret',1,NULL,'Dear Margaret',1,NULL,'Margaret Parker-Roberts',NULL,1,'1978-09-06',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (98,'Household',NULL,'Parker family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Parker family',NULL,NULL,NULL,'
5
',NULL,'425242179',NULL,'Sample Data',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,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (99,'Individual',NULL,'wilson.ashley64@testing.net',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'wilson.ashley64@testing.net',NULL,NULL,NULL,NULL,NULL,'749972313',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear wilson.ashley64@testing.net',1,NULL,'Dear wilson.ashley64@testing.net',1,NULL,'wilson.ashley64@testing.net',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (100,'Individual',NULL,'Truman Roberts',NULL,NULL,'Truman','Q','Roberts',0,0,0,0,0,0,NULL,'Roberts, Truman',NULL,NULL,NULL,'
2
',NULL,'3664937465',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Truman',1,NULL,'Dear Truman',1,NULL,'Truman Roberts',NULL,2,'1970-05-22',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (101,'Individual',NULL,'Sonny Patel',NULL,NULL,'Sonny','T','Patel',0,0,0,0,0,0,NULL,'Patel, Sonny',NULL,NULL,NULL,NULL,NULL,'995093613',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Sonny',1,NULL,'Dear Sonny',1,NULL,'Sonny Patel',NULL,NULL,'1966-05-28',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (102,'Household',NULL,'Barkley-Grant family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Barkley-Grant family',NULL,NULL,NULL,'
5
',NULL,'2724040510',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Barkley-Grant family',5,NULL,'Dear Barkley-Grant family',2,NULL,'Barkley-Grant family',NULL,NULL,NULL,0,NULL,'Barkley-Grant family',NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (103,'Individual',NULL,'Shad Samuels-Samson III',NULL,NULL,'Shad','J','Samuels-Samson',0,1,0,0,0,0,NULL,'Samuels-Samson, Shad',NULL,NULL,NULL,'
3
',NULL,'2532964502',NULL,'Sample Data',NULL,4,NULL,NULL,1,NULL,'Dear Shad',1,NULL,'Dear Shad',1,NULL,'Shad Samuels-Samson III',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (104,'Individual',NULL,'Dr. Andrew Dimitrov-McReynolds',NULL,NULL,'Andrew','B','Dimitrov-McReynolds',1,0,0,0,0,0,NULL,'Dimitrov-McReynolds, Andrew',NULL,NULL,NULL,NULL,NULL,'605921910',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Andrew',1,NULL,'Dear Andrew',1,NULL,'Dr. Andrew Dimitrov-McReynolds',NULL,NULL,'1984-09-09',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (105,'Individual',NULL,'Erik González',NULL,NULL,'Erik','','González',1,1,0,0,0,0,NULL,'González, Erik',NULL,NULL,NULL,NULL,NULL,'1456610806',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Erik',1,NULL,'Dear Erik',1,NULL,'Erik González',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (106,'Individual',NULL,'Lashawnda Roberts',NULL,NULL,'Lashawnda','','Roberts',0,1,0,0,1,0,NULL,'Roberts, Lashawnda',NULL,NULL,NULL,NULL,NULL,'1535794167',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Lashawnda',1,NULL,'Dear Lashawnda',1,NULL,'Lashawnda Roberts',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (107,'Individual',NULL,'samuelsr@example.biz',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'samuelsr@example.biz',NULL,NULL,NULL,NULL,NULL,'1720340811',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear samuelsr@example.biz',1,NULL,'Dear samuelsr@example.biz',1,NULL,'samuelsr@example.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (108,'Individual',NULL,'Iris Wagner','Texas Culture Solutions',NULL,'Iris','','Wagner',0,1,0,0,0,0,NULL,'Wagner, Iris',NULL,NULL,NULL,'
3
',NULL,'2617223006',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Iris',1,NULL,'Dear Iris',1,NULL,'Iris Wagner',NULL,NULL,'1993-12-28',0,NULL,NULL,NULL,NULL,NULL,193,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (109,'Individual',NULL,'Scarlet Terry-Patel',NULL,NULL,'Scarlet','','Terry-Patel',0,0,0,0,0,0,NULL,'Terry-Patel, Scarlet',NULL,NULL,NULL,NULL,NULL,'2554143572',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Scarlet',1,NULL,'Dear Scarlet',1,NULL,'Scarlet Terry-Patel',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (110,'Individual',NULL,'mcreynolds.d.brent@sample.net',NULL,NULL,NULL,NULL,NULL,0,1,0,0,0,0,NULL,'mcreynolds.d.brent@sample.net',NULL,NULL,NULL,'
5
',NULL,'1779226976',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear mcreynolds.d.brent@sample.net',1,NULL,'Dear mcreynolds.d.brent@sample.net',1,NULL,'mcreynolds.d.brent@sample.net',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (111,'Individual',NULL,'Junko Prentice',NULL,NULL,'Junko','','Prentice',0,0,0,0,1,0,NULL,'Prentice, Junko',NULL,NULL,NULL,NULL,NULL,'1179006212',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Junko',1,NULL,'Dear Junko',1,NULL,'Junko Prentice',NULL,NULL,'1970-04-15',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (112,'Individual',NULL,'sdimitrov@testing.biz',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'sdimitrov@testing.biz',NULL,NULL,NULL,'
5
',NULL,'98992964',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear sdimitrov@testing.biz',1,NULL,'Dear sdimitrov@testing.biz',1,NULL,'sdimitrov@testing.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (113,'Individual',NULL,'Justina Jacobs',NULL,NULL,'Justina','','Jacobs',0,1,0,0,0,0,NULL,'Jacobs, Justina',NULL,NULL,NULL,'
3
',NULL,'1829359712',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Justina',1,NULL,'Dear Justina',1,NULL,'Justina Jacobs',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (114,'Individual',NULL,'Billy Müller',NULL,NULL,'Billy','','Müller',0,0,0,0,0,0,NULL,'Müller, Billy',NULL,NULL,NULL,NULL,NULL,'1431681652',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Billy',1,NULL,'Dear Billy',1,NULL,'Billy Müller',NULL,NULL,'1967-07-06',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (115,'Individual',NULL,'Shad Adams',NULL,NULL,'Shad','Q','Adams',0,0,0,0,0,0,NULL,'Adams, Shad',NULL,NULL,NULL,'
5
',NULL,'1641092808',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Shad',1,NULL,'Dear Shad',1,NULL,'Shad Adams',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (116,'Individual',NULL,'Ray Cruz',NULL,NULL,'Ray','','Cruz',0,0,0,0,1,0,NULL,'Cruz, Ray',NULL,NULL,NULL,NULL,NULL,'1703831601',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Ray',1,NULL,'Dear Ray',1,NULL,'Ray Cruz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (117,'Individual',NULL,'samson.eleonor@fishmail.co.in',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'samson.eleonor@fishmail.co.in',NULL,NULL,NULL,NULL,NULL,'42884516',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear samson.eleonor@fishmail.co.in',1,NULL,'Dear samson.eleonor@fishmail.co.in',1,NULL,'samson.eleonor@fishmail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (118,'Individual',NULL,'Damaris González',NULL,NULL,'Damaris','I','González',0,0,0,0,0,0,NULL,'González, Damaris',NULL,NULL,NULL,'
5
',NULL,'1257732273',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Damaris',1,NULL,'Dear Damaris',1,NULL,'Damaris González',NULL,NULL,'1987-08-31',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (119,'Individual',NULL,'Arlyne McReynolds',NULL,NULL,'Arlyne','','McReynolds',0,0,0,0,1,0,NULL,'McReynolds, Arlyne',NULL,NULL,NULL,'
3
',NULL,'1526771757',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Arlyne',1,NULL,'Dear Arlyne',1,NULL,'Arlyne McReynolds',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (120,'Individual',NULL,'Norris Samuels-McReynolds II',NULL,NULL,'Norris','','Samuels-McReynolds',0,1,0,0,0,0,NULL,'Samuels-McReynolds, Norris',NULL,NULL,NULL,'
5
',NULL,'2624098484',NULL,'Sample Data',NULL,3,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Norris Samuels-McReynolds II',NULL,2,'2004-09-24',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (121,'Organization',NULL,'Mississippi Music Partnership','Mississippi Music Partnership',NULL,NULL,NULL,NULL,0,0,0,0,1,0,NULL,'Mississippi Music Partnership',NULL,NULL,NULL,NULL,NULL,'2704621655',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Mississippi Music Partnership',NULL,NULL,NULL,0,NULL,NULL,52,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (122,'Individual',NULL,'Megan Reynolds',NULL,NULL,'Megan','X','Reynolds',0,0,0,0,0,0,NULL,'Reynolds, Megan',NULL,NULL,NULL,NULL,NULL,'373930154',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Megan',1,NULL,'Dear Megan',1,NULL,'Megan Reynolds',NULL,1,'1982-04-22',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (123,'Individual',NULL,'Ms. Delana Bachman',NULL,NULL,'Delana','','Bachman',0,0,0,0,0,0,NULL,'Bachman, Delana',NULL,NULL,NULL,'
5
',NULL,'1435428348',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear Delana',1,NULL,'Dear Delana',1,NULL,'Ms. Delana Bachman',NULL,1,'1949-12-04',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (124,'Organization',NULL,'Saint Paul Culture School','Saint Paul Culture School',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Saint Paul Culture School',NULL,NULL,NULL,NULL,NULL,'2898624530',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Saint Paul Culture School',NULL,NULL,NULL,0,NULL,NULL,163,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (125,'Individual',NULL,'Rolando Bachman',NULL,NULL,'Rolando','S','Bachman',0,1,0,0,0,0,NULL,'Bachman, Rolando',NULL,NULL,NULL,NULL,NULL,'1672731969',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Rolando',1,NULL,'Dear Rolando',1,NULL,'Rolando Bachman',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (126,'Individual',NULL,'mcreynoldsr@airmail.co.in',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'mcreynoldsr@airmail.co.in',NULL,NULL,NULL,NULL,NULL,'479880284',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear mcreynoldsr@airmail.co.in',1,NULL,'Dear mcreynoldsr@airmail.co.in',1,NULL,'mcreynoldsr@airmail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (127,'Individual',NULL,'Dr. Rolando Terrell',NULL,NULL,'Rolando','S','Terrell',1,0,0,0,0,0,NULL,'Terrell, Rolando',NULL,NULL,NULL,'
4
',NULL,'3773897082',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Rolando',1,NULL,'Dear Rolando',1,NULL,'Dr. Rolando Terrell',NULL,2,'1999-11-24',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (128,'Individual',NULL,'Mrs. Ashley Blackwell',NULL,NULL,'Ashley','','Blackwell',0,0,0,0,1,0,NULL,'Blackwell, Ashley',NULL,NULL,NULL,'
1
',NULL,'2843113739',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Ashley',1,NULL,'Dear Ashley',1,NULL,'Mrs. Ashley Blackwell',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (129,'Organization',NULL,'Global Wellness Partners','Global Wellness Partners',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Global Wellness Partners',NULL,NULL,NULL,NULL,NULL,'1902330600',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Global Wellness Partners',NULL,NULL,NULL,0,NULL,NULL,138,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (130,'Organization',NULL,'Second Legal Partnership','Second Legal Partnership',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Second Legal Partnership',NULL,NULL,NULL,'
2
',NULL,'661847778',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Second Legal Partnership',NULL,NULL,NULL,0,NULL,NULL,34,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (131,'Individual',NULL,'jacobroberts@spamalot.com',NULL,NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'jacobroberts@spamalot.com',NULL,NULL,NULL,NULL,NULL,'2559460925',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear jacobroberts@spamalot.com',1,NULL,'Dear jacobroberts@spamalot.com',1,NULL,'jacobroberts@spamalot.com',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (132,'Household',NULL,'Adams-Deforest family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Adams-Deforest family',NULL,NULL,NULL,NULL,NULL,'3716633876',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Adams-Deforest family',5,NULL,'Dear Adams-Deforest family',2,NULL,'Adams-Deforest family',NULL,NULL,NULL,0,NULL,'Adams-Deforest family',NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (133,'Individual',NULL,'Ms. Arlyne Grant',NULL,NULL,'Arlyne','L','Grant',0,0,0,0,0,0,NULL,'Grant, Arlyne',NULL,NULL,NULL,'
4
',NULL,'1053085057',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear Arlyne',1,NULL,'Dear Arlyne',1,NULL,'Ms. Arlyne Grant',NULL,1,'1983-11-23',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (134,'Individual',NULL,'Mr. Lou Cruz',NULL,NULL,'Lou','','Cruz',1,0,0,0,1,0,NULL,'Cruz, Lou',NULL,NULL,NULL,NULL,NULL,'3825436654',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Lou',1,NULL,'Dear Lou',1,NULL,'Mr. Lou Cruz',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (135,'Organization',NULL,'Greensboro Health Partnership','Greensboro Health Partnership',NULL,NULL,NULL,NULL,0,1,0,0,0,0,NULL,'Greensboro Health Partnership',NULL,NULL,NULL,NULL,NULL,'1263263394',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Greensboro Health Partnership',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (136,'Individual',NULL,'Dr. Maxwell Samuels Jr.',NULL,NULL,'Maxwell','F','Samuels',0,1,0,0,0,0,NULL,'Samuels, Maxwell',NULL,NULL,NULL,NULL,NULL,'445599950',NULL,'Sample Data',4,1,NULL,NULL,1,NULL,'Dear Maxwell',1,NULL,'Dear Maxwell',1,NULL,'Dr. Maxwell Samuels Jr.',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (137,'Household',NULL,'Parker family',NULL,NULL,NULL,NULL,NULL,0,1,0,0,0,0,NULL,'Parker family',NULL,NULL,NULL,NULL,NULL,'425242179',NULL,'Sample Data',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,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (138,'Individual',NULL,'Mrs. Laree Terry','Global Wellness Partners',NULL,'Laree','','Terry',0,0,0,0,0,0,NULL,'Terry, Laree',NULL,NULL,NULL,'
2
',NULL,'2580704464',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Laree',1,NULL,'Dear Laree',1,NULL,'Mrs. Laree Terry',NULL,NULL,'1966-01-07',0,NULL,NULL,NULL,NULL,NULL,129,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (139,'Individual',NULL,'kathleenterry-mcreynolds@fakemail.co.in',NULL,NULL,NULL,NULL,NULL,0,0,0,0,1,0,NULL,'kathleenterry-mcreynolds@fakemail.co.in',NULL,NULL,NULL,'
2
',NULL,'964626417',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear kathleenterry-mcreynolds@fakemail.co.in',1,NULL,'Dear kathleenterry-mcreynolds@fakemail.co.in',1,NULL,'kathleenterry-mcreynolds@fakemail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (140,'Individual',NULL,'ih.reynolds-dimitrov84@fishmail.info',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'ih.reynolds-dimitrov84@fishmail.info',NULL,NULL,NULL,'
5
',NULL,'136872972',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear ih.reynolds-dimitrov84@fishmail.info',1,NULL,'Dear ih.reynolds-dimitrov84@fishmail.info',1,NULL,'ih.reynolds-dimitrov84@fishmail.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (141,'Household',NULL,'Patel family',NULL,NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'Patel family',NULL,NULL,NULL,'
4
',NULL,'1669281794',NULL,'Sample Data',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,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (142,'Individual',NULL,'kprentice@sample.org',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'kprentice@sample.org',NULL,NULL,NULL,NULL,NULL,'1372542916',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear kprentice@sample.org',1,NULL,'Dear kprentice@sample.org',1,NULL,'kprentice@sample.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (143,'Individual',NULL,'Mr. Norris Müller',NULL,NULL,'Norris','','Müller',1,1,0,0,0,0,NULL,'Müller, Norris',NULL,NULL,NULL,'
3
',NULL,'1477289672',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Mr. Norris Müller',NULL,2,'1937-09-23',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (144,'Organization',NULL,'Urban Culture Fellowship','Urban Culture Fellowship',NULL,NULL,NULL,NULL,0,0,0,0,1,0,NULL,'Urban Culture Fellowship',NULL,NULL,NULL,NULL,NULL,'250204628',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Urban Culture Fellowship',NULL,NULL,NULL,0,NULL,NULL,74,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (145,'Individual',NULL,'grantj@example.co.in',NULL,NULL,NULL,NULL,NULL,0,1,0,0,0,0,NULL,'grantj@example.co.in',NULL,NULL,NULL,NULL,NULL,'508542910',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear grantj@example.co.in',1,NULL,'Dear grantj@example.co.in',1,NULL,'grantj@example.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (146,'Individual',NULL,'Bob Jacobs III','Global Development Academy',NULL,'Bob','','Jacobs',0,0,0,0,0,0,NULL,'Jacobs, Bob',NULL,NULL,NULL,NULL,NULL,'171700629',NULL,'Sample Data',NULL,4,NULL,NULL,1,NULL,'Dear Bob',1,NULL,'Dear Bob',1,NULL,'Bob Jacobs III',NULL,2,'1996-03-27',0,NULL,NULL,NULL,NULL,NULL,40,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (147,'Individual',NULL,'Dr. Valene Dimitrov',NULL,NULL,'Valene','','Dimitrov',0,0,0,0,1,0,NULL,'Dimitrov, Valene',NULL,NULL,NULL,NULL,NULL,'1409634663',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Valene',1,NULL,'Dear Valene',1,NULL,'Dr. Valene Dimitrov',NULL,NULL,'1956-11-26',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (148,'Individual',NULL,'Dr. Sonny González Jr.',NULL,NULL,'Sonny','C','González',0,0,0,0,1,0,NULL,'González, Sonny',NULL,NULL,NULL,NULL,NULL,'2595794049',NULL,'Sample Data',4,1,NULL,NULL,1,NULL,'Dear Sonny',1,NULL,'Dear Sonny',1,NULL,'Dr. Sonny González Jr.',NULL,NULL,'1996-03-31',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (149,'Individual',NULL,'Beula González-Wagner',NULL,NULL,'Beula','','González-Wagner',1,0,0,0,0,0,NULL,'González-Wagner, Beula',NULL,NULL,NULL,NULL,NULL,'1749186655',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Beula',1,NULL,'Dear Beula',1,NULL,'Beula González-Wagner',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (150,'Individual',NULL,'Beula Grant',NULL,NULL,'Beula','F','Grant',1,0,0,0,0,0,NULL,'Grant, Beula',NULL,NULL,NULL,NULL,NULL,'2604882984',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Beula',1,NULL,'Dear Beula',1,NULL,'Beula Grant',NULL,1,'1988-02-01',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (151,'Individual',NULL,'Sanford Parker',NULL,NULL,'Sanford','B','Parker',0,0,0,0,1,0,NULL,'Parker, Sanford',NULL,NULL,NULL,'
1
',NULL,'2029750387',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Sanford',1,NULL,'Dear Sanford',1,NULL,'Sanford Parker',NULL,NULL,'2008-09-21',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (152,'Household',NULL,'Samuels-McReynolds family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Samuels-McReynolds family',NULL,NULL,NULL,'
1
',NULL,'1078001120',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Samuels-McReynolds family',5,NULL,'Dear Samuels-McReynolds family',2,NULL,'Samuels-McReynolds family',NULL,NULL,NULL,0,NULL,'Samuels-McReynolds family',NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (153,'Individual',NULL,'Scott Parker Sr.',NULL,NULL,'Scott','','Parker',0,1,0,0,0,0,NULL,'Parker, Scott',NULL,NULL,NULL,NULL,NULL,'3303025093',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Scott',1,NULL,'Dear Scott',1,NULL,'Scott Parker Sr.',NULL,2,'1996-01-27',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (154,'Individual',NULL,'Landon Müller',NULL,NULL,'Landon','','Müller',0,0,0,0,0,0,NULL,'Müller, Landon',NULL,NULL,NULL,'
3
',NULL,'2647475480',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Landon',1,NULL,'Dear Landon',1,NULL,'Landon Müller',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (155,'Individual',NULL,'Mr. Rolando Samson','Dowlen Empowerment Network',NULL,'Rolando','','Samson',1,0,0,0,1,0,NULL,'Samson, Rolando',NULL,NULL,NULL,NULL,NULL,'3728356464',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Rolando',1,NULL,'Dear Rolando',1,NULL,'Mr. Rolando Samson',NULL,2,'2000-12-31',0,NULL,NULL,NULL,NULL,NULL,69,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (156,'Individual',NULL,'Tanya Terrell',NULL,NULL,'Tanya','','Terrell',1,0,0,0,1,0,NULL,'Terrell, Tanya',NULL,NULL,NULL,NULL,NULL,'1604022989',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Tanya',1,NULL,'Dear Tanya',1,NULL,'Tanya Terrell',NULL,NULL,'1990-02-12',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (157,'Individual',NULL,'Brent Samson',NULL,NULL,'Brent','','Samson',0,0,0,0,0,0,NULL,'Samson, Brent',NULL,NULL,NULL,NULL,NULL,'3338201893',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Brent',1,NULL,'Dear Brent',1,NULL,'Brent Samson',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (158,'Individual',NULL,'Dr. Juliann Zope','Toledo Technology Network',NULL,'Juliann','','Zope',0,1,0,0,0,0,NULL,'Zope, Juliann',NULL,NULL,NULL,NULL,NULL,'2334217579',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Juliann',1,NULL,'Dear Juliann',1,NULL,'Dr. Juliann Zope',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,49,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (159,'Individual',NULL,'terrya13@testing.co.in',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'terrya13@testing.co.in',NULL,NULL,NULL,NULL,NULL,'2064701131',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear terrya13@testing.co.in',1,NULL,'Dear terrya13@testing.co.in',1,NULL,'terrya13@testing.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (160,'Individual',NULL,'Sanford Jameson Sr.',NULL,NULL,'Sanford','F','Jameson',1,1,0,0,0,0,NULL,'Jameson, Sanford',NULL,NULL,NULL,NULL,NULL,'3668600161',NULL,'Sample Data',NULL,2,NULL,NULL,1,NULL,'Dear Sanford',1,NULL,'Dear Sanford',1,NULL,'Sanford Jameson Sr.',NULL,2,'1982-02-14',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (161,'Household',NULL,'Roberts family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,1,0,NULL,'Roberts family',NULL,NULL,NULL,NULL,NULL,'2097305882',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Roberts family',5,NULL,'Dear Roberts family',2,NULL,'Roberts family',NULL,NULL,NULL,0,NULL,'Roberts family',NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (162,'Household',NULL,'Terrell family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,1,0,NULL,'Terrell family',NULL,NULL,NULL,NULL,NULL,'1136333121',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Terrell family',5,NULL,'Dear Terrell family',2,NULL,'Terrell family',NULL,NULL,NULL,0,NULL,'Terrell family',NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (163,'Individual',NULL,'Bernadette McReynolds','Saint Paul Culture School',NULL,'Bernadette','','McReynolds',0,1,0,0,1,0,NULL,'McReynolds, Bernadette',NULL,NULL,NULL,NULL,NULL,'1201192588',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Bernadette',1,NULL,'Dear Bernadette',1,NULL,'Bernadette McReynolds',NULL,1,'1971-08-20',0,NULL,NULL,NULL,NULL,NULL,124,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (164,'Individual',NULL,'Andrew Samuels-McReynolds II',NULL,NULL,'Andrew','B','Samuels-McReynolds',1,0,0,0,0,0,NULL,'Samuels-McReynolds, Andrew',NULL,NULL,NULL,NULL,NULL,'2398390407',NULL,'Sample Data',NULL,3,NULL,NULL,1,NULL,'Dear Andrew',1,NULL,'Dear Andrew',1,NULL,'Andrew Samuels-McReynolds II',NULL,2,'2010-10-02',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (165,'Individual',NULL,'Jed Samuels III',NULL,NULL,'Jed','B','Samuels',0,0,0,0,0,0,NULL,'Samuels, Jed',NULL,NULL,NULL,NULL,NULL,'3988235934',NULL,'Sample Data',NULL,4,NULL,NULL,1,NULL,'Dear Jed',1,NULL,'Dear Jed',1,NULL,'Jed Samuels III',NULL,2,'1968-12-14',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (166,'Individual',NULL,'santinadimitrov@fakemail.co.nz','El Camino Family School',NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'santinadimitrov@fakemail.co.nz',NULL,NULL,NULL,'
5
',NULL,'51632527',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear santinadimitrov@fakemail.co.nz',1,NULL,'Dear santinadimitrov@fakemail.co.nz',1,NULL,'santinadimitrov@fakemail.co.nz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,84,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (167,'Individual',NULL,'Mrs. Damaris González',NULL,NULL,'Damaris','A','González',0,0,0,0,0,0,NULL,'González, Damaris',NULL,NULL,NULL,'
4
',NULL,'1257732273',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Damaris',1,NULL,'Dear Damaris',1,NULL,'Mrs. Damaris González',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (168,'Individual',NULL,'dr.barkley-grant@sample.co.in',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'dr.barkley-grant@sample.co.in',NULL,NULL,NULL,NULL,NULL,'3381634190',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear dr.barkley-grant@sample.co.in',1,NULL,'Dear dr.barkley-grant@sample.co.in',1,NULL,'dr.barkley-grant@sample.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (169,'Organization',NULL,'Pocono Summit Legal Trust','Pocono Summit Legal Trust',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Pocono Summit Legal Trust',NULL,NULL,NULL,NULL,NULL,'2993431405',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Pocono Summit Legal Trust',NULL,NULL,NULL,0,NULL,NULL,32,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (170,'Household',NULL,'Wagner family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Wagner family',NULL,NULL,NULL,'
3
',NULL,'1570966486',NULL,'Sample Data',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,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (171,'Individual',NULL,'Carlos �ąchowski III',NULL,NULL,'Carlos','L','�ąchowski',0,0,0,0,0,0,NULL,'�ąchowski, Carlos',NULL,NULL,NULL,NULL,NULL,'205380068',NULL,'Sample Data',NULL,4,NULL,NULL,1,NULL,'Dear Carlos',1,NULL,'Dear Carlos',1,NULL,'Carlos �ąchowski III',NULL,2,'1974-06-26',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (172,'Individual',NULL,'Elina McReynolds',NULL,NULL,'Elina','N','McReynolds',0,0,0,0,1,0,NULL,'McReynolds, Elina',NULL,NULL,NULL,'
1
',NULL,'130391420',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Elina',1,NULL,'Dear Elina',1,NULL,'Elina McReynolds',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (173,'Individual',NULL,'parker.arlyne63@fishmail.co.in',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'parker.arlyne63@fishmail.co.in',NULL,NULL,NULL,'
2
',NULL,'4057497131',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear parker.arlyne63@fishmail.co.in',1,NULL,'Dear parker.arlyne63@fishmail.co.in',1,NULL,'parker.arlyne63@fishmail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (174,'Organization',NULL,'Community Development Services','Community Development Services',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Community Development Services',NULL,NULL,NULL,'
5
',NULL,'2020178751',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Community Development Services',NULL,NULL,NULL,0,NULL,NULL,73,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (175,'Individual',NULL,'lashawndaadams-deforest@example.net',NULL,NULL,NULL,NULL,NULL,1,0,0,0,0,0,NULL,'lashawndaadams-deforest@example.net',NULL,NULL,NULL,NULL,NULL,'1961807407',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear lashawndaadams-deforest@example.net',1,NULL,'Dear lashawndaadams-deforest@example.net',1,NULL,'lashawndaadams-deforest@example.net',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (176,'Individual',NULL,'Juliann Olsen',NULL,NULL,'Juliann','','Olsen',1,1,0,0,0,0,NULL,'Olsen, Juliann',NULL,NULL,NULL,NULL,NULL,'3406571736',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Juliann',1,NULL,'Dear Juliann',1,NULL,'Juliann Olsen',NULL,1,'1994-12-27',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (177,'Individual',NULL,'Mrs. Elizabeth Wilson',NULL,NULL,'Elizabeth','','Wilson',1,0,0,0,1,0,NULL,'Wilson, Elizabeth',NULL,NULL,NULL,NULL,NULL,'690212617',NULL,'Sample Data',1,NULL,NULL,NULL,1,NULL,'Dear Elizabeth',1,NULL,'Dear Elizabeth',1,NULL,'Mrs. Elizabeth Wilson',NULL,NULL,'1950-02-28',1,'2023-05-17',NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (178,'Household',NULL,'Samuels-Samson family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Samuels-Samson family',NULL,NULL,NULL,'
4
',NULL,'3598035709',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear Samuels-Samson family',5,NULL,'Dear Samuels-Samson family',2,NULL,'Samuels-Samson family',NULL,NULL,NULL,0,NULL,'Samuels-Samson family',NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (179,'Individual',NULL,'Ms. Alexia Jacobs',NULL,NULL,'Alexia','O','Jacobs',0,0,0,0,0,0,NULL,'Jacobs, Alexia',NULL,NULL,NULL,'
4
',NULL,'817763028',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear Alexia',1,NULL,'Dear Alexia',1,NULL,'Ms. Alexia Jacobs',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (180,'Individual',NULL,'Sonny Samuels',NULL,NULL,'Sonny','P','Samuels',1,0,0,0,0,0,NULL,'Samuels, Sonny',NULL,NULL,NULL,'
4
',NULL,'1288913393',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Sonny',1,NULL,'Dear Sonny',1,NULL,'Sonny Samuels',NULL,2,'1972-05-29',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (181,'Individual',NULL,'Shauna Adams-Deforest',NULL,NULL,'Shauna','','Adams-Deforest',0,0,0,0,0,0,NULL,'Adams-Deforest, Shauna',NULL,NULL,NULL,NULL,NULL,'3495339319',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Shauna',1,NULL,'Dear Shauna',1,NULL,'Shauna Adams-Deforest',NULL,1,'2007-12-26',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (182,'Individual',NULL,'Santina Olsen',NULL,NULL,'Santina','','Olsen',0,0,0,0,0,0,NULL,'Olsen, Santina',NULL,NULL,NULL,NULL,NULL,'3876725059',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Santina',1,NULL,'Dear Santina',1,NULL,'Santina Olsen',NULL,1,'1962-10-03',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (183,'Individual',NULL,'Mr. Maxwell Reynolds Sr.',NULL,NULL,'Maxwell','','Reynolds',0,0,0,0,0,0,NULL,'Reynolds, Maxwell',NULL,NULL,NULL,'
1
',NULL,'1572980564',NULL,'Sample Data',3,2,NULL,NULL,1,NULL,'Dear Maxwell',1,NULL,'Dear Maxwell',1,NULL,'Mr. Maxwell Reynolds Sr.',NULL,NULL,'1982-11-28',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (184,'Organization',NULL,'Sunland Park Action Fund','Sunland Park Action Fund',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Sunland Park Action Fund',NULL,NULL,NULL,NULL,NULL,'3225878681',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Sunland Park Action Fund',NULL,NULL,NULL,0,NULL,NULL,83,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (185,'Individual',NULL,'Winford McReynolds III',NULL,NULL,'Winford','Z','McReynolds',0,0,0,0,1,0,NULL,'McReynolds, Winford',NULL,NULL,NULL,NULL,NULL,'3334322093',NULL,'Sample Data',NULL,4,NULL,NULL,1,NULL,'Dear Winford',1,NULL,'Dear Winford',1,NULL,'Winford McReynolds III',NULL,2,'2013-06-30',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (186,'Individual',NULL,'Kenny González II','Northpoint Music Systems',NULL,'Kenny','','González',0,0,0,0,0,0,NULL,'González, Kenny',NULL,NULL,NULL,'
2
',NULL,'2778042534',NULL,'Sample Data',NULL,3,NULL,NULL,1,NULL,'Dear Kenny',1,NULL,'Dear Kenny',1,NULL,'Kenny González II',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,192,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (187,'Individual',NULL,'Mr. Jay Prentice',NULL,NULL,'Jay','','Prentice',0,0,0,0,0,0,NULL,'Prentice, Jay',NULL,NULL,NULL,'
4
',NULL,'748648362',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Jay',1,NULL,'Dear Jay',1,NULL,'Mr. Jay Prentice',NULL,2,'1952-09-19',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (188,'Individual',NULL,'kandaces67@mymail.info',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'kandaces67@mymail.info',NULL,NULL,NULL,NULL,NULL,'2464122831',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear kandaces67@mymail.info',1,NULL,'Dear kandaces67@mymail.info',1,NULL,'kandaces67@mymail.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (189,'Individual',NULL,'Mr. Jed González',NULL,NULL,'Jed','C','González',0,0,0,0,1,0,NULL,'González, Jed',NULL,NULL,NULL,NULL,NULL,'517806702',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Jed',1,NULL,'Dear Jed',1,NULL,'Mr. Jed González',NULL,NULL,'1977-05-20',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (190,'Individual',NULL,'gonzlez-grant.g.allen@infomail.com',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'gonzlez-grant.g.allen@infomail.com',NULL,NULL,NULL,NULL,NULL,'1964184295',NULL,'Sample Data',3,1,NULL,NULL,1,NULL,'Dear gonzlez-grant.g.allen@infomail.com',1,NULL,'Dear gonzlez-grant.g.allen@infomail.com',1,NULL,'gonzlez-grant.g.allen@infomail.com',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (191,'Individual',NULL,'Mr. Rosario Roberts',NULL,NULL,'Rosario','R','Roberts',0,0,0,0,0,0,NULL,'Roberts, Rosario',NULL,NULL,NULL,NULL,NULL,'2207993588',NULL,'Sample Data',3,NULL,NULL,NULL,1,NULL,'Dear Rosario',1,NULL,'Dear Rosario',1,NULL,'Mr. Rosario Roberts',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (192,'Organization',NULL,'Northpoint Music Systems','Northpoint Music Systems',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Northpoint Music Systems',NULL,NULL,NULL,NULL,NULL,'1538237879',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Northpoint Music Systems',NULL,NULL,NULL,0,NULL,NULL,186,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (193,'Organization',NULL,'Texas Culture Solutions','Texas Culture Solutions',NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'Texas Culture Solutions',NULL,NULL,NULL,NULL,NULL,'2389275435',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Texas Culture Solutions',NULL,NULL,NULL,0,NULL,NULL,108,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (194,'Individual',NULL,'gonzlez.lawerence@example.net',NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,NULL,'gonzlez.lawerence@example.net',NULL,NULL,NULL,NULL,NULL,'1695987172',NULL,'Sample Data',3,2,NULL,NULL,1,NULL,'Dear gonzlez.lawerence@example.net',1,NULL,'Dear gonzlez.lawerence@example.net',1,NULL,'gonzlez.lawerence@example.net',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (195,'Individual',NULL,'Dr. Juliann Jacobs',NULL,NULL,'Juliann','M','Jacobs',0,1,0,0,0,0,NULL,'Jacobs, Juliann',NULL,NULL,NULL,NULL,NULL,'3009811288',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Juliann',1,NULL,'Dear Juliann',1,NULL,'Dr. Juliann Jacobs',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (196,'Individual',NULL,'Laree Cooper',NULL,NULL,'Laree','N','Cooper',0,1,0,0,1,0,NULL,'Cooper, Laree',NULL,NULL,NULL,NULL,NULL,'4213061637',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Laree',1,NULL,'Dear Laree',1,NULL,'Laree Cooper',NULL,NULL,'1938-06-02',1,'2023-09-25',NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (197,'Individual',NULL,'Dr. Daren Cooper',NULL,NULL,'Daren','','Cooper',0,0,0,0,1,0,NULL,'Cooper, Daren',NULL,NULL,NULL,'
2
',NULL,'1555868236',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Daren',1,NULL,'Dear Daren',1,NULL,'Dr. Daren Cooper',NULL,NULL,'1954-05-01',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (198,'Individual',NULL,'Laree McReynolds',NULL,NULL,'Laree','','McReynolds',0,0,0,0,0,0,NULL,'McReynolds, Laree',NULL,NULL,NULL,'
2
',NULL,'206927507',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,'Dear Laree',1,NULL,'Dear Laree',1,NULL,'Laree McReynolds',NULL,1,'1940-11-21',1,'2023-07-01',NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (199,'Household',NULL,'González-Grant family',NULL,NULL,NULL,NULL,NULL,0,0,0,0,1,0,NULL,'González-Grant family',NULL,NULL,NULL,NULL,NULL,'1848537795',NULL,'Sample Data',NULL,NULL,NULL,NULL,5,NULL,'Dear González-Grant family',5,NULL,'Dear González-Grant family',2,NULL,'González-Grant family',NULL,NULL,NULL,0,NULL,'González-Grant family',NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (200,'Individual',NULL,'Dr. Ashlie Parker',NULL,NULL,'Ashlie','','Parker',0,0,0,0,0,0,NULL,'Parker, Ashlie',NULL,NULL,NULL,NULL,NULL,'1516256819',NULL,'Sample Data',4,NULL,NULL,NULL,1,NULL,'Dear Ashlie',1,NULL,'Dear Ashlie',1,NULL,'Dr. Ashlie Parker',NULL,1,'1990-12-03',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:08','Both'),
+ (201,'Individual',NULL,'Ms. Brigette Wagner',NULL,NULL,'Brigette','S','Wagner',0,0,0,0,1,0,NULL,'Wagner, Brigette',NULL,NULL,NULL,'
2
',NULL,'3285817434',NULL,'Sample Data',2,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Ms. Brigette Wagner',NULL,1,'1944-01-08',0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:08','2024-04-26 15:50:09','Both'),
+ (202,'Individual',NULL,'Jenny Lee',NULL,NULL,'Jenny',NULL,'Lee',0,0,0,0,0,0,NULL,'Lee, Jenny',NULL,NULL,NULL,NULL,'en_US','244f6934d57a96cfee53696046df2574',NULL,NULL,NULL,NULL,NULL,1,1,NULL,'Dear Jenny',1,NULL,'Dear Jenny',1,NULL,'Jenny Lee','Volunteer coordinator',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,'2024-04-26 15:50:10','2024-04-26 15:50:10','Both');
 /*!40000 ALTER TABLE `civicrm_contact` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2213,117 +2218,117 @@ 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,'2014-01-06 04:30:30',0.00,125.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'April Mailer 1',NULL,NULL,0,0,1,NULL,'1041',NULL,NULL,0.00,NULL,0),
- (2,4,1,NULL,1,'2021-10-06 04:30:30',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,0.00,NULL,0),
- (3,6,1,NULL,4,'2017-12-11 15:30:30',0.00,25.00,NULL,NULL,'GBP12',NULL,NULL,'GBP',NULL,NULL,NULL,NULL,'April Mailer 1',NULL,NULL,0,0,1,NULL,'2095',NULL,NULL,0.00,NULL,0),
- (4,8,1,NULL,4,'2021-10-06 04:30:30',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,'10552',NULL,NULL,0.00,NULL,0),
- (5,4,1,NULL,1,'2021-10-06 04:30:30',0.00,50.00,NULL,NULL,'Q90901X1',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (6,16,1,NULL,4,'2023-10-13 03:48:30',0.00,500.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'April Mailer 1',NULL,NULL,0,0,1,NULL,'509',NULL,NULL,0.00,NULL,0),
- (7,19,1,NULL,1,'2024-01-04 04:30:30',0.00,1750.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,'102',NULL,NULL,0.00,NULL,0),
- (8,82,1,NULL,1,'2023-05-14 12:41:30',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,0.00,NULL,0),
- (9,92,1,NULL,1,'2023-02-06 04:30:30',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,0.00,NULL,0),
- (10,34,1,NULL,1,'2019-08-14 06:30:30',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,0.00,NULL,0),
- (11,71,1,NULL,1,'2024-01-05 00:30:30',0.00,500.00,NULL,NULL,'PL71',NULL,NULL,'JPY',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (12,43,1,NULL,1,'2022-10-05 17:57:10',0.00,50.00,NULL,NULL,'P291X1',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (13,32,1,NULL,1,'2023-10-06 00:00:00',0.00,50.00,NULL,NULL,'PL32I',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (14,32,1,NULL,1,'2023-11-06 00:00:00',0.00,50.00,NULL,NULL,'PL32II',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (15,59,1,NULL,1,'2022-10-06 04:30:30',0.00,25.00,NULL,NULL,'PL32I591',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (16,59,1,NULL,1,'2022-11-06 04:30:30',0.00,25.00,NULL,NULL,'PL32I592',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (17,59,1,NULL,1,'2022-12-06 04:30:30',0.00,25.00,NULL,NULL,'PL32I593',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (18,59,1,NULL,1,'2023-01-06 04:30:30',0.00,25.00,NULL,NULL,'PL32I594',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (19,59,1,NULL,1,'2023-02-06 04:30:30',0.00,25.00,NULL,NULL,'PL32I595',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (20,59,1,NULL,1,'2023-03-06 04:30:30',0.00,25.00,NULL,NULL,'PL32I596',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (21,59,1,NULL,1,'2023-04-06 04:30:30',0.00,25.00,NULL,NULL,'PL32I597',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (22,59,1,NULL,1,'2023-05-06 04:30:30',0.00,25.00,NULL,NULL,'PL32I598',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (23,59,1,NULL,1,'2023-06-06 04:30:30',0.00,25.00,NULL,NULL,'PL32I599',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (24,59,1,NULL,1,'2023-07-06 04:30:30',0.00,25.00,NULL,NULL,'PL32I5910',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (25,59,1,NULL,1,'2023-08-06 04:30:30',0.00,25.00,NULL,NULL,'PL32I5911',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (26,99,1,NULL,1,'2023-05-06 04:30:30',0.00,10.00,NULL,NULL,'PL32I991',NULL,NULL,'CAD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,2,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (27,99,1,NULL,1,'2023-06-06 04:30:30',0.00,10.00,NULL,NULL,'PL32I992',NULL,NULL,'CAD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,2,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (28,99,1,NULL,1,'2023-07-06 04:30:30',0.00,10.00,NULL,NULL,'PL32I993',NULL,NULL,'CAD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,2,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (29,99,1,NULL,1,'2023-08-06 04:30:30',0.00,10.00,NULL,NULL,'PL32I994',NULL,NULL,'CAD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,2,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (30,99,1,NULL,1,'2023-09-06 04:30:30',0.00,10.00,NULL,NULL,'PL32I995',NULL,NULL,'CAD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,2,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (31,103,1,NULL,1,'2023-12-06 04:30:30',0.00,5.00,NULL,NULL,'PL32I1031',NULL,NULL,'EUR',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,3,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (32,183,2,NULL,1,'2024-01-06 04:30:30',0.00,100.00,NULL,NULL,'d04bebb925f35013',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (33,160,2,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'aa84cd6d0c671bf6',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (34,56,2,NULL,1,'2024-01-06 04:30:30',0.00,100.00,NULL,NULL,'85f82bdf993869a9',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (35,157,2,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'4d0f515e9744319f',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (36,102,2,NULL,1,'2024-01-06 04:30:30',0.00,100.00,NULL,NULL,'a6e23b5bdacc2556',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (37,41,2,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'549daaa33e883987',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (38,22,2,NULL,1,'2024-01-06 04:30:30',0.00,100.00,NULL,NULL,'54ba67e8cd2c5831',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (39,165,2,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'82bd65e9cca2891e',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (40,150,2,NULL,1,'2024-01-06 04:30:30',0.00,100.00,NULL,NULL,'72e3d8ab02a88749',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (41,129,2,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'83a31e80a72fedf9',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (42,3,2,NULL,1,'2024-01-06 04:30:30',0.00,1200.00,NULL,NULL,'3b7979f46cceaa08',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Lifetime Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (43,11,2,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'102f534ba875514c',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (44,42,2,NULL,1,'2024-01-06 04:30:30',0.00,100.00,NULL,NULL,'114664b16c0d05d7',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (45,93,2,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'c63f9619b1f6a5da',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (46,65,2,NULL,1,'2024-01-06 04:30:30',0.00,100.00,NULL,NULL,'54afd47a158e6a98',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (47,202,2,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'a166d69a85636182',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (48,159,2,NULL,1,'2024-01-06 04:30:30',0.00,100.00,NULL,NULL,'513d0202ba2e33e8',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (49,123,2,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'f897088d4040e88b',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (50,38,2,NULL,1,'2024-01-06 04:30:30',0.00,100.00,NULL,NULL,'254358f51b2e2e2e',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (51,78,2,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'64d9a20ca6695123',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (52,9,2,NULL,1,'2024-01-06 04:30:30',0.00,100.00,NULL,NULL,'d436781d36642d52',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (53,139,2,NULL,1,'2024-01-06 04:30:30',0.00,1200.00,NULL,NULL,'6a5980462cb6efb4',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Lifetime Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (54,4,2,NULL,1,'2024-01-06 04:30:30',0.00,100.00,NULL,NULL,'c46dd20e75d9cd63',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (55,94,2,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'b44f6776a38cd0b0',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (56,35,2,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'bdd4ba34f19b8508',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (57,66,2,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'243d7aa987a2baa3',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (58,28,2,NULL,1,'2024-01-06 04:30:30',0.00,100.00,NULL,NULL,'c30b782dffc88578',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (59,27,2,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'401f0d68db4d1e96',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (60,24,2,NULL,1,'2024-01-06 04:30:30',0.00,100.00,NULL,NULL,'147acd979994a3e5',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (61,188,2,NULL,1,'2024-01-06 04:30:30',0.00,100.00,NULL,NULL,'49e79faa71b04821',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (63,2,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'e33de35039337003',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (64,6,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'fb4905a867502a4b',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (65,7,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'f006b49b97550bcf',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (66,12,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'2d1e67a9245d5fdc',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (67,15,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'121d8980a5da7e03',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (68,18,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'f9affcc9daf9f3f3',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (69,24,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'785c41d770598228',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (70,25,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'213d7fbdd009495b',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (71,32,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'5dab449584553811',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (72,37,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'bf96d198baa1575a',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (73,38,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'7f20752b4fcf16b9',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (74,41,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'a5dde0c0ef88b617',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (75,46,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'c9bddcb498f240eb',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (76,47,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'3c19adb701828ca5',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (77,50,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'306134a0c8b767ba',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (78,62,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'2d5db36ace9588e4',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (79,65,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'1c930ea45e0c1ae4',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (80,66,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'bb245dad4d1aef62',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (81,67,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'c9d3a804ca680143',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (82,72,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'dacf986f91993264',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (83,75,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'85e4457d3b235f62',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (84,77,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'e146bd83b1233a2d',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (85,80,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'983ea229b2e6c29f',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (86,87,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'888233d8d87b2292',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (87,89,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'bc1bc41100582c43',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (88,94,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'356e2ea6f7e138db',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (89,98,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'3cd0fcd4bd3c6e9c',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (90,101,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'f0f1369ed8bd6ade',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (91,103,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'ed7b07c140ba59ce',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (92,111,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'ee67cf60826046ab',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (93,114,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'fd8a5608dfc8fd90',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (94,118,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'376e6c1d14da650c',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (95,125,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'d601f86d7d4ac5f0',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (96,138,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'45dd6c0b12692902',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (97,144,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'dd75be522b0c3b37',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (98,147,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'c05415199bd45c2e',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (99,148,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'0c13497f46c6bb46',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (100,152,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'1fc5dfd486634955',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (101,161,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'894bf74b96303bc8',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (102,162,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'2867fa3f312390e3',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (103,167,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'6237b3b4d3156e7f',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (104,183,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'5f71b04aa74cef80',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (105,184,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'98746c0f1879a8b3',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (106,185,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'ba540bde6a24512f',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (107,187,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'a52ae21e1127264b',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (108,189,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'2170e40ef82e30ed',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (109,190,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'0dd4e5033a7eaf87',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (110,192,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'9e971d6e58baa4ba',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (111,201,4,NULL,1,'2024-01-06 04:30:30',0.00,800.00,NULL,NULL,'fb14ee1572cd5300',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
- (112,202,4,NULL,1,'2024-01-06 04:30:30',0.00,50.00,NULL,NULL,'6e6b62f0b3b1560f',NULL,NULL,'USD',NULL,NULL,'2024-01-06 04:30:30',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0);
+ (1,2,1,NULL,4,'2014-04-26 15:50:11',0.00,125.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'April Mailer 1',NULL,NULL,0,0,1,NULL,'1041',NULL,NULL,0.00,NULL,0),
+ (2,4,1,NULL,1,'2022-01-26 15:50:11',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,0.00,NULL,0),
+ (3,6,1,NULL,4,'2018-04-01 02:50:11',0.00,25.00,NULL,NULL,'GBP12',NULL,NULL,'GBP',NULL,NULL,NULL,NULL,'April Mailer 1',NULL,NULL,0,0,1,NULL,'2095',NULL,NULL,0.00,NULL,0),
+ (4,8,1,NULL,4,'2022-01-26 15:50:11',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,'10552',NULL,NULL,0.00,NULL,0),
+ (5,4,1,NULL,1,'2022-01-26 15:50:11',0.00,50.00,NULL,NULL,'Q90901X1',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (6,16,1,NULL,4,'2024-02-01 15:08:11',0.00,500.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'April Mailer 1',NULL,NULL,0,0,1,NULL,'509',NULL,NULL,0.00,NULL,0),
+ (7,19,1,NULL,1,'2024-04-24 15:50:11',0.00,1750.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,'102',NULL,NULL,0.00,NULL,0),
+ (8,82,1,NULL,1,'2023-09-03 00:01:11',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,0.00,NULL,0),
+ (9,92,1,NULL,1,'2023-05-26 15:50:11',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,0.00,NULL,0),
+ (10,34,1,NULL,1,'2019-12-03 17:50:11',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,0.00,NULL,0),
+ (11,71,1,NULL,1,'2024-04-25 11:50:11',0.00,500.00,NULL,NULL,'PL71',NULL,NULL,'JPY',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (12,43,1,NULL,1,'2023-01-26 05:16:51',0.00,50.00,NULL,NULL,'P291X1',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (13,32,1,NULL,1,'2024-01-26 00:00:00',0.00,50.00,NULL,NULL,'PL32I',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (14,32,1,NULL,1,'2024-02-26 00:00:00',0.00,50.00,NULL,NULL,'PL32II',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (15,59,1,NULL,1,'2023-01-26 15:50:11',0.00,25.00,NULL,NULL,'PL32I591',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (16,59,1,NULL,1,'2023-02-26 15:50:11',0.00,25.00,NULL,NULL,'PL32I592',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (17,59,1,NULL,1,'2023-03-26 15:50:11',0.00,25.00,NULL,NULL,'PL32I593',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (18,59,1,NULL,1,'2023-04-26 15:50:11',0.00,25.00,NULL,NULL,'PL32I594',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (19,59,1,NULL,1,'2023-05-26 15:50:11',0.00,25.00,NULL,NULL,'PL32I595',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (20,59,1,NULL,1,'2023-06-26 15:50:11',0.00,25.00,NULL,NULL,'PL32I596',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (21,59,1,NULL,1,'2023-07-26 15:50:11',0.00,25.00,NULL,NULL,'PL32I597',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (22,59,1,NULL,1,'2023-08-26 15:50:11',0.00,25.00,NULL,NULL,'PL32I598',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (23,59,1,NULL,1,'2023-09-26 15:50:11',0.00,25.00,NULL,NULL,'PL32I599',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (24,59,1,NULL,1,'2023-10-26 15:50:11',0.00,25.00,NULL,NULL,'PL32I5910',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (25,59,1,NULL,1,'2023-11-26 15:50:11',0.00,25.00,NULL,NULL,'PL32I5911',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,1,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (26,99,1,NULL,1,'2023-08-26 15:50:11',0.00,10.00,NULL,NULL,'PL32I991',NULL,NULL,'CAD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,2,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (27,99,1,NULL,1,'2023-09-26 15:50:11',0.00,10.00,NULL,NULL,'PL32I992',NULL,NULL,'CAD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,2,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (28,99,1,NULL,1,'2023-10-26 15:50:11',0.00,10.00,NULL,NULL,'PL32I993',NULL,NULL,'CAD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,2,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (29,99,1,NULL,1,'2023-11-26 15:50:11',0.00,10.00,NULL,NULL,'PL32I994',NULL,NULL,'CAD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,2,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (30,99,1,NULL,1,'2023-12-26 15:50:11',0.00,10.00,NULL,NULL,'PL32I995',NULL,NULL,'CAD',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,2,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (31,103,1,NULL,1,'2024-03-26 15:50:11',0.00,5.00,NULL,NULL,'PL32I1031',NULL,NULL,'EUR',NULL,NULL,NULL,NULL,'Recurring contribution',NULL,3,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (32,194,2,NULL,1,'2024-04-26 15:50:11',0.00,100.00,NULL,NULL,'b5a1f057208f5a91',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (33,87,2,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'04200bff0203f12b',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (34,60,2,NULL,1,'2024-04-26 15:50:11',0.00,100.00,NULL,NULL,'9bdcc5ddeda8a520',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (35,190,2,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'c609360e57109b79',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (36,5,2,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'4c6f53503b7cb0ab',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (37,13,2,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'11e1d593feccae66',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (38,112,2,NULL,1,'2024-04-26 15:50:11',0.00,100.00,NULL,NULL,'566c8d0eaa230008',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (39,115,2,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'5f3a2b9681b9191d',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (40,201,2,NULL,1,'2024-04-26 15:50:11',0.00,100.00,NULL,NULL,'9d3f65600f92e622',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (41,128,2,NULL,1,'2024-04-26 15:50:11',0.00,100.00,NULL,NULL,'5d51964f045bfc50',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (42,43,2,NULL,1,'2024-04-26 15:50:11',0.00,1200.00,NULL,NULL,'37571dfcbd354f51',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Lifetime Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (43,4,2,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'372fd8fed5180672',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (44,142,2,NULL,1,'2024-04-26 15:50:11',0.00,100.00,NULL,NULL,'69e3ac0aed8b096e',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (45,160,2,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'849a688d25f2104b',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (46,65,2,NULL,1,'2024-04-26 15:50:11',0.00,100.00,NULL,NULL,'f2b8bd135e9d8647',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (47,159,2,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'a88ca39c8d59289a',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (48,20,2,NULL,1,'2024-04-26 15:50:11',0.00,100.00,NULL,NULL,'a35f43b2180dc9b8',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (49,120,2,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'ee7d28b0fcbd3565',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (50,200,2,NULL,1,'2024-04-26 15:50:11',0.00,100.00,NULL,NULL,'fb9f821467c5e4fc',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (51,140,2,NULL,1,'2024-04-26 15:50:11',0.00,100.00,NULL,NULL,'6335cfc1d9871c1b',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (52,62,2,NULL,1,'2024-04-26 15:50:11',0.00,100.00,NULL,NULL,'4a4b1b66ffae3b2c',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (53,155,2,NULL,1,'2024-04-26 15:50:11',0.00,1200.00,NULL,NULL,'a907f68f10ede934',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Lifetime Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (54,75,2,NULL,1,'2024-04-26 15:50:11',0.00,100.00,NULL,NULL,'2e3ca93d825f20d9',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (55,202,2,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'4f5e7edcdf368aea',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (56,71,2,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'bd0ce735fc8dc0c6',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (57,39,2,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'0c44ffa31ddbf75a',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (58,107,2,NULL,1,'2024-04-26 15:50:11',0.00,100.00,NULL,NULL,'1444e63322cdf98b',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (59,116,2,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'0c09b3b4fdb01b27',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (60,166,2,NULL,1,'2024-04-26 15:50:11',0.00,100.00,NULL,NULL,'803a2c4aef4f6525',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (61,50,2,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'a73f415d7191472d',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (63,51,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'74a98451297ed311',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (64,34,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'ef3979bae5fa5259',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (65,193,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'08803a9e355cc4e5',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (66,153,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'2d3a6db93c7f6bd1',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (67,62,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'715572a10c53ced9',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (68,132,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'f4b86efdd60681d5',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (69,35,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'df890dda694d5b76',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (70,95,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'3215d0da8c4ce892',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (71,81,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'79d4dbb475e83ba5',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (72,75,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'fc054807180e31b5',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (73,54,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'0ad5ea9ad6aed4a6',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (74,113,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'1f1e675c4ed0ab6d',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (75,156,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'7d6d1c9a9905405f',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (76,123,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'39ef698d0a9fa817',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (77,101,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'6cfbb070c8b03fbf',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (78,146,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'540bff0df0925751',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (79,163,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'815f109b17f31db2',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (80,11,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'22d294eb3cea5959',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (81,87,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'c18f74ca873f6019',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (82,10,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'8195591eb560bc4d',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (83,195,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'2424577915fd9766',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (84,129,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'b1470cef41e4c3cb',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (85,8,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'619b7759d6e32711',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (86,158,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'4cbf9af362859f59',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (87,93,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'44a5024cef66c06d',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (88,22,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'59f65a58649cf3a4',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (89,60,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'d9ec4cad79a91ddb',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (90,182,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'8bf39427a743d80c',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (91,152,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'925afe959c4ad2d6',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (92,26,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'3bffd940b5c1d2d6',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (93,79,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'b17b0c95a3657e18',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (94,70,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'4a7e3c62eb8fa913',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (95,57,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'f96ff6fa694afa82',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (96,28,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'556f2376af926b0c',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (97,186,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'876780d3d4b6e328',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (98,6,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'1cbfab3eb27c53a6',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (99,114,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'001ad0270c003a8b',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (100,41,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'7e326126f20083b2',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (101,21,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'98cdfabd8ef63498',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (102,72,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'cd5ca6b847a015c6',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (103,171,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'1de1101df072cb5b',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (104,3,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'e36426bbfb2db460',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (105,177,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'01103a74844523b1',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (106,176,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'89460233cf2bc979',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (107,18,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'b35e37ceebbcdb51',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (108,194,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'45cc2fa538a41cba',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (109,181,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'e8b5e4f2432d35c1',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (110,78,4,NULL,1,'2024-04-26 15:50:11',0.00,50.00,NULL,NULL,'1aea5132eeee329a',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (111,67,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'0cfc5f84ff9fddf2',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0),
+ (112,20,4,NULL,1,'2024-04-26 15:50:11',0.00,800.00,NULL,NULL,'391ce58e0ed19572',NULL,NULL,'USD',NULL,NULL,'2024-04-26 15:50:11',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,0.00,NULL,0);
 /*!40000 ALTER TABLE `civicrm_contribution` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2356,9 +2361,9 @@ UNLOCK TABLES;
 LOCK TABLES `civicrm_contribution_recur` WRITE;
 /*!40000 ALTER TABLE `civicrm_contribution_recur` DISABLE KEYS */;
 INSERT INTO `civicrm_contribution_recur` (`id`, `contact_id`, `amount`, `currency`, `frequency_unit`, `frequency_interval`, `installments`, `start_date`, `create_date`, `modified_date`, `cancel_date`, `cancel_reason`, `end_date`, `processor_id`, `payment_token_id`, `trxn_id`, `invoice_id`, `contribution_status_id`, `is_test`, `cycle_day`, `next_sched_contribution_date`, `failure_count`, `failure_retry_date`, `auto_renew`, `payment_processor_id`, `financial_type_id`, `payment_instrument_id`, `campaign_id`, `is_email_receipt`) VALUES
- (1,59,25.00,'USD','month',1,12,'2022-10-06 04:30:30','2024-01-06 04:30:30','2024-01-06 04:30:30',NULL,'',NULL,'CLC45',NULL,'56799',NULL,1,0,1,NULL,0,NULL,0,1,NULL,NULL,NULL,1),
- (2,99,10.00,'CAD','month',1,6,'2023-05-06 04:30:30','2024-01-06 04:30:30','2024-01-06 04:30:30','2023-12-06 04:30:30','No longer interested',NULL,'CLR35',NULL,'22799',NULL,3,0,1,NULL,0,NULL,0,1,NULL,NULL,NULL,1),
- (3,103,5.00,'EUR','month',3,3,'2023-12-06 04:30:30','2024-01-06 04:30:30','2024-01-06 04:30:30',NULL,'',NULL,'EGR12',NULL,'44889',NULL,5,0,1,'2024-03-06 04:30:30',0,NULL,0,1,NULL,NULL,NULL,1);
+ (1,59,25.00,'USD','month',1,12,'2023-01-26 15:50:11','2024-04-26 15:50:11','2024-04-26 15:50:11',NULL,'',NULL,'CLC45',NULL,'56799',NULL,1,0,1,NULL,0,NULL,0,1,NULL,NULL,NULL,1),
+ (2,99,10.00,'CAD','month',1,6,'2023-08-26 15:50:11','2024-04-26 15:50:11','2024-04-26 15:50:11','2024-03-26 15:50:11','No longer interested',NULL,'CLR35',NULL,'22799',NULL,3,0,1,NULL,0,NULL,0,1,NULL,NULL,NULL,1),
+ (3,103,5.00,'EUR','month',3,3,'2024-03-26 15:50:11','2024-04-26 15:50:11','2024-04-26 15:50:11',NULL,'',NULL,'EGR12',NULL,'44889',NULL,5,0,1,'2024-06-26 15:50:11',0,NULL,0,1,NULL,NULL,NULL,1);
 /*!40000 ALTER TABLE `civicrm_contribution_recur` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2369,8 +2374,8 @@ 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,9,86,10.00,'USD',1,1,'Jones Family','Helping Hands',10),
- (2,10,86,250.00,'USD',1,1,'Annie and the kids','Annie Helps',10);
+ (1,9,89,10.00,'USD',1,1,'Jones Family','Helping Hands',10),
+ (2,10,89,250.00,'USD',1,1,'Annie and the kids','Annie Helps',10);
 /*!40000 ALTER TABLE `civicrm_contribution_soft` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2968,7 +2973,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.70.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.74.4',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
 /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2980,183 +2985,183 @@ 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,120,1,'loublackwell@testmail.com',1,0,0,0,NULL,NULL,NULL,NULL),
- (3,130,1,'npatel@notmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
- (4,130,1,'nicolepatel43@spamalot.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
- (5,99,1,'margaretblackwell@testing.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
- (6,99,1,'margaretblackwell80@notmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
- (7,37,1,'barkley.k.allen42@fakemail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
- (8,92,1,'cblackwell55@notmail.com',1,0,0,0,NULL,NULL,NULL,NULL),
- (9,92,1,'clintb@fishmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
- (10,53,1,'reynolds.barry@testing.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (11,53,1,'reynolds.barry85@infomail.biz',0,0,0,0,NULL,NULL,NULL,NULL),
- (12,196,1,'santinad15@lol.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
- (13,196,1,'santinadaz80@mymail.net',0,0,0,0,NULL,NULL,NULL,NULL),
- (14,165,1,'cooper.lincoln76@airmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
- (15,46,1,'roberts.kandace72@fishmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
- (16,46,1,'roberts.kandace@lol.com',0,0,0,0,NULL,NULL,NULL,NULL),
- (17,190,1,'bernadetteg@mymail.com',1,0,0,0,NULL,NULL,NULL,NULL),
- (18,200,1,'ak.samuels@sample.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
- (19,183,1,'zopel@testmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
- (20,176,1,'terry.kathlyn@lol.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (21,176,1,'terry.w.kathlyn@testing.info',0,0,0,0,NULL,NULL,NULL,NULL),
- (22,22,1,'elbertdeforest@testmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
- (23,22,1,'deforest.d.elbert31@notmail.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),
- (24,110,1,'tanyasamuels@fakemail.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (25,110,1,'tsamuels61@mymail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
- (26,133,1,'wilson.norris@spamalot.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
- (27,47,1,'bachman.tanya70@sample.com',1,0,0,0,NULL,NULL,NULL,NULL),
- (28,47,1,'bachman.tanya@mymail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
- (29,85,1,'barkleyj55@sample.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
- (30,101,1,'zope.valene31@spamalot.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (31,101,1,'vzope@notmail.biz',0,0,0,0,NULL,NULL,NULL,NULL),
- (32,15,1,'loureynolds45@lol.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
- (33,15,1,'reynoldsl51@lol.info',0,0,0,0,NULL,NULL,NULL,NULL),
- (34,77,1,'chowski.teddy92@testing.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (35,77,1,'chowski.teddy39@fishmail.org',0,0,0,0,NULL,NULL,NULL,NULL),
- (36,50,1,'nielsen.q.ivey73@fishmail.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (37,164,1,'merriegrant87@sample.com',1,0,0,0,NULL,NULL,NULL,NULL),
- (38,192,1,'brzczysawterrell28@testing.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (39,192,1,'terrell.m.brzczysaw@lol.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
- (40,75,1,'ivanov.omar@spamalot.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
- (41,75,1,'ob.ivanov91@testing.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),
- (42,19,1,'ashleyprentice@fishmail.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (43,19,1,'prentice.ashley@lol.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),
- (44,146,1,'chowski.jay@fishmail.biz',1,0,0,0,NULL,NULL,NULL,NULL),
- (45,106,1,'olsen.x.angelika70@airmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
- (46,71,1,'valened60@airmail.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (47,14,1,'robertsi@sample.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (48,34,1,'andrewgonzlez@testmail.biz',1,0,0,0,NULL,NULL,NULL,NULL),
- (49,34,1,'andrewgonzlez@fishmail.org',0,0,0,0,NULL,NULL,NULL,NULL),
- (50,163,1,'bs.wagner@lol.biz',1,0,0,0,NULL,NULL,NULL,NULL),
- (51,27,1,'lb.gonzlez@testmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
- (52,4,1,'kiaraw13@airmail.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (53,4,1,'wilson.kiara67@lol.net',0,0,0,0,NULL,NULL,NULL,NULL),
- (54,91,1,'iveym8@example.info',1,0,0,0,NULL,NULL,NULL,NULL),
- (55,91,1,'iveymcreynolds@fakemail.net',0,0,0,0,NULL,NULL,NULL,NULL),
- (56,60,1,'elinal@airmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
- (57,60,1,'lee.c.elina@testmail.biz',0,0,0,0,NULL,NULL,NULL,NULL),
- (58,172,1,'terrell.u.carlos44@lol.biz',1,0,0,0,NULL,NULL,NULL,NULL),
- (59,172,1,'carlosterrell@testing.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
- (60,102,1,'beularoberts@infomail.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (61,102,1,'roberts.beula@fishmail.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),
- (62,128,1,'cooper.arlyne@infomail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
- (63,117,1,'pcooper@testmail.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (64,52,1,'lareejacobs69@sample.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
- (65,17,1,'lashawndajones@testmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
- (66,16,1,'jamesonb87@airmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
- (67,16,1,'bd.jameson87@testmail.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),
- (68,159,1,'mw.jones@sample.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (69,41,1,'arlyney@mymail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
- (70,98,1,'wagnerf@infomail.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (71,98,1,'fw.wagner22@notmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
- (72,90,1,'heidis@mymail.info',1,0,0,0,NULL,NULL,NULL,NULL),
- (73,90,1,'heidis@lol.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
- (74,155,1,'nicoleivanov@lol.com',1,0,0,0,NULL,NULL,NULL,NULL),
- (75,148,1,'lareeb95@testmail.info',1,0,0,0,NULL,NULL,NULL,NULL),
- (76,148,1,'lareeb@spamalot.biz',0,0,0,0,NULL,NULL,NULL,NULL),
- (77,125,1,'ko.jacobs76@mymail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
- (78,125,1,'jacobsk@spamalot.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
- (79,189,1,'bwattson@mymail.info',1,0,0,0,NULL,NULL,NULL,NULL),
- (80,83,1,'cruz.c.brigette83@fakemail.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (81,83,1,'brigettec@spamalot.biz',0,0,0,0,NULL,NULL,NULL,NULL),
- (82,175,1,'oparker83@fakemail.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (83,49,1,'parker.maria45@testing.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
- (84,3,1,'jones.brigette@testing.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
- (85,3,1,'brigettej90@lol.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),
- (86,58,1,'claudioroberts3@example.info',1,0,0,0,NULL,NULL,NULL,NULL),
- (87,58,1,'robertsc45@fishmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
- (88,2,1,'roberts.herminia@lol.biz',1,0,0,0,NULL,NULL,NULL,NULL),
- (89,2,1,'hroberts@spamalot.info',0,0,0,0,NULL,NULL,NULL,NULL),
- (90,140,1,'roberts.b.scarlet@spamalot.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
- (91,38,1,'gonzlez.miguel34@sample.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (92,134,1,'agonzlez26@infomail.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (93,149,1,'iveyrobertson@fakemail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
- (94,149,1,'robertsoni62@notmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
- (95,123,1,'robertson.brittney49@mymail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
- (96,123,1,'robertsonb@testmail.org',0,0,0,0,NULL,NULL,NULL,NULL),
- (97,79,1,'robertsone@infomail.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (98,79,1,'robertson.elbert@testing.org',0,0,0,0,NULL,NULL,NULL,NULL),
- (99,32,1,'robertsont13@fakemail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
- (100,42,1,'bn.reynolds@mymail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
- (101,143,1,'reynoldsn@sample.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
- (102,143,1,'reynolds.nicole@fishmail.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),
- (103,132,1,'creynolds61@mymail.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (104,199,1,'billyreynolds@sample.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
- (105,199,1,'breynolds44@testmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
- (106,11,1,'jensen.kenny89@testing.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (107,119,1,'daz.jay@airmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
- (108,119,1,'daz.jay60@airmail.info',0,0,0,0,NULL,NULL,NULL,NULL),
- (109,103,1,'st.daz@fishmail.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (110,103,1,'sharynd@fakemail.info',0,0,0,0,NULL,NULL,NULL,NULL),
- (111,112,1,'daz.nicole59@spamalot.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (112,112,1,'np.daz21@spamalot.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
- (113,95,1,'barryb2@fishmail.biz',1,0,0,0,NULL,NULL,NULL,NULL),
- (114,95,1,'barkleyb57@airmail.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),
- (115,108,1,'jyadav@spamalot.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (116,108,1,'yadav.jina@spamalot.org',0,0,0,0,NULL,NULL,NULL,NULL),
- (117,191,1,'barkley-yadav.betty@sample.info',1,0,0,0,NULL,NULL,NULL,NULL),
- (118,105,1,'tt.barkley-yadav@example.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
- (119,153,1,'russellwilson25@lol.biz',1,0,0,0,NULL,NULL,NULL,NULL),
- (120,33,1,'wilsona33@lol.com',1,0,0,0,NULL,NULL,NULL,NULL),
- (121,33,1,'wilson.arlyne@testing.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
- (122,104,1,'alexiaw30@infomail.info',1,0,0,0,NULL,NULL,NULL,NULL),
- (123,7,1,'rrobertson@example.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
- (124,65,1,'robertson.scott@example.info',1,0,0,0,NULL,NULL,NULL,NULL),
- (125,43,1,'robertsoni43@spamalot.info',1,0,0,0,NULL,NULL,NULL,NULL),
- (126,197,1,'em.cooper@notmail.info',1,0,0,0,NULL,NULL,NULL,NULL),
- (127,39,1,'cooper-yadavl@airmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
- (128,162,1,'dimitrovj17@sample.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (129,20,1,'dimitrov-bachman.x.esta69@airmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
- (130,20,1,'estadimitrov-bachman@mymail.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),
- (131,97,1,'terrell.e.maria@example.info',1,0,0,0,NULL,NULL,NULL,NULL),
- (132,97,1,'terrell.e.maria@spamalot.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
- (133,18,1,'em.terrell@testing.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
- (134,35,1,'bobt@fishmail.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (135,111,1,'ivanovs@testmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
- (136,31,1,'ivanov-olsen.lincoln92@testing.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (137,126,1,'sanfordb19@fakemail.info',1,0,0,0,NULL,NULL,NULL,NULL),
- (138,26,1,'lw.bachman@mymail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
- (139,26,1,'bachman.lawerence22@mymail.org',0,0,0,0,NULL,NULL,NULL,NULL),
- (140,139,1,'raybachman80@testmail.com',1,0,0,0,NULL,NULL,NULL,NULL),
- (141,139,1,'bachman.ray@notmail.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),
- (142,201,1,'deforestr@testmail.net',1,0,0,0,NULL,NULL,NULL,NULL),
- (143,194,1,'roberts.q.kathleen@testmail.info',1,0,0,0,NULL,NULL,NULL,NULL),
- (144,194,1,'kathleenr3@testing.com',0,0,0,0,NULL,NULL,NULL,NULL),
- (145,28,1,'deforest-roberts.ashley@testing.biz',1,0,0,0,NULL,NULL,NULL,NULL),
- (146,72,1,'kdeforest-roberts@infomail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
- (147,72,1,'deforest-roberts.kacey@sample.net',0,0,0,0,NULL,NULL,NULL,NULL),
- (148,12,1,'zope.m.bryon74@spamalot.com',1,0,0,0,NULL,NULL,NULL,NULL),
- (149,12,1,'bryonzope87@testmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
- (150,136,1,'jensen.kandace13@spamalot.com',1,0,0,0,NULL,NULL,NULL,NULL),
- (151,78,1,'zope-jensen.a.scott@example.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (152,82,1,'scottblackwell-mcreynolds@airmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
- (153,51,3,'service@pennsylvaniafund.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (154,57,2,'adamsb33@pennsylvaniafund.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (155,138,3,'info@pennsylvaniapartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (156,82,2,'blackwell-mcreynoldss54@pennsylvaniapartnership.org',0,0,0,0,NULL,NULL,NULL,NULL),
- (157,135,3,'contact@mississippialliance.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (158,130,2,'nicolep@mississippialliance.org',0,0,0,0,NULL,NULL,NULL,NULL),
- (159,48,3,'sales@urbansoftwareinitiative.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (160,165,2,'cooper.lincoln33@urbansoftwareinitiative.org',0,0,0,0,NULL,NULL,NULL,NULL),
- (161,122,3,'sales@creativeenvironmental.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (162,110,2,'samuels.tanya@creativeenvironmental.org',0,0,0,0,NULL,NULL,NULL,NULL),
- (163,73,3,'feedback@anchoragesports.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (164,139,2,'bachmanr6@anchoragesports.org',0,0,0,0,NULL,NULL,NULL,NULL),
- (165,40,3,'service@friendslegalalliance.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (166,3,2,'gonzlez.felisha@friendslegalalliance.org',0,0,0,0,NULL,NULL,NULL,NULL),
- (167,187,3,'info@ohiohealthinitiative.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (168,68,2,'jones.z.alida@ohiohealthinitiative.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (169,142,3,'feedback@mainfamilypartners.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (170,44,3,'feedback@ruralwellnessschool.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (171,173,3,'sales@alabamaeducationservices.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (172,160,2,'blackwell.brzczysaw94@alabamaeducationservices.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (173,118,3,'info@tennesseesolutions.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (174,52,2,'jacobs.laree@tennesseesolutions.org',0,0,0,0,NULL,NULL,NULL,NULL),
- (175,36,3,'sales@ohiosoftwarepartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (176,49,2,'parkerm73@ohiosoftwarepartnership.org',0,0,0,0,NULL,NULL,NULL,NULL),
- (177,170,3,'contact@ncwellnesstrust.org',1,0,0,0,NULL,NULL,NULL,NULL),
- (178,151,2,'princessw@ncwellnesstrust.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (2,185,1,'winfordm@infomail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
+ (3,185,1,'wz.mcreynolds@fakemail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
+ (4,8,1,'ivanov.magan@testing.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (5,8,1,'mw.ivanov@airmail.info',0,0,0,0,NULL,NULL,NULL,NULL),
+ (6,89,1,'rg.dimitrov@mymail.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (7,89,1,'dimitrov.g.ray38@infomail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
+ (8,37,1,'chowski.craig26@mymail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
+ (9,107,1,'samuelsr@example.biz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (10,73,1,'scarletdimitrov@example.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
+ (11,20,1,'jc.parker@fishmail.biz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (12,20,1,'parkerj28@sample.info',0,0,0,0,NULL,NULL,NULL,NULL),
+ (13,111,1,'prentice.junko@example.biz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (14,198,1,'mcreynolds.laree4@testmail.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (15,116,1,'rcruz76@notmail.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (16,6,1,'irvinp75@lol.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
+ (17,36,1,'rebekahmller39@lol.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (18,78,1,'bolsen@testing.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (19,78,1,'olsen.brigette@notmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
+ (20,21,1,'wattson.kenny@example.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (21,21,1,'kennywattson@testing.biz',0,0,0,0,NULL,NULL,NULL,NULL),
+ (22,79,1,'reynolds.k.alexia@testing.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
+ (23,58,1,'cruz.maria45@lol.com',1,0,0,0,NULL,NULL,NULL,NULL),
+ (24,58,1,'cruzm23@notmail.biz',0,0,0,0,NULL,NULL,NULL,NULL),
+ (25,160,1,'sanfordjameson@mymail.net',1,0,0,0,NULL,NULL,NULL,NULL),
+ (26,160,1,'sf.jameson@fishmail.info',0,0,0,0,NULL,NULL,NULL,NULL),
+ (27,22,1,'grantj3@testing.biz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (28,166,1,'dimitrov.santina@infomail.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (29,166,1,'santinadimitrov@fakemail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
+ (30,167,1,'gonzlez.a.damaris@testing.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (31,94,1,'db.terry@fakemail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (32,74,1,'terrella@testing.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (33,61,1,'olsen.toby@airmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (34,96,1,'kb.terry@testmail.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (35,76,1,'blee@spamalot.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
+ (36,76,1,'barryl58@airmail.org',0,0,0,0,NULL,NULL,NULL,NULL),
+ (37,187,1,'prentice.jay@fishmail.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (38,122,1,'reynolds.x.megan29@spamalot.com',1,0,0,0,NULL,NULL,NULL,NULL),
+ (39,159,1,'terry.alida@fishmail.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (40,159,1,'terrya13@testing.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
+ (41,93,1,'zopej31@sample.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (42,93,1,'jz.zope@spamalot.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),
+ (43,60,1,'cruzs54@testing.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (44,60,1,'cruzs52@fakemail.biz',0,0,0,0,NULL,NULL,NULL,NULL),
+ (45,134,1,'louc@mymail.net',1,0,0,0,NULL,NULL,NULL,NULL),
+ (46,66,1,'jacobd60@fakemail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
+ (47,66,1,'deforest.jacob@mymail.info',0,0,0,0,NULL,NULL,NULL,NULL),
+ (48,81,1,'cjameson@example.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
+ (49,131,1,'jacobr64@testing.net',1,0,0,0,NULL,NULL,NULL,NULL),
+ (50,131,1,'jacobroberts@spamalot.com',0,0,0,0,NULL,NULL,NULL,NULL),
+ (51,138,1,'lterry@example.biz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (52,138,1,'lterry@mymail.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),
+ (53,5,1,'maxwellw@testing.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
+ (54,112,1,'sdimitrov@testing.biz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (55,194,1,'gonzlez.lawerence@example.net',1,0,0,0,NULL,NULL,NULL,NULL),
+ (56,145,1,'grantj@example.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
+ (57,88,1,'bobj85@fishmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
+ (58,28,1,'sonnyo@testing.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
+ (59,99,1,'ashleyw@example.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
+ (60,99,1,'wilson.ashley64@testing.net',0,0,0,0,NULL,NULL,NULL,NULL),
+ (61,55,1,'tobya11@mymail.biz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (62,142,1,'kprentice@sample.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (63,189,1,'gonzlezj5@lol.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (64,179,1,'jacobs.alexia@mymail.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (65,118,1,'gonzlez.damaris@lol.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (66,118,1,'gonzlez.i.damaris@notmail.info',0,0,0,0,NULL,NULL,NULL,NULL),
+ (67,114,1,'bmller64@spamalot.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
+ (68,114,1,'billym3@notmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
+ (69,54,1,'patel.maxwell@testing.net',1,0,0,0,NULL,NULL,NULL,NULL),
+ (70,68,1,'chowski.jina@testmail.com',1,0,0,0,NULL,NULL,NULL,NULL),
+ (71,52,1,'winfordprentice@testing.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
+ (72,32,1,'wattson.truman@fakemail.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (73,30,1,'lareebarkley37@lol.com',1,0,0,0,NULL,NULL,NULL,NULL),
+ (74,30,1,'lareeb@infomail.net',0,0,0,0,NULL,NULL,NULL,NULL),
+ (75,43,1,'prentice.jina@sample.biz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (76,43,1,'jinaprentice86@notmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
+ (77,105,1,'gonzlez.erik@example.biz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (78,105,1,'gonzlez.erik@lol.com',0,0,0,0,NULL,NULL,NULL,NULL),
+ (79,156,1,'tanyat@testmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (80,127,1,'terrellr@example.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (81,70,1,'olsenr@infomail.net',1,0,0,0,NULL,NULL,NULL,NULL),
+ (82,182,1,'olsen.santina@airmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
+ (83,56,1,'jolsen2@notmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (84,153,1,'sparker@airmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
+ (85,173,1,'parker.arlyne63@fishmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
+ (86,53,1,'parker.miguel15@mymail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
+ (87,53,1,'parkerm48@example.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
+ (88,151,1,'sb.parker@infomail.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (89,109,1,'scarletterry-patel40@spamalot.biz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (90,109,1,'terry-patel.scarlet94@fakemail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
+ (91,51,1,'junkop9@lol.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (92,51,1,'patel.junko@spamalot.org',0,0,0,0,NULL,NULL,NULL,NULL),
+ (93,7,1,'jaypatel@lol.com',1,0,0,0,NULL,NULL,NULL,NULL),
+ (94,24,1,'parker.rebekah@fakemail.net',1,0,0,0,NULL,NULL,NULL,NULL),
+ (95,24,1,'parker.rebekah@airmail.com',0,0,0,0,NULL,NULL,NULL,NULL),
+ (96,57,1,'allanp@fishmail.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (97,62,1,'parker.tanya21@notmail.com',1,0,0,0,NULL,NULL,NULL,NULL),
+ (98,62,1,'tanyap@testing.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
+ (99,191,1,'roberts.r.rosario81@sample.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
+ (100,191,1,'robertsr@mymail.com',0,0,0,0,NULL,NULL,NULL,NULL),
+ (101,39,1,'raysamson39@fakemail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
+ (102,155,1,'rolandos24@spamalot.com',1,0,0,0,NULL,NULL,NULL,NULL),
+ (103,155,1,'samson.rolando56@testmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
+ (104,148,1,'sonnygonzlez97@example.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (105,148,1,'gonzlez.sonny@fakemail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
+ (106,50,1,'jgonzlez-grant17@mymail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (107,50,1,'justinagonzlez-grant@testmail.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),
+ (108,190,1,'gonzlez-grant.g.allen@infomail.com',1,0,0,0,NULL,NULL,NULL,NULL),
+ (109,16,1,'samsont@fishmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
+ (110,2,1,'bettysamson@mymail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
+ (111,2,1,'samson.u.betty@mymail.info',0,0,0,0,NULL,NULL,NULL,NULL),
+ (112,117,1,'samson.t.eleonor@notmail.biz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (113,117,1,'samson.eleonor@fishmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
+ (114,188,1,'kandaces95@fishmail.biz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (115,188,1,'kandaces67@mymail.info',0,0,0,0,NULL,NULL,NULL,NULL),
+ (116,146,1,'jacobs.bob@airmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
+ (117,195,1,'jacobs.juliann35@mymail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
+ (118,195,1,'jacobs.m.juliann@example.org',0,0,0,0,NULL,NULL,NULL,NULL),
+ (119,44,1,'jacobsi54@example.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
+ (120,44,1,'jacobsi85@mymail.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),
+ (121,110,1,'bd.mcreynolds@testmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (122,110,1,'mcreynolds.d.brent@sample.net',0,0,0,0,NULL,NULL,NULL,NULL),
+ (123,163,1,'bmcreynolds62@fakemail.biz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (124,140,1,'ih.reynolds-dimitrov84@fishmail.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (125,38,1,'kwagner@airmail.net',1,0,0,0,NULL,NULL,NULL,NULL),
+ (126,38,1,'wagnerk94@fishmail.com',0,0,0,0,NULL,NULL,NULL,NULL),
+ (127,108,1,'iwagner23@airmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
+ (128,26,1,'erroljameson9@mymail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),
+ (129,26,1,'errolj29@testmail.com',0,0,0,0,NULL,NULL,NULL,NULL),
+ (130,75,1,'jameson-patel.bob32@fishmail.biz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (131,168,1,'dr.barkley-grant@sample.co.in',1,0,0,0,NULL,NULL,NULL,NULL),
+ (132,183,1,'reynolds.maxwell36@fakemail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
+ (133,64,1,'scarletb@spamalot.com',1,0,0,0,NULL,NULL,NULL,NULL),
+ (134,72,1,'reynoldsw@notmail.com',1,0,0,0,NULL,NULL,NULL,NULL),
+ (135,71,1,'rolandodeforest33@mymail.net',1,0,0,0,NULL,NULL,NULL,NULL),
+ (136,71,1,'rdeforest96@testmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
+ (137,181,1,'shaunaadams-deforest38@airmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (138,181,1,'adams-deforests@lol.net',0,0,0,0,NULL,NULL,NULL,NULL),
+ (139,175,1,'adams-deforestl@testmail.net',1,0,0,0,NULL,NULL,NULL,NULL),
+ (140,175,1,'lashawndaadams-deforest@example.net',0,0,0,0,NULL,NULL,NULL,NULL),
+ (141,3,1,'justinas36@spamalot.info',1,0,0,0,NULL,NULL,NULL,NULL),
+ (142,3,1,'justinasamuels-samson@fishmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
+ (143,103,1,'sj.samuels-samson@notmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (144,103,1,'samuels-samson.j.shad@mymail.net',0,0,0,0,NULL,NULL,NULL,NULL),
+ (145,126,1,'rebekahmcreynolds86@lol.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
+ (146,126,1,'mcreynoldsr@airmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
+ (147,164,1,'andrews@example.biz',1,0,0,0,NULL,NULL,NULL,NULL),
+ (148,164,1,'samuels-mcreynoldsa38@fishmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),
+ (149,139,1,'kathleent@lol.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),
+ (150,139,1,'kathleenterry-mcreynolds@fakemail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),
+ (151,193,3,'service@texassolutions.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (152,108,2,'wagner.iris@texassolutions.org',0,0,0,0,NULL,NULL,NULL,NULL),
+ (153,17,3,'info@communitysolutions.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (154,78,2,'sgrant@communitysolutions.org',0,0,0,0,NULL,NULL,NULL,NULL),
+ (155,9,3,'feedback@sierralegalsystems.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (156,60,2,'scottcruz@sierralegalsystems.org',0,0,0,0,NULL,NULL,NULL,NULL),
+ (157,23,3,'contact@creativeadvocacyalliance.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (158,144,3,'contact@urbanfellowship.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (159,74,2,'mcreynoldsb31@urbanfellowship.org',0,0,0,0,NULL,NULL,NULL,NULL),
+ (160,129,3,'feedback@globalwellnesspartners.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (161,138,2,'lareeterry69@globalwellnesspartners.org',0,0,0,0,NULL,NULL,NULL,NULL),
+ (162,174,3,'sales@communitydevelopmentservices.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (163,73,2,'dimitrov.scarlet@communitydevelopmentservices.org',0,0,0,0,NULL,NULL,NULL,NULL),
+ (164,49,3,'contact@toledonetwork.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (165,158,2,'zope.juliann@toledonetwork.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (166,192,3,'contact@northpointmusicsystems.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (167,186,2,'gonzlezk1@northpointmusicsystems.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (168,121,3,'sales@mississippimusic.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (169,52,2,'wprentice25@mississippimusic.org',0,0,0,0,NULL,NULL,NULL,NULL),
+ (170,184,3,'info@spactionfund.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (171,83,2,'barkleye@spactionfund.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (172,124,3,'feedback@spcultureschool.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (173,163,2,'bernadettemcreynolds68@spcultureschool.org',0,0,0,0,NULL,NULL,NULL,NULL),
+ (174,135,3,'contact@greensborohealthpartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (175,84,3,'info@ecfamilyschool.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (176,166,2,'roberts.lawerence@ecfamilyschool.org',0,0,0,0,NULL,NULL,NULL,NULL),
+ (177,69,3,'sales@dowlenempowermentnetwork.org',1,0,0,0,NULL,NULL,NULL,NULL),
+ (178,155,2,'rsamson78@dowlenempowermentnetwork.org',0,0,0,0,NULL,NULL,NULL,NULL),
  (179,202,1,'jenny@example.com',1,0,0,0,NULL,NULL,NULL,NULL),
  (180,NULL,1,'development@example.org',0,0,0,0,NULL,NULL,NULL,NULL),
  (181,NULL,1,'tournaments@example.org',0,0,0,0,NULL,NULL,NULL,NULL),
@@ -3288,11 +3293,11 @@ INSERT INTO `civicrm_entity_financial_trxn` (`id`, `entity_table`, `entity_id`,
  (64,'civicrm_financial_item',32,32,100.00),
  (65,'civicrm_contribution',34,33,100.00),
  (66,'civicrm_financial_item',33,33,100.00),
- (67,'civicrm_contribution',36,34,100.00),
+ (67,'civicrm_contribution',38,34,100.00),
  (68,'civicrm_financial_item',34,34,100.00),
- (69,'civicrm_contribution',38,35,100.00),
+ (69,'civicrm_contribution',40,35,100.00),
  (70,'civicrm_financial_item',35,35,100.00),
- (71,'civicrm_contribution',40,36,100.00),
+ (71,'civicrm_contribution',41,36,100.00),
  (72,'civicrm_financial_item',36,36,100.00),
  (73,'civicrm_contribution',44,37,100.00),
  (74,'civicrm_financial_item',37,37,100.00),
@@ -3302,25 +3307,25 @@ INSERT INTO `civicrm_entity_financial_trxn` (`id`, `entity_table`, `entity_id`,
  (78,'civicrm_financial_item',39,39,100.00),
  (79,'civicrm_contribution',50,40,100.00),
  (80,'civicrm_financial_item',40,40,100.00),
- (81,'civicrm_contribution',52,41,100.00),
+ (81,'civicrm_contribution',51,41,100.00),
  (82,'civicrm_financial_item',41,41,100.00),
- (83,'civicrm_contribution',54,42,100.00),
+ (83,'civicrm_contribution',52,42,100.00),
  (84,'civicrm_financial_item',42,42,100.00),
- (85,'civicrm_contribution',58,43,100.00),
+ (85,'civicrm_contribution',54,43,100.00),
  (86,'civicrm_financial_item',43,43,100.00),
- (87,'civicrm_contribution',60,44,100.00),
+ (87,'civicrm_contribution',58,44,100.00),
  (88,'civicrm_financial_item',44,44,100.00),
- (89,'civicrm_contribution',61,45,100.00),
+ (89,'civicrm_contribution',60,45,100.00),
  (90,'civicrm_financial_item',45,45,100.00),
  (91,'civicrm_contribution',33,46,50.00),
  (92,'civicrm_financial_item',46,46,50.00),
  (93,'civicrm_contribution',35,47,50.00),
  (94,'civicrm_financial_item',47,47,50.00),
- (95,'civicrm_contribution',37,48,50.00),
+ (95,'civicrm_contribution',36,48,50.00),
  (96,'civicrm_financial_item',48,48,50.00),
- (97,'civicrm_contribution',39,49,50.00),
+ (97,'civicrm_contribution',37,49,50.00),
  (98,'civicrm_financial_item',49,49,50.00),
- (99,'civicrm_contribution',41,50,50.00),
+ (99,'civicrm_contribution',39,50,50.00),
  (100,'civicrm_financial_item',50,50,50.00),
  (101,'civicrm_contribution',43,51,50.00),
  (102,'civicrm_financial_item',51,51,50.00),
@@ -3330,119 +3335,119 @@ INSERT INTO `civicrm_entity_financial_trxn` (`id`, `entity_table`, `entity_id`,
  (106,'civicrm_financial_item',53,53,50.00),
  (107,'civicrm_contribution',49,54,50.00),
  (108,'civicrm_financial_item',54,54,50.00),
- (109,'civicrm_contribution',51,55,50.00),
+ (109,'civicrm_contribution',55,55,50.00),
  (110,'civicrm_financial_item',55,55,50.00),
- (111,'civicrm_contribution',55,56,50.00),
+ (111,'civicrm_contribution',56,56,50.00),
  (112,'civicrm_financial_item',56,56,50.00),
- (113,'civicrm_contribution',56,57,50.00),
+ (113,'civicrm_contribution',57,57,50.00),
  (114,'civicrm_financial_item',57,57,50.00),
- (115,'civicrm_contribution',57,58,50.00),
+ (115,'civicrm_contribution',59,58,50.00),
  (116,'civicrm_financial_item',58,58,50.00),
- (117,'civicrm_contribution',59,59,50.00),
+ (117,'civicrm_contribution',61,59,50.00),
  (118,'civicrm_financial_item',59,59,50.00),
  (119,'civicrm_contribution',42,60,1200.00),
  (120,'civicrm_financial_item',60,60,1200.00),
  (121,'civicrm_contribution',53,61,1200.00),
  (122,'civicrm_financial_item',61,61,1200.00),
- (123,'civicrm_contribution',96,62,50.00),
+ (123,'civicrm_contribution',64,62,50.00),
  (124,'civicrm_financial_item',62,62,50.00),
- (125,'civicrm_contribution',81,63,50.00),
+ (125,'civicrm_contribution',67,63,50.00),
  (126,'civicrm_financial_item',63,63,50.00),
- (127,'civicrm_contribution',78,64,50.00),
+ (127,'civicrm_contribution',70,64,50.00),
  (128,'civicrm_financial_item',64,64,50.00),
- (129,'civicrm_contribution',101,65,50.00),
+ (129,'civicrm_contribution',73,65,50.00),
  (130,'civicrm_financial_item',65,65,50.00),
- (131,'civicrm_contribution',99,66,50.00),
+ (131,'civicrm_contribution',76,66,50.00),
  (132,'civicrm_financial_item',66,66,50.00),
- (133,'civicrm_contribution',76,67,50.00),
+ (133,'civicrm_contribution',79,67,50.00),
  (134,'civicrm_financial_item',67,67,50.00),
- (135,'civicrm_contribution',74,68,50.00),
+ (135,'civicrm_contribution',82,68,50.00),
  (136,'civicrm_financial_item',68,68,50.00),
- (137,'civicrm_contribution',86,69,50.00),
+ (137,'civicrm_contribution',85,69,50.00),
  (138,'civicrm_financial_item',69,69,50.00),
- (139,'civicrm_contribution',84,70,50.00),
+ (139,'civicrm_contribution',89,70,50.00),
  (140,'civicrm_financial_item',70,70,50.00),
- (141,'civicrm_contribution',97,71,50.00),
+ (141,'civicrm_contribution',92,71,50.00),
  (142,'civicrm_financial_item',71,71,50.00),
- (143,'civicrm_contribution',65,72,50.00),
+ (143,'civicrm_contribution',95,72,50.00),
  (144,'civicrm_financial_item',72,72,50.00),
- (145,'civicrm_contribution',106,73,50.00),
+ (145,'civicrm_contribution',98,73,50.00),
  (146,'civicrm_financial_item',73,73,50.00),
- (147,'civicrm_contribution',70,74,50.00),
+ (147,'civicrm_contribution',101,74,50.00),
  (148,'civicrm_financial_item',74,74,50.00),
- (149,'civicrm_contribution',102,75,50.00),
+ (149,'civicrm_contribution',104,75,50.00),
  (150,'civicrm_financial_item',75,75,50.00),
- (151,'civicrm_contribution',112,76,50.00),
+ (151,'civicrm_contribution',107,76,50.00),
  (152,'civicrm_financial_item',76,76,50.00),
- (153,'civicrm_contribution',95,77,50.00),
+ (153,'civicrm_contribution',110,77,50.00),
  (154,'civicrm_financial_item',77,77,50.00),
- (155,'civicrm_contribution',104,78,800.00),
+ (155,'civicrm_contribution',65,78,800.00),
  (156,'civicrm_financial_item',78,78,800.00),
- (157,'civicrm_contribution',83,79,800.00),
+ (157,'civicrm_contribution',68,79,800.00),
  (158,'civicrm_financial_item',79,79,800.00),
- (159,'civicrm_contribution',91,80,800.00),
+ (159,'civicrm_contribution',71,80,800.00),
  (160,'civicrm_financial_item',80,80,800.00),
- (161,'civicrm_contribution',92,81,800.00),
+ (161,'civicrm_contribution',74,81,800.00),
  (162,'civicrm_financial_item',81,81,800.00),
- (163,'civicrm_contribution',105,82,800.00),
+ (163,'civicrm_contribution',77,82,800.00),
  (164,'civicrm_financial_item',82,82,800.00),
- (165,'civicrm_contribution',89,83,800.00),
+ (165,'civicrm_contribution',80,83,800.00),
  (166,'civicrm_financial_item',83,83,800.00),
- (167,'civicrm_contribution',94,84,800.00),
+ (167,'civicrm_contribution',83,84,800.00),
  (168,'civicrm_financial_item',84,84,800.00),
- (169,'civicrm_contribution',109,85,800.00),
+ (169,'civicrm_contribution',86,85,800.00),
  (170,'civicrm_financial_item',85,85,800.00),
- (171,'civicrm_contribution',64,86,800.00),
+ (171,'civicrm_contribution',87,86,800.00),
  (172,'civicrm_financial_item',86,86,800.00),
- (173,'civicrm_contribution',111,87,800.00),
+ (173,'civicrm_contribution',90,87,800.00),
  (174,'civicrm_financial_item',87,87,800.00),
- (175,'civicrm_contribution',82,88,800.00),
+ (175,'civicrm_contribution',93,88,800.00),
  (176,'civicrm_financial_item',88,88,800.00),
- (177,'civicrm_contribution',108,89,800.00),
+ (177,'civicrm_contribution',96,89,800.00),
  (178,'civicrm_financial_item',89,89,800.00),
- (179,'civicrm_contribution',77,90,800.00),
+ (179,'civicrm_contribution',99,90,800.00),
  (180,'civicrm_financial_item',90,90,800.00),
- (181,'civicrm_contribution',80,91,800.00),
+ (181,'civicrm_contribution',102,91,800.00),
  (182,'civicrm_financial_item',91,91,800.00),
- (183,'civicrm_contribution',63,92,800.00),
+ (183,'civicrm_contribution',105,92,800.00),
  (184,'civicrm_financial_item',92,92,800.00),
- (185,'civicrm_contribution',66,93,800.00),
+ (185,'civicrm_contribution',108,93,800.00),
  (186,'civicrm_financial_item',93,93,800.00),
- (187,'civicrm_contribution',75,94,800.00),
+ (187,'civicrm_contribution',111,94,800.00),
  (188,'civicrm_financial_item',94,94,800.00),
- (189,'civicrm_contribution',98,95,800.00),
+ (189,'civicrm_contribution',112,95,800.00),
  (190,'civicrm_financial_item',95,95,800.00),
- (191,'civicrm_contribution',88,96,50.00),
+ (191,'civicrm_contribution',63,96,50.00),
  (192,'civicrm_financial_item',96,96,50.00),
- (193,'civicrm_contribution',69,97,50.00),
+ (193,'civicrm_contribution',66,97,50.00),
  (194,'civicrm_financial_item',97,97,50.00),
- (195,'civicrm_contribution',72,98,50.00),
+ (195,'civicrm_contribution',69,98,50.00),
  (196,'civicrm_financial_item',98,98,50.00),
- (197,'civicrm_contribution',85,99,50.00),
+ (197,'civicrm_contribution',72,99,50.00),
  (198,'civicrm_financial_item',99,99,50.00),
- (199,'civicrm_contribution',93,100,50.00),
+ (199,'civicrm_contribution',75,100,50.00),
  (200,'civicrm_financial_item',100,100,50.00),
- (201,'civicrm_contribution',87,101,50.00),
+ (201,'civicrm_contribution',78,101,50.00),
  (202,'civicrm_financial_item',101,101,50.00),
- (203,'civicrm_contribution',110,102,50.00),
+ (203,'civicrm_contribution',81,102,50.00),
  (204,'civicrm_financial_item',102,102,50.00),
- (205,'civicrm_contribution',107,103,50.00),
+ (205,'civicrm_contribution',84,103,50.00),
  (206,'civicrm_financial_item',103,103,50.00),
- (207,'civicrm_contribution',90,104,50.00),
+ (207,'civicrm_contribution',88,104,50.00),
  (208,'civicrm_financial_item',104,104,50.00),
- (209,'civicrm_contribution',73,105,50.00),
+ (209,'civicrm_contribution',91,105,50.00),
  (210,'civicrm_financial_item',105,105,50.00),
- (211,'civicrm_contribution',68,106,50.00),
+ (211,'civicrm_contribution',94,106,50.00),
  (212,'civicrm_financial_item',106,106,50.00),
- (213,'civicrm_contribution',79,107,50.00),
+ (213,'civicrm_contribution',97,107,50.00),
  (214,'civicrm_financial_item',107,107,50.00),
- (215,'civicrm_contribution',71,108,50.00),
+ (215,'civicrm_contribution',100,108,50.00),
  (216,'civicrm_financial_item',108,108,50.00),
- (217,'civicrm_contribution',67,109,50.00),
+ (217,'civicrm_contribution',103,109,50.00),
  (218,'civicrm_financial_item',109,109,50.00),
- (219,'civicrm_contribution',100,110,50.00),
+ (219,'civicrm_contribution',106,110,50.00),
  (220,'civicrm_financial_item',110,110,50.00),
- (221,'civicrm_contribution',103,111,50.00),
+ (221,'civicrm_contribution',109,111,50.00),
  (222,'civicrm_financial_item',111,111,50.00);
 /*!40000 ALTER TABLE `civicrm_entity_financial_trxn` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -3454,122 +3459,125 @@ 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
- (92,'civicrm_contact',7,5),
- (110,'civicrm_contact',12,4),
- (111,'civicrm_contact',12,5),
- (41,'civicrm_contact',14,5),
- (55,'civicrm_contact',17,4),
- (98,'civicrm_contact',20,4),
- (1,'civicrm_contact',21,1),
- (25,'civicrm_contact',22,5),
- (106,'civicrm_contact',26,5),
- (44,'civicrm_contact',27,4),
- (45,'civicrm_contact',27,5),
- (109,'civicrm_contact',28,4),
- (58,'civicrm_contact',30,4),
- (59,'civicrm_contact',30,5),
- (103,'civicrm_contact',31,4),
- (42,'civicrm_contact',34,5),
- (10,'civicrm_contact',36,2),
- (15,'civicrm_contact',37,5),
- (71,'civicrm_contact',38,4),
+ (112,'civicrm_contact',3,4),
+ (113,'civicrm_contact',3,5),
+ (2,'civicrm_contact',9,3),
+ (92,'civicrm_contact',12,4),
+ (93,'civicrm_contact',12,5),
+ (24,'civicrm_contact',13,4),
+ (10,'civicrm_contact',14,1),
+ (85,'civicrm_contact',16,4),
+ (64,'civicrm_contact',19,4),
+ (25,'civicrm_contact',21,4),
+ (26,'civicrm_contact',21,5),
+ (30,'civicrm_contact',22,4),
+ (75,'civicrm_contact',24,4),
+ (76,'civicrm_contact',24,5),
+ (82,'civicrm_contact',25,5),
+ (98,'civicrm_contact',26,4),
+ (51,'civicrm_contact',28,5),
+ (62,'civicrm_contact',30,4),
+ (63,'civicrm_contact',30,5),
+ (22,'civicrm_contact',36,4),
+ (23,'civicrm_contact',36,5),
+ (13,'civicrm_contact',37,4),
+ (97,'civicrm_contact',38,4),
+ (80,'civicrm_contact',39,4),
+ (81,'civicrm_contact',39,5),
  (6,'civicrm_contact',40,2),
- (75,'civicrm_contact',42,4),
- (76,'civicrm_contact',42,5),
- (34,'civicrm_contact',50,4),
- (54,'civicrm_contact',52,5),
- (16,'civicrm_contact',53,5),
- (114,'civicrm_contact',54,4),
- (115,'civicrm_contact',54,5),
- (70,'civicrm_contact',56,4),
- (63,'civicrm_contact',57,4),
- (64,'civicrm_contact',57,5),
- (69,'civicrm_contact',58,5),
- (49,'civicrm_contact',60,4),
- (50,'civicrm_contact',60,5),
- (100,'civicrm_contact',61,5),
- (51,'civicrm_contact',63,4),
- (52,'civicrm_contact',63,5),
- (93,'civicrm_contact',65,5),
- (68,'civicrm_contact',68,5),
- (40,'civicrm_contact',71,4),
- (37,'civicrm_contact',75,4),
- (38,'civicrm_contact',75,5),
- (33,'civicrm_contact',77,4),
- (74,'civicrm_contact',79,4),
- (112,'civicrm_contact',81,4),
- (113,'civicrm_contact',81,5),
- (65,'civicrm_contact',83,4),
- (27,'civicrm_contact',84,4),
- (28,'civicrm_contact',84,5),
- (31,'civicrm_contact',85,4),
- (2,'civicrm_contact',87,3),
- (48,'civicrm_contact',91,5),
- (29,'civicrm_contact',93,4),
- (30,'civicrm_contact',93,5),
- (87,'civicrm_contact',95,4),
- (82,'civicrm_contact',96,4),
- (83,'civicrm_contact',96,5),
- (99,'civicrm_contact',97,5),
- (13,'civicrm_contact',99,4),
- (14,'civicrm_contact',99,5),
- (4,'civicrm_contact',100,3),
- (32,'civicrm_contact',101,4),
- (91,'civicrm_contact',104,5),
- (72,'civicrm_contact',107,4),
- (60,'civicrm_contact',109,5),
- (26,'civicrm_contact',110,4),
- (101,'civicrm_contact',111,4),
- (102,'civicrm_contact',111,5),
- (86,'civicrm_contact',112,4),
- (17,'civicrm_contact',113,4),
- (85,'civicrm_contact',119,5),
- (11,'civicrm_contact',120,4),
- (12,'civicrm_contact',120,5),
- (36,'civicrm_contact',121,4),
- (5,'civicrm_contact',122,1),
- (67,'civicrm_contact',124,4),
- (62,'civicrm_contact',125,4),
- (104,'civicrm_contact',126,4),
- (105,'civicrm_contact',126,5),
- (53,'civicrm_contact',128,5),
- (77,'civicrm_contact',132,4),
- (78,'civicrm_contact',132,5),
- (21,'civicrm_contact',137,5),
- (3,'civicrm_contact',138,2),
- (18,'civicrm_contact',141,4),
- (19,'civicrm_contact',141,5),
- (7,'civicrm_contact',142,2),
- (79,'civicrm_contact',144,4),
- (80,'civicrm_contact',144,5),
- (8,'civicrm_contact',145,1),
- (39,'civicrm_contact',146,5),
- (73,'civicrm_contact',149,5),
- (89,'civicrm_contact',153,4),
- (90,'civicrm_contact',153,5),
- (61,'civicrm_contact',155,5),
- (116,'civicrm_contact',157,5),
- (56,'civicrm_contact',159,4),
- (57,'civicrm_contact',159,5),
- (96,'civicrm_contact',162,4),
- (97,'civicrm_contact',162,5),
- (43,'civicrm_contact',163,4),
- (35,'civicrm_contact',164,5),
- (46,'civicrm_contact',168,4),
- (47,'civicrm_contact',168,5),
- (66,'civicrm_contact',175,4),
- (95,'civicrm_contact',179,4),
- (9,'civicrm_contact',180,1),
- (20,'civicrm_contact',181,5),
- (23,'civicrm_contact',183,4),
- (24,'civicrm_contact',183,5),
- (84,'civicrm_contact',185,4),
- (81,'civicrm_contact',188,5),
- (22,'civicrm_contact',190,4),
- (88,'civicrm_contact',191,4),
- (94,'civicrm_contact',197,4),
- (107,'civicrm_contact',201,4),
- (108,'civicrm_contact',201,5);
+ (94,'civicrm_contact',47,5),
+ (95,'civicrm_contact',48,4),
+ (96,'civicrm_contact',48,5),
+ (5,'civicrm_contact',49,3),
+ (84,'civicrm_contact',50,4),
+ (73,'civicrm_contact',51,4),
+ (74,'civicrm_contact',51,5),
+ (61,'civicrm_contact',52,5),
+ (71,'civicrm_contact',53,4),
+ (59,'civicrm_contact',54,4),
+ (60,'civicrm_contact',54,5),
+ (52,'civicrm_contact',55,5),
+ (40,'civicrm_contact',60,4),
+ (41,'civicrm_contact',60,5),
+ (77,'civicrm_contact',62,5),
+ (58,'civicrm_contact',65,4),
+ (65,'civicrm_contact',67,4),
+ (67,'civicrm_contact',70,5),
+ (106,'civicrm_contact',72,4),
+ (107,'civicrm_contact',72,5),
+ (14,'civicrm_contact',73,5),
+ (99,'civicrm_contact',75,4),
+ (100,'civicrm_contact',75,5),
+ (36,'civicrm_contact',76,4),
+ (66,'civicrm_contact',77,4),
+ (43,'civicrm_contact',81,4),
+ (44,'civicrm_contact',81,5),
+ (91,'civicrm_contact',82,5),
+ (101,'civicrm_contact',83,5),
+ (48,'civicrm_contact',92,5),
+ (32,'civicrm_contact',94,5),
+ (12,'civicrm_contact',95,5),
+ (34,'civicrm_contact',96,4),
+ (35,'civicrm_contact',96,5),
+ (72,'civicrm_contact',101,5),
+ (118,'civicrm_contact',104,5),
+ (79,'civicrm_contact',106,5),
+ (90,'civicrm_contact',110,4),
+ (16,'civicrm_contact',111,4),
+ (17,'civicrm_contact',111,5),
+ (49,'civicrm_contact',112,5),
+ (89,'civicrm_contact',113,4),
+ (108,'civicrm_contact',115,5),
+ (21,'civicrm_contact',116,4),
+ (86,'civicrm_contact',117,4),
+ (87,'civicrm_contact',117,5),
+ (119,'civicrm_contact',119,4),
+ (116,'civicrm_contact',120,4),
+ (117,'civicrm_contact',120,5),
+ (7,'civicrm_contact',121,1),
+ (37,'civicrm_contact',122,4),
+ (53,'civicrm_contact',125,5),
+ (45,'civicrm_contact',128,5),
+ (8,'civicrm_contact',130,1),
+ (9,'civicrm_contact',135,1),
+ (33,'civicrm_contact',136,5),
+ (46,'civicrm_contact',138,4),
+ (47,'civicrm_contact',138,5),
+ (3,'civicrm_contact',144,3),
+ (50,'civicrm_contact',145,4),
+ (88,'civicrm_contact',146,5),
+ (83,'civicrm_contact',148,5),
+ (69,'civicrm_contact',153,4),
+ (70,'civicrm_contact',153,5),
+ (29,'civicrm_contact',154,5),
+ (18,'civicrm_contact',158,5),
+ (38,'civicrm_contact',159,4),
+ (39,'civicrm_contact',159,5),
+ (114,'civicrm_contact',165,4),
+ (115,'civicrm_contact',165,5),
+ (31,'civicrm_contact',167,5),
+ (102,'civicrm_contact',168,4),
+ (103,'civicrm_contact',168,5),
+ (27,'civicrm_contact',171,4),
+ (28,'civicrm_contact',171,5),
+ (4,'civicrm_contact',174,1),
+ (68,'civicrm_contact',176,5),
+ (110,'civicrm_contact',180,4),
+ (111,'civicrm_contact',180,5),
+ (109,'civicrm_contact',181,5),
+ (104,'civicrm_contact',183,4),
+ (105,'civicrm_contact',183,5),
+ (11,'civicrm_contact',185,4),
+ (56,'civicrm_contact',186,4),
+ (57,'civicrm_contact',186,5),
+ (54,'civicrm_contact',189,4),
+ (55,'civicrm_contact',189,5),
+ (78,'civicrm_contact',191,4),
+ (1,'civicrm_contact',193,1),
+ (42,'civicrm_contact',197,4),
+ (19,'civicrm_contact',198,4),
+ (20,'civicrm_contact',198,5),
+ (15,'civicrm_contact',200,5);
 /*!40000 ALTER TABLE `civicrm_entity_tag` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3580,9 +3588,9 @@ 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`, `is_show_calendar_links`) 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,'2024-07-06 17:00:00','2024-07-08 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,0,0,NULL,0,0,NULL,NULL,0,NULL,NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0,1),
- (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,'2024-01-05 12:00:00','2024-01-05 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,0,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,0,0,NULL,0,0,NULL,NULL,0,NULL,NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0,1),
- (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,'2024-08-06 07:00:00','2024-08-09 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,0,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,0,0,NULL,0,0,NULL,NULL,0,NULL,NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0,1),
+ (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,'2024-10-26 17:00:00','2024-10-28 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,0,0,NULL,0,0,NULL,NULL,0,NULL,NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0,1),
+ (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,'2024-04-25 12:00:00','2024-04-25 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,0,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,0,0,NULL,0,0,NULL,NULL,0,NULL,NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0,1),
+ (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,'2024-11-26 07:00:00','2024-11-29 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,0,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,0,0,NULL,0,0,NULL,NULL,0,NULL,NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0,1),
  (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,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,NULL,NULL,1,0,0,0,0,NULL,0,0,NULL,NULL,1,'Free Meeting without Online Registration',NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0,1),
  (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,0,0,NULL,0,0,NULL,NULL,1,'Free Meeting with Online Registration',NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0,1),
  (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,0,0,NULL,0,0,NULL,NULL,1,'Paid Conference with Online Registration',NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0,1);
@@ -3671,117 +3679,117 @@ 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,'2024-01-06 04:30:31','2014-01-06 04:30:30',2,'Contribution Amount',125.00,'USD',1,1,'civicrm_line_item',1),
- (2,'2024-01-06 04:30:31','2021-10-06 04:30:30',4,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',2),
- (3,'2024-01-06 04:30:31','2017-12-11 15:30:30',6,'Contribution Amount',25.00,'GBP',1,1,'civicrm_line_item',3),
- (4,'2024-01-06 04:30:31','2021-10-06 04:30:30',8,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',4),
- (5,'2024-01-06 04:30:31','2021-10-06 04:30:30',4,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',5),
- (6,'2024-01-06 04:30:31','2023-10-13 03:48:30',16,'Contribution Amount',500.00,'USD',1,1,'civicrm_line_item',6),
- (7,'2024-01-06 04:30:31','2024-01-04 04:30:30',19,'Contribution Amount',1750.00,'USD',1,1,'civicrm_line_item',7),
- (8,'2024-01-06 04:30:31','2023-05-14 12:41:30',82,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',8),
- (9,'2024-01-06 04:30:31','2023-02-06 04:30:30',92,'Contribution Amount',10.00,'USD',1,1,'civicrm_line_item',9),
- (10,'2024-01-06 04:30:31','2019-08-14 06:30:30',34,'Contribution Amount',250.00,'USD',1,1,'civicrm_line_item',10),
- (11,'2024-01-06 04:30:31','2024-01-05 00:30:30',71,'Contribution Amount',500.00,'JPY',1,1,'civicrm_line_item',11),
- (12,'2024-01-06 04:30:31','2022-10-05 17:57:10',43,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',12),
- (13,'2024-01-06 04:30:31','2023-10-06 00:00:00',32,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',13),
- (14,'2024-01-06 04:30:31','2023-11-06 00:00:00',32,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',14),
- (15,'2024-01-06 04:30:31','2022-10-06 04:30:30',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',15),
- (16,'2024-01-06 04:30:31','2022-11-06 04:30:30',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',16),
- (17,'2024-01-06 04:30:31','2022-12-06 04:30:30',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',17),
- (18,'2024-01-06 04:30:31','2023-01-06 04:30:30',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',18),
- (19,'2024-01-06 04:30:31','2023-02-06 04:30:30',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',19),
- (20,'2024-01-06 04:30:31','2023-03-06 04:30:30',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',20),
- (21,'2024-01-06 04:30:31','2023-04-06 04:30:30',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',21),
- (22,'2024-01-06 04:30:31','2023-05-06 04:30:30',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',22),
- (23,'2024-01-06 04:30:31','2023-06-06 04:30:30',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',23),
- (24,'2024-01-06 04:30:31','2023-07-06 04:30:30',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',24),
- (25,'2024-01-06 04:30:31','2023-08-06 04:30:30',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',25),
- (26,'2024-01-06 04:30:31','2023-05-06 04:30:30',99,'Contribution Amount',10.00,'CAD',1,1,'civicrm_line_item',26),
- (27,'2024-01-06 04:30:31','2023-06-06 04:30:30',99,'Contribution Amount',10.00,'CAD',1,1,'civicrm_line_item',27),
- (28,'2024-01-06 04:30:31','2023-07-06 04:30:30',99,'Contribution Amount',10.00,'CAD',1,1,'civicrm_line_item',28),
- (29,'2024-01-06 04:30:31','2023-08-06 04:30:30',99,'Contribution Amount',10.00,'CAD',1,1,'civicrm_line_item',29),
- (30,'2024-01-06 04:30:31','2023-09-06 04:30:30',99,'Contribution Amount',10.00,'CAD',1,1,'civicrm_line_item',30),
- (31,'2024-01-06 04:30:31','2023-12-06 04:30:30',103,'Contribution Amount',5.00,'EUR',1,1,'civicrm_line_item',31),
- (32,'2024-01-06 04:30:31','2024-01-06 04:30:30',183,'General',100.00,'USD',2,1,'civicrm_line_item',32),
- (33,'2024-01-06 04:30:31','2024-01-06 04:30:30',56,'General',100.00,'USD',2,1,'civicrm_line_item',33),
- (34,'2024-01-06 04:30:31','2024-01-06 04:30:30',102,'General',100.00,'USD',2,1,'civicrm_line_item',34),
- (35,'2024-01-06 04:30:31','2024-01-06 04:30:30',22,'General',100.00,'USD',2,1,'civicrm_line_item',35),
- (36,'2024-01-06 04:30:31','2024-01-06 04:30:30',150,'General',100.00,'USD',2,1,'civicrm_line_item',36),
- (37,'2024-01-06 04:30:31','2024-01-06 04:30:30',42,'General',100.00,'USD',2,1,'civicrm_line_item',37),
- (38,'2024-01-06 04:30:31','2024-01-06 04:30:30',65,'General',100.00,'USD',2,1,'civicrm_line_item',38),
- (39,'2024-01-06 04:30:31','2024-01-06 04:30:30',159,'General',100.00,'USD',2,1,'civicrm_line_item',39),
- (40,'2024-01-06 04:30:31','2024-01-06 04:30:30',38,'General',100.00,'USD',2,1,'civicrm_line_item',40),
- (41,'2024-01-06 04:30:31','2024-01-06 04:30:30',9,'General',100.00,'USD',2,1,'civicrm_line_item',41),
- (42,'2024-01-06 04:30:31','2024-01-06 04:30:30',4,'General',100.00,'USD',2,1,'civicrm_line_item',42),
- (43,'2024-01-06 04:30:31','2024-01-06 04:30:30',28,'General',100.00,'USD',2,1,'civicrm_line_item',43),
- (44,'2024-01-06 04:30:31','2024-01-06 04:30:30',24,'General',100.00,'USD',2,1,'civicrm_line_item',44),
- (45,'2024-01-06 04:30:31','2024-01-06 04:30:30',188,'General',100.00,'USD',2,1,'civicrm_line_item',45),
- (46,'2024-01-06 04:30:31','2024-01-06 04:30:30',160,'Student',50.00,'USD',2,1,'civicrm_line_item',46),
- (47,'2024-01-06 04:30:31','2024-01-06 04:30:30',157,'Student',50.00,'USD',2,1,'civicrm_line_item',47),
- (48,'2024-01-06 04:30:31','2024-01-06 04:30:30',41,'Student',50.00,'USD',2,1,'civicrm_line_item',48),
- (49,'2024-01-06 04:30:31','2024-01-06 04:30:30',165,'Student',50.00,'USD',2,1,'civicrm_line_item',49),
- (50,'2024-01-06 04:30:31','2024-01-06 04:30:30',129,'Student',50.00,'USD',2,1,'civicrm_line_item',50),
- (51,'2024-01-06 04:30:31','2024-01-06 04:30:30',11,'Student',50.00,'USD',2,1,'civicrm_line_item',51),
- (52,'2024-01-06 04:30:31','2024-01-06 04:30:30',93,'Student',50.00,'USD',2,1,'civicrm_line_item',52),
- (53,'2024-01-06 04:30:31','2024-01-06 04:30:30',202,'Student',50.00,'USD',2,1,'civicrm_line_item',53),
- (54,'2024-01-06 04:30:31','2024-01-06 04:30:30',123,'Student',50.00,'USD',2,1,'civicrm_line_item',54),
- (55,'2024-01-06 04:30:31','2024-01-06 04:30:30',78,'Student',50.00,'USD',2,1,'civicrm_line_item',55),
- (56,'2024-01-06 04:30:31','2024-01-06 04:30:30',94,'Student',50.00,'USD',2,1,'civicrm_line_item',56),
- (57,'2024-01-06 04:30:31','2024-01-06 04:30:30',35,'Student',50.00,'USD',2,1,'civicrm_line_item',57),
- (58,'2024-01-06 04:30:31','2024-01-06 04:30:30',66,'Student',50.00,'USD',2,1,'civicrm_line_item',58),
- (59,'2024-01-06 04:30:31','2024-01-06 04:30:30',27,'Student',50.00,'USD',2,1,'civicrm_line_item',59),
- (60,'2024-01-06 04:30:31','2024-01-06 04:30:30',3,'Lifetime',1200.00,'USD',2,1,'civicrm_line_item',60),
- (61,'2024-01-06 04:30:31','2024-01-06 04:30:30',139,'Lifetime',1200.00,'USD',2,1,'civicrm_line_item',61),
- (62,'2024-01-06 04:30:31','2024-01-06 04:30:30',138,'Soprano',50.00,'USD',2,1,'civicrm_line_item',97),
- (63,'2024-01-06 04:30:31','2024-01-06 04:30:30',67,'Soprano',50.00,'USD',2,1,'civicrm_line_item',98),
- (64,'2024-01-06 04:30:31','2024-01-06 04:30:30',62,'Soprano',50.00,'USD',2,1,'civicrm_line_item',99),
- (65,'2024-01-06 04:30:31','2024-01-06 04:30:30',161,'Soprano',50.00,'USD',2,1,'civicrm_line_item',100),
- (66,'2024-01-06 04:30:31','2024-01-06 04:30:30',148,'Soprano',50.00,'USD',2,1,'civicrm_line_item',101),
- (67,'2024-01-06 04:30:31','2024-01-06 04:30:30',47,'Soprano',50.00,'USD',2,1,'civicrm_line_item',102),
- (68,'2024-01-06 04:30:31','2024-01-06 04:30:30',41,'Soprano',50.00,'USD',2,1,'civicrm_line_item',103),
- (69,'2024-01-06 04:30:31','2024-01-06 04:30:30',87,'Soprano',50.00,'USD',2,1,'civicrm_line_item',104),
- (70,'2024-01-06 04:30:31','2024-01-06 04:30:30',77,'Soprano',50.00,'USD',2,1,'civicrm_line_item',105),
- (71,'2024-01-06 04:30:31','2024-01-06 04:30:30',144,'Soprano',50.00,'USD',2,1,'civicrm_line_item',106),
- (72,'2024-01-06 04:30:31','2024-01-06 04:30:30',7,'Soprano',50.00,'USD',2,1,'civicrm_line_item',107),
- (73,'2024-01-06 04:30:31','2024-01-06 04:30:30',185,'Soprano',50.00,'USD',2,1,'civicrm_line_item',108),
- (74,'2024-01-06 04:30:31','2024-01-06 04:30:30',25,'Soprano',50.00,'USD',2,1,'civicrm_line_item',109),
- (75,'2024-01-06 04:30:31','2024-01-06 04:30:30',162,'Soprano',50.00,'USD',2,1,'civicrm_line_item',110),
- (76,'2024-01-06 04:30:31','2024-01-06 04:30:30',202,'Soprano',50.00,'USD',2,1,'civicrm_line_item',111),
- (77,'2024-01-06 04:30:31','2024-01-06 04:30:30',125,'Soprano',50.00,'USD',2,1,'civicrm_line_item',112),
- (78,'2024-01-06 04:30:31','2024-01-06 04:30:30',183,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',63),
- (79,'2024-01-06 04:30:31','2024-01-06 04:30:30',75,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',64),
- (80,'2024-01-06 04:30:31','2024-01-06 04:30:30',103,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',65),
- (81,'2024-01-06 04:30:31','2024-01-06 04:30:30',111,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',66),
- (82,'2024-01-06 04:30:31','2024-01-06 04:30:30',184,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',67),
- (83,'2024-01-06 04:30:31','2024-01-06 04:30:30',98,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',68),
- (84,'2024-01-06 04:30:31','2024-01-06 04:30:30',118,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',69),
- (85,'2024-01-06 04:30:31','2024-01-06 04:30:30',190,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',70),
- (86,'2024-01-06 04:30:31','2024-01-06 04:30:30',6,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',71),
- (87,'2024-01-06 04:30:31','2024-01-06 04:30:30',201,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',72),
- (88,'2024-01-06 04:30:31','2024-01-06 04:30:30',72,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',73),
- (89,'2024-01-06 04:30:31','2024-01-06 04:30:30',189,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',74),
- (90,'2024-01-06 04:30:31','2024-01-06 04:30:30',50,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',75),
- (91,'2024-01-06 04:30:31','2024-01-06 04:30:30',66,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',76),
- (92,'2024-01-06 04:30:31','2024-01-06 04:30:30',2,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',77),
- (93,'2024-01-06 04:30:31','2024-01-06 04:30:30',12,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',78),
- (94,'2024-01-06 04:30:31','2024-01-06 04:30:30',46,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',79),
- (95,'2024-01-06 04:30:31','2024-01-06 04:30:30',147,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',80),
- (96,'2024-01-06 04:30:31','2024-01-06 04:30:30',94,'Single',50.00,'USD',4,1,'civicrm_line_item',81),
- (97,'2024-01-06 04:30:31','2024-01-06 04:30:30',24,'Single',50.00,'USD',4,1,'civicrm_line_item',82),
- (98,'2024-01-06 04:30:31','2024-01-06 04:30:30',37,'Single',50.00,'USD',4,1,'civicrm_line_item',83),
- (99,'2024-01-06 04:30:31','2024-01-06 04:30:30',80,'Single',50.00,'USD',4,1,'civicrm_line_item',84),
- (100,'2024-01-06 04:30:31','2024-01-06 04:30:30',114,'Single',50.00,'USD',4,1,'civicrm_line_item',85),
- (101,'2024-01-06 04:30:31','2024-01-06 04:30:30',89,'Single',50.00,'USD',4,1,'civicrm_line_item',86),
- (102,'2024-01-06 04:30:31','2024-01-06 04:30:30',192,'Single',50.00,'USD',4,1,'civicrm_line_item',87),
- (103,'2024-01-06 04:30:31','2024-01-06 04:30:30',187,'Single',50.00,'USD',4,1,'civicrm_line_item',88),
- (104,'2024-01-06 04:30:31','2024-01-06 04:30:30',101,'Single',50.00,'USD',4,1,'civicrm_line_item',89),
- (105,'2024-01-06 04:30:31','2024-01-06 04:30:30',38,'Single',50.00,'USD',4,1,'civicrm_line_item',90),
- (106,'2024-01-06 04:30:31','2024-01-06 04:30:30',18,'Single',50.00,'USD',4,1,'civicrm_line_item',91),
- (107,'2024-01-06 04:30:31','2024-01-06 04:30:30',65,'Single',50.00,'USD',4,1,'civicrm_line_item',92),
- (108,'2024-01-06 04:30:31','2024-01-06 04:30:30',32,'Single',50.00,'USD',4,1,'civicrm_line_item',93),
- (109,'2024-01-06 04:30:31','2024-01-06 04:30:30',15,'Single',50.00,'USD',4,1,'civicrm_line_item',94),
- (110,'2024-01-06 04:30:31','2024-01-06 04:30:30',152,'Single',50.00,'USD',4,1,'civicrm_line_item',95),
- (111,'2024-01-06 04:30:31','2024-01-06 04:30:30',167,'Single',50.00,'USD',4,1,'civicrm_line_item',96);
+ (1,'2024-04-26 15:50:11','2014-04-26 15:50:11',2,'Contribution Amount',125.00,'USD',1,1,'civicrm_line_item',1),
+ (2,'2024-04-26 15:50:11','2022-01-26 15:50:11',4,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',2),
+ (3,'2024-04-26 15:50:11','2018-04-01 02:50:11',6,'Contribution Amount',25.00,'GBP',1,1,'civicrm_line_item',3),
+ (4,'2024-04-26 15:50:11','2022-01-26 15:50:11',8,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',4),
+ (5,'2024-04-26 15:50:11','2022-01-26 15:50:11',4,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',5),
+ (6,'2024-04-26 15:50:11','2024-02-01 15:08:11',16,'Contribution Amount',500.00,'USD',1,1,'civicrm_line_item',6),
+ (7,'2024-04-26 15:50:11','2024-04-24 15:50:11',19,'Contribution Amount',1750.00,'USD',1,1,'civicrm_line_item',7),
+ (8,'2024-04-26 15:50:11','2023-09-03 00:01:11',82,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',8),
+ (9,'2024-04-26 15:50:11','2023-05-26 15:50:11',92,'Contribution Amount',10.00,'USD',1,1,'civicrm_line_item',9),
+ (10,'2024-04-26 15:50:11','2019-12-03 17:50:11',34,'Contribution Amount',250.00,'USD',1,1,'civicrm_line_item',10),
+ (11,'2024-04-26 15:50:11','2024-04-25 11:50:11',71,'Contribution Amount',500.00,'JPY',1,1,'civicrm_line_item',11),
+ (12,'2024-04-26 15:50:11','2023-01-26 05:16:51',43,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',12),
+ (13,'2024-04-26 15:50:11','2024-01-26 00:00:00',32,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',13),
+ (14,'2024-04-26 15:50:11','2024-02-26 00:00:00',32,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',14),
+ (15,'2024-04-26 15:50:11','2023-01-26 15:50:11',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',15),
+ (16,'2024-04-26 15:50:11','2023-02-26 15:50:11',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',16),
+ (17,'2024-04-26 15:50:11','2023-03-26 15:50:11',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',17),
+ (18,'2024-04-26 15:50:11','2023-04-26 15:50:11',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',18),
+ (19,'2024-04-26 15:50:11','2023-05-26 15:50:11',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',19),
+ (20,'2024-04-26 15:50:11','2023-06-26 15:50:11',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',20),
+ (21,'2024-04-26 15:50:11','2023-07-26 15:50:11',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',21),
+ (22,'2024-04-26 15:50:11','2023-08-26 15:50:11',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',22),
+ (23,'2024-04-26 15:50:11','2023-09-26 15:50:11',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',23),
+ (24,'2024-04-26 15:50:11','2023-10-26 15:50:11',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',24),
+ (25,'2024-04-26 15:50:11','2023-11-26 15:50:11',59,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',25),
+ (26,'2024-04-26 15:50:11','2023-08-26 15:50:11',99,'Contribution Amount',10.00,'CAD',1,1,'civicrm_line_item',26),
+ (27,'2024-04-26 15:50:11','2023-09-26 15:50:11',99,'Contribution Amount',10.00,'CAD',1,1,'civicrm_line_item',27),
+ (28,'2024-04-26 15:50:11','2023-10-26 15:50:11',99,'Contribution Amount',10.00,'CAD',1,1,'civicrm_line_item',28),
+ (29,'2024-04-26 15:50:11','2023-11-26 15:50:11',99,'Contribution Amount',10.00,'CAD',1,1,'civicrm_line_item',29),
+ (30,'2024-04-26 15:50:11','2023-12-26 15:50:11',99,'Contribution Amount',10.00,'CAD',1,1,'civicrm_line_item',30),
+ (31,'2024-04-26 15:50:11','2024-03-26 15:50:11',103,'Contribution Amount',5.00,'EUR',1,1,'civicrm_line_item',31),
+ (32,'2024-04-26 15:50:11','2024-04-26 15:50:11',194,'General',100.00,'USD',2,1,'civicrm_line_item',32),
+ (33,'2024-04-26 15:50:11','2024-04-26 15:50:11',60,'General',100.00,'USD',2,1,'civicrm_line_item',33),
+ (34,'2024-04-26 15:50:11','2024-04-26 15:50:11',112,'General',100.00,'USD',2,1,'civicrm_line_item',34),
+ (35,'2024-04-26 15:50:11','2024-04-26 15:50:11',201,'General',100.00,'USD',2,1,'civicrm_line_item',35),
+ (36,'2024-04-26 15:50:12','2024-04-26 15:50:11',128,'General',100.00,'USD',2,1,'civicrm_line_item',36),
+ (37,'2024-04-26 15:50:12','2024-04-26 15:50:11',142,'General',100.00,'USD',2,1,'civicrm_line_item',37),
+ (38,'2024-04-26 15:50:12','2024-04-26 15:50:11',65,'General',100.00,'USD',2,1,'civicrm_line_item',38),
+ (39,'2024-04-26 15:50:12','2024-04-26 15:50:11',20,'General',100.00,'USD',2,1,'civicrm_line_item',39),
+ (40,'2024-04-26 15:50:12','2024-04-26 15:50:11',200,'General',100.00,'USD',2,1,'civicrm_line_item',40),
+ (41,'2024-04-26 15:50:12','2024-04-26 15:50:11',140,'General',100.00,'USD',2,1,'civicrm_line_item',41),
+ (42,'2024-04-26 15:50:12','2024-04-26 15:50:11',62,'General',100.00,'USD',2,1,'civicrm_line_item',42),
+ (43,'2024-04-26 15:50:12','2024-04-26 15:50:11',75,'General',100.00,'USD',2,1,'civicrm_line_item',43),
+ (44,'2024-04-26 15:50:12','2024-04-26 15:50:11',107,'General',100.00,'USD',2,1,'civicrm_line_item',44),
+ (45,'2024-04-26 15:50:12','2024-04-26 15:50:11',166,'General',100.00,'USD',2,1,'civicrm_line_item',45),
+ (46,'2024-04-26 15:50:12','2024-04-26 15:50:11',87,'Student',50.00,'USD',2,1,'civicrm_line_item',46),
+ (47,'2024-04-26 15:50:12','2024-04-26 15:50:11',190,'Student',50.00,'USD',2,1,'civicrm_line_item',47),
+ (48,'2024-04-26 15:50:12','2024-04-26 15:50:11',5,'Student',50.00,'USD',2,1,'civicrm_line_item',48),
+ (49,'2024-04-26 15:50:12','2024-04-26 15:50:11',13,'Student',50.00,'USD',2,1,'civicrm_line_item',49),
+ (50,'2024-04-26 15:50:12','2024-04-26 15:50:11',115,'Student',50.00,'USD',2,1,'civicrm_line_item',50),
+ (51,'2024-04-26 15:50:12','2024-04-26 15:50:11',4,'Student',50.00,'USD',2,1,'civicrm_line_item',51),
+ (52,'2024-04-26 15:50:12','2024-04-26 15:50:11',160,'Student',50.00,'USD',2,1,'civicrm_line_item',52),
+ (53,'2024-04-26 15:50:12','2024-04-26 15:50:11',159,'Student',50.00,'USD',2,1,'civicrm_line_item',53),
+ (54,'2024-04-26 15:50:12','2024-04-26 15:50:11',120,'Student',50.00,'USD',2,1,'civicrm_line_item',54),
+ (55,'2024-04-26 15:50:12','2024-04-26 15:50:11',202,'Student',50.00,'USD',2,1,'civicrm_line_item',55),
+ (56,'2024-04-26 15:50:12','2024-04-26 15:50:11',71,'Student',50.00,'USD',2,1,'civicrm_line_item',56),
+ (57,'2024-04-26 15:50:12','2024-04-26 15:50:11',39,'Student',50.00,'USD',2,1,'civicrm_line_item',57),
+ (58,'2024-04-26 15:50:12','2024-04-26 15:50:11',116,'Student',50.00,'USD',2,1,'civicrm_line_item',58),
+ (59,'2024-04-26 15:50:12','2024-04-26 15:50:11',50,'Student',50.00,'USD',2,1,'civicrm_line_item',59),
+ (60,'2024-04-26 15:50:12','2024-04-26 15:50:11',43,'Lifetime',1200.00,'USD',2,1,'civicrm_line_item',60),
+ (61,'2024-04-26 15:50:12','2024-04-26 15:50:11',155,'Lifetime',1200.00,'USD',2,1,'civicrm_line_item',61),
+ (62,'2024-04-26 15:50:12','2024-04-26 15:50:11',34,'Soprano',50.00,'USD',2,1,'civicrm_line_item',97),
+ (63,'2024-04-26 15:50:12','2024-04-26 15:50:11',62,'Soprano',50.00,'USD',2,1,'civicrm_line_item',98),
+ (64,'2024-04-26 15:50:12','2024-04-26 15:50:11',95,'Soprano',50.00,'USD',2,1,'civicrm_line_item',99),
+ (65,'2024-04-26 15:50:12','2024-04-26 15:50:11',54,'Soprano',50.00,'USD',2,1,'civicrm_line_item',100),
+ (66,'2024-04-26 15:50:12','2024-04-26 15:50:11',123,'Soprano',50.00,'USD',2,1,'civicrm_line_item',101),
+ (67,'2024-04-26 15:50:12','2024-04-26 15:50:11',163,'Soprano',50.00,'USD',2,1,'civicrm_line_item',102),
+ (68,'2024-04-26 15:50:12','2024-04-26 15:50:11',10,'Soprano',50.00,'USD',2,1,'civicrm_line_item',103),
+ (69,'2024-04-26 15:50:12','2024-04-26 15:50:11',8,'Soprano',50.00,'USD',2,1,'civicrm_line_item',104),
+ (70,'2024-04-26 15:50:12','2024-04-26 15:50:11',60,'Soprano',50.00,'USD',2,1,'civicrm_line_item',105),
+ (71,'2024-04-26 15:50:12','2024-04-26 15:50:11',26,'Soprano',50.00,'USD',2,1,'civicrm_line_item',106),
+ (72,'2024-04-26 15:50:12','2024-04-26 15:50:11',57,'Soprano',50.00,'USD',2,1,'civicrm_line_item',107),
+ (73,'2024-04-26 15:50:12','2024-04-26 15:50:11',6,'Soprano',50.00,'USD',2,1,'civicrm_line_item',108),
+ (74,'2024-04-26 15:50:12','2024-04-26 15:50:11',21,'Soprano',50.00,'USD',2,1,'civicrm_line_item',109),
+ (75,'2024-04-26 15:50:12','2024-04-26 15:50:11',3,'Soprano',50.00,'USD',2,1,'civicrm_line_item',110),
+ (76,'2024-04-26 15:50:12','2024-04-26 15:50:11',18,'Soprano',50.00,'USD',2,1,'civicrm_line_item',111),
+ (77,'2024-04-26 15:50:12','2024-04-26 15:50:11',78,'Soprano',50.00,'USD',2,1,'civicrm_line_item',112),
+ (78,'2024-04-26 15:50:12','2024-04-26 15:50:11',193,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',63),
+ (79,'2024-04-26 15:50:12','2024-04-26 15:50:11',132,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',64),
+ (80,'2024-04-26 15:50:12','2024-04-26 15:50:11',81,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',65),
+ (81,'2024-04-26 15:50:12','2024-04-26 15:50:11',113,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',66),
+ (82,'2024-04-26 15:50:12','2024-04-26 15:50:11',101,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',67),
+ (83,'2024-04-26 15:50:12','2024-04-26 15:50:11',11,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',68),
+ (84,'2024-04-26 15:50:12','2024-04-26 15:50:11',195,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',69),
+ (85,'2024-04-26 15:50:12','2024-04-26 15:50:11',158,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',70),
+ (86,'2024-04-26 15:50:12','2024-04-26 15:50:11',93,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',71),
+ (87,'2024-04-26 15:50:12','2024-04-26 15:50:11',182,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',72),
+ (88,'2024-04-26 15:50:12','2024-04-26 15:50:11',79,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',73),
+ (89,'2024-04-26 15:50:12','2024-04-26 15:50:11',28,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',74),
+ (90,'2024-04-26 15:50:12','2024-04-26 15:50:11',114,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',75),
+ (91,'2024-04-26 15:50:12','2024-04-26 15:50:11',72,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',76),
+ (92,'2024-04-26 15:50:12','2024-04-26 15:50:11',177,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',77),
+ (93,'2024-04-26 15:50:12','2024-04-26 15:50:11',194,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',78),
+ (94,'2024-04-26 15:50:12','2024-04-26 15:50:11',67,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',79),
+ (95,'2024-04-26 15:50:12','2024-04-26 15:50:11',20,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',80),
+ (96,'2024-04-26 15:50:12','2024-04-26 15:50:11',51,'Single',50.00,'USD',4,1,'civicrm_line_item',81),
+ (97,'2024-04-26 15:50:12','2024-04-26 15:50:11',153,'Single',50.00,'USD',4,1,'civicrm_line_item',82),
+ (98,'2024-04-26 15:50:12','2024-04-26 15:50:11',35,'Single',50.00,'USD',4,1,'civicrm_line_item',83),
+ (99,'2024-04-26 15:50:12','2024-04-26 15:50:11',75,'Single',50.00,'USD',4,1,'civicrm_line_item',84),
+ (100,'2024-04-26 15:50:12','2024-04-26 15:50:11',156,'Single',50.00,'USD',4,1,'civicrm_line_item',85),
+ (101,'2024-04-26 15:50:12','2024-04-26 15:50:11',146,'Single',50.00,'USD',4,1,'civicrm_line_item',86),
+ (102,'2024-04-26 15:50:12','2024-04-26 15:50:11',87,'Single',50.00,'USD',4,1,'civicrm_line_item',87),
+ (103,'2024-04-26 15:50:12','2024-04-26 15:50:11',129,'Single',50.00,'USD',4,1,'civicrm_line_item',88),
+ (104,'2024-04-26 15:50:12','2024-04-26 15:50:11',22,'Single',50.00,'USD',4,1,'civicrm_line_item',89),
+ (105,'2024-04-26 15:50:12','2024-04-26 15:50:11',152,'Single',50.00,'USD',4,1,'civicrm_line_item',90),
+ (106,'2024-04-26 15:50:12','2024-04-26 15:50:11',70,'Single',50.00,'USD',4,1,'civicrm_line_item',91),
+ (107,'2024-04-26 15:50:12','2024-04-26 15:50:11',186,'Single',50.00,'USD',4,1,'civicrm_line_item',92),
+ (108,'2024-04-26 15:50:12','2024-04-26 15:50:11',41,'Single',50.00,'USD',4,1,'civicrm_line_item',93),
+ (109,'2024-04-26 15:50:12','2024-04-26 15:50:11',171,'Single',50.00,'USD',4,1,'civicrm_line_item',94),
+ (110,'2024-04-26 15:50:12','2024-04-26 15:50:11',176,'Single',50.00,'USD',4,1,'civicrm_line_item',95),
+ (111,'2024-04-26 15:50:12','2024-04-26 15:50:11',181,'Single',50.00,'USD',4,1,'civicrm_line_item',96);
 /*!40000 ALTER TABLE `civicrm_financial_item` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3792,117 +3800,117 @@ 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,'2014-01-06 04:30:30',125.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'1041',NULL,NULL),
- (2,NULL,6,'2021-10-06 04:30:30',50.00,NULL,NULL,'USD',1,'P20901X1',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (3,NULL,6,'2017-12-11 15:30:30',25.00,NULL,NULL,'GBP',1,'GBP12',NULL,1,NULL,4,NULL,'2095',NULL,NULL),
- (4,NULL,6,'2021-10-06 04:30:30',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'10552',NULL,NULL),
- (5,NULL,6,'2021-10-06 04:30:30',50.00,NULL,NULL,'USD',1,'Q90901X1',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (6,NULL,6,'2023-10-13 03:48:30',500.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'509',NULL,NULL),
- (7,NULL,6,'2024-01-04 04:30:30',1750.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,'102',NULL,NULL),
- (8,NULL,6,'2023-05-14 12:41:30',50.00,NULL,NULL,'USD',1,'P20193L2',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (9,NULL,6,'2023-02-06 04:30:30',10.00,NULL,NULL,'USD',1,'P40232Y3',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (10,NULL,6,'2019-08-14 06:30:30',250.00,NULL,NULL,'USD',1,'P20193L6',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (11,NULL,6,'2024-01-05 00:30:30',500.00,NULL,NULL,'JPY',1,'PL71',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (12,NULL,6,'2022-10-05 17:57:10',50.00,NULL,NULL,'USD',1,'P291X1',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (13,NULL,6,'2023-10-06 00:00:00',50.00,NULL,NULL,'USD',1,'PL32I',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (14,NULL,6,'2023-11-06 00:00:00',50.00,NULL,NULL,'USD',1,'PL32II',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (15,NULL,6,'2022-10-06 04:30:30',25.00,NULL,NULL,'USD',1,'PL32I591',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (16,NULL,6,'2022-11-06 04:30:30',25.00,NULL,NULL,'USD',1,'PL32I592',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (17,NULL,6,'2022-12-06 04:30:30',25.00,NULL,NULL,'USD',1,'PL32I593',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (18,NULL,6,'2023-01-06 04:30:30',25.00,NULL,NULL,'USD',1,'PL32I594',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (19,NULL,6,'2023-02-06 04:30:30',25.00,NULL,NULL,'USD',1,'PL32I595',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (20,NULL,6,'2023-03-06 04:30:30',25.00,NULL,NULL,'USD',1,'PL32I596',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (21,NULL,6,'2023-04-06 04:30:30',25.00,NULL,NULL,'USD',1,'PL32I597',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (22,NULL,6,'2023-05-06 04:30:30',25.00,NULL,NULL,'USD',1,'PL32I598',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (23,NULL,6,'2023-06-06 04:30:30',25.00,NULL,NULL,'USD',1,'PL32I599',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (24,NULL,6,'2023-07-06 04:30:30',25.00,NULL,NULL,'USD',1,'PL32I5910',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (25,NULL,6,'2023-08-06 04:30:30',25.00,NULL,NULL,'USD',1,'PL32I5911',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (26,NULL,6,'2023-05-06 04:30:30',10.00,NULL,NULL,'CAD',1,'PL32I991',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (27,NULL,6,'2023-06-06 04:30:30',10.00,NULL,NULL,'CAD',1,'PL32I992',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (28,NULL,6,'2023-07-06 04:30:30',10.00,NULL,NULL,'CAD',1,'PL32I993',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (29,NULL,6,'2023-08-06 04:30:30',10.00,NULL,NULL,'CAD',1,'PL32I994',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (30,NULL,6,'2023-09-06 04:30:30',10.00,NULL,NULL,'CAD',1,'PL32I995',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (31,NULL,6,'2023-12-06 04:30:30',5.00,NULL,NULL,'EUR',1,'PL32I1031',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (32,NULL,6,'2024-01-06 04:30:30',100.00,NULL,NULL,'USD',1,'d04bebb925f35013',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (33,NULL,6,'2024-01-06 04:30:30',100.00,NULL,NULL,'USD',1,'85f82bdf993869a9',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (34,NULL,6,'2024-01-06 04:30:30',100.00,NULL,NULL,'USD',1,'a6e23b5bdacc2556',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (35,NULL,6,'2024-01-06 04:30:30',100.00,NULL,NULL,'USD',1,'54ba67e8cd2c5831',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (36,NULL,6,'2024-01-06 04:30:30',100.00,NULL,NULL,'USD',1,'72e3d8ab02a88749',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (37,NULL,6,'2024-01-06 04:30:30',100.00,NULL,NULL,'USD',1,'114664b16c0d05d7',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (38,NULL,6,'2024-01-06 04:30:30',100.00,NULL,NULL,'USD',1,'54afd47a158e6a98',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (39,NULL,6,'2024-01-06 04:30:30',100.00,NULL,NULL,'USD',1,'513d0202ba2e33e8',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (40,NULL,6,'2024-01-06 04:30:30',100.00,NULL,NULL,'USD',1,'254358f51b2e2e2e',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (41,NULL,6,'2024-01-06 04:30:30',100.00,NULL,NULL,'USD',1,'d436781d36642d52',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (42,NULL,6,'2024-01-06 04:30:30',100.00,NULL,NULL,'USD',1,'c46dd20e75d9cd63',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (43,NULL,6,'2024-01-06 04:30:30',100.00,NULL,NULL,'USD',1,'c30b782dffc88578',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (44,NULL,6,'2024-01-06 04:30:30',100.00,NULL,NULL,'USD',1,'147acd979994a3e5',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (45,NULL,6,'2024-01-06 04:30:30',100.00,NULL,NULL,'USD',1,'49e79faa71b04821',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (46,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'aa84cd6d0c671bf6',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (47,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'4d0f515e9744319f',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (48,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'549daaa33e883987',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (49,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'82bd65e9cca2891e',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (50,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'83a31e80a72fedf9',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (51,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'102f534ba875514c',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (52,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'c63f9619b1f6a5da',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (53,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'a166d69a85636182',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (54,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'f897088d4040e88b',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (55,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'64d9a20ca6695123',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (56,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'b44f6776a38cd0b0',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (57,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'bdd4ba34f19b8508',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (58,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'243d7aa987a2baa3',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (59,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'401f0d68db4d1e96',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (60,NULL,6,'2024-01-06 04:30:30',1200.00,NULL,NULL,'USD',1,'3b7979f46cceaa08',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (61,NULL,6,'2024-01-06 04:30:30',1200.00,NULL,NULL,'USD',1,'6a5980462cb6efb4',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (62,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'45dd6c0b12692902',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (63,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'c9d3a804ca680143',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (64,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'2d5db36ace9588e4',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (65,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'894bf74b96303bc8',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (66,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'0c13497f46c6bb46',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (67,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'3c19adb701828ca5',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (68,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'a5dde0c0ef88b617',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (69,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'888233d8d87b2292',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (70,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'e146bd83b1233a2d',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (71,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'dd75be522b0c3b37',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (72,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'f006b49b97550bcf',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (73,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'ba540bde6a24512f',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (74,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'213d7fbdd009495b',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (75,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'2867fa3f312390e3',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (76,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'6e6b62f0b3b1560f',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (77,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'d601f86d7d4ac5f0',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (78,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'5f71b04aa74cef80',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (79,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'85e4457d3b235f62',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (80,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'ed7b07c140ba59ce',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (81,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'ee67cf60826046ab',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (82,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'98746c0f1879a8b3',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (83,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'3cd0fcd4bd3c6e9c',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (84,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'376e6c1d14da650c',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (85,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'0dd4e5033a7eaf87',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (86,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'fb4905a867502a4b',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (87,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'fb14ee1572cd5300',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (88,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'dacf986f91993264',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (89,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'2170e40ef82e30ed',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (90,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'306134a0c8b767ba',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (91,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'bb245dad4d1aef62',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (92,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'e33de35039337003',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (93,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'2d1e67a9245d5fdc',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (94,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'c9bddcb498f240eb',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (95,NULL,6,'2024-01-06 04:30:30',800.00,NULL,NULL,'USD',1,'c05415199bd45c2e',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (96,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'356e2ea6f7e138db',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (97,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'785c41d770598228',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (98,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'bf96d198baa1575a',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (99,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'983ea229b2e6c29f',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (100,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'fd8a5608dfc8fd90',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (101,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'bc1bc41100582c43',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (102,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'9e971d6e58baa4ba',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (103,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'a52ae21e1127264b',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (104,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'f0f1369ed8bd6ade',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (105,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'7f20752b4fcf16b9',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (106,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'f9affcc9daf9f3f3',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (107,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'1c930ea45e0c1ae4',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (108,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'5dab449584553811',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (109,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'121d8980a5da7e03',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (110,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'1fc5dfd486634955',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
- (111,NULL,6,'2024-01-06 04:30:30',50.00,NULL,NULL,'USD',1,'6237b3b4d3156e7f',NULL,1,NULL,1,NULL,NULL,NULL,NULL);
+ (1,NULL,6,'2014-04-26 15:50:11',125.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'1041',NULL,NULL),
+ (2,NULL,6,'2022-01-26 15:50:11',50.00,NULL,NULL,'USD',1,'P20901X1',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (3,NULL,6,'2018-04-01 02:50:11',25.00,NULL,NULL,'GBP',1,'GBP12',NULL,1,NULL,4,NULL,'2095',NULL,NULL),
+ (4,NULL,6,'2022-01-26 15:50:11',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'10552',NULL,NULL),
+ (5,NULL,6,'2022-01-26 15:50:11',50.00,NULL,NULL,'USD',1,'Q90901X1',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (6,NULL,6,'2024-02-01 15:08:11',500.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'509',NULL,NULL),
+ (7,NULL,6,'2024-04-24 15:50:11',1750.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,'102',NULL,NULL),
+ (8,NULL,6,'2023-09-03 00:01:11',50.00,NULL,NULL,'USD',1,'P20193L2',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (9,NULL,6,'2023-05-26 15:50:11',10.00,NULL,NULL,'USD',1,'P40232Y3',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (10,NULL,6,'2019-12-03 17:50:11',250.00,NULL,NULL,'USD',1,'P20193L6',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (11,NULL,6,'2024-04-25 11:50:11',500.00,NULL,NULL,'JPY',1,'PL71',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (12,NULL,6,'2023-01-26 05:16:51',50.00,NULL,NULL,'USD',1,'P291X1',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (13,NULL,6,'2024-01-26 00:00:00',50.00,NULL,NULL,'USD',1,'PL32I',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (14,NULL,6,'2024-02-26 00:00:00',50.00,NULL,NULL,'USD',1,'PL32II',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (15,NULL,6,'2023-01-26 15:50:11',25.00,NULL,NULL,'USD',1,'PL32I591',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (16,NULL,6,'2023-02-26 15:50:11',25.00,NULL,NULL,'USD',1,'PL32I592',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (17,NULL,6,'2023-03-26 15:50:11',25.00,NULL,NULL,'USD',1,'PL32I593',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (18,NULL,6,'2023-04-26 15:50:11',25.00,NULL,NULL,'USD',1,'PL32I594',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (19,NULL,6,'2023-05-26 15:50:11',25.00,NULL,NULL,'USD',1,'PL32I595',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (20,NULL,6,'2023-06-26 15:50:11',25.00,NULL,NULL,'USD',1,'PL32I596',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (21,NULL,6,'2023-07-26 15:50:11',25.00,NULL,NULL,'USD',1,'PL32I597',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (22,NULL,6,'2023-08-26 15:50:11',25.00,NULL,NULL,'USD',1,'PL32I598',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (23,NULL,6,'2023-09-26 15:50:11',25.00,NULL,NULL,'USD',1,'PL32I599',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (24,NULL,6,'2023-10-26 15:50:11',25.00,NULL,NULL,'USD',1,'PL32I5910',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (25,NULL,6,'2023-11-26 15:50:11',25.00,NULL,NULL,'USD',1,'PL32I5911',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (26,NULL,6,'2023-08-26 15:50:11',10.00,NULL,NULL,'CAD',1,'PL32I991',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (27,NULL,6,'2023-09-26 15:50:11',10.00,NULL,NULL,'CAD',1,'PL32I992',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (28,NULL,6,'2023-10-26 15:50:11',10.00,NULL,NULL,'CAD',1,'PL32I993',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (29,NULL,6,'2023-11-26 15:50:11',10.00,NULL,NULL,'CAD',1,'PL32I994',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (30,NULL,6,'2023-12-26 15:50:11',10.00,NULL,NULL,'CAD',1,'PL32I995',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (31,NULL,6,'2024-03-26 15:50:11',5.00,NULL,NULL,'EUR',1,'PL32I1031',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (32,NULL,6,'2024-04-26 15:50:11',100.00,NULL,NULL,'USD',1,'b5a1f057208f5a91',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (33,NULL,6,'2024-04-26 15:50:11',100.00,NULL,NULL,'USD',1,'9bdcc5ddeda8a520',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (34,NULL,6,'2024-04-26 15:50:11',100.00,NULL,NULL,'USD',1,'566c8d0eaa230008',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (35,NULL,6,'2024-04-26 15:50:11',100.00,NULL,NULL,'USD',1,'9d3f65600f92e622',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (36,NULL,6,'2024-04-26 15:50:11',100.00,NULL,NULL,'USD',1,'5d51964f045bfc50',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (37,NULL,6,'2024-04-26 15:50:11',100.00,NULL,NULL,'USD',1,'69e3ac0aed8b096e',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (38,NULL,6,'2024-04-26 15:50:11',100.00,NULL,NULL,'USD',1,'f2b8bd135e9d8647',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (39,NULL,6,'2024-04-26 15:50:11',100.00,NULL,NULL,'USD',1,'a35f43b2180dc9b8',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (40,NULL,6,'2024-04-26 15:50:11',100.00,NULL,NULL,'USD',1,'fb9f821467c5e4fc',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (41,NULL,6,'2024-04-26 15:50:11',100.00,NULL,NULL,'USD',1,'6335cfc1d9871c1b',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (42,NULL,6,'2024-04-26 15:50:11',100.00,NULL,NULL,'USD',1,'4a4b1b66ffae3b2c',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (43,NULL,6,'2024-04-26 15:50:11',100.00,NULL,NULL,'USD',1,'2e3ca93d825f20d9',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (44,NULL,6,'2024-04-26 15:50:11',100.00,NULL,NULL,'USD',1,'1444e63322cdf98b',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (45,NULL,6,'2024-04-26 15:50:11',100.00,NULL,NULL,'USD',1,'803a2c4aef4f6525',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (46,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'04200bff0203f12b',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (47,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'c609360e57109b79',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (48,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'4c6f53503b7cb0ab',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (49,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'11e1d593feccae66',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (50,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'5f3a2b9681b9191d',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (51,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'372fd8fed5180672',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (52,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'849a688d25f2104b',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (53,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'a88ca39c8d59289a',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (54,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'ee7d28b0fcbd3565',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (55,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'4f5e7edcdf368aea',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (56,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'bd0ce735fc8dc0c6',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (57,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'0c44ffa31ddbf75a',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (58,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'0c09b3b4fdb01b27',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (59,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'a73f415d7191472d',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (60,NULL,6,'2024-04-26 15:50:11',1200.00,NULL,NULL,'USD',1,'37571dfcbd354f51',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (61,NULL,6,'2024-04-26 15:50:11',1200.00,NULL,NULL,'USD',1,'a907f68f10ede934',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (62,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'ef3979bae5fa5259',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (63,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'715572a10c53ced9',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (64,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'3215d0da8c4ce892',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (65,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'0ad5ea9ad6aed4a6',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (66,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'39ef698d0a9fa817',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (67,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'815f109b17f31db2',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (68,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'8195591eb560bc4d',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (69,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'619b7759d6e32711',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (70,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'d9ec4cad79a91ddb',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (71,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'3bffd940b5c1d2d6',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (72,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'f96ff6fa694afa82',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (73,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'1cbfab3eb27c53a6',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (74,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'98cdfabd8ef63498',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (75,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'e36426bbfb2db460',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (76,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'b35e37ceebbcdb51',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (77,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'1aea5132eeee329a',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (78,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'08803a9e355cc4e5',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (79,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'f4b86efdd60681d5',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (80,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'79d4dbb475e83ba5',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (81,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'1f1e675c4ed0ab6d',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (82,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'6cfbb070c8b03fbf',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (83,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'22d294eb3cea5959',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (84,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'2424577915fd9766',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (85,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'4cbf9af362859f59',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (86,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'44a5024cef66c06d',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (87,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'8bf39427a743d80c',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (88,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'b17b0c95a3657e18',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (89,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'556f2376af926b0c',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (90,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'001ad0270c003a8b',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (91,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'cd5ca6b847a015c6',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (92,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'01103a74844523b1',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (93,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'45cc2fa538a41cba',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (94,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'0cfc5f84ff9fddf2',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (95,NULL,6,'2024-04-26 15:50:11',800.00,NULL,NULL,'USD',1,'391ce58e0ed19572',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (96,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'74a98451297ed311',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (97,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'2d3a6db93c7f6bd1',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (98,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'df890dda694d5b76',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (99,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'fc054807180e31b5',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (100,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'7d6d1c9a9905405f',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (101,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'540bff0df0925751',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (102,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'c18f74ca873f6019',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (103,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'b1470cef41e4c3cb',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (104,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'59f65a58649cf3a4',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (105,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'925afe959c4ad2d6',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (106,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'4a7e3c62eb8fa913',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (107,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'876780d3d4b6e328',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (108,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'7e326126f20083b2',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (109,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'1de1101df072cb5b',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (110,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'89460233cf2bc979',NULL,1,NULL,1,NULL,NULL,NULL,NULL),
+ (111,NULL,6,'2024-04-26 15:50:11',50.00,NULL,NULL,'USD',1,'e8b5e4f2432d35c1',NULL,1,NULL,1,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_financial_trxn` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3941,89 +3949,89 @@ 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,120,'Added',NULL,NULL),
- (2,2,130,'Added',NULL,NULL),
- (3,2,99,'Added',NULL,NULL),
- (4,2,86,'Added',NULL,NULL),
+ (1,2,185,'Added',NULL,NULL),
+ (2,2,8,'Added',NULL,NULL),
+ (3,2,95,'Added',NULL,NULL),
+ (4,2,89,'Added',NULL,NULL),
  (5,2,37,'Added',NULL,NULL),
- (6,2,92,'Added',NULL,NULL),
- (7,2,53,'Added',NULL,NULL),
- (8,2,70,'Added',NULL,NULL),
- (9,2,113,'Added',NULL,NULL),
- (10,2,196,'Added',NULL,NULL),
- (11,2,141,'Added',NULL,NULL),
- (12,2,165,'Added',NULL,NULL),
- (13,2,181,'Added',NULL,NULL),
- (14,2,46,'Added',NULL,NULL),
- (15,2,137,'Added',NULL,NULL),
- (16,2,66,'Added',NULL,NULL),
- (17,2,190,'Added',NULL,NULL),
- (18,2,200,'Added',NULL,NULL),
- (19,2,183,'Added',NULL,NULL),
- (20,2,176,'Added',NULL,NULL),
- (21,2,22,'Added',NULL,NULL),
- (22,2,195,'Added',NULL,NULL),
- (23,2,110,'Added',NULL,NULL),
- (24,2,59,'Added',NULL,NULL),
- (25,2,84,'Added',NULL,NULL),
- (26,2,133,'Added',NULL,NULL),
- (27,2,93,'Added',NULL,NULL),
- (28,2,47,'Added',NULL,NULL),
- (29,2,85,'Added',NULL,NULL),
- (30,2,193,'Added',NULL,NULL),
- (31,2,101,'Added',NULL,NULL),
- (32,2,15,'Added',NULL,NULL),
- (33,2,77,'Added',NULL,NULL),
- (34,2,166,'Added',NULL,NULL),
- (35,2,50,'Added',NULL,NULL),
- (36,2,23,'Added',NULL,NULL),
- (37,2,164,'Added',NULL,NULL),
- (38,2,67,'Added',NULL,NULL),
- (39,2,121,'Added',NULL,NULL),
- (40,2,192,'Added',NULL,NULL),
- (41,2,75,'Added',NULL,NULL),
- (42,2,19,'Added',NULL,NULL),
- (43,2,146,'Added',NULL,NULL),
- (44,2,106,'Added',NULL,NULL),
- (45,2,71,'Added',NULL,NULL),
- (46,2,13,'Added',NULL,NULL),
- (47,2,14,'Added',NULL,NULL),
- (48,2,10,'Added',NULL,NULL),
- (49,2,34,'Added',NULL,NULL),
- (50,2,88,'Added',NULL,NULL),
- (51,2,163,'Added',NULL,NULL),
- (52,2,129,'Added',NULL,NULL),
- (53,2,27,'Added',NULL,NULL),
- (54,2,4,'Added',NULL,NULL),
- (55,2,168,'Added',NULL,NULL),
- (56,2,198,'Added',NULL,NULL),
- (57,2,91,'Added',NULL,NULL),
- (58,2,62,'Added',NULL,NULL),
- (59,2,60,'Added',NULL,NULL),
- (60,2,172,'Added',NULL,NULL),
- (61,3,63,'Added',NULL,NULL),
- (62,3,102,'Added',NULL,NULL),
- (63,3,128,'Added',NULL,NULL),
- (64,3,117,'Added',NULL,NULL),
- (65,3,52,'Added',NULL,NULL),
- (66,3,76,'Added',NULL,NULL),
- (67,3,17,'Added',NULL,NULL),
- (68,3,16,'Added',NULL,NULL),
- (69,3,159,'Added',NULL,NULL),
- (70,3,41,'Added',NULL,NULL),
- (71,3,30,'Added',NULL,NULL),
- (72,3,98,'Added',NULL,NULL),
- (73,3,109,'Added',NULL,NULL),
- (74,3,90,'Added',NULL,NULL),
- (75,3,155,'Added',NULL,NULL),
- (76,4,120,'Added',NULL,NULL),
- (77,4,70,'Added',NULL,NULL),
- (78,4,137,'Added',NULL,NULL),
- (79,4,195,'Added',NULL,NULL),
- (80,4,85,'Added',NULL,NULL),
- (81,4,23,'Added',NULL,NULL),
- (82,4,146,'Added',NULL,NULL),
- (83,4,88,'Added',NULL,NULL),
+ (6,2,107,'Added',NULL,NULL),
+ (7,2,73,'Added',NULL,NULL),
+ (8,2,85,'Added',NULL,NULL),
+ (9,2,200,'Added',NULL,NULL),
+ (10,2,20,'Added',NULL,NULL),
+ (11,2,111,'Added',NULL,NULL),
+ (12,2,63,'Added',NULL,NULL),
+ (13,2,158,'Added',NULL,NULL),
+ (14,2,42,'Added',NULL,NULL),
+ (15,2,198,'Added',NULL,NULL),
+ (16,2,196,'Added',NULL,NULL),
+ (17,2,116,'Added',NULL,NULL),
+ (18,2,6,'Added',NULL,NULL),
+ (19,2,36,'Added',NULL,NULL),
+ (20,2,78,'Added',NULL,NULL),
+ (21,2,13,'Added',NULL,NULL),
+ (22,2,177,'Added',NULL,NULL),
+ (23,2,21,'Added',NULL,NULL),
+ (24,2,79,'Added',NULL,NULL),
+ (25,2,171,'Added',NULL,NULL),
+ (26,2,58,'Added',NULL,NULL),
+ (27,2,154,'Added',NULL,NULL),
+ (28,2,160,'Added',NULL,NULL),
+ (29,2,22,'Added',NULL,NULL),
+ (30,2,166,'Added',NULL,NULL),
+ (31,2,167,'Added',NULL,NULL),
+ (32,2,4,'Added',NULL,NULL),
+ (33,2,94,'Added',NULL,NULL),
+ (34,2,74,'Added',NULL,NULL),
+ (35,2,136,'Added',NULL,NULL),
+ (36,2,61,'Added',NULL,NULL),
+ (37,2,96,'Added',NULL,NULL),
+ (38,2,35,'Added',NULL,NULL),
+ (39,2,76,'Added',NULL,NULL),
+ (40,2,187,'Added',NULL,NULL),
+ (41,2,122,'Added',NULL,NULL),
+ (42,2,123,'Added',NULL,NULL),
+ (43,2,159,'Added',NULL,NULL),
+ (44,2,93,'Added',NULL,NULL),
+ (45,2,60,'Added',NULL,NULL),
+ (46,2,134,'Added',NULL,NULL),
+ (47,2,197,'Added',NULL,NULL),
+ (48,2,66,'Added',NULL,NULL),
+ (49,2,81,'Added',NULL,NULL),
+ (50,2,131,'Added',NULL,NULL),
+ (51,2,128,'Added',NULL,NULL),
+ (52,2,143,'Added',NULL,NULL),
+ (53,2,138,'Added',NULL,NULL),
+ (54,2,201,'Added',NULL,NULL),
+ (55,2,92,'Added',NULL,NULL),
+ (56,2,5,'Added',NULL,NULL),
+ (57,2,112,'Added',NULL,NULL),
+ (58,2,194,'Added',NULL,NULL),
+ (59,2,145,'Added',NULL,NULL),
+ (60,2,88,'Added',NULL,NULL),
+ (61,3,28,'Added',NULL,NULL),
+ (62,3,99,'Added',NULL,NULL),
+ (63,3,55,'Added',NULL,NULL),
+ (64,3,100,'Added',NULL,NULL),
+ (65,3,125,'Added',NULL,NULL),
+ (66,3,142,'Added',NULL,NULL),
+ (67,3,189,'Added',NULL,NULL),
+ (68,3,179,'Added',NULL,NULL),
+ (69,3,186,'Added',NULL,NULL),
+ (70,3,118,'Added',NULL,NULL),
+ (71,3,65,'Added',NULL,NULL),
+ (72,3,114,'Added',NULL,NULL),
+ (73,3,54,'Added',NULL,NULL),
+ (74,3,68,'Added',NULL,NULL),
+ (75,3,52,'Added',NULL,NULL),
+ (76,4,185,'Added',NULL,NULL),
+ (77,4,85,'Added',NULL,NULL),
+ (78,4,198,'Added',NULL,NULL),
+ (79,4,177,'Added',NULL,NULL),
+ (80,4,22,'Added',NULL,NULL),
+ (81,4,61,'Added',NULL,NULL),
+ (82,4,159,'Added',NULL,NULL),
+ (83,4,131,'Added',NULL,NULL),
  (84,4,202,'Added',NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_group_contact` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -4070,28 +4078,28 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_job` WRITE;
 /*!40000 ALTER TABLE `civicrm_job` DISABLE KEYS */;
-INSERT INTO `civicrm_job` (`id`, `domain_id`, `run_frequency`, `last_run`, `scheduled_run_date`, `name`, `description`, `api_entity`, `api_action`, `parameters`, `is_active`) VALUES
- (1,1,'Daily',NULL,NULL,'CiviCRM Update Check','Checks for version updates. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_version_check','Job','version_check',NULL,1),
- (2,1,'Always',NULL,NULL,'Send Scheduled Mailings','Sends out scheduled mailings. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_process_mailing','Job','process_mailing',NULL,0),
- (3,1,'Hourly',NULL,NULL,'Fetch Bounces','Fetches bounces from mailings. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_fetch_bounces','Job','fetch_bounces','is_create_activities=0',0),
- (4,1,'Hourly',NULL,NULL,'Process Inbound Emails','Inserts activity for a contact or a case by retrieving inbound emails. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_fetch_activities','Job','fetch_activities',NULL,0),
- (5,1,'Daily',NULL,NULL,'Process Pledges','Updates pledge records and sends out reminders. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_process_pledge','Job','process_pledge','send_reminders=0',0),
- (6,1,'Daily',NULL,NULL,'Geocode and Parse Addresses','Geocodes and/or parses street addresses. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_geocode','Job','geocode','geocoding=1\n      parse=0\n      throttle=0',0),
- (7,1,'Daily',NULL,NULL,'Update Individual Email Greeting','Update Individual Email Greeting. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_update_greeting','Job','update_greeting','ct=Individual\ngt=email_greeting',0),
- (8,1,'Daily',NULL,NULL,'Update Individual Postal Greeting','Update Individual Postal Greeting. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_update_greeting','Job','update_greeting','ct=Individual\ngt=postal_greeting',0),
- (9,1,'Daily',NULL,NULL,'Update Individual Addressee','Update Individual Addressee. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_update_greeting','Job','update_greeting','ct=Individual\ngt=addressee',0),
- (10,1,'Daily',NULL,NULL,'Mail Reports','Generates and sends out reports via email. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_mail_report','Job','mail_report','',0),
- (11,1,'Hourly',NULL,NULL,'Send Scheduled Reminders','Sends out scheduled reminders via email. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_send_reminder','Job','send_reminder',NULL,0),
- (12,1,'Always',NULL,NULL,'Update Participant Statuses','Updates pending event participant statuses based on time. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_process_participant','Job','process_participant',NULL,0),
- (13,1,'Daily',NULL,NULL,'Update Membership Statuses','Updates membership statuses. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_process_membership','Job','process_membership',NULL,0),
- (14,1,'Always',NULL,NULL,'Process Survey Respondents','Releases reserved survey respondents. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_process_respondent','Job','process_respondent',NULL,0),
- (15,1,'Monthly',NULL,NULL,'Clean-up Temporary Data and Files','Removes temporary data and files. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_cleanup','Job','cleanup','session=0',0),
- (16,1,'Always',NULL,NULL,'Send Scheduled SMS','Sends out scheduled SMS. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_process_sms','Job','process_sms',NULL,0),
- (17,1,'Hourly',NULL,NULL,'Rebuild Smart Group Cache','Rebuilds the smart group cache. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_group_rebuild','Job','group_rebuild','limit=0',0),
- (18,1,'Hourly',NULL,NULL,'Group Cache Flush','Purges aged smart group cache data. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_group_cache_flush','Job','group_cache_flush','',0),
- (19,1,'Daily',NULL,NULL,'Disable expired relationships','Disables relationships that have expired. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_disable_expired_relationships','Job','disable_expired_relationships',NULL,0),
- (20,1,'Daily',NULL,NULL,'Validate Email Address from Mailings.','Updates the reset_date on an email address. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#mailing_update_email_resetdate','Mailing','update_email_resetdate','minDays=5\n      maxDays=60',0),
- (21,1,'Daily',NULL,NULL,'Dedupe Contacts','Executes the Individual, Unsupervised redupe rule. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_process_batch_merge','Job','process_batch_merge',NULL,0);
+INSERT INTO `civicrm_job` (`id`, `domain_id`, `run_frequency`, `last_run`, `last_run_end`, `scheduled_run_date`, `name`, `description`, `api_entity`, `api_action`, `parameters`, `is_active`) VALUES
+ (1,1,'Daily',NULL,NULL,NULL,'CiviCRM Update Check','Checks for version updates. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_version_check','Job','version_check',NULL,1),
+ (2,1,'Always',NULL,NULL,NULL,'Send Scheduled Mailings','Sends out scheduled mailings. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_process_mailing','Job','process_mailing',NULL,0),
+ (3,1,'Hourly',NULL,NULL,NULL,'Fetch Bounces','Fetches bounces from mailings. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_fetch_bounces','Job','fetch_bounces','is_create_activities=0',0),
+ (4,1,'Hourly',NULL,NULL,NULL,'Process Inbound Emails','Inserts activity for a contact or a case by retrieving inbound emails. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_fetch_activities','Job','fetch_activities',NULL,0),
+ (5,1,'Daily',NULL,NULL,NULL,'Process Pledges','Updates pledge records and sends out reminders. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_process_pledge','Job','process_pledge','send_reminders=0',0),
+ (6,1,'Daily',NULL,NULL,NULL,'Geocode and Parse Addresses','Geocodes and/or parses street addresses. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_geocode','Job','geocode','geocoding=1\n      parse=0\n      throttle=0',0),
+ (7,1,'Daily',NULL,NULL,NULL,'Update Individual Email Greeting','Update Individual Email Greeting. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_update_greeting','Job','update_greeting','ct=Individual\ngt=email_greeting',0),
+ (8,1,'Daily',NULL,NULL,NULL,'Update Individual Postal Greeting','Update Individual Postal Greeting. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_update_greeting','Job','update_greeting','ct=Individual\ngt=postal_greeting',0),
+ (9,1,'Daily',NULL,NULL,NULL,'Update Individual Addressee','Update Individual Addressee. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_update_greeting','Job','update_greeting','ct=Individual\ngt=addressee',0),
+ (10,1,'Daily',NULL,NULL,NULL,'Mail Reports','Generates and sends out reports via email. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_mail_report','Job','mail_report','',0),
+ (11,1,'Hourly',NULL,NULL,NULL,'Send Scheduled Reminders','Sends out scheduled reminders via email. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_send_reminder','Job','send_reminder',NULL,0),
+ (12,1,'Always',NULL,NULL,NULL,'Update Participant Statuses','Updates pending event participant statuses based on time. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_process_participant','Job','process_participant',NULL,0),
+ (13,1,'Daily',NULL,NULL,NULL,'Update Membership Statuses','Updates membership statuses. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_process_membership','Job','process_membership',NULL,0),
+ (14,1,'Always',NULL,NULL,NULL,'Process Survey Respondents','Releases reserved survey respondents. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_process_respondent','Job','process_respondent',NULL,0),
+ (15,1,'Monthly',NULL,NULL,NULL,'Clean-up Temporary Data and Files','Removes temporary data and files. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_cleanup','Job','cleanup','session=0',0),
+ (16,1,'Always',NULL,NULL,NULL,'Send Scheduled SMS','Sends out scheduled SMS. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_process_sms','Job','process_sms',NULL,0),
+ (17,1,'Hourly',NULL,NULL,NULL,'Rebuild Smart Group Cache','Rebuilds the smart group cache. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_group_rebuild','Job','group_rebuild','limit=0',0),
+ (18,1,'Hourly',NULL,NULL,NULL,'Group Cache Flush','Purges aged smart group cache data. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_group_cache_flush','Job','group_cache_flush','',0),
+ (19,1,'Daily',NULL,NULL,NULL,'Disable expired relationships','Disables relationships that have expired. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_disable_expired_relationships','Job','disable_expired_relationships',NULL,0),
+ (20,1,'Daily',NULL,NULL,NULL,'Validate Email Address from Mailings.','Updates the reset_date on an email address. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#mailing_update_email_resetdate','Mailing','update_email_resetdate','minDays=5\n      maxDays=60',0),
+ (21,1,'Daily',NULL,NULL,NULL,'Dedupe Contacts','Executes the Individual, Unsupervised redupe rule. https://docs.civicrm.org/user/en/latest/initial-set-up/scheduled-jobs/#job_process_batch_merge','Job','process_batch_merge',NULL,0);
 /*!40000 ALTER TABLE `civicrm_job` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4144,84 +4152,84 @@ INSERT INTO `civicrm_line_item` (`id`, `entity_table`, `entity_id`, `contributio
  (31,'civicrm_contribution',31,31,1,'Contribution Amount',1.00,5.00,5.00,0,1,1,0.00,0.00,NULL),
  (32,'civicrm_membership',1,32,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
  (33,'civicrm_membership',3,34,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
- (34,'civicrm_membership',5,36,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
- (35,'civicrm_membership',7,38,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
- (36,'civicrm_membership',9,40,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
+ (34,'civicrm_membership',7,38,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
+ (35,'civicrm_membership',9,40,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
+ (36,'civicrm_membership',10,41,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
  (37,'civicrm_membership',13,44,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
  (38,'civicrm_membership',15,46,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
  (39,'civicrm_membership',17,48,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
  (40,'civicrm_membership',19,50,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
- (41,'civicrm_membership',21,52,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
- (42,'civicrm_membership',23,54,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
- (43,'civicrm_membership',27,58,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
- (44,'civicrm_membership',29,60,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
- (45,'civicrm_membership',30,61,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
+ (41,'civicrm_membership',20,51,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
+ (42,'civicrm_membership',21,52,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
+ (43,'civicrm_membership',23,54,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
+ (44,'civicrm_membership',27,58,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
+ (45,'civicrm_membership',29,60,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,0.00,NULL),
  (46,'civicrm_membership',2,33,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
  (47,'civicrm_membership',4,35,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
- (48,'civicrm_membership',6,37,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
- (49,'civicrm_membership',8,39,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
- (50,'civicrm_membership',10,41,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
+ (48,'civicrm_membership',5,36,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
+ (49,'civicrm_membership',6,37,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
+ (50,'civicrm_membership',8,39,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
  (51,'civicrm_membership',12,43,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
  (52,'civicrm_membership',14,45,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
  (53,'civicrm_membership',16,47,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
  (54,'civicrm_membership',18,49,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
- (55,'civicrm_membership',20,51,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
- (56,'civicrm_membership',24,55,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
- (57,'civicrm_membership',25,56,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
- (58,'civicrm_membership',26,57,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
- (59,'civicrm_membership',28,59,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
+ (55,'civicrm_membership',24,55,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
+ (56,'civicrm_membership',25,56,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
+ (57,'civicrm_membership',26,57,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
+ (58,'civicrm_membership',28,59,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
+ (59,'civicrm_membership',30,61,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,0.00,NULL),
  (60,'civicrm_membership',11,42,4,'Lifetime',1.00,1200.00,1200.00,NULL,9,2,0.00,0.00,NULL),
  (61,'civicrm_membership',22,53,4,'Lifetime',1.00,1200.00,1200.00,NULL,9,2,0.00,0.00,NULL),
- (63,'civicrm_participant',3,104,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (64,'civicrm_participant',6,83,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (65,'civicrm_participant',9,91,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (66,'civicrm_participant',12,92,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (67,'civicrm_participant',15,105,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (68,'civicrm_participant',18,89,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (69,'civicrm_participant',21,94,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (70,'civicrm_participant',24,109,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (71,'civicrm_participant',25,64,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (72,'civicrm_participant',28,111,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (73,'civicrm_participant',31,82,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (74,'civicrm_participant',34,108,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (75,'civicrm_participant',37,77,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (76,'civicrm_participant',40,80,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (77,'civicrm_participant',43,63,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (78,'civicrm_participant',46,66,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (79,'civicrm_participant',49,75,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (80,'civicrm_participant',50,98,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
- (81,'civicrm_participant',1,88,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (82,'civicrm_participant',4,69,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (83,'civicrm_participant',7,72,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (84,'civicrm_participant',10,85,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (85,'civicrm_participant',13,93,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (86,'civicrm_participant',16,87,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (87,'civicrm_participant',19,110,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (88,'civicrm_participant',22,107,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (89,'civicrm_participant',26,90,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (90,'civicrm_participant',29,73,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (91,'civicrm_participant',32,68,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (92,'civicrm_participant',35,79,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (93,'civicrm_participant',38,71,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (94,'civicrm_participant',41,67,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (95,'civicrm_participant',44,100,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (96,'civicrm_participant',47,103,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
- (97,'civicrm_participant',2,96,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
- (98,'civicrm_participant',5,81,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
- (99,'civicrm_participant',8,78,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
- (100,'civicrm_participant',11,101,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
- (101,'civicrm_participant',14,99,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
- (102,'civicrm_participant',17,76,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
- (103,'civicrm_participant',20,74,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
- (104,'civicrm_participant',23,86,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
- (105,'civicrm_participant',27,84,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
- (106,'civicrm_participant',30,97,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
- (107,'civicrm_participant',33,65,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
- (108,'civicrm_participant',36,106,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
- (109,'civicrm_participant',39,70,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
- (110,'civicrm_participant',42,102,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
- (111,'civicrm_participant',45,112,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
- (112,'civicrm_participant',48,95,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL);
+ (63,'civicrm_participant',3,65,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (64,'civicrm_participant',6,68,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (65,'civicrm_participant',9,71,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (66,'civicrm_participant',12,74,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (67,'civicrm_participant',15,77,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (68,'civicrm_participant',18,80,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (69,'civicrm_participant',21,83,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (70,'civicrm_participant',24,86,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (71,'civicrm_participant',25,87,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (72,'civicrm_participant',28,90,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (73,'civicrm_participant',31,93,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (74,'civicrm_participant',34,96,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (75,'civicrm_participant',37,99,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (76,'civicrm_participant',40,102,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (77,'civicrm_participant',43,105,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (78,'civicrm_participant',46,108,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (79,'civicrm_participant',49,111,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (80,'civicrm_participant',50,112,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,0.00,NULL),
+ (81,'civicrm_participant',1,63,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (82,'civicrm_participant',4,66,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (83,'civicrm_participant',7,69,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (84,'civicrm_participant',10,72,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (85,'civicrm_participant',13,75,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (86,'civicrm_participant',16,78,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (87,'civicrm_participant',19,81,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (88,'civicrm_participant',22,84,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (89,'civicrm_participant',26,88,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (90,'civicrm_participant',29,91,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (91,'civicrm_participant',32,94,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (92,'civicrm_participant',35,97,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (93,'civicrm_participant',38,100,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (94,'civicrm_participant',41,103,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (95,'civicrm_participant',44,106,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (96,'civicrm_participant',47,109,8,'Single',1.00,50.00,50.00,0,16,4,0.00,0.00,NULL),
+ (97,'civicrm_participant',2,64,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
+ (98,'civicrm_participant',5,67,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
+ (99,'civicrm_participant',8,70,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
+ (100,'civicrm_participant',11,73,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
+ (101,'civicrm_participant',14,76,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
+ (102,'civicrm_participant',17,79,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
+ (103,'civicrm_participant',20,82,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
+ (104,'civicrm_participant',23,85,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
+ (105,'civicrm_participant',27,89,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
+ (106,'civicrm_participant',30,92,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
+ (107,'civicrm_participant',33,95,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
+ (108,'civicrm_participant',36,98,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
+ (109,'civicrm_participant',39,101,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
+ (110,'civicrm_participant',42,104,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
+ (111,'civicrm_participant',45,107,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL),
+ (112,'civicrm_participant',48,110,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,0.00,NULL);
 /*!40000 ALTER TABLE `civicrm_line_item` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4232,9 +4240,9 @@ 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,178,180,154,NULL,NULL,NULL,NULL,NULL),
- (2,179,181,155,NULL,NULL,NULL,NULL,NULL),
- (3,180,182,156,NULL,NULL,NULL,NULL,NULL);
+ (1,180,180,153,NULL,NULL,NULL,NULL,NULL),
+ (2,181,181,154,NULL,NULL,NULL,NULL,NULL),
+ (3,182,182,155,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_loc_block` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4260,7 +4268,7 @@ UNLOCK TABLES;
 LOCK TABLES `civicrm_log` WRITE;
 /*!40000 ALTER TABLE `civicrm_log` DISABLE KEYS */;
 INSERT INTO `civicrm_log` (`id`, `entity_table`, `entity_id`, `data`, `modified_id`, `modified_date`) VALUES
- (1,'civicrm_contact',202,'civicrm_contact,202',202,'2024-01-06 04:30:29');
+ (1,'civicrm_contact',202,'civicrm_contact,202',202,'2024-04-26 15:50:10');
 /*!40000 ALTER TABLE `civicrm_log` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4684,36 +4692,36 @@ 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,183,1,'2024-01-06','2024-01-06','2026-01-05','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (2,160,2,'2024-01-05','2024-01-05','2025-01-04','Payment',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (3,56,1,'2024-01-04','2024-01-04','2026-01-03','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (4,157,2,'2024-01-03','2024-01-03','2025-01-02','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (5,102,1,'2021-12-05','2021-12-05','2023-12-04','Donation',3,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (6,41,2,'2024-01-01','2024-01-01','2024-12-31','Donation',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (7,22,1,'2023-12-31','2023-12-31','2025-12-30','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (8,165,2,'2023-12-30','2023-12-30','2024-12-29','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (9,150,1,'2023-12-29','2023-12-29','2025-12-28','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (10,129,2,'2022-12-28','2022-12-28','2023-12-27','Donation',4,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (11,3,3,'2023-12-27','2023-12-27',NULL,'Payment',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (12,11,2,'2023-12-26','2023-12-26','2024-12-25','Payment',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (13,42,1,'2023-12-25','2023-12-25','2025-12-24','Donation',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (14,93,2,'2023-12-24','2023-12-24','2024-12-23','Donation',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (15,65,1,'2021-09-16','2021-09-16','2023-09-15','Donation',3,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (16,202,2,'2023-12-22','2023-12-22','2024-12-21','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (17,159,1,'2023-12-21','2023-12-21','2025-12-20','Payment',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (18,123,2,'2023-12-20','2023-12-20','2024-12-19','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (19,38,1,'2023-12-19','2023-12-19','2025-12-18','Payment',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (20,78,2,'2022-12-18','2022-12-18','2023-12-17','Check',4,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (21,9,1,'2023-12-17','2023-12-17','2025-12-16','Payment',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (22,139,3,'2023-12-16','2023-12-16',NULL,'Payment',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (23,4,1,'2023-12-15','2023-12-15','2025-12-14','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (24,94,2,'2023-12-14','2023-12-14','2024-12-13','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (25,35,2,'2022-12-13','2022-12-13','2023-12-12','Donation',4,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (26,66,2,'2023-12-12','2023-12-12','2024-12-11','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (27,28,1,'2023-12-11','2023-12-11','2025-12-10','Donation',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (28,27,2,'2023-12-10','2023-12-10','2024-12-09','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (29,24,1,'2023-12-09','2023-12-09','2025-12-08','Donation',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
- (30,188,1,'2021-05-19','2021-05-19','2023-05-18','Check',3,0,NULL,NULL,NULL,0,0,NULL,NULL);
+ (1,194,1,'2024-04-26','2024-04-26','2026-04-25','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (2,87,2,'2024-04-25','2024-04-25','2025-04-24','Payment',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (3,60,1,'2024-04-24','2024-04-24','2026-04-23','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (4,190,2,'2024-04-23','2024-04-23','2025-04-22','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (5,5,2,'2023-04-22','2023-04-22','2024-04-21','Check',4,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (6,13,2,'2024-04-21','2024-04-21','2025-04-20','Payment',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (7,112,1,'2024-04-20','2024-04-20','2026-04-19','Donation',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (8,115,2,'2024-04-19','2024-04-19','2025-04-18','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (9,201,1,'2024-04-18','2024-04-18','2026-04-17','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (10,128,1,'2022-02-13','2022-02-13','2024-02-12','Check',3,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (11,43,3,'2024-04-16','2024-04-16',NULL,'Payment',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (12,4,2,'2024-04-15','2024-04-15','2025-04-14','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (13,142,1,'2024-04-14','2024-04-14','2026-04-13','Payment',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (14,160,2,'2024-04-13','2024-04-13','2025-04-12','Donation',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (15,65,1,'2022-01-04','2022-01-04','2024-01-03','Donation',3,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (16,159,2,'2024-04-11','2024-04-11','2025-04-10','Donation',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (17,20,1,'2024-04-10','2024-04-10','2026-04-09','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (18,120,2,'2024-04-09','2024-04-09','2025-04-08','Donation',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (19,200,1,'2024-04-08','2024-04-08','2026-04-07','Payment',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (20,140,1,'2021-11-25','2021-11-25','2023-11-24','Check',3,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (21,62,1,'2024-04-06','2024-04-06','2026-04-05','Payment',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (22,155,3,'2024-04-05','2024-04-05',NULL,'Payment',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (23,75,1,'2024-04-04','2024-04-04','2026-04-03','Donation',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (24,202,2,'2024-04-03','2024-04-03','2025-04-02','Donation',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (25,71,2,'2023-04-02','2023-04-02','2024-04-01','Payment',4,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (26,39,2,'2024-04-01','2024-04-01','2025-03-31','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (27,107,1,'2024-03-31','2024-03-31','2026-03-30','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (28,116,2,'2024-03-30','2024-03-30','2025-03-29','Check',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (29,166,1,'2024-03-29','2024-03-29','2026-03-28','Donation',1,0,NULL,NULL,NULL,0,0,NULL,NULL),
+ (30,50,2,'2023-03-28','2023-03-28','2024-03-27','Payment',4,0,NULL,NULL,NULL,0,0,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_membership` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4735,36 +4743,36 @@ 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,11,1,'2023-12-27',NULL,3,'2024-01-06',3,NULL),
- (2,23,1,'2023-12-15','2025-12-14',4,'2024-01-06',1,NULL),
- (3,21,1,'2023-12-17','2025-12-16',9,'2024-01-06',1,NULL),
- (4,12,1,'2023-12-26','2024-12-25',11,'2024-01-06',2,NULL),
- (5,7,1,'2023-12-31','2025-12-30',22,'2024-01-06',1,NULL),
- (6,29,1,'2023-12-09','2025-12-08',24,'2024-01-06',1,NULL),
- (7,28,1,'2023-12-10','2024-12-09',27,'2024-01-06',2,NULL),
- (8,27,1,'2023-12-11','2025-12-10',28,'2024-01-06',1,NULL),
- (9,25,4,'2022-12-13','2023-12-12',35,'2024-01-06',2,NULL),
- (10,19,1,'2023-12-19','2025-12-18',38,'2024-01-06',1,NULL),
- (11,6,1,'2024-01-01','2024-12-31',41,'2024-01-06',2,NULL),
- (12,13,1,'2023-12-25','2025-12-24',42,'2024-01-06',1,NULL),
- (13,3,1,'2024-01-04','2026-01-03',56,'2024-01-06',1,NULL),
- (14,15,3,'2021-09-16','2023-09-15',65,'2024-01-06',1,NULL),
- (15,26,1,'2023-12-12','2024-12-11',66,'2024-01-06',2,NULL),
- (16,20,4,'2022-12-18','2023-12-17',78,'2024-01-06',2,NULL),
- (17,14,1,'2023-12-24','2024-12-23',93,'2024-01-06',2,NULL),
- (18,24,1,'2023-12-14','2024-12-13',94,'2024-01-06',2,NULL),
- (19,5,3,'2021-12-05','2023-12-04',102,'2024-01-06',1,NULL),
- (20,18,1,'2023-12-20','2024-12-19',123,'2024-01-06',2,NULL),
- (21,10,4,'2022-12-28','2023-12-27',129,'2024-01-06',2,NULL),
- (22,22,1,'2023-12-16',NULL,139,'2024-01-06',3,NULL),
- (23,9,1,'2023-12-29','2025-12-28',150,'2024-01-06',1,NULL),
- (24,4,1,'2024-01-03','2025-01-02',157,'2024-01-06',2,NULL),
- (25,17,1,'2023-12-21','2025-12-20',159,'2024-01-06',1,NULL),
- (26,2,1,'2024-01-05','2025-01-04',160,'2024-01-06',2,NULL),
- (27,8,1,'2023-12-30','2024-12-29',165,'2024-01-06',2,NULL),
- (28,1,1,'2024-01-06','2026-01-05',183,'2024-01-06',1,NULL),
- (29,30,3,'2021-05-19','2023-05-18',188,'2024-01-06',1,NULL),
- (30,16,1,'2023-12-22','2024-12-21',202,'2024-01-06',2,NULL);
+ (1,12,1,'2024-04-15','2025-04-14',4,'2024-04-26',2,NULL),
+ (2,5,4,'2023-04-22','2024-04-21',5,'2024-04-26',2,NULL),
+ (3,6,1,'2024-04-21','2025-04-20',13,'2024-04-26',2,NULL),
+ (4,17,1,'2024-04-10','2026-04-09',20,'2024-04-26',1,NULL),
+ (5,26,1,'2024-04-01','2025-03-31',39,'2024-04-26',2,NULL),
+ (6,11,1,'2024-04-16',NULL,43,'2024-04-26',3,NULL),
+ (7,30,4,'2023-03-28','2024-03-27',50,'2024-04-26',2,NULL),
+ (8,3,1,'2024-04-24','2026-04-23',60,'2024-04-26',1,NULL),
+ (9,21,1,'2024-04-06','2026-04-05',62,'2024-04-26',1,NULL),
+ (10,15,3,'2022-01-04','2024-01-03',65,'2024-04-26',1,NULL),
+ (11,25,4,'2023-04-02','2024-04-01',71,'2024-04-26',2,NULL),
+ (12,23,1,'2024-04-04','2026-04-03',75,'2024-04-26',1,NULL),
+ (13,2,1,'2024-04-25','2025-04-24',87,'2024-04-26',2,NULL),
+ (14,27,1,'2024-03-31','2026-03-30',107,'2024-04-26',1,NULL),
+ (15,7,1,'2024-04-20','2026-04-19',112,'2024-04-26',1,NULL),
+ (16,8,1,'2024-04-19','2025-04-18',115,'2024-04-26',2,NULL),
+ (17,28,1,'2024-03-30','2025-03-29',116,'2024-04-26',2,NULL),
+ (18,18,1,'2024-04-09','2025-04-08',120,'2024-04-26',2,NULL),
+ (19,10,3,'2022-02-13','2024-02-12',128,'2024-04-26',1,NULL),
+ (20,20,3,'2021-11-25','2023-11-24',140,'2024-04-26',1,NULL),
+ (21,13,1,'2024-04-14','2026-04-13',142,'2024-04-26',1,NULL),
+ (22,22,1,'2024-04-05',NULL,155,'2024-04-26',3,NULL),
+ (23,16,1,'2024-04-11','2025-04-10',159,'2024-04-26',2,NULL),
+ (24,14,1,'2024-04-13','2025-04-12',160,'2024-04-26',2,NULL),
+ (25,29,1,'2024-03-29','2026-03-28',166,'2024-04-26',1,NULL),
+ (26,4,1,'2024-04-23','2025-04-22',190,'2024-04-26',2,NULL),
+ (27,1,1,'2024-04-26','2026-04-25',194,'2024-04-26',1,NULL),
+ (28,19,1,'2024-04-08','2026-04-07',200,'2024-04-26',1,NULL),
+ (29,9,1,'2024-04-18','2026-04-17',201,'2024-04-26',1,NULL),
+ (30,24,1,'2024-04-03','2025-04-02',202,'2024-04-26',2,NULL);
 /*!40000 ALTER TABLE `civicrm_membership_log` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4775,36 +4783,36 @@ 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
- (28,1,32),
- (26,2,33),
- (13,3,34),
- (24,4,35),
- (19,5,36),
- (11,6,37),
- (5,7,38),
- (27,8,39),
- (23,9,40),
- (21,10,41),
- (1,11,42),
- (4,12,43),
- (12,13,44),
- (17,14,45),
- (14,15,46),
- (30,16,47),
- (25,17,48),
- (20,18,49),
- (10,19,50),
- (16,20,51),
- (3,21,52),
+ (1,1,32),
+ (2,2,33),
+ (3,3,34),
+ (4,4,35),
+ (5,5,36),
+ (6,6,37),
+ (7,7,38),
+ (8,8,39),
+ (9,9,40),
+ (10,10,41),
+ (11,11,42),
+ (12,12,43),
+ (13,13,44),
+ (14,14,45),
+ (15,15,46),
+ (16,16,47),
+ (17,17,48),
+ (18,18,49),
+ (19,19,50),
+ (20,20,51),
+ (21,21,52),
  (22,22,53),
- (2,23,54),
- (18,24,55),
- (9,25,56),
- (15,26,57),
- (8,27,58),
- (7,28,59),
- (6,29,60),
- (29,30,61);
+ (23,23,54),
+ (24,24,55),
+ (25,25,56),
+ (26,26,57),
+ (27,27,58),
+ (28,28,59),
+ (29,29,60),
+ (30,30,61);
 /*!40000 ALTER TABLE `civicrm_membership_payment` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4845,467 +4853,465 @@ 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/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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (2,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (3,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (4,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (5,1,'civicrm/tag',NULL,'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: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,1,0,1,0,25,1,0,0,'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\";}'),
- (6,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:4:\"Tags\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
- (7,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:4:\"Tags\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
- (8,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (9,1,'civicrm/ajax/api4',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (10,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (11,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:1:{i:0;s:23:\"administer CiviCRM data\";}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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,10,1,0,0,'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\";}'),
- (12,1,'civicrm/admin/custom/group/edit',NULL,'Configure 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:23:\"administer CiviCRM data\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (13,1,'civicrm/admin/custom/group/preview',NULL,'Custom Field Preview','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 CiviCRM data\";}i:1;s:3:\"and\";}','s:23:\"CRM_Custom_Form_Preview\";',NULL,'a:3:{i:0;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:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (14,1,'civicrm/admin/custom/group/delete',NULL,'Delete 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:23:\"administer CiviCRM data\";}i:1;s:3:\"and\";}','s:27:\"CRM_Custom_Form_DeleteGroup\";',NULL,'a:3:{i:0;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:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (15,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:1:{i:0;s:23:\"administer CiviCRM data\";}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:10:\"Administer\";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,1,0,1,1,11,1,0,0,'a:0:{}'),
- (16,1,'civicrm/admin/custom/group/field/delete',NULL,'Delete Custom Field','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 CiviCRM data\";}i:1;s:3:\"and\";}','s:27:\"CRM_Custom_Form_DeleteField\";',NULL,'a:3:{i:0;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:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (17,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:1:{i:0;s:23:\"administer CiviCRM data\";}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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (18,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:1:{i:0;s:23:\"administer CiviCRM data\";}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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (19,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:1:{i:0;s:23:\"administer CiviCRM data\";}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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (20,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:1:{i:0;s:23:\"administer CiviCRM data\";}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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (21,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,20,1,0,0,'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\";}'),
- (22,1,'civicrm/admin/uf/group/preview',NULL,'Preview','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:19:\"CRM_UF_Form_Preview\";',NULL,'a:3:{i:0;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:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (23,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:10:\"Administer\";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,1,0,1,1,21,1,0,0,'a:0:{}'),
- (24,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:10:\"Administer\";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,1,0,1,1,22,1,0,0,'a:0:{}'),
- (25,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:10:\"Administer\";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,1,0,1,1,23,1,0,0,'a:0:{}'),
- (26,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:10:\"Administer\";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,1,0,1,1,24,1,0,0,'a:0:{}'),
- (27,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:10:\"Administer\";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,1,0,1,1,25,1,0,0,'a:0:{}'),
- (28,1,'civicrm/admin/uf/group/copy',NULL,'Profile Copy','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;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:3:{i:0;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:\"Administer\";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,1,0,1,1,26,1,0,0,'a:0:{}'),
- (29,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:10:\"Administer\";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,1,0,1,1,0,1,0,0,'a:0:{}'),
- (30,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:10:\"Administer\";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,1,0,1,1,30,1,0,0,'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\";}'),
- (31,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,35,1,0,0,'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\";}'),
- (32,1,'civicrm/admin/reltype/edit',NULL,'Edit Relationship 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:31:\"CRM_Admin_Form_RelationshipType\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:18:\"Relationship Types\";s:3:\"url\";s:30:\"/civicrm/admin/reltype?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
- (33,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:10:\"Administer\";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,1,0,1,1,40,1,0,0,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),
- (34,1,'civicrm/admin/options/subtype/edit',NULL,'Edit Contact 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:26:\"CRM_Admin_Form_ContactType\";',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:10:\"Administer\";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:13:\"Contact Types\";s:3:\"url\";s:38:\"/civicrm/admin/options/subtype?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
- (35,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:10:\"Administer\";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,1,0,1,1,45,1,0,0,'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\";}'),
- (36,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:10:\"Administer\";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,1,0,1,1,50,1,0,0,'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\";}'),
- (37,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:10:\"Administer\";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,1,0,1,1,55,1,0,0,'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\";}'),
- (38,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,60,1,0,0,'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\";}'),
- (39,1,'civicrm/admin/locationType/edit',NULL,'Edit Location 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:27:\"CRM_Admin_Form_LocationType\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:30:\"Location Types (Home, Work...)\";s:3:\"url\";s:35:\"/civicrm/admin/locationType?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
- (40,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:10:\"Administer\";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,1,0,1,1,65,1,0,0,'a:2:{s:4:\"desc\";s:48:\"Options for assigning website types to contacts.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),
- (41,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:10:\"Administer\";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,1,0,1,1,70,1,0,0,'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\";}'),
- (42,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:10:\"Administer\";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,1,0,1,1,75,1,0,0,'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\";}'),
- (43,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:10:\"Administer\";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,1,0,1,1,80,1,0,0,'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\";}'),
- (44,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,90,1,0,0,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),
- (45,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,95,1,0,0,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),
- (46,1,'civicrm/admin/setting/preferences/date/edit',NULL,'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_Form_PreferencesDate\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:21:\"View Date Preferences\";s:3:\"url\";s:47:\"/civicrm/admin/setting/preferences/date?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,97,1,0,0,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),
- (47,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,100,1,0,0,'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\";}'),
- (48,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:10:\"Administer\";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,1,0,1,1,105,1,0,0,'a:2:{s:4:\"desc\";s:18:\"Word Replacements.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),
- (49,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:10:\"Administer\";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,1,0,1,1,110,1,0,0,'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\";}'),
- (50,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,10,1,0,0,'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\";}'),
- (51,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:10:\"Administer\";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,1,0,1,1,20,1,0,0,'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\";}'),
- (52,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,30,1,0,0,'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\";}'),
- (53,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:10:\"Administer\";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,1,0,1,1,262,1,0,0,'a:1:{s:4:\"desc\";s:26:\"Add/Edit Message Templates\";}'),
- (54,1,'civicrm/admin/scheduleReminders',NULL,'Schedule Reminders','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:23:\"administer CiviCRM data\";}i:1;s:3:\"and\";}','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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,40,1,0,0,'a:2:{s:4:\"desc\";s:19:\"Schedule Reminders.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),
- (55,1,'civicrm/admin/scheduleReminders/edit',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_Form_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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:18:\"Schedule Reminders\";s:3:\"url\";s:40:\"/civicrm/admin/scheduleReminders?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
- (56,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
- (57,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:10:\"Administer\";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,1,0,1,1,50,1,0,0,'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\";}'),
- (58,1,'civicrm/admin/labelFormats',NULL,'Label Page 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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,60,1,0,0,'a:2:{s:4:\"desc\";s:82:\"Configure label sizes and page layouts that are used when printing mailing labels.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),
- (59,1,'civicrm/admin/labelFormats/edit',NULL,'Label Page 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:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:18:\"Label Page Formats\";s:3:\"url\";s:35:\"/civicrm/admin/labelFormats?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
- (60,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,70,1,0,0,'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\";}'),
- (61,1,'civicrm/admin/pdfFormats/edit',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:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:24:\"Print Page (PDF) Formats\";s:3:\"url\";s:33:\"/civicrm/admin/pdfFormats?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
- (62,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:10:\"Administer\";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,1,0,1,1,75,1,0,0,'a:2:{s:4:\"desc\";s:42:\"Options for Communication Style selection.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),
- (63,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:10:\"Administer\";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,1,0,1,1,80,1,0,0,'a:2:{s:4:\"desc\";s:75:\"Options for assigning email greetings to individual and household contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),
- (64,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:10:\"Administer\";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,1,0,1,1,90,1,0,0,'a:2:{s:4:\"desc\";s:76:\"Options for assigning postal greetings to individual and household contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),
- (65,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:10:\"Administer\";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,1,0,1,1,100,1,0,0,'a:2:{s:4:\"desc\";s:83:\"Options for assigning addressee to individual, household and organization contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),
- (66,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,10,1,0,0,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),
- (67,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,20,1,0,0,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),
- (68,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,30,1,0,0,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),
- (69,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:10:\"Administer\";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,1,0,1,1,40,1,0,0,'a:2:{s:4:\"desc\";s:30:\"Options for contact languages.\";s:10:\"adminGroup\";s:12:\"Localization\";}'),
- (70,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,10,1,0,0,'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\";}'),
- (71,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:10:\"Administer\";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,1,0,1,1,10,1,0,0,'a:1:{s:4:\"desc\";s:65:\"Grant access to CiviCRM components and other CiviCRM permissions.\";}'),
- (72,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,20,1,0,0,'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\";}'),
- (73,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}','civicrm/admin/configtask',NULL,NULL,1,0,1,1,1,1,0,0,'a:2:{s:4:\"desc\";s:55:\"List of configuration tasks with links to each setting.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (74,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,10,1,0,0,'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\";}'),
- (75,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,120,1,0,0,'a:2:{s:4:\"desc\";s:0:\"\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (76,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (77,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,20,1,0,0,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (78,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,30,1,0,0,'a:2:{s:4:\"desc\";s:48:\"Payment Processor setup for CiviCRM transactions\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (79,1,'civicrm/admin/paymentProcessor/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:29:\"administer payment processors\";}i:1;s:3:\"and\";}','s:31:\"CRM_Admin_Form_PaymentProcessor\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:28:\"Settings - Payment Processor\";s:3:\"url\";s:39:\"/civicrm/admin/paymentProcessor?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
- (80,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,40,1,0,0,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (81,1,'civicrm/admin/setting/misc',NULL,'Misc (Undelete, PDFs, Limits, Logging, 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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,50,1,0,0,'a:2:{s:4:\"desc\";s:63:\"Enable undelete/move to trash feature, detailed change logging.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (82,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,60,1,0,0,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (83,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,70,1,0,0,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (84,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,80,1,0,0,'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\";}'),
- (85,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,90,1,0,0,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (86,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:10:\"Administer\";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,1,0,1,1,100,1,0,0,'a:2:{s:4:\"desc\";s:44:\"File Extensions that can be considered safe.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (87,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,105,1,0,0,'a:2:{s:4:\"desc\";s:35:\"Access all meta-data option groups.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (88,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,110,1,0,0,'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\";}'),
- (89,1,'civicrm/admin/mapping/edit',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_Form_Mapping\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:22:\"Import/Export Mappings\";s:3:\"url\";s:30:\"/civicrm/admin/mapping?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,111,1,0,0,'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\";}'),
- (90,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,120,1,0,0,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (91,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,130,1,0,0,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (92,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,10,1,0,0,'a:3:{s:4:\"desc\";s:40:\"Configure global CiviCampaign behaviors.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),
- (93,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,420,1,0,0,'a:2:{s:4:\"desc\";s:37:\"Configure global CiviEvent behaviors.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),
- (94,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,430,1,0,0,'a:2:{s:4:\"desc\";s:36:\"Configure global CiviMail behaviors.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),
- (95,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,390,1,0,0,'a:2:{s:4:\"desc\";s:38:\"Configure global CiviMember behaviors.\";s:10:\"adminGroup\";s:10:\"CiviMember\";}'),
- (96,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
- (97,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:1:{s:4:\"desc\";s:36:\"URL used for running scheduled jobs.\";}'),
- (98,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1370,1,0,0,'a:2:{s:4:\"desc\";s:35:\"Managing periodially running tasks.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (99,1,'civicrm/admin/job/add',NULL,'Add Scheduled Job','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_Form_Job\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:14:\"Scheduled Jobs\";s:3:\"url\";s:26:\"/civicrm/admin/job?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:1:{s:4:\"desc\";s:31:\"Add a periodially running task.\";}'),
- (100,1,'civicrm/admin/job/edit',NULL,'Edit Scheduled Job','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:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:14:\"Scheduled Jobs\";s:3:\"url\";s:26:\"/civicrm/admin/job?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1372,1,0,0,'a:2:{s:4:\"desc\";s:32:\"Edit a periodially running task.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (101,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1380,1,0,0,'a:2:{s:4:\"desc\";s:46:\"Browsing the log of periodially running tasks.\";s:10:\"adminGroup\";s:6:\"Manage\";}'),
- (102,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:10:\"Administer\";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,1,0,1,1,385,1,0,0,'a:2:{s:4:\"desc\";s:148:\"List of types which can be assigned to Grants. (Enable CiviGrant from Administer > System Settings > Enable Components if you want to track grants.)\";s:10:\"adminGroup\";s:12:\"Option Lists\";}'),
- (103,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,390,1,0,0,'a:1:{s:4:\"desc\";s:34:\"Payment Processor type information\";}'),
- (104,1,'civicrm/admin',NULL,'Administer','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;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,1,0,1,1,9000,1,1,0,'a:0:{}'),
- (105,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (106,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,1,0,1,0,1,1,3,0,'a:0:{}'),
- (107,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (108,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,380,1,0,0,'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\";}'),
- (109,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'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.\";}'),
- (110,1,'civicrm/admin/price/edit',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:3:{i:0;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:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (111,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (112,1,'civicrm/admin/price/field/edit',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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (113,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (114,1,'civicrm/admin/price/field/option/edit',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: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:10:\"Administer\";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\";}i:3;a:2:{s:5:\"title\";s:19:\"Price Field Options\";s:3:\"url\";s:41:\"/civicrm/admin/price/field/option?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
- (115,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,500,1,0,0,'a:2:{s:4:\"desc\";s:27:\"To configure a sms provider\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (116,1,'civicrm/admin/sms/provider/edit',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_Form_Provider\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Sms Providers\";s:3:\"url\";s:35:\"/civicrm/admin/sms/provider?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,501,1,0,0,'a:2:{s:4:\"desc\";s:27:\"To configure a sms provider\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
- (117,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,1,0,1,0,610,1,1,0,'a:0:{}'),
- (118,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (119,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,399,1,0,0,'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\";}'),
- (120,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (121,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,1,1,1,0,0,1,0,0,'a:0:{}'),
- (122,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,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
- (123,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (124,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (125,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (126,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (127,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (128,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (129,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (130,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,1,0,1,0,1,1,3,0,'a:0:{}'),
- (131,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (132,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (133,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,1,1,1,0,0,1,0,0,'a:0:{}'),
- (134,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (135,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,362,1,0,0,'a:2:{s:4:\"desc\";s:49:\"View and manage existing personal campaign pages.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),
- (136,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,1,0,1,0,0,1,0,0,'a:0:{}'),
- (137,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,1,0,1,0,0,1,1,0,'a:0:{}'),
- (138,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,1,0,1,0,10,1,1,0,'a:0:{}'),
- (139,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (140,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (141,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (142,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,1,0,1,0,12,1,1,0,'a:0:{}'),
- (143,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,1,0,1,0,14,1,1,0,'a:0:{}'),
- (144,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (145,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (146,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (147,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (148,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (149,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (150,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (151,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (152,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (153,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (154,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (155,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (156,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (157,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (158,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (159,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (160,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (161,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (162,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (163,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (164,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (165,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (166,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (167,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (168,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,1,1,1,0,0,1,0,0,'a:0:{}'),
- (169,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
- (170,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
- (171,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
- (172,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,1,0,1,0,1,1,3,0,'a:0:{}'),
- (173,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (174,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (175,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,1,0,1,0,1,1,3,0,'a:0:{}'),
- (176,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (177,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (178,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (179,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (180,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (181,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (182,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (183,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (184,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
- (185,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
- (186,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
- (187,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,1,0,1,0,105,1,0,0,'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\";}'),
- (188,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (189,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (190,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (191,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,1,0,1,0,110,1,0,0,'a:1:{s:10:\"adminGroup\";s:6:\"Manage\";}'),
- (192,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (193,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (194,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (195,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (196,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (197,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (198,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (199,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,1,0,1,0,400,1,1,0,'a:0:{}'),
- (200,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,1,0,1,0,410,1,1,0,'a:0:{}'),
- (201,1,'civicrm/import/contact/summary',NULL,'Import 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:31:\"CRM_Contact_Import_Form_Summary\";',NULL,'a:3:{i:0;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\";}i:2;a:2:{s:5:\"title\";s:15:\"Import Contacts\";s:3:\"url\";s:31:\"/civicrm/import/contact?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,410,1,1,0,'a:0:{}'),
- (202,1,'civicrm/import/outcome',NULL,'Import results','a:2:{i:0;s:19:\"CRM_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_Import_Forms\";i:1;s:9:\"outputCSV\";}',NULL,'a:2:{i:0;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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (203,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,1,0,1,0,420,1,1,0,'a:0:{}'),
- (204,1,'civicrm/import/contribution',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:6:\"Import\";s:3:\"url\";s:23:\"/civicrm/import?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,520,1,1,0,'a:0:{}'),
- (205,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,1,0,1,0,420,1,1,0,'a:0:{}'),
- (206,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (207,1,'civicrm/import/datasource',NULL,'Import','a:2:{i:0;s:19:\"CRM_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_Import_Form_DataSourceConfig\";',NULL,'a:2:{i:0;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,1,0,1,0,450,1,1,0,'a:0:{}'),
- (208,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,1,0,1,0,30,1,1,0,'a:0:{}'),
- (209,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,1,0,1,0,1,1,0,0,'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\";}'),
- (210,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (211,1,'civicrm/group/edit',NULL,'Edit 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:19:\"CRM_Group_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:13:\"Manage Groups\";s:3:\"url\";s:22:\"/civicrm/group?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
- (212,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (213,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,1,1,1,0,0,1,0,0,'a:0:{}'),
- (214,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,1,1,1,0,0,1,0,0,'a:0:{}'),
- (215,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (216,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (217,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (218,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (219,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,1,0,1,0,0,1,0,0,'a:0:{}'),
- (220,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (221,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (222,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (223,1,'civicrm/acl/edit',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_Form_ACL\";',NULL,'a:2:{i:0;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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (224,1,'civicrm/acl/delete',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_Form_ACL\";',NULL,'a:2:{i:0;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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (225,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (226,1,'civicrm/acl/entityrole/edit',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_Form_EntityRole\";',NULL,'a:3:{i:0;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\";}i:2;a:2:{s:5:\"title\";s:25:\"Assign Users to ACL Roles\";s:3:\"url\";s:31:\"/civicrm/acl/entityrole?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
- (227,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (228,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (229,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (230,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,1,0,1,0,9999,1,1,0,'a:0:{}'),
- (231,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (232,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (233,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (234,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (235,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (236,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (237,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (238,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (239,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (240,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (241,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (242,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (243,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (244,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (245,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (246,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (247,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (248,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (249,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (250,1,'civicrm/dev/fake-error',NULL,'Fake Error','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:23:\"CRM_Core_Page_FakeError\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,1,1,0,1,1,0,0,'a:0:{}'),
- (251,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (252,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (253,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (254,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (255,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (256,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (257,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (258,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (259,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (260,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (261,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (262,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (263,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (264,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (265,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (266,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (267,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (268,1,'civicrm/task/add-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\";}','s:26:\"CRM_Activity_Form_Activity\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
- (269,1,'civicrm/note',NULL,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:18:\"CRM_Note_Form_Note\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
- (270,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (271,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (272,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,1,0,1,0,800,1,1,0,'a:1:{s:9:\"component\";s:9:\"CiviEvent\";}'),
- (273,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,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:9:\"CiviEvent\";}'),
- (274,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (275,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,1,1,1,1,1,1,0,0,'a:0:{}'),
- (276,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,1,1,1,1,1,1,0,0,'a:0:{}'),
- (277,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,1,1,1,0,0,1,0,0,'a:0:{}'),
- (278,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,1,1,1,0,0,1,0,0,'a:0:{}'),
- (279,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,1,1,1,0,0,1,0,0,'a:0:{}'),
- (280,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,370,1,0,0,'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\";}'),
- (281,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,375,1,0,0,'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\";}'),
- (282,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:10:\"Administer\";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,1,0,1,1,385,1,0,0,'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\";}'),
- (283,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,390,1,0,0,'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\";}'),
- (284,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:10:\"Administer\";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,1,0,1,1,395,1,0,0,'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\";}'),
- (285,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:10:\"Administer\";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,1,0,1,1,398,1,0,0,'a:2:{s:4:\"desc\";s:48:\"Template to control participant listing display.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),
- (286,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,1,0,1,0,810,1,1,0,'a:0:{}'),
- (287,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,1,0,1,1,820,1,1,0,'a:0:{}'),
- (288,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (289,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,1,0,1,1,910,1,0,0,'a:0:{}'),
- (290,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,1,0,1,1,930,1,0,0,'a:0:{}'),
- (291,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,1,0,1,1,920,1,0,0,'a:0:{}'),
- (292,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,1,0,1,1,930,1,0,0,'a:0:{}'),
- (293,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,1,0,1,1,940,1,0,0,'a:0:{}'),
- (294,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,1,0,1,1,950,1,0,0,'a:0:{}'),
- (295,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,1,0,1,1,960,1,0,0,'a:0:{}'),
- (296,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,1,0,1,0,830,1,0,0,'a:0:{}'),
- (297,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,1,0,1,0,840,1,1,0,'a:0:{}'),
- (298,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,1,0,1,0,850,1,1,0,'a:0:{}'),
- (299,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,1,1,1,0,880,1,1,0,'a:0:{}'),
- (300,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,1,1,1,0,890,1,1,0,'a:0:{}'),
- (301,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,1,0,1,0,4,1,0,0,'a:0:{}'),
- (302,1,'civicrm/participant/delete',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"delete in CiviEvent\";}i:1;s:3:\"and\";}','s:33:\"CRM_Event_Form_Participant_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,1,0,1,0,4,1,0,0,'a:0:{}'),
- (303,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (304,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (305,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (306,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,1,0,1,1,540,1,1,0,'a:0:{}'),
- (307,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (308,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,1,1,1,0,0,1,0,0,'a:0:{}'),
- (309,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,1,0,1,0,500,1,1,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
- (310,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,1,0,1,0,1,1,1,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
- (311,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,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
- (312,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,1,1,1,1,0,1,0,0,'a:0:{}'),
- (313,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,360,1,0,0,'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\";}'),
- (314,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:10:\"Administer\";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,1,0,1,1,400,1,0,0,'a:0:{}'),
- (315,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:10:\"Administer\";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,1,0,1,1,410,1,0,0,'a:0:{}'),
- (316,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:10:\"Administer\";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,1,0,1,1,420,1,0,0,'a:0:{}'),
- (317,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:10:\"Administer\";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,1,0,1,1,430,1,0,0,'a:0:{}'),
- (318,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:10:\"Administer\";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,1,0,1,1,430,1,0,0,'a:0:{}'),
- (319,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:10:\"Administer\";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,1,0,1,1,440,1,0,0,'a:0:{}'),
- (320,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:10:\"Administer\";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,1,0,1,1,460,1,0,0,'a:0:{}'),
- (321,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:10:\"Administer\";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,1,0,1,1,470,1,0,0,'a:0:{}'),
- (322,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:10:\"Administer\";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,1,0,1,1,480,1,0,0,'a:0:{}'),
- (323,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (324,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:10:\"Administer\";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,1,0,1,1,365,1,0,0,'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\";}'),
- (325,1,'civicrm/admin/contribute/managePremiums/edit',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_Form_ManagePremiums\";',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:10:\"Administer\";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\";}i:3;a:2:{s:5:\"title\";s:15:\"Manage Premiums\";s:3:\"url\";s:48:\"/civicrm/admin/contribute/managePremiums?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
- (326,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,580,1,0,0,'a:2:{s:4:\"desc\";s:64:\"Formerly civicrm_contribution_type merged into this table in 4.1\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),
- (327,1,'civicrm/admin/financial/financialType/edit',NULL,'Edit Financial 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:32:\"CRM_Financial_Form_FinancialType\";',NULL,'a:3:{i:0;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:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (328,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,1,0,1,0,1,1,1,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
- (329,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,370,1,0,0,'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\";}'),
- (330,1,'civicrm/admin/financial/financialAccount/edit',NULL,'Edit 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_Form_FinancialAccount\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:18:\"Financial Accounts\";s:3:\"url\";s:49:\"/civicrm/admin/financial/financialAccount?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
- (331,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:10:\"Administer\";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,1,0,1,1,380,1,0,0,'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\";}'),
- (332,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:10:\"Administer\";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,1,0,1,1,395,1,0,0,'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\";}'),
- (333,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'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\";}'),
- (334,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (335,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (336,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (337,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,1,0,1,0,510,1,1,0,'a:0:{}'),
- (338,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,1,0,1,0,588,1,1,0,'a:0:{}'),
- (339,1,'civicrm/admin/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:3:{i:0;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:\"Administer\";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,1,0,1,1,530,1,1,0,'a:0:{}'),
- (340,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,1,0,1,0,0,1,0,0,'a:0:{}'),
- (341,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (342,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (343,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (344,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (345,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (346,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (347,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:10:\"Administer\";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,1,0,1,1,581,1,0,0,'a:0:{}'),
- (348,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,1,0,1,0,585,1,0,0,'a:0:{}'),
- (349,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,1,0,1,0,586,1,0,0,'a:0:{}'),
- (350,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,1,0,1,0,600,1,0,0,'a:0:{}'),
- (351,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,1,0,1,0,610,1,0,0,'a:0:{}'),
- (352,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,1,0,1,0,1,1,1,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
- (353,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:2:{s:4:\"desc\";s:42:\"Configure global CiviContribute behaviors.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),
- (354,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,1,0,1,0,620,1,1,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
- (355,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,1,0,1,0,630,1,1,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
- (356,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (357,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (358,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (359,1,'civicrm/contribute/widget',NULL,'CiviContribute','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:26:\"CRM_Contribute_Page_Widget\";',NULL,'a:2:{i:0;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,1,1,1,0,0,1,0,0,'a:0:{}'),
- (360,1,'civicrm/contribute/task',NULL,'Contribution Task','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_Contribute_Controller_Task\";',NULL,'a:2:{i:0;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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (361,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:10:\"Administer\";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,1,0,1,1,450,1,0,0,'a:0:{}'),
- (362,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,1,1,1,0,0,1,0,0,'a:0:{}'),
- (363,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,1,0,1,0,700,1,1,0,'a:1:{s:9:\"component\";s:10:\"CiviMember\";}'),
- (364,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,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:10:\"CiviMember\";}'),
- (365,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,370,1,0,0,'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\";}'),
- (366,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,380,1,0,0,'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\";}'),
- (367,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,1,0,1,0,2,1,0,0,'a:0:{}'),
- (368,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,1,0,1,0,390,1,0,0,'a:0:{}'),
- (369,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,1,0,1,0,710,1,1,0,'a:0:{}'),
- (370,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,1,0,1,0,720,1,1,0,'a:0:{}'),
- (371,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (372,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
- (373,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,1,0,1,0,600,1,1,0,'a:1:{s:9:\"component\";s:8:\"CiviMail\";}'),
- (374,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,400,1,0,0,'a:2:{s:4:\"desc\";s:61:\"Configure spool period, throttling and other mailer settings.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),
- (375,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,410,1,0,0,'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\";}'),
- (376,1,'civicrm/admin/component/edit',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_Form_Component\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:40:\"Headers, Footers, and Automated Messages\";s:3:\"url\";s:32:\"/civicrm/admin/component?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,411,1,0,0,'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\";}'),
- (377,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:10:\"Administer\";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,1,0,1,1,415,1,0,0,'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\";}'),
- (378,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,420,1,0,0,'a:2:{s:4:\"desc\";s:20:\"List email accounts.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),
- (379,1,'civicrm/admin/mailSettings/edit',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_Form_MailSettings\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Mail Accounts\";s:3:\"url\";s:35:\"/civicrm/admin/mailSettings?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,420,1,0,0,'a:0:{}'),
- (380,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,1,0,1,0,610,1,1,0,'a:0:{}'),
- (381,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,1,0,1,0,620,1,1,0,'a:0:{}'),
- (382,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,1,0,1,0,620,1,1,0,'a:0:{}'),
- (383,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,1,0,1,0,625,1,1,0,'a:0:{}'),
- (384,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,1,0,1,0,630,1,1,0,'a:0:{}'),
- (385,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,1,1,1,0,640,1,0,0,'a:0:{}'),
- (386,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,1,1,1,0,645,1,0,0,'a:0:{}'),
- (387,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,1,1,1,0,650,1,0,0,'a:0:{}'),
- (388,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,1,1,1,0,660,1,0,0,'a:0:{}'),
- (389,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,1,1,1,0,660,1,0,0,'a:0:{}'),
- (390,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,1,0,1,0,680,1,0,0,'a:0:{}'),
- (391,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,1,1,1,0,685,1,0,0,'a:0:{}'),
- (392,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,1,0,1,0,695,1,0,0,'a:0:{}'),
- (393,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (394,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,1,1,1,0,800,1,0,0,'a:0:{}'),
- (395,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,1,0,1,0,850,1,0,0,'a:0:{}'),
- (396,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (397,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (398,1,'civicrm/ajax/setupMailAccount',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 CiviMail\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Mailing_Page_AJAX\";i:1;s:5:\"setup\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
- (399,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (400,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (401,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,1,0,1,0,550,1,1,0,'a:1:{s:9:\"component\";s:10:\"CiviPledge\";}'),
- (402,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,1,0,1,0,560,1,1,0,'a:0:{}'),
- (403,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,1,0,1,0,570,1,0,0,'a:0:{}'),
- (404,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,1,0,1,0,1,1,1,0,'a:1:{s:9:\"component\";s:10:\"CiviPledge\";}'),
- (405,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,1,0,1,0,580,1,0,0,'a:0:{}'),
- (406,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (407,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,1,0,1,0,900,1,1,0,'a:1:{s:9:\"component\";s:8:\"CiviCase\";}'),
- (408,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,1,0,1,0,1,1,1,0,'a:1:{s:9:\"component\";s:8:\"CiviCase\";}'),
- (409,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,1,0,1,0,910,1,1,0,'a:0:{}'),
- (410,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (411,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (412,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (413,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (414,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (415,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (416,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (417,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (418,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,380,1,0,0,'a:1:{s:10:\"adminGroup\";s:8:\"CiviCase\";}'),
- (419,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:10:\"Administer\";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,1,0,1,1,390,1,0,0,'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\";}'),
- (420,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:10:\"Administer\";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,1,0,1,1,400,1,0,0,'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\";}'),
- (421,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:10:\"Administer\";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,1,0,1,1,400,1,0,0,'a:2:{s:4:\"desc\";s:48:\"List of statuses that can be assigned to a case.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),
- (422,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:10:\"Administer\";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,1,0,1,1,400,1,0,0,'a:2:{s:4:\"desc\";s:26:\"List of encounter mediums.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),
- (423,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (424,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (425,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,1,0,1,0,1,1,3,0,'a:0:{}'),
- (426,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (427,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (428,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (429,1,'civicrm/case/email/add','action=add,task=email','Email','a:2:{i:0;s:19:\"CRM_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_Task_Email\";',NULL,'a:2:{i:0;a: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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (430,1,'civicrm/contact/view/case/deleteClient',NULL,'Remove 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:26:\"CRM_Case_Form_DeleteClient\";',NULL,'a:3:{i:0;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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (431,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,1,0,1,0,1200,1,1,0,'a:1:{s:9:\"component\";s:10:\"CiviReport\";}'),
- (432,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (433,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,1,0,1,0,1220,1,1,0,'a:0:{}'),
- (434,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,1,0,1,0,1241,1,1,0,'a:0:{}'),
- (435,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:1:{s:4:\"desc\";s:30:\"Register the Report templates.\";}'),
- (436,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (437,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:2:{s:4:\"desc\";s:49:\"Component wise listing of all available templates\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),
- (438,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:2:{s:4:\"desc\";s:45:\"Browse, Edit and Delete the Report templates.\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),
- (439,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:2:{s:4:\"desc\";s:60:\"Browse existing report, change report criteria and settings.\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),
- (440,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),
- (441,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,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),
- (442,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),
- (443,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:2:{s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),
- (444,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:10:\"Administer\";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,1,0,1,1,2,1,0,0,'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\";}'),
- (445,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:10:\"Administer\";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,1,0,1,1,3,1,0,0,'a:3:{s:4:\"desc\";s:34:\"Define statuses for campaign here.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),
- (446,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:10:\"Administer\";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,1,0,1,1,4,1,0,0,'a:3:{s:4:\"desc\";s:18:\"Engagement levels.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),
- (447,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,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),
- (448,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),
- (449,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (450,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (451,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (452,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (453,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,1,1,1,0,1,1,0,0,'a:0:{}'),
- (454,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
- (455,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (456,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (457,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (458,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,1,0,1,0,1,1,0,0,'a:0:{}'),
- (459,1,'civicrm/admin/ckeditor',NULL,'Configure CKEditor 4','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:33:\"CRM_Ckeditor4_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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
- (460,1,'civicrm/admin/setting/recaptcha',NULL,'reCAPTCHA 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:20:\"administer recaptcha\";}i:1;s:2:\"or\";}','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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:2:{s:10:\"adminGroup\";s:15:\"System Settings\";s:4:\"desc\";s:108:\"Uses the Google reCAPTCHA web service to improve the CAPTCHA system. It is tough on bots and easy on humans.\";}'),
- (461,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:20:{s:13:\"{weight}.Tags\";a:6:{s:5:\"title\";s:4:\"Tags\";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:4:\"Tags\";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:25:\"{weight}.Date Preferences\";a:6:{s:5:\"title\";s:16:\"Date Preferences\";s:4:\"desc\";N;s:2:\"id\";s:15:\"DatePreferences\";s:3:\"url\";s:52:\"/civicrm/admin/setting/preferences/date/edit?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:\"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:27:\"{weight}.Label Page Formats\";a:6:{s:5:\"title\";s:18:\"Label Page Formats\";s:4:\"desc\";s:82:\"Configure label sizes and page layouts that are used when printing mailing labels.\";s:2:\"id\";s:16:\"LabelPageFormats\";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:20:{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:53:\"{weight}.Misc (Undelete, PDFs, Limits, Logging, etc.)\";a:6:{s:5:\"title\";s:44:\"Misc (Undelete, PDFs, Limits, Logging, etc.)\";s:4:\"desc\";s:63:\"Enable undelete/move to trash feature, detailed change logging.\";s:2:\"id\";s:38:\"Misc_Undelete_PDFs_Limits_Logging_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:35:\"/civicrm/admin/mapping/edit?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:27:\"{weight}.Edit Scheduled Job\";a:6:{s:5:\"title\";s:18:\"Edit Scheduled Job\";s:4:\"desc\";s:32:\"Edit a periodially running task.\";s:2:\"id\";s:16:\"EditScheduledJob\";s:3:\"url\";s:31:\"/civicrm/admin/job/edit?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:40:\"/civicrm/admin/sms/provider/edit?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.reCAPTCHA Settings\";a:6:{s:5:\"title\";s:18:\"reCAPTCHA Settings\";s:4:\"desc\";s:108:\"Uses the Google reCAPTCHA web service to improve the CAPTCHA system. It is tough on bots and easy on humans.\";s:2:\"id\";s:17:\"reCAPTCHASettings\";s:3:\"url\";s:40:\"/civicrm/admin/setting/recaptcha?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:8:{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: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:37:\"/civicrm/admin/component/edit?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:20:\"List email accounts.\";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 > System 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: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: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,1,0,1,1,1,1,1,0,'a:0:{}');
+ (1,1,'civicrm/tag',NULL,'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: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,1,0,1,0,25,1,0,0,'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\";}'),
+ (2,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:4:\"Tags\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (3,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:4:\"Tags\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (4,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (5,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,1,1,1,0,0,1,0,0,'a:0:{}'),
+ (6,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,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
+ (7,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (8,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (9,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (10,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,1,1,1,0,0,1,0,0,'a:0:{}'),
+ (11,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,1,1,1,0,0,1,0,0,'a:0:{}'),
+ (12,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (13,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (14,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,1,1,1,0,0,1,0,0,'a:0:{}'),
+ (15,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (16,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,362,1,0,0,'a:2:{s:4:\"desc\";s:49:\"View and manage existing personal campaign pages.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),
+ (17,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (18,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (19,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (20,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (21,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (22,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (23,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (24,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,1,0,1,0,1,1,3,0,'a:0:{}'),
+ (25,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (26,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (27,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (28,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,1,0,1,0,0,1,0,0,'a:0:{}'),
+ (29,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (30,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (31,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (32,1,'civicrm/acl/edit',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_Form_ACL\";',NULL,'a:2:{i:0;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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (33,1,'civicrm/acl/delete',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_Form_ACL\";',NULL,'a:2:{i:0;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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (34,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (35,1,'civicrm/acl/entityrole/edit',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_Form_EntityRole\";',NULL,'a:3:{i:0;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\";}i:2;a:2:{s:5:\"title\";s:25:\"Assign Users to ACL Roles\";s:3:\"url\";s:31:\"/civicrm/acl/entityrole?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (36,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (37,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (38,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (39,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,1,0,1,0,9999,1,1,0,'a:0:{}'),
+ (40,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (41,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (42,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (43,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (44,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (45,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (46,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (47,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (48,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (49,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (50,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (51,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (52,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (53,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (54,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (55,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (56,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (57,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (58,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (59,1,'civicrm/dev/fake-error',NULL,'Fake Error','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:23:\"CRM_Core_Page_FakeError\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (60,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (61,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (62,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (63,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (64,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (65,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (66,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (67,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (68,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (69,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (70,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (71,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (72,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (73,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (74,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (75,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (76,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (77,1,'civicrm/task/add-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\";}','s:26:\"CRM_Activity_Form_Activity\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (78,1,'civicrm/note',NULL,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:18:\"CRM_Note_Form_Note\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (79,1,'civicrm/ajax/api4',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (80,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (81,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:21:\"CRM_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,1,0,1,0,400,1,1,0,'a:0:{}'),
+ (82,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:21:\"CRM_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,1,0,1,0,410,1,1,0,'a:0:{}'),
+ (83,1,'civicrm/import/contact/summary',NULL,'Import 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:31:\"CRM_Contact_Import_Form_Summary\";',NULL,'a:3:{i:0;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\";}i:2;a:2:{s:5:\"title\";s:15:\"Import Contacts\";s:3:\"url\";s:31:\"/civicrm/import/contact?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,410,1,1,0,'a:0:{}'),
+ (84,1,'civicrm/import/outcome',NULL,'Import results','a:2:{i:0;s:19:\"CRM_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_Import_Forms\";i:1;s:9:\"outputCSV\";}',NULL,'a:2:{i:0;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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (85,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:21:\"CRM_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,1,0,1,0,420,1,1,0,'a:0:{}'),
+ (86,1,'civicrm/import/contribution',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:21:\"CRM_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,1,0,1,0,520,1,1,0,'a:0:{}'),
+ (87,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:21:\"CRM_Import_Controller\";','s:30:\"class_prefix=CRM_Custom_Import\";','a:2:{i:0;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,1,0,1,0,420,1,1,0,'a:0:{}'),
+ (88,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (89,1,'civicrm/import/datasource',NULL,'Import','a:2:{i:0;s:19:\"CRM_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_Import_Form_DataSourceConfig\";',NULL,'a:2:{i:0;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,1,0,1,0,450,1,1,0,'a:0:{}'),
+ (90,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,1,0,1,0,0,1,0,0,'a:0:{}'),
+ (91,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,1,0,1,0,0,1,1,0,'a:0:{}'),
+ (92,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,1,0,1,0,10,1,1,0,'a:0:{}'),
+ (93,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (94,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (95,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (96,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,1,0,1,0,12,1,1,0,'a:0:{}'),
+ (97,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,1,0,1,0,14,1,1,0,'a:0:{}'),
+ (98,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (99,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (100,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (101,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (102,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (103,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (104,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (105,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (106,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (107,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (108,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (109,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (110,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (111,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (112,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (113,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (114,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (115,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (116,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (117,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (118,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (119,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (120,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (121,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (122,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,1,1,1,0,0,1,0,0,'a:0:{}'),
+ (123,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (124,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (125,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (126,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,1,0,1,0,1,1,3,0,'a:0:{}'),
+ (127,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (128,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,1,0,1,0,1,1,3,0,'a:0:{}'),
+ (129,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (130,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (131,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (132,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (133,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (134,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (135,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (136,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (137,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (138,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (139,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,1,0,1,0,105,1,0,0,'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\";}'),
+ (140,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (141,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (142,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (143,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,1,0,1,0,110,1,0,0,'a:1:{s:10:\"adminGroup\";s:6:\"Manage\";}'),
+ (144,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (145,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (146,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (147,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (148,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (149,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (150,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (151,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (152,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (153,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (154,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (155,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:1:{i:0;s:23:\"administer CiviCRM data\";}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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,10,1,0,0,'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\";}'),
+ (156,1,'civicrm/admin/custom/group/edit',NULL,'Configure 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:23:\"administer CiviCRM data\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (157,1,'civicrm/admin/custom/group/preview',NULL,'Custom Field Preview','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 CiviCRM data\";}i:1;s:3:\"and\";}','s:23:\"CRM_Custom_Form_Preview\";',NULL,'a:3:{i:0;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:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (158,1,'civicrm/admin/custom/group/delete',NULL,'Delete 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:23:\"administer CiviCRM data\";}i:1;s:3:\"and\";}','s:27:\"CRM_Custom_Form_DeleteGroup\";',NULL,'a:3:{i:0;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:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (159,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:1:{i:0;s:23:\"administer CiviCRM data\";}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:10:\"Administer\";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,1,0,1,1,11,1,0,0,'a:0:{}'),
+ (160,1,'civicrm/admin/custom/group/field/delete',NULL,'Delete Custom Field','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 CiviCRM data\";}i:1;s:3:\"and\";}','s:27:\"CRM_Custom_Form_DeleteField\";',NULL,'a:3:{i:0;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:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (161,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:1:{i:0;s:23:\"administer CiviCRM data\";}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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (162,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:1:{i:0;s:23:\"administer CiviCRM data\";}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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (163,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:1:{i:0;s:23:\"administer CiviCRM data\";}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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (164,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:1:{i:0;s:23:\"administer CiviCRM data\";}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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (165,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,20,1,0,0,'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\";}'),
+ (166,1,'civicrm/admin/uf/group/preview',NULL,'Preview','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:19:\"CRM_UF_Form_Preview\";',NULL,'a:3:{i:0;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:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (167,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:10:\"Administer\";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,1,0,1,1,21,1,0,0,'a:0:{}'),
+ (168,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:10:\"Administer\";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,1,0,1,1,22,1,0,0,'a:0:{}'),
+ (169,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:10:\"Administer\";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,1,0,1,1,23,1,0,0,'a:0:{}'),
+ (170,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:10:\"Administer\";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,1,0,1,1,24,1,0,0,'a:0:{}'),
+ (171,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:10:\"Administer\";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,1,0,1,1,25,1,0,0,'a:0:{}'),
+ (172,1,'civicrm/admin/uf/group/copy',NULL,'Profile Copy','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;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:3:{i:0;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:\"Administer\";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,1,0,1,1,26,1,0,0,'a:0:{}'),
+ (173,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:10:\"Administer\";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,1,0,1,1,0,1,0,0,'a:0:{}'),
+ (174,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:10:\"Administer\";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,1,0,1,1,30,1,0,0,'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\";}'),
+ (175,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,35,1,0,0,'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\";}'),
+ (176,1,'civicrm/admin/reltype/edit',NULL,'Edit Relationship 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:31:\"CRM_Admin_Form_RelationshipType\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:18:\"Relationship Types\";s:3:\"url\";s:30:\"/civicrm/admin/reltype?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (177,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:10:\"Administer\";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,1,0,1,1,40,1,0,0,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),
+ (178,1,'civicrm/admin/options/subtype/edit',NULL,'Edit Contact 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:26:\"CRM_Admin_Form_ContactType\";',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:10:\"Administer\";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:13:\"Contact Types\";s:3:\"url\";s:38:\"/civicrm/admin/options/subtype?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (179,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:10:\"Administer\";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,1,0,1,1,45,1,0,0,'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\";}'),
+ (180,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:10:\"Administer\";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,1,0,1,1,50,1,0,0,'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\";}'),
+ (181,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:10:\"Administer\";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,1,0,1,1,55,1,0,0,'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\";}'),
+ (182,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,60,1,0,0,'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\";}'),
+ (183,1,'civicrm/admin/locationType/edit',NULL,'Edit Location 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:27:\"CRM_Admin_Form_LocationType\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:30:\"Location Types (Home, Work...)\";s:3:\"url\";s:35:\"/civicrm/admin/locationType?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (184,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:10:\"Administer\";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,1,0,1,1,65,1,0,0,'a:2:{s:4:\"desc\";s:48:\"Options for assigning website types to contacts.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),
+ (185,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:10:\"Administer\";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,1,0,1,1,70,1,0,0,'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\";}'),
+ (186,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:10:\"Administer\";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,1,0,1,1,75,1,0,0,'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\";}'),
+ (187,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:10:\"Administer\";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,1,0,1,1,80,1,0,0,'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\";}'),
+ (188,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,90,1,0,0,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),
+ (189,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,95,1,0,0,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),
+ (190,1,'civicrm/admin/setting/preferences/date/edit',NULL,'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_Form_PreferencesDate\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:21:\"View Date Preferences\";s:3:\"url\";s:47:\"/civicrm/admin/setting/preferences/date?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,97,1,0,0,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),
+ (191,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,100,1,0,0,'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\";}'),
+ (192,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:10:\"Administer\";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,1,0,1,1,105,1,0,0,'a:2:{s:4:\"desc\";s:18:\"Word Replacements.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),
+ (193,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:10:\"Administer\";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,1,0,1,1,110,1,0,0,'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\";}'),
+ (194,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,10,1,0,0,'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\";}'),
+ (195,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:10:\"Administer\";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,1,0,1,1,20,1,0,0,'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\";}'),
+ (196,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,30,1,0,0,'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\";}'),
+ (197,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:10:\"Administer\";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,1,0,1,1,262,1,0,0,'a:1:{s:4:\"desc\";s:26:\"Add/Edit Message Templates\";}'),
+ (198,1,'civicrm/admin/scheduleReminders',NULL,'Schedule Reminders','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:23:\"administer CiviCRM data\";}i:1;s:3:\"and\";}','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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,40,1,0,0,'a:2:{s:4:\"desc\";s:19:\"Schedule Reminders.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),
+ (199,1,'civicrm/admin/scheduleReminders/edit',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_Form_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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:18:\"Schedule Reminders\";s:3:\"url\";s:40:\"/civicrm/admin/scheduleReminders?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (200,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (201,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:10:\"Administer\";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,1,0,1,1,50,1,0,0,'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\";}'),
+ (202,1,'civicrm/admin/labelFormats',NULL,'Label Page 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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,60,1,0,0,'a:2:{s:4:\"desc\";s:82:\"Configure label sizes and page layouts that are used when printing mailing labels.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),
+ (203,1,'civicrm/admin/labelFormats/edit',NULL,'Label Page 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:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:18:\"Label Page Formats\";s:3:\"url\";s:35:\"/civicrm/admin/labelFormats?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (204,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,70,1,0,0,'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\";}'),
+ (205,1,'civicrm/admin/pdfFormats/edit',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:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:24:\"Print Page (PDF) Formats\";s:3:\"url\";s:33:\"/civicrm/admin/pdfFormats?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (206,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:10:\"Administer\";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,1,0,1,1,75,1,0,0,'a:2:{s:4:\"desc\";s:42:\"Options for Communication Style selection.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),
+ (207,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:10:\"Administer\";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,1,0,1,1,80,1,0,0,'a:2:{s:4:\"desc\";s:75:\"Options for assigning email greetings to individual and household contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),
+ (208,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:10:\"Administer\";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,1,0,1,1,90,1,0,0,'a:2:{s:4:\"desc\";s:76:\"Options for assigning postal greetings to individual and household contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),
+ (209,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:10:\"Administer\";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,1,0,1,1,100,1,0,0,'a:2:{s:4:\"desc\";s:83:\"Options for assigning addressee to individual, household and organization contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),
+ (210,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,10,1,0,0,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),
+ (211,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,20,1,0,0,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),
+ (212,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,30,1,0,0,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),
+ (213,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:10:\"Administer\";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,1,0,1,1,40,1,0,0,'a:2:{s:4:\"desc\";s:30:\"Options for contact languages.\";s:10:\"adminGroup\";s:12:\"Localization\";}'),
+ (214,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,10,1,0,0,'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\";}'),
+ (215,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:10:\"Administer\";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,1,0,1,1,10,1,0,0,'a:1:{s:4:\"desc\";s:65:\"Grant access to CiviCRM components and other CiviCRM permissions.\";}'),
+ (216,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,20,1,0,0,'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\";}'),
+ (217,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}','civicrm/admin/configtask',NULL,NULL,1,0,1,1,1,1,0,0,'a:2:{s:4:\"desc\";s:55:\"List of configuration tasks with links to each setting.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (218,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,10,1,0,0,'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\";}'),
+ (219,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,120,1,0,0,'a:2:{s:4:\"desc\";s:0:\"\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (220,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (221,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,20,1,0,0,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (222,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,30,1,0,0,'a:2:{s:4:\"desc\";s:48:\"Payment Processor setup for CiviCRM transactions\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (223,1,'civicrm/admin/paymentProcessor/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:29:\"administer payment processors\";}i:1;s:3:\"and\";}','s:31:\"CRM_Admin_Form_PaymentProcessor\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:28:\"Settings - Payment Processor\";s:3:\"url\";s:39:\"/civicrm/admin/paymentProcessor?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (224,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,40,1,0,0,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (225,1,'civicrm/admin/setting/misc',NULL,'Misc (Undelete, PDFs, Limits, Logging, 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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,50,1,0,0,'a:2:{s:4:\"desc\";s:63:\"Enable undelete/move to trash feature, detailed change logging.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (226,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,60,1,0,0,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (227,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,70,1,0,0,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (228,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,80,1,0,0,'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\";}'),
+ (229,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,90,1,0,0,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (230,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:10:\"Administer\";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,1,0,1,1,100,1,0,0,'a:2:{s:4:\"desc\";s:44:\"File Extensions that can be considered safe.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (231,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,105,1,0,0,'a:2:{s:4:\"desc\";s:35:\"Access all meta-data option groups.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (232,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,110,1,0,0,'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\";}'),
+ (233,1,'civicrm/admin/mapping/edit',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_Form_Mapping\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:22:\"Import/Export Mappings\";s:3:\"url\";s:30:\"/civicrm/admin/mapping?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,111,1,0,0,'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\";}'),
+ (234,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,120,1,0,0,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (235,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,130,1,0,0,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (236,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,10,1,0,0,'a:3:{s:4:\"desc\";s:40:\"Configure global CiviCampaign behaviors.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),
+ (237,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,420,1,0,0,'a:2:{s:4:\"desc\";s:37:\"Configure global CiviEvent behaviors.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),
+ (238,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,430,1,0,0,'a:2:{s:4:\"desc\";s:36:\"Configure global CiviMail behaviors.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),
+ (239,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,390,1,0,0,'a:2:{s:4:\"desc\";s:38:\"Configure global CiviMember behaviors.\";s:10:\"adminGroup\";s:10:\"CiviMember\";}'),
+ (240,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (241,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:1:{s:4:\"desc\";s:36:\"URL used for running scheduled jobs.\";}'),
+ (242,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1370,1,0,0,'a:2:{s:4:\"desc\";s:35:\"Managing periodially running tasks.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (243,1,'civicrm/admin/job/add',NULL,'Add Scheduled Job','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_Form_Job\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:14:\"Scheduled Jobs\";s:3:\"url\";s:26:\"/civicrm/admin/job?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:1:{s:4:\"desc\";s:31:\"Add a periodially running task.\";}'),
+ (244,1,'civicrm/admin/job/edit',NULL,'Edit Scheduled Job','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:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:14:\"Scheduled Jobs\";s:3:\"url\";s:26:\"/civicrm/admin/job?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1372,1,0,0,'a:2:{s:4:\"desc\";s:32:\"Edit a periodially running task.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (245,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1380,1,0,0,'a:2:{s:4:\"desc\";s:46:\"Browsing the log of periodially running tasks.\";s:10:\"adminGroup\";s:6:\"Manage\";}'),
+ (246,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:10:\"Administer\";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,1,0,1,1,385,1,0,0,'a:2:{s:4:\"desc\";s:148:\"List of types which can be assigned to Grants. (Enable CiviGrant from Administer > System Settings > Enable Components if you want to track grants.)\";s:10:\"adminGroup\";s:12:\"Option Lists\";}'),
+ (247,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,390,1,0,0,'a:1:{s:4:\"desc\";s:34:\"Payment Processor type information\";}'),
+ (248,1,'civicrm/admin',NULL,'Administer','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;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,1,0,1,1,9000,1,1,0,'a:0:{}'),
+ (249,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (250,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,1,0,1,0,1,1,3,0,'a:0:{}'),
+ (251,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (252,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,380,1,0,0,'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\";}'),
+ (253,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'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.\";}'),
+ (254,1,'civicrm/admin/price/edit',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:3:{i:0;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:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (255,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (256,1,'civicrm/admin/price/field/edit',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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (257,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (258,1,'civicrm/admin/price/field/option/edit',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: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:10:\"Administer\";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\";}i:3;a:2:{s:5:\"title\";s:19:\"Price Field Options\";s:3:\"url\";s:41:\"/civicrm/admin/price/field/option?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (259,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,500,1,0,0,'a:2:{s:4:\"desc\";s:27:\"To configure a sms provider\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (260,1,'civicrm/admin/sms/provider/edit',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_Form_Provider\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Sms Providers\";s:3:\"url\";s:35:\"/civicrm/admin/sms/provider?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,501,1,0,0,'a:2:{s:4:\"desc\";s:27:\"To configure a sms provider\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),
+ (261,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,1,0,1,0,610,1,1,0,'a:0:{}'),
+ (262,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (263,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,399,1,0,0,'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\";}'),
+ (264,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (265,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,1,0,1,0,30,1,1,0,'a:0:{}'),
+ (266,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,1,0,1,0,1,1,0,0,'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\";}'),
+ (267,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (268,1,'civicrm/group/edit',NULL,'Edit 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:19:\"CRM_Group_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:13:\"Manage Groups\";s:3:\"url\";s:22:\"/civicrm/group?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (269,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (270,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,1,0,1,1,540,1,1,0,'a:0:{}'),
+ (271,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (272,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,1,1,1,0,0,1,0,0,'a:0:{}'),
+ (273,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,1,0,1,0,800,1,1,0,'a:1:{s:9:\"component\";s:9:\"CiviEvent\";}'),
+ (274,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,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:9:\"CiviEvent\";}'),
+ (275,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (276,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,1,1,1,1,1,1,0,0,'a:0:{}'),
+ (277,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,1,1,1,1,1,1,0,0,'a:0:{}'),
+ (278,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,1,1,1,0,0,1,0,0,'a:0:{}'),
+ (279,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,1,1,1,0,0,1,0,0,'a:0:{}'),
+ (280,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,1,1,1,0,0,1,0,0,'a:0:{}'),
+ (281,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,370,1,0,0,'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\";}'),
+ (282,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,375,1,0,0,'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\";}'),
+ (283,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:10:\"Administer\";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,1,0,1,1,385,1,0,0,'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\";}'),
+ (284,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,390,1,0,0,'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\";}'),
+ (285,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:10:\"Administer\";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,1,0,1,1,395,1,0,0,'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\";}'),
+ (286,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:10:\"Administer\";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,1,0,1,1,398,1,0,0,'a:2:{s:4:\"desc\";s:48:\"Template to control participant listing display.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),
+ (287,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,1,0,1,0,810,1,1,0,'a:0:{}'),
+ (288,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,1,0,1,1,820,1,1,0,'a:0:{}'),
+ (289,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (290,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,1,0,1,1,910,1,0,0,'a:0:{}'),
+ (291,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,1,0,1,1,930,1,0,0,'a:0:{}'),
+ (292,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,1,0,1,1,920,1,0,0,'a:0:{}'),
+ (293,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,1,0,1,1,930,1,0,0,'a:0:{}'),
+ (294,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,1,0,1,1,940,1,0,0,'a:0:{}'),
+ (295,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,1,0,1,1,950,1,0,0,'a:0:{}'),
+ (296,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,1,0,1,1,960,1,0,0,'a:0:{}'),
+ (297,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,1,0,1,0,830,1,0,0,'a:0:{}'),
+ (298,1,'civicrm/import/participant',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:21:\"CRM_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,1,0,1,0,840,1,1,0,'a:0:{}'),
+ (299,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,1,0,1,0,850,1,1,0,'a:0:{}'),
+ (300,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,1,1,1,0,880,1,1,0,'a:0:{}'),
+ (301,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,1,1,1,0,890,1,1,0,'a:0:{}'),
+ (302,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,1,0,1,0,4,1,0,0,'a:0:{}'),
+ (303,1,'civicrm/participant/delete',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"delete in CiviEvent\";}i:1;s:3:\"and\";}','s:33:\"CRM_Event_Form_Participant_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,1,0,1,0,4,1,0,0,'a:0:{}'),
+ (304,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (305,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (306,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (307,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,1,0,1,0,500,1,1,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
+ (308,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,1,0,1,0,1,1,1,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
+ (309,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,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
+ (310,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,1,1,1,1,0,1,0,0,'a:0:{}'),
+ (311,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,360,1,0,0,'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\";}'),
+ (312,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:10:\"Administer\";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,1,0,1,1,400,1,0,0,'a:0:{}'),
+ (313,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:10:\"Administer\";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,1,0,1,1,410,1,0,0,'a:0:{}'),
+ (314,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:10:\"Administer\";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,1,0,1,1,420,1,0,0,'a:0:{}'),
+ (315,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:10:\"Administer\";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,1,0,1,1,430,1,0,0,'a:0:{}'),
+ (316,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:10:\"Administer\";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,1,0,1,1,430,1,0,0,'a:0:{}'),
+ (317,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:10:\"Administer\";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,1,0,1,1,440,1,0,0,'a:0:{}'),
+ (318,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:10:\"Administer\";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,1,0,1,1,460,1,0,0,'a:0:{}'),
+ (319,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:10:\"Administer\";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,1,0,1,1,470,1,0,0,'a:0:{}'),
+ (320,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:10:\"Administer\";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,1,0,1,1,480,1,0,0,'a:0:{}'),
+ (321,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (322,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:10:\"Administer\";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,1,0,1,1,365,1,0,0,'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\";}'),
+ (323,1,'civicrm/admin/contribute/managePremiums/edit',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_Form_ManagePremiums\";',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:10:\"Administer\";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\";}i:3;a:2:{s:5:\"title\";s:15:\"Manage Premiums\";s:3:\"url\";s:48:\"/civicrm/admin/contribute/managePremiums?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (324,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,580,1,0,0,'a:2:{s:4:\"desc\";s:64:\"Formerly civicrm_contribution_type merged into this table in 4.1\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),
+ (325,1,'civicrm/admin/financial/financialType/edit',NULL,'Edit Financial 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:32:\"CRM_Financial_Form_FinancialType\";',NULL,'a:3:{i:0;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:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (326,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,1,0,1,0,1,1,1,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
+ (327,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,370,1,0,0,'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\";}'),
+ (328,1,'civicrm/admin/financial/financialAccount/edit',NULL,'Edit 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_Form_FinancialAccount\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:18:\"Financial Accounts\";s:3:\"url\";s:49:\"/civicrm/admin/financial/financialAccount?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (329,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:10:\"Administer\";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,1,0,1,1,380,1,0,0,'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\";}'),
+ (330,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:10:\"Administer\";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,1,0,1,1,395,1,0,0,'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\";}'),
+ (331,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'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\";}'),
+ (332,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (333,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (334,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (335,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,1,0,1,0,510,1,1,0,'a:0:{}'),
+ (336,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,1,0,1,0,588,1,1,0,'a:0:{}'),
+ (337,1,'civicrm/admin/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:3:{i:0;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:\"Administer\";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,1,0,1,1,530,1,1,0,'a:0:{}'),
+ (338,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,1,0,1,0,0,1,0,0,'a:0:{}'),
+ (339,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (340,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (341,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (342,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (343,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (344,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (345,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:10:\"Administer\";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,1,0,1,1,581,1,0,0,'a:0:{}'),
+ (346,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,1,0,1,0,585,1,0,0,'a:0:{}'),
+ (347,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,1,0,1,0,586,1,0,0,'a:0:{}'),
+ (348,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,1,0,1,0,600,1,0,0,'a:0:{}'),
+ (349,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,1,0,1,0,610,1,0,0,'a:0:{}'),
+ (350,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,1,0,1,0,1,1,1,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
+ (351,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:2:{s:4:\"desc\";s:42:\"Configure global CiviContribute behaviors.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),
+ (352,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,1,0,1,0,620,1,1,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
+ (353,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,1,0,1,0,630,1,1,0,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),
+ (354,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (355,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (356,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (357,1,'civicrm/contribute/widget',NULL,'CiviContribute','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:26:\"CRM_Contribute_Page_Widget\";',NULL,'a:2:{i:0;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,1,1,1,0,0,1,0,0,'a:0:{}'),
+ (358,1,'civicrm/contribute/task',NULL,'Contribution Task','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_Contribute_Controller_Task\";',NULL,'a:2:{i:0;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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (359,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:10:\"Administer\";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,1,0,1,1,450,1,0,0,'a:0:{}'),
+ (360,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,1,1,1,0,0,1,0,0,'a:0:{}'),
+ (361,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,1,0,1,0,700,1,1,0,'a:1:{s:9:\"component\";s:10:\"CiviMember\";}'),
+ (362,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,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:10:\"CiviMember\";}'),
+ (363,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,370,1,0,0,'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\";}'),
+ (364,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,380,1,0,0,'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\";}'),
+ (365,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,1,0,1,0,2,1,0,0,'a:0:{}'),
+ (366,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,1,0,1,0,390,1,0,0,'a:0:{}'),
+ (367,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,1,0,1,0,710,1,1,0,'a:0:{}'),
+ (368,1,'civicrm/import/membership',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:21:\"CRM_Import_Controller\";','s:20:\"entity_prefix=Member\";','a:2:{i:0;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,1,0,1,0,720,1,1,0,'a:0:{}'),
+ (369,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (370,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:10:\"Administer\";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,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (371,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,1,0,1,0,600,1,1,0,'a:1:{s:9:\"component\";s:8:\"CiviMail\";}'),
+ (372,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,400,1,0,0,'a:2:{s:4:\"desc\";s:61:\"Configure spool period, throttling and other mailer settings.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),
+ (373,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,410,1,0,0,'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\";}'),
+ (374,1,'civicrm/admin/component/edit',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_Form_Component\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:40:\"Headers, Footers, and Automated Messages\";s:3:\"url\";s:32:\"/civicrm/admin/component?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,411,1,0,0,'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\";}'),
+ (375,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:10:\"Administer\";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,1,0,1,1,415,1,0,0,'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\";}'),
+ (376,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,420,1,0,0,'a:2:{s:4:\"desc\";s:20:\"List email accounts.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),
+ (377,1,'civicrm/admin/mailSettings/edit',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_Form_MailSettings\";',NULL,'a:3:{i:0;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:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Mail Accounts\";s:3:\"url\";s:35:\"/civicrm/admin/mailSettings?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,420,1,0,0,'a:0:{}'),
+ (378,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,1,0,1,0,610,1,1,0,'a:0:{}'),
+ (379,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,1,0,1,0,620,1,1,0,'a:0:{}'),
+ (380,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,1,0,1,0,620,1,1,0,'a:0:{}'),
+ (381,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,1,0,1,0,625,1,1,0,'a:0:{}'),
+ (382,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,1,0,1,0,630,1,1,0,'a:0:{}'),
+ (383,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_Page_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,1,1,1,0,640,1,0,0,'a:0:{}'),
+ (384,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,1,1,1,0,645,1,0,0,'a:0:{}'),
+ (385,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,1,1,1,0,650,1,0,0,'a:0:{}'),
+ (386,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,1,1,1,0,660,1,0,0,'a:0:{}'),
+ (387,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,1,1,1,0,660,1,0,0,'a:0:{}'),
+ (388,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,1,0,1,0,680,1,0,0,'a:0:{}'),
+ (389,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,1,1,1,0,685,1,0,0,'a:0:{}'),
+ (390,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,1,0,1,0,695,1,0,0,'a:0:{}'),
+ (391,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (392,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,1,1,1,0,800,1,0,0,'a:0:{}'),
+ (393,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,1,0,1,0,850,1,0,0,'a:0:{}'),
+ (394,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (395,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (396,1,'civicrm/ajax/setupMailAccount',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 CiviMail\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Mailing_Page_AJAX\";i:1;s:5:\"setup\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (397,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (398,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (399,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,1,0,1,0,550,1,1,0,'a:1:{s:9:\"component\";s:10:\"CiviPledge\";}'),
+ (400,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,1,0,1,0,560,1,1,0,'a:0:{}'),
+ (401,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,1,0,1,0,570,1,0,0,'a:0:{}'),
+ (402,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,1,0,1,0,1,1,1,0,'a:1:{s:9:\"component\";s:10:\"CiviPledge\";}'),
+ (403,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,1,0,1,0,580,1,0,0,'a:0:{}'),
+ (404,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (405,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,1,0,1,0,900,1,1,0,'a:1:{s:9:\"component\";s:8:\"CiviCase\";}'),
+ (406,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,1,0,1,0,1,1,1,0,'a:1:{s:9:\"component\";s:8:\"CiviCase\";}'),
+ (407,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,1,0,1,0,910,1,1,0,'a:0:{}'),
+ (408,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (409,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (410,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (411,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (412,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (413,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (414,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (415,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (416,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,380,1,0,0,'a:1:{s:10:\"adminGroup\";s:8:\"CiviCase\";}'),
+ (417,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:10:\"Administer\";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,1,0,1,1,390,1,0,0,'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\";}'),
+ (418,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:10:\"Administer\";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,1,0,1,1,400,1,0,0,'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\";}'),
+ (419,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:10:\"Administer\";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,1,0,1,1,400,1,0,0,'a:2:{s:4:\"desc\";s:48:\"List of statuses that can be assigned to a case.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),
+ (420,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:10:\"Administer\";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,1,0,1,1,400,1,0,0,'a:2:{s:4:\"desc\";s:26:\"List of encounter mediums.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),
+ (421,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (422,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (423,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,1,0,1,0,1,1,3,0,'a:0:{}'),
+ (424,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (425,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (426,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (427,1,'civicrm/case/email/add','action=add,task=email','Email','a:2:{i:0;s:19:\"CRM_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_Task_Email\";',NULL,'a:2:{i:0;a: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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (428,1,'civicrm/contact/view/case/deleteClient',NULL,'Remove 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:26:\"CRM_Case_Form_DeleteClient\";',NULL,'a:3:{i:0;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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (429,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,1,0,1,0,1200,1,1,0,'a:1:{s:9:\"component\";s:10:\"CiviReport\";}'),
+ (430,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (431,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,1,0,1,0,1220,1,1,0,'a:0:{}'),
+ (432,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,1,0,1,0,1241,1,1,0,'a:0:{}'),
+ (433,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:1:{s:4:\"desc\";s:30:\"Register the Report templates.\";}'),
+ (434,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (435,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:2:{s:4:\"desc\";s:49:\"Component wise listing of all available templates\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),
+ (436,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:2:{s:4:\"desc\";s:45:\"Browse, Edit and Delete the Report templates.\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),
+ (437,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:2:{s:4:\"desc\";s:60:\"Browse existing report, change report criteria and settings.\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),
+ (438,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),
+ (439,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,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),
+ (440,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),
+ (441,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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:2:{s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),
+ (442,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:10:\"Administer\";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,1,0,1,1,2,1,0,0,'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\";}'),
+ (443,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:10:\"Administer\";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,1,0,1,1,3,1,0,0,'a:3:{s:4:\"desc\";s:34:\"Define statuses for campaign here.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),
+ (444,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:10:\"Administer\";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,1,0,1,1,4,1,0,0,'a:3:{s:4:\"desc\";s:18:\"Engagement levels.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),
+ (445,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,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),
+ (446,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),
+ (447,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (448,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (449,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (450,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (451,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,1,1,1,0,1,1,0,0,'a:0:{}'),
+ (452,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:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (453,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (454,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (455,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (456,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,1,0,1,0,1,1,0,0,'a:0:{}'),
+ (457,1,'civicrm/admin/ckeditor',NULL,'Configure CKEditor 4','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:33:\"CRM_Ckeditor4_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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:0:{}'),
+ (458,1,'civicrm/admin/setting/recaptcha',NULL,'reCAPTCHA 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:20:\"administer recaptcha\";}i:1;s:2:\"or\";}','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:10:\"Administer\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,1,0,1,1,1,1,0,0,'a:2:{s:10:\"adminGroup\";s:15:\"System Settings\";s:4:\"desc\";s:108:\"Uses the Google reCAPTCHA web service to improve the CAPTCHA system. It is tough on bots and easy on humans.\";}'),
+ (459,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:20:{s:13:\"{weight}.Tags\";a:6:{s:5:\"title\";s:4:\"Tags\";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:4:\"Tags\";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:25:\"{weight}.Date Preferences\";a:6:{s:5:\"title\";s:16:\"Date Preferences\";s:4:\"desc\";N;s:2:\"id\";s:15:\"DatePreferences\";s:3:\"url\";s:52:\"/civicrm/admin/setting/preferences/date/edit?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: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:\"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:27:\"{weight}.Label Page Formats\";a:6:{s:5:\"title\";s:18:\"Label Page Formats\";s:4:\"desc\";s:82:\"Configure label sizes and page layouts that are used when printing mailing labels.\";s:2:\"id\";s:16:\"LabelPageFormats\";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:20:{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:53:\"{weight}.Misc (Undelete, PDFs, Limits, Logging, etc.)\";a:6:{s:5:\"title\";s:44:\"Misc (Undelete, PDFs, Limits, Logging, etc.)\";s:4:\"desc\";s:63:\"Enable undelete/move to trash feature, detailed change logging.\";s:2:\"id\";s:38:\"Misc_Undelete_PDFs_Limits_Logging_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:35:\"/civicrm/admin/mapping/edit?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:27:\"{weight}.Edit Scheduled Job\";a:6:{s:5:\"title\";s:18:\"Edit Scheduled Job\";s:4:\"desc\";s:32:\"Edit a periodially running task.\";s:2:\"id\";s:16:\"EditScheduledJob\";s:3:\"url\";s:31:\"/civicrm/admin/job/edit?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:40:\"/civicrm/admin/sms/provider/edit?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.reCAPTCHA Settings\";a:6:{s:5:\"title\";s:18:\"reCAPTCHA Settings\";s:4:\"desc\";s:108:\"Uses the Google reCAPTCHA web service to improve the CAPTCHA system. It is tough on bots and easy on humans.\";s:2:\"id\";s:17:\"reCAPTCHASettings\";s:3:\"url\";s:40:\"/civicrm/admin/setting/recaptcha?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:8:{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: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:37:\"/civicrm/admin/component/edit?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:20:\"List email accounts.\";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 > System 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,1,0,1,1,1,1,1,0,'a:0:{}');
 /*!40000 ALTER TABLE `civicrm_menu` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5316,66 +5322,66 @@ 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 !empty($idHash)}[case #{$idHash}]{/if} {$activitySubject}\n','===========================================================\n{ts}Activity Summary{/ts} - {$activityTypeName}\n===========================================================\n{if !empty($isCaseActivity)}\n{ts}Your Case Role(s){/ts} : {$contact.role|default:\'\'}\n{if !empty($manageCaseURL)}\n{ts}Manage Case{/ts} : {$manageCaseURL}\n{/if}\n{/if}\n\n{if !empty($editActURL)}\n{ts}Edit activity{/ts} : {$editActURL}\n{/if}\n{if !empty($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} : {$field.value|crmDate:$config->dateformatDatetime}\n{else}\n{$field.label} : {$field.value}\n{/if}\n{/foreach}\n\n{if !empty($activity.customGroups)}\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{/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    <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 !empty($isCaseActivity)}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Your Case Role(s){/ts}\n                </td>\n                <td {$valueStyle}>\n                  {$contact.role|default:\'\'}\n                </td>\n              </tr>\n              {if !empty($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 !empty($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 !empty($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}\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            {if !empty($activity.customGroups)}\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            {/if}\n          </table>\n        </td>\n      </tr>\n    </table>\n</body>\n</html>\n',1,814,'case_activity',1,0,0,NULL),
- (2,'Cases - Send Copy of an Activity','{if !empty($idHash)}[case #{$idHash}]{/if} {$activitySubject}\n','===========================================================\n{ts}Activity Summary{/ts} - {$activityTypeName}\n===========================================================\n{if !empty($isCaseActivity)}\n{ts}Your Case Role(s){/ts} : {$contact.role|default:\'\'}\n{if !empty($manageCaseURL)}\n{ts}Manage Case{/ts} : {$manageCaseURL}\n{/if}\n{/if}\n\n{if !empty($editActURL)}\n{ts}Edit activity{/ts} : {$editActURL}\n{/if}\n{if !empty($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} : {$field.value|crmDate:$config->dateformatDatetime}\n{else}\n{$field.label} : {$field.value}\n{/if}\n{/foreach}\n\n{if !empty($activity.customGroups)}\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{/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    <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 !empty($isCaseActivity)}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Your Case Role(s){/ts}\n                </td>\n                <td {$valueStyle}>\n                  {$contact.role|default:\'\'}\n                </td>\n              </tr>\n              {if !empty($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 !empty($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 !empty($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}\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            {if !empty($activity.customGroups)}\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            {/if}\n          </table>\n        </td>\n      </tr>\n    </table>\n</body>\n</html>\n',1,814,'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  <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</body>\n</html>\n',1,815,'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  <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</body>\n</html>\n',1,815,'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_display}\"}{if $greeting}{$greeting},{/if}\n\n{if {contribution.contribution_page_id.receipt_text|boolean}}\n{contribution.contribution_page_id.receipt_text}\n{elseif {contribution.paid_amount|boolean}} {ts}Below you will find a receipt for this contribution.{/ts}\n{/if}\n\n===========================================================\n{ts}Contribution Information{/ts}\n\n===========================================================\n{ts}Contributor{/ts}: {contact.display_name}\n{if \'{contribution.financial_type_id}\'}\n{ts}Financial Type{/ts}: {contribution.financial_type_id:label}\n{/if}\n{if $isShowLineItems}\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 $isShowTax && {contribution.tax_amount|boolean}}\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 $isShowTax && {contribution.tax_amount|boolean}} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"}\n----------------------------------------------------------\n{foreach from=$lineItems item=line}\n{capture assign=ts_item}{$line.title}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney:\'{contribution.currency}\'|string_format:\"%10s\"} {if $isShowTax && {contribution.tax_amount|boolean}}{$line.line_total|crmMoney:\'{contribution.currency}\'|string_format:\"%10s\"} {if $line.tax_rate || $line.tax_amount != \"\"} {$line.tax_rate|string_format:\"%.2f\"} %   {$line.tax_amount|crmMoney:\'{contribution.currency}\'|string_format:\"%10s\"} {else}                  {/if} {/if}   {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'|string_format:\"%10s\"}\n{/foreach}\n{/if}\n\n\n{if $isShowTax && {contribution.tax_amount|boolean}}\n{ts}Amount before Tax{/ts} : {contribution.tax_exclusive_amount}\n{/if}\n{foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if} : {$taxDetail.amount|crmMoney:\'{contribution.currency}\'}\n{/foreach}\n\n{if $isShowTax}\n{ts}Total Tax Amount{/ts} : {contribution.tax_amount}\n{/if}\n{ts}Total Amount{/ts} : {contribution.total_amount}\n{if \'{contribution.receive_date}\'}\n{ts}Contribution Date{/ts}: {contribution.receive_date|crmDate:\"shortdate\"}\n{/if}\n{if \'{contribution.receipt_date}\'}\n{ts}Receipt Date{/ts}: {contribution.receipt_date|crmDate:\"shortdate\"}\n{/if}\n{if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n{ts}Paid By{/ts}: {contribution.payment_instrument_id:label}\n{if \'{contribution.check_number}\'}\n{ts}Check Number{/ts}: {contribution.check_number}\n{/if}\n{/if}\n{if \'{contribution.trxn_id}\'}\n{ts}Transaction ID{/ts}: {contribution.trxn_id}\n{/if}\n\n{if !empty($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 !empty($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 !empty($softCreditTypes) and !empty($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 !empty($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 !empty($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  <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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n      <p>\n        {if {contribution.contribution_page_id.receipt_text|boolean}}{contribution.contribution_page_id.receipt_text}\n        {elseif {contribution.paid_amount|boolean}}{ts}Below you will find a receipt for this contribution.{/ts}{/if}\n      </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}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      {if \'{contribution.financial_type_id}\'}\n        <td {$labelStyle}>\n         {ts}Financial Type{/ts}\n        </td>\n        <td {$valueStyle}>\n         {contribution.financial_type_id:label}\n        </td>\n      {/if}\n     </tr>\n\n     {if $isShowLineItems}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <table>\n          <tr>\n           <th>{ts}Item{/ts}</th>\n           <th>{ts}Qty{/ts}</th>\n           <th>{ts}Each{/ts}</th>\n           {if $isShowTax && {contribution.tax_amount|boolean}}\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=$lineItems item=line}\n           <tr>\n            <td>\n              {$line.title}\n            </td>\n            <td>\n             {$line.qty}\n            </td>\n            <td>\n             {$line.unit_price|crmMoney:\'{contribution.currency}\'}\n            </td>\n            {if $isShowTax && {contribution.tax_amount|boolean}}\n              <td>\n                {$line.line_total|crmMoney:\'{contribution.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:\'{contribution.currency}\'}\n                </td>\n              {else}\n                <td></td>\n                <td></td>\n              {/if}\n            {/if}\n            <td>\n             {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n            </td>\n           </tr>\n          {/foreach}\n         </table>\n        </td>\n       </tr>\n\n     {/if}\n     {if $isShowTax && {contribution.tax_amount|boolean}}\n       <tr>\n         <td {$labelStyle}>\n           {ts} Amount before Tax : {/ts}\n         </td>\n         <td {$valueStyle}>\n           {contribution.tax_exclusive_amount}\n         </td>\n       </tr>\n\n       {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n         <tr>\n          <td>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if}</td>\n          <td>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $isShowTax}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.tax_amount}\n        </td>\n      </tr>\n     {/if}\n\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n        {contribution.total_amount}\n      </td>\n     </tr>\n\n     {if \'{contribution.receive_date}\'}\n       <tr>\n       <td {$labelStyle}>\n        {ts}Contribution Date{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.receive_date|crmDate:\"shortdate\"}\n       </td>\n      </tr>\n     {/if}\n\n      {if \'{contribution.receipt_date}\'}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Receipt Date{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.receipt_date|crmDate:\"shortdate\"}\n       </td>\n      </tr>\n     {/if}\n\n     {if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Paid By{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.payment_instrument_id:label}\n       </td>\n      </tr>\n      {if \'{contribution.check_number}\'}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Check Number{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.check_number}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if \'{contribution.trxn_id}\'}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction ID{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n     {if !empty($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 !empty($softCreditTypes) and !empty($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 !empty($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 !empty($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 !empty($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\n</body>\n</html>\n',1,816,'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_display}\"}{if $greeting}{$greeting},{/if}\n\n{if {contribution.contribution_page_id.receipt_text|boolean}}\n{contribution.contribution_page_id.receipt_text}\n{elseif {contribution.paid_amount|boolean}} {ts}Below you will find a receipt for this contribution.{/ts}\n{/if}\n\n===========================================================\n{ts}Contribution Information{/ts}\n\n===========================================================\n{ts}Contributor{/ts}: {contact.display_name}\n{if \'{contribution.financial_type_id}\'}\n{ts}Financial Type{/ts}: {contribution.financial_type_id:label}\n{/if}\n{if $isShowLineItems}\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 $isShowTax && {contribution.tax_amount|boolean}}\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 $isShowTax && {contribution.tax_amount|boolean}} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"}\n----------------------------------------------------------\n{foreach from=$lineItems item=line}\n{capture assign=ts_item}{$line.title}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney:\'{contribution.currency}\'|string_format:\"%10s\"} {if $isShowTax && {contribution.tax_amount|boolean}}{$line.line_total|crmMoney:\'{contribution.currency}\'|string_format:\"%10s\"} {if $line.tax_rate || $line.tax_amount != \"\"} {$line.tax_rate|string_format:\"%.2f\"} %   {$line.tax_amount|crmMoney:\'{contribution.currency}\'|string_format:\"%10s\"} {else}                  {/if} {/if}   {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'|string_format:\"%10s\"}\n{/foreach}\n{/if}\n\n\n{if $isShowTax && {contribution.tax_amount|boolean}}\n{ts}Amount before Tax{/ts} : {contribution.tax_exclusive_amount}\n{/if}\n{foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if} : {$taxDetail.amount|crmMoney:\'{contribution.currency}\'}\n{/foreach}\n\n{if $isShowTax}\n{ts}Total Tax Amount{/ts} : {contribution.tax_amount}\n{/if}\n{ts}Total Amount{/ts} : {contribution.total_amount}\n{if \'{contribution.receive_date}\'}\n{ts}Contribution Date{/ts}: {contribution.receive_date|crmDate:\"shortdate\"}\n{/if}\n{if \'{contribution.receipt_date}\'}\n{ts}Receipt Date{/ts}: {contribution.receipt_date|crmDate:\"shortdate\"}\n{/if}\n{if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n{ts}Paid By{/ts}: {contribution.payment_instrument_id:label}\n{if \'{contribution.check_number}\'}\n{ts}Check Number{/ts}: {contribution.check_number}\n{/if}\n{/if}\n{if \'{contribution.trxn_id}\'}\n{ts}Transaction ID{/ts}: {contribution.trxn_id}\n{/if}\n\n{if !empty($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 !empty($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 !empty($softCreditTypes) and !empty($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 !empty($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 !empty($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  <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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n      <p>\n        {if {contribution.contribution_page_id.receipt_text|boolean}}{contribution.contribution_page_id.receipt_text}\n        {elseif {contribution.paid_amount|boolean}}{ts}Below you will find a receipt for this contribution.{/ts}{/if}\n      </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}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      {if \'{contribution.financial_type_id}\'}\n        <td {$labelStyle}>\n         {ts}Financial Type{/ts}\n        </td>\n        <td {$valueStyle}>\n         {contribution.financial_type_id:label}\n        </td>\n      {/if}\n     </tr>\n\n     {if $isShowLineItems}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <table>\n          <tr>\n           <th>{ts}Item{/ts}</th>\n           <th>{ts}Qty{/ts}</th>\n           <th>{ts}Each{/ts}</th>\n           {if $isShowTax && {contribution.tax_amount|boolean}}\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=$lineItems item=line}\n           <tr>\n            <td>\n              {$line.title}\n            </td>\n            <td>\n             {$line.qty}\n            </td>\n            <td>\n             {$line.unit_price|crmMoney:\'{contribution.currency}\'}\n            </td>\n            {if $isShowTax && {contribution.tax_amount|boolean}}\n              <td>\n                {$line.line_total|crmMoney:\'{contribution.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:\'{contribution.currency}\'}\n                </td>\n              {else}\n                <td></td>\n                <td></td>\n              {/if}\n            {/if}\n            <td>\n             {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n            </td>\n           </tr>\n          {/foreach}\n         </table>\n        </td>\n       </tr>\n\n     {/if}\n     {if $isShowTax && {contribution.tax_amount|boolean}}\n       <tr>\n         <td {$labelStyle}>\n           {ts} Amount before Tax : {/ts}\n         </td>\n         <td {$valueStyle}>\n           {contribution.tax_exclusive_amount}\n         </td>\n       </tr>\n\n       {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n         <tr>\n          <td>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if}</td>\n          <td>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $isShowTax}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.tax_amount}\n        </td>\n      </tr>\n     {/if}\n\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n        {contribution.total_amount}\n      </td>\n     </tr>\n\n     {if \'{contribution.receive_date}\'}\n       <tr>\n       <td {$labelStyle}>\n        {ts}Contribution Date{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.receive_date|crmDate:\"shortdate\"}\n       </td>\n      </tr>\n     {/if}\n\n      {if \'{contribution.receipt_date}\'}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Receipt Date{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.receipt_date|crmDate:\"shortdate\"}\n       </td>\n      </tr>\n     {/if}\n\n     {if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Paid By{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.payment_instrument_id:label}\n       </td>\n      </tr>\n      {if \'{contribution.check_number}\'}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Check Number{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.check_number}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if \'{contribution.trxn_id}\'}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction ID{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n     {if !empty($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 !empty($softCreditTypes) and !empty($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 !empty($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 !empty($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 !empty($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\n</body>\n</html>\n',1,816,'contribution_offline_receipt',0,1,0,NULL),
- (7,'Contributions - Receipt (on-line)','{if \'{contribution.contribution_status_id:name}\' === \'Pending\'}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name}\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<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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if !empty($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  {if {contribution.total_amount|boolean}}\n    <tr>\n      <th {$headerStyle}>\n        {ts}Contribution Information{/ts}\n      </th>\n    </tr>\n\n    {if $isShowLineItems}\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          <table>\n            <tr>\n              <th>{ts}Item{/ts}</th>\n              <th>{ts}Qty{/ts}</th>\n              <th>{ts}Each{/ts}</th>\n              {if $isShowTax && {contribution.tax_amount|boolean}}\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=$lineItems item=line}\n              <tr>\n                <td>{$line.title}</td>\n                <td>{$line.qty}</td>\n                <td>{$line.unit_price|crmMoney:$currency}</td>\n                {if $isShowTax && {contribution.tax_amount|boolean}}\n                  <td>{$line.line_total|crmMoney:$currency}</td>\n                  {if $line.tax_rate || $line.tax_amount != \"\"}\n                    <td>{$line.tax_rate|string_format:\"%.2f\"}%</td>\n                    <td>{$line.tax_amount|crmMoney:$currency}</td>\n                  {else}\n                    <td></td>\n                    <td></td>\n                  {/if}\n                {/if}\n                <td>\n                  {$line.line_total_inclusive|crmMoney:$currency}\n                </td>\n              </tr>\n            {/foreach}\n          </table>\n        </td>\n      </tr>\n\n      {if $isShowTax && {contribution.tax_amount|boolean}}\n        <tr>\n          <td {$labelStyle}>\n            {ts} Amount before Tax : {/ts}\n          </td>\n          <td {$valueStyle}>\n            {contribution.tax_exclusive_amount}\n          </td>\n        </tr>\n\n        {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n          <tr>\n            <td>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if}</td>\n            <td>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n          </tr>\n        {/foreach}\n\n      {/if}\n      {if $isShowTax}\n        <tr>\n          <td {$labelStyle}>\n            {ts}Total Tax{/ts}\n          </td>\n          <td {$valueStyle}>\n            {contribution.tax_amount}\n          </td>\n        </tr>\n      {/if}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.total_amount}\n        </td>\n      </tr>\n    {else}\n      {if {contribution.tax_amount|boolean}}\n        <tr>\n          <td {$labelStyle}>\n            {ts}Total Tax Amount{/ts}\n          </td>\n          <td {$valueStyle}>\n            {contribution.tax_amount}\n          </td>\n         </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {contribution.total_amount} {if \'{contribution.amount_level}\'} - {contribution.amount_level}{/if}\n        </td>\n       </tr>\n\n      {/if}\n\n  {/if}\n\n\n     {if !empty($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 {contribution.trxn_id|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n    {if !empty($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 !empty($softCreditTypes) and !empty($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 !empty($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 !empty($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 {contribution.contribution_page_id.is_share|boolean}}\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n            {capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id={contribution.contribution_page_id}\" 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 !empty($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 !empty($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 !empty($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 !empty($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 !empty($contact_email) OR !empty($contact_phone)}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}For information about this premium, contact:{/ts}</p>\n         {if !empty($contact_email)}\n          <p>{$contact_email}</p>\n         {/if}\n         {if !empty($contact_phone)}\n          <p>{$contact_phone}</p>\n         {/if}\n        </td>\n       </tr>\n      {/if}\n      {if $is_deductible AND !empty($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 !empty($customPre)}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if !empty($customPost)}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n  </table>\n\n</body>\n</html>\n',1,817,'contribution_online_receipt',1,0,0,NULL),
- (8,'Contributions - Receipt (on-line)','{if \'{contribution.contribution_status_id:name}\' === \'Pending\'}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name}\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<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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if !empty($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  {if {contribution.total_amount|boolean}}\n    <tr>\n      <th {$headerStyle}>\n        {ts}Contribution Information{/ts}\n      </th>\n    </tr>\n\n    {if $isShowLineItems}\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          <table>\n            <tr>\n              <th>{ts}Item{/ts}</th>\n              <th>{ts}Qty{/ts}</th>\n              <th>{ts}Each{/ts}</th>\n              {if $isShowTax && {contribution.tax_amount|boolean}}\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=$lineItems item=line}\n              <tr>\n                <td>{$line.title}</td>\n                <td>{$line.qty}</td>\n                <td>{$line.unit_price|crmMoney:$currency}</td>\n                {if $isShowTax && {contribution.tax_amount|boolean}}\n                  <td>{$line.line_total|crmMoney:$currency}</td>\n                  {if $line.tax_rate || $line.tax_amount != \"\"}\n                    <td>{$line.tax_rate|string_format:\"%.2f\"}%</td>\n                    <td>{$line.tax_amount|crmMoney:$currency}</td>\n                  {else}\n                    <td></td>\n                    <td></td>\n                  {/if}\n                {/if}\n                <td>\n                  {$line.line_total_inclusive|crmMoney:$currency}\n                </td>\n              </tr>\n            {/foreach}\n          </table>\n        </td>\n      </tr>\n\n      {if $isShowTax && {contribution.tax_amount|boolean}}\n        <tr>\n          <td {$labelStyle}>\n            {ts} Amount before Tax : {/ts}\n          </td>\n          <td {$valueStyle}>\n            {contribution.tax_exclusive_amount}\n          </td>\n        </tr>\n\n        {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n          <tr>\n            <td>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if}</td>\n            <td>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n          </tr>\n        {/foreach}\n\n      {/if}\n      {if $isShowTax}\n        <tr>\n          <td {$labelStyle}>\n            {ts}Total Tax{/ts}\n          </td>\n          <td {$valueStyle}>\n            {contribution.tax_amount}\n          </td>\n        </tr>\n      {/if}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.total_amount}\n        </td>\n      </tr>\n    {else}\n      {if {contribution.tax_amount|boolean}}\n        <tr>\n          <td {$labelStyle}>\n            {ts}Total Tax Amount{/ts}\n          </td>\n          <td {$valueStyle}>\n            {contribution.tax_amount}\n          </td>\n         </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {contribution.total_amount} {if \'{contribution.amount_level}\'} - {contribution.amount_level}{/if}\n        </td>\n       </tr>\n\n      {/if}\n\n  {/if}\n\n\n     {if !empty($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 {contribution.trxn_id|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n    {if !empty($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 !empty($softCreditTypes) and !empty($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 !empty($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 !empty($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 {contribution.contribution_page_id.is_share|boolean}}\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n            {capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id={contribution.contribution_page_id}\" 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 !empty($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 !empty($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 !empty($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 !empty($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 !empty($contact_email) OR !empty($contact_phone)}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}For information about this premium, contact:{/ts}</p>\n         {if !empty($contact_email)}\n          <p>{$contact_email}</p>\n         {/if}\n         {if !empty($contact_phone)}\n          <p>{$contact_phone}</p>\n         {/if}\n        </td>\n       </tr>\n      {/if}\n      {if $is_deductible AND !empty($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 !empty($customPre)}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if !empty($customPost)}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n  </table>\n\n</body>\n</html>\n',1,817,'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=\"{domain.empowered_by_civicrm_image_url}\" 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      {if $userText}\n        <tr>\n          <td><font size=\"1\" colspan=\"3\">{$userText}</font></td>\n        </tr>\n      {/if}\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.name}</font></b></td>\n      </tr>\n      <tr>\n        <td><font size=\"1\" align=\"center\">{contact.display_name}{if \'{contact.current_employer}\'} ({contact.current_employer}){/if}</font></td>\n        <td><font size=\"1\" align=\"right\">{$invoice_date}</font></td>\n        <td style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">\n          {domain.street_address}\n          {domain.supplemental_address_1}\n        </font></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><font size=\"1\" align=\"right\">\n          {domain.supplemental_address_2}\n          {domain.state_province_id:label}\n        </font></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\">{contribution.invoice_number}</font></td>\n        <td style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">\n          {domain.city}\n          {domain.postal_code}\n        </font></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\">{domain.country_id:label}</font></td>\n      </tr>\n      <tr>\n        <td><font size=\"1\" align=\"right\"> {$country}</font></td>\n        <td><font size=\"1\" align=\"right\">{contribution.source}</font></td>\n        <td valign=\"top\" style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">{domain.email}</font> </td>\n      </tr>\n      <tr>\n        <td></td>\n        <td></td>\n        <td valign=\"top\"><font size=\"1\" align=\"right\">{domain.phone}</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\">{domain.tax_term}</font></th>\n        <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts 1=$currency}Amount %1{/ts}</font></th>\n      </tr>\n      {foreach from=$lineItems item=line}\n        <tr>\n          <td style=\"text-align:left;nowrap\"><font size=\"1\">\n            {$line.title}\n          </font></td>\n          <td style=\"text-align:right;\"><font size=\"1\">{$line.qty}</font></td>\n          <td style=\"text-align:right;\"><font size=\"1\">{$line.unit_price|crmMoney:$currency}</font></td>\n            {if $line.tax_amount != \'\'}\n              <td style=\"text-align:right;\"><font size=\"1\">{if $line.tax_rate}{$line.tax_rate|crmNumberFormat}%{/if}</font></td>\n            {else}\n              <td style=\"text-align:right;\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\'}-{/ts}{/if}</font></td>\n            {/if}\n          <td style=\"text-align:right;\"><font size=\"1\">{$line.line_total|crmMoney:\'{contribution.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=$taxRateBreakdown item=taxDetail key=taxRate}\n        {if $taxRate != 0}\n          <tr>\n            <td colspan=\"3\"></td>\n            <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\' 2=$taxRate|crmNumberFormat}TOTAL %1 %2%{/ts}{/if}</font></td>\n            <td style=\"text-align:right\"><font size=\"1\" align=\"right\">{$taxDetail.amount|crmMoney:\'{contribution.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=$currency}TOTAL %1{/ts}</font></b></td>\n        <td style=\"text-align:right;\"><font size=\"1\">{$amount|crmMoney:$currency}</font></td>\n      </tr>\n      <tr>\n        <td colspan=\"3\"></td>\n        <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">\n          {if \'{contribution.contribution_status_id:name}\' == \'Refunded\'}\n            {ts}Amount Credited{/ts}\n          {else}\n            {ts}Amount Paid{/ts}\n          {/if}\n        </font></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      <tr>\n        <td colspan=\"5\"></td>\n      </tr>\n      {if \'{contribution.contribution_status_id:name}\' == \'Pending\' && \'{contribution.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\n    {if \'{contribution.contribution_status_id:name}\' == \'Pending\' && \'{contribution.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/>\n            <font size=\"1\" align=\"left\"><b>{ts}To:{/ts}</b><div style=\"width:24em;word-wrap:break-word;\">\n              {domain.name}<br />\n              {domain.street_address} {domain.supplemental_address_1}<br />\n              {domain.supplemental_address_2} {domain.state_province_id:label}<br />\n              {domain.city} {domain.postal_code}<br />\n              {domain.country_id:label}<br />\n              {domain.email}</div>\n              {domain.phone}<br />\n            </font>\n            <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\">{contact.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\">{contribution.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          </td>\n        </tr>\n      </table>\n    {/if}\n\n    {if \'{contribution.contribution_status_id:name}\' === \'Refunded\' || \'{contribution.contribution_status_id:name}\' === \'Cancelled\'}\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    <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.name}</font></td>\n      </tr>\n      <tr>\n        <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{contact.display_name}{if \'{contact.current_employer}\'} ({contact.current_employer}){/if}</font></td>\n        <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{$invoice_date}</font></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.street_address}\n          {domain.supplemental_address_1}\n         </font></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><font size=\"1\" align=\"right\">\n          {domain.supplemental_address_2}\n          {domain.state_province_id:label}\n        </font></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\">{contribution.creditnote_id}</font></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.city}\n          {domain.postal_code}\n        </font></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><font size=\"1\" align=\"right\">\n          {domain.country_id:label}\n        </font></td>\n      </tr>\n      <tr>\n        <td></td>\n        <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{contribution.source}</font></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.email}\n        </font></td>\n      </tr>\n      <tr>\n        <td></td>\n        <td></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.phone}\n        </font></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\">\n          <table>\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\">{domain.tax_term}</font></th>\n              <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts 1=$currency}Amount %1{/ts}</font></th>\n            </tr>\n            {foreach from=$lineItems item=line key=index}\n              <tr><td colspan=\"5\"><hr {if $index == 0}size=\"3\" style=\"color:#000;\"{else}style=\"color:#F5F5F5;\"{/if}></hr></td></tr>\n              <tr>\n                <td style =\"text-align:left;\"  ><font size=\"1\">\n                  {$line.title}\n                </font></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$line.qty}</font></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$line.unit_price|crmMoney:$currency}</font></td>\n                {if $line.tax_amount != \'\'}\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{if $line.tax_rate}{$line.tax_rate|crmNumberFormat}%{/if}</font></td>\n                {else}\n                  <td style=\"padding-left:28px;text-align:right\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\'}No %1{/ts}{/if}</font></td>\n                {/if}\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$line.line_total|crmMoney:\'{contribution.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=$taxRateBreakdown item=taxDetail key=taxRate}\n                {if $taxRate != 0}\n                  <tr>\n                    <td colspan=\"3\"></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\' 2=$taxRate|crmNumberFormat}TOTAL %1 %2%{/ts}{/if}</font></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\" align=\"right\">{$taxDetail.amount|crmMoney:\'{contribution.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=$currency}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 \'{contribution.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\">{contact.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\">{contribution.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\n  </div>\n  </body>\n</html>\n',1,818,'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=\"{domain.empowered_by_civicrm_image_url}\" 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      {if $userText}\n        <tr>\n          <td><font size=\"1\" colspan=\"3\">{$userText}</font></td>\n        </tr>\n      {/if}\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.name}</font></b></td>\n      </tr>\n      <tr>\n        <td><font size=\"1\" align=\"center\">{contact.display_name}{if \'{contact.current_employer}\'} ({contact.current_employer}){/if}</font></td>\n        <td><font size=\"1\" align=\"right\">{$invoice_date}</font></td>\n        <td style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">\n          {domain.street_address}\n          {domain.supplemental_address_1}\n        </font></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><font size=\"1\" align=\"right\">\n          {domain.supplemental_address_2}\n          {domain.state_province_id:label}\n        </font></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\">{contribution.invoice_number}</font></td>\n        <td style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">\n          {domain.city}\n          {domain.postal_code}\n        </font></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\">{domain.country_id:label}</font></td>\n      </tr>\n      <tr>\n        <td><font size=\"1\" align=\"right\"> {$country}</font></td>\n        <td><font size=\"1\" align=\"right\">{contribution.source}</font></td>\n        <td valign=\"top\" style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">{domain.email}</font> </td>\n      </tr>\n      <tr>\n        <td></td>\n        <td></td>\n        <td valign=\"top\"><font size=\"1\" align=\"right\">{domain.phone}</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\">{domain.tax_term}</font></th>\n        <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts 1=$currency}Amount %1{/ts}</font></th>\n      </tr>\n      {foreach from=$lineItems item=line}\n        <tr>\n          <td style=\"text-align:left;nowrap\"><font size=\"1\">\n            {$line.title}\n          </font></td>\n          <td style=\"text-align:right;\"><font size=\"1\">{$line.qty}</font></td>\n          <td style=\"text-align:right;\"><font size=\"1\">{$line.unit_price|crmMoney:$currency}</font></td>\n            {if $line.tax_amount != \'\'}\n              <td style=\"text-align:right;\"><font size=\"1\">{if $line.tax_rate}{$line.tax_rate|crmNumberFormat}%{/if}</font></td>\n            {else}\n              <td style=\"text-align:right;\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\'}-{/ts}{/if}</font></td>\n            {/if}\n          <td style=\"text-align:right;\"><font size=\"1\">{$line.line_total|crmMoney:\'{contribution.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=$taxRateBreakdown item=taxDetail key=taxRate}\n        {if $taxRate != 0}\n          <tr>\n            <td colspan=\"3\"></td>\n            <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\' 2=$taxRate|crmNumberFormat}TOTAL %1 %2%{/ts}{/if}</font></td>\n            <td style=\"text-align:right\"><font size=\"1\" align=\"right\">{$taxDetail.amount|crmMoney:\'{contribution.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=$currency}TOTAL %1{/ts}</font></b></td>\n        <td style=\"text-align:right;\"><font size=\"1\">{$amount|crmMoney:$currency}</font></td>\n      </tr>\n      <tr>\n        <td colspan=\"3\"></td>\n        <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">\n          {if \'{contribution.contribution_status_id:name}\' == \'Refunded\'}\n            {ts}Amount Credited{/ts}\n          {else}\n            {ts}Amount Paid{/ts}\n          {/if}\n        </font></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      <tr>\n        <td colspan=\"5\"></td>\n      </tr>\n      {if \'{contribution.contribution_status_id:name}\' == \'Pending\' && \'{contribution.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\n    {if \'{contribution.contribution_status_id:name}\' == \'Pending\' && \'{contribution.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/>\n            <font size=\"1\" align=\"left\"><b>{ts}To:{/ts}</b><div style=\"width:24em;word-wrap:break-word;\">\n              {domain.name}<br />\n              {domain.street_address} {domain.supplemental_address_1}<br />\n              {domain.supplemental_address_2} {domain.state_province_id:label}<br />\n              {domain.city} {domain.postal_code}<br />\n              {domain.country_id:label}<br />\n              {domain.email}</div>\n              {domain.phone}<br />\n            </font>\n            <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\">{contact.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\">{contribution.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          </td>\n        </tr>\n      </table>\n    {/if}\n\n    {if \'{contribution.contribution_status_id:name}\' === \'Refunded\' || \'{contribution.contribution_status_id:name}\' === \'Cancelled\'}\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    <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.name}</font></td>\n      </tr>\n      <tr>\n        <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{contact.display_name}{if \'{contact.current_employer}\'} ({contact.current_employer}){/if}</font></td>\n        <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{$invoice_date}</font></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.street_address}\n          {domain.supplemental_address_1}\n         </font></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><font size=\"1\" align=\"right\">\n          {domain.supplemental_address_2}\n          {domain.state_province_id:label}\n        </font></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\">{contribution.creditnote_id}</font></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.city}\n          {domain.postal_code}\n        </font></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><font size=\"1\" align=\"right\">\n          {domain.country_id:label}\n        </font></td>\n      </tr>\n      <tr>\n        <td></td>\n        <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{contribution.source}</font></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.email}\n        </font></td>\n      </tr>\n      <tr>\n        <td></td>\n        <td></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.phone}\n        </font></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\">\n          <table>\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\">{domain.tax_term}</font></th>\n              <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts 1=$currency}Amount %1{/ts}</font></th>\n            </tr>\n            {foreach from=$lineItems item=line key=index}\n              <tr><td colspan=\"5\"><hr {if $index == 0}size=\"3\" style=\"color:#000;\"{else}style=\"color:#F5F5F5;\"{/if}></hr></td></tr>\n              <tr>\n                <td style =\"text-align:left;\"  ><font size=\"1\">\n                  {$line.title}\n                </font></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$line.qty}</font></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$line.unit_price|crmMoney:$currency}</font></td>\n                {if $line.tax_amount != \'\'}\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{if $line.tax_rate}{$line.tax_rate|crmNumberFormat}%{/if}</font></td>\n                {else}\n                  <td style=\"padding-left:28px;text-align:right\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\'}No %1{/ts}{/if}</font></td>\n                {/if}\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$line.line_total|crmMoney:\'{contribution.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=$taxRateBreakdown item=taxDetail key=taxRate}\n                {if $taxRate != 0}\n                  <tr>\n                    <td colspan=\"3\"></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\' 2=$taxRate|crmNumberFormat}TOTAL %1 %2%{/ts}{/if}</font></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\" align=\"right\">{$taxDetail.amount|crmMoney:\'{contribution.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=$currency}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 \'{contribution.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\">{contact.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\">{contribution.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\n  </div>\n  </body>\n</html>\n',1,818,'contribution_invoice_receipt',0,1,0,NULL),
+ (1,'Cases - Send Copy of an Activity','{if !empty($idHash)}[case #{$idHash}]{/if} {$activitySubject}\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    <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} - {activity.activity_type_id:label}\n              </th>\n            </tr>\n            {if !empty($isCaseActivity)}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Your Case Role(s){/ts}\n                </td>\n                <td {$valueStyle}>\n                  {$contact.role|default:\'\'}\n                </td>\n              </tr>\n              {if !empty($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 !empty($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 !empty($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}\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            {if !empty($activity.customGroups)}\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            {/if}\n          </table>\n        </td>\n      </tr>\n    </table>\n</body>\n</html>\n',1,814,'case_activity',1,0,0,NULL),
+ (2,'Cases - Send Copy of an Activity','{if !empty($idHash)}[case #{$idHash}]{/if} {$activitySubject}\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    <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} - {activity.activity_type_id:label}\n              </th>\n            </tr>\n            {if !empty($isCaseActivity)}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Your Case Role(s){/ts}\n                </td>\n                <td {$valueStyle}>\n                  {$contact.role|default:\'\'}\n                </td>\n              </tr>\n              {if !empty($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 !empty($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 !empty($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}\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            {if !empty($activity.customGroups)}\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            {/if}\n          </table>\n        </td>\n      </tr>\n    </table>\n</body>\n</html>\n',1,814,'case_activity',0,1,0,NULL),
+ (3,'Contributions - Duplicate Organization Alert','{ts}CiviContribute Alert: Possible Duplicate Contact Record{/ts} - {contact.display_name}\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  <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</body>\n</html>\n',1,815,'contribution_dupalert',1,0,0,NULL),
+ (4,'Contributions - Duplicate Organization Alert','{ts}CiviContribute Alert: Possible Duplicate Contact Record{/ts} - {contact.display_name}\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  <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</body>\n</html>\n',1,815,'contribution_dupalert',0,1,0,NULL),
+ (5,'Contributions - Receipt (off-line)','{ts}Contribution Receipt{/ts} - {contact.display_name}\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  <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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n      <p>\n        {if {contribution.contribution_page_id.receipt_text|boolean}}{contribution.contribution_page_id.receipt_text}\n        {elseif {contribution.paid_amount|boolean}}{ts}Below you will find a receipt for this contribution.{/ts}{/if}\n      </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}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      {if \'{contribution.financial_type_id}\'}\n        <td {$labelStyle}>\n         {ts}Financial Type{/ts}\n        </td>\n        <td {$valueStyle}>\n         {contribution.financial_type_id:label}\n        </td>\n      {/if}\n     </tr>\n\n     {if $isShowLineItems}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <table>\n          <tr>\n           <th>{ts}Item{/ts}</th>\n           <th>{ts}Qty{/ts}</th>\n           <th>{ts}Each{/ts}</th>\n           {if $isShowTax && {contribution.tax_amount|boolean}}\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=$lineItems item=line}\n           <tr>\n            <td>\n              {$line.title}\n            </td>\n            <td>\n             {$line.qty}\n            </td>\n            <td>\n             {$line.unit_price|crmMoney:\'{contribution.currency}\'}\n            </td>\n            {if $isShowTax && {contribution.tax_amount|boolean}}\n              <td>\n                {$line.line_total|crmMoney:\'{contribution.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:\'{contribution.currency}\'}\n                </td>\n              {else}\n                <td></td>\n                <td></td>\n              {/if}\n            {/if}\n            <td>\n             {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n            </td>\n           </tr>\n          {/foreach}\n         </table>\n        </td>\n       </tr>\n\n     {/if}\n     {if $isShowTax && {contribution.tax_amount|boolean}}\n       <tr>\n         <td {$labelStyle}>\n           {ts} Amount before Tax : {/ts}\n         </td>\n         <td {$valueStyle}>\n           {contribution.tax_exclusive_amount}\n         </td>\n       </tr>\n\n       {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n         <tr>\n          <td>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if}</td>\n          <td>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $isShowTax}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.tax_amount}\n        </td>\n      </tr>\n     {/if}\n\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n        {contribution.total_amount}\n      </td>\n     </tr>\n\n     {if \'{contribution.receive_date}\'}\n       <tr>\n       <td {$labelStyle}>\n        {ts}Contribution Date{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.receive_date|crmDate:\"shortdate\"}\n       </td>\n      </tr>\n     {/if}\n\n      {if \'{contribution.receipt_date}\'}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Receipt Date{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.receipt_date|crmDate:\"shortdate\"}\n       </td>\n      </tr>\n     {/if}\n\n     {if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Paid By{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.payment_instrument_id:label}\n       </td>\n      </tr>\n      {if \'{contribution.check_number}\'}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Check Number{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.check_number}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if \'{contribution.trxn_id}\'}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction ID{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n     {if !empty($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 !empty($softCreditTypes) and !empty($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 !empty($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 !empty($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 !empty($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\n</body>\n</html>\n',1,816,'contribution_offline_receipt',1,0,0,NULL),
+ (6,'Contributions - Receipt (off-line)','{ts}Contribution Receipt{/ts} - {contact.display_name}\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  <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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n      <p>\n        {if {contribution.contribution_page_id.receipt_text|boolean}}{contribution.contribution_page_id.receipt_text}\n        {elseif {contribution.paid_amount|boolean}}{ts}Below you will find a receipt for this contribution.{/ts}{/if}\n      </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}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      {if \'{contribution.financial_type_id}\'}\n        <td {$labelStyle}>\n         {ts}Financial Type{/ts}\n        </td>\n        <td {$valueStyle}>\n         {contribution.financial_type_id:label}\n        </td>\n      {/if}\n     </tr>\n\n     {if $isShowLineItems}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <table>\n          <tr>\n           <th>{ts}Item{/ts}</th>\n           <th>{ts}Qty{/ts}</th>\n           <th>{ts}Each{/ts}</th>\n           {if $isShowTax && {contribution.tax_amount|boolean}}\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=$lineItems item=line}\n           <tr>\n            <td>\n              {$line.title}\n            </td>\n            <td>\n             {$line.qty}\n            </td>\n            <td>\n             {$line.unit_price|crmMoney:\'{contribution.currency}\'}\n            </td>\n            {if $isShowTax && {contribution.tax_amount|boolean}}\n              <td>\n                {$line.line_total|crmMoney:\'{contribution.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:\'{contribution.currency}\'}\n                </td>\n              {else}\n                <td></td>\n                <td></td>\n              {/if}\n            {/if}\n            <td>\n             {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n            </td>\n           </tr>\n          {/foreach}\n         </table>\n        </td>\n       </tr>\n\n     {/if}\n     {if $isShowTax && {contribution.tax_amount|boolean}}\n       <tr>\n         <td {$labelStyle}>\n           {ts} Amount before Tax : {/ts}\n         </td>\n         <td {$valueStyle}>\n           {contribution.tax_exclusive_amount}\n         </td>\n       </tr>\n\n       {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n         <tr>\n          <td>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if}</td>\n          <td>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $isShowTax}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.tax_amount}\n        </td>\n      </tr>\n     {/if}\n\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n        {contribution.total_amount}\n      </td>\n     </tr>\n\n     {if \'{contribution.receive_date}\'}\n       <tr>\n       <td {$labelStyle}>\n        {ts}Contribution Date{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.receive_date|crmDate:\"shortdate\"}\n       </td>\n      </tr>\n     {/if}\n\n      {if \'{contribution.receipt_date}\'}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Receipt Date{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.receipt_date|crmDate:\"shortdate\"}\n       </td>\n      </tr>\n     {/if}\n\n     {if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Paid By{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.payment_instrument_id:label}\n       </td>\n      </tr>\n      {if \'{contribution.check_number}\'}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Check Number{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.check_number}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if \'{contribution.trxn_id}\'}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction ID{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n     {if !empty($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 !empty($softCreditTypes) and !empty($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 !empty($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 !empty($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 !empty($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\n</body>\n</html>\n',1,816,'contribution_offline_receipt',0,1,0,NULL),
+ (7,'Contributions - Receipt (on-line)','{if \'{contribution.contribution_status_id:name}\' === \'Pending\'}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name}\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<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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n     {if $userText}\n       <p>{$userText}</p>\n     {elseif {contribution.contribution_page_id.receipt_text|boolean}}\n       <p>{contribution.contribution_page_id.receipt_text}</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  {if {contribution.total_amount|boolean}}\n    <tr>\n      <th {$headerStyle}>\n        {ts}Contribution Information{/ts}\n      </th>\n    </tr>\n\n    {if $isShowLineItems}\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          <table>\n            <tr>\n              <th>{ts}Item{/ts}</th>\n              <th>{ts}Qty{/ts}</th>\n              <th>{ts}Each{/ts}</th>\n              {if $isShowTax && {contribution.tax_amount|boolean}}\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=$lineItems item=line}\n              <tr>\n                <td>{$line.title}</td>\n                <td>{$line.qty}</td>\n                <td>{$line.unit_price|crmMoney:$currency}</td>\n                {if $isShowTax && {contribution.tax_amount|boolean}}\n                  <td>{$line.line_total|crmMoney:$currency}</td>\n                  {if $line.tax_rate || $line.tax_amount != \"\"}\n                    <td>{$line.tax_rate|string_format:\"%.2f\"}%</td>\n                    <td>{$line.tax_amount|crmMoney:$currency}</td>\n                  {else}\n                    <td></td>\n                    <td></td>\n                  {/if}\n                {/if}\n                <td>\n                  {$line.line_total_inclusive|crmMoney:$currency}\n                </td>\n              </tr>\n            {/foreach}\n          </table>\n        </td>\n      </tr>\n\n      {if $isShowTax && {contribution.tax_amount|boolean}}\n        <tr>\n          <td {$labelStyle}>\n            {ts} Amount before Tax : {/ts}\n          </td>\n          <td {$valueStyle}>\n            {contribution.tax_exclusive_amount}\n          </td>\n        </tr>\n\n        {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n          <tr>\n            <td>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if}</td>\n            <td>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n          </tr>\n        {/foreach}\n\n      {/if}\n      {if $isShowTax}\n        <tr>\n          <td {$labelStyle}>\n            {ts}Total Tax{/ts}\n          </td>\n          <td {$valueStyle}>\n            {contribution.tax_amount}\n          </td>\n        </tr>\n      {/if}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.total_amount}\n        </td>\n      </tr>\n    {else}\n      {if {contribution.tax_amount|boolean}}\n        <tr>\n          <td {$labelStyle}>\n            {ts}Total Tax Amount{/ts}\n          </td>\n          <td {$valueStyle}>\n            {contribution.tax_amount}\n          </td>\n         </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {contribution.total_amount} {if \'{contribution.amount_level}\'} - {contribution.amount_level}{/if}\n        </td>\n       </tr>\n\n      {/if}\n\n  {/if}\n\n\n     {if !empty($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 {contribution.trxn_id|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n    {if !empty($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 !empty($softCreditTypes) and !empty($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 !empty($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 !empty($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 {contribution.contribution_page_id.is_share|boolean}}\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n            {capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id={contribution.contribution_page_id}\" 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 !empty($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 !empty($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 !empty($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 !empty($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 !empty($contact_email) OR !empty($contact_phone)}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}For information about this premium, contact:{/ts}</p>\n         {if !empty($contact_email)}\n          <p>{$contact_email}</p>\n         {/if}\n         {if !empty($contact_phone)}\n          <p>{$contact_phone}</p>\n         {/if}\n        </td>\n       </tr>\n      {/if}\n      {if $is_deductible AND !empty($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 !empty($customPre)}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if !empty($customPost)}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n  </table>\n\n</body>\n</html>\n',1,817,'contribution_online_receipt',1,0,0,NULL),
+ (8,'Contributions - Receipt (on-line)','{if \'{contribution.contribution_status_id:name}\' === \'Pending\'}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name}\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<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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n     {if $userText}\n       <p>{$userText}</p>\n     {elseif {contribution.contribution_page_id.receipt_text|boolean}}\n       <p>{contribution.contribution_page_id.receipt_text}</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  {if {contribution.total_amount|boolean}}\n    <tr>\n      <th {$headerStyle}>\n        {ts}Contribution Information{/ts}\n      </th>\n    </tr>\n\n    {if $isShowLineItems}\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          <table>\n            <tr>\n              <th>{ts}Item{/ts}</th>\n              <th>{ts}Qty{/ts}</th>\n              <th>{ts}Each{/ts}</th>\n              {if $isShowTax && {contribution.tax_amount|boolean}}\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=$lineItems item=line}\n              <tr>\n                <td>{$line.title}</td>\n                <td>{$line.qty}</td>\n                <td>{$line.unit_price|crmMoney:$currency}</td>\n                {if $isShowTax && {contribution.tax_amount|boolean}}\n                  <td>{$line.line_total|crmMoney:$currency}</td>\n                  {if $line.tax_rate || $line.tax_amount != \"\"}\n                    <td>{$line.tax_rate|string_format:\"%.2f\"}%</td>\n                    <td>{$line.tax_amount|crmMoney:$currency}</td>\n                  {else}\n                    <td></td>\n                    <td></td>\n                  {/if}\n                {/if}\n                <td>\n                  {$line.line_total_inclusive|crmMoney:$currency}\n                </td>\n              </tr>\n            {/foreach}\n          </table>\n        </td>\n      </tr>\n\n      {if $isShowTax && {contribution.tax_amount|boolean}}\n        <tr>\n          <td {$labelStyle}>\n            {ts} Amount before Tax : {/ts}\n          </td>\n          <td {$valueStyle}>\n            {contribution.tax_exclusive_amount}\n          </td>\n        </tr>\n\n        {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n          <tr>\n            <td>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if}</td>\n            <td>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n          </tr>\n        {/foreach}\n\n      {/if}\n      {if $isShowTax}\n        <tr>\n          <td {$labelStyle}>\n            {ts}Total Tax{/ts}\n          </td>\n          <td {$valueStyle}>\n            {contribution.tax_amount}\n          </td>\n        </tr>\n      {/if}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.total_amount}\n        </td>\n      </tr>\n    {else}\n      {if {contribution.tax_amount|boolean}}\n        <tr>\n          <td {$labelStyle}>\n            {ts}Total Tax Amount{/ts}\n          </td>\n          <td {$valueStyle}>\n            {contribution.tax_amount}\n          </td>\n         </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {contribution.total_amount} {if \'{contribution.amount_level}\'} - {contribution.amount_level}{/if}\n        </td>\n       </tr>\n\n      {/if}\n\n  {/if}\n\n\n     {if !empty($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 {contribution.trxn_id|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n    {if !empty($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 !empty($softCreditTypes) and !empty($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 !empty($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 !empty($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 {contribution.contribution_page_id.is_share|boolean}}\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n            {capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id={contribution.contribution_page_id}\" 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 !empty($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 !empty($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 !empty($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 !empty($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 !empty($contact_email) OR !empty($contact_phone)}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}For information about this premium, contact:{/ts}</p>\n         {if !empty($contact_email)}\n          <p>{$contact_email}</p>\n         {/if}\n         {if !empty($contact_phone)}\n          <p>{$contact_phone}</p>\n         {/if}\n        </td>\n       </tr>\n      {/if}\n      {if $is_deductible AND !empty($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 !empty($customPre)}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if !empty($customPost)}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n  </table>\n\n</body>\n</html>\n',1,817,'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','','<!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=\"{domain.empowered_by_civicrm_image_url}\" 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      {if $userText}\n        <tr>\n          <td><font size=\"1\" colspan=\"3\">{$userText}</font></td>\n        </tr>\n      {/if}\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.name}</font></b></td>\n      </tr>\n      <tr>\n        <td><font size=\"1\" align=\"center\">{contact.display_name}{if \'{contact.current_employer}\'} ({contact.current_employer}){/if}</font></td>\n        <td><font size=\"1\" align=\"right\">{contribution.receive_date|crmDate:\"Full\"}</font></td>\n        <td style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">\n          {domain.street_address}\n          {domain.supplemental_address_1}\n        </font></td>\n      </tr>\n      <tr>\n        <td><font size=\"1\" align=\"center\">{contact.address_billing.street_address} {contact.address_billing.supplemental_address_1}</font></td>\n        <td><b><font size=\"1\" align=\"right\">{ts}Invoice Number:{/ts}</font></b></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.supplemental_address_2}\n          {domain.state_province_id:label}\n        </font></td>\n      </tr>\n      <tr>\n        <td><font size=\"1\" align=\"center\">{contact.address_billing.supplemental_address_2} {contact.address_billing.state_province_id:abbr}</font></td>\n        <td><font size=\"1\" align=\"right\">{contribution.invoice_number}</font></td>\n        <td style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">\n          {domain.city}\n          {domain.postal_code}\n        </font></td>\n      </tr>\n      <tr>\n        <td><font size=\"1\" align=\"right\">{contact.address_billing.city}  {contact.address_billing.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\">{domain.country_id:label}</font></td>\n      </tr>\n      <tr>\n        <td><font size=\"1\" align=\"right\"> {contact.address_billing.country_id:label}</font></td>\n        <td><font size=\"1\" align=\"right\">{contribution.source}</font></td>\n        <td valign=\"top\" style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">{domain.email}</font> </td>\n      </tr>\n      <tr>\n        <td></td>\n        <td></td>\n        <td valign=\"top\"><font size=\"1\" align=\"right\">{domain.phone}</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\">{domain.tax_term}</font></th>\n        <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts 1=\'{contribution.currency}\'}Amount %1{/ts}</font></th>\n      </tr>\n      {foreach from=$lineItems item=line}\n        <tr>\n          <td style=\"text-align:left;nowrap\"><font size=\"1\">\n            {$line.title}\n          </font></td>\n          <td style=\"text-align:right;\"><font size=\"1\">{$line.qty}</font></td>\n          <td style=\"text-align:right;\"><font size=\"1\">{$line.unit_price|crmMoney:$currency}</font></td>\n            {if $line.tax_amount != \'\'}\n              <td style=\"text-align:right;\"><font size=\"1\">{if $line.tax_rate}{$line.tax_rate|crmNumberFormat}%{/if}</font></td>\n            {else}\n              <td style=\"text-align:right;\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\'}-{/ts}{/if}</font></td>\n            {/if}\n          <td style=\"text-align:right;\"><font size=\"1\">{$line.line_total|crmMoney:\'{contribution.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\">{contribution.tax_exclusive_amount}</font></td>\n      </tr>\n      {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n        {if $taxRate != 0}\n          <tr>\n            <td colspan=\"3\"></td>\n            <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\' 2=$taxRate|crmNumberFormat}TOTAL %1 %2%{/ts}{/if}</font></td>\n            <td style=\"text-align:right\"><font size=\"1\" align=\"right\">{$taxDetail.amount|crmMoney:\'{contribution.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=\'{contribution.currency}\'}TOTAL %1{/ts}</font></b></td>\n        <td style=\"text-align:right;\"><font size=\"1\">{contribution.total_amount}</font></td>\n      </tr>\n      <tr>\n        <td colspan=\"3\"></td>\n        <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">\n          {if \'{contribution.contribution_status_id:name}\' == \'Refunded\'}\n            {ts}Amount Credited{/ts}\n          {else}\n            {ts}Amount Paid{/ts}\n          {/if}\n        </font></td>\n        <td style=\"text-align:right;\"><font size=\"1\">{contribution.paid_amount}</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\">{contribution.balance_amount}</font></b></td>\n      </tr>\n      <tr>\n        <td colspan=\"5\"></td>\n      </tr>\n      {if \'{contribution.contribution_status_id:name}\' == \'Pending\' && \'{contribution.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\n    {if \'{contribution.contribution_status_id:name}\' == \'Pending\' && \'{contribution.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/>\n            <font size=\"1\" align=\"left\"><b>{ts}To:{/ts}</b><div style=\"width:24em;word-wrap:break-word;\">\n              {domain.name}<br />\n              {domain.street_address} {domain.supplemental_address_1}<br />\n              {domain.supplemental_address_2} {domain.state_province_id:label}<br />\n              {domain.city} {domain.postal_code}<br />\n              {domain.country_id:label}<br />\n              {domain.email}</div>\n              {domain.phone}<br />\n            </font>\n            <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\">{contact.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\">{contribution.invoice_number}</font></td>\n              </tr>\n              <tr><td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></td></tr>\n              {if {contribution.is_pay_later|boolean}}\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;\">{contribution.total_amount}</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;\">{contribution.paid_amount}</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          </td>\n        </tr>\n      </table>\n    {/if}\n\n    {if \'{contribution.contribution_status_id:name}\' === \'Refunded\' || \'{contribution.contribution_status_id:name}\' === \'Cancelled\'}\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    <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.name}</font></td>\n      </tr>\n      <tr>\n        <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{contact.display_name}{if \'{contact.current_employer}\'} ({contact.current_employer}){/if}</font></td>\n        <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{contribution.receive_date|crmDate:\"Full\"}</font></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.street_address}\n          {domain.supplemental_address_1}\n         </font></td>\n      </tr>\n      <tr>\n        <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{contact.address_billing.street_address}   {contact.address_billing.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><font size=\"1\" align=\"right\">\n          {domain.supplemental_address_2}\n          {domain.state_province_id:label}\n        </font></td>\n      </tr>\n      <tr>\n        <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{contact.address_billing.supplemental_address_2} {contact.address_billing.state_province_id:abbr}</font></td>\n        <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{contribution.creditnote_id}</font></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.city}\n          {domain.postal_code}\n        </font></td>\n      </tr>\n      <tr>\n        <td style=\"padding-left:17px;\"><font size=\"1\" align=\"right\">{contact.address_billing.city}  {contact.address_billing.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><font size=\"1\" align=\"right\">\n          {domain.country_id:label}\n        </font></td>\n      </tr>\n      <tr>\n        <td></td>\n        <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{contribution.source}</font></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.email}\n        </font></td>\n      </tr>\n      <tr>\n        <td></td>\n        <td></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.phone}\n        </font></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\">\n          <table>\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\">{domain.tax_term}</font></th>\n              <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts 1=\"{contribution.currency}\"}Amount %1{/ts}</font></th>\n            </tr>\n            {foreach from=$lineItems item=line key=index}\n              <tr><td colspan=\"5\"><hr {if $index == 0}size=\"3\" style=\"color:#000;\"{else}style=\"color:#F5F5F5;\"{/if}></hr></td></tr>\n              <tr>\n                <td style =\"text-align:left;\"  ><font size=\"1\">\n                  {$line.title}\n                </font></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$line.qty}</font></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$line.unit_price|crmMoney:\'{contribution.currency}\'}</font></td>\n                {if $line.tax_amount != \'\'}\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{if $line.tax_rate}{$line.tax_rate|crmNumberFormat}%{/if}</font></td>\n                {else}\n                  <td style=\"padding-left:28px;text-align:right\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\'}No %1{/ts}{/if}</font></td>\n                {/if}\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$line.line_total|crmMoney:\'{contribution.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\">{contribution.tax_exclusive_amount}</font></td>\n            </tr>\n            {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n                {if $taxRate != 0}\n                  <tr>\n                    <td colspan=\"3\"></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\' 2=$taxRate|crmNumberFormat}TOTAL %1 %2%{/ts}{/if}</font></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\" align=\"right\">{$taxDetail.amount|crmMoney:\'{contribution.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=\'{contribution.currency}\'}TOTAL %1{/ts}</font></b></td>\n              <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{contribution.total_amount}</font></td>\n            </tr>\n            {if !\'{contribution.is_pay_later|boolean}\'}\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\">{contribution.total_amount}</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\">{contribution.balance_amount}</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\">{contact.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\">{contribution.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;\">{contribution.total_amount}</font></td>\n            </tr>\n          </table>\n        </td>\n      </tr>\n    </table>\n  {/if}\n\n  </div>\n  </body>\n</html>\n',1,818,'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','','<!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=\"{domain.empowered_by_civicrm_image_url}\" 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      {if $userText}\n        <tr>\n          <td><font size=\"1\" colspan=\"3\">{$userText}</font></td>\n        </tr>\n      {/if}\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.name}</font></b></td>\n      </tr>\n      <tr>\n        <td><font size=\"1\" align=\"center\">{contact.display_name}{if \'{contact.current_employer}\'} ({contact.current_employer}){/if}</font></td>\n        <td><font size=\"1\" align=\"right\">{contribution.receive_date|crmDate:\"Full\"}</font></td>\n        <td style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">\n          {domain.street_address}\n          {domain.supplemental_address_1}\n        </font></td>\n      </tr>\n      <tr>\n        <td><font size=\"1\" align=\"center\">{contact.address_billing.street_address} {contact.address_billing.supplemental_address_1}</font></td>\n        <td><b><font size=\"1\" align=\"right\">{ts}Invoice Number:{/ts}</font></b></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.supplemental_address_2}\n          {domain.state_province_id:label}\n        </font></td>\n      </tr>\n      <tr>\n        <td><font size=\"1\" align=\"center\">{contact.address_billing.supplemental_address_2} {contact.address_billing.state_province_id:abbr}</font></td>\n        <td><font size=\"1\" align=\"right\">{contribution.invoice_number}</font></td>\n        <td style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">\n          {domain.city}\n          {domain.postal_code}\n        </font></td>\n      </tr>\n      <tr>\n        <td><font size=\"1\" align=\"right\">{contact.address_billing.city}  {contact.address_billing.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\">{domain.country_id:label}</font></td>\n      </tr>\n      <tr>\n        <td><font size=\"1\" align=\"right\"> {contact.address_billing.country_id:label}</font></td>\n        <td><font size=\"1\" align=\"right\">{contribution.source}</font></td>\n        <td valign=\"top\" style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">{domain.email}</font> </td>\n      </tr>\n      <tr>\n        <td></td>\n        <td></td>\n        <td valign=\"top\"><font size=\"1\" align=\"right\">{domain.phone}</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\">{domain.tax_term}</font></th>\n        <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts 1=\'{contribution.currency}\'}Amount %1{/ts}</font></th>\n      </tr>\n      {foreach from=$lineItems item=line}\n        <tr>\n          <td style=\"text-align:left;nowrap\"><font size=\"1\">\n            {$line.title}\n          </font></td>\n          <td style=\"text-align:right;\"><font size=\"1\">{$line.qty}</font></td>\n          <td style=\"text-align:right;\"><font size=\"1\">{$line.unit_price|crmMoney:$currency}</font></td>\n            {if $line.tax_amount != \'\'}\n              <td style=\"text-align:right;\"><font size=\"1\">{if $line.tax_rate}{$line.tax_rate|crmNumberFormat}%{/if}</font></td>\n            {else}\n              <td style=\"text-align:right;\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\'}-{/ts}{/if}</font></td>\n            {/if}\n          <td style=\"text-align:right;\"><font size=\"1\">{$line.line_total|crmMoney:\'{contribution.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\">{contribution.tax_exclusive_amount}</font></td>\n      </tr>\n      {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n        {if $taxRate != 0}\n          <tr>\n            <td colspan=\"3\"></td>\n            <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\' 2=$taxRate|crmNumberFormat}TOTAL %1 %2%{/ts}{/if}</font></td>\n            <td style=\"text-align:right\"><font size=\"1\" align=\"right\">{$taxDetail.amount|crmMoney:\'{contribution.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=\'{contribution.currency}\'}TOTAL %1{/ts}</font></b></td>\n        <td style=\"text-align:right;\"><font size=\"1\">{contribution.total_amount}</font></td>\n      </tr>\n      <tr>\n        <td colspan=\"3\"></td>\n        <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">\n          {if \'{contribution.contribution_status_id:name}\' == \'Refunded\'}\n            {ts}Amount Credited{/ts}\n          {else}\n            {ts}Amount Paid{/ts}\n          {/if}\n        </font></td>\n        <td style=\"text-align:right;\"><font size=\"1\">{contribution.paid_amount}</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\">{contribution.balance_amount}</font></b></td>\n      </tr>\n      <tr>\n        <td colspan=\"5\"></td>\n      </tr>\n      {if \'{contribution.contribution_status_id:name}\' == \'Pending\' && \'{contribution.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\n    {if \'{contribution.contribution_status_id:name}\' == \'Pending\' && \'{contribution.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/>\n            <font size=\"1\" align=\"left\"><b>{ts}To:{/ts}</b><div style=\"width:24em;word-wrap:break-word;\">\n              {domain.name}<br />\n              {domain.street_address} {domain.supplemental_address_1}<br />\n              {domain.supplemental_address_2} {domain.state_province_id:label}<br />\n              {domain.city} {domain.postal_code}<br />\n              {domain.country_id:label}<br />\n              {domain.email}</div>\n              {domain.phone}<br />\n            </font>\n            <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\">{contact.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\">{contribution.invoice_number}</font></td>\n              </tr>\n              <tr><td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></td></tr>\n              {if {contribution.is_pay_later|boolean}}\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;\">{contribution.total_amount}</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;\">{contribution.paid_amount}</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          </td>\n        </tr>\n      </table>\n    {/if}\n\n    {if \'{contribution.contribution_status_id:name}\' === \'Refunded\' || \'{contribution.contribution_status_id:name}\' === \'Cancelled\'}\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    <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.name}</font></td>\n      </tr>\n      <tr>\n        <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{contact.display_name}{if \'{contact.current_employer}\'} ({contact.current_employer}){/if}</font></td>\n        <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{contribution.receive_date|crmDate:\"Full\"}</font></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.street_address}\n          {domain.supplemental_address_1}\n         </font></td>\n      </tr>\n      <tr>\n        <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{contact.address_billing.street_address}   {contact.address_billing.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><font size=\"1\" align=\"right\">\n          {domain.supplemental_address_2}\n          {domain.state_province_id:label}\n        </font></td>\n      </tr>\n      <tr>\n        <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{contact.address_billing.supplemental_address_2} {contact.address_billing.state_province_id:abbr}</font></td>\n        <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{contribution.creditnote_id}</font></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.city}\n          {domain.postal_code}\n        </font></td>\n      </tr>\n      <tr>\n        <td style=\"padding-left:17px;\"><font size=\"1\" align=\"right\">{contact.address_billing.city}  {contact.address_billing.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><font size=\"1\" align=\"right\">\n          {domain.country_id:label}\n        </font></td>\n      </tr>\n      <tr>\n        <td></td>\n        <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{contribution.source}</font></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.email}\n        </font></td>\n      </tr>\n      <tr>\n        <td></td>\n        <td></td>\n        <td><font size=\"1\" align=\"right\">\n          {domain.phone}\n        </font></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\">\n          <table>\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\">{domain.tax_term}</font></th>\n              <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts 1=\"{contribution.currency}\"}Amount %1{/ts}</font></th>\n            </tr>\n            {foreach from=$lineItems item=line key=index}\n              <tr><td colspan=\"5\"><hr {if $index == 0}size=\"3\" style=\"color:#000;\"{else}style=\"color:#F5F5F5;\"{/if}></hr></td></tr>\n              <tr>\n                <td style =\"text-align:left;\"  ><font size=\"1\">\n                  {$line.title}\n                </font></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$line.qty}</font></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$line.unit_price|crmMoney:\'{contribution.currency}\'}</font></td>\n                {if $line.tax_amount != \'\'}\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{if $line.tax_rate}{$line.tax_rate|crmNumberFormat}%{/if}</font></td>\n                {else}\n                  <td style=\"padding-left:28px;text-align:right\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\'}No %1{/ts}{/if}</font></td>\n                {/if}\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$line.line_total|crmMoney:\'{contribution.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\">{contribution.tax_exclusive_amount}</font></td>\n            </tr>\n            {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n                {if $taxRate != 0}\n                  <tr>\n                    <td colspan=\"3\"></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{if \'{domain.tax_term}\'}{ts 1=\'{domain.tax_term}\' 2=$taxRate|crmNumberFormat}TOTAL %1 %2%{/ts}{/if}</font></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\" align=\"right\">{$taxDetail.amount|crmMoney:\'{contribution.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=\'{contribution.currency}\'}TOTAL %1{/ts}</font></b></td>\n              <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{contribution.total_amount}</font></td>\n            </tr>\n            {if !\'{contribution.is_pay_later|boolean}\'}\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\">{contribution.total_amount}</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\">{contribution.balance_amount}</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\">{contact.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\">{contribution.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;\">{contribution.total_amount}</font></td>\n            </tr>\n          </table>\n        </td>\n      </tr>\n    </table>\n  {/if}\n\n  </div>\n  </body>\n</html>\n',1,818,'contribution_invoice_receipt',0,1,0,NULL),
  (11,'Contributions - Recurring Start and End Notification','{ts}Recurring Contribution Notification{/ts} - {contact.display_name}\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  <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_display}\"}{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\n</body>\n</html>\n',1,819,'contribution_recurring_notify',1,0,0,NULL),
  (12,'Contributions - Recurring Start and End Notification','{ts}Recurring Contribution Notification{/ts} - {contact.display_name}\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  <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_display}\"}{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\n</body>\n</html>\n',1,819,'contribution_recurring_notify',0,1,0,NULL),
  (13,'Contributions - Recurring Cancellation Notification','{ts}Recurring Contribution Cancellation Notification{/ts} - {contact.display_name}\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  <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_display}\"}{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\n</body>\n</html>\n',1,820,'contribution_recurring_cancelled',1,0,0,NULL),
  (14,'Contributions - Recurring Cancellation Notification','{ts}Recurring Contribution Cancellation Notification{/ts} - {contact.display_name}\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  <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_display}\"}{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\n</body>\n</html>\n',1,820,'contribution_recurring_cancelled',0,1,0,NULL),
  (15,'Contributions - Recurring Billing Updates','{ts}Recurring Contribution Billing Updates{/ts} - {contact.display_name}\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  <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_display}\"}{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\n</body>\n</html>\n',1,821,'contribution_recurring_billing',1,0,0,NULL),
  (16,'Contributions - Recurring Billing Updates','{ts}Recurring Contribution Billing Updates{/ts} - {contact.display_name}\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  <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_display}\"}{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\n</body>\n</html>\n',1,821,'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_display}\"}{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  <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_display}\"}{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\n</body>\n</html>\n',1,822,'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_display}\"}{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  <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_display}\"}{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\n</body>\n</html>\n',1,822,'contribution_recurring_edit',0,1,0,NULL),
+ (17,'Contributions - Recurring Updates','{ts}Recurring Contribution Update Notification{/ts} - {contact.display_name}\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  <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_display}\"}{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\n</body>\n</html>\n',1,822,'contribution_recurring_edit',1,0,0,NULL),
+ (18,'Contributions - Recurring Updates','{ts}Recurring Contribution Update Notification{/ts} - {contact.display_name}\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  <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_display}\"}{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\n</body>\n</html>\n',1,822,'contribution_recurring_edit',0,1,0,NULL),
  (19,'Personal Campaign Pages - Admin Notification','{ts}Personal Campaign Page Notification{/ts} - {contact.display_name}\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 fe=1}{/capture}\n\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\n</body>\n</html>\n',1,823,'pcp_notify',1,0,0,NULL),
  (20,'Personal Campaign Pages - Admin Notification','{ts}Personal Campaign Page Notification{/ts} - {contact.display_name}\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 fe=1}{/capture}\n\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\n</body>\n</html>\n',1,823,'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','','<!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 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\n</body>\n</html>\n',1,824,'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','','<!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 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\n</body>\n</html>\n',1,824,'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','','<!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  <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_display}\"}{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\n</body>\n</html>\n',1,825,'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','','<!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  <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_display}\"}{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\n</body>\n</html>\n',1,825,'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_display}\"}{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}Contribution Date{/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_display}\"}{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}Contribution Date{/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,826,'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_display}\"}{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}Contribution Date{/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_display}\"}{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}Contribution Date{/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,826,'pcp_owner_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','','<!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_display}\"}{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}Contribution Date{/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,826,'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','','<!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_display}\"}{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}Contribution Date{/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,826,'pcp_owner_notify',0,1,0,NULL),
  (27,'Additional Payment Receipt or Refund Notification','{if {financial_trxn.total_amount|raw} < 0}{ts}Refund Notification{/ts}{else}{ts}Payment Receipt{/ts}{/if}{if {event.title|boolean}} - {event.title}{/if} - {contact.display_name}\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 <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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n      {if {financial_trxn.total_amount|raw} < 0}\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 !{contribution.balance_amount|boolean}}\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 {financial_trxn.total_amount|raw} < 0}\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          {financial_trxn.total_amount}\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        {financial_trxn.total_amount}\n        </td>\n      </tr>\n    {/if}\n    {if {financial_trxn.trxn_date|boolean}}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Transaction Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {financial_trxn.trxn_date}\n        </td>\n      </tr>\n    {/if}\n    {if {financial_trxn.trxn_id|boolean}}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n        </td>\n        <td {$valueStyle}>\n          {financial_trxn.trxn_id}\n        </td>\n      </tr>\n    {/if}\n    {if {financial_trxn.payment_instrument_id|boolean}}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Paid By{/ts}\n        </td>\n        <td {$valueStyle}>\n          {financial_trxn.payment_instrument_id:label}\n        </td>\n      </tr>\n    {/if}\n    {if {financial_trxn.check_number|boolean}}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Check Number{/ts}\n        </td>\n        <td {$valueStyle}>\n          {financial_trxn.check_number}\n        </td>\n      </tr>\n    {/if}\n\n  <tr>\n    <th {$headerStyle}>{ts}Contribution Details{/ts}</th>\n  </tr>\n  {if {contribution.total_amount|boolean}}\n  <tr>\n    <td {$labelStyle}>\n      {ts}Total Fee{/ts}\n    </td>\n    <td {$valueStyle}>\n      {contribution.total_amount}\n    </td>\n  </tr>\n  {/if}\n  {if {contribution.paid_amount|boolean}}\n  <tr>\n    <td {$labelStyle}>\n      {ts}Total Paid{/ts}\n    </td>\n    <td {$valueStyle}>\n      {contribution.paid_amount}\n    </td>\n  </tr>\n  {/if}\n  {if {contribution.balance_amount|boolean}}\n  <tr>\n    <td {$labelStyle}>\n      {ts}Balance Owed{/ts}\n    </td>\n    <td {$valueStyle}>\n      {contribution.balance_amount}\n    </td>\n  </tr>\n  {/if}\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 {contribution.address_id.display|boolean}}\n        <tr>\n          <th {$headerStyle}>\n              {ts}Billing Name and Address{/ts}\n          </th>\n        </tr>\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n              {contribution.address_id.name}<br/>\n              {contribution.address_id.display}\n          </td>\n        </tr>\n      {/if}\n    {if {financial_trxn.pan_truncation|boolean}}\n      <tr>\n        <th {$headerStyle}>\n          {ts}Credit Card Information{/ts}\n        </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {financial_trxn.card_type_id:label}<br />\n          ************{financial_trxn.pan_truncation}<br />\n        </td>\n      </tr>\n    {/if}\n    {if {event.id|boolean}}\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.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date}{/if}{/if}\n        </td>\n      </tr>\n\n      {if {participant.role_id|boolean}}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Participant Role{/ts}\n        </td>\n        <td {$valueStyle}>\n         {participant.role_id:label}\n        </td>\n      </tr>\n      {/if}\n\n      {if {event.is_show_location|boolean}}\n            <tr>\n              <td colspan=\"2\" {$valueStyle}>\n                  {event.location}\n              </td>\n            </tr>\n          {/if}\n          {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n            <tr>\n              <td colspan=\"2\" {$labelStyle}>\n                  {ts}Event Contacts:{/ts}\n              </td>\n            </tr>\n\n             {if {event.loc_block_id.phone_id.phone|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                      {event.loc_block_id.phone_id.phone_type_id:label}\n                  {else}\n                      {ts}Phone{/ts}\n                  {/if}\n              </td>\n              <td {$valueStyle}>\n                  {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n              </td>\n            </tr>\n          {/if}\n             {if {event.loc_block_id.phone_2_id.phone|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                      {event.loc_block_id.phone_2_id.phone_type_id:label}\n                  {else}\n                      {ts}Phone{/ts}\n                  {/if}\n              </td>\n              <td {$valueStyle}>\n                  {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n              </td>\n            </tr>\n          {/if}\n\n              {if {event.loc_block_id.email_id.email|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {ts}Email{/ts}\n              </td>\n              <td {$valueStyle}>\n                  {event.loc_block_id.email_id.email}\n              </td>\n            </tr>\n          {/if}\n\n              {if {event.loc_block_id.email_2_id.email|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                      {ts}Email{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                      {event.loc_block_id.email_2_id.email}\n                  </td>\n                </tr>\n              {/if}\n            {/if}\n\n          {/if}\n        </table>\n      </td>\n    </tr>\n  </table>\n </body>\n</html>\n',1,827,'payment_or_refund_notification',1,0,0,NULL),
  (28,'Additional Payment Receipt or Refund Notification','{if {financial_trxn.total_amount|raw} < 0}{ts}Refund Notification{/ts}{else}{ts}Payment Receipt{/ts}{/if}{if {event.title|boolean}} - {event.title}{/if} - {contact.display_name}\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 <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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n      {if {financial_trxn.total_amount|raw} < 0}\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 !{contribution.balance_amount|boolean}}\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 {financial_trxn.total_amount|raw} < 0}\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          {financial_trxn.total_amount}\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        {financial_trxn.total_amount}\n        </td>\n      </tr>\n    {/if}\n    {if {financial_trxn.trxn_date|boolean}}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Transaction Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {financial_trxn.trxn_date}\n        </td>\n      </tr>\n    {/if}\n    {if {financial_trxn.trxn_id|boolean}}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n        </td>\n        <td {$valueStyle}>\n          {financial_trxn.trxn_id}\n        </td>\n      </tr>\n    {/if}\n    {if {financial_trxn.payment_instrument_id|boolean}}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Paid By{/ts}\n        </td>\n        <td {$valueStyle}>\n          {financial_trxn.payment_instrument_id:label}\n        </td>\n      </tr>\n    {/if}\n    {if {financial_trxn.check_number|boolean}}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Check Number{/ts}\n        </td>\n        <td {$valueStyle}>\n          {financial_trxn.check_number}\n        </td>\n      </tr>\n    {/if}\n\n  <tr>\n    <th {$headerStyle}>{ts}Contribution Details{/ts}</th>\n  </tr>\n  {if {contribution.total_amount|boolean}}\n  <tr>\n    <td {$labelStyle}>\n      {ts}Total Fee{/ts}\n    </td>\n    <td {$valueStyle}>\n      {contribution.total_amount}\n    </td>\n  </tr>\n  {/if}\n  {if {contribution.paid_amount|boolean}}\n  <tr>\n    <td {$labelStyle}>\n      {ts}Total Paid{/ts}\n    </td>\n    <td {$valueStyle}>\n      {contribution.paid_amount}\n    </td>\n  </tr>\n  {/if}\n  {if {contribution.balance_amount|boolean}}\n  <tr>\n    <td {$labelStyle}>\n      {ts}Balance Owed{/ts}\n    </td>\n    <td {$valueStyle}>\n      {contribution.balance_amount}\n    </td>\n  </tr>\n  {/if}\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 {contribution.address_id.display|boolean}}\n        <tr>\n          <th {$headerStyle}>\n              {ts}Billing Name and Address{/ts}\n          </th>\n        </tr>\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n              {contribution.address_id.name}<br/>\n              {contribution.address_id.display}\n          </td>\n        </tr>\n      {/if}\n    {if {financial_trxn.pan_truncation|boolean}}\n      <tr>\n        <th {$headerStyle}>\n          {ts}Credit Card Information{/ts}\n        </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {financial_trxn.card_type_id:label}<br />\n          ************{financial_trxn.pan_truncation}<br />\n        </td>\n      </tr>\n    {/if}\n    {if {event.id|boolean}}\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.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date}{/if}{/if}\n        </td>\n      </tr>\n\n      {if {participant.role_id|boolean}}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Participant Role{/ts}\n        </td>\n        <td {$valueStyle}>\n         {participant.role_id:label}\n        </td>\n      </tr>\n      {/if}\n\n      {if {event.is_show_location|boolean}}\n            <tr>\n              <td colspan=\"2\" {$valueStyle}>\n                  {event.location}\n              </td>\n            </tr>\n          {/if}\n          {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n            <tr>\n              <td colspan=\"2\" {$labelStyle}>\n                  {ts}Event Contacts:{/ts}\n              </td>\n            </tr>\n\n             {if {event.loc_block_id.phone_id.phone|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                      {event.loc_block_id.phone_id.phone_type_id:label}\n                  {else}\n                      {ts}Phone{/ts}\n                  {/if}\n              </td>\n              <td {$valueStyle}>\n                  {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n              </td>\n            </tr>\n          {/if}\n             {if {event.loc_block_id.phone_2_id.phone|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                      {event.loc_block_id.phone_2_id.phone_type_id:label}\n                  {else}\n                      {ts}Phone{/ts}\n                  {/if}\n              </td>\n              <td {$valueStyle}>\n                  {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n              </td>\n            </tr>\n          {/if}\n\n              {if {event.loc_block_id.email_id.email|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {ts}Email{/ts}\n              </td>\n              <td {$valueStyle}>\n                  {event.loc_block_id.email_id.email}\n              </td>\n            </tr>\n          {/if}\n\n              {if {event.loc_block_id.email_2_id.email|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                      {ts}Email{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                      {event.loc_block_id.email_2_id.email}\n                  </td>\n                </tr>\n              {/if}\n            {/if}\n\n          {/if}\n        </table>\n      </td>\n    </tr>\n  </table>\n </body>\n</html>\n',1,827,'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','','<!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=participantTotalStyle}style=\"margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;\"{/capture}\n\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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n    {if $userText}\n     <p>{$userText}</p>\n    {/if}\n\n    {if !empty($isOnWaitlist)}\n      <p>{ts}You have been added to the WAIT LIST for this event.{/ts}</p>\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    {elseif !empty($isRequireApproval)}\n      <p>{ts}Your registration has been submitted.{/ts}</p>\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    {elseif {contribution.is_pay_later|boolean} && {contribution.balance_amount|boolean}}\n     <p>{event.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.title}<br />\n       {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date}{/if}{/if}\n      </td>\n     </tr>\n\n     {if \"{participant.role_id:label}\" neq \'Attendee\'}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Participant Role{/ts}\n       </td>\n       <td {$valueStyle}>\n         {participant.role_id:label}\n       </td>\n      </tr>\n     {/if}\n\n     {if {event.is_show_location|boolean}}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n         {event.location}\n       </td>\n      </tr>\n     {/if}\n\n     {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n       <tr>\n         <td colspan=\"2\" {$labelStyle}>\n           {ts}Event Contacts:{/ts}\n         </td>\n       </tr>\n\n       {if {event.loc_block_id.phone_id.phone|boolean}}\n         <tr>\n           <td {$labelStyle}>\n             {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n               {event.loc_block_id.phone_id.phone_type_id:label}\n             {else}\n               {ts}Phone{/ts}\n             {/if}\n           </td>\n         <td {$valueStyle}>\n          {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n         </td>\n        </tr>\n       {/if}\n       {if {event.loc_block_id.phone_2_id.phone|boolean}}\n         <tr>\n           <td {$labelStyle}>\n             {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n               {event.loc_block_id.phone_2_id.phone_type_id:label}\n             {else}\n               {ts}Phone{/ts}\n             {/if}\n           </td>\n           <td {$valueStyle}>\n             {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n           </td>\n         </tr>\n       {/if}\n\n       {if {event.loc_block_id.email_id.email|boolean}}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n           {event.loc_block_id.email_id.email}\n         </td>\n        </tr>\n       {/if}\n\n       {if {event.loc_block_id.email_2_id.email|boolean}}\n         <tr>\n           <td {$labelStyle}>\n             {ts}Email{/ts}\n           </td>\n           <td {$valueStyle}>\n               {event.loc_block_id.email_2_id.email}\n           </td>\n         </tr>\n       {/if}\n     {/if}\n\n     {if {event.is_public|boolean} and {event.is_show_calendar_links|boolean}}\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 entry for this event.{/ts}</a>\n       </td>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {capture assign=gCalendar}{crmURL p=\'civicrm/event/ical\' q=\"gCalendar=1&reset=1&id={event.id}\" h=0 a=1 fe=1}{/capture}\n         <a href=\"{$gCalendar}\">{ts}Add event to Google Calendar{/ts}</a>\n       </td>\n      </tr>\n     {/if}\n\n     {if {contact.email_primary.email|boolean}}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n         {contact.email_primary.email}\n       </td>\n      </tr>\n     {/if}\n\n\n     {if {event.is_monetary|boolean}}\n      <tr>\n        <th {$headerStyle}>\n            {event.fee_label}\n        </th>\n      </tr>\n        {if $isShowLineItems}\n          {foreach from=$participants key=index item=currentParticipant}\n            {if $isPrimary || {participant.id} === $currentParticipant.id}\n              {if $isPrimary && ($participants|@count > 1)} {* Header for multi participant registration cases. *}\n                <tr>\n                  <td colspan=\"2\" {$labelStyle}>\n                    {$currentParticipant.contact.display_name}\n                  </td>\n                </tr>\n              {/if}\n              <tr>\n                <td colspan=\"2\" {$valueStyle}>\n                  <table>\n                    <tr>\n                      <th>{ts}Item{/ts}</th>\n                      <th>{ts}Qty{/ts}</th>\n                      <th>{ts}Each{/ts}</th>\n                      {if $isShowTax && {contribution.tax_amount|boolean}}\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 $isShowParticipantCount}\n                          <th>{ts}Total Participants{/ts}</th>\n                        {/if}\n                    </tr>\n                    {foreach from=$currentParticipant.line_items item=line}\n                      <tr>\n                        <td {$tdfirstStyle}>{$line.title}</td>\n                        <td {$tdStyle} align=\"middle\">{$line.qty}</td>\n                        <td {$tdStyle}>{$line.unit_price|crmMoney:$currency}</td>\n                          {if $isShowTax && {contribution.tax_amount|boolean}}\n                            <td>{$line.line_total|crmMoney:$currency}</td>\n                            {if $line.tax_rate || $line.tax_amount != \"\"}\n                              <td>{$line.tax_rate|string_format:\"%.2f\"}%</td>\n                              <td>{$line.tax_amount|crmMoney:$currency}</td>\n                            {else}\n                              <td></td>\n                              <td></td>\n                            {/if}\n                          {/if}\n                        <td {$tdStyle}>\n                            {$line.line_total_inclusive|crmMoney:$currency}\n                        </td>\n                        {if $isShowParticipantCount}\n                          <td {$tdStyle}>{$line.participant_count}</td>\n                        {/if}\n                      </tr>\n                    {/foreach}\n                    {if $isShowTax && $isPrimary && ($participants|@count > 1)}\n                      <tr {$participantTotalStyle}>\n                        <td colspan=3>{ts 1=$currentParticipant.contact.display_name}Total for %1{/ts}</td>\n                        <td colspan=2>{$currentParticipant.totals.total_amount_exclusive|crmMoney}</td>\n                        <td colspan=1>{$currentParticipant.totals.tax_amount|crmMoney}</td>\n                        <td colspan=2>{$currentParticipant.totals.total_amount_inclusive|crmMoney}</td>\n                      </tr>\n                    {/if}\n                  </table>\n                </td>\n              </tr>\n            {/if}\n          {/foreach}\n        {/if}\n        {if !$isShowLineItems}\n          {foreach from=$participants key=index item=currentParticipant}\n            {if $isPrimary || {participant.id} === $currentParticipant.id}\n              {foreach from=$currentParticipant.line_items key=index item=currentLineItem}\n                <tr>\n                  <td {$valueStyle}>\n                    {$currentLineItem.label}{if $isPrimary && ($participants|@count > 1)} - {$currentParticipant.contact.display_name}{/if}\n                  </td>\n                  <td {$valueStyle}>\n                    {$currentLineItem.line_total|crmMoney:$currency}\n                  </td>\n                </tr>\n              {/foreach}\n            {/if}\n          {/foreach}\n       {/if}\n        {if $isShowTax && {contribution.tax_amount|boolean}}\n          <tr>\n            <td {$labelStyle}>\n                {ts}Amount Before Tax:{/ts}\n            </td>\n            <td {$valueStyle}>\n                {if $isPrimary}{contribution.tax_exclusive_amount}{else}{$participant.totals.total_amount_exclusive|crmMoney}{/if}\n            </td>\n          </tr>\n          {if !$isPrimary}\n            {* Use the participant specific tax rate breakdown *}\n            {assign var=taxRateBreakdown value=$participant.tax_rate_breakdown}\n          {/if}\n          {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n            <tr>\n              <td {$labelStyle}>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if}</td>\n              <td {$valueStyle}>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n            </tr>\n          {/foreach}\n        {/if}\n        {if $isShowTax && {contribution.tax_amount|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Total Tax Amount{/ts}\n            </td>\n            <td {$valueStyle}>\n              {if $isPrimary}{contribution.tax_amount}{else}{$participant.totals.tax_amount|crmMoney}{/if}\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              {contribution.total_amount}\n            </td>\n          </tr>\n          {if {contribution.balance_amount|boolean} && {contribution.paid_amount|boolean}}\n            <tr>\n              <td {$labelStyle}>{ts}Total Paid{/ts}</td>\n              <td {$valueStyle}>\n                {contribution.paid_amount|crmMoney}\n              </td>\n            </tr>\n            <tr>\n              <td {$labelStyle}>{ts}Balance{/ts}</td>\n              <td {$valueStyle}>{contribution.balance_amount}</td>\n            </tr>\n          {/if}\n          {if $isShowParticipantCount}\n            <tr>\n              <td {$labelStyle}>{ts}Total Participants{/ts}</td>\n              <td {$valueStyle}>{$line.participant_count}</td>\n            </tr>\n          {/if}\n          {if {contribution.is_pay_later|boolean} && {contribution.balance_amount|boolean} && {event.pay_later_receipt|boolean}}\n            <tr>\n              <td colspan=\"2\" {$labelStyle}>\n                {event.pay_later_receipt}\n              </td>\n            </tr>\n          {/if}\n\n          {if {participant.register_date|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                {ts}Registration Date{/ts}\n              </td>\n              <td {$valueStyle}>\n                {participant.register_date}\n              </td>\n            </tr>\n          {/if}\n\n          {if {contribution.receive_date|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {ts}Transaction Date{/ts}\n              </td>\n              <td {$valueStyle}>\n                {contribution.receive_date}\n              </td>\n            </tr>\n          {/if}\n\n          {if {contribution.financial_type_id|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {ts}Financial Type{/ts}\n              </td>\n              <td {$valueStyle}>\n                {contribution.financial_type_id:label}\n              </td>\n            </tr>\n          {/if}\n\n          {if {contribution.trxn_id|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {ts}Transaction #{/ts}\n              </td>\n              <td {$valueStyle}>\n                {contribution.trxn_id}\n              </td>\n            </tr>\n          {/if}\n\n          {if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {ts}Paid By{/ts}\n              </td>\n              <td {$valueStyle}>\n                  {contribution.payment_instrument_id:label}\n              </td>\n            </tr>\n          {/if}\n\n          {if {contribution.check_number|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {ts}Check Number{/ts}\n              </td>\n              <td {$valueStyle}>\n                {contribution.check_number}\n              </td>\n            </tr>\n          {/if}\n\n          {if {contribution.address_id.display|boolean}}\n            <tr>\n              <th {$headerStyle}>\n                {ts}Billing Name and Address{/ts}\n              </th>\n            </tr>\n            <tr>\n              <td colspan=\"2\" {$valueStyle}>\n                {contribution.address_id.name}<br/>\n                {contribution.address_id.display}\n              </td>\n            </tr>\n          {/if}\n\n          {if !empty($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              </td>\n            </tr>\n          {/if}\n        {/if}\n     {/if} {* End of conditional section for Paid events *}\n\n     {if !empty($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\n</body>\n</html>\n',1,828,'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','','<!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=participantTotalStyle}style=\"margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;\"{/capture}\n\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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n    {if $userText}\n     <p>{$userText}</p>\n    {/if}\n\n    {if !empty($isOnWaitlist)}\n      <p>{ts}You have been added to the WAIT LIST for this event.{/ts}</p>\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    {elseif !empty($isRequireApproval)}\n      <p>{ts}Your registration has been submitted.{/ts}</p>\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    {elseif {contribution.is_pay_later|boolean} && {contribution.balance_amount|boolean}}\n     <p>{event.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.title}<br />\n       {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date}{/if}{/if}\n      </td>\n     </tr>\n\n     {if \"{participant.role_id:label}\" neq \'Attendee\'}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Participant Role{/ts}\n       </td>\n       <td {$valueStyle}>\n         {participant.role_id:label}\n       </td>\n      </tr>\n     {/if}\n\n     {if {event.is_show_location|boolean}}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n         {event.location}\n       </td>\n      </tr>\n     {/if}\n\n     {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n       <tr>\n         <td colspan=\"2\" {$labelStyle}>\n           {ts}Event Contacts:{/ts}\n         </td>\n       </tr>\n\n       {if {event.loc_block_id.phone_id.phone|boolean}}\n         <tr>\n           <td {$labelStyle}>\n             {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n               {event.loc_block_id.phone_id.phone_type_id:label}\n             {else}\n               {ts}Phone{/ts}\n             {/if}\n           </td>\n         <td {$valueStyle}>\n          {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n         </td>\n        </tr>\n       {/if}\n       {if {event.loc_block_id.phone_2_id.phone|boolean}}\n         <tr>\n           <td {$labelStyle}>\n             {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n               {event.loc_block_id.phone_2_id.phone_type_id:label}\n             {else}\n               {ts}Phone{/ts}\n             {/if}\n           </td>\n           <td {$valueStyle}>\n             {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n           </td>\n         </tr>\n       {/if}\n\n       {if {event.loc_block_id.email_id.email|boolean}}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n           {event.loc_block_id.email_id.email}\n         </td>\n        </tr>\n       {/if}\n\n       {if {event.loc_block_id.email_2_id.email|boolean}}\n         <tr>\n           <td {$labelStyle}>\n             {ts}Email{/ts}\n           </td>\n           <td {$valueStyle}>\n               {event.loc_block_id.email_2_id.email}\n           </td>\n         </tr>\n       {/if}\n     {/if}\n\n     {if {event.is_public|boolean} and {event.is_show_calendar_links|boolean}}\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 entry for this event.{/ts}</a>\n       </td>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {capture assign=gCalendar}{crmURL p=\'civicrm/event/ical\' q=\"gCalendar=1&reset=1&id={event.id}\" h=0 a=1 fe=1}{/capture}\n         <a href=\"{$gCalendar}\">{ts}Add event to Google Calendar{/ts}</a>\n       </td>\n      </tr>\n     {/if}\n\n     {if {contact.email_primary.email|boolean}}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n         {contact.email_primary.email}\n       </td>\n      </tr>\n     {/if}\n\n\n     {if {event.is_monetary|boolean}}\n      <tr>\n        <th {$headerStyle}>\n            {event.fee_label}\n        </th>\n      </tr>\n        {if $isShowLineItems}\n          {foreach from=$participants key=index item=currentParticipant}\n            {if $isPrimary || {participant.id} === $currentParticipant.id}\n              {if $isPrimary && ($participants|@count > 1)} {* Header for multi participant registration cases. *}\n                <tr>\n                  <td colspan=\"2\" {$labelStyle}>\n                    {$currentParticipant.contact.display_name}\n                  </td>\n                </tr>\n              {/if}\n              <tr>\n                <td colspan=\"2\" {$valueStyle}>\n                  <table>\n                    <tr>\n                      <th>{ts}Item{/ts}</th>\n                      <th>{ts}Qty{/ts}</th>\n                      <th>{ts}Each{/ts}</th>\n                      {if $isShowTax && {contribution.tax_amount|boolean}}\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 $isShowParticipantCount}\n                          <th>{ts}Total Participants{/ts}</th>\n                        {/if}\n                    </tr>\n                    {foreach from=$currentParticipant.line_items item=line}\n                      <tr>\n                        <td {$tdfirstStyle}>{$line.title}</td>\n                        <td {$tdStyle} align=\"middle\">{$line.qty}</td>\n                        <td {$tdStyle}>{$line.unit_price|crmMoney:$currency}</td>\n                          {if $isShowTax && {contribution.tax_amount|boolean}}\n                            <td>{$line.line_total|crmMoney:$currency}</td>\n                            {if $line.tax_rate || $line.tax_amount != \"\"}\n                              <td>{$line.tax_rate|string_format:\"%.2f\"}%</td>\n                              <td>{$line.tax_amount|crmMoney:$currency}</td>\n                            {else}\n                              <td></td>\n                              <td></td>\n                            {/if}\n                          {/if}\n                        <td {$tdStyle}>\n                            {$line.line_total_inclusive|crmMoney:$currency}\n                        </td>\n                        {if $isShowParticipantCount}\n                          <td {$tdStyle}>{$line.participant_count}</td>\n                        {/if}\n                      </tr>\n                    {/foreach}\n                    {if $isShowTax && $isPrimary && ($participants|@count > 1)}\n                      <tr {$participantTotalStyle}>\n                        <td colspan=3>{ts 1=$currentParticipant.contact.display_name}Total for %1{/ts}</td>\n                        <td colspan=2>{$currentParticipant.totals.total_amount_exclusive|crmMoney}</td>\n                        <td colspan=1>{$currentParticipant.totals.tax_amount|crmMoney}</td>\n                        <td colspan=2>{$currentParticipant.totals.total_amount_inclusive|crmMoney}</td>\n                      </tr>\n                    {/if}\n                  </table>\n                </td>\n              </tr>\n            {/if}\n          {/foreach}\n        {/if}\n        {if !$isShowLineItems}\n          {foreach from=$participants key=index item=currentParticipant}\n            {if $isPrimary || {participant.id} === $currentParticipant.id}\n              {foreach from=$currentParticipant.line_items key=index item=currentLineItem}\n                <tr>\n                  <td {$valueStyle}>\n                    {$currentLineItem.label}{if $isPrimary && ($participants|@count > 1)} - {$currentParticipant.contact.display_name}{/if}\n                  </td>\n                  <td {$valueStyle}>\n                    {$currentLineItem.line_total|crmMoney:$currency}\n                  </td>\n                </tr>\n              {/foreach}\n            {/if}\n          {/foreach}\n       {/if}\n        {if $isShowTax && {contribution.tax_amount|boolean}}\n          <tr>\n            <td {$labelStyle}>\n                {ts}Amount Before Tax:{/ts}\n            </td>\n            <td {$valueStyle}>\n                {if $isPrimary}{contribution.tax_exclusive_amount}{else}{$participant.totals.total_amount_exclusive|crmMoney}{/if}\n            </td>\n          </tr>\n          {if !$isPrimary}\n            {* Use the participant specific tax rate breakdown *}\n            {assign var=taxRateBreakdown value=$participant.tax_rate_breakdown}\n          {/if}\n          {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n            <tr>\n              <td {$labelStyle}>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if}</td>\n              <td {$valueStyle}>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n            </tr>\n          {/foreach}\n        {/if}\n        {if $isShowTax && {contribution.tax_amount|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Total Tax Amount{/ts}\n            </td>\n            <td {$valueStyle}>\n              {if $isPrimary}{contribution.tax_amount}{else}{$participant.totals.tax_amount|crmMoney}{/if}\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              {contribution.total_amount}\n            </td>\n          </tr>\n          {if {contribution.balance_amount|boolean} && {contribution.paid_amount|boolean}}\n            <tr>\n              <td {$labelStyle}>{ts}Total Paid{/ts}</td>\n              <td {$valueStyle}>\n                {contribution.paid_amount|crmMoney}\n              </td>\n            </tr>\n            <tr>\n              <td {$labelStyle}>{ts}Balance{/ts}</td>\n              <td {$valueStyle}>{contribution.balance_amount}</td>\n            </tr>\n          {/if}\n          {if $isShowParticipantCount}\n            <tr>\n              <td {$labelStyle}>{ts}Total Participants{/ts}</td>\n              <td {$valueStyle}>{$line.participant_count}</td>\n            </tr>\n          {/if}\n          {if {contribution.is_pay_later|boolean} && {contribution.balance_amount|boolean} && {event.pay_later_receipt|boolean}}\n            <tr>\n              <td colspan=\"2\" {$labelStyle}>\n                {event.pay_later_receipt}\n              </td>\n            </tr>\n          {/if}\n\n          {if {participant.register_date|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                {ts}Registration Date{/ts}\n              </td>\n              <td {$valueStyle}>\n                {participant.register_date}\n              </td>\n            </tr>\n          {/if}\n\n          {if {contribution.receive_date|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {ts}Transaction Date{/ts}\n              </td>\n              <td {$valueStyle}>\n                {contribution.receive_date}\n              </td>\n            </tr>\n          {/if}\n\n          {if {contribution.financial_type_id|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {ts}Financial Type{/ts}\n              </td>\n              <td {$valueStyle}>\n                {contribution.financial_type_id:label}\n              </td>\n            </tr>\n          {/if}\n\n          {if {contribution.trxn_id|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {ts}Transaction #{/ts}\n              </td>\n              <td {$valueStyle}>\n                {contribution.trxn_id}\n              </td>\n            </tr>\n          {/if}\n\n          {if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {ts}Paid By{/ts}\n              </td>\n              <td {$valueStyle}>\n                  {contribution.payment_instrument_id:label}\n              </td>\n            </tr>\n          {/if}\n\n          {if {contribution.check_number|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {ts}Check Number{/ts}\n              </td>\n              <td {$valueStyle}>\n                {contribution.check_number}\n              </td>\n            </tr>\n          {/if}\n\n          {if {contribution.address_id.display|boolean}}\n            <tr>\n              <th {$headerStyle}>\n                {ts}Billing Name and Address{/ts}\n              </th>\n            </tr>\n            <tr>\n              <td colspan=\"2\" {$valueStyle}>\n                {contribution.address_id.name}<br/>\n                {contribution.address_id.display}\n              </td>\n            </tr>\n          {/if}\n\n          {if !empty($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              </td>\n            </tr>\n          {/if}\n        {/if}\n     {/if} {* End of conditional section for Paid events *}\n\n     {if !empty($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\n</body>\n</html>\n',1,828,'event_offline_receipt',0,1,0,NULL),
- (31,'Events - Registration Confirmation and Receipt (on-line)','{if !empty($isOnWaitlist)}{ts}Wait List Confirmation{/ts}{elseif !empty($isRequireApproval)}{ts}Registration Request Confirmation{/ts}{else}{ts}Registration Confirmation{/ts}{/if} - {event.title} - {contact.display_name}\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=participantTotalStyle}style=\"margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;\"{/capture}\n\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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n      {if {event.confirm_email_text|boolean} AND (empty($isOnWaitlist) AND empty($isRequireApproval))}\n        <p>{event.confirm_email_text}</p>\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}\n              {if $isOnWaitlist}{ts}This is a confirmation that your registration has been received and your status has been updated to<strong>waitlisted</strong>.{/ts}\n              {else}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>registered<strong>.{/ts}\n              {/if}\n            {/if}\n        </p>\n      {/if}\n\n      {if !empty($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 !empty($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 {contribution.is_pay_later|boolean} && {contribution.balance_amount|boolean} && $isPrimary}\n          <p>{if {event.pay_later_receipt|boolean}}{event.pay_later_receipt}{/if}</p>\n        {/if}\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.title}<br/>\n            {event.start_date|crmDate:\"%A\"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date|crmDate:\"%A\"} {event.end_date|crmDate}{/if}{/if}\n          </td>\n        </tr>\n\n        {if \"{participant.role_id:label}\" neq \'Attendee\'}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Participant Role{/ts}\n            </td>\n            <td {$valueStyle}>\n              {participant.role_id:label}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.is_show_location|boolean}}\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n              {event.location}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n          <tr>\n            <td colspan=\"2\" {$labelStyle}>\n              {ts}Event Contacts:{/ts}\n            </td>\n          </tr>\n\n          {if {event.loc_block_id.phone_id.phone|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                      {event.loc_block_id.phone_id.phone_type_id:label}\n                  {else}\n                      {ts}Phone{/ts}\n                  {/if}\n              </td>\n              <td {$valueStyle}>\n                  {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n              </td>\n            </tr>\n          {/if}\n          {if {event.loc_block_id.phone_2_id.phone|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                      {event.loc_block_id.phone_2_id.phone_type_id:label}\n                  {else}\n                      {ts}Phone{/ts}\n                  {/if}\n              </td>\n              <td {$valueStyle}>\n                  {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n              </td>\n            </tr>\n          {/if}\n          {if {event.loc_block_id.email_id.email|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                {ts}Email{/ts}\n              </td>\n              <td {$valueStyle}>\n                {event.loc_block_id.email_id.email}\n              </td>\n            </tr>\n          {/if}\n          {if {event.loc_block_id.email_2_id.email|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                {ts}Email{/ts}\n              </td>\n              <td {$valueStyle}>\n                {event.loc_block_id.email_2_id.email}\n              </td>\n            </tr>\n          {/if}\n        {/if}\n\n        {if {event.is_public|boolean} and {event.is_show_calendar_links|boolean}}\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 entry for this event.{/ts}</a>\n            </td>\n          </tr>\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n              {capture assign=gCalendar}{crmURL p=\'civicrm/event/ical\' q=\"gCalendar=1&reset=1&id={event.id}\" h=0 a=1 fe=1}{/capture}\n              <a href=\"{$gCalendar}\">{ts}Add event to Google Calendar{/ts}</a>\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.is_share|boolean}}\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 pageURL=$eventUrl title=\'{event.title}\'}\n            </td>\n          </tr>\n        {/if}\n        {if !empty($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|boolean} and empty($isRequireApproval)}\n          <tr>\n            <th {$headerStyle}>\n              {event.fee_label}\n            </th>\n          </tr>\n            {if $isShowLineItems}\n              {foreach from=$participants key=index item=currentParticipant}\n                {if $isPrimary || {participant.id} === $currentParticipant.id}\n                  {if $isPrimary && ($participants|@count > 1)} {* Header for multi participant registration cases. *}\n                    <tr>\n                      <td colspan=\"2\" {$labelStyle}>\n                        {$currentParticipant.contact.display_name}\n                      </td>\n                    </tr>\n                  {/if}\n                  <tr>\n                    <td colspan=\"2\" {$valueStyle}>\n                      <table>\n                        <tr>\n                          <th>{ts}Item{/ts}</th>\n                          <th>{ts}Qty{/ts}</th>\n                          <th>{ts}Each{/ts}</th>\n                          {if $isShowTax && {contribution.tax_amount|boolean}}\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 $isShowParticipantCount}\n                            <th>{ts}Total Participants{/ts}</th>\n                          {/if}\n                        </tr>\n                        {foreach from=$currentParticipant.line_items item=line}\n                          <tr>\n                            <td {$tdfirstStyle}>{$line.title}</td>\n                            <td {$tdStyle} align=\"middle\">{$line.qty}</td>\n                            <td {$tdStyle}>{$line.unit_price|crmMoney:$currency}</td>\n                            {if $isShowTax && {contribution.tax_amount|boolean}}\n                              <td>{$line.line_total|crmMoney:$currency}</td>\n                              {if $line.tax_rate || $line.tax_amount != \"\"}\n                                <td>{$line.tax_rate|string_format:\"%.2f\"}%</td>\n                                <td>{$line.tax_amount|crmMoney:$currency}</td>\n                              {else}\n                                <td></td>\n                                <td></td>\n                              {/if}\n                            {/if}\n                            <td {$tdStyle}>\n                              {$line.line_total_inclusive|crmMoney:$currency}\n                            </td>\n                            {if $isShowParticipantCount}\n                              <td {$tdStyle}>{$line.participant_count}</td>\n                            {/if}\n                          </tr>\n                        {/foreach}\n                        {if $isShowTax && $isPrimary && ($participants|@count > 1)}\n                          <tr {$participantTotalStyle}>\n                            <td colspan=3>{ts 1=$currentParticipant.contact.display_name}Total for %1{/ts}</td>\n                            <td colspan=2>{$currentParticipant.totals.total_amount_exclusive|crmMoney}</td>\n                            <td colspan=1>{$currentParticipant.totals.tax_amount|crmMoney}</td>\n                            <td colspan=2>{$currentParticipant.totals.total_amount_inclusive|crmMoney}</td>\n                          </tr>\n                        {/if}\n                      </table>\n                    </td>\n                  </tr>\n                {/if}\n              {/foreach}\n            {/if}\n            {if !$isShowLineItems}\n              {foreach from=$participants key=index item=currentParticipant}\n                {if $isPrimary || {participant.id} === $currentParticipant.id}\n                  {foreach from=$currentParticipant.line_items key=index item=currentLineItem}\n                  <tr>\n                    <td {$valueStyle}>\n                      {$currentLineItem.label}{if $isPrimary && ($participants|@count > 1)} - {$currentParticipant.contact.display_name}{/if}\n                    </td>\n                    <td {$valueStyle}>\n                      {$currentLineItem.line_total|crmMoney:$currency}\n                    </td>\n                  </tr>\n                  {/foreach}\n                {/if}\n              {/foreach}\n            {/if}\n            {if $isShowTax && {contribution.tax_amount|boolean}}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Amount Before Tax:{/ts}\n                </td>\n                <td {$valueStyle}>\n                  {if $isPrimary}{contribution.tax_exclusive_amount}{else}{$participant.totals.total_amount_exclusive|crmMoney}{/if}\n                </td>\n              </tr>\n              {if !$isPrimary}\n                {* Use the participant specific tax rate breakdown *}\n                {assign var=taxRateBreakdown value=$participant.tax_rate_breakdown}\n              {/if}\n              {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n                <tr>\n                  <td {$labelStyle}>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if}</td>\n                  <td {$valueStyle}>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n                </tr>\n              {/foreach}\n              <tr>\n                <td {$labelStyle}>\n                    {ts}Total Tax Amount{/ts}\n                </td>\n                <td {$valueStyle}>\n                    {if $isPrimary}{contribution.tax_amount}{else}{$participant.totals.tax_amount|crmMoney}{/if}\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                  {contribution.total_amount} {if !empty($hookDiscount.message)}({$hookDiscount.message}){/if}\n                </td>\n              </tr>\n              {if $isShowParticipantCount}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Total Participants{/ts}</td>\n                  <td {$valueStyle}>\n                    {$participantCount}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {participant.register_date|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Registration Date{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {participant.register_date}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.receive_date|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Transaction Date{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.receive_date}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.financial_type_id|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Financial Type{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.financial_type_id:label}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.trxn_id|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Transaction #{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.trxn_id|boolean}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Paid By{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.payment_instrument_id:label}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.check_number|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Check Number{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.check_number}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.address_id.display|boolean}}\n                <tr>\n                  <th {$headerStyle}>\n                    {ts}Billing Name and Address{/ts}\n                  </th>\n                </tr>\n                <tr>\n                  <td colspan=\"2\" {$valueStyle}>\n                    {contribution.address_id.name}<br/>\n                    {contribution.address_id.display}\n                  </td>\n                </tr>\n              {/if}\n\n              {if !empty($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            {/if}\n\n          {/if} {* End of conditional section for Paid events *}\n\n        {if !empty($customPre)}\n          {foreach from=$customPre item=customPr key=i}\n            <tr>\n              <th {$headerStyle}>{$customPre_grouptitle.$i}</th>\n            </tr>\n            {foreach from=$customPr item=customValue key=customName}\n              <tr>\n                <td {$labelStyle}>{$customName}</td>\n                <td {$valueStyle}>{$customValue}</td>\n              </tr>\n            {/foreach}\n          {/foreach}\n        {/if}\n\n        {if !empty($customPost)}\n          {foreach from=$customPost item=customPos key=j}\n            <tr>\n              <th {$headerStyle}>{$customPost_grouptitle.$j}</th>\n            </tr>\n            {foreach from=$customPos item=customValue key=customName}\n              <tr>\n                <td {$labelStyle}>{$customName}</td>\n                <td {$valueStyle}>{$customValue}</td>\n              </tr>\n            {/foreach}\n          {/foreach}\n        {/if}\n\n        {if !empty($customProfile)}\n          {foreach from=$customProfile.profile item=eachParticipant key=participantID}\n            <tr>\n              <th {$headerStyle}>{ts 1=$participantID+2}Participant %1{/ts} </th>\n            </tr>\n            {foreach from=$eachParticipant item=eachProfile key=pid}\n              <tr>\n                <th {$headerStyle}>{$customProfile.title.$pid}</th>\n              </tr>\n              {foreach from=$eachProfile item=val key=field}\n                <tr>\n                  {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      </table>\n      {if {event.allow_selfcancelxfer|boolean}}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            {capture assign=selfservice_preposition}{if {event.selfcancelxfer_time} > 0}{ts}before{/ts}{else}{ts}after{/ts}{/if}{/capture}\n            {ts 1={event.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}\n            {if {contribution.paid_amount|boolean}}{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\n</body>\n</html>\n',1,829,'event_online_receipt',1,0,0,NULL),
- (32,'Events - Registration Confirmation and Receipt (on-line)','{if !empty($isOnWaitlist)}{ts}Wait List Confirmation{/ts}{elseif !empty($isRequireApproval)}{ts}Registration Request Confirmation{/ts}{else}{ts}Registration Confirmation{/ts}{/if} - {event.title} - {contact.display_name}\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=participantTotalStyle}style=\"margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;\"{/capture}\n\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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n      {if {event.confirm_email_text|boolean} AND (empty($isOnWaitlist) AND empty($isRequireApproval))}\n        <p>{event.confirm_email_text}</p>\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}\n              {if $isOnWaitlist}{ts}This is a confirmation that your registration has been received and your status has been updated to<strong>waitlisted</strong>.{/ts}\n              {else}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>registered<strong>.{/ts}\n              {/if}\n            {/if}\n        </p>\n      {/if}\n\n      {if !empty($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 !empty($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 {contribution.is_pay_later|boolean} && {contribution.balance_amount|boolean} && $isPrimary}\n          <p>{if {event.pay_later_receipt|boolean}}{event.pay_later_receipt}{/if}</p>\n        {/if}\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.title}<br/>\n            {event.start_date|crmDate:\"%A\"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date|crmDate:\"%A\"} {event.end_date|crmDate}{/if}{/if}\n          </td>\n        </tr>\n\n        {if \"{participant.role_id:label}\" neq \'Attendee\'}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Participant Role{/ts}\n            </td>\n            <td {$valueStyle}>\n              {participant.role_id:label}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.is_show_location|boolean}}\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n              {event.location}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n          <tr>\n            <td colspan=\"2\" {$labelStyle}>\n              {ts}Event Contacts:{/ts}\n            </td>\n          </tr>\n\n          {if {event.loc_block_id.phone_id.phone|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                      {event.loc_block_id.phone_id.phone_type_id:label}\n                  {else}\n                      {ts}Phone{/ts}\n                  {/if}\n              </td>\n              <td {$valueStyle}>\n                  {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n              </td>\n            </tr>\n          {/if}\n          {if {event.loc_block_id.phone_2_id.phone|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                      {event.loc_block_id.phone_2_id.phone_type_id:label}\n                  {else}\n                      {ts}Phone{/ts}\n                  {/if}\n              </td>\n              <td {$valueStyle}>\n                  {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n              </td>\n            </tr>\n          {/if}\n          {if {event.loc_block_id.email_id.email|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                {ts}Email{/ts}\n              </td>\n              <td {$valueStyle}>\n                {event.loc_block_id.email_id.email}\n              </td>\n            </tr>\n          {/if}\n          {if {event.loc_block_id.email_2_id.email|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                {ts}Email{/ts}\n              </td>\n              <td {$valueStyle}>\n                {event.loc_block_id.email_2_id.email}\n              </td>\n            </tr>\n          {/if}\n        {/if}\n\n        {if {event.is_public|boolean} and {event.is_show_calendar_links|boolean}}\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 entry for this event.{/ts}</a>\n            </td>\n          </tr>\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n              {capture assign=gCalendar}{crmURL p=\'civicrm/event/ical\' q=\"gCalendar=1&reset=1&id={event.id}\" h=0 a=1 fe=1}{/capture}\n              <a href=\"{$gCalendar}\">{ts}Add event to Google Calendar{/ts}</a>\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.is_share|boolean}}\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 pageURL=$eventUrl title=\'{event.title}\'}\n            </td>\n          </tr>\n        {/if}\n        {if !empty($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|boolean} and empty($isRequireApproval)}\n          <tr>\n            <th {$headerStyle}>\n              {event.fee_label}\n            </th>\n          </tr>\n            {if $isShowLineItems}\n              {foreach from=$participants key=index item=currentParticipant}\n                {if $isPrimary || {participant.id} === $currentParticipant.id}\n                  {if $isPrimary && ($participants|@count > 1)} {* Header for multi participant registration cases. *}\n                    <tr>\n                      <td colspan=\"2\" {$labelStyle}>\n                        {$currentParticipant.contact.display_name}\n                      </td>\n                    </tr>\n                  {/if}\n                  <tr>\n                    <td colspan=\"2\" {$valueStyle}>\n                      <table>\n                        <tr>\n                          <th>{ts}Item{/ts}</th>\n                          <th>{ts}Qty{/ts}</th>\n                          <th>{ts}Each{/ts}</th>\n                          {if $isShowTax && {contribution.tax_amount|boolean}}\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 $isShowParticipantCount}\n                            <th>{ts}Total Participants{/ts}</th>\n                          {/if}\n                        </tr>\n                        {foreach from=$currentParticipant.line_items item=line}\n                          <tr>\n                            <td {$tdfirstStyle}>{$line.title}</td>\n                            <td {$tdStyle} align=\"middle\">{$line.qty}</td>\n                            <td {$tdStyle}>{$line.unit_price|crmMoney:$currency}</td>\n                            {if $isShowTax && {contribution.tax_amount|boolean}}\n                              <td>{$line.line_total|crmMoney:$currency}</td>\n                              {if $line.tax_rate || $line.tax_amount != \"\"}\n                                <td>{$line.tax_rate|string_format:\"%.2f\"}%</td>\n                                <td>{$line.tax_amount|crmMoney:$currency}</td>\n                              {else}\n                                <td></td>\n                                <td></td>\n                              {/if}\n                            {/if}\n                            <td {$tdStyle}>\n                              {$line.line_total_inclusive|crmMoney:$currency}\n                            </td>\n                            {if $isShowParticipantCount}\n                              <td {$tdStyle}>{$line.participant_count}</td>\n                            {/if}\n                          </tr>\n                        {/foreach}\n                        {if $isShowTax && $isPrimary && ($participants|@count > 1)}\n                          <tr {$participantTotalStyle}>\n                            <td colspan=3>{ts 1=$currentParticipant.contact.display_name}Total for %1{/ts}</td>\n                            <td colspan=2>{$currentParticipant.totals.total_amount_exclusive|crmMoney}</td>\n                            <td colspan=1>{$currentParticipant.totals.tax_amount|crmMoney}</td>\n                            <td colspan=2>{$currentParticipant.totals.total_amount_inclusive|crmMoney}</td>\n                          </tr>\n                        {/if}\n                      </table>\n                    </td>\n                  </tr>\n                {/if}\n              {/foreach}\n            {/if}\n            {if !$isShowLineItems}\n              {foreach from=$participants key=index item=currentParticipant}\n                {if $isPrimary || {participant.id} === $currentParticipant.id}\n                  {foreach from=$currentParticipant.line_items key=index item=currentLineItem}\n                  <tr>\n                    <td {$valueStyle}>\n                      {$currentLineItem.label}{if $isPrimary && ($participants|@count > 1)} - {$currentParticipant.contact.display_name}{/if}\n                    </td>\n                    <td {$valueStyle}>\n                      {$currentLineItem.line_total|crmMoney:$currency}\n                    </td>\n                  </tr>\n                  {/foreach}\n                {/if}\n              {/foreach}\n            {/if}\n            {if $isShowTax && {contribution.tax_amount|boolean}}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Amount Before Tax:{/ts}\n                </td>\n                <td {$valueStyle}>\n                  {if $isPrimary}{contribution.tax_exclusive_amount}{else}{$participant.totals.total_amount_exclusive|crmMoney}{/if}\n                </td>\n              </tr>\n              {if !$isPrimary}\n                {* Use the participant specific tax rate breakdown *}\n                {assign var=taxRateBreakdown value=$participant.tax_rate_breakdown}\n              {/if}\n              {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n                <tr>\n                  <td {$labelStyle}>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if}</td>\n                  <td {$valueStyle}>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n                </tr>\n              {/foreach}\n              <tr>\n                <td {$labelStyle}>\n                    {ts}Total Tax Amount{/ts}\n                </td>\n                <td {$valueStyle}>\n                    {if $isPrimary}{contribution.tax_amount}{else}{$participant.totals.tax_amount|crmMoney}{/if}\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                  {contribution.total_amount} {if !empty($hookDiscount.message)}({$hookDiscount.message}){/if}\n                </td>\n              </tr>\n              {if $isShowParticipantCount}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Total Participants{/ts}</td>\n                  <td {$valueStyle}>\n                    {$participantCount}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {participant.register_date|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Registration Date{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {participant.register_date}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.receive_date|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Transaction Date{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.receive_date}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.financial_type_id|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Financial Type{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.financial_type_id:label}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.trxn_id|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Transaction #{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.trxn_id|boolean}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Paid By{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.payment_instrument_id:label}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.check_number|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Check Number{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.check_number}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.address_id.display|boolean}}\n                <tr>\n                  <th {$headerStyle}>\n                    {ts}Billing Name and Address{/ts}\n                  </th>\n                </tr>\n                <tr>\n                  <td colspan=\"2\" {$valueStyle}>\n                    {contribution.address_id.name}<br/>\n                    {contribution.address_id.display}\n                  </td>\n                </tr>\n              {/if}\n\n              {if !empty($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            {/if}\n\n          {/if} {* End of conditional section for Paid events *}\n\n        {if !empty($customPre)}\n          {foreach from=$customPre item=customPr key=i}\n            <tr>\n              <th {$headerStyle}>{$customPre_grouptitle.$i}</th>\n            </tr>\n            {foreach from=$customPr item=customValue key=customName}\n              <tr>\n                <td {$labelStyle}>{$customName}</td>\n                <td {$valueStyle}>{$customValue}</td>\n              </tr>\n            {/foreach}\n          {/foreach}\n        {/if}\n\n        {if !empty($customPost)}\n          {foreach from=$customPost item=customPos key=j}\n            <tr>\n              <th {$headerStyle}>{$customPost_grouptitle.$j}</th>\n            </tr>\n            {foreach from=$customPos item=customValue key=customName}\n              <tr>\n                <td {$labelStyle}>{$customName}</td>\n                <td {$valueStyle}>{$customValue}</td>\n              </tr>\n            {/foreach}\n          {/foreach}\n        {/if}\n\n        {if !empty($customProfile)}\n          {foreach from=$customProfile.profile item=eachParticipant key=participantID}\n            <tr>\n              <th {$headerStyle}>{ts 1=$participantID+2}Participant %1{/ts} </th>\n            </tr>\n            {foreach from=$eachParticipant item=eachProfile key=pid}\n              <tr>\n                <th {$headerStyle}>{$customProfile.title.$pid}</th>\n              </tr>\n              {foreach from=$eachProfile item=val key=field}\n                <tr>\n                  {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      </table>\n      {if {event.allow_selfcancelxfer|boolean}}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            {capture assign=selfservice_preposition}{if {event.selfcancelxfer_time} > 0}{ts}before{/ts}{else}{ts}after{/ts}{/if}{/capture}\n            {ts 1={event.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}\n            {if {contribution.paid_amount|boolean}}{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\n</body>\n</html>\n',1,829,'event_online_receipt',0,1,0,NULL),
+ (31,'Events - Registration Confirmation and Receipt (on-line)','{if !empty($isOnWaitlist)}{ts}Wait List Confirmation{/ts}{elseif !empty($isRequireApproval)}{ts}Registration Request Confirmation{/ts}{else}{ts}Registration Confirmation{/ts}{/if} - {event.title} - {contact.display_name}\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=participantTotalStyle}style=\"margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;\"{/capture}\n\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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n      {if {event.confirm_email_text|boolean} AND (empty($isOnWaitlist) AND empty($isRequireApproval))}\n        <p>{event.confirm_email_text}</p>\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}\n              {if $isOnWaitlist}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>waitlisted</strong>.{/ts}\n              {else}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>registered<strong>.{/ts}\n              {/if}\n            {/if}\n        </p>\n      {/if}\n\n      {if !empty($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 !empty($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 {contribution.is_pay_later|boolean} && {contribution.balance_amount|boolean} && $isPrimary}\n          <p>{if {event.pay_later_receipt|boolean}}{event.pay_later_receipt}{/if}</p>\n        {/if}\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.title}<br/>\n            {event.start_date|crmDate:\"%A\"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date|crmDate:\"%A\"} {event.end_date|crmDate}{/if}{/if}\n          </td>\n        </tr>\n\n        {if \"{participant.role_id:label}\" neq \'Attendee\'}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Participant Role{/ts}\n            </td>\n            <td {$valueStyle}>\n              {participant.role_id:label}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.is_show_location|boolean}}\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n              {event.location}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n          <tr>\n            <td colspan=\"2\" {$labelStyle}>\n              {ts}Event Contacts:{/ts}\n            </td>\n          </tr>\n\n          {if {event.loc_block_id.phone_id.phone|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                      {event.loc_block_id.phone_id.phone_type_id:label}\n                  {else}\n                      {ts}Phone{/ts}\n                  {/if}\n              </td>\n              <td {$valueStyle}>\n                  {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n              </td>\n            </tr>\n          {/if}\n          {if {event.loc_block_id.phone_2_id.phone|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                      {event.loc_block_id.phone_2_id.phone_type_id:label}\n                  {else}\n                      {ts}Phone{/ts}\n                  {/if}\n              </td>\n              <td {$valueStyle}>\n                  {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n              </td>\n            </tr>\n          {/if}\n          {if {event.loc_block_id.email_id.email|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                {ts}Email{/ts}\n              </td>\n              <td {$valueStyle}>\n                {event.loc_block_id.email_id.email}\n              </td>\n            </tr>\n          {/if}\n          {if {event.loc_block_id.email_2_id.email|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                {ts}Email{/ts}\n              </td>\n              <td {$valueStyle}>\n                {event.loc_block_id.email_2_id.email}\n              </td>\n            </tr>\n          {/if}\n        {/if}\n\n        {if {event.is_public|boolean} and {event.is_show_calendar_links|boolean}}\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 entry for this event.{/ts}</a>\n            </td>\n          </tr>\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n              {capture assign=gCalendar}{crmURL p=\'civicrm/event/ical\' q=\"gCalendar=1&reset=1&id={event.id}\" h=0 a=1 fe=1}{/capture}\n              <a href=\"{$gCalendar}\">{ts}Add event to Google Calendar{/ts}</a>\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.is_share|boolean}}\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 pageURL=$eventUrl title=\'{event.title}\'}\n            </td>\n          </tr>\n        {/if}\n        {if !empty($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|boolean} and empty($isRequireApproval)}\n          <tr>\n            <th {$headerStyle}>\n              {event.fee_label}\n            </th>\n          </tr>\n            {if $isShowLineItems}\n              {foreach from=$participants key=index item=currentParticipant}\n                {if $isPrimary || {participant.id} === $currentParticipant.id}\n                  {if $isPrimary && ($participants|@count > 1)} {* Header for multi participant registration cases. *}\n                    <tr>\n                      <td colspan=\"2\" {$labelStyle}>\n                        {$currentParticipant.contact.display_name}\n                      </td>\n                    </tr>\n                  {/if}\n                  <tr>\n                    <td colspan=\"2\" {$valueStyle}>\n                      <table>\n                        <tr>\n                          <th>{ts}Item{/ts}</th>\n                          <th>{ts}Qty{/ts}</th>\n                          <th>{ts}Each{/ts}</th>\n                          {if $isShowTax && {contribution.tax_amount|boolean}}\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 $isShowParticipantCount}\n                            <th>{ts}Total Participants{/ts}</th>\n                          {/if}\n                        </tr>\n                        {foreach from=$currentParticipant.line_items item=line}\n                          <tr>\n                            <td {$tdfirstStyle}>{$line.title}</td>\n                            <td {$tdStyle} align=\"middle\">{$line.qty}</td>\n                            <td {$tdStyle}>{$line.unit_price|crmMoney:$currency}</td>\n                            {if $isShowTax && {contribution.tax_amount|boolean}}\n                              <td>{$line.line_total|crmMoney:$currency}</td>\n                              {if $line.tax_rate || $line.tax_amount != \"\"}\n                                <td>{$line.tax_rate|string_format:\"%.2f\"}%</td>\n                                <td>{$line.tax_amount|crmMoney:$currency}</td>\n                              {else}\n                                <td></td>\n                                <td></td>\n                              {/if}\n                            {/if}\n                            <td {$tdStyle}>\n                              {$line.line_total_inclusive|crmMoney:$currency}\n                            </td>\n                            {if $isShowParticipantCount}\n                              <td {$tdStyle}>{$line.participant_count}</td>\n                            {/if}\n                          </tr>\n                        {/foreach}\n                        {if $isShowTax && $isPrimary && ($participants|@count > 1)}\n                          <tr {$participantTotalStyle}>\n                            <td colspan=3>{ts 1=$currentParticipant.contact.display_name}Total for %1{/ts}</td>\n                            <td colspan=2>{$currentParticipant.totals.total_amount_exclusive|crmMoney}</td>\n                            <td colspan=1>{$currentParticipant.totals.tax_amount|crmMoney}</td>\n                            <td colspan=2>{$currentParticipant.totals.total_amount_inclusive|crmMoney}</td>\n                          </tr>\n                        {/if}\n                      </table>\n                    </td>\n                  </tr>\n                {/if}\n              {/foreach}\n            {/if}\n            {if !$isShowLineItems}\n              {foreach from=$participants key=index item=currentParticipant}\n                {if $isPrimary || {participant.id} === $currentParticipant.id}\n                  {foreach from=$currentParticipant.line_items key=index item=currentLineItem}\n                  <tr>\n                    <td {$valueStyle}>\n                      {$currentLineItem.label}{if $isPrimary && ($participants|@count > 1)} - {$currentParticipant.contact.display_name}{/if}\n                    </td>\n                    <td {$valueStyle}>\n                      {$currentLineItem.line_total|crmMoney:$currency}\n                    </td>\n                  </tr>\n                  {/foreach}\n                {/if}\n              {/foreach}\n            {/if}\n            {if $isShowTax && {contribution.tax_amount|boolean}}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Amount Before Tax:{/ts}\n                </td>\n                <td {$valueStyle}>\n                  {if $isPrimary}{contribution.tax_exclusive_amount}{else}{$participant.totals.total_amount_exclusive|crmMoney}{/if}\n                </td>\n              </tr>\n              {if !$isPrimary}\n                {* Use the participant specific tax rate breakdown *}\n                {assign var=taxRateBreakdown value=$participant.tax_rate_breakdown}\n              {/if}\n              {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n                <tr>\n                  <td {$labelStyle}>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if}</td>\n                  <td {$valueStyle}>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n                </tr>\n              {/foreach}\n              <tr>\n                <td {$labelStyle}>\n                    {ts}Total Tax Amount{/ts}\n                </td>\n                <td {$valueStyle}>\n                    {if $isPrimary}{contribution.tax_amount}{else}{$participant.totals.tax_amount|crmMoney}{/if}\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                  {contribution.total_amount} {if !empty($hookDiscount.message)}({$hookDiscount.message}){/if}\n                </td>\n              </tr>\n              {if $isShowParticipantCount}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Total Participants{/ts}</td>\n                  <td {$valueStyle}>\n                    {$participantCount}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {participant.register_date|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Registration Date{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {participant.register_date}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.receive_date|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Transaction Date{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.receive_date}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.financial_type_id|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Financial Type{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.financial_type_id:label}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.trxn_id|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Transaction #{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.trxn_id}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Paid By{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.payment_instrument_id:label}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.check_number|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Check Number{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.check_number}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.address_id.display|boolean}}\n                <tr>\n                  <th {$headerStyle}>\n                    {ts}Billing Name and Address{/ts}\n                  </th>\n                </tr>\n                <tr>\n                  <td colspan=\"2\" {$valueStyle}>\n                    {contribution.address_id.name}<br/>\n                    {contribution.address_id.display}\n                  </td>\n                </tr>\n              {/if}\n\n              {if !empty($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            {/if}\n\n          {/if} {* End of conditional section for Paid events *}\n\n        {if !empty($customPre)}\n          {foreach from=$customPre item=customPr key=i}\n            <tr>\n              <th {$headerStyle}>{$customPre_grouptitle.$i}</th>\n            </tr>\n            {foreach from=$customPr item=customValue key=customName}\n              <tr>\n                <td {$labelStyle}>{$customName}</td>\n                <td {$valueStyle}>{$customValue}</td>\n              </tr>\n            {/foreach}\n          {/foreach}\n        {/if}\n\n        {if !empty($customPost)}\n          {foreach from=$customPost item=customPos key=j}\n            <tr>\n              <th {$headerStyle}>{$customPost_grouptitle.$j}</th>\n            </tr>\n            {foreach from=$customPos item=customValue key=customName}\n              <tr>\n                <td {$labelStyle}>{$customName}</td>\n                <td {$valueStyle}>{$customValue}</td>\n              </tr>\n            {/foreach}\n          {/foreach}\n        {/if}\n\n        {if !empty($customProfile)}\n          {foreach from=$customProfile.profile item=eachParticipant key=participantID}\n            <tr>\n              <th {$headerStyle}>{ts 1=$participantID+2}Participant %1{/ts} </th>\n            </tr>\n            {foreach from=$eachParticipant item=eachProfile key=pid}\n              <tr>\n                <th {$headerStyle}>{$customProfile.title.$pid}</th>\n              </tr>\n              {foreach from=$eachProfile item=val key=field}\n                <tr>\n                  {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      </table>\n      {if {event.allow_selfcancelxfer|boolean}}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            {capture assign=selfservice_preposition}{if {event.selfcancelxfer_time|boolean} && {event.selfcancelxfer_time} > 0}{ts}before{/ts}{else}{ts}after{/ts}{/if}{/capture}\n            {ts 1=\"{event.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}\n            {if {contribution.paid_amount|boolean}}{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\n</body>\n</html>\n',1,829,'event_online_receipt',1,0,0,NULL),
+ (32,'Events - Registration Confirmation and Receipt (on-line)','{if !empty($isOnWaitlist)}{ts}Wait List Confirmation{/ts}{elseif !empty($isRequireApproval)}{ts}Registration Request Confirmation{/ts}{else}{ts}Registration Confirmation{/ts}{/if} - {event.title} - {contact.display_name}\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=participantTotalStyle}style=\"margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;\"{/capture}\n\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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n      {if {event.confirm_email_text|boolean} AND (empty($isOnWaitlist) AND empty($isRequireApproval))}\n        <p>{event.confirm_email_text}</p>\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}\n              {if $isOnWaitlist}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>waitlisted</strong>.{/ts}\n              {else}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>registered<strong>.{/ts}\n              {/if}\n            {/if}\n        </p>\n      {/if}\n\n      {if !empty($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 !empty($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 {contribution.is_pay_later|boolean} && {contribution.balance_amount|boolean} && $isPrimary}\n          <p>{if {event.pay_later_receipt|boolean}}{event.pay_later_receipt}{/if}</p>\n        {/if}\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.title}<br/>\n            {event.start_date|crmDate:\"%A\"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date|crmDate:\"%A\"} {event.end_date|crmDate}{/if}{/if}\n          </td>\n        </tr>\n\n        {if \"{participant.role_id:label}\" neq \'Attendee\'}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Participant Role{/ts}\n            </td>\n            <td {$valueStyle}>\n              {participant.role_id:label}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.is_show_location|boolean}}\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n              {event.location}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n          <tr>\n            <td colspan=\"2\" {$labelStyle}>\n              {ts}Event Contacts:{/ts}\n            </td>\n          </tr>\n\n          {if {event.loc_block_id.phone_id.phone|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                      {event.loc_block_id.phone_id.phone_type_id:label}\n                  {else}\n                      {ts}Phone{/ts}\n                  {/if}\n              </td>\n              <td {$valueStyle}>\n                  {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n              </td>\n            </tr>\n          {/if}\n          {if {event.loc_block_id.phone_2_id.phone|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                  {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                      {event.loc_block_id.phone_2_id.phone_type_id:label}\n                  {else}\n                      {ts}Phone{/ts}\n                  {/if}\n              </td>\n              <td {$valueStyle}>\n                  {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n              </td>\n            </tr>\n          {/if}\n          {if {event.loc_block_id.email_id.email|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                {ts}Email{/ts}\n              </td>\n              <td {$valueStyle}>\n                {event.loc_block_id.email_id.email}\n              </td>\n            </tr>\n          {/if}\n          {if {event.loc_block_id.email_2_id.email|boolean}}\n            <tr>\n              <td {$labelStyle}>\n                {ts}Email{/ts}\n              </td>\n              <td {$valueStyle}>\n                {event.loc_block_id.email_2_id.email}\n              </td>\n            </tr>\n          {/if}\n        {/if}\n\n        {if {event.is_public|boolean} and {event.is_show_calendar_links|boolean}}\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 entry for this event.{/ts}</a>\n            </td>\n          </tr>\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n              {capture assign=gCalendar}{crmURL p=\'civicrm/event/ical\' q=\"gCalendar=1&reset=1&id={event.id}\" h=0 a=1 fe=1}{/capture}\n              <a href=\"{$gCalendar}\">{ts}Add event to Google Calendar{/ts}</a>\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.is_share|boolean}}\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 pageURL=$eventUrl title=\'{event.title}\'}\n            </td>\n          </tr>\n        {/if}\n        {if !empty($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|boolean} and empty($isRequireApproval)}\n          <tr>\n            <th {$headerStyle}>\n              {event.fee_label}\n            </th>\n          </tr>\n            {if $isShowLineItems}\n              {foreach from=$participants key=index item=currentParticipant}\n                {if $isPrimary || {participant.id} === $currentParticipant.id}\n                  {if $isPrimary && ($participants|@count > 1)} {* Header for multi participant registration cases. *}\n                    <tr>\n                      <td colspan=\"2\" {$labelStyle}>\n                        {$currentParticipant.contact.display_name}\n                      </td>\n                    </tr>\n                  {/if}\n                  <tr>\n                    <td colspan=\"2\" {$valueStyle}>\n                      <table>\n                        <tr>\n                          <th>{ts}Item{/ts}</th>\n                          <th>{ts}Qty{/ts}</th>\n                          <th>{ts}Each{/ts}</th>\n                          {if $isShowTax && {contribution.tax_amount|boolean}}\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 $isShowParticipantCount}\n                            <th>{ts}Total Participants{/ts}</th>\n                          {/if}\n                        </tr>\n                        {foreach from=$currentParticipant.line_items item=line}\n                          <tr>\n                            <td {$tdfirstStyle}>{$line.title}</td>\n                            <td {$tdStyle} align=\"middle\">{$line.qty}</td>\n                            <td {$tdStyle}>{$line.unit_price|crmMoney:$currency}</td>\n                            {if $isShowTax && {contribution.tax_amount|boolean}}\n                              <td>{$line.line_total|crmMoney:$currency}</td>\n                              {if $line.tax_rate || $line.tax_amount != \"\"}\n                                <td>{$line.tax_rate|string_format:\"%.2f\"}%</td>\n                                <td>{$line.tax_amount|crmMoney:$currency}</td>\n                              {else}\n                                <td></td>\n                                <td></td>\n                              {/if}\n                            {/if}\n                            <td {$tdStyle}>\n                              {$line.line_total_inclusive|crmMoney:$currency}\n                            </td>\n                            {if $isShowParticipantCount}\n                              <td {$tdStyle}>{$line.participant_count}</td>\n                            {/if}\n                          </tr>\n                        {/foreach}\n                        {if $isShowTax && $isPrimary && ($participants|@count > 1)}\n                          <tr {$participantTotalStyle}>\n                            <td colspan=3>{ts 1=$currentParticipant.contact.display_name}Total for %1{/ts}</td>\n                            <td colspan=2>{$currentParticipant.totals.total_amount_exclusive|crmMoney}</td>\n                            <td colspan=1>{$currentParticipant.totals.tax_amount|crmMoney}</td>\n                            <td colspan=2>{$currentParticipant.totals.total_amount_inclusive|crmMoney}</td>\n                          </tr>\n                        {/if}\n                      </table>\n                    </td>\n                  </tr>\n                {/if}\n              {/foreach}\n            {/if}\n            {if !$isShowLineItems}\n              {foreach from=$participants key=index item=currentParticipant}\n                {if $isPrimary || {participant.id} === $currentParticipant.id}\n                  {foreach from=$currentParticipant.line_items key=index item=currentLineItem}\n                  <tr>\n                    <td {$valueStyle}>\n                      {$currentLineItem.label}{if $isPrimary && ($participants|@count > 1)} - {$currentParticipant.contact.display_name}{/if}\n                    </td>\n                    <td {$valueStyle}>\n                      {$currentLineItem.line_total|crmMoney:$currency}\n                    </td>\n                  </tr>\n                  {/foreach}\n                {/if}\n              {/foreach}\n            {/if}\n            {if $isShowTax && {contribution.tax_amount|boolean}}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Amount Before Tax:{/ts}\n                </td>\n                <td {$valueStyle}>\n                  {if $isPrimary}{contribution.tax_exclusive_amount}{else}{$participant.totals.total_amount_exclusive|crmMoney}{/if}\n                </td>\n              </tr>\n              {if !$isPrimary}\n                {* Use the participant specific tax rate breakdown *}\n                {assign var=taxRateBreakdown value=$participant.tax_rate_breakdown}\n              {/if}\n              {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n                <tr>\n                  <td {$labelStyle}>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if}</td>\n                  <td {$valueStyle}>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n                </tr>\n              {/foreach}\n              <tr>\n                <td {$labelStyle}>\n                    {ts}Total Tax Amount{/ts}\n                </td>\n                <td {$valueStyle}>\n                    {if $isPrimary}{contribution.tax_amount}{else}{$participant.totals.tax_amount|crmMoney}{/if}\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                  {contribution.total_amount} {if !empty($hookDiscount.message)}({$hookDiscount.message}){/if}\n                </td>\n              </tr>\n              {if $isShowParticipantCount}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Total Participants{/ts}</td>\n                  <td {$valueStyle}>\n                    {$participantCount}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {participant.register_date|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Registration Date{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {participant.register_date}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.receive_date|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Transaction Date{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.receive_date}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.financial_type_id|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Financial Type{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.financial_type_id:label}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.trxn_id|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Transaction #{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.trxn_id}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Paid By{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.payment_instrument_id:label}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.check_number|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Check Number{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.check_number}\n                  </td>\n                </tr>\n              {/if}\n\n              {if {contribution.address_id.display|boolean}}\n                <tr>\n                  <th {$headerStyle}>\n                    {ts}Billing Name and Address{/ts}\n                  </th>\n                </tr>\n                <tr>\n                  <td colspan=\"2\" {$valueStyle}>\n                    {contribution.address_id.name}<br/>\n                    {contribution.address_id.display}\n                  </td>\n                </tr>\n              {/if}\n\n              {if !empty($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            {/if}\n\n          {/if} {* End of conditional section for Paid events *}\n\n        {if !empty($customPre)}\n          {foreach from=$customPre item=customPr key=i}\n            <tr>\n              <th {$headerStyle}>{$customPre_grouptitle.$i}</th>\n            </tr>\n            {foreach from=$customPr item=customValue key=customName}\n              <tr>\n                <td {$labelStyle}>{$customName}</td>\n                <td {$valueStyle}>{$customValue}</td>\n              </tr>\n            {/foreach}\n          {/foreach}\n        {/if}\n\n        {if !empty($customPost)}\n          {foreach from=$customPost item=customPos key=j}\n            <tr>\n              <th {$headerStyle}>{$customPost_grouptitle.$j}</th>\n            </tr>\n            {foreach from=$customPos item=customValue key=customName}\n              <tr>\n                <td {$labelStyle}>{$customName}</td>\n                <td {$valueStyle}>{$customValue}</td>\n              </tr>\n            {/foreach}\n          {/foreach}\n        {/if}\n\n        {if !empty($customProfile)}\n          {foreach from=$customProfile.profile item=eachParticipant key=participantID}\n            <tr>\n              <th {$headerStyle}>{ts 1=$participantID+2}Participant %1{/ts} </th>\n            </tr>\n            {foreach from=$eachParticipant item=eachProfile key=pid}\n              <tr>\n                <th {$headerStyle}>{$customProfile.title.$pid}</th>\n              </tr>\n              {foreach from=$eachProfile item=val key=field}\n                <tr>\n                  {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      </table>\n      {if {event.allow_selfcancelxfer|boolean}}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            {capture assign=selfservice_preposition}{if {event.selfcancelxfer_time|boolean} && {event.selfcancelxfer_time} > 0}{ts}before{/ts}{else}{ts}after{/ts}{/if}{/capture}\n            {ts 1=\"{event.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}\n            {if {contribution.paid_amount|boolean}}{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\n</body>\n</html>\n',1,829,'event_online_receipt',0,1,0,NULL),
  (33,'Events - Receipt only','Receipt for {if $events_in_cart} Event Registration{/if} - {contact.display_name}\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_display}\"}{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 !empty($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 !empty($line_items) && empty($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|crmDate:\"%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 !empty($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|crmDate:\"%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|crmDate:\"%D %I:%M %p\"} - {$line_item.event->end_date|crmDate:\"%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,830,'event_registration_receipt',1,0,0,NULL),
  (34,'Events - Receipt only','Receipt for {if $events_in_cart} Event Registration{/if} - {contact.display_name}\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_display}\"}{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 !empty($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 !empty($line_items) && empty($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|crmDate:\"%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 !empty($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|crmDate:\"%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|crmDate:\"%D %I:%M %p\"} - {$line_item.event->end_date|crmDate:\"%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,830,'event_registration_receipt',0,1,0,NULL),
- (35,'Events - Registration Cancellation Notice','{ts 1=\"{event.title}\"}Event Registration Cancelled for %1{/ts} - {contact.display_name}\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  <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_display}\"}{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.title}<br />\n       {event.start_date|crmDate:\"%A\"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date|crmDate:\"%A\"} {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_id:label}\n      </td>\n     </tr>\n\n    {if !empty($isShowLocation)}\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n                {event.location}\n            </td>\n          </tr>\n        {/if}\n\n    {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n          <tr>\n            <td colspan=\"2\" {$labelStyle}>\n                {ts}Event Contacts:{/ts}\n            </td>\n          </tr>\n\n            {if {event.loc_block_id.phone_id.phone|boolean}}\n              <tr>\n                <td {$labelStyle}>\n                    {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                        {event.loc_block_id.phone_id.phone_type_id:label}\n                    {else}\n                        {ts}Phone{/ts}\n                    {/if}\n                </td>\n                <td {$valueStyle}>\n                    {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n                </td>\n              </tr>\n            {/if}\n            {if {event.loc_block_id.phone_2_id.phone|boolean}}\n              <tr>\n                <td {$labelStyle}>\n                    {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                        {event.loc_block_id.phone_2_id.phone_type_id:label}\n                    {else}\n                        {ts}Phone{/ts}\n                    {/if}\n                </td>\n                <td {$valueStyle}>\n                    {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n                </td>\n              </tr>\n            {/if}\n            {if {event.loc_block_id.email_id.email|boolean}}\n              <tr>\n                <td {$labelStyle}>\n                    {ts}Email{/ts}\n                </td>\n                <td {$valueStyle}>\n                    {event.loc_block_id.email_id.email}\n                </td>\n              </tr>\n            {/if}\n            {if {event.loc_block_id.email_2_id.email|boolean}}\n              <tr>\n                <td {$labelStyle}>\n                    {ts}Email{/ts}\n                </td>\n                <td {$valueStyle}>\n                    {event.loc_block_id.email_2_id.email}\n                </td>\n              </tr>\n            {/if}\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 !empty(\'{participant.register_date}\')}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {participant.register_date}\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\n</body>\n</html>\n',1,831,'participant_cancelled',1,0,0,NULL),
- (36,'Events - Registration Cancellation Notice','{ts 1=\"{event.title}\"}Event Registration Cancelled for %1{/ts} - {contact.display_name}\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  <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_display}\"}{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.title}<br />\n       {event.start_date|crmDate:\"%A\"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date|crmDate:\"%A\"} {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_id:label}\n      </td>\n     </tr>\n\n    {if !empty($isShowLocation)}\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n                {event.location}\n            </td>\n          </tr>\n        {/if}\n\n    {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n          <tr>\n            <td colspan=\"2\" {$labelStyle}>\n                {ts}Event Contacts:{/ts}\n            </td>\n          </tr>\n\n            {if {event.loc_block_id.phone_id.phone|boolean}}\n              <tr>\n                <td {$labelStyle}>\n                    {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                        {event.loc_block_id.phone_id.phone_type_id:label}\n                    {else}\n                        {ts}Phone{/ts}\n                    {/if}\n                </td>\n                <td {$valueStyle}>\n                    {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n                </td>\n              </tr>\n            {/if}\n            {if {event.loc_block_id.phone_2_id.phone|boolean}}\n              <tr>\n                <td {$labelStyle}>\n                    {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                        {event.loc_block_id.phone_2_id.phone_type_id:label}\n                    {else}\n                        {ts}Phone{/ts}\n                    {/if}\n                </td>\n                <td {$valueStyle}>\n                    {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n                </td>\n              </tr>\n            {/if}\n            {if {event.loc_block_id.email_id.email|boolean}}\n              <tr>\n                <td {$labelStyle}>\n                    {ts}Email{/ts}\n                </td>\n                <td {$valueStyle}>\n                    {event.loc_block_id.email_id.email}\n                </td>\n              </tr>\n            {/if}\n            {if {event.loc_block_id.email_2_id.email|boolean}}\n              <tr>\n                <td {$labelStyle}>\n                    {ts}Email{/ts}\n                </td>\n                <td {$valueStyle}>\n                    {event.loc_block_id.email_2_id.email}\n                </td>\n              </tr>\n            {/if}\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 !empty(\'{participant.register_date}\')}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {participant.register_date}\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\n</body>\n</html>\n',1,831,'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','','<!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  <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_display}\"}{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|crmDate:\"%Y%m%d\" == $event.event_start_date|crmDate:\"%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 $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 entry for this event.{/ts}</a>\n       </td>\n     </tr>\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n           {capture assign=gCalendar}{crmURL p=\'civicrm/event/ical\' q=\"gCalendar=1&reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n         <a href=\"{$gCalendar}\">{ts}Add event to Google Calendar{/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\n</body>\n</html>\n',1,832,'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','','<!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  <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_display}\"}{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|crmDate:\"%Y%m%d\" == $event.event_start_date|crmDate:\"%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 $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 entry for this event.{/ts}</a>\n       </td>\n     </tr>\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n           {capture assign=gCalendar}{crmURL p=\'civicrm/event/ical\' q=\"gCalendar=1&reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n         <a href=\"{$gCalendar}\">{ts}Add event to Google Calendar{/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\n</body>\n</html>\n',1,832,'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','','<!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  <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_display}\"}{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|crmDate:\"%Y%m%d\" == $event.event_start_date|crmDate:\"%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 !empty($event.location.phone.1.phone) || !empty($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\n</body>\n</html>\n',1,833,'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','','<!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  <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_display}\"}{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|crmDate:\"%Y%m%d\" == $event.event_start_date|crmDate:\"%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 !empty($event.location.phone.1.phone) || !empty($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\n</body>\n</html>\n',1,833,'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','','<!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  <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_display}\"}{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|crmDate:\"%Y%m%d\" == $event.event_start_date|crmDate:\"%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 !empty($event.location.phone.1.phone) || !empty($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\n</body>\n</html>\n',1,834,'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','','<!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  <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_display}\"}{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|crmDate:\"%Y%m%d\" == $event.event_start_date|crmDate:\"%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 !empty($event.location.phone.1.phone) || !empty($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\n</body>\n</html>\n',1,834,'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  <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\n</body>\n</html>\n',1,835,'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  <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\n</body>\n</html>\n',1,835,'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_display}\"}{if $greeting}{$greeting},{/if}\n\n{if $userTextPlain}\n{$userTextPlain}\n{else}{ts}Thank you for this contribution.{/ts}{/if}\n\n{if !$isShowLineItems}\n===========================================================\n{ts}Membership Information{/ts}\n\n===========================================================\n{ts}Membership Type{/ts}: {membership.membership_type_id:name}\n{/if}\n{if \'{membership.status_id:name}\' !== \'Cancelled\'}\n{if !$isShowLineItems}\n{ts}Membership Start Date{/ts}: {membership.start_date|crmDate:\"Full\"}\n{ts}Membership Expiration Date{/ts}: {membership.end_date|crmDate:\"Full\"}\n{/if}\n\n{if {contribution.total_amount|boolean}}\n===========================================================\n{ts}Membership Fee{/ts}\n\n===========================================================\n{if {contribution.financial_type_id|boolean}}\n{ts}Financial Type{/ts}: {contribution.financial_type_id:label}\n{/if}\n{if $isShowLineItems}\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_total}{ts}Fee{/ts}{/capture}\n{if $isShowTax && \'{contribution.tax_amount|boolean}\'}\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 Expiration Date{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_total|string_format:\"%10s\"} {if $isShowTax && {contribution.tax_amount|boolean}} {$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=$lineItems item=line}\n{line.title} {$line.line_total|crmMoney|string_format:\"%10s\"}  {if $isShowTax && {contribution.tax_amount|boolean}} {$line.line_total|crmMoney:\'{contribution.currency}\'|string_format:\"%10s\"} {if $line.tax_rate || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:\'{contribution.currency}\'|string_format:\"%10s\"}  {else}                  {/if}   {$line.line_total_inclusive|crmMoney|string_format:\"%10s\"} {/if} {$line.membership.start_date|string_format:\"%20s\"} {$line.membership.end_date|string_format:\"%20s\"}\n{/foreach}\n\n{if $isShowTax && {contribution.tax_amount|boolean}}\n{ts}Amount before Tax:{/ts} {contribution.tax_exclusive_amount}\n\n{foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else} {$taxTerm} {$taxDetail.percentage}%{/if}: {$taxDetail.amount|crmMoney:\'{contribution.currency}\'}\n{/foreach}\n{/if}\n--------------------------------------------------------------------------------------------------\n{/if}\n\n{if {contribution.tax_amount|boolean}}\n{ts}Total Tax Amount{/ts}: {contribution.tax_amount}\n{/if}\n\n{ts}Amount{/ts}: {contribution.total_amount}\n{if {contribution.receive_date|boolean}}\n{ts}Contribution Date{/ts}: {contribution.receive_date}\n{/if}\n{if {contribution.payment_instrument_id|boolean}}\n{ts}Paid By{/ts}: {contribution.payment_instrument_id:label}\n{if {contribution.check_number|boolean}}\n{ts}Check Number{/ts}: {contribution.check_number|boolean}\n{/if}\n{/if}\n{/if}\n{/if}\n\n{if !empty($isPrimary)}\n{if !empty($billingName)}\n\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n{/if}\n\n{if !empty($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 !empty($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\"\n        \"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  <table id=\"crm-membership_receipt\"\n         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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n        {if $userText}\n          <p>{$userText}</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 !$isShowLineItems}\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.membership_type_id:name}\n              </td>\n            </tr>\n          {/if}\n          {if \'{membership.status_id:name}\' !== \'Cancelled\'}\n            {if !$isShowLineItems}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Membership Start Date{/ts}\n                </td>\n                <td {$valueStyle}>\n                  {membership.start_date|crmDate:\"Full\"}\n                </td>\n              </tr>\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Membership Expiration Date{/ts}\n                </td>\n                <td {$valueStyle}>\n                    {membership.end_date|crmDate:\"Full\"}\n                </td>\n              </tr>\n            {/if}\n            {if {contribution.total_amount|boolean}}\n              <tr>\n                <th {$headerStyle}>\n                  {ts}Membership Fee{/ts}\n                </th>\n              </tr>\n              {if {contribution.financial_type_id|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Financial Type{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.financial_type_id:label}\n                  </td>\n                </tr>\n              {/if}\n\n              {if $isShowLineItems}\n                  <tr>\n                    <td colspan=\"2\" {$valueStyle}>\n                      <table>\n                        <tr>\n                          <th>{ts}Item{/ts}</th>\n                          <th>{ts}Fee{/ts}</th>\n                          {if $isShowTax && {contribution.tax_amount|boolean}}\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 Expiration Date{/ts}</th>\n                        </tr>\n                        {foreach from=$lineItems item=line}\n                          <tr>\n                            <td>{$line.title}</td>\n                            <td>\n                              {$line.line_total|crmMoney}\n                            </td>\n                            {if $isShowTax && {contribution.tax_amount|boolean}}\n                              <td>\n                                {$line.line_total|crmMoney:\'{contribution.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:\'{contribution.currency}\'}\n                                </td>\n                              {else}\n                                <td></td>\n                                <td></td>\n                              {/if}\n                              <td>\n                                {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n                              </td>\n                            {/if}\n                            <td>\n                              {$line.membership.start_date|crmDate:\"Full\"}\n                            </td>\n                            <td>\n                              {$line.membership.end_date|crmDate:\"Full\"}\n                            </td>\n                          </tr>\n                        {/foreach}\n                      </table>\n                    </td>\n                  </tr>\n\n                {if $isShowTax && {contribution.tax_amount|boolean}}\n                  <tr>\n                    <td {$labelStyle}>\n                        {ts}Amount Before Tax:{/ts}\n                    </td>\n                    <td {$valueStyle}>\n                        {contribution.tax_exclusive_amount}\n                    </td>\n                  </tr>\n                  {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n                    <tr>\n                      <td {$labelStyle}>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else} {$taxTerm} {$taxDetail.percentage}%{/if}</td>\n                      <td {$valueStyle}>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n                    </tr>\n                  {/foreach}\n                {/if}\n              {/if}\n              {if {contribution.tax_amount|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Total Tax Amount{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.tax_amount}\n                  </td>\n                </tr>\n              {/if}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Amount{/ts}\n                </td>\n                <td {$valueStyle}>\n                  {contribution.total_amount}\n                </td>\n              </tr>\n              {if {contribution.receive_date|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Contribution Date{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.receive_date}\n                  </td>\n                </tr>\n              {/if}\n              {if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Paid By{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                      {contribution.payment_instrument_id:label}\n                  </td>\n                </tr>\n                {if {contribution.check_number|boolean}}\n                  <tr>\n                    <td {$labelStyle}>\n                      {ts}Check Number{/ts}\n                    </td>\n                    <td {$valueStyle}>\n                      {contribution.check_number}\n                    </td>\n                  </tr>\n                {/if}\n              {/if}\n            {/if}\n          {/if}\n        </table>\n      </td>\n    </tr>\n\n    {if !empty($isPrimary)}\n      <tr>\n        <td>\n          <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n\n            {if !empty($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 !empty($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 !empty($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\n</body>\n</html>\n',1,836,'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_display}\"}{if $greeting}{$greeting},{/if}\n\n{if $userTextPlain}\n{$userTextPlain}\n{else}{ts}Thank you for this contribution.{/ts}{/if}\n\n{if !$isShowLineItems}\n===========================================================\n{ts}Membership Information{/ts}\n\n===========================================================\n{ts}Membership Type{/ts}: {membership.membership_type_id:name}\n{/if}\n{if \'{membership.status_id:name}\' !== \'Cancelled\'}\n{if !$isShowLineItems}\n{ts}Membership Start Date{/ts}: {membership.start_date|crmDate:\"Full\"}\n{ts}Membership Expiration Date{/ts}: {membership.end_date|crmDate:\"Full\"}\n{/if}\n\n{if {contribution.total_amount|boolean}}\n===========================================================\n{ts}Membership Fee{/ts}\n\n===========================================================\n{if {contribution.financial_type_id|boolean}}\n{ts}Financial Type{/ts}: {contribution.financial_type_id:label}\n{/if}\n{if $isShowLineItems}\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_total}{ts}Fee{/ts}{/capture}\n{if $isShowTax && \'{contribution.tax_amount|boolean}\'}\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 Expiration Date{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_total|string_format:\"%10s\"} {if $isShowTax && {contribution.tax_amount|boolean}} {$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=$lineItems item=line}\n{line.title} {$line.line_total|crmMoney|string_format:\"%10s\"}  {if $isShowTax && {contribution.tax_amount|boolean}} {$line.line_total|crmMoney:\'{contribution.currency}\'|string_format:\"%10s\"} {if $line.tax_rate || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:\'{contribution.currency}\'|string_format:\"%10s\"}  {else}                  {/if}   {$line.line_total_inclusive|crmMoney|string_format:\"%10s\"} {/if} {$line.membership.start_date|string_format:\"%20s\"} {$line.membership.end_date|string_format:\"%20s\"}\n{/foreach}\n\n{if $isShowTax && {contribution.tax_amount|boolean}}\n{ts}Amount before Tax:{/ts} {contribution.tax_exclusive_amount}\n\n{foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else} {$taxTerm} {$taxDetail.percentage}%{/if}: {$taxDetail.amount|crmMoney:\'{contribution.currency}\'}\n{/foreach}\n{/if}\n--------------------------------------------------------------------------------------------------\n{/if}\n\n{if {contribution.tax_amount|boolean}}\n{ts}Total Tax Amount{/ts}: {contribution.tax_amount}\n{/if}\n\n{ts}Amount{/ts}: {contribution.total_amount}\n{if {contribution.receive_date|boolean}}\n{ts}Contribution Date{/ts}: {contribution.receive_date}\n{/if}\n{if {contribution.payment_instrument_id|boolean}}\n{ts}Paid By{/ts}: {contribution.payment_instrument_id:label}\n{if {contribution.check_number|boolean}}\n{ts}Check Number{/ts}: {contribution.check_number|boolean}\n{/if}\n{/if}\n{/if}\n{/if}\n\n{if !empty($isPrimary)}\n{if !empty($billingName)}\n\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n{/if}\n\n{if !empty($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 !empty($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\"\n        \"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  <table id=\"crm-membership_receipt\"\n         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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n        {if $userText}\n          <p>{$userText}</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 !$isShowLineItems}\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.membership_type_id:name}\n              </td>\n            </tr>\n          {/if}\n          {if \'{membership.status_id:name}\' !== \'Cancelled\'}\n            {if !$isShowLineItems}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Membership Start Date{/ts}\n                </td>\n                <td {$valueStyle}>\n                  {membership.start_date|crmDate:\"Full\"}\n                </td>\n              </tr>\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Membership Expiration Date{/ts}\n                </td>\n                <td {$valueStyle}>\n                    {membership.end_date|crmDate:\"Full\"}\n                </td>\n              </tr>\n            {/if}\n            {if {contribution.total_amount|boolean}}\n              <tr>\n                <th {$headerStyle}>\n                  {ts}Membership Fee{/ts}\n                </th>\n              </tr>\n              {if {contribution.financial_type_id|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Financial Type{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.financial_type_id:label}\n                  </td>\n                </tr>\n              {/if}\n\n              {if $isShowLineItems}\n                  <tr>\n                    <td colspan=\"2\" {$valueStyle}>\n                      <table>\n                        <tr>\n                          <th>{ts}Item{/ts}</th>\n                          <th>{ts}Fee{/ts}</th>\n                          {if $isShowTax && {contribution.tax_amount|boolean}}\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 Expiration Date{/ts}</th>\n                        </tr>\n                        {foreach from=$lineItems item=line}\n                          <tr>\n                            <td>{$line.title}</td>\n                            <td>\n                              {$line.line_total|crmMoney}\n                            </td>\n                            {if $isShowTax && {contribution.tax_amount|boolean}}\n                              <td>\n                                {$line.line_total|crmMoney:\'{contribution.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:\'{contribution.currency}\'}\n                                </td>\n                              {else}\n                                <td></td>\n                                <td></td>\n                              {/if}\n                              <td>\n                                {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n                              </td>\n                            {/if}\n                            <td>\n                              {$line.membership.start_date|crmDate:\"Full\"}\n                            </td>\n                            <td>\n                              {$line.membership.end_date|crmDate:\"Full\"}\n                            </td>\n                          </tr>\n                        {/foreach}\n                      </table>\n                    </td>\n                  </tr>\n\n                {if $isShowTax && {contribution.tax_amount|boolean}}\n                  <tr>\n                    <td {$labelStyle}>\n                        {ts}Amount Before Tax:{/ts}\n                    </td>\n                    <td {$valueStyle}>\n                        {contribution.tax_exclusive_amount}\n                    </td>\n                  </tr>\n                  {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n                    <tr>\n                      <td {$labelStyle}>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else} {$taxTerm} {$taxDetail.percentage}%{/if}</td>\n                      <td {$valueStyle}>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n                    </tr>\n                  {/foreach}\n                {/if}\n              {/if}\n              {if {contribution.tax_amount|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Total Tax Amount{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.tax_amount}\n                  </td>\n                </tr>\n              {/if}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Amount{/ts}\n                </td>\n                <td {$valueStyle}>\n                  {contribution.total_amount}\n                </td>\n              </tr>\n              {if {contribution.receive_date|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Contribution Date{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.receive_date}\n                  </td>\n                </tr>\n              {/if}\n              {if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Paid By{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                      {contribution.payment_instrument_id:label}\n                  </td>\n                </tr>\n                {if {contribution.check_number|boolean}}\n                  <tr>\n                    <td {$labelStyle}>\n                      {ts}Check Number{/ts}\n                    </td>\n                    <td {$valueStyle}>\n                      {contribution.check_number}\n                    </td>\n                  </tr>\n                {/if}\n              {/if}\n            {/if}\n          {/if}\n        </table>\n      </td>\n    </tr>\n\n    {if !empty($isPrimary)}\n      <tr>\n        <td>\n          <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n\n            {if !empty($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 !empty($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 !empty($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\n</body>\n</html>\n',1,836,'membership_offline_receipt',0,1,0,NULL),
- (47,'Memberships - Receipt (on-line)','{if \'{contribution.contribution_status_id:name}\' === \'Pending\'}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {contribution.contribution_page_id.frontend_title} - {contact.display_name}\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  <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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $userText}\n     <p>{$userText}</p>\n    {/if}\n    {if {contribution.balance_amount|boolean} && {contribution.is_pay_later|boolean}}\n      <p>{contribution.contribution_page_id.pay_later_receipt}</p>\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    {if {membership.id|boolean} && !$isShowLineItems}\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         {ts}{membership.membership_type_id:label}{/ts}\n       </td>\n      </tr>\n      {if {membership.start_date|boolean}}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {membership.start_date}\n        </td>\n       </tr>\n      {/if}\n      {if {membership.end_date|boolean}}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Expiration Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {membership.end_date}\n        </td>\n       </tr>\n      {/if}\n    {/if}\n    {if {contribution.total_amount|boolean}}\n      <tr>\n        <th {$headerStyle}>{ts}Membership Fee{/ts}</th>\n      </tr>\n\n      {if !$isShowLineItems && {contribution.total_amount|boolean}}\n        {foreach from=$lineItems item=line}\n          <tr>\n            <td {$labelStyle}>\n              {if $line.membership_type_id}\n                {ts 1=\"{membership.membership_type_id:label}\"}%1 Membership{/ts}\n              {else}\n                {ts}Contribution Amount{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n            </td>\n          </tr>\n        {/foreach}\n      {elseif $isShowLineItems}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            <table>\n              <tr>\n                <th>{ts}Item{/ts}</th>\n                <th>{ts}Fee{/ts}</th>\n                {if $isShowTax && {contribution.tax_amount|boolean}}\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 Expiration Date{/ts}</th>\n              </tr>\n              {foreach from=$lineItems item=line}\n                <tr>\n                  <td>{$line.title}</td>\n                  <td>\n                    {$line.line_total|crmMoney}\n                  </td>\n                  {if $isShowTax && {contribution.tax_amount|boolean}}\n                    <td>\n                      {$line.line_total|crmMoney:\'{contribution.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:\'{contribution.currency}\'}\n                      </td>\n                    {else}\n                      <td></td>\n                      <td></td>\n                    {/if}\n                    <td>\n                      {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n                    </td>\n                  {/if}\n                  <td>\n                    {$line.membership.start_date|crmDate:\"Full\"}\n                  </td>\n                  <td>\n                    {$line.membership.end_date|crmDate:\"Full\"}\n                  </td>\n                </tr>\n              {/foreach}\n            </table>\n          </td>\n        </tr>\n\n        {if $isShowTax && {contribution.tax_amount|boolean}}\n          <tr>\n            <td {$labelStyle}>\n                {ts}Amount Before Tax:{/ts}\n            </td>\n            <td {$valueStyle}>\n                {contribution.tax_exclusive_amount}\n            </td>\n          </tr>\n          {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n            <tr>\n              <td {$labelStyle}>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else} {$taxTerm} {$taxDetail.percentage}%{/if}</td>\n              <td {$valueStyle}>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n            </tr>\n          {/foreach}\n        {/if}\n      {/if}\n      <tr>\n        <td {$labelStyle}>\n            {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n            {contribution.total_amount}\n        </td>\n      </tr>\n    {/if}\n\n    {if {contribution.receive_date|boolean}}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.receive_date}\n        </td>\n      </tr>\n    {/if}\n\n    {if {contribution.trxn_id|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.trxn_id}\n       </td>\n      </tr>\n    {/if}\n\n    {if {contribution.contribution_recur_id|boolean}}\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 !empty($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 !empty($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 {contribution.address_id.display|boolean}}\n      <tr>\n        <th {$headerStyle}>\n          {ts}Billing Name and Address{/ts}\n        </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {contribution.address_id.name}<br/>\n          {contribution.address_id.display}\n        </td>\n      </tr>\n    {/if}\n    {if {contact.email_primary.email|boolean}}\n      <tr>\n        <th {$headerStyle}>\n          {ts}Registered Email{/ts}\n        </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {contact.email_primary.email}\n        </td>\n      </tr>\n    {/if}\n\n    {if !empty($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 !empty($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 !empty($contact_email) OR !empty($contact_phone)}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            <p>{ts}For information about this premium, contact:{/ts}</p>\n            {if !empty($contact_email)}\n              <p>{$contact_email}</p>\n            {/if}\n            {if !empty($contact_phone)}\n              <p>{$contact_phone}</p>\n            {/if}\n          </td>\n        </tr>\n      {/if}\n      {if $is_deductible AND !empty($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 !empty($customPre)}\n      <tr>\n       <th {$headerStyle}>\n         {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n        <tr>\n          <td {$labelStyle}>\n            {$customName}\n          </td>\n          <td {$valueStyle}>\n            {$customValue}\n          </td>\n        </tr>\n      {/foreach}\n    {/if}\n\n    {if !empty($customPost)}\n      <tr>\n        <th {$headerStyle}>\n          {$customPost_grouptitle}\n        </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n        <tr>\n          <td {$labelStyle}>\n            {$customName}\n          </td>\n          <td {$valueStyle}>\n            {$customValue}\n          </td>\n        </tr>\n      {/foreach}\n    {/if}\n\n  </table>\n\n</body>\n</html>\n',1,837,'membership_online_receipt',1,0,0,NULL),
- (48,'Memberships - Receipt (on-line)','{if \'{contribution.contribution_status_id:name}\' === \'Pending\'}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {contribution.contribution_page_id.frontend_title} - {contact.display_name}\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  <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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $userText}\n     <p>{$userText}</p>\n    {/if}\n    {if {contribution.balance_amount|boolean} && {contribution.is_pay_later|boolean}}\n      <p>{contribution.contribution_page_id.pay_later_receipt}</p>\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    {if {membership.id|boolean} && !$isShowLineItems}\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         {ts}{membership.membership_type_id:label}{/ts}\n       </td>\n      </tr>\n      {if {membership.start_date|boolean}}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {membership.start_date}\n        </td>\n       </tr>\n      {/if}\n      {if {membership.end_date|boolean}}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Expiration Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {membership.end_date}\n        </td>\n       </tr>\n      {/if}\n    {/if}\n    {if {contribution.total_amount|boolean}}\n      <tr>\n        <th {$headerStyle}>{ts}Membership Fee{/ts}</th>\n      </tr>\n\n      {if !$isShowLineItems && {contribution.total_amount|boolean}}\n        {foreach from=$lineItems item=line}\n          <tr>\n            <td {$labelStyle}>\n              {if $line.membership_type_id}\n                {ts 1=\"{membership.membership_type_id:label}\"}%1 Membership{/ts}\n              {else}\n                {ts}Contribution Amount{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n            </td>\n          </tr>\n        {/foreach}\n      {elseif $isShowLineItems}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            <table>\n              <tr>\n                <th>{ts}Item{/ts}</th>\n                <th>{ts}Fee{/ts}</th>\n                {if $isShowTax && {contribution.tax_amount|boolean}}\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 Expiration Date{/ts}</th>\n              </tr>\n              {foreach from=$lineItems item=line}\n                <tr>\n                  <td>{$line.title}</td>\n                  <td>\n                    {$line.line_total|crmMoney}\n                  </td>\n                  {if $isShowTax && {contribution.tax_amount|boolean}}\n                    <td>\n                      {$line.line_total|crmMoney:\'{contribution.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:\'{contribution.currency}\'}\n                      </td>\n                    {else}\n                      <td></td>\n                      <td></td>\n                    {/if}\n                    <td>\n                      {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n                    </td>\n                  {/if}\n                  <td>\n                    {$line.membership.start_date|crmDate:\"Full\"}\n                  </td>\n                  <td>\n                    {$line.membership.end_date|crmDate:\"Full\"}\n                  </td>\n                </tr>\n              {/foreach}\n            </table>\n          </td>\n        </tr>\n\n        {if $isShowTax && {contribution.tax_amount|boolean}}\n          <tr>\n            <td {$labelStyle}>\n                {ts}Amount Before Tax:{/ts}\n            </td>\n            <td {$valueStyle}>\n                {contribution.tax_exclusive_amount}\n            </td>\n          </tr>\n          {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n            <tr>\n              <td {$labelStyle}>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else} {$taxTerm} {$taxDetail.percentage}%{/if}</td>\n              <td {$valueStyle}>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n            </tr>\n          {/foreach}\n        {/if}\n      {/if}\n      <tr>\n        <td {$labelStyle}>\n            {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n            {contribution.total_amount}\n        </td>\n      </tr>\n    {/if}\n\n    {if {contribution.receive_date|boolean}}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.receive_date}\n        </td>\n      </tr>\n    {/if}\n\n    {if {contribution.trxn_id|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.trxn_id}\n       </td>\n      </tr>\n    {/if}\n\n    {if {contribution.contribution_recur_id|boolean}}\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 !empty($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 !empty($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 {contribution.address_id.display|boolean}}\n      <tr>\n        <th {$headerStyle}>\n          {ts}Billing Name and Address{/ts}\n        </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {contribution.address_id.name}<br/>\n          {contribution.address_id.display}\n        </td>\n      </tr>\n    {/if}\n    {if {contact.email_primary.email|boolean}}\n      <tr>\n        <th {$headerStyle}>\n          {ts}Registered Email{/ts}\n        </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {contact.email_primary.email}\n        </td>\n      </tr>\n    {/if}\n\n    {if !empty($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 !empty($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 !empty($contact_email) OR !empty($contact_phone)}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            <p>{ts}For information about this premium, contact:{/ts}</p>\n            {if !empty($contact_email)}\n              <p>{$contact_email}</p>\n            {/if}\n            {if !empty($contact_phone)}\n              <p>{$contact_phone}</p>\n            {/if}\n          </td>\n        </tr>\n      {/if}\n      {if $is_deductible AND !empty($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 !empty($customPre)}\n      <tr>\n       <th {$headerStyle}>\n         {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n        <tr>\n          <td {$labelStyle}>\n            {$customName}\n          </td>\n          <td {$valueStyle}>\n            {$customValue}\n          </td>\n        </tr>\n      {/foreach}\n    {/if}\n\n    {if !empty($customPost)}\n      <tr>\n        <th {$headerStyle}>\n          {$customPost_grouptitle}\n        </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n        <tr>\n          <td {$labelStyle}>\n            {$customName}\n          </td>\n          <td {$valueStyle}>\n            {$customValue}\n          </td>\n        </tr>\n      {/foreach}\n    {/if}\n\n  </table>\n\n</body>\n</html>\n',1,837,'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_display}\"}{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 Expiration 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  <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_display}\"}{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 Expiration Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$mem_end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n\n </table>\n\n</body>\n</html>\n',1,838,'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_display}\"}{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 Expiration 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  <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_display}\"}{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 Expiration Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$mem_end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n\n </table>\n\n</body>\n</html>\n',1,838,'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_display}\"}{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  <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_display}\"}{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\n</body>\n</html>\n',1,839,'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_display}\"}{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  <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_display}\"}{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\n</body>\n</html>\n',1,839,'membership_autorenew_billing',0,1,0,NULL),
+ (35,'Events - Registration Cancellation Notice','{ts 1=\"{event.title}\"}Event Registration Cancelled for %1{/ts} - {contact.display_name}\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  <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_display}\"}{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.title}<br />\n       {event.start_date|crmDate:\"%A\"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date|crmDate:\"%A\"} {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_id:label}\n      </td>\n     </tr>\n    {if {event.is_show_location|boolean}}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            {event.location}\n          </td>\n        </tr>\n      {/if}\n\n    {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts}Event Contacts:{/ts}\n          </td>\n        </tr>\n\n        {if {event.loc_block_id.phone_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n        {if {event.loc_block_id.phone_2_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_2_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_id.email}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_2_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_2_id.email}\n            </td>\n          </tr>\n        {/if}\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 !empty(\'{participant.register_date}\')}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {participant.register_date}\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\n</body>\n</html>\n',1,831,'participant_cancelled',1,0,0,NULL),
+ (36,'Events - Registration Cancellation Notice','{ts 1=\"{event.title}\"}Event Registration Cancelled for %1{/ts} - {contact.display_name}\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  <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_display}\"}{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.title}<br />\n       {event.start_date|crmDate:\"%A\"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date|crmDate:\"%A\"} {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_id:label}\n      </td>\n     </tr>\n    {if {event.is_show_location|boolean}}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            {event.location}\n          </td>\n        </tr>\n      {/if}\n\n    {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts}Event Contacts:{/ts}\n          </td>\n        </tr>\n\n        {if {event.loc_block_id.phone_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n        {if {event.loc_block_id.phone_2_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_2_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_id.email}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_2_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_2_id.email}\n            </td>\n          </tr>\n        {/if}\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 !empty(\'{participant.register_date}\')}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {participant.register_date}\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\n</body>\n</html>\n',1,831,'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','','<!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  <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_display}\"}{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|boolean}}\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|boolean}}\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.title}<br />\n       {event.start_date|crmDate:\"%A\"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date|crmDate:\"%A\"} {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_id:label}\n      </td>\n     </tr>\n     {if {event.is_show_location|boolean}}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            {event.location}\n          </td>\n        </tr>\n      {/if}\n\n     {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts}Event Contacts:{/ts}\n          </td>\n        </tr>\n\n        {if {event.loc_block_id.phone_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n        {if {event.loc_block_id.phone_2_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_2_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_id.email}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_2_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_2_id.email}\n            </td>\n          </tr>\n        {/if}\n      {/if}\n\n     {if {event.is_public|boolean}}\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 entry for this event.{/ts}</a>\n       </td>\n     </tr>\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n           {capture assign=gCalendar}{crmURL p=\'civicrm/event/ical\' q=\"gCalendar=1&reset=1&id={event.id}\" h=0 a=1 fe=1}{/capture}\n         <a href=\"{$gCalendar}\">{ts}Add event to Google Calendar{/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 {participant.register_date|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n         {participant.register_date}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n  {if {event.allow_selfcancelxfer|boolean}}\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}<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\n</body>\n</html>\n',1,832,'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','','<!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  <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_display}\"}{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|boolean}}\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|boolean}}\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.title}<br />\n       {event.start_date|crmDate:\"%A\"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date|crmDate:\"%A\"} {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_id:label}\n      </td>\n     </tr>\n     {if {event.is_show_location|boolean}}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            {event.location}\n          </td>\n        </tr>\n      {/if}\n\n     {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts}Event Contacts:{/ts}\n          </td>\n        </tr>\n\n        {if {event.loc_block_id.phone_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n        {if {event.loc_block_id.phone_2_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_2_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_id.email}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_2_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_2_id.email}\n            </td>\n          </tr>\n        {/if}\n      {/if}\n\n     {if {event.is_public|boolean}}\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 entry for this event.{/ts}</a>\n       </td>\n     </tr>\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n           {capture assign=gCalendar}{crmURL p=\'civicrm/event/ical\' q=\"gCalendar=1&reset=1&id={event.id}\" h=0 a=1 fe=1}{/capture}\n         <a href=\"{$gCalendar}\">{ts}Add event to Google Calendar{/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 {participant.register_date|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n         {participant.register_date}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n  {if {event.allow_selfcancelxfer|boolean}}\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}<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\n</body>\n</html>\n',1,832,'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','','<!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  <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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=\"{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.title}<br />\n       {event.start_date|crmDate:\"%A\"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date|crmDate:\"%A\"} {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_id:label}\n      </td>\n     </tr>\n\n    {if {event.is_show_location|boolean}}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            {event.location}\n          </td>\n        </tr>\n      {/if}\n\n    {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts}Event Contacts:{/ts}\n          </td>\n        </tr>\n\n        {if {event.loc_block_id.phone_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n        {if {event.loc_block_id.phone_2_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_2_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_id.email}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_2_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_2_id.email}\n            </td>\n          </tr>\n        {/if}\n      {/if}\n\n    {if {participant.register_date|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {participant.register_date}\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\n</body>\n</html>\n',1,833,'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','','<!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  <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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=\"{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.title}<br />\n       {event.start_date|crmDate:\"%A\"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date|crmDate:\"%A\"} {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_id:label}\n      </td>\n     </tr>\n\n    {if {event.is_show_location|boolean}}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            {event.location}\n          </td>\n        </tr>\n      {/if}\n\n    {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts}Event Contacts:{/ts}\n          </td>\n        </tr>\n\n        {if {event.loc_block_id.phone_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n        {if {event.loc_block_id.phone_2_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_2_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_id.email}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_2_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_2_id.email}\n            </td>\n          </tr>\n        {/if}\n      {/if}\n\n    {if {participant.register_date|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {participant.register_date}\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\n</body>\n</html>\n',1,833,'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','','<!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  <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_display}\"}{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.title}<br />\n       {event.start_date|crmDate:\"%A\"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date|crmDate:\"%A\"} {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_id:label}\n      </td>\n     </tr>\n\n     {if {event.is_show_location|boolean}}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            {event.location}\n          </td>\n        </tr>\n      {/if}\n\n     {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts}Event Contacts:{/ts}\n          </td>\n        </tr>\n\n        {if {event.loc_block_id.phone_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n        {if {event.loc_block_id.phone_2_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_2_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_id.email}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_2_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_2_id.email}\n            </td>\n          </tr>\n        {/if}\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 {participant.register_date|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {participant.register_date}\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\n</body>\n</html>\n',1,834,'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','','<!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  <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_display}\"}{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.title}<br />\n       {event.start_date|crmDate:\"%A\"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if \'{event.end_date|crmDate:\"%Y%m%d\"}\' === \'{event.start_date|crmDate:\"%Y%m%d\"}\'}{event.end_date|crmDate:\"Time\"}{else}{event.end_date|crmDate:\"%A\"} {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_id:label}\n      </td>\n     </tr>\n\n     {if {event.is_show_location|boolean}}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            {event.location}\n          </td>\n        </tr>\n      {/if}\n\n     {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts}Event Contacts:{/ts}\n          </td>\n        </tr>\n\n        {if {event.loc_block_id.phone_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n        {if {event.loc_block_id.phone_2_id.phone|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}\n                {event.loc_block_id.phone_2_id.phone_type_id:label}\n              {else}\n                {ts}Phone{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_id.email}\n            </td>\n          </tr>\n        {/if}\n\n        {if {event.loc_block_id.email_2_id.email|boolean}}\n          <tr>\n            <td {$labelStyle}>\n              {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n              {event.loc_block_id.email_2_id.email}\n            </td>\n          </tr>\n        {/if}\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 {participant.register_date|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {participant.register_date}\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\n</body>\n</html>\n',1,834,'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','','<!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  <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\n</body>\n</html>\n',1,835,'friend',1,0,0,NULL),
+ (44,'Tell-a-Friend Email','{ts 1=$senderContactName 2=$title}%1 wants you to know about %2{/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  <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\n</body>\n</html>\n',1,835,'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','','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n        \"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  <table id=\"crm-membership_receipt\"\n         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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n        {if $userText}\n          <p>{$userText}</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 !$isShowLineItems}\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.membership_type_id:name}\n              </td>\n            </tr>\n          {/if}\n          {if \'{membership.status_id:name}\' !== \'Cancelled\'}\n            {if !$isShowLineItems}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Membership Start Date{/ts}\n                </td>\n                <td {$valueStyle}>\n                  {membership.start_date|crmDate:\"Full\"}\n                </td>\n              </tr>\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Membership Expiration Date{/ts}\n                </td>\n                <td {$valueStyle}>\n                    {membership.end_date|crmDate:\"Full\"}\n                </td>\n              </tr>\n            {/if}\n            {if {contribution.total_amount|boolean}}\n              <tr>\n                <th {$headerStyle}>\n                  {ts}Membership Fee{/ts}\n                </th>\n              </tr>\n              {if {contribution.financial_type_id|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Financial Type{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.financial_type_id:label}\n                  </td>\n                </tr>\n              {/if}\n\n              {if $isShowLineItems}\n                  <tr>\n                    <td colspan=\"2\" {$valueStyle}>\n                      <table>\n                        <tr>\n                          <th>{ts}Item{/ts}</th>\n                          <th>{ts}Fee{/ts}</th>\n                          {if $isShowTax && {contribution.tax_amount|boolean}}\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 Expiration Date{/ts}</th>\n                        </tr>\n                        {foreach from=$lineItems item=line}\n                          <tr>\n                            <td>{$line.title}</td>\n                            <td>\n                              {$line.line_total|crmMoney}\n                            </td>\n                            {if $isShowTax && {contribution.tax_amount|boolean}}\n                              <td>\n                                {$line.line_total|crmMoney:\'{contribution.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:\'{contribution.currency}\'}\n                                </td>\n                              {else}\n                                <td></td>\n                                <td></td>\n                              {/if}\n                              <td>\n                                {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n                              </td>\n                            {/if}\n                            <td>\n                              {$line.membership.start_date|crmDate:\"Full\"}\n                            </td>\n                            <td>\n                              {$line.membership.end_date|crmDate:\"Full\"}\n                            </td>\n                          </tr>\n                        {/foreach}\n                      </table>\n                    </td>\n                  </tr>\n\n                {if $isShowTax && {contribution.tax_amount|boolean}}\n                  <tr>\n                    <td {$labelStyle}>\n                        {ts}Amount Before Tax:{/ts}\n                    </td>\n                    <td {$valueStyle}>\n                        {contribution.tax_exclusive_amount}\n                    </td>\n                  </tr>\n                  {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n                    <tr>\n                      <td {$labelStyle}>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else} {$taxTerm} {$taxDetail.percentage}%{/if}</td>\n                      <td {$valueStyle}>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n                    </tr>\n                  {/foreach}\n                {/if}\n              {/if}\n              {if {contribution.tax_amount|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Total Tax Amount{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.tax_amount}\n                  </td>\n                </tr>\n              {/if}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Amount{/ts}\n                </td>\n                <td {$valueStyle}>\n                  {contribution.total_amount}\n                </td>\n              </tr>\n              {if {contribution.receive_date|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Contribution Date{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.receive_date}\n                  </td>\n                </tr>\n              {/if}\n              {if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Paid By{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                      {contribution.payment_instrument_id:label}\n                  </td>\n                </tr>\n                {if {contribution.check_number|boolean}}\n                  <tr>\n                    <td {$labelStyle}>\n                      {ts}Check Number{/ts}\n                    </td>\n                    <td {$valueStyle}>\n                      {contribution.check_number}\n                    </td>\n                  </tr>\n                {/if}\n              {/if}\n            {/if}\n          {/if}\n        </table>\n      </td>\n    </tr>\n\n    {if !empty($isPrimary)}\n      <tr>\n        <td>\n          <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n\n            {if !empty($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 !empty($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 !empty($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\n</body>\n</html>\n',1,836,'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','','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n        \"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  <table id=\"crm-membership_receipt\"\n         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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n        {if $userText}\n          <p>{$userText}</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 !$isShowLineItems}\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.membership_type_id:name}\n              </td>\n            </tr>\n          {/if}\n          {if \'{membership.status_id:name}\' !== \'Cancelled\'}\n            {if !$isShowLineItems}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Membership Start Date{/ts}\n                </td>\n                <td {$valueStyle}>\n                  {membership.start_date|crmDate:\"Full\"}\n                </td>\n              </tr>\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Membership Expiration Date{/ts}\n                </td>\n                <td {$valueStyle}>\n                    {membership.end_date|crmDate:\"Full\"}\n                </td>\n              </tr>\n            {/if}\n            {if {contribution.total_amount|boolean}}\n              <tr>\n                <th {$headerStyle}>\n                  {ts}Membership Fee{/ts}\n                </th>\n              </tr>\n              {if {contribution.financial_type_id|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Financial Type{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.financial_type_id:label}\n                  </td>\n                </tr>\n              {/if}\n\n              {if $isShowLineItems}\n                  <tr>\n                    <td colspan=\"2\" {$valueStyle}>\n                      <table>\n                        <tr>\n                          <th>{ts}Item{/ts}</th>\n                          <th>{ts}Fee{/ts}</th>\n                          {if $isShowTax && {contribution.tax_amount|boolean}}\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 Expiration Date{/ts}</th>\n                        </tr>\n                        {foreach from=$lineItems item=line}\n                          <tr>\n                            <td>{$line.title}</td>\n                            <td>\n                              {$line.line_total|crmMoney}\n                            </td>\n                            {if $isShowTax && {contribution.tax_amount|boolean}}\n                              <td>\n                                {$line.line_total|crmMoney:\'{contribution.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:\'{contribution.currency}\'}\n                                </td>\n                              {else}\n                                <td></td>\n                                <td></td>\n                              {/if}\n                              <td>\n                                {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n                              </td>\n                            {/if}\n                            <td>\n                              {$line.membership.start_date|crmDate:\"Full\"}\n                            </td>\n                            <td>\n                              {$line.membership.end_date|crmDate:\"Full\"}\n                            </td>\n                          </tr>\n                        {/foreach}\n                      </table>\n                    </td>\n                  </tr>\n\n                {if $isShowTax && {contribution.tax_amount|boolean}}\n                  <tr>\n                    <td {$labelStyle}>\n                        {ts}Amount Before Tax:{/ts}\n                    </td>\n                    <td {$valueStyle}>\n                        {contribution.tax_exclusive_amount}\n                    </td>\n                  </tr>\n                  {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n                    <tr>\n                      <td {$labelStyle}>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else} {$taxTerm} {$taxDetail.percentage}%{/if}</td>\n                      <td {$valueStyle}>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n                    </tr>\n                  {/foreach}\n                {/if}\n              {/if}\n              {if {contribution.tax_amount|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Total Tax Amount{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.tax_amount}\n                  </td>\n                </tr>\n              {/if}\n              <tr>\n                <td {$labelStyle}>\n                  {ts}Amount{/ts}\n                </td>\n                <td {$valueStyle}>\n                  {contribution.total_amount}\n                </td>\n              </tr>\n              {if {contribution.receive_date|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Contribution Date{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                    {contribution.receive_date}\n                  </td>\n                </tr>\n              {/if}\n              {if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}\n                <tr>\n                  <td {$labelStyle}>\n                    {ts}Paid By{/ts}\n                  </td>\n                  <td {$valueStyle}>\n                      {contribution.payment_instrument_id:label}\n                  </td>\n                </tr>\n                {if {contribution.check_number|boolean}}\n                  <tr>\n                    <td {$labelStyle}>\n                      {ts}Check Number{/ts}\n                    </td>\n                    <td {$valueStyle}>\n                      {contribution.check_number}\n                    </td>\n                  </tr>\n                {/if}\n              {/if}\n            {/if}\n          {/if}\n        </table>\n      </td>\n    </tr>\n\n    {if !empty($isPrimary)}\n      <tr>\n        <td>\n          <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n\n            {if !empty($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 !empty($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 !empty($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\n</body>\n</html>\n',1,836,'membership_offline_receipt',0,1,0,NULL),
+ (47,'Memberships - Receipt (on-line)','{if \'{contribution.contribution_status_id:name}\' === \'Pending\'}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {contribution.contribution_page_id.frontend_title} - {contact.display_name}\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  <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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n     {if $userText}\n       <p>{$userText}</p>\n     {elseif {contribution.contribution_page_id.receipt_text|boolean}}\n       <p>{contribution.contribution_page_id.receipt_text}</p>\n     {/if}\n    {if {contribution.balance_amount|boolean} && {contribution.is_pay_later|boolean}}\n      <p>{contribution.contribution_page_id.pay_later_receipt}</p>\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    {if {membership.id|boolean} && !$isShowLineItems}\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         {ts}{membership.membership_type_id:label}{/ts}\n       </td>\n      </tr>\n      {if {membership.start_date|boolean}}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {membership.start_date}\n        </td>\n       </tr>\n      {/if}\n      {if {membership.end_date|boolean}}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Expiration Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {membership.end_date}\n        </td>\n       </tr>\n      {/if}\n    {/if}\n    {if {contribution.total_amount|boolean}}\n      <tr>\n        <th {$headerStyle}>{ts}Membership Fee{/ts}</th>\n      </tr>\n\n      {if !$isShowLineItems && {contribution.total_amount|boolean}}\n        {foreach from=$lineItems item=line}\n          <tr>\n            <td {$labelStyle}>\n              {if $line.membership_type_id}\n                {ts 1=\"{membership.membership_type_id:label}\"}%1 Membership{/ts}\n              {else}\n                {ts}Contribution Amount{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n            </td>\n          </tr>\n        {/foreach}\n      {elseif $isShowLineItems}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            <table>\n              <tr>\n                <th>{ts}Item{/ts}</th>\n                <th>{ts}Fee{/ts}</th>\n                {if $isShowTax && {contribution.tax_amount|boolean}}\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 Expiration Date{/ts}</th>\n              </tr>\n              {foreach from=$lineItems item=line}\n                <tr>\n                  <td>{$line.title}</td>\n                  <td>\n                    {$line.line_total|crmMoney}\n                  </td>\n                  {if $isShowTax && {contribution.tax_amount|boolean}}\n                    <td>\n                      {$line.line_total|crmMoney:\'{contribution.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:\'{contribution.currency}\'}\n                      </td>\n                    {else}\n                      <td></td>\n                      <td></td>\n                    {/if}\n                    <td>\n                      {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n                    </td>\n                  {/if}\n                  <td>\n                    {$line.membership.start_date|crmDate:\"Full\"}\n                  </td>\n                  <td>\n                    {$line.membership.end_date|crmDate:\"Full\"}\n                  </td>\n                </tr>\n              {/foreach}\n            </table>\n          </td>\n        </tr>\n\n        {if $isShowTax && {contribution.tax_amount|boolean}}\n          <tr>\n            <td {$labelStyle}>\n                {ts}Amount Before Tax:{/ts}\n            </td>\n            <td {$valueStyle}>\n                {contribution.tax_exclusive_amount}\n            </td>\n          </tr>\n          {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n            <tr>\n              <td {$labelStyle}>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else} {$taxTerm} {$taxDetail.percentage}%{/if}</td>\n              <td {$valueStyle}>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n            </tr>\n          {/foreach}\n        {/if}\n      {/if}\n      <tr>\n        <td {$labelStyle}>\n            {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n            {contribution.total_amount}\n        </td>\n      </tr>\n    {/if}\n\n    {if {contribution.receive_date|boolean}}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.receive_date}\n        </td>\n      </tr>\n    {/if}\n\n    {if {contribution.trxn_id|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.trxn_id}\n       </td>\n      </tr>\n    {/if}\n\n    {if {contribution.contribution_recur_id|boolean}}\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 !empty($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 !empty($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 {contribution.address_id.display|boolean}}\n      <tr>\n        <th {$headerStyle}>\n          {ts}Billing Name and Address{/ts}\n        </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {contribution.address_id.name}<br/>\n          {contribution.address_id.display}\n        </td>\n      </tr>\n    {/if}\n    {if {contact.email_primary.email|boolean}}\n      <tr>\n        <th {$headerStyle}>\n          {ts}Registered Email{/ts}\n        </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {contact.email_primary.email}\n        </td>\n      </tr>\n    {/if}\n\n    {if !empty($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 !empty($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 !empty($contact_email) OR !empty($contact_phone)}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            <p>{ts}For information about this premium, contact:{/ts}</p>\n            {if !empty($contact_email)}\n              <p>{$contact_email}</p>\n            {/if}\n            {if !empty($contact_phone)}\n              <p>{$contact_phone}</p>\n            {/if}\n          </td>\n        </tr>\n      {/if}\n      {if $is_deductible AND !empty($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 !empty($customPre)}\n      <tr>\n       <th {$headerStyle}>\n         {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n        <tr>\n          <td {$labelStyle}>\n            {$customName}\n          </td>\n          <td {$valueStyle}>\n            {$customValue}\n          </td>\n        </tr>\n      {/foreach}\n    {/if}\n\n    {if !empty($customPost)}\n      <tr>\n        <th {$headerStyle}>\n          {$customPost_grouptitle}\n        </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n        <tr>\n          <td {$labelStyle}>\n            {$customName}\n          </td>\n          <td {$valueStyle}>\n            {$customValue}\n          </td>\n        </tr>\n      {/foreach}\n    {/if}\n\n  </table>\n\n</body>\n</html>\n',1,837,'membership_online_receipt',1,0,0,NULL),
+ (48,'Memberships - Receipt (on-line)','{if \'{contribution.contribution_status_id:name}\' === \'Pending\'}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {contribution.contribution_page_id.frontend_title} - {contact.display_name}\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  <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_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n     {if $userText}\n       <p>{$userText}</p>\n     {elseif {contribution.contribution_page_id.receipt_text|boolean}}\n       <p>{contribution.contribution_page_id.receipt_text}</p>\n     {/if}\n    {if {contribution.balance_amount|boolean} && {contribution.is_pay_later|boolean}}\n      <p>{contribution.contribution_page_id.pay_later_receipt}</p>\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    {if {membership.id|boolean} && !$isShowLineItems}\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         {ts}{membership.membership_type_id:label}{/ts}\n       </td>\n      </tr>\n      {if {membership.start_date|boolean}}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {membership.start_date}\n        </td>\n       </tr>\n      {/if}\n      {if {membership.end_date|boolean}}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Expiration Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {membership.end_date}\n        </td>\n       </tr>\n      {/if}\n    {/if}\n    {if {contribution.total_amount|boolean}}\n      <tr>\n        <th {$headerStyle}>{ts}Membership Fee{/ts}</th>\n      </tr>\n\n      {if !$isShowLineItems && {contribution.total_amount|boolean}}\n        {foreach from=$lineItems item=line}\n          <tr>\n            <td {$labelStyle}>\n              {if $line.membership_type_id}\n                {ts 1=\"{membership.membership_type_id:label}\"}%1 Membership{/ts}\n              {else}\n                {ts}Contribution Amount{/ts}\n              {/if}\n            </td>\n            <td {$valueStyle}>\n              {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n            </td>\n          </tr>\n        {/foreach}\n      {elseif $isShowLineItems}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            <table>\n              <tr>\n                <th>{ts}Item{/ts}</th>\n                <th>{ts}Fee{/ts}</th>\n                {if $isShowTax && {contribution.tax_amount|boolean}}\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 Expiration Date{/ts}</th>\n              </tr>\n              {foreach from=$lineItems item=line}\n                <tr>\n                  <td>{$line.title}</td>\n                  <td>\n                    {$line.line_total|crmMoney}\n                  </td>\n                  {if $isShowTax && {contribution.tax_amount|boolean}}\n                    <td>\n                      {$line.line_total|crmMoney:\'{contribution.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:\'{contribution.currency}\'}\n                      </td>\n                    {else}\n                      <td></td>\n                      <td></td>\n                    {/if}\n                    <td>\n                      {$line.line_total_inclusive|crmMoney:\'{contribution.currency}\'}\n                    </td>\n                  {/if}\n                  <td>\n                    {$line.membership.start_date|crmDate:\"Full\"}\n                  </td>\n                  <td>\n                    {$line.membership.end_date|crmDate:\"Full\"}\n                  </td>\n                </tr>\n              {/foreach}\n            </table>\n          </td>\n        </tr>\n\n        {if $isShowTax && {contribution.tax_amount|boolean}}\n          <tr>\n            <td {$labelStyle}>\n                {ts}Amount Before Tax:{/ts}\n            </td>\n            <td {$valueStyle}>\n                {contribution.tax_exclusive_amount}\n            </td>\n          </tr>\n          {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}\n            <tr>\n              <td {$labelStyle}>{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else} {$taxTerm} {$taxDetail.percentage}%{/if}</td>\n              <td {$valueStyle}>{$taxDetail.amount|crmMoney:\'{contribution.currency}\'}</td>\n            </tr>\n          {/foreach}\n        {/if}\n      {/if}\n      <tr>\n        <td {$labelStyle}>\n            {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n            {contribution.total_amount}\n        </td>\n      </tr>\n    {/if}\n\n    {if {contribution.receive_date|boolean}}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {contribution.receive_date}\n        </td>\n      </tr>\n    {/if}\n\n    {if {contribution.trxn_id|boolean}}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n         {contribution.trxn_id}\n       </td>\n      </tr>\n    {/if}\n\n    {if {contribution.contribution_recur_id|boolean}}\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 !empty($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 !empty($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 {contribution.address_id.display|boolean}}\n      <tr>\n        <th {$headerStyle}>\n          {ts}Billing Name and Address{/ts}\n        </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {contribution.address_id.name}<br/>\n          {contribution.address_id.display}\n        </td>\n      </tr>\n    {/if}\n    {if {contact.email_primary.email|boolean}}\n      <tr>\n        <th {$headerStyle}>\n          {ts}Registered Email{/ts}\n        </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {contact.email_primary.email}\n        </td>\n      </tr>\n    {/if}\n\n    {if !empty($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 !empty($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 !empty($contact_email) OR !empty($contact_phone)}\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            <p>{ts}For information about this premium, contact:{/ts}</p>\n            {if !empty($contact_email)}\n              <p>{$contact_email}</p>\n            {/if}\n            {if !empty($contact_phone)}\n              <p>{$contact_phone}</p>\n            {/if}\n          </td>\n        </tr>\n      {/if}\n      {if $is_deductible AND !empty($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 !empty($customPre)}\n      <tr>\n       <th {$headerStyle}>\n         {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n        <tr>\n          <td {$labelStyle}>\n            {$customName}\n          </td>\n          <td {$valueStyle}>\n            {$customValue}\n          </td>\n        </tr>\n      {/foreach}\n    {/if}\n\n    {if !empty($customPost)}\n      <tr>\n        <th {$headerStyle}>\n          {$customPost_grouptitle}\n        </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n        <tr>\n          <td {$labelStyle}>\n            {$customName}\n          </td>\n          <td {$valueStyle}>\n            {$customValue}\n          </td>\n        </tr>\n      {/foreach}\n    {/if}\n\n  </table>\n\n</body>\n</html>\n',1,837,'membership_online_receipt',0,1,0,NULL),
+ (49,'Memberships - Auto-renew Cancellation Notification','{ts}Autorenew Membership Cancellation Notification{/ts} - {contact.display_name}\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  <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_display}\"}{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 Expiration Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$mem_end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n\n </table>\n\n</body>\n</html>\n',1,838,'membership_autorenew_cancelled',1,0,0,NULL),
+ (50,'Memberships - Auto-renew Cancellation Notification','{ts}Autorenew Membership Cancellation Notification{/ts} - {contact.display_name}\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  <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_display}\"}{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 Expiration Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$mem_end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n\n </table>\n\n</body>\n</html>\n',1,838,'membership_autorenew_cancelled',0,1,0,NULL),
+ (51,'Memberships - Auto-renew Billing Updates','{ts}Membership Autorenewal Billing Updates{/ts} - {contact.display_name}\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  <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_display}\"}{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\n</body>\n</html>\n',1,839,'membership_autorenew_billing',1,0,0,NULL),
+ (52,'Memberships - Auto-renew Billing Updates','{ts}Membership Autorenewal Billing Updates{/ts} - {contact.display_name}\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  <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_display}\"}{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\n</body>\n</html>\n',1,839,'membership_autorenew_billing',0,1,0,NULL),
  (53,'Test-drive - Receipt Header','[TEST]\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',1,840,'test_preview',1,0,0,NULL),
  (54,'Test-drive - Receipt Header','[TEST]\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',1,840,'test_preview',0,1,0,NULL),
  (55,'Pledges - Acknowledgement','{ts}Thank you for your Pledge{/ts} - {contact.display_name}\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  <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_display}\"}{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\n</body>\n</html>\n',1,841,'pledge_acknowledge',1,0,0,NULL),
  (56,'Pledges - Acknowledgement','{ts}Thank you for your Pledge{/ts} - {contact.display_name}\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  <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_display}\"}{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\n</body>\n</html>\n',1,841,'pledge_acknowledge',0,1,0,NULL),
  (57,'Pledges - Payment Reminder','{ts}Pledge Payment Reminder{/ts} - {contact.display_name}\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  <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_display}\"}{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.id}`&pledgeId=`$pledge_id`&cs=`$checksumValue`\" a=true h=0 fe=1}{/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 you for your generous support.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n\n</body>\n</html>\n',1,842,'pledge_reminder',1,0,0,NULL),
  (58,'Pledges - Payment Reminder','{ts}Pledge Payment Reminder{/ts} - {contact.display_name}\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  <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_display}\"}{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.id}`&pledgeId=`$pledge_id`&cs=`$checksumValue`\" a=true h=0 fe=1}{/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 you for your generous support.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n\n</body>\n</html>\n',1,842,'pledge_reminder',0,1,0,NULL),
- (59,'Profiles - Admin Notification','{$grouptitle} {ts 1=$displayName}Submitted by %1{/ts} - {contact.display_name}\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  <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\n</body>\n</html>\n',1,843,'uf_notify',1,0,0,NULL),
- (60,'Profiles - Admin Notification','{$grouptitle} {ts 1=$displayName}Submitted by %1{/ts} - {contact.display_name}\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  <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\n</body>\n</html>\n',1,843,'uf_notify',0,1,0,NULL),
+ (59,'Profiles - Admin Notification','{$grouptitle} {ts 1=$userDisplayName}Submitted by %1{/ts} - {contact.display_name}\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  <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       {contact.display_name}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Date{/ts}\n      </td>\n      <td {$valueStyle}>\n       {domain.now|crmDate:\"Full\"}\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\n</body>\n</html>\n',1,843,'uf_notify',1,0,0,NULL),
+ (60,'Profiles - Admin Notification','{$grouptitle} {ts 1=$userDisplayName}Submitted by %1{/ts} - {contact.display_name}\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  <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       {contact.display_name}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Date{/ts}\n      </td>\n      <td {$valueStyle}>\n       {domain.now|crmDate:\"Full\"}\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\n</body>\n</html>\n',1,843,'uf_notify',0,1,0,NULL),
  (61,'Petition - signature added','Thank you for signing {survey.title} - {contact.display_name}\n','','{assign var=\"greeting\" value=\"{contact.email_greeting_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n<p>Thank you for signing {survey.title}.</p>\n\n{capture assign=petitionURL}{crmURL p=\'civicrm/petition/sign\' q=\"sid={survey.id}\" a=1 fe=1 h=1}{/capture}\n{include file=\"CRM/common/SocialNetwork.tpl\" url=$petitionURL title=\'{survey.title}\' pageURL=$petitionURL petition_id=\'{survey.id}\' noscript=true emailMode=true}\n',1,844,'petition_sign',1,0,0,NULL),
  (62,'Petition - signature added','Thank you for signing {survey.title} - {contact.display_name}\n','','{assign var=\"greeting\" value=\"{contact.email_greeting_display}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n<p>Thank you for signing {survey.title}.</p>\n\n{capture assign=petitionURL}{crmURL p=\'civicrm/petition/sign\' q=\"sid={survey.id}\" a=1 fe=1 h=1}{/capture}\n{include file=\"CRM/common/SocialNetwork.tpl\" url=$petitionURL title=\'{survey.title}\' pageURL=$petitionURL petition_id=\'{survey.id}\' noscript=true emailMode=true}\n',1,844,'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_display}\"}{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,845,'petition_confirmation_needed',1,0,0,NULL),
@@ -5447,7 +5453,7 @@ INSERT INTO `civicrm_navigation` (`id`, `domain_id`, `label`, `name`, `url`, `ic
  (52,1,'Register Event Participant','Register Event Participant','civicrm/participant/add?reset=1&action=add&context=standalone',NULL,'access CiviEvent,edit event participants','AND',50,1,NULL,2),
  (53,1,'Find Participants','Find Participants','civicrm/event/search?reset=1',NULL,'access CiviEvent','',50,1,NULL,3),
  (54,1,'Event Reports','Event Reports','civicrm/report/list?compid=1&reset=1',NULL,'access CiviEvent','',50,1,1,4),
- (55,1,'Import Participants','Import Participants','civicrm/event/import?reset=1',NULL,'access CiviEvent,edit event participants','AND',50,1,1,5),
+ (55,1,'Import Participants','Import Participants','civicrm/import/participant?reset=1',NULL,'access CiviEvent,edit event participants','AND',50,1,1,5),
  (56,1,'New Event','New Event','civicrm/event/add?reset=1&action=add',NULL,'access CiviEvent,edit all events','AND',50,0,NULL,6),
  (57,1,'Manage Events','Manage Events','civicrm/event/manage?reset=1',NULL,'access CiviEvent,edit all events','AND',50,1,1,7),
  (58,1,'Personal Campaign Pages','Personal Campaign Pages','civicrm/admin/pcp?reset=1&page_type=event',NULL,'access CiviEvent,administer CiviCRM','AND',50,1,1,8),
@@ -5473,7 +5479,7 @@ INSERT INTO `civicrm_navigation` (`id`, `domain_id`, `label`, `name`, `url`, `ic
  (78,1,'Find Memberships','Find Memberships','civicrm/member/search?reset=1',NULL,'access CiviMember','',75,1,NULL,3),
  (79,1,'Membership Reports','Membership Reports','civicrm/report/list?compid=3&reset=1',NULL,'access CiviMember','',75,1,1,4),
  (80,1,'Batch Data Entry','Batch Data Entry','civicrm/batch?reset=1',NULL,'access CiviContribute','',75,1,NULL,5),
- (81,1,'Import Memberships','Import Members','civicrm/member/import?reset=1',NULL,'access CiviMember,edit memberships','AND',75,1,1,6),
+ (81,1,'Import Memberships','Import Members','civicrm/import/membership?reset=1',NULL,'access CiviMember,edit memberships','AND',75,1,1,6),
  (82,1,'New Price Set','New Price Set','civicrm/admin/price/edit?reset=1&action=add',NULL,'access CiviMember,administer CiviCRM','AND',75,0,NULL,7),
  (83,1,'Manage Price Sets','Manage Price Sets','civicrm/admin/price?reset=1',NULL,'access CiviMember,administer CiviCRM','AND',75,1,NULL,8),
  (84,1,'Campaigns','Campaigns',NULL,'crm-i fa-bullhorn','interview campaign contacts,release campaign contacts,reserve campaign contacts,manage campaign,administer CiviCampaign,gotv campaign contacts','OR',NULL,1,NULL,70),
@@ -5623,7 +5629,7 @@ INSERT INTO `civicrm_navigation` (`id`, `domain_id`, `label`, `name`, `url`, `ic
  (228,1,'Api Explorer v4','Api Explorer v4','civicrm/api4#/explorer',NULL,'administer CiviCRM','',226,1,NULL,2),
  (229,1,'Developer Docs','Developer Docs','https://civicrm.org/developer-documentation?src=iam',NULL,'administer CiviCRM','',226,1,NULL,3),
  (230,1,'Reports','Reports',NULL,'crm-i fa-bar-chart','access CiviReport','',NULL,1,NULL,95),
- (231,1,'Contact Reports','Contact Reports','civicrm/report/list?compid=99&reset=1',NULL,'administer CiviCRM','',230,1,0,1),
+ (231,1,'Contact Reports','Contact Reports','civicrm/report/list?compid=99&reset=1',NULL,'access CiviReport','',230,1,0,1),
  (232,1,'Contribution Reports','Contribution Reports','civicrm/report/list?compid=2&reset=1',NULL,'access CiviContribute','',230,1,0,2),
  (233,1,'Pledge Reports','Pledge Reports','civicrm/report/list?compid=6&reset=1',NULL,'access CiviPledge','',230,1,0,3),
  (234,1,'Event Reports','Event Reports','civicrm/report/list?compid=1&reset=1',NULL,'access CiviEvent','',230,1,0,4),
@@ -5648,26 +5654,26 @@ 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`, `note_date`, `created_date`, `modified_date`, `subject`, `privacy`) VALUES
- (1,'civicrm_contact',135,'Get the registration done for NGO status',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-12-05 13:38:41',NULL,'0'),
- (2,'civicrm_contact',81,'Get the registration done for NGO status',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-01-31 23:17:32',NULL,'0'),
- (3,'civicrm_contact',71,'Arrange for cricket match with Sunil Gavaskar',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-06-11 01:50:54',NULL,'0'),
- (4,'civicrm_contact',102,'Arrange collection of funds from members',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-02-12 08:48:42',NULL,'0'),
- (5,'civicrm_contact',105,'Invite members for the Steve Prefontaine 10k dream run',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-04-12 17:49:10',NULL,'0'),
- (6,'civicrm_contact',58,'Send reminder for annual dinner',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-06-21 17:23:11',NULL,'0'),
- (7,'civicrm_contact',91,'Organize the Terry Fox run',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-02-25 05:14:40',NULL,'0'),
- (8,'civicrm_contact',100,'Invite members for the Steve Prefontaine 10k dream run',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-04-12 11:53:46',NULL,'0'),
- (9,'civicrm_contact',179,'Arrange for cricket match with Sunil Gavaskar',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-12-26 10:27:01',NULL,'0'),
- (10,'civicrm_contact',166,'Connect for presentation',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-06-17 22:57:52',NULL,'0'),
- (11,'civicrm_contact',21,'Arrange collection of funds from members',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-04-25 15:17:56',NULL,'0'),
- (12,'civicrm_contact',143,'Arrange collection of funds from members',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-11-27 12:24:44',NULL,'0'),
- (13,'civicrm_contact',175,'Reminder screening of \"Black\" on next Friday',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-02-27 12:54:18',NULL,'0'),
- (14,'civicrm_contact',107,'Send reminder for annual dinner',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-02-07 19:17:33',NULL,'0'),
- (15,'civicrm_contact',127,'Arrange for cricket match with Sunil Gavaskar',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-06-05 02:25:59',NULL,'0'),
- (16,'civicrm_contact',61,'Reminder screening of \"Black\" on next Friday',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-04-17 05:16:24',NULL,'0'),
- (17,'civicrm_contact',57,'Send reminder for annual dinner',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-11-15 08:09:53',NULL,'0'),
- (18,'civicrm_contact',127,'Send newsletter for April 2005',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-08-20 08:41:46',NULL,'0'),
- (19,'civicrm_contact',201,'Arrange for cricket match with Sunil Gavaskar',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-07-13 08:23:21',NULL,'0'),
- (20,'civicrm_contact',65,'Invite members for the Steve Prefontaine 10k dream run',1,'2024-01-06 04:30:29','2024-01-06 04:30:29','2023-08-02 14:26:38',NULL,'0');
+ (1,'civicrm_contact',48,'Invite members for the Steve Prefontaine 10k dream run',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2023-08-27 19:44:47',NULL,'0'),
+ (2,'civicrm_contact',117,'Send reminder for annual dinner',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2023-12-28 01:04:28',NULL,'0'),
+ (3,'civicrm_contact',158,'Invite members for the Steve Prefontaine 10k dream run',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2023-06-28 20:44:37',NULL,'0'),
+ (4,'civicrm_contact',4,'Organize the Terry Fox run',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2023-07-19 15:16:51',NULL,'0'),
+ (5,'civicrm_contact',110,'Send newsletter for April 2005',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2024-03-28 21:38:05',NULL,'0'),
+ (6,'civicrm_contact',138,'Chart out route map for next 10k run',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2023-11-12 15:04:30',NULL,'0'),
+ (7,'civicrm_contact',166,'Send reminder for annual dinner',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2023-08-23 05:30:23',NULL,'0'),
+ (8,'civicrm_contact',29,'Organize the Terry Fox run',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2023-07-26 16:35:36',NULL,'0'),
+ (9,'civicrm_contact',12,'Arrange collection of funds from members',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2023-12-27 19:24:20',NULL,'0'),
+ (10,'civicrm_contact',24,'Arrange for cricket match with Sunil Gavaskar',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2023-10-18 02:34:32',NULL,'0'),
+ (11,'civicrm_contact',6,'Arrange for cricket match with Sunil Gavaskar',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2023-11-08 15:10:02',NULL,'0'),
+ (12,'civicrm_contact',109,'Chart out route map for next 10k run',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2024-01-31 01:45:24',NULL,'0'),
+ (13,'civicrm_contact',32,'Reminder screening of \"Black\" on next Friday',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2023-06-20 09:55:03',NULL,'0'),
+ (14,'civicrm_contact',14,'Organize the Terry Fox run',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2024-02-23 03:19:47',NULL,'0'),
+ (15,'civicrm_contact',148,'Arrange for cricket match with Sunil Gavaskar',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2023-07-26 18:31:20',NULL,'0'),
+ (16,'civicrm_contact',130,'Organize the Terry Fox run',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2023-07-22 21:01:32',NULL,'0'),
+ (17,'civicrm_contact',168,'Reminder screening of \"Black\" on next Friday',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2024-01-02 01:47:45',NULL,'0'),
+ (18,'civicrm_contact',82,'Chart out route map for next 10k run',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2024-02-10 18:29:49',NULL,'0'),
+ (19,'civicrm_contact',47,'Reminder screening of \"Black\" on next Friday',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2023-12-06 01:20:36',NULL,'0'),
+ (20,'civicrm_contact',160,'Reminder screening of \"Black\" on next Friday',1,'2024-04-26 15:50:10','2024-04-26 15:50:10','2024-03-09 14:03:51',NULL,'0');
 /*!40000 ALTER TABLE `civicrm_note` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6674,56 +6680,56 @@ 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`, `created_id`) VALUES
- (1,94,1,1,'1','2009-01-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (2,138,2,2,'2','2008-05-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (3,183,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,NULL),
- (4,24,1,4,'4','2008-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (5,67,2,1,'1','2008-01-10 00:00:00','Check','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (6,75,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,NULL),
- (7,37,1,3,'3','2009-07-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (8,62,2,4,'4','2009-03-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (9,103,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,NULL),
- (10,80,1,2,'2','2008-02-01 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (11,161,2,3,'3','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (12,111,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,NULL),
- (13,114,1,1,'2','2008-06-04 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (14,148,2,2,'3','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (15,184,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,NULL),
- (16,89,1,4,'2','2009-01-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (17,47,2,2,'3','2008-01-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (18,98,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,NULL),
- (19,192,1,2,'1','2008-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (20,41,2,4,'1','2009-01-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (21,118,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,NULL),
- (22,187,1,2,'3','2009-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (23,87,2,4,'1','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (24,190,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,NULL),
- (25,6,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,NULL),
- (26,101,1,1,'1','2009-01-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (27,77,2,2,'2','2008-05-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (28,201,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,NULL),
- (29,38,1,4,'4','2009-12-13 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (30,144,2,1,'1','2009-12-14 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (31,72,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,NULL),
- (32,18,1,3,'3','2009-07-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (33,7,2,4,'4','2009-03-07 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (34,189,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,NULL),
- (35,65,1,2,'2','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (36,185,2,3,'3','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (37,50,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,NULL),
- (38,32,1,1,'2','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (39,25,2,2,'3','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (40,66,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,NULL),
- (41,15,1,4,'2','2009-01-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (42,162,2,2,'3','2009-12-15 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (43,2,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,NULL),
- (44,152,1,2,'1','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (45,202,2,4,'1','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (46,12,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,NULL),
- (47,167,1,2,'3','2009-10-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (48,125,2,4,'1','2009-12-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
- (49,46,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,NULL),
- (50,147,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,NULL);
+ (1,51,1,1,'1','2009-01-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (2,34,2,2,'2','2008-05-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (3,193,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,NULL),
+ (4,153,1,4,'4','2008-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (5,62,2,1,'1','2008-01-10 00:00:00','Check','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (6,132,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,NULL),
+ (7,35,1,3,'3','2009-07-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (8,95,2,4,'4','2009-03-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (9,81,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,NULL),
+ (10,75,1,2,'2','2008-02-01 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (11,54,2,3,'3','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (12,113,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,NULL),
+ (13,156,1,1,'2','2008-06-04 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (14,123,2,2,'3','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (15,101,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,NULL),
+ (16,146,1,4,'2','2009-01-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (17,163,2,2,'3','2008-01-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (18,11,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,NULL),
+ (19,87,1,2,'1','2008-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (20,10,2,4,'1','2009-01-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (21,195,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,NULL),
+ (22,129,1,2,'3','2009-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (23,8,2,4,'1','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (24,158,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,NULL),
+ (25,93,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,NULL),
+ (26,22,1,1,'1','2009-01-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (27,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,NULL),
+ (28,182,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,NULL),
+ (29,152,1,4,'4','2009-12-13 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (30,26,2,1,'1','2009-12-14 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (31,79,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,NULL),
+ (32,70,1,3,'3','2009-07-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (33,57,2,4,'4','2009-03-07 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (34,28,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,NULL),
+ (35,186,1,2,'2','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (36,6,2,3,'3','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (37,114,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,NULL),
+ (38,41,1,1,'2','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (39,21,2,2,'3','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (40,72,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,NULL),
+ (41,171,1,4,'2','2009-01-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (42,3,2,2,'3','2009-12-15 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (43,177,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,NULL),
+ (44,176,1,2,'1','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (45,18,2,4,'1','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (46,194,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,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,NULL),
+ (48,78,2,4,'1','2009-12-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL),
+ (49,67,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,NULL),
+ (50,20,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,NULL);
 /*!40000 ALTER TABLE `civicrm_participant` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6734,56 +6740,56 @@ 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,43,63),
- (2,25,64),
- (3,33,65),
- (4,46,66),
- (5,41,67),
- (6,32,68),
- (7,4,69),
- (8,39,70),
- (9,38,71),
- (10,7,72),
- (11,29,73),
- (12,20,74),
- (13,49,75),
- (14,17,76),
- (15,37,77),
- (16,8,78),
- (17,35,79),
- (18,40,80),
- (19,5,81),
- (20,31,82),
- (21,6,83),
- (22,27,84),
- (23,10,85),
- (24,23,86),
- (25,16,87),
- (26,1,88),
- (27,18,89),
- (28,26,90),
- (29,9,91),
- (30,12,92),
- (31,13,93),
- (32,21,94),
- (33,48,95),
- (34,2,96),
- (35,30,97),
- (36,50,98),
- (37,14,99),
- (38,44,100),
- (39,11,101),
- (40,42,102),
- (41,47,103),
- (42,3,104),
- (43,15,105),
- (44,36,106),
- (45,22,107),
- (46,34,108),
- (47,24,109),
- (48,19,110),
- (49,28,111),
- (50,45,112);
+ (1,1,63),
+ (2,2,64),
+ (3,3,65),
+ (4,4,66),
+ (5,5,67),
+ (6,6,68),
+ (7,7,69),
+ (8,8,70),
+ (9,9,71),
+ (10,10,72),
+ (11,11,73),
+ (12,12,74),
+ (13,13,75),
+ (14,14,76),
+ (15,15,77),
+ (16,16,78),
+ (17,17,79),
+ (18,18,80),
+ (19,19,81),
+ (20,20,82),
+ (21,21,83),
+ (22,22,84),
+ (23,23,85),
+ (24,24,86),
+ (25,25,87),
+ (26,26,88),
+ (27,27,89),
+ (28,28,90),
+ (29,29,91),
+ (30,30,92),
+ (31,31,93),
+ (32,32,94),
+ (33,33,95),
+ (34,34,96),
+ (35,35,97),
+ (36,36,98),
+ (37,37,99),
+ (38,38,100),
+ (39,39,101),
+ (40,40,102),
+ (41,41,103),
+ (42,42,104),
+ (43,43,105),
+ (44,44,106),
+ (45,45,107),
+ (46,46,108),
+ (47,47,109),
+ (48,48,110),
+ (49,49,111),
+ (50,50,112);
 /*!40000 ALTER TABLE `civicrm_participant_payment` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6856,7 +6862,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,86,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);
+ (1,89,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;
 
@@ -6878,162 +6884,161 @@ 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,120,1,1,0,NULL,'576-7505',NULL,'5767505',2),
- (2,130,1,1,0,NULL,'804-7587',NULL,'8047587',1),
- (3,99,1,1,0,NULL,'411-3825',NULL,'4113825',1),
- (4,99,1,0,0,NULL,'(311) 226-5554',NULL,'3112265554',2),
- (5,86,1,1,0,NULL,'(569) 477-6047',NULL,'5694776047',2),
- (6,86,1,0,0,NULL,'419-3585',NULL,'4193585',1),
- (7,37,1,1,0,NULL,'(219) 352-1365',NULL,'2193521365',2),
- (8,92,1,1,0,NULL,'207-6760',NULL,'2076760',2),
- (9,92,1,0,0,NULL,'(464) 544-8828',NULL,'4645448828',1),
- (10,53,1,1,0,NULL,'(696) 706-8246',NULL,'6967068246',2),
- (11,53,1,0,0,NULL,'756-8614',NULL,'7568614',2),
- (12,113,1,1,0,NULL,'550-9374',NULL,'5509374',1),
- (13,196,1,1,0,NULL,'(890) 492-5849',NULL,'8904925849',2),
- (14,196,1,0,0,NULL,'(563) 675-5151',NULL,'5636755151',1),
- (15,141,1,1,0,NULL,'(265) 840-6920',NULL,'2658406920',1),
- (16,165,1,1,0,NULL,'531-4633',NULL,'5314633',2),
- (17,46,1,1,0,NULL,'590-1201',NULL,'5901201',2),
- (18,137,1,1,0,NULL,'575-7000',NULL,'5757000',2),
- (19,137,1,0,0,NULL,'323-6848',NULL,'3236848',1),
- (20,66,1,1,0,NULL,'404-1637',NULL,'4041637',1),
- (21,66,1,0,0,NULL,'266-2586',NULL,'2662586',1),
- (22,190,1,1,0,NULL,'(409) 247-4263',NULL,'4092474263',1),
- (23,22,1,1,0,NULL,'687-7556',NULL,'6877556',2),
- (24,195,1,1,0,NULL,'(752) 229-1795',NULL,'7522291795',1),
- (25,110,1,1,0,NULL,'(487) 398-8154',NULL,'4873988154',1),
- (26,84,1,1,0,NULL,'242-6079',NULL,'2426079',1),
- (27,133,1,1,0,NULL,'556-9633',NULL,'5569633',1),
- (28,47,1,1,0,NULL,'611-9412',NULL,'6119412',2),
- (29,85,1,1,0,NULL,'644-8279',NULL,'6448279',1),
- (30,85,1,0,0,NULL,'(500) 804-4443',NULL,'5008044443',2),
- (31,193,1,1,0,NULL,'861-7338',NULL,'8617338',2),
- (32,101,1,1,0,NULL,'(250) 367-8612',NULL,'2503678612',1),
- (33,101,1,0,0,NULL,'871-9950',NULL,'8719950',2),
- (34,77,1,1,0,NULL,'(854) 779-3993',NULL,'8547793993',2),
- (35,50,1,1,0,NULL,'757-5986',NULL,'7575986',1),
- (36,50,1,0,0,NULL,'(442) 601-1411',NULL,'4426011411',1),
- (37,164,1,1,0,NULL,'(519) 821-5318',NULL,'5198215318',1),
- (38,67,1,1,0,NULL,'(205) 427-3171',NULL,'2054273171',2),
- (39,67,1,0,0,NULL,'848-1893',NULL,'8481893',1),
- (40,121,1,1,0,NULL,'785-3064',NULL,'7853064',2),
- (41,192,1,1,0,NULL,'409-2681',NULL,'4092681',1),
- (42,75,1,1,0,NULL,'(233) 256-2210',NULL,'2332562210',2),
- (43,19,1,1,0,NULL,'(755) 785-1270',NULL,'7557851270',2),
- (44,19,1,0,0,NULL,'(227) 204-8678',NULL,'2272048678',2),
- (45,146,1,1,0,NULL,'(515) 362-6065',NULL,'5153626065',1),
- (46,106,1,1,0,NULL,'736-5781',NULL,'7365781',2),
- (47,106,1,0,0,NULL,'(503) 723-8369',NULL,'5037238369',2),
- (48,71,1,1,0,NULL,'(782) 452-6489',NULL,'7824526489',2),
- (49,13,1,1,0,NULL,'(210) 815-8672',NULL,'2108158672',2),
- (50,14,1,1,0,NULL,'(822) 516-3505',NULL,'8225163505',2),
- (51,88,1,1,0,NULL,'601-5464',NULL,'6015464',2),
- (52,88,1,0,0,NULL,'(538) 417-3584',NULL,'5384173584',2),
- (53,163,1,1,0,NULL,'(548) 546-1946',NULL,'5485461946',1),
- (54,129,1,1,0,NULL,'225-2012',NULL,'2252012',2),
- (55,27,1,1,0,NULL,'803-3112',NULL,'8033112',1),
- (56,4,1,1,0,NULL,'417-6656',NULL,'4176656',2),
- (57,91,1,1,0,NULL,'(858) 312-5948',NULL,'8583125948',2),
- (58,60,1,1,0,NULL,'(546) 622-4921',NULL,'5466224921',1),
- (59,172,1,1,0,NULL,'538-3332',NULL,'5383332',1),
- (60,63,1,1,0,NULL,'708-3745',NULL,'7083745',2),
- (61,63,1,0,0,NULL,'364-4717',NULL,'3644717',2),
- (62,102,1,1,0,NULL,'(848) 670-3275',NULL,'8486703275',1),
- (63,117,1,1,0,NULL,'(822) 576-2550',NULL,'8225762550',2),
- (64,17,1,1,0,NULL,'(366) 841-1082',NULL,'3668411082',1),
- (65,17,1,0,0,NULL,'(669) 751-6827',NULL,'6697516827',1),
- (66,16,1,1,0,NULL,'(204) 572-1264',NULL,'2045721264',2),
- (67,16,1,0,0,NULL,'(301) 643-8023',NULL,'3016438023',1),
- (68,159,1,1,0,NULL,'642-1912',NULL,'6421912',1),
- (69,41,1,1,0,NULL,'574-8756',NULL,'5748756',1),
- (70,41,1,0,0,NULL,'(623) 290-8773',NULL,'6232908773',2),
- (71,30,1,1,0,NULL,'(837) 816-2028',NULL,'8378162028',1),
- (72,98,1,1,0,NULL,'443-3561',NULL,'4433561',2),
- (73,109,1,1,0,NULL,'(733) 889-7695',NULL,'7338897695',1),
- (74,155,1,1,0,NULL,'(793) 723-1124',NULL,'7937231124',1),
- (75,155,1,0,0,NULL,'(491) 883-1926',NULL,'4918831926',1),
- (76,125,1,1,0,NULL,'792-4382',NULL,'7924382',1),
- (77,125,1,0,0,NULL,'(542) 727-7168',NULL,'5427277168',1),
- (78,189,1,1,0,NULL,'(209) 533-9689',NULL,'2095339689',2),
- (79,57,1,1,0,NULL,'(440) 835-1640',NULL,'4408351640',1),
- (80,57,1,0,0,NULL,'644-2716',NULL,'6442716',1),
- (81,114,1,1,0,NULL,'408-4135',NULL,'4084135',1),
- (82,114,1,0,0,NULL,'685-6487',NULL,'6856487',1),
- (83,175,1,1,0,NULL,'(776) 343-2358',NULL,'7763432358',2),
- (84,49,1,1,0,NULL,'(535) 838-4817',NULL,'5358384817',1),
- (85,69,1,1,0,NULL,'(785) 389-5755',NULL,'7853895755',2),
- (86,58,1,1,0,NULL,'879-7960',NULL,'8797960',1),
- (87,56,1,1,0,NULL,'277-5034',NULL,'2775034',2),
- (88,140,1,1,0,NULL,'346-8687',NULL,'3468687',1),
- (89,38,1,1,0,NULL,'(804) 291-1570',NULL,'8042911570',1),
- (90,38,1,0,0,NULL,'664-6943',NULL,'6646943',2),
- (91,107,1,1,0,NULL,'(662) 474-5980',NULL,'6624745980',1),
- (92,134,1,1,0,NULL,'774-4759',NULL,'7744759',2),
- (93,79,1,1,0,NULL,'443-3687',NULL,'4433687',1),
- (94,79,1,0,0,NULL,'(486) 689-7704',NULL,'4866897704',2),
- (95,32,1,1,0,NULL,'220-5874',NULL,'2205874',2),
- (96,42,1,1,0,NULL,'(793) 637-9745',NULL,'7936379745',1),
- (97,42,1,0,0,NULL,'(271) 688-2880',NULL,'2716882880',1),
- (98,132,1,1,0,NULL,'(568) 582-3180',NULL,'5685823180',1),
- (99,132,1,0,0,NULL,'(238) 849-7668',NULL,'2388497668',2),
- (100,160,1,1,0,NULL,'467-7573',NULL,'4677573',1),
- (101,160,1,0,0,NULL,'(826) 647-5608',NULL,'8266475608',1),
- (102,96,1,1,0,NULL,'(322) 557-8828',NULL,'3225578828',1),
- (103,185,1,1,0,NULL,'(644) 616-6984',NULL,'6446166984',1),
- (104,185,1,0,0,NULL,'(665) 622-1516',NULL,'6656221516',2),
- (105,158,1,1,0,NULL,'(471) 603-2209',NULL,'4716032209',1),
- (106,119,1,1,0,NULL,'(757) 534-6636',NULL,'7575346636',2),
- (107,103,1,1,0,NULL,'835-4556',NULL,'8354556',2),
- (108,103,1,0,0,NULL,'(736) 218-2716',NULL,'7362182716',1),
- (109,112,1,1,0,NULL,'330-4678',NULL,'3304678',2),
- (110,112,1,0,0,NULL,'(709) 590-5230',NULL,'7095905230',1),
- (111,108,1,1,0,NULL,'285-6598',NULL,'2856598',2),
- (112,33,1,1,0,NULL,'(738) 665-2249',NULL,'7386652249',1),
- (113,33,1,0,0,NULL,'(429) 830-6169',NULL,'4298306169',2),
- (114,104,1,1,0,NULL,'616-1009',NULL,'6161009',2),
- (115,7,1,1,0,NULL,'536-2772',NULL,'5362772',2),
- (116,29,1,1,0,NULL,'(564) 876-1571',NULL,'5648761571',1),
- (117,197,1,1,0,NULL,'814-7118',NULL,'8147118',1),
- (118,9,1,1,0,NULL,'(799) 256-5836',NULL,'7992565836',2),
- (119,9,1,0,0,NULL,'617-1823',NULL,'6171823',1),
- (120,179,1,1,0,NULL,'(557) 493-5870',NULL,'5574935870',1),
- (121,179,1,0,0,NULL,'(831) 864-8361',NULL,'8318648361',2),
- (122,162,1,1,0,NULL,'(410) 578-6490',NULL,'4105786490',1),
- (123,20,1,1,0,NULL,'(544) 797-1489',NULL,'5447971489',2),
- (124,20,1,0,0,NULL,'514-9510',NULL,'5149510',2),
- (125,18,1,1,0,NULL,'624-5432',NULL,'6245432',2),
- (126,18,1,0,0,NULL,'(821) 759-9432',NULL,'8217599432',1),
- (127,61,1,1,0,NULL,'463-3949',NULL,'4633949',1),
- (128,35,1,1,0,NULL,'(222) 875-4873',NULL,'2228754873',1),
- (129,111,1,1,0,NULL,'(865) 842-4637',NULL,'8658424637',1),
- (130,111,1,0,0,NULL,'(738) 498-4809',NULL,'7384984809',1),
- (131,178,1,1,0,NULL,'563-7792',NULL,'5637792',2),
- (132,31,1,1,0,NULL,'(837) 448-2521',NULL,'8374482521',2),
- (133,31,1,0,0,NULL,'267-1329',NULL,'2671329',1),
- (134,74,1,1,0,NULL,'(253) 784-8156',NULL,'2537848156',2),
- (135,74,1,0,0,NULL,'310-8551',NULL,'3108551',2),
- (136,126,1,1,0,NULL,'495-1945',NULL,'4951945',1),
- (137,186,1,1,0,NULL,'(899) 833-4935',NULL,'8998334935',1),
- (138,186,1,0,0,NULL,'(219) 848-7031',NULL,'2198487031',2),
- (139,26,1,1,0,NULL,'(630) 560-3368',NULL,'6305603368',2),
- (140,139,1,1,0,NULL,'(458) 425-1943',NULL,'4584251943',1),
- (141,201,1,1,0,NULL,'693-6513',NULL,'6936513',1),
- (142,28,1,1,0,NULL,'495-4859',NULL,'4954859',1),
- (143,28,1,0,0,NULL,'561-4207',NULL,'5614207',1),
- (144,72,1,1,0,NULL,'511-9369',NULL,'5119369',2),
- (145,72,1,0,0,NULL,'(263) 702-5396',NULL,'2637025396',1),
- (146,12,1,1,0,NULL,'(344) 362-3872',NULL,'3443623872',2),
- (147,136,1,1,0,NULL,'(752) 652-3738',NULL,'7526523738',2),
- (148,78,1,1,0,NULL,'(844) 712-7968',NULL,'8447127968',2),
- (149,78,1,0,0,NULL,'310-9055',NULL,'3109055',2),
- (150,54,1,1,0,NULL,'525-6572',NULL,'5256572',2),
- (151,54,1,0,0,NULL,'(204) 314-9112',NULL,'2043149112',2),
- (152,94,1,1,0,NULL,'252-1523',NULL,'2521523',2),
- (153,157,1,1,0,NULL,'(540) 591-4504',NULL,'5405914504',1),
- (154,NULL,1,0,0,NULL,'204 222-1000',NULL,'2042221000',1),
- (155,NULL,1,0,0,NULL,'204 223-1000',NULL,'2042231000',1),
- (156,NULL,1,0,0,NULL,'303 323-1000',NULL,'3033231000',1);
+ (1,8,1,1,0,NULL,'587-6756',NULL,'5876756',2),
+ (2,89,1,1,0,NULL,'(389) 470-5421',NULL,'3894705421',1),
+ (3,89,1,0,0,NULL,'(641) 483-4759',NULL,'6414834759',2),
+ (4,37,1,1,0,NULL,'(322) 512-4592',NULL,'3225124592',1),
+ (5,37,1,0,0,NULL,'(240) 210-2329',NULL,'2402102329',1),
+ (6,107,1,1,0,NULL,'(204) 251-4382',NULL,'2042514382',2),
+ (7,200,1,1,0,NULL,'(838) 866-3690',NULL,'8388663690',2),
+ (8,200,1,0,0,NULL,'316-9908',NULL,'3169908',2),
+ (9,20,1,1,0,NULL,'(633) 416-1786',NULL,'6334161786',2),
+ (10,63,1,1,0,NULL,'(495) 446-5109',NULL,'4954465109',2),
+ (11,63,1,0,0,NULL,'604-9596',NULL,'6049596',1),
+ (12,158,1,1,0,NULL,'(539) 615-1888',NULL,'5396151888',1),
+ (13,116,1,1,0,NULL,'(238) 883-1898',NULL,'2388831898',2),
+ (14,6,1,1,0,NULL,'(218) 379-3409',NULL,'2183793409',1),
+ (15,6,1,0,0,NULL,'776-3045',NULL,'7763045',2),
+ (16,78,1,1,0,NULL,'279-8726',NULL,'2798726',1),
+ (17,78,1,0,0,NULL,'(809) 607-8860',NULL,'8096078860',2),
+ (18,13,1,1,0,NULL,'622-8150',NULL,'6228150',2),
+ (19,177,1,1,0,NULL,'447-8954',NULL,'4478954',1),
+ (20,21,1,1,0,NULL,'(562) 354-8944',NULL,'5623548944',1),
+ (21,79,1,1,0,NULL,'858-6404',NULL,'8586404',1),
+ (22,79,1,0,0,NULL,'241-7229',NULL,'2417229',1),
+ (23,171,1,1,0,NULL,'428-7797',NULL,'4287797',2),
+ (24,171,1,0,0,NULL,'321-3784',NULL,'3213784',1),
+ (25,58,1,1,0,NULL,'(297) 249-1401',NULL,'2972491401',2),
+ (26,160,1,1,0,NULL,'324-5355',NULL,'3245355',1),
+ (27,22,1,1,0,NULL,'464-6657',NULL,'4646657',2),
+ (28,22,1,0,0,NULL,'(509) 352-4601',NULL,'5093524601',1),
+ (29,166,1,1,0,NULL,'(580) 709-1123',NULL,'5807091123',2),
+ (30,166,1,0,0,NULL,'(292) 252-2995',NULL,'2922522995',1),
+ (31,167,1,1,0,NULL,'521-2922',NULL,'5212922',1),
+ (32,167,1,0,0,NULL,'690-1206',NULL,'6901206',2),
+ (33,94,1,1,0,NULL,'(424) 409-8505',NULL,'4244098505',2),
+ (34,74,1,1,0,NULL,'368-6460',NULL,'3686460',1),
+ (35,61,1,1,0,NULL,'(674) 536-5959',NULL,'6745365959',2),
+ (36,35,1,1,0,NULL,'(354) 435-5811',NULL,'3544355811',2),
+ (37,187,1,1,0,NULL,'798-9241',NULL,'7989241',1),
+ (38,187,1,0,0,NULL,'389-3740',NULL,'3893740',2),
+ (39,122,1,1,0,NULL,'(795) 575-2502',NULL,'7955752502',1),
+ (40,122,1,0,0,NULL,'(714) 822-5427',NULL,'7148225427',1),
+ (41,159,1,1,0,NULL,'374-5561',NULL,'3745561',1),
+ (42,93,1,1,0,NULL,'665-6046',NULL,'6656046',2),
+ (43,60,1,1,0,NULL,'309-9832',NULL,'3099832',1),
+ (44,60,1,0,0,NULL,'(258) 592-9380',NULL,'2585929380',1),
+ (45,66,1,1,0,NULL,'(437) 248-3187',NULL,'4372483187',1),
+ (46,81,1,1,0,NULL,'(572) 220-2235',NULL,'5722202235',1),
+ (47,81,1,0,0,NULL,'483-5731',NULL,'4835731',2),
+ (48,131,1,1,0,NULL,'(510) 507-7020',NULL,'5105077020',2),
+ (49,131,1,0,0,NULL,'(868) 332-8065',NULL,'8683328065',2),
+ (50,143,1,1,0,NULL,'306-8870',NULL,'3068870',1),
+ (51,143,1,0,0,NULL,'835-3894',NULL,'8353894',1),
+ (52,201,1,1,0,NULL,'(483) 710-7760',NULL,'4837107760',1),
+ (53,92,1,1,0,NULL,'534-1609',NULL,'5341609',1),
+ (54,92,1,0,0,NULL,'266-7430',NULL,'2667430',2),
+ (55,5,1,1,0,NULL,'(740) 663-5586',NULL,'7406635586',2),
+ (56,5,1,0,0,NULL,'807-5904',NULL,'8075904',1),
+ (57,194,1,1,0,NULL,'823-7420',NULL,'8237420',1),
+ (58,194,1,0,0,NULL,'403-2058',NULL,'4032058',1),
+ (59,145,1,1,0,NULL,'307-3976',NULL,'3073976',1),
+ (60,145,1,0,0,NULL,'(386) 337-3038',NULL,'3863373038',1),
+ (61,88,1,1,0,NULL,'(272) 713-1640',NULL,'2727131640',1),
+ (62,88,1,0,0,NULL,'(861) 265-7395',NULL,'8612657395',2),
+ (63,99,1,1,0,NULL,'(402) 315-2097',NULL,'4023152097',1),
+ (64,99,1,0,0,NULL,'(684) 247-6024',NULL,'6842476024',1),
+ (65,55,1,1,0,NULL,'728-3333',NULL,'7283333',2),
+ (66,100,1,1,0,NULL,'(477) 235-4317',NULL,'4772354317',1),
+ (67,100,1,0,0,NULL,'418-2740',NULL,'4182740',1),
+ (68,142,1,1,0,NULL,'462-9326',NULL,'4629326',2),
+ (69,179,1,1,0,NULL,'(285) 409-6732',NULL,'2854096732',2),
+ (70,179,1,0,0,NULL,'399-2871',NULL,'3992871',1),
+ (71,186,1,1,0,NULL,'(744) 373-6140',NULL,'7443736140',2),
+ (72,118,1,1,0,NULL,'(743) 253-7988',NULL,'7432537988',1),
+ (73,65,1,1,0,NULL,'(499) 361-6783',NULL,'4993616783',1),
+ (74,54,1,1,0,NULL,'729-3642',NULL,'7293642',1),
+ (75,54,1,0,0,NULL,'(867) 312-5775',NULL,'8673125775',2),
+ (76,32,1,1,0,NULL,'(497) 800-2995',NULL,'4978002995',1),
+ (77,30,1,1,0,NULL,'(850) 437-9358',NULL,'8504379358',1),
+ (78,43,1,1,0,NULL,'376-8709',NULL,'3768709',2),
+ (79,19,1,1,0,NULL,'(411) 553-1689',NULL,'4115531689',1),
+ (80,19,1,0,0,NULL,'(499) 309-9620',NULL,'4993099620',2),
+ (81,105,1,1,0,NULL,'(795) 636-6034',NULL,'7956366034',1),
+ (82,67,1,1,0,NULL,'(830) 648-7636',NULL,'8306487636',2),
+ (83,77,1,1,0,NULL,'(768) 536-2239',NULL,'7685362239',2),
+ (84,77,1,0,0,NULL,'596-5943',NULL,'5965943',2),
+ (85,70,1,1,0,NULL,'669-2208',NULL,'6692208',1),
+ (86,176,1,1,0,NULL,'(573) 722-3564',NULL,'5737223564',1),
+ (87,176,1,0,0,NULL,'(751) 413-7545',NULL,'7514137545',1),
+ (88,173,1,1,0,NULL,'(285) 282-9091',NULL,'2852829091',2),
+ (89,53,1,1,0,NULL,'(203) 465-5249',NULL,'2034655249',2),
+ (90,151,1,1,0,NULL,'(605) 316-3926',NULL,'6053163926',2),
+ (91,151,1,0,0,NULL,'675-5271',NULL,'6755271',2),
+ (92,101,1,1,0,NULL,'323-6779',NULL,'3236779',1),
+ (93,24,1,1,0,NULL,'423-6551',NULL,'4236551',2),
+ (94,24,1,0,0,NULL,'736-9244',NULL,'7369244',2),
+ (95,62,1,1,0,NULL,'(766) 474-9998',NULL,'7664749998',1),
+ (96,62,1,0,0,NULL,'(804) 660-9232',NULL,'8046609232',1),
+ (97,33,1,1,0,NULL,'250-4548',NULL,'2504548',1),
+ (98,191,1,1,0,NULL,'(321) 758-5190',NULL,'3217585190',1),
+ (99,191,1,0,0,NULL,'(695) 504-3826',NULL,'6955043826',1),
+ (100,97,1,1,0,NULL,'224-8272',NULL,'2248272',2),
+ (101,39,1,1,0,NULL,'368-5653',NULL,'3685653',1),
+ (102,39,1,0,0,NULL,'317-9121',NULL,'3179121',1),
+ (103,25,1,1,0,NULL,'(205) 350-2566',NULL,'2053502566',2),
+ (104,157,1,1,0,NULL,'312-3380',NULL,'3123380',2),
+ (105,157,1,0,0,NULL,'(354) 768-5066',NULL,'3547685066',1),
+ (106,148,1,1,0,NULL,'(202) 547-1138',NULL,'2025471138',2),
+ (107,50,1,1,0,NULL,'(228) 491-4813',NULL,'2284914813',2),
+ (108,50,1,0,0,NULL,'688-9434',NULL,'6889434',2),
+ (109,190,1,1,0,NULL,'(548) 464-3157',NULL,'5484643157',1),
+ (110,16,1,1,0,NULL,'266-1235',NULL,'2661235',1),
+ (111,16,1,0,0,NULL,'(502) 311-7990',NULL,'5023117990',1),
+ (112,2,1,1,0,NULL,'893-8185',NULL,'8938185',1),
+ (113,188,1,1,0,NULL,'(707) 243-6728',NULL,'7072436728',1),
+ (114,146,1,1,0,NULL,'309-8742',NULL,'3098742',1),
+ (115,146,1,0,0,NULL,'570-5749',NULL,'5705749',1),
+ (116,113,1,1,0,NULL,'214-2693',NULL,'2142693',1),
+ (117,110,1,1,0,NULL,'695-1358',NULL,'6951358',2),
+ (118,110,1,0,0,NULL,'(364) 245-7832',NULL,'3642457832',2),
+ (119,47,1,1,0,NULL,'(542) 757-9958',NULL,'5427579958',2),
+ (120,47,1,0,0,NULL,'(861) 747-5342',NULL,'8617475342',1),
+ (121,48,1,1,0,NULL,'(771) 641-7687',NULL,'7716417687',2),
+ (122,34,1,1,0,NULL,'501-3048',NULL,'5013048',1),
+ (123,34,1,0,0,NULL,'766-6377',NULL,'7666377',1),
+ (124,75,1,1,0,NULL,'(492) 497-2000',NULL,'4924972000',1),
+ (125,83,1,1,0,NULL,'257-8094',NULL,'2578094',1),
+ (126,150,1,1,0,NULL,'606-2488',NULL,'6062488',1),
+ (127,150,1,0,0,NULL,'376-4345',NULL,'3764345',2),
+ (128,168,1,1,0,NULL,'(843) 774-8295',NULL,'8437748295',2),
+ (129,31,1,1,0,NULL,'619-8494',NULL,'6198494',2),
+ (130,64,1,1,0,NULL,'800-1566',NULL,'8001566',2),
+ (131,72,1,1,0,NULL,'(452) 421-8966',NULL,'4524218966',2),
+ (132,15,1,1,0,NULL,'(820) 555-9077',NULL,'8205559077',1),
+ (133,15,1,0,0,NULL,'(482) 794-7442',NULL,'4827947442',1),
+ (134,115,1,1,0,NULL,'640-7119',NULL,'6407119',2),
+ (135,115,1,0,0,NULL,'(468) 375-2163',NULL,'4683752163',1),
+ (136,181,1,1,0,NULL,'(358) 435-5825',NULL,'3584355825',2),
+ (137,181,1,0,0,NULL,'(665) 324-6057',NULL,'6653246057',2),
+ (138,175,1,1,0,NULL,'(248) 727-1645',NULL,'2487271645',2),
+ (139,175,1,0,0,NULL,'282-1197',NULL,'2821197',1),
+ (140,180,1,1,0,NULL,'255-4203',NULL,'2554203',2),
+ (141,180,1,0,0,NULL,'(512) 272-2532',NULL,'5122722532',2),
+ (142,87,1,1,0,NULL,'(399) 324-9451',NULL,'3993249451',1),
+ (143,3,1,1,0,NULL,'896-7101',NULL,'8967101',1),
+ (144,3,1,0,0,NULL,'(703) 733-4157',NULL,'7037334157',1),
+ (145,165,1,1,0,NULL,'826-9298',NULL,'8269298',1),
+ (146,126,1,1,0,NULL,'(535) 363-5339',NULL,'5353635339',1),
+ (147,126,1,0,0,NULL,'(649) 338-8602',NULL,'6493388602',1),
+ (148,104,1,1,0,NULL,'(735) 315-9693',NULL,'7353159693',1),
+ (149,104,1,0,0,NULL,'788-8307',NULL,'7888307',1),
+ (150,139,1,1,0,NULL,'(237) 532-6201',NULL,'2375326201',2),
+ (151,139,1,0,0,NULL,'(577) 625-9495',NULL,'5776259495',2),
+ (152,119,1,1,0,NULL,'(316) 420-2548',NULL,'3164202548',2),
+ (153,NULL,1,0,0,NULL,'204 222-1000',NULL,'2042221000',1),
+ (154,NULL,1,0,0,NULL,'204 223-1000',NULL,'2042231000',1),
+ (155,NULL,1,0,0,NULL,'303 323-1000',NULL,'3033231000',1);
 /*!40000 ALTER TABLE `civicrm_phone` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7267,223 +7272,222 @@ 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`, `created_date`, `modified_date`) VALUES
- (1,175,83,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (2,49,83,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (3,175,114,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (4,49,114,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (5,49,175,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (6,114,152,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (7,175,152,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (8,49,152,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (9,83,152,7,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (10,114,83,2,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (11,68,124,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (12,69,124,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (13,68,3,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (14,69,3,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (15,69,68,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (16,3,89,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (17,68,89,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (18,69,89,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (19,124,89,7,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (20,3,124,2,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (21,56,58,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (22,140,58,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (23,56,2,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (24,140,2,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (25,140,56,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (26,2,177,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (27,56,177,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (28,140,177,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (29,58,177,7,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (30,2,58,2,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (31,107,38,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (32,134,38,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (33,107,24,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (34,134,24,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (35,134,107,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (36,24,167,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (37,107,167,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (38,134,167,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (39,38,167,7,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (40,24,38,2,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (41,79,149,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (42,32,149,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (43,79,123,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (44,32,123,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (45,32,79,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (46,123,115,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (47,79,115,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (48,32,115,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (49,149,115,7,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (50,123,149,2,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (51,132,42,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (52,199,42,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (53,132,143,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (54,199,143,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (55,199,132,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (56,143,147,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (57,132,147,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (58,199,147,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (59,42,147,7,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (60,143,42,2,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (61,188,144,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (62,8,144,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (63,188,160,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (64,8,160,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (65,8,188,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (66,160,161,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (67,188,161,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (68,8,161,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (69,144,161,7,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (70,160,144,2,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (71,185,96,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (72,158,96,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (73,185,11,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (74,158,11,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (75,158,185,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (76,11,127,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (77,185,127,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (78,158,127,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (79,96,127,7,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (80,11,96,2,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (81,112,119,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (82,150,119,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (83,112,103,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (84,150,103,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (85,150,112,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (86,103,6,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (87,112,6,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (88,150,6,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (89,119,6,7,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (90,103,119,2,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (91,191,95,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (92,105,95,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (93,191,108,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (94,105,108,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (95,105,191,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (96,108,5,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (97,191,5,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (98,105,5,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (99,95,5,7,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (100,108,95,2,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (101,104,153,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (102,151,153,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (103,104,33,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (104,151,33,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (105,151,104,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (106,33,174,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (107,104,174,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (108,151,174,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (109,153,174,7,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (110,33,153,2,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (111,65,7,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (112,43,7,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (113,65,29,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (114,43,29,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (115,43,65,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (116,29,80,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (117,65,80,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (118,43,80,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (119,7,80,7,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (120,29,7,2,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (121,179,197,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (122,39,197,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (123,179,9,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (124,39,9,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (125,39,179,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (126,9,55,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (127,179,55,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (128,39,55,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (129,197,55,7,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (130,9,197,2,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (131,20,162,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (132,25,162,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (133,20,169,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (134,25,169,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (135,25,20,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (136,169,171,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (137,20,171,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (138,25,171,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (139,162,171,7,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (140,169,162,2,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (141,61,97,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (142,35,97,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (143,61,18,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (144,35,18,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (145,35,61,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (146,18,182,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (147,61,182,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (148,35,182,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (149,97,182,7,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (150,18,97,2,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (151,31,111,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (152,74,111,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (153,31,178,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (154,74,178,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (155,74,31,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (156,178,45,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (157,31,45,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (158,74,45,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (159,111,45,7,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (160,178,111,2,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (161,26,126,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (162,139,126,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (163,26,186,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (164,139,186,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (165,139,26,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (166,186,156,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (167,26,156,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (168,139,156,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (169,126,156,7,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (170,186,126,2,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (171,28,201,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (172,72,201,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (173,28,194,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (174,72,194,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (175,72,28,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (176,194,131,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (177,28,131,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (178,72,131,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (179,201,131,7,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (180,194,201,2,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (181,81,12,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (182,78,12,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (183,81,136,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (184,78,136,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (185,78,81,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (186,136,116,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (187,81,116,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (188,78,116,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (189,12,116,7,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (190,136,12,2,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (191,157,54,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (192,82,54,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (193,157,94,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (194,82,94,1,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (195,82,157,4,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (196,94,184,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (197,157,184,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (198,82,184,8,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (199,54,184,7,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (200,94,54,2,NULL,NULL,0,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (201,46,21,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (202,49,36,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (203,3,40,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (204,165,48,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (205,57,51,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (206,139,73,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (207,50,87,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (208,52,118,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (209,110,122,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (210,130,135,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (211,82,138,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (212,103,145,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (213,141,154,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (214,151,170,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (215,160,173,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (216,109,180,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28'),
- (217,68,187,5,NULL,NULL,1,NULL,0,0,NULL,'2024-01-06 04:30:28','2024-01-06 04:30:28');
+ (1,77,67,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (2,127,67,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (3,77,156,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (4,127,156,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (5,127,77,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (6,156,162,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (7,77,162,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (8,127,162,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (9,67,162,7,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (10,156,67,2,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (11,176,70,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (12,56,70,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (13,176,182,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (14,56,182,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (15,56,176,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (16,182,80,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (17,176,80,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (18,56,80,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (19,70,80,7,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (20,182,70,2,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (21,53,153,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (22,151,153,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (23,53,173,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (24,151,173,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (25,151,53,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (26,173,137,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (27,53,137,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (28,151,137,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (29,153,137,7,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (30,173,153,2,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (31,51,101,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (32,7,101,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (33,51,109,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (34,7,109,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (35,7,51,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (36,109,141,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (37,51,141,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (38,7,141,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (39,101,141,7,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (40,109,101,2,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (41,62,24,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (42,33,24,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (43,62,57,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (44,33,57,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (45,33,62,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (46,57,98,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (47,62,98,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (48,33,98,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (49,24,98,7,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (50,57,24,2,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (51,106,191,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (52,91,191,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (53,106,97,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (54,91,97,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (55,91,106,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (56,97,161,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (57,106,161,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (58,91,161,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (59,191,161,7,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (60,97,191,2,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (61,25,39,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (62,157,39,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (63,25,155,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (64,157,155,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (65,157,25,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (66,155,10,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (67,25,10,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (68,157,10,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (69,39,10,7,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (70,155,39,2,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (71,50,148,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (72,190,148,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (73,50,133,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (74,190,133,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (75,190,50,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (76,133,199,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (77,50,199,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (78,190,199,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (79,148,199,7,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (80,133,148,2,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (81,117,16,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (82,188,16,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (83,117,2,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (84,188,2,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (85,188,117,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (86,2,29,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (87,117,29,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (88,188,29,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (89,16,29,7,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (90,2,16,2,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (91,113,146,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (92,44,146,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (93,113,195,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (94,44,195,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (95,44,113,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (96,195,59,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (97,113,59,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (98,44,59,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (99,146,59,7,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (100,195,146,2,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (101,82,110,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (102,172,110,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (103,82,163,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (104,172,163,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (105,172,82,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (106,163,46,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (107,82,46,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (108,172,46,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (109,110,46,7,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (110,163,110,2,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (111,47,12,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (112,140,12,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (113,47,147,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (114,140,147,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (115,140,47,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (116,147,11,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (117,47,11,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (118,140,11,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (119,12,11,7,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (120,147,12,2,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (121,38,48,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (122,108,48,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (123,38,149,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (124,108,149,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (125,108,38,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (126,149,170,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (127,38,170,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (128,108,170,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (129,48,170,7,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (130,149,48,2,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (131,75,26,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (132,27,26,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (133,75,34,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (134,27,34,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (135,27,75,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (136,34,41,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (137,75,41,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (138,27,41,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (139,26,41,7,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (140,34,26,2,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (141,168,83,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (142,31,83,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (143,168,150,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (144,31,150,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (145,31,168,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (146,150,102,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (147,168,102,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (148,31,102,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (149,83,102,7,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (150,150,83,2,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (151,72,183,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (152,15,183,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (153,72,64,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (154,15,64,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (155,15,72,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (156,64,86,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (157,72,86,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (158,15,86,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (159,183,86,7,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (160,64,183,2,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (161,181,115,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (162,175,115,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (163,181,71,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (164,175,71,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (165,175,181,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (166,71,132,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (167,181,132,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (168,175,132,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (169,115,132,7,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (170,71,115,2,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (171,3,180,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (172,103,180,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (173,3,87,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (174,103,87,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (175,103,3,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (176,87,178,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (177,3,178,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (178,103,178,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (179,180,178,7,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (180,87,180,2,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (181,120,165,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (182,164,165,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (183,120,126,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (184,164,126,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (185,164,120,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (186,126,152,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (187,120,152,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (188,164,152,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (189,165,152,7,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (190,126,165,2,NULL,NULL,0,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (191,119,104,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (192,45,104,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (193,119,139,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (194,45,139,1,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (195,45,119,4,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (196,139,18,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (197,119,18,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (198,45,18,8,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (199,104,18,7,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (200,139,104,2,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (201,60,9,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (202,78,17,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (203,146,40,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (204,158,49,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (205,155,69,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (206,166,84,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (207,52,121,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (208,163,124,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (209,138,129,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (210,34,130,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (211,74,144,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (212,32,169,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (213,73,174,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (214,83,184,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (215,186,192,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09'),
+ (216,108,193,5,NULL,NULL,1,NULL,0,0,NULL,'2024-04-26 15:50:09','2024-04-26 15:50:09');
 /*!40000 ALTER TABLE `civicrm_relationship` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7494,440 +7498,438 @@ 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`, `case_id`) VALUES
- (1,1,1,'a_b',175,'Child of',83,'Parent of',1,NULL,NULL,NULL),
- (2,1,1,'b_a',83,'Parent of',175,'Child of',1,NULL,NULL,NULL),
- (3,2,1,'a_b',49,'Child of',83,'Parent of',1,NULL,NULL,NULL),
- (4,2,1,'b_a',83,'Parent of',49,'Child of',1,NULL,NULL,NULL),
- (5,3,1,'a_b',175,'Child of',114,'Parent of',1,NULL,NULL,NULL),
- (6,3,1,'b_a',114,'Parent of',175,'Child of',1,NULL,NULL,NULL),
- (7,4,1,'a_b',49,'Child of',114,'Parent of',1,NULL,NULL,NULL),
- (8,4,1,'b_a',114,'Parent of',49,'Child of',1,NULL,NULL,NULL),
- (9,5,4,'a_b',49,'Sibling of',175,'Sibling of',1,NULL,NULL,NULL),
- (10,5,4,'b_a',175,'Sibling of',49,'Sibling of',1,NULL,NULL,NULL),
- (11,6,8,'a_b',114,'Household Member of',152,'Household Member is',1,NULL,NULL,NULL),
- (12,6,8,'b_a',152,'Household Member is',114,'Household Member of',1,NULL,NULL,NULL),
- (13,7,8,'a_b',175,'Household Member of',152,'Household Member is',1,NULL,NULL,NULL),
- (14,7,8,'b_a',152,'Household Member is',175,'Household Member of',1,NULL,NULL,NULL),
- (15,8,8,'a_b',49,'Household Member of',152,'Household Member is',1,NULL,NULL,NULL),
- (16,8,8,'b_a',152,'Household Member is',49,'Household Member of',1,NULL,NULL,NULL),
- (17,9,7,'a_b',83,'Head of Household for',152,'Head of Household is',0,NULL,NULL,NULL),
- (18,9,7,'b_a',152,'Head of Household is',83,'Head of Household for',0,NULL,NULL,NULL),
- (19,10,2,'a_b',114,'Spouse of',83,'Spouse of',0,NULL,NULL,NULL),
- (20,10,2,'b_a',83,'Spouse of',114,'Spouse of',0,NULL,NULL,NULL),
- (21,11,1,'a_b',68,'Child of',124,'Parent of',1,NULL,NULL,NULL),
- (22,11,1,'b_a',124,'Parent of',68,'Child of',1,NULL,NULL,NULL),
- (23,12,1,'a_b',69,'Child of',124,'Parent of',1,NULL,NULL,NULL),
- (24,12,1,'b_a',124,'Parent of',69,'Child of',1,NULL,NULL,NULL),
- (25,13,1,'a_b',68,'Child of',3,'Parent of',1,NULL,NULL,NULL),
- (26,13,1,'b_a',3,'Parent of',68,'Child of',1,NULL,NULL,NULL),
- (27,14,1,'a_b',69,'Child of',3,'Parent of',1,NULL,NULL,NULL),
- (28,14,1,'b_a',3,'Parent of',69,'Child of',1,NULL,NULL,NULL),
- (29,15,4,'a_b',69,'Sibling of',68,'Sibling of',1,NULL,NULL,NULL),
- (30,15,4,'b_a',68,'Sibling of',69,'Sibling of',1,NULL,NULL,NULL),
- (31,16,8,'a_b',3,'Household Member of',89,'Household Member is',1,NULL,NULL,NULL),
- (32,16,8,'b_a',89,'Household Member is',3,'Household Member of',1,NULL,NULL,NULL),
- (33,17,8,'a_b',68,'Household Member of',89,'Household Member is',1,NULL,NULL,NULL),
- (34,17,8,'b_a',89,'Household Member is',68,'Household Member of',1,NULL,NULL,NULL),
- (35,18,8,'a_b',69,'Household Member of',89,'Household Member is',1,NULL,NULL,NULL),
- (36,18,8,'b_a',89,'Household Member is',69,'Household Member of',1,NULL,NULL,NULL),
- (37,19,7,'a_b',124,'Head of Household for',89,'Head of Household is',0,NULL,NULL,NULL),
- (38,19,7,'b_a',89,'Head of Household is',124,'Head of Household for',0,NULL,NULL,NULL),
- (39,20,2,'a_b',3,'Spouse of',124,'Spouse of',0,NULL,NULL,NULL),
- (40,20,2,'b_a',124,'Spouse of',3,'Spouse of',0,NULL,NULL,NULL),
- (41,21,1,'a_b',56,'Child of',58,'Parent of',1,NULL,NULL,NULL),
- (42,21,1,'b_a',58,'Parent of',56,'Child of',1,NULL,NULL,NULL),
- (43,22,1,'a_b',140,'Child of',58,'Parent of',1,NULL,NULL,NULL),
- (44,22,1,'b_a',58,'Parent of',140,'Child of',1,NULL,NULL,NULL),
- (45,23,1,'a_b',56,'Child of',2,'Parent of',1,NULL,NULL,NULL),
- (46,23,1,'b_a',2,'Parent of',56,'Child of',1,NULL,NULL,NULL),
- (47,24,1,'a_b',140,'Child of',2,'Parent of',1,NULL,NULL,NULL),
- (48,24,1,'b_a',2,'Parent of',140,'Child of',1,NULL,NULL,NULL),
- (49,25,4,'a_b',140,'Sibling of',56,'Sibling of',1,NULL,NULL,NULL),
- (50,25,4,'b_a',56,'Sibling of',140,'Sibling of',1,NULL,NULL,NULL),
- (51,26,8,'a_b',2,'Household Member of',177,'Household Member is',1,NULL,NULL,NULL),
- (52,26,8,'b_a',177,'Household Member is',2,'Household Member of',1,NULL,NULL,NULL),
- (53,27,8,'a_b',56,'Household Member of',177,'Household Member is',1,NULL,NULL,NULL),
- (54,27,8,'b_a',177,'Household Member is',56,'Household Member of',1,NULL,NULL,NULL),
- (55,28,8,'a_b',140,'Household Member of',177,'Household Member is',1,NULL,NULL,NULL),
- (56,28,8,'b_a',177,'Household Member is',140,'Household Member of',1,NULL,NULL,NULL),
- (57,29,7,'a_b',58,'Head of Household for',177,'Head of Household is',0,NULL,NULL,NULL),
- (58,29,7,'b_a',177,'Head of Household is',58,'Head of Household for',0,NULL,NULL,NULL),
- (59,30,2,'a_b',2,'Spouse of',58,'Spouse of',0,NULL,NULL,NULL),
- (60,30,2,'b_a',58,'Spouse of',2,'Spouse of',0,NULL,NULL,NULL),
- (61,31,1,'a_b',107,'Child of',38,'Parent of',1,NULL,NULL,NULL),
- (62,31,1,'b_a',38,'Parent of',107,'Child of',1,NULL,NULL,NULL),
- (63,32,1,'a_b',134,'Child of',38,'Parent of',1,NULL,NULL,NULL),
- (64,32,1,'b_a',38,'Parent of',134,'Child of',1,NULL,NULL,NULL),
- (65,33,1,'a_b',107,'Child of',24,'Parent of',1,NULL,NULL,NULL),
- (66,33,1,'b_a',24,'Parent of',107,'Child of',1,NULL,NULL,NULL),
- (67,34,1,'a_b',134,'Child of',24,'Parent of',1,NULL,NULL,NULL),
- (68,34,1,'b_a',24,'Parent of',134,'Child of',1,NULL,NULL,NULL),
- (69,35,4,'a_b',134,'Sibling of',107,'Sibling of',1,NULL,NULL,NULL),
- (70,35,4,'b_a',107,'Sibling of',134,'Sibling of',1,NULL,NULL,NULL),
- (71,36,8,'a_b',24,'Household Member of',167,'Household Member is',1,NULL,NULL,NULL),
- (72,36,8,'b_a',167,'Household Member is',24,'Household Member of',1,NULL,NULL,NULL),
- (73,37,8,'a_b',107,'Household Member of',167,'Household Member is',1,NULL,NULL,NULL),
- (74,37,8,'b_a',167,'Household Member is',107,'Household Member of',1,NULL,NULL,NULL),
- (75,38,8,'a_b',134,'Household Member of',167,'Household Member is',1,NULL,NULL,NULL),
- (76,38,8,'b_a',167,'Household Member is',134,'Household Member of',1,NULL,NULL,NULL),
- (77,39,7,'a_b',38,'Head of Household for',167,'Head of Household is',1,NULL,NULL,NULL),
- (78,39,7,'b_a',167,'Head of Household is',38,'Head of Household for',1,NULL,NULL,NULL),
- (79,40,2,'a_b',24,'Spouse of',38,'Spouse of',1,NULL,NULL,NULL),
- (80,40,2,'b_a',38,'Spouse of',24,'Spouse of',1,NULL,NULL,NULL),
- (81,41,1,'a_b',79,'Child of',149,'Parent of',1,NULL,NULL,NULL),
- (82,41,1,'b_a',149,'Parent of',79,'Child of',1,NULL,NULL,NULL),
- (83,42,1,'a_b',32,'Child of',149,'Parent of',1,NULL,NULL,NULL),
- (84,42,1,'b_a',149,'Parent of',32,'Child of',1,NULL,NULL,NULL),
- (85,43,1,'a_b',79,'Child of',123,'Parent of',1,NULL,NULL,NULL),
- (86,43,1,'b_a',123,'Parent of',79,'Child of',1,NULL,NULL,NULL),
- (87,44,1,'a_b',32,'Child of',123,'Parent of',1,NULL,NULL,NULL),
- (88,44,1,'b_a',123,'Parent of',32,'Child of',1,NULL,NULL,NULL),
- (89,45,4,'a_b',32,'Sibling of',79,'Sibling of',1,NULL,NULL,NULL),
- (90,45,4,'b_a',79,'Sibling of',32,'Sibling of',1,NULL,NULL,NULL),
- (91,46,8,'a_b',123,'Household Member of',115,'Household Member is',1,NULL,NULL,NULL),
- (92,46,8,'b_a',115,'Household Member is',123,'Household Member of',1,NULL,NULL,NULL),
- (93,47,8,'a_b',79,'Household Member of',115,'Household Member is',1,NULL,NULL,NULL),
- (94,47,8,'b_a',115,'Household Member is',79,'Household Member of',1,NULL,NULL,NULL),
- (95,48,8,'a_b',32,'Household Member of',115,'Household Member is',1,NULL,NULL,NULL),
- (96,48,8,'b_a',115,'Household Member is',32,'Household Member of',1,NULL,NULL,NULL),
- (97,49,7,'a_b',149,'Head of Household for',115,'Head of Household is',1,NULL,NULL,NULL),
- (98,49,7,'b_a',115,'Head of Household is',149,'Head of Household for',1,NULL,NULL,NULL),
- (99,50,2,'a_b',123,'Spouse of',149,'Spouse of',1,NULL,NULL,NULL),
- (100,50,2,'b_a',149,'Spouse of',123,'Spouse of',1,NULL,NULL,NULL),
- (101,51,1,'a_b',132,'Child of',42,'Parent of',1,NULL,NULL,NULL),
- (102,51,1,'b_a',42,'Parent of',132,'Child of',1,NULL,NULL,NULL),
- (103,52,1,'a_b',199,'Child of',42,'Parent of',1,NULL,NULL,NULL),
- (104,52,1,'b_a',42,'Parent of',199,'Child of',1,NULL,NULL,NULL),
- (105,53,1,'a_b',132,'Child of',143,'Parent of',1,NULL,NULL,NULL),
- (106,53,1,'b_a',143,'Parent of',132,'Child of',1,NULL,NULL,NULL),
- (107,54,1,'a_b',199,'Child of',143,'Parent of',1,NULL,NULL,NULL),
- (108,54,1,'b_a',143,'Parent of',199,'Child of',1,NULL,NULL,NULL),
- (109,55,4,'a_b',199,'Sibling of',132,'Sibling of',1,NULL,NULL,NULL),
- (110,55,4,'b_a',132,'Sibling of',199,'Sibling of',1,NULL,NULL,NULL),
- (111,56,8,'a_b',143,'Household Member of',147,'Household Member is',1,NULL,NULL,NULL),
- (112,56,8,'b_a',147,'Household Member is',143,'Household Member of',1,NULL,NULL,NULL),
- (113,57,8,'a_b',132,'Household Member of',147,'Household Member is',1,NULL,NULL,NULL),
- (114,57,8,'b_a',147,'Household Member is',132,'Household Member of',1,NULL,NULL,NULL),
- (115,58,8,'a_b',199,'Household Member of',147,'Household Member is',1,NULL,NULL,NULL),
- (116,58,8,'b_a',147,'Household Member is',199,'Household Member of',1,NULL,NULL,NULL),
- (117,59,7,'a_b',42,'Head of Household for',147,'Head of Household is',1,NULL,NULL,NULL),
- (118,59,7,'b_a',147,'Head of Household is',42,'Head of Household for',1,NULL,NULL,NULL),
- (119,60,2,'a_b',143,'Spouse of',42,'Spouse of',1,NULL,NULL,NULL),
- (120,60,2,'b_a',42,'Spouse of',143,'Spouse of',1,NULL,NULL,NULL),
- (121,61,1,'a_b',188,'Child of',144,'Parent of',1,NULL,NULL,NULL),
- (122,61,1,'b_a',144,'Parent of',188,'Child of',1,NULL,NULL,NULL),
- (123,62,1,'a_b',8,'Child of',144,'Parent of',1,NULL,NULL,NULL),
- (124,62,1,'b_a',144,'Parent of',8,'Child of',1,NULL,NULL,NULL),
- (125,63,1,'a_b',188,'Child of',160,'Parent of',1,NULL,NULL,NULL),
- (126,63,1,'b_a',160,'Parent of',188,'Child of',1,NULL,NULL,NULL),
- (127,64,1,'a_b',8,'Child of',160,'Parent of',1,NULL,NULL,NULL),
- (128,64,1,'b_a',160,'Parent of',8,'Child of',1,NULL,NULL,NULL),
- (129,65,4,'a_b',8,'Sibling of',188,'Sibling of',1,NULL,NULL,NULL),
- (130,65,4,'b_a',188,'Sibling of',8,'Sibling of',1,NULL,NULL,NULL),
- (131,66,8,'a_b',160,'Household Member of',161,'Household Member is',1,NULL,NULL,NULL),
- (132,66,8,'b_a',161,'Household Member is',160,'Household Member of',1,NULL,NULL,NULL),
- (133,67,8,'a_b',188,'Household Member of',161,'Household Member is',1,NULL,NULL,NULL),
- (134,67,8,'b_a',161,'Household Member is',188,'Household Member of',1,NULL,NULL,NULL),
- (135,68,8,'a_b',8,'Household Member of',161,'Household Member is',1,NULL,NULL,NULL),
- (136,68,8,'b_a',161,'Household Member is',8,'Household Member of',1,NULL,NULL,NULL),
- (137,69,7,'a_b',144,'Head of Household for',161,'Head of Household is',0,NULL,NULL,NULL),
- (138,69,7,'b_a',161,'Head of Household is',144,'Head of Household for',0,NULL,NULL,NULL),
- (139,70,2,'a_b',160,'Spouse of',144,'Spouse of',0,NULL,NULL,NULL),
- (140,70,2,'b_a',144,'Spouse of',160,'Spouse of',0,NULL,NULL,NULL),
- (141,71,1,'a_b',185,'Child of',96,'Parent of',1,NULL,NULL,NULL),
- (142,71,1,'b_a',96,'Parent of',185,'Child of',1,NULL,NULL,NULL),
- (143,72,1,'a_b',158,'Child of',96,'Parent of',1,NULL,NULL,NULL),
- (144,72,1,'b_a',96,'Parent of',158,'Child of',1,NULL,NULL,NULL),
- (145,73,1,'a_b',185,'Child of',11,'Parent of',1,NULL,NULL,NULL),
- (146,73,1,'b_a',11,'Parent of',185,'Child of',1,NULL,NULL,NULL),
- (147,74,1,'a_b',158,'Child of',11,'Parent of',1,NULL,NULL,NULL),
- (148,74,1,'b_a',11,'Parent of',158,'Child of',1,NULL,NULL,NULL),
- (149,75,4,'a_b',158,'Sibling of',185,'Sibling of',1,NULL,NULL,NULL),
- (150,75,4,'b_a',185,'Sibling of',158,'Sibling of',1,NULL,NULL,NULL),
- (151,76,8,'a_b',11,'Household Member of',127,'Household Member is',1,NULL,NULL,NULL),
- (152,76,8,'b_a',127,'Household Member is',11,'Household Member of',1,NULL,NULL,NULL),
- (153,77,8,'a_b',185,'Household Member of',127,'Household Member is',1,NULL,NULL,NULL),
- (154,77,8,'b_a',127,'Household Member is',185,'Household Member of',1,NULL,NULL,NULL),
- (155,78,8,'a_b',158,'Household Member of',127,'Household Member is',1,NULL,NULL,NULL),
- (156,78,8,'b_a',127,'Household Member is',158,'Household Member of',1,NULL,NULL,NULL),
- (157,79,7,'a_b',96,'Head of Household for',127,'Head of Household is',1,NULL,NULL,NULL),
- (158,79,7,'b_a',127,'Head of Household is',96,'Head of Household for',1,NULL,NULL,NULL),
- (159,80,2,'a_b',11,'Spouse of',96,'Spouse of',1,NULL,NULL,NULL),
- (160,80,2,'b_a',96,'Spouse of',11,'Spouse of',1,NULL,NULL,NULL),
- (161,81,1,'a_b',112,'Child of',119,'Parent of',1,NULL,NULL,NULL),
- (162,81,1,'b_a',119,'Parent of',112,'Child of',1,NULL,NULL,NULL),
- (163,82,1,'a_b',150,'Child of',119,'Parent of',1,NULL,NULL,NULL),
- (164,82,1,'b_a',119,'Parent of',150,'Child of',1,NULL,NULL,NULL),
- (165,83,1,'a_b',112,'Child of',103,'Parent of',1,NULL,NULL,NULL),
- (166,83,1,'b_a',103,'Parent of',112,'Child of',1,NULL,NULL,NULL),
- (167,84,1,'a_b',150,'Child of',103,'Parent of',1,NULL,NULL,NULL),
- (168,84,1,'b_a',103,'Parent of',150,'Child of',1,NULL,NULL,NULL),
- (169,85,4,'a_b',150,'Sibling of',112,'Sibling of',1,NULL,NULL,NULL),
- (170,85,4,'b_a',112,'Sibling of',150,'Sibling of',1,NULL,NULL,NULL),
- (171,86,8,'a_b',103,'Household Member of',6,'Household Member is',1,NULL,NULL,NULL),
- (172,86,8,'b_a',6,'Household Member is',103,'Household Member of',1,NULL,NULL,NULL),
- (173,87,8,'a_b',112,'Household Member of',6,'Household Member is',1,NULL,NULL,NULL),
- (174,87,8,'b_a',6,'Household Member is',112,'Household Member of',1,NULL,NULL,NULL),
- (175,88,8,'a_b',150,'Household Member of',6,'Household Member is',1,NULL,NULL,NULL),
- (176,88,8,'b_a',6,'Household Member is',150,'Household Member of',1,NULL,NULL,NULL),
- (177,89,7,'a_b',119,'Head of Household for',6,'Head of Household is',1,NULL,NULL,NULL),
- (178,89,7,'b_a',6,'Head of Household is',119,'Head of Household for',1,NULL,NULL,NULL),
- (179,90,2,'a_b',103,'Spouse of',119,'Spouse of',1,NULL,NULL,NULL),
- (180,90,2,'b_a',119,'Spouse of',103,'Spouse of',1,NULL,NULL,NULL),
- (181,91,1,'a_b',191,'Child of',95,'Parent of',1,NULL,NULL,NULL),
- (182,91,1,'b_a',95,'Parent of',191,'Child of',1,NULL,NULL,NULL),
- (183,92,1,'a_b',105,'Child of',95,'Parent of',1,NULL,NULL,NULL),
- (184,92,1,'b_a',95,'Parent of',105,'Child of',1,NULL,NULL,NULL),
- (185,93,1,'a_b',191,'Child of',108,'Parent of',1,NULL,NULL,NULL),
- (186,93,1,'b_a',108,'Parent of',191,'Child of',1,NULL,NULL,NULL),
- (187,94,1,'a_b',105,'Child of',108,'Parent of',1,NULL,NULL,NULL),
- (188,94,1,'b_a',108,'Parent of',105,'Child of',1,NULL,NULL,NULL),
- (189,95,4,'a_b',105,'Sibling of',191,'Sibling of',1,NULL,NULL,NULL),
- (190,95,4,'b_a',191,'Sibling of',105,'Sibling of',1,NULL,NULL,NULL),
- (191,96,8,'a_b',108,'Household Member of',5,'Household Member is',1,NULL,NULL,NULL),
- (192,96,8,'b_a',5,'Household Member is',108,'Household Member of',1,NULL,NULL,NULL),
- (193,97,8,'a_b',191,'Household Member of',5,'Household Member is',1,NULL,NULL,NULL),
- (194,97,8,'b_a',5,'Household Member is',191,'Household Member of',1,NULL,NULL,NULL),
- (195,98,8,'a_b',105,'Household Member of',5,'Household Member is',1,NULL,NULL,NULL),
- (196,98,8,'b_a',5,'Household Member is',105,'Household Member of',1,NULL,NULL,NULL),
- (197,99,7,'a_b',95,'Head of Household for',5,'Head of Household is',1,NULL,NULL,NULL),
- (198,99,7,'b_a',5,'Head of Household is',95,'Head of Household for',1,NULL,NULL,NULL),
- (199,100,2,'a_b',108,'Spouse of',95,'Spouse of',1,NULL,NULL,NULL),
- (200,100,2,'b_a',95,'Spouse of',108,'Spouse of',1,NULL,NULL,NULL),
- (201,101,1,'a_b',104,'Child of',153,'Parent of',1,NULL,NULL,NULL),
- (202,101,1,'b_a',153,'Parent of',104,'Child of',1,NULL,NULL,NULL),
- (203,102,1,'a_b',151,'Child of',153,'Parent of',1,NULL,NULL,NULL),
- (204,102,1,'b_a',153,'Parent of',151,'Child of',1,NULL,NULL,NULL),
- (205,103,1,'a_b',104,'Child of',33,'Parent of',1,NULL,NULL,NULL),
- (206,103,1,'b_a',33,'Parent of',104,'Child of',1,NULL,NULL,NULL),
- (207,104,1,'a_b',151,'Child of',33,'Parent of',1,NULL,NULL,NULL),
- (208,104,1,'b_a',33,'Parent of',151,'Child of',1,NULL,NULL,NULL),
- (209,105,4,'a_b',151,'Sibling of',104,'Sibling of',1,NULL,NULL,NULL),
- (210,105,4,'b_a',104,'Sibling of',151,'Sibling of',1,NULL,NULL,NULL),
- (211,106,8,'a_b',33,'Household Member of',174,'Household Member is',1,NULL,NULL,NULL),
- (212,106,8,'b_a',174,'Household Member is',33,'Household Member of',1,NULL,NULL,NULL),
- (213,107,8,'a_b',104,'Household Member of',174,'Household Member is',1,NULL,NULL,NULL),
- (214,107,8,'b_a',174,'Household Member is',104,'Household Member of',1,NULL,NULL,NULL),
- (215,108,8,'a_b',151,'Household Member of',174,'Household Member is',1,NULL,NULL,NULL),
- (216,108,8,'b_a',174,'Household Member is',151,'Household Member of',1,NULL,NULL,NULL),
- (217,109,7,'a_b',153,'Head of Household for',174,'Head of Household is',1,NULL,NULL,NULL),
- (218,109,7,'b_a',174,'Head of Household is',153,'Head of Household for',1,NULL,NULL,NULL),
- (219,110,2,'a_b',33,'Spouse of',153,'Spouse of',1,NULL,NULL,NULL),
- (220,110,2,'b_a',153,'Spouse of',33,'Spouse of',1,NULL,NULL,NULL),
- (221,111,1,'a_b',65,'Child of',7,'Parent of',1,NULL,NULL,NULL),
- (222,111,1,'b_a',7,'Parent of',65,'Child of',1,NULL,NULL,NULL),
- (223,112,1,'a_b',43,'Child of',7,'Parent of',1,NULL,NULL,NULL),
- (224,112,1,'b_a',7,'Parent of',43,'Child of',1,NULL,NULL,NULL),
- (225,113,1,'a_b',65,'Child of',29,'Parent of',1,NULL,NULL,NULL),
- (226,113,1,'b_a',29,'Parent of',65,'Child of',1,NULL,NULL,NULL),
- (227,114,1,'a_b',43,'Child of',29,'Parent of',1,NULL,NULL,NULL),
- (228,114,1,'b_a',29,'Parent of',43,'Child of',1,NULL,NULL,NULL),
- (229,115,4,'a_b',43,'Sibling of',65,'Sibling of',1,NULL,NULL,NULL),
- (230,115,4,'b_a',65,'Sibling of',43,'Sibling of',1,NULL,NULL,NULL),
- (231,116,8,'a_b',29,'Household Member of',80,'Household Member is',1,NULL,NULL,NULL),
- (232,116,8,'b_a',80,'Household Member is',29,'Household Member of',1,NULL,NULL,NULL),
- (233,117,8,'a_b',65,'Household Member of',80,'Household Member is',1,NULL,NULL,NULL),
- (234,117,8,'b_a',80,'Household Member is',65,'Household Member of',1,NULL,NULL,NULL),
- (235,118,8,'a_b',43,'Household Member of',80,'Household Member is',1,NULL,NULL,NULL),
- (236,118,8,'b_a',80,'Household Member is',43,'Household Member of',1,NULL,NULL,NULL),
- (237,119,7,'a_b',7,'Head of Household for',80,'Head of Household is',1,NULL,NULL,NULL),
- (238,119,7,'b_a',80,'Head of Household is',7,'Head of Household for',1,NULL,NULL,NULL),
- (239,120,2,'a_b',29,'Spouse of',7,'Spouse of',1,NULL,NULL,NULL),
- (240,120,2,'b_a',7,'Spouse of',29,'Spouse of',1,NULL,NULL,NULL),
- (241,121,1,'a_b',179,'Child of',197,'Parent of',1,NULL,NULL,NULL),
- (242,121,1,'b_a',197,'Parent of',179,'Child of',1,NULL,NULL,NULL),
- (243,122,1,'a_b',39,'Child of',197,'Parent of',1,NULL,NULL,NULL),
- (244,122,1,'b_a',197,'Parent of',39,'Child of',1,NULL,NULL,NULL),
- (245,123,1,'a_b',179,'Child of',9,'Parent of',1,NULL,NULL,NULL),
- (246,123,1,'b_a',9,'Parent of',179,'Child of',1,NULL,NULL,NULL),
- (247,124,1,'a_b',39,'Child of',9,'Parent of',1,NULL,NULL,NULL),
- (248,124,1,'b_a',9,'Parent of',39,'Child of',1,NULL,NULL,NULL),
- (249,125,4,'a_b',39,'Sibling of',179,'Sibling of',1,NULL,NULL,NULL),
- (250,125,4,'b_a',179,'Sibling of',39,'Sibling of',1,NULL,NULL,NULL),
- (251,126,8,'a_b',9,'Household Member of',55,'Household Member is',1,NULL,NULL,NULL),
- (252,126,8,'b_a',55,'Household Member is',9,'Household Member of',1,NULL,NULL,NULL),
- (253,127,8,'a_b',179,'Household Member of',55,'Household Member is',1,NULL,NULL,NULL),
- (254,127,8,'b_a',55,'Household Member is',179,'Household Member of',1,NULL,NULL,NULL),
- (255,128,8,'a_b',39,'Household Member of',55,'Household Member is',1,NULL,NULL,NULL),
- (256,128,8,'b_a',55,'Household Member is',39,'Household Member of',1,NULL,NULL,NULL),
- (257,129,7,'a_b',197,'Head of Household for',55,'Head of Household is',1,NULL,NULL,NULL),
- (258,129,7,'b_a',55,'Head of Household is',197,'Head of Household for',1,NULL,NULL,NULL),
- (259,130,2,'a_b',9,'Spouse of',197,'Spouse of',1,NULL,NULL,NULL),
- (260,130,2,'b_a',197,'Spouse of',9,'Spouse of',1,NULL,NULL,NULL),
- (261,131,1,'a_b',20,'Child of',162,'Parent of',1,NULL,NULL,NULL),
- (262,131,1,'b_a',162,'Parent of',20,'Child of',1,NULL,NULL,NULL),
- (263,132,1,'a_b',25,'Child of',162,'Parent of',1,NULL,NULL,NULL),
- (264,132,1,'b_a',162,'Parent of',25,'Child of',1,NULL,NULL,NULL),
- (265,133,1,'a_b',20,'Child of',169,'Parent of',1,NULL,NULL,NULL),
- (266,133,1,'b_a',169,'Parent of',20,'Child of',1,NULL,NULL,NULL),
- (267,134,1,'a_b',25,'Child of',169,'Parent of',1,NULL,NULL,NULL),
- (268,134,1,'b_a',169,'Parent of',25,'Child of',1,NULL,NULL,NULL),
- (269,135,4,'a_b',25,'Sibling of',20,'Sibling of',1,NULL,NULL,NULL),
- (270,135,4,'b_a',20,'Sibling of',25,'Sibling of',1,NULL,NULL,NULL),
- (271,136,8,'a_b',169,'Household Member of',171,'Household Member is',1,NULL,NULL,NULL),
- (272,136,8,'b_a',171,'Household Member is',169,'Household Member of',1,NULL,NULL,NULL),
- (273,137,8,'a_b',20,'Household Member of',171,'Household Member is',1,NULL,NULL,NULL),
- (274,137,8,'b_a',171,'Household Member is',20,'Household Member of',1,NULL,NULL,NULL),
- (275,138,8,'a_b',25,'Household Member of',171,'Household Member is',1,NULL,NULL,NULL),
- (276,138,8,'b_a',171,'Household Member is',25,'Household Member of',1,NULL,NULL,NULL),
- (277,139,7,'a_b',162,'Head of Household for',171,'Head of Household is',1,NULL,NULL,NULL),
- (278,139,7,'b_a',171,'Head of Household is',162,'Head of Household for',1,NULL,NULL,NULL),
- (279,140,2,'a_b',169,'Spouse of',162,'Spouse of',1,NULL,NULL,NULL),
- (280,140,2,'b_a',162,'Spouse of',169,'Spouse of',1,NULL,NULL,NULL),
- (281,141,1,'a_b',61,'Child of',97,'Parent of',1,NULL,NULL,NULL),
- (282,141,1,'b_a',97,'Parent of',61,'Child of',1,NULL,NULL,NULL),
- (283,142,1,'a_b',35,'Child of',97,'Parent of',1,NULL,NULL,NULL),
- (284,142,1,'b_a',97,'Parent of',35,'Child of',1,NULL,NULL,NULL),
- (285,143,1,'a_b',61,'Child of',18,'Parent of',1,NULL,NULL,NULL),
- (286,143,1,'b_a',18,'Parent of',61,'Child of',1,NULL,NULL,NULL),
- (287,144,1,'a_b',35,'Child of',18,'Parent of',1,NULL,NULL,NULL),
- (288,144,1,'b_a',18,'Parent of',35,'Child of',1,NULL,NULL,NULL),
- (289,145,4,'a_b',35,'Sibling of',61,'Sibling of',1,NULL,NULL,NULL),
- (290,145,4,'b_a',61,'Sibling of',35,'Sibling of',1,NULL,NULL,NULL),
- (291,146,8,'a_b',18,'Household Member of',182,'Household Member is',1,NULL,NULL,NULL),
- (292,146,8,'b_a',182,'Household Member is',18,'Household Member of',1,NULL,NULL,NULL),
- (293,147,8,'a_b',61,'Household Member of',182,'Household Member is',1,NULL,NULL,NULL),
- (294,147,8,'b_a',182,'Household Member is',61,'Household Member of',1,NULL,NULL,NULL),
- (295,148,8,'a_b',35,'Household Member of',182,'Household Member is',1,NULL,NULL,NULL),
- (296,148,8,'b_a',182,'Household Member is',35,'Household Member of',1,NULL,NULL,NULL),
- (297,149,7,'a_b',97,'Head of Household for',182,'Head of Household is',0,NULL,NULL,NULL),
- (298,149,7,'b_a',182,'Head of Household is',97,'Head of Household for',0,NULL,NULL,NULL),
- (299,150,2,'a_b',18,'Spouse of',97,'Spouse of',0,NULL,NULL,NULL),
- (300,150,2,'b_a',97,'Spouse of',18,'Spouse of',0,NULL,NULL,NULL),
- (301,151,1,'a_b',31,'Child of',111,'Parent of',1,NULL,NULL,NULL),
- (302,151,1,'b_a',111,'Parent of',31,'Child of',1,NULL,NULL,NULL),
- (303,152,1,'a_b',74,'Child of',111,'Parent of',1,NULL,NULL,NULL),
- (304,152,1,'b_a',111,'Parent of',74,'Child of',1,NULL,NULL,NULL),
- (305,153,1,'a_b',31,'Child of',178,'Parent of',1,NULL,NULL,NULL),
- (306,153,1,'b_a',178,'Parent of',31,'Child of',1,NULL,NULL,NULL),
- (307,154,1,'a_b',74,'Child of',178,'Parent of',1,NULL,NULL,NULL),
- (308,154,1,'b_a',178,'Parent of',74,'Child of',1,NULL,NULL,NULL),
- (309,155,4,'a_b',74,'Sibling of',31,'Sibling of',1,NULL,NULL,NULL),
- (310,155,4,'b_a',31,'Sibling of',74,'Sibling of',1,NULL,NULL,NULL),
- (311,156,8,'a_b',178,'Household Member of',45,'Household Member is',1,NULL,NULL,NULL),
- (312,156,8,'b_a',45,'Household Member is',178,'Household Member of',1,NULL,NULL,NULL),
- (313,157,8,'a_b',31,'Household Member of',45,'Household Member is',1,NULL,NULL,NULL),
- (314,157,8,'b_a',45,'Household Member is',31,'Household Member of',1,NULL,NULL,NULL),
- (315,158,8,'a_b',74,'Household Member of',45,'Household Member is',1,NULL,NULL,NULL),
- (316,158,8,'b_a',45,'Household Member is',74,'Household Member of',1,NULL,NULL,NULL),
- (317,159,7,'a_b',111,'Head of Household for',45,'Head of Household is',0,NULL,NULL,NULL),
- (318,159,7,'b_a',45,'Head of Household is',111,'Head of Household for',0,NULL,NULL,NULL),
- (319,160,2,'a_b',178,'Spouse of',111,'Spouse of',0,NULL,NULL,NULL),
- (320,160,2,'b_a',111,'Spouse of',178,'Spouse of',0,NULL,NULL,NULL),
- (321,161,1,'a_b',26,'Child of',126,'Parent of',1,NULL,NULL,NULL),
- (322,161,1,'b_a',126,'Parent of',26,'Child of',1,NULL,NULL,NULL),
- (323,162,1,'a_b',139,'Child of',126,'Parent of',1,NULL,NULL,NULL),
- (324,162,1,'b_a',126,'Parent of',139,'Child of',1,NULL,NULL,NULL),
- (325,163,1,'a_b',26,'Child of',186,'Parent of',1,NULL,NULL,NULL),
- (326,163,1,'b_a',186,'Parent of',26,'Child of',1,NULL,NULL,NULL),
- (327,164,1,'a_b',139,'Child of',186,'Parent of',1,NULL,NULL,NULL),
- (328,164,1,'b_a',186,'Parent of',139,'Child of',1,NULL,NULL,NULL),
- (329,165,4,'a_b',139,'Sibling of',26,'Sibling of',1,NULL,NULL,NULL),
- (330,165,4,'b_a',26,'Sibling of',139,'Sibling of',1,NULL,NULL,NULL),
- (331,166,8,'a_b',186,'Household Member of',156,'Household Member is',1,NULL,NULL,NULL),
- (332,166,8,'b_a',156,'Household Member is',186,'Household Member of',1,NULL,NULL,NULL),
- (333,167,8,'a_b',26,'Household Member of',156,'Household Member is',1,NULL,NULL,NULL),
- (334,167,8,'b_a',156,'Household Member is',26,'Household Member of',1,NULL,NULL,NULL),
- (335,168,8,'a_b',139,'Household Member of',156,'Household Member is',1,NULL,NULL,NULL),
- (336,168,8,'b_a',156,'Household Member is',139,'Household Member of',1,NULL,NULL,NULL),
- (337,169,7,'a_b',126,'Head of Household for',156,'Head of Household is',1,NULL,NULL,NULL),
- (338,169,7,'b_a',156,'Head of Household is',126,'Head of Household for',1,NULL,NULL,NULL),
- (339,170,2,'a_b',186,'Spouse of',126,'Spouse of',1,NULL,NULL,NULL),
- (340,170,2,'b_a',126,'Spouse of',186,'Spouse of',1,NULL,NULL,NULL),
- (341,171,1,'a_b',28,'Child of',201,'Parent of',1,NULL,NULL,NULL),
- (342,171,1,'b_a',201,'Parent of',28,'Child of',1,NULL,NULL,NULL),
- (343,172,1,'a_b',72,'Child of',201,'Parent of',1,NULL,NULL,NULL),
- (344,172,1,'b_a',201,'Parent of',72,'Child of',1,NULL,NULL,NULL),
- (345,173,1,'a_b',28,'Child of',194,'Parent of',1,NULL,NULL,NULL),
- (346,173,1,'b_a',194,'Parent of',28,'Child of',1,NULL,NULL,NULL),
- (347,174,1,'a_b',72,'Child of',194,'Parent of',1,NULL,NULL,NULL),
- (348,174,1,'b_a',194,'Parent of',72,'Child of',1,NULL,NULL,NULL),
- (349,175,4,'a_b',72,'Sibling of',28,'Sibling of',1,NULL,NULL,NULL),
- (350,175,4,'b_a',28,'Sibling of',72,'Sibling of',1,NULL,NULL,NULL),
- (351,176,8,'a_b',194,'Household Member of',131,'Household Member is',1,NULL,NULL,NULL),
- (352,176,8,'b_a',131,'Household Member is',194,'Household Member of',1,NULL,NULL,NULL),
- (353,177,8,'a_b',28,'Household Member of',131,'Household Member is',1,NULL,NULL,NULL),
- (354,177,8,'b_a',131,'Household Member is',28,'Household Member of',1,NULL,NULL,NULL),
- (355,178,8,'a_b',72,'Household Member of',131,'Household Member is',1,NULL,NULL,NULL),
- (356,178,8,'b_a',131,'Household Member is',72,'Household Member of',1,NULL,NULL,NULL),
- (357,179,7,'a_b',201,'Head of Household for',131,'Head of Household is',1,NULL,NULL,NULL),
- (358,179,7,'b_a',131,'Head of Household is',201,'Head of Household for',1,NULL,NULL,NULL),
- (359,180,2,'a_b',194,'Spouse of',201,'Spouse of',1,NULL,NULL,NULL),
- (360,180,2,'b_a',201,'Spouse of',194,'Spouse of',1,NULL,NULL,NULL),
- (361,181,1,'a_b',81,'Child of',12,'Parent of',1,NULL,NULL,NULL),
- (362,181,1,'b_a',12,'Parent of',81,'Child of',1,NULL,NULL,NULL),
- (363,182,1,'a_b',78,'Child of',12,'Parent of',1,NULL,NULL,NULL),
- (364,182,1,'b_a',12,'Parent of',78,'Child of',1,NULL,NULL,NULL),
- (365,183,1,'a_b',81,'Child of',136,'Parent of',1,NULL,NULL,NULL),
- (366,183,1,'b_a',136,'Parent of',81,'Child of',1,NULL,NULL,NULL),
- (367,184,1,'a_b',78,'Child of',136,'Parent of',1,NULL,NULL,NULL),
- (368,184,1,'b_a',136,'Parent of',78,'Child of',1,NULL,NULL,NULL),
- (369,185,4,'a_b',78,'Sibling of',81,'Sibling of',1,NULL,NULL,NULL),
- (370,185,4,'b_a',81,'Sibling of',78,'Sibling of',1,NULL,NULL,NULL),
- (371,186,8,'a_b',136,'Household Member of',116,'Household Member is',1,NULL,NULL,NULL),
- (372,186,8,'b_a',116,'Household Member is',136,'Household Member of',1,NULL,NULL,NULL),
- (373,187,8,'a_b',81,'Household Member of',116,'Household Member is',1,NULL,NULL,NULL),
- (374,187,8,'b_a',116,'Household Member is',81,'Household Member of',1,NULL,NULL,NULL),
- (375,188,8,'a_b',78,'Household Member of',116,'Household Member is',1,NULL,NULL,NULL),
- (376,188,8,'b_a',116,'Household Member is',78,'Household Member of',1,NULL,NULL,NULL),
- (377,189,7,'a_b',12,'Head of Household for',116,'Head of Household is',0,NULL,NULL,NULL),
- (378,189,7,'b_a',116,'Head of Household is',12,'Head of Household for',0,NULL,NULL,NULL),
- (379,190,2,'a_b',136,'Spouse of',12,'Spouse of',0,NULL,NULL,NULL),
- (380,190,2,'b_a',12,'Spouse of',136,'Spouse of',0,NULL,NULL,NULL),
- (381,191,1,'a_b',157,'Child of',54,'Parent of',1,NULL,NULL,NULL),
- (382,191,1,'b_a',54,'Parent of',157,'Child of',1,NULL,NULL,NULL),
- (383,192,1,'a_b',82,'Child of',54,'Parent of',1,NULL,NULL,NULL),
- (384,192,1,'b_a',54,'Parent of',82,'Child of',1,NULL,NULL,NULL),
- (385,193,1,'a_b',157,'Child of',94,'Parent of',1,NULL,NULL,NULL),
- (386,193,1,'b_a',94,'Parent of',157,'Child of',1,NULL,NULL,NULL),
- (387,194,1,'a_b',82,'Child of',94,'Parent of',1,NULL,NULL,NULL),
- (388,194,1,'b_a',94,'Parent of',82,'Child of',1,NULL,NULL,NULL),
- (389,195,4,'a_b',82,'Sibling of',157,'Sibling of',1,NULL,NULL,NULL),
- (390,195,4,'b_a',157,'Sibling of',82,'Sibling of',1,NULL,NULL,NULL),
- (391,196,8,'a_b',94,'Household Member of',184,'Household Member is',1,NULL,NULL,NULL),
- (392,196,8,'b_a',184,'Household Member is',94,'Household Member of',1,NULL,NULL,NULL),
- (393,197,8,'a_b',157,'Household Member of',184,'Household Member is',1,NULL,NULL,NULL),
- (394,197,8,'b_a',184,'Household Member is',157,'Household Member of',1,NULL,NULL,NULL),
- (395,198,8,'a_b',82,'Household Member of',184,'Household Member is',1,NULL,NULL,NULL),
- (396,198,8,'b_a',184,'Household Member is',82,'Household Member of',1,NULL,NULL,NULL),
- (397,199,7,'a_b',54,'Head of Household for',184,'Head of Household is',0,NULL,NULL,NULL),
- (398,199,7,'b_a',184,'Head of Household is',54,'Head of Household for',0,NULL,NULL,NULL),
- (399,200,2,'a_b',94,'Spouse of',54,'Spouse of',0,NULL,NULL,NULL),
- (400,200,2,'b_a',54,'Spouse of',94,'Spouse of',0,NULL,NULL,NULL),
- (401,201,5,'a_b',46,'Employee of',21,'Employer of',1,NULL,NULL,NULL),
- (402,201,5,'b_a',21,'Employer of',46,'Employee of',1,NULL,NULL,NULL),
- (403,202,5,'a_b',49,'Employee of',36,'Employer of',1,NULL,NULL,NULL),
- (404,202,5,'b_a',36,'Employer of',49,'Employee of',1,NULL,NULL,NULL),
- (405,203,5,'a_b',3,'Employee of',40,'Employer of',1,NULL,NULL,NULL),
- (406,203,5,'b_a',40,'Employer of',3,'Employee of',1,NULL,NULL,NULL),
- (407,204,5,'a_b',165,'Employee of',48,'Employer of',1,NULL,NULL,NULL),
- (408,204,5,'b_a',48,'Employer of',165,'Employee of',1,NULL,NULL,NULL),
- (409,205,5,'a_b',57,'Employee of',51,'Employer of',1,NULL,NULL,NULL),
- (410,205,5,'b_a',51,'Employer of',57,'Employee of',1,NULL,NULL,NULL),
- (411,206,5,'a_b',139,'Employee of',73,'Employer of',1,NULL,NULL,NULL),
- (412,206,5,'b_a',73,'Employer of',139,'Employee of',1,NULL,NULL,NULL),
- (413,207,5,'a_b',50,'Employee of',87,'Employer of',1,NULL,NULL,NULL),
- (414,207,5,'b_a',87,'Employer of',50,'Employee of',1,NULL,NULL,NULL),
- (415,208,5,'a_b',52,'Employee of',118,'Employer of',1,NULL,NULL,NULL),
- (416,208,5,'b_a',118,'Employer of',52,'Employee of',1,NULL,NULL,NULL),
- (417,209,5,'a_b',110,'Employee of',122,'Employer of',1,NULL,NULL,NULL),
- (418,209,5,'b_a',122,'Employer of',110,'Employee of',1,NULL,NULL,NULL),
- (419,210,5,'a_b',130,'Employee of',135,'Employer of',1,NULL,NULL,NULL),
- (420,210,5,'b_a',135,'Employer of',130,'Employee of',1,NULL,NULL,NULL),
- (421,211,5,'a_b',82,'Employee of',138,'Employer of',1,NULL,NULL,NULL),
- (422,211,5,'b_a',138,'Employer of',82,'Employee of',1,NULL,NULL,NULL),
- (423,212,5,'a_b',103,'Employee of',145,'Employer of',1,NULL,NULL,NULL),
- (424,212,5,'b_a',145,'Employer of',103,'Employee of',1,NULL,NULL,NULL),
- (425,213,5,'a_b',141,'Employee of',154,'Employer of',1,NULL,NULL,NULL),
- (426,213,5,'b_a',154,'Employer of',141,'Employee of',1,NULL,NULL,NULL),
- (427,214,5,'a_b',151,'Employee of',170,'Employer of',1,NULL,NULL,NULL),
- (428,214,5,'b_a',170,'Employer of',151,'Employee of',1,NULL,NULL,NULL),
- (429,215,5,'a_b',160,'Employee of',173,'Employer of',1,NULL,NULL,NULL),
- (430,215,5,'b_a',173,'Employer of',160,'Employee of',1,NULL,NULL,NULL),
- (431,216,5,'a_b',109,'Employee of',180,'Employer of',1,NULL,NULL,NULL),
- (432,216,5,'b_a',180,'Employer of',109,'Employee of',1,NULL,NULL,NULL),
- (433,217,5,'a_b',68,'Employee of',187,'Employer of',1,NULL,NULL,NULL),
- (434,217,5,'b_a',187,'Employer of',68,'Employee of',1,NULL,NULL,NULL);
+ (1,1,1,'a_b',77,'Child of',67,'Parent of',1,NULL,NULL,NULL),
+ (2,1,1,'b_a',67,'Parent of',77,'Child of',1,NULL,NULL,NULL),
+ (3,2,1,'a_b',127,'Child of',67,'Parent of',1,NULL,NULL,NULL),
+ (4,2,1,'b_a',67,'Parent of',127,'Child of',1,NULL,NULL,NULL),
+ (5,3,1,'a_b',77,'Child of',156,'Parent of',1,NULL,NULL,NULL),
+ (6,3,1,'b_a',156,'Parent of',77,'Child of',1,NULL,NULL,NULL),
+ (7,4,1,'a_b',127,'Child of',156,'Parent of',1,NULL,NULL,NULL),
+ (8,4,1,'b_a',156,'Parent of',127,'Child of',1,NULL,NULL,NULL),
+ (9,5,4,'a_b',127,'Sibling of',77,'Sibling of',1,NULL,NULL,NULL),
+ (10,5,4,'b_a',77,'Sibling of',127,'Sibling of',1,NULL,NULL,NULL),
+ (11,6,8,'a_b',156,'Household Member of',162,'Household Member is',1,NULL,NULL,NULL),
+ (12,6,8,'b_a',162,'Household Member is',156,'Household Member of',1,NULL,NULL,NULL),
+ (13,7,8,'a_b',77,'Household Member of',162,'Household Member is',1,NULL,NULL,NULL),
+ (14,7,8,'b_a',162,'Household Member is',77,'Household Member of',1,NULL,NULL,NULL),
+ (15,8,8,'a_b',127,'Household Member of',162,'Household Member is',1,NULL,NULL,NULL),
+ (16,8,8,'b_a',162,'Household Member is',127,'Household Member of',1,NULL,NULL,NULL),
+ (17,9,7,'a_b',67,'Head of Household for',162,'Head of Household is',0,NULL,NULL,NULL),
+ (18,9,7,'b_a',162,'Head of Household is',67,'Head of Household for',0,NULL,NULL,NULL),
+ (19,10,2,'a_b',156,'Spouse of',67,'Spouse of',0,NULL,NULL,NULL),
+ (20,10,2,'b_a',67,'Spouse of',156,'Spouse of',0,NULL,NULL,NULL),
+ (21,11,1,'a_b',176,'Child of',70,'Parent of',1,NULL,NULL,NULL),
+ (22,11,1,'b_a',70,'Parent of',176,'Child of',1,NULL,NULL,NULL),
+ (23,12,1,'a_b',56,'Child of',70,'Parent of',1,NULL,NULL,NULL),
+ (24,12,1,'b_a',70,'Parent of',56,'Child of',1,NULL,NULL,NULL),
+ (25,13,1,'a_b',176,'Child of',182,'Parent of',1,NULL,NULL,NULL),
+ (26,13,1,'b_a',182,'Parent of',176,'Child of',1,NULL,NULL,NULL),
+ (27,14,1,'a_b',56,'Child of',182,'Parent of',1,NULL,NULL,NULL),
+ (28,14,1,'b_a',182,'Parent of',56,'Child of',1,NULL,NULL,NULL),
+ (29,15,4,'a_b',56,'Sibling of',176,'Sibling of',1,NULL,NULL,NULL),
+ (30,15,4,'b_a',176,'Sibling of',56,'Sibling of',1,NULL,NULL,NULL),
+ (31,16,8,'a_b',182,'Household Member of',80,'Household Member is',1,NULL,NULL,NULL),
+ (32,16,8,'b_a',80,'Household Member is',182,'Household Member of',1,NULL,NULL,NULL),
+ (33,17,8,'a_b',176,'Household Member of',80,'Household Member is',1,NULL,NULL,NULL),
+ (34,17,8,'b_a',80,'Household Member is',176,'Household Member of',1,NULL,NULL,NULL),
+ (35,18,8,'a_b',56,'Household Member of',80,'Household Member is',1,NULL,NULL,NULL),
+ (36,18,8,'b_a',80,'Household Member is',56,'Household Member of',1,NULL,NULL,NULL),
+ (37,19,7,'a_b',70,'Head of Household for',80,'Head of Household is',0,NULL,NULL,NULL),
+ (38,19,7,'b_a',80,'Head of Household is',70,'Head of Household for',0,NULL,NULL,NULL),
+ (39,20,2,'a_b',182,'Spouse of',70,'Spouse of',0,NULL,NULL,NULL),
+ (40,20,2,'b_a',70,'Spouse of',182,'Spouse of',0,NULL,NULL,NULL),
+ (41,21,1,'a_b',53,'Child of',153,'Parent of',1,NULL,NULL,NULL),
+ (42,21,1,'b_a',153,'Parent of',53,'Child of',1,NULL,NULL,NULL),
+ (43,22,1,'a_b',151,'Child of',153,'Parent of',1,NULL,NULL,NULL),
+ (44,22,1,'b_a',153,'Parent of',151,'Child of',1,NULL,NULL,NULL),
+ (45,23,1,'a_b',53,'Child of',173,'Parent of',1,NULL,NULL,NULL),
+ (46,23,1,'b_a',173,'Parent of',53,'Child of',1,NULL,NULL,NULL),
+ (47,24,1,'a_b',151,'Child of',173,'Parent of',1,NULL,NULL,NULL),
+ (48,24,1,'b_a',173,'Parent of',151,'Child of',1,NULL,NULL,NULL),
+ (49,25,4,'a_b',151,'Sibling of',53,'Sibling of',1,NULL,NULL,NULL),
+ (50,25,4,'b_a',53,'Sibling of',151,'Sibling of',1,NULL,NULL,NULL),
+ (51,26,8,'a_b',173,'Household Member of',137,'Household Member is',1,NULL,NULL,NULL),
+ (52,26,8,'b_a',137,'Household Member is',173,'Household Member of',1,NULL,NULL,NULL),
+ (53,27,8,'a_b',53,'Household Member of',137,'Household Member is',1,NULL,NULL,NULL),
+ (54,27,8,'b_a',137,'Household Member is',53,'Household Member of',1,NULL,NULL,NULL),
+ (55,28,8,'a_b',151,'Household Member of',137,'Household Member is',1,NULL,NULL,NULL),
+ (56,28,8,'b_a',137,'Household Member is',151,'Household Member of',1,NULL,NULL,NULL),
+ (57,29,7,'a_b',153,'Head of Household for',137,'Head of Household is',1,NULL,NULL,NULL),
+ (58,29,7,'b_a',137,'Head of Household is',153,'Head of Household for',1,NULL,NULL,NULL),
+ (59,30,2,'a_b',173,'Spouse of',153,'Spouse of',1,NULL,NULL,NULL),
+ (60,30,2,'b_a',153,'Spouse of',173,'Spouse of',1,NULL,NULL,NULL),
+ (61,31,1,'a_b',51,'Child of',101,'Parent of',1,NULL,NULL,NULL),
+ (62,31,1,'b_a',101,'Parent of',51,'Child of',1,NULL,NULL,NULL),
+ (63,32,1,'a_b',7,'Child of',101,'Parent of',1,NULL,NULL,NULL),
+ (64,32,1,'b_a',101,'Parent of',7,'Child of',1,NULL,NULL,NULL),
+ (65,33,1,'a_b',51,'Child of',109,'Parent of',1,NULL,NULL,NULL),
+ (66,33,1,'b_a',109,'Parent of',51,'Child of',1,NULL,NULL,NULL),
+ (67,34,1,'a_b',7,'Child of',109,'Parent of',1,NULL,NULL,NULL),
+ (68,34,1,'b_a',109,'Parent of',7,'Child of',1,NULL,NULL,NULL),
+ (69,35,4,'a_b',7,'Sibling of',51,'Sibling of',1,NULL,NULL,NULL),
+ (70,35,4,'b_a',51,'Sibling of',7,'Sibling of',1,NULL,NULL,NULL),
+ (71,36,8,'a_b',109,'Household Member of',141,'Household Member is',1,NULL,NULL,NULL),
+ (72,36,8,'b_a',141,'Household Member is',109,'Household Member of',1,NULL,NULL,NULL),
+ (73,37,8,'a_b',51,'Household Member of',141,'Household Member is',1,NULL,NULL,NULL),
+ (74,37,8,'b_a',141,'Household Member is',51,'Household Member of',1,NULL,NULL,NULL),
+ (75,38,8,'a_b',7,'Household Member of',141,'Household Member is',1,NULL,NULL,NULL),
+ (76,38,8,'b_a',141,'Household Member is',7,'Household Member of',1,NULL,NULL,NULL),
+ (77,39,7,'a_b',101,'Head of Household for',141,'Head of Household is',1,NULL,NULL,NULL),
+ (78,39,7,'b_a',141,'Head of Household is',101,'Head of Household for',1,NULL,NULL,NULL),
+ (79,40,2,'a_b',109,'Spouse of',101,'Spouse of',1,NULL,NULL,NULL),
+ (80,40,2,'b_a',101,'Spouse of',109,'Spouse of',1,NULL,NULL,NULL),
+ (81,41,1,'a_b',62,'Child of',24,'Parent of',1,NULL,NULL,NULL),
+ (82,41,1,'b_a',24,'Parent of',62,'Child of',1,NULL,NULL,NULL),
+ (83,42,1,'a_b',33,'Child of',24,'Parent of',1,NULL,NULL,NULL),
+ (84,42,1,'b_a',24,'Parent of',33,'Child of',1,NULL,NULL,NULL),
+ (85,43,1,'a_b',62,'Child of',57,'Parent of',1,NULL,NULL,NULL),
+ (86,43,1,'b_a',57,'Parent of',62,'Child of',1,NULL,NULL,NULL),
+ (87,44,1,'a_b',33,'Child of',57,'Parent of',1,NULL,NULL,NULL),
+ (88,44,1,'b_a',57,'Parent of',33,'Child of',1,NULL,NULL,NULL),
+ (89,45,4,'a_b',33,'Sibling of',62,'Sibling of',1,NULL,NULL,NULL),
+ (90,45,4,'b_a',62,'Sibling of',33,'Sibling of',1,NULL,NULL,NULL),
+ (91,46,8,'a_b',57,'Household Member of',98,'Household Member is',1,NULL,NULL,NULL),
+ (92,46,8,'b_a',98,'Household Member is',57,'Household Member of',1,NULL,NULL,NULL),
+ (93,47,8,'a_b',62,'Household Member of',98,'Household Member is',1,NULL,NULL,NULL),
+ (94,47,8,'b_a',98,'Household Member is',62,'Household Member of',1,NULL,NULL,NULL),
+ (95,48,8,'a_b',33,'Household Member of',98,'Household Member is',1,NULL,NULL,NULL),
+ (96,48,8,'b_a',98,'Household Member is',33,'Household Member of',1,NULL,NULL,NULL),
+ (97,49,7,'a_b',24,'Head of Household for',98,'Head of Household is',1,NULL,NULL,NULL),
+ (98,49,7,'b_a',98,'Head of Household is',24,'Head of Household for',1,NULL,NULL,NULL),
+ (99,50,2,'a_b',57,'Spouse of',24,'Spouse of',1,NULL,NULL,NULL),
+ (100,50,2,'b_a',24,'Spouse of',57,'Spouse of',1,NULL,NULL,NULL),
+ (101,51,1,'a_b',106,'Child of',191,'Parent of',1,NULL,NULL,NULL),
+ (102,51,1,'b_a',191,'Parent of',106,'Child of',1,NULL,NULL,NULL),
+ (103,52,1,'a_b',91,'Child of',191,'Parent of',1,NULL,NULL,NULL),
+ (104,52,1,'b_a',191,'Parent of',91,'Child of',1,NULL,NULL,NULL),
+ (105,53,1,'a_b',106,'Child of',97,'Parent of',1,NULL,NULL,NULL),
+ (106,53,1,'b_a',97,'Parent of',106,'Child of',1,NULL,NULL,NULL),
+ (107,54,1,'a_b',91,'Child of',97,'Parent of',1,NULL,NULL,NULL),
+ (108,54,1,'b_a',97,'Parent of',91,'Child of',1,NULL,NULL,NULL),
+ (109,55,4,'a_b',91,'Sibling of',106,'Sibling of',1,NULL,NULL,NULL),
+ (110,55,4,'b_a',106,'Sibling of',91,'Sibling of',1,NULL,NULL,NULL),
+ (111,56,8,'a_b',97,'Household Member of',161,'Household Member is',1,NULL,NULL,NULL),
+ (112,56,8,'b_a',161,'Household Member is',97,'Household Member of',1,NULL,NULL,NULL),
+ (113,57,8,'a_b',106,'Household Member of',161,'Household Member is',1,NULL,NULL,NULL),
+ (114,57,8,'b_a',161,'Household Member is',106,'Household Member of',1,NULL,NULL,NULL),
+ (115,58,8,'a_b',91,'Household Member of',161,'Household Member is',1,NULL,NULL,NULL),
+ (116,58,8,'b_a',161,'Household Member is',91,'Household Member of',1,NULL,NULL,NULL),
+ (117,59,7,'a_b',191,'Head of Household for',161,'Head of Household is',0,NULL,NULL,NULL),
+ (118,59,7,'b_a',161,'Head of Household is',191,'Head of Household for',0,NULL,NULL,NULL),
+ (119,60,2,'a_b',97,'Spouse of',191,'Spouse of',0,NULL,NULL,NULL),
+ (120,60,2,'b_a',191,'Spouse of',97,'Spouse of',0,NULL,NULL,NULL),
+ (121,61,1,'a_b',25,'Child of',39,'Parent of',1,NULL,NULL,NULL),
+ (122,61,1,'b_a',39,'Parent of',25,'Child of',1,NULL,NULL,NULL),
+ (123,62,1,'a_b',157,'Child of',39,'Parent of',1,NULL,NULL,NULL),
+ (124,62,1,'b_a',39,'Parent of',157,'Child of',1,NULL,NULL,NULL),
+ (125,63,1,'a_b',25,'Child of',155,'Parent of',1,NULL,NULL,NULL),
+ (126,63,1,'b_a',155,'Parent of',25,'Child of',1,NULL,NULL,NULL),
+ (127,64,1,'a_b',157,'Child of',155,'Parent of',1,NULL,NULL,NULL),
+ (128,64,1,'b_a',155,'Parent of',157,'Child of',1,NULL,NULL,NULL),
+ (129,65,4,'a_b',157,'Sibling of',25,'Sibling of',1,NULL,NULL,NULL),
+ (130,65,4,'b_a',25,'Sibling of',157,'Sibling of',1,NULL,NULL,NULL),
+ (131,66,8,'a_b',155,'Household Member of',10,'Household Member is',1,NULL,NULL,NULL),
+ (132,66,8,'b_a',10,'Household Member is',155,'Household Member of',1,NULL,NULL,NULL),
+ (133,67,8,'a_b',25,'Household Member of',10,'Household Member is',1,NULL,NULL,NULL),
+ (134,67,8,'b_a',10,'Household Member is',25,'Household Member of',1,NULL,NULL,NULL),
+ (135,68,8,'a_b',157,'Household Member of',10,'Household Member is',1,NULL,NULL,NULL),
+ (136,68,8,'b_a',10,'Household Member is',157,'Household Member of',1,NULL,NULL,NULL),
+ (137,69,7,'a_b',39,'Head of Household for',10,'Head of Household is',1,NULL,NULL,NULL),
+ (138,69,7,'b_a',10,'Head of Household is',39,'Head of Household for',1,NULL,NULL,NULL),
+ (139,70,2,'a_b',155,'Spouse of',39,'Spouse of',1,NULL,NULL,NULL),
+ (140,70,2,'b_a',39,'Spouse of',155,'Spouse of',1,NULL,NULL,NULL),
+ (141,71,1,'a_b',50,'Child of',148,'Parent of',1,NULL,NULL,NULL),
+ (142,71,1,'b_a',148,'Parent of',50,'Child of',1,NULL,NULL,NULL),
+ (143,72,1,'a_b',190,'Child of',148,'Parent of',1,NULL,NULL,NULL),
+ (144,72,1,'b_a',148,'Parent of',190,'Child of',1,NULL,NULL,NULL),
+ (145,73,1,'a_b',50,'Child of',133,'Parent of',1,NULL,NULL,NULL),
+ (146,73,1,'b_a',133,'Parent of',50,'Child of',1,NULL,NULL,NULL),
+ (147,74,1,'a_b',190,'Child of',133,'Parent of',1,NULL,NULL,NULL),
+ (148,74,1,'b_a',133,'Parent of',190,'Child of',1,NULL,NULL,NULL),
+ (149,75,4,'a_b',190,'Sibling of',50,'Sibling of',1,NULL,NULL,NULL),
+ (150,75,4,'b_a',50,'Sibling of',190,'Sibling of',1,NULL,NULL,NULL),
+ (151,76,8,'a_b',133,'Household Member of',199,'Household Member is',1,NULL,NULL,NULL),
+ (152,76,8,'b_a',199,'Household Member is',133,'Household Member of',1,NULL,NULL,NULL),
+ (153,77,8,'a_b',50,'Household Member of',199,'Household Member is',1,NULL,NULL,NULL),
+ (154,77,8,'b_a',199,'Household Member is',50,'Household Member of',1,NULL,NULL,NULL),
+ (155,78,8,'a_b',190,'Household Member of',199,'Household Member is',1,NULL,NULL,NULL),
+ (156,78,8,'b_a',199,'Household Member is',190,'Household Member of',1,NULL,NULL,NULL),
+ (157,79,7,'a_b',148,'Head of Household for',199,'Head of Household is',1,NULL,NULL,NULL),
+ (158,79,7,'b_a',199,'Head of Household is',148,'Head of Household for',1,NULL,NULL,NULL),
+ (159,80,2,'a_b',133,'Spouse of',148,'Spouse of',1,NULL,NULL,NULL),
+ (160,80,2,'b_a',148,'Spouse of',133,'Spouse of',1,NULL,NULL,NULL),
+ (161,81,1,'a_b',117,'Child of',16,'Parent of',1,NULL,NULL,NULL),
+ (162,81,1,'b_a',16,'Parent of',117,'Child of',1,NULL,NULL,NULL),
+ (163,82,1,'a_b',188,'Child of',16,'Parent of',1,NULL,NULL,NULL),
+ (164,82,1,'b_a',16,'Parent of',188,'Child of',1,NULL,NULL,NULL),
+ (165,83,1,'a_b',117,'Child of',2,'Parent of',1,NULL,NULL,NULL),
+ (166,83,1,'b_a',2,'Parent of',117,'Child of',1,NULL,NULL,NULL),
+ (167,84,1,'a_b',188,'Child of',2,'Parent of',1,NULL,NULL,NULL),
+ (168,84,1,'b_a',2,'Parent of',188,'Child of',1,NULL,NULL,NULL),
+ (169,85,4,'a_b',188,'Sibling of',117,'Sibling of',1,NULL,NULL,NULL),
+ (170,85,4,'b_a',117,'Sibling of',188,'Sibling of',1,NULL,NULL,NULL),
+ (171,86,8,'a_b',2,'Household Member of',29,'Household Member is',1,NULL,NULL,NULL),
+ (172,86,8,'b_a',29,'Household Member is',2,'Household Member of',1,NULL,NULL,NULL),
+ (173,87,8,'a_b',117,'Household Member of',29,'Household Member is',1,NULL,NULL,NULL),
+ (174,87,8,'b_a',29,'Household Member is',117,'Household Member of',1,NULL,NULL,NULL),
+ (175,88,8,'a_b',188,'Household Member of',29,'Household Member is',1,NULL,NULL,NULL),
+ (176,88,8,'b_a',29,'Household Member is',188,'Household Member of',1,NULL,NULL,NULL),
+ (177,89,7,'a_b',16,'Head of Household for',29,'Head of Household is',1,NULL,NULL,NULL),
+ (178,89,7,'b_a',29,'Head of Household is',16,'Head of Household for',1,NULL,NULL,NULL),
+ (179,90,2,'a_b',2,'Spouse of',16,'Spouse of',1,NULL,NULL,NULL),
+ (180,90,2,'b_a',16,'Spouse of',2,'Spouse of',1,NULL,NULL,NULL),
+ (181,91,1,'a_b',113,'Child of',146,'Parent of',1,NULL,NULL,NULL),
+ (182,91,1,'b_a',146,'Parent of',113,'Child of',1,NULL,NULL,NULL),
+ (183,92,1,'a_b',44,'Child of',146,'Parent of',1,NULL,NULL,NULL),
+ (184,92,1,'b_a',146,'Parent of',44,'Child of',1,NULL,NULL,NULL),
+ (185,93,1,'a_b',113,'Child of',195,'Parent of',1,NULL,NULL,NULL),
+ (186,93,1,'b_a',195,'Parent of',113,'Child of',1,NULL,NULL,NULL),
+ (187,94,1,'a_b',44,'Child of',195,'Parent of',1,NULL,NULL,NULL),
+ (188,94,1,'b_a',195,'Parent of',44,'Child of',1,NULL,NULL,NULL),
+ (189,95,4,'a_b',44,'Sibling of',113,'Sibling of',1,NULL,NULL,NULL),
+ (190,95,4,'b_a',113,'Sibling of',44,'Sibling of',1,NULL,NULL,NULL),
+ (191,96,8,'a_b',195,'Household Member of',59,'Household Member is',1,NULL,NULL,NULL),
+ (192,96,8,'b_a',59,'Household Member is',195,'Household Member of',1,NULL,NULL,NULL),
+ (193,97,8,'a_b',113,'Household Member of',59,'Household Member is',1,NULL,NULL,NULL),
+ (194,97,8,'b_a',59,'Household Member is',113,'Household Member of',1,NULL,NULL,NULL),
+ (195,98,8,'a_b',44,'Household Member of',59,'Household Member is',1,NULL,NULL,NULL),
+ (196,98,8,'b_a',59,'Household Member is',44,'Household Member of',1,NULL,NULL,NULL),
+ (197,99,7,'a_b',146,'Head of Household for',59,'Head of Household is',0,NULL,NULL,NULL),
+ (198,99,7,'b_a',59,'Head of Household is',146,'Head of Household for',0,NULL,NULL,NULL),
+ (199,100,2,'a_b',195,'Spouse of',146,'Spouse of',0,NULL,NULL,NULL),
+ (200,100,2,'b_a',146,'Spouse of',195,'Spouse of',0,NULL,NULL,NULL),
+ (201,101,1,'a_b',82,'Child of',110,'Parent of',1,NULL,NULL,NULL),
+ (202,101,1,'b_a',110,'Parent of',82,'Child of',1,NULL,NULL,NULL),
+ (203,102,1,'a_b',172,'Child of',110,'Parent of',1,NULL,NULL,NULL),
+ (204,102,1,'b_a',110,'Parent of',172,'Child of',1,NULL,NULL,NULL),
+ (205,103,1,'a_b',82,'Child of',163,'Parent of',1,NULL,NULL,NULL),
+ (206,103,1,'b_a',163,'Parent of',82,'Child of',1,NULL,NULL,NULL),
+ (207,104,1,'a_b',172,'Child of',163,'Parent of',1,NULL,NULL,NULL),
+ (208,104,1,'b_a',163,'Parent of',172,'Child of',1,NULL,NULL,NULL),
+ (209,105,4,'a_b',172,'Sibling of',82,'Sibling of',1,NULL,NULL,NULL),
+ (210,105,4,'b_a',82,'Sibling of',172,'Sibling of',1,NULL,NULL,NULL),
+ (211,106,8,'a_b',163,'Household Member of',46,'Household Member is',1,NULL,NULL,NULL),
+ (212,106,8,'b_a',46,'Household Member is',163,'Household Member of',1,NULL,NULL,NULL),
+ (213,107,8,'a_b',82,'Household Member of',46,'Household Member is',1,NULL,NULL,NULL),
+ (214,107,8,'b_a',46,'Household Member is',82,'Household Member of',1,NULL,NULL,NULL),
+ (215,108,8,'a_b',172,'Household Member of',46,'Household Member is',1,NULL,NULL,NULL),
+ (216,108,8,'b_a',46,'Household Member is',172,'Household Member of',1,NULL,NULL,NULL),
+ (217,109,7,'a_b',110,'Head of Household for',46,'Head of Household is',1,NULL,NULL,NULL),
+ (218,109,7,'b_a',46,'Head of Household is',110,'Head of Household for',1,NULL,NULL,NULL),
+ (219,110,2,'a_b',163,'Spouse of',110,'Spouse of',1,NULL,NULL,NULL),
+ (220,110,2,'b_a',110,'Spouse of',163,'Spouse of',1,NULL,NULL,NULL),
+ (221,111,1,'a_b',47,'Child of',12,'Parent of',1,NULL,NULL,NULL),
+ (222,111,1,'b_a',12,'Parent of',47,'Child of',1,NULL,NULL,NULL),
+ (223,112,1,'a_b',140,'Child of',12,'Parent of',1,NULL,NULL,NULL),
+ (224,112,1,'b_a',12,'Parent of',140,'Child of',1,NULL,NULL,NULL),
+ (225,113,1,'a_b',47,'Child of',147,'Parent of',1,NULL,NULL,NULL),
+ (226,113,1,'b_a',147,'Parent of',47,'Child of',1,NULL,NULL,NULL),
+ (227,114,1,'a_b',140,'Child of',147,'Parent of',1,NULL,NULL,NULL),
+ (228,114,1,'b_a',147,'Parent of',140,'Child of',1,NULL,NULL,NULL),
+ (229,115,4,'a_b',140,'Sibling of',47,'Sibling of',1,NULL,NULL,NULL),
+ (230,115,4,'b_a',47,'Sibling of',140,'Sibling of',1,NULL,NULL,NULL),
+ (231,116,8,'a_b',147,'Household Member of',11,'Household Member is',1,NULL,NULL,NULL),
+ (232,116,8,'b_a',11,'Household Member is',147,'Household Member of',1,NULL,NULL,NULL),
+ (233,117,8,'a_b',47,'Household Member of',11,'Household Member is',1,NULL,NULL,NULL),
+ (234,117,8,'b_a',11,'Household Member is',47,'Household Member of',1,NULL,NULL,NULL),
+ (235,118,8,'a_b',140,'Household Member of',11,'Household Member is',1,NULL,NULL,NULL),
+ (236,118,8,'b_a',11,'Household Member is',140,'Household Member of',1,NULL,NULL,NULL),
+ (237,119,7,'a_b',12,'Head of Household for',11,'Head of Household is',1,NULL,NULL,NULL),
+ (238,119,7,'b_a',11,'Head of Household is',12,'Head of Household for',1,NULL,NULL,NULL),
+ (239,120,2,'a_b',147,'Spouse of',12,'Spouse of',1,NULL,NULL,NULL),
+ (240,120,2,'b_a',12,'Spouse of',147,'Spouse of',1,NULL,NULL,NULL),
+ (241,121,1,'a_b',38,'Child of',48,'Parent of',1,NULL,NULL,NULL),
+ (242,121,1,'b_a',48,'Parent of',38,'Child of',1,NULL,NULL,NULL),
+ (243,122,1,'a_b',108,'Child of',48,'Parent of',1,NULL,NULL,NULL),
+ (244,122,1,'b_a',48,'Parent of',108,'Child of',1,NULL,NULL,NULL),
+ (245,123,1,'a_b',38,'Child of',149,'Parent of',1,NULL,NULL,NULL),
+ (246,123,1,'b_a',149,'Parent of',38,'Child of',1,NULL,NULL,NULL),
+ (247,124,1,'a_b',108,'Child of',149,'Parent of',1,NULL,NULL,NULL),
+ (248,124,1,'b_a',149,'Parent of',108,'Child of',1,NULL,NULL,NULL),
+ (249,125,4,'a_b',108,'Sibling of',38,'Sibling of',1,NULL,NULL,NULL),
+ (250,125,4,'b_a',38,'Sibling of',108,'Sibling of',1,NULL,NULL,NULL),
+ (251,126,8,'a_b',149,'Household Member of',170,'Household Member is',1,NULL,NULL,NULL),
+ (252,126,8,'b_a',170,'Household Member is',149,'Household Member of',1,NULL,NULL,NULL),
+ (253,127,8,'a_b',38,'Household Member of',170,'Household Member is',1,NULL,NULL,NULL),
+ (254,127,8,'b_a',170,'Household Member is',38,'Household Member of',1,NULL,NULL,NULL),
+ (255,128,8,'a_b',108,'Household Member of',170,'Household Member is',1,NULL,NULL,NULL),
+ (256,128,8,'b_a',170,'Household Member is',108,'Household Member of',1,NULL,NULL,NULL),
+ (257,129,7,'a_b',48,'Head of Household for',170,'Head of Household is',0,NULL,NULL,NULL),
+ (258,129,7,'b_a',170,'Head of Household is',48,'Head of Household for',0,NULL,NULL,NULL),
+ (259,130,2,'a_b',149,'Spouse of',48,'Spouse of',0,NULL,NULL,NULL),
+ (260,130,2,'b_a',48,'Spouse of',149,'Spouse of',0,NULL,NULL,NULL),
+ (261,131,1,'a_b',75,'Child of',26,'Parent of',1,NULL,NULL,NULL),
+ (262,131,1,'b_a',26,'Parent of',75,'Child of',1,NULL,NULL,NULL),
+ (263,132,1,'a_b',27,'Child of',26,'Parent of',1,NULL,NULL,NULL),
+ (264,132,1,'b_a',26,'Parent of',27,'Child of',1,NULL,NULL,NULL),
+ (265,133,1,'a_b',75,'Child of',34,'Parent of',1,NULL,NULL,NULL),
+ (266,133,1,'b_a',34,'Parent of',75,'Child of',1,NULL,NULL,NULL),
+ (267,134,1,'a_b',27,'Child of',34,'Parent of',1,NULL,NULL,NULL),
+ (268,134,1,'b_a',34,'Parent of',27,'Child of',1,NULL,NULL,NULL),
+ (269,135,4,'a_b',27,'Sibling of',75,'Sibling of',1,NULL,NULL,NULL),
+ (270,135,4,'b_a',75,'Sibling of',27,'Sibling of',1,NULL,NULL,NULL),
+ (271,136,8,'a_b',34,'Household Member of',41,'Household Member is',1,NULL,NULL,NULL),
+ (272,136,8,'b_a',41,'Household Member is',34,'Household Member of',1,NULL,NULL,NULL),
+ (273,137,8,'a_b',75,'Household Member of',41,'Household Member is',1,NULL,NULL,NULL),
+ (274,137,8,'b_a',41,'Household Member is',75,'Household Member of',1,NULL,NULL,NULL),
+ (275,138,8,'a_b',27,'Household Member of',41,'Household Member is',1,NULL,NULL,NULL),
+ (276,138,8,'b_a',41,'Household Member is',27,'Household Member of',1,NULL,NULL,NULL),
+ (277,139,7,'a_b',26,'Head of Household for',41,'Head of Household is',1,NULL,NULL,NULL),
+ (278,139,7,'b_a',41,'Head of Household is',26,'Head of Household for',1,NULL,NULL,NULL),
+ (279,140,2,'a_b',34,'Spouse of',26,'Spouse of',1,NULL,NULL,NULL),
+ (280,140,2,'b_a',26,'Spouse of',34,'Spouse of',1,NULL,NULL,NULL),
+ (281,141,1,'a_b',168,'Child of',83,'Parent of',1,NULL,NULL,NULL),
+ (282,141,1,'b_a',83,'Parent of',168,'Child of',1,NULL,NULL,NULL),
+ (283,142,1,'a_b',31,'Child of',83,'Parent of',1,NULL,NULL,NULL),
+ (284,142,1,'b_a',83,'Parent of',31,'Child of',1,NULL,NULL,NULL),
+ (285,143,1,'a_b',168,'Child of',150,'Parent of',1,NULL,NULL,NULL),
+ (286,143,1,'b_a',150,'Parent of',168,'Child of',1,NULL,NULL,NULL),
+ (287,144,1,'a_b',31,'Child of',150,'Parent of',1,NULL,NULL,NULL),
+ (288,144,1,'b_a',150,'Parent of',31,'Child of',1,NULL,NULL,NULL),
+ (289,145,4,'a_b',31,'Sibling of',168,'Sibling of',1,NULL,NULL,NULL),
+ (290,145,4,'b_a',168,'Sibling of',31,'Sibling of',1,NULL,NULL,NULL),
+ (291,146,8,'a_b',150,'Household Member of',102,'Household Member is',1,NULL,NULL,NULL),
+ (292,146,8,'b_a',102,'Household Member is',150,'Household Member of',1,NULL,NULL,NULL),
+ (293,147,8,'a_b',168,'Household Member of',102,'Household Member is',1,NULL,NULL,NULL),
+ (294,147,8,'b_a',102,'Household Member is',168,'Household Member of',1,NULL,NULL,NULL),
+ (295,148,8,'a_b',31,'Household Member of',102,'Household Member is',1,NULL,NULL,NULL),
+ (296,148,8,'b_a',102,'Household Member is',31,'Household Member of',1,NULL,NULL,NULL),
+ (297,149,7,'a_b',83,'Head of Household for',102,'Head of Household is',0,NULL,NULL,NULL),
+ (298,149,7,'b_a',102,'Head of Household is',83,'Head of Household for',0,NULL,NULL,NULL),
+ (299,150,2,'a_b',150,'Spouse of',83,'Spouse of',0,NULL,NULL,NULL),
+ (300,150,2,'b_a',83,'Spouse of',150,'Spouse of',0,NULL,NULL,NULL),
+ (301,151,1,'a_b',72,'Child of',183,'Parent of',1,NULL,NULL,NULL),
+ (302,151,1,'b_a',183,'Parent of',72,'Child of',1,NULL,NULL,NULL),
+ (303,152,1,'a_b',15,'Child of',183,'Parent of',1,NULL,NULL,NULL),
+ (304,152,1,'b_a',183,'Parent of',15,'Child of',1,NULL,NULL,NULL),
+ (305,153,1,'a_b',72,'Child of',64,'Parent of',1,NULL,NULL,NULL),
+ (306,153,1,'b_a',64,'Parent of',72,'Child of',1,NULL,NULL,NULL),
+ (307,154,1,'a_b',15,'Child of',64,'Parent of',1,NULL,NULL,NULL),
+ (308,154,1,'b_a',64,'Parent of',15,'Child of',1,NULL,NULL,NULL),
+ (309,155,4,'a_b',15,'Sibling of',72,'Sibling of',1,NULL,NULL,NULL),
+ (310,155,4,'b_a',72,'Sibling of',15,'Sibling of',1,NULL,NULL,NULL),
+ (311,156,8,'a_b',64,'Household Member of',86,'Household Member is',1,NULL,NULL,NULL),
+ (312,156,8,'b_a',86,'Household Member is',64,'Household Member of',1,NULL,NULL,NULL),
+ (313,157,8,'a_b',72,'Household Member of',86,'Household Member is',1,NULL,NULL,NULL),
+ (314,157,8,'b_a',86,'Household Member is',72,'Household Member of',1,NULL,NULL,NULL),
+ (315,158,8,'a_b',15,'Household Member of',86,'Household Member is',1,NULL,NULL,NULL),
+ (316,158,8,'b_a',86,'Household Member is',15,'Household Member of',1,NULL,NULL,NULL),
+ (317,159,7,'a_b',183,'Head of Household for',86,'Head of Household is',1,NULL,NULL,NULL),
+ (318,159,7,'b_a',86,'Head of Household is',183,'Head of Household for',1,NULL,NULL,NULL),
+ (319,160,2,'a_b',64,'Spouse of',183,'Spouse of',1,NULL,NULL,NULL),
+ (320,160,2,'b_a',183,'Spouse of',64,'Spouse of',1,NULL,NULL,NULL),
+ (321,161,1,'a_b',181,'Child of',115,'Parent of',1,NULL,NULL,NULL),
+ (322,161,1,'b_a',115,'Parent of',181,'Child of',1,NULL,NULL,NULL),
+ (323,162,1,'a_b',175,'Child of',115,'Parent of',1,NULL,NULL,NULL),
+ (324,162,1,'b_a',115,'Parent of',175,'Child of',1,NULL,NULL,NULL),
+ (325,163,1,'a_b',181,'Child of',71,'Parent of',1,NULL,NULL,NULL),
+ (326,163,1,'b_a',71,'Parent of',181,'Child of',1,NULL,NULL,NULL),
+ (327,164,1,'a_b',175,'Child of',71,'Parent of',1,NULL,NULL,NULL),
+ (328,164,1,'b_a',71,'Parent of',175,'Child of',1,NULL,NULL,NULL),
+ (329,165,4,'a_b',175,'Sibling of',181,'Sibling of',1,NULL,NULL,NULL),
+ (330,165,4,'b_a',181,'Sibling of',175,'Sibling of',1,NULL,NULL,NULL),
+ (331,166,8,'a_b',71,'Household Member of',132,'Household Member is',1,NULL,NULL,NULL),
+ (332,166,8,'b_a',132,'Household Member is',71,'Household Member of',1,NULL,NULL,NULL),
+ (333,167,8,'a_b',181,'Household Member of',132,'Household Member is',1,NULL,NULL,NULL),
+ (334,167,8,'b_a',132,'Household Member is',181,'Household Member of',1,NULL,NULL,NULL),
+ (335,168,8,'a_b',175,'Household Member of',132,'Household Member is',1,NULL,NULL,NULL),
+ (336,168,8,'b_a',132,'Household Member is',175,'Household Member of',1,NULL,NULL,NULL),
+ (337,169,7,'a_b',115,'Head of Household for',132,'Head of Household is',0,NULL,NULL,NULL),
+ (338,169,7,'b_a',132,'Head of Household is',115,'Head of Household for',0,NULL,NULL,NULL),
+ (339,170,2,'a_b',71,'Spouse of',115,'Spouse of',0,NULL,NULL,NULL),
+ (340,170,2,'b_a',115,'Spouse of',71,'Spouse of',0,NULL,NULL,NULL),
+ (341,171,1,'a_b',3,'Child of',180,'Parent of',1,NULL,NULL,NULL),
+ (342,171,1,'b_a',180,'Parent of',3,'Child of',1,NULL,NULL,NULL),
+ (343,172,1,'a_b',103,'Child of',180,'Parent of',1,NULL,NULL,NULL),
+ (344,172,1,'b_a',180,'Parent of',103,'Child of',1,NULL,NULL,NULL),
+ (345,173,1,'a_b',3,'Child of',87,'Parent of',1,NULL,NULL,NULL),
+ (346,173,1,'b_a',87,'Parent of',3,'Child of',1,NULL,NULL,NULL),
+ (347,174,1,'a_b',103,'Child of',87,'Parent of',1,NULL,NULL,NULL),
+ (348,174,1,'b_a',87,'Parent of',103,'Child of',1,NULL,NULL,NULL),
+ (349,175,4,'a_b',103,'Sibling of',3,'Sibling of',1,NULL,NULL,NULL),
+ (350,175,4,'b_a',3,'Sibling of',103,'Sibling of',1,NULL,NULL,NULL),
+ (351,176,8,'a_b',87,'Household Member of',178,'Household Member is',1,NULL,NULL,NULL),
+ (352,176,8,'b_a',178,'Household Member is',87,'Household Member of',1,NULL,NULL,NULL),
+ (353,177,8,'a_b',3,'Household Member of',178,'Household Member is',1,NULL,NULL,NULL),
+ (354,177,8,'b_a',178,'Household Member is',3,'Household Member of',1,NULL,NULL,NULL),
+ (355,178,8,'a_b',103,'Household Member of',178,'Household Member is',1,NULL,NULL,NULL),
+ (356,178,8,'b_a',178,'Household Member is',103,'Household Member of',1,NULL,NULL,NULL),
+ (357,179,7,'a_b',180,'Head of Household for',178,'Head of Household is',1,NULL,NULL,NULL),
+ (358,179,7,'b_a',178,'Head of Household is',180,'Head of Household for',1,NULL,NULL,NULL),
+ (359,180,2,'a_b',87,'Spouse of',180,'Spouse of',1,NULL,NULL,NULL),
+ (360,180,2,'b_a',180,'Spouse of',87,'Spouse of',1,NULL,NULL,NULL),
+ (361,181,1,'a_b',120,'Child of',165,'Parent of',1,NULL,NULL,NULL),
+ (362,181,1,'b_a',165,'Parent of',120,'Child of',1,NULL,NULL,NULL),
+ (363,182,1,'a_b',164,'Child of',165,'Parent of',1,NULL,NULL,NULL),
+ (364,182,1,'b_a',165,'Parent of',164,'Child of',1,NULL,NULL,NULL),
+ (365,183,1,'a_b',120,'Child of',126,'Parent of',1,NULL,NULL,NULL),
+ (366,183,1,'b_a',126,'Parent of',120,'Child of',1,NULL,NULL,NULL),
+ (367,184,1,'a_b',164,'Child of',126,'Parent of',1,NULL,NULL,NULL),
+ (368,184,1,'b_a',126,'Parent of',164,'Child of',1,NULL,NULL,NULL),
+ (369,185,4,'a_b',164,'Sibling of',120,'Sibling of',1,NULL,NULL,NULL),
+ (370,185,4,'b_a',120,'Sibling of',164,'Sibling of',1,NULL,NULL,NULL),
+ (371,186,8,'a_b',126,'Household Member of',152,'Household Member is',1,NULL,NULL,NULL),
+ (372,186,8,'b_a',152,'Household Member is',126,'Household Member of',1,NULL,NULL,NULL),
+ (373,187,8,'a_b',120,'Household Member of',152,'Household Member is',1,NULL,NULL,NULL),
+ (374,187,8,'b_a',152,'Household Member is',120,'Household Member of',1,NULL,NULL,NULL),
+ (375,188,8,'a_b',164,'Household Member of',152,'Household Member is',1,NULL,NULL,NULL),
+ (376,188,8,'b_a',152,'Household Member is',164,'Household Member of',1,NULL,NULL,NULL),
+ (377,189,7,'a_b',165,'Head of Household for',152,'Head of Household is',0,NULL,NULL,NULL),
+ (378,189,7,'b_a',152,'Head of Household is',165,'Head of Household for',0,NULL,NULL,NULL),
+ (379,190,2,'a_b',126,'Spouse of',165,'Spouse of',0,NULL,NULL,NULL),
+ (380,190,2,'b_a',165,'Spouse of',126,'Spouse of',0,NULL,NULL,NULL),
+ (381,191,1,'a_b',119,'Child of',104,'Parent of',1,NULL,NULL,NULL),
+ (382,191,1,'b_a',104,'Parent of',119,'Child of',1,NULL,NULL,NULL),
+ (383,192,1,'a_b',45,'Child of',104,'Parent of',1,NULL,NULL,NULL),
+ (384,192,1,'b_a',104,'Parent of',45,'Child of',1,NULL,NULL,NULL),
+ (385,193,1,'a_b',119,'Child of',139,'Parent of',1,NULL,NULL,NULL),
+ (386,193,1,'b_a',139,'Parent of',119,'Child of',1,NULL,NULL,NULL),
+ (387,194,1,'a_b',45,'Child of',139,'Parent of',1,NULL,NULL,NULL),
+ (388,194,1,'b_a',139,'Parent of',45,'Child of',1,NULL,NULL,NULL),
+ (389,195,4,'a_b',45,'Sibling of',119,'Sibling of',1,NULL,NULL,NULL),
+ (390,195,4,'b_a',119,'Sibling of',45,'Sibling of',1,NULL,NULL,NULL),
+ (391,196,8,'a_b',139,'Household Member of',18,'Household Member is',1,NULL,NULL,NULL),
+ (392,196,8,'b_a',18,'Household Member is',139,'Household Member of',1,NULL,NULL,NULL),
+ (393,197,8,'a_b',119,'Household Member of',18,'Household Member is',1,NULL,NULL,NULL),
+ (394,197,8,'b_a',18,'Household Member is',119,'Household Member of',1,NULL,NULL,NULL),
+ (395,198,8,'a_b',45,'Household Member of',18,'Household Member is',1,NULL,NULL,NULL),
+ (396,198,8,'b_a',18,'Household Member is',45,'Household Member of',1,NULL,NULL,NULL),
+ (397,199,7,'a_b',104,'Head of Household for',18,'Head of Household is',1,NULL,NULL,NULL),
+ (398,199,7,'b_a',18,'Head of Household is',104,'Head of Household for',1,NULL,NULL,NULL),
+ (399,200,2,'a_b',139,'Spouse of',104,'Spouse of',1,NULL,NULL,NULL),
+ (400,200,2,'b_a',104,'Spouse of',139,'Spouse of',1,NULL,NULL,NULL),
+ (401,201,5,'a_b',60,'Employee of',9,'Employer of',1,NULL,NULL,NULL),
+ (402,201,5,'b_a',9,'Employer of',60,'Employee of',1,NULL,NULL,NULL),
+ (403,202,5,'a_b',78,'Employee of',17,'Employer of',1,NULL,NULL,NULL),
+ (404,202,5,'b_a',17,'Employer of',78,'Employee of',1,NULL,NULL,NULL),
+ (405,203,5,'a_b',146,'Employee of',40,'Employer of',1,NULL,NULL,NULL),
+ (406,203,5,'b_a',40,'Employer of',146,'Employee of',1,NULL,NULL,NULL),
+ (407,204,5,'a_b',158,'Employee of',49,'Employer of',1,NULL,NULL,NULL),
+ (408,204,5,'b_a',49,'Employer of',158,'Employee of',1,NULL,NULL,NULL),
+ (409,205,5,'a_b',155,'Employee of',69,'Employer of',1,NULL,NULL,NULL),
+ (410,205,5,'b_a',69,'Employer of',155,'Employee of',1,NULL,NULL,NULL),
+ (411,206,5,'a_b',166,'Employee of',84,'Employer of',1,NULL,NULL,NULL),
+ (412,206,5,'b_a',84,'Employer of',166,'Employee of',1,NULL,NULL,NULL),
+ (413,207,5,'a_b',52,'Employee of',121,'Employer of',1,NULL,NULL,NULL),
+ (414,207,5,'b_a',121,'Employer of',52,'Employee of',1,NULL,NULL,NULL),
+ (415,208,5,'a_b',163,'Employee of',124,'Employer of',1,NULL,NULL,NULL),
+ (416,208,5,'b_a',124,'Employer of',163,'Employee of',1,NULL,NULL,NULL),
+ (417,209,5,'a_b',138,'Employee of',129,'Employer of',1,NULL,NULL,NULL),
+ (418,209,5,'b_a',129,'Employer of',138,'Employee of',1,NULL,NULL,NULL),
+ (419,210,5,'a_b',34,'Employee of',130,'Employer of',1,NULL,NULL,NULL),
+ (420,210,5,'b_a',130,'Employer of',34,'Employee of',1,NULL,NULL,NULL),
+ (421,211,5,'a_b',74,'Employee of',144,'Employer of',1,NULL,NULL,NULL),
+ (422,211,5,'b_a',144,'Employer of',74,'Employee of',1,NULL,NULL,NULL),
+ (423,212,5,'a_b',32,'Employee of',169,'Employer of',1,NULL,NULL,NULL),
+ (424,212,5,'b_a',169,'Employer of',32,'Employee of',1,NULL,NULL,NULL),
+ (425,213,5,'a_b',73,'Employee of',174,'Employer of',1,NULL,NULL,NULL),
+ (426,213,5,'b_a',174,'Employer of',73,'Employee of',1,NULL,NULL,NULL),
+ (427,214,5,'a_b',83,'Employee of',184,'Employer of',1,NULL,NULL,NULL),
+ (428,214,5,'b_a',184,'Employer of',83,'Employee of',1,NULL,NULL,NULL),
+ (429,215,5,'a_b',186,'Employee of',192,'Employer of',1,NULL,NULL,NULL),
+ (430,215,5,'b_a',192,'Employer of',186,'Employee of',1,NULL,NULL,NULL),
+ (431,216,5,'a_b',108,'Employee of',193,'Employer of',1,NULL,NULL,NULL),
+ (432,216,5,'b_a',193,'Employer of',108,'Employee of',1,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_relationship_cache` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8003,13 +8005,13 @@ UNLOCK TABLES;
 LOCK TABLES `civicrm_saved_search` WRITE;
 /*!40000 ALTER TABLE `civicrm_saved_search` DISABLE KEYS */;
 INSERT INTO `civicrm_saved_search` (`id`, `name`, `label`, `form_values`, `mapping_id`, `search_custom_id`, `api_entity`, `api_params`, `created_id`, `modified_id`, `expires_date`, `created_date`, `modified_date`, `description`) VALUES
- (1,'Administer_Campaigns','Administer Campaigns',NULL,NULL,NULL,'Campaign','{\"version\":4,\"select\":[\"id\",\"title\",\"description\",\"is_active\",\"start_date\",\"end_date\",\"campaign_type_id:label\",\"status_id:label\"],\"orderBy\":[],\"where\":[],\"groupBy\":[],\"join\":[],\"having\":[]}',NULL,NULL,NULL,'2024-01-06 04:30:26','2024-01-06 04:30:26',NULL),
- (2,'Administer_Petitions','Administer Petitions',NULL,NULL,NULL,'Survey','{\"version\":4,\"select\":[\"id\",\"title\",\"campaign_id:label\",\"is_active\",\"is_default\"],\"orderBy\":[],\"where\":[[\"activity_type_id:name\",\"=\",\"Petition\"]],\"groupBy\":[],\"join\":[],\"having\":[]}',NULL,NULL,NULL,'2024-01-06 04:30:26','2024-01-06 04:30:26',NULL),
- (3,'Administer_Survey_Options','Administer Survey Options',NULL,NULL,NULL,'OptionValue','{\"version\":4,\"select\":[\"label\",\"value\",\"filter\"],\"orderBy\":[],\"where\":[],\"groupBy\":[],\"join\":[],\"having\":[]}',NULL,NULL,NULL,'2024-01-06 04:30:26','2024-01-06 04:30:26',NULL),
- (4,'Administer_Surveys','Administer Surveys',NULL,NULL,NULL,'Survey','{\"version\":4,\"select\":[\"id\",\"title\",\"campaign_id:label\",\"activity_type_id:label\",\"release_frequency\",\"default_number_of_contacts\",\"max_number_of_contacts\",\"is_active\",\"is_default\",\"result_id:label\"],\"orderBy\":[],\"where\":[[\"activity_type_id:name\",\"!=\",\"Petition\"]],\"groupBy\":[],\"join\":[],\"having\":[]}',NULL,NULL,NULL,'2024-01-06 04:30:26','2024-01-06 04:30:26',NULL),
- (5,'Email_Bounce_History','Email Bounce History',NULL,NULL,NULL,'MailingEventBounce','{\"version\":4,\"select\":[\"time_stamp\",\"bounce_type_id:label\",\"bounce_reason\",\"MailingEventBounce_MailingEventQueue_event_queue_id_01_MailingEventQueue_MailingJob_job_id_01_MailingJob_Mailing_mailing_id_01.name\"],\"orderBy\":[],\"where\":[],\"groupBy\":[],\"join\":[[\"MailingEventQueue AS MailingEventBounce_MailingEventQueue_event_queue_id_01\",\"INNER\",[\"event_queue_id\",\"=\",\"MailingEventBounce_MailingEventQueue_event_queue_id_01.id\"]],[\"MailingJob AS MailingEventBounce_MailingEventQueue_event_queue_id_01_MailingEventQueue_MailingJob_job_id_01\",\"INNER\",[\"MailingEventBounce_MailingEventQueue_event_queue_id_01.job_id\",\"=\",\"MailingEventBounce_MailingEventQueue_event_queue_id_01_MailingEventQueue_MailingJob_job_id_01.id\"]],[\"Mailing AS MailingEventBounce_MailingEventQueue_event_queue_id_01_MailingEventQueue_MailingJob_job_id_01_MailingJob_Mailing_mailing_id_01\",\"INNER\",[\"MailingEventBounce_MailingEventQueue_event_queue_id_01_MailingEventQueue_MailingJob_job_id_01.mailing_id\",\"=\",\"MailingEventBounce_MailingEventQueue_event_queue_id_01_MailingEventQueue_MailingJob_job_id_01_MailingJob_Mailing_mailing_id_01.id\"]]],\"having\":[]}',NULL,NULL,NULL,'2024-01-06 04:30:26','2024-01-06 04:30:26',NULL),
- (6,'Contact_Summary_Notes','Contact Summary Notes',NULL,NULL,NULL,'Note','{\"version\":4,\"select\":[\"id\",\"subject\",\"note\",\"note_date\",\"modified_date\",\"contact_id.sort_name\",\"GROUP_CONCAT(UNIQUE Note_EntityFile_File_01.file_name) AS GROUP_CONCAT_Note_EntityFile_File_01_file_name\",\"COUNT(Note_Note_entity_id_01.id) AS COUNT_Note_Note_entity_id_01_id\"],\"orderBy\":[],\"where\":[],\"groupBy\":[\"id\"],\"join\":[[\"File AS Note_EntityFile_File_01\",\"LEFT\",\"EntityFile\",[\"id\",\"=\",\"Note_EntityFile_File_01.entity_id\"],[\"Note_EntityFile_File_01.entity_table\",\"=\",\"\'civicrm_note\'\"]],[\"Note AS Note_Note_entity_id_01\",\"LEFT\",[\"id\",\"=\",\"Note_Note_entity_id_01.entity_id\"],[\"Note_Note_entity_id_01.entity_table\",\"=\",\"\'civicrm_note\'\"]]],\"having\":[]}',NULL,NULL,NULL,'2024-01-06 04:30:26','2024-01-06 04:30:26',NULL),
- (7,'Contact_Summary_Relationships','Contact Summary Relationships',NULL,NULL,NULL,'RelationshipCache','{\"version\":4,\"select\":[\"near_relation:label\",\"RelationshipCache_Contact_far_contact_id_01.display_name\",\"start_date\",\"end_date\",\"RelationshipCache_Contact_far_contact_id_01.address_primary.city\",\"RelationshipCache_Contact_far_contact_id_01.address_primary.state_province_id:label\",\"RelationshipCache_Contact_far_contact_id_01.email_primary.email\",\"RelationshipCache_Contact_far_contact_id_01.phone_primary.phone\",\"permission_near_to_far:label\",\"permission_far_to_near:label\",\"is_active\"],\"orderBy\":[],\"where\":[[\"RelationshipCache_Contact_far_contact_id_01.is_deleted\",\"=\",false]],\"groupBy\":[],\"join\":[[\"Contact AS RelationshipCache_Contact_far_contact_id_01\",\"LEFT\",[\"far_contact_id\",\"=\",\"RelationshipCache_Contact_far_contact_id_01.id\"]]],\"having\":[]}',NULL,NULL,NULL,'2024-01-06 04:30:26','2024-01-06 04:30:26',NULL);
+ (1,'Administer_Campaigns','Administer Campaigns',NULL,NULL,NULL,'Campaign','{\"version\":4,\"select\":[\"id\",\"title\",\"description\",\"is_active\",\"start_date\",\"end_date\",\"campaign_type_id:label\",\"status_id:label\"],\"orderBy\":[],\"where\":[],\"groupBy\":[],\"join\":[],\"having\":[]}',NULL,NULL,NULL,'2024-04-26 15:50:08','2024-04-26 15:50:08',NULL),
+ (2,'Administer_Petitions','Administer Petitions',NULL,NULL,NULL,'Survey','{\"version\":4,\"select\":[\"id\",\"title\",\"campaign_id:label\",\"is_active\",\"is_default\"],\"orderBy\":[],\"where\":[[\"activity_type_id:name\",\"=\",\"Petition\"]],\"groupBy\":[],\"join\":[],\"having\":[]}',NULL,NULL,NULL,'2024-04-26 15:50:08','2024-04-26 15:50:08',NULL),
+ (3,'Administer_Survey_Options','Administer Survey Options',NULL,NULL,NULL,'OptionValue','{\"version\":4,\"select\":[\"label\",\"value\",\"filter\"],\"orderBy\":[],\"where\":[],\"groupBy\":[],\"join\":[],\"having\":[]}',NULL,NULL,NULL,'2024-04-26 15:50:08','2024-04-26 15:50:08',NULL),
+ (4,'Administer_Surveys','Administer Surveys',NULL,NULL,NULL,'Survey','{\"version\":4,\"select\":[\"id\",\"title\",\"campaign_id:label\",\"activity_type_id:label\",\"release_frequency\",\"default_number_of_contacts\",\"max_number_of_contacts\",\"is_active\",\"is_default\",\"result_id:label\"],\"orderBy\":[],\"where\":[[\"activity_type_id:name\",\"!=\",\"Petition\"]],\"groupBy\":[],\"join\":[],\"having\":[]}',NULL,NULL,NULL,'2024-04-26 15:50:08','2024-04-26 15:50:08',NULL),
+ (5,'Email_Bounce_History','Email Bounce History',NULL,NULL,NULL,'MailingEventBounce','{\"version\":4,\"select\":[\"time_stamp\",\"bounce_type_id:label\",\"bounce_reason\",\"MailingEventBounce_MailingEventQueue_event_queue_id_01_MailingEventQueue_MailingJob_job_id_01_MailingJob_Mailing_mailing_id_01.name\"],\"orderBy\":[],\"where\":[],\"groupBy\":[],\"join\":[[\"MailingEventQueue AS MailingEventBounce_MailingEventQueue_event_queue_id_01\",\"INNER\",[\"event_queue_id\",\"=\",\"MailingEventBounce_MailingEventQueue_event_queue_id_01.id\"]],[\"MailingJob AS MailingEventBounce_MailingEventQueue_event_queue_id_01_MailingEventQueue_MailingJob_job_id_01\",\"INNER\",[\"MailingEventBounce_MailingEventQueue_event_queue_id_01.job_id\",\"=\",\"MailingEventBounce_MailingEventQueue_event_queue_id_01_MailingEventQueue_MailingJob_job_id_01.id\"]],[\"Mailing AS MailingEventBounce_MailingEventQueue_event_queue_id_01_MailingEventQueue_MailingJob_job_id_01_MailingJob_Mailing_mailing_id_01\",\"INNER\",[\"MailingEventBounce_MailingEventQueue_event_queue_id_01_MailingEventQueue_MailingJob_job_id_01.mailing_id\",\"=\",\"MailingEventBounce_MailingEventQueue_event_queue_id_01_MailingEventQueue_MailingJob_job_id_01_MailingJob_Mailing_mailing_id_01.id\"]]],\"having\":[]}',NULL,NULL,NULL,'2024-04-26 15:50:08','2024-04-26 15:50:08',NULL),
+ (6,'Contact_Summary_Notes','Contact Summary Notes',NULL,NULL,NULL,'Note','{\"version\":4,\"select\":[\"id\",\"subject\",\"note\",\"note_date\",\"modified_date\",\"contact_id.sort_name\",\"GROUP_CONCAT(UNIQUE Note_EntityFile_File_01.file_name) AS GROUP_CONCAT_Note_EntityFile_File_01_file_name\",\"COUNT(Note_Note_entity_id_01.id) AS COUNT_Note_Note_entity_id_01_id\"],\"orderBy\":[],\"where\":[],\"groupBy\":[\"id\"],\"join\":[[\"File AS Note_EntityFile_File_01\",\"LEFT\",\"EntityFile\",[\"id\",\"=\",\"Note_EntityFile_File_01.entity_id\"],[\"Note_EntityFile_File_01.entity_table\",\"=\",\"\'civicrm_note\'\"]],[\"Note AS Note_Note_entity_id_01\",\"LEFT\",[\"id\",\"=\",\"Note_Note_entity_id_01.entity_id\"],[\"Note_Note_entity_id_01.entity_table\",\"=\",\"\'civicrm_note\'\"]]],\"having\":[]}',NULL,NULL,NULL,'2024-04-26 15:50:08','2024-04-26 15:50:08',NULL),
+ (7,'Contact_Summary_Relationships','Contact Summary Relationships',NULL,NULL,NULL,'RelationshipCache','{\"version\":4,\"select\":[\"near_relation:label\",\"RelationshipCache_Contact_far_contact_id_01.display_name\",\"start_date\",\"end_date\",\"RelationshipCache_Contact_far_contact_id_01.address_primary.city\",\"RelationshipCache_Contact_far_contact_id_01.address_primary.state_province_id:label\",\"RelationshipCache_Contact_far_contact_id_01.email_primary.email\",\"RelationshipCache_Contact_far_contact_id_01.phone_primary.phone\",\"permission_near_to_far:label\",\"permission_far_to_near:label\",\"is_active\"],\"orderBy\":[],\"where\":[[\"RelationshipCache_Contact_far_contact_id_01.is_deleted\",\"=\",false]],\"groupBy\":[],\"join\":[[\"Contact AS RelationshipCache_Contact_far_contact_id_01\",\"LEFT\",[\"far_contact_id\",\"=\",\"RelationshipCache_Contact_far_contact_id_01.id\"]]],\"having\":[]}',NULL,NULL,NULL,'2024-04-26 15:50:08','2024-04-26 15:50:08',NULL);
 /*!40000 ALTER TABLE `civicrm_saved_search` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12117,90 +12119,90 @@ 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,120,2,'2023-07-19 05:22:51','Email','Added',NULL),
- (2,130,2,'2023-09-30 01:56:30','Email','Added',NULL),
- (3,99,2,'2023-11-24 11:00:04','Admin','Added',NULL),
- (4,86,2,'2024-01-04 03:51:34','Admin','Added',NULL),
- (5,37,2,'2023-03-19 17:38:09','Admin','Added',NULL),
- (6,92,2,'2023-05-27 21:34:19','Email','Added',NULL),
- (7,53,2,'2023-11-25 18:51:00','Email','Added',NULL),
- (8,70,2,'2023-04-10 19:56:47','Email','Added',NULL),
- (9,113,2,'2023-03-09 05:34:23','Admin','Added',NULL),
- (10,196,2,'2023-05-07 19:17:12','Email','Added',NULL),
- (11,141,2,'2023-04-07 13:03:46','Admin','Added',NULL),
- (12,165,2,'2023-05-19 13:01:51','Email','Added',NULL),
- (13,181,2,'2023-11-10 04:35:14','Admin','Added',NULL),
- (14,46,2,'2023-01-23 09:15:18','Admin','Added',NULL),
- (15,137,2,'2023-09-09 09:13:37','Admin','Added',NULL),
- (16,66,2,'2023-10-13 07:02:50','Admin','Added',NULL),
- (17,190,2,'2023-01-27 01:18:16','Email','Added',NULL),
- (18,200,2,'2023-07-20 04:39:02','Admin','Added',NULL),
- (19,183,2,'2023-10-30 19:10:43','Admin','Added',NULL),
- (20,176,2,'2023-04-08 21:44:04','Email','Added',NULL),
- (21,22,2,'2023-11-24 08:07:25','Admin','Added',NULL),
- (22,195,2,'2023-09-16 10:35:16','Email','Added',NULL),
- (23,110,2,'2023-07-08 21:47:55','Email','Added',NULL),
- (24,59,2,'2023-02-07 21:45:08','Email','Added',NULL),
- (25,84,2,'2023-05-31 13:53:48','Admin','Added',NULL),
- (26,133,2,'2023-03-09 05:37:04','Email','Added',NULL),
- (27,93,2,'2023-12-06 22:10:28','Admin','Added',NULL),
- (28,47,2,'2023-09-08 00:16:46','Admin','Added',NULL),
- (29,85,2,'2023-12-27 02:06:59','Admin','Added',NULL),
- (30,193,2,'2023-01-18 17:01:45','Admin','Added',NULL),
- (31,101,2,'2023-08-08 07:40:42','Email','Added',NULL),
- (32,15,2,'2023-11-18 05:40:40','Admin','Added',NULL),
- (33,77,2,'2023-03-20 05:14:26','Admin','Added',NULL),
- (34,166,2,'2023-01-31 18:24:17','Admin','Added',NULL),
- (35,50,2,'2023-03-26 13:44:47','Admin','Added',NULL),
- (36,23,2,'2023-07-18 19:32:35','Admin','Added',NULL),
- (37,164,2,'2023-06-14 18:52:57','Admin','Added',NULL),
- (38,67,2,'2023-04-19 12:23:54','Admin','Added',NULL),
- (39,121,2,'2023-09-03 08:57:30','Email','Added',NULL),
- (40,192,2,'2023-01-23 13:56:06','Email','Added',NULL),
- (41,75,2,'2023-07-26 01:58:18','Admin','Added',NULL),
- (42,19,2,'2023-09-22 04:14:43','Email','Added',NULL),
- (43,146,2,'2023-04-27 09:18:27','Admin','Added',NULL),
- (44,106,2,'2023-05-17 20:56:33','Email','Added',NULL),
- (45,71,2,'2023-02-01 07:37:41','Email','Added',NULL),
- (46,13,2,'2023-05-11 03:45:32','Admin','Added',NULL),
- (47,14,2,'2023-12-01 12:35:15','Admin','Added',NULL),
- (48,10,2,'2023-02-07 19:57:24','Admin','Added',NULL),
- (49,34,2,'2023-08-25 16:28:11','Email','Added',NULL),
- (50,88,2,'2023-06-18 10:30:32','Email','Added',NULL),
- (51,163,2,'2023-02-23 07:16:28','Email','Added',NULL),
- (52,129,2,'2023-05-13 14:24:48','Email','Added',NULL),
- (53,27,2,'2023-08-16 23:15:16','Admin','Added',NULL),
- (54,4,2,'2023-09-03 03:29:18','Admin','Added',NULL),
- (55,168,2,'2023-08-30 16:12:07','Email','Added',NULL),
- (56,198,2,'2023-05-10 09:34:35','Email','Added',NULL),
- (57,91,2,'2023-11-30 03:05:09','Email','Added',NULL),
- (58,62,2,'2023-07-29 16:18:46','Email','Added',NULL),
- (59,60,2,'2023-03-18 04:52:25','Email','Added',NULL),
- (60,172,2,'2023-05-12 06:48:01','Admin','Added',NULL),
- (61,63,3,'2023-06-10 01:21:31','Admin','Added',NULL),
- (62,102,3,'2023-01-13 03:18:32','Admin','Added',NULL),
- (63,128,3,'2023-11-02 01:01:37','Email','Added',NULL),
- (64,117,3,'2023-12-09 23:02:00','Email','Added',NULL),
- (65,52,3,'2023-09-27 09:34:20','Email','Added',NULL),
- (66,76,3,'2023-04-04 00:21:10','Email','Added',NULL),
- (67,17,3,'2023-10-19 05:48:00','Admin','Added',NULL),
- (68,16,3,'2024-01-02 09:41:21','Email','Added',NULL),
- (69,159,3,'2023-03-09 08:07:03','Email','Added',NULL),
- (70,41,3,'2023-06-29 12:37:29','Admin','Added',NULL),
- (71,30,3,'2023-04-08 03:16:14','Admin','Added',NULL),
- (72,98,3,'2023-07-09 16:54:15','Email','Added',NULL),
- (73,109,3,'2023-02-16 04:30:15','Admin','Added',NULL),
- (74,90,3,'2023-07-01 21:29:52','Admin','Added',NULL),
- (75,155,3,'2023-03-28 19:01:11','Email','Added',NULL),
- (76,120,4,'2023-02-10 02:51:58','Email','Added',NULL),
- (77,70,4,'2023-02-15 05:54:57','Admin','Added',NULL),
- (78,137,4,'2023-04-10 19:09:24','Email','Added',NULL),
- (79,195,4,'2023-11-30 19:35:40','Admin','Added',NULL),
- (80,85,4,'2023-08-13 19:52:48','Admin','Added',NULL),
- (81,23,4,'2023-03-26 22:51:30','Email','Added',NULL),
- (82,146,4,'2023-02-08 20:28:17','Admin','Added',NULL),
- (83,88,4,'2023-06-07 10:30:04','Admin','Added',NULL),
- (84,202,4,'2023-09-18 06:48:28','Admin','Added',NULL);
+ (1,185,2,'2024-02-01 18:22:17','Admin','Added',NULL),
+ (2,8,2,'2023-05-02 12:41:25','Admin','Added',NULL),
+ (3,95,2,'2023-09-28 21:09:40','Admin','Added',NULL),
+ (4,89,2,'2024-02-03 16:00:39','Admin','Added',NULL),
+ (5,37,2,'2024-04-17 06:55:42','Admin','Added',NULL),
+ (6,107,2,'2023-08-31 05:29:54','Email','Added',NULL),
+ (7,73,2,'2023-09-13 07:28:53','Admin','Added',NULL),
+ (8,85,2,'2023-05-31 10:18:23','Admin','Added',NULL),
+ (9,200,2,'2023-06-26 13:30:36','Email','Added',NULL),
+ (10,20,2,'2024-01-02 23:37:14','Admin','Added',NULL),
+ (11,111,2,'2023-10-20 22:32:53','Email','Added',NULL),
+ (12,63,2,'2024-02-25 14:29:43','Email','Added',NULL),
+ (13,158,2,'2023-11-09 13:38:57','Admin','Added',NULL),
+ (14,42,2,'2024-01-23 15:30:17','Admin','Added',NULL),
+ (15,198,2,'2024-01-08 06:31:57','Admin','Added',NULL),
+ (16,196,2,'2024-04-13 14:22:03','Email','Added',NULL),
+ (17,116,2,'2023-06-12 05:03:12','Admin','Added',NULL),
+ (18,6,2,'2023-12-10 08:02:12','Admin','Added',NULL),
+ (19,36,2,'2024-01-15 03:11:03','Admin','Added',NULL),
+ (20,78,2,'2024-04-15 13:20:20','Email','Added',NULL),
+ (21,13,2,'2023-10-30 06:38:13','Email','Added',NULL),
+ (22,177,2,'2023-05-26 03:26:37','Email','Added',NULL),
+ (23,21,2,'2023-11-09 10:28:35','Admin','Added',NULL),
+ (24,79,2,'2023-05-15 21:02:19','Email','Added',NULL),
+ (25,171,2,'2023-12-10 19:23:19','Email','Added',NULL),
+ (26,58,2,'2024-03-28 00:46:10','Admin','Added',NULL),
+ (27,154,2,'2024-04-01 19:15:51','Email','Added',NULL),
+ (28,160,2,'2023-12-21 09:37:07','Email','Added',NULL),
+ (29,22,2,'2024-04-22 22:17:07','Email','Added',NULL),
+ (30,166,2,'2023-09-05 03:19:54','Admin','Added',NULL),
+ (31,167,2,'2023-09-06 04:22:16','Admin','Added',NULL),
+ (32,4,2,'2023-12-13 09:42:07','Email','Added',NULL),
+ (33,94,2,'2023-06-05 10:29:09','Email','Added',NULL),
+ (34,74,2,'2023-10-06 18:52:09','Admin','Added',NULL),
+ (35,136,2,'2024-01-25 05:54:43','Email','Added',NULL),
+ (36,61,2,'2024-01-11 06:21:45','Admin','Added',NULL),
+ (37,96,2,'2023-09-12 13:16:12','Admin','Added',NULL),
+ (38,35,2,'2024-03-01 03:07:50','Admin','Added',NULL),
+ (39,76,2,'2024-03-28 06:51:35','Admin','Added',NULL),
+ (40,187,2,'2023-06-18 11:16:39','Admin','Added',NULL),
+ (41,122,2,'2024-01-27 21:36:03','Email','Added',NULL),
+ (42,123,2,'2023-05-15 17:34:50','Admin','Added',NULL),
+ (43,159,2,'2023-10-14 01:55:02','Admin','Added',NULL),
+ (44,93,2,'2024-02-05 18:43:38','Admin','Added',NULL),
+ (45,60,2,'2023-08-09 05:02:15','Admin','Added',NULL),
+ (46,134,2,'2024-01-20 17:26:03','Email','Added',NULL),
+ (47,197,2,'2024-04-25 10:44:12','Email','Added',NULL),
+ (48,66,2,'2023-08-26 00:33:26','Admin','Added',NULL),
+ (49,81,2,'2023-06-30 22:50:09','Email','Added',NULL),
+ (50,131,2,'2023-10-29 09:46:24','Email','Added',NULL),
+ (51,128,2,'2023-11-13 18:53:32','Admin','Added',NULL),
+ (52,143,2,'2024-02-29 04:01:42','Admin','Added',NULL),
+ (53,138,2,'2024-03-17 10:19:46','Admin','Added',NULL),
+ (54,201,2,'2023-07-29 00:29:38','Email','Added',NULL),
+ (55,92,2,'2024-01-14 16:12:23','Admin','Added',NULL),
+ (56,5,2,'2023-11-23 20:44:36','Email','Added',NULL),
+ (57,112,2,'2023-09-08 08:26:04','Email','Added',NULL),
+ (58,194,2,'2023-11-20 17:31:53','Email','Added',NULL),
+ (59,145,2,'2024-04-03 00:00:53','Email','Added',NULL),
+ (60,88,2,'2023-06-05 01:59:51','Email','Added',NULL),
+ (61,28,3,'2024-02-01 19:40:21','Email','Added',NULL),
+ (62,99,3,'2024-01-19 06:33:04','Admin','Added',NULL),
+ (63,55,3,'2024-03-11 07:49:51','Admin','Added',NULL),
+ (64,100,3,'2023-06-25 23:17:43','Email','Added',NULL),
+ (65,125,3,'2024-01-16 03:20:27','Email','Added',NULL),
+ (66,142,3,'2024-01-06 03:47:05','Email','Added',NULL),
+ (67,189,3,'2024-02-24 02:19:13','Email','Added',NULL),
+ (68,179,3,'2023-08-20 03:04:52','Admin','Added',NULL),
+ (69,186,3,'2023-07-23 19:27:33','Email','Added',NULL),
+ (70,118,3,'2023-12-03 05:32:52','Email','Added',NULL),
+ (71,65,3,'2024-04-24 21:54:39','Email','Added',NULL),
+ (72,114,3,'2023-06-04 06:34:51','Email','Added',NULL),
+ (73,54,3,'2023-10-16 12:21:31','Email','Added',NULL),
+ (74,68,3,'2023-07-08 06:53:33','Email','Added',NULL),
+ (75,52,3,'2023-10-03 13:48:34','Admin','Added',NULL),
+ (76,185,4,'2023-05-16 08:49:50','Admin','Added',NULL),
+ (77,85,4,'2023-10-22 07:23:06','Email','Added',NULL),
+ (78,198,4,'2023-06-13 17:38:06','Admin','Added',NULL),
+ (79,177,4,'2023-09-06 07:32:12','Email','Added',NULL),
+ (80,22,4,'2023-12-13 12:25:39','Email','Added',NULL),
+ (81,61,4,'2023-08-25 08:35:15','Admin','Added',NULL),
+ (82,159,4,'2023-09-14 12:34:33','Admin','Added',NULL),
+ (83,131,4,'2024-01-17 14:23:02','Admin','Added',NULL),
+ (84,202,4,'2024-02-03 10:05:34','Admin','Added',NULL);
 /*!40000 ALTER TABLE `civicrm_subscription_history` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12229,11 +12231,11 @@ UNLOCK TABLES;
 LOCK TABLES `civicrm_tag` WRITE;
 /*!40000 ALTER TABLE `civicrm_tag` DISABLE KEYS */;
 INSERT INTO `civicrm_tag` (`id`, `name`, `label`, `description`, `parent_id`, `is_selectable`, `is_reserved`, `is_tagset`, `used_for`, `created_id`, `color`, `created_date`) VALUES
- (1,'Non_profit','Non-profit','Any not-for-profit organization.',NULL,1,0,0,'civicrm_contact',NULL,'#0bcb21','2024-01-06 04:30:24'),
- (2,'Company','Company','For-profit organization.',NULL,1,0,0,'civicrm_contact',NULL,'#2260c3','2024-01-06 04:30:24'),
- (3,'Government_Entity','Government Entity','Any governmental entity.',NULL,1,0,0,'civicrm_contact',NULL,'#cd4b13','2024-01-06 04:30:24'),
- (4,'Major_Donor','Major Donor','High-value supporter of our organization.',NULL,1,0,0,'civicrm_contact',NULL,'#0cdae9','2024-01-06 04:30:24'),
- (5,'Volunteer','Volunteer','Active volunteers.',NULL,1,0,0,'civicrm_contact',NULL,'#f0dc00','2024-01-06 04:30:24');
+ (1,'Non_profit','Non-profit','Any not-for-profit organization.',NULL,1,0,0,'civicrm_contact',NULL,'#0bcb21','2024-04-26 15:50:04'),
+ (2,'Company','Company','For-profit organization.',NULL,1,0,0,'civicrm_contact',NULL,'#2260c3','2024-04-26 15:50:04'),
+ (3,'Government_Entity','Government Entity','Any governmental entity.',NULL,1,0,0,'civicrm_contact',NULL,'#cd4b13','2024-04-26 15:50:04'),
+ (4,'Major_Donor','Major Donor','High-value supporter of our organization.',NULL,1,0,0,'civicrm_contact',NULL,'#0cdae9','2024-04-26 15:50:04'),
+ (5,'Volunteer','Volunteer','Active volunteers.',NULL,1,0,0,'civicrm_contact',NULL,'#f0dc00','2024-04-26 15:50:04');
 /*!40000 ALTER TABLE `civicrm_tag` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12363,20 +12365,20 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_uf_group` WRITE;
 /*!40000 ALTER TABLE `civicrm_uf_group` DISABLE KEYS */;
-INSERT INTO `civicrm_uf_group` (`id`, `is_active`, `group_type`, `title`, `frontend_title`, `description`, `help_pre`, `help_post`, `limit_listings_group_id`, `post_url`, `add_to_group_id`, `add_captcha`, `is_map`, `is_edit_link`, `is_uf_link`, `is_update_dupe`, `cancel_url`, `is_cms_user`, `notify`, `is_reserved`, `name`, `created_id`, `created_date`, `is_proximity_search`, `cancel_button_text`, `submit_button_text`, `add_cancel_button`) VALUES
- (1,1,'Individual,Contact','Name and Address','Name and Address',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,0,'name_and_address',NULL,NULL,0,NULL,NULL,1),
- (2,1,'Individual,Contact','Supporter Profile','Supporter Profile',NULL,NULL,'<p><strong>The information you provide will NOT be shared with any third party organisations.</strong></p><p>Thank you for getting involved in our campaign!</p>',NULL,NULL,NULL,0,0,0,0,0,NULL,2,NULL,0,'supporter_profile',NULL,NULL,0,NULL,NULL,1),
- (3,1,'Participant','Participant Status','Participant Status',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,'participant_status',NULL,NULL,0,NULL,NULL,1),
- (4,1,'Individual,Contact','New Individual','New Individual',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,'new_individual',NULL,NULL,0,NULL,NULL,1),
- (5,1,'Organization,Contact','New Organization','New Organization',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,'new_organization',NULL,NULL,0,NULL,NULL,1),
- (6,1,'Household,Contact','New Household','New Household',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,'new_household',NULL,NULL,0,NULL,NULL,1),
- (7,1,'Contact','Summary Overlay','Summary Overlay',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,'summary_overlay',NULL,NULL,0,NULL,NULL,1),
- (8,1,'Contact','Shared Address','Shared Address',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,'shared_address',NULL,NULL,0,NULL,NULL,1),
- (9,1,'Contact,Organization','On Behalf Of Organization','On Behalf Of Organization',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,'on_behalf_organization',NULL,NULL,0,NULL,NULL,1),
- (10,1,'Contribution','Contribution Bulk Entry','Contribution Bulk Entry',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,'contribution_batch_entry',NULL,NULL,0,NULL,NULL,1),
- (11,1,'Membership','Membership Bulk Entry','Membership Bulk Entry',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,'membership_batch_entry',NULL,NULL,0,NULL,NULL,1),
- (12,1,'Individual,Contact','Your Registration Info','Your Registration Info',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,0,'event_registration',NULL,NULL,0,NULL,NULL,1),
- (13,1,'Individual,Contact','Honoree Individual','Honoree Individual',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,'honoree_individual',NULL,NULL,0,NULL,NULL,1);
+INSERT INTO `civicrm_uf_group` (`id`, `name`, `is_active`, `group_type`, `title`, `frontend_title`, `description`, `help_pre`, `help_post`, `limit_listings_group_id`, `post_url`, `add_to_group_id`, `add_captcha`, `is_map`, `is_edit_link`, `is_uf_link`, `is_update_dupe`, `cancel_url`, `is_cms_user`, `notify`, `is_reserved`, `created_id`, `created_date`, `is_proximity_search`, `cancel_button_text`, `submit_button_text`, `add_cancel_button`) VALUES
+ (1,'name_and_address',1,'Individual,Contact','Name and Address','Name and Address',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,0,NULL,NULL,0,NULL,NULL,1),
+ (2,'supporter_profile',1,'Individual,Contact','Supporter Profile','Supporter Profile',NULL,NULL,'<p><strong>The information you provide will NOT be shared with any third party organisations.</strong></p><p>Thank you for getting involved in our campaign!</p>',NULL,NULL,NULL,0,0,0,0,0,NULL,2,NULL,0,NULL,NULL,0,NULL,NULL,1),
+ (3,'participant_status',1,'Participant','Participant Status','Participant Status',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,1),
+ (4,'new_individual',1,'Individual,Contact','New Individual','New Individual',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,1),
+ (5,'new_organization',1,'Organization,Contact','New Organization','New Organization',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,1),
+ (6,'new_household',1,'Household,Contact','New Household','New Household',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,1),
+ (7,'summary_overlay',1,'Contact','Summary Overlay','Summary Overlay',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,1),
+ (8,'shared_address',1,'Contact','Shared Address','Shared Address',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,1),
+ (9,'on_behalf_organization',1,'Contact,Organization','On Behalf Of Organization','On Behalf Of Organization',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,1),
+ (10,'contribution_batch_entry',1,'Contribution','Contribution Bulk Entry','Contribution Bulk Entry',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,1),
+ (11,'membership_batch_entry',1,'Membership','Membership Bulk Entry','Membership Bulk Entry',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,1),
+ (12,'event_registration',1,'Individual,Contact','Your Registration Info','Your Registration Info',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,0,NULL,NULL,0,NULL,NULL,1),
+ (13,'honoree_individual',1,'Individual,Contact','Honoree Individual','Honoree Individual',NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,1);
 /*!40000 ALTER TABLE `civicrm_uf_group` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12426,20 +12428,21 @@ 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,51,'http://pennsylvaniafund.org',1),
- (2,138,'http://pennsylvaniapartnership.org',1),
- (3,135,'http://mississippialliance.org',1),
- (4,48,'http://urbansoftwareinitiative.org',1),
- (5,122,'http://creativeenvironmental.org',1),
- (6,73,'http://anchoragesports.org',1),
- (7,40,'http://friendslegalalliance.org',1),
- (8,187,'http://ohiohealthinitiative.org',1),
- (9,142,'http://mainfamilypartners.org',1),
- (10,44,'http://ruralwellnessschool.org',1),
- (11,173,'http://alabamaeducationservices.org',1),
- (12,118,'http://tennesseesolutions.org',1),
- (13,36,'http://ohiosoftwarepartnership.org',1),
- (14,170,'http://ncwellnesstrust.org',1);
+ (1,193,'http://texassolutions.org',1),
+ (2,17,'http://communitysolutions.org',1),
+ (3,9,'http://sierralegalsystems.org',1),
+ (4,23,'http://creativeadvocacyalliance.org',1),
+ (5,144,'http://urbanfellowship.org',1),
+ (6,129,'http://globalwellnesspartners.org',1),
+ (7,174,'http://communitydevelopmentservices.org',1),
+ (8,49,'http://toledonetwork.org',1),
+ (9,192,'http://northpointmusicsystems.org',1),
+ (10,121,'http://mississippimusic.org',1),
+ (11,184,'http://spactionfund.org',1),
+ (12,124,'http://spcultureschool.org',1),
+ (13,135,'http://greensborohealthpartnership.org',1),
+ (14,84,'http://ecfamilyschool.org',1),
+ (15,69,'http://dowlenempowermentnetwork.org',1);
 /*!40000 ALTER TABLE `civicrm_website` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12471,12 +12474,13 @@ UNLOCK TABLES;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-01-06  4:30:31
+-- Dump completed on 2024-04-26 15:50:13
 -- +--------------------------------------------------------------------+
 -- | Copyright CiviCRM LLC. All rights reserved.                        |
 -- |                                                                    |
@@ -12563,8 +12567,9 @@ INSERT INTO  `civicrm_option_group` (`name`, `title`, `is_reserved`, `is_active`
   VALUES  ('soup_selection', 'Soup Selection', 0, 1);
 SELECT @ogid := MAX(id) FROM civicrm_option_group;
 
-INSERT INTO civicrm_custom_group ( name, title,  extends, extends_entity_column_id, extends_entity_column_value, style, is_active, table_name) VALUES
- ('Food_Preference', 'Food Preference', 'Participant', 2, '
1
', 'Inline', 1, 'civicrm_value_food_preference_2');
+INSERT INTO `civicrm_custom_group` (`name`, `title`, `extends`, `extends_entity_column_id`, `extends_entity_column_value`, `style`, `is_active`, `table_name`, `weight`)
+  VALUES
+ ('Food_Preference', 'Food Preference', 'Participant', 2, '
1
', 'Inline', 1, 'civicrm_value_food_preference_2', 2);
 SELECT @cgid := MAX(id) FROM civicrm_custom_group;
 
 INSERT INTO civicrm_custom_field ( custom_group_id, label, name, data_type, html_type, is_active, text_length, note_columns, note_rows, column_name, option_group_id, is_searchable ) VALUES  ( @cgid, 'Soup Selection', 'Soup_Selection', 'String',  'Radio',   1,  255, 60, 4, 'soup_selection_4', @ogid, 1);
@@ -12580,9 +12585,9 @@ CREATE TABLE civicrm_value_food_preference_2 ( id INT(10) UNSIGNED NOT NULL AUTO
 
 -- Donors’ custom data
 
-INSERT INTO `civicrm_custom_group` (`name`, `title`, `extends`, `extends_entity_column_id`, `extends_entity_column_value`, `style`, `is_active`, `table_name`)
+INSERT INTO `civicrm_custom_group` (`name`, `title`, `extends`, `extends_entity_column_id`, `extends_entity_column_value`, `style`, `is_active`, `table_name`, `weight`)
   VALUES
- ('Donor_Information', 'Donor Information', 'Contribution', NULL, NULL, 'Inline', 1, 'civicrm_value_donor_information_3');
+ ('Donor_Information', 'Donor Information', 'Contribution', NULL, NULL, 'Inline', 1, 'civicrm_value_donor_information_3', 3);
 
 SELECT @cgid_contribution := MAX(id) FROM civicrm_custom_group;
 
diff --git a/www/modules/civicrm/sql/civicrm_navigation.mysql b/www/modules/civicrm/sql/civicrm_navigation.mysql
index 9970312bf..41be1b36b 100644
--- a/www/modules/civicrm/sql/civicrm_navigation.mysql
+++ b/www/modules/civicrm/sql/civicrm_navigation.mysql
@@ -154,7 +154,7 @@ VALUES
     ( @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/report/list?compid=1&reset=1', 'Event Reports', 'Event Reports', 'access CiviEvent', '', @eventlastID, '1', 1,    4 ),
-    ( @domainID, 'civicrm/event/import?reset=1',                            'Import Participants','Import Participants',  'access CiviEvent,edit event participants', 'AND',    @eventlastID, '1', '1',  5 ),
+    ( @domainID, 'civicrm/import/participant?reset=1',                            'Import Participants','Import Participants',  'access CiviEvent,edit event participants', 'AND',    @eventlastID, '1', '1',  5 ),
     ( @domainID, 'civicrm/event/add?reset=1&action=add',                    'New Event',          'New Event',            'access CiviEvent,edit all events', 'AND',    @eventlastID, '0', NULL, 6 ),
     ( @domainID, 'civicrm/event/manage?reset=1',                            'Manage Events',      'Manage Events',        'access CiviEvent,edit all events', 'AND',    @eventlastID, '1', 1, 7 ),
     ( @domainID, 'civicrm/admin/pcp?reset=1&page_type=event',               'Personal Campaign Pages',    'Personal Campaign Pages',   'access CiviEvent,administer CiviCRM', 'AND', @eventlastID, '1', 1, 8 ),
@@ -198,7 +198,7 @@ VALUES
     ( @domainID, 'civicrm/member/search?reset=1',                       'Find Memberships',    'Find Memberships','access CiviMember', '', @memberlastID, '1', NULL, 3 ),
     ( @domainID, 'civicrm/report/list?compid=3&reset=1',                'Membership Reports',  'Membership Reports', 'access CiviMember', '', @memberlastID, '1', 1,    4 ),
     ( @domainID, 'civicrm/batch?reset=1',                               'Batch Data Entry',     'Batch Data Entry','access CiviContribute', '', @memberlastID, '1', NULL, 5 ),
-    ( @domainID, 'civicrm/member/import?reset=1',                       'Import Memberships',  'Import Members',  'access CiviMember,edit memberships', 'AND', @memberlastID, '1', 1, 6 ),
+    ( @domainID, 'civicrm/import/membership?reset=1',                       'Import Memberships',  'Import Members',  'access CiviMember,edit memberships', 'AND', @memberlastID, '1', 1, 6 ),
     ( @domainID, 'civicrm/admin/price/edit?reset=1&action=add',         'New Price Set',       'New Price Set',   'access CiviMember,administer CiviCRM', 'AND',  @memberlastID, '0', NULL, 7 ),
     ( @domainID, 'civicrm/admin/price?reset=1',                         'Manage Price Sets',   'Manage Price Sets', 'access CiviMember,administer CiviCRM', 'AND',  @memberlastID, '1', NULL, 8 );
 
@@ -527,7 +527,7 @@ 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
-    ( @domainID, 'civicrm/report/list?compid=99&reset=1', 'Contact Reports', 'Contact Reports', 'administer CiviCRM', '', @reportlastID, '1', 0,    1 );
+    ( @domainID, 'civicrm/report/list?compid=99&reset=1', 'Contact Reports', 'Contact Reports', 'access CiviReport', '', @reportlastID, '1', 0,    1 );
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
 VALUES
diff --git a/www/modules/civicrm/sql/civicrm_sample.mysql b/www/modules/civicrm/sql/civicrm_sample.mysql
index 98ed28298..f6cb501c5 100644
--- a/www/modules/civicrm/sql/civicrm_sample.mysql
+++ b/www/modules/civicrm/sql/civicrm_sample.mysql
@@ -234,6 +234,7 @@ VALUES
     (@priceFieldID,'bass','Bass','25',1,1,1,2),
     (@priceFieldID,'tenor','Tenor','40',2,1,0,2),
     (@priceFieldID,'soprano','Soprano','50',3,1,0,2);
+
 -- +--------------------------------------------------------------------+
 -- | Copyright CiviCRM LLC. All rights reserved.                        |
 -- |                                                                    |
@@ -261,3 +262,4 @@ INSERT INTO civicrm_acl_entity_role
     (`acl_role_id`, `entity_table`, `entity_id`, `is_active`)
 VALUES
     (1, 'civicrm_group', 1, 1);
+
diff --git a/www/modules/civicrm/sql/civicrm_sample_custom_data.mysql b/www/modules/civicrm/sql/civicrm_sample_custom_data.mysql
index eefd6bd4a..8182a94da 100644
--- a/www/modules/civicrm/sql/civicrm_sample_custom_data.mysql
+++ b/www/modules/civicrm/sql/civicrm_sample_custom_data.mysql
@@ -80,7 +80,8 @@ INSERT INTO  `civicrm_option_group` (`name`, `title`, `is_reserved`, `is_active`
   VALUES  ('soup_selection', 'Soup Selection', 0, 1);
 SELECT @ogid := MAX(id) FROM civicrm_option_group;
 
-INSERT INTO civicrm_custom_group ( name, title,  extends, extends_entity_column_id, extends_entity_column_value, style, is_active, table_name) VALUES ('Food_Preference', 'Food Preference', 'Participant', 2, '
1
', 'Inline', 1, 'civicrm_value_food_preference_2');
+INSERT INTO `civicrm_custom_group` (`name`, `title`, `extends`, `extends_entity_column_id`, `extends_entity_column_value`, `style`, `is_active`, `table_name`, `weight`)
+  VALUES ('Food_Preference', 'Food Preference', 'Participant', 2, '
1
', 'Inline', 1, 'civicrm_value_food_preference_2', 2);
 SELECT @cgid := MAX(id) FROM civicrm_custom_group;
 
 INSERT INTO civicrm_custom_field ( custom_group_id, label, name, data_type, html_type, is_active, text_length, note_columns, note_rows, column_name, option_group_id, is_searchable ) VALUES  ( @cgid, 'Soup Selection', 'Soup_Selection', 'String',  'Radio',   1,  255, 60, 4, 'soup_selection_4', @ogid, 1);
@@ -95,8 +96,8 @@ CREATE TABLE civicrm_value_food_preference_2 ( id INT(10) UNSIGNED NOT NULL AUTO
 
 -- Donors’ custom data
 
-INSERT INTO `civicrm_custom_group` (`name`, `title`, `extends`, `extends_entity_column_id`, `extends_entity_column_value`, `style`, `is_active`, `table_name`)
-  VALUES ('Donor_Information', 'Donor Information', 'Contribution', NULL, NULL, 'Inline', 1, 'civicrm_value_donor_information_3');
+INSERT INTO `civicrm_custom_group` (`name`, `title`, `extends`, `extends_entity_column_id`, `extends_entity_column_value`, `style`, `is_active`, `table_name`, `weight`)
+  VALUES ('Donor_Information', 'Donor Information', 'Contribution', NULL, NULL, 'Inline', 1, 'civicrm_value_donor_information_3', 3);
 
 SELECT @cgid_contribution := MAX(id) FROM civicrm_custom_group;
 
diff --git a/www/modules/civicrm/templates/CRM/Activity/Form/Activity.tpl b/www/modules/civicrm/templates/CRM/Activity/Form/Activity.tpl
index adbc8da90..363a89bfa 100644
--- a/www/modules/civicrm/templates/CRM/Activity/Form/Activity.tpl
+++ b/www/modules/civicrm/templates/CRM/Activity/Form/Activity.tpl
@@ -173,7 +173,7 @@
       {if $action eq 4}
         {include file="CRM/Custom/Page/CustomDataView.tpl"}
       {else}
-        {include file="CRM/common/customDataBlock.tpl"}
+        {include file="CRM/common/customDataBlock.tpl" groupID='' customDataType='Activity'}
       {/if}
     </td>
   </tr>
@@ -208,7 +208,7 @@
             $('.crm-accordion-body', $form).each( function() {
               //open tab if form rule throws error
               if ( $(this).children( ).find('span.crm-error').text( ).length > 0 ) {
-                $(this).parent('.collapsed').crmAccordionToggle();
+                $(this).parent('details').prop('open', true);
               }
             });
             function toggleMultiActivityCheckbox() {
diff --git a/www/modules/civicrm/templates/CRM/Activity/Form/FollowUp.tpl b/www/modules/civicrm/templates/CRM/Activity/Form/FollowUp.tpl
index 59d7d2c3c..ef4caddcb 100644
--- a/www/modules/civicrm/templates/CRM/Activity/Form/FollowUp.tpl
+++ b/www/modules/civicrm/templates/CRM/Activity/Form/FollowUp.tpl
@@ -1,7 +1,7 @@
-<div id="follow-up" class="crm-accordion-wrapper collapsed">
-  <div class="crm-accordion-header">
+<details id="follow-up" class="crm-accordion-bold">
+  <summary>
      {ts}Schedule Follow-up{/ts}
-  </div><!-- /.crm-accordion-header -->
+  </summary>
   <div class="crm-accordion-body">
     <table class="form-layout-compressed">
       <tr class="crm-{$type}activity-form-block-followup_activity_type_id">
@@ -26,6 +26,6 @@
         </td>
       </tr>
     </table>
-  </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+  </div>
+</details>
      
diff --git a/www/modules/civicrm/templates/CRM/Activity/Form/Search.tpl b/www/modules/civicrm/templates/CRM/Activity/Form/Search.tpl
index 2918a83a9..625890550 100644
--- a/www/modules/civicrm/templates/CRM/Activity/Form/Search.tpl
+++ b/www/modules/civicrm/templates/CRM/Activity/Form/Search.tpl
@@ -9,11 +9,10 @@
 *}
 {* Search form and results for Activities *}
 <div class="crm-form-block crm-search-form-block">
-  <details class="crm-accordion-wrapper crm-advanced_search_form-accordion" {if !$rows}open=""{/if}">
-    <summary class="crm-accordion-header crm-master-accordion-header">
+  <details class="crm-accordion-light crm-advanced_search_form-accordion" {if !$rows}open=""{/if}">
+    <summary>
       {ts}Edit Search Criteria{/ts}
     </summary>
-    <!-- /.crm-accordion-header -->
     <div class="crm-accordion-body">
       <div id="searchForm" class="form-item">
         {strip}
diff --git a/www/modules/civicrm/templates/CRM/Activity/Selector/Selector.tpl b/www/modules/civicrm/templates/CRM/Activity/Selector/Selector.tpl
index aba74b792..fe8d02143 100644
--- a/www/modules/civicrm/templates/CRM/Activity/Selector/Selector.tpl
+++ b/www/modules/civicrm/templates/CRM/Activity/Selector/Selector.tpl
@@ -8,10 +8,10 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-activity-selector-{$context}">
-  <div class="crm-accordion-wrapper crm-search_filters-accordion">
-    <div class="crm-accordion-header">
+  <details class="crm-accordion-bold crm-search_filters-accordion" open>
+    <summary>
     {ts}Filter by Activity{/ts}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
     <div class="crm-accordion-body">
       <form><!-- form element is here to fool the datepicker widget -->
       <table class="no-border form-layout-compressed activity-search-options">
@@ -22,17 +22,15 @@
           <td class="crm-contact-form-block-activity_type_exclude_filter_id crm-inline-edit-field">
             {$form.activity_type_exclude_filter_id.label}<br /> {$form.activity_type_exclude_filter_id.html|crmAddClass:medium}
           </td>
-          <td>
-            {include file="CRM/Core/DatePickerRange.tpl" fieldName="activity_date_time"}
-          </td>
+          {include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="activity_date_time" hideRelativeLabel=false}
           <td class="crm-contact-form-block-activity_status_filter_id crm-inline-edit-field">
             <label>{ts}Status{/ts}</label><br /> {$form.status_id.html|crmAddClass:medium}
           </td>
         </tr>
       </table>
       </form>
-    </div><!-- /.crm-accordion-body -->
-  </div><!-- /.crm-accordion-wrapper -->
+    </div>
+  </details>
   <table class="contact-activity-selector-{$context} crm-ajax-table" style="width: 100%;">
     <thead>
     <tr>
diff --git a/www/modules/civicrm/templates/CRM/Admin/Form/MessageTemplates.tpl b/www/modules/civicrm/templates/CRM/Admin/Form/MessageTemplates.tpl
index c7862dcdc..c142b1338 100644
--- a/www/modules/civicrm/templates/CRM/Admin/Form/MessageTemplates.tpl
+++ b/www/modules/civicrm/templates/CRM/Admin/Form/MessageTemplates.tpl
@@ -65,11 +65,11 @@
         <tr>
       </table>
 
-      <div id="msg_html_section" class="crm-accordion-wrapper crm-html_email-accordion ">
-        <div class="crm-accordion-header">
+      <details id="msg_html_section" class="crm-accordion-bold crm-html_email-accordion " open>
+        <summary>
           {ts}HTML Format{/ts}
           {help id="id-message-text" file="CRM/Contact/Form/Task/Email.hlp"}
-        </div><!-- /.crm-accordion-header -->
+        </summary>
         <div class="crm-accordion-body">
           <div class="helpIcon" id="helphtml">
             <input class="crm-token-selector big" data-field="msg_html" />
@@ -79,14 +79,14 @@
           <div class='html'>
             {$form.msg_html.html|crmAddClass:huge}
           </div>
-        </div><!-- /.crm-accordion-body -->
-      </div><!-- /.crm-accordion-wrapper -->
+        </div>
+      </details>
 
-      <div id="msg_text_section" class="crm-accordion-wrapper crm-plaint_text_email-accordion ">
-        <div class="crm-accordion-header">
+      <details id="msg_text_section" class="crm-accordion-bold crm-plaint_text_email-accordion " open>
+        <summary>
           {ts}Optional Plain-Text Format{/ts}
           {help id="id-message-plain" file="CRM/Contact/Form/Task/Email.hlp"}
-        </div><!-- /.crm-accordion-header -->
+        </summary>
         <div class="crm-accordion-body">
           <div class="helpIcon" id="helptext">
             <input class="crm-token-selector big" data-field="msg_text" />
@@ -96,13 +96,13 @@
           <div class='text'>
             {$form.msg_text.html|crmAddClass:huge}
           </div>
-        </div><!-- /.crm-accordion-body -->
-      </div><!-- /.crm-accordion-wrapper -->
+        </div>
+      </details>
 
-      <div id="pdf_format" class="crm-accordion-wrapper crm-html_email-accordion ">
-        <div class="crm-accordion-header">
+      <details id="pdf_format" class="crm-accordion-bold crm-html_email-accordion " open>
+        <summary>
           {$form.pdf_format_id.label}
-        </div><!-- /.crm-accordion-header -->
+        </summary>
         <div class="crm-accordion-body">
           <div class="spacer"></div>
           <div class='html'>
@@ -110,8 +110,8 @@
             {help id="id-msg-template" file="CRM/Contact/Form/Task/PDFLetterCommon.hlp"}
             <div class="description">{ts}Page format to use when creating PDF files using this template.{/ts}</div>
           </div>
-        </div><!-- /.crm-accordion-body -->
-      </div><!-- /.crm-accordion-wrapper -->
+        </div>
+      </details>
 
       {if !$isWorkflow}
         <table class="form-layout-compressed">
diff --git a/www/modules/civicrm/templates/CRM/Admin/Form/Options.tpl b/www/modules/civicrm/templates/CRM/Admin/Form/Options.tpl
index a4d3c84a8..44a0cd8de 100644
--- a/www/modules/civicrm/templates/CRM/Admin/Form/Options.tpl
+++ b/www/modules/civicrm/templates/CRM/Admin/Form/Options.tpl
@@ -12,7 +12,7 @@
   {if $action eq 8}
     <div class="messages status no-popup">
       {icon icon="fa-info-circle"}{/icon}
-      {ts 1=$gLabel}WARNING: Deleting this option will result in the loss of all %1 related records which use the option.{/ts} {ts}This may mean the loss of a substantial amount of data, and the action cannot be undone.{/ts} {ts}Do you want to continue?{/ts}
+      {$deleteMessage|escape}
     </div>
   {else}
     <table class="form-layout-compressed">
@@ -156,6 +156,11 @@
              <td>{$form.contact_type_id.html}</td>
            </tr>
         {/if}
+        <tr class="crm-admin-options-form-block-custom_data">
+          <td colspan="2">
+            {include file="CRM/common/customDataBlock.tpl" customDataType='OptionValue' cid=false}
+          </td>
+        </tr>
     </table>
   {/if}
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
diff --git a/www/modules/civicrm/templates/CRM/Admin/Form/Preferences/Address.hlp b/www/modules/civicrm/templates/CRM/Admin/Form/Preferences/Address.hlp
index 07870f820..83a99f531 100644
--- a/www/modules/civicrm/templates/CRM/Admin/Form/Preferences/Address.hlp
+++ b/www/modules/civicrm/templates/CRM/Admin/Form/Preferences/Address.hlp
@@ -15,7 +15,7 @@
 <p>{ts}Configure mailing labels for your site using tokens, which are replaced by contact field values when the labels are generated. Place your cursor within the Mailing Labels box where you want to the token to be inserted. Then click the "Insert Tokens" link to see a list of available tokens (including custom fields). Insert the token by clicking the desired token name.{/ts}</p>
 <ul>
   <li>{ts}Address field values are taken from the contact's <strong>primary</strong> location.{/ts}</li>
-  <li>{ts 1=&#123;contact.state_province&#125; 2=&#123;contact.state_province_name&#125;}Use the %1 token for state/province abbreviation or %2 for full state/province name.{/ts}</li>
+  <li>{ts 1="&#123;contact.state_province&#125;" 2="&#123;contact.state_province_name&#125;"}Use the %1 token for state/province abbreviation or %2 for full state/province name.{/ts}</li>
   <li>{ts}Add spaces or punctuation to layout by surrounding them with brackets.{/ts}
     <ul><li>{ts}EXAMPLE:{/ts} {literal}{, }{/literal}</li></ul></li>
   <li>{ts}If you want to include the county in your mailing labels, the <strong>County</strong> checkbox must be checked in the Address Editing section on this screen, and county names must be added to the civicrm_county table in your database.{/ts}</li>
diff --git a/www/modules/civicrm/templates/CRM/Admin/Form/Preferences/Address.tpl b/www/modules/civicrm/templates/CRM/Admin/Form/Preferences/Address.tpl
index bf8d1656b..f54dd7f30 100644
--- a/www/modules/civicrm/templates/CRM/Admin/Form/Preferences/Address.tpl
+++ b/www/modules/civicrm/templates/CRM/Admin/Form/Preferences/Address.tpl
@@ -62,7 +62,7 @@
              <tr class="crm-preferences-address-form-block-description">
                 <td colspan="2">
                   <span class="description">
-                      {ts 1=https://www.usps.com/business/web-tools-apis/welcome.htm}CiviCRM includes an optional plugin for interfacing with the United States Postal Services (USPS) Address Standardization web service. You must register to use the USPS service at <a href='%1' target='_blank'>%1</a>. If you are approved, they will provide you with a User ID and the URL for the service.{/ts}
+                      {ts 1="https://www.usps.com/business/web-tools-apis/welcome.htm"}CiviCRM includes an optional plugin for interfacing with the United States Postal Services (USPS) Address Standardization web service. You must register to use the USPS service at <a href='%1' target='_blank'>%1</a>. If you are approved, they will provide you with a User ID and the URL for the service.{/ts}
                       {ts}Plugins for other address standardization services may be available from 3rd party developers. If installed, they will be included in the drop-down below.{/ts}
                   </span>
               </td>
diff --git a/www/modules/civicrm/templates/CRM/Admin/Form/ScheduleReminders.tpl b/www/modules/civicrm/templates/CRM/Admin/Form/ScheduleReminders.tpl
index df5a7d92d..7047176f8 100644
--- a/www/modules/civicrm/templates/CRM/Admin/Form/ScheduleReminders.tpl
+++ b/www/modules/civicrm/templates/CRM/Admin/Form/ScheduleReminders.tpl
@@ -117,9 +117,9 @@
           <td>{$form.is_active.html}</td>
         </tr>
       </table>
-      <fieldset id="email-section" class="crm-collapsible" style="display: block;">
-        <legend class="collapsible-title">{ts}Email{/ts}</legend>
-        <div>
+      <details id="email-section" open>
+        <summary>{ts}Email{/ts}</summary>
+        <div class="crm-accordion-body">
           <table id="email-field-table" class="form-layout-compressed">
             <tr>
               <td class="label">{$form.from_name.label}</td>
@@ -145,10 +145,11 @@
           </table>
             {include file="CRM/Contact/Form/Task/EmailCommon.tpl" upload=1 noAttach=1}
         </div>
-      </fieldset>
+      </details>
     {if $sms}
-      <fieldset id="sms-section" class="crm-collapsible"><legend class="collapsible-title">{ts}SMS{/ts}</legend>
-        <div>
+      <details id="sms-section" open>
+        <summary>{ts}SMS{/ts}</summary>
+        <div class="crm-accordion-body">
           <table id="sms-field-table" class="form-layout-compressed">
             <tr class="crm-scheduleReminder-form-block-sms_provider_id">
               <td class="label">{$form.sms_provider_id.label} <span class="crm-marker">*</span></td>
@@ -159,9 +160,9 @@
               <td>{$form.SMStemplate.html}</td>
             </tr>
           </table>
-            {include file="CRM/Contact/Form/Task/SMSCommon.tpl" upload=1 noAttach=1}
-          <div>
-      </fieldset>
+          {include file="CRM/Contact/Form/Task/SMSCommon.tpl" upload=1 noAttach=1}
+        <div>
+      </details>
     {/if}
 
     {literal}
diff --git a/www/modules/civicrm/templates/CRM/Admin/Form/Setting/Url.tpl b/www/modules/civicrm/templates/CRM/Admin/Form/Setting/Url.tpl
index 7aa5e51b7..bbb34ceb5 100644
--- a/www/modules/civicrm/templates/CRM/Admin/Form/Setting/Url.tpl
+++ b/www/modules/civicrm/templates/CRM/Admin/Form/Setting/Url.tpl
@@ -65,6 +65,7 @@
         </td>
         <td>
             {$form.enableSSL.html}
+            <p class="description font-red">{ts}{$settings_fields.enableSSL.description}{/ts}</p>
         </td>
     </tr>
     <tr class="crm-url-form-block-verifySSL">
@@ -73,7 +74,7 @@
         </td>
         <td>
             {$form.verifySSL.html}<br/>
-            <p class="description font-red">{ts}{$verifySSL_description}{/ts}</p>
+            <p class="description font-red">{ts}{$settings_fields.verifySSL.description}{/ts}</p>
         </td>
     </tr>
     <tr class="crm-url-form-block-defaultExternUrl">
diff --git a/www/modules/civicrm/templates/CRM/Admin/Page/APIExplorer.tpl b/www/modules/civicrm/templates/CRM/Admin/Page/APIExplorer.tpl
index f541fcb56..9f199b1e0 100644
--- a/www/modules/civicrm/templates/CRM/Admin/Page/APIExplorer.tpl
+++ b/www/modules/civicrm/templates/CRM/Admin/Page/APIExplorer.tpl
@@ -194,10 +194,6 @@
     margin-top: 1em;
     border-top: 1px solid #d3d3d3;
   }
-  .api-doc-code .collapsible-title {
-    font-weight: bold;
-    margin-top: .5em;
-  }
   .doc-filename {
     text-align: right;
     font-style: italic;
@@ -265,8 +261,8 @@
         <input type="checkbox" class="crm-form-checkbox api-param-checkbox api-input" id="sequential-checkbox" name="sequential" checked="checked" value="1">sequential
       </label>
 
-      <div id="api-join" class="crm-form-block crm-collapsible collapsed" style="display:none;">
-        <h4 class="collapsible-title">{ts}Join on:{/ts} {help id='api-join'}</h4>
+      <div id="api-join" class="crm-form-block">
+        <h4>{ts}Join on:{/ts} {help id='api-join'}</h4>
         <div></div>
       </div>
 
@@ -370,7 +366,7 @@
       {/literal}
         <select class="crm-form-select api-param-op">
           {foreach from=$operators item='op'}
-            <option value="{$op|htmlspecialchars}">{$op|htmlspecialchars}</option>
+            <option value="{$op|escape}">{$op|escape}</option>
           {/foreach}
         </select>
       {literal}
@@ -438,13 +434,13 @@
 </script>
 
 <script type="text/template" id="doc-code-tpl">
-  <div class="crm-collapsible collapsed api-doc-code">
-    <div class="collapsible-title">{ts}Source Code{/ts}</div>
-    <div>
+  <details class="api-doc-code">
+    <summary>{ts}Source Code{/ts}</summary>
+    <div class="crm-accordion-body">
       <div class="doc-filename"><%- file %></div>
       <pre class="lang-php linenums"><%- code %></pre>
     </div>
-  </div>
+  </details>
 </script>
 
 <script type="text/template" id="join-tpl">
diff --git a/www/modules/civicrm/templates/CRM/Admin/Page/Extensions/Main.tpl b/www/modules/civicrm/templates/CRM/Admin/Page/Extensions/Main.tpl
index 7fdfd12bc..12502efe9 100644
--- a/www/modules/civicrm/templates/CRM/Admin/Page/Extensions/Main.tpl
+++ b/www/modules/civicrm/templates/CRM/Admin/Page/Extensions/Main.tpl
@@ -31,7 +31,7 @@ Depends: CRM/common/enableDisableApi.tpl and CRM/common/jsortable.tpl
           </td>
           <td class="crm-extensions-status">{$row.statusLabel} </td>
           <td class="crm-extensions-version">{$row.version|escape}
-            {if (!empty($row.develStage) and $row.develStage != 'stable') or preg_match(";(alpha|beta|dev);", $row.version)}
+            {if !$row.is_stable}
               {icon icon="fa-flask crm-extensions-stage"}{ts}This is a pre-release version. For more details, see the expanded description.{/ts}{/icon}
             {else}
               {icon icon="fa-check-circle crm-extensions-stage"}{ts}This is a stable release version.{/ts}{/icon}
diff --git a/www/modules/civicrm/templates/CRM/Admin/Page/MessageTemplates.tpl b/www/modules/civicrm/templates/CRM/Admin/Page/MessageTemplates.tpl
index 3bb1b2f3d..ffe0c2577 100644
--- a/www/modules/civicrm/templates/CRM/Admin/Page/MessageTemplates.tpl
+++ b/www/modules/civicrm/templates/CRM/Admin/Page/MessageTemplates.tpl
@@ -37,7 +37,7 @@
   <div class="crm-section msg_html-section">
     <h3 class="header-dark">{$form.msg_html.label}</h3>
     <div class='text'>
-      <textarea class="huge" name='msg_html' id='msg_html'>{$form.msg_html.value|htmlentities}</textarea>
+      <textarea class="huge" name='msg_html' id='msg_html'>{$form.msg_html.value|escape:'htmlall'}</textarea>
       <div class='spacer'></div>
       <div class="section">
         <a href='#' onclick='MessageTemplates.msg_html.select(); return false;' class='button'><span>{ts}Select HTML Message{/ts}</span></a>
@@ -49,7 +49,7 @@
   <div class="crm-section msg_txt-section">
   <h3 class="header-dark">{$form.msg_text.label}</h3>
     <div class="text">
-      <textarea class="huge" name='msg_text' id='msg_text'>{$form.msg_text.value|htmlentities}</textarea>
+      <textarea class="huge" name='msg_text' id='msg_text'>{$form.msg_text.value|escape:'htmlall'}</textarea>
       <div class='spacer'></div>
       <div class="section">
         <a href='#' onclick='MessageTemplates.msg_text.select(); return false;' class='button'><span>{ts}Select Text Message{/ts}</span></a>
@@ -95,7 +95,7 @@
           {if $type eq 'userTemplates'}
             {capture assign=schedRemURL}{crmURL p='civicrm/admin/scheduleReminders' q="reset=1"}{/capture}
             {ts 1=$schedRemURL}Message templates allow you to easily create similar emails or letters on a recurring basis. Messages used for membership renewal reminders, as well as event and activity related reminders should be created via <a href="%1">Schedule Reminders</a>.{/ts}
-            {if array_search('CiviMail', $config->enableComponents)}
+            {if $isCiviMailEnabled}
               {capture assign=automatedMsgURL}{crmURL p='civicrm/admin/component' q="reset=1"}{/capture}
               {ts 1=$automatedMsgURL}You can also use message templates for CiviMail (bulk email) content. However, subscribe, unsubscribe and opt-out messages are configured at <a href="%1">Administer > CiviMail > Headers, Footers and Automated Messages</a>.{/ts}
             {/if}
diff --git a/www/modules/civicrm/templates/CRM/Batch/Form/Entry.tpl b/www/modules/civicrm/templates/CRM/Batch/Form/Entry.tpl
index 496770023..eac32e081 100644
--- a/www/modules/civicrm/templates/CRM/Batch/Form/Entry.tpl
+++ b/www/modules/civicrm/templates/CRM/Batch/Form/Entry.tpl
@@ -112,7 +112,7 @@
       </div>
     {/section}
   </div>
-  <div class="crm-submit-buttons">{if $fields}{$form._qf_Batch_refresh.html}{/if} &nbsp; {$form.buttons.html}</div>
+  <div class="crm-submit-buttons">{if $fields && array_key_exists('_qf_Batch_refresh', $form) && is_array($form._qf_Batch_refresh)}{$form._qf_Batch_refresh.html}{/if} &nbsp; {$form.buttons.html}</div>
 </div>
 {literal}
 <script type="text/javascript">
diff --git a/www/modules/civicrm/templates/CRM/Block/FullTextSearch.tpl b/www/modules/civicrm/templates/CRM/Block/FullTextSearch.tpl
index 7363708ab..f939bb0dd 100644
--- a/www/modules/civicrm/templates/CRM/Block/FullTextSearch.tpl
+++ b/www/modules/civicrm/templates/CRM/Block/FullTextSearch.tpl
@@ -28,7 +28,7 @@
     <input type="hidden" name="qfKey" value="{crmKey name='CRM_Legacycustomsearches_Controller_Search' addSequence=1}" />
   </div>
   <select class="form-select" id="fulltext_table" name="fulltext_table">
-{if call_user_func(array('CRM_Core_Permission','giveMeAllACLs'))}
+{if $hasAllACLs}
       <option value="">{ts}All{/ts}</option>
       <option value="Contact">{ts}Contacts{/ts}</option>
 {/if}
diff --git a/www/modules/civicrm/templates/CRM/Campaign/Form/Campaign.tpl b/www/modules/civicrm/templates/CRM/Campaign/Form/Campaign.tpl
index 71414c0a9..7888084cf 100644
--- a/www/modules/civicrm/templates/CRM/Campaign/Form/Campaign.tpl
+++ b/www/modules/civicrm/templates/CRM/Campaign/Form/Campaign.tpl
@@ -69,7 +69,7 @@
   </tr>
   </table>
 
-  {include file="CRM/common/customDataBlock.tpl" cid=false}
+  {include file="CRM/common/customDataBlock.tpl" groupID='' customDataType='Campaign' cid=false}
 
 {/if}
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
diff --git a/www/modules/civicrm/templates/CRM/Campaign/Form/Gotv.tpl b/www/modules/civicrm/templates/CRM/Campaign/Form/Gotv.tpl
index 0d6a7ea63..769432484 100644
--- a/www/modules/civicrm/templates/CRM/Campaign/Form/Gotv.tpl
+++ b/www/modules/civicrm/templates/CRM/Campaign/Form/Gotv.tpl
@@ -100,7 +100,7 @@
 
       //collapse the search form.
       var searchFormName = '#search_form_' + {/literal}'{$searchVoterFor}'{literal};
-      CRM.$( searchFormName + '.crm-accordion-wrapper:not(.collapsed)').crmAccordionToggle();
+      CRM.$( searchFormName + 'details').prop('open', false);
     }, 'html' );
   }
 
diff --git a/www/modules/civicrm/templates/CRM/Campaign/Form/Petition.tpl b/www/modules/civicrm/templates/CRM/Campaign/Form/Petition.tpl
index 459f8717b..9922861fe 100644
--- a/www/modules/civicrm/templates/CRM/Campaign/Form/Petition.tpl
+++ b/www/modules/civicrm/templates/CRM/Campaign/Form/Petition.tpl
@@ -94,7 +94,7 @@
         </td>
       </tr>
     </table>
-    {include file="CRM/common/customDataBlock.tpl"}
+    {include file="CRM/common/customDataBlock.tpl"  groupID='' customDataType='Survey' customDataSubType=false entityID=$surveyId cid=false}
   {/if}
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
diff --git a/www/modules/civicrm/templates/CRM/Campaign/Form/Search/Common.tpl b/www/modules/civicrm/templates/CRM/Campaign/Form/Search/Common.tpl
index 2b9a059b4..5dc4fac45 100644
--- a/www/modules/civicrm/templates/CRM/Campaign/Form/Search/Common.tpl
+++ b/www/modules/civicrm/templates/CRM/Campaign/Form/Search/Common.tpl
@@ -14,10 +14,10 @@
 {if $searchVoterFor}
   {assign var='searchForm' value="search_form_$searchVoterFor"}
 {/if}
-  <div id="{$searchForm}" class="crm-accordion-wrapper crm-contribution_search_form-accordion {if $rows}collapsed{/if}">
-    <div class="crm-accordion-header {if !$votingTab} crm-master-accordion-header{/if}">
+  <details id="{$searchForm}" class="{if !$votingTab} crm-accordion-light{else}crm-accordion-bold{/if} crm-contribution_search_form-accordion" {if $rows}{else}open{/if}>
+    <summary>
     {ts}Edit Search Criteria{/ts}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
 
     <div class="crm-accordion-body">
     {strip}
@@ -142,7 +142,7 @@
     {/strip}
 
     </div>
-  </div>
+  </details>
 </div>
 
 {literal}
diff --git a/www/modules/civicrm/templates/CRM/Campaign/Form/Survey/Main.tpl b/www/modules/civicrm/templates/CRM/Campaign/Form/Survey/Main.tpl
index e08b71263..7f6cbffe1 100644
--- a/www/modules/civicrm/templates/CRM/Campaign/Form/Survey/Main.tpl
+++ b/www/modules/civicrm/templates/CRM/Campaign/Form/Survey/Main.tpl
@@ -52,7 +52,7 @@
    </tr>
    <tr class="crm-campaign-form-block-custom_data">
        <td colspan="2">
-         {include file="CRM/common/customDataBlock.tpl"}
+         {include file="CRM/common/customDataBlock.tpl" groupID='' entityID=$surveyId customDataType='Survey' customDataSubType=false cid=false}
        </td>
    </tr>
   </table>
diff --git a/www/modules/civicrm/templates/CRM/Campaign/Form/Survey/Results.tpl b/www/modules/civicrm/templates/CRM/Campaign/Form/Survey/Results.tpl
index 477ee6dcb..10657183e 100644
--- a/www/modules/civicrm/templates/CRM/Campaign/Form/Survey/Results.tpl
+++ b/www/modules/civicrm/templates/CRM/Campaign/Form/Survey/Results.tpl
@@ -20,8 +20,8 @@
     {* Create Report *}
     <tr id='showoption'>
       <td colspan="2">
-        <div id="new-group" class="crm-accordion-wrapper">
-          <div class="crm-accordion-header">{ts}Create Report{/ts}</div>
+        <details id="new-group" class="crm-accordion-bold" open>
+          <summary>{ts}Create Report{/ts}</summary>
           <div class="crm-accordion-body">
             <table class="form-layout-compressed">
               <tr>
@@ -34,7 +34,7 @@
               </tr>
             </table>
           </div>
-        </div>
+        </details>
       </td>
     </tr>
   </table>
diff --git a/www/modules/civicrm/templates/CRM/Campaign/Form/Task/Reserve.tpl b/www/modules/civicrm/templates/CRM/Campaign/Form/Task/Reserve.tpl
index 6eb404b6e..133febbe4 100644
--- a/www/modules/civicrm/templates/CRM/Campaign/Form/Task/Reserve.tpl
+++ b/www/modules/civicrm/templates/CRM/Campaign/Form/Task/Reserve.tpl
@@ -16,8 +16,8 @@
   {include file="CRM/Contact/Form/Task.tpl"}
 
   {* New Group *}
-  <div id="new-group" class="crm-accordion-wrapper collapsed">
-    <div class="crm-accordion-header">{ts}Add respondent(s) to a new group{/ts}</div>
+  <details id="new-group" class="crm-accordion-bold">
+    <summary>{ts}Add respondent(s) to a new group{/ts}</summary>
     <div class="crm-accordion-body">
             <table class="form-layout-compressed">
              <tr>
@@ -30,11 +30,11 @@
              </tr>
             </table>
     </div>
-  </div>
+  </details>
 
   {* Existing Group *}
-  <div class="crm-accordion-wrapper crm-existing_group-accordion {if $hasExistingGroups} {else}collapsed{/if}">
-    <div class="crm-accordion-header">{ts}Add respondent(s) to existing group(s){/ts}</div>
+  <details class="crm-accordion-bold crm-existing_group-accordion" {if $hasExistingGroups}open{/if}>
+    <summary>{ts}Add respondent(s) to existing group(s){/ts}</summary>
     <div class="crm-accordion-body">
       <table class="form-layout-compressed">
         <tr>
@@ -43,7 +43,7 @@
         </tr>
       </table>
     </div>
-  </div>
+  </details>
 
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
@@ -57,7 +57,7 @@
   function setDefaultGroup() {
     var invalidGroupName = {/literal}'{$invalidGroupName}'{literal};
     if (invalidGroupName) {
-       cj("#new-group.collapsed").crmAccordionToggle();
+       cj("#new-group").prop('open', true);
     } else {
        cj("#newGroupName").val('');
        cj("#newGroupDesc").val('');
diff --git a/www/modules/civicrm/templates/CRM/Case/Form/Activity.tpl b/www/modules/civicrm/templates/CRM/Case/Form/Activity.tpl
index aa14680e2..4e374f55d 100644
--- a/www/modules/civicrm/templates/CRM/Case/Form/Activity.tpl
+++ b/www/modules/civicrm/templates/CRM/Case/Form/Activity.tpl
@@ -41,10 +41,10 @@
       {* Added Activity Details accordion tab *}
       <tr class="crm-case-activity-form-block-activity-details">
         <td colspan="2">
-          <div id="activity-details" class="crm-accordion-wrapper collapsed">
-            <div class="crm-accordion-header">
+          <details id="activity-details" class="crm-accordion-bold">
+            <summary>
               {ts}Activity Details{/ts}
-            </div><!-- /.crm-accordion-header -->
+            </summary>
             <div class="crm-accordion-body">
     {else}
       <tr class="crm-case-activity-form-block-activity-details">
@@ -115,7 +115,11 @@
               {/if}
               <tr class="crm-case-activity-form-block-medium_id">
                 <td class="label">{$form.medium_id.label}</td>
-                <td class="view-value">{$form.medium_id.html}&nbsp;&nbsp;&nbsp;{$form.location.label} &nbsp;{$form.location.html|crmAddClass:huge}</td>
+                <td class="view-value">{$form.medium_id.html}</td>
+              </tr>
+              <tr class="crm-case-activity-form-block-location">
+                <td class="label">{$form.location.label}</td>
+                <td class="view-value">{$form.location.html|crmAddClass:huge}</td>
               </tr>
               <tr class="crm-case-activity-form-block-activity_date_time">
                 <td class="label">{$form.activity_date_time.label}</td>
@@ -135,7 +139,7 @@
               </tr>
               {/if}
               <tr>
-                <td colspan="2">{include file="CRM/common/customDataBlock.tpl"}</td>
+                <td colspan="2">{include file="CRM/common/customDataBlock.tpl" groupID='' customDataType='Activity'}</td>
               </tr>
               {if NOT $activityTypeFile}
                 <tr class="crm-case-activity-form-block-details">
@@ -156,8 +160,8 @@
         {if $activityTypeFile EQ 'ChangeCaseStatus'
         || $activityTypeFile EQ 'ChangeCaseType'
         || $activityTypeFile EQ 'ChangeCaseStartDate'}
-          </div><!-- /.crm-accordion-body -->
-        </div><!-- /.crm-accordion-wrapper -->
+          </div>
+        </details>
         {* End of Activity Details accordion tab *}
       {/if}
       </td>
@@ -168,10 +172,10 @@
     {if $searchRows} {* We have got case role rows to display for "Send Copy To" feature *}
       <tr class="crm-case-activity-form-block-send_copy">
         <td colspan="2">
-          <div id="sendcopy" class="crm-accordion-wrapper collapsed">
-            <div class="crm-accordion-header">
+          <details id="sendcopy" class="crm-accordion-bold">
+            <summary>
               {ts}Send a Copy{/ts}
-            </div><!-- /.crm-accordion-header -->
+            </summary>
             <div id="sendcopy-body" class="crm-accordion-body">
 
               <div class="description">{ts}Email a complete copy of this activity record to other people involved with the case. Click the top left box to select all.{/ts}</div>
@@ -197,8 +201,8 @@
                   {/foreach}
                 </table>
               {/strip}
-            </div><!-- /.crm-accordion-body -->
-          </div><!-- /.crm-accordion-wrapper -->
+            </div>
+          </details>
         </td>
       </tr>
     {/if}
@@ -264,10 +268,14 @@
   {if $action neq 8 and $action neq 32768 and empty($activityTypeFile)}
   <script type="text/javascript">
     {if $searchRows}
-      cj('#sendcopy').crmAccordionToggle();
+      {literal}
+      cj('#sendcopy').prop('open', function(i, val) {return !val;});
+      {/literal}
     {/if}
 
-    cj('#follow-up').crmAccordionToggle();
+    {literal}
+    cj('#follow-up').prop('open', function(i, val) {return !val;});
+    {/literal}
   </script>
   {/if}
 
diff --git a/www/modules/civicrm/templates/CRM/Case/Form/ActivityTab.tpl b/www/modules/civicrm/templates/CRM/Case/Form/ActivityTab.tpl
index 683da8bf1..f1a5e400d 100644
--- a/www/modules/civicrm/templates/CRM/Case/Form/ActivityTab.tpl
+++ b/www/modules/civicrm/templates/CRM/Case/Form/ActivityTab.tpl
@@ -10,64 +10,65 @@
 {*this template is used for activity accordion*}
 {assign var=caseid value=$caseID}
 {if $isForm}
-  <div class="crm-accordion-wrapper crm-case_activities-accordion  crm-case-activities-block">
-    <div class="crm-accordion-header">
+  <details class="crm-accordion-bold crm-case_activities-accordion  crm-case-activities-block" open>
+    <summary>
       {ts}Activities{/ts}
-    </div>
-
+    </summary>
     <div id="activities" class="crm-accordion-body padded">
-    <div class="crm-collapsible crm-search_filters-accordion collapsed">
-      <div class="collapsible-title">
-        {ts}Search Filters{/ts}
-      </div>
-      <table class="no-border form-layout-compressed" id="searchOptions">
-        <tr>
-          <td class="crm-case-caseview-form-block-repoter_id"colspan="2"><label for="reporter_id">{ts}Reporter/Role{/ts}</label><br />
-            {$form.reporter_id.html|crmAddClass:twenty}
-          </td>
-          <td class="crm-case-caseview-form-block-status_id"><label for="status_id">{$form.status_id.label}</label><br />
-            {$form.status_id.html}
-          </td>
-        </tr>
-        <tr>
-          <td class="crm-case-caseview-form-block-activity_date_low">
-            {assign var=activitylow  value="activity_date_low_`$caseID`"}
-            {$form.$activitylow.label}<br />
-            {$form.$activitylow.html}
-          </td>
-          <td class="crm-case-caseview-form-block-activity_date_high">
-            {assign var=activityhigh  value="activity_date_high_`$caseID`"}
-            {$form.$activityhigh.label}<br />
-            {$form.$activityhigh.html}
-          </td>
-          <td class="crm-case-caseview-form-block-activity_type_filter_id">
-            {$form.activity_type_filter_id.label}<br />
-            {$form.activity_type_filter_id.html}
-          </td>
-        </tr>
-        {if !empty($form.activity_deleted)}
-          <tr class="crm-case-caseview-form-block-activity_deleted">
-            <td>
-              {$form.activity_deleted.html}{$form.activity_deleted.label}
-            </td>
-          </tr>
-        {/if}
-      </table>
-    </div><!-- /.crm-accordion-wrapper -->
-{/if}
+      <details class="crm-accordion-light crm-search_filters-accordion">
+        <summary>
+          {ts}Search Filters{/ts}
+        </summary>
+        <div class="crm-accordion-body">
+          <table class="no-border form-layout-compressed" id="searchOptions">
+            <tr>
+              <td class="crm-case-caseview-form-block-repoter_id"colspan="2"><label for="reporter_id">{ts}Reporter/Role{/ts}</label><br />
+                {$form.reporter_id.html|crmAddClass:twenty}
+              </td>
+              <td class="crm-case-caseview-form-block-status_id"><label for="status_id">{$form.status_id.label}</label><br />
+                {$form.status_id.html}
+              </td>
+            </tr>
+            <tr>
+              <td class="crm-case-caseview-form-block-activity_date_low">
+                {assign var=activitylow  value="activity_date_low_`$caseID`"}
+                {$form.$activitylow.label}<br />
+                {$form.$activitylow.html}
+              </td>
+              <td class="crm-case-caseview-form-block-activity_date_high">
+                {assign var=activityhigh  value="activity_date_high_`$caseID`"}
+                {$form.$activityhigh.label}<br />
+                {$form.$activityhigh.html}
+              </td>
+              <td class="crm-case-caseview-form-block-activity_type_filter_id">
+                {$form.activity_type_filter_id.label}<br />
+                {$form.activity_type_filter_id.html}
+              </td>
+            </tr>
+            {if !empty($form.activity_deleted)}
+              <tr class="crm-case-caseview-form-block-activity_deleted">
+                <td>
+                  {$form.activity_deleted.html}{$form.activity_deleted.label}
+                </td>
+              </tr>
+            {/if}
+          </table>
+        </div>
+      </details>
+    {/if}
 
-    <table id="case_id_{$caseid}"  class="nestedActivitySelector crm-ajax-table" data-page-length="10">
-      <thead><tr>
-        <th data-data="activity_date_time" class="crm-case-activities-date">{ts}Date{/ts}</th>
-        <th data-data="subject" cell-class="crmf-subject crm-editable" class="crm-case-activities-subject">{ts}Subject{/ts}</th>
-        <th data-data="type" class="crm-case-activities-type">{ts}Type{/ts}</th>
-        <th data-data="target_contact_name" class="crm-case-activities-with">{ts}With{/ts}</th>
-        <th data-data="source_contact_name" class="crm-case-activities-assignee">{ts}Reporter{/ts}</th>
-        <th data-data="assignee_contact_name" class="crm-case-activities-assignee">{ts}Assignee{/ts}</th>
-        <th data-data="status_id" cell-class="crmf-status_id crm-editable" cell-data-type="select" cell-data-refresh=1 class="crm-case-activities-status">{ts}Status{/ts}</th>
-        <th data-data="links" data-orderable="false" class="crm-case-activities-status">&nbsp;</th>
-      </tr></thead>
-    </table>
+  <table id="case_id_{$caseid}"  class="nestedActivitySelector crm-ajax-table" data-page-length="10">
+    <thead><tr>
+      <th data-data="activity_date_time" class="crm-case-activities-date">{ts}Date{/ts}</th>
+      <th data-data="subject" cell-class="crmf-subject crm-editable" class="crm-case-activities-subject">{ts}Subject{/ts}</th>
+      <th data-data="type" class="crm-case-activities-type">{ts}Type{/ts}</th>
+      <th data-data="target_contact_name" class="crm-case-activities-with">{ts}With{/ts}</th>
+      <th data-data="source_contact_name" class="crm-case-activities-assignee">{ts}Reporter{/ts}</th>
+      <th data-data="assignee_contact_name" class="crm-case-activities-assignee">{ts}Assignee{/ts}</th>
+      <th data-data="status_id" cell-class="crmf-status_id crm-editable" cell-data-type="select" cell-data-refresh=1 class="crm-case-activities-status">{ts}Status{/ts}</th>
+      <th data-data="links" data-orderable="false" class="crm-case-activities-status">&nbsp;</th>
+    </tr></thead>
+  </table>
   {literal}
     <script type="text/javascript">
       (function($) {
@@ -105,6 +106,6 @@
   </style>
 
 {if $isForm}
-    </div><!-- /.crm-accordion-body -->
-  </div><!-- /.crm-accordion-wrapper -->
+    </div>
+  </details><!-- /.crm-accordion-wrapper -->
 {/if}
diff --git a/www/modules/civicrm/templates/CRM/Case/Form/Case.tpl b/www/modules/civicrm/templates/CRM/Case/Form/Case.tpl
index bb34a8ec5..172d338ae 100644
--- a/www/modules/civicrm/templates/CRM/Case/Form/Case.tpl
+++ b/www/modules/civicrm/templates/CRM/Case/Form/Case.tpl
@@ -58,11 +58,11 @@
 
 {* custom data group *}
 {* This shows ACTIVITY custom fields, as opposed to CASE custom fields, so is not a duplicate of the other custom data block below. *}
-{if $groupTree}
-    <tr>
-       <td colspan="2">{include file="CRM/Custom/Form/CustomData.tpl" skipTitle=0}</td>
-    </tr>
-{/if}
+<tr class="crm-activity-form-block-custom_data">
+  <td colspan="2">
+    {include file="CRM/common/customDataBlock.tpl" customDataType='Activity' customDataSubType=$activityTypeID cid=false}
+  </td>
+</tr>
 
 {if !empty($form.activity_subject.html)}
     <tr class="crm-case-form-block-activity_subject">
@@ -97,7 +97,7 @@
 {* This shows CASE custom fields, as opposed to ACTIVITY custom fields, so is not a duplicate of the other custom data block above. *}
 <tr class="crm-case-form-block-custom_data">
     <td colspan="2">
-      {include file="CRM/common/customDataBlock.tpl"}
+      {include file="CRM/common/customDataBlock.tpl" customDataType='Case' customDataSubType=$caseTypeID cid=false}
     </td>
 </tr>
 
diff --git a/www/modules/civicrm/templates/CRM/Case/Form/CaseFilter.tpl b/www/modules/civicrm/templates/CRM/Case/Form/CaseFilter.tpl
index c078bcee5..bd78b9549 100644
--- a/www/modules/civicrm/templates/CRM/Case/Form/CaseFilter.tpl
+++ b/www/modules/civicrm/templates/CRM/Case/Form/CaseFilter.tpl
@@ -8,10 +8,10 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-case-filter-{$list}">
-  <div class="crm-accordion-wrapper crm-search_filters-accordion">
-    <div class="crm-accordion-header">
+  <details class="crm-accordion-bold crm-search_filters-accordion" open>
+    <summary>
     {ts}Filter by Case{/ts}</a>
-    </div><!-- /.crm-accordion-header -->
+    </summary>
     <div class="crm-accordion-body">
       <table class="no-border form-layout-compressed case-search-options-{$list}">
         <tr>
@@ -29,7 +29,7 @@
           {/if}
         </tr>
       </table>
-    </div><!-- /.crm-accordion-body -->
-  </div><!-- /.crm-accordion-wrapper -->
+    </div>
+  </details>
 </div>
 <div class="spacer"></div>
diff --git a/www/modules/civicrm/templates/CRM/Case/Form/CaseView.js b/www/modules/civicrm/templates/CRM/Case/Form/CaseView.js
index 10e932349..518d75649 100644
--- a/www/modules/civicrm/templates/CRM/Case/Form/CaseView.js
+++ b/www/modules/civicrm/templates/CRM/Case/Form/CaseView.js
@@ -285,16 +285,21 @@
       .on('crmBeforeLoad', function(e) {
         if ($(e.target).is(this)) {
           accordionStates = [];
-          $('.crm-accordion-wrapper', this).each(function() {
-            accordionStates.push($(this).hasClass('collapsed'));
+          $('details', this).each(function() {
+            accordionStates.push($(this).prop('open') ? true : false);
           });
         }
       })
       .on('crmLoad', function(e) {
         if ($(e.target).is(this)) {
-          var $targets = $('.crm-accordion-wrapper', this);
-          $.each(accordionStates, function(i, isCollapsed) {
-            $targets.eq(i).toggleClass('collapsed', isCollapsed);
+          var $targets = $('details', this);
+          $.each(accordionStates, function(i, isOpen) {
+            if (isOpen) {
+              $targets.eq(i).prop('open', true);
+            }
+            else {
+              $targets.eq(i).removeProp('open');
+            }
           });
         }
       });
diff --git a/www/modules/civicrm/templates/CRM/Case/Form/CaseView.tpl b/www/modules/civicrm/templates/CRM/Case/Form/CaseView.tpl
index 95677b07e..4fea447e9 100644
--- a/www/modules/civicrm/templates/CRM/Case/Form/CaseView.tpl
+++ b/www/modules/civicrm/templates/CRM/Case/Form/CaseView.tpl
@@ -118,7 +118,7 @@
           </span>
         {/if}
 
-        {if call_user_func(array('CRM_Core_Permission','giveMeAllACLs'))}
+        {if $hasAllACLs}
           <a class="action-item crm-hover-button medium-popup" href="{crmURL p='civicrm/contact/view/case/editClient' h=1 q="reset=1&action=update&id=$caseID&cid=$contactID"}"><i class="crm-i fa-user" aria-hidden="true"></i> {ts}Assign to Another Client{/ts}</a>
         {/if}
       </p>
@@ -128,10 +128,10 @@
   <div class="clear"></div>
   {include file="CRM/Case/Page/CustomDataView.tpl"}
 
-  <div class="crm-accordion-wrapper collapsed crm-case-roles-block">
-    <div class="crm-accordion-header">
+  <details class="crm-accordion-bold crm-case-roles-block">
+    <summary>
       {ts}Roles{/ts}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
     <div class="crm-accordion-body">
 
       {if $hasAccessToAllCases}
@@ -185,14 +185,14 @@
         {ts}Are you sure you want to end this relationship?{/ts}
       </div>
 
-   </div><!-- /.crm-accordion-body -->
-  </div><!-- /.crm-accordion-wrapper -->
+   </div>
+  </details>
 
   {if $hasAccessToAllCases}
-  <div class="crm-accordion-wrapper collapsed crm-case-other-relationships-block">
-    <div class="crm-accordion-header">
+  <details class="crm-accordion-bold crm-case-other-relationships-block">
+    <summary>
       {ts}Other Relationships{/ts}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
     <div class="crm-accordion-body">
       <div class="crm-submit-buttons">
         {crmButton p='civicrm/contact/view/rel' q="action=add&reset=1&cid=`$contactId`&caseID=`$caseID`" icon="plus-circle"}{ts}Add client relationship{/ts}{/crmButton}
@@ -252,18 +252,18 @@
     {/literal}
   {/if}
 
-  </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+  </div>
+</details>
 
 {/if} {* other relationship section ends *}
 {include file="CRM/Case/Form/ActivityToCase.tpl"}
 
 {* pane to display / edit regular tags or tagsets for cases *}
 {if $showTags}
-<div id="casetags" class="crm-accordion-wrapper  crm-case-tags-block">
- <div class="crm-accordion-header">
+<details id="casetags" class="crm-accordion-bold  crm-case-tags-block" open>
+ <summary>
   {ts}Case Tags{/ts}
- </div><!-- /.crm-accordion-header -->
+ </summary>
  <div class="crm-accordion-body">
   {if $tags}
     <p class="crm-block crm-content-block crm-case-caseview-display-tags">
@@ -295,8 +295,8 @@
     </a>
   </div>
 
- </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+ </div>
+</details>
 
 <div id="manageTagsDialog" class="hiddenElement">
   <div class="label">{$form.case_tag.label}</div>
diff --git a/www/modules/civicrm/templates/CRM/Case/Form/Search.tpl b/www/modules/civicrm/templates/CRM/Case/Form/Search.tpl
index 1aae150e0..93a62b3ab 100644
--- a/www/modules/civicrm/templates/CRM/Case/Form/Search.tpl
+++ b/www/modules/civicrm/templates/CRM/Case/Form/Search.tpl
@@ -13,10 +13,10 @@
 {else}
 
 <div class="crm-block crm-form-block crm-case-search-form-block">
-<div class="crm-accordion-wrapper crm-case_search-accordion {if $rows}collapsed{/if}">
- <div class="crm-accordion-header crm-master-accordion-header">
+<details class="crm-accordion-light crm-case_search-accordion" {if $rows}{else}open{/if}>
+ <summary>
             {ts}Edit Search Criteria{/ts}
-</div><!-- /.crm-accordion-header -->
+</summary>
  <div class="crm-accordion-body">
         {strip}
             <table class="form-layout">
@@ -33,8 +33,8 @@
             </tr>
             </table>
         {/strip}
-</div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+</div>
+</details>
 </div><!-- /.crm-form-block -->
     {if $rowsEmpty || $rows}
 <div class="crm-content-block">
diff --git a/www/modules/civicrm/templates/CRM/Case/Page/CustomDataView.tpl b/www/modules/civicrm/templates/CRM/Case/Page/CustomDataView.tpl
index 05f6a622e..6b8a4d3bb 100644
--- a/www/modules/civicrm/templates/CRM/Case/Page/CustomDataView.tpl
+++ b/www/modules/civicrm/templates/CRM/Case/Page/CustomDataView.tpl
@@ -11,10 +11,10 @@
 {foreach from=$viewCustomData item=customValues key=customGroupId}
   {foreach from=$customValues item=cd_edit key=cvID}
     {assign var='index' value=$groupId|cat:"_$cvID"}
-  <div id="{$cd_edit.name}" class="crm-accordion-wrapper {if $cd_edit.collapse_display neq 0}collapsed{/if}">
-    <div class="crm-accordion-header">
+  <details id="{$cd_edit.name}" class="crm-accordion-bold" {if $cd_edit.collapse_display neq 0}{else}open{/if}>
+    <summary>
       {$cd_edit.title}
-    </div>
+    </summary>
     <div class="crm-accordion-body">
       {if !empty($cd_edit.fields)}
         <table class="crm-info-panel">
@@ -47,7 +47,7 @@
       <br/>
       <div class="clear"></div>
     </div>
-  </div>
+  </details>
 
   {/foreach}
 {/foreach}
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Contact.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Contact.tpl
index 8e05bf6e8..80d17865c 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Contact.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Contact.tpl
@@ -23,10 +23,10 @@
     {include file="CRM/common/formButtons.tpl" location="top"}
     </div>
 
-    <div class="crm-accordion-wrapper crm-contactDetails-accordion">
-      <div class="crm-accordion-header">
+    <details class="crm-accordion-bold crm-contactDetails-accordion" open>
+      <summary>
         {ts}Contact Details{/ts}
-      </div><!-- /.crm-accordion-header -->
+      </summary>
       <div class="crm-accordion-body" id="contactDetails">
         <div id="contactDetails">
           <div class="crm-section contact_basic_information-section">
@@ -73,12 +73,12 @@
           {/if}
           <div class="spacer"></div>
         </div>
-      </div><!-- /.crm-accordion-body -->
-    </div><!-- /.crm-accordion-wrapper -->
+      </div>
+    </details>
 
     {foreach from = $editOptions item = "title" key="name"}
       {if $name eq 'CustomData'}
-        <div id='customData'>{include file="CRM/Contact/Form/Edit/CustomData.tpl" isSingleRecordEdit=false}</div>
+        <div id='customData_{$contactType}'>{include file="CRM/Contact/Form/Edit/CustomData.tpl" isSingleRecordEdit=false skipTitle=false}</div>
       {else}
         {include file="CRM/Contact/Form/Edit/$name.tpl"}
       {/if}
@@ -92,8 +92,8 @@
   <script type="text/javascript" >
   CRM.$(function($) {
     var $form = $("form.{/literal}{$form.formClass}{literal}"),
-      action = {/literal}{$action|intval}{literal},
-      cid = {/literal}{$contactId|intval}{literal},
+      action = {/literal}{$action|string_format:"%d"}{literal},
+      cid = {/literal}{$contactId|string_format:"%d"}{literal},
       _ = CRM._;
 
     $('.crm-accordion-body').each( function() {
@@ -106,15 +106,15 @@
       }
       //open tab if form rule throws error
       if ( $(this).children().find('span.crm-error').text().length > 0 ) {
-        $(this).parents('.collapsed').crmAccordionToggle();
+        $(this).parents('details').prop('open', true);
       }
     });
     if (action === 2) {
-      $('.crm-accordion-wrapper').not('.crm-accordion-wrapper .crm-accordion-wrapper').each(function() {
+      $('details').not('details details').each(function() {
         highlightTabs(this);
       });
       $('#crm-container').on('change click', '.crm-accordion-body :input, .crm-accordion-body a', function() {
-        highlightTabs($(this).parents('.crm-accordion-wrapper'));
+        highlightTabs($(this).parents('details'));
       });
     }
     function highlightTabs(tab) {
@@ -125,7 +125,7 @@
             case 'checkbox':
             case 'radio':
               if($(this).is(':checked') && !$(this).is('[id$=IsPrimary],[id$=IsBilling]')) {
-                $('.crm-accordion-header:first', tab).addClass('active');
+                $('summary:first', tab).addClass('active');
                 return false;
               }
               break;
@@ -133,7 +133,7 @@
             case 'text':
             case 'textarea':
               if($(this).val()) {
-                $('.crm-accordion-header:first', tab).addClass('active');
+                $('summary:first', tab).addClass('active');
                 return false;
               }
               break;
@@ -141,19 +141,19 @@
             case 'select-one':
             case 'select-multiple':
               if($(this).val() && $('option[value=""]', this).length > 0) {
-                $('.crm-accordion-header:first', tab).addClass('active');
+                $('summary:first', tab).addClass('active');
                 return false;
               }
               break;
 
             case 'file':
               if($(this).next().html()) {
-                $('.crm-accordion-header:first', tab).addClass('active');
+                $('summary:first', tab).addClass('active');
                 return false;
               }
               break;
           }
-          $('.crm-accordion-header:first', tab).removeClass('active');
+          $('summary:first', tab).removeClass('active');
       });
     }
 
@@ -161,11 +161,11 @@
       if( $(this).attr('href') == '#expand') {
         var message = {/literal}"{ts escape='js'}Collapse all tabs{/ts}"{literal};
         $(this).attr('href', '#collapse');
-        $('.crm-accordion-wrapper.collapsed').crmAccordionToggle();
+        $('.crm-form-block details').prop('open', true);
       }
       else {
         var message = {/literal}"{ts escape='js'}Expand all tabs{/ts}"{literal};
-        $('.crm-accordion-wrapper:not(.collapsed)').crmAccordionToggle();
+        $('.crm-form-block details').prop('open', false);
         $(this).attr('href', '#expand');
       }
       $(this).html(message);
@@ -244,14 +244,7 @@
     {/literal}{* Ajax check for matching contacts *}
     {if $checkSimilar == 1}
     var contactType = {$contactType|@json_encode},
-      rules = {*$ruleFields|@json_encode*}{literal}[
-        'first_name',
-        'last_name',
-        'nick_name',
-        'household_name',
-        'organization_name',
-        'email'
-      ],
+      rules = {$ruleFields}{literal},
       ruleFields = {},
       $ruleElements = $(),
       matchMessage,
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/CustomData.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/CustomData.tpl
index f4022bccf..e29db1da6 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/CustomData.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/CustomData.tpl
@@ -14,7 +14,7 @@
      <div class="crm-submit-buttons">{$form.buttons.html}</div>
    {/if}
 {else}
-    <div id="customData"></div>
+    <div id="customData_{$contact_type}" class="crm-customData-block"></div>
     <div class="crm-submit-buttons">{$form.buttons.html}</div>
 
     {*include custom data js file*}
@@ -45,4 +45,3 @@
   {/if}
   {include file="CRM/Form/attachmentjs.tpl"}
 {/if}
-
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Address.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Address.tpl
index b0da0bf2f..0f9cea404 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Address.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Address.tpl
@@ -12,10 +12,10 @@
 {* @var $blockId Contains the current address block id, and assigned in the  CRM/Contact/Form/Location.php file *}
 
 {if $className eq 'CRM_Contact_Form_Contact' && $title}
-<div id="addressBlockId" class="crm-accordion-wrapper crm-address-accordion collapsed">
- <div class="crm-accordion-header">
+<details id="addressBlockId" class="crm-accordion-bold crm-address-accordion">
+ <summary>
     {$title}
- </div><!-- /.crm-accordion-header -->
+ </summary>
  <div class="crm-accordion-body" id="addressBlock">
 {/if}
 
@@ -71,8 +71,8 @@
 
 {if $className eq 'CRM_Contact_Form_Contact' && $title}
 </div>
- </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+ </div>
+</details>
 {/if}
 {literal}
 <script type="text/javascript">
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomData.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomData.tpl
index 8f5600bf2..19691f8e9 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomData.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Address/CustomData.tpl
@@ -10,14 +10,14 @@
 
 {foreach from=$address_groupTree.$blockId item=cd_edit key=group_id}
 <div id="{$cd_edit.name}_{$group_id}_{$blockId}" class="form-item">
-    <div class="crm-collapsible crm-{$cd_edit.name}_{$group_id}_{$blockId}-accordion {if $cd_edit.collapse_display}collapsed{/if}">
-        <div class="collapsible-title">
+    <details class="crm-accordion-light crm-{$cd_edit.name}_{$group_id}_{$blockId}-accordion" {if !$cd_edit.collapse_display}open{/if}>
+        <summary>
             {$cd_edit.title}
-        </div>
-        <div>
-        {include file="CRM/Custom/Form/Edit/CustomData.tpl" customDataEntity='address'}
-        </div>
-    </div>
+        </summary>
+        <div class="crm-accordion-body">
+        {include file="CRM/Custom/Form/Edit/CustomData.tpl" customDataEntity='address' isSingleRecordEdit=false prefix=''}
+        </div><!-- crm-accordion-body-->
+    </details>
 
     <div id="custom_group_{$group_id}_{$blockId}"></div>
 </div>
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl
index 5b469501c..89fc1c026 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl
@@ -10,10 +10,10 @@
 {* This file provides the plugin for the communication preferences in all the three types of contact *}
 {* @var $form Contains the array for the form elements and other form associated information assigned to the template by the controller *}
 
-<div class="crm-accordion-wrapper crm-commPrefs-accordion collapsed">
- <div class="crm-accordion-header">
+<details class="crm-accordion-bold crm-commPrefs-accordion">
+ <summary>
     {$title}
-  </div><!-- /.crm-accordion-header -->
+  </summary>
 <div id="commPrefs" class="crm-accordion-body">
     <table class="form-layout-compressed" >
         {if array_key_exists('communication_style_id', $form)}
@@ -106,6 +106,6 @@
           <td>{$form.is_opt_out.html} {$form.is_opt_out.label} {help id="id-optOut" file="CRM/Contact/Form/Contact.hlp"}</td>
         </tr>
     </table>
- </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+ </div>
+</details>
 {include file="CRM/Contact/Form/Edit/CommunicationPreferences.js.tpl"}
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/CustomData.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/CustomData.tpl
index 98c49144d..0f0d82106 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/CustomData.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/CustomData.tpl
@@ -10,25 +10,20 @@
 
 {foreach from=$groupTree item=cd_edit key=group_id}
   {if $cd_edit.is_multiple eq 1}
-    {assign var=tableID value=$cd_edit.table_id}
-    {assign var=divName value=$group_id|cat:"_$tableID"}
     <div></div>
-    <div
-     class="crm-accordion-wrapper crm-custom-accordion {if $cd_edit.collapse_display and !$skipTitle}collapsed{/if}">
+    <details class="crm-accordion-bold crm-custom-accordion" {if $cd_edit.collapse_display and !$skipTitle}{else}open{/if}>
   {else}
-    <div id="{$cd_edit.name}"
-       class="crm-accordion-wrapper crm-custom-accordion {if $cd_edit.collapse_display}collapsed{/if}">
+    <details id="{$cd_edit.name}" class="crm-accordion-bold crm-custom-accordion" {if $cd_edit.collapse_display}{else}open{/if}>
   {/if}
-    <div class="crm-accordion-header">
+    <summary>
       {$cd_edit.title}
-    </div>
-    <div id="customData{$group_id}" class="crm-accordion-body">
+    </summary>
+    <div id="customData_{$contactType}{$group_id}" class="crm-accordion-body crm-customData-block">
       {include file="CRM/Custom/Form/Edit/CustomData.tpl" customDataEntity=''}
       {include file="CRM/Form/attachmentjs.tpl"}
     </div>
     <!-- crm-accordion-body-->
-  </div>
-  <!-- crm-accordion-wrapper -->
+  </details>
   <div id="custom_group_{$group_id}_{$cgCount}"></div>
   {/foreach}
 
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl
index 59c4f604b..6d8ca409c 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Demographics.tpl
@@ -7,10 +7,10 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-<div class="crm-accordion-wrapper crm-demographics-accordion collapsed">
- <div class="crm-accordion-header">
+<details class="crm-accordion-bold crm-demographics-accordion">
+ <summary>
     {$title}
-  </div><!-- /.crm-accordion-header -->
+  </summary>
   <div id="demographics" class="crm-accordion-body">
   <div class="form-item">
         <span class="label">{$form.gender_id.label}</span>
@@ -31,8 +31,8 @@
        <span class="label">{$form.deceased_date.label}</span>
        <span class="fields">{$form.deceased_date.html}</span>
   </div>
- </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+ </div>
+</details>
 
 {literal}
 <script type="text/javascript">
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl
index 80d6008cb..30a40ce58 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Email.tpl
@@ -29,11 +29,11 @@
   <td>{$form.email.$blockId.email.html|crmAddClass:email}&nbsp;{$form.email.$blockId.location_type_id.html}
     {if $isAddSignatureFields}
       <div class="clear"></div>
-      <div class="email-signature crm-collapsible collapsed">
-        <div class="collapsible-title">
+      <details class="email-signature crm-accordion-light">
+        <summary>
           {ts}Signature{/ts}
-        </div>
-        <div id="signatureBlock{$blockId}">
+        </summary>
+        <div id="signatureBlock{$blockId}" class="crm-accordion-body">
           {$form.email.$blockId.signature_html.label}<br/>{$form.email.$blockId.signature_html.html}<br/>
           {$form.email.$blockId.signature_text.label}<br/>{$form.email.$blockId.signature_text.html}
         </div>
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Notes.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Notes.tpl
index a1948fdd6..dceb9d12a 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Notes.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/Notes.tpl
@@ -7,11 +7,11 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-<div class="crm-accordion-wrapper crm-notesBlock-accordion collapsed">
- <div class="crm-accordion-header">
+<details class="crm-accordion-bold crm-notesBlock-accordion">
+ <summary>
 
     {$title}
-  </div><!-- /.crm-accordion-header -->
+  </summary>
   <div class="crm-accordion-body" id="notesBlock">
    <table class="form-layout-compressed">
      <tr>
@@ -24,5 +24,5 @@
        </td>
      </tr>
    </table>
- </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+ </div>
+</details>
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
index 29e10947b..945b90364 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
@@ -8,8 +8,8 @@
  +--------------------------------------------------------------------+
 *}
 {if $title}
-<div class="crm-accordion-wrapper crm-tagGroup-accordion collapsed">
-  <div class="crm-accordion-header">{$title}</div>
+<details class="crm-accordion-bold crm-tagGroup-accordion">
+  <summary>{$title}</summary>
   <div class="crm-accordion-body" id="tagGroup">
 {/if}
     <table class="form-layout-compressed{if $context EQ 'profile'} crm-profile-tagsandgroups{/if}">
@@ -49,5 +49,5 @@
     </table>
 {if $title}
   </div>
-</div><!-- /.crm-accordion-wrapper -->
+</details>
 {/if}
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Relationship.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Relationship.tpl
index 63cc61869..d78138559 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Relationship.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Relationship.tpl
@@ -47,7 +47,7 @@
         <tr class="crm-relationship-form-block-is_permission_b_a">
           <td class="label"> </td>
           <td>
-            {ts 1=$contact_b|ucfirst 2=$display_name_a}Permission for <strong>%1</strong> to access information about <strong>%2</strong>{/ts}<br />
+            {ts 1=$contact_b|capitalize 2=$display_name_a}Permission for <strong>%1</strong> to access information about <strong>%2</strong>{/ts}<br />
             {$form.is_permission_b_a.html}
           </td>
         </tr>
@@ -56,13 +56,13 @@
           <td>{$form.is_active.html}</td>
         </tr>
       </table>
-      <div id="customData"></div>
+      <div id="customData_Relationship" class="crm-customData-block"></div>
       <div class="spacer"></div>
     </div>
   {/if}
   {if ($action EQ 1) OR ($action EQ 2)}
     {*include custom data js file *}
-    {include file="CRM/common/customData.tpl"}
+    {include file="CRM/common/customDataBlock.tpl" groupID='' customDataType='Relationship' cid=false}
     <script type="text/javascript">
       {literal}
       CRM.$(function($) {
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Search/Advanced.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Search/Advanced.tpl
index 6ebbe18c4..ae5e340cf 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Search/Advanced.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Search/Advanced.tpl
@@ -13,8 +13,8 @@
 
   {include file="CRM/Contact/Form/Search/Intro.tpl"}
 
-  <details class="crm-advanced_search_form-accordion" {if !$rows}open{/if} >
-    <summary class="crm-master-accordion-header">
+  <details class="crm-accordion-light crm-advanced_search_form-accordion" {if !$rows}open{/if} >
+    <summary>
       {if !empty($savedSearch)}
         {ts 1=$savedSearch.name}Edit %1 Smart Group Criteria{/ts}
       {elseif !empty($ssID) or $rows}
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
index 715eeee7f..22228d607 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
@@ -13,11 +13,11 @@
 CRM.$(function($) {
   // Bind first click of accordion header to load crm-accordion-body with snippet
   // everything else is taken care of by crmAccordions()
-  $('.crm-search_criteria_basic-accordion .crm-accordion-header').addClass('active');
-  $('.crm-ajax-accordion').on('click', '.crm-accordion-header:not(.active)', function() {
+  $('.crm-search_criteria_basic-accordion summary').addClass('active');
+  $('.crm-ajax-accordion').on('click', 'summary:not(.active)', function() {
     loadPanes($(this).attr('id'));
   });
-  $('.crm-ajax-accordion:not(.collapsed) .crm-accordion-header').each(function() {
+  $('.crm-ajax-accordion:not(.collapsed) summary').each(function() {
     loadPanes($(this).attr('id'));
   });
   $('.crm-ajax-accordion').on('click', '.crm-close-accordion', function() {
@@ -46,7 +46,7 @@ CRM.$(function($) {
     $('#task').val('');
     var mode = modes[$('#component_mode').val()] || null;
     if (mode) {
-      $('.crm-' + mode + '-accordion.collapsed').crmAccordionToggle();
+      $('.crm-' + mode + '-accordion:not([open])').prop('open', true);
       loadPanes(mode);
     }
     if ('related_contact' === modes[$('#component_mode').val()]) {
@@ -87,24 +87,24 @@ CRM.$(function($) {
 {/if}
 
 {strip}
-  <details class="crm-accordion-wrapper crm-search_criteria_basic-accordion" open>
-    <summary class="crm-accordion-header">
+  <details class="crm-accordion-bold crm-search_criteria_basic-accordion" open>
+    <summary>
       {ts}Display Settings For Results{/ts}
     </summary>
     <div class="crm-accordion-body">
       {include file="CRM/Contact/Form/Search/Criteria/DisplaySettings.tpl"}
     </div>
   </details>
-  <details class="crm-accordion-wrapper crm-search_criteria_basic-accordion" open>
-    <summary class="crm-accordion-header">
+  <details class="crm-accordion-bold crm-search_criteria_basic-accordion" open>
+    <summary>
       {ts}Search Settings{/ts}
     </summary>
     <div class="crm-accordion-body">
       {include file="CRM/Contact/Form/Search/Criteria/SearchSettings.tpl"}
     </div>
   </details>
-  <details class="crm-accordion-wrapper crm-search_criteria_basic-accordion" open>
-    <summary class="crm-accordion-header">
+  <details class="crm-accordion-bold crm-search_criteria_basic-accordion" open>
+    <summary>
       {ts}Basic Criteria{/ts}
     </summary>
     <div class="crm-accordion-body">
@@ -112,8 +112,8 @@ CRM.$(function($) {
     </div>
   </details>
   {foreach from=$allPanes key=paneName item=paneValue}
-    <details class="crm-accordion-wrapper crm-ajax-accordion crm-{$paneValue.id}-accordion {if $paneValue.open eq 'true' || array_key_exists($paneName, $openedPanes)} {else}collapsed{/if}">
-      <summary class="crm-accordion-header" id="{$paneValue.id}">
+    <details class="crm-accordion-bold crm-ajax-accordion crm-{$paneValue.id}-accordion {if $paneValue.open eq 'true' || array_key_exists($paneName, $openedPanes)} {else}collapsed{/if}">
+      <summary id="{$paneValue.id}">
         {$paneName}
       </summary>
     <div class="crm-accordion-body {$paneValue.id}"></div>
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Search/BasicCriteria.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Search/BasicCriteria.tpl
index 2557db371..4a67d5559 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Search/BasicCriteria.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Search/BasicCriteria.tpl
@@ -20,10 +20,10 @@
 
 {strip}
 <div class="crm-block crm-form-block crm-basic-criteria-form-block">
-    <div class="crm-accordion-wrapper crm-case_search-accordion {if $rows}collapsed{/if}">
-     <div class="crm-accordion-header crm-master-accordion-header">
+    <details class="crm-accordion-light crm-case_search-accordion" {if $rows}{else}open{/if}>
+     <summary>
         {$editTitle}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
     <div class="crm-accordion-body">
         <div class="crm-section sort_name-section">
           <div class="label">
@@ -79,7 +79,7 @@
             </div>
         {/if}
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-    </div><!-- /.crm-accordion-body -->
-    </div><!-- /.crm-accordion-wrapper -->
+    </div>
+    </details>
 </div><!-- /.crm-form-block -->
 {/strip}
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Search/Builder.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Search/Builder.tpl
index 2739f00ee..630547ae3 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Search/Builder.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Search/Builder.tpl
@@ -14,10 +14,10 @@
   {ts 1="href='$skUrl'"}Search Builder is a legacy part of CiviCRM. It is recommended to <a %1>use SearchKit instead</a>.{/ts}
 </div>
 <div class="crm-form-block crm-search-form-block">
-  <div class="crm-accordion-wrapper crm-search_builder-accordion {if $rows and !$showSearchForm}collapsed{/if}">
-    <div class="crm-accordion-header crm-master-accordion-header">
+  <details class="crm-accordion-light crm-search_builder-accordion" {if $rows and !$showSearchForm}{else}open{/if}>
+    <summary>
       {ts}Search Criteria{/ts} {help id='builder-intro'}
-    </div>
+    </summary>
     <div class="crm-accordion-body">
       <div id="searchForm">
         {* Table for adding search criteria. *}
@@ -27,8 +27,8 @@
           {$form.buttons.html}
         </div>
       </div>
-    </div><!-- /.crm-accordion-body -->
-  </div><!-- /.crm-accordion-wrapper -->
+    </div>
+  </details>
 </div><!-- /.crm-form-block -->
 {if $rowsEmpty || $rows}
 <div class="crm-content-block">
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Task/AddToGroup.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Task/AddToGroup.tpl
index 31795d9a3..e316e89e4 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Task/AddToGroup.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Task/AddToGroup.tpl
@@ -40,7 +40,7 @@
                 </tr>
                 {/if}
                 <tr>
-                  <td colspan=2>{include file="CRM/Custom/Form/CustomData.tpl"}</td>
+                  <td colspan=2>{include file="CRM/common/customDataBlock.tpl" groupID='' customDataType='Group' customDataSubType=false cid=false}</td>
                 </tr>
                 </table>
             </td>
@@ -52,7 +52,6 @@
 </table>
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
-{include file="CRM/common/showHide.tpl"}
 
 {if !$form.group_id.value}
 {literal}
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Task/Email.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Task/Email.tpl
index a66cf3843..ad73eef2f 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Task/Email.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Task/Email.tpl
@@ -17,7 +17,7 @@
 <table class="form-layout-compressed">
   <tr id="selectEmailFrom" class="crm-contactEmail-form-block-fromEmailAddress crm-email-element">
     <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/Help/Email/id-from_email.hlp"}</td>
+    <td>{$form.from_email_address.html} {help id="id-from_email" file="CRM/Contact/Form/Task/Help/Email/id-from_email.hlp" title=$form.from_email_address.label}</td>
   </tr>
     <tr class="crm-contactEmail-form-block-recipient">
        <td class="label">{if $single eq false}{ts}Recipient(s){/ts}{else}{$form.to.label}{/if}</td>
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Task/EmailCommon.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Task/EmailCommon.tpl
index 3d647d57a..ce0258ac8 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Task/EmailCommon.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Task/EmailCommon.tpl
@@ -9,11 +9,11 @@
 *}
 {*common template for compose mail*}
 
-<div class="crm-accordion-wrapper crm-html_email-accordion ">
-<div class="crm-accordion-header">
+<details class="crm-accordion-bold crm-html_email-accordion " open>
+<summary>
     {ts}HTML Format{/ts}
     {help id="id-message-text" file="CRM/Contact/Form/Task/Email.hlp"}
-</div><!-- /.crm-accordion-header -->
+</summary>
  <div class="crm-accordion-body">
   <div class="helpIcon" id="helphtml">
     <input class="crm-token-selector big" data-field="html_message" />
@@ -23,13 +23,13 @@
     <div class='html'>
       {$form.html_message.html}<br />
     </div>
-  </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+  </div>
+</details>
 
-<div class="crm-accordion-wrapper crm-plaint_text_email-accordion collapsed">
-<div class="crm-accordion-header">
+<details class="crm-accordion-bold crm-plaint_text_email-accordion">
+<summary>
   {ts}Plain-Text Format{/ts}
-  </div><!-- /.crm-accordion-header -->
+  </summary>
  <div class="crm-accordion-body">
    <div class="helpIcon" id="helptext">
      <input class="crm-token-selector big" data-field="text_message" />
@@ -38,22 +38,23 @@
     <div class='text'>
       {$form.text_message.html}<br />
     </div>
-  </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
-<div id="editMessageDetails" class="section">
-  {if call_user_func(array('CRM_Core_Permission','check'), 'edit message templates')}
-      <div id="updateDetails" class="section" >
-    {$form.updateTemplate.html}&nbsp;{$form.updateTemplate.label}
-      </div>
-      <div class="section">
-    {$form.saveTemplate.html}&nbsp;{$form.saveTemplate.label}
-      </div>
-  {/if}
+  </div>
+</details>
+
+<div id="editMessageDetails">
+  <div id="updateDetails" >
+    {if array_key_exists('updateTemplate', $form)}{$form.updateTemplate.html}&nbsp;{$form.updateTemplate.label}{/if}
+  </div>
+  <div>
+    {if array_key_exists('saveTemplate', $form)}{$form.saveTemplate.html}&nbsp;{$form.saveTemplate.label}{/if}
+  </div>
 </div>
 
 <div id="saveDetails" class="section">
-   <div class="label">{$form.saveTemplateName.label}</div>
-   <div class="content">{$form.saveTemplateName.html|crmAddClass:huge}</div>
+  {if array_key_exists('saveTemplateName', $form)}
+    <div class="label">{$form.saveTemplateName.label}</div>
+    <div class="content">{$form.saveTemplateName.html|crmAddClass:huge}</div>
+  {/if}
 </div>
 
 {if !$noAttach}
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
index 743caf01b..868a3671d 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
@@ -32,10 +32,10 @@
 </table>
 {/if}
 
-<div class="crm-accordion-wrapper collapsed crm-pdf-format-accordion">
-    <div class="crm-accordion-header">
+<details class="crm-accordion-bold crm-pdf-format-accordion">
+    <summary>
       {ts}Page Format:{/ts} <span class="pdf-format-header-label"></span>
-    </div>
+    </summary>
     <div class="crm-accordion-body">
       <div class="crm-block crm-form-block">
     <table class="form-layout-compressed">
@@ -74,21 +74,21 @@
         <div id="updateFormat" style="display: none">{$form.update_format.html}&nbsp;{$form.update_format.label}</div>
       </div>
   </div>
-</div>
+</details>
 
-<div class="crm-accordion-wrapper crm-document-accordion ">
-  <div class="crm-accordion-header">
+<details class="crm-accordion-bold crm-document-accordion " open>
+  <summary>
     {ts}Preview Document{/ts}
-  </div><!-- /.crm-accordion-header -->
+  </summary>
   <div class="crm-accordion-body">
     <div id='document-preview'></div>
-  </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+  </div>
+</details>
 
-<div class="crm-accordion-wrapper crm-html_email-accordion ">
-<div class="crm-accordion-header">
+<details class="crm-accordion-bold crm-html_email-accordion " open>
+<summary>
     {$form.html_message.label}
-</div><!-- /.crm-accordion-header -->
+</summary>
  <div class="crm-accordion-body">
    <div class="helpIcon" id="helphtml">
      <input class="crm-token-selector big" data-field="html_message" />
@@ -101,20 +101,22 @@
 
 <div id="editMessageDetails">
     <div id="updateDetails" >
-        {$form.updateTemplate.html}&nbsp;{$form.updateTemplate.label}
+      {if array_key_exists('updateTemplate', $form)}{$form.updateTemplate.html}&nbsp;{$form.updateTemplate.label}{/if}
     </div>
     <div>
-        {$form.saveTemplate.html}&nbsp;{$form.saveTemplate.label}
+      {if array_key_exists('saveTemplate', $form)}{$form.saveTemplate.html}&nbsp;{$form.saveTemplate.label}{/if}
     </div>
 </div>
 
 <div id="saveDetails" class="section">
+  {if array_key_exists('saveTemplateName', $form)}
     <div class="label">{$form.saveTemplateName.label}</div>
     <div class="content">{$form.saveTemplateName.html|crmAddClass:huge}</div>
+  {/if}
 </div>
 
-  </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+  </div>
+</details>
 
 <table class="form-layout-compressed">
   <tr>
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Task/SMS.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Task/SMS.tpl
index 0cf9b5c79..58e3a2005 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Task/SMS.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Task/SMS.tpl
@@ -30,7 +30,7 @@
        <td>{$form.sms_provider_id.html} {help id ="id-provider" file="CRM/Contact/Form/Task/SMS.hlp"}</td>
     </tr>
     <tr class="crm-contactsms-form-block-recipient">
-       <td class="label">{if $single eq false}{ts}Recipient(s){/ts}{else}{$form.to.label}{/if}</td>
+       <td class="label">{$form.to.label}</td>
        <td>{$form.to.html}
     <div class="spacer"></div>
       </td>
@@ -40,7 +40,7 @@
    </tr>
 
 
-{if $SMSTask}
+{if array_key_exists('SMStemplate', $form)}
     <tr class="crm-contactPhone-form-block-template">
         <td class="label">{$form.SMStemplate.label}</td>
         <td>{$form.SMStemplate.html}</td>
@@ -69,31 +69,3 @@
 {/if}
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
-<script type="text/javascript">
-
-{if $toContact}
-    toContact  = {$toContact};
-{/if}
-
-{literal}
-CRM.$(function($){
-  var sourceDataUrl = "{/literal}{crmURL p='civicrm/ajax/checkphone' h=0}{literal}";
-  function phoneSelect(el){
-    $(el).data('api-entity', 'contact').crmSelect2({
-      minimumInputLength: 1,
-      multiple: true,
-      ajax: {
-        url: sourceDataUrl,
-        data: function(term) {
-          return { name: term, id: 1};
-        },
-        results: function(response) {
-          return { results: response };
-        }
-      }
-    }).select2('data', toContact);
-  }
-  phoneSelect('#to');
-});
-</script>
-{/literal}
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Task/SMSCommon.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Task/SMSCommon.tpl
index b84c69f52..d11904abc 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Task/SMSCommon.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Task/SMSCommon.tpl
@@ -9,10 +9,10 @@
 *}
 {*common template for compose sms*}
 
-<div class="crm-accordion-wrapper crm-plaint_text_sms-accordion ">
-<div class="crm-accordion-header">
+<details class="crm-accordion-bold crm-plaint_text_sms-accordion " open>
+<summary>
   {$form.sms_text_message.label}
-  </div><!-- /.crm-accordion-header -->
+  </summary>
  <div class="crm-accordion-body">
  <div><span id="char-count-message"></span> <span id="char-count-help">{help id="id-count-text" tplFile=$tplFile file="CRM/Contact/Form/Task/SMS.hlp"}</span></div>
    <div class="helpIcon" id="helptext">
@@ -22,20 +22,22 @@
     <div class='text'>
   {$form.sms_text_message.html}<br />
     </div>
-  </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+  </div>
+</details>
 <div id="SMSeditMessageDetails" class="section">
-    <div id="SMSupdateDetails" class="section" >
-  {$form.SMSupdateTemplate.html}&nbsp;{$form.SMSupdateTemplate.label}
-    </div>
-    <div class="section">
-  {$form.SMSsaveTemplate.html}&nbsp;{$form.SMSsaveTemplate.label}
-    </div>
+  <div id="SMSupdateDetails" class="section" >
+    {if array_key_exists('SMSupdateTemplate', $form)}{$form.SMSupdateTemplate.html}&nbsp;{$form.SMSupdateTemplate.label}{/if}
+  </div>
+  <div class="section">
+    {if array_key_exists('SMSsaveTemplate', $form)}{$form.SMSsaveTemplate.html}&nbsp;{$form.SMSsaveTemplate.label}{/if}
+  </div>
 </div>
 
 <div id="SMSsaveDetails" class="section">
-   <div class="label">{$form.SMSsaveTemplateName.label}</div>
-   <div class="content">{$form.SMSsaveTemplateName.html|crmAddClass:huge}</div>
+  {if array_key_exists('SMSsaveTemplateName', $form)}
+    <div class="label">{$form.SMSsaveTemplateName.label}</div>
+    <div class="content">{$form.SMSsaveTemplateName.html|crmAddClass:huge}</div>
+  {/if}
 </div>
 
 {capture assign="char_count_message"}
diff --git a/www/modules/civicrm/templates/CRM/Contact/Form/Task/SaveSearch.tpl b/www/modules/civicrm/templates/CRM/Contact/Form/Task/SaveSearch.tpl
index 8f52167de..f8f027ca6 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Form/Task/SaveSearch.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Form/Task/SaveSearch.tpl
@@ -40,7 +40,7 @@
         <td>{$form.group_type.html}</td>
       </tr>
       <tr>
-        <td colspan=2>{include file="CRM/Custom/Form/CustomData.tpl"}</td>
+        <td colspan=2>{include file="CRM/common/customDataBlock.tpl" groupID='' customDataType='Group' customDataSubType=false cid=false}</td>
       </tr>
     {/if}
   </table>
diff --git a/www/modules/civicrm/templates/CRM/Contact/Import/Form/Preview.tpl b/www/modules/civicrm/templates/CRM/Contact/Import/Form/Preview.tpl
index c003443b8..cf7d0efba 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Import/Form/Preview.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Import/Form/Preview.tpl
@@ -56,10 +56,10 @@
 
  {* Group options *}
  {* New Group *}
-<div id="new-group" class="crm-accordion-wrapper collapsed">
- <div class="crm-accordion-header">
+<details id="new-group" class="crm-accordion-bold">
+ <summary>
     {ts}Add imported records to a new group{/ts}
- </div><!-- /.crm-accordion-header -->
+ </summary>
  <div class="crm-accordion-body">
             <table class="form-layout-compressed">
              <tr>
@@ -75,30 +75,30 @@
                <td>{$form.newGroupType.html}</td>
              </tr>
             </table>
- </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+ </div>
+</details>
 
 
       {* Existing Group *}
 
-<div id="existing-groups" class="crm-accordion-wrapper crm-existing_group-accordion {if !empty($form.groups)} {else}collapsed{/if}">
- <div class="crm-accordion-header">
+<details id="existing-groups" class="crm-accordion-bold crm-existing_group-accordion" {if !empty($form.groups)}open{/if}>
+ <summary>
   {$form.groups.label}
- </div><!-- /.crm-accordion-header -->
+ </summary>
  <div class="crm-accordion-body">
 
         <div class="form-item">
         <table><tr><td style="width: 14em;"></td><td>{$form.groups.html}</td></tr></table>
         </div>
- </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+ </div>
+</details>
 
     {* Tag options *}
     {* New Tag *}
-<div id="new-tag" class="crm-accordion-wrapper collapsed">
- <div class="crm-accordion-header">
+<details id="new-tag" class="crm-accordion-bold">
+ <summary>
   {ts}Create a new tag and assign it to imported records{/ts}
- </div><!-- /.crm-accordion-header -->
+ </summary>
  <div class="crm-accordion-body">
 
   <div class="form-item">
@@ -113,14 +113,14 @@
            </tr>
         </table>
     </div>
- </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+ </div>
+</details>
     {* Existing Tag Imported Contact *}
 
-<div id="existing-tags" class="crm-accordion-wrapper collapsed">
- <div class="crm-accordion-header">
+<details id="existing-tags" class="crm-accordion-bold">
+ <summary>
   {ts}Tag imported records{/ts}
-</div><!-- /.crm-accordion-header -->
+</summary>
  <div class="crm-accordion-body">
 
         <table class="form-layout-compressed">
@@ -130,25 +130,11 @@
             </td>
           </tr>
         </table>
- </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+ </div>
+</details>
 </div> {* End of preview-info div. We hide this on form submit. *}
 
 <div class="crm-submit-buttons">
    {include file="CRM/common/formButtons.tpl" location="bottom"}
 </div>
 </div>
-
-{literal}
-<script type="text/javascript">
-
-if (cj("#newGroupName").val()) {
-  cj("#new-group.collapsed").crmAccordionToggle();
-}
-
-if (cj("#newTagName").val()) {
-  cj("#new-tag.collapsed").crmAccordionToggle();
-}
-
-</script>
-{/literal}
diff --git a/www/modules/civicrm/templates/CRM/Contact/Page/DedupeException.tpl b/www/modules/civicrm/templates/CRM/Contact/Page/DedupeException.tpl
index af8f9f71c..3735ca7c7 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Page/DedupeException.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Page/DedupeException.tpl
@@ -8,26 +8,27 @@
  +--------------------------------------------------------------------+
 *}
 {include file="CRM/common/dedupe.tpl"}
-<div class="crm-accordion-header">
-  {ts}Filter Contacts{/ts}
-</div>
-<div class="crm-accordion-body">
-  <form method="get">
-    <table class="no-border form-layout-compressed" id="searchOptions" style="width:100%;">
-      <tr>
-        <td class="crm-contact-form-block-contact1">
-          <label for="search-contact1">{ts}Contact Name{/ts}</label><br />
-          <input class="crm-form-text" type="text" size="50" placeholder="{ts}Search Contacts{/ts}" value="{$searchcontact1}" id="search-contact1" search-column="0" />
-        </td>
-        <td class="crm-contact-form-block-search">
-          <label>&nbsp;</label><br />
-          <button type="submit" class="button crm-button filtercontacts"><span><i class="crm-i fa-search" aria-hidden="true"></i> {ts}Find Contacts{/ts}</span></button>
-        </td>
-      </tr>
-    </table>
-  </form>
-</div>
-
+<details class="crm-accordion-bold" open>
+  <summary>
+    {ts}Filter Contacts{/ts}
+  </summary>
+  <div class="crm-accordion-body">
+    <form method="get">
+      <table class="no-border form-layout-compressed" id="searchOptions" style="width:100%;">
+        <tr>
+          <td class="crm-contact-form-block-contact1">
+            <label for="search-contact1">{ts}Contact Name{/ts}</label><br />
+            <input class="crm-form-text" type="text" size="50" placeholder="{ts}Search Contacts{/ts}" value="{$searchcontact1}" id="search-contact1" search-column="0" />
+          </td>
+          <td class="crm-contact-form-block-search">
+            <label>&nbsp;</label><br />
+            <button type="submit" class="button crm-button filtercontacts"><span><i class="crm-i fa-search" aria-hidden="true"></i> {ts}Find Contacts{/ts}</span></button>
+          </td>
+        </tr>
+      </table>
+    </form>
+  </div>
+</details>
 
 <div class="crm-content-block crm-block">
   {include file="CRM/common/pager.tpl" location="top"}
diff --git a/www/modules/civicrm/templates/CRM/Contact/Page/DedupeFind.tpl b/www/modules/civicrm/templates/CRM/Contact/Page/DedupeFind.tpl
index 84e214c1c..5d241ff58 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Page/DedupeFind.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -9,10 +9,10 @@
 *}
 {if $action eq 2 || $action eq 16}
 <div class="form-item">
-  <div class="crm-accordion-wrapper crm-search_filters-accordion">
-    <div class="crm-accordion-header">
+  <details class="crm-accordion-bold crm-search_filters-accordion" open>
+    <summary>
     {ts}Filter Contacts{/ts}</a>
-    </div><!-- /.crm-accordion-header -->
+    </summary>
     <div class="crm-accordion-body">
       <table class="no-border form-layout-compressed" id="searchOptions" style="width:100%;">
         <tr>
@@ -52,8 +52,8 @@
           </td>
         </tr>
       </table>
-    </div><!-- /.crm-accordion-body -->
-  </div><!-- /.crm-accordion-wrapper -->
+    </div>
+  </details>
   <div>
     {ts}Show / Hide columns:{/ts}
     <input type='checkbox' id='steet-address' class='toggle-vis' data-column-main="7" data-column-dupe="8" >
diff --git a/www/modules/civicrm/templates/CRM/Contact/Page/Inline/Address.tpl b/www/modules/civicrm/templates/CRM/Contact/Page/Inline/Address.tpl
index 7c18e0201..cacfffcd7 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Page/Inline/Address.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Page/Inline/Address.tpl
@@ -47,25 +47,23 @@
     {foreach from=$add.custom item=customGroup key=cgId} {* start of outer foreach *}
       {assign var="isAddressCustomPresent" value=1}
       {foreach from=$customGroup item=customValue key=cvId}
-        <div id="address_custom_{$cgId}_{$locationIndex}"
-        class="crm-collapsible crm-address-custom-{$cgId}-{$locationIndex}-accordion
-        {if $customValue.collapse_display}collapsed{/if}">
-        <div class="collapsible-title">
-          {$customValue.title}
-        </div>
-        <div class="crm-summary-block">
-          {foreach from=$customValue.fields item=customField key=cfId}
-          <div class="crm-summary-row">
-            <div class="crm-label">
-              {$customField.field_title}
-            </div>
-            <div class="crm-content">
-              {$customField.field_value}
+        <details id="address_custom_{$cgId}_{$locationIndex}" class="crm-address-custom-{$cgId}-{$locationIndex}-accordion crm-accordion-light" {if $customValue.collapse_display}{else}open{/if}>
+          <summary class="collapsible-title">
+            {$customValue.title}
+          </summary>
+          <div class="crm-summary-block">
+            {foreach from=$customValue.fields item=customField key=cfId}
+            <div class="crm-summary-row">
+              <div class="crm-label">
+                {$customField.field_title}
+              </div>
+              <div class="crm-content">
+                {$customField.field_value}
+              </div>
             </div>
+            {/foreach}
           </div>
-          {/foreach}
-          </div>
-        </div>
+        </details>
       {/foreach}
     {/foreach} {* end of outer custom group foreach *}
     <!-- end custom data -->
diff --git a/www/modules/civicrm/templates/CRM/Contact/Page/Inline/Email.tpl b/www/modules/civicrm/templates/CRM/Contact/Page/Inline/Email.tpl
index bdd8503bd..f7df7a8d3 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Page/Inline/Email.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Page/Inline/Email.tpl
@@ -46,7 +46,7 @@
           {$item.email}
         {/if}
         {crmAPI var='civi_mail' entity='Extension' action='get' full_name="civi_mail" is_active=1}
-        {if $item.on_hold == 2}&nbsp;({ts}On Hold - Opt Out{/ts})&nbsp;{ts}{$item.hold_date|truncate:10:''|crmDate}{/ts}{elseif $item.on_hold}&nbsp;{if $civi_mail.count}<a href="{crmURL p="civicrm/contact/view/bounces" q="email_id=`$item.id`"}" class="crm-popup" title="{ts 1=$item.email}Email Bounce History{/ts}">{/if}({ts}On Hold{/ts})&nbsp;{ts}{$item.hold_date|truncate:10:''|crmDate}{/ts}{if $civi_mail.count}&nbsp;<i class="crm-i fa-list-alt" aria-hidden="true"></i></a>{/if}{/if}{if $item.is_bulkmail}&nbsp;({ts}Bulk{/ts}){/if}
+        {if $item.on_hold == 2}&nbsp;({ts}On Hold - Opt Out{/ts})&nbsp;{ts}{$item.hold_date|truncate:10:''|crmDate}{/ts}{elseif $item.on_hold}&nbsp;{if $civi_mail.count}<a href="{crmURL p="civicrm/contact/view/bounces" f="?email_id=`$item.id`"}" class="crm-popup" title="{ts 1=$item.email}Email Bounce History{/ts}">{/if}({ts}On Hold{/ts})&nbsp;{ts}{$item.hold_date|truncate:10:''|crmDate}{/ts}{if $civi_mail.count}&nbsp;<i class="crm-i fa-list-alt" aria-hidden="true"></i></a>{/if}{/if}{if $item.is_bulkmail}&nbsp;({ts}Bulk{/ts}){/if}
         {if !empty($item.signature_text) OR !empty($item.signature_html)}
         <span class="signature-link description">
           <a href="#" title="{ts}Signature{/ts}" onClick="showHideSignature( '{$blockId}' ); return false;">{ts}(signature){/ts}</a>
diff --git a/www/modules/civicrm/templates/CRM/Contact/Page/View/CustomDataView.tpl b/www/modules/civicrm/templates/CRM/Contact/Page/View/CustomDataView.tpl
index 48608878c..563c8d5c7 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Page/View/CustomDataView.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Page/View/CustomDataView.tpl
@@ -14,8 +14,8 @@
   {assign var="count" value=$customGroupCount%2}
   {if ($count eq $side) or $skipTitle}
     {foreach from=$customValues item=cd_edit key=cvID}
-      <details class="customFieldGroup crm-accordion-wrapper ui-corner-all {$cd_edit.name} crm-custom-set-block-{$customGroupId}" {if empty($cd_edit.collapse_display)} open{/if}>
-        <summary class="crm-accordion-header crm-master-accordion-header">
+      <details class="customFieldGroup crm-accordion-light ui-corner-all {$cd_edit.name} crm-custom-set-block-{$customGroupId}" {if empty($cd_edit.collapse_display)} open{/if}>
+        <summary>
           {$cd_edit.title}
         </summary>
         {if $cvID eq 0}
diff --git a/www/modules/civicrm/templates/CRM/Contact/Page/View/GroupContact.tpl b/www/modules/civicrm/templates/CRM/Contact/Page/View/GroupContact.tpl
index 96c419669..b2dea6274 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Page/View/GroupContact.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Page/View/GroupContact.tpl
@@ -62,17 +62,14 @@
   {if $contactSmartGroupSettings neq 3}
     <div class="spacer" style="height: 1.5em;"></div>
     <div class="accordion ui-accordion ui-widget ui-helper-reset">
-      <div class="crm-accordion-wrapper crm-ajax-accordion crm-smartgroup-accordion {if $contactSmartGroupSettings eq 1}collapsed{/if}">
-        <div class="crm-accordion-header" id="crm-contact_smartgroup" contact_id="{$contactId}">
+      <details class="crm-accordion-bold crm-ajax-accordion crm-smartgroup-accordion" {if $contactSmartGroupSettings eq 1}{else}open{/if}>
+        <summary  id="crm-contact_smartgroup" contact_id="{$contactId}">
           {ts}Smart Groups{/ts}
-        </div>
-        <!-- /.crm-accordion-header -->
+        </summary>
         <div class="crm-accordion-body">
           <div class="crm-contact_smartgroup" style="min-height: 3em;"></div>
         </div>
-        <!-- /.crm-accordion-body -->
-      </div>
-      <!-- /.crm-accordion-wrapper -->
+      </details>
     </div>
   {/if}
 
@@ -185,8 +182,8 @@
       }
     }
     // bind first click of accordion header to load crm-accordion-body with snippet
-    $('.view-contact-groups .crm-ajax-accordion.collapsed .crm-accordion-header').one('click', loadPanes);
-    $('.view-contact-groups .crm-ajax-accordion:not(.collapsed) .crm-accordion-header').each(loadPanes);
+    $('.view-contact-groups .crm-ajax-accordion:not([open]) summary').one('click', loadPanes);
+    $('.view-contact-groups .crm-ajax-accordion[open] summary').each(loadPanes);
     // Handle enable/delete links
     var that;
     function refresh() {
diff --git a/www/modules/civicrm/templates/CRM/Contact/Page/View/Log.tpl b/www/modules/civicrm/templates/CRM/Contact/Page/View/Log.tpl
index 9796b68cd..ca63bea32 100644
--- a/www/modules/civicrm/templates/CRM/Contact/Page/View/Log.tpl
+++ b/www/modules/civicrm/templates/CRM/Contact/Page/View/Log.tpl
@@ -8,10 +8,8 @@
  +--------------------------------------------------------------------+
 *}
 <div id="changeLog" class="view-content">
-   <p></p>
-   <div class="bold">{ts}Change Log:{/ts} {$displayName}</div>
+   <h3>{ts}Change Log:{/ts} {$displayName}</h3>
    {if $useLogging}
-     <br />
      <div class='instance_data'><div class="crm-loading-element"></div></div>
    {else}
     <div class="form-item">
diff --git a/www/modules/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.tpl b/www/modules/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.tpl
index 2e1ba2a37..dd9d1f0f8 100644
--- a/www/modules/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.tpl
+++ b/www/modules/civicrm/templates/CRM/Contribute/Form/AdditionalPayment.tpl
@@ -66,7 +66,7 @@
         </tr>
         <tr id="fromEmail" class="crm-payment-form-block-from_email_address" style="display:none;">
           <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/Help/Email/id-from_email.hlp"}</td>
+          <td>{$form.from_email_address.html} {help id="id-from_email" file="CRM/Contact/Form/Task/Help/Email/id-from_email.hlp" title=$form.from_email_address.label}</td>
         </tr>
       {/if}
       {if $contributionMode}
@@ -75,11 +75,11 @@
     </tr>
    </table>
 
-    <div class="crm-accordion-wrapper crm-accordion_title-accordion crm-accordion-processed" id="paymentDetails_Information">
+    <details class="crm-accordion-bold crm-accordion_title-accordion crm-accordion-processed" id="paymentDetails_Information" open>
       {if !$contributionMode}
-      <div class="crm-accordion-header">
+      <summary>
         {if $paymentType EQ 'refund'}{ts}Refund Details{/ts}{else}{ts}Payment Details{/ts}{/if}
-      </div>
+      </summary>
       <div class="crm-accordion-body">
         <table class="form-layout-compressed" >
           <tr class="crm-payment-form-block-trxn_date">
@@ -97,13 +97,13 @@
           </tr>
           <tr class="crm-payment-form-block-fee_amount">
             <td class="label">{$form.fee_amount.label}</td>
-            <td{$valueStyle}>{$form.fee_amount.html}</td>
+            <td>{$form.fee_amount.html}</td>
           </tr>
         </table>
       </div>
       {/if}
-      {include file='CRM/Core/BillingBlockWrapper.tpl'}
-    </div>
+      {include file='CRM/Core/BillingBlockWrapper.tpl' currency=false}
+    </details>
 
     {literal}
     <script type="text/javascript">
diff --git a/www/modules/civicrm/templates/CRM/Contribute/Form/Contribution.tpl b/www/modules/civicrm/templates/CRM/Contribute/Form/Contribution.tpl
index 88c66e192..abe9e0c7f 100644
--- a/www/modules/civicrm/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/www/modules/civicrm/templates/CRM/Contribute/Form/Contribution.tpl
@@ -216,7 +216,7 @@
         {if empty($is_template)}
         <tr id="fromEmail" class="crm-contribution-form-block-receipt_date" style="display:none;">
           <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/Help/Email/id-from_email.hlp"}</td>
+          <td>{$form.from_email_address.html} {help id="id-from_email" file="CRM/Contact/Form/Task/Help/Email/id-from_email.hlp" title=$form.from_email_address.label}</td>
         </tr>
         {/if}
         {if empty($is_template)}
@@ -258,10 +258,10 @@
 
     <!-- start of soft credit -->
     {if !$payNow}
-      <div class="crm-accordion-wrapper crm-accordion_title-accordion crm-accordion-processed {if $noSoftCredit}collapsed{/if}" id="softCredit">
-        <div class="crm-accordion-header">
+      <details class="crm-accordion-bold crm-accordion_title-accordion crm-accordion-processed" id="softCredit" {if $noSoftCredit}{else}open{/if}>
+        <summary>
           {ts}Soft Credit{/ts}&nbsp;{help id="id-soft_credit"}
-        </div>
+        </summary>
         <div class="crm-accordion-body">
           <table class="form-layout-compressed">
             <tr class="crm-contribution-form-block-soft_credit_to">
@@ -271,16 +271,16 @@
             </tr>
           </table>
         </div>
-      </div>
+      </details>
     {/if}
     <!-- end of soft credit -->
 
     <!-- start of PCP -->
     {if array_key_exists('pcp_made_through_id', $form) && !$payNow}
-      <div class="crm-accordion-wrapper crm-accordion_title-accordion crm-accordion-processed {if $noPCP}collapsed{/if}" id="pcp">
-        <div class="crm-accordion-header">
+      <details class="crm-accordion-bold crm-accordion_title-accordion crm-accordion-processed" id="pcp" {if $noPCP}{else}open{/if}>
+        <summary>
           {ts}Personal Campaign Page{/ts}&nbsp;{help id="id-pcp"}
-        </div>
+        </summary>
         <div class="crm-accordion-body">
           <table class="form-layout-compressed">
             <tr class="crm-contribution-pcp-block crm-contribution-form-block-pcp_made_through_id">
@@ -310,15 +310,14 @@
             </tr>
           </table>
         </div>
-      </div>
+      </details>
       {include file="CRM/Contribute/Form/PCP.js.tpl"}
     {/if}
     <!-- end of PCP -->
 
     {if !$payNow}
-      {include file="CRM/common/customDataBlock.tpl" cid=$contactId}
+      {include file="CRM/common/customDataBlock.tpl" groupID='' customDataType='Contribution' cid=$contactId}
     {/if}
-
     {literal}
       <script type="text/javascript">
         CRM.$(function($) {
@@ -329,10 +328,10 @@
           // bind first click of accordion header to load crm-accordion-body with snippet
           // everything else taken care of by cj().crm-accordions()
           cj('#adjust-option-type').hide();
-          cj('.crm-ajax-accordion .crm-accordion-header').one('click', function() {
+          cj('.crm-ajax-accordion summary').one('click', function() {
             loadPanes(cj(this).attr('id'));
           });
-          cj('.crm-ajax-accordion:not(.collapsed) .crm-accordion-header').each(function(index) {
+          cj('.crm-ajax-accordion[open] summary').each(function(index) {
             loadPanes(cj(this).attr('id'));
           });
         });
@@ -402,17 +401,15 @@
         {/if}
       </script>
 
-      <div class="accordion ui-accordion ui-widget ui-helper-reset">
-        {* Additional Detail / Honoree Information / Premium Information *}
-        {foreach from=$allPanes key=paneName item=paneValue}
-          <div class="crm-accordion-wrapper crm-ajax-accordion crm-{$paneValue.id}-accordion {if $paneValue.open neq 'true'}collapsed{/if}">
-            <div class="crm-accordion-header" id="{$paneValue.id}">{$paneName}</div>
-            <div class="crm-accordion-body">
-              <div class="{$paneValue.id}"></div>
-            </div><!-- /.crm-accordion-body -->
-          </div><!-- /.crm-accordion-wrapper -->
-        {/foreach}
-      </div>
+      {* Additional Detail / Premium Information *}
+      {foreach from=$allPanes key=paneName item=paneValue}
+        <details class="crm-accordion-bold crm-ajax-accordion crm-{$paneValue.id}-accordion" {if $paneValue.open neq 'true'}{else}open{/if}>
+          <summary  id="{$paneValue.id}">{$paneName}</summary>
+          <div class="crm-accordion-body">
+            <div class="{$paneValue.id}"></div>
+          </div>
+        </details>
+      {/foreach}
     {/if}
     {if $billing_address}
       <fieldset>
diff --git a/www/modules/civicrm/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl b/www/modules/civicrm/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
index 566b0ed78..23a461dca 100644
--- a/www/modules/civicrm/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
+++ b/www/modules/civicrm/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
@@ -21,10 +21,10 @@
   </table>
 
   <div id="premiumSettings">
-    <div class="crm-accordion-wrapper crm-premium-settings-accordion collapsed">
-      <div class="crm-accordion-header">
+    <details class="crm-accordion-bold crm-premium-settings-accordion">
+      <summary>
         {ts}Premiums Settings{/ts}
-      </div>
+      </summary>
       <div class="crm-accordion-body">
         <table class="form-layout-compressed">
           <tr class="crm-contribution-contributionpage-premium-form-block-premiums_intro_title">
@@ -103,9 +103,7 @@
           </tr>
         </table>
       </div>
-      <!-- /.crm-accordion-body -->
-    </div>
-    <!-- /.crm-accordion-wrapper -->
+    </details>
 
     {* include premium product templates *}
     {include file="CRM/Contribute/Page/Premium.tpl"}
@@ -143,5 +141,5 @@
   {/literal}
 </script>
 {/crmRegion}
-{crmRegion name="contribute-form-contributionpage-premium-post}
+{crmRegion name="contribute-form-contributionpage-premium-post"}
 {/crmRegion}
diff --git a/www/modules/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl b/www/modules/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
index eb272f688..403586a1c 100644
--- a/www/modules/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
+++ b/www/modules/civicrm/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
@@ -79,18 +79,18 @@
         </div>
 
 
-        <div class="crm-accordion-wrapper collapsed crm-case-roles-block">
-         <div class="crm-accordion-header">
+        <details class="crm-accordion-bold crm-case-roles-block">
+         <summary>
           {ts}Edit Widget Colors{/ts}
-         </div><!-- /.crm-accordion-header -->
+         </summary>
          <div class="crm-accordion-body">
             <table class="form-layout-compressed">
             {foreach from=$colorFields item=field key=fieldName}
               <tr><td class="label">{$form.$fieldName.label}<span class="crm-marker"> *</span></td><td>{$form.$fieldName.html}</td></tr>
             {/foreach}
             </table>
-         </div><!-- /.crm-accordion-body -->
-        </div><!-- /.crm-accordion-wrapper -->
+         </div>
+        </details>
 
     </div>
 
diff --git a/www/modules/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl b/www/modules/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl
index 23838fd79..804656d8a 100644
--- a/www/modules/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl
+++ b/www/modules/civicrm/templates/CRM/Contribute/Form/ContributionView.tpl
@@ -194,10 +194,10 @@
 </table>
 
 {if $softContributions && count($softContributions)} {* We show soft credit name with PCP section if contribution is linked to a PCP. *}
-  <div class="crm-accordion-wrapper crm-soft-credit-pane">
-    <div class="crm-accordion-header">
+  <details class="crm-accordion-bold crm-soft-credit-pane" open>
+    <summary>
       {ts}Soft Credit{/ts}
-    </div>
+    </summary>
     <div class="crm-accordion-body">
       <table class="crm-info-panel crm-soft-credit-listing">
         {foreach from=$softContributions item="softCont"}
@@ -216,14 +216,14 @@
         {/foreach}
       </table>
     </div>
-  </div>
+  </details>
 {/if}
 
 {if $premium}
-  <div class="crm-accordion-wrapper ">
-    <div class="crm-accordion-header">
+  <details class="crm-accordion-bold " open>
+    <summary>
       {ts}Premium Information{/ts}
-    </div>
+    </summary>
     <div class="crm-accordion-body">
       <table class="crm-info-panel">
         <td class="label">{ts}Premium{/ts}</td>
@@ -231,17 +231,17 @@
         <td class="label">{ts}Option{/ts}</td>
         <td>{$option}</td>
         <td class="label">{ts}Fulfilled{/ts}</td>
-        <td>{$fulfilled|truncate:10:''|crmDate}</td>
+        <td>{if $fulfilled}{$fulfilled|truncate:10:''|crmDate}{else}{ts}No{/ts}{/if}</td>
       </table>
     </div>
-  </div>
+  </details>
 {/if}
 
 {if $pcp_id}
-  <div id='PCPView' class="crm-accordion-wrapper ">
-    <div class="crm-accordion-header">
+  <details id='PCPView' class="crm-accordion-bold " open>
+    <summary>
       {ts}Personal Campaign Page Contribution Information{/ts}
-    </div>
+    </summary>
     <div class="crm-accordion-body">
       <table class="crm-info-panel">
         <tr>
@@ -273,7 +273,7 @@
         {/if}
       </table>
     </div>
-  </div>
+  </details>
 {/if}
 
 {include file="CRM/Custom/Page/CustomDataView.tpl"}
diff --git a/www/modules/civicrm/templates/CRM/Contribute/Form/ManagePremiums.tpl b/www/modules/civicrm/templates/CRM/Contribute/Form/ManagePremiums.tpl
index 8d820b3ed..9bc8da609 100644
--- a/www/modules/civicrm/templates/CRM/Contribute/Form/ManagePremiums.tpl
+++ b/www/modules/civicrm/templates/CRM/Contribute/Form/ManagePremiums.tpl
@@ -94,7 +94,7 @@
     <tr class="crm-contribution-form-block-options">
        <td class="label">{$form.options.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_product' field='options' id=$productId}{/if}</td>
       <td class="html-adjust">{$form.options.html}<br />
-          <span class="description">{ts}Enter a comma-delimited list of color, size, etc. options for the product if applicable. Contributors will be presented a drop-down menu of these options when they select this product.{/ts}</span>
+          <span class="description">{ts}Enter a comma-delimited list of color, size, etc. options for the product if applicable. Contributors will be presented a drop-down menu of these options when they select this product.{/ts} {ts}You can also use the format key=label, where the key could be the SKU of the option, for example.{/ts}</span>
        </td>
     </tr>
     <tr class="crm-contribution-form-block-is_active">
@@ -104,9 +104,9 @@
   </table>
   {/crmRegion}
   {crmRegion name="contribute-form-managepremiums-other-fields"}
-  <fieldset id="time-delimited" class="crm-collapsible {if empty($showSubscriptions)}collapsed{/if}">
-    <legend class="collapsible-title">{ts}Subscription or Service Settings{/ts}</legend>
-    <div>
+  <details id="time-delimited" class="crm-accordion-light" {if !empty($showSubscriptions)}open{/if}>
+    <summary>{ts}Subscription or Service Settings{/ts}</summary>
+    <div class="crm-accordion-body">
       <table class="form-layout-compressed">
         <tr class="crm-contribution-form-block-period_type">
            <td class="label">{$form.period_type.label}</td>
@@ -134,7 +134,7 @@
         </tr>
       </table>
     </div>
-  </fieldset>
+  </details>
   {/crmRegion}
  {/if}
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
diff --git a/www/modules/civicrm/templates/CRM/Contribute/Form/Search.tpl b/www/modules/civicrm/templates/CRM/Contribute/Form/Search.tpl
index 892f6ad2a..c98c7c06a 100644
--- a/www/modules/civicrm/templates/CRM/Contribute/Form/Search.tpl
+++ b/www/modules/civicrm/templates/CRM/Contribute/Form/Search.tpl
@@ -11,10 +11,10 @@
 {assign var="showBlock" value="'searchForm'"}
 {assign var="hideBlock" value="'searchForm_show'"}
 <div class="crm-block crm-form-block crm-contribution-search-form-block">
-  <div class="crm-accordion-wrapper crm-contribution_search_form-accordion {if $rows}collapsed{/if}">
-      <div class="crm-accordion-header crm-master-accordion-header">
+  <details class="crm-accordion-light crm-contribution_search_form-accordion" {if $rows}{else}open{/if}>
+      <summary>
           {ts}Edit Search Criteria{/ts}
-       </div><!-- /.crm-accordion-header -->
+       </summary>
       <div class="crm-accordion-body">
         {strip}
           <table class="form-layout">
@@ -25,8 +25,8 @@
             </tr>
             </table>
         {/strip}
-      </div><!-- /.crm-accordion-body -->
-    </div><!-- /.crm-accordion-wrapper -->
+      </div>
+    </details>
 </div><!-- /.crm-form-block -->
 {if $rowsEmpty || $rows}
 <div class="crm-content-block">
diff --git a/www/modules/civicrm/templates/CRM/Contribute/Form/Search/ContributionRecur.tpl b/www/modules/civicrm/templates/CRM/Contribute/Form/Search/ContributionRecur.tpl
index 1eb1679a8..cd973630e 100644
--- a/www/modules/civicrm/templates/CRM/Contribute/Form/Search/ContributionRecur.tpl
+++ b/www/modules/civicrm/templates/CRM/Contribute/Form/Search/ContributionRecur.tpl
@@ -8,11 +8,10 @@
  +--------------------------------------------------------------------+
 *}
 
-<div class="crm-accordion-wrapper crm-contactDetails-accordion
-   {if empty($contribution_recur_pane_open)} collapsed{/if}" id="contribution_recur">
-  <div class="crm-accordion-header">
+<details class="crm-accordion-bold crm-contactDetails-accordion" id="contribution_recur" {if empty($contribution_recur_pane_open)}{else}open{/if}>
+  <summary>
     {ts}Recurring Contributions{/ts}
-  </div>
+  </summary>
   <div class="crm-accordion-body">
     <table class="form-layout-compressed">
       <tr>
@@ -79,7 +78,6 @@
       {/if}
     </table>
   </div>
-<!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+</details>
 
 
diff --git a/www/modules/civicrm/templates/CRM/Contribute/Form/Task/Invoice.tpl b/www/modules/civicrm/templates/CRM/Contribute/Form/Task/Invoice.tpl
index ad8a6d90e..f999a2fe9 100644
--- a/www/modules/civicrm/templates/CRM/Contribute/Form/Task/Invoice.tpl
+++ b/www/modules/civicrm/templates/CRM/Contribute/Form/Task/Invoice.tpl
@@ -26,7 +26,7 @@
   {/if}
   <tr id="selectEmailFrom" style="display: none" class="crm-contactEmail-form-block-fromEmailAddress crm-email-element">
     <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/Help/Email/id-from_email.hlp"}</td>
+    <td>{$form.from_email_address.html} {help id="id-from_email" file="CRM/Contact/Form/Task/Help/Email/id-from_email.hlp" title=$form.from_email_address.label}</td>
   </tr>
   <tr class="crm-email-element crm-contactEmail-form-block-cc_id">
     <td class="label">{$form.cc_id.label}</td>
diff --git a/www/modules/civicrm/templates/CRM/Contribute/Form/Task/PDF.tpl b/www/modules/civicrm/templates/CRM/Contribute/Form/Task/PDF.tpl
index b799bac83..d072fea76 100644
--- a/www/modules/civicrm/templates/CRM/Contribute/Form/Task/PDF.tpl
+++ b/www/modules/civicrm/templates/CRM/Contribute/Form/Task/PDF.tpl
@@ -21,7 +21,7 @@
   </tr>
   <tr id="selectEmailFrom" style="display: none" class="crm-contactEmail-form-block-fromEmailAddress crm-email-element">
     <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/Help/Email/id-from_email.hlp"}</td>
+    <td>{$form.from_email_address.html}  {help id="id-from_email" file="CRM/Contact/Form/Task/Help/Email/id-from_email.hlp" title=$form.from_email_address.label}</td>
   </tr>
   <tr>
     <td>{$form.output.pdf_receipt.html}</td>
diff --git a/www/modules/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.tpl b/www/modules/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.tpl
index 701a68f4d..802e38def 100644
--- a/www/modules/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.tpl
+++ b/www/modules/civicrm/templates/CRM/Contribute/Form/Task/PDFLetter.tpl
@@ -13,10 +13,10 @@
     <div class="messages status no-popup">{include file="CRM/Contribute/Form/Task.tpl"}</div>
 {/if}
 
-<div class="crm-accordion-wrapper crm-html_email-accordion ">
-  <div class="crm-accordion-header">
+<details class="crm-accordion-bold crm-html_email-accordion " open>
+  <summary>
     {$form.more_options_header.html}
-  </div><!-- /.crm-accordion-header -->
+  </summary>
   <div class="crm-accordion-body">
     <table class="form-layout-compressed">
       <tr><td class="label-left">{$form.thankyou_update.html} {$form.thankyou_update.label}</td><td></td></tr>
@@ -36,12 +36,12 @@
         <td>{$form.email_options.html}</td>
       </tr>
       <tr>
-        <td class="label-left">{$form.from_email_address.label}  {help id="id-from_email" file="CRM/Contact/Form/Task/Help/Email/id-from_email.hlp"}</td>
+        <td class="label-left">{$form.from_email_address.label}  {help id="id-from_email" file="CRM/Contact/Form/Task/Help/Email/id-from_email.hlp" title=$form.from_email_address.label}</td>
         <td>{$form.from_email_address.html}</td>
       </tr>
     </table>
-  </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+  </div>
+</details>
 
 {include file="CRM/Contact/Form/Task/PDFLetterCommon.tpl"}
 
diff --git a/www/modules/civicrm/templates/CRM/Contribute/Form/UpdateSubscription.tpl b/www/modules/civicrm/templates/CRM/Contribute/Form/UpdateSubscription.tpl
index a31e6b07a..541881a84 100644
--- a/www/modules/civicrm/templates/CRM/Contribute/Form/UpdateSubscription.tpl
+++ b/www/modules/civicrm/templates/CRM/Contribute/Form/UpdateSubscription.tpl
@@ -11,9 +11,9 @@
   {if $changeHelpText}
     <div class="help">
       {$changeHelpText}
-      {if $recurMembership}
+      {if $membershipID}
         <br/><strong> {ts}WARNING: This recurring contribution is linked to membership:{/ts}
-        <a class="crm-hover-button" href='{crmURL p="civicrm/contact/view/membership" q="action=view&reset=1&cid=`$contactId`&id=`$recurMembership.membership_id`&context=membership&selectedChild=member"}'>{$recurMembership.membership_name}</a>
+        <a class="crm-hover-button" href='{crmURL p="civicrm/contact/view/membership" q="action=view&reset=1&cid=`$contactId`&id=`$membershipID`&context=membership&selectedChild=member"}'>{$membershipName|escape}</a>
         </strong>
       {/if}
     </div>
@@ -27,10 +27,16 @@
   <table class="form-layout">
     <tr>
       <td class="label">{$form.amount.label}</td>
-      <td>{$form.currency.html|crmAddClass:eight}&nbsp;{$form.amount.html|crmAddClass:eight} ({ts}every{/ts} {$recur_frequency_interval} {$recur_frequency_unit})</td>
+      <td>{$form.currency.html|crmAddClass:eight}&nbsp;{$form.amount.html|crmAddClass:eight} ({ts}every{/ts} {$recur_frequency_interval|escape} {$recur_frequency_unit|escape})</td>
     </tr>
-    <tr><td class="label">{$form.installments.label}</td><td>{$form.installments.html}<br />
-          <span class="description">{ts}Total number of payments to be made. Set this to 0 if this is an open-ended commitment i.e. no set end date.{/ts}</span></td></tr>
+    {if array_key_exists('installments', $form)}
+      <tr>
+        <td class="label">{$form.installments.label}</td>
+        <td>{$form.installments.html}<br />
+          <span class="description">{ts}Total number of payments to be made. Set this to 0 if this is an open-ended commitment i.e. no set end date.{/ts}</span>
+        </td>
+      </tr>
+    {/if}
     {foreach from=$editableScheduleFields item='field'}
       <tr><td class="label">{$form.$field.label}</td><td>{$form.$field.html}</td></tr>
     {/foreach}
@@ -42,7 +48,7 @@
   </table>
 
   {if !$self_service}
-    {include file="CRM/common/customDataBlock.tpl"}
+    {include file="CRM/common/customDataBlock.tpl" groupID='' customDataType='ContributionRecur' customDataSubType=false entityID=$contributionRecurID cid=false}
   {/if}
 
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
diff --git a/www/modules/civicrm/templates/CRM/Contribute/Page/ContributionRecurPayments.tpl b/www/modules/civicrm/templates/CRM/Contribute/Page/ContributionRecurPayments.tpl
index 4934bd166..52274a043 100644
--- a/www/modules/civicrm/templates/CRM/Contribute/Page/ContributionRecurPayments.tpl
+++ b/www/modules/civicrm/templates/CRM/Contribute/Page/ContributionRecurPayments.tpl
@@ -1,6 +1,6 @@
 {if $contributionsCount > 0}
-  <div class="crm-accordion-wrapper">
-    <div class="crm-accordion-header">{ts}Related Contributions{/ts}</div>
+  <details class="crm-accordion-bold" open>
+    <summary>{ts}Related Contributions{/ts}</summary>
     <div class="crm-accordion-body">
       <table class="crm-contact-contributions">
         <thead>
@@ -33,7 +33,7 @@
         {/literal}
       </script>
     </div>
-  </div>
+  </details>
 {else}
   <div class="messages status no-popup">
     {icon icon="fa-info-circle"}{/icon}
diff --git a/www/modules/civicrm/templates/CRM/Core/Calendar/ICal.tpl b/www/modules/civicrm/templates/CRM/Core/Calendar/ICal.tpl
index ba35c212f..d320a2d6d 100644
--- a/www/modules/civicrm/templates/CRM/Core/Calendar/ICal.tpl
+++ b/www/modules/civicrm/templates/CRM/Core/Calendar/ICal.tpl
@@ -53,9 +53,6 @@ DTEND;TZID={$timezone}:{$event.start_date|crmICalDate}
 {if $event.is_show_location EQ 1 && $event.location}
 LOCATION:{$event.location|crmICalText}
 {/if}
-{if $event.contact_email}
-ORGANIZER:MAILTO:{$event.contact_email|crmICalText}
-{/if}
 {if $event.url}
 URL:{$event.url}
 {/if}
diff --git a/www/modules/civicrm/templates/CRM/Core/Form/RecurringEntity.hlp b/www/modules/civicrm/templates/CRM/Core/Form/RecurringEntity.hlp
deleted file mode 100644
index 435126843..000000000
--- a/www/modules/civicrm/templates/CRM/Core/Form/RecurringEntity.hlp
+++ /dev/null
@@ -1,63 +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       |
- +--------------------------------------------------------------------+
-*}
-{capture assign='entityType'}{if array_key_exists('entityType', $params)}{$params.entityType|lower}{/if}{/capture}
-
-{htxt id="id-repeats-title"}
-  {ts}Repeats{/ts}
-{/htxt}
-{htxt id="id-repeats"}
-  {ts 1=$entityType}Access the drop-down menus here to select how frequently your %1 occurs.{/ts}
-  {ts 1=$entityType}Example: You would select options "1 month", if your %1 occurs every month.{/ts}
-{/htxt}
-
-{htxt id="id-repeats-on-title"}
-  {ts}Repeats on{/ts}
-{/htxt}
-{htxt id="id-repeats-on"}
-  {ts 1=$entityType}You can choose to select your %1 to repeat on weekdays, weekends or any combination of day of the week.{/ts}<br/>
-  {ts 1=$entityType}Example: You can select Monday, Wednesday and Friday for your %1 to occur on alternate weekdays.{/ts}
-{/htxt}
-
-{htxt id="id-repeats-by-month-title"}
-  {ts}Repeats by day of the month{/ts}
-{/htxt}
-{htxt id="id-repeats-by-month"}
-  {ts}Options given here are days of a month from 1 - 31{/ts}<br/>
-  {ts 1=$entityType}Example: If your %1 repeats 8th of every month then you would select 8.{/ts}
-{/htxt}
-
-{htxt id="id-repeats-by-week-title"}
-  {ts}Repeats by day of the week{/ts}
-{/htxt}
-{htxt id="id-repeats-by-week"}
-  {ts 1=$entityType}You can choose to select %1 occurring every third Friday, last Monday, fourth Wednesday of the month and various other combinations given in the dropdown.{/ts}
-{/htxt}
-
-{htxt id="id-ends-after-title"}
-  {ts}Ends{/ts}
-{/htxt}
-{htxt id="id-ends-after"}
-  {ts 1=$entityType}Use this field to limit/end the repetition of the %1.{/ts}<br/>
-  {ts 1=$entityType}Example: If you want to repeat an %1 6 times, then set 6 as a value for this field.{/ts}
-{/htxt}
-
-{htxt id="id-ends-on-title"}
-  {ts}Ends{/ts}
-{/htxt}
-{htxt id="id-ends-on"}
-  {ts}Choose a specific date to limit/end the repetition.{/ts}
-{/htxt}
-
-{htxt id="id-exclude-date-title"}
-  {ts}Exclude Date(s){/ts}
-{/htxt}
-{htxt id="id-exclude-date"}
-  {ts}This field enables you to alter certain sessions, skip holidays, or create gaps in the sequence for other reasons.{/ts}
-{/htxt}
diff --git a/www/modules/civicrm/templates/CRM/Core/Form/RecurringEntity.tpl b/www/modules/civicrm/templates/CRM/Core/Form/RecurringEntity.tpl
index 1a2f3bd6f..e7fea455c 100644
--- a/www/modules/civicrm/templates/CRM/Core/Form/RecurringEntity.tpl
+++ b/www/modules/civicrm/templates/CRM/Core/Form/RecurringEntity.tpl
@@ -8,19 +8,19 @@
  +--------------------------------------------------------------------+
 *}
 
-<div class="crm-core-form-recurringentity-block crm-accordion-wrapper{if $recurringFormIsEmbedded && !$scheduleReminderId} collapsed{/if}" id="recurring-entity-block">
-  <div class="crm-accordion-header">
+<details class="crm-core-form-recurringentity-block crm-accordion-bold" id="recurring-entity-block" {if $recurringFormIsEmbedded && !$scheduleReminderId}{else}open{/if}>
+  <summary>
     {ts 1=$recurringEntityType}Repeat %1{/ts}
-  </div>
+  </summary>
   <div class="crm-accordion-body">
     <table class="form-layout-compressed">
       <tr class="crm-core-form-recurringentity-block-repetition_frequency">
-        <td class="label">{$form.repetition_frequency_unit.label}&nbsp;<span class="crm-marker">*</span>  {help id="id-repeats" entityType=$recurringEntityType file="CRM/Core/Form/RecurringEntity.hlp"}</td>
+        <td class="label">{$form.repetition_frequency_unit.label}&nbsp;<span class="crm-marker">*</span></td>
         <td>{$form.repetition_frequency_interval.html} {$form.repetition_frequency_unit.html}</td>
       </tr>
       <tr class="crm-core-form-recurringentity-block-start_action_condition">
         <td class="label">
-          <label for="repeats_on">{$form.start_action_condition.label} {help id="id-repeats-on" entityType=$recurringEntityType file="CRM/Core/Form/RecurringEntity.hlp"}</label>
+          <label for="repeats_on">{$form.start_action_condition.label}</label>
         </td>
         <td>
           {$form.start_action_condition.html}
@@ -28,12 +28,12 @@
       </tr>
       <tr class="crm-core-form-recurringentity-block-repeats_by">
         <td class="label">{$form.repeats_by.label}&nbsp;<span class="crm-marker">*</span></td>
-        <td>{help id="id-repeats-by-month" entityType=$recurringEntityType file="CRM/Core/Form/RecurringEntity.hlp"} {$form.repeats_by.1.html} {$form.limit_to.html}
+        <td>{$form.repeats_by.1.html} {$form.limit_to.html}
         </td>
       </tr>
       <tr class="crm-core-form-recurringentity-block-repeats_by">
         <td class="label"></td>
-        <td>{help id="id-repeats-by-week" entityType=$recurringEntityType file="CRM/Core/Form/RecurringEntity.hlp"} {$form.repeats_by.2.html} {$form.entity_status_1.html} {$form.entity_status_2.html}
+        <td>{$form.repeats_by.2.html} {$form.entity_status_1.html} {$form.entity_status_2.html}
         </td>
       </tr>
       <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
@@ -43,14 +43,14 @@
       </tr>
       <tr class="crm-core-form-recurringentity-block-ends">
         <td class="label">{$form.ends.label}&nbsp;<span class="crm-marker">*</span></td>
-        <td>{help id="id-ends-after" entityType=$recurringEntityType file="CRM/Core/Form/RecurringEntity.hlp"} {$form.ends.1.html} {$form.start_action_offset.html} {ts}occurrences{/ts}</td>
+        <td>{$form.ends.1.html} {$form.start_action_offset.html} {ts}occurrences{/ts}</td>
       </tr>
       <tr class="crm-core-form-recurringentity-block-absolute_date">
         <td class="label"> </td>
-        <td>{help id="id-ends-on" entityType=$recurringEntityType file="CRM/Core/Form/RecurringEntity.hlp"} {$form.ends.2.html} {$form.repeat_absolute_date.html}</td>
+        <td>{$form.ends.2.html} {$form.repeat_absolute_date.html}</td>
       </tr>
       <tr class="crm-core-form-recurringentity-block-exclude_date">
-        <td class="label">{$form.exclude_date_list.label} {help id="id-exclude-date" entityType=$recurringEntityType file="CRM/Core/Form/RecurringEntity.hlp"}</td>
+        <td class="label">{$form.exclude_date_list.label}</td>
         <td>{$form.exclude_date_list.html}</td>
       </tr>
     </table>
@@ -60,7 +60,7 @@
       </div>
     {/if}
   </div>
-</div>
+</details>
 {literal}
 <script type="text/javascript">
 (function (_) {
diff --git a/www/modules/civicrm/templates/CRM/Custom/Form/CustomData.tpl b/www/modules/civicrm/templates/CRM/Custom/Form/CustomData.tpl
index dc5f7dc04..6f18dfc5e 100644
--- a/www/modules/civicrm/templates/CRM/Custom/Form/CustomData.tpl
+++ b/www/modules/civicrm/templates/CRM/Custom/Form/CustomData.tpl
@@ -21,16 +21,16 @@
         {include file="CRM/Custom/Form/Edit/CustomData.tpl" customDataEntity=''}
       </div>
     {else}
-     <div class="custom-group custom-group-{$cd_edit.name} crm-accordion-wrapper crm-custom-accordion {if $cd_edit.collapse_display and empty($skipTitle)}collapsed{/if}">
+     <details class="custom-group custom-group-{$cd_edit.name} crm-accordion-bold crm-custom-accordion" {if $cd_edit.collapse_display and empty($skipTitle)}{else}open{/if}>
       {if empty($skipTitle)}
-      <div class="crm-accordion-header">
+      <summary>
         {$cd_edit.title}
-       </div><!-- /.crm-accordion-header -->
+       </summary>
       {/if}
       <div class="crm-accordion-body">
         {include file="CRM/Custom/Form/Edit/CustomData.tpl" customDataEntity=''}
       </div>
-     </div>
+     </details>
     {/if}
     {if $cgCount}
       <div id="custom_group_{$group_id}_{$cgCount}"></div>
diff --git a/www/modules/civicrm/templates/CRM/Custom/Form/Edit/CustomData.tpl b/www/modules/civicrm/templates/CRM/Custom/Form/Edit/CustomData.tpl
index 1ac06c2b3..b8dd7c67c 100644
--- a/www/modules/civicrm/templates/CRM/Custom/Form/Edit/CustomData.tpl
+++ b/www/modules/civicrm/templates/CRM/Custom/Form/Edit/CustomData.tpl
@@ -1,4 +1,4 @@
-{if !$isSingleRecordEdit && $cd_edit.is_multiple eq 1 and $cd_edit.table_id and $contactId and !$skipTitle and $cd_edit.style eq 'Inline'}
+{if !$isSingleRecordEdit && $cd_edit.is_multiple eq 1 and array_key_exists('table_id', $cd_edit) && $cd_edit.table_id and $contactId and !$skipTitle and $cd_edit.style eq 'Inline'}
   {assign var=tableID value=$cd_edit.table_id}
   <a href="#" class="crm-hover-button crm-custom-value-del" title="{ts 1=$cd_edit.title}Delete %1{/ts}"
      data-post='{ldelim}"valueID": "{$tableID}", "groupID": "{$group_id}", "contactId": "{$contactId}", "key": "{crmKey name='civicrm/ajax/customvalue'}"{rdelim}'>
diff --git a/www/modules/civicrm/templates/CRM/Custom/Form/Edit/CustomField.tpl b/www/modules/civicrm/templates/CRM/Custom/Form/Edit/CustomField.tpl
index 34dd65073..eb92de5f5 100644
--- a/www/modules/civicrm/templates/CRM/Custom/Form/Edit/CustomField.tpl
+++ b/www/modules/civicrm/templates/CRM/Custom/Form/Edit/CustomField.tpl
@@ -51,7 +51,7 @@
     <td class="html-adjust">
       {$formElement.html}&nbsp;
       {if $element.data_type eq 'File'}
-        {if $element.element_value.data}
+        {if array_key_exists('element_value', $element) && $element.element_value.data}
           <div class="crm-attachment-wrapper crm-entity" id="file_{$element.element_name}">
             <span class="html-adjust"><br/>&nbsp;{ts}Attached File{/ts}: &nbsp;
               {if $element.element_value.displayURL}
diff --git a/www/modules/civicrm/templates/CRM/Custom/Form/Field.hlp b/www/modules/civicrm/templates/CRM/Custom/Form/Field.hlp
index 85f057a63..32c17c2dd 100644
--- a/www/modules/civicrm/templates/CRM/Custom/Form/Field.hlp
+++ b/www/modules/civicrm/templates/CRM/Custom/Form/Field.hlp
@@ -8,5 +8,5 @@
  +--------------------------------------------------------------------+
 *}
 {htxt id="id-in_selector"}
-  {ts}Display in Table controls which columns are included in the listing of custom data records. If your custom data set has a large number of fields, uncheck this box to exclude less important fields from the listing. All fields will still be included when viewing a single record. You may also want to exclude Note type fields from the table listing.{/ts} 
+  {ts}Display in Table controls which columns are included in the listing of custom data records. If your custom data set has a large number of fields, uncheck this box to exclude less important fields from the listing. All fields will still be included when viewing a single record. You may also want to exclude Note type fields from the table listing.{/ts}
 {/htxt}
diff --git a/www/modules/civicrm/templates/CRM/Custom/Form/Field.tpl b/www/modules/civicrm/templates/CRM/Custom/Form/Field.tpl
index d2e4dea8d..b96e0d237 100644
--- a/www/modules/civicrm/templates/CRM/Custom/Form/Field.tpl
+++ b/www/modules/civicrm/templates/CRM/Custom/Form/Field.tpl
@@ -29,6 +29,10 @@
       <td class="label">{$form.fk_entity.label} <span class="crm-marker">*</span></td>
       <td class="html-adjust">{$form.fk_entity.html}</td>
     </tr>
+    <tr class="crm-custom-field-form-block-fk_entity_on_delete">
+      <td class="label">{$form.fk_entity_on_delete.label} <span class="crm-marker">*</span></td>
+      <td class="html-adjust">{$form.fk_entity_on_delete.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>
@@ -202,6 +206,7 @@
 
       // Show/hide entityReference selector
       $('.crm-custom-field-form-block-fk_entity').toggle(dataType === 'EntityReference');
+      $('.crm-custom-field-form-block-fk_entity_on_delete').toggle(dataType === 'EntityReference');
     }
 
     function onChangeHtmlType() {
diff --git a/www/modules/civicrm/templates/CRM/Custom/Form/Search.tpl b/www/modules/civicrm/templates/CRM/Custom/Form/Search.tpl
index dbea3ce67..78956f437 100644
--- a/www/modules/civicrm/templates/CRM/Custom/Form/Search.tpl
+++ b/www/modules/civicrm/templates/CRM/Custom/Form/Search.tpl
@@ -10,10 +10,10 @@
 {if $groupTree}
 {foreach from=$groupTree item=cd_edit key=group_id}
 
-  <div class="crm-accordion-wrapper crm-contactDetails-accordion {if $form.formName eq 'Advanced' AND $cd_edit.collapse_adv_display eq 1}collapsed{/if}" id="{$cd_edit.name}" >
-    <div class="crm-accordion-header">
+  <details class="crm-accordion-bold crm-contactDetails-accordion" id="{$cd_edit.name}"  {if $form.formName eq 'Advanced' AND $cd_edit.collapse_adv_display eq 1}{else}open{/if}>
+    <summary>
         {$cd_edit.title}
-    </div>
+    </summary>
     <div class="crm-accordion-body">
     <table class="form-layout-compressed">
     {foreach from=$cd_edit.fields item=element key=field_id}
@@ -48,8 +48,8 @@
           </tr>
       {/foreach}
      </table>
-    </div><!-- /.crm-accordion-body -->
-  </div><!-- /.crm-accordion-wrapper -->
+    </div>
+  </details>
 
 {/foreach}
   {if !empty($add_multivalue_js)}
diff --git a/www/modules/civicrm/templates/CRM/Custom/Page/CustomDataView.tpl b/www/modules/civicrm/templates/CRM/Custom/Page/CustomDataView.tpl
index cc50ccf2f..9ede32107 100644
--- a/www/modules/civicrm/templates/CRM/Custom/Page/CustomDataView.tpl
+++ b/www/modules/civicrm/templates/CRM/Custom/Page/CustomDataView.tpl
@@ -31,11 +31,11 @@
       {assign var="showEdit" value=0}
       <tr>
         <td id="{$cd_edit.name}_{$index}" class="section-shown form-item">
-          <div class="crm-accordion-wrapper{if !empty($cd_edit.collapse_display) && empty($skipTitle)} collapsed{/if}">
+          <details class="crm-accordion-bold" {if !empty($cd_edit.collapse_display) && empty($skipTitle)}{else}open{/if}>
             {if !$skipTitle}
-              <div class="crm-accordion-header">
+              <summary>
                 {$cd_edit.title}
-              </div>
+              </summary>
             {/if}
             <div class="crm-accordion-body">
               {if $groupId and $cvID and $editPermission and $cd_edit.editable}
@@ -83,7 +83,7 @@
             </div>
             <!-- end of body -->
             <div class="clear"></div>
-          </div>
+          </details>
           <!-- end of main accordion -->
         </td>
       </tr>
diff --git a/www/modules/civicrm/templates/CRM/Dashlet/Page/Blog.tpl b/www/modules/civicrm/templates/CRM/Dashlet/Page/Blog.tpl
index 52edd33ca..42fd6be9c 100644
--- a/www/modules/civicrm/templates/CRM/Dashlet/Page/Blog.tpl
+++ b/www/modules/civicrm/templates/CRM/Dashlet/Page/Blog.tpl
@@ -16,7 +16,7 @@
   #civicrm-news-feed .crm-news-feed-unread .crm-news-feed-item-title {
     font-weight: bold;
   }
-  #civicrm-news-feed details:not([open]) .crm-accordion-header {
+  #civicrm-news-feed details:not([open]) summary {
     text-overflow: ellipsis;
     text-wrap: none;
     white-space: nowrap;
@@ -46,10 +46,10 @@
   {foreach from=$feeds item="channel"}
     <div id="civicrm-news-feed-{$channel.name}">
     {foreach from=$channel.items item=article}
-      <details class="crm-accordion-wrapper">
-        <summary class="crm-accordion-header">
+      <details class="crm-accordion-bold">
+        <summary>
           <span class="crm-news-feed-item-title">{$article.title|smarty:nodefaults|purify}</span>
-          <span class="crm-news-feed-item-preview"> - {if function_exists('mb_substr')}{$article.description|smarty:nodefaults|strip_tags|mb_substr:0:150}{else}{$article.description|smarty:nodefaults|strip_tags}{/if}</span>
+          <span class="crm-news-feed-item-preview"> - {$article.description|smarty:nodefaults|strip_tags|mb_substr:0:150}</span>
         </summary>
         <div class="crm-accordion-body">
           <div>{$article.description|smarty:nodefaults|purify}</div>
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/EventFees.tpl b/www/modules/civicrm/templates/CRM/Event/Form/EventFees.tpl
index 943ea0abc..a35359e47 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/EventFees.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/EventFees.tpl
@@ -105,7 +105,7 @@
         </tr>
         <tr id="from-email" class="crm-event-eventfees-form-block-from_email_address">
           <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/Help/Email/id-from_email.hlp"}</td>
+          <td>{$form.from_email_address.html}  {help id="id-from_email" file="CRM/Contact/Form/Task/Help/Email/id-from_email.hlp" title=$form.from_email_address.label}</td>
         </tr>
         <tr id='notice' class="crm-event-eventfees-form-block-receipt_text">
         <td class="label">{$form.receipt_text.label}</td>
@@ -132,7 +132,7 @@
       </tr>
       <tr id="from-email" class="crm-event-eventfees-form-block-from_email_address">
         <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/Help/Email/id-from_email.hlp"}</td>
+        <td>{$form.from_email_address.html} {help id="id-from_email" file="CRM/Contact/Form/Task/Help/Email/id-from_email.hlp" title=$form.from_email_address.label}</td>
       </tr>
       <tr id='notice' class="crm-event-eventfees-form-block-receipt_text">
         <td class="label">{$form.receipt_text.label}</td>
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl b/www/modules/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
index 326ef4aa0..281a11947 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
@@ -11,40 +11,46 @@
 
 <div class="crm-block crm-form-block crm-event-manage-eventinfo-form-block">
   <table class="form-layout-compressed">
-    {if !empty($form.template_id)}
-      <tr class="crm-event-manage-eventinfo-form-block-template_id">
-        <td class="label">{$form.template_id.label} {help id="id-select-template" isTemplate=$isTemplate}</td>
-        <td>{$form.template_id.html}</td>
-      </tr>
-    {/if}
+    <tr class="crm-event-manage-eventinfo-form-block-title">
+      <td class="label">{$form.title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='title' id=$eventID}{/if}</td>
+      <td>{$form.title.html}</td>
+    </tr>
     {if !empty($form.template_title)}
       <tr class="crm-event-manage-eventinfo-form-block-template_title">
         <td class="label">{$form.template_title.label} {help id="id-template-title"}{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='template_title' id=$eventID}{/if}</td>
         <td>{$form.template_title.html}</td>
       </tr>
     {/if}
+    {if !$isTemplate}
+      <tr class="crm-event-manage-eventinfo-form-block-start_date">
+        <td class="label">{$form.start_date.label}</td>
+        <td>{$form.start_date.html}</td>
+      </tr>
+      <tr class="crm-event-manage-eventinfo-form-block-end_date">
+        <td class="label">{$form.end_date.label}</td>
+        <td>{$form.end_date.html}</td>
+      </tr>
+    {/if}
+    {if !empty($form.template_id)}
+      <tr class="crm-event-manage-eventinfo-form-block-template_id">
+        <td class="label">{$form.template_id.label} {help id="id-select-template" isTemplate=$isTemplate}</td>
+        <td>{$form.template_id.html}</td>
+      </tr>
+    {/if}
     <tr class="crm-event-manage-eventinfo-form-block-event_type_id">
       <td class="label">{$form.event_type_id.label}</td>
       <td>{$form.event_type_id.html}</td>
     </tr>
 
-    {* CRM-7362 --add campaign *}
-    {include file="CRM/Campaign/Form/addCampaignToComponent.tpl"
-    campaignTrClass="crm-event-manage-eventinfo-form-block-campaign_id"}
-
     <tr class="crm-event-manage-eventinfo-form-block-default_role_id">
       <td class="label">{$form.default_role_id.label} {help id="id-participant-role"}</td>
       <td>{$form.default_role_id.html}
       </td>
     </tr>
-    <tr class="crm-event-manage-eventinfo-form-block-participant_listing_id">
-      <td class="label">{$form.participant_listing_id.label} {help id="id-listing" isTemplate=$isTemplate action=$action entityId=$eventID}</td>
-      <td>{$form.participant_listing_id.html}</td>
-    </tr>
-    <tr class="crm-event-manage-eventinfo-form-block-title">
-      <td class="label">{$form.title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='title' id=$eventID}{/if}</td>
-      <td>{$form.title.html}</td>
-    </tr>
+    {* CRM-7362 --add campaign *}
+    {include file="CRM/Campaign/Form/addCampaignToComponent.tpl"
+    campaignTrClass="crm-event-manage-eventinfo-form-block-campaign_id"}
+
     <tr class="crm-event-manage-eventinfo-form-block-summary">
       <td class="label">{$form.summary.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='summary' id=$eventID}{/if}</td>
       <td>{$form.summary.html}</td>
@@ -53,16 +59,10 @@
       <td class="label">{$form.description.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='description' id=$eventID}{/if}</td>
       <td>{$form.description.html}</td>
     </tr>
-    {if !$isTemplate}
-      <tr class="crm-event-manage-eventinfo-form-block-start_date">
-        <td class="label">{$form.start_date.label}</td>
-        <td>{$form.start_date.html}</td>
-      </tr>
-      <tr class="crm-event-manage-eventinfo-form-block-end_date">
-        <td class="label">{$form.end_date.label}</td>
-        <td>{$form.end_date.html}</td>
-      </tr>
-    {/if}
+    <tr class="crm-event-manage-eventinfo-form-block-participant_listing_id">
+      <td class="label">{$form.participant_listing_id.label} {help id="id-listing" isTemplate=$isTemplate action=$action entityId=$eventID}</td>
+      <td>{$form.participant_listing_id.html}</td>
+    </tr>
     <tr class="crm-event-manage-eventinfo-form-block-max_participants">
       <td class="label">{$form.max_participants.label} {help id="id-max_participants" waitlist=$waitlist}</td>
       <td>
@@ -124,7 +124,7 @@
       </tr>
     {/if}
   </table>
-  {include file="CRM/common/customDataBlock.tpl" entityID=$eventID}
+  {include file="CRM/common/customDataBlock.tpl" entityID=$eventID cid=false}
   <div class="crm-submit-buttons">
     {include file="CRM/common/formButtons.tpl" location="bottom"}
   </div>
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.tpl b/www/modules/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.tpl
index 94c72dded..5520b51aa 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/ManageEvent/Registration.tpl
@@ -98,9 +98,9 @@
 <div class="spacer"></div>
 
 {*Registration Block*}
-<fieldset id="registration" class="crm-collapsible {if $defaultsEmpty}collapsed{/if}">
-  <legend class="collapsible-title">{ts}Registration Screen{/ts}</legend>
-  <div id="registration_screen">
+<details id="registration" {if !$defaultsEmpty}open{/if}>
+  <summary>{ts}Registration Screen{/ts}</summary>
+  <div id="registration_screen" class="crm-accordion-body">
     <table class="form-layout-compressed">
       <tr class="crm-event-manage-registration-form-block-intro_text">
         <td scope="row" class="label"
@@ -191,12 +191,13 @@
       {/if}
     </table>
   </div>
-</fieldset>
+</details>
 
 {*Confirmation Block*}
-<fieldset id="confirm" class="crm-collapsible {if $defaultsEmpty}collapsed{/if}">
-  <legend class="collapsible-title">{ts}Confirmation Screen{/ts}</legend>
-  {if !$is_monetary}
+<details id="confirm" {if !$defaultsEmpty}open{/if}>
+  <summary class="collapsible-title">{ts}Confirmation Screen{/ts}</summary>
+  <div id="confirm_screen_settings" class="crm-accordion-body">
+    {if !$is_monetary}
     <table class="form-layout-compressed">
       <tr class="crm-event-manage-registration-form-block-is_confirm_enabled">
         <td scope="row" class="label" width="20%">{$form.is_confirm_enabled.label}</td>
@@ -205,9 +206,7 @@
         </td>
       </tr>
     </table>
-  {/if}
-
-  <div id="confirm_screen_settings">
+    {/if}
     <table class="form-layout-compressed">
       <tr class="crm-event-manage-registration-form-block-confirm_title">
         <td scope="row" class="label" width="20%">{$form.confirm_title.label} <span
@@ -227,34 +226,36 @@
       </tr>
     </table>
   </div>
-</fieldset>
+</details>
 
 {*ThankYou Block*}
-<fieldset id="thankyou" class="crm-collapsible {if $defaultsEmpty}collapsed{/if}">
-  <legend class="collapsible-title">{ts}Thank-you Screen{/ts}</legend>
-  <table class="form-layout-compressed">
-    <tr class="crm-event-manage-registration-form-block-confirm_thankyou_title">
-      <td scope="row" class="label" width="20%">{$form.thankyou_title.label} <span
-          class="crm-marker">*</span> {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='thankyou_title' id=$eventID}{/if}
-      </td>
-      <td>{$form.thankyou_title.html}</td>
-    </tr>
-    <tr class="crm-event-manage-registration-form-block-confirm_thankyou_text">
-      <td scope="row" class="label" width="20%">{$form.thankyou_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='thankyou_text' id=$eventID}{/if}</td>
-      <td>{$form.thankyou_text.html}</td>
-    </tr>
-    <tr class="crm-event-manage-registration-form-block-confirm_thankyou_footer_text">
-      <td scope="row" class="label"
-          width="20%">{$form.thankyou_footer_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='thankyou_footer_text' id=$eventID}{/if}</td>
-      <td>{$form.thankyou_footer_text.html}</td>
-    </tr>
-  </table>
-</fieldset>
+<details id="thankyou" {if !$defaultsEmpty}open{/if}>
+  <summary>{ts}Thank-you Screen{/ts}</summary>
+  <div class="crm-accordion-body">
+    <table class="form-layout-compressed">
+      <tr class="crm-event-manage-registration-form-block-confirm_thankyou_title">
+        <td scope="row" class="label" width="20%">{$form.thankyou_title.label} <span
+            class="crm-marker">*</span> {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='thankyou_title' id=$eventID}{/if}
+        </td>
+        <td>{$form.thankyou_title.html}</td>
+      </tr>
+      <tr class="crm-event-manage-registration-form-block-confirm_thankyou_text">
+        <td scope="row" class="label" width="20%">{$form.thankyou_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='thankyou_text' id=$eventID}{/if}</td>
+        <td>{$form.thankyou_text.html}</td>
+      </tr>
+      <tr class="crm-event-manage-registration-form-block-confirm_thankyou_footer_text">
+        <td scope="row" class="label"
+            width="20%">{$form.thankyou_footer_text.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='thankyou_footer_text' id=$eventID}{/if}</td>
+        <td>{$form.thankyou_footer_text.html}</td>
+      </tr>
+    </table>
+  </div
+</details>
 
 {* Confirmation Email Block *}
-<fieldset id="mail" class="crm-collapsible {if $defaultsEmpty}collapsed{/if}">
-  <legend class="collapsible-title">{ts}Confirmation Email{/ts}</legend>
-  <div>
+<details id="mail" {if !$defaultsEmpty}open{/if}>
+  <summary class="collapsible-title">{ts}Confirmation Email{/ts}</summary>
+  <div class="crm-accordion-wrapper">
     <table class="form-layout-compressed">
       <tr class="crm-event-manage-registration-form-block-is_email_confirm">
         <td scope="row" class="label" width="20%">{$form.is_email_confirm.label} {help id="id-is_email_confirm"}</td>
@@ -292,7 +293,7 @@
       </table>
     </div>
   </div>
-</fieldset>
+</details>
 </div> {*end of div registration_blocks*}
     </div>
   <div class="crm-submit-buttons">
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/ManageEvent/Repeat.tpl b/www/modules/civicrm/templates/CRM/Event/Form/ManageEvent/Repeat.tpl
index e5cc29ae3..a084c81cc 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/ManageEvent/Repeat.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/ManageEvent/Repeat.tpl
@@ -10,8 +10,8 @@
 <div class="crm-block crm-form-block crm-event-manage-repeat-form-block">
 {include file="CRM/Core/Form/RecurringEntity.tpl" recurringFormIsEmbedded=false}
 {if $rows}
-<div class="crm-block crm-manage-events crm-accordion-wrapper">
-  <div class="crm-accordion-header">{ts}Connected Repeating Events{/ts}</div>
+<details class="crm-block crm-manage-events crm-accordion-bold" open>
+  <summary>{ts}Connected Repeating Events{/ts}</summary>
   <div class="crm-accordion-body">
   {strip}
   {include file="CRM/common/jsortable.tpl"}
@@ -57,6 +57,6 @@
     </table>
   {/strip}
   </div>
-</div>
+</details>
 {/if}
 </div>
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/Participant.tpl b/www/modules/civicrm/templates/CRM/Event/Form/Participant.tpl
index e22a8367c..c2dbc6a1a 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/Participant.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/Participant.tpl
@@ -114,10 +114,10 @@
         </fieldset>
 
         <div class="crm-participant-form-block-customData">
-          <div id="customData" class="crm-customData-block"></div>  {* Participant Custom data *}
-          <div id="customData{$eventNameCustomDataTypeID}" class="crm-customData-block"></div> {* Event Custom Data *}
-          <div id="customData{$roleCustomDataTypeID}" class="crm-customData-block"></div> {* Role Custom Data *}
-          <div id="customData{$eventTypeCustomDataTypeID}" class="crm-customData-block"></div> {* Role Custom Data *}
+          <div id="customData_Participant" class="crm-customData-block"></div>  {* Participant Custom data *}
+          <div id="customData_Participant{$eventNameCustomDataTypeID}" class="crm-customData-block"></div> {* Event Custom Data *}
+          <div id="customData_Participant{$roleCustomDataTypeID}" class="crm-customData-block"></div> {* Role Custom Data *}
+          <div id="customData_Participant{$eventTypeCustomDataTypeID}" class="crm-customData-block"></div> {* Role Custom Data *}
         </div>
       {/if}
 
@@ -182,7 +182,9 @@
 
         function buildRoleCustomData() {
           var roleId = $('select[name^=role_id]', $form).val() || [];
-          CRM.buildCustomData('Participant', roleId.join(), {/literal}{$roleCustomDataTypeID}{literal});
+          // If -1 is passed this will avoid https://lab.civicrm.org/dev/core/-/issues/5253
+          // as it is not a valid role ID but it is not 'empty'
+          CRM.buildCustomData('Participant', roleId.join() || -1, {/literal}{$roleCustomDataTypeID}{literal});
         }
 
         //build fee block
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/ParticipantFeeSelection.tpl b/www/modules/civicrm/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
index 1e25ca065..6420df984 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
@@ -141,7 +141,7 @@ CRM.$(function($) {
        </tr>
        <tr id="from-email" class="crm-event-eventfees-form-block-from_email_address">
          <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/Help/Email/id-from_email.hlp"}</td>
+         <td>{$form.from_email_address.html}  {help id="id-from_email" file="CRM/Contact/Form/Task/Help/Email/id-from_email.hlp" title=$form.from_email_address.label}</td>
        </tr>
        <tr id='notice' class="crm-event-eventfees-form-block-receipt_text">
          <td class="label">{$form.receipt_text.label}</td>
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/ParticipantView.tpl b/www/modules/civicrm/templates/CRM/Event/Form/ParticipantView.tpl
index 5e4919029..dc2859084 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/ParticipantView.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/ParticipantView.tpl
@@ -12,14 +12,14 @@
     <div class="action-link">
         <div class="crm-submit-buttons">
             {if call_user_func(array('CRM_Core_Permission','check'), 'edit event participants')}
-         {assign var='editUrlParams' value="reset=1&id=$id&cid=$contact_id&action=update&context=$context&selectedChild=event"}
+         {assign var='editUrlParams' value="reset=1&id=$participantId&cid=$contactId&action=update&context=$context&selectedChild=event"}
          {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey}
-         {assign var='editUrlParams' value="reset=1&id=$id&cid=$contact_id&action=update&context=$context&selectedChild=event&key=$searchKey"}
+         {assign var='editUrlParams' value="reset=1&id=$participantId&cid=$contactId&action=update&context=$context&selectedChild=event&key=$searchKey"}
          {/if}
              <a class="button" href="{crmURL p='civicrm/contact/view/participant' q=$editUrlParams}" accesskey="e"><span><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts}Edit{/ts}</span></a>
           {/if}
           {if call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviEvent')}
-            <a class="button" href="{crmURL p='civicrm/participant/delete' q="reset=1&id=$id"}"><span><i class="crm-i fa-trash" aria-hidden="true"></i> {ts}Delete{/ts}</span></a>
+            <a class="button" href="{crmURL p='civicrm/participant/delete' q="reset=1&id=$participantId"}"><span><i class="crm-i fa-trash" aria-hidden="true"></i> {ts}Delete{/ts}</span></a>
           {/if}
 
         </div>
@@ -28,58 +28,58 @@
     <tr class="crm-event-participantview-form-block-displayName">
       <td class="label">{ts}Participant Name{/ts}</td>
       <td>
-        <strong><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$contact_id"}" title="{ts}View contact record{/ts}">{$displayName}</a></strong>
+        <strong><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$contactId"}" title="{ts}View contact record{/ts}">{$displayName|escape}</a></strong>
         <div>
-            <a class="action-item crm-hover-button" href="{crmURL p='civicrm/event/badge' q="reset=1&context=view&id=$id&cid=$contact_id"}"><i class="crm-i fa-print" aria-hidden="true"></i> {ts}Print Name Badge{/ts}</a>
+            <a class="action-item crm-hover-button" href="{crmURL p='civicrm/event/badge' q="reset=1&context=view&id=$participantId&cid=$contactId"}"><i class="crm-i fa-print" aria-hidden="true"></i> {ts}Print Name Badge{/ts}</a>
         </div>
       </td>
   </tr>
   {if $participant_registered_by_id} {* Display primary participant *}
       <tr class="crm-event-participantview-form-block-registeredBy">
           <td class="label">{ts}Registered By{/ts}</td>
-          <td><a href="{crmURL p='civicrm/contact/view/participant' q="reset=1&id=$participant_registered_by_id&cid=$registered_by_contact_id&action=view"}" title="{ts}view primary participant{/ts}">{$registered_by_display_name}</a></td>
+          <td><a href="{crmURL p='civicrm/contact/view/participant' q="reset=1&id=$participant_registered_by_id&cid=$registered_by_contact_id&action=view"}" title="{ts}view primary participant{/ts}">{$registered_by_display_name|escape}</a></td>
       </tr>
   {/if}
   {if $additionalParticipants} {* Display others registered by this participant *}
         <tr class="crm-event-participantview-form-block-additionalParticipants">
             <td class="label">{ts}Also Registered by this Participant{/ts}</td>
             <td>
-                {foreach from=$additionalParticipants key=apName item=apURL}
-                    <a href="{$apURL}" title="{ts}view additional participant{/ts}">{$apName}</a><br />
+                {foreach from=$additionalParticipants key=participantName item=participantURL}
+                    <a href="{$participantURL}" title="{ts}view additional participant{/ts}">{$participantName|escape}</a><br />
                 {/foreach}
             </td>
         </tr>
   {/if}
     <tr class="crm-event-participantview-form-block-event">
       <td class="label">{ts}Event{/ts}</td><td>
-        <a href="{crmURL p='civicrm/event/manage/settings' q="action=update&reset=1&id=$event_id"}" title="{ts}Configure this event{/ts}">{$event}</a>
+        <a href="{crmURL p='civicrm/event/manage/settings' q="action=update&reset=1&id=$event_id"}" title="{ts}Configure this event{/ts}">{$event|escape}</a>
       </td>
   </tr>
 
     {if $campaign}
     <tr class="crm-event-participantview-form-block-campaign">
       <td class="label">{ts}Campaign{/ts}</td>
-      <td>{$campaign}</td>
+      <td>{$campaign|escape}</td>
     </tr>
     {/if}
 
     <tr class="crm-event-participantview-form-block-role">
       <td class="label">{ts}Participant Role{/ts}</td>
-      <td>{$role}</td></tr>
+      <td>{$role|escape}</td></tr>
         <tr class="crm-event-participantview-form-block-register_date">
       <td class="label">{ts}Registration Date{/ts}</td>
       <td>{$register_date|crmDate}&nbsp;</td>
   </tr>
     <tr class="crm-event-participantview-form-block-status">
-      <td class="label">{ts}Status{/ts}</td><td>{$status}&nbsp;
+      <td class="label">{ts}Status{/ts}</td><td>{$status|escape}&nbsp;
       {if $transferName}
-        {ts}(Transferred to <a href="{crmURL p='civicrm/contact/view/participant' q="action=view&reset=1&id=$pid&cid=$transferId"}" title="{ts}View this Participant{/ts}">{$transferName}</a>){/ts}
+        {ts}(Transferred to <a href="{crmURL p='civicrm/contact/view/participant' q="action=view&reset=1&id=$pid&cid=$transferId"}" title="{ts}View this Participant{/ts}">{$transferName|escape}</a>){/ts}
       {/if}
       </td>
   </tr>
     {if $source}
         <tr class="crm-event-participantview-form-block-event_source">
-        <td class="label">{ts}Participant Source{/ts}</td><td>{$source}&nbsp;</td>
+        <td class="label">{ts}Participant Source{/ts}</td><td>{$source|escape}&nbsp;</td>
       </tr>
     {/if}
     {if $participantId and $hasPayment}
@@ -92,7 +92,7 @@
         <tr class="crm-event-participantview-form-block-fee_amount">
             {if $lineItem}
                 <td class="label">{ts}Selections{/ts}</td>
-                <td>{include file="CRM/Price/Page/LineItem.tpl" context="Event"}
+                <td>{include file="CRM/Price/Page/LineItem.tpl" context="Event" displayLineItemFinancialType=false getTaxDetails=$totalTaxAmount hookDiscount=false}
                 {if call_user_func(array('CRM_Core_Permission','check'), 'edit event participants')}
                     {if $hasPayment or $parentHasPayment}
                       <a class="action-item crm-hover-button" href='{crmURL p="civicrm/event/participant/feeselection" q="reset=1&id=`$participantId`&cid=`$contactId`&action=update"}'><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts}Change Selections{/ts}</a>
@@ -106,13 +106,13 @@
                 </td>
             {else}
                 <td class="label">{ts}Event Level{/ts}</td>
-                <td>{$fee_level}&nbsp;{if $fee_amount}- {$fee_amount|crmMoney:$fee_currency}{/if}</td>
+                <td>{$fee_level|escape}&nbsp;{if $fee_amount}- {$fee_amount|crmMoney:$currency}{/if}</td>
             {/if}
         </tr>
     {/if}
     {foreach from=$note item="rec"}
       {if $rec}
-            <tr><td class="label">{ts}Note{/ts}</td><td>{$rec|nl2br}</td></tr>
+            <tr><td class="label">{ts}Note{/ts}</td><td>{$rec|escape|nl2br}</td></tr>
       {/if}
     {/foreach}
     </table>
@@ -121,14 +121,14 @@
     {/if}
     {include file="CRM/Custom/Page/CustomDataView.tpl"}
     {if $accessContribution and $rows.0.contribution_id}
-        {include file="CRM/Contribute/Form/Selector.tpl" context="Search"}
+        {include file="CRM/Contribute/Form/Selector.tpl" context="Search" single=true}
     {/if}
     <div class="crm-submit-buttons">
       {if call_user_func(array('CRM_Core_Permission','check'), 'edit event participants')}
         <a class="button" href="{crmURL p='civicrm/contact/view/participant' q=$editUrlParams}" accesskey="e"><span><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts}Edit{/ts}</span></a>
       {/if}
       {if call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviEvent')}
-        <a class="button" href="{crmURL p='civicrm/participant/delete' q="reset=1&id=$id"}"><span><i class="crm-i fa-trash" aria-hidden="true"></i> {ts}Delete{/ts}</span></a>
+        <a class="button" href="{crmURL p='civicrm/participant/delete' q="reset=1&id=$participantId"}"><span><i class="crm-i fa-trash" aria-hidden="true"></i> {ts}Delete{/ts}</span></a>
       {/if}
       {include file="CRM/common/formButtons.tpl" location="bottom"}
     </div>
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl b/www/modules/civicrm/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
index b9c9ca030..a1ec18a2d 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
@@ -34,7 +34,7 @@
 <div class="crm-event-id-{$event.id} crm-block crm-event-additionalparticipant-form-block">
 {if $priceSet}
      <fieldset id="priceset" class="crm-public-form-item crm-group priceset-group"><legend>{$event.fee_label}</legend>
-        {include file="CRM/Price/Form/PriceSet.tpl" extends="Event" hideTotal=false}
+        {include file="CRM/Price/Form/PriceSet.tpl" extends="Event" hideTotal=false isAdditionalParticipants=true}
     </fieldset>
 {else}
     {if $paidEvent}
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/Registration/Confirm.tpl b/www/modules/civicrm/templates/CRM/Event/Form/Registration/Confirm.tpl
index 006f9e2c9..1ee74a2fa 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/Registration/Confirm.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/Registration/Confirm.tpl
@@ -33,9 +33,9 @@
       {include file="CRM/common/formButtons.tpl" location="top"}
     </div>
 
-    {if $event.confirm_text}
+    {if $confirm_text}
         <div id="intro_text" class="crm-section event_confirm_text-section">
-          <p>{$event.confirm_text}</p>
+          <p>{$confirm_text|purify}</p>
         </div>
     {/if}
 
@@ -45,29 +45,29 @@
                 {$event.fee_label}
             </div>
             {if $lineItem}
-                {include file="CRM/Price/Page/LineItem.tpl" context="Event"}
+                {include file="CRM/Price/Page/LineItem.tpl" context="Event" displayLineItemFinancialType=false getTaxDetails=$totalTaxAmount}
             {elseif $amounts || $amount == 0}
           <div class="crm-section no-label amount-item-section">
                     {foreach from=$amounts item=amount key=level}
               <div class="content">
-                  {$amount.amount|crmMoney}&nbsp;&nbsp;{$amount.label}
+                  {$amount.amount|crmMoney:$currency}&nbsp;&nbsp;{$amount.label}
               </div>
                   <div class="clear"></div>
                     {/foreach}
             </div>
                 {if $totalTaxAmount}
                   <div class="crm-section no-label total-amount-section">
-                  <div class="content bold">{ts}Total {$taxTerm} Amount{/ts}:&nbsp;&nbsp;{$totalTaxAmount|crmMoney}</div>
+                  <div class="content bold">{ts}Total {$taxTerm} Amount{/ts}:&nbsp;&nbsp;{$totalTaxAmount|crmMoney:$currency}</div>
                   <div class="clear"></div>
                   </div>
                 {/if}
                 {if $totalAmount}
                 <div class="crm-section no-label total-amount-section">
-                    <div class="content bold">{ts}Total Amount{/ts}:&nbsp;&nbsp;{$totalAmount|crmMoney}</div>
+                    <div class="content bold">{ts}Total Amount{/ts}:&nbsp;&nbsp;{$totalAmount|crmMoney:$currency}</div>
                     <div class="clear"></div>
                   </div>
                 {/if}
-                {if $hookDiscount.message}
+                {if $hookDiscount}
                     <div class="crm-section hookDiscount-section">
                         <em>({$hookDiscount.message})</em>
                     </div>
@@ -180,10 +180,9 @@
       {include file="CRM/common/formButtons.tpl" location="bottom"}
     </div>
 
-    {if $event.confirm_footer_text}
+    {if array_key_exists('confirm_footer_text', $event) && $event.confirm_footer_text}
         <div id="footer_text" class="crm-section event_confirm_footer-section">
-            <p>{$event.confirm_footer_text}</p>
+            <p>{$event.confirm_footer_text|purify}</p>
         </div>
     {/if}
 </div>
-{include file="CRM/common/showHide.tpl"}
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/Registration/DisplayProfile.tpl b/www/modules/civicrm/templates/CRM/Event/Form/Registration/DisplayProfile.tpl
index 49db27a5b..121baa882 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/Registration/DisplayProfile.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/Registration/DisplayProfile.tpl
@@ -22,7 +22,7 @@
                    {/foreach}
                </fieldset>
             {/if}
-         {if $primaryParticipantProfile.CustomPost}
+         {if array_key_exists('CustomPost', $primaryParticipantProfile) && $primaryParticipantProfile.CustomPost}
                {foreach from=$primaryParticipantProfile.CustomPost item=value key=field}
                   <fieldset class="label-left no-border"><div class="bold crm-profile-view-title">{$primaryParticipantProfile.CustomPostGroupTitle.$field.groupTitle}</div>
                     <div class="crm-profile-view">
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl b/www/modules/civicrm/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl
index d67538e42..7cf3725e6 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/Registration/EventInfoBlock.tpl
@@ -21,7 +21,7 @@
   <tr><td>{ts}When{/ts}</td>
       <td width="90%">
         {$event.event_start_date|crmDate}
-        {if $event.event_end_date}{ts}through{/ts}
+        {if array_key_exists('event_end_date', $event) && $event.event_end_date}{ts}through{/ts}
             {* Only show end time if end date = start date *}
             {if $event.event_end_date|crmDate:"%Y%m%d" == $event.event_start_date|crmDate:"%Y%m%d"}
               {$event.event_end_date|crmDate:0:1}
@@ -33,7 +33,7 @@
   </tr>
 
   {if $isShowLocation}
-    {if $location.address.1}
+    {if array_key_exists(1, $location.address) && $location.address.1}
       <tr><td>{ts}Location{/ts}</td>
           <td>
             {$location.address.1.display|nl2br}
@@ -48,13 +48,13 @@
     {/if}
   {/if}{*End of isShowLocation condition*}
 
-  {if $location.phone.1.phone || $location.email.1.email}
+  {if array_key_exists(1, $location.phone) || array(1, $location.email)}
     <tr><td>{ts}Contact{/ts}</td>
         <td>
         {* loop on any phones and emails for this event *}
            {foreach from=$location.phone item=phone}
              {if $phone.phone}
-                {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}
+                {if array_key_exists('phone_type', $phone) && $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone} {if array_key_exists('phone_ext', $phone) && $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}
                 <br />
             {/if}
            {/foreach}
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/Registration/Register.tpl b/www/modules/civicrm/templates/CRM/Event/Form/Registration/Register.tpl
index 747a74e15..f1dbe401f 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/Registration/Register.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/Registration/Register.tpl
@@ -76,8 +76,8 @@
       {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false hideFieldset=false}
     </div>
 
-    {if $priceSet}
-      {if ! $quickConfig}<fieldset id="priceset" class="crm-public-form-item crm-group priceset-group">
+    {if !$suppressPaymentBlock}
+      {if !$quickConfig}<fieldset id="priceset" class="crm-public-form-item crm-group priceset-group">
         <legend>{$event.fee_label}</legend>{/if}
       {include file="CRM/Price/Form/PriceSet.tpl" extends="Event" hideTotal=$quickConfig}
       {include file="CRM/Price/Form/ParticipantCount.tpl"}
@@ -130,7 +130,7 @@
       </fieldset>
     {/if}
 
-    {if $priceSet && !$showPaymentOnConfirm}
+    {if !$suppressPaymentBlock && !$showPaymentOnConfirm}
       {include file='CRM/Core/BillingBlockWrapper.tpl'}
     {/if}
 
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/Registration/ThankYou.tpl b/www/modules/civicrm/templates/CRM/Event/Form/Registration/ThankYou.tpl
index f697f70e5..250d0d93a 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/Registration/ThankYou.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/Registration/ThankYou.tpl
@@ -13,10 +13,10 @@
 
 <div class="crm-event-id-{$event.id} crm-block crm-event-thankyou-form-block">
     {* Don't use "normal" thank-you message for Waitlist and Approval Required registrations - since it will probably not make sense for those situations. dgg *}
-    {if $event.thankyou_text AND (not $isOnWaitlist AND not $isRequireApproval)}
+    {if array_key_exists('thankyou_text', $event) AND (not $isOnWaitlist AND not $isRequireApproval)}
         <div id="intro_text" class="crm-section event_thankyou_text-section">
             <p>
-            {$event.thankyou_text}
+            {$event.thankyou_text|purify}
             </p>
         </div>
     {/if}
@@ -86,22 +86,22 @@
               <div class="crm-section no-label amount-item-section">
                     {foreach from=$finalAmount item=amount key=level}
                   <div class="content">
-                      {$amount.amount|crmMoney}&nbsp;&nbsp;{$amount.label}
+                      {$amount.amount|crmMoney:$currency}&nbsp;&nbsp;{$amount.label}
                   </div>
                   <div class="clear"></div>
                     {/foreach}
                 </div>
                 {if $totalTaxAmount}
-                  <div class="content bold">{ts}Tax Total{/ts}:&nbsp;&nbsp;{$totalTaxAmount|crmMoney}</div>
+                  <div class="content bold">{ts}Tax Total{/ts}:&nbsp;&nbsp;{$totalTaxAmount|crmMoney:$currency}</div>
                   <div class="clear"></div>
                 {/if}
                 {if $totalAmount}
                  <div class="crm-section no-label total-amount-section">
-                    <div class="content bold">{ts}Total Amount{/ts}:&nbsp;&nbsp;{$totalAmount|crmMoney}</div>
+                    <div class="content bold">{ts}Total Amount{/ts}:&nbsp;&nbsp;{$totalAmount|crmMoney:$currency}</div>
                     <div class="clear"></div>
                   </div>
 
-                    {if $hookDiscount.message}
+                    {if $hookDiscount}
                         <div class="crm-section hookDiscount-section">
                             <em>({$hookDiscount.message})</em>
                         </div>
@@ -186,9 +186,9 @@
       {/crmRegion}
     {/if}
 
-    {if $event.thankyou_footer_text}
+    {if array_key_exists('thankyou_footer_text', $event) && $event.thankyou_footer_text}
         <div id="footer_text" class="crm-section event_thankyou_footer-section">
-            <p>{$event.thankyou_footer_text}</p>
+            <p>{$event.thankyou_footer_text|purify}</p>
         </div>
     {/if}
 
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/Search.tpl b/www/modules/civicrm/templates/CRM/Event/Form/Search.tpl
index bd7570947..d47b23f54 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/Search.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/Search.tpl
@@ -11,10 +11,10 @@
 {assign var="showBlock" value="'searchForm'"}
 {assign var="hideBlock" value="'searchForm_show'"}
 <div class="crm-block crm-form-block crm-event-search-form-block">
-<div class="crm-accordion-wrapper crm-advanced_search_form-accordion {if !empty($ssID) or $rows}collapsed{/if}">
- <div class="crm-accordion-header crm-master-accordion-header">
+<details class="crm-accordion-light crm-advanced_search_form-accordion" {if !empty($ssID) or $rows}{else}open{/if}>
+ <summary>
         {ts}Edit Search Criteria{/ts}
-  </div>
+  </summary>
  <div class="crm-accordion-body">
 <div id="searchForm">
     {strip}
@@ -30,7 +30,7 @@
     {/strip}
 </div>
 </div>
-</div>
+</details>
 </div>
 {if $rowsEmpty|| $rows}
 <div class="crm-block crm-content-block">
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/SearchEvent.tpl b/www/modules/civicrm/templates/CRM/Event/Form/SearchEvent.tpl
index 45c02680e..b0c4762f4 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/SearchEvent.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/SearchEvent.tpl
@@ -7,10 +7,10 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-  <div class="crm-accordion-wrapper crm-block crm-form-block crm-event-searchevent-form-block">
-    <div class="crm-accordion-header">
+  <details class="crm-accordion-bold crm-block crm-form-block crm-event-searchevent-form-block" open>
+    <summary>
       {ts}Find Events{/ts}
-    </div>
+    </summary>
     <div class="crm-accordion-body">
   <table class="form-layout">
     <tr class="crm-event-searchevent-form-block-title">
@@ -47,7 +47,7 @@
     <td class="right">{include file="CRM/common/formButtons.tpl" location=''}</td>
   </table>
     </div>
-  </div>
+  </details>
 
 {include file="CRM/common/showHide.tpl"}
 
diff --git a/www/modules/civicrm/templates/CRM/Event/Form/Selector.tpl b/www/modules/civicrm/templates/CRM/Event/Form/Selector.tpl
index f2bc818d8..9bd07c5d5 100644
--- a/www/modules/civicrm/templates/CRM/Event/Form/Selector.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Form/Selector.tpl
@@ -8,13 +8,13 @@
  +--------------------------------------------------------------------+
 *}
 {if $context EQ 'Search'}
-    {include file="CRM/common/pager.tpl" location="top"}
+  {include file="CRM/common/pager.tpl" location="top"}
 {/if}
 
 {strip}
 <table class="selector row-highlight">
 <thead class="sticky">
-    <tr>
+  <tr>
     {if ! $single and $context eq 'Search'}
       <th scope="col" title="{ts}Select rows{/ts}">{$form.toggleSelect.html}</th>
     {/if}
@@ -28,47 +28,47 @@
         {/if}
         </th>
     {/foreach}
-    </tr>
- </thead>
+  </tr>
+</thead>
 
-  {counter start=0 skip=1 print=false}
-  {foreach from=$rows item=row}
+{counter start=0 skip=1 print=false}
+{foreach from=$rows item=row}
   <tr id='rowid{$row.participant_id}' class="{cycle values="odd-row,even-row"} crm-event crm-event_{$row.event_id}">
-     {if ! $single}
-        {if $context eq 'Search'}
-            {assign var=cbName value=$row.checkbox}
-            <td>{$form.$cbName.html}</td>
-        {/if}
-  <td class="crm-participant-contact_type">{$row.contact_type}</td>
+    {if ! $single}
+      {if $context eq 'Search'}
+        {assign var=cbName value=$row.checkbox}
+        <td>{$form.$cbName.html}</td>
+      {/if}
+      <td class="crm-participant-contact_type">{$row.contact_type}</td>
       <td class="crm-participant-sort_name"><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$row.contact_id`"}" title="{ts}View contact record{/ts}">{$row.sort_name|smarty:nodefaults|purify}</a></td>
     {/if}
 
     <td class="crm-participant-event_title"><a href="{crmURL p='civicrm/event/info' q="id=`$row.event_id`&reset=1"}" title="{ts}View event info page{/ts}">{$row.event_title|smarty:nodefaults|purify}</a>
-        {if !empty($contactId)}<br /><a href="{crmURL p='civicrm/event/search' q="reset=1&force=1&event=`$row.event_id`"}" title="{ts}List participants for this event (all statuses){/ts}">({ts}participants{/ts})</a>{/if}
+      {if !empty($contactId)}<br /><a href="{crmURL p='civicrm/event/search' q="reset=1&force=1&event=`$row.event_id`"}" title="{ts}List participants for this event (all statuses){/ts}">({ts}participants{/ts})</a>{/if}
     </td>
-    {assign var="participant_id" value=$row.participant_id}
-    {if $lineItems.$participant_id}
-        <td>
+    <td class="crm-participant-participant_fee_level">
+      {assign var="participant_id" value=$row.participant_id}
+      {if $lineItems.$participant_id}
         {foreach from=$lineItems.$participant_id item=line name=lineItemsIter}
-      {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if}: {$line.qty}
-            {if ! $smarty.foreach.lineItemsIter.last}<br />{/if}
+          {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if}: {$line.qty}
+          {if ! $smarty.foreach.lineItemsIter.last}<br />{/if}
         {/foreach}
-        </td>
-    {else}
-        <td class="crm-participant-participant_fee_level">{if !$row.paid && !$row.participant_fee_level} {ts}(no fee){/ts}{else} {$row.participant_fee_level}{/if}</td>
-    {/if}
-    <td class="right nowrap crm-participant-participant_fee_amount">{$row.participant_fee_amount|crmMoney:$row.participant_fee_currency}</td>
+      {else}
+        {if !$row.paid && (!array_key_exists('participant_fee_level', $row) || !$row.participant_fee_level)} {ts}(no fee){/ts}{elseif array_key_exists('participant_fee_level', $row)}{$row.participant_fee_level}{/if}
+      {/if}
+    </td>
+    <td class="right nowrap crm-participant-participant_fee_amount">{if array_key_exists('participant_fee_amount', $row)}{$row.participant_fee_amount|crmMoney:$row.participant_fee_currency}{/if}</td>
     <td class="crm-participant-participant_register_date">{$row.participant_register_date|truncate:10:''|crmDate}</td>
     <td class="crm-participant-event_start_date">{$row.event_start_date|truncate:10:''|crmDate}
-        {if $row.event_end_date && $row.event_end_date|crmDate:"%Y%m%d" NEQ $row.event_start_date|crmDate:"%Y%m%d"}
-            <br/>- {$row.event_end_date|truncate:10:''|crmDate}
-        {/if}
-   </td>
+      {if $row.event_end_date && $row.event_end_date|crmDate:"%Y%m%d" NEQ $row.event_start_date|crmDate:"%Y%m%d"}
+        <br/>- {$row.event_end_date|truncate:10:''|crmDate}
+      {/if}
+    </td>
     <td class="crm-participant-participant_status crm-participant_status_{$row.participant_status_id}">{$row.participant_status}</td>
     <td class="crm-participant-participant_role">{$row.participant_role_id}</td>
     <td>{$row.action|replace:'xx':$participant_id}</td>
-   </tr>
-  {/foreach}
+  </tr>
+{/foreach}
 {* Link to "View all participants" for Dashboard and Contact Summary *}
 {if $limit and $pager->_totalItems GT $limit}
   {if $context EQ 'event_dashboard'}
@@ -84,8 +84,6 @@
 </table>
 {/strip}
 
-
-
 {if $context EQ 'Search'}
     {include file="CRM/common/pager.tpl" location="bottom"}
 {/if}
diff --git a/www/modules/civicrm/templates/CRM/Event/Page/EventInfo.tpl b/www/modules/civicrm/templates/CRM/Event/Page/EventInfo.tpl
index ed71354dc..359b95784 100644
--- a/www/modules/civicrm/templates/CRM/Event/Page/EventInfo.tpl
+++ b/www/modules/civicrm/templates/CRM/Event/Page/EventInfo.tpl
@@ -75,7 +75,7 @@
 <div class="vevent crm-event-id-{$event.id} crm-block crm-event-info-form-block">
   <div class="event-info">
   {* Display top buttons only if the page is long enough to merit duplicate buttons *}
-  {if $event.summary or $event.description}
+  {if (array_key_exists('summary', $event) && $event.summary) or array_key_exists('description', $event) && $event.description}
     <div class="crm-actionlinks-top">
       {crmRegion name="event-page-eventinfo-actionlinks-top"}
         {if $allowRegistration}
@@ -87,12 +87,13 @@
     </div>
   {/if}
 
-  {if $event.summary}
+  {if array_key_exists('summary', $event) && $event.summary}
       <div class="crm-section event_summary-section">
         {$event.summary|purify}
       </div>
   {/if}
-  {if $event.description}
+
+  {if array_key_exists('description', $event) && $event.description}
       <div class="crm-section event_description-section summary">
           {$event.description|purify}
       </div>
@@ -102,14 +103,14 @@
       <div class="label">{ts}When{/ts}</div>
       <div class="content">
         {strip}
-            {if $event.event_start_date && $event.event_end_date && ($event.event_end_date|crmDate:'%Y%m%d':0 == $event.event_start_date|crmDate:'%Y%m%d':0)}
+            {if $event.event_start_date && array_key_exists('event_end_date', $event) && $event.event_end_date && ($event.event_end_date|crmDate:'%Y%m%d':0 == $event.event_start_date|crmDate:'%Y%m%d':0)}
               {$event.event_start_date|crmDate:'Full':0}
               &nbsp;{ts}from{/ts}&nbsp;
               {$event.event_start_date|crmDate:0:1}
             {else}
               {$event.event_start_date|crmDate}
             {/if}
-            {if $event.event_end_date}
+            {if array_key_exists('event_end_date', $event) && $event.event_end_date}
                 &nbsp;{ts}to{/ts}&nbsp;
                 {* Only show end time if end date = start date *}
                 {if $event.event_end_date|crmDate:"%Y%m%d":0 == $event.event_start_date|crmDate:"%Y%m%d":0}
@@ -125,16 +126,16 @@
 
   {if $isShowLocation}
 
-        {if $location.address.1}
+        {if array_key_exists(1, $location.address) && $location.address.1}
             <div class="crm-section event_address-section">
                 <div class="label">{ts}Location{/ts}</div>
-                <div class="content">{$location.address.1.display|nl2br}</div>
+                <div class="content">{$location.address.1.display|purify|nl2br}</div>
                 <div class="clear"></div>
             </div>
         {/if}
 
       {if ($event.is_map && $config->mapProvider &&
-          (is_numeric($location.address.1.geo_code_1) ||
+          array_key_exists('address', $location)  && (is_numeric($location.address.1.geo_code_1) ||
           ($location.address.1.city AND $location.address.1.state_province)))}
           <div class="crm-section event_map-section">
               <div class="content">
@@ -149,34 +150,40 @@
   {/if}{*End of isShowLocation condition*}
 
 
-  {if $location.phone.1.phone || $location.email.1.email}
+  {if (array_key_exists(1, $location.phone) && $location.phone.1.phone)
+    || (array_key_exists(1, $location.email) && $location.email.1.email)}
       <div class="crm-section event_contact-section">
           <div class="label">{ts}Contact{/ts}</div>
           <div class="content">
+            {if array_key_exists('phone', $location)}
               {foreach from=$location.phone item=phone}
                   {if $phone.phone}
                     <div class="crm-eventinfo-contact-phone">
                       {* @todo This should use "{ts 1=$phone.phone_type_display 2=$phone}%1: %2{/ts}" because some language have nbsp before column *}
                       {if $phone.phone_type_id}{$phone.phone_type_display}:{else}{ts}Phone:{/ts}{/if}
-                      <span class="tel">{$phone.phone}{if array_key_exists('phone_ext', $phone)}&nbsp;{ts}ext.{/ts}&nbsp;{$phone.phone_ext}{/if}</span>
+                      <span class="tel">{$phone.phone|escape}{if array_key_exists('phone_ext', $phone)}&nbsp;{ts}ext.{/ts}&nbsp;{$phone.phone_ext|escape}{/if}</span>
                     </div>
                   {/if}
               {/foreach}
+            {/if}
+            {if array_key_exists('email', $location)}
               {foreach from=$location.email item=email}
                   {if $email.email}
                     <div class="crm-eventinfo-contact-email">
-                      {ts}Email:{/ts} <span class="email"><a href="mailto:{$email.email}">{$email.email}</a></span>
+                      {ts}Email:{/ts} <span class="email"><a href="mailto:{$email.email|purify}">{$email.email|escape}</a></span>
                     </div>
                   {/if}
               {/foreach}
+            {/if}
           </div>
           <div class="clear"></div>
       </div>
+
   {/if}
 
   {if $event.is_monetary eq 1 && $feeBlock.value}
       <div class="crm-section event_fees-section">
-          <div class="label">{$event.fee_label}</div>
+          <div class="label">{$event.fee_label|escape}</div>
           <div class="content">
               <table class="form-layout-compressed fee_block-table">
                   {foreach from=$feeBlock.value name=fees item=value}
diff --git a/www/modules/civicrm/templates/CRM/Financial/Form/BatchTransaction.tpl b/www/modules/civicrm/templates/CRM/Financial/Form/BatchTransaction.tpl
index 20b9fe746..2ed4e1b84 100644
--- a/www/modules/civicrm/templates/CRM/Financial/Form/BatchTransaction.tpl
+++ b/www/modules/civicrm/templates/CRM/Financial/Form/BatchTransaction.tpl
@@ -10,10 +10,10 @@
 {* this template is used for batch transaction screen, assign/remove transactions to batch  *}
 {if in_array($batchStatus, array('Open', 'Reopened'))}
 <div class="crm-form-block crm-search-form-block">
-  <div class="crm-accordion-wrapper crm-batch_transaction_search-accordion collapsed">
-    <div class="crm-accordion-header crm-master-accordion-header">
+  <details class="crm-accordion-light crm-batch_transaction_search-accordion">
+    <summary>
       {ts}Edit Search Criteria{/ts}
-    </div>
+    </summary>
     <div class="crm-accordion-body">
       <div id="searchForm" class="crm-block crm-form-block crm-contact-custom-search-activity-search-form-block">
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
@@ -46,7 +46,7 @@
 	<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
       </div>
     </div>
-  </div>
+  </details>
 </div>
 {if in_array($batchStatus, array('Open', 'Reopened'))}
 <div class="form-layout-compressed">{$form.trans_assign.html}&nbsp;{$form.submit.html}</div><br/>
@@ -81,7 +81,7 @@
 <script type="text/javascript">
 CRM.$(function($) {
   CRM.$('#_qf_BatchTransaction_submit-top, #_qf_BatchTransaction_submit-bottom').click(function() {
-    CRM.$('.crm-batch_transaction_search-accordion:not(.collapsed)').crmAccordionToggle();
+    CRM.$('.crm-batch_transaction_search-accordion[open]').prop('open', false);
   });
   var batchStatus = {/literal}{$statusID}{literal};
   {/literal}{if $validStatus}{literal}
diff --git a/www/modules/civicrm/templates/CRM/Financial/Form/FinancialAccount.tpl b/www/modules/civicrm/templates/CRM/Financial/Form/FinancialAccount.tpl
index a338c406b..604668865 100644
--- a/www/modules/civicrm/templates/CRM/Financial/Form/FinancialAccount.tpl
+++ b/www/modules/civicrm/templates/CRM/Financial/Form/FinancialAccount.tpl
@@ -75,9 +75,7 @@
       </td>
     </tr>
   </table>
-  <div id="financial_account_custom_field_extension_section" class="crm-accordion-wrapper crm-financial-account-panel">
-  {include file="CRM/Custom/Form/CustomData.tpl"}
-  </div>
+  {include file="CRM/common/customDataBlock.tpl" groupID='' customDataType='FinancialAccount' customDataSubType=false cid=false}
 {/if}
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="botttom"}</div>
+<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="botttom"}</div>
 </div>
diff --git a/www/modules/civicrm/templates/CRM/Financial/Form/FinancialBatch.tpl b/www/modules/civicrm/templates/CRM/Financial/Form/FinancialBatch.tpl
index b1993f55e..f782f7013 100644
--- a/www/modules/civicrm/templates/CRM/Financial/Form/FinancialBatch.tpl
+++ b/www/modules/civicrm/templates/CRM/Financial/Form/FinancialBatch.tpl
@@ -43,9 +43,9 @@
       </tr>
     {/if}
   </table>
-  <fieldset class="crm-collapsible">
-    <legend class="collapsible-title">{ts}Optional Constraints{/ts}</legend>
-      <div>
+  <details class="crm-accordion-light">
+    <summary>{ts}Optional Constraints{/ts}</summary>
+    <div class="crm-accordion-body">
       <table class="form-layout">
         <tr class="crm-contribution-form-block-payment_instrument">
           <td class="label">{$form.payment_instrument_id.label}</td>
@@ -61,7 +61,7 @@
         </tr>
       </table>
     </div>
-  </fieldset>
+  </details>
 {/if}
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="botttom"}</div>
 </div>
diff --git a/www/modules/civicrm/templates/CRM/Financial/Form/Search.tpl b/www/modules/civicrm/templates/CRM/Financial/Form/Search.tpl
index 54c29a0b3..88ce1133e 100644
--- a/www/modules/civicrm/templates/CRM/Financial/Form/Search.tpl
+++ b/www/modules/civicrm/templates/CRM/Financial/Form/Search.tpl
@@ -14,10 +14,10 @@
   <a accesskey="N" href="{crmURL p='civicrm/financial/batch' q="reset=1&action=add&context=$batchStatus"}" id="newBatch" class="button"><span><i class="crm-i fa-plus-circle" aria-hidden="true"></i> {ts}New Accounting Batch{/ts}</span></a>
 </div>
 <div class="crm-form-block crm-search-form-block">
-  <div class="crm-accordion-wrapper crm-activity_search-accordion">
-    <div class="crm-accordion-header">
+  <details class="crm-accordion-bold crm-activity_search-accordion" open>
+    <summary>
       {ts}Filter Results{/ts}
-    </div>
+    </summary>
     <div class="crm-accordion-body">
       <div id="financial-search-form" class="crm-block crm-form-block">
         <table class="form-layout-compressed">
@@ -33,7 +33,7 @@
         </table>
       </div>
     </div>
-  </div>
+  </details>
 </div>
 {if !empty($form.batch_update)}<div class="form-layout-compressed">{$form.batch_update.html}&nbsp;{$form.submit.html}</div><br/>{/if}
 <table id="crm-batch-selector-{$batchStatus}" class="row-highlight">
diff --git a/www/modules/civicrm/templates/CRM/Form/attachment.tpl b/www/modules/civicrm/templates/CRM/Form/attachment.tpl
index 0c7ef9f99..1e95ad121 100644
--- a/www/modules/civicrm/templates/CRM/Form/attachment.tpl
+++ b/www/modules/civicrm/templates/CRM/Form/attachment.tpl
@@ -32,10 +32,10 @@
     {else}
       {capture assign=attachTitle}{ts}Attachment(s){/ts}{/capture}
     {/if}
-    <div class="crm-accordion-wrapper {if (!$context || $context NEQ 'pcpCampaign') AND !$currentAttachmentInfo}collapsed{/if}">
-     <div class="crm-accordion-header">
+    <details class="crm-accordion-bold" {if (!$context || $context NEQ 'pcpCampaign') AND !$currentAttachmentInfo}{else}open{/if}>
+     <summary>
       {$attachTitle}
-     </div><!-- /.crm-accordion-header -->
+     </summary>
     <div class="crm-accordion-body">
     <div id="attachments">
       <table class="form-layout-compressed">
@@ -109,8 +109,8 @@
       {/if}
       </table>
     </div>
-  </div><!-- /.crm-accordion-body -->
-  </div><!-- /.crm-accordion-wrapper -->
+  </div>
+  </details>
     {literal}
     <script type="text/javascript">
       CRM.$(function($) {
diff --git a/www/modules/civicrm/templates/CRM/Group/Form/Delete.tpl b/www/modules/civicrm/templates/CRM/Group/Form/Delete.tpl
index 4043531fe..79317e946 100644
--- a/www/modules/civicrm/templates/CRM/Group/Form/Delete.tpl
+++ b/www/modules/civicrm/templates/CRM/Group/Form/Delete.tpl
@@ -17,7 +17,20 @@
     {if $count !== NULL}
         {ts count=$count plural='This group currently has %count members in it.'}This group currently has one member in it.{/ts}
     {/if}
+
     {ts}Deleting this group will NOT delete the member contact records. However, all contact subscription information and history for this group will be deleted.{/ts} {ts}If this group is used in CiviCRM profiles, those fields will be reset.{/ts} {ts}This action cannot be undone.{/ts}
+
+    {if $smartGroupsUsingThisGroup}
+      <p><strong>{ts 1=$smartGroupsUsingThisGroup|count}WARNING - This Group is currently referenced by %1 smart group(s).{/ts}</strong></p>
+      <p>{ts}Deleting this group will mean the following Smart Groups will no longer restrict based on membership in this group - as they do currently. Please edit and resave these smart groups to remove reference to this group before deleting.{/ts}</p>
+      <ul>
+      {foreach from=$smartGroupsUsingThisGroup item=group key=k}
+        <li>
+          {ts 1=$group.editSearchURL 2=$group.title}%2 <a class='action-item crm-hover-button' href="%1" target="_blank">Edit Smart Group Criteria</a>{/ts}
+        </li>
+      {/foreach}
+      </ul>
+    {/if}
     </div>
 
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
diff --git a/www/modules/civicrm/templates/CRM/Group/Form/Edit.tpl b/www/modules/civicrm/templates/CRM/Group/Form/Edit.tpl
index 2a96a0300..1881de410 100644
--- a/www/modules/civicrm/templates/CRM/Group/Form/Edit.tpl
+++ b/www/modules/civicrm/templates/CRM/Group/Form/Edit.tpl
@@ -85,7 +85,7 @@
 
 
     <tr>
-      <td colspan=2>{include file="CRM/Custom/Form/CustomData.tpl"}</td>
+      <td colspan=2>{include file="CRM/common/customDataBlock.tpl" groupID='' customDataType='Group' customDataSubType=false cid=false}</td>
     </tr>
   </table>
 
diff --git a/www/modules/civicrm/templates/CRM/Group/Form/Search.tpl b/www/modules/civicrm/templates/CRM/Group/Form/Search.tpl
index cc635783a..7de1d3305 100644
--- a/www/modules/civicrm/templates/CRM/Group/Form/Search.tpl
+++ b/www/modules/civicrm/templates/CRM/Group/Form/Search.tpl
@@ -8,10 +8,10 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-block crm-form-block crm-group-search-form-block">
-  <div class="crm-accordion-wrapper crm-search_builder-accordion">
-    <div class="crm-accordion-header crm-master-accordion-header">
+  <details class="crm-accordion-light crm-search_builder-accordion" open>
+    <summary>
       {ts}Find Groups{/ts}
-    </div>
+    </summary>
     <div class="crm-accordion-body">
       <div id="searchForm">
         <table class="form-layout">
@@ -63,7 +63,7 @@
         </table>
       </div>
     </div>
-  </div>
+  </details>
 <div class="css_right">
   <a class="crm-hover-button action-item" href="{crmURL q="reset=1&update_smart_groups=1"}">{ts}Update Smart Group Counts{/ts}</a> {help id="update_smart_groups"}
 </div>
diff --git a/www/modules/civicrm/templates/CRM/Mailing/Form/Approve.tpl b/www/modules/civicrm/templates/CRM/Mailing/Form/Approve.tpl
index 18e477964..60a3f3d0b 100644
--- a/www/modules/civicrm/templates/CRM/Mailing/Form/Approve.tpl
+++ b/www/modules/civicrm/templates/CRM/Mailing/Form/Approve.tpl
@@ -24,10 +24,10 @@
 </table>
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
 
-<div class="crm-accordion-wrapper crm-plain_text_email-accordion collapsed">
-    <div class="crm-accordion-header">
+<details class="crm-accordion-bold crm-plain_text_email-accordion">
+    <summary>
         {ts}Preview Mailing{/ts}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
     <div class="crm-accordion-body">
         <table class="form-layout">
           <tr class="crm-mailing-test-form-block-subject"><td class="label">{ts}Subject:{/ts}</td><td>{$preview.subject}</td></tr>
@@ -38,7 +38,7 @@
     <tr><td class="label">{if $preview.type eq 'html'}{ts}Mailing HTML:{/ts}{else}{ts}Mailing Text:{/ts}{/if}</td><td><iframe height="300" src="{$preview.viewURL}" width="80%"><a href="{$preview.viewURL}" onclick="window.open(this.href); return false;">{ts}Mailing Text:{/ts}</a></iframe></td></tr>
           {/if}
         </table>
-    </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+    </div>
+</details>
 
 </div>
diff --git a/www/modules/civicrm/templates/CRM/Mailing/Form/InsertTokens.tpl b/www/modules/civicrm/templates/CRM/Mailing/Form/InsertTokens.tpl
index dc73e4166..18c8e84a5 100644
--- a/www/modules/civicrm/templates/CRM/Mailing/Form/InsertTokens.tpl
+++ b/www/modules/civicrm/templates/CRM/Mailing/Form/InsertTokens.tpl
@@ -25,7 +25,13 @@ var isMailing    = false;
   text_message = "mailing_format";
   isMailing = false;
   {/literal}
-{elseif $form.formClass eq 'CRM_SMS_Form_Upload' || $form.formClass eq 'CRM_Contact_Form_Task_SMS'}
+{elseif $form.formClass eq 'CRM_Contact_Form_Task_SMS'}
+  {literal}
+    prefix = "SMS";
+    text_message = "sms_text_message";
+    isMailing = true;
+  {/literal}
+{elseif $form.formClass eq 'CRM_SMS_Form_Upload'}
   {literal}
   prefix = "SMS";
   text_message = "sms_text_message";
@@ -74,7 +80,8 @@ function showSaveUpdateChkBox(prefix) {
     document.getElementById(prefix + "saveDetails").style.display = "none";
     return;
   }
-  if (document.getElementById(prefix + "template") == null) {
+
+  if (cj('#' + prefix + "template").val() === '') {
     if (document.getElementsByName(prefix + "saveTemplate")[0].checked){
       document.getElementById(prefix + "saveDetails").style.display = "block";
       document.getElementById(prefix + "editMessageDetails").style.display = "block";
@@ -93,7 +100,7 @@ function showSaveUpdateChkBox(prefix) {
   else if ( document.getElementsByName(prefix + "saveTemplate")[0].checked &&
     document.getElementsByName(prefix + "updateTemplate")[0].checked ){
     document.getElementById(prefix + "editMessageDetails").style.display = "block";
-    document.getElementById(pefix + "saveDetails").style.display = "block";
+    document.getElementById(prefix + "saveDetails").style.display = "block";
   }
   else if ( document.getElementsByName(prefix + "saveTemplate")[0].checked == false &&
       document.getElementsByName(prefix + "updateTemplate")[0].checked ) {
@@ -102,7 +109,12 @@ function showSaveUpdateChkBox(prefix) {
   }
   else {
     document.getElementById(prefix + "saveDetails").style.display = "none";
-    document.getElementById(prefix + "updateDetails").style.display = "none";
+    if (cj('#' + prefix + "template").val() === '') {
+      document.getElementById(prefix + "updateDetails").style.display = "none";
+    }
+    else {
+      document.getElementById(prefix + "updateDetails").style.display = "block";
+    }
   }
 }
 
@@ -113,20 +125,17 @@ function selectValue( val, prefix) {
     showSaveUpdateChkBox(prefix);
   }
   if ( !val ) {
-    if (document.getElementById("subject").length) {
-      document.getElementById("subject").value ="";
-    }
-    if (document.getElementById("subject").length) {
-      document.getElementById("subject").value ="";
+    // The SMS form has activity_subject not subject which is not
+    // cleared by this as subject is not present. It's unclear if that
+    // is deliberate or not but this does not error if the field is not present.
+    cj('#subject').val('');
+    if (prefix === 'SMS') {
+      document.getElementById("sms_text_message").value ="";
+      return;
     }
+
     if ( !isPDF ) {
-      if (prefix == 'SMS') {
-        document.getElementById("sms_text_message").value ="";
-        return;
-      }
-      else {
-        document.getElementById("text_message").value ="";
-      }
+      document.getElementById("text_message").value ="";
     }
     else {
       cj('.crm-html_email-accordion').show();
diff --git a/www/modules/civicrm/templates/CRM/Mailing/Page/Report.tpl b/www/modules/civicrm/templates/CRM/Mailing/Page/Report.tpl
index a7bf50da8..ce763e86b 100644
--- a/www/modules/civicrm/templates/CRM/Mailing/Page/Report.tpl
+++ b/www/modules/civicrm/templates/CRM/Mailing/Page/Report.tpl
@@ -193,7 +193,7 @@
 <tr><td class="label">{ts}Mailing Name{/ts}</td><td>{$report.mailing.name}</td></tr>
 <tr><td class="label">{ts}Subject{/ts}</td><td>{$report.mailing.subject}</td></tr>
 <tr><td class="label">{ts}From{/ts}</td><td>{$report.mailing.from_name} &lt;{$report.mailing.from_email}&gt;</td></tr>
-<tr><td class="label">{ts}Reply-to email{/ts}</td><td>{$report.mailing.replyto_email|htmlentities}</td></tr>
+<tr><td class="label">{ts}Reply-to email{/ts}</td><td>{$report.mailing.replyto_email|escape:'htmlall'}</td></tr>
 
 <tr><td class="label">{ts}Forward replies{/ts}</td><td>{if $report.mailing.forward_replies}{ts}Enabled{/ts}{else}{ts}Disabled{/ts}{/if}</td></tr>
 <tr><td class="label">{ts}Auto-respond to replies{/ts}</td><td>{if $report.mailing.auto_responder}{ts}Enabled{/ts}{else}{ts}Disabled{/ts}{/if}</td></tr>
diff --git a/www/modules/civicrm/templates/CRM/Member/Form/Membership.tpl b/www/modules/civicrm/templates/CRM/Member/Form/Membership.tpl
index 08f8bb334..85b28d778 100644
--- a/www/modules/civicrm/templates/CRM/Member/Form/Membership.tpl
+++ b/www/modules/civicrm/templates/CRM/Member/Form/Membership.tpl
@@ -48,7 +48,7 @@
   {/if}
   {if $membershipMode}
   <div class="help">
-    {ts 1=$displayName 2=$registerMode}Use this form to submit Membership Record on behalf of %1. <strong>A %2 transaction will be submitted</strong> using the selected payment processor.{/ts}
+    {ts 1=$displayName|escape 2=$registerMode}Use this form to submit Membership Record on behalf of %1. <strong>A %2 transaction will be submitted</strong> using the selected payment processor.{/ts}
   </div>
   {/if}
   <div class="crm-block crm-form-block crm-membership-form-block">
@@ -197,7 +197,7 @@
         {/if}
         <tr id="fromEmail" style="display: none" class="crm-contactEmail-form-block-fromEmailAddress crm-email-element">
           <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/Help/Email/id-from_email.hlp"}</td>
+          <td>{$form.from_email_address.html}  {help id="id-from_email" file="CRM/Contact/Form/Task/Help/Email/id-from_email.hlp" title=$form.from_email_address.label}</td>
         </tr>
         <tr id='notice' style="display:none;">
           <td class="label">{$form.receipt_text.label}</td>
@@ -207,8 +207,8 @@
       </table>
       {include file="CRM/common/customDataBlock.tpl"}
       {if $accessContribution and $action eq 2 and $rows.0.contribution_id}
-        <div class="crm-accordion-wrapper">
-          <div class="crm-accordion-header">{ts}Related Contributions{/ts}</div>
+        <details class="crm-accordion-bold" open>
+          <summary>{ts}Related Contributions{/ts}</summary>
           <div class="crm-accordion-body">
             {include file="CRM/Contribute/Form/Selector.tpl" context="Search"}
             <script type="text/javascript">
@@ -236,13 +236,13 @@
             </script>
             <div id="membership-recurring-contributions"></div>
           </div>
-        </div>
+        </details>
       {/if}
       {if $softCredit}
-        <div class="crm-accordion-wrapper">
-          <div class="crm-accordion-header">{ts}Related Soft Contributions{/ts}</div>
+        <details class="crm-accordion-bold" open>
+          <summary>{ts}Related Soft Contributions{/ts}</summary>
           <div class="crm-accordion-body">{include file="CRM/Contribute/Page/ContributionSoft.tpl" context="membership"}</div>
-       </div>
+       </details>
       {/if}
     {/if}
 
@@ -590,7 +590,7 @@
       showEmailOptions();
     }
 
-    var customDataType = {/literal}{$customDataType|@json_encode}{literal};
+    var customDataType = 'Membership';
 
     // load form during form rule.
     {/literal}{if $buildPriceSet}{literal}
@@ -605,7 +605,7 @@
         var fname = '#priceset';
         if ( !priceSetId ) {
         cj('#membership_type_id_1').val(0);
-        CRM.buildCustomData(customDataType, null);
+        CRM.buildCustomData('Membership', null);
 
         // hide price set fields.
         cj( fname ).hide( );
@@ -788,7 +788,7 @@
         subTypeNames = null;
       }
 
-      CRM.buildCustomData(customDataType, subTypeNames);
+      CRM.buildCustomData('Membership', subTypeNames);
     }
 
   function enableAmountSection( setContributionType ) {
diff --git a/www/modules/civicrm/templates/CRM/Member/Form/MembershipCommon.tpl b/www/modules/civicrm/templates/CRM/Member/Form/MembershipCommon.tpl
index e8cc54938..e0e844a8c 100644
--- a/www/modules/civicrm/templates/CRM/Member/Form/MembershipCommon.tpl
+++ b/www/modules/civicrm/templates/CRM/Member/Form/MembershipCommon.tpl
@@ -3,7 +3,7 @@
     <table>
       <tr class="crm-{$formClass}-form-block-contribution-contact">
         <td class="label">{$form.is_different_contribution_contact.label}</td>
-        <td>{$form.is_different_contribution_contact.html}&nbsp;&nbsp;{help id="id-contribution_contact"}</td>
+        <td>{$form.is_different_contribution_contact.html}&nbsp;&nbsp;{help id="id-contribution_contact" file="CRM/Member/Page/Tab.hlp"}</td>
       </tr>
       <tr id="record-different-contact">
         <td>&nbsp;</td>
diff --git a/www/modules/civicrm/templates/CRM/Member/Form/MembershipRenewal.tpl b/www/modules/civicrm/templates/CRM/Member/Form/MembershipRenewal.tpl
index 932a25e7c..1fdcf35a7 100644
--- a/www/modules/civicrm/templates/CRM/Member/Form/MembershipRenewal.tpl
+++ b/www/modules/civicrm/templates/CRM/Member/Form/MembershipRenewal.tpl
@@ -21,7 +21,7 @@
   {/if}
   {if $membershipMode}
     <div class="help">
-      {ts 1=$displayName}Use this form to Renew Membership Record on behalf of %1.{/ts}
+      {ts 1=$displayName|escape}Use this form to renew membership on behalf of %1.{/ts}
       {if $registerMode == 'LIVE'}
         {ts}<strong>A LIVE transaction will be submitted</strong> using the selected payment processor.{/ts}
       {else}
@@ -109,7 +109,7 @@
         </tr>
         <tr id="fromEmail">
           <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/Help/Email/id-from_email.hlp"}</td>
+          <td>{$form.from_email_address.html}  {help id="id-from_email" file="CRM/Contact/Form/Task/Help/Email/id-from_email.hlp" title=$form.from_email_address.label}</td>
         </tr>
         <tr id="notice" class="crm-member-membershiprenew-form-block-receipt_text">
           <td class="label">{$form.receipt_text.label}</td>
@@ -122,7 +122,7 @@
       </table>
     {/if}
 
-    {include file="CRM/common/customDataBlock.tpl"}
+    {include file="CRM/common/customDataBlock.tpl" groupID='' customDataType='Membership' cid=false}
 
     <div>{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 
diff --git a/www/modules/civicrm/templates/CRM/Member/Form/MembershipView.tpl b/www/modules/civicrm/templates/CRM/Member/Form/MembershipView.tpl
index b495f9ea3..62198e254 100644
--- a/www/modules/civicrm/templates/CRM/Member/Form/MembershipView.tpl
+++ b/www/modules/civicrm/templates/CRM/Member/Form/MembershipView.tpl
@@ -64,10 +64,10 @@
     {include file="CRM/Custom/Page/CustomDataView.tpl"}
 
     {if $accessContribution}
-      <div class="crm-accordion-wrapper">
-        <div class="crm-accordion-header">
+      <details class="crm-accordion-bold" open>
+        <summary>
           {ts}Related Contributions and Recurring Contributions{/ts}
-        </div>
+        </summary>
         <div class="crm-accordion-body">
           {if $rows.0.contribution_id}
             {include file="CRM/Contribute/Form/Selector.tpl" context="Search"}
@@ -97,14 +97,14 @@
           </script>
           <div id="membership-recurring-contributions"></div>
         </div>
-      </div>
+      </details>
     {/if}
 
     {if $softCredit}
-        <div class="crm-accordion-wrapper">
-            <div class="crm-accordion-header">{ts}Related Soft Contributions{/ts}</div>
+        <details class="crm-accordion-bold" open>
+            <summary>{ts}Related Soft Contributions{/ts}</summary>
             <div class="crm-accordion-body">{include file="CRM/Contribute/Page/ContributionSoft.tpl" context="membership"}</div>
-        </div>
+        </details>
     {/if}
 
     {if $has_related}
diff --git a/www/modules/civicrm/templates/CRM/Member/Form/Search.tpl b/www/modules/civicrm/templates/CRM/Member/Form/Search.tpl
index 20b929411..16896dad4 100644
--- a/www/modules/civicrm/templates/CRM/Member/Form/Search.tpl
+++ b/www/modules/civicrm/templates/CRM/Member/Form/Search.tpl
@@ -8,10 +8,10 @@
  +--------------------------------------------------------------------+
 *}
 <div class="crm-form-block crm-search-form-block">
-  <div class="crm-accordion-wrapper crm-member_search_form-accordion {if $rows}collapsed{/if}">
-   <div class="crm-accordion-header crm-master-accordion-header">
+  <details class="crm-accordion-light crm-member_search_form-accordion" {if $rows}{else}open{/if}>
+   <summary>
       {ts}Edit Search Criteria{/ts}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
   <div class="crm-accordion-body">
   {strip}
        <table class="form-layout">
@@ -23,8 +23,8 @@
           </tr>
       </table>
   {/strip}
-   </div><!-- /.crm-accordion-body -->
-  </div><!-- /.crm-accordion-wrapper -->
+   </div>
+  </details>
 </div><!-- /.crm-form-block -->
 <div class="crm-content-block">
   {if $rowsEmpty}
diff --git a/www/modules/civicrm/templates/CRM/Member/Page/MembershipType.tpl b/www/modules/civicrm/templates/CRM/Member/Page/MembershipType.tpl
index 8ca0e9dc0..0369b32fb 100644
--- a/www/modules/civicrm/templates/CRM/Member/Page/MembershipType.tpl
+++ b/www/modules/civicrm/templates/CRM/Member/Page/MembershipType.tpl
@@ -10,7 +10,7 @@
 
 {capture assign=reminderLink}{crmURL p='civicrm/admin/scheduleReminders' q='reset=1'}{/capture}
 <div class="help">
-  <p>{icon icon="fa-info-circle"}{/icon}{ts}Membership types are used to categorize memberships. You can define an unlimited number of types. Each type incorporates a 'name' (Gold Member, Honor Society Member...), a description, a minimum fee (can be $0), and a duration (can be 'lifetime'). Each member type is specifically linked to the membership entity (organization) - e.g. Bay Area Chapter.{/ts} {docURL page="user/membership/defining-memberships/"}</p>
+  <p>{icon icon="fa-info-circle"}{/icon} {ts}Membership types are used to categorize memberships. You can define an unlimited number of types. Each type incorporates a 'name' (Gold Member, Honor Society Member...), a description, a minimum fee (can be $0), and a duration (can be 'lifetime'). Each member type is specifically linked to the membership entity (organization) - e.g. Bay Area Chapter.{/ts} {docURL page="user/membership/defining-memberships/"}</p>
   <p>{ts 1=$reminderLink}Configure membership renewal reminders using <a href="%1">Schedule Reminders</a>.{/ts} {docURL page="user/email/scheduled-reminders"}</p>
 </div>
 
@@ -64,7 +64,7 @@
 {else}
   {if $action ne 1}
   <div class="messages status no-popup">
-    <img src="{$config->resourceBase}i/Inform.gif" alt="{ts}status{/ts}"/>
+    {icon icon="fa-info-circle"}{/icon} 
     {capture assign=crmURL}{crmURL p='civicrm/admin/member/membershipType/add' q="action=add&reset=1"}{/capture}{ts 1=$crmURL}There are no membership types entered. You can <a href='%1'>add one</a>.{/ts}
   </div>
   {/if}
diff --git a/www/modules/civicrm/templates/CRM/Pledge/Form/Pledge.tpl b/www/modules/civicrm/templates/CRM/Pledge/Form/Pledge.tpl
index ef7fd58b0..3d4a3d923 100644
--- a/www/modules/civicrm/templates/CRM/Pledge/Form/Pledge.tpl
+++ b/www/modules/civicrm/templates/CRM/Pledge/Form/Pledge.tpl
@@ -96,7 +96,7 @@
         {/if}
           <tr id="fromEmail" style="display:none;">
             <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/Help/Email/id-from_email.hlp"}</td>
+            <td>{$form.from_email_address.html}  {help id="id-from_email" file="CRM/Contact/Form/Task/Help/Email/id-from_email.hlp" title=$form.from_email_address.label}</td>
           </tr>
           <tr id="acknowledgeDate">
             <td class="label" class="crm-pledge-form-block-acknowledge_date">{$form.acknowledge_date.label}</td>
@@ -126,7 +126,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan=2>{include file="CRM/Custom/Form/CustomData.tpl"}</td>
+            <td colspan=2>{include file="CRM/common/customDataBlock.tpl" groupID='' customDataType='Pledge' customDataSubType=false entityID=$pledgeID cid=false}</td>
           </tr>
        </table>
 {literal}
@@ -134,13 +134,13 @@
   // bind first click of accordion header to load crm-accordion-body with snippet
   // everything else taken care of by $().crm-accordions()
   CRM.$(function($) {
-    $('.crm-ajax-accordion .crm-accordion-header').one('click', function() {
+    $('.crm-ajax-accordion summary').one('click', function() {
       loadPanes($(this).attr('id'));
     });
     $('#currency').on('change', function() {
       replaceCurrency($('#currency option:selected').text());
     });
-    $('.crm-ajax-accordion:not(.collapsed) .crm-accordion-header').each(function(index) {
+    $('.crm-ajax-accordion[open] summary').each(function(index) {
       loadPanes($(this).attr('id'));
     });
 
@@ -173,14 +173,14 @@
 
 <div class="accordion ui-accordion ui-widget ui-helper-reset">
 {foreach from=$allPanes key=paneName item=paneValue}
-<div class="crm-accordion-wrapper crm-ajax-accordion crm-{$paneValue.id}-accordion {if $paneValue.open neq 'true'}collapsed{/if}">
-<div class="crm-accordion-header" id="{$paneValue.id}">
+<details class="crm-accordion-bold crm-ajax-accordion crm-{$paneValue.id}-accordion" {if $paneValue.open neq 'true'}{else}open{/if}>
+<summary  id="{$paneValue.id}">
         {$paneName}
-  </div><!-- /.crm-accordion-header -->
+  </summary>
  <div class="crm-accordion-body">
        <div class="{$paneValue.id}"></div>
- </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+ </div>
+</details>
 
 {/foreach}
 </div>
diff --git a/www/modules/civicrm/templates/CRM/Pledge/Form/PledgeView.tpl b/www/modules/civicrm/templates/CRM/Pledge/Form/PledgeView.tpl
index 534808d2e..94f10c560 100644
--- a/www/modules/civicrm/templates/CRM/Pledge/Form/PledgeView.tpl
+++ b/www/modules/civicrm/templates/CRM/Pledge/Form/PledgeView.tpl
@@ -7,15 +7,10 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-{math equation="x / y" x=$amount y=$installments format="%.2f" assign="currentInstallment"}
-{* Check if current Total Pledge Amount is different from original pledge amount. *}
-{if $currentInstallment NEQ $original_installment_amount}
-    {assign var=originalPledgeAmount value=$installments*$original_installment_amount}
-{/if}
 
 <div class="crm-block crm-content-block crm-pledge-view-block">
   <table class="crm-info-panel">
-    <tr class="crm-pledge-form-block-displayName"><td class="label">{ts}Pledge By{/ts}</td><td class="bold"><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$contactId"}">{$displayName}</a></td></tr>
+    <tr class="crm-pledge-form-block-displayName"><td class="label">{ts}Pledge By{/ts}</td><td class="bold"><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$contactId"}">{$displayName|escape}</a></td></tr>
     <tr class="crm-pledge-form-block-amount">
       <td class="label">{ts}Total Pledge Amount{/ts}</td>
       <td><span class="bold">{$amount|crmMoney:$currency}</span>
@@ -36,24 +31,21 @@
     {/if}
     <tr class="crm-pledge-form-block-contribution_type crm-pledge-form-block-financial_type">
       <td class="label">{ts}Financial Type{/ts}</td>
-      <td>{$financial_type}&nbsp;{if $is_test}{ts}(test){/ts}{/if}</td>
+      <td>{$financial_type|escape}&nbsp;{if $is_test}{ts}(test){/ts}{/if}</td>
     </tr>
     {if $campaign}
       <tr class="crm-pledge-form-block-campaign">
         <td class="label">{ts}Campaign{/ts}</td>
-        <td>{$campaign}</td>
+        <td>{$campaign|escape}</td>
       </tr>
     {/if}
     {if $acknowledge_date}
       <tr class="crm-pledge-form-block-acknowledge_date"><td class="label">{ts}Received{/ts}</td><td>{$acknowledge_date|truncate:10:''|crmDate}&nbsp;</td></tr>
     {/if}
     {if $contribution_page}
-      <tr class="crm-pledge-form-block-contribution_page"><td class="label">{ts}Self-service Payments Page{/ts}</td><td>{$contribution_page}</td></tr>
-    {/if}
-      <tr class="crm-pledge-form-block-pledge_status"><td class="label">{ts}Pledge Status{/ts}</td><td{if $status_id eq 3} class="font-red bold"{/if}>{$pledge_status} </td></tr>
-    {if $honor_contact_id}
-      <tr class="crm-pledge-form-block-honor_type"><td class="label">{$honor_type}</td><td>{$honor_display}</td></tr>
+      <tr class="crm-pledge-form-block-contribution_page"><td class="label">{ts}Self-service Payments Page{/ts}</td><td>{$contribution_page|escape}</td></tr>
     {/if}
+    <tr class="crm-pledge-form-block-pledge_status"><td class="label">{ts}Pledge Status{/ts}</td><td{if $pledge_status_name eq 'Cancelled'} class="font-red bold"{/if}>{$pledge_status|escape} </td></tr>
     <tr class="crm-pledge-form-block-initial_reminder_day"><td class="label">{ts}Initial Reminder Day{/ts}</td><td>{$initial_reminder_day}&nbsp;days prior to schedule date </td></tr>
     <tr class="crm-pledge-form-block-max_reminders"><td class="label">{ts}Maximum Reminders Send{/ts}</td><td>{$max_reminders}&nbsp;</td></tr>
     <tr class="crm-pledge-form-block-additional_reminder_day"><td class="label">{ts}Send additional reminders{/ts}</td><td>{$additional_reminder_day}&nbsp;days after the last one sent</td></tr>
diff --git a/www/modules/civicrm/templates/CRM/Pledge/Form/Search.tpl b/www/modules/civicrm/templates/CRM/Pledge/Form/Search.tpl
index c12a1acb3..0ab3f84b3 100644
--- a/www/modules/civicrm/templates/CRM/Pledge/Form/Search.tpl
+++ b/www/modules/civicrm/templates/CRM/Pledge/Form/Search.tpl
@@ -9,10 +9,10 @@
 *}
 {* Search form and results for Event Participants *}
 <div class="crm-form-block crm-search-form-block">
-<div class="crm-accordion-wrapper crm-advanced_search_form-accordion {if $rowsEmpty or $rows}collapsed{/if}">
- <div class="crm-accordion-header crm-master-accordion-header">
+<details class="crm-accordion-light crm-advanced_search_form-accordion" {if $rowsEmpty or $rows}{else}open{/if}>
+ <summary>
         {ts}Edit Search Criteria{/ts}
- </div><!-- /.crm-accordion-header -->
+ </summary>
  <div class="crm-accordion-body">
 
 <div id="searchForm">
@@ -28,7 +28,7 @@
     {/strip}
   </div>
 </div>
-</div>
+</details>
 </div>
 
 {if $rowsEmpty || $rows}
diff --git a/www/modules/civicrm/templates/CRM/Price/Form/Calculate.tpl b/www/modules/civicrm/templates/CRM/Price/Form/Calculate.tpl
index 438f9739e..6bb92cfda 100644
--- a/www/modules/civicrm/templates/CRM/Price/Form/Calculate.tpl
+++ b/www/modules/civicrm/templates/CRM/Price/Form/Calculate.tpl
@@ -133,7 +133,7 @@ function calculateSelectLineItemValue(priceElement) {
 function calculateText(priceElement) {
   //CRM-16034 - comma acts as decimal in price set text pricing
   //CRM-19937 - dollar sign easy mistake to make by users.
-  var textval = parseFloat(cj(priceElement).val().replace(thousandMarker, '').replace(symbol, ''));
+  var textval = parseFloat(cj(priceElement).val().replace(thousandMarker, '').replace(symbol, '').replace(separator, '.'));
 
   if (isNaN(textval)) {
     textval = parseFloat(0);
diff --git a/www/modules/civicrm/templates/CRM/Price/Page/LineItem.tpl b/www/modules/civicrm/templates/CRM/Price/Page/LineItem.tpl
index e71449121..7663001cd 100644
--- a/www/modules/civicrm/templates/CRM/Price/Page/LineItem.tpl
+++ b/www/modules/civicrm/templates/CRM/Price/Page/LineItem.tpl
@@ -8,10 +8,7 @@
  +--------------------------------------------------------------------+
 *}
 
-{* Displays contribution/event fees when price set is used. *}
-{if !$currency && $fee_currency}
-  {assign var=currency value="$fee_currency"}
-{/if}
+{* Displays contribution/event fees. *}
 
 {foreach from=$lineItem item=value key=priceset}
   {if $value neq 'skip'}
@@ -112,7 +109,7 @@
         {assign var="lineItemCount" value=0}
 
         {foreach from=$pcount item=p_count}
-          {assign var="intPCount" value=$p_count.participant_count|intval}
+          {assign var="intPCount" value=$p_count.participant_count|string_format:"%d"}
           {assign var="lineItemCount" value=$lineItemCount+$intPCount}
         {/foreach}
         {if $lineItemCount < 1}
@@ -132,22 +129,3 @@
     <em>({$hookDiscount.message})</em>
   </div>
 {/if}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-  {/literal}
-    var comma = '{$config->monetaryThousandSeparator}';
-    var dot = '{$config->monetaryDecimalPoint}';
-    var format = '{$config->moneyformat}';
-    var currency = '{$currency}';
-    var currencySymbol = '{$currencySymbol}';
-  {literal}
-  // Todo: This function should be a utility
-  function moneyFormat(amount) {
-    amount = parseFloat(amount).toFixed(2);
-    amount = amount.replace(',', 'comma').replace('.', 'dot');
-    amount = amount.replace('comma', comma).replace('dot', dot);
-    return format.replace('%C', currency).replace('%c', currencySymbol).replace('%a', amount);
-  }});
-</script>
-{/literal}
diff --git a/www/modules/civicrm/templates/CRM/Profile/Form/Search.tpl b/www/modules/civicrm/templates/CRM/Profile/Form/Search.tpl
index a18de33a9..e96797a56 100644
--- a/www/modules/civicrm/templates/CRM/Profile/Form/Search.tpl
+++ b/www/modules/civicrm/templates/CRM/Profile/Form/Search.tpl
@@ -9,10 +9,10 @@
 *}
 {if ! empty($fields)}
   {if $groupId}
-  <div class="crm-accordion-wrapper crm-group-{$groupId}-accordion {if $rows}collapsed{/if}">
-    <div class="crm-accordion-header crm-master-accordion-header">
+  <details class="crm-accordion-light crm-group-{$groupId}-accordion" {if $rows}{else}open{/if}>
+    <summary>
       {ts}Edit Search Criteria{/ts}
-    </div>
+    </summary>
   <div class="crm-accordion-body">
     {else}
   <div>
@@ -49,7 +49,7 @@
             </td>
           {else}
             <td class="description">
-              {if $n|substr:0:5 eq 'phone'}
+              {if $n|str_starts_with:'phone'}
                 {assign var="phone_ext_field" value=$n|replace:'phone':'phone_ext'}
                 {$form.$n.html}
                 {if $form.$phone_ext_field.html}
@@ -79,8 +79,12 @@
   </table>
 
   {if $groupId}
-  </div><!-- /.crm-accordion-body -->
-  </div><!-- /.crm-accordion-wrapper -->
+  {else}
+  </div>
+  {/if}
+  {if $groupId}
+  </div>
+  </details>
   {/if}
 
 {elseif $statusMessage}
diff --git a/www/modules/civicrm/templates/CRM/Report/Form/Tabs/FieldSelection.tpl b/www/modules/civicrm/templates/CRM/Report/Form/Tabs/FieldSelection.tpl
index 339f51cb5..1db215d52 100644
--- a/www/modules/civicrm/templates/CRM/Report/Form/Tabs/FieldSelection.tpl
+++ b/www/modules/civicrm/templates/CRM/Report/Form/Tabs/FieldSelection.tpl
@@ -13,10 +13,10 @@
       {assign  var="count" value=0}
       {* Wrap custom field sets in collapsed accordion pane. *}
       {if !empty($grpFields.use_accordian_for_field_selection)}
-        <div class="crm-accordion-wrapper crm-accordion collapsed">
-        <div class="crm-accordion-header">
+        <details class="crm-accordion-bold crm-accordion">
+        <summary>
           {$grpFields.group_title}
-        </div><!-- /.crm-accordion-header -->
+        </summary>
         <div class="crm-accordion-body">
       {/if}
       <table class="criteria-group">
@@ -34,8 +34,8 @@
         </tr>
       </table>
       {if !empty($grpFields.use_accordian_for_field_selection)}
-        </div><!-- /.crm-accordion-body -->
-        </div><!-- /.crm-accordion-wrapper -->
+        </div>
+        </details>
       {/if}
     {/foreach}
   </div>
diff --git a/www/modules/civicrm/templates/CRM/Report/Form/Tabs/Filters.tpl b/www/modules/civicrm/templates/CRM/Report/Form/Tabs/Filters.tpl
index b3a701f52..b1b708100 100644
--- a/www/modules/civicrm/templates/CRM/Report/Form/Tabs/Filters.tpl
+++ b/www/modules/civicrm/templates/CRM/Report/Form/Tabs/Filters.tpl
@@ -14,10 +14,10 @@
       {foreach from=$filterGroups item=filterGroup}
         {* Wrap custom field sets in collapsed accordion pane. *}
         {if $filterGroup.use_accordion_for_field_selection}
-          <div class="crm-accordion-wrapper crm-accordion collapsed">
-            <div class="crm-accordion-header">
+          <details class="crm-accordion-bold crm-accordion">
+            <summary>
               {$filterGroup.group_title}
-            </div><!-- /.crm-accordion-header -->
+            </summary>
             <div class="crm-accordion-body">
         {/if}
         <table class="report-layout">
@@ -49,8 +49,8 @@
         {/foreach}
         </table>
         {if $filterGroup.use_accordion_for_field_selection}
-            </div><!-- /.crm-accordion-body -->
-          </div><!-- /.crm-accordion-wrapper -->
+            </div>
+          </details>
         {/if}
       {/foreach}
   </div>
diff --git a/www/modules/civicrm/templates/CRM/Report/Page/InstanceList.tpl b/www/modules/civicrm/templates/CRM/Report/Page/InstanceList.tpl
index d12f9e31a..dacb4b4a5 100644
--- a/www/modules/civicrm/templates/CRM/Report/Page/InstanceList.tpl
+++ b/www/modules/civicrm/templates/CRM/Report/Page/InstanceList.tpl
@@ -20,10 +20,10 @@
     <div class="crm-block crm-form-block crm-report-instanceList-form-block">
       {counter start=0 skip=1 print=false}
       {foreach from=$list item=rows key=report}
-        <div class="crm-accordion-wrapper crm-accordion_{$report}-accordion ">
-          <div class="crm-accordion-header">
+        <details class="crm-accordion-bold crm-accordion_{$report}-accordion " open>
+          <summary>
             {if $title}{$title}{elseif $report EQ 'Contribute'}{ts}Contribution Reports{/ts}{else}{ts 1=$report}%1 Reports{/ts}{/if}</a>
-          </div><!-- /.crm-accordion-header -->
+          </summary>
           <div class="crm-accordion-body">
             <div id="{$report}" class="boxBlock">
               <table class="report-layout">
@@ -37,7 +37,7 @@
                       <ul class="panel">
                         {foreach from=$row.actions item=action key=action_name}
                           <li><a href="{$action.url}" class="{$action_name} action-item crm-hover-button small-popup"
-                          {if $action.confirm_message}onclick="return window.confirm({$action.confirm_message|json_encode|htmlspecialchars})"{/if}
+                          {if $action.confirm_message}onclick="return window.confirm({$action.confirm_message|json_encode|escape})"{/if}
                           title="{$action.label|escape}">{$action.label}</a></li>
                         {/foreach}
                       </ul>
@@ -48,7 +48,7 @@
               </table>
             </div>
           </div>
-        </div>
+        </details>
       {/foreach}
     </div>
 
diff --git a/www/modules/civicrm/templates/CRM/Report/Page/TemplateList.tpl b/www/modules/civicrm/templates/CRM/Report/Page/TemplateList.tpl
index c19163479..535aca963 100644
--- a/www/modules/civicrm/templates/CRM/Report/Page/TemplateList.tpl
+++ b/www/modules/civicrm/templates/CRM/Report/Page/TemplateList.tpl
@@ -17,10 +17,10 @@
     {if $list}
       {counter start=0 skip=1 print=false}
       {foreach from=$list item=rows key=report}
-        <div class="crm-accordion-wrapper crm-accordion_{$report}-accordion ">
-          <div class="crm-accordion-header">
+        <details class="crm-accordion-bold crm-accordion_{$report}-accordion " open>
+          <summary>
             {if $report}{if $report EQ 'Contribute'}{ts}Contribution{/ts}{else}{$report}{/if}{else}{ts}Contact{/ts}{/if} Report Templates
-          </div><!-- /.crm-accordion-header -->
+          </summary>
           <div class="crm-accordion-body">
             <div id="{$report}" class="boxBlock">
               <table class="report-layout">
@@ -41,8 +41,8 @@
                 {/foreach}
               </table>
             </div>
-          </div><!-- /.crm-accordion-body -->
-        </div><!-- /.crm-accordion-wrapper -->
+          </div>
+        </details>
       {/foreach}
     {else}
       <div class="messages status no-popup">
diff --git a/www/modules/civicrm/templates/CRM/SMS/Form/Group.tpl b/www/modules/civicrm/templates/CRM/SMS/Form/Group.tpl
index 3df24931d..36975c969 100644
--- a/www/modules/civicrm/templates/CRM/SMS/Form/Group.tpl
+++ b/www/modules/civicrm/templates/CRM/SMS/Form/Group.tpl
@@ -23,10 +23,10 @@
 
 
 <div id="id-additional" class="form-item">
-<div class="crm-accordion-wrapper ">
- <div class="crm-accordion-header">
+<details class="crm-accordion-bold " open>
+ <summary>
 {ts}Mailing Recipients{/ts}
- </div><!-- /.crm-accordion-header -->
+ </summary>
  <div class="crm-accordion-body">
   {strip}
 
@@ -46,8 +46,8 @@
   </table>
 
   {/strip}
- </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+ </div>
+</details>
 
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
 </div>
diff --git a/www/modules/civicrm/templates/CRM/SMS/Form/Schedule.tpl b/www/modules/civicrm/templates/CRM/SMS/Form/Schedule.tpl
index fe5af9ab5..ef564715a 100644
--- a/www/modules/civicrm/templates/CRM/SMS/Form/Schedule.tpl
+++ b/www/modules/civicrm/templates/CRM/SMS/Form/Schedule.tpl
@@ -27,10 +27,10 @@
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location=''}</div>
 
 {if $preview}
-<div class="crm-accordion-wrapper crm-plain_text_sms-accordion collapsed">
-    <div class="crm-accordion-header">
+<details class="crm-accordion-bold crm-plain_text_sms-accordion">
+    <summary>
         {ts}Preview SMS{/ts}
-    </div><!-- /.crm-accordion-header -->
+    </summary>
     <div class="crm-accordion-body">
         <table class="form-layout">
 
@@ -38,8 +38,8 @@
     <tr><td class="label">{if $preview.type eq 'html'}{ts}SMS HTML:{/ts}{else}{ts}SMS Text:{/ts}{/if}</td><td><iframe height="300" src="{$preview.viewURL}" width="80%"><a href="{$preview.viewURL}" onclick="window.open(this.href); return false;">{ts}SMS Text:{/ts}</a></iframe></td></tr>
           {/if}
         </table>
-    </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+    </div>
+</details>
 {/if}
 
 </div>
diff --git a/www/modules/civicrm/templates/CRM/SMS/Form/Upload.tpl b/www/modules/civicrm/templates/CRM/SMS/Form/Upload.tpl
index c9b425d4c..6b8ac39a2 100644
--- a/www/modules/civicrm/templates/CRM/SMS/Form/Upload.tpl
+++ b/www/modules/civicrm/templates/CRM/SMS/Form/Upload.tpl
@@ -17,10 +17,12 @@
 {include file="CRM/Mailing/Form/Count.tpl"}
 
 <table class="form-layout-compressed">
+  {if array_key_exists('SMStemplate', $form)}
     <tr class="crm-mailing-upload-form-block-template">
       <td class="label">{$form.SMStemplate.label}</td>
-  <td>{$form.SMStemplate.html}</td>
+      <td>{$form.SMStemplate.html}</td>
     </tr>
+  {/if}
     <tr class="crm-mailing-upload-form-block-upload_type"><td></td><td colspan="2">{$form.upload_type.label} {$form.upload_type.html} {help id="upload-compose"}</td></tr>
 </table>
 
diff --git a/www/modules/civicrm/templates/CRM/Tag/Form/Tagtree.tpl b/www/modules/civicrm/templates/CRM/Tag/Form/Tagtree.tpl
index 54469f2e3..006d49f33 100644
--- a/www/modules/civicrm/templates/CRM/Tag/Form/Tagtree.tpl
+++ b/www/modules/civicrm/templates/CRM/Tag/Form/Tagtree.tpl
@@ -13,7 +13,7 @@
     <li>
       <a id="tag_{$id}" class="{if !$node.is_selectable || $permission neq 'edit'}jstree-disabled{/if} {if $tagged[$id]}jstree-clicked{/if}">
         <span class="crm-tag-item" {if !empty($allTags.$id.color)}style="background-color: {$allTags.$id.color}; color: {$allTags.$id.color|colorContrast};"{/if} title="{$node.description|escape}">
-          {$node.name}
+          {$node.label}
         </span>
       </a>
       {if $node.children}
diff --git a/www/modules/civicrm/templates/CRM/UF/Form/AdvanceSetting.tpl b/www/modules/civicrm/templates/CRM/UF/Form/AdvanceSetting.tpl
index 554b3e769..b776100ee 100644
--- a/www/modules/civicrm/templates/CRM/UF/Form/AdvanceSetting.tpl
+++ b/www/modules/civicrm/templates/CRM/UF/Form/AdvanceSetting.tpl
@@ -7,10 +7,10 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-<div class="crm-accordion-wrapper collapsed">
- <div class="crm-accordion-header">
+<details class="crm-accordion-bold">
+ <summary>
     {ts}Advanced Settings{/ts}
-  </div><!-- /.crm-accordion-header -->
+  </summary>
   <div class="crm-accordion-body">
   <div class="crm-block crm-form-block crm-uf-advancesetting-form-block">
     <table class="form-layout">
@@ -86,8 +86,8 @@
         </tr>
     </table>
     </div><!-- / .crm-block -->
-  </div><!-- /.crm-accordion-body -->
-</div><!-- /.crm-accordion-wrapper -->
+  </div>
+</details>
 {literal}
   <script type="text/javascript">
   CRM.$(function($) {
diff --git a/www/modules/civicrm/templates/CRM/UF/Form/Field.hlp b/www/modules/civicrm/templates/CRM/UF/Form/Field.hlp
index 6b0a0c8b8..74b9d9728 100644
--- a/www/modules/civicrm/templates/CRM/UF/Form/Field.hlp
+++ b/www/modules/civicrm/templates/CRM/UF/Form/Field.hlp
@@ -57,10 +57,10 @@
 {/htxt}
 {htxt id='visibility'}
   <p>
-    {ts}Is this field hidden from public search ('User and User Admin Only'), or is it visible to the public and potentially searchable in the Profile Search form ('Expose Publicly' or 'Expose Publicly and for Listings')?  ('User and User Admin Only') fields can still be used for Edit and Create mode.{/ts}
+    {ts}Is this field hidden from public search ('User and User Admin Only'), or is it visible to the public and potentially searchable in the Profile Search form ('Public Pages' or 'Public Pages and Listings')?  ('User and User Admin Only') fields can still be used for Edit and Create mode.{/ts}
   </p>
   <p>
-    {ts}When visibility is 'Expose Publicly and for Listings', users can also click the field value when viewing a contact in order to locate other contacts with the same value(s) (i.e. other contacts who live in Poland).{/ts}
+    {ts}When visibility is 'Public Pages and Listings', users can also click the field value when viewing a contact in order to locate other contacts with the same value(s) (i.e. other contacts who live in Poland).{/ts}
   </p>
 {/htxt}
 
diff --git a/www/modules/civicrm/templates/CRM/UF/Form/Field.tpl b/www/modules/civicrm/templates/CRM/UF/Form/Field.tpl
index 63b516dee..ea2e10769 100644
--- a/www/modules/civicrm/templates/CRM/UF/Form/Field.tpl
+++ b/www/modules/civicrm/templates/CRM/UF/Form/Field.tpl
@@ -141,15 +141,6 @@ function showLabel( ) {
   {/foreach}
   {literal}
 
-  // Code to set Profile Field help, from custom data field help
-  if (fieldId.substring(0, 7) == 'custom_') {
-    fieldId = fieldId.substring( fieldId.length, 7);
-    var dataUrl = {/literal}"{crmURL p='civicrm/ajax/custom' h=0}"{literal};
-    cj.post( dataUrl, { id: fieldId }, function(data) {
-      cj('#help_post').val(data.help_post);
-      cj('#help_pre').val(data.help_pre);
-    }, 'json');
-  }
 }
 
 {/literal}{if $action neq 8}{literal}
@@ -190,45 +181,40 @@ CRM.$(function($) {
 });
 {/literal}{/if}{literal}
 
-cj("#field_name_1").change(
-  function() {
-    multiSummaryToggle(cj(this).val());
-  });
-
 CRM.$(function($) {
-  var fieldId = cj("#field_name_1").val();
-  multiSummaryToggle(fieldId);
-});
+  $("#field_name_1").change(handleCustomField).each(handleCustomField);
+
+  function hideMultiSummary() {
+    $('#is_multi_summary').prop('checked', false);
+    $('.crm-uf-field-form-block-is_multi').hide();
+  }
 
-function multiSummaryToggle(customId) {
-  if (customId && customId.match(/custom_[\d]/)) {
+  function handleCustomField() {
+    const fieldName = $(this).val();
+    if (fieldName && fieldName.match(/^custom_[\d]/)) {
+      const customFieldId = fieldName.split('_')[1];
 
-    var dataUrl = "{/literal}{crmURL p='civicrm/ajax/rest' q='className=CRM_UF_Page_AJAX&fnName=checkIsMultiRecord&json=1' h=0}"{literal};
-    dataUrl = dataUrl + '&customId=' + customId;
-    cj.ajax({  url: dataUrl,
-      async: false,
-      global: false,
-      dataType : 'json',
-      success : function(response) {
-        if (response.is_multi != 0 ) {
-          cj('.crm-uf-field-form-block-is_multi').show();
+      CRM.api4('CustomField', 'get', {
+        select: ['help_pre', 'help_post', 'custom_group_id.is_multiple'],
+        where: [['id', '=', customFieldId]]
+      }, 0).then(function(result) {
+        if (result && result.help_pre) {
+          $('#help_pre').val(result.help_pre);
         }
-        else {
-          if (cj('#is_multi_summary').is(':checked')) {
-            cj('#is_multi_summary').prop('checked', false);
-          }
-          cj('.crm-uf-field-form-block-is_multi').hide();
+        if (result && result.help_post) {
+          $('#help_post').val(result.help_post);
         }
-      }
-    });
-  }
-  else {
-    if (cj('#is_multi_summary').is(':checked')) {
-      cj('#is_multi_summary').prop('checked', false);
+        if (result && result['custom_group_id.is_multiple']) {
+          $('.crm-uf-field-form-block-is_multi').show();
+        } else {
+          hideMultiSummary()
+        }
+      });
+    } else {
+      hideMultiSummary();
     }
-    cj('.crm-uf-field-form-block-is_multi').hide();
   }
-}
+});
 
 function viewOnlyShowHide() {
   var is_search = cj('#is_search_label, #is_search_html');
diff --git a/www/modules/civicrm/templates/CRM/UF/Form/Fields.tpl b/www/modules/civicrm/templates/CRM/UF/Form/Fields.tpl
index f697dc71a..6c0290aa1 100644
--- a/www/modules/civicrm/templates/CRM/UF/Form/Fields.tpl
+++ b/www/modules/civicrm/templates/CRM/UF/Form/Fields.tpl
@@ -58,9 +58,9 @@
           {$formElement.label}
         </div>
         <div class="content">
-          {if $profileFieldName|substr:0:3 eq 'im-'}
+          {if $profileFieldName|str_starts_with:'im-'}
             {assign var="provider" value=profileFieldNamen|cat:"-provider_id"}
-            {$form.$provider.html}&nbsp;
+            {if array_key_exists($provider, $form)}{$form.$provider.html}{/if}&nbsp;
           {/if}
 
           {if $profileFieldName eq 'email_greeting' or  $profileFieldName eq 'postal_greeting' or $profileFieldName eq 'addressee'}
@@ -115,10 +115,10 @@
                 </div>
               </div>
             {/if}
-          {elseif $profileFieldName|substr:0:5 eq 'phone'}
+          {elseif $profileFieldName|str_starts_with:'phone'}
             {assign var="phone_ext_field" value=$profileFieldName|replace:'phone':'phone_ext'}
             {$formElement.html}
-            {if $form.$phone_ext_field.html}
+            {if array_key_exists($phone_ext_field, $form)}
               &nbsp;{$form.$phone_ext_field.html}
             {/if}
           {else}
diff --git a/www/modules/civicrm/templates/CRM/common/additionalBlocks.tpl b/www/modules/civicrm/templates/CRM/common/additionalBlocks.tpl
index 54e5b6672..fd9ae2bc3 100644
--- a/www/modules/civicrm/templates/CRM/common/additionalBlocks.tpl
+++ b/www/modules/civicrm/templates/CRM/common/additionalBlocks.tpl
@@ -156,7 +156,7 @@ function clearFirstBlock( blockName , blockId ) {
     cj("#" + element +" input, " + "#" + element + " select").each(function () {
         cj(this).val('');
     });
-    cj("#addressBlockId:not(.collapsed)").crmAccordionToggle();
+    cj("#addressBlockId[open]").prop('open', false);
     cj("#addressBlockId .active").removeClass('active');
 }
 
diff --git a/www/modules/civicrm/templates/CRM/common/civicrm.settings.php.template b/www/modules/civicrm/templates/CRM/common/civicrm.settings.php.template
index 091d141e1..64609b9d3 100644
--- a/www/modules/civicrm/templates/CRM/common/civicrm.settings.php.template
+++ b/www/modules/civicrm/templates/CRM/common/civicrm.settings.php.template
@@ -254,20 +254,20 @@ if (!defined('CIVICRM_UF_BASEURL')) {
 
 
 /**
- * Specify a Smarty 3 autoload file.
+ * Specify a Smarty autoload file.
  *
- * Smarty3 is the version of Smarty we are in the process of adopting. To enable it
+ * Smarty5 is the version of Smarty we are in the process of adopting. To enable it
  * un-comment the line describing the path. Note that this will become always enabled in
  * the near future - this opt-in setting is transitional.
  */
-if (!defined('CIVICRM_SMARTY3_AUTOLOAD_PATH')) {
+if (!defined('CIVICRM_SMARTY_AUTOLOAD_PATH') && getenv('CIVICRM_SMARTY_AUTOLOAD_PATH') === FALSE) {
   // enable by default for dev & demo sites for now - will soon enable by default for all new installs.
   if (strpos(CIVICRM_UF_BASEURL, 'localhost') !== FALSE || strpos(CIVICRM_UF_BASEURL, 'demo.civicrm.org') !== FALSE) {
     if (is_dir($civicrm_root . '/packages')) {
-      define('CIVICRM_SMARTY3_AUTOLOAD_PATH', $civicrm_root . '/packages/smarty3/vendor/autoload.php');
+      define('CIVICRM_SMARTY_AUTOLOAD_PATH', $civicrm_root . '/packages/smarty5/Smarty.php');
     }
     elseif (is_dir($civicrm_root . '/../civicrm-packages')) {
-      define('CIVICRM_SMARTY3_AUTOLOAD_PATH', $civicrm_root . '/../civicrm-packages/smarty3/vendor/autoload.php');
+      define('CIVICRM_SMARTY_AUTOLOAD_PATH', $civicrm_root . '/../civicrm-packages/smarty5/Smarty.php');
     }
   }
 }
diff --git a/www/modules/civicrm/templates/CRM/common/customData.tpl b/www/modules/civicrm/templates/CRM/common/customData.tpl
index 948d76178..b6f728069 100644
--- a/www/modules/civicrm/templates/CRM/common/customData.tpl
+++ b/www/modules/civicrm/templates/CRM/common/customData.tpl
@@ -13,7 +13,7 @@
     CRM.buildCustomData = function (type, subType, subName, cgCount, groupID, isMultiple, onlySubtype, cid) {
       var dataUrl = CRM.url('civicrm/custom', {type: type}),
         prevCount = 1,
-        fname = '#customData',
+        fname = '#customData_' + type,
         storage = {};
 
       if (subType) {
@@ -26,10 +26,10 @@
 
       if (subName) {
         dataUrl += '&subName=' + subName;
-        $('#customData' + subName).show();
+        $('#customData_' + type + subName).show();
       }
       else {
-        $('#customData').show();
+        $('#customData_' + type).show();
       }
       if (groupID) {
         dataUrl += '&groupID=' + groupID;
diff --git a/www/modules/civicrm/templates/CRM/common/customDataBlock.tpl b/www/modules/civicrm/templates/CRM/common/customDataBlock.tpl
index a8195f064..46ee3c663 100644
--- a/www/modules/civicrm/templates/CRM/common/customDataBlock.tpl
+++ b/www/modules/civicrm/templates/CRM/common/customDataBlock.tpl
@@ -1,19 +1,24 @@
+
 {if !empty($customDataType)}
-  <div id="customData"></div>
+  <div id="customData_{$customDataType}" class="crm-customData-block"></div>
   {*include custom data js file*}
   {include file="CRM/common/customData.tpl"}
-  {assign var='cid' value=$cid|default:'false'}
+  {* convert falsey values to NULL so that the default of 'false' works lower down (it's a string not a bool lower down) *}
+  {if !$customDataSubType}
+    {assign value=null var=customDataSubType}
+  {/if}
+  {if !$cid}
+    {assign value=null var=cid}
+  {/if}
   {literal}
   <script type="text/javascript">
     CRM.$(function($) {
       {/literal}
-      {if !empty($customDataSubType)}
-        CRM.buildCustomData('{$customDataType}', {$customDataSubType}, false, false, false, false, false, {$cid});
-      {else}
-        CRM.buildCustomData('{$customDataType}', false, false, false, false, false, false, {$cid});
-      {/if}
-      {literal}
+      CRM.buildCustomData('{$customDataType}', {$customDataSubType|default:"false"}, false, false, false, false, false, {$cid|default:"false"});
+    {literal}
     });
   </script>
   {/literal}
 {/if}
+{* jQuery validate *}
+{include file="CRM/Form/validate.tpl"}
diff --git a/www/modules/civicrm/templates/CRM/common/fatal.tpl b/www/modules/civicrm/templates/CRM/common/fatal.tpl
index 7e5a35365..a25c88078 100644
--- a/www/modules/civicrm/templates/CRM/common/fatal.tpl
+++ b/www/modules/civicrm/templates/CRM/common/fatal.tpl
@@ -13,7 +13,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 
 <head>
-  <title>{$pageTitle|escape}</title>
+  <title>{ts}Error{/ts}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <base href="{$config->resourceBase}" />
   <style type="text/css" media="screen">
@@ -40,10 +40,10 @@
         <div class="crm-section crm-error-message">{$error.message|escape}</div>
     {/if}
     {if (!empty($code) || !empty($mysql_code) || !empty($errorDetails)) AND $config->debug}
-        <div class="crm-accordion-wrapper collapsed crm-fatal-error-details-block">
-         <div class="crm-accordion-header" onclick="toggle(this);";>
+        <details class="crm-accordion-bold crm-fatal-error-details-block">
+         <summary>
           {ts}Error Details{/ts}
-         </div><!-- /.crm-accordion-header -->
+         </summary>
          <div class="crm-accordion-body">
             {if !empty($code)}
                 <div class="crm-section">{ts}Error Code:{/ts} {$code|purify}</div>
@@ -54,25 +54,12 @@
             {if !empty($errorDetails)}
                 <div class="crm-section">{ts}Additional Details:{/ts} {$errorDetails|purify}</div>
             {/if}
-         </div><!-- /.crm-accordion-body -->
-        </div><!-- /.crm-accordion-wrapper -->
+         </div>
+        </details>
     {/if}
     <p><a href="{$config->userFrameworkBaseURL}" title="{ts}Main Menu{/ts}">{ts}Return to home page.{/ts}</a></p>
 </div>
 </div> {* end crm-container div *}
-{literal}
-<script language="JavaScript">
-function toggle( element ) {
-    var parent = element.parentNode;
-    var className = parent.className;
-    if ( className  == 'crm-accordion-wrapper collapsed crm-fatal-error-details-block') {
-        parent.className = 'crm-accordion-wrapper  crm-fatal-error-details-block';
-    } else {
-        parent.className = 'crm-accordion-wrapper collapsed crm-fatal-error-details-block';
-    }
-}
-</script>
-{/literal}
 {if $config->userFramework != 'WordPress'}
 </body>
 </html>
diff --git a/www/modules/civicrm/templates/CRM/common/highLightImport.tpl b/www/modules/civicrm/templates/CRM/common/highLightImport.tpl
index 6279ff532..4fb8b9a30 100644
--- a/www/modules/civicrm/templates/CRM/common/highLightImport.tpl
+++ b/www/modules/civicrm/templates/CRM/common/highLightImport.tpl
@@ -10,12 +10,13 @@
 {* Highlight the required field during import (included within a <script>)*}
 {literal}
 CRM.$(function($) {
-  var highlightedFields = ["{/literal}{'","'|implode:$highlightedFields}{literal}"];
+  var highlightedFields = {/literal}{$highlightedFields}{literal};
   $.each(highlightedFields, function() {
+    // This addition of color by css appears to have stopped working along the way although the append works.
     $('select[id^="mapper"][id$="_0"] option[value='+ this + ']').append(' *').css({"color":"#FF0000"});
   });
   {/literal}{if $highlightedRelFields}{literal}
-  var highlightedRelFields = {/literal}{$highlightedRelFields|@json_encode}{literal};
+  var highlightedRelFields = {/literal}{$highlightedRelFields}{literal};
   function highlight() {
     var select, fields = highlightedRelFields[$(this).val()];
     if (fields) {
diff --git a/www/modules/civicrm/templates/CRM/common/jsortable.tpl b/www/modules/civicrm/templates/CRM/common/jsortable.tpl
index c0adbc015..70781460a 100644
--- a/www/modules/civicrm/templates/CRM/common/jsortable.tpl
+++ b/www/modules/civicrm/templates/CRM/common/jsortable.tpl
@@ -29,11 +29,11 @@
     // for date sorting see http://wiki.civicrm.org/confluence/display/CRMDOC/Sorting+Date+Fields+in+dataTables+Widget
     var useAjax = {/literal}{$useAjax}{literal},
       sourceUrl = '',
-      useClass  = 'display',
+      useClass = 'display',
       tcount = 1,
       tableId = [];
 
-    if ( useAjax ) {
+    if (useAjax) {
       {/literal}{if $sourceUrl}sourceUrl = "{$sourceUrl}";{/if}{literal}
       useClass = 'pagerDisplay';
       tcount = 5;
@@ -43,37 +43,37 @@
 
     // FIXME: Rewriting DOM ids is probably a bad idea, and could be avoided
     $('table.' + useClass).not('.dataTable').each(function() {
-      $(this).attr('id','option' + tcount + CRM.dataTableCount);
+      $(this).attr('id', 'option' + tcount + CRM.dataTableCount);
       tableId.push(CRM.dataTableCount);
       CRM.dataTableCount++;
     });
 
-    $.each(tableId, function(i,n){
+    $.each(tableId, function(i, n) {
       var tabId = '#option' + tcount + n;
-      //get the object of first tr data row.
+      // get the object of first tr data row.
       var tdObject = $(tabId + ' tr:nth(1) td');
-      var id = -1; var count = 0; var columns=''; var sortColumn = '';
-      //build columns array for sorting or not sorting
-      $(tabId + ' th').each( function( ) {
+      var id = -1; var count = 0; var columns = ''; var sortColumn = '';
+      // build columns array for sorting or not sorting
+      $(tabId + ' th').each(function() {
         var option = $(this).prop('id').split("_");
-        option  = ( option.length > 1 ) ? option[1] : option[0];
-        var stype   = 'numeric';
-        switch( option ) {
+        option = (option.length > 1) ? option[1] : option[0];
+        var stype = 'numeric';
+        switch (option) {
           case 'sortable':
-            sortColumn += '[' + count + ', "asc" ],';
-            columns += '{"sClass": "'+ getElementClass( this ) +'"},';
+            sortColumn += '[' + count + ', "{/literal}{$defaultOrderByDirection}{literal}" ],';
+            columns += '{"sClass": "' + getElementClass(this) + '"},';
             break;
           case 'date':
             stype = 'date';
           case 'order':
-            if ( $(this).attr('class') == 'sortable' ){
-              sortColumn += '[' + count + ', "asc" ],';
+            if ($(this).attr('class') == 'sortable') {
+              sortColumn += '[' + count + ', "{/literal}{$defaultOrderByDirection}{literal}" ],';
             }
-            var sortId   = getRowId(tdObject, $(this).attr('id') +' hiddenElement' );
+            var sortId = getRowId(tdObject, $(this).attr('id') + ' hiddenElement');
             columns += '{ "render": function ( data, type, row ) { return "<div style=\'display:none\'>"+ data +"</div>" + row[sortId] ; }, "targets": sortColumn,"bUseRendered": false},';
             break;
           case 'nosort':
-            columns += '{ "bSortable": false, "sClass": "'+ getElementClass( this ) +'"},';
+            columns += '{ "bSortable": false, "sClass": "' + getElementClass(this) + '"},';
             break;
           case 'currency':
             columns += '{ "sType": "currency" },';
@@ -82,8 +82,8 @@
             columns += '{"sType": "html"},';
             break;
           default:
-            if ( $(this).text() ) {
-              columns += '{"sClass": "'+ getElementClass( this ) +'"},';
+            if ($(this).text()) {
+              columns += '{"sClass": "' + getElementClass(this) + '"},';
             } else {
               columns += '{ "bSortable": false },';
             }
@@ -91,16 +91,15 @@
         }
         count++;
       });
-      // Fixme: this could be done without eval
-      columns    = columns.substring(0, columns.length - 1 );
-      sortColumn = sortColumn.substring(0, sortColumn.length - 1 );
-      eval('sortColumn =[' + sortColumn + ']');
-      eval('columns =[' + columns + ']');
+      columns = columns.substring(0, columns.length - 1);
+      sortColumn = sortColumn.substring(0, sortColumn.length - 1);
+      columns = JSON.parse('[' + columns + ']');
+      sortColumn = JSON.parse('[' + sortColumn + ']');
 
-      var noRecordFoundMsg  = {/literal}'{ts escape="js"}None found.{/ts}'{literal};
+      var noRecordFoundMsg = {/literal}'{ts escape="js"}None found.{/ts}'{literal};
 
       var oTable;
-      if ( useAjax ) {
+      if (useAjax) {
         oTable = $(tabId).dataTable({
           "iDisplayLength": 25,
           "bFilter": false,
@@ -109,17 +108,17 @@
           "aoColumns": columns,
           "bProcessing": true,
           "bJQueryUI": true,
-          "asStripClasses": [ "odd-row", "even-row" ],
+          "asStripClasses": ["odd-row", "even-row"],
           "sPaginationType": "full_numbers",
           "sDom": '<"crm-datatable-pager-top"lfp>rt<"crm-datatable-pager-bottom"ip>',
           "bServerSide": true,
           "sAjaxSource": sourceUrl,
-          "oLanguage":{
+          "oLanguage": {
             "sEmptyTable": noRecordFoundMsg,
             "sZeroRecords": noRecordFoundMsg
           },
-          "fnServerData": function ( sSource, aoData, fnCallback ) {
-            $.ajax( {
+          "fnServerData": function (sSource, aoData, fnCallback) {
+            $.ajax({
               "dataType": 'json',
               "type": "POST",
               "url": sSource,
@@ -135,12 +134,12 @@
           "bLengthChange": true,
           "bFilter": false,
           "bInfo": false,
-          "asStripClasses": [ "odd-row", "even-row" ],
+          "asStripClasses": ["odd-row", "even-row"],
           "bAutoWidth": false,
           "aoColumns": columns,
           "bSort": true,
           "sDom": 'ti',
-          "oLanguage":{
+          "oLanguage": {
             "sEmptyTable": noRecordFoundMsg,
             "sZeroRecords": noRecordFoundMsg
           }
@@ -149,23 +148,23 @@
     });
   });
 
-  //plugin to sort on currency
-  cj.fn.dataTableExt.oSort['currency-asc']  = function(a,b) {
+  // plugin to sort on currency
+  cj.fn.dataTableExt.oSort['currency-asc'] = function(a, b) {
     var symbol = "{/literal}{$defaultCurrencySymbol}{literal}";
     var x = (a == "-") ? 0 : a.replace( symbol, "" );
     var y = (b == "-") ? 0 : b.replace( symbol, "" );
-    x = parseFloat( x );
-    y = parseFloat( y );
-    return ((x < y) ? -1 : ((x > y) ?  1 : 0));
+    x = parseFloat(x);
+    y = parseFloat(y);
+    return ((x < y) ? -1 : ((x > y) ? 1 : 0));
   };
 
-  cj.fn.dataTableExt.oSort['currency-desc'] = function(a,b) {
+  cj.fn.dataTableExt.oSort['currency-desc'] = function(a, b) {
     var symbol = "{/literal}{$defaultCurrencySymbol}{literal}";
     var x = (a == "-") ? 0 : a.replace( symbol, "" );
     var y = (b == "-") ? 0 : b.replace( symbol, "" );
-    x = parseFloat( x );
-    y = parseFloat( y );
-    return ((x < y) ?  1 : ((x > y) ? -1 : 0));
+    x = parseFloat(x);
+    y = parseFloat(y);
+    return ((x < y) ? 1 : ((x > y) ? -1 : 0));
   };
 </script>
 {/literal}
diff --git a/www/modules/civicrm/templates/CRM/common/l10n.js.tpl b/www/modules/civicrm/templates/CRM/common/l10n.js.tpl
index 5e8f34e45..78872565a 100644
--- a/www/modules/civicrm/templates/CRM/common/l10n.js.tpl
+++ b/www/modules/civicrm/templates/CRM/common/l10n.js.tpl
@@ -100,7 +100,7 @@
     ignoreTitle: true,
     errorPlacement: function(error, element) {
       if (element.prop('type') === 'radio') {
-        error.appendTo(element.parent('div.content'));
+        error.appendTo(element.parents('div.content')[0]);
       }
       else {
         error.insertAfter(element);
@@ -115,6 +115,7 @@
     if ($('#crm-notification-container').length) {
       $.each(validator.errorList, function(k, error) {
         $(error.element).parents('.crm-custom-accordion.collapsed').crmAccordionToggle();
+        $(error.element).parents('.crm-custom-accordion').prop('open', true);
         $(error.element).crmError(error.message);
       });
     }
diff --git a/www/modules/civicrm/templates/CRM/common/standalone.tpl b/www/modules/civicrm/templates/CRM/common/standalone.tpl
index 6f9cf0004..b7e7a1611 100644
--- a/www/modules/civicrm/templates/CRM/common/standalone.tpl
+++ b/www/modules/civicrm/templates/CRM/common/standalone.tpl
@@ -50,7 +50,7 @@
     <div class="clear"></div>
 
     <div id="crm-main-content-wrapper">
-      {* include file="CRM/common/status.tpl" @todo FIXME *}
+      {include file="CRM/common/status.tpl"}
       {crmRegion name='page-body'}
         {if isset($isForm) and $isForm and isset($formTpl)}
           {include file="CRM/Form/$formTpl.tpl"}
diff --git a/www/modules/civicrm/vendor/autoload.php b/www/modules/civicrm/vendor/autoload.php
index d6cad280c..b2691cc40 100644
--- a/www/modules/civicrm/vendor/autoload.php
+++ b/www/modules/civicrm/vendor/autoload.php
@@ -9,4 +9,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit916d9f32223eab18656bda33869fc5af::getLoader();
+return ComposerAutoloaderInitaa74d45ec227180963008c14e2673306::getLoader();
diff --git a/www/modules/civicrm/vendor/civicrm/composer-compile-plugin/.travis.yml b/www/modules/civicrm/vendor/civicrm/composer-compile-plugin/.travis.yml
index a57cede92..e7b0573da 100644
--- a/www/modules/civicrm/vendor/civicrm/composer-compile-plugin/.travis.yml
+++ b/www/modules/civicrm/vendor/civicrm/composer-compile-plugin/.travis.yml
@@ -29,6 +29,10 @@ matrix:
       dist: xenial
       php: 8.1
       env: COMPOSER_VERSION=--snapshot
+#    - os: linux
+#      dist: focal
+#      php: 8.2
+#      env: COMPOSER_VERSION=--snapshot
     - os: osx
       osx_image: xcode12
       language: generic
diff --git a/www/modules/civicrm/vendor/civicrm/composer-compile-plugin/src/Handler/ExportHandler.php b/www/modules/civicrm/vendor/civicrm/composer-compile-plugin/src/Handler/ExportHandler.php
index 8c65463ea..93f964ea8 100644
--- a/www/modules/civicrm/vendor/civicrm/composer-compile-plugin/src/Handler/ExportHandler.php
+++ b/www/modules/civicrm/vendor/civicrm/composer-compile-plugin/src/Handler/ExportHandler.php
@@ -20,6 +20,12 @@
  */
 class ExportHandler
 {
+
+    /**
+     * @var string
+     */
+    public $rootPackagePath;
+
     /**
      * ExportHandler constructor.
      */
diff --git a/www/modules/civicrm/vendor/civicrm/composer-downloads-plugin/.github/workflows/main.yml b/www/modules/civicrm/vendor/civicrm/composer-downloads-plugin/.github/workflows/main.yml
index 026f0d72b..d66a374f0 100644
--- a/www/modules/civicrm/vendor/civicrm/composer-downloads-plugin/.github/workflows/main.yml
+++ b/www/modules/civicrm/vendor/civicrm/composer-downloads-plugin/.github/workflows/main.yml
@@ -10,9 +10,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        php: [7.4, 7.3]
+        php: [7.2, 7.3, 7.4, 8.0, 8.1]
         os: [ubuntu-latest]
-        composer: [v1, v2]
+        composer: [v2]
     name: ${{ matrix.php }} - PHPUnit - Composer ${{ matrix.composer }}
     steps:
       - uses: actions/checkout@v2
diff --git a/www/modules/civicrm/vendor/civicrm/composer-downloads-plugin/README.md b/www/modules/civicrm/vendor/civicrm/composer-downloads-plugin/README.md
index 7ca12bfac..3dae12154 100644
--- a/www/modules/civicrm/vendor/civicrm/composer-downloads-plugin/README.md
+++ b/www/modules/civicrm/vendor/civicrm/composer-downloads-plugin/README.md
@@ -3,10 +3,6 @@ Composer Downloads Plugin
 
 The "Downloads" plugin allows you to download extra files (`*.zip` or `*.tar.gz`) and extract them within your package.
 
-This is an updated version of [lastcall/composer-extra-files](https://github.com/LastCallMedia/ComposerExtraFiles/).
-It adds integration tests, fixes some bugs, and makes a few other improvements. Some of the
-configuration options have changed, so it has been renamed to prevent it from conflicting in real-world usage.
-
 ## Example
 
 Suppose you publish a PHP package `foo/bar` which relies on an external artifact `examplelib-0.1.zip`. Place this configuration in the `composer.json` for `foo/bar`:
@@ -15,7 +11,7 @@ Suppose you publish a PHP package `foo/bar` which relies on an external artifact
 {
   "name": "foo/bar",
   "require": {
-    "civicrm/composer-downloads-plugin": "~2.1"
+    "civicrm/composer-downloads-plugin": "~3 || ~4"
   },
   "extra": {
     "downloads": {
@@ -31,6 +27,13 @@ Suppose you publish a PHP package `foo/bar` which relies on an external artifact
 
 When a downstream user of `foo/bar` runs `composer install`, it will fetch and extract the zip file, creating `vendor/foo/bar/extern/examplelib`. 
 
+## Release History
+
+* __v1.x__: Original release of [lastcall/composer-extra-files](https://github.com/LastCallMedia/ComposerExtraFiles/)
+* __v2.x__: Fork. Add test suite. Rename to `composer-downloads-plugin` (`extra.downloads`). Improve tracking/redownload behaviors. Add more download options. Expand docs.
+* __v3.x__: Add support for composer v2.
+* __v4.x__: Improve PHP 8.2+. Swap gitignore parser. Drop composer v1.
+
 ## Evaluation
 
 The primary strengths of `composer-downloads-plugin` are:
diff --git a/www/modules/civicrm/vendor/civicrm/composer-downloads-plugin/composer.json b/www/modules/civicrm/vendor/civicrm/composer-downloads-plugin/composer.json
index 6e51f4d51..71cf2fb9f 100644
--- a/www/modules/civicrm/vendor/civicrm/composer-downloads-plugin/composer.json
+++ b/www/modules/civicrm/vendor/civicrm/composer-downloads-plugin/composer.json
@@ -14,13 +14,13 @@
         }
     ],
     "require": {
-        "composer-plugin-api": "^1.1 || ^2.0",
-        "php": ">=5.6",
-        "togos/gitignore": "~1.1.1"
+        "composer-plugin-api": "^2.0",
+        "php": ">=7.2",
+        "civicrm/gitignore": "~1.2.0"
     },
     "require-dev": {
-        "composer/composer": "~1.0 || ~2.0",
-        "phpunit/phpunit": "^5.7",
+        "composer/composer": "~2.0",
+        "phpunit/phpunit": "^8.5 || ^9.5",
         "friendsofphp/php-cs-fixer": "^2.3",
         "totten/process-helper": "^1.0.1"
     },
diff --git a/www/modules/civicrm/vendor/civicrm/gitignore/LICENSE b/www/modules/civicrm/vendor/civicrm/gitignore/LICENSE
new file mode 100644
index 000000000..5a6f622b1
--- /dev/null
+++ b/www/modules/civicrm/vendor/civicrm/gitignore/LICENSE
@@ -0,0 +1,20 @@
+PHP Git Ignore
+Copyright (c) 2019 Dan Stevens
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/www/modules/civicrm/vendor/togos/gitignore/Makefile b/www/modules/civicrm/vendor/civicrm/gitignore/Makefile
similarity index 87%
rename from www/modules/civicrm/vendor/togos/gitignore/Makefile
rename to www/modules/civicrm/vendor/civicrm/gitignore/Makefile
index 3f547218e..91d29dba8 100644
--- a/www/modules/civicrm/vendor/togos/gitignore/Makefile
+++ b/www/modules/civicrm/vendor/civicrm/gitignore/Makefile
@@ -11,3 +11,6 @@ vendor: composer.lock
 
 run-unit-tests: vendor
 	vendor/bin/phpsimplertest --bootstrap vendor/autoload.php src/test/ --colorful-output
+
+clean:
+	rm -rf composer.lock vendor
diff --git a/www/modules/civicrm/vendor/civicrm/gitignore/README.md b/www/modules/civicrm/vendor/civicrm/gitignore/README.md
new file mode 100644
index 000000000..9cad97027
--- /dev/null
+++ b/www/modules/civicrm/vendor/civicrm/gitignore/README.md
@@ -0,0 +1,38 @@
+# PHP Git Ignore
+
+This is a maintenance fork of https://github.com/TOGoS/PHPGitIgnore to
+provide compatibility with newer versions of PHP.
+
+## Installation
+
+```bash
+composer require civicrm/gitignore
+```
+
+## Testing
+
+The `Makefile` defines targets for building and testing. If you have GNU Make and PHP, then just run:
+
+```bash
+make
+```
+
+If you don't have GNU Make and PHP, then you can use `nix-shell` ([Nix package manager](https://nixos.org/download/)), eg
+
+```bash
+nix-shell -A php83
+make
+```
+
+Or you can string together several calls, with alternating versions of PHP:
+
+```bash
+## Run the tests with multiple versions of PHP
+nix-shell -A php83 --run 'make clean run-unit-tests'
+nix-shell -A php82 --run 'make clean run-unit-tests'
+nix-shell -A php81 --run 'make clean run-unit-tests'
+nix-shell -A php74 --run 'make clean run-unit-tests'
+nix-shell -A php70 --run 'make run-unit-tests'
+nix-shell -A php56 --run 'make run-unit-tests'
+## (Each phpXX should be listed in shell.nix)
+```
diff --git a/www/modules/civicrm/vendor/togos/gitignore/composer.json b/www/modules/civicrm/vendor/civicrm/gitignore/composer.json
similarity index 83%
rename from www/modules/civicrm/vendor/togos/gitignore/composer.json
rename to www/modules/civicrm/vendor/civicrm/gitignore/composer.json
index b5df8a8cc..37ea00f82 100644
--- a/www/modules/civicrm/vendor/togos/gitignore/composer.json
+++ b/www/modules/civicrm/vendor/civicrm/gitignore/composer.json
@@ -1,10 +1,13 @@
 {
-	"name": "togos/gitignore",
+	"name": "civicrm/gitignore",
 	"description": "Parser for .gitignore (and sparse-checkout, and anything else using the same format) files",
 	"license": "MIT",
+	"replace": {
+		"togos/gitignore": "1.*"
+	},
 
 	"require": {
-		"php": ">=5.2"
+		"php": ">=5.6"
 	},
 	"autoload": {
 		"psr-0": {
diff --git a/www/modules/civicrm/vendor/civicrm/gitignore/shell.nix b/www/modules/civicrm/vendor/civicrm/gitignore/shell.nix
new file mode 100644
index 000000000..6448a0c04
--- /dev/null
+++ b/www/modules/civicrm/vendor/civicrm/gitignore/shell.nix
@@ -0,0 +1,106 @@
+let
+  pins = {
+    ## nixpkgs v22.05: Good for php74
+    v2205 = import (fetchTarball {
+      url = "https://github.com/nixos/nixpkgs/archive/ce6aa13369b667ac2542593170993504932eb836.tar.gz";
+      sha256 = "0d643wp3l77hv2pmg2fi7vyxn4rwy0iyr8djcw1h5x72315ck9ik";
+    }) {};
+    ## nixpkgs v23.11: Good for php83
+    v2311 = import (fetchTarball {
+      url = "https://github.com/nixos/nixpkgs/archive/057f9aecfb71c4437d2b27d3323df7f93c010b7e.tar.gz";
+      sha256 = "1ndiv385w1qyb3b18vw13991fzb9wg4cl21wglk89grsfsnra41k";
+    }) {};
+
+    v1803 = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/862fb5215f076833b74c7599fb4e8218d4dfeac2.tar.gz) {};
+    v1903 = import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/34c7eb7545d155cc5b6f499b23a7cb1c96ab4d59.tar.gz) {};
+  };
+
+  makePhpShell = { pkgs, php, composer }: pkgs.mkShell {
+    nativeBuildInputs = [
+      php
+      composer
+
+      ## php.packages.composer ##   <<== Works inv 22.05+ but not earlier
+
+      ## Commonly needed for shells, but not specifically assessed re:PHPGitIgnore
+      pkgs.bash-completion
+      pkgs.bzip2
+      pkgs.coreutils
+      pkgs.curl
+      pkgs.gnumake
+      pkgs.gnutar
+      pkgs.patch
+      pkgs.unzip
+      pkgs.which
+      pkgs.zip
+    ];
+    shellHook = ''
+      source ${pkgs.bash-completion}/etc/profile.d/bash_completion.sh
+    '';
+  };
+
+in {
+
+  php56 = makePhpShell {
+    pkgs = pins.v1803;
+    php = pins.v1803.php56;
+    composer = pins.v1803.php56Packages.composer;
+  };
+
+  php70 = makePhpShell {
+    pkgs = pins.v1803;
+    php = pins.v1803.php70;
+    composer = pins.v1803.php70Packages.composer;
+  };
+
+  php71 = makePhpShell {
+    pkgs = pins.v1903;
+    php = pins.v1903.php71;
+    composer = pins.v1903.php71Packages.composer;
+  };
+
+  php74 = makePhpShell {
+    pkgs = pins.v2205;
+    php = pins.v2205.php74.buildEnv {
+      # extensions = { all, enabled}: with all; enabled++ [opcache ];
+      extraConfig = ''
+        memory_limit=-1
+      '';
+    };
+    composer = pins.v2205.php74.packages.composer;
+  };
+
+  php81 = makePhpShell {
+    pkgs = pins.v2311;
+    php = pins.v2311.php81.buildEnv {
+      # extensions = { all, enabled}: with all; enabled++ [opcache ];
+      extraConfig = ''
+        memory_limit=-1
+      '';
+    };
+    composer = pins.v2311.php81.packages.composer;
+  };
+
+  php82 = makePhpShell {
+    pkgs = pins.v2311;
+    php = pins.v2311.php82.buildEnv {
+      # extensions = { all, enabled}: with all; enabled++ [opcache ];
+      extraConfig = ''
+        memory_limit=-1
+      '';
+    };
+    composer = pins.v2311.php82.packages.composer;
+  };
+
+  php83 = makePhpShell {
+    pkgs = pins.v2311;
+    php = pins.v2311.php83.buildEnv {
+      # extensions = { all, enabled}: with all; enabled++ [opcache ];
+      extraConfig = ''
+        memory_limit=-1
+      '';
+    };
+    composer = pins.v2311.php83.packages.composer;
+  };
+
+}
diff --git a/www/modules/civicrm/vendor/togos/gitignore/src/main/php/TOGoS/GitIgnore/FileFinder.php b/www/modules/civicrm/vendor/civicrm/gitignore/src/main/php/TOGoS/GitIgnore/FileFinder.php
similarity index 91%
rename from www/modules/civicrm/vendor/togos/gitignore/src/main/php/TOGoS/GitIgnore/FileFinder.php
rename to www/modules/civicrm/vendor/civicrm/gitignore/src/main/php/TOGoS/GitIgnore/FileFinder.php
index a47693768..9ff57b95b 100644
--- a/www/modules/civicrm/vendor/togos/gitignore/src/main/php/TOGoS/GitIgnore/FileFinder.php
+++ b/www/modules/civicrm/vendor/civicrm/gitignore/src/main/php/TOGoS/GitIgnore/FileFinder.php
@@ -2,6 +2,11 @@
 
 class TOGoS_GitIgnore_FileFinder
 {
+  protected $ruleset;
+  protected $invertRulesetResult;
+  protected $defaultResult;
+  protected $includeDirectories;
+  protected $callback;
 	public function __construct(array $options) {
 		// TODO: Validate options
 		$this->ruleset = $options['ruleset'];
@@ -39,4 +44,4 @@ protected function _findFiles($rootDir, $f) {
 	public function findFiles($dir) {
 		self::_findFiles($dir, '');
 	}
-}
\ No newline at end of file
+}
diff --git a/www/modules/civicrm/vendor/togos/gitignore/src/main/php/TOGoS/GitIgnore/Pattern.php b/www/modules/civicrm/vendor/civicrm/gitignore/src/main/php/TOGoS/GitIgnore/Pattern.php
similarity index 100%
rename from www/modules/civicrm/vendor/togos/gitignore/src/main/php/TOGoS/GitIgnore/Pattern.php
rename to www/modules/civicrm/vendor/civicrm/gitignore/src/main/php/TOGoS/GitIgnore/Pattern.php
diff --git a/www/modules/civicrm/vendor/togos/gitignore/src/main/php/TOGoS/GitIgnore/Rule.php b/www/modules/civicrm/vendor/civicrm/gitignore/src/main/php/TOGoS/GitIgnore/Rule.php
similarity index 63%
rename from www/modules/civicrm/vendor/togos/gitignore/src/main/php/TOGoS/GitIgnore/Rule.php
rename to www/modules/civicrm/vendor/civicrm/gitignore/src/main/php/TOGoS/GitIgnore/Rule.php
index 3b09bcd54..75ee2f78f 100644
--- a/www/modules/civicrm/vendor/togos/gitignore/src/main/php/TOGoS/GitIgnore/Rule.php
+++ b/www/modules/civicrm/vendor/civicrm/gitignore/src/main/php/TOGoS/GitIgnore/Rule.php
@@ -2,12 +2,12 @@
 
 class TOGoS_GitIgnore_Rule
 {
-	protected $isExclusion;
-	protected $pattern;
+	protected $_isExclusion;
+	protected $_pattern;
 
 	public function __construct(TOGoS_GitIgnore_Pattern $pattern, $isExclusion) {
-		$this->pattern = $pattern;
-		$this->isExclusion = $isExclusion;
+		$this->_pattern = $pattern;
+		$this->_isExclusion = $isExclusion;
 	}
 	
 	/** @return true: include this file, false: exclude this file, null: rule does not apply to this file */
@@ -15,8 +15,8 @@ public function match($path) {
 		if( !is_string($path) ) {
 			throw new Exception(__METHOD__." expects a string; given ".TOGoS_GitIgnore_Util::describe($path));
 		}
-		if( $this->pattern->match($path) ) {
-			return $this->isExclusion ? false : true;
+		if( $this->_pattern->match($path) ) {
+			return $this->_isExclusion ? false : true;
 		}
 		return null;
 	}
@@ -30,4 +30,8 @@ public static function parse($str) {
 		$pattern = TOGoS_GitIgnore_Pattern::parse($str);
 		return new self($pattern, $isExclusion);
 	}
+
+	public function isExclusion() { return $this->_isExclusion; }
+	
+	public function __toString() { return ($this->isExclusion() ? "!" : "") . $this->_pattern->getPatternString(); }
 }
diff --git a/www/modules/civicrm/vendor/togos/gitignore/src/main/php/TOGoS/GitIgnore/Ruleset.php b/www/modules/civicrm/vendor/civicrm/gitignore/src/main/php/TOGoS/GitIgnore/Ruleset.php
similarity index 100%
rename from www/modules/civicrm/vendor/togos/gitignore/src/main/php/TOGoS/GitIgnore/Ruleset.php
rename to www/modules/civicrm/vendor/civicrm/gitignore/src/main/php/TOGoS/GitIgnore/Ruleset.php
diff --git a/www/modules/civicrm/vendor/togos/gitignore/src/main/php/TOGoS/GitIgnore/Util.php b/www/modules/civicrm/vendor/civicrm/gitignore/src/main/php/TOGoS/GitIgnore/Util.php
similarity index 100%
rename from www/modules/civicrm/vendor/togos/gitignore/src/main/php/TOGoS/GitIgnore/Util.php
rename to www/modules/civicrm/vendor/civicrm/gitignore/src/main/php/TOGoS/GitIgnore/Util.php
diff --git a/www/modules/civicrm/vendor/composer/autoload_files.php b/www/modules/civicrm/vendor/composer/autoload_files.php
index 3a0ccbe7d..66b7810b3 100644
--- a/www/modules/civicrm/vendor/composer/autoload_files.php
+++ b/www/modules/civicrm/vendor/composer/autoload_files.php
@@ -82,5 +82,6 @@
     '5897ea0ac4cccf14d323035e65887801' => $vendorDir . '/symfony/polyfill-php82/bootstrap.php',
     '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
     'bad842bce63596a608e2623519fb382c' => $vendorDir . '/xkerman/restricted-unserialize/src/function.php',
+    '23c7c9fb739a56c448f3bc838e8b186d' => $baseDir . '/functions.php',
     '59969633dcdb4ee3e2fec945065028d6' => $baseDir . '/guzzle_php81_shim.php',
 );
diff --git a/www/modules/civicrm/vendor/composer/autoload_namespaces.php b/www/modules/civicrm/vendor/composer/autoload_namespaces.php
index c2f335dc3..ccbaa6455 100644
--- a/www/modules/civicrm/vendor/composer/autoload_namespaces.php
+++ b/www/modules/civicrm/vendor/composer/autoload_namespaces.php
@@ -7,7 +7,7 @@
 
 return array(
     'Validate' => array($vendorDir . '/pear/validate_finance_creditcard'),
-    'TOGoS_GitIgnore_' => array($vendorDir . '/togos/gitignore/src/main/php'),
+    'TOGoS_GitIgnore_' => array($vendorDir . '/civicrm/gitignore/src/main/php'),
     'PHPUnit_' => array($baseDir . '/packages'),
     'Net' => array($vendorDir . '/pear/net_socket', $vendorDir . '/pear/net_smtp'),
     'Mail' => array($vendorDir . '/pear/mail', $vendorDir . '/pear/mail_mime'),
diff --git a/www/modules/civicrm/vendor/composer/autoload_real.php b/www/modules/civicrm/vendor/composer/autoload_real.php
index fc28d66a3..d990f3b45 100644
--- a/www/modules/civicrm/vendor/composer/autoload_real.php
+++ b/www/modules/civicrm/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit916d9f32223eab18656bda33869fc5af
+class ComposerAutoloaderInitaa74d45ec227180963008c14e2673306
 {
     private static $loader;
 
@@ -24,22 +24,22 @@ public static function getLoader()
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit916d9f32223eab18656bda33869fc5af', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitaa74d45ec227180963008c14e2673306', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit916d9f32223eab18656bda33869fc5af', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitaa74d45ec227180963008c14e2673306', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths[] = get_include_path();
         set_include_path(implode(PATH_SEPARATOR, $includePaths));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit916d9f32223eab18656bda33869fc5af::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitaa74d45ec227180963008c14e2673306::getInitializer($loader));
 
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInit916d9f32223eab18656bda33869fc5af::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInitaa74d45ec227180963008c14e2673306::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire916d9f32223eab18656bda33869fc5af($fileIdentifier, $file);
+            composerRequireaa74d45ec227180963008c14e2673306($fileIdentifier, $file);
         }
 
         return $loader;
@@ -51,7 +51,7 @@ public static function getLoader()
  * @param string $file
  * @return void
  */
-function composerRequire916d9f32223eab18656bda33869fc5af($fileIdentifier, $file)
+function composerRequireaa74d45ec227180963008c14e2673306($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
diff --git a/www/modules/civicrm/vendor/composer/autoload_static.php b/www/modules/civicrm/vendor/composer/autoload_static.php
index 402d9b9bd..da7c4cb3f 100644
--- a/www/modules/civicrm/vendor/composer/autoload_static.php
+++ b/www/modules/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit916d9f32223eab18656bda33869fc5af
+class ComposerStaticInitaa74d45ec227180963008c14e2673306
 {
     public static $files = array (
         'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -83,6 +83,7 @@ class ComposerStaticInit916d9f32223eab18656bda33869fc5af
         '5897ea0ac4cccf14d323035e65887801' => __DIR__ . '/..' . '/symfony/polyfill-php82/bootstrap.php',
         '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
         'bad842bce63596a608e2623519fb382c' => __DIR__ . '/..' . '/xkerman/restricted-unserialize/src/function.php',
+        '23c7c9fb739a56c448f3bc838e8b186d' => __DIR__ . '/../..' . '/functions.php',
         '59969633dcdb4ee3e2fec945065028d6' => __DIR__ . '/../..' . '/guzzle_php81_shim.php',
     );
 
@@ -464,7 +465,7 @@ class ComposerStaticInit916d9f32223eab18656bda33869fc5af
         array (
             'TOGoS_GitIgnore_' => 
             array (
-                0 => __DIR__ . '/..' . '/togos/gitignore/src/main/php',
+                0 => __DIR__ . '/..' . '/civicrm/gitignore/src/main/php',
             ),
         ),
         'P' => 
@@ -713,11 +714,11 @@ class ComposerStaticInit916d9f32223eab18656bda33869fc5af
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit916d9f32223eab18656bda33869fc5af::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit916d9f32223eab18656bda33869fc5af::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit916d9f32223eab18656bda33869fc5af::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit916d9f32223eab18656bda33869fc5af::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit916d9f32223eab18656bda33869fc5af::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitaa74d45ec227180963008c14e2673306::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitaa74d45ec227180963008c14e2673306::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInitaa74d45ec227180963008c14e2673306::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInitaa74d45ec227180963008c14e2673306::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInitaa74d45ec227180963008c14e2673306::$classMap;
 
         }, null, ClassLoader::class);
     }
diff --git a/www/modules/civicrm/vendor/composer/include_paths.php b/www/modules/civicrm/vendor/composer/include_paths.php
index 5386e5c83..59371ec74 100644
--- a/www/modules/civicrm/vendor/composer/include_paths.php
+++ b/www/modules/civicrm/vendor/composer/include_paths.php
@@ -7,8 +7,8 @@
 
 return array(
     $vendorDir . '/tecnickcom',
-    $vendorDir . '/pear/pear_exception',
     $vendorDir . '/pear/auth_sasl',
+    $vendorDir . '/pear/pear_exception',
     $vendorDir . '/pear/console_getopt',
     $vendorDir . '/pear/pear-core-minimal/src',
     $vendorDir . '/pear/db',
diff --git a/www/modules/civicrm/vendor/composer/installed.json b/www/modules/civicrm/vendor/composer/installed.json
index f79761da2..2261121f3 100644
--- a/www/modules/civicrm/vendor/composer/installed.json
+++ b/www/modules/civicrm/vendor/composer/installed.json
@@ -292,17 +292,17 @@
         },
         {
             "name": "civicrm/composer-compile-plugin",
-            "version": "v0.19",
-            "version_normalized": "0.19.0.0",
+            "version": "v0.20",
+            "version_normalized": "0.20.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/civicrm/composer-compile-plugin.git",
-                "reference": "496d266d42fddb3d7cdec2d7c46bad3e9495801c"
+                "reference": "0933ff53cd720ddcb24bdc5984879673ea1e0cbe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/496d266d42fddb3d7cdec2d7c46bad3e9495801c",
-                "reference": "496d266d42fddb3d7cdec2d7c46bad3e9495801c",
+                "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/0933ff53cd720ddcb24bdc5984879673ea1e0cbe",
+                "reference": "0933ff53cd720ddcb24bdc5984879673ea1e0cbe",
                 "shasum": ""
             },
             "require": {
@@ -314,7 +314,7 @@
                 "composer/composer": "~1.0",
                 "totten/process-helper": "^1.0.1"
             },
-            "time": "2022-07-22T09:22:20+00:00",
+            "time": "2023-03-01T06:55:29+00:00",
             "type": "composer-plugin",
             "extra": {
                 "class": "Civi\\CompilePlugin\\CompilePlugin"
@@ -338,37 +338,37 @@
             "description": "Define a 'compile' event for all packages in the dependency-graph",
             "support": {
                 "issues": "https://github.com/civicrm/composer-compile-plugin/issues",
-                "source": "https://github.com/civicrm/composer-compile-plugin/tree/v0.19"
+                "source": "https://github.com/civicrm/composer-compile-plugin/tree/v0.20"
             },
             "install-path": "../civicrm/composer-compile-plugin"
         },
         {
             "name": "civicrm/composer-downloads-plugin",
-            "version": "v3.0.1",
-            "version_normalized": "3.0.1.0",
+            "version": "v4.0.0",
+            "version_normalized": "4.0.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/civicrm/composer-downloads-plugin.git",
-                "reference": "3aabb6d259a86158d01829fc2c62a2afb9618877"
+                "reference": "7af08ca4a78607ac2bad3215c05a10390da9c673"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/civicrm/composer-downloads-plugin/zipball/3aabb6d259a86158d01829fc2c62a2afb9618877",
-                "reference": "3aabb6d259a86158d01829fc2c62a2afb9618877",
+                "url": "https://api.github.com/repos/civicrm/composer-downloads-plugin/zipball/7af08ca4a78607ac2bad3215c05a10390da9c673",
+                "reference": "7af08ca4a78607ac2bad3215c05a10390da9c673",
                 "shasum": ""
             },
             "require": {
-                "composer-plugin-api": "^1.1 || ^2.0",
-                "php": ">=5.6",
-                "togos/gitignore": "~1.1.1"
+                "civicrm/gitignore": "~1.2.0",
+                "composer-plugin-api": "^2.0",
+                "php": ">=7.2"
             },
             "require-dev": {
-                "composer/composer": "~1.0 || ~2.0",
+                "composer/composer": "~2.0",
                 "friendsofphp/php-cs-fixer": "^2.3",
-                "phpunit/phpunit": "^5.7",
+                "phpunit/phpunit": "^8.5 || ^9.5",
                 "totten/process-helper": "^1.0.1"
             },
-            "time": "2020-11-02T05:26:23+00:00",
+            "time": "2024-04-09T20:34:36+00:00",
             "type": "composer-plugin",
             "extra": {
                 "class": "LastCall\\DownloadsPlugin\\Plugin"
@@ -395,10 +395,52 @@
             ],
             "description": "Composer plugin for downloading additional files within any composer package.",
             "support": {
-                "source": "https://github.com/civicrm/composer-downloads-plugin/tree/v3.0.1"
+                "source": "https://github.com/civicrm/composer-downloads-plugin/tree/v4.0.0"
             },
             "install-path": "../civicrm/composer-downloads-plugin"
         },
+        {
+            "name": "civicrm/gitignore",
+            "version": "1.2.0",
+            "version_normalized": "1.2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/civicrm/PHPGitIgnore.git",
+                "reference": "7491782ee89c4e14bbcc9b30bebb90389054cb2e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/civicrm/PHPGitIgnore/zipball/7491782ee89c4e14bbcc9b30bebb90389054cb2e",
+                "reference": "7491782ee89c4e14bbcc9b30bebb90389054cb2e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "replace": {
+                "togos/gitignore": "1.*"
+            },
+            "require-dev": {
+                "togos/simpler-test": "1.1.1"
+            },
+            "time": "2024-04-09T07:07:33+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-0": {
+                    "TOGoS_GitIgnore_": "src/main/php/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Parser for .gitignore (and sparse-checkout, and anything else using the same format) files",
+            "support": {
+                "source": "https://github.com/civicrm/PHPGitIgnore/tree/1.2.0"
+            },
+            "install-path": "../civicrm/gitignore"
+        },
         {
             "name": "cweagans/composer-patches",
             "version": "1.7.3",
@@ -1986,26 +2028,23 @@
         },
         {
             "name": "pear/auth_sasl",
-            "version": "v1.1.0",
-            "version_normalized": "1.1.0.0",
+            "version": "v1.2.0",
+            "version_normalized": "1.2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Auth_SASL.git",
-                "reference": "db1ead3dc0bf986d2bab0dbc04d114800cf91dee"
+                "reference": "ebf4c2c5ea190b283229f8443b866ccf34422471"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Auth_SASL/zipball/db1ead3dc0bf986d2bab0dbc04d114800cf91dee",
-                "reference": "db1ead3dc0bf986d2bab0dbc04d114800cf91dee",
+                "url": "https://api.github.com/repos/pear/Auth_SASL/zipball/ebf4c2c5ea190b283229f8443b866ccf34422471",
+                "reference": "ebf4c2c5ea190b283229f8443b866ccf34422471",
                 "shasum": ""
             },
-            "require": {
-                "pear/pear_exception": "@stable"
-            },
             "require-dev": {
                 "phpunit/phpunit": "@stable"
             },
-            "time": "2017-03-07T14:37:05+00:00",
+            "time": "2023-12-21T21:52:08+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2018,7 +2057,7 @@
                 "./"
             ],
             "license": [
-                "BSD"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
@@ -2038,6 +2077,7 @@
                 }
             ],
             "description": "Abstraction of various SASL mechanism responses",
+            "homepage": "http://pear.php.net/package/Auth_SASL",
             "support": {
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Auth_SASL",
                 "source": "https://github.com/pear/Auth_SASL"
@@ -2100,28 +2140,26 @@
         },
         {
             "name": "pear/db",
-            "version": "v1.11.0",
-            "version_normalized": "1.11.0.0",
+            "version": "v1.12.1",
+            "version_normalized": "1.12.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/DB.git",
-                "reference": "7e4f33dcecd99595df982ef8f56c1d7c2bbeaa21"
+                "reference": "403775906ed8bb25505cefdee49885de181862da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/DB/zipball/7e4f33dcecd99595df982ef8f56c1d7c2bbeaa21",
-                "reference": "7e4f33dcecd99595df982ef8f56c1d7c2bbeaa21",
+                "url": "https://api.github.com/repos/pear/DB/zipball/403775906ed8bb25505cefdee49885de181862da",
+                "reference": "403775906ed8bb25505cefdee49885de181862da",
                 "shasum": ""
             },
             "require": {
                 "pear/pear-core-minimal": "*"
             },
-            "time": "2021-08-11T00:24:34+00:00",
+            "time": "2024-01-17T08:06:35+00:00",
             "type": "library",
             "extra": {
                 "patches_applied": {
-                    "Apply patch to ensure that MySQLI reporting remains the same in php8.1": "https://patch-diff.githubusercontent.com/raw/pear/DB/pull/13.patch",
-                    "Apply patch to fix deprecations in php8.2": "https://patch-diff.githubusercontent.com/raw/pear/DB/pull/14.patch",
                     "Apply CiviCRM Customisations for the pear:db package": "https://raw.githubusercontent.com/civicrm/civicrm-core/2ad420c394/tools/scripts/composer/pear_db_civicrm_changes.patch"
                 }
             },
@@ -2149,6 +2187,11 @@
                     "email": "aharvey@php.net",
                     "role": "Lead"
                 },
+                {
+                    "name": "Armin Graefe",
+                    "email": "schengawegga@gmail.com",
+                    "role": "Lead"
+                },
                 {
                     "name": "Stig Bakken",
                     "email": "stig@php.net",
@@ -2237,17 +2280,17 @@
         },
         {
             "name": "pear/mail",
-            "version": "v1.5.0",
-            "version_normalized": "1.5.0.0",
+            "version": "v2.0.0",
+            "version_normalized": "2.0.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Mail.git",
-                "reference": "c31b7635899a630a8ce681e5ced18cededcc15f3"
+                "reference": "eb053f8b74f4f3178105fcf001626e63068c0dbc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Mail/zipball/c31b7635899a630a8ce681e5ced18cededcc15f3",
-                "reference": "c31b7635899a630a8ce681e5ced18cededcc15f3",
+                "url": "https://api.github.com/repos/pear/Mail/zipball/eb053f8b74f4f3178105fcf001626e63068c0dbc",
+                "reference": "eb053f8b74f4f3178105fcf001626e63068c0dbc",
                 "shasum": ""
             },
             "require": {
@@ -2260,7 +2303,7 @@
             "suggest": {
                 "pear/net_smtp": "Install optionally via your project's composer.json"
             },
-            "time": "2022-11-29T22:04:18+00:00",
+            "time": "2024-01-15T21:56:23+00:00",
             "type": "library",
             "extra": {
                 "patches_applied": {
@@ -2371,17 +2414,17 @@
         },
         {
             "name": "pear/net_smtp",
-            "version": "1.10.0",
-            "version_normalized": "1.10.0.0",
+            "version": "1.12.1",
+            "version_normalized": "1.12.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Net_SMTP.git",
-                "reference": "51e5997b711fbd1e5a9a075634d4d682168537fa"
+                "reference": "5d7ba854d75a7c207d8581de1cc6fd2895ae2518"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Net_SMTP/zipball/51e5997b711fbd1e5a9a075634d4d682168537fa",
-                "reference": "51e5997b711fbd1e5a9a075634d4d682168537fa",
+                "url": "https://api.github.com/repos/pear/Net_SMTP/zipball/5d7ba854d75a7c207d8581de1cc6fd2895ae2518",
+                "reference": "5d7ba854d75a7c207d8581de1cc6fd2895ae2518",
                 "shasum": ""
             },
             "require": {
@@ -2395,7 +2438,7 @@
             "suggest": {
                 "pear/auth_sasl": "Install optionally via your project's composer.json"
             },
-            "time": "2021-03-19T18:39:42+00:00",
+            "time": "2024-04-15T19:42:15+00:00",
             "type": "library",
             "extra": {
                 "patches_applied": {
@@ -2426,6 +2469,11 @@
                     "name": "Chuck Hagenbuch",
                     "email": "chuck@horde.org",
                     "role": "Lead"
+                },
+                {
+                    "name": "Armin Graefe",
+                    "email": "schengawegga@gmail.com",
+                    "role": "Lead"
                 }
             ],
             "description": "An implementation of the SMTP protocol",
@@ -2443,26 +2491,27 @@
         },
         {
             "name": "pear/net_socket",
-            "version": "1.0.14",
-            "version_normalized": "1.0.14.0",
+            "version": "v1.2.1",
+            "version_normalized": "1.2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Net_Socket.git",
-                "reference": "fcd33efd77e4b35ce85489141ab9145343579fe8"
+                "reference": "f31d75ac352d49908f8987bbb1496c02a409812a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Net_Socket/zipball/fcd33efd77e4b35ce85489141ab9145343579fe8",
-                "reference": "fcd33efd77e4b35ce85489141ab9145343579fe8",
+                "url": "https://api.github.com/repos/pear/Net_Socket/zipball/f31d75ac352d49908f8987bbb1496c02a409812a",
+                "reference": "f31d75ac352d49908f8987bbb1496c02a409812a",
                 "shasum": ""
             },
             "require": {
-                "pear/pear_exception": "*"
+                "pear/pear_exception": "@stable",
+                "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "*"
+                "phpunit/phpunit": "^4"
             },
-            "time": "2014-02-20T19:27:06+00:00",
+            "time": "2017-04-06T15:16:38+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2475,7 +2524,7 @@
                 "./"
             ],
             "license": [
-                "PHP License"
+                "BSD-2-Clause"
             ],
             "authors": [
                 {
@@ -2714,17 +2763,17 @@
         },
         {
             "name": "phenx/php-svg-lib",
-            "version": "0.5.1",
-            "version_normalized": "0.5.1.0",
+            "version": "0.5.2",
+            "version_normalized": "0.5.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/php-svg-lib.git",
-                "reference": "8a8a1ebcf6aea861ef30197999f096f7bd4b4456"
+                "reference": "732faa9fb4309221e2bd9b2fda5de44f947133aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/8a8a1ebcf6aea861ef30197999f096f7bd4b4456",
-                "reference": "8a8a1ebcf6aea861ef30197999f096f7bd4b4456",
+                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/732faa9fb4309221e2bd9b2fda5de44f947133aa",
+                "reference": "732faa9fb4309221e2bd9b2fda5de44f947133aa",
                 "shasum": ""
             },
             "require": {
@@ -2735,7 +2784,7 @@
             "require-dev": {
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5"
             },
-            "time": "2023-12-11T20:56:08+00:00",
+            "time": "2024-02-07T12:49:40+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2757,7 +2806,7 @@
             "homepage": "https://github.com/PhenX/php-svg-lib",
             "support": {
                 "issues": "https://github.com/dompdf/php-svg-lib/issues",
-                "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.1"
+                "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.2"
             },
             "install-path": "../phenx/php-svg-lib"
         },
@@ -2988,17 +3037,17 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.31",
-            "version_normalized": "2.0.31.0",
+            "version": "2.0.47",
+            "version_normalized": "2.0.47.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "233a920cb38636a43b18d428f9a8db1f0a1a08f4"
+                "reference": "b7d7d90ee7df7f33a664b4aea32d50a305d35adb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/233a920cb38636a43b18d428f9a8db1f0a1a08f4",
-                "reference": "233a920cb38636a43b18d428f9a8db1f0a1a08f4",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/b7d7d90ee7df7f33a664b4aea32d50a305d35adb",
+                "reference": "b7d7d90ee7df7f33a664b4aea32d50a305d35adb",
                 "shasum": ""
             },
             "require": {
@@ -3013,9 +3062,10 @@
                 "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
                 "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
                 "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
+                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
+                "ext-xml": "Install the XML extension to load XML formatted public keys."
             },
-            "time": "2021-04-06T13:56:45+00:00",
+            "time": "2024-02-26T04:55:38+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3080,7 +3130,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.31"
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.47"
             },
             "funding": [
                 {
@@ -3100,23 +3150,23 @@
         },
         {
             "name": "pontedilana/php-weasyprint",
-            "version": "0.13.0",
-            "version_normalized": "0.13.0.0",
+            "version": "1.4.0",
+            "version_normalized": "1.4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pontedilana/php-weasyprint.git",
-                "reference": "3ceba9644240e775d3d44e1bcee90b930769a17f"
+                "reference": "62c8704834e7d2a3688318ec15bf0e87b3061de9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pontedilana/php-weasyprint/zipball/3ceba9644240e775d3d44e1bcee90b930769a17f",
-                "reference": "3ceba9644240e775d3d44e1bcee90b930769a17f",
+                "url": "https://api.github.com/repos/pontedilana/php-weasyprint/zipball/62c8704834e7d2a3688318ec15bf0e87b3061de9",
+                "reference": "62c8704834e7d2a3688318ec15bf0e87b3061de9",
                 "shasum": ""
             },
             "require": {
-                "php": "7.4.* || 8.0.* || 8.1.* || 8.2.*",
+                "php": "7.4.* || 8.0.* || 8.1.* || 8.2.* || 8.3.*",
                 "psr/log": "^1.1 || ^2.0 || ^3.0",
-                "symfony/process": "^4.4 || ^5.4 || ^6.0"
+                "symfony/process": "^5.4 || ^6.2  || ^7"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^3.4",
@@ -3125,7 +3175,7 @@
                 "phpstan/phpstan-phpunit": "^1.0",
                 "phpunit/phpunit": "^9.5"
             },
-            "time": "2023-01-16T09:42:22+00:00",
+            "time": "2023-11-20T08:58:59+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3151,8 +3201,18 @@
             ],
             "support": {
                 "issues": "https://github.com/pontedilana/php-weasyprint/issues",
-                "source": "https://github.com/pontedilana/php-weasyprint/tree/0.13.0"
+                "source": "https://github.com/pontedilana/php-weasyprint/tree/1.4.0"
             },
+            "funding": [
+                {
+                    "url": "https://github.com/endelwar",
+                    "type": "github"
+                },
+                {
+                    "url": "https://ko-fi.com/endelwar",
+                    "type": "ko_fi"
+                }
+            ],
             "install-path": "../pontedilana/php-weasyprint"
         },
         {
@@ -3382,23 +3442,23 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.3",
-            "version_normalized": "1.1.3.0",
+            "version": "1.1.4",
+            "version_normalized": "1.1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
-            "time": "2020-03-23T09:12:05+00:00",
+            "time": "2021-05-03T11:20:27+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -3418,7 +3478,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for logging libraries",
@@ -3429,7 +3489,7 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.3"
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
             },
             "install-path": "../psr/log"
         },
@@ -3586,17 +3646,17 @@
         },
         {
             "name": "sabberworm/php-css-parser",
-            "version": "8.4.0",
-            "version_normalized": "8.4.0.0",
+            "version": "v8.5.1",
+            "version_normalized": "8.5.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sabberworm/PHP-CSS-Parser.git",
-                "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30"
+                "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
+                "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30",
-                "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30",
+                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/4a3d572b0f8b28bb6fd016ae8bbfc445facef152",
+                "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152",
                 "shasum": ""
             },
             "require": {
@@ -3604,14 +3664,18 @@
                 "php": ">=5.6.20"
             },
             "require-dev": {
-                "codacy/coverage": "^1.4",
-                "phpunit/phpunit": "^4.8.36"
+                "phpunit/phpunit": "^5.7.27"
             },
             "suggest": {
                 "ext-mbstring": "for parsing UTF-8 CSS"
             },
-            "time": "2021-12-11T13:40:54+00:00",
+            "time": "2024-02-15T16:41:13+00:00",
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "9.0.x-dev"
+                }
+            },
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {
@@ -3625,6 +3689,14 @@
             "authors": [
                 {
                     "name": "Raphael Schweikert"
+                },
+                {
+                    "name": "Oliver Klee",
+                    "email": "github@oliverklee.de"
+                },
+                {
+                    "name": "Jake Hotson",
+                    "email": "jake.github@qzdesign.co.uk"
                 }
             ],
             "description": "Parser for CSS Files written in PHP",
@@ -3635,8 +3707,8 @@
                 "stylesheet"
             ],
             "support": {
-                "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues",
-                "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.4.0"
+                "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
+                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.5.1"
             },
             "install-path": "../sabberworm/php-css-parser"
         },
@@ -4653,28 +4725,25 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.27.0",
-            "version_normalized": "1.27.0.0",
+            "version": "v1.29.0",
+            "version_normalized": "1.29.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
-            "time": "2022-11-03T14:55:06+00:00",
+            "time": "2024-01-29T20:11:03+00:00",
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -4719,7 +4788,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -4903,24 +4972,24 @@
         },
         {
             "name": "symfony/process",
-            "version": "v4.4.41",
-            "version_normalized": "4.4.41.0",
+            "version": "v5.4.36",
+            "version_normalized": "5.4.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "9eedd60225506d56e42210a70c21bb80ca8456ce"
+                "reference": "4fdf34004f149cc20b2f51d7d119aa500caad975"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/9eedd60225506d56e42210a70c21bb80ca8456ce",
-                "reference": "9eedd60225506d56e42210a70c21bb80ca8456ce",
+                "url": "https://api.github.com/repos/symfony/process/zipball/4fdf34004f149cc20b2f51d7d119aa500caad975",
+                "reference": "4fdf34004f149cc20b2f51d7d119aa500caad975",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3",
+                "php": ">=7.2.5",
                 "symfony/polyfill-php80": "^1.16"
             },
-            "time": "2022-04-04T10:19:07+00:00",
+            "time": "2024-02-12T15:49:53+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -4948,7 +5017,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v4.4.41"
+                "source": "https://github.com/symfony/process/tree/v5.4.36"
             },
             "funding": [
                 {
@@ -5142,23 +5211,23 @@
         },
         {
             "name": "tecnickcom/tcpdf",
-            "version": "6.4.4",
-            "version_normalized": "6.4.4.0",
+            "version": "6.7.5",
+            "version_normalized": "6.7.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tecnickcom/TCPDF.git",
-                "reference": "42cd0f9786af7e5db4fcedaa66f717b0d0032320"
+                "reference": "951eabf0338ec2522bd0d5d9c79b08a3a3d36b36"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/42cd0f9786af7e5db4fcedaa66f717b0d0032320",
-                "reference": "42cd0f9786af7e5db4fcedaa66f717b0d0032320",
+                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/951eabf0338ec2522bd0d5d9c79b08a3a3d36b36",
+                "reference": "951eabf0338ec2522bd0d5d9c79b08a3a3d36b36",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=5.5.0"
             },
-            "time": "2021-12-31T08:39:24+00:00",
+            "time": "2024-04-20T17:25:10+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -5183,7 +5252,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPL-3.0-only"
+                "LGPL-3.0-or-later"
             ],
             "authors": [
                 {
@@ -5205,7 +5274,7 @@
             ],
             "support": {
                 "issues": "https://github.com/tecnickcom/TCPDF/issues",
-                "source": "https://github.com/tecnickcom/TCPDF/tree/6.4.4"
+                "source": "https://github.com/tecnickcom/TCPDF/tree/6.7.5"
             },
             "funding": [
                 {
@@ -5215,46 +5284,6 @@
             ],
             "install-path": "../tecnickcom/tcpdf"
         },
-        {
-            "name": "togos/gitignore",
-            "version": "1.1.1",
-            "version_normalized": "1.1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/TOGoS/PHPGitIgnore.git",
-                "reference": "32bc0830e4123f670adcbf5ddda5bef362f4f4d4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/TOGoS/PHPGitIgnore/zipball/32bc0830e4123f670adcbf5ddda5bef362f4f4d4",
-                "reference": "32bc0830e4123f670adcbf5ddda5bef362f4f4d4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2"
-            },
-            "require-dev": {
-                "togos/simpler-test": "1.1.1"
-            },
-            "time": "2019-04-19T19:16:58+00:00",
-            "type": "library",
-            "installation-source": "dist",
-            "autoload": {
-                "psr-0": {
-                    "TOGoS_GitIgnore_": "src/main/php/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Parser for .gitignore (and sparse-checkout, and anything else using the same format) files",
-            "support": {
-                "issues": "https://github.com/TOGoS/PHPGitIgnore/issues",
-                "source": "https://github.com/TOGoS/PHPGitIgnore/tree/master"
-            },
-            "install-path": "../togos/gitignore"
-        },
         {
             "name": "totten/ca-config",
             "version": "v23.07.0",
diff --git a/www/modules/civicrm/vendor/composer/installed.php b/www/modules/civicrm/vendor/composer/installed.php
index e55fcc4b7..b94d68569 100644
--- a/www/modules/civicrm/vendor/composer/installed.php
+++ b/www/modules/civicrm/vendor/composer/installed.php
@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => 'civicrm/civicrm-core',
-        'pretty_version' => '5.70.x-dev',
-        'version' => '5.70.9999999.9999999-dev',
-        'reference' => '5acc60c51015091954b12aedcccbc180d30f70b5',
+        'pretty_version' => '5.74.x-dev',
+        'version' => '5.74.9999999.9999999-dev',
+        'reference' => '3e5fbfd58f35c5943ceb071957730e4130b2388b',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -38,9 +38,9 @@
             'dev_requirement' => false,
         ),
         'civicrm/civicrm-core' => array(
-            'pretty_version' => '5.70.x-dev',
-            'version' => '5.70.9999999.9999999-dev',
-            'reference' => '5acc60c51015091954b12aedcccbc180d30f70b5',
+            'pretty_version' => '5.74.x-dev',
+            'version' => '5.74.9999999.9999999-dev',
+            'reference' => '3e5fbfd58f35c5943ceb071957730e4130b2388b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -65,23 +65,32 @@
             'dev_requirement' => false,
         ),
         'civicrm/composer-compile-plugin' => array(
-            'pretty_version' => 'v0.19',
-            'version' => '0.19.0.0',
-            'reference' => '496d266d42fddb3d7cdec2d7c46bad3e9495801c',
+            'pretty_version' => 'v0.20',
+            'version' => '0.20.0.0',
+            'reference' => '0933ff53cd720ddcb24bdc5984879673ea1e0cbe',
             'type' => 'composer-plugin',
             'install_path' => __DIR__ . '/../civicrm/composer-compile-plugin',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'civicrm/composer-downloads-plugin' => array(
-            'pretty_version' => 'v3.0.1',
-            'version' => '3.0.1.0',
-            'reference' => '3aabb6d259a86158d01829fc2c62a2afb9618877',
+            'pretty_version' => 'v4.0.0',
+            'version' => '4.0.0.0',
+            'reference' => '7af08ca4a78607ac2bad3215c05a10390da9c673',
             'type' => 'composer-plugin',
             'install_path' => __DIR__ . '/../civicrm/composer-downloads-plugin',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
+        'civicrm/gitignore' => array(
+            'pretty_version' => '1.2.0',
+            'version' => '1.2.0.0',
+            'reference' => '7491782ee89c4e14bbcc9b30bebb90389054cb2e',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../civicrm/gitignore',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
         'cweagans/composer-patches' => array(
             'pretty_version' => '1.7.3',
             'version' => '1.7.3.0',
@@ -287,9 +296,9 @@
             'dev_requirement' => false,
         ),
         'pear/auth_sasl' => array(
-            'pretty_version' => 'v1.1.0',
-            'version' => '1.1.0.0',
-            'reference' => 'db1ead3dc0bf986d2bab0dbc04d114800cf91dee',
+            'pretty_version' => 'v1.2.0',
+            'version' => '1.2.0.0',
+            'reference' => 'ebf4c2c5ea190b283229f8443b866ccf34422471',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/auth_sasl',
             'aliases' => array(),
@@ -305,9 +314,9 @@
             'dev_requirement' => false,
         ),
         'pear/db' => array(
-            'pretty_version' => 'v1.11.0',
-            'version' => '1.11.0.0',
-            'reference' => '7e4f33dcecd99595df982ef8f56c1d7c2bbeaa21',
+            'pretty_version' => 'v1.12.1',
+            'version' => '1.12.1.0',
+            'reference' => '403775906ed8bb25505cefdee49885de181862da',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/db',
             'aliases' => array(),
@@ -323,9 +332,9 @@
             'dev_requirement' => false,
         ),
         'pear/mail' => array(
-            'pretty_version' => 'v1.5.0',
-            'version' => '1.5.0.0',
-            'reference' => 'c31b7635899a630a8ce681e5ced18cededcc15f3',
+            'pretty_version' => 'v2.0.0',
+            'version' => '2.0.0.0',
+            'reference' => 'eb053f8b74f4f3178105fcf001626e63068c0dbc',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/mail',
             'aliases' => array(),
@@ -341,18 +350,18 @@
             'dev_requirement' => false,
         ),
         'pear/net_smtp' => array(
-            'pretty_version' => '1.10.0',
-            'version' => '1.10.0.0',
-            'reference' => '51e5997b711fbd1e5a9a075634d4d682168537fa',
+            'pretty_version' => '1.12.1',
+            'version' => '1.12.1.0',
+            'reference' => '5d7ba854d75a7c207d8581de1cc6fd2895ae2518',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/net_smtp',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'pear/net_socket' => array(
-            'pretty_version' => '1.0.14',
-            'version' => '1.0.14.0',
-            'reference' => 'fcd33efd77e4b35ce85489141ab9145343579fe8',
+            'pretty_version' => 'v1.2.1',
+            'version' => '1.2.1.0',
+            'reference' => 'f31d75ac352d49908f8987bbb1496c02a409812a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/net_socket',
             'aliases' => array(),
@@ -395,9 +404,9 @@
             'dev_requirement' => false,
         ),
         'phenx/php-svg-lib' => array(
-            'pretty_version' => '0.5.1',
-            'version' => '0.5.1.0',
-            'reference' => '8a8a1ebcf6aea861ef30197999f096f7bd4b4456',
+            'pretty_version' => '0.5.2',
+            'version' => '0.5.2.0',
+            'reference' => '732faa9fb4309221e2bd9b2fda5de44f947133aa',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phenx/php-svg-lib',
             'aliases' => array(),
@@ -422,18 +431,18 @@
             'dev_requirement' => false,
         ),
         'phpseclib/phpseclib' => array(
-            'pretty_version' => '2.0.31',
-            'version' => '2.0.31.0',
-            'reference' => '233a920cb38636a43b18d428f9a8db1f0a1a08f4',
+            'pretty_version' => '2.0.47',
+            'version' => '2.0.47.0',
+            'reference' => 'b7d7d90ee7df7f33a664b4aea32d50a305d35adb',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpseclib/phpseclib',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'pontedilana/php-weasyprint' => array(
-            'pretty_version' => '0.13.0',
-            'version' => '0.13.0.0',
-            'reference' => '3ceba9644240e775d3d44e1bcee90b930769a17f',
+            'pretty_version' => '1.4.0',
+            'version' => '1.4.0.0',
+            'reference' => '62c8704834e7d2a3688318ec15bf0e87b3061de9',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pontedilana/php-weasyprint',
             'aliases' => array(),
@@ -500,9 +509,9 @@
             ),
         ),
         'psr/log' => array(
-            'pretty_version' => '1.1.3',
-            'version' => '1.1.3.0',
-            'reference' => '0f73288fd15629204f9d42b7055f72dacbe811fc',
+            'pretty_version' => '1.1.4',
+            'version' => '1.1.4.0',
+            'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/log',
             'aliases' => array(),
@@ -542,9 +551,9 @@
             'dev_requirement' => false,
         ),
         'sabberworm/php-css-parser' => array(
-            'pretty_version' => '8.4.0',
-            'version' => '8.4.0.0',
-            'reference' => 'e41d2140031d533348b2192a83f02d8dd8a71d30',
+            'pretty_version' => 'v8.5.1',
+            'version' => '8.5.1.0',
+            'reference' => '4a3d572b0f8b28bb6fd016ae8bbfc445facef152',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sabberworm/php-css-parser',
             'aliases' => array(),
@@ -674,9 +683,9 @@
             'dev_requirement' => false,
         ),
         'symfony/polyfill-php80' => array(
-            'pretty_version' => 'v1.27.0',
-            'version' => '1.27.0.0',
-            'reference' => '7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936',
+            'pretty_version' => 'v1.29.0',
+            'version' => '1.29.0.0',
+            'reference' => '87b68208d5c1188808dd7839ee1e6c8ec3b02f1b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-php80',
             'aliases' => array(),
@@ -701,9 +710,9 @@
             'dev_requirement' => false,
         ),
         'symfony/process' => array(
-            'pretty_version' => 'v4.4.41',
-            'version' => '4.4.41.0',
-            'reference' => '9eedd60225506d56e42210a70c21bb80ca8456ce',
+            'pretty_version' => 'v5.4.36',
+            'version' => '5.4.36.0',
+            'reference' => '4fdf34004f149cc20b2f51d7d119aa500caad975',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/process',
             'aliases' => array(),
@@ -734,22 +743,19 @@
             'dev_requirement' => false,
         ),
         'tecnickcom/tcpdf' => array(
-            'pretty_version' => '6.4.4',
-            'version' => '6.4.4.0',
-            'reference' => '42cd0f9786af7e5db4fcedaa66f717b0d0032320',
+            'pretty_version' => '6.7.5',
+            'version' => '6.7.5.0',
+            'reference' => '951eabf0338ec2522bd0d5d9c79b08a3a3d36b36',
             'type' => 'library',
             'install_path' => __DIR__ . '/../tecnickcom/tcpdf',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'togos/gitignore' => array(
-            'pretty_version' => '1.1.1',
-            'version' => '1.1.1.0',
-            'reference' => '32bc0830e4123f670adcbf5ddda5bef362f4f4d4',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../togos/gitignore',
-            'aliases' => array(),
             'dev_requirement' => false,
+            'replaced' => array(
+                0 => '1.*',
+            ),
         ),
         'totten/ca-config' => array(
             'pretty_version' => 'v23.07.0',
diff --git a/www/modules/civicrm/vendor/pear/auth_sasl/.travis.yml b/www/modules/civicrm/vendor/pear/auth_sasl/.travis.yml
index 2acb4d644..c580ee46d 100644
--- a/www/modules/civicrm/vendor/pear/auth_sasl/.travis.yml
+++ b/www/modules/civicrm/vendor/pear/auth_sasl/.travis.yml
@@ -1,15 +1,34 @@
 language: php
-sudo: false
+
 php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
+  - nightly
+  - 8.1
+  - 8.0
+  - 7.4
+  - 7.3
+  - 7.2
   - 7.1
+  - 7.0
+  - 5.6
+arch:
+  - amd64
+
+jobs:
+  fast_finish: true
+  allow_failures:
+    - php: nightly
+  include:
+    - php: 5.5
+      dist: trusty
+      arch: amd64
+    - php: 5.4
+      dist: precise
+      arch: amd64
+
 script:
   - pear list
   - pear channel-update pear.php.net
-  - pear upgrade --force pear/pear-1.10.1
+  - pear upgrade --force pear/pear
   - pear list
   - pear install --force package.xml
   - pear list
@@ -18,4 +37,3 @@ script:
   - pear install --force *.tgz
   - pear list
   - composer install
-  - ./vendor/bin/phpunit -c phpunit.xml.dist
diff --git a/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL.php b/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL.php
index 47f8c7fa9..3693aa276 100755
--- a/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL.php
+++ b/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL.php
@@ -52,9 +52,11 @@ class Auth_SASL
     * type.
     *
     * @param string $type One of: Anonymous
+     *                            Login (DEPRECATED)
     *                             Plain
-    *                             CramMD5
-    *                             DigestMD5
+     *                            External
+    *                             CramMD5 (DEPRECATED)
+    *                             DigestMD5 (DEPRECATED)
     *                             SCRAM-* (any mechanism of the SCRAM family)
     *                     Types are not case sensitive
     */
@@ -67,6 +69,10 @@ public static function factory($type)
                 break;
 
             case 'login':
+                /* TODO trigger deprecation warning in 2.0.0 and remove LOGIN authentication in 3.0.0
+                trigger_error(__CLASS__ . ': Authentication method LOGIN' .
+                    ' is no longer secure and should be avoided.', E_USER_DEPRECATED);
+                */
                 $filename  = 'Auth/SASL/Login.php';
                 $classname = 'Auth_SASL_Login';
                 break;
@@ -85,6 +91,10 @@ public static function factory($type)
                 // $msg = 'Deprecated mechanism name. Use IANA-registered name: CRAM-MD5.';
                 // trigger_error($msg, E_USER_DEPRECATED);
             case 'cram-md5':
+                /* TODO trigger deprecation warning in 2.0.0 and remove CRAM-MD5 authentication in 3.0.0
+                trigger_error(__CLASS__ . ': Authentication method CRAM-MD5' .
+                    ' is no longer secure and should be avoided.', E_USER_DEPRECATED);
+                */
                 $filename  = 'Auth/SASL/CramMD5.php';
                 $classname = 'Auth_SASL_CramMD5';
                 break;
@@ -93,8 +103,10 @@ public static function factory($type)
                 // $msg = 'Deprecated mechanism name. Use IANA-registered name: DIGEST-MD5.';
                 // trigger_error($msg, E_USER_DEPRECATED);
             case 'digest-md5':
-                // $msg = 'DIGEST-MD5 is a deprecated SASL mechanism as per RFC-6331. Using it could be a security risk.';
-                // trigger_error($msg, E_USER_NOTICE);
+                /* TODO trigger deprecation warning in 2.0.0 and remove DIGEST-MD5 authentication in 3.0.0
+                trigger_error(__CLASS__ . ': Authentication method DIGEST-MD5' .
+                    ' is no longer secure and should be avoided.', E_USER_DEPRECATED);
+                */
                 $filename  = 'Auth/SASL/DigestMD5.php';
                 $classname = 'Auth_SASL_DigestMD5';
                 break;
@@ -104,7 +116,7 @@ public static function factory($type)
                 if (preg_match($scram, $type, $matches))
                 {
                     $hash = $matches[1];
-                    $filename = dirname(__FILE__) .'/SASL/SCRAM.php';
+                    $filename = __DIR__ .'/SASL/SCRAM.php';
                     $classname = 'Auth_SASL_SCRAM';
                     $parameter = $hash;
                     break;
diff --git a/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/CramMD5.php b/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/CramMD5.php
index d3fbf179b..ba6c1c6bb 100755
--- a/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/CramMD5.php
+++ b/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/CramMD5.php
@@ -40,6 +40,7 @@
 * @author  Richard Heyes <richard@php.net>
 * @access  public
 * @version 1.0
+* @deprecated since 1.2.0
 * @package Auth_SASL
 */
 
diff --git a/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/DigestMD5.php b/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/DigestMD5.php
index 07007b7c9..af25ec281 100755
--- a/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/DigestMD5.php
+++ b/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/DigestMD5.php
@@ -40,6 +40,7 @@
 * @author  Richard Heyes <richard@php.net>
 * @access  public
 * @version 1.0
+* @deprecated since 1.2.0
 * @package Auth_SASL
 */
 
diff --git a/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/Login.php b/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/Login.php
index 918daeedd..f751d8243 100755
--- a/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/Login.php
+++ b/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/Login.php
@@ -43,6 +43,7 @@
 * @author  Richard Heyes <richard@php.net>
 * @access  public
 * @version 1.0
+* @deprecated since 1.2.0
 * @package Auth_SASL
 */
 
diff --git a/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/SCRAM.php b/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/SCRAM.php
index cbca500e4..a43abd5a5 100644
--- a/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/SCRAM.php
+++ b/www/modules/civicrm/vendor/pear/auth_sasl/Auth/SASL/SCRAM.php
@@ -50,6 +50,14 @@
 
 class Auth_SASL_SCRAM extends Auth_SASL_Common
 {
+    private $hash;
+    private $hmac;
+    private $gs2_header;
+    private $cnonce;
+    private $first_message_bare;
+    private $saltedPassword;
+    private $authMessage;
+
     /**
     * Construct a SCRAM-H client where 'H' is a cryptographic hash function.
     *
@@ -69,8 +77,8 @@ function __construct($hash)
             'md5' => 'md5',
             'sha-1' => 'sha1',
             'sha1' => 'sha1',
-            'sha-224' > 'sha224',
-            'sha224' > 'sha224',
+            'sha-224' => 'sha224',
+            'sha224' => 'sha224',
             'sha-256' => 'sha256',
             'sha256' => 'sha256',
             'sha-384' => 'sha384',
@@ -79,21 +87,33 @@ function __construct($hash)
             'sha512' => 'sha512');
         if (function_exists('hash_hmac') && isset($hashes[$hash]))
         {
-            $this->hash = create_function('$data', 'return hash("' . $hashes[$hash] . '", $data, TRUE);');
-            $this->hmac = create_function('$key,$str,$raw', 'return hash_hmac("' . $hashes[$hash] . '", $str, $key, $raw);');
+            $selectedHash = $hashes[$hash];
+            $this->hash = function($data) use ($selectedHash) {
+                return hash($selectedHash, $data, TRUE);
+            };
+            $this->hmac = function($key,$str,$raw) use ($selectedHash) {
+                return hash_hmac($selectedHash, $str, $key, $raw);
+            };
         }
         elseif ($hash == 'md5')
         {
-            $this->hash = create_function('$data', 'return md5($data, true);');
+            $this->hash = function($data) {
+                return md5($data, true);
+            };
             $this->hmac = array($this, '_HMAC_MD5');
         }
         elseif (in_array($hash, array('sha1', 'sha-1')))
         {
-            $this->hash = create_function('$data', 'return sha1($data, true);');
+            $this->hash = function($data) {
+                return sha1($data, true);
+            };
             $this->hmac = array($this, '_HMAC_SHA1');
         }
-        else
+        else {
             return PEAR::raiseError('Invalid SASL mechanism type');
+        }
+
+        return true;
     }
 
     /**
@@ -256,7 +276,7 @@ public function processOutcome($data)
     * Hi() call, which is essentially PBKDF2 (RFC-2898) with HMAC-H() as the pseudorandom function.
     *
     * @param string $str The string to hash.
-    * @param string $hash The hash value.
+    * @param string $salt The salt value.
     * @param int $i The iteration count.
     * @access private
     */
diff --git a/www/modules/civicrm/vendor/pear/auth_sasl/README.md b/www/modules/civicrm/vendor/pear/auth_sasl/README.md
index 0be0113a7..42017c83c 100644
--- a/www/modules/civicrm/vendor/pear/auth_sasl/README.md
+++ b/www/modules/civicrm/vendor/pear/auth_sasl/README.md
@@ -4,12 +4,13 @@
     
 
 Provides code to generate responses to common SASL mechanisms, including:
-- Digest-MD5
-- Cram-MD5
-- Plain
 - Anonymous
-- Login (Pseudo mechanism)
-- SCRAM	
+- Cram-MD5 (DEPRECATED)
+- Digest-MD5 (DEPRECATED)
+- External
+- Login (Pseudo mechanism) (DEPRECATED)
+- Plain
+- SCRAM
 
 [Homepage](http://pear.php.net/package/Auth_SASL/)
 
diff --git a/www/modules/civicrm/vendor/pear/auth_sasl/composer.json b/www/modules/civicrm/vendor/pear/auth_sasl/composer.json
index 08c5f8e2d..366215e23 100644
--- a/www/modules/civicrm/vendor/pear/auth_sasl/composer.json
+++ b/www/modules/civicrm/vendor/pear/auth_sasl/composer.json
@@ -22,19 +22,17 @@
         }
     },
     "description": "Abstraction of various SASL mechanism responses",
+    "homepage": "http://pear.php.net/package/Auth_SASL",
     "include-path": [
         "./"
     ],
-    "license": "BSD",
+    "license": "BSD-3-Clause",
     "name": "pear/auth_sasl",
     "support": {
         "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Auth_SASL",
         "source": "https://github.com/pear/Auth_SASL"
     },
     "type": "library",
-    "require": {
-        "pear/pear_exception": "@stable"
-    },
     "require-dev": {
         "phpunit/phpunit": "@stable"
     }
diff --git a/www/modules/civicrm/vendor/pear/auth_sasl/package.xml b/www/modules/civicrm/vendor/pear/auth_sasl/package.xml
index 6a1d1455b..c70f47c4e 100755
--- a/www/modules/civicrm/vendor/pear/auth_sasl/package.xml
+++ b/www/modules/civicrm/vendor/pear/auth_sasl/package.xml
@@ -13,11 +13,12 @@
  <summary>Abstraction of various SASL mechanism responses</summary>
  <description>
 Provides code to generate responses to common SASL mechanisms, including:
-- Digest-MD5
-- Cram-MD5
-- Plain
 - Anonymous
-- Login (Pseudo mechanism)
+- Cram-MD5 (DEPRECATED)
+- Digest-MD5 (DEPRECATED)
+- External
+- Login (Pseudo mechanism) (DEPRECATED)
+- Plain
 - SCRAM
  </description>
 
@@ -39,10 +40,16 @@ Provides code to generate responses to common SASL mechanisms, including:
   <email>michael@bretterklieber.com</email>
   <active>no</active>
  </lead>
+ <lead>
+  <name>Armin Graefe</name>
+  <user>schengawegga</user>
+  <email>schengawegga@gmail.com</email>
+  <active>yes</active>
+ </lead>
 
- <date>2017-03-07</date>
+ <date>2023-12-21</date>
  <version>
-  <release>1.1.0</release>
+  <release>1.2.0</release>
   <api>1.1.0</api>
  </version>
  <stability>
@@ -51,10 +58,9 @@ Provides code to generate responses to common SASL mechanisms, including:
  </stability>
  <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
  <notes>
-* Set minimum PHP version to 5.4.0
-* Set minimum PEAR version to 1.10.1
-
-* Request #21033: PHP warning depreciated
+* feature: PHP8.2 ready
+* bugfix: scram-sha-224 broken #14
+* task: mark authentication methods cram-md5, digest-md5, and login as deprecated #14
  </notes>
 
  <contents>
@@ -90,6 +96,24 @@ Provides code to generate responses to common SASL mechanisms, including:
 
  <changelog>
 
+  <release>
+   <version>
+    <release>1.2.0</release>
+    <api>1.1.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2023-12-21</date>
+   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
+   <notes>
+* feature: PHP8.2 ready
+* bugfix: scram-sha-224 broken #14
+* task: mark authentication methods cram-md5, digest-md5, and login as deprecated #14
+   </notes>
+  </release>
+
   <release>
    <version>
     <release>1.1.0</release>
diff --git a/www/modules/civicrm/vendor/pear/auth_sasl/phpunit.xml.dist b/www/modules/civicrm/vendor/pear/auth_sasl/phpunit.xml.dist
index 8eaaa2fe6..1dc720cc3 100644
--- a/www/modules/civicrm/vendor/pear/auth_sasl/phpunit.xml.dist
+++ b/www/modules/civicrm/vendor/pear/auth_sasl/phpunit.xml.dist
@@ -17,7 +17,7 @@
 
     <filter>
         <whitelist>
-            <directory suffix=".php">Net/</directory>
+            <directory suffix=".php">Auth/</directory>
         </whitelist>
     </filter>
 
diff --git a/www/modules/civicrm/vendor/pear/db/DB.php b/www/modules/civicrm/vendor/pear/db/DB.php
index 9ff82b865..3deed423c 100644
--- a/www/modules/civicrm/vendor/pear/db/DB.php
+++ b/www/modules/civicrm/vendor/pear/db/DB.php
@@ -589,7 +589,7 @@ public static function connect($dsn, $options = array())
      *
      * @return string  the DB API version number
      */
-    function apiVersion()
+    public static function apiVersion()
     {
         return '@package_version@';
     }
@@ -779,7 +779,11 @@ public static function parseDSN($dsn)
         if (is_array($dsn)) {
             $dsn = array_merge($parsed, $dsn);
             if (!$dsn['dbsyntax']) {
-                $dsn['dbsyntax'] = $dsn['phptype'];
+                if($dsn['phptype'] == "sqlite3") {
+                    $dsn['dbsyntax'] = "sqlite";
+                } else {
+                    $dsn['dbsyntax'] = $dsn['phptype'];
+                }
             }
             return $dsn;
         }
diff --git a/www/modules/civicrm/vendor/pear/db/DB/common.php b/www/modules/civicrm/vendor/pear/db/DB/common.php
index b4112e513..9ab863cc2 100644
--- a/www/modules/civicrm/vendor/pear/db/DB/common.php
+++ b/www/modules/civicrm/vendor/pear/db/DB/common.php
@@ -315,6 +315,7 @@ function quote($string = null)
      *   + odbc(db2)
      *   + pgsql
      *   + sqlite
+     *   + sqlite3
      *   + sybase (must execute <kbd>set quoted_identifier on</kbd> sometime
      *     prior to use)
      *
@@ -417,6 +418,10 @@ function quoteIdentifier($str)
      *        (<kbd>INTEGER</kbd>)
      *      </li>
      *      <li>
+     *        <kbd>sqlite3</kbd> -> <samp>1/0</samp>
+     *        (<kbd>INTEGER</kbd>)
+     *      </li>
+     *      <li>
      *        <kbd>sybase</kbd> -> <samp>1/0</samp>
      *        (<kbd>TINYINT(1)</kbd>)
      *      </li>
@@ -641,6 +646,7 @@ function setFetchMode($fetchmode, $object_class = 'stdClass')
      * + mysql
      * + mysqli
      * + sqlite
+     * + sqlite3
      *
      *
      * <samp>DB_PORTABILITY_NUMROWS</samp>
@@ -720,6 +726,7 @@ function setOption($option, $value)
                         case 'mysql':
                         case 'mysqli':
                         case 'sqlite':
+                        case 'sqlite3':
                             $this->options['portability'] =
                                     DB_PORTABILITY_DELETE_COUNT;
                             break;
@@ -1823,6 +1830,23 @@ function nextId($seq_name, $ondemand = true)
         return $this->raiseError(DB_ERROR_NOT_CAPABLE);
     }
 
+    // }}}
+    // {{{ lastId()
+
+    /**
+     * Returns the row ID of the most recent INSERT into the database
+     *
+     * @param string  $link_identifier  DBMS link identifier
+     *
+     * @return int the row ID of the most recent INSERT into the database.
+     *             If no successful INSERTs into rowid tables have ever
+     *             occurred on this database connection then returns 0.
+     */
+    function lastId($link_identifier = null)
+    {
+        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
+    }
+
     // }}}
     // {{{ createSequence()
 
diff --git a/www/modules/civicrm/vendor/pear/db/DB/dbase.php b/www/modules/civicrm/vendor/pear/db/DB/dbase.php
index 8368c3d73..ec027cc0e 100644
--- a/www/modules/civicrm/vendor/pear/db/DB/dbase.php
+++ b/www/modules/civicrm/vendor/pear/db/DB/dbase.php
@@ -269,7 +269,7 @@ function disconnect()
     // }}}
     // {{{ &query()
 
-    function &query($query = null)
+    function &query($query = null, $params = array())
     {
         // emulate result resources
         $this->res_row[(int)$this->result] = 0;
diff --git a/www/modules/civicrm/vendor/pear/db/DB/ibase.php b/www/modules/civicrm/vendor/pear/db/DB/ibase.php
index ca0c948bd..8b8a03dcb 100644
--- a/www/modules/civicrm/vendor/pear/db/DB/ibase.php
+++ b/www/modules/civicrm/vendor/pear/db/DB/ibase.php
@@ -707,9 +707,9 @@ function nextId($seq_name, $ondemand = true)
         $repeat = 0;
         do {
             $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("SELECT GEN_ID(${sqn}, 1) "
+            $result = $this->query("SELECT GEN_ID({$sqn}, 1) "
                                    . 'FROM RDB$GENERATORS '
-                                   . "WHERE RDB\$GENERATOR_NAME='${sqn}'");
+                                   . "WHERE RDB\$GENERATOR_NAME='{$sqn}'");
             $this->popErrorHandling();
             if ($ondemand && DB::isError($result)) {
                 $repeat = 1;
@@ -746,7 +746,7 @@ function createSequence($seq_name)
     {
         $sqn = strtoupper($this->getSequenceName($seq_name));
         $this->pushErrorHandling(PEAR_ERROR_RETURN);
-        $result = $this->query("CREATE GENERATOR ${sqn}");
+        $result = $this->query("CREATE GENERATOR {$sqn}");
         $this->popErrorHandling();
 
         return $result;
diff --git a/www/modules/civicrm/vendor/pear/db/DB/msql.php b/www/modules/civicrm/vendor/pear/db/DB/msql.php
index 202f93ede..cc95f9f8a 100644
--- a/www/modules/civicrm/vendor/pear/db/DB/msql.php
+++ b/www/modules/civicrm/vendor/pear/db/DB/msql.php
@@ -443,7 +443,7 @@ function nextId($seq_name, $ondemand = true)
         $repeat = false;
         do {
             $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("SELECT _seq FROM ${seqname}");
+            $result = $this->query("SELECT _seq FROM {$seqname}");
             $this->popErrorHandling();
             if ($ondemand && DB::isError($result) &&
                 $result->getCode() == DB_ERROR_NOSUCHTABLE) {
@@ -490,7 +490,7 @@ function createSequence($seq_name)
         if (DB::isError($res)) {
             return $res;
         }
-        $res = $this->query("CREATE SEQUENCE ON ${seqname}");
+        $res = $this->query("CREATE SEQUENCE ON {$seqname}");
         return $res;
     }
 
diff --git a/www/modules/civicrm/vendor/pear/db/DB/mssql.php b/www/modules/civicrm/vendor/pear/db/DB/mssql.php
index 82bf63f47..e26dc7ca0 100644
--- a/www/modules/civicrm/vendor/pear/db/DB/mssql.php
+++ b/www/modules/civicrm/vendor/pear/db/DB/mssql.php
@@ -22,6 +22,7 @@
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
  * @version    CVS: $Id$
  * @link       http://pear.php.net/package/DB
+ * @deprecated since 1.12.0
  */
 
 /**
@@ -51,6 +52,7 @@
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
  * @version    Release: @package_version@
  * @link       http://pear.php.net/package/DB
+ * @deprecated since 1.12.0
  */
 class DB_mssql extends DB_common
 {
diff --git a/www/modules/civicrm/vendor/pear/db/DB/mysql.php b/www/modules/civicrm/vendor/pear/db/DB/mysql.php
index 1ca86fa69..7b1528eb2 100644
--- a/www/modules/civicrm/vendor/pear/db/DB/mysql.php
+++ b/www/modules/civicrm/vendor/pear/db/DB/mysql.php
@@ -22,6 +22,7 @@
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
  * @version    CVS: $Id$
  * @link       http://pear.php.net/package/DB
+ * @deprecated since 1.12.0
  */
 
 /**
@@ -43,6 +44,7 @@
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
  * @version    Release: @package_version@
  * @link       http://pear.php.net/package/DB
+ * @deprecated since 1.12.0
  */
 class DB_mysql extends DB_common
 {
@@ -590,7 +592,7 @@ function nextId($seq_name, $ondemand = true)
         do {
             $repeat = 0;
             $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("UPDATE ${seqname} ".
+            $result = $this->query("UPDATE {$seqname} ".
                                    'SET id=LAST_INSERT_ID(id+1)');
             $this->popErrorHandling();
             if ($result === DB_OK) {
@@ -602,7 +604,7 @@ function nextId($seq_name, $ondemand = true)
                 // EMPTY SEQ TABLE
                 // Sequence table must be empty for some reason, so fill
                 // it and return 1 and obtain a user-level lock
-                $result = $this->getOne("SELECT GET_LOCK('${seqname}_lock',10)");
+                $result = $this->getOne("SELECT GET_LOCK('{$seqname}_lock',10)");
                 if (DB::isError($result)) {
                     return $this->raiseError($result);
                 }
@@ -612,14 +614,14 @@ function nextId($seq_name, $ondemand = true)
                 }
 
                 // add the default value
-                $result = $this->query("REPLACE INTO ${seqname} (id) VALUES (0)");
+                $result = $this->query("REPLACE INTO {$seqname} (id) VALUES (0)");
                 if (DB::isError($result)) {
                     return $this->raiseError($result);
                 }
 
                 // Release the lock
                 $result = $this->getOne('SELECT RELEASE_LOCK('
-                                        . "'${seqname}_lock')");
+                                        . "'{$seqname}_lock')");
                 if (DB::isError($result)) {
                     return $this->raiseError($result);
                 }
@@ -653,6 +655,29 @@ function nextId($seq_name, $ondemand = true)
         return $this->raiseError($result);
     }
 
+    // }}}
+    // {{{ lastId()
+
+    /**
+     * Returns the row ID of the most recent INSERT into the database
+     *
+     * @param string  $link_identifier mysql link identifier
+     *
+     * @return int the row ID of the most recent INSERT into the database.
+     *             If no successful INSERTs into rowid tables have ever
+     *             occurred on this database connection then returns 0.
+     *
+     * @see DB_common::lastID()
+     */
+    function lastId($link_identifier = null)
+    {
+        $id = mysql_insert_id($link_identifier);
+        if(empty($id) || !is_int($id)) {
+            return 0;
+        }
+        return $id;
+    }
+
     // }}}
     // {{{ createSequence()
 
@@ -676,12 +701,12 @@ function createSequence($seq_name)
             return $res;
         }
         // insert yields value 1, nextId call will generate ID 2
-        $res = $this->query("INSERT INTO ${seqname} (id) VALUES (0)");
+        $res = $this->query("INSERT INTO {$seqname} (id) VALUES (0)");
         if (DB::isError($res)) {
             return $res;
         }
         // so reset to zero
-        return $this->query("UPDATE ${seqname} SET id = 0");
+        return $this->query("UPDATE {$seqname} SET id = 0");
     }
 
     // }}}
@@ -720,7 +745,7 @@ function _BCsequence($seqname)
         // Obtain a user-level lock... this will release any previous
         // application locks, but unlike LOCK TABLES, it does not abort
         // the current transaction and is much less frequently used.
-        $result = $this->getOne("SELECT GET_LOCK('${seqname}_lock',10)");
+        $result = $this->getOne("SELECT GET_LOCK('{$seqname}_lock',10)");
         if (DB::isError($result)) {
             return $result;
         }
@@ -730,7 +755,7 @@ function _BCsequence($seqname)
             return $this->mysqlRaiseError(DB_ERROR_NOT_LOCKED);
         }
 
-        $highest_id = $this->getOne("SELECT MAX(id) FROM ${seqname}");
+        $highest_id = $this->getOne("SELECT MAX(id) FROM {$seqname}");
         if (DB::isError($highest_id)) {
             return $highest_id;
         }
@@ -746,7 +771,7 @@ function _BCsequence($seqname)
         // If another thread has been waiting for this lock,
         // it will go thru the above procedure, but will have no
         // real effect
-        $result = $this->getOne("SELECT RELEASE_LOCK('${seqname}_lock')");
+        $result = $this->getOne("SELECT RELEASE_LOCK('{$seqname}_lock')");
         if (DB::isError($result)) {
             return $result;
         }
diff --git a/www/modules/civicrm/vendor/pear/db/DB/mysqli.php b/www/modules/civicrm/vendor/pear/db/DB/mysqli.php
index 06696588d..2de6cf198 100644
--- a/www/modules/civicrm/vendor/pear/db/DB/mysqli.php
+++ b/www/modules/civicrm/vendor/pear/db/DB/mysqli.php
@@ -692,7 +692,7 @@ function nextId($seq_name, $ondemand = true)
                 // so fill it and return 1
                 // Obtain a user-level lock
                 $result = $this->getOne('SELECT GET_LOCK('
-                                        . "'${seqname}_lock', 10)");
+                                        . "'{$seqname}_lock', 10)");
                 if (DB::isError($result)) {
                     return $this->raiseError($result);
                 }
@@ -709,7 +709,7 @@ function nextId($seq_name, $ondemand = true)
 
                 // Release the lock
                 $result = $this->getOne('SELECT RELEASE_LOCK('
-                                        . "'${seqname}_lock')");
+                                        . "'{$seqname}_lock')");
                 if (DB::isError($result)) {
                     return $this->raiseError($result);
                 }
@@ -747,6 +747,29 @@ function nextId($seq_name, $ondemand = true)
         return $this->raiseError($result);
     }
 
+    // }}}
+    // {{{ lastId()
+
+    /**
+     * Returns the row ID of the most recent INSERT into the database
+     *
+     * @param string  $link_identifier mysqli link identifier
+     *
+     * @return int the row ID of the most recent INSERT into the database.
+     *             If no successful INSERTs into rowid tables have ever
+     *             occurred on this database connection then returns 0.
+     *
+     * @see DB_common::lastID()
+     */
+    function lastId($link_identifier = null)
+    {
+        $id = $this->connection->insert_id();
+        if (empty($id) || !is_int($id)) {
+            return 0;
+        }
+        return $id;
+    }
+
     /**
      * Creates a new sequence
      *
@@ -767,7 +790,7 @@ function createSequence($seq_name)
             return $res;
         }
         // insert yields value 1, nextId call will generate ID 2
-        return $this->query("INSERT INTO ${seqname} (id) VALUES (0)");
+        return $this->query("INSERT INTO {$seqname} (id) VALUES (0)");
     }
 
     // }}}
@@ -806,7 +829,7 @@ function _BCsequence($seqname)
         // Obtain a user-level lock... this will release any previous
         // application locks, but unlike LOCK TABLES, it does not abort
         // the current transaction and is much less frequently used.
-        $result = $this->getOne("SELECT GET_LOCK('${seqname}_lock',10)");
+        $result = $this->getOne("SELECT GET_LOCK('{$seqname}_lock',10)");
         if (DB::isError($result)) {
             return $result;
         }
@@ -816,7 +839,7 @@ function _BCsequence($seqname)
             return $this->mysqliRaiseError(DB_ERROR_NOT_LOCKED);
         }
 
-        $highest_id = $this->getOne("SELECT MAX(id) FROM ${seqname}");
+        $highest_id = $this->getOne("SELECT MAX(id) FROM {$seqname}");
         if (DB::isError($highest_id)) {
             return $highest_id;
         }
@@ -833,7 +856,7 @@ function _BCsequence($seqname)
         // If another thread has been waiting for this lock,
         // it will go thru the above procedure, but will have no
         // real effect
-        $result = $this->getOne("SELECT RELEASE_LOCK('${seqname}_lock')");
+        $result = $this->getOne("SELECT RELEASE_LOCK('{$seqname}_lock')");
         if (DB::isError($result)) {
             return $result;
         }
diff --git a/www/modules/civicrm/vendor/pear/db/DB/oci8.php b/www/modules/civicrm/vendor/pear/db/DB/oci8.php
index 06ea8c1a6..a89dd33cc 100644
--- a/www/modules/civicrm/vendor/pear/db/DB/oci8.php
+++ b/www/modules/civicrm/vendor/pear/db/DB/oci8.php
@@ -249,7 +249,7 @@ function connect($dsn, $persistent = false)
                                                    $dsn['password'],
                                                    $db,
                                                    $char);
-            $error = OCIError();
+            $error = oci_error();
             if (!empty($error) && $error['code'] == 12541) {
                 // Couldn't find TNS listener.  Try direct connection.
                 $this->connection = @$connect_function($dsn['username'],
@@ -270,7 +270,7 @@ function connect($dsn, $persistent = false)
         }
 
         if (!$this->connection) {
-            $error = OCIError();
+            $error = oci_error();
             $error = (is_array($error)) ? $error['message'] : null;
             return $this->raiseError(DB_ERROR_CONNECT_FAILED,
                                      null, null, null,
@@ -289,11 +289,7 @@ function connect($dsn, $persistent = false)
      */
     function disconnect()
     {
-        if (function_exists('oci_close')) {
-            $ret = @oci_close($this->connection);
-        } else {
-            $ret = @OCILogOff($this->connection);
-        }
+        $ret = @oci_close($this->connection);
         $this->connection = null;
         return $ret;
     }
@@ -320,14 +316,14 @@ function simpleQuery($query)
         $this->last_parameters = array();
         $this->last_query = $query;
         $query = $this->modifyQuery($query);
-        $result = @OCIParse($this->connection, $query);
+        $result = @oci_parse($this->connection, $query);
         if (!$result) {
             return $this->oci8RaiseError();
         }
         if ($this->autocommit) {
-            $success = @OCIExecute($result,OCI_COMMIT_ON_SUCCESS);
+            $success = @oci_execute($result,OCI_COMMIT_ON_SUCCESS);
         } else {
-            $success = @OCIExecute($result,OCI_DEFAULT);
+            $success = @oci_execute($result,OCI_DEFAULT);
         }
         if (!$success) {
             return $this->oci8RaiseError($result);
@@ -336,7 +332,7 @@ function simpleQuery($query)
         if ($this->_checkManip($query)) {
             return DB_OK;
         } else {
-            @ocisetprefetch($result, $this->options['result_buffering']);
+            @oci_set_prefetch($result, $this->options['result_buffering']);
             return $result;
         }
     }
@@ -387,14 +383,14 @@ function fetchInto($result, &$arr, $fetchmode, $rownum = null)
             return $this->raiseError(DB_ERROR_NOT_CAPABLE);
         }
         if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $moredata = @OCIFetchInto($result,$arr,OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS);
+            $moredata = @oci_fetch_array($result,$arr,OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS);
             if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE &&
                 $moredata)
             {
                 $arr = array_change_key_case($arr, CASE_LOWER);
             }
         } else {
-            $moredata = OCIFetchInto($result,$arr,OCI_RETURN_NULLS+OCI_RETURN_LOBS);
+            $moredata = oci_fetch_array($result,$arr,OCI_RETURN_NULLS+OCI_RETURN_LOBS);
         }
         if (!$moredata) {
             return null;
@@ -426,7 +422,7 @@ function fetchInto($result, &$arr, $fetchmode, $rownum = null)
      */
     function freeResult($result)
     {
-        return is_resource($result) ? OCIFreeStatement($result) : false;
+        return is_resource($result) ? oci_free_statement($result) : false;
     }
 
     /**
@@ -520,7 +516,7 @@ function numRows($result)
      */
     function numCols($result)
     {
-        $cols = @OCINumCols($result);
+        $cols = @oci_num_fields($result);
         if (!$cols) {
             return $this->oci8RaiseError($result);
         }
@@ -592,7 +588,7 @@ function prepare($query)
 
         $this->last_query = $query;
         $newquery = $this->modifyQuery($newquery);
-        if (!$stmt = @OCIParse($this->connection, $newquery)) {
+        if (!$stmt = @oci_parse($this->connection, $newquery)) {
             return $this->oci8RaiseError();
         }
         $this->prepare_types[(int)$stmt] = $types;
@@ -664,7 +660,7 @@ function &execute($stmt, $data = array())
                     $data[$key] = $this->quoteFloat($data[$key]);
                 }
             }
-            if (!@OCIBindByName($stmt, ':bind' . $i, $data[$key], -1)) {
+            if (!@oci_bind_by_name($stmt, ':bind' . $i, $data[$key], -1)) {
                 $tmp = $this->oci8RaiseError($stmt);
                 return $tmp;
             }
@@ -673,9 +669,9 @@ function &execute($stmt, $data = array())
             $i++;
         }
         if ($this->autocommit) {
-            $success = @OCIExecute($stmt, OCI_COMMIT_ON_SUCCESS);
+            $success = @oci_execute($stmt, OCI_COMMIT_ON_SUCCESS);
         } else {
-            $success = @OCIExecute($stmt, OCI_DEFAULT);
+            $success = @oci_execute($stmt, OCI_DEFAULT);
         }
         if (!$success) {
             $tmp = $this->oci8RaiseError($stmt);
@@ -688,7 +684,7 @@ function &execute($stmt, $data = array())
             $tmp = DB_OK;
         } else {
             $this->_last_query_manip = false;
-            @ocisetprefetch($stmt, $this->options['result_buffering']);
+            @oci_set_prefetch($stmt, $this->options['result_buffering']);
             $tmp = new DB_result($this, $stmt);
         }
         return $tmp;
@@ -721,7 +717,7 @@ function autoCommit($onoff = false)
      */
     function commit()
     {
-        $result = @OCICommit($this->connection);
+        $result = @oci_commit($this->connection);
         if (!$result) {
             return $this->oci8RaiseError();
         }
@@ -738,7 +734,7 @@ function commit()
      */
     function rollback()
     {
-        $result = @OCIRollback($this->connection);
+        $result = @oci_rollback($this->connection);
         if (!$result) {
             return $this->oci8RaiseError();
         }
@@ -760,7 +756,7 @@ function affectedRows()
         if ($this->last_stmt === false) {
             return $this->oci8RaiseError();
         }
-        $result = @OCIRowCount($this->last_stmt);
+        $result = @oci_num_rows($this->last_stmt);
         if ($result === false) {
             return $this->oci8RaiseError($this->last_stmt);
         }
@@ -821,20 +817,20 @@ function modifyLimitQuery($query, $from, $count, $params = array())
         } else {
             $q_fields = "SELECT * FROM ($query) WHERE NULL = NULL";
 
-            if (!$result = @OCIParse($this->connection, $q_fields)) {
+            if (!$result = @oci_parse($this->connection, $q_fields)) {
                 $this->last_query = $q_fields;
                 return $this->oci8RaiseError();
             }
-            if (!@OCIExecute($result, OCI_DEFAULT)) {
+            if (!@oci_execute($result, OCI_DEFAULT)) {
                 $this->last_query = $q_fields;
                 return $this->oci8RaiseError($result);
             }
         }
 
-        $ncols = OCINumCols($result);
+        $ncols = oci_num_fields($result);
         $cols  = array();
         for ( $i = 1; $i <= $ncols; $i++ ) {
-            $cols[] = '"' . OCIColumnName($result, $i) . '"';
+            $cols[] = '"' . oci_field_name($result, $i) . '"';
         }
         $fields = implode(', ', $cols);
         // XXX Test that (tip by John Lim)
@@ -877,7 +873,7 @@ function nextId($seq_name, $ondemand = true)
         $repeat = 0;
         do {
             $this->expectError(DB_ERROR_NOSUCHTABLE);
-            $result = $this->query("SELECT ${seqname}.nextval FROM dual");
+            $result = $this->query("SELECT {$seqname}.nextval FROM dual");
             $this->popExpect();
             if ($ondemand && DB::isError($result) &&
                 $result->getCode() == DB_ERROR_NOSUCHTABLE) {
@@ -950,11 +946,11 @@ function dropSequence($seq_name)
     function oci8RaiseError($errno = null)
     {
         if ($errno === null) {
-            $error = @OCIError($this->connection);
+            $error = @oci_error($this->connection);
             return $this->raiseError($this->errorCode($error['code']),
                                      null, null, null, $error['message']);
         } elseif (is_resource($errno)) {
-            $error = @OCIError($errno);
+            $error = @oci_error($errno);
             return $this->raiseError($this->errorCode($error['code']),
                                      null, null, null, $error['message']);
         }
@@ -973,9 +969,9 @@ function oci8RaiseError($errno = null)
     function errorNative()
     {
         if (is_resource($this->last_stmt)) {
-            $error = @OCIError($this->last_stmt);
+            $error = @oci_error($this->last_stmt);
         } else {
-            $error = @OCIError($this->connection);
+            $error = @oci_error($this->connection);
         }
         if (is_array($error)) {
             return $error['code'];
@@ -1029,21 +1025,21 @@ function tableInfo($result, $mode = null)
 
             $this->last_query = $q_fields;
 
-            if (!$stmt = @OCIParse($this->connection, $q_fields)) {
+            if (!$stmt = @oci_parse($this->connection, $q_fields)) {
                 return $this->oci8RaiseError(DB_ERROR_NEED_MORE_DATA);
             }
-            if (!@OCIExecute($stmt, OCI_DEFAULT)) {
+            if (!@oci_execute($stmt, OCI_DEFAULT)) {
                 return $this->oci8RaiseError($stmt);
             }
             
             $i = 0;
-            while (@OCIFetch($stmt)) {
+            while (@oci_fetch($stmt)) {
                 $res[$i] = array(
                     'table' => $case_func($result),
-                    'name'  => $case_func(@OCIResult($stmt, 1)),
-                    'type'  => @OCIResult($stmt, 2),
-                    'len'   => @OCIResult($stmt, 3),
-                    'flags' => (@OCIResult($stmt, 4) == 'N') ? 'not_null' : '',
+                    'name'  => $case_func(@oci_result($stmt, 1)),
+                    'type'  => @oci_result($stmt, 2),
+                    'len'   => @oci_result($stmt, 3),
+                    'flags' => (@oci_result($stmt, 4) == 'N') ? 'not_null' : '',
                 );
                 if ($mode & DB_TABLEINFO_ORDER) {
                     $res['order'][$res[$i]['name']] = $i;
@@ -1057,7 +1053,7 @@ function tableInfo($result, $mode = null)
             if ($mode) {
                 $res['num_fields'] = $i;
             }
-            @OCIFreeStatement($stmt);
+            @oci_free_statement($stmt);
 
         } else {
             if (isset($result->result)) {
@@ -1071,16 +1067,16 @@ function tableInfo($result, $mode = null)
             $res = array();
 
             if ($result === $this->last_stmt) {
-                $count = @OCINumCols($result);
+                $count = @oci_num_fields($result);
                 if ($mode) {
                     $res['num_fields'] = $count;
                 }
                 for ($i = 0; $i < $count; $i++) {
                     $res[$i] = array(
                         'table' => '',
-                        'name'  => $case_func(@OCIColumnName($result, $i+1)),
-                        'type'  => @OCIColumnType($result, $i+1),
-                        'len'   => @OCIColumnSize($result, $i+1),
+                        'name'  => $case_func(@oci_field_name($result, $i+1)),
+                        'type'  => @oci_field_type($result, $i+1),
+                        'len'   => @oci_field_size($result, $i+1),
                         'flags' => '',
                     );
                     if ($mode & DB_TABLEINFO_ORDER) {
diff --git a/www/modules/civicrm/vendor/pear/db/DB/odbc.php b/www/modules/civicrm/vendor/pear/db/DB/odbc.php
index a66433132..13a390b1e 100644
--- a/www/modules/civicrm/vendor/pear/db/DB/odbc.php
+++ b/www/modules/civicrm/vendor/pear/db/DB/odbc.php
@@ -331,7 +331,7 @@ function fetchInto($result, &$arr, $fetchmode, $rownum = null)
             return null;
         }
         if ($fetchmode !== DB_FETCHMODE_ORDERED) {
-            for ($i = 0; $i < count($arr); $i++) {
+            for ($i = 0, $iMax = count($arr); $i < $iMax; $i++) {
                 $colName = @odbc_field_name($result, $i+1);
                 $a[$colName] = $arr[$i];
             }
@@ -502,7 +502,7 @@ function nextId($seq_name, $ondemand = true)
         $repeat = 0;
         do {
             $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("update ${seqname} set id = id + 1");
+            $result = $this->query("update {$seqname} set id = id + 1");
             $this->popErrorHandling();
             if ($ondemand && DB::isError($result) &&
                 $result->getCode() == DB_ERROR_NOSUCHTABLE) {
@@ -513,7 +513,7 @@ function nextId($seq_name, $ondemand = true)
                 if (DB::isError($result)) {
                     return $this->raiseError($result);
                 }
-                $result = $this->query("insert into ${seqname} (id) values(0)");
+                $result = $this->query("insert into {$seqname} (id) values(0)");
             } else {
                 $repeat = 0;
             }
@@ -523,7 +523,7 @@ function nextId($seq_name, $ondemand = true)
             return $this->raiseError($result);
         }
 
-        $result = $this->query("select id from ${seqname}");
+        $result = $this->query("select id from {$seqname}");
         if (DB::isError($result)) {
             return $result;
         }
diff --git a/www/modules/civicrm/vendor/pear/db/DB/pgsql.php b/www/modules/civicrm/vendor/pear/db/DB/pgsql.php
index 8a75ca61f..213f74d64 100644
--- a/www/modules/civicrm/vendor/pear/db/DB/pgsql.php
+++ b/www/modules/civicrm/vendor/pear/db/DB/pgsql.php
@@ -460,7 +460,7 @@ function freeResult($result)
             unset($this->row[(int)$result]);
             unset($this->_num_rows[(int)$result]);
             $this->affected = 0;
-            return @pg_freeresult($result);
+            return @pg_free_result($result);
         }
         return false;
     }
@@ -534,7 +534,7 @@ function escapeSimple($str)
      */
     function numCols($result)
     {
-        $cols = @pg_numfields($result);
+        $cols = @pg_num_fields($result);
         if (!$cols) {
             return $this->pgsqlRaiseError();
         }
@@ -559,7 +559,7 @@ function numCols($result)
      */
     function numRows($result)
     {
-        $rows = @pg_numrows($result);
+        $rows = @pg_num_rows($result);
         if ($rows === null) {
             return $this->pgsqlRaiseError();
         }
@@ -664,7 +664,7 @@ function nextId($seq_name, $ondemand = true)
         $repeat = false;
         do {
             $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("SELECT NEXTVAL('${seqname}')");
+            $result = $this->query("SELECT NEXTVAL('{$seqname}')");
             $this->popErrorHandling();
             if ($ondemand && DB::isError($result) &&
                 $result->getCode() == DB_ERROR_NOSUCHTABLE) {
@@ -703,7 +703,7 @@ function nextId($seq_name, $ondemand = true)
     function createSequence($seq_name)
     {
         $seqname = $this->getSequenceName($seq_name);
-        $result = $this->query("CREATE SEQUENCE ${seqname}");
+        $result = $this->query("CREATE SEQUENCE {$seqname}");
         return $result;
     }
 
@@ -791,7 +791,7 @@ function pgsqlRaiseError($errno = null)
      */
     function errorNative()
     {
-        return @pg_errormessage($this->connection);
+        return @pg_last_error($this->connection);
     }
 
     // }}}
@@ -916,7 +916,7 @@ function tableInfo($result, $mode = null)
             $case_func = 'strval';
         }
 
-        $count = @pg_numfields($id);
+        $count = @pg_num_fields($id);
         $res   = array();
 
         if ($mode) {
@@ -926,9 +926,9 @@ function tableInfo($result, $mode = null)
         for ($i = 0; $i < $count; $i++) {
             $res[$i] = array(
                 'table' => $got_string ? $case_func($result) : '',
-                'name'  => $case_func(@pg_fieldname($id, $i)),
-                'type'  => @pg_fieldtype($id, $i),
-                'len'   => @pg_fieldsize($id, $i),
+                'name'  => $case_func(@pg_field_name($id, $i)),
+                'type'  => @pg_field_type($id, $i),
+                'len'   => @pg_field_size($id, $i),
                 'flags' => $got_string
                            ? $this->_pgFieldFlags($id, $i, $result)
                            : '',
@@ -943,7 +943,7 @@ function tableInfo($result, $mode = null)
 
         // free the result only if we were called on a table
         if ($got_string) {
-            @pg_freeresult($id);
+            @pg_free_result($id);
         }
         return $res;
     }
@@ -967,7 +967,7 @@ function tableInfo($result, $mode = null)
      */
     function _pgFieldFlags($resource, $num_field, $table_name)
     {
-        $field_name = @pg_fieldname($resource, $num_field);
+        $field_name = @pg_field_name($resource, $num_field);
 
         // Check if there's a schema in $table_name and update things
         // accordingly.
@@ -986,7 +986,7 @@ function _pgFieldFlags($resource, $num_field, $table_name)
                                 AND typ.typrelid = f.attrelid
                                 AND f.attname = '$field_name'
                                 AND $tableWhere");
-        if (@pg_numrows($result) > 0) {
+        if (@pg_num_rows($result) > 0) {
             $row = @pg_fetch_row($result, 0);
             $flags  = ($row[0] == 't') ? 'not_null ' : '';
 
@@ -1010,7 +1010,7 @@ function _pgFieldFlags($resource, $num_field, $table_name)
                                 AND f.attrelid = i.indrelid
                                 AND f.attname = '$field_name'
                                 AND $tableWhere");
-        $count = @pg_numrows($result);
+        $count = @pg_num_rows($result);
 
         for ($i = 0; $i < $count ; $i++) {
             $row = @pg_fetch_row($result, $i);
diff --git a/www/modules/civicrm/vendor/pear/db/DB/sqlite.php b/www/modules/civicrm/vendor/pear/db/DB/sqlite.php
index b81a43f13..4d48dd34c 100644
--- a/www/modules/civicrm/vendor/pear/db/DB/sqlite.php
+++ b/www/modules/civicrm/vendor/pear/db/DB/sqlite.php
@@ -517,7 +517,7 @@ function createSequence($seq_name)
         if (DB::isError($result)) {
             return($result);
         }
-        $query   = "CREATE TRIGGER ${seqname}_cleanup AFTER INSERT ON $seqname
+        $query   = "CREATE TRIGGER {$seqname}_cleanup AFTER INSERT ON $seqname
                     BEGIN
                         DELETE FROM $seqname WHERE id<LAST_INSERT_ROWID();
                     END ";
diff --git a/www/modules/civicrm/vendor/pear/db/DB/sqlite3.php b/www/modules/civicrm/vendor/pear/db/DB/sqlite3.php
new file mode 100644
index 000000000..6aab7e398
--- /dev/null
+++ b/www/modules/civicrm/vendor/pear/db/DB/sqlite3.php
@@ -0,0 +1,964 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * The PEAR DB driver for PHP's sqlite3 extension
+ * for interacting with SQLite3 databases
+ *
+ * PHP version 8.0.10
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Database
+ * @package    DB
+ * @author     Urs Gehrig <urs@circle.ch>
+ * @author     Mika Tuupola <tuupola@appelsiini.net>
+ * @author     Daniel Convissor <danielc@php.net>
+ * @author     Armin Graefe <schengawegga@gmail.com>
+ * @copyright  1997-2007 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0 3.0
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/DB
+ */
+
+/**
+ * Obtain the DB_common class so it can be extended from
+ */
+require_once 'DB/common.php';
+
+/**
+ * The methods PEAR DB uses to interact with PHP's sqlite extension
+ * for interacting with SQLite databases
+ *
+ * These methods overload the ones declared in DB_common.
+ *
+ * NOTICE:  This driver needs PHP's track_errors ini setting to be on.
+ * It is automatically turned on when connecting to the database.
+ * Make sure your scripts don't turn it off.
+ *
+ * @category   Database
+ * @package    DB
+ * @author     Urs Gehrig <urs@circle.ch>
+ * @author     Mika Tuupola <tuupola@appelsiini.net>
+ * @author     Daniel Convissor <danielc@php.net>
+ * @author     Armin Graefe <schengawegga@gmail.com>
+ * @copyright  1997-2007 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0 3.0
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/DB
+ */
+class DB_sqlite3 extends DB_common
+{
+    // {{{ properties
+    
+    /**
+     * The DB driver type (mysql, oci8, odbc, etc.)
+     * @var string
+     */
+    var $phptype = 'sqlite3';
+    
+    /**
+     * The database syntax variant to be used (db2, access, etc.), if any
+     * @var string
+     */
+    var $dbsyntax = 'sqlite';
+    
+    /**
+     * The capabilities of this DB implementation
+     *
+     * The 'new_link' element contains the PHP version that first provided
+     * new_link support for this DBMS.  Contains false if it's unsupported.
+     *
+     * Meaning of the 'limit' element:
+     *   + 'emulate' = emulate with fetch row by number
+     *   + 'alter'   = alter the query
+     *   + false     = skip rows
+     *
+     * @var array
+     */
+    var $features = array(
+        'limit'         => 'alter',
+        'new_link'      => false,
+        'numrows'       => true,
+        'pconnect'      => true,
+        'prepare'       => false,
+        'ssl'           => false,
+        'transactions'  => false,
+    );
+    
+    /**
+     * A mapping of native error codes to DB error codes
+     *
+     * {@internal  Error codes according to sqlite_exec.  See the online
+     * manual at http://sqlite.org/c_interface.html for info.
+     * This error handling based on sqlite_exec is not yet implemented.}}
+     *
+     * @var array
+     */
+    var $errorcode_map = array(
+    );
+    
+    /**
+     * The raw database connection created by PHP
+     * @var resource
+     */
+    var $connection;
+    
+    /**
+     * The DSN information for connecting to a database
+     * @var array
+     */
+    var $dsn = array();
+    
+    
+    /**
+     * SQLite data types
+     *
+     * @link http://www.sqlite.org/datatypes.html
+     *
+     * @var array
+     */
+    var $keywords = array (
+        'BLOB'      => '',
+        'BOOLEAN'   => '',
+        'CHARACTER' => '',
+        'CLOB'      => '',
+        'FLOAT'     => '',
+        'INTEGER'   => '',
+        'KEY'       => '',
+        'NATIONAL'  => '',
+        'NUMERIC'   => '',
+        'NVARCHAR'  => '',
+        'PRIMARY'   => '',
+        'TEXT'      => '',
+        'TIMESTAMP' => '',
+        'UNIQUE'    => '',
+        'VARCHAR'   => '',
+        'VARYING'   => '',
+    );
+    
+    /**
+     * The most recent error message from $php_errormsg
+     * @var string
+     * @access private
+     */
+    var $_lasterror = '';
+    
+    
+    // }}}
+    // {{{ constructor
+    
+    /**
+     * This constructor calls <kbd>parent::__construct()</kbd>
+     *
+     * @return void
+     */
+    function __construct()
+    {
+        parent::__construct();
+    }
+    
+    // }}}
+    // {{{ connect()
+    
+    /**
+     * Connect to the database server, log in and open the database
+     *
+     * Don't call this method directly.  Use DB::connect() instead.
+     *
+     * PEAR DB's sqlite driver supports the following extra DSN options:
+     *   + mode  The permissions for the database file, in four digit
+     *            chmod octal format (eg "0600").
+     *
+     * Example of connecting to a database in read-only mode:
+     * <code>
+     * require_once 'DB.php';
+     *
+     * $dsn = 'sqlite:///path/and/name/of/db/file?mode=0400';
+     * $options = array(
+     *     'portability' => DB_PORTABILITY_ALL,
+     * );
+     *
+     * $db = DB::connect($dsn, $options);
+     * if (PEAR::isError($db)) {
+     *     die($db->getMessage());
+     * }
+     * </code>
+     *
+     * @param array $dsn         the data source name
+     * @param bool  $persistent  should the connection be persistent?
+     *
+     * @return int  DB_OK on success. A DB_Error object on failure.
+     */
+    function connect($dsn, $persistent = false)
+    {
+        $persistent = False;
+        if (!PEAR::loadExtension('sqlite3')) {
+            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
+        }
+        
+        $this->dsn = $dsn;
+        if ($dsn['dbsyntax']) {
+            $this->dbsyntax = $dsn['dbsyntax'];
+        }
+        
+        if (!$dsn['database']) {
+            return $this->sqliteRaiseError(DB_ERROR_ACCESS_VIOLATION);
+        }
+        
+        if ($dsn['database'] !== ':memory:') {
+            if (!file_exists($dsn['database'])) {
+                if (!touch($dsn['database'])) {
+                    return $this->sqliteRaiseError(DB_ERROR_NOT_FOUND);
+                }
+                if (!isset($dsn['mode']) ||
+                    !is_numeric($dsn['mode']))
+                {
+                    $mode = 0644;
+                } else {
+                    $mode = octdec($dsn['mode']);
+                }
+                if (!chmod($dsn['database'], $mode)) {
+                    return $this->sqliteRaiseError(DB_ERROR_NOT_FOUND);
+                }
+                if (!file_exists($dsn['database'])) {
+                    return $this->sqliteRaiseError(DB_ERROR_NOT_FOUND);
+                }
+            }
+            if (!is_file($dsn['database'])) {
+                return $this->sqliteRaiseError(DB_ERROR_INVALID);
+            }
+            if (!is_readable($dsn['database'])) {
+                return $this->sqliteRaiseError(DB_ERROR_ACCESS_VIOLATION);
+            }
+        }
+        
+        // track_errors must remain on for simpleQuery()
+        @ini_set('track_errors', 1);
+        $php_errormsg = '';
+        
+        //var_dump($this->getOption('readable'));exit();
+        
+        if (!$this->connection = @new SQLite3($dsn['database'])) {
+            return $this->raiseError(DB_ERROR_NODBSELECTED,
+                null, null, null,
+                $php_errormsg);
+        }
+        return DB_OK;
+    }
+    
+    // }}}
+    // {{{ disconnect()
+    
+    /**
+     * Disconnects from the database server
+     *
+     * @return bool  TRUE on success, FALSE on failure
+     */
+    function disconnect()
+    {
+        $ret = @$this->connection->close();
+        $this->connection = null;
+        return $ret;
+    }
+    
+    // }}}
+    // {{{ simpleQuery()
+    
+    /**
+     * Sends a query to the database server
+     *
+     * NOTICE:  This method needs PHP's track_errors ini setting to be on.
+     * It is automatically turned on when connecting to the database.
+     * Make sure your scripts don't turn it off.
+     *
+     * @param string  the SQL query string
+     *
+     * @return mixed  + a PHP result resrouce for successful SELECT queries
+     *                + the DB_OK constant for other successful queries
+     *                + a DB_Error object on failure
+     */
+    function simpleQuery($query)
+    {
+        $ismanip = $this->_checkManip($query);
+        $this->last_query = $query;
+        $query = $this->modifyQuery($query);
+        
+        $php_errormsg = '';
+        
+        $result = @$this->connection->query($query);
+        $this->_lasterror = $php_errormsg ? $php_errormsg : '';
+        
+        $this->result = $result;
+        if (!$this->result) {
+            return $this->sqliteRaiseError(null);
+        }
+        
+        // sqlite_query() seems to allways return a resource
+        // so cant use that. Using $ismanip instead
+        if (!$ismanip) {
+            $numRows = $this->numRows($result);
+            if (is_object($numRows)) {
+                // we've got PEAR_Error
+                return $numRows;
+            }
+            return $result;
+        }
+        return DB_OK;
+    }
+    
+    // }}}
+    // {{{ nextResult()
+    
+    /**
+     * Move the internal sqlite result pointer to the next available result
+     *
+     * @param resource $result  the valid sqlite result resource
+     *
+     * @return bool  true if a result is available otherwise return false
+     */
+    function nextResult($result)
+    {
+        return false;
+    }
+    
+    // }}}
+    // {{{ fetchInto()
+    
+    /**
+     * Places a row from the result set into the given array
+     *
+     * Formating of the array and the data therein are configurable.
+     * See DB_result::fetchInto() for more information.
+     *
+     * This method is not meant to be called directly.  Use
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * because DB_result is a separate object.
+     *
+     * @param resource $result    the query result resource
+     * @param array    $arr       the referenced array to put the data in
+     * @param int      $fetchmode how the resulting array should be indexed
+     * @param int      $rownum    the row number to fetch (0 = first row)
+     *
+     * @return mixed  DB_OK on success, NULL when the end of a result set is
+     *                 reached or on failure
+     *
+     * @see DB_result::fetchInto()
+     */
+    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
+    {
+        if($fetchmode & DB_FETCHMODE_ASSOC){
+            $sqlite_fetchmode = SQLITE3_ASSOC;
+        } else {
+            $sqlite_fetchmode = SQLITE3_NUM;
+        }
+        
+        if ($rownum !== null) {
+            $rownumber = -1;
+            while($rownum_res = @$result->fetchArray($sqlite_fetchmode)){
+                $rownumber++;
+                if($rownum == $rownumber){
+                    $arr = $rownum_res;
+                    break;
+                }
+            }
+
+            if(!$arr){
+                return null;
+            }
+            $result->reset();
+        } else {
+            $arr = @$result->fetchArray($sqlite_fetchmode);
+        }
+        if ($fetchmode & DB_FETCHMODE_ASSOC) {
+            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
+                $arr = array_change_key_case($arr, CASE_LOWER);
+            }
+            
+            /* Remove extraneous " characters from the fields in the result.
+             * Fixes bug #11716. */
+            if (is_array($arr) && count($arr) > 0) {
+                $strippedArr = array();
+                foreach ($arr as $field => $value) {
+                    $strippedArr[trim($field, '"')] = $value;
+                }
+                $arr = $strippedArr;
+            }
+        }
+        if (!$arr) {
+            return null;
+        }
+        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
+            /*
+             * Even though this DBMS already trims output, we do this because
+             * a field might have intentional whitespace at the end that
+             * gets removed by DB_PORTABILITY_RTRIM under another driver.
+             */
+            $this->_rtrimArrayValues($arr);
+        }
+        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
+            $this->_convertNullArrayValuesToEmpty($arr);
+        }
+        return DB_OK;
+    }
+    
+    // }}}
+    // {{{ freeResult()
+    
+    /**
+     * Deletes the result set and frees the memory occupied by the result set
+     *
+     * This method is not meant to be called directly.  Use
+     * DB_result::free() instead.  It can't be declared "protected"
+     * because DB_result is a separate object.
+     *
+     * @param resource $result  PHP's query result resource
+     *
+     * @return bool  TRUE on success, FALSE if $result is invalid
+     *
+     * @see DB_result::free()
+     */
+    function freeResult(&$result)
+    {
+        // XXX No native free?
+        if (!is_resource($result)) {
+            return false;
+        }
+        $result = null;
+        return true;
+    }
+    
+    // }}}
+    // {{{ numCols()
+    
+    /**
+     * Gets the number of columns in a result set
+     *
+     * This method is not meant to be called directly.  Use
+     * DB_result::numCols() instead.  It can't be declared "protected"
+     * because DB_result is a separate object.
+     *
+     * @param resource $result  PHP's query result resource
+     *
+     * @return int  the number of columns.  A DB_Error object on failure.
+     *
+     * @see DB_result::numCols()
+     */
+    function numCols($result)
+    {
+        $cols = @$result->numColumns();
+        if (!$cols) {
+            return $this->sqliteRaiseError();
+        }
+        return $cols;
+    }
+    
+    // }}}
+    // {{{ numRows()
+    
+    /**
+     * Gets the number of rows in a result set
+     *
+     * This method is not meant to be called directly.  Use
+     * DB_result::numRows() instead.  It can't be declared "protected"
+     * because DB_result is a separate object.
+     *
+     * @param resource $result  PHP's query result resource
+     *
+     * @return int  the number of rows.  A DB_Error object on failure.
+     *
+     * @see DB_result::numRows()
+     */
+    function numRows($result)
+    {
+        $numRows = 0;
+        while($rows = @$result->fetchArray(SQLITE3_NUM)){
+            $numRows++;
+        }
+        return $numRows;
+    }
+    
+    // }}}
+    // {{{ affected()
+    
+    /**
+     * Determines the number of rows affected by a data maniuplation query
+     *
+     * 0 is returned for queries that don't manipulate data.
+     *
+     * @return int  the number of rows.  A DB_Error object on failure.
+     */
+    function affectedRows()
+    {
+        return @$this->connection->changes();
+    }
+    
+    // }}}
+    // {{{ dropSequence()
+    
+    /**
+     * Deletes a sequence
+     *
+     * @param string $seq_name  name of the sequence to be deleted
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     *
+     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
+     *      DB_sqlite::nextID(), DB_sqlite::createSequence()
+     */
+    function dropSequence($seq_name)
+    {
+        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name));
+    }
+    
+    /**
+     * Creates a new sequence
+     *
+     * @param string $seq_name  name of the new sequence
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     *
+     * @see DB_common::createSequence(), DB_common::getSequenceName(),
+     *      DB_sqlite::nextID(), DB_sqlite::dropSequence()
+     */
+    function createSequence($seq_name)
+    {
+        $seqname = $this->getSequenceName($seq_name);
+        $query   = 'CREATE TABLE ' . $seqname .
+        ' (id INTEGER UNSIGNED PRIMARY KEY) ';
+        $result  = $this->query($query);
+        if (DB::isError($result)) {
+            return($result);
+        }
+        $query   = "CREATE TRIGGER {$seqname}_cleanup AFTER INSERT ON $seqname
+                    BEGIN
+                        DELETE FROM $seqname WHERE id<LAST_INSERT_ROWID();
+                    END ";
+        $result  = $this->query($query);
+        if (DB::isError($result)) {
+            return($result);
+        }
+    }
+    
+    // }}}
+    // {{{ nextId()
+    
+    /**
+     * Returns the next free id in a sequence
+     *
+     * @param string  $seq_name  name of the sequence
+     * @param boolean $ondemand  when true, the seqence is automatically
+     *                            created if it does not exist
+     *
+     * @return int  the next id number in the sequence.
+     *               A DB_Error object on failure.
+     *
+     * @see DB_common::nextID(), DB_common::getSequenceName(),
+     *      DB_sqlite::createSequence(), DB_sqlite::dropSequence()
+     */
+    function nextId($seq_name, $ondemand = true)
+    {
+        $seqname = $this->getSequenceName($seq_name);
+        
+        do {
+            $repeat = 0;
+            $this->pushErrorHandling(PEAR_ERROR_RETURN);
+            $result = $this->query("INSERT INTO $seqname (id) VALUES (NULL)");
+            $this->popErrorHandling();
+            if ($result === DB_OK) {
+                $id = @$this->connection->lastInsertRowID();
+                if ($id != 0) {
+                    return $id;
+                }
+            } elseif ($ondemand && DB::isError($result) &&
+                $result->getCode() == DB_ERROR_NOSUCHTABLE)
+            {
+                $result = $this->createSequence($seq_name);
+                if (DB::isError($result)) {
+                    return $this->raiseError($result);
+                } else {
+                    $repeat = 1;
+                }
+            }
+        } while ($repeat);
+        
+        return $this->raiseError($result);
+    }
+
+    // }}}
+    // {{{ lastId()
+
+    /**
+     * Returns the row ID of the most recent INSERT into the database
+     *
+     * @param string  $link_identifier DBMS link identifier
+     *
+     * @return int the row ID of the most recent INSERT into the database.
+     *             If no successful INSERTs into rowid tables have ever
+     *             occurred on this database connection,
+     *             then SQLite3::lastInsertRowID() returns 0
+     *
+     * @see DB_common::lastID(), SQLite3::lastInsertRowID()
+     */
+    function lastId($link_identifier = null)
+    {
+        $id = $this->connection->lastInsertRowID();
+        if (empty($id) || !is_int($id)) {
+            return 0;
+        }
+        return $id;
+    }
+    
+    // }}}
+    // {{{ getDbFileStats()
+    
+    /**
+     * Get the file stats for the current database
+     *
+     * Possible arguments are dev, ino, mode, nlink, uid, gid, rdev, size,
+     * atime, mtime, ctime, blksize, blocks or a numeric key between
+     * 0 and 12.
+     *
+     * @param string $arg  the array key for stats()
+     *
+     * @return mixed  an array on an unspecified key, integer on a passed
+     *                arg and false at a stats error
+     */
+    function getDbFileStats($arg = '')
+    {
+        $stats = stat($this->dsn['database']);
+        if ($stats == false) {
+            return false;
+        }
+        if (is_array($stats)) {
+            if (is_numeric($arg)) {
+                if (((int)$arg <= 12) & ((int)$arg >= 0)) {
+                    return false;
+                }
+                return $stats[$arg ];
+            }
+            if (array_key_exists(trim($arg), $stats)) {
+                return $stats[$arg ];
+            }
+        }
+        return $stats;
+    }
+    
+    // }}}
+    // {{{ escapeSimple()
+    
+    /**
+     * Escapes a string according to the current DBMS's standards
+     *
+     * In SQLite, this makes things safe for inserts/updates, but may
+     * cause problems when performing text comparisons against columns
+     * containing binary data. See the
+     * {@link http://php.net/sqlite_escape_string PHP manual} for more info.
+     *
+     * @param string $str  the string to be escaped
+     *
+     * @return string  the escaped string
+     *
+     * @since Method available since Release 1.6.1
+     * @see DB_common::escapeSimple()
+     */
+    function escapeSimple($str)
+    {
+        return @$this->connection->escapeString($str);
+    }
+    
+    // }}}
+    // {{{ modifyLimitQuery()
+    
+    /**
+     * Adds LIMIT clauses to a query string according to current DBMS standards
+     *
+     * @param string $query   the query to modify
+     * @param int    $from    the row to start to fetching (0 = the first row)
+     * @param int    $count   the numbers of rows to fetch
+     * @param mixed  $params  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
+     *
+     * @return string  the query string with LIMIT clauses added
+     *
+     * @access protected
+     */
+    function modifyLimitQuery($query, $from, $count, $params = array())
+    {
+        return "$query LIMIT $count OFFSET $from";
+    }
+    
+    // }}}
+    // {{{ modifyQuery()
+    
+    /**
+     * Changes a query string for various DBMS specific reasons
+     *
+     * This little hack lets you know how many rows were deleted
+     * when running a "DELETE FROM table" query.  Only implemented
+     * if the DB_PORTABILITY_DELETE_COUNT portability option is on.
+     *
+     * @param string $query  the query string to modify
+     *
+     * @return string  the modified query string
+     *
+     * @access protected
+     * @see DB_common::setOption()
+     */
+    function modifyQuery($query)
+    {
+        if ($this->options['portability'] & DB_PORTABILITY_DELETE_COUNT) {
+            if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $query)) {
+                $query = preg_replace('/^\s*DELETE\s+FROM\s+(\S+)\s*$/',
+                    'DELETE FROM \1 WHERE 1=1', $query);
+            }
+        }
+        return $query;
+    }
+    
+    // }}}
+    // {{{ sqliteRaiseError()
+    
+    /**
+     * Produces a DB_Error object regarding the current problem
+     *
+     * @param int $errno  if the error is being manually raised pass a
+     *                     DB_ERROR* constant here.  If this isn't passed
+     *                     the error information gathered from the DBMS.
+     *
+     * @return object  the DB_Error object
+     *
+     * @see DB_common::raiseError(),
+     *      DB_sqlite::errorNative(), DB_sqlite::errorCode()
+     */
+    function sqliteRaiseError($errno = null)
+    {
+        $native = $this->errorNative();
+        if ($errno === null) {
+            $errno = $this->errorCode($native);
+        }
+        
+        $errorcode = @$this->connection->lastErrorCode();
+        $userinfo = "$errorcode ** $this->last_query";
+        
+        return $this->raiseError($errno, null, null, $userinfo, $native);
+    }
+    
+    // }}}
+    // {{{ errorNative()
+    
+    /**
+     * Gets the DBMS' native error message produced by the last query
+     *
+     * {@internal This is used to retrieve more meaningfull error messages
+     * because sqlite_last_error() does not provide adequate info.}}
+     *
+     * @return string  the DBMS' error message
+     */
+    function errorNative()
+    {
+        return $this->_lasterror;
+    }
+    
+    // }}}
+    // {{{ errorCode()
+    
+    /**
+     * Determines PEAR::DB error code from the database's text error message
+     *
+     * @param string $errormsg  the error message returned from the database
+     *
+     * @return integer  the DB error number
+     */
+    function errorCode($errormsg)
+    {
+        static $error_regexps;
+        
+        // PHP 5.2+ prepends the function name to $php_errormsg, so we need
+        // this hack to work around it, per bug #9599.
+        $errormsg = preg_replace('/^sqlite[a-z_]+\(\): /', '', $errormsg);
+        
+        if (!isset($error_regexps)) {
+            $error_regexps = array(
+                '/^no such table:/' => DB_ERROR_NOSUCHTABLE,
+                '/^no such index:/' => DB_ERROR_NOT_FOUND,
+                '/^(table|index) .* already exists$/' => DB_ERROR_ALREADY_EXISTS,
+                '/PRIMARY KEY must be unique/i' => DB_ERROR_CONSTRAINT,
+                '/is not unique/' => DB_ERROR_CONSTRAINT,
+                '/columns .* are not unique/i' => DB_ERROR_CONSTRAINT,
+                '/uniqueness constraint failed/' => DB_ERROR_CONSTRAINT,
+                '/may not be NULL/' => DB_ERROR_CONSTRAINT_NOT_NULL,
+                '/^no such column:/' => DB_ERROR_NOSUCHFIELD,
+                '/no column named/' => DB_ERROR_NOSUCHFIELD,
+                '/column not present in both tables/i' => DB_ERROR_NOSUCHFIELD,
+                '/^near ".*": syntax error$/' => DB_ERROR_SYNTAX,
+                '/[0-9]+ values for [0-9]+ columns/i' => DB_ERROR_VALUE_COUNT_ON_ROW,
+            );
+        }
+        foreach ($error_regexps as $regexp => $code) {
+            if (preg_match($regexp, $errormsg)) {
+                return $code;
+            }
+        }
+        // Fall back to DB_ERROR if there was no mapping.
+        return DB_ERROR;
+    }
+    
+    // }}}
+    // {{{ tableInfo()
+    
+    /**
+     * Returns information about a table
+     *
+     * @param string         $result  a string containing the name of a table
+     * @param int            $mode    a valid tableInfo mode
+     *
+     * @return array  an associative array with the information requested.
+     *                 A DB_Error object on failure.
+     *
+     * @see DB_common::tableInfo()
+     */
+    function tableInfo($result, $mode = null)
+    {
+        if (is_string($result)) {
+            /*
+             * Probably received a table name.
+             * Create a result resource identifier.
+             */
+            $id = @$this->getAll("PRAGMA table_info('$result');", array(), DB_FETCHMODE_ASSOC);
+            $got_string = true;
+        } else {
+            $this->last_query = '';
+            return $this->raiseError(DB_ERROR_NOT_CAPABLE, null, null, null,
+                'This DBMS can not obtain tableInfo' .
+                ' from result sets');
+        }
+        
+        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
+            $case_func = 'strtolower';
+        } else {
+            $case_func = 'strval';
+        }
+        
+        $count = count($id);
+        $res   = array();
+        
+        if ($mode) {
+            $res['num_fields'] = $count;
+        }
+        
+        for ($i = 0; $i < $count; $i++) {
+            if (strpos($id[$i]['type'], '(') !== false) {
+                $bits = explode('(', $id[$i]['type']);
+                $type = $bits[0];
+                $len  = rtrim($bits[1],')');
+            } else {
+                $type = $id[$i]['type'];
+                $len  = 0;
+            }
+            
+            $flags = '';
+            if ($id[$i]['pk']) {
+                $flags .= 'primary_key ';
+                if (strtoupper($type) == 'INTEGER') {
+                    $flags .= 'auto_increment ';
+                }
+            }
+            if ($id[$i]['notnull']) {
+                $flags .= 'not_null ';
+            }
+            if ($id[$i]['dflt_value'] !== null) {
+                $flags .= 'default_' . rawurlencode($id[$i]['dflt_value']);
+            }
+            $flags = trim($flags);
+            
+            $res[$i] = array(
+                'table' => $case_func($result),
+                'name'  => $case_func($id[$i]['name']),
+                'type'  => $type,
+                'len'   => $len,
+                'flags' => $flags,
+            );
+            
+            if ($mode & DB_TABLEINFO_ORDER) {
+                $res['order'][$res[$i]['name']] = $i;
+            }
+            if ($mode & DB_TABLEINFO_ORDERTABLE) {
+                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
+            }
+        }
+        
+        return $res;
+    }
+    
+    // }}}
+    // {{{ getSpecialQuery()
+    
+    /**
+     * Obtains the query string needed for listing a given type of objects
+     *
+     * @param string $type  the kind of objects you want to retrieve
+     * @param array  $args  SQLITE DRIVER ONLY: a private array of arguments
+     *                       used by the getSpecialQuery().  Do not use
+     *                       this directly.
+     *
+     * @return string  the SQL query string or null if the driver doesn't
+     *                  support the object type requested
+     *
+     * @access protected
+     * @see DB_common::getListOf()
+     */
+    function getSpecialQuery($type, $args = array())
+    {
+        if (!is_array($args)) {
+            return $this->raiseError('no key specified', null, null, null,
+                'Argument has to be an array.');
+        }
+        
+        switch ($type) {
+            case 'master':
+                return 'SELECT * FROM sqlite_master;';
+            case 'tables':
+                return "SELECT name FROM sqlite_master WHERE type='table' "
+                    . 'UNION ALL SELECT name FROM sqlite_temp_master '
+                        . "WHERE type='table' ORDER BY name;";
+            case 'schema':
+                return 'SELECT sql FROM (SELECT * FROM sqlite_master '
+                    . 'UNION ALL SELECT * FROM sqlite_temp_master) '
+                        . "WHERE type!='meta' "
+                            . 'ORDER BY tbl_name, type DESC, name;';
+            case 'schemax':
+            case 'schema_x':
+                /*
+                 * Use like:
+                 * $res = $db->query($db->getSpecialQuery('schema_x',
+                 *                   array('table' => 'table3')));
+                 */
+                return 'SELECT sql FROM (SELECT * FROM sqlite_master '
+                    . 'UNION ALL SELECT * FROM sqlite_temp_master) '
+                        . "WHERE tbl_name LIKE '{$args['table']}' "
+                        . "AND type!='meta' "
+                            . 'ORDER BY type DESC, name;';
+            default:
+                return null;
+        }
+    }
+    
+    // }}}
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
+
+?>
\ No newline at end of file
diff --git a/www/modules/civicrm/vendor/pear/db/DB/sybase.php b/www/modules/civicrm/vendor/pear/db/DB/sybase.php
index aa3a1b7c7..c7e3f5025 100644
--- a/www/modules/civicrm/vendor/pear/db/DB/sybase.php
+++ b/www/modules/civicrm/vendor/pear/db/DB/sybase.php
@@ -17,12 +17,13 @@
  * @category   Database
  * @package    DB
  * @author     Sterling Hughes <sterling@php.net>
- * @author     Antônio Carlos Venâncio Júnior <floripa@php.net>
+ * @author     Antônio Carlos Venâncio Júnior <floripa@php.net>
  * @author     Daniel Convissor <danielc@php.net>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
  * @version    CVS: $Id$
  * @link       http://pear.php.net/package/DB
+ * @deprecated since 1.12.0
  */
 
 /**
@@ -42,12 +43,13 @@
  * @category   Database
  * @package    DB
  * @author     Sterling Hughes <sterling@php.net>
- * @author     Antônio Carlos Venâncio Júnior <floripa@php.net>
+ * @author     Antônio Carlos Venâncio Júnior <floripa@php.net>
  * @author     Daniel Convissor <danielc@php.net>
  * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
  * @version    Release: @package_version@
  * @link       http://pear.php.net/package/DB
+ * @deprecated since 1.12.0
  */
 class DB_sybase extends DB_common
 {
diff --git a/www/modules/civicrm/vendor/pear/db/PATCHES.txt b/www/modules/civicrm/vendor/pear/db/PATCHES.txt
index c1b9eb6b5..c17a786ed 100644
--- a/www/modules/civicrm/vendor/pear/db/PATCHES.txt
+++ b/www/modules/civicrm/vendor/pear/db/PATCHES.txt
@@ -1,14 +1,6 @@
 This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches)
 Patches applied to this directory:
 
-Apply patch to ensure that MySQLI reporting remains the same in php8.1
-Source: https://patch-diff.githubusercontent.com/raw/pear/DB/pull/13.patch
-
-
-Apply patch to fix deprecations in php8.2
-Source: https://patch-diff.githubusercontent.com/raw/pear/DB/pull/14.patch
-
-
 Apply CiviCRM Customisations for the pear:db package
 Source: https://raw.githubusercontent.com/civicrm/civicrm-core/2ad420c394/tools/scripts/composer/pear_db_civicrm_changes.patch
 
diff --git a/www/modules/civicrm/vendor/pear/db/composer.json b/www/modules/civicrm/vendor/pear/db/composer.json
index 05d12a737..c0102ac7b 100644
--- a/www/modules/civicrm/vendor/pear/db/composer.json
+++ b/www/modules/civicrm/vendor/pear/db/composer.json
@@ -10,6 +10,11 @@
             "name": "Adam Harvey",
             "role": "Lead"
         },
+        {
+            "email": "schengawegga@gmail.com",
+            "name": "Armin Graefe",
+            "role": "Lead"
+        },
         {
             "email": "stig@php.net",
             "name": "Stig Bakken",
diff --git a/www/modules/civicrm/vendor/pear/mail/Mail/RFC822.php b/www/modules/civicrm/vendor/pear/mail/Mail/RFC822.php
index e0748f586..d33273531 100644
--- a/www/modules/civicrm/vendor/pear/mail/Mail/RFC822.php
+++ b/www/modules/civicrm/vendor/pear/mail/Mail/RFC822.php
@@ -60,7 +60,8 @@
  * How do I use it?
  *
  * $address_string = 'My Group: "Richard" <richard@localhost> (A comment), ted@example.com (Ted Bloggs), Barney;';
- * $structure = Mail_RFC822::parseAddressList($address_string, 'example.com', true)
+ * $parser = new Mail_RFC822();
+ * $structure = $parser->parseAddressList($address_string, 'example.com', true);
  * print_r($structure);
  *
  * @author  Richard Heyes <richard@phpguru.org>
@@ -172,10 +173,14 @@ public function __construct($address = null, $default_domain = null, $nest_group
      */
     public function parseAddressList($address = null, $default_domain = null, $nest_groups = null, $validate = null, $limit = null)
     {
-        if (!isset($this) || !isset($this->mailRFC822)) {
-            $obj = new Mail_RFC822($address, $default_domain, $nest_groups, $validate, $limit);
-            return $obj->parseAddressList();
-        }
+      if (version_compare(PHP_VERSION, '8.0.0', '<')) {
+          if (!isset($this) || !isset($this->mailRFC822)) {
+              $warn = "Calling non-static methods statically is no longer supported since PHP 8";
+              trigger_error($warn, E_USER_NOTICE);
+              $obj = new Mail_RFC822($address, $default_domain, $nest_groups, $validate, $limit);
+              return $obj->parseAddressList();
+          }
+      }
 
         if (isset($address))        $this->address        = $address;
         if (isset($default_domain)) $this->default_domain = $default_domain;
@@ -227,6 +232,9 @@ public function parseAddressList($address = null, $default_domain = null, $nest_
      */
     protected function _splitAddresses($address)
     {
+        $is_group = false;
+        $split_char = ',';
+
         if (!empty($this->limit) && count($this->addresses) == $this->limit) {
             return '';
         }
@@ -437,6 +445,7 @@ protected function _hasUnclosedBracketsSub($string, &$num, $char)
      */
     protected function _validateAddress($address)
     {
+        $structure = null;
         $is_group = false;
         $addresses = array();
 
@@ -477,7 +486,7 @@ protected function _validateAddress($address)
         }
 
         // Trim the whitespace from all of the address strings.
-        array_map('trim', $addresses);
+        $addresses = array_map('trim', $addresses);
 
         // Validate each mailbox.
         // Format could be one of: name <geezer@domain.com>
@@ -614,6 +623,7 @@ public function validateMailbox(&$mailbox)
         $phrase  = '';
         $comment = '';
         $comments = array();
+        $addr_spec = null;
 
         // Catch any RFC822 comments and store them separately.
         $_mailbox = $mailbox;
@@ -771,6 +781,7 @@ protected function _validateDomain($domain)
     {
         // Note the different use of $subdomains and $sub_domains
         $subdomains = explode('.', $domain);
+        $sub_domains = array();
 
         while (count($subdomains) > 0) {
             $sub_domains[] = $this->_splitCheck($subdomains, '.');
diff --git a/www/modules/civicrm/vendor/pear/mail/Mail/mail.php b/www/modules/civicrm/vendor/pear/mail/Mail/mail.php
index 4ff4403a1..7de92c510 100644
--- a/www/modules/civicrm/vendor/pear/mail/Mail/mail.php
+++ b/www/modules/civicrm/vendor/pear/mail/Mail/mail.php
@@ -76,16 +76,6 @@ public function __construct($params = null)
         } else {
             $this->_params = $params;
         }
-
-        /* Because the mail() function may pass headers as command
-         * line arguments, we can't guarantee the use of the standard
-         * "\r\n" separator.  Instead, we use the system's native line
-         * separator. */
-        if (defined('PHP_EOL')) {
-            $this->sep = PHP_EOL;
-        } else {
-            $this->sep = (strpos(PHP_OS, 'WIN') === false) ? "\n" : "\r\n";
-        }
     }
 
     /**
diff --git a/www/modules/civicrm/vendor/pear/mail/Mail/smtp.php b/www/modules/civicrm/vendor/pear/mail/Mail/smtp.php
index 3cf7497e8..62515b256 100644
--- a/www/modules/civicrm/vendor/pear/mail/Mail/smtp.php
+++ b/www/modules/civicrm/vendor/pear/mail/Mail/smtp.php
@@ -112,12 +112,12 @@ class Mail_smtp extends Mail {
      *
      * If the value is set to true, the Net_SMTP package will attempt to use
      * a STARTTLS encrypted connection.
-     * 
+     *
      * If the value is set to false, the Net_SMTP package will avoid
      * a STARTTLS encrypted connection.
-     * 
+     *
      * NULL indicates only STARTTLS if $auth is set.
-     * 
+     *
      * PEAR/Net_SMTP >= 1.10.0 required.
      *
      * @var boolean
@@ -173,6 +173,22 @@ class Mail_smtp extends Mail {
      */
     var $debug = false;
 
+    /**
+     * Set debug_handler on Net_SMTP
+     *
+     * @var callable $debug_handler
+     */
+    var $debug_handler = null;
+
+    /**
+     * we need the greeting; from it we can extract the authorative name of the mail
+     * server we've really connected to. ideal if we're connecting to a round-robin
+     * of relay servers and need to track which exact one took the email
+     *
+     * @var string
+     */
+    var $greeting = null;
+
     /**
      * Indicates whether or not the SMTP connection should persist over
      * multiple calls to the send() method.
@@ -197,24 +213,47 @@ class Mail_smtp extends Mail {
      */
     var $socket_options = array();
 
+    /**
+     * SMTP response message
+     *
+     * @var string
+     * @since 1.6.0
+     */
+    var $response = null;
+
+    /**
+     * If the message ends up in the queue, on the recipient server,
+     * the response will be saved here.
+     * Some successfully delivered emails will include a “queued�
+     * notation in the SMTP response, such as "250 OK; queued as 12345".
+     * This indicates that the email was delivered to the recipient
+     * as expected, but may require additional processing before it
+     * lands in the recipient’s inbox.
+     *
+     * @var string
+     */
+    var $queued_as = null;
+
     /**
      * Constructor.
      *
      * Instantiates a new Mail_smtp:: object based on the parameters
      * passed in. It looks for the following parameters:
-     *     host        The server to connect to. Defaults to localhost.
-     *     port        The port to connect to. Defaults to 25.
-     *     auth        SMTP authentication. Defaults to none.
-     *     starttls    Should STARTTLS connection be used? No default. PEAR/Net_SMTP >= 1.10.0 required.
-     *     username    The username to use for SMTP auth. No default.
-     *     password    The password to use for SMTP auth. No default.
-     *     localhost   The local hostname / domain. Defaults to localhost.
-     *     timeout     The SMTP connection timeout. Defaults to none.
-     *     verp        Whether to use VERP or not. Defaults to false.
-     *                 DEPRECATED as of 1.2.0 (use setMailParams()).
-     *     debug       Activate SMTP debug mode? Defaults to false.
-     *     persist     Should the SMTP connection persist?
-     *     pipelining  Use SMTP command pipelining
+     *     host            The server to connect to. Defaults to localhost.
+     *     port            The port to connect to. Defaults to 25.
+     *     auth            SMTP authentication. Defaults to none.
+     *     starttls        Should STARTTLS connection be used? No default. PEAR/Net_SMTP >= 1.10.0 required.
+     *     username        The username to use for SMTP auth. No default.
+     *     password        The password to use for SMTP auth. No default.
+     *     localhost       The local hostname / domain. Defaults to localhost.
+     *     timeout         The SMTP connection timeout. Defaults to none.
+     *     verp            Whether to use VERP or not. Defaults to false.
+     *                     DEPRECATED as of 1.2.0 (use setMailParams()).
+     *     debug           Activate SMTP debug mode? Defaults to false.
+     *     debug_handler   Set SMTP debug handler function. Defaults to null.
+     *     persist         Should the SMTP connection persist?
+     *     pipelining      Use SMTP command pipelining
+     *     socket_options  Socket stream_context_create() options.
      *
      * If a parameter is present in the $params array, it replaces the
      * default.
@@ -233,6 +272,7 @@ public function __construct($params)
         if (isset($params['localhost'])) $this->localhost = $params['localhost'];
         if (isset($params['timeout'])) $this->timeout = $params['timeout'];
         if (isset($params['debug'])) $this->debug = (bool)$params['debug'];
+        if (isset($params['debug_handler'])) $this->debug_handler = $params['debug_handler'];
         if (isset($params['persist'])) $this->persist = (bool)$params['persist'];
         if (isset($params['pipelining'])) $this->pipelining = (bool)$params['pipelining'];
         if (isset($params['socket_options'])) $this->socket_options = $params['socket_options'];
@@ -349,7 +389,10 @@ protected function send_or_fail($recipients, $headers, $body)
 
         /* Send the message's headers and the body as SMTP data. */
         $res = $this->_smtp->data($body, $textHeaders);
-        list(,$args) = $this->_smtp->getResponse();
+
+        list($code, $args) = $this->_smtp->getResponse();
+
+        $this->response = $code . ' ' . $args;
 
         if (preg_match("/ queued as (.*)/", $args, $queued)) {
             $this->queued_as = $queued[1];
@@ -399,7 +442,7 @@ public function getSMTPObject()
 
         /* Configure the SMTP connection. */
         if ($this->debug) {
-            $this->_smtp->setDebug(true);
+            $this->_smtp->setDebug(true, $this->debug_handler);
         }
 
         /* Attempt to connect to the configured SMTP server. */
@@ -413,7 +456,7 @@ public function getSMTPObject()
         /* Attempt to authenticate if authentication has been enabled. */
         if ($this->auth) {
             $method = is_string($this->auth) ? $this->auth : '';
-            
+
             $tls = $this->starttls === false ? false : true;
 
             if (PEAR::isError($res = $this->_smtp->auth($this->username,
@@ -426,7 +469,7 @@ public function getSMTPObject()
                 return PEAR::raiseError($error, PEAR_MAIL_SMTP_ERROR_AUTH);
             }
         }
-        
+
         /* Attempt to establish a TLS encrypted connection. PEAR/Net_SMTP >= 1.10.0 required. */
         if ($this->starttls && !$this->auth) {
             $starttls = $this->_smtp->starttls();
@@ -471,6 +514,30 @@ public function disconnect()
         return ($this->_smtp === null);
     }
 
+    /**
+     * Returns the SMTP response message after sending.
+     *
+     * @return string SMTP response message or NULL.
+     *
+     * @since  1.6.0
+     */
+    public function getResponse()
+    {
+        return $this->response;
+    }
+
+    /**
+     * Returns the SMTP response message if includes "queue" after sending.
+     *
+     * @return string SMTP queue message or NULL.
+     *
+     * @since  1.6.0
+     */
+    public function getQueuedAs()
+    {
+        return $this->queued_as;
+    }
+
     /**
      * Build a standardized string describing the current SMTP error.
      *
diff --git a/www/modules/civicrm/vendor/pear/mail/Mail/smtpmx.php b/www/modules/civicrm/vendor/pear/mail/Mail/smtpmx.php
index e26db1be8..42a34b722 100644
--- a/www/modules/civicrm/vendor/pear/mail/Mail/smtpmx.php
+++ b/www/modules/civicrm/vendor/pear/mail/Mail/smtpmx.php
@@ -125,24 +125,31 @@ class Mail_smtpmx extends Mail {
     /**
      * Switch to test mode - don't send emails for real
      *
-     * @var boolean $debug
+     * @var boolean $test
      */
     var $test = false;
 
     /**
      * Turn on Net_SMTP debugging?
      *
-     * @var boolean $peardebug
+     * @var boolean $debug
      */
     var $debug = false;
 
+    /**
+     * Set debug_handler on Net_SMTP
+     *
+     * @var string $debug_handler
+     */
+    var $debug_handler = null;
+
     /**
      * internal error codes
      *
      * translate internal error identifier to PEAR-Error codes and human
      * readable messages.
      *
-     * @var boolean $debug
+     * @var array $errorCode
      * @todo as I need unique error-codes to identify what exactly went wrond
      *       I did not use intergers as it should be. Instead I added a "namespace"
      *       for each code. This avoids conflicts with error codes from different
@@ -196,14 +203,15 @@ class Mail_smtpmx extends Mail {
      *
      * Instantiates a new Mail_smtp:: object based on the parameters
      * passed in. It looks for the following parameters:
-     *     mailname    The name of the local mail system (a valid hostname which matches the reverse lookup)
-     *     port        smtp-port - the default comes from getservicebyname() and should work fine
-     *     timeout     The SMTP connection timeout. Defaults to 30 seconds.
-     *     vrfy        Whether to use VRFY or not. Defaults to false.
-     *     verp        Whether to use VERP or not. Defaults to false.
-     *     test        Activate test mode? Defaults to false.
-     *     debug       Activate SMTP and Net_DNS debug mode? Defaults to false.
-     *     netdns      whether to use PEAR:Net_DNS or the PHP build in function getmxrr, default is true
+     *     mailname       The name of the local mail system (a valid hostname which matches the reverse lookup)
+     *     port           smtp-port - the default comes from getservicebyname() and should work fine
+     *     timeout        The SMTP connection timeout. Defaults to 30 seconds.
+     *     vrfy           Whether to use VRFY or not. Defaults to false.
+     *     verp           Whether to use VERP or not. Defaults to false.
+     *     test           Activate test mode? Defaults to false.
+     *     debug          Activate SMTP and Net_DNS debug mode? Defaults to false.
+     *     debug_handler  Set SMTP debug handler function. Defaults to null.
+     *     netdns         whether to use PEAR:Net_DNS or the PHP build in function getmxrr, default is true
      *
      * If a parameter is present in the $params array, it replaces the
      * default.
@@ -227,15 +235,18 @@ function __construct($params)
 
         // port number
         if (isset($params['port'])) {
-            $this->_port = $params['port'];
+            $this->port = $params['port'];
         } else {
-            $this->_port = getservbyname('smtp', 'tcp');
+            $this->port = getservbyname('smtp', 'tcp');
         }
 
         if (isset($params['timeout'])) $this->timeout = $params['timeout'];
+        if (isset($params['vrfy'])) $this->vrfy = (bool)$params['vrfy'];
         if (isset($params['verp'])) $this->verp = $params['verp'];
-        if (isset($params['test'])) $this->test = $params['test'];
-        if (isset($params['peardebug'])) $this->test = $params['peardebug'];
+        if (isset($params['test'])) $this->test = (bool)$params['test'];
+        if (isset($params['peardebug'])) $this->debug = (bool)$params['peardebug'];
+        if (isset($params['debug'])) $this->debug = (bool)$params['debug'];
+        if (isset($params['debug_handler'])) $this->debug_handler = $params['debug_handler'];
         if (isset($params['netdns'])) $this->withNetDns = $params['netdns'];
     }
 
@@ -324,7 +335,7 @@ function send($recipients, $headers, $body)
 
                 // configure the SMTP connection.
                 if ($this->debug) {
-                    $this->_smtp->setDebug(true);
+                    $this->_smtp->setDebug(true, $this->debug_handler);
                 }
 
                 // attempt to connect to the configured SMTP server.
@@ -464,7 +475,7 @@ function _loadNetDns()
 
         $this->resolver = new Net_DNS_Resolver();
         if ($this->debug) {
-            $this->resolver->test = 1;
+            $this->resolver->debug = 1;
         }
 
         return true;
diff --git a/www/modules/civicrm/vendor/pear/net_smtp/.github/workflows/ci.yml b/www/modules/civicrm/vendor/pear/net_smtp/.github/workflows/ci.yml
deleted file mode 100644
index b04870f5b..000000000
--- a/www/modules/civicrm/vendor/pear/net_smtp/.github/workflows/ci.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: CI
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        php-version: ['5.6', '7.0', '7.1', '7.2', '7.3']
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up PHP ${{ matrix.php-version }}
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          ini-values: include_path=.:/usr/share/php:pear/usr/share/php
-      - name: Install dependencies
-        run: |
-          pear -v install -R pear -o Net_Socket
-      - name: Run tests
-        run: |
-          pear run-tests -d tests/
diff --git a/www/modules/civicrm/vendor/pear/net_smtp/Net/SMTP.php b/www/modules/civicrm/vendor/pear/net_smtp/Net/SMTP.php
index 4dbd0193f..731415a2e 100644
--- a/www/modules/civicrm/vendor/pear/net_smtp/Net/SMTP.php
+++ b/www/modules/civicrm/vendor/pear/net_smtp/Net/SMTP.php
@@ -150,6 +150,25 @@ class Net_SMTP
      */
     protected $esmtp = array();
 
+    /**
+     * GSSAPI principal.
+     * @var string
+     */
+    protected $gssapi_principal = null;
+
+    /**
+     * GSSAPI principal.
+     * @var string
+     */
+    protected $gssapi_cname = null;
+
+    /**
+     * SCRAM SHA-Hash algorithm.
+     *
+     * @var string
+     */
+    protected $scram_sha_hash_algorithm = null;
+
     /**
      * Instantiates a new Net_SMTP object, overriding any defaults
      * with parameters that are passed in.
@@ -174,7 +193,7 @@ class Net_SMTP
      */
     public function __construct($host = null, $port = null, $localhost = null,
         $pipelining = false, $timeout = 0, $socket_options = null,
-        $gssapi_principal=null, $gssapi_cname=null
+        $gssapi_principal = null, $gssapi_cname = null
     ) {
         if (isset($host)) {
             $this->host = $host;
@@ -194,7 +213,7 @@ public function __construct($host = null, $port = null, $localhost = null,
         $this->gssapi_cname     = $gssapi_cname;
 
         /* If PHP krb5 extension is loaded, we enable GSSAPI method. */
-        if (extension_loaded('krb5')) {
+        if (isset($gssapi_principal) && extension_loaded('krb5')) {
             $this->setAuthMethod('GSSAPI', array($this, 'authGSSAPI'));
         }
 
@@ -203,12 +222,18 @@ public function __construct($host = null, $port = null, $localhost = null,
         if (@include_once 'Auth/SASL.php') {
             $this->setAuthMethod('CRAM-MD5', array($this, 'authCramMD5'));
             $this->setAuthMethod('DIGEST-MD5', array($this, 'authDigestMD5'));
+            $this->setAuthMethod('SCRAM-SHA-1', array($this, 'authScramSHA1'));
+            $this->setAuthMethod('SCRAM-SHA-224', array($this, 'authScramSHA224'));
+            $this->setAuthMethod('SCRAM-SHA-256', array($this, 'authScramSHA256'));
+            $this->setAuthMethod('SCRAM-SHA-384', array($this, 'authScramSHA384'));
+            $this->setAuthMethod('SCRAM-SHA-512', array($this, 'authScramSHA512'));
         }
 
         /* These standard authentication methods are always available. */
         $this->setAuthMethod('LOGIN', array($this, 'authLogin'), false);
         $this->setAuthMethod('PLAIN', array($this, 'authPlain'), false);
         $this->setAuthMethod('XOAUTH2', array($this, 'authXOAuth2'), false);
+        $this->setAuthMethod('OAUTHBEARER', array($this, 'authOAuthBearer'), false);
     }
 
     /**
@@ -416,7 +441,7 @@ public function command($command, $valid)
      */
     public function getResponse()
     {
-        return array($this->code, join("\n", $this->arguments));
+        return array($this->code, implode("\n", $this->arguments));
     }
 
     /**
@@ -487,22 +512,32 @@ public function connect($timeout = null, $persistent = false)
     /**
      * Attempt to disconnect from the SMTP server.
      *
+     * @param bool $force Forces a disconnection of the socket even if
+     *                    the QUIT command fails
+     *
      * @return mixed Returns a PEAR_Error with an error message on any
      *               kind of failure, or true on success.
      * @since 1.0
      */
-    public function disconnect()
+    public function disconnect($force = false)
     {
-        if (PEAR::isError($error = $this->put('QUIT'))) {
-            return $error;
+        /* parseResponse is only needed if put QUIT is successful */
+        if (!PEAR::isError($error = $this->put('QUIT'))) {
+            $error = $this->parseResponse(221);
         }
-        if (PEAR::isError($error = $this->parseResponse(221))) {
-            return $error;
+
+        /* disconnecting socket if there is no error on the QUIT
+         * command or force disconnecting is requested */
+        if (!PEAR::isError($error) || $force) {
+            if (PEAR::isError($error_socket = $this->socket->disconnect())) {
+                return PEAR::raiseError(
+                    'Failed to disconnect socket: ' . $error_socket->getMessage()
+                );
+            }
         }
-        if (PEAR::isError($error = $this->socket->disconnect())) {
-            return PEAR::raiseError(
-                'Failed to disconnect socket: ' . $error->getMessage()
-            );
+
+        if (PEAR::isError($error)) {
+            return $error;
         }
 
         return true;
@@ -603,33 +638,90 @@ public function starttls()
                     /* STREAM_CRYPTO_METHOD_TLS_ANY_CLIENT constant does not exist
                      * and STREAM_CRYPTO_METHOD_SSLv23_CLIENT constant is
                      * inconsistent across PHP versions. */
-                    $crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT
-                    | @STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT
-                    | @STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
+                    $crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
+
+                    if (defined('STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT')) {
+                        $crypto_method |= @STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
+                    }
+
+                    if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
+                        $crypto_method |= @STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
+                    }
+
+                    if (defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT')) {
+                        $crypto_method |= @STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT;
+                    }
                 }
-                if (PEAR::isError($result = $this->socket->enableCrypto(true, $crypto_method))) {
-                    return $result;
-                } elseif ($result !== true) {
-                    return PEAR::raiseError('STARTTLS failed');
+
+                for ($attempts = 1; $attempts < 15; $attempts++) {
+                    if(PEAR::isError(
+                            $result = $this->socket->enableCrypto(
+                                true, $crypto_method)
+                        )
+                    ) {
+                        return $result;
+                    }
+                    if ($this->socket->isBlocking() !== true) {
+                        usleep($attempts);
+                    }
+                    if ($result !== 0) {
+                        break;
+                    }
                 }
-                
+
+                if ($result !== true) {
+                    $last_error = error_get_last();
+                    $crypto_types_arr = $this->getDefinedConstantsKeyFilter(
+                        'STREAM_CRYPTO_METHOD_'
+                    );
+                    $error_types_arr = $this->getDefinedConstantsKeyFilter(
+                        'E_'
+                    );
+
+                    $resultErrorString = "STARTTLS failed ";
+                    //{enableCrypto: false;
+                    $resultErrorString .= "{enableCrypto: %s; ";
+                    //crypto_method: STREAM_CRYPTO_METHOD_TLS_CLIENT (3);
+                    $resultErrorString .= "crypto_method: %s (%s); ";
+                    //attempts: 1;
+                    $resultErrorString .= "attempts: %d; ";
+                    //E_ERROR (1): ErrorMessage}
+                    $resultErrorString .= "%s (%s): %s}";
+
+                    return PEAR::raiseError(
+                        sprintf(
+                            $resultErrorString,
+                            var_export($result, true),
+                            array_search($crypto_method, $crypto_types_arr),
+                            var_export($crypto_method, true),
+                            $attempts,
+                            array_search($last_error['type'], $error_types_arr),
+                            $last_error['type'],
+                            $last_error['message']
+                        )
+                    );
+                }
+
                 /* Send EHLO again to recieve the AUTH string from the
                  * SMTP server. */
                 $this->negotiate();
             } else {
                 return false;
             }
-            
+
             return true;
     }
-        
+
     /**
      * Attempt to do SMTP authentication.
      *
      * @param string $uid    The userid to authenticate as.
      * @param string $pwd    The password to authenticate with.
-     * @param string $method The requested authentication method.  If none is
+     * @param string $method The requested authentication method. If none is
      *                       specified, the best supported method will be used.
+     *                       If you use the special method `OAUTH`, library
+     *                       will choose between OAUTHBEARER or XOAUTH2
+     *                       according the server's capabilities.
      * @param bool   $tls    Flag indicating whether or not TLS should be attempted.
      * @param string $authz  An optional authorization identifier.  If specified, this
      *                       identifier will be used as the authorization proxy.
@@ -663,6 +755,19 @@ public function auth($uid, $pwd , $method = '', $tls = true, $authz = '')
                 /* Return the PEAR_Error object from _getBestAuthMethod(). */
                 return $method;
             }
+        } elseif ($method === 'OAUTH') {
+            // special case of OAUTH, use the supported method
+            $found = false;
+            $available_methods = explode(' ', $this->esmtp['AUTH']);
+            foreach (['OAUTHBEARER', 'XOAUTH2'] as $method) {
+                if (in_array($method, $available_methods)) {
+                    $found = true;
+                    break;
+                }
+            }
+            if (!$found) {
+                return PEAR::raiseError("neither OAUTHBEARER nor XOAUTH2 is a supported authentication method");
+            }
         } else {
             $method = strtoupper($method);
             if (!array_key_exists($method, $this->auth_methods)) {
@@ -745,9 +850,15 @@ public function setAuthMethod($name, $callback, $prepend = true)
      * @return mixed Returns a PEAR_Error with an error message on any
      *               kind of failure, or true on success.
      * @since 1.1.0
+     * @deprecated 1.11.0
      */
     protected function authDigestMD5($uid, $pwd, $authz = '')
     {
+        /* TODO trigger deprecation error in 2.0.0 and remove authDigestMD5() in 3.0.0
+        trigger_error(__CLASS__ . ' (' . $this->host . '): Authentication method DIGEST-MD5' .
+            ' is no longer secure and should be avoided.', E_USER_DEPRECATED);
+        */
+
         if (PEAR::isError($error = $this->put('AUTH', 'DIGEST-MD5'))) {
             return $error;
         }
@@ -760,8 +871,7 @@ protected function authDigestMD5($uid, $pwd, $authz = '')
             return $error;
         }
 
-        $auth_sasl = new Auth_SASL;
-        $digest    = $auth_sasl->factory('digest-md5');
+        $digest    = Auth_SASL::factory('digest-md5');
         $challenge = base64_decode($this->arguments[0]);
         $auth_str  = base64_encode(
             $digest->getResponse($uid, $pwd, $challenge, $this->host, "smtp", $authz)
@@ -797,9 +907,15 @@ protected function authDigestMD5($uid, $pwd, $authz = '')
      * @return mixed Returns a PEAR_Error with an error message on any
      *               kind of failure, or true on success.
      * @since 1.1.0
+     * @deprecated 1.11.0
      */
     protected function authCRAMMD5($uid, $pwd, $authz = '')
     {
+        /* TODO trigger deprecation error in 2.0.0 and remove authCRAMMD5() in 3.0.0
+        trigger_error(__CLASS__ . ' (' . $this->host . '): Authentication method CRAM-MD5' .
+            ' is no longer secure and should be avoided.', E_USER_DEPRECATED);
+        */
+
         if (PEAR::isError($error = $this->put('AUTH', 'CRAM-MD5'))) {
             return $error;
         }
@@ -812,9 +928,8 @@ protected function authCRAMMD5($uid, $pwd, $authz = '')
             return $error;
         }
 
-        $auth_sasl = new Auth_SASL;
         $challenge = base64_decode($this->arguments[0]);
-        $cram      = $auth_sasl->factory('cram-md5');
+        $cram      = Auth_SASL::factory('cram-md5');
         $auth_str  = base64_encode($cram->getResponse($uid, $pwd, $challenge));
 
         if (PEAR::isError($error = $this->put($auth_str))) {
@@ -837,9 +952,15 @@ protected function authCRAMMD5($uid, $pwd, $authz = '')
      * @return mixed Returns a PEAR_Error with an error message on any
      *               kind of failure, or true on success.
      * @since 1.1.0
+     * @deprecated 1.11.0
      */
     protected function authLogin($uid, $pwd, $authz = '')
     {
+        /* TODO trigger deprecation error in 2.0.0 and remove authLogin() in 3.0.0
+        trigger_error(__CLASS__ . ' (' . $this->host . '): Authentication method LOGIN' .
+            ' is no longer secure and should be avoided.', E_USER_DEPRECATED);
+        */
+
         if (PEAR::isError($error = $this->put('AUTH', 'LOGIN'))) {
             return $error;
         }
@@ -999,18 +1120,77 @@ protected function authGSSAPI($uid, $pwd, $authz = '')
      * Authenticates the user using the XOAUTH2 method.
      *
      * @param string $uid   The userid to authenticate as.
-     * @param string $token The access token to authenticate with.
+     * @param string $token The access token prefixed by it's type
+     *                      example: "Bearer $access_token".
      * @param string $authz The optional authorization proxy identifier.
+     * @param object $conn  The current object
      *
      * @return mixed Returns a PEAR_Error with an error message on any
      *               kind of failure, or true on success.
      * @since 1.9.0
      */
+    //FIXME: to switch into protected method on next major release
     public function authXOAuth2($uid, $token, $authz, $conn)
     {
         $auth = base64_encode("user=$uid\1auth=$token\1\1");
-        if (PEAR::isError($error = $this->put('AUTH', 'XOAUTH2 ' . $auth))) {
-            return $error;
+        return $this->authenticateOAuth('XOAUTH2', $auth, $authz, $conn);
+    }
+
+    /**
+     * Authenticates the user using the OAUTHBEARER method.
+     *
+     * @param string $uid   The userid to authenticate as.
+     * @param string $token The access token prefixed by it's type
+     *                      example: "Bearer $access_token".
+     * @param string $authz The optional authorization proxy identifier.
+     * @param object $conn  The current object
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @since 1.9.3
+     * @see https://www.rfc-editor.org/rfc/rfc7628.html
+     */
+    protected function authOAuthBearer($uid, $token, $authz, $conn)
+    {
+        $auth = base64_encode("n,a=$uid\1auth=$token\1\1");
+        return $this->authenticateOAuth('OAUTHBEARER', $auth, $authz, $conn);
+    }
+
+    /**
+     * Authenticates the user using the OAUTHBEARER or XOAUTH2 method.
+     *
+     * @param string $method The method (OAUTHBEARER or XOAUTH2)
+     * @param string $auth   The authentication string (base64 coded)
+     * @param string $authz  The optional authorization proxy identifier.
+     * @param object $conn   The current object
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     */
+    protected function authenticateOAuth( $method, $auth, $authz, $conn)
+    {
+        // Maximum length of the base64-encoded token to be sent in the initial response is 504 - strlen($method) bytes,
+        // according to RFC 4954 (https://datatracker.ietf.org/doc/html/rfc4954); for longer tokens an empty initial
+        // response MUST be sent and the token must be sent separately
+        // (504 bytes = /SMTP command length limit/ - 6 bytes /"AUTH "/ -strlen($method) - 1 byte /" "/ - 2 bytes /CRLF/)
+        if (strlen($auth) <= (504-strlen($method))) {
+            if (PEAR::isError($error = $this->put('AUTH', $method . ' ' . $auth))) {
+                return $error;
+            }
+        } else {
+            if (PEAR::isError($error = $this->put('AUTH', $method))) {
+                return $error;
+            }
+
+            // server is expected to respond with 334
+            if (PEAR::isError($error = $this->parseResponse(334))) {
+                return $error;
+            }
+
+            // then follows the token
+            if (PEAR::isError($error = $this->put($auth))) {
+                return $error;
+            }
         }
 
         /* 235: Authentication successful or 334: Continue authentication */
@@ -1034,6 +1214,159 @@ public function authXOAuth2($uid, $token, $authz, $conn)
         return true;
     }
 
+    /**
+     * Authenticates the user using the SCRAM-SHA-1 method.
+     *
+     * @param string $uid   The userid to authenticate as.
+     * @param string $pwd   The password to authenticate with.
+     * @param string $authz The optional authorization proxy identifier.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @since  1.11.0
+     */
+    protected function authScramSHA1($uid, $pwd, $authz = '')
+    {
+        $this->scram_sha_hash_algorithm = 'SCRAM-SHA-1';
+        return $this->authScramSHA($uid, $pwd, $authz);
+    }
+
+    /**
+     * Authenticates the user using the SCRAM-SHA-224 method.
+     *
+     * @param string $uid   The userid to authenticate as.
+     * @param string $pwd   The password to authenticate with.
+     * @param string $authz The optional authorization proxy identifier.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @since  1.11.0
+     */
+    protected function authScramSHA224($uid, $pwd, $authz = '')
+    {
+        $this->scram_sha_hash_algorithm = 'SCRAM-SHA-224';
+        return $this->authScramSHA($uid, $pwd, $authz);
+    }
+
+    /**
+     * Authenticates the user using the SCRAM-SHA-256 method.
+     *
+     * @param string $uid   The userid to authenticate as.
+     * @param string $pwd   The password to authenticate with.
+     * @param string $authz The optional authorization proxy identifier.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @since  1.11.0
+     */
+    protected function authScramSHA256($uid, $pwd, $authz = '')
+    {
+        $this->scram_sha_hash_algorithm = 'SCRAM-SHA-256';
+        return $this->authScramSHA($uid, $pwd, $authz);
+    }
+
+    /**
+     * Authenticates the user using the SCRAM-SHA-384 method.
+     *
+     * @param string $uid   The userid to authenticate as.
+     * @param string $pwd   The password to authenticate with.
+     * @param string $authz The optional authorization proxy identifier.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @since  1.11.0
+     */
+    protected function authScramSHA384($uid, $pwd, $authz = '')
+    {
+        $this->scram_sha_hash_algorithm = 'SCRAM-SHA-384';
+        return $this->authScramSHA($uid, $pwd, $authz);
+    }
+
+    /**
+     * Authenticates the user using the SCRAM-SHA-512 method.
+     *
+     * @param string $uid   The userid to authenticate as.
+     * @param string $pwd   The password to authenticate with.
+     * @param string $authz The optional authorization proxy identifier.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @since  1.11.0
+     */
+    protected function authScramSHA512($uid, $pwd, $authz = '')
+    {
+        $this->scram_sha_hash_algorithm = 'SCRAM-SHA-512';
+        return $this->authScramSHA($uid, $pwd, $authz);
+    }
+
+    /**
+     * Authenticates the user using the SCRAM-SHA method.
+     *
+     * @param string $uid   The userid to authenticate as.
+     * @param string $pwd   The password to authenticate with.
+     * @param string $authz The optional authorization proxy identifier.
+     *
+     * @return mixed Returns a PEAR_Error with an error message on any
+     *               kind of failure, or true on success.
+     * @since  1.11.0
+     */
+    protected function authScramSHA($uid, $pwd, $authz = '')
+    {
+        if (PEAR::isError($error = $this->put('AUTH', $this->scram_sha_hash_algorithm))) {
+            return $error;
+        }
+        /* 334: Continue authentication request */
+        if (PEAR::isError($error = $this->parseResponse(334))) {
+            /* 503: Error: already authenticated */
+            if ($this->code === 503) {
+                return true;
+            }
+            return $error;
+        }
+
+        $cram      = Auth_SASL::factory($this->scram_sha_hash_algorithm);
+        $auth_str  = base64_encode($cram->getResponse($uid, $pwd));
+
+        /* Step 1: Send first authentication request */
+        if (PEAR::isError($error = $this->put($auth_str))) {
+            return $error;
+        }
+
+        /* 334: Continue authentication request with password salt */
+        if (PEAR::isError($error = $this->parseResponse(334))) {
+            return $error;
+        }
+
+        $challenge = base64_decode($this->arguments[0]);
+        $auth_str  = base64_encode($cram->getResponse($uid, $pwd, $challenge));
+
+        /* Step 2: Send salted authentication request */
+        if (PEAR::isError($error = $this->put($auth_str))) {
+            return $error;
+        }
+
+        /* 334: Continue authentication request with password salt */
+        if (PEAR::isError($error = $this->parseResponse(334))) {
+            return $error;
+        }
+
+        /* Verify server signature */
+        $verification = $cram->processOutcome(base64_decode($this->arguments[0]));
+        if ($verification == false) {
+            return PEAR::raiseError("SCRAM Server verification on step 3 not successful");
+        }
+
+        /* Step 3: Send a request to acknowledge verification */
+        if (PEAR::isError($error = $this->put("NOOP"))) {
+            return $error;
+        }
+
+        /* 235: Authentication successful */
+        if (PEAR::isError($error = $this->parseResponse(235))) {
+            return $error;
+        }
+    }
+
     /**
      * Send the HELO command.
      *
@@ -1434,4 +1767,25 @@ public function identifySender()
     {
         return true;
     }
+
+    /**
+     * Backwards-compatibility method.
+     * array_filter alternative in PHP5.4 for using
+     * key filter because array_filter mode parameter
+     * is only available since PHP5.6.
+     *
+     * @param string $filter The string to filter
+     * @return array Filtered constants array.
+     */
+    private function getDefinedConstantsKeyFilter($filter) {
+        $constants_filtered = array();
+        $filter_length = strlen($filter);
+        $constants = get_defined_constants();
+        foreach ($constants as $key=>$value){
+            if (substr($key, 0, $filter_length) == $filter) {
+                $constants_filtered[$key] = $value;
+            }
+        }
+        return $constants_filtered;
+    }
 }
diff --git a/www/modules/civicrm/vendor/pear/net_smtp/composer.json b/www/modules/civicrm/vendor/pear/net_smtp/composer.json
index 0b0250bd3..fe5b9054a 100644
--- a/www/modules/civicrm/vendor/pear/net_smtp/composer.json
+++ b/www/modules/civicrm/vendor/pear/net_smtp/composer.json
@@ -10,6 +10,11 @@
             "email": "chuck@horde.org",
             "name": "Chuck Hagenbuch",
             "role": "Lead"
+        },
+        {
+            "email": "schengawegga@gmail.com",
+            "name": "Armin Graefe",
+            "role": "Lead"
         }
     ],
     "autoload": {
diff --git a/www/modules/civicrm/vendor/pear/net_socket/.travis.yml b/www/modules/civicrm/vendor/pear/net_socket/.travis.yml
new file mode 100644
index 000000000..2acb4d644
--- /dev/null
+++ b/www/modules/civicrm/vendor/pear/net_socket/.travis.yml
@@ -0,0 +1,21 @@
+language: php
+sudo: false
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - 7.1
+script:
+  - pear list
+  - pear channel-update pear.php.net
+  - pear upgrade --force pear/pear-1.10.1
+  - pear list
+  - pear install --force package.xml
+  - pear list
+  - pear package
+  - pear package-validate
+  - pear install --force *.tgz
+  - pear list
+  - composer install
+  - ./vendor/bin/phpunit -c phpunit.xml.dist
diff --git a/www/modules/civicrm/vendor/pear/net_socket/LICENSE b/www/modules/civicrm/vendor/pear/net_socket/LICENSE
new file mode 100644
index 000000000..5a6b12a0b
--- /dev/null
+++ b/www/modules/civicrm/vendor/pear/net_socket/LICENSE
@@ -0,0 +1,9 @@
+Copyright 1997-2017 The PHP Group
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. 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.
+
+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 HOLDER 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.
diff --git a/www/modules/civicrm/vendor/pear/net_socket/Net/Socket.php b/www/modules/civicrm/vendor/pear/net_socket/Net/Socket.php
index bf1d1bbcd..8df768d9a 100644
--- a/www/modules/civicrm/vendor/pear/net_socket/Net/Socket.php
+++ b/www/modules/civicrm/vendor/pear/net_socket/Net/Socket.php
@@ -2,27 +2,41 @@
 /**
  * Net_Socket
  *
- * PHP Version 4
+ * PHP Version 5
  *
- * Copyright (c) 1997-2013 The PHP Group
+ * LICENSE:
  *
- * This source file is subject to version 2.0 of the PHP license,
- * that is bundled with this package in the file LICENSE, and is
- * available at through the world-wide-web at
- * http://www.php.net/license/2_02.txt.
- * If you did not receive a copy of the PHP license and are unable to
- * obtain it through the world-wide-web, please send a note to
- * license@php.net so we can mail you a copy immediately.
+ * Copyright (c) 1997-2017 The PHP Group
+ * All rights reserved.
  *
- * Authors: Stig Bakken <ssb@php.net>
- *          Chuck Hagenbuch <chuck@horde.org>
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * o 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.
+ *
+ * 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
+ * HOLDER 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  Net
  * @package   Net_Socket
  * @author    Stig Bakken <ssb@php.net>
  * @author    Chuck Hagenbuch <chuck@horde.org>
- * @copyright 1997-2003 The PHP Group
- * @license   http://www.php.net/license/2_02.txt PHP 2.02
+ * @copyright 1997-2017 The PHP Group
+ * @license   http://opensource.org/licenses/bsd-license.php BSD-2-Clause
  * @link      http://pear.php.net/packages/Net_Socket
  */
 
@@ -39,8 +53,8 @@
  * @package   Net_Socket
  * @author    Stig Bakken <ssb@php.net>
  * @author    Chuck Hagenbuch <chuck@horde.org>
- * @copyright 1997-2003 The PHP Group
- * @license   http://www.php.net/license/2_02.txt PHP 2.02
+ * @copyright 1997-2017 The PHP Group
+ * @license   http://opensource.org/licenses/bsd-license.php BSD-2-Clause
  * @link      http://pear.php.net/packages/Net_Socket
  */
 class Net_Socket extends PEAR
@@ -49,71 +63,75 @@ class Net_Socket extends PEAR
      * Socket file pointer.
      * @var resource $fp
      */
-    var $fp = null;
+    public $fp = null;
 
     /**
      * Whether the socket is blocking. Defaults to true.
      * @var boolean $blocking
      */
-    var $blocking = true;
+    public $blocking = true;
 
     /**
      * Whether the socket is persistent. Defaults to false.
      * @var boolean $persistent
      */
-    var $persistent = false;
+    public $persistent = false;
 
     /**
      * The IP address to connect to.
      * @var string $addr
      */
-    var $addr = '';
+    public $addr = '';
 
     /**
      * The port number to connect to.
      * @var integer $port
      */
-    var $port = 0;
+    public $port = 0;
 
     /**
      * Number of seconds to wait on socket operations before assuming
      * there's no more data. Defaults to no timeout.
      * @var integer|float $timeout
      */
-    var $timeout = null;
+    public $timeout = null;
 
     /**
      * Number of bytes to read at a time in readLine() and
      * readAll(). Defaults to 2048.
      * @var integer $lineLength
      */
-    var $lineLength = 2048;
+    public $lineLength = 2048;
 
     /**
      * The string to use as a newline terminator. Usually "\r\n" or "\n".
      * @var string $newline
      */
-    var $newline = "\r\n";
+    public $newline = "\r\n";
 
     /**
      * Connect to the specified port. If called when the socket is
      * already connected, it disconnects and connects again.
      *
-     * @param string  $addr       IP address or host name (may be with protocol prefix).
-     * @param integer $port       TCP port number.
+     * @param string $addr IP address or host name (may be with protocol prefix).
+     * @param integer $port TCP port number.
      * @param boolean $persistent (optional) Whether the connection is
      *                            persistent (kept open between requests
      *                            by the web server).
-     * @param integer $timeout    (optional) Connection socket timeout.
-     * @param array   $options    See options for stream_context_create.
+     * @param integer $timeout (optional) Connection socket timeout.
+     * @param array $options See options for stream_context_create.
      *
      * @access public
      *
      * @return boolean|PEAR_Error  True on success or a PEAR_Error on failure.
      */
-    function connect($addr, $port = 0, $persistent = null,
-                     $timeout = null, $options = null)
-    {
+    public function connect(
+        $addr,
+        $port = 0,
+        $persistent = null,
+        $timeout = null,
+        $options = null
+    ) {
         if (is_resource($this->fp)) {
             @fclose($this->fp);
             $this->fp = null;
@@ -121,10 +139,12 @@ function connect($addr, $port = 0, $persistent = null,
 
         if (!$addr) {
             return $this->raiseError('$addr cannot be empty');
-        } else if (strspn($addr, ':.0123456789') == strlen($addr)) {
-            $this->addr = strpos($addr, ':') !== false ? '['.$addr.']' : $addr;
         } else {
-            $this->addr = $addr;
+            if (strspn($addr, ':.0123456789') === strlen($addr)) {
+                $this->addr = strpos($addr, ':') !== false ? '[' . $addr . ']' : $addr;
+            } else {
+                $this->addr = $addr;
+            }
         }
 
         $this->port = $port % 65536;
@@ -134,8 +154,8 @@ function connect($addr, $port = 0, $persistent = null,
         }
 
         $openfunc = $this->persistent ? 'pfsockopen' : 'fsockopen';
-        $errno    = 0;
-        $errstr   = '';
+        $errno = 0;
+        $errstr = '';
 
         $old_track_errors = @ini_set('track_errors', 1);
 
@@ -155,27 +175,29 @@ function connect($addr, $port = 0, $persistent = null,
                 }
 
                 $addr = $this->addr . ':' . $this->port;
-                $fp   = stream_socket_client($addr, $errno, $errstr,
-                                             $timeout, $flags, $context);
+                $fp = @stream_socket_client($addr, $errno, $errstr,
+                    $timeout, $flags, $context);
             } else {
                 $fp = @$openfunc($this->addr, $this->port, $errno,
-                                 $errstr, $timeout, $context);
+                    $errstr, $timeout, $context);
             }
         } else {
             $fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $timeout);
         }
 
         if (!$fp) {
-            if ($errno == 0 && !strlen($errstr) && isset($php_errormsg)) {
+            if ($errno === 0 && !strlen($errstr) && isset($php_errormsg)) {
                 $errstr = $php_errormsg;
             }
             @ini_set('track_errors', $old_track_errors);
+
             return $this->raiseError($errstr, $errno);
         }
 
         @ini_set('track_errors', $old_track_errors);
         $this->fp = $fp;
         $this->setTimeout();
+
         return $this->setBlocking($this->blocking);
     }
 
@@ -185,7 +207,7 @@ function connect($addr, $port = 0, $persistent = null,
      * @access public
      * @return mixed true on success or a PEAR_Error instance otherwise
      */
-    function disconnect()
+    public function disconnect()
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
@@ -193,18 +215,20 @@ function disconnect()
 
         @fclose($this->fp);
         $this->fp = null;
+
         return true;
     }
 
     /**
      * Set the newline character/sequence to use.
      *
-     * @param string $newline  Newline character(s)
+     * @param string $newline Newline character(s)
      * @return boolean True
      */
-    function setNewline($newline)
+    public function setNewline($newline)
     {
         $this->newline = $newline;
+
         return true;
     }
 
@@ -214,7 +238,7 @@ function setNewline($newline)
      * @access public
      * @return boolean  The current blocking mode.
      */
-    function isBlocking()
+    public function isBlocking()
     {
         return $this->blocking;
     }
@@ -230,7 +254,7 @@ function isBlocking()
      * @access public
      * @return mixed true on success or a PEAR_Error instance otherwise
      */
-    function setBlocking($mode)
+    public function setBlocking($mode)
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
@@ -238,6 +262,7 @@ function setBlocking($mode)
 
         $this->blocking = $mode;
         stream_set_blocking($this->fp, (int)$this->blocking);
+
         return true;
     }
 
@@ -245,30 +270,29 @@ function setBlocking($mode)
      * Sets the timeout value on socket descriptor,
      * expressed in the sum of seconds and microseconds
      *
-     * @param integer $seconds      Seconds.
+     * @param integer $seconds Seconds.
      * @param integer $microseconds Microseconds, optional.
      *
      * @access public
      * @return mixed True on success or false on failure or
      *               a PEAR_Error instance when not connected
      */
-    function setTimeout($seconds = null, $microseconds = null)
+    public function setTimeout($seconds = null, $microseconds = null)
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
         }
 
         if ($seconds === null && $microseconds === null) {
-            $seconds      = (int) $this->timeout;
-            $microseconds = (int) (($this->timeout - $seconds) * 1000000);
+            $seconds = (int)$this->timeout;
+            $microseconds = (int)(($this->timeout - $seconds) * 1000000);
         } else {
-            $this->timeout = $seconds + $microseconds/1000000;
+            $this->timeout = $seconds + $microseconds / 1000000;
         }
 
         if ($this->timeout > 0) {
-            return stream_set_timeout($this->fp, (int) $seconds, (int) $microseconds);
-        }
-        else {
+            return stream_set_timeout($this->fp, (int)$seconds, (int)$microseconds);
+        } else {
             return false;
         }
     }
@@ -282,16 +306,17 @@ function setTimeout($seconds = null, $microseconds = null)
      * @access public
      * @return mixed on success or an PEAR_Error object otherwise
      */
-    function setWriteBuffer($size)
+    public function setWriteBuffer($size)
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
         }
 
         $returned = stream_set_write_buffer($this->fp, $size);
-        if ($returned == 0) {
+        if ($returned === 0) {
             return true;
         }
+
         return $this->raiseError('Cannot set write buffer.');
     }
 
@@ -310,7 +335,7 @@ function setWriteBuffer($size)
      * @return mixed Array containing information about existing socket
      *               resource or a PEAR_Error instance otherwise
      */
-    function getStatus()
+    public function getStatus()
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
@@ -331,13 +356,13 @@ function getStatus()
      * @return mixed $size bytes of data from the socket, or a PEAR_Error if
      *         not connected. If an error occurs, FALSE is returned.
      */
-    function gets($size = null)
+    public function gets($size = null)
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
         }
 
-        if (is_null($size)) {
+        if (null === $size) {
             return @fgets($this->fp);
         } else {
             return @fgets($this->fp, $size);
@@ -353,10 +378,10 @@ function gets($size = null)
      * @param integer $size The number of bytes to read from the socket.
      *
      * @access public
-     * @return $size bytes of data from the socket, or a PEAR_Error if
+     * @return string $size bytes of data from the socket, or a PEAR_Error if
      *         not connected.
      */
-    function read($size)
+    public function read($size)
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
@@ -368,7 +393,7 @@ function read($size)
     /**
      * Write a specified amount of data.
      *
-     * @param string  $data      Data to write.
+     * @param string $data Data to write.
      * @param integer $blocksize Amount of data to write at once.
      *                           NULL means all at once.
      *
@@ -379,17 +404,17 @@ function read($size)
      *               If the write fails, returns false.
      *               If the socket times out, returns an instance of PEAR_Error.
      */
-    function write($data, $blocksize = null)
+    public function write($data, $blocksize = null)
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
         }
 
-        if (is_null($blocksize) && !OS_WINDOWS) {
+        if (null === $blocksize && !OS_WINDOWS) {
             $written = @fwrite($this->fp, $data);
 
             // Check for timeout or lost connection
-            if (!$written) {
+            if ($written === false) {
                 $meta_data = $this->getStatus();
 
                 if (!is_array($meta_data)) {
@@ -403,17 +428,17 @@ function write($data, $blocksize = null)
 
             return $written;
         } else {
-            if (is_null($blocksize)) {
+            if (null === $blocksize) {
                 $blocksize = 1024;
             }
 
-            $pos  = 0;
+            $pos = 0;
             $size = strlen($data);
             while ($pos < $size) {
                 $written = @fwrite($this->fp, substr($data, $pos, $blocksize));
 
                 // Check for timeout or lost connection
-                if (!$written) {
+                if ($written === false) {
                     $meta_data = $this->getStatus();
 
                     if (!is_array($meta_data)) {
@@ -442,7 +467,7 @@ function write($data, $blocksize = null)
      * @access public
      * @return mixed fwrite() result, or PEAR_Error when not connected
      */
-    function writeLine($data)
+    public function writeLine($data)
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
@@ -459,7 +484,7 @@ function writeLine($data)
      * @access public
      * @return bool
      */
-    function eof()
+    public function eof()
     {
         return (!is_resource($this->fp) || feof($this->fp));
     }
@@ -468,10 +493,10 @@ function eof()
      * Reads a byte of data
      *
      * @access public
-     * @return 1 byte of data from the socket, or a PEAR_Error if
+     * @return integer 1 byte of data from the socket, or a PEAR_Error if
      *         not connected.
      */
-    function readByte()
+    public function readByte()
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
@@ -484,16 +509,17 @@ function readByte()
      * Reads a word of data
      *
      * @access public
-     * @return 1 word of data from the socket, or a PEAR_Error if
+     * @return integer 1 word of data from the socket, or a PEAR_Error if
      *         not connected.
      */
-    function readWord()
+    public function readWord()
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
         }
 
         $buf = @fread($this->fp, 2);
+
         return (ord($buf[0]) + (ord($buf[1]) << 8));
     }
 
@@ -504,15 +530,16 @@ function readWord()
      * @return integer  1 int of data from the socket, or a PEAR_Error if
      *                  not connected.
      */
-    function readInt()
+    public function readInt()
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
         }
 
         $buf = @fread($this->fp, 4);
+
         return (ord($buf[0]) + (ord($buf[1]) << 8) +
-                (ord($buf[2]) << 16) + (ord($buf[3]) << 24));
+            (ord($buf[2]) << 16) + (ord($buf[3]) << 24));
     }
 
     /**
@@ -522,16 +549,17 @@ function readInt()
      * @return string, or a PEAR_Error if
      *         not connected.
      */
-    function readString()
+    public function readString()
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
         }
 
         $string = '';
-        while (($char = @fread($this->fp, 1)) != "\x00") {
+        while (($char = @fread($this->fp, 1)) !== "\x00") {
             $string .= $char;
         }
+
         return $string;
     }
 
@@ -539,18 +567,19 @@ function readString()
      * Reads an IP Address and returns it in a dot formatted string
      *
      * @access public
-     * @return Dot formatted string, or a PEAR_Error if
+     * @return string Dot formatted string, or a PEAR_Error if
      *         not connected.
      */
-    function readIPAddress()
+    public function readIPAddress()
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
         }
 
         $buf = @fread($this->fp, 4);
+
         return sprintf('%d.%d.%d.%d', ord($buf[0]), ord($buf[1]),
-                       ord($buf[2]), ord($buf[3]));
+            ord($buf[2]), ord($buf[3]));
     }
 
     /**
@@ -558,11 +587,11 @@ function readIPAddress()
      * comes first. Strips the trailing newline from the returned data.
      *
      * @access public
-     * @return All available data up to a newline, without that
+     * @return string All available data up to a newline, without that
      *         newline, or until the end of the socket, or a PEAR_Error if
      *         not connected.
      */
-    function readLine()
+    public function readLine()
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
@@ -578,6 +607,7 @@ function readLine()
                 return rtrim($line, $this->newline);
             }
         }
+
         return $line;
     }
 
@@ -594,16 +624,19 @@ function readLine()
      * @return string  All data until the socket closes, or a PEAR_Error if
      *                 not connected.
      */
-    function readAll()
+    public function readAll()
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
         }
 
         $data = '';
-        while (!feof($this->fp)) {
+        $timeout = time() + $this->timeout;
+
+        while (!feof($this->fp) && (!$this->timeout || time() < $timeout)) {
             $data .= @fread($this->fp, $this->lineLength);
         }
+
         return $data;
     }
 
@@ -611,22 +644,22 @@ function readAll()
      * Runs the equivalent of the select() system call on the socket
      * with a timeout specified by tv_sec and tv_usec.
      *
-     * @param integer $state   Which of read/write/error to check for.
-     * @param integer $tv_sec  Number of seconds for timeout.
+     * @param integer $state Which of read/write/error to check for.
+     * @param integer $tv_sec Number of seconds for timeout.
      * @param integer $tv_usec Number of microseconds for timeout.
      *
      * @access public
      * @return False if select fails, integer describing which of read/write/error
      *         are ready, or PEAR_Error if not connected.
      */
-    function select($state, $tv_sec, $tv_usec = 0)
+    public function select($state, $tv_sec, $tv_usec = 0)
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
         }
 
-        $read   = null;
-        $write  = null;
+        $read = null;
+        $write = null;
         $except = null;
         if ($state & NET_SOCKET_READ) {
             $read[] = $this->fp;
@@ -638,7 +671,8 @@ function select($state, $tv_sec, $tv_usec = 0)
             $except[] = $this->fp;
         }
         if (false === ($sr = stream_select($read, $write, $except,
-                                          $tv_sec, $tv_usec))) {
+                $tv_sec, $tv_usec))
+        ) {
             return false;
         }
 
@@ -652,15 +686,16 @@ function select($state, $tv_sec, $tv_usec = 0)
         if (count($except)) {
             $result |= NET_SOCKET_ERROR;
         }
+
         return $result;
     }
 
     /**
      * Turns encryption on/off on a connected socket.
      *
-     * @param bool    $enabled Set this parameter to true to enable encryption
+     * @param bool $enabled Set this parameter to true to enable encryption
      *                         and false to disable encryption.
-     * @param integer $type    Type of encryption. See stream_socket_enable_crypto()
+     * @param integer $type Type of encryption. See stream_socket_enable_crypto()
      *                         for values.
      *
      * @see    http://se.php.net/manual/en/function.stream-socket-enable-crypto.php
@@ -670,15 +705,17 @@ function select($state, $tv_sec, $tv_usec = 0)
      *         A PEAR_Error object is returned if the socket is not
      *         connected
      */
-    function enableCrypto($enabled, $type)
+    public function enableCrypto($enabled, $type)
     {
-        if (version_compare(phpversion(), "5.1.0", ">=")) {
+        if (version_compare(phpversion(), '5.1.0', '>=')) {
             if (!is_resource($this->fp)) {
                 return $this->raiseError('not connected');
             }
+
             return @stream_socket_enable_crypto($this->fp, $enabled, $type);
         } else {
             $msg = 'Net_Socket::enableCrypto() requires php version >= 5.1.0';
+
             return $this->raiseError($msg);
         }
     }
diff --git a/www/modules/civicrm/vendor/pear/net_socket/README.md b/www/modules/civicrm/vendor/pear/net_socket/README.md
new file mode 100644
index 000000000..d6eb53024
--- /dev/null
+++ b/www/modules/civicrm/vendor/pear/net_socket/README.md
@@ -0,0 +1,43 @@
+# Net_Socket - Network Socket Interface
+
+[![Build Status](https://travis-ci.org/pear/Net_Socket.svg?branch=master)](https://travis-ci.org/pear/Net_Socket)
+    
+
+Net_Socket is a class interface to TCP sockets. It provides blocking
+and non-blocking operation, with different reading and writing modes
+(byte-wise, block-wise, line-wise and special formats like network
+byte-order ip addresses).
+
+[Homepage](http://pear.php.net/package/Net_Socket/)
+
+
+## Installation
+For a PEAR installation that downloads from the PEAR channel:
+
+`$ pear install pear/net_socket`
+
+For a PEAR installation from a previously downloaded tarball:
+
+`$ pear install Net_Socket-*.tgz`
+
+For a PEAR installation from a code clone:
+
+`$ pear install package.xml`
+
+For a local composer installation:
+
+`$ composer install`
+
+To add as a dependency to your composer-managed application:
+
+`$composer require pear/net_socket`
+
+
+## Tests
+Run  the tests from a local composer installation:
+
+`$ ./vendor/bin/phpunit`
+
+
+## License
+BSD-2 license
diff --git a/www/modules/civicrm/vendor/pear/net_socket/composer.json b/www/modules/civicrm/vendor/pear/net_socket/composer.json
index 3fb03939a..7bf46ecbc 100644
--- a/www/modules/civicrm/vendor/pear/net_socket/composer.json
+++ b/www/modules/civicrm/vendor/pear/net_socket/composer.json
@@ -25,7 +25,7 @@
     "include-path": [
         "./"
     ],
-    "license": "PHP License",
+    "license": "BSD-2-Clause",
     "name": "pear/net_socket",
     "support": {
         "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Net_Socket",
@@ -33,9 +33,10 @@
     },
     "type": "library",
     "require": {
-        "pear/pear_exception": "*"
+        "php": ">=5.4.0",
+        "pear/pear_exception": "@stable"
     },
     "require-dev": {
-        "phpunit/phpunit": "*"
+        "phpunit/phpunit": "^4"
     }
-}
\ No newline at end of file
+}
diff --git a/www/modules/civicrm/vendor/pear/net_socket/package.xml b/www/modules/civicrm/vendor/pear/net_socket/package.xml
index d9f4ab1c9..116f6d282 100644
--- a/www/modules/civicrm/vendor/pear/net_socket/package.xml
+++ b/www/modules/civicrm/vendor/pear/net_socket/package.xml
@@ -11,7 +11,7 @@
   <name>Chuck Hagenbuch</name>
   <user>chagenbu</user>
   <email>chuck@horde.org</email>
-  <active>yes</active>
+  <active>no</active>
  </lead>
  <lead>
   <name>Stig Bakken</name>
@@ -23,37 +23,37 @@
   <name>Aleksander Machniak</name>
   <user>alec</user>
   <email>alec@php.net</email>
-  <active>yes</active>
+  <active>no</active>
  </lead>
- <date>2013-05-24</date>
- <time>20:00:00</time>
+ <date>2017-04-06</date>
  <version>
-  <release>1.0.14</release>
-  <api>1.0.10</api>
+  <release>1.2.1</release>
+  <api>1.2.0</api>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
- <license uri="http://www.php.net/license/2_02.txt">PHP License</license>
+ <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD-2-Clause</license>
  <notes>
-- Fix connecting when host is specified with protocol prefix e.g. ssl://
+* Fix BSD-2 licensing
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
-   <file baseinstalldir="/" md5sum="057d5c52b2dd9cfb2a458d532d95cfbb" name="Net/Socket.php" role="php" />
+   <file baseinstalldir="/" name="Net/Socket.php" role="php" />
+   <file baseinstalldir="/" name="README.md" role="doc" />
+   <file baseinstalldir="/" name="LICENSE" role="doc" />
   </dir>
  </contents>
  <dependencies>
   <required>
    <php>
-    <min>4.3.0</min>
+    <min>5.4.0</min>
    </php>
    <pearinstaller>
-    <min>1.4.0b1</min>
+    <min>1.10.1</min>
    </pearinstaller>
   </required>
  </dependencies>
  <phprelease />
- <changelog />
 </package>
diff --git a/www/modules/civicrm/vendor/pear/net_socket/phpunit.xml.dist b/www/modules/civicrm/vendor/pear/net_socket/phpunit.xml.dist
new file mode 100644
index 000000000..8eaaa2fe6
--- /dev/null
+++ b/www/modules/civicrm/vendor/pear/net_socket/phpunit.xml.dist
@@ -0,0 +1,29 @@
+<phpunit bootstrap="vendor/autoload.php"
+         cacheTokens="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         stopOnError="false"
+         stopOnFailure="false"
+         stopOnIncomplete="false"
+         stopOnSkipped="false">
+
+    <testsuites>
+        <testsuite name="Test Suite">
+            <directory suffix=".php">tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">Net/</directory>
+        </whitelist>
+    </filter>
+
+    <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <log type="coverage-html" target="build/coverage/"/>
+    </logging>
+
+</phpunit>
diff --git a/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Document.php b/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Document.php
index 309875b61..990cfde25 100644
--- a/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Document.php
+++ b/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Document.php
@@ -202,7 +202,7 @@ protected function before($attributes)
     {
         $surface = $this->getSurface();
 
-        $style = new DefaultStyle();
+        $style = new DefaultStyle($this);
         $style->inherit($this);
         $style->fromAttributes($attributes);
 
diff --git a/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Style.php b/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Style.php
index 514f54629..9fac46919 100644
--- a/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Style.php
+++ b/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Style.php
@@ -18,6 +18,7 @@ class Style
     const TYPE_ANGLE = 4;
     const TYPE_NUMBER = 5;
 
+    private $_document;
     private $_parentStyle;
 
     public $color;
@@ -43,6 +44,12 @@ class Style
     public $fontStyle = 'normal';
     public $textAnchor = 'start';
 
+    public function __construct($document = null) {
+        if ($document !== null) {
+            $this->_document = $document;
+        }
+    }
+
     protected function getStyleMap()
     {
         return array(
@@ -139,16 +146,6 @@ public function fromStyleSheets(AbstractTag $tag, $attributes) {
                         break;
                     }
                 }
-
-                if (
-                    \array_key_exists("font-family", $styles)
-                    && (
-                        \strtolower(\substr($this->href, 0, 7)) === "phar://"
-                        || ($this->document->allowExternalReferences === false && \strtolower(\substr($this->href, 0, 5)) !== "data:")
-                    )
-                ) {
-                    unset($style["font-family"]);
-                }
             }
         }
 
@@ -185,6 +182,16 @@ protected function fillStyles($styles)
                         $value = $styles[$from];
                 }
 
+                if ($from === "font-family") {
+                    $scheme = \strtolower(parse_url($value, PHP_URL_SCHEME) ?: "");
+                    if (
+                        $scheme === "phar" || \strtolower(\substr($value, 0, 7)) === "phar://"
+                        || ($this->_document !== null && $this->_document->allowExternalReferences === false && $scheme !== "data")
+                    ) {
+                        continue;
+                    }
+                }
+
                 if ($value !== null) {
                     $this->$to = $value;
                 }
diff --git a/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Tag/AbstractTag.php b/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Tag/AbstractTag.php
index 9fa679320..e368aab77 100644
--- a/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Tag/AbstractTag.php
+++ b/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Tag/AbstractTag.php
@@ -119,7 +119,7 @@ public function getStyle()
      * @return Style
      */
     protected function makeStyle($attributes) {
-        $style = new Style();
+        $style = new Style($this->document);
         $style->inherit($this);
         $style->fromStyleSheets($this, $attributes);
         $style->fromAttributes($attributes);
diff --git a/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Tag/Image.php b/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Tag/Image.php
index 8cbfccd89..de397c498 100644
--- a/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Tag/Image.php
+++ b/www/modules/civicrm/vendor/phenx/php-svg-lib/src/Svg/Tag/Image.php
@@ -58,7 +58,11 @@ public function start($attributes)
 
         $this->document->getSurface()->transform(1, 0, 0, -1, 0, $height);
 
-        if (\strtolower(\substr($this->href, 0, 7)) === "phar://" || ($this->document->allowExternalReferences === false && \strtolower(\substr($this->href, 0, 5) !== "data:"))) {
+        $scheme = \strtolower(parse_url($this->href, PHP_URL_SCHEME) ?: "");
+        if (
+            $scheme === "phar" || \strtolower(\substr($this->href, 0, 7)) === "phar://"
+            || ($this->document->allowExternalReferences === false && $scheme !== "data")
+        ) {
             return;
         }
 
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/AUTHORS b/www/modules/civicrm/vendor/phpseclib/phpseclib/AUTHORS
index a08b3099c..9f10d2671 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/AUTHORS
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/AUTHORS
@@ -4,3 +4,4 @@ phpseclib Developers:      monnerat (Patrick Monnerat)
                            bantu (Andreas Fischer)
                            petrich (Hans-Jürgen Petrich)
                            GrahamCampbell (Graham Campbell)
+                           hc-jworman
\ No newline at end of file
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/BACKERS.md b/www/modules/civicrm/vendor/phpseclib/phpseclib/BACKERS.md
index e03152ca1..efca482ad 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/BACKERS.md
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/BACKERS.md
@@ -4,5 +4,14 @@ phpseclib ongoing development is made possible by [Tidelift](https://tidelift.co
 
 ## Backers
 
+- Allan Simon
+- [ChargeOver](https://chargeover.com/)
+- Raghu Veer Dendukuri
 - Zane Hooper
-- [Setasign](https://www.setasign.com/)
\ No newline at end of file
+- [Setasign](https://www.setasign.com/)
+- [Charles Severance](https://github.com/csev)
+- [Rachel Fish](https://github.com/itsrachelfish)
+- Tharyrok
+- [cjhaas](https://github.com/cjhaas)
+- [istiak-tridip](https://github.com/istiak-tridip)
+- [Anna Filina](https://github.com/afilina)
\ No newline at end of file
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/README.md b/www/modules/civicrm/vendor/phpseclib/phpseclib/README.md
index 099486dc9..1bdee151d 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/README.md
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/README.md
@@ -1,6 +1,6 @@
 # phpseclib - PHP Secure Communications Library
 
-[![Build Status](https://travis-ci.com/phpseclib/phpseclib.svg?branch=2.0)](https://travis-ci.com/phpseclib/phpseclib)
+[![Build Status](https://travis-ci.com/phpseclib/phpseclib.svg?branch=2.0)](https://travis-ci.com/github/phpseclib/phpseclib)
 
 ## Supporting phpseclib
 
@@ -51,8 +51,7 @@ SSH-2, SFTP, X.509, an arbitrary-precision integer arithmetic library, Ed25519 /
 * PHP4 compatible
 * Composer compatible (PSR-0 autoloading)
 * Install using Composer: `composer require phpseclib/phpseclib:~1.0`
-* Install using PEAR: See [phpseclib PEAR Channel Documentation](http://phpseclib.sourceforge.net/pear.htm)
-* [Download 1.0.19 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.19.zip/download)
+* [Download 1.0.23 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.23.zip/download)
 
 ## Security contact information
 
@@ -66,6 +65,13 @@ Need Support?
 * [Create a Support Ticket on GitHub](https://github.com/phpseclib/phpseclib/issues/new)
 * [Browse the Support Forum](http://www.frostjedi.com/phpbb/viewforum.php?f=46) (no longer in use)
 
+## Special Thanks
+
+Special Thanks to our $50+ sponsors!:
+
+- Allan Simon
+- [ChargeOver](https://chargeover.com/)
+
 ## Contributing
 
 1. Fork the Project
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/composer.json b/www/modules/civicrm/vendor/phpseclib/phpseclib/composer.json
index 08b9c7c91..3fbffa67c 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/composer.json
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/composer.json
@@ -62,7 +62,8 @@
         "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
         "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
         "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-        "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations."
+        "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
+        "ext-xml": "Install the XML extension to load XML formatted public keys."
     },
     "autoload": {
         "files": [
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/AES.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/AES.php
index 7d8cb8b03..9903db105 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/AES.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/AES.php
@@ -84,43 +84,13 @@ function setBlockLength($length)
      */
     function setKeyLength($length)
     {
-        switch ($length) {
-            case 160:
-                $length = 192;
-                break;
-            case 224:
-                $length = 256;
-        }
         parent::setKeyLength($length);
-    }
-
-    /**
-     * Sets the key.
-     *
-     * Rijndael supports five different key lengths, AES only supports three.
-     *
-     * @see \phpseclib\Crypt\Rijndael:setKey()
-     * @see setKeyLength()
-     * @access public
-     * @param string $key
-     */
-    function setKey($key)
-    {
-        parent::setKey($key);
-
-        if (!$this->explicit_key_length) {
-            $length = strlen($key);
-            switch (true) {
-                case $length <= 16:
-                    $this->key_length = 16;
-                    break;
-                case $length <= 24:
-                    $this->key_length = 24;
-                    break;
-                default:
-                    $this->key_length = 32;
-            }
-            $this->_setEngine();
+        switch ($this->key_length) {
+            case 20:
+                $this->key_length = 24;
+                break;
+            case 28:
+                $this->key_length = 32;
         }
     }
 }
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Base.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Base.php
index 8822b9b88..ab5944cde 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Base.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Base.php
@@ -79,7 +79,11 @@ abstract class Base
     /**
      * Encrypt / decrypt using the Cipher Feedback mode (8bit)
      */
-    const MODE_CFB8 = 38;
+    const MODE_CFB8 = 6;
+    /**
+     * Encrypt / decrypt using the Output Feedback mode (8bit)
+     */
+    const MODE_OFB8 = 7;
     /**
      * Encrypt / decrypt using the Output Feedback mode.
      *
@@ -152,7 +156,7 @@ abstract class Base
      * @var string
      * @access private
      */
-    var $iv;
+    var $iv = '';
 
     /**
      * A "sliding" Initialization Vector
@@ -484,6 +488,7 @@ function __construct($mode = self::MODE_CBC)
             case self::MODE_CTR:
             case self::MODE_CFB:
             case self::MODE_CFB8:
+            case self::MODE_OFB8:
             case self::MODE_OFB:
             case self::MODE_STREAM:
                 $this->mode = $mode;
@@ -495,6 +500,46 @@ function __construct($mode = self::MODE_CBC)
         }
 
         $this->_setEngine();
+
+        // Determining whether inline crypting can be used by the cipher
+        if ($this->use_inline_crypt !== false) {
+            $this->use_inline_crypt = version_compare(PHP_VERSION, '5.3.0') >= 0 || function_exists('create_function');
+        }
+
+        if (!defined('PHP_INT_SIZE')) {
+            define('PHP_INT_SIZE', 4);
+        }
+
+        if (!defined('CRYPT_BASE_USE_REG_INTVAL')) {
+            switch (true) {
+                // PHP_OS & "\xDF\xDF\xDF" == strtoupper(substr(PHP_OS, 0, 3)), but a lot faster
+                case (PHP_OS & "\xDF\xDF\xDF") === 'WIN':
+                case !function_exists('php_uname'):
+                case !is_string(php_uname('m')):
+                case (php_uname('m') & "\xDF\xDF\xDF") != 'ARM':
+                case PHP_INT_SIZE == 8:
+                    define('CRYPT_BASE_USE_REG_INTVAL', true);
+                    break;
+                case (php_uname('m') & "\xDF\xDF\xDF") == 'ARM':
+                    switch (true) {
+                        /* PHP 7.0.0 introduced a bug that affected 32-bit ARM processors:
+
+                           https://github.com/php/php-src/commit/716da71446ebbd40fa6cf2cea8a4b70f504cc3cd
+
+                           altho the changelogs make no mention of it, this bug was fixed with this commit:
+
+                           https://github.com/php/php-src/commit/c1729272b17a1fe893d1a54e423d3b71470f3ee8
+
+                           affected versions of PHP are: 7.0.x, 7.1.0 - 7.1.23 and 7.2.0 - 7.2.11 */
+                        case PHP_VERSION_ID >= 70000 && PHP_VERSION_ID <= 70123:
+                        case PHP_VERSION_ID >= 70200 && PHP_VERSION_ID <= 70211:
+                            define('CRYPT_BASE_USE_REG_INTVAL', false);
+                            break;
+                        default:
+                            define('CRYPT_BASE_USE_REG_INTVAL', true);
+                    }
+            }
+        }
     }
 
     /**
@@ -588,6 +633,10 @@ function setKey($key)
      *         $hash, $salt, $count, $dkLen
      *
      *         Where $hash (default = sha1) currently supports the following hashes: see: Crypt/Hash.php
+     *     {@link https://en.wikipedia.org/wiki/Bcrypt bcypt}:
+     *         $salt, $rounds, $keylen
+     *
+     *         This is a modified version of bcrypt used by OpenSSH.
      *
      * @see Crypt/Hash.php
      * @param string $password
@@ -601,6 +650,28 @@ function setPassword($password, $method = 'pbkdf2')
         $key = '';
 
         switch ($method) {
+            case 'bcrypt':
+                $func_args = func_get_args();
+
+                if (!isset($func_args[2])) {
+                    return false;
+                }
+
+                $salt = $func_args[2];
+
+                $rounds = isset($func_args[3]) ? $func_args[3] : 16;
+                $keylen = isset($func_args[4]) ? $func_args[4] : $this->key_length;
+
+                $bf = new Blowfish();
+                $key = $bf->bcrypt_pbkdf($password, $salt, $keylen + $this->block_size, $rounds);
+                if (!$key) {
+                    return false;
+                }
+
+                $this->setKey(substr($key, 0, $keylen));
+                $this->setIV(substr($key, $keylen));
+
+                return true;
             default: // 'pbkdf2' or 'pbkdf1'
                 $func_args = func_get_args();
 
@@ -773,6 +844,22 @@ function encrypt($plaintext)
                         }
                     }
                     return $ciphertext;
+                case self::MODE_OFB8:
+                    // OpenSSL has built in support for cfb8 but not ofb8
+                    $ciphertext = '';
+                    $len = strlen($plaintext);
+                    $iv = $this->encryptIV;
+
+                    for ($i = 0; $i < $len; ++$i) {
+                        $xor = openssl_encrypt($iv, $this->cipher_name_openssl_ecb, $this->key, $this->openssl_options, $this->decryptIV);
+                        $ciphertext.= $plaintext[$i] ^ $xor;
+                        $iv = substr($iv, 1) . $xor[0];
+                    }
+
+                    if ($this->continuousBuffer) {
+                        $this->encryptIV = $iv;
+                    }
+                    break;
                 case self::MODE_OFB:
                     return $this->_openssl_ofb_process($plaintext, $this->encryptIV, $this->enbuffer);
             }
@@ -896,8 +983,8 @@ function encrypt($plaintext)
                         $block = substr($plaintext, $i, $block_size);
                         if (strlen($block) > strlen($buffer['ciphertext'])) {
                             $buffer['ciphertext'].= $this->_encryptBlock($xor);
+                            $this->_increment_str($xor);
                         }
-                        $this->_increment_str($xor);
                         $key = $this->_string_shift($buffer['ciphertext'], $block_size);
                         $ciphertext.= $block ^ $key;
                     }
@@ -959,12 +1046,14 @@ function encrypt($plaintext)
                 }
                 break;
             case self::MODE_CFB8:
+                // compared to regular CFB, which encrypts a block at a time,
+                // here, we're encrypting a byte at a time
                 $ciphertext = '';
                 $len = strlen($plaintext);
                 $iv = $this->encryptIV;
 
                 for ($i = 0; $i < $len; ++$i) {
-                    $ciphertext .= ($c = $plaintext[$i] ^ $this->_encryptBlock($iv));
+                    $ciphertext.= ($c = $plaintext[$i] ^ $this->_encryptBlock($iv));
                     $iv = substr($iv, 1) . $c;
                 }
 
@@ -976,6 +1065,21 @@ function encrypt($plaintext)
                     }
                 }
                 break;
+            case self::MODE_OFB8:
+                $ciphertext = '';
+                $len = strlen($plaintext);
+                $iv = $this->encryptIV;
+
+                for ($i = 0; $i < $len; ++$i) {
+                    $xor = $this->_encryptBlock($iv);
+                    $ciphertext.= $plaintext[$i] ^ $xor;
+                    $iv = substr($iv, 1) . $xor[0];
+                }
+
+                if ($this->continuousBuffer) {
+                    $this->encryptIV = $iv;
+                }
+                break;
             case self::MODE_OFB:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['xor'])) {
@@ -1067,7 +1171,7 @@ function decrypt($ciphertext)
                     $plaintext = '';
                     if ($this->continuousBuffer) {
                         $iv = &$this->decryptIV;
-                        $pos = &$this->buffer['pos'];
+                        $pos = &$this->debuffer['pos'];
                     } else {
                         $iv = $this->decryptIV;
                         $pos = 0;
@@ -1116,6 +1220,21 @@ function decrypt($ciphertext)
                         }
                     }
                     break;
+                case self::MODE_OFB8:
+                    $plaintext = '';
+                    $len = strlen($ciphertext);
+                    $iv = $this->decryptIV;
+
+                    for ($i = 0; $i < $len; ++$i) {
+                        $xor = openssl_encrypt($iv, $this->cipher_name_openssl_ecb, $this->key, $this->openssl_options, $this->decryptIV);
+                        $plaintext.= $ciphertext[$i] ^ $xor;
+                        $iv = substr($iv, 1) . $xor[0];
+                    }
+
+                    if ($this->continuousBuffer) {
+                        $this->decryptIV = $iv;
+                    }
+                    break;
                 case self::MODE_OFB:
                     $plaintext = $this->_openssl_ofb_process($ciphertext, $this->decryptIV, $this->debuffer);
             }
@@ -1290,7 +1409,7 @@ function decrypt($ciphertext)
                 $iv = $this->decryptIV;
 
                 for ($i = 0; $i < $len; ++$i) {
-                    $plaintext .= $ciphertext[$i] ^ $this->_encryptBlock($iv);
+                    $plaintext.= $ciphertext[$i] ^ $this->_encryptBlock($iv);
                     $iv = substr($iv, 1) . $ciphertext[$i];
                 }
 
@@ -1302,6 +1421,21 @@ function decrypt($ciphertext)
                     }
                 }
                 break;
+            case self::MODE_OFB8:
+                $plaintext = '';
+                $len = strlen($ciphertext);
+                $iv = $this->decryptIV;
+
+                for ($i = 0; $i < $len; ++$i) {
+                    $xor = $this->_encryptBlock($iv);
+                    $plaintext.= $ciphertext[$i] ^ $xor;
+                    $iv = substr($iv, 1) . $xor[0];
+                }
+
+                if ($this->continuousBuffer) {
+                    $this->decryptIV = $iv;
+                }
+                break;
             case self::MODE_OFB:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['xor'])) {
@@ -1864,6 +1998,7 @@ function _setupMcrypt()
                 self::MODE_CFB    => 'ncfb',
                 self::MODE_CFB8   => MCRYPT_MODE_CFB,
                 self::MODE_OFB    => MCRYPT_MODE_NOFB,
+                self::MODE_OFB8   => MCRYPT_MODE_OFB,
                 self::MODE_STREAM => MCRYPT_MODE_STREAM,
             );
 
@@ -2009,6 +2144,13 @@ function _string_pop(&$string, $index = 1)
      */
     function _increment_str(&$var)
     {
+        if (function_exists('sodium_increment')) {
+            $var = strrev($var);
+            sodium_increment($var);
+            $var = strrev($var);
+            return;
+        }
+
         for ($i = 4; $i <= strlen($var); $i+= 4) {
             $temp = substr($var, -$i, 4);
             switch ($temp) {
@@ -2446,7 +2588,7 @@ function _createInlineCryptFunction($cipher_code)
                     for ($_i = 0; $_i < $_len; ++$_i) {
                         $in = $_iv;
                         '.$encrypt_block.'
-                        $_ciphertext .= ($_c = $_text[$_i] ^ $in);
+                        $_ciphertext.= ($_c = $_text[$_i] ^ $in);
                         $_iv = substr($_iv, 1) . $_c;
                     }
 
@@ -2468,7 +2610,7 @@ function _createInlineCryptFunction($cipher_code)
                     for ($_i = 0; $_i < $_len; ++$_i) {
                         $in = $_iv;
                         '.$encrypt_block.'
-                        $_plaintext .= $_text[$_i] ^ $in;
+                        $_plaintext.= $_text[$_i] ^ $in;
                         $_iv = substr($_iv, 1) . $_text[$_i];
                     }
 
@@ -2480,6 +2622,44 @@ function _createInlineCryptFunction($cipher_code)
                         }
                     }
 
+                    return $_plaintext;
+                    ';
+                break;
+            case self::MODE_OFB8:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_len = strlen($_text);
+                    $_iv = $self->encryptIV;
+
+                    for ($_i = 0; $_i < $_len; ++$_i) {
+                        $in = $_iv;
+                        '.$encrypt_block.'
+                        $_ciphertext.= $_text[$_i] ^ $in;
+                        $_iv = substr($_iv, 1) . $in[0];
+                    }
+
+                    if ($self->continuousBuffer) {
+                        $self->encryptIV = $_iv;
+                    }
+
+                    return $_ciphertext;
+                    ';
+                $decrypt = $init_encrypt . '
+                    $_plaintext = "";
+                    $_len = strlen($_text);
+                    $_iv = $self->decryptIV;
+
+                    for ($_i = 0; $_i < $_len; ++$_i) {
+                        $in = $_iv;
+                        '.$encrypt_block.'
+                        $_plaintext.= $_text[$_i] ^ $in;
+                        $_iv = substr($_iv, 1) . $in[0];
+                    }
+
+                    if ($self->continuousBuffer) {
+                        $self->decryptIV = $_iv;
+                    }
+
                     return $_plaintext;
                     ';
                 break;
@@ -2684,11 +2864,8 @@ function _hashInlineCryptFunction($bytes)
      */
     function safe_intval($x)
     {
-        switch (true) {
-            case is_int($x):
-            // PHP 5.3, per http://php.net/releases/5_3_0.php, introduced "more consistent float rounding"
-            case (php_uname('m') & "\xDF\xDF\xDF") != 'ARM':
-                return $x;
+        if (is_int($x)) {
+            return $x;
         }
         return (fmod($x, 0x80000000) & 0x7FFFFFFF) |
             ((fmod(floor($x / 0x80000000), 2) & 1) << 31);
@@ -2702,15 +2879,12 @@ function safe_intval($x)
      */
     function safe_intval_inline()
     {
-        switch (true) {
-            case defined('PHP_INT_SIZE') && PHP_INT_SIZE == 8:
-            case (php_uname('m') & "\xDF\xDF\xDF") != 'ARM':
-                return '%s';
-                break;
-            default:
-                $safeint = '(is_int($temp = %s) ? $temp : (fmod($temp, 0x80000000) & 0x7FFFFFFF) | ';
-                return $safeint . '((fmod(floor($temp / 0x80000000), 2) & 1) << 31))';
+        if (CRYPT_BASE_USE_REG_INTVAL) {
+            return PHP_INT_SIZE == 4 ? 'intval(%s)' : '%s';
         }
+
+        $safeint = '(is_int($temp = %s) ? $temp : (fmod($temp, 0x80000000) & 0x7FFFFFFF) | ';
+        return $safeint . '((fmod(floor($temp / 0x80000000), 2) & 1) << 31))';
     }
 
     /**
@@ -2721,4 +2895,15 @@ function safe_intval_inline()
     function do_nothing()
     {
     }
+
+    /**
+     * Is the continuous buffer enabled?
+     *
+     * @access public
+     * @return boolean
+     */
+    function continuousBufferEnabled()
+    {
+        return $this->continuousBuffer;
+    }
 }
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php
index 74cc49de8..346c064b8 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php
@@ -11,6 +11,87 @@
  *
  *  - {@link http://en.wikipedia.org/wiki/Blowfish_(cipher) Wikipedia description of Blowfish}
  *
+ * # An overview of bcrypt vs Blowfish
+ *
+ * OpenSSH private keys use a customized version of bcrypt. Specifically, instead of
+ * encrypting OrpheanBeholderScryDoubt 64 times OpenSSH's bcrypt variant encrypts
+ * OxychromaticBlowfishSwatDynamite 64 times. so we can't use crypt().
+ *
+ * bcrypt is basically Blowfish but instead of performing the key expansion once it performs
+ * the expansion 129 times for each round, with the first key expansion interleaving the salt
+ * and password. This renders OpenSSL unusable and forces us to use a pure-PHP implementation
+ * of blowfish.
+ *
+ * # phpseclib's four different _encryptBlock() implementations
+ *
+ * When using Blowfish as an encryption algorithm, _encryptBlock() is called 9 + 512 +
+ * (the number of blocks in the plaintext) times.
+ *
+ * Each of the first 9 calls to _encryptBlock() modify the P-array. Each of the next 512
+ * calls modify the S-boxes. The remaining _encryptBlock() calls operate on the plaintext to
+ * produce the ciphertext. In the pure-PHP implementation of Blowfish these remaining
+ * _encryptBlock() calls are highly optimized through the use of eval(). Among other things,
+ * P-array lookups are eliminated by hard-coding the key-dependent P-array values, and thus we
+ * have explained 2 of the 4 different _encryptBlock() implementations.
+ *
+ * With bcrypt things are a bit different. _encryptBlock() is called 1,079,296 times,
+ * assuming 16 rounds (which is what OpenSSH's bcrypt defaults to). The eval()-optimized
+ * _encryptBlock() isn't as beneficial because the P-array values are not constant. Well, they
+ * are constant, but only for, at most, 777 _encryptBlock() calls, which is equivalent to ~6KB
+ * of data. The average length of back to back _encryptBlock() calls with a fixed P-array is
+ * 514.12, which is ~4KB of data. Creating an eval()-optimized _encryptBlock() has an upfront
+ * cost, which is CPU dependent and is probably not going to be worth it for just ~4KB of
+ * data. Conseqeuently, bcrypt does not benefit from the eval()-optimized _encryptBlock().
+ *
+ * The regular _encryptBlock() does unpack() and pack() on every call, as well, and that can
+ * begin to add up after one million function calls.
+ *
+ * In theory, one might think that it might be beneficial to rewrite all block ciphers so
+ * that, instead of passing strings to _encryptBlock(), you convert the string to an array of
+ * integers and then pass successive subarrays of that array to _encryptBlock. This, however,
+ * kills PHP's memory use. Like let's say you have a 1MB long string. After doing
+ * $in = str_repeat('a', 1024 * 1024); PHP's memory utilization jumps up by ~1MB. After doing
+ * $blocks = str_split($in, 4); it jumps up by an additional ~16MB. After
+ * $blocks = array_map(fn($x) => unpack('N*', $x), $blocks); it jumps up by an additional
+ * ~90MB, yielding a 106x increase in memory usage. Consequently, it bcrypt calls a different
+ * _encryptBlock() then the regular Blowfish does. That said, the Blowfish _encryptBlock() is
+ * basically just a thin wrapper around the bcrypt _encryptBlock(), so there's that.
+ *
+ * This explains 3 of the 4 _encryptBlock() implementations. the last _encryptBlock()
+ * implementation can best be understood by doing Ctrl + F and searching for where
+ * CRYPT_BASE_USE_REG_INTVAL is defined.
+ *
+ * # phpseclib's three different _setupKey() implementations
+ *
+ * Every bcrypt round is the equivalent of encrypting 512KB of data. Since OpenSSH uses 16
+ * rounds by default that's ~8MB of data that's essentially being encrypted whenever
+ * you use bcrypt. That's a lot of data, however, bcrypt operates within tighter constraints
+ * than regular Blowfish, so we can use that to our advantage. In particular, whereas Blowfish
+ * supports variable length keys, in bcrypt, the initial "key" is the sha512 hash of the
+ * password. sha512 hashes are 512 bits or 64 bytes long and thus the bcrypt keys are of a
+ * fixed length whereas Blowfish keys are not of a fixed length.
+ *
+ * bcrypt actually has two different key expansion steps. The first one (expandstate) is
+ * constantly XOR'ing every _encryptBlock() parameter against the salt prior _encryptBlock()'s
+ * being called. The second one (expand0state) is more similar to Blowfish's _setupKey()
+ * but it can still use the fixed length key optimization discussed above and can do away with
+ * the pack() / unpack() calls.
+ *
+ * I suppose _setupKey() could be made to be a thin wrapper around expandstate() but idk it's
+ * just a lot of work for very marginal benefits as _setupKey() is only called once for
+ * regular Blowfish vs the 128 times it's called --per round-- with bcrypt.
+ *
+ * # blowfish + bcrypt in the same class
+ *
+ * Altho there's a lot of Blowfish code that bcrypt doesn't re-use, bcrypt does re-use the
+ * initial S-boxes, the initial P-array and the int-only _encryptBlock() implementation.
+ *
+ * # Credit
+ *
+ * phpseclib's bcrypt implementation is based losely off of OpenSSH's implementation:
+ *
+ * https://github.com/openssh/openssh-portable/blob/master/openbsd-compat/bcrypt_pbkdf.c
+ *
  * Here's a short example of how to use this library:
  * <code>
  * <?php
@@ -74,6 +155,15 @@ class Blowfish extends Base
      */
     var $cfb_init_len = 500;
 
+    /**
+     * SHA512 Object
+     *
+     * @see self::bcrypt_pbkdf
+     * @var object
+     * @access private
+     */
+    var $sha512;
+
     /**
      * The fixed subkeys boxes ($sbox0 - $sbox3) with 256 entries each
      *
@@ -283,6 +373,41 @@ class Blowfish extends Base
      */
     var $key_length = 16;
 
+    /**
+     * Default Constructor.
+     *
+     * Determines whether or not the mcrypt extension should be used.
+     *
+     * $mode could be:
+     *
+     * - CRYPT_MODE_ECB
+     *
+     * - CRYPT_MODE_CBC
+     *
+     * - CRYPT_MODE_CTR
+     *
+     * - CRYPT_MODE_CFB
+     *
+     * - CRYPT_MODE_OFB
+     *
+     * (or the alias constants of the chosen cipher, for example for AES: CRYPT_AES_MODE_ECB or CRYPT_AES_MODE_CBC ...)
+     *
+     * If not explicitly set, CRYPT_MODE_CBC will be used.
+     *
+     * @param int $mode
+     * @access public
+     */
+    function __construct($mode = self::MODE_CBC)
+    {
+        parent::__construct($mode);
+
+        $this->sbox0 = array_map('intval', $this->sbox0);
+        $this->sbox1 = array_map('intval', $this->sbox1);
+        $this->sbox2 = array_map('intval', $this->sbox2);
+        $this->sbox3 = array_map('intval', $this->sbox3);
+        $this->parray = array_map('intval', $this->parray);
+    }
+
     /**
      * Sets the key length.
      *
@@ -317,6 +442,12 @@ function setKeyLength($length)
     function isValidEngine($engine)
     {
         if ($engine == self::ENGINE_OPENSSL) {
+            // quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
+            // "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
+            // in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
+            if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
+                return false;
+            }
             if (version_compare(PHP_VERSION, '5.3.7') < 0 && $this->key_length != 16) {
                 return false;
             }
@@ -358,6 +489,7 @@ function _setupKey()
         // unpack binary string in unsigned chars
         $key  = array_values(unpack('C*', $this->key));
         $keyl = count($key);
+        // with bcrypt $keyl will always be 16 (because the key is the sha512 of the key you provide)
         for ($j = 0, $i = 0; $i < 18; ++$i) {
             // xor P1 with the first 32-bits of the key, xor P2 with the second 32-bits ...
             for ($data = 0, $k = 0; $k < 4; ++$k) {
@@ -366,7 +498,7 @@ function _setupKey()
                     $j = 0;
                 }
             }
-            $this->bctx['p'][] = $this->parray[$i] ^ $data;
+            $this->bctx['p'][] = $this->parray[$i] ^ intval($data);
         }
 
         // encrypt the zero-string, replace P1 and P2 with the encrypted data,
@@ -386,6 +518,230 @@ function _setupKey()
         }
     }
 
+    /**
+     * bcrypt
+     *
+     * @param string $sha2pass
+     * @param string $sha2salt
+     * @access private
+     * @return string
+     */
+    function _bcrypt_hash($sha2pass, $sha2salt)
+    {
+        $p = $this->parray;
+        $sbox0 = $this->sbox0;
+        $sbox1 = $this->sbox1;
+        $sbox2 = $this->sbox2;
+        $sbox3 = $this->sbox3;
+
+        $cdata = array_values(unpack('N*', 'OxychromaticBlowfishSwatDynamite'));
+        $sha2pass = array_values(unpack('N*', $sha2pass));
+        $sha2salt = array_values(unpack('N*', $sha2salt));
+
+        $this->_expandstate($sha2salt, $sha2pass, $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        for ($i = 0; $i < 64; $i++) {
+            $this->_expand0state($sha2salt, $sbox0, $sbox1, $sbox2, $sbox3, $p);
+            $this->_expand0state($sha2pass, $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        }
+
+        for ($i = 0; $i < 64; $i++) {
+            for ($j = 0; $j < 8; $j+= 2) { // count($cdata) == 8
+                list($cdata[$j], $cdata[$j + 1]) = $this->_encryptBlockHelperFast($cdata[$j], $cdata[$j + 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+            }
+        }
+
+        $output = '';
+        for ($i = 0; $i < count($cdata); $i++) {
+            $output.= pack('L*', $cdata[$i]);
+        }
+        return $output;
+    }
+
+    /**
+     * Performs OpenSSH-style bcrypt
+     *
+     * @param string $pass
+     * @param string $salt
+     * @param int $keylen
+     * @param int $rounds
+     * @access public
+     * @return false|string
+     */
+    function bcrypt_pbkdf($pass, $salt, $keylen, $rounds)
+    {
+        if (PHP_INT_SIZE == 4) {
+            user_error('bcrypt is far too slow to be practical on 32-bit versions of PHP');
+            return false;
+        }
+
+        if (!isset($this->sha512)) {
+            $this->sha512 = new Hash('sha512');
+        }
+
+        $sha2pass = $this->sha512->hash($pass);
+        $results = array();
+        $count = 1;
+        while (32 * count($results) < $keylen) {
+            $countsalt = $salt . pack('N', $count++);
+            $sha2salt = $this->sha512->hash($countsalt);
+            $out = $tmpout = $this->_bcrypt_hash($sha2pass, $sha2salt);
+            for ($i = 1; $i < $rounds; $i++) {
+                $sha2salt = $this->sha512->hash($tmpout);
+                $tmpout = $this->_bcrypt_hash($sha2pass, $sha2salt);
+                $out^= $tmpout;
+            }
+            $results[] = $out;
+        }
+        $output = '';
+        for ($i = 0; $i < 32; $i++) {
+            foreach ($results as $result) {
+                $output.= $result[$i];
+            }
+        }
+        return substr($output, 0, $keylen);
+    }
+
+    /**
+     * Key expansion without salt
+     *
+     * @access private
+     * @param int[] $key
+     * @param int[] $sbox0
+     * @param int[] $sbox1
+     * @param int[] $sbox2
+     * @param int[] $sbox3
+     * @param int[] $p
+     * @see self::_bcrypt_hash()
+     */
+    function _expand0state($key, &$sbox0, &$sbox1, &$sbox2, &$sbox3, &$p)
+    {
+        // expand0state is basically the same thing as this:
+        //return $this->_expandstate(array_fill(0, 16, 0), $key);
+        // but this separate function eliminates a bunch of XORs and array lookups
+
+        $p = array(
+            $p[0] ^ $key[0],
+            $p[1] ^ $key[1],
+            $p[2] ^ $key[2],
+            $p[3] ^ $key[3],
+            $p[4] ^ $key[4],
+            $p[5] ^ $key[5],
+            $p[6] ^ $key[6],
+            $p[7] ^ $key[7],
+            $p[8] ^ $key[8],
+            $p[9] ^ $key[9],
+            $p[10] ^ $key[10],
+            $p[11] ^ $key[11],
+            $p[12] ^ $key[12],
+            $p[13] ^ $key[13],
+            $p[14] ^ $key[14],
+            $p[15] ^ $key[15],
+            $p[16] ^ $key[0],
+            $p[17] ^ $key[1]
+        );
+
+        // @codingStandardsIgnoreStart
+        list( $p[0],  $p[1]) = $this->_encryptBlockHelperFast(     0,      0, $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list( $p[2],  $p[3]) = $this->_encryptBlockHelperFast($p[ 0], $p[ 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list( $p[4],  $p[5]) = $this->_encryptBlockHelperFast($p[ 2], $p[ 3], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list( $p[6],  $p[7]) = $this->_encryptBlockHelperFast($p[ 4], $p[ 5], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list( $p[8],  $p[9]) = $this->_encryptBlockHelperFast($p[ 6], $p[ 7], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list($p[10], $p[11]) = $this->_encryptBlockHelperFast($p[ 8], $p[ 9], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list($p[12], $p[13]) = $this->_encryptBlockHelperFast($p[10], $p[11], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list($p[14], $p[15]) = $this->_encryptBlockHelperFast($p[12], $p[13], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list($p[16], $p[17]) = $this->_encryptBlockHelperFast($p[14], $p[15], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        // @codingStandardsIgnoreEnd
+
+        list($sbox0[0], $sbox0[1]) = $this->_encryptBlockHelperFast($p[16], $p[17], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        for ($i = 2; $i < 256; $i+= 2) {
+            list($sbox0[$i], $sbox0[$i + 1]) = $this->_encryptBlockHelperFast($sbox0[$i - 2], $sbox0[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        }
+
+        list($sbox1[0], $sbox1[1]) = $this->_encryptBlockHelperFast($sbox0[254], $sbox0[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        for ($i = 2; $i < 256; $i+= 2) {
+            list($sbox1[$i], $sbox1[$i + 1]) = $this->_encryptBlockHelperFast($sbox1[$i - 2], $sbox1[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        }
+
+        list($sbox2[0], $sbox2[1]) = $this->_encryptBlockHelperFast($sbox1[254], $sbox1[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        for ($i = 2; $i < 256; $i+= 2) {
+            list($sbox2[$i], $sbox2[$i + 1]) = $this->_encryptBlockHelperFast($sbox2[$i - 2], $sbox2[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        }
+
+        list($sbox3[0], $sbox3[1]) = $this->_encryptBlockHelperFast($sbox2[254], $sbox2[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        for ($i = 2; $i < 256; $i+= 2) {
+            list($sbox3[$i], $sbox3[$i + 1]) = $this->_encryptBlockHelperFast($sbox3[$i - 2], $sbox3[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        }
+    }
+
+    /**
+     * Key expansion with salt
+     *
+     * @access private
+     * @param int[] $data
+     * @param int[] $key
+     * @param int[] $sbox0
+     * @param int[] $sbox1
+     * @param int[] $sbox2
+     * @param int[] $sbox3
+     * @param int[] $p
+     * @see self::_bcrypt_hash()
+     */
+    function _expandstate($data, $key, &$sbox0, &$sbox1, &$sbox2, &$sbox3, &$p)
+    {
+        $p = array(
+            $p[0] ^ $key[0],
+            $p[1] ^ $key[1],
+            $p[2] ^ $key[2],
+            $p[3] ^ $key[3],
+            $p[4] ^ $key[4],
+            $p[5] ^ $key[5],
+            $p[6] ^ $key[6],
+            $p[7] ^ $key[7],
+            $p[8] ^ $key[8],
+            $p[9] ^ $key[9],
+            $p[10] ^ $key[10],
+            $p[11] ^ $key[11],
+            $p[12] ^ $key[12],
+            $p[13] ^ $key[13],
+            $p[14] ^ $key[14],
+            $p[15] ^ $key[15],
+            $p[16] ^ $key[0],
+            $p[17] ^ $key[1]
+        );
+
+        // @codingStandardsIgnoreStart
+        list( $p[0],  $p[1]) = $this->_encryptBlockHelperFast($data[ 0]         , $data[ 1]         , $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list( $p[2],  $p[3]) = $this->_encryptBlockHelperFast($data[ 2] ^ $p[ 0], $data[ 3] ^ $p[ 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list( $p[4],  $p[5]) = $this->_encryptBlockHelperFast($data[ 4] ^ $p[ 2], $data[ 5] ^ $p[ 3], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list( $p[6],  $p[7]) = $this->_encryptBlockHelperFast($data[ 6] ^ $p[ 4], $data[ 7] ^ $p[ 5], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list( $p[8],  $p[9]) = $this->_encryptBlockHelperFast($data[ 8] ^ $p[ 6], $data[ 9] ^ $p[ 7], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list($p[10], $p[11]) = $this->_encryptBlockHelperFast($data[10] ^ $p[ 8], $data[11] ^ $p[ 9], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list($p[12], $p[13]) = $this->_encryptBlockHelperFast($data[12] ^ $p[10], $data[13] ^ $p[11], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list($p[14], $p[15]) = $this->_encryptBlockHelperFast($data[14] ^ $p[12], $data[15] ^ $p[13], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        list($p[16], $p[17]) = $this->_encryptBlockHelperFast($data[ 0] ^ $p[14], $data[ 1] ^ $p[15], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        // @codingStandardsIgnoreEnd
+
+        list($sbox0[0], $sbox0[1]) = $this->_encryptBlockHelperFast($data[2] ^ $p[16], $data[3] ^ $p[17], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        for ($i = 2, $j = 4; $i < 256; $i+= 2, $j = ($j + 2) % 16) { // instead of 16 maybe count($data) would be better?
+            list($sbox0[$i], $sbox0[$i + 1]) = $this->_encryptBlockHelperFast($data[$j] ^ $sbox0[$i - 2], $data[$j + 1] ^ $sbox0[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        }
+
+        list($sbox1[0], $sbox1[1]) = $this->_encryptBlockHelperFast($data[2] ^ $sbox0[254], $data[3] ^ $sbox0[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        for ($i = 2, $j = 4; $i < 256; $i+= 2, $j = ($j + 2) % 16) {
+            list($sbox1[$i], $sbox1[$i + 1]) = $this->_encryptBlockHelperFast($data[$j] ^ $sbox1[$i - 2], $data[$j + 1] ^ $sbox1[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        }
+
+        list($sbox2[0], $sbox2[1]) = $this->_encryptBlockHelperFast($data[2] ^ $sbox1[254], $data[3] ^ $sbox1[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        for ($i = 2, $j = 4; $i < 256; $i+= 2, $j = ($j + 2) % 16) {
+            list($sbox2[$i], $sbox2[$i + 1]) = $this->_encryptBlockHelperFast($data[$j] ^ $sbox2[$i - 2], $data[$j + 1] ^ $sbox2[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        }
+
+        list($sbox3[0], $sbox3[1]) = $this->_encryptBlockHelperFast($data[2] ^ $sbox2[254], $data[3] ^ $sbox2[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        for ($i = 2, $j = 4; $i < 256; $i+= 2, $j = ($j + 2) % 16) {
+            list($sbox3[$i], $sbox3[$i + 1]) = $this->_encryptBlockHelperFast($data[$j] ^ $sbox3[$i - 2], $data[$j + 1] ^ $sbox3[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
+        }
+    }
+
     /**
      * Encrypts a block
      *
@@ -406,18 +762,84 @@ function _encryptBlock($in)
         $l = $in[1];
         $r = $in[2];
 
-        for ($i = 0; $i < 16; $i+= 2) {
-            $l^= $p[$i];
-            $r^= $this->safe_intval(($this->safe_intval($sb_0[$l >> 24 & 0xff]  + $sb_1[$l >> 16 & 0xff]) ^
-                  $sb_2[$l >>  8 & 0xff]) +
-                  $sb_3[$l       & 0xff]);
+        list($r, $l) = PHP_INT_SIZE === 8 ?
+            $this->_encryptBlockHelperFast($l, $r, $sb_0, $sb_1, $sb_2, $sb_3, $p) :
+            $this->_encryptBlockHelperSlow($l, $r, $sb_0, $sb_1, $sb_2, $sb_3, $p);
 
-            $r^= $p[$i + 1];
-            $l^= $this->safe_intval(($this->safe_intval($sb_0[$r >> 24 & 0xff]  + $sb_1[$r >> 16 & 0xff]) ^
-                  $sb_2[$r >>  8 & 0xff]) +
-                  $sb_3[$r       & 0xff]);
-        }
-        return pack("N*", $r ^ $p[17], $l ^ $p[16]);
+        return pack("N*", $r, $l);
+    }
+
+    /**
+     * Fast helper function for block encryption
+     *
+     * @access private
+     * @param int $x0
+     * @param int $x1
+     * @param int[] $sbox0
+     * @param int[] $sbox1
+     * @param int[] $sbox2
+     * @param int[] $sbox3
+     * @param int[] $p
+     * @return int[]
+     */
+    function _encryptBlockHelperFast($x0, $x1, $sbox0, $sbox1, $sbox2, $sbox3, $p)
+    {
+        $x0 ^= $p[0];
+        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[1];
+        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[2];
+        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[3];
+        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[4];
+        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[5];
+        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[6];
+        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[7];
+        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[8];
+        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[9];
+        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[10];
+        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[11];
+        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[12];
+        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[13];
+        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[14];
+        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[15];
+        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[16];
+
+        return array($x1 & 0xFFFFFFFF ^ $p[17], $x0 & 0xFFFFFFFF);
+    }
+
+    /**
+     * Slow helper function for block encryption
+     *
+     * @access private
+     * @param int $x0
+     * @param int $x1
+     * @param int[] $sbox0
+     * @param int[] $sbox1
+     * @param int[] $sbox2
+     * @param int[] $sbox3
+     * @param int[] $p
+     * @return int[]
+     */
+    function _encryptBlockHelperSlow($x0, $x1, $sbox0, $sbox1, $sbox2, $sbox3, $p)
+    {
+        // -16777216 == intval(0xFF000000) on 32-bit PHP installs
+        $x0^= $p[0];
+        $x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[1];
+        $x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[2];
+        $x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[3];
+        $x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[4];
+        $x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[5];
+        $x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[6];
+        $x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[7];
+        $x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[8];
+        $x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[9];
+        $x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[10];
+        $x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[11];
+        $x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[12];
+        $x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[13];
+        $x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[14];
+        $x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[15];
+        $x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[16];
+
+        return array($x1 ^ $p[17], $x0);
     }
 
     /**
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/DES.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/DES.php
index 9a8225fb5..26bd385f5 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/DES.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/DES.php
@@ -592,6 +592,12 @@ function isValidEngine($engine)
     {
         if ($this->key_length_max == 8) {
             if ($engine == self::ENGINE_OPENSSL) {
+                // quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
+                // "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
+                // in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
+                if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
+                    return false;
+                }
                 $this->cipher_name_openssl_ecb = 'des-ecb';
                 $this->cipher_name_openssl = 'des-' . $this->_openssl_translate_mode();
             }
@@ -1246,9 +1252,9 @@ function _setupKey()
                       $pc2mapd3[($d >>  8) & 0xFF] | $pc2mapd4[ $d        & 0xFF];
 
                 // Reorder: odd bytes/even bytes. Push the result in key schedule.
-                $val1 = ( $cp        & 0xFF000000) | (($cp <<  8) & 0x00FF0000) |
+                $val1 = ( $cp        & intval(0xFF000000)) | (($cp <<  8) & 0x00FF0000) |
                         (($dp >> 16) & 0x0000FF00) | (($dp >>  8) & 0x000000FF);
-                $val2 = (($cp <<  8) & 0xFF000000) | (($cp << 16) & 0x00FF0000) |
+                $val2 = (($cp <<  8) & intval(0xFF000000)) | (($cp << 16) & 0x00FF0000) |
                         (($dp >>  8) & 0x0000FF00) | ( $dp        & 0x000000FF);
                 $keys[$des_round][self::ENCRYPT][       ] = $val1;
                 $keys[$des_round][self::DECRYPT][$ki - 1] = $val1;
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Hash.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Hash.php
index 248b65ef7..5e5d13d4c 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Hash.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Hash.php
@@ -866,7 +866,7 @@ function _add()
             $result+= $argument < 0 ? ($argument & 0x7FFFFFFF) + 0x80000000 : $argument;
         }
 
-        if ((php_uname('m') & "\xDF\xDF\xDF") != 'ARM') {
+        if (function_exists('php_uname') && is_string(php_uname('m')) && (php_uname('m') & "\xDF\xDF\xDF") != 'ARM') {
             return fmod($result, $mod);
         }
 
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC2.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC2.php
index b2b9d48ea..e0511b32f 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC2.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC2.php
@@ -72,7 +72,7 @@ class RC2 extends Base
      * @var string
      * @access private
      */
-    var $orig_key;
+    var $orig_key = '';
 
     /**
      * Don't truncate / null pad key
@@ -273,6 +273,12 @@ function isValidEngine($engine)
     {
         switch ($engine) {
             case self::ENGINE_OPENSSL:
+                // quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
+                // "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
+                // in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
+                if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
+                    return false;
+                }
                 if ($this->current_key_length != 128 || strlen($this->orig_key) < 16) {
                     return false;
                 }
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC4.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC4.php
index 25e4ff854..2e5c05567 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC4.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC4.php
@@ -144,7 +144,13 @@ function __construct()
      */
     function isValidEngine($engine)
     {
-        if ($engine == Base::ENGINE_OPENSSL) {
+        if ($engine == self::ENGINE_OPENSSL) {
+            // quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
+            // "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
+            // in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
+            if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
+                return false;
+            }
             if (version_compare(PHP_VERSION, '5.3.7') >= 0) {
                 $this->cipher_name_openssl = 'rc4-40';
             } else {
@@ -222,7 +228,7 @@ function setKeyLength($length)
      */
     function encrypt($plaintext)
     {
-        if ($this->engine != Base::ENGINE_INTERNAL) {
+        if ($this->engine != self::ENGINE_INTERNAL) {
             return parent::encrypt($plaintext);
         }
         return $this->_crypt($plaintext, self::ENCRYPT);
@@ -242,7 +248,7 @@ function encrypt($plaintext)
      */
     function decrypt($ciphertext)
     {
-        if ($this->engine != Base::ENGINE_INTERNAL) {
+        if ($this->engine != self::ENGINE_INTERNAL) {
             return parent::decrypt($ciphertext);
         }
         return $this->_crypt($ciphertext, self::DECRYPT);
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
index 811d039d3..fec689585 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
@@ -470,7 +470,7 @@ function __construct()
                 case defined('MATH_BIGINTEGER_OPENSSL_DISABLE'):
                     define('CRYPT_RSA_MODE', self::MODE_INTERNAL);
                     break;
-                case extension_loaded('openssl') && file_exists($this->configFile):
+                case function_exists('phpinfo') && extension_loaded('openssl') && file_exists($this->configFile):
                     // some versions of XAMPP have mismatched versions of OpenSSL which causes it not to work
                     $versions = array();
 
@@ -570,6 +570,7 @@ function createKey($bits = 1024, $timeout = false, $partial = array())
             $publickey = call_user_func_array(array($this, '_convertPublicKey'), array_values($this->_parseKey($publickey, self::PUBLIC_FORMAT_PKCS1)));
 
             // clear the buffer of error strings stemming from a minimalistic openssl.cnf
+            // https://github.com/php/php-src/issues/11054 talks about other errors this'll pick up
             while (openssl_error_string() !== false) {
             }
 
@@ -878,9 +879,9 @@ function _convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients)
                 );
                 $key = "openssh-key-v1\0$key";
 
-                return "-----BEGIN OPENSSH PRIVATE KEY-----\r\n" .
-                       chunk_split(base64_encode($key), 70) .
-                       "-----END OPENSSH PRIVATE KEY-----";
+                return "-----BEGIN OPENSSH PRIVATE KEY-----\n" .
+                       chunk_split(base64_encode($key), 70, "\n") .
+                       "-----END OPENSSH PRIVATE KEY-----\n";
             default: // eg. self::PRIVATE_FORMAT_PKCS1
                 $components = array();
                 foreach ($raw as $name => $value) {
@@ -1388,6 +1389,10 @@ function.  As is, the definitive authority on this encoding scheme isn't the IET
             // http://en.wikipedia.org/wiki/XML_Signature
             case self::PRIVATE_FORMAT_XML:
             case self::PUBLIC_FORMAT_XML:
+                if (!extension_loaded('xml')) {
+                    return false;
+                }
+
                 $this->components = array();
 
                 $xml = xml_parser_create('UTF-8');
@@ -1405,11 +1410,18 @@ function.  As is, the definitive authority on this encoding scheme isn't the IET
                 unset($xml);
 
                 return isset($this->components['modulus']) && isset($this->components['publicExponent']) ? $this->components : false;
-            // from PuTTY's SSHPUBK.C
+            // see PuTTY's SSHPUBK.C and https://tartarus.org/~simon/putty-snapshots/htmldoc/AppendixC.html
             case self::PRIVATE_FORMAT_PUTTY:
                 $components = array();
                 $key = preg_split('#\r\n|\r|\n#', $key);
-                $type = trim(preg_replace('#PuTTY-User-Key-File-2: (.+)#', '$1', $key[0]));
+                if ($this->_string_shift($key[0], strlen('PuTTY-User-Key-File-')) != 'PuTTY-User-Key-File-') {
+                    return false;
+                }
+                $version = (int) $this->_string_shift($key[0], 3); // should be either "2: " or "3: 0" prior to int casting
+                if ($version != 2 && $version != 3) {
+                    return false;
+                }
+                $type = rtrim($key[0]);
                 if ($type != 'ssh-rsa') {
                     return false;
                 }
@@ -1424,23 +1436,55 @@ function.  As is, the definitive authority on this encoding scheme isn't the IET
                 extract(unpack('Nlength', $this->_string_shift($public, 4)));
                 $components['modulus'] = new BigInteger($this->_string_shift($public, $length), -256);
 
-                $privateLength = trim(preg_replace('#Private-Lines: (\d+)#', '$1', $key[$publicLength + 4]));
-                $private = base64_decode(implode('', array_map('trim', array_slice($key, $publicLength + 5, $privateLength))));
-
+                $offset = $publicLength + 4;
                 switch ($encryption) {
                     case 'aes256-cbc':
-                        $symkey = '';
-                        $sequence = 0;
-                        while (strlen($symkey) < 32) {
-                            $temp = pack('Na*', $sequence++, $this->password);
-                            $symkey.= pack('H*', sha1($temp));
-                        }
-                        $symkey = substr($symkey, 0, 32);
                         $crypto = new AES();
+                        switch ($version) {
+                            case 3:
+                                if (!function_exists('sodium_crypto_pwhash')) {
+                                    return false;
+                                }
+                                $flavour = trim(preg_replace('#Key-Derivation: (.*)#', '$1', $key[$offset++]));
+                                switch ($flavour) {
+                                    case 'Argon2i':
+                                        $flavour = SODIUM_CRYPTO_PWHASH_ALG_ARGON2I13;
+                                        break;
+                                    case 'Argon2id':
+                                        $flavour = SODIUM_CRYPTO_PWHASH_ALG_ARGON2ID13;
+                                        break;
+                                    default:
+                                        return false;
+                                }
+                                $memory = trim(preg_replace('#Argon2-Memory: (\d+)#', '$1', $key[$offset++]));
+                                $passes = trim(preg_replace('#Argon2-Passes: (\d+)#', '$1', $key[$offset++]));
+                                $parallelism = trim(preg_replace('#Argon2-Parallelism: (\d+)#', '$1', $key[$offset++]));
+                                $salt = pack('H*', trim(preg_replace('#Argon2-Salt: ([0-9a-f]+)#', '$1', $key[$offset++])));
+
+                                $length = 80; // keylen + ivlen + mac_keylen
+                                $temp = sodium_crypto_pwhash($length, $this->password, $salt, $passes, $memory << 10, $flavour);
+
+                                $symkey = substr($temp, 0, 32);
+                                $symiv = substr($temp, 32, 16);
+                                break;
+                            case 2:
+                                $symkey = '';
+                                $sequence = 0;
+                                while (strlen($symkey) < 32) {
+                                    $temp = pack('Na*', $sequence++, $this->password);
+                                    $symkey.= pack('H*', sha1($temp));
+                                }
+                                $symkey = substr($symkey, 0, 32);
+                                $symiv = str_repeat("\0", 16);
+                        }
                 }
 
+                $privateLength = trim(preg_replace('#Private-Lines: (\d+)#', '$1', $key[$offset++]));
+                $private = base64_decode(implode('', array_map('trim', array_slice($key, $offset, $privateLength))));
+
                 if ($encryption != 'none') {
                     $crypto->setKey($symkey);
+                    $crypto->setIV($symiv);
                     $crypto->disablePadding();
                     $private = $crypto->decrypt($private);
                     if ($private === false) {
@@ -1483,14 +1527,44 @@ function.  As is, the definitive authority on this encoding scheme isn't the IET
                 if ($magic !== "openssh-key-v1\0") {
                     return false;
                 }
-                $options = $this->_string_shift($decoded, 24);
-                // \0\0\0\4none = ciphername
-                // \0\0\0\4none = kdfname
-                // \0\0\0\0 = kdfoptions
-                // \0\0\0\1 = numkeys
-                if ($options != "\0\0\0\4none\0\0\0\4none\0\0\0\0\0\0\0\1") {
+                extract(unpack('Nlength', $this->_string_shift($decoded, 4)));
+                if (strlen($decoded) < $length) {
+                    return false;
+                }
+                $ciphername = $this->_string_shift($decoded, $length);
+                extract(unpack('Nlength', $this->_string_shift($decoded, 4)));
+                if (strlen($decoded) < $length) {
+                    return false;
+                }
+                $kdfname = $this->_string_shift($decoded, $length);
+                extract(unpack('Nlength', $this->_string_shift($decoded, 4)));
+                if (strlen($decoded) < $length) {
+                    return false;
+                }
+                $kdfoptions = $this->_string_shift($decoded, $length);
+                extract(unpack('Nnumkeys', $this->_string_shift($decoded, 4)));
+                if ($numkeys != 1 || ($ciphername != 'none' && $kdfname != 'bcrypt')) {
                     return false;
                 }
+                switch ($ciphername) {
+                    case 'none':
+                        break;
+                    case 'aes256-ctr':
+                        extract(unpack('Nlength', $this->_string_shift($kdfoptions, 4)));
+                        if (strlen($kdfoptions) < $length) {
+                            return false;
+                        }
+                        $salt = $this->_string_shift($kdfoptions, $length);
+                        extract(unpack('Nrounds', $this->_string_shift($kdfoptions, 4)));
+                        $crypto = new AES(AES::MODE_CTR);
+                        $crypto->disablePadding();
+                        if (!$crypto->setPassword($this->password, 'bcrypt', $salt, $rounds, 32)) {
+                            return false;
+                        }
+                        break;
+                    default:
+                        return false;
+                }
                 extract(unpack('Nlength', $this->_string_shift($decoded, 4)));
                 if (strlen($decoded) < $length) {
                     return false;
@@ -1500,12 +1574,16 @@ function.  As is, the definitive authority on this encoding scheme isn't the IET
                 if (strlen($decoded) < $length) {
                     return false;
                 }
-                $paddedKey = $this->_string_shift($decoded, $length);
 
                 if ($this->_string_shift($publicKey, 11) !== "\0\0\0\7ssh-rsa") {
                     return false;
                 }
 
+                $paddedKey = $this->_string_shift($decoded, $length);
+                if (isset($crypto)) {
+                    $paddedKey = $crypto->decrypt($paddedKey);
+                }
+
                 $checkint1 = $this->_string_shift($paddedKey, 4);
                 $checkint2 = $this->_string_shift($paddedKey, 4);
                 if (strlen($checkint1) != 4 || $checkint1 !== $checkint2) {
@@ -2580,9 +2658,9 @@ function _rsaes_oaep_decrypt($c, $l = '')
             $offset+= $patternMatch ? 0 : 1;
         }
 
-        // we do & instead of && to avoid https://en.wikipedia.org/wiki/Short-circuit_evaluation
+        // we do | instead of || to avoid https://en.wikipedia.org/wiki/Short-circuit_evaluation
         // to protect against timing attacks
-        if (!$hashesMatch & !$patternMatch) {
+        if (!$hashesMatch | !$patternMatch) {
             user_error('Decryption error');
             return false;
         }
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Random.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Random.php
index 8f53eb319..e039340c5 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Random.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Random.php
@@ -151,7 +151,10 @@ static function string($length)
                 (isset($_POST) ? phpseclib_safe_serialize($_POST) : '') .
                 (isset($_GET) ? phpseclib_safe_serialize($_GET) : '') .
                 (isset($_COOKIE) ? phpseclib_safe_serialize($_COOKIE) : '') .
-                phpseclib_safe_serialize($GLOBALS) .
+                // as of PHP 8.1 $GLOBALS can't be accessed by reference, which eliminates
+                // the need for phpseclib_safe_serialize. see https://wiki.php.net/rfc/restrict_globals_usage
+                // for more info
+                (version_compare(PHP_VERSION, '8.1.0', '>=') ? serialize($GLOBALS) : phpseclib_safe_serialize($GLOBALS)) .
                 phpseclib_safe_serialize($_SESSION) .
                 phpseclib_safe_serialize($_OLD_SESSION)
             ));
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php
index 3648a1972..4665738e1 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php
@@ -340,7 +340,7 @@ function _encryptBlock($in)
         $k = $c[2];
         $l = $c[3];
         while ($i < $Nb) {
-            $temp[$i] = ($state[$i] & 0xFF000000) ^
+            $temp[$i] = ($state[$i] & intval(0xFF000000)) ^
                         ($state[$j] & 0x00FF0000) ^
                         ($state[$k] & 0x0000FF00) ^
                         ($state[$l] & 0x000000FF) ^
@@ -426,7 +426,7 @@ function _decryptBlock($in)
         $l = $Nb - $c[3];
 
         while ($i < $Nb) {
-            $word = ($state[$i] & 0xFF000000) |
+            $word = ($state[$i] & intval(0xFF000000)) |
                     ($state[$j] & 0x00FF0000) |
                     ($state[$k] & 0x0000FF00) |
                     ($state[$l] & 0x000000FF);
@@ -465,14 +465,19 @@ function _setupKey()
     {
         // Each number in $rcon is equal to the previous number multiplied by two in Rijndael's finite field.
         // See http://en.wikipedia.org/wiki/Finite_field_arithmetic#Multiplicative_inverse
-        static $rcon = array(0,
-            0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000,
-            0x20000000, 0x40000000, 0x80000000, 0x1B000000, 0x36000000,
-            0x6C000000, 0xD8000000, 0xAB000000, 0x4D000000, 0x9A000000,
-            0x2F000000, 0x5E000000, 0xBC000000, 0x63000000, 0xC6000000,
-            0x97000000, 0x35000000, 0x6A000000, 0xD4000000, 0xB3000000,
-            0x7D000000, 0xFA000000, 0xEF000000, 0xC5000000, 0x91000000
-        );
+        static $rcon;
+
+        if (!isset($rcon)) {
+            $rcon = array(0,
+                0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000,
+                0x20000000, 0x40000000, 0x80000000, 0x1B000000, 0x36000000,
+                0x6C000000, 0xD8000000, 0xAB000000, 0x4D000000, 0x9A000000,
+                0x2F000000, 0x5E000000, 0xBC000000, 0x63000000, 0xC6000000,
+                0x97000000, 0x35000000, 0x6A000000, 0xD4000000, 0xB3000000,
+                0x7D000000, 0xFA000000, 0xEF000000, 0xC5000000, 0x91000000
+            );
+            $rcon = array_map('intval', $rcon);
+        }
 
         if (isset($this->kl['key']) && $this->key === $this->kl['key'] && $this->key_length === $this->kl['key_length'] && $this->block_size === $this->kl['block_size']) {
             // already expanded
@@ -511,7 +516,7 @@ function _setupKey()
                 // on a 32-bit machine, it's 32-bits, and on a 64-bit machine, it's 64-bits. on a 32-bit machine,
                 // 0xFFFFFFFF << 8 == 0xFFFFFF00, but on a 64-bit machine, it equals 0xFFFFFFFF00. as such, doing 'and'
                 // with 0xFFFFFFFF (or 0xFFFFFF00) on a 32-bit machine is unnecessary, but on a 64-bit machine, it is.
-                $temp = (($temp << 8) & 0xFFFFFF00) | (($temp >> 24) & 0x000000FF); // rotWord
+                $temp = (($temp << 8) & intval(0xFFFFFF00)) | (($temp >> 24) & 0x000000FF); // rotWord
                 $temp = $this->_subWord($temp) ^ $rcon[$i / $this->Nk];
             } elseif ($this->Nk > 6 && $i % $this->Nk == 4) {
                 $temp = $this->_subWord($temp);
@@ -641,9 +646,9 @@ function &_getTables()
             ));
 
             foreach ($t3 as $t3i) {
-                $t0[] = (($t3i << 24) & 0xFF000000) | (($t3i >>  8) & 0x00FFFFFF);
-                $t1[] = (($t3i << 16) & 0xFFFF0000) | (($t3i >> 16) & 0x0000FFFF);
-                $t2[] = (($t3i <<  8) & 0xFFFFFF00) | (($t3i >> 24) & 0x000000FF);
+                $t0[] = (($t3i << 24) & intval(0xFF000000)) | (($t3i >>  8) & 0x00FFFFFF);
+                $t1[] = (($t3i << 16) & intval(0xFFFF0000)) | (($t3i >> 16) & 0x0000FFFF);
+                $t2[] = (($t3i <<  8) & intval(0xFFFFFF00)) | (($t3i >> 24) & 0x000000FF);
             }
 
             $tables = array(
@@ -725,9 +730,9 @@ function &_getInvTables()
             ));
 
             foreach ($dt3 as $dt3i) {
-                $dt0[] = (($dt3i << 24) & 0xFF000000) | (($dt3i >>  8) & 0x00FFFFFF);
-                $dt1[] = (($dt3i << 16) & 0xFFFF0000) | (($dt3i >> 16) & 0x0000FFFF);
-                $dt2[] = (($dt3i <<  8) & 0xFFFFFF00) | (($dt3i >> 24) & 0x000000FF);
+                $dt0[] = (($dt3i << 24) & intval(0xFF000000)) | (($dt3i >>  8) & 0x00FFFFFF);
+                $dt1[] = (($dt3i << 16) & intval(0xFFFF0000)) | (($dt3i >> 16) & 0x0000FFFF);
+                $dt2[] = (($dt3i <<  8) & intval(0xFFFFFF00)) | (($dt3i >> 24) & 0x000000FF);
             };
 
             $tables = array(
@@ -809,7 +814,6 @@ function _setupInlineCrypt()
 
             // Generating encrypt code:
             $init_encrypt.= '
-                static $tables;
                 if (empty($tables)) {
                     $tables = &$self->_getTables();
                 }
@@ -866,7 +870,6 @@ function _setupInlineCrypt()
 
             // Generating decrypt code:
             $init_decrypt.= '
-                static $invtables;
                 if (empty($invtables)) {
                     $invtables = &$self->_getInvTables();
                 }
@@ -923,7 +926,7 @@ function _setupInlineCrypt()
 
             $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
                 array(
-                   'init_crypt'    => '',
+                   'init_crypt'    => 'static $tables; static $invtables;',
                    'init_encrypt'  => $init_encrypt,
                    'init_decrypt'  => $init_decrypt,
                    'encrypt_block' => $encrypt_block,
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php
index a2c41668a..bf2df95ed 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php
@@ -57,7 +57,7 @@ class TripleDES extends DES
      *
      * Outer chaining is used by SSH-2 and when the mode is set to \phpseclib\Crypt\Base::MODE_CBC.
      */
-    const MODE_CBC3 = Base::MODE_CBC;
+    const MODE_CBC3 = self::MODE_CBC;
 
     /**
      * Key Length (in bytes)
@@ -151,20 +151,20 @@ class TripleDES extends DES
      * @param int $mode
      * @access public
      */
-    function __construct($mode = Base::MODE_CBC)
+    function __construct($mode = self::MODE_CBC)
     {
         switch ($mode) {
             // In case of self::MODE_3CBC, we init as CRYPT_DES_MODE_CBC
             // and additional flag us internally as 3CBC
             case self::MODE_3CBC:
-                parent::__construct(Base::MODE_CBC);
+                parent::__construct(self::MODE_CBC);
                 $this->mode_3cbc = true;
 
                 // This three $des'es will do the 3CBC work (if $key > 64bits)
                 $this->des = array(
-                    new DES(Base::MODE_CBC),
-                    new DES(Base::MODE_CBC),
-                    new DES(Base::MODE_CBC),
+                    new DES(self::MODE_CBC),
+                    new DES(self::MODE_CBC),
+                    new DES(self::MODE_CBC),
                 );
 
                 // we're going to be doing the padding, ourselves, so disable it in the \phpseclib\Crypt\DES objects
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php
index 70980a2ff..1c020481a 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php
@@ -368,6 +368,42 @@ class Twofish extends Base
      */
     var $key_length = 16;
 
+    /**
+     * Default Constructor.
+     *
+     * Determines whether or not the mcrypt extension should be used.
+     *
+     * $mode could be:
+     *
+     * - CRYPT_MODE_ECB
+     *
+     * - CRYPT_MODE_CBC
+     *
+     * - CRYPT_MODE_CTR
+     *
+     * - CRYPT_MODE_CFB
+     *
+     * - CRYPT_MODE_OFB
+     *
+     * (or the alias constants of the chosen cipher, for example for AES: CRYPT_AES_MODE_ECB or CRYPT_AES_MODE_CBC ...)
+     *
+     * If not explicitly set, CRYPT_MODE_CBC will be used.
+     *
+     * @param int $mode
+     * @access public
+     */
+    function __construct($mode = self::MODE_CBC)
+    {
+        parent::__construct($mode);
+
+        $this->m0 = array_map('intval', $this->m0);
+        $this->m1 = array_map('intval', $this->m1);
+        $this->m2 = array_map('intval', $this->m2);
+        $this->m3 = array_map('intval', $this->m3);
+        $this->q0 = array_map('intval', $this->q0);
+        $this->q1 = array_map('intval', $this->q1);
+    }
+
     /**
      * Sets the key length.
      *
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
index dc5b78f64..dba99de73 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
@@ -143,6 +143,16 @@ class ASN1
      */
     var $filters;
 
+    /**
+     * Current Location of most recent ASN.1 encode process
+     *
+     * Useful for debug purposes
+     *
+     * @var array
+     * @see self::encode_der()
+     */
+    var $location;
+
     /**
      * Type mapping table for the ANY type.
      *
@@ -234,6 +244,9 @@ function _decode_ber($encoded, $start = 0, $encoded_pos = 0)
     {
         $current = array('start' => $start);
 
+        if (!isset($encoded[$encoded_pos])) {
+            return false;
+        }
         $type = ord($encoded[$encoded_pos++]);
         $startOffset = 1;
 
@@ -244,6 +257,9 @@ function _decode_ber($encoded, $start = 0, $encoded_pos = 0)
             $tag = 0;
             // process septets (since the eighth bit is ignored, it's not an octet)
             do {
+                if (!isset($encoded[$encoded_pos])) {
+                    return false;
+                }
                 $temp = ord($encoded[$encoded_pos++]);
                 $startOffset++;
                 $loop = $temp >> 7;
@@ -260,6 +276,9 @@ function _decode_ber($encoded, $start = 0, $encoded_pos = 0)
         $start+= $startOffset;
 
         // Length, as discussed in paragraph 8.1.3 of X.690-0207.pdf#page=13
+        if (!isset($encoded[$encoded_pos])) {
+            return false;
+        }
         $length = ord($encoded[$encoded_pos++]);
         $start++;
         if ($length == 0x80) { // indefinite length
@@ -993,7 +1012,10 @@ function _encode_der($source, $mapping, $idx = null, $special = array())
             case self::TYPE_GENERALIZED_TIME:
                 $format = $mapping['type'] == self::TYPE_UTC_TIME ? 'y' : 'Y';
                 $format.= 'mdHis';
+                // if $source does _not_ include timezone information within it then assume that the timezone is GMT
                 $date = new DateTime($source, new DateTimeZone('GMT'));
+                // if $source _does_ include timezone information within it then convert the time to GMT
+                $date->setTimezone(new DateTimeZone('GMT'));
                 $value = $date->format($format) . 'Z';
                 break;
             case self::TYPE_BIT_STRING:
@@ -1154,6 +1176,11 @@ function _decodeOID($content)
         $oid = array();
         $pos = 0;
         $len = strlen($content);
+        // see https://github.com/openjdk/jdk/blob/2deb318c9f047ec5a4b160d66a4b52f93688ec42/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java#L55
+        if ($len > 4096) {
+            //user_error('Object Identifier size is limited to 4096 bytes');
+            return false;
+        }
 
         if (ord($content[$len - 1]) & 0x80) {
             return false;
@@ -1419,7 +1446,7 @@ function convert($in, $from = self::TYPE_UTF8_STRING, $to = self::TYPE_UTF8_STRI
                         return false;
                     }
                     break;
-                case ($c & 0x80000000) != 0:
+                case ($c & (PHP_INT_SIZE == 8 ? 0x80000000 : (1 << 31))) != 0:
                     return false;
                 case $c >= 0x04000000:
                     $v .= chr(0x80 | ($c & 0x3F));
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/File/X509.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/File/X509.php
index 7b1b1cfad..7b8d96e29 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/File/X509.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/File/X509.php
@@ -145,6 +145,7 @@ class X509
     var $AuthorityKeyIdentifier;
     var $CertificatePolicies;
     var $AuthorityInfoAccessSyntax;
+    var $SubjectInfoAccessSyntax;
     var $SubjectAltName;
     var $SubjectDirectoryAttributes;
     var $PrivateKeyUsagePeriod;
@@ -1320,6 +1321,10 @@ function __construct()
             '2.5.4.45' => 'id-at-uniqueIdentifier',
             '2.5.4.72' => 'id-at-role',
             '2.5.4.16' => 'id-at-postalAddress',
+            '1.3.6.1.4.1.311.60.2.1.3' => 'jurisdictionOfIncorporationCountryName',
+            '1.3.6.1.4.1.311.60.2.1.2' => 'jurisdictionOfIncorporationStateOrProvinceName',
+            '1.3.6.1.4.1.311.60.2.1.1' => 'jurisdictionLocalityName',
+            '2.5.4.15' => 'id-at-businessCategory',
 
             '0.9.2342.19200300.100.1.25' => 'id-domainComponent',
             '1.2.840.113549.1.9' => 'pkcs-9',
@@ -1622,7 +1627,6 @@ function _mapInExtensions(&$root, $path, $asn1)
                 $id = $extensions[$i]['extnId'];
                 $value = &$extensions[$i]['extnValue'];
                 $value = base64_decode($value);
-                $decoded = $asn1->decodeBER($value);
                 /* [extnValue] contains the DER encoding of an ASN.1 value
                    corresponding to the extension type identified by extnID */
                 $map = $this->_getMapping($id);
@@ -1630,6 +1634,7 @@ function _mapInExtensions(&$root, $path, $asn1)
                     $decoder = $id == 'id-ce-nameConstraints' ?
                         array($this, '_decodeNameConstraintIP') :
                         array($this, '_decodeIP');
+                    $decoded = $asn1->decodeBER($value);
                     $mapped = $asn1->asn1map($decoded[0], $map, array('iPAddress' => $decoder));
                     $value = $mapped === false ? $decoded[0] : $mapped;
 
@@ -2065,7 +2070,8 @@ function validateURL($url)
         if ($names = $this->getExtension('id-ce-subjectAltName')) {
             foreach ($names as $name) {
                 foreach ($name as $key => $value) {
-                    $value = str_replace(array('.', '*'), array('\.', '[^.]*'), $value);
+                    $value = preg_quote($value);
+                    $value = str_replace('\*', '[^.]*', $value);
                     switch ($key) {
                         case 'dNSName':
                             /* From RFC2818 "HTTP over TLS":
@@ -2163,7 +2169,11 @@ static function _fetchURL($url)
                 if (!$fsock) {
                     return false;
                 }
-                fputs($fsock, "GET $parts[path] HTTP/1.0\r\n");
+                $path = $parts['path'];
+                if (isset($parts['query'])) {
+                    $path.= '?' . $parts['query'];
+                }
+                fputs($fsock, "GET $path HTTP/1.0\r\n");
                 fputs($fsock, "Host: $parts[host]\r\n\r\n");
                 $line = fgets($fsock, 1024);
                 if (strlen($line) < 3) {
@@ -2571,6 +2581,20 @@ function _encodeIP($ip)
     function _translateDNProp($propName)
     {
         switch (strtolower($propName)) {
+            case 'jurisdictionofincorporationcountryname':
+            case 'jurisdictioncountryname':
+            case 'jurisdictionc':
+                return 'jurisdictionOfIncorporationCountryName';
+            case 'jurisdictionofincorporationstateorprovincename':
+            case 'jurisdictionstateorprovincename':
+            case 'jurisdictionst':
+                return 'jurisdictionOfIncorporationStateOrProvinceName';
+            case 'jurisdictionlocalityname':
+            case 'jurisdictionl':
+                return 'jurisdictionLocalityName';
+            case 'id-at-businesscategory':
+            case 'businesscategory':
+                return 'id-at-businessCategory';
             case 'id-at-countryname':
             case 'countryname':
             case 'c':
@@ -5058,7 +5082,7 @@ function _extractBER($str)
             $temp = $str;
         } else {
             $temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
-            $temp = preg_replace('#-+END.*[\r\n ]*.*#ms', '', $str, 1);
+            $temp = preg_replace('#-+END.*[\r\n ]*.*#ms', '', $temp, 1);
         }
         // remove new lines
         $temp = str_replace(array("\r", "\n", ' '), '', $temp);
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
index fc24b9145..7747a95b6 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
@@ -163,23 +163,23 @@ class BigInteger
      *
      * @see __construct()
      */
-    protected static $base;
-    protected static $baseFull;
-    protected static $maxDigit;
-    protected static $msb;
+    static $base;
+    static $baseFull;
+    static $maxDigit;
+    static $msb;
 
     /**
      * $max10 in greatest $max10Len satisfying
      * $max10 = 10**$max10Len <= 2**$base.
      */
-    protected static $max10;
+    static $max10;
 
     /**
      * $max10Len in greatest $max10Len satisfying
      * $max10 = 10**$max10Len <= 2**$base.
      */
-    protected static $max10Len;
-    protected static $maxDigit2;
+    static $max10Len;
+    static $maxDigit2;
     /**#@-*/
 
     /**
@@ -268,7 +268,7 @@ function __construct($x = 0, $base = 10)
             $versions = array();
 
             // avoid generating errors (even with suppression) when phpinfo() is disabled (common in production systems)
-            if (strpos(ini_get('disable_functions'), 'phpinfo') === false) {
+            if (function_exists('phpinfo')) {
                 ob_start();
                 @phpinfo();
                 $content = ob_get_contents();
@@ -372,7 +372,7 @@ function __construct($x = 0, $base = 10)
                         break;
                     case self::MODE_BCMATH:
                         // round $len to the nearest 4 (thanks, DavidMJ!)
-                        $len = (strlen($x) + 3) & 0xFFFFFFFC;
+                        $len = (strlen($x) + 3) & ~3;
 
                         $x = str_pad($x, $len, chr(0), STR_PAD_LEFT);
 
@@ -408,7 +408,7 @@ function __construct($x = 0, $base = 10)
                     $x = substr($x, 1);
                 }
 
-                $x = preg_replace('#^(?:0x)?([A-Fa-f0-9]*).*#', '$1', $x);
+                $x = preg_replace('#^(?:0x)?([A-Fa-f0-9]*).*#s', '$1', $x);
 
                 $is_negative = false;
                 if ($base < 0 && hexdec($x[0]) >= 8) {
@@ -444,7 +444,7 @@ function __construct($x = 0, $base = 10)
                 // (?<!^)(?:-).*: find any -'s that aren't at the beginning and then any characters that follow that
                 // (?<=^|-)0*: find any 0's that are preceded by the start of the string or by a - (ie. octals)
                 // [^-0-9].*: find any non-numeric characters and then any characters that follow that
-                $x = preg_replace('#(?<!^)(?:-).*|(?<=^|-)0*|[^-0-9].*#', '', $x);
+                $x = preg_replace('#(?<!^)(?:-).*|(?<=^|-)0*|[^-0-9].*#s', '', $x);
                 if (!strlen($x) || $x == '-') {
                     $x = '0';
                 }
@@ -486,7 +486,7 @@ function __construct($x = 0, $base = 10)
                     $x = substr($x, 1);
                 }
 
-                $x = preg_replace('#^([01]*).*#', '$1', $x);
+                $x = preg_replace('#^([01]*).*#s', '$1', $x);
                 $x = str_pad($x, strlen($x) + (3 * strlen($x)) % 4, 0, STR_PAD_LEFT);
 
                 $str = '0x';
@@ -729,6 +729,33 @@ function toString()
         return $result;
     }
 
+    /**
+     * Return the size of a BigInteger in bits
+     *
+     * @return int
+     */
+    function getLength()
+    {
+        if (MATH_BIGINTEGER_MODE != self::MODE_INTERNAL) {
+            return strlen($this->toBits());
+        }
+
+        $max = count($this->value) - 1;
+        return $max != -1 ?
+            $max * self::$base + intval(ceil(log($this->value[$max] + 1, 2))) :
+            0;
+    }
+
+    /**
+     * Return the size of a BigInteger in bytes
+     *
+     * @return int
+     */
+    function getLengthInBytes()
+    {
+        return (int) ceil($this->getLength() / 8);
+    }
+
     /**
      * Copy an object
      *
@@ -3237,6 +3264,11 @@ function randomPrime($arg1, $arg2 = false, $timeout = false)
             $min = $temp;
         }
 
+        $length = $max->getLength();
+        if ($length > 8196) {
+            user_error('Generation of random prime numbers larger than 8196 has been disabled');
+        }
+
         static $one, $two;
         if (!isset($one)) {
             $one = new static(1);
@@ -3344,7 +3376,14 @@ function _make_odd()
      */
     function isPrime($t = false)
     {
-        $length = strlen($this->toBytes());
+        $length = $this->getLength();
+        // OpenSSL limits RSA keys to 16384 bits. The length of an RSA key is equal to the length of the modulo, which is
+        // produced by multiplying the primes p and q by one another. The largest number two 8196 bit primes can produce is
+        // a 16384 bit number so, basically, 8196 bit primes are the largest OpenSSL will generate and if that's the largest
+        // that it'll generate it also stands to reason that that's the largest you'll be able to test primality on
+        if ($length > 8196) {
+            user_error('Primality testing is not supported for numbers larger than 8196 bits');
+        }
 
         if (!$t) {
             // see HAC 4.49 "Note (controlling the error probability)"
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SCP.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SCP.php
index cf13496cd..ee6e1c9d9 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SCP.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SCP.php
@@ -247,6 +247,13 @@ function get($remote_file, $local_file = false)
         $content = '';
         while ($size < $info['size']) {
             $data = $this->_receive();
+
+            // Terminate the loop in case the server repeatedly sends an empty response
+            if ($data === false) {
+                user_error('No data received from server', E_USER_NOTICE);
+                return false;
+            }
+
             // SCP usually seems to split stuff out into 16k chunks
             $size+= strlen($data);
 
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php
index 34741831b..28b568062 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php
@@ -5,9 +5,7 @@
  *
  * PHP version 5
  *
- * Currently only supports SFTPv2 and v3, which, according to wikipedia.org, "is the most widely used version,
- * implemented by the popular OpenSSH SFTP server".  If you want SFTPv4/5/6 support, provide me with access
- * to an SFTPv4/5/6 server.
+ * Supports SFTPv2/3/4/5/6. Defaults to v3.
  *
  * The API for this library is modeled after the API from PHP's {@link http://php.net/book.ftp FTP extension}.
  *
@@ -154,6 +152,24 @@ class SFTP extends SSH2
      */
     var $version;
 
+    /**
+     * Default Server SFTP version
+     *
+     * @var int
+     * @see self::_initChannel()
+     * @access private
+     */
+    var $defaultVersion;
+
+    /**
+     * Preferred SFTP version
+     *
+     * @var int
+     * @see self::_initChannel()
+     * @access private
+     */
+    var $preferredVersion = 3;
+
     /**
      * Current working directory
      *
@@ -269,6 +285,71 @@ class SFTP extends SSH2
      */
     var $preserveTime = false;
 
+    /**
+     * Arbitrary Length Packets Flag
+     *
+     * Determines whether or not packets of any length should be allowed,
+     * in cases where the server chooses the packet length (such as
+     * directory listings). By default, packets are only allowed to be
+     * 256 * 1024 bytes (SFTP_MAX_MSG_LENGTH from OpenSSH's sftp-common.h)
+     *
+     * @see self::enableArbitraryLengthPackets()
+     * @see self::_get_sftp_packet()
+     * @var bool
+     * @access private
+     */
+    var $allow_arbitrary_length_packets = false;
+
+    /**
+     * Was the last packet due to the channels being closed or not?
+     *
+     * @see self::get()
+     * @see self::get_sftp_packet()
+     * @var bool
+     * @access private
+     */
+    var $channel_close = false;
+
+    /**
+     * Has the SFTP channel been partially negotiated?
+     *
+     * @var bool
+     * @access private
+     */
+    var $partial_init = false;
+
+    /**
+     * http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-7.1
+     * the order, in this case, matters quite a lot - see \phpseclib3\Net\SFTP::_parseAttributes() to understand why
+     *
+     * @var array
+     * @access private
+     */
+    var $attributes = array();
+
+    /**
+     * @var array
+     * @access private
+     */
+    var $open_flags = array();
+
+    /**
+     * SFTPv5+ changed the flags up:
+     * https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-8.1.1.3
+     *
+     * @var array
+     * @access private
+     */
+    var $open_flags5 = array();
+
+    /**
+     * http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-5.2
+     * see \phpseclib\Net\SFTP::_parseLongname() for an explanation
+     *
+     * @var array
+     */
+    var $file_types = array();
+
     /**
      * Default Constructor.
      *
@@ -289,15 +370,13 @@ function __construct($host, $port = 22, $timeout = 10)
         $this->packet_types = array(
             1  => 'NET_SFTP_INIT',
             2  => 'NET_SFTP_VERSION',
-            /* the format of SSH_FXP_OPEN changed between SFTPv4 and SFTPv5+:
-                   SFTPv5+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.1
-               pre-SFTPv5 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3 */
             3  => 'NET_SFTP_OPEN',
             4  => 'NET_SFTP_CLOSE',
             5  => 'NET_SFTP_READ',
             6  => 'NET_SFTP_WRITE',
             7  => 'NET_SFTP_LSTAT',
             9  => 'NET_SFTP_SETSTAT',
+            10 => 'NET_SFTP_FSETSTAT',
             11 => 'NET_SFTP_OPENDIR',
             12 => 'NET_SFTP_READDIR',
             13 => 'NET_SFTP_REMOVE',
@@ -305,18 +384,13 @@ function __construct($host, $port = 22, $timeout = 10)
             15 => 'NET_SFTP_RMDIR',
             16 => 'NET_SFTP_REALPATH',
             17 => 'NET_SFTP_STAT',
-            /* the format of SSH_FXP_RENAME changed between SFTPv4 and SFTPv5+:
-                   SFTPv5+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
-               pre-SFTPv5 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.5 */
             18 => 'NET_SFTP_RENAME',
             19 => 'NET_SFTP_READLINK',
             20 => 'NET_SFTP_SYMLINK',
+            21 => 'NET_SFTP_LINK',
 
             101=> 'NET_SFTP_STATUS',
             102=> 'NET_SFTP_HANDLE',
-            /* the format of SSH_FXP_NAME changed between SFTPv3 and SFTPv4+:
-                   SFTPv4+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-9.4
-               pre-SFTPv4 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-02#section-7 */
             103=> 'NET_SFTP_DATA',
             104=> 'NET_SFTP_NAME',
             105=> 'NET_SFTP_ATTRS',
@@ -361,25 +435,59 @@ function __construct($host, $port = 22, $timeout = 10)
         // the order, in this case, matters quite a lot - see \phpseclib\Net\SFTP::_parseAttributes() to understand why
         $this->attributes = array(
             0x00000001 => 'NET_SFTP_ATTR_SIZE',
-            0x00000002 => 'NET_SFTP_ATTR_UIDGID', // defined in SFTPv3, removed in SFTPv4+
+            0x00000002 => 'NET_SFTP_ATTR_UIDGID',          // defined in SFTPv3, removed in SFTPv4+
+            0x00000080 => 'NET_SFTP_ATTR_OWNERGROUP',      // defined in SFTPv4+
             0x00000004 => 'NET_SFTP_ATTR_PERMISSIONS',
             0x00000008 => 'NET_SFTP_ATTR_ACCESSTIME',
+            0x00000010 => 'NET_SFTP_ATTR_CREATETIME',      // SFTPv4+
+            0x00000020 => 'NET_SFTP_ATTR_MODIFYTIME',
+            0x00000040 => 'NET_SFTP_ATTR_ACL',
+            0x00000100 => 'NET_SFTP_ATTR_SUBSECOND_TIMES',
+            0x00000200 => 'NET_SFTP_ATTR_BITS',            // SFTPv5+
+            0x00000400 => 'NET_SFTP_ATTR_ALLOCATION_SIZE', // SFTPv6+
+            0x00000800 => 'NET_SFTP_ATTR_TEXT_HINT',
+            0x00001000 => 'NET_SFTP_ATTR_MIME_TYPE',
+            0x00002000 => 'NET_SFTP_ATTR_LINK_COUNT',
+            0x00004000 => 'NET_SFTP_ATTR_UNTRANSLATED_NAME',
+            0x00008000 => 'NET_SFTP_ATTR_CTIME',
             // 0x80000000 will yield a floating point on 32-bit systems and converting floating points to integers
             // yields inconsistent behavior depending on how php is compiled.  so we left shift -1 (which, in
             // two's compliment, consists of all 1 bits) by 31.  on 64-bit systems this'll yield 0xFFFFFFFF80000000.
             // that's not a problem, however, and 'anded' and a 32-bit number, as all the leading 1 bits are ignored.
-            (-1 << 31) & 0xFFFFFFFF => 'NET_SFTP_ATTR_EXTENDED'
+            (PHP_INT_SIZE == 4 ? (-1 << 31) : 0x80000000) => 'NET_SFTP_ATTR_EXTENDED'
         );
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3
-        // the flag definitions change somewhat in SFTPv5+.  if SFTPv5+ support is added to this library, maybe name
-        // the array for that $this->open5_flags and similarly alter the constant names.
         $this->open_flags = array(
             0x00000001 => 'NET_SFTP_OPEN_READ',
             0x00000002 => 'NET_SFTP_OPEN_WRITE',
             0x00000004 => 'NET_SFTP_OPEN_APPEND',
             0x00000008 => 'NET_SFTP_OPEN_CREATE',
             0x00000010 => 'NET_SFTP_OPEN_TRUNCATE',
-            0x00000020 => 'NET_SFTP_OPEN_EXCL'
+            0x00000020 => 'NET_SFTP_OPEN_EXCL',
+            0x00000040 => 'NET_SFTP_OPEN_TEXT' // defined in SFTPv4
+        );
+        // SFTPv5+ changed the flags up:
+        // https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-8.1.1.3
+        $this->open_flags5 = array(
+            // when SSH_FXF_ACCESS_DISPOSITION is a 3 bit field that controls how the file is opened
+            0x00000000 => 'NET_SFTP_OPEN_CREATE_NEW',
+            0x00000001 => 'NET_SFTP_OPEN_CREATE_TRUNCATE',
+            0x00000002 => 'NET_SFTP_OPEN_OPEN_EXISTING',
+            0x00000003 => 'NET_SFTP_OPEN_OPEN_OR_CREATE',
+            0x00000004 => 'NET_SFTP_OPEN_TRUNCATE_EXISTING',
+            // the rest of the flags are not supported
+            0x00000008 => 'NET_SFTP_OPEN_APPEND_DATA', // "the offset field of SS_FXP_WRITE requests is ignored"
+            0x00000010 => 'NET_SFTP_OPEN_APPEND_DATA_ATOMIC',
+            0x00000020 => 'NET_SFTP_OPEN_TEXT_MODE',
+            0x00000040 => 'NET_SFTP_OPEN_BLOCK_READ',
+            0x00000080 => 'NET_SFTP_OPEN_BLOCK_WRITE',
+            0x00000100 => 'NET_SFTP_OPEN_BLOCK_DELETE',
+            0x00000200 => 'NET_SFTP_OPEN_BLOCK_ADVISORY',
+            0x00000400 => 'NET_SFTP_OPEN_NOFOLLOW',
+            0x00000800 => 'NET_SFTP_OPEN_DELETE_ON_CLOSE',
+            0x00001000 => 'NET_SFTP_OPEN_ACCESS_AUDIT_ALARM_INFO',
+            0x00002000 => 'NET_SFTP_OPEN_ACCESS_BACKUP',
+            0x00004000 => 'NET_SFTP_OPEN_BACKUP_STREAM',
+            0x00008000 => 'NET_SFTP_OPEN_OVERRIDE_OWNER',
         );
         // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-5.2
         // see \phpseclib\Net\SFTP::_parseLongname() for an explanation
@@ -401,6 +509,7 @@ function __construct($host, $port = 22, $timeout = 10)
             $this->status_codes,
             $this->attributes,
             $this->open_flags,
+            $this->open_flags5,
             $this->file_types
         );
 
@@ -413,18 +522,32 @@ function __construct($host, $port = 22, $timeout = 10)
     }
 
     /**
-     * Login
+     * Check a few things before SFTP functions are called
      *
-     * @param string $username
      * @return bool
      * @access public
      */
-    function login($username)
+    function _precheck()
     {
-        if (!call_user_func_array('parent::login', func_get_args())) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
+        if ($this->pwd === false) {
+            return $this->_init_sftp_connection();
+        }
+
+        return true;
+    }
+
+    /**
+     * Partially initialize an SFTP connection
+     *
+     * @return bool
+     * @access public
+     */
+    function _partial_init_sftp_connection()
+    {
         $this->window_size_server_to_client[self::CHANNEL] = $this->window_size;
 
         $packet = pack(
@@ -446,6 +569,8 @@ function login($username)
         $response = $this->_get_channel_packet(self::CHANNEL, true);
         if ($response === false) {
             return false;
+        } elseif ($response === true && $this->isTimeout()) {
+            return false;
         }
 
         $packet = pack(
@@ -492,6 +617,8 @@ function login($username)
             if ($response === false) {
                 return false;
             }
+        } elseif ($response === true && $this->isTimeout()) {
+            return false;
         }
 
         $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_DATA;
@@ -506,11 +633,13 @@ function login($username)
             return false;
         }
 
+        $this->use_request_id = true;
+
         if (strlen($response) < 4) {
             return false;
         }
         extract(unpack('Nversion', $this->_string_shift($response, 4)));
-        $this->version = $version;
+        $this->defaultVersion = $version;
         while (!empty($response)) {
             if (strlen($response) < 4) {
                 return false;
@@ -525,21 +654,22 @@ function login($username)
             $this->extensions[$key] = $value;
         }
 
-        /*
-         SFTPv4+ defines a 'newline' extension.  SFTPv3 seems to have unofficial support for it via 'newline@vandyke.com',
-         however, I'm not sure what 'newline@vandyke.com' is supposed to do (the fact that it's unofficial means that it's
-         not in the official SFTPv3 specs) and 'newline@vandyke.com' / 'newline' are likely not drop-in substitutes for
-         one another due to the fact that 'newline' comes with a SSH_FXF_TEXT bitmask whereas it seems unlikely that
-         'newline@vandyke.com' would.
-        */
-        /*
-        if (isset($this->extensions['newline@vandyke.com'])) {
-            $this->extensions['newline'] = $this->extensions['newline@vandyke.com'];
-            unset($this->extensions['newline@vandyke.com']);
-        }
-        */
+        $this->partial_init = true;
 
-        $this->use_request_id = true;
+        return true;
+    }
+
+    /**
+     * (Re)initializes the SFTP channel
+     *
+     * @return bool
+     * @access private
+     */
+    function _init_sftp_connection()
+    {
+        if (!$this->partial_init && !$this->_partial_init_sftp_connection()) {
+            return false;
+        }
 
         /*
          A Note on SFTPv4/5/6 support:
@@ -564,15 +694,72 @@ function login($username)
          in draft-ietf-secsh-filexfer-13 would be quite impossible.  As such, what \phpseclib\Net\SFTP would do is close the
          channel and reopen it with a new and updated SSH_FXP_INIT packet.
         */
-        switch ($this->version) {
-            case 2:
-            case 3:
-                break;
-            default:
-                return false;
+        $this->version = $this->defaultVersion;
+        if (isset($this->extensions['versions']) && (!$this->preferredVersion || $this->preferredVersion != $this->version)) {
+            $versions = explode(',', $this->extensions['versions']);
+            $supported = array(6, 5, 4);
+            if ($this->preferredVersion) {
+                $supported = array_diff($supported, array($this->preferredVersion));
+                array_unshift($supported, $this->preferredVersion);
+            }
+            foreach ($supported as $ver) {
+                if (in_array($ver, $versions)) {
+                    if ($ver === $this->version) {
+                        break;
+                    }
+                    $this->version = (int) $ver;
+                    $packet = pack('Na*Na*', strlen('version-select'), 'version-select', strlen($ver), $ver);
+                    if (!$this->_send_sftp_packet(NET_SFTP_EXTENDED, $packet)) {
+                        return false;
+                    }
+                    $response = $this->_get_sftp_packet();
+                    if ($this->packet_type != NET_SFTP_STATUS) {
+                        user_error('Expected SSH_FXP_STATUS');
+                        return false;
+                    }
+
+                    if (strlen($response) < 4) {
+                        return false;
+                    }
+                    extract(unpack('Nstatus', $this->_string_shift($response, 4)));
+                    if ($status != NET_SFTP_STATUS_OK) {
+                        $this->_logError($response, $status);
+                        return false;
+                    }
+
+                    break;
+                }
+            }
         }
 
+        /*
+         SFTPv4+ defines a 'newline' extension.  SFTPv3 seems to have unofficial support for it via 'newline@vandyke.com',
+         however, I'm not sure what 'newline@vandyke.com' is supposed to do (the fact that it's unofficial means that it's
+         not in the official SFTPv3 specs) and 'newline@vandyke.com' / 'newline' are likely not drop-in substitutes for
+         one another due to the fact that 'newline' comes with a SSH_FXF_TEXT bitmask whereas it seems unlikely that
+         'newline@vandyke.com' would.
+        */
+        /*
+        if (isset($this->extensions['newline@vandyke.com'])) {
+            $this->extensions['newline'] = $this->extensions['newline@vandyke.com'];
+            unset($this->extensions['newline@vandyke.com']);
+        }
+        */
+
+        if ($this->version < 2 || $this->version > 6) {
+            return false;
+        }
+
+        $this->pwd = true;
         $this->pwd = $this->_realpath('.');
+        if ($this->pwd === false) {
+            if (!$this->canonicalize_paths) {
+                user_error('Unable to canonicalize current working directory');
+                return false;
+            }
+            $this->canonicalize_paths = false;
+            $this->_reset_connection(NET_SSH2_DISCONNECT_CONNECTION_LOST);
+        }
 
         $this->_update_stat_cache($this->pwd, array());
 
@@ -620,7 +807,9 @@ function enablePathCanonicalization()
     }
 
     /**
-     * Enable path canonicalization
+     * Disable path canonicalization
+     *
+     * If this is enabled then $sftp->pwd() will not return the canonicalized absolute path
      *
      * @access public
      */
@@ -629,6 +818,26 @@ function disablePathCanonicalization()
         $this->canonicalize_paths = false;
     }
 
+    /**
+     * Enable arbitrary length packets
+     *
+     * @access public
+     */
+    function enableArbitraryLengthPackets()
+    {
+        $this->allow_arbitrary_length_packets = true;
+    }
+
+    /**
+     * Disable arbitrary length packets
+     *
+     * @access public
+     */
+    function disableArbitraryLengthPackets()
+    {
+        $this->allow_arbitrary_length_packets = false;
+    }
+
     /**
      * Returns the current directory name
      *
@@ -637,6 +846,10 @@ function disablePathCanonicalization()
      */
     function pwd()
     {
+        if (!$this->_precheck()) {
+            return false;
+        }
+
         return $this->pwd;
     }
 
@@ -658,7 +871,7 @@ function _logError($response, $status = -1)
 
         $error = $this->status_codes[$status];
 
-        if ($this->version > 2 || strlen($response) < 4) {
+        if ($this->version > 2) {
             extract(unpack('Nlength', $this->_string_shift($response, 4)));
             $this->sftp_errors[] = $error . ': ' . $this->_string_shift($response, $length);
         } else {
@@ -678,6 +891,10 @@ function _logError($response, $status = -1)
      */
     function realpath($path)
     {
+        if (!$this->_precheck()) {
+            return false;
+        }
+
         return $this->_realpath($path);
     }
 
@@ -698,10 +915,37 @@ function realpath($path)
     function _realpath($path)
     {
         if (!$this->canonicalize_paths) {
-            return $path;
+            if ($this->pwd === true) {
+                return '.';
+            }
+            if (!strlen($path) || $path[0] != '/') {
+                $path = $this->pwd . '/' . $path;
+            }
+
+            $parts = explode('/', $path);
+            $afterPWD = $beforePWD = array();
+            foreach ($parts as $part) {
+                switch ($part) {
+                    //case '': // some SFTP servers /require/ double /'s. see https://github.com/phpseclib/phpseclib/pull/1137
+                    case '.':
+                        break;
+                    case '..':
+                        if (!empty($afterPWD)) {
+                            array_pop($afterPWD);
+                        } else {
+                            $beforePWD[] = '..';
+                        }
+                        break;
+                    default:
+                        $afterPWD[] = $part;
+                }
+            }
+
+            $beforePWD = count($beforePWD) ? implode('/', $beforePWD) : '.';
+            return $beforePWD . '/' . implode('/', $afterPWD);
         }
 
-        if ($this->pwd === false) {
+        if ($this->pwd === true) {
             // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.9
             if (!$this->_send_sftp_packet(NET_SFTP_REALPATH, pack('Na*', strlen($path), $path))) {
                 return false;
@@ -723,7 +967,6 @@ function _realpath($path)
                     $this->_logError($response);
                     return false;
                 default:
-                    user_error('Expected SSH_FXP_NAME or SSH_FXP_STATUS');
                     return false;
             }
         }
@@ -760,7 +1003,7 @@ function _realpath($path)
      */
     function chdir($dir)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->_precheck()) {
             return false;
         }
 
@@ -839,6 +1082,12 @@ function _nlist_helper($dir, $recursive, $relativeDir)
     {
         $files = $this->_list($dir, false);
 
+        // If we get an int back, then that is an "unexpected" status.
+        // We do not have a file list, so return false.
+        if (is_int($files)) {
+            return false;
+        }
+
         if (!$recursive || $files === false) {
             return $files;
         }
@@ -874,6 +1123,13 @@ function _nlist_helper($dir, $recursive, $relativeDir)
     function rawlist($dir = '.', $recursive = false)
     {
         $files = $this->_list($dir, true);
+
+        // If we get an int back, then that is an "unexpected" status.
+        // We do not have a file list, so return false.
+        if (is_int($files)) {
+            return false;
+        }
+
         if (!$recursive || $files === false) {
             return $files;
         }
@@ -917,7 +1173,7 @@ function rawlist($dir = '.', $recursive = false)
      */
     function _list($dir, $raw = true)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->_precheck()) {
             return false;
         }
 
@@ -941,8 +1197,12 @@ function _list($dir, $raw = true)
                 break;
             case NET_SFTP_STATUS:
                 // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-                $this->_logError($response);
-                return false;
+                if (strlen($response) < 4) {
+                    return false;
+                }
+                extract(unpack('Nstatus', $this->_string_shift($response, 4)));
+                $this->_logError($response, $status);
+                return $status;
             default:
                 user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
                 return false;
@@ -972,13 +1232,17 @@ function _list($dir, $raw = true)
                         }
                         extract(unpack('Nlength', $this->_string_shift($response, 4)));
                         $shortname = $this->_string_shift($response, $length);
-                        if (strlen($response) < 4) {
-                            return false;
+                        // SFTPv4 "removed the long filename from the names structure-- it can now be
+                        //         built from information available in the attrs structure."
+                        if ($this->version < 4) {
+                            if (strlen($response) < 4) {
+                                return false;
+                            }
+                            extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                            $longname = $this->_string_shift($response, $length);
                         }
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        $longname = $this->_string_shift($response, $length);
                         $attributes = $this->_parseAttributes($response);
-                        if (!isset($attributes['type'])) {
+                        if (!isset($attributes['type']) && $this->version < 4) {
                             $fileType = $this->_parseLongname($longname);
                             if ($fileType) {
                                 $attributes['type'] = $fileType;
@@ -1007,7 +1271,7 @@ function _list($dir, $raw = true)
                     extract(unpack('Nstatus', $this->_string_shift($response, 4)));
                     if ($status != NET_SFTP_STATUS_EOF) {
                         $this->_logError($response, $status);
-                        return false;
+                        return $status;
                     }
                     break 2;
                 default:
@@ -1138,10 +1402,6 @@ function setListOrder()
      */
     function size($filename)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
         $result = $this->stat($filename);
         if ($result === false) {
             return false;
@@ -1258,7 +1518,7 @@ function _query_stat_cache($path)
      */
     function stat($filename)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->_precheck()) {
             return false;
         }
 
@@ -1315,7 +1575,7 @@ function stat($filename)
      */
     function lstat($filename)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->_precheck()) {
             return false;
         }
 
@@ -1429,7 +1689,7 @@ function truncate($filename, $new_size)
      */
     function touch($filename, $time = null, $atime = null)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->_precheck()) {
             return false;
         }
 
@@ -1445,9 +1705,25 @@ function touch($filename, $time = null, $atime = null)
             $atime = $time;
         }
 
-        $flags = NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE | NET_SFTP_OPEN_EXCL;
-        $attr = pack('N3', NET_SFTP_ATTR_ACCESSTIME, $time, $atime);
-        $packet = pack('Na*Na*', strlen($filename), $filename, $flags, $attr);
+        if ($this->version < 4) {
+            $attr = pack('N3', NET_SFTP_ATTR_ACCESSTIME, $atime, $time);
+        } else {
+            $attr = pack(
+                'N5',
+                NET_SFTP_ATTR_ACCESSTIME | NET_SFTP_ATTR_MODIFYTIME,
+                $atime / 4294967296,
+                $atime,
+                $time / 4294967296,
+                $time
+            );
+        }
+
+        $packet = pack('Na*', strlen($filename), $filename);
+        $packet.= $this->version >= 5 ?
+            pack('N2', 0, NET_SFTP_OPEN_OPEN_EXISTING) :
+            pack('N', NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE | NET_SFTP_OPEN_EXCL);
+        $packet.= $attr;
+
         if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
             return false;
         }
@@ -1470,19 +1746,47 @@ function touch($filename, $time = null, $atime = null)
     /**
      * Changes file or directory owner
      *
+     * $uid should be an int for SFTPv3 and a string for SFTPv4+. Ideally the string
+     * would be of the form "user@dns_domain" but it does not need to be.
+     * `$sftp->getSupportedVersions()['version']` will return the specific version
+     * that's being used.
+     *
      * Returns true on success or false on error.
      *
      * @param string $filename
-     * @param int $uid
+     * @param int|string $uid
      * @param bool $recursive
      * @return bool
      * @access public
      */
     function chown($filename, $uid, $recursive = false)
     {
-        // quoting from <http://www.kernel.org/doc/man-pages/online/pages/man2/chown.2.html>,
-        // "if the owner or group is specified as -1, then that ID is not changed"
-        $attr = pack('N3', NET_SFTP_ATTR_UIDGID, $uid, -1);
+        /*
+         quoting <https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.5>,
+
+         "To avoid a representation that is tied to a particular underlying
+          implementation at the client or server, the use of UTF-8 strings has
+          been chosen.  The string should be of the form "user@dns_domain".
+          This will allow for a client and server that do not use the same
+          local representation the ability to translate to a common syntax that
+          can be interpreted by both.  In the case where there is no
+          translation available to the client or server, the attribute value
+          must be constructed without the "@"."
+
+         phpseclib _could_ auto append the dns_domain to $uid BUT what if it shouldn't
+         have one? phpseclib would have no way of knowing so rather than guess phpseclib
+         will just use whatever value the user provided
+       */
+
+        $attr = $this->version < 4 ?
+            // quoting <http://www.kernel.org/doc/man-pages/online/pages/man2/chown.2.html>,
+            // "if the owner or group is specified as -1, then that ID is not changed"
+            pack('N3', NET_SFTP_ATTR_UIDGID, $uid, -1) :
+            // quoting <https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.5>,
+            // "If either the owner or group field is zero length, the field should be
+            //  considered absent, and no change should be made to that specific field
+            //  during a modification operation"
+            pack('NNa*Na*', NET_SFTP_ATTR_OWNERGROUP, strlen($uid), $uid, 0, '');
 
         return $this->_setstat($filename, $attr, $recursive);
     }
@@ -1490,17 +1794,24 @@ function chown($filename, $uid, $recursive = false)
     /**
      * Changes file or directory group
      *
+     * $gid should be an int for SFTPv3 and a string for SFTPv4+. Ideally the string
+     * would be of the form "user@dns_domain" but it does not need to be.
+     * `$sftp->getSupportedVersions()['version']` will return the specific version
+     * that's being used.
+     *
      * Returns true on success or false on error.
      *
      * @param string $filename
-     * @param int $gid
+     * @param int|string $gid
      * @param bool $recursive
      * @return bool
      * @access public
      */
     function chgrp($filename, $gid, $recursive = false)
     {
-        $attr = pack('N3', NET_SFTP_ATTR_UIDGID, -1, $gid);
+        $attr = $this->version < 4 ?
+            pack('N3', NET_SFTP_ATTR_UIDGID, -1, $gid) :
+            pack('NNa*Na*', NET_SFTP_ATTR_OWNERGROUP, 0, '', strlen($gid), $gid);
 
         return $this->_setstat($filename, $attr, $recursive);
     }
@@ -1567,7 +1878,7 @@ function chmod($mode, $filename, $recursive = false)
      */
     function _setstat($filename, $attr, $recursive)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->_precheck()) {
             return false;
         }
 
@@ -1585,9 +1896,10 @@ function _setstat($filename, $attr, $recursive)
             return $result;
         }
 
-        // SFTPv4+ has an additional byte field - type - that would need to be sent, as well. setting it to
-        // SSH_FILEXFER_TYPE_UNKNOWN might work. if not, we'd have to do an SSH_FXP_STAT before doing an SSH_FXP_SETSTAT.
-        if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, pack('Na*a*', strlen($filename), $filename, $attr))) {
+        $packet = $this->version >= 4 ?
+            pack('Na*a*Ca*', strlen($filename), $filename, substr($attr, 0, 4), NET_SFTP_TYPE_UNKNOWN, substr($attr, 4)) :
+            pack('Na*a*', strlen($filename), $filename, $attr);
+        if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, $packet)) {
             return false;
         }
 
@@ -1635,7 +1947,7 @@ function _setstat_recursive($path, $attr, &$i)
         $i = 0;
         $entries = $this->_list($path, true);
 
-        if ($entries === false) {
+        if ($entries === false || is_int($entries)) {
             return $this->_setstat($path, $attr, false);
         }
 
@@ -1657,7 +1969,10 @@ function _setstat_recursive($path, $attr, &$i)
                     return false;
                 }
             } else {
-                if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, pack('Na*a*', strlen($temp), $temp, $attr))) {
+                $packet = $this->version >= 4 ?
+                    pack('Na*Ca*', strlen($temp), $temp, NET_SFTP_TYPE_UNKNOWN, $attr) :
+                    pack('Na*a*', strlen($temp), $temp, $attr);
+                if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, $packet)) {
                     return false;
                 }
 
@@ -1672,7 +1987,10 @@ function _setstat_recursive($path, $attr, &$i)
             }
         }
 
-        if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, pack('Na*a*', strlen($path), $path, $attr))) {
+        $packet = $this->version >= 4 ?
+            pack('Na*Ca*', strlen($temp), $temp, NET_SFTP_TYPE_UNKNOWN, $attr) :
+            pack('Na*a*', strlen($temp), $temp, $attr);
+        if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, $packet)) {
             return false;
         }
 
@@ -1697,7 +2015,7 @@ function _setstat_recursive($path, $attr, &$i)
      */
     function readlink($link)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->_precheck()) {
             return false;
         }
 
@@ -1747,15 +2065,44 @@ function readlink($link)
      */
     function symlink($target, $link)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->_precheck()) {
             return false;
         }
 
         //$target = $this->_realpath($target);
         $link = $this->_realpath($link);
 
-        $packet = pack('Na*Na*', strlen($target), $target, strlen($link), $link);
-        if (!$this->_send_sftp_packet(NET_SFTP_SYMLINK, $packet)) {
+        /* quoting https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-09#section-12.1 :
+
+           Changed the SYMLINK packet to be LINK and give it the ability to
+           create hard links.  Also change it's packet number because many
+           implementation implemented SYMLINK with the arguments reversed.
+           Hopefully the new argument names make it clear which way is which.
+        */
+        if ($this->version == 6) {
+            $type = NET_SFTP_LINK;
+            $packet = pack('Na*Na*C', strlen($link), $link, strlen($target), $target, 1);
+        } else {
+            $type = NET_SFTP_SYMLINK;
+            /* quoting http://bxr.su/OpenBSD/usr.bin/ssh/PROTOCOL#347 :
+
+               3.1. sftp: Reversal of arguments to SSH_FXP_SYMLINK
+
+               When OpenSSH's sftp-server was implemented, the order of the arguments
+               to the SSH_FXP_SYMLINK method was inadvertently reversed. Unfortunately,
+               the reversal was not noticed until the server was widely deployed. Since
+               fixing this to follow the specification would cause incompatibility, the
+               current order was retained. For correct operation, clients should send
+               SSH_FXP_SYMLINK as follows:
+
+                   uint32      id
+                   string      targetpath
+                   string      linkpath */
+            $packet = substr($this->server_identifier, 0, 15) == 'SSH-2.0-OpenSSH' ?
+                pack('Na*Na*', strlen($target), $target, strlen($link), $link) :
+                pack('Na*Na*', strlen($link), $link, strlen($target), $target);
+        }
+        if (!$this->_send_sftp_packet($type, $packet)) {
             return false;
         }
 
@@ -1788,7 +2135,7 @@ function symlink($target, $link)
      */
     function mkdir($dir, $mode = -1, $recursive = false)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->_precheck()) {
             return false;
         }
 
@@ -1857,7 +2204,7 @@ function _mkdir_helper($dir, $mode)
      */
     function rmdir($dir)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->_precheck()) {
             return false;
         }
 
@@ -1906,7 +2253,8 @@ function rmdir($dir)
      * contain as many bytes as filename.ext does on your local filesystem.  If your filename.ext is 1MB then that is how
      * large $remote_file will be, as well.
      *
-     * Setting $mode to self::SOURCE_CALLBACK will use $data as callback function, which gets only one parameter -- number of bytes to return, and returns a string if there is some data or null if there is no more data
+     * Setting $mode to self::SOURCE_CALLBACK will use $data as callback function, which gets only one parameter -- number
+     * of bytes to return, and returns a string if there is some data or null if there is no more data
      *
      * If $data is a resource then it'll be used as a resource instead.
      *
@@ -1942,7 +2290,7 @@ function rmdir($dir)
      */
     function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $local_start = -1, $progressCallback = null)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->_precheck()) {
             return false;
         }
 
@@ -1953,23 +2301,34 @@ function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $loc
 
         $this->_remove_from_stat_cache($remote_file);
 
-        $flags = NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE;
-        // according to the SFTP specs, NET_SFTP_OPEN_APPEND should "force all writes to append data at the end of the file."
-        // in practice, it doesn't seem to do that.
-        //$flags|= ($mode & self::RESUME) ? NET_SFTP_OPEN_APPEND : NET_SFTP_OPEN_TRUNCATE;
+        if ($this->version >= 5) {
+            $flags = NET_SFTP_OPEN_OPEN_OR_CREATE;
+        } else {
+            $flags = NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE;
+            // according to the SFTP specs, NET_SFTP_OPEN_APPEND should "force all writes to append data at the end of the file."
+            // in practice, it doesn't seem to do that.
+            //$flags|= ($mode & SFTP::RESUME) ? NET_SFTP_OPEN_APPEND : NET_SFTP_OPEN_TRUNCATE;
+        }
 
         if ($start >= 0) {
             $offset = $start;
-        } elseif ($mode & self::RESUME) {
+        } elseif ($mode & (self::RESUME | self::RESUME_START)) {
             // if NET_SFTP_OPEN_APPEND worked as it should _size() wouldn't need to be called
             $size = $this->size($remote_file);
             $offset = $size !== false ? $size : 0;
         } else {
             $offset = 0;
-            $flags|= NET_SFTP_OPEN_TRUNCATE;
+            if ($this->version >= 5) {
+                $flags = NET_SFTP_OPEN_CREATE_TRUNCATE;
+            } else {
+                $flags|= NET_SFTP_OPEN_TRUNCATE;
+            }
         }
 
-        $packet = pack('Na*N2', strlen($remote_file), $remote_file, $flags, 0);
+        $packet = pack('Na*', strlen($remote_file), $remote_file);
+        $packet.= $this->version >= 5 ?
+            pack('N3', 0, $flags, 0) :
+            pack('N2', $flags, 0);
         if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
             return false;
         }
@@ -2000,7 +2359,7 @@ function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $loc
             case is_resource($data):
                 $mode = $mode & ~self::SOURCE_LOCAL_FILE;
                 $info = stream_get_meta_data($data);
-                if ($info['wrapper_type'] == 'PHP' && $info['stream_type'] == 'Input') {
+                if (isset($info['wrapper_type']) && $info['wrapper_type'] == 'PHP' && $info['stream_type'] == 'Input') {
                     $fp = fopen('php://memory', 'w+');
                     stream_copy_to_stream($data, $fp);
                     rewind($fp);
@@ -2026,7 +2385,11 @@ function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $loc
             if ($local_start >= 0) {
                 fseek($fp, $local_start);
                 $size-= $local_start;
+            } elseif ($mode & self::RESUME) {
+                fseek($fp, $offset);
+                $size-= $offset;
             }
+
         } elseif ($dataCallback) {
             $size = 0;
         } else {
@@ -2078,6 +2441,8 @@ function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $loc
             }
         }
 
+        $result = $this->_close_handle($handle);
+
         if (!$this->_read_put_responses($i)) {
             if ($mode & self::SOURCE_LOCAL_FILE) {
                 fclose($fp);
@@ -2086,18 +2451,33 @@ function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $loc
             return false;
         }
 
-        if ($mode & self::SOURCE_LOCAL_FILE) {
-            if ($this->preserveTime) {
-                $stat = fstat($fp);
-                $this->touch($remote_file, $stat['mtime'], $stat['atime']);
-            }
-
+        if ($mode & SFTP::SOURCE_LOCAL_FILE) {
             if (isset($fp) && is_resource($fp)) {
                 fclose($fp);
             }
+
+            if ($this->preserveTime) {
+                $stat = stat($data);
+                if ($this->version < 4) {
+                    $attr = pack('N3', NET_SFTP_ATTR_ACCESSTIME, $stat['atime'], $stat['mtime']);
+                } else {
+                    $attr = pack(
+                        'N5',
+                        NET_SFTP_ATTR_ACCESSTIME | NET_SFTP_ATTR_MODIFYTIME,
+                        $stat['atime'] / 4294967296,
+                        $stat['atime'],
+                        $stat['mtime'] / 4294967296,
+                        $stat['mtime']
+                    );
+                }
+
+                if (!$this->_setstat($remote_file, $attr, false)) {
+                    user_error('Error setting file time');
+                }
+            }
         }
 
-        return $this->_close_handle($handle);
+        return $result;
     }
 
     /**
@@ -2184,7 +2564,7 @@ function _close_handle($handle)
      */
     function get($remote_file, $local_file = false, $offset = 0, $length = -1, $progressCallback = null)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->_precheck()) {
             return false;
         }
 
@@ -2193,7 +2573,10 @@ function get($remote_file, $local_file = false, $offset = 0, $length = -1, $prog
             return false;
         }
 
-        $packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_READ, 0);
+        $packet = pack('Na*', strlen($remote_file), $remote_file);
+        $packet.= $this->version >= 5 ?
+            pack('N3', 0, NET_SFTP_OPEN_OPEN_EXISTING, 0) :
+            pack('N2', NET_SFTP_OPEN_READ, 0);
         if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
             return false;
         }
@@ -2293,7 +2676,14 @@ function get($remote_file, $local_file = false, $offset = 0, $length = -1, $prog
                         if ($fclose_check) {
                             fclose($fp);
                         }
-                        user_error('Expected SSH_FX_DATA or SSH_FXP_STATUS');
+                        // maybe the file was successfully transferred, maybe it wasn't
+                        if ($this->channel_close) {
+                            $this->partial_init = false;
+                            $this->_init_sftp_connection();
+                            return false;
+                        } else {
+                            user_error('Expected SSH_FX_DATA or SSH_FXP_STATUS');
+                        }
                 }
                 $response = null;
             }
@@ -2303,14 +2693,6 @@ function get($remote_file, $local_file = false, $offset = 0, $length = -1, $prog
             }
         }
 
-        if ($length > 0 && $length <= $offset - $start) {
-            if ($local_file === false) {
-                $content = substr($content, 0, $length);
-            } else {
-                ftruncate($fp, $length + $res_offset);
-            }
-        }
-
         if ($fclose_check) {
             fclose($fp);
 
@@ -2338,7 +2720,7 @@ function get($remote_file, $local_file = false, $offset = 0, $length = -1, $prog
      */
     function delete($path, $recursive = true)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->_precheck()) {
             return false;
         }
 
@@ -2406,12 +2788,17 @@ function _delete_recursive($path, &$i)
         $i = 0;
         $entries = $this->_list($path, true);
 
-        // normally $entries would have at least . and .. but it might not if the directories
-        // permissions didn't allow reading
-        if (empty($entries)) {
+        // The folder does not exist at all, so we cannot delete it.
+        if ($entries === NET_SFTP_STATUS_NO_SUCH_FILE) {
             return false;
         }
 
+        // Normally $entries would have at least . and .. but it might not if the directories
+        // permissions didn't allow reading. If this happens then default to an empty list of files.
+        if ($entries === false || is_int($entries)) {
+            $entries = array();
+        }
+
         unset($entries['.'], $entries['..']);
         foreach ($entries as $filename => $props) {
             if (!isset($props['type'])) {
@@ -2467,6 +2854,10 @@ function _delete_recursive($path, &$i)
     function file_exists($path)
     {
         if ($this->use_stat_cache) {
+            if (!$this->_precheck()) {
+                return false;
+            }
+
             $path = $this->_realpath($path);
 
             $result = $this->_query_stat_cache($path);
@@ -2537,6 +2928,10 @@ function is_link($path)
      */
     function is_readable($path)
     {
+        if (!$this->_precheck()) {
+            return false;
+        }
+
         $path = $this->_realpath($path);
 
         $packet = pack('Na*N2', strlen($path), $path, NET_SFTP_OPEN_READ, 0);
@@ -2565,6 +2960,10 @@ function is_readable($path)
      */
     function is_writable($path)
     {
+        if (!$this->_precheck()) {
+            return false;
+        }
+
         $path = $this->_realpath($path);
 
         $packet = pack('Na*N2', strlen($path), $path, NET_SFTP_OPEN_WRITE, 0);
@@ -2745,6 +3144,10 @@ function _get_lstat_cache_prop($path, $prop)
      */
     function _get_xstat_cache_prop($path, $prop, $type)
     {
+        if (!$this->_precheck()) {
+            return false;
+        }
+
         if ($this->use_stat_cache) {
             $path = $this->_realpath($path);
 
@@ -2765,7 +3168,9 @@ function _get_xstat_cache_prop($path, $prop, $type)
     }
 
     /**
-     * Renames a file or a directory on the SFTP server
+     * Renames a file or a directory on the SFTP server.
+     *
+     * If the file already exists this will return false
      *
      * @param string $oldname
      * @param string $newname
@@ -2774,7 +3179,7 @@ function _get_xstat_cache_prop($path, $prop, $type)
      */
     function rename($oldname, $newname)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        if (!$this->_precheck()) {
             return false;
         }
 
@@ -2786,6 +3191,18 @@ function rename($oldname, $newname)
 
         // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
         $packet = pack('Na*Na*', strlen($oldname), $oldname, strlen($newname), $newname);
+        if ($this->version >= 5) {
+            /* quoting https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-05#section-6.5 ,
+
+               'flags' is 0 or a combination of:
+
+                   SSH_FXP_RENAME_OVERWRITE  0x00000001
+                   SSH_FXP_RENAME_ATOMIC     0x00000002
+                   SSH_FXP_RENAME_NATIVE     0x00000004
+
+               (none of these are currently supported) */
+            $packet.= "\0\0\0\0";
+        }
         if (!$this->_send_sftp_packet(NET_SFTP_RENAME, $packet)) {
             return false;
         }
@@ -2815,6 +3232,31 @@ function rename($oldname, $newname)
         return true;
     }
 
+    /**
+     * Parse Time
+     *
+     * See '7.7.  Times' of draft-ietf-secsh-filexfer-13 for more info.
+     *
+     * @param string $key
+     * @param int $flags
+     * @param string $response
+     * @return array
+     * @access private
+     */
+    function _parseTime($key, $flags, &$response)
+    {
+        if (strlen($response) < 8) {
+            user_error('Malformed file attributes');
+            return array();
+        }
+        $attr = array();
+        $attr[$key] = hexdec(bin2hex($this->_string_shift($response, 8)));
+        if ($flags & NET_SFTP_ATTR_SUBSECOND_TIMES) {
+            $attr+= extract(unpack('N' . $key . '_nseconds', $this->_string_shift($response, 4)));
+        }
+        return $attr;
+    }
+
     /**
      * Parse Attributes
      *
@@ -2826,16 +3268,56 @@ function rename($oldname, $newname)
      */
     function _parseAttributes(&$response)
     {
+        if ($this->version >= 4) {
+            $length = 5;
+            $format = 'Nflags/Ctype';
+        } else {
+            $length = 4;
+            $format = 'Nflags';
+        }
+
         $attr = array();
-        if (strlen($response) < 4) {
+        if (strlen($response) < $length) {
             user_error('Malformed file attributes');
             return array();
         }
-        extract(unpack('Nflags', $this->_string_shift($response, 4)));
-        // SFTPv4+ have a type field (a byte) that follows the above flag field
+        extract(unpack($format, $this->_string_shift($response, $length)));
+        if (isset($type)) {
+            $attr['type'] = $type;
+        }
         foreach ($this->attributes as $key => $value) {
             switch ($flags & $key) {
-                case NET_SFTP_ATTR_SIZE: // 0x00000001
+                case NET_SFTP_ATTR_UIDGID:
+                    if ($this->version > 3) {
+                        continue 2;
+                    }
+                    break;
+                case NET_SFTP_ATTR_CREATETIME:
+                case NET_SFTP_ATTR_MODIFYTIME:
+                case NET_SFTP_ATTR_ACL:
+                case NET_SFTP_ATTR_OWNERGROUP:
+                case NET_SFTP_ATTR_SUBSECOND_TIMES:
+                    if ($this->version < 4) {
+                        continue 2;
+                    }
+                    break;
+                case NET_SFTP_ATTR_BITS:
+                    if ($this->version < 5) {
+                        continue 2;
+                    }
+                    break;
+                case NET_SFTP_ATTR_ALLOCATION_SIZE:
+                case NET_SFTP_ATTR_TEXT_HINT:
+                case NET_SFTP_ATTR_MIME_TYPE:
+                case NET_SFTP_ATTR_LINK_COUNT:
+                case NET_SFTP_ATTR_UNTRANSLATED_NAME:
+                case NET_SFTP_ATTR_CTIME:
+                    if ($this->version < 6) {
+                        continue 2;
+                    }
+            }
+            switch ($flags & $key) {
+                case NET_SFTP_ATTR_SIZE:             // 0x00000001
                     // The size attribute is defined as an unsigned 64-bit integer.
                     // The following will use floats on 32-bit platforms, if necessary.
                     // As can be seen in the BigInteger class, floats are generally
@@ -2844,14 +3326,14 @@ function _parseAttributes(&$response)
                     // of precision. Interpreted in filesize, 2^50 bytes = 1024 TiB.
                     $attr['size'] = hexdec(bin2hex($this->_string_shift($response, 8)));
                     break;
-                case NET_SFTP_ATTR_UIDGID: // 0x00000002 (SFTPv3 only)
+                case NET_SFTP_ATTR_UIDGID:           // 0x00000002 (SFTPv3 or earlier)
                     if (strlen($response) < 8) {
                         user_error('Malformed file attributes');
                         return $attr;
                     }
                     $attr+= unpack('Nuid/Ngid', $this->_string_shift($response, 8));
                     break;
-                case NET_SFTP_ATTR_PERMISSIONS: // 0x00000004
+                case NET_SFTP_ATTR_PERMISSIONS:      // 0x00000004
                     if (strlen($response) < 4) {
                         user_error('Malformed file attributes');
                         return $attr;
@@ -2865,14 +3347,134 @@ function _parseAttributes(&$response)
                         $attr+= array('type' => $fileType);
                     }
                     break;
-                case NET_SFTP_ATTR_ACCESSTIME: // 0x00000008
+                case NET_SFTP_ATTR_ACCESSTIME:       // 0x00000008
+                    if ($this->version >= 4) {
+                        $attr+= $this->_parseTime('atime', $flags, $response);
+                        break;
+                    }
                     if (strlen($response) < 8) {
                         user_error('Malformed file attributes');
                         return $attr;
                     }
                     $attr+= unpack('Natime/Nmtime', $this->_string_shift($response, 8));
                     break;
-                case NET_SFTP_ATTR_EXTENDED: // 0x80000000
+                case NET_SFTP_ATTR_CREATETIME:       // 0x00000010 (SFTPv4+)
+                    $attr+= $this->_parseTime('createtime', $flags, $response);
+                    break;
+                case NET_SFTP_ATTR_MODIFYTIME:       // 0x00000020
+                    $attr+= $this->_parseTime('mtime', $flags, $response);
+                    break;
+                case NET_SFTP_ATTR_ACL:              // 0x00000040
+                    // access control list
+                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-04#section-5.7
+                    // currently unsupported
+                    if (strlen($response) < 4) {
+                        user_error('Malformed file attributes');
+                        return $attr;
+                    }
+                    extract(unpack('Ncount', $this->_string_shift($response, 4)));
+                    for ($i = 0; $i < $count; $i++) {
+                        if (strlen($response) < 16) {
+                            user_error('Malformed file attributes');
+                            return $attr;
+                        }
+                        extract(unpack('Ntype/Nflag/Nmask/Nlength', $this->_string_shift($response, 16)));
+                        if (strlen($response) < $length) {
+                            user_error('Malformed file attributes');
+                            return $attr;
+                        }
+                        $this->_string_shift($response, $length); // who
+                    }
+                    break;
+                case NET_SFTP_ATTR_OWNERGROUP:       // 0x00000080
+                    if (strlen($response) < 4) {
+                        user_error('Malformed file attributes');
+                        return $attr;
+                    }
+                    extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                    if (strlen($response) < $length) {
+                        user_error('Malformed file attributes');
+                        return $attr;
+                    }
+                    $attr['owner'] = $this->_string_shift($response, $length);
+
+                    if (strlen($response) < 4) {
+                        user_error('Malformed file attributes');
+                        return $attr;
+                    }
+                    extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                    if (strlen($response) < $length) {
+                        user_error('Malformed file attributes');
+                        return $attr;
+                    }
+                    $attr['group'] = $this->_string_shift($response, $length);
+                    break;
+                case NET_SFTP_ATTR_SUBSECOND_TIMES:  // 0x00000100
+                    break;
+                case NET_SFTP_ATTR_BITS:             // 0x00000200 (SFTPv5+)
+                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-05#section-5.8
+                    // currently unsupported
+                    // tells if you file is:
+                    // readonly, system, hidden, case inensitive, archive, encrypted, compressed, sparse
+                    // append only, immutable, sync
+                    if (strlen($response) < 8) {
+                        user_error('Malformed file attributes');
+                        return $attr;
+                    }
+                    extract(unpack('Nattrib-bits/Nattrib-bits-valid', $this->_string_shift($response, 8)));
+                    break;
+                case NET_SFTP_ATTR_ALLOCATION_SIZE:  // 0x00000400 (SFTPv6+)
+                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.4
+                    // represents the number of bytes htat the file consumes on the disk. will
+                    // usually be larger than the 'size' field
+                    $attr['allocation-size'] = hexdec(bin2hex($this->_string_shift($response, 8)));
+                    break;
+                case NET_SFTP_ATTR_TEXT_HINT:        // 0x00000800
+                    // https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.10
+                    // currently unsupported
+                    // tells if file is "known text", "guessed text", "known binary", "guessed binary"
+                    extract(unpack('Ctext-hint', $this->_string_shift($response)));
+                    break;
+                case NET_SFTP_ATTR_MIME_TYPE:        // 0x00001000
+                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.11
+                    if (strlen($response) < 4) {
+                        user_error('Malformed file attributes');
+                        return $attr;
+                    }
+                    extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                    if (strlen($response) < $length) {
+                        user_error('Malformed file attributes');
+                        return $attr;
+                    }
+                    $attr['mime-type'] = $this->_string_shift($response, $length);
+                    break;
+                case NET_SFTP_ATTR_LINK_COUNT:       // 0x00002000
+                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.12
+                    if (strlen($response) < 4) {
+                        user_error('Malformed file attributes');
+                        return $attr;
+                    }
+                    $attr+= unpack('Nlink-count', $this->_string_shift($response, 4));
+                    break;
+                case NET_SFTP_ATTR_UNTRANSLATED_NAME:// 0x00004000
+                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.13
+                    if (strlen($response) < 4) {
+                        user_error('Malformed file attributes');
+                        return $attr;
+                    }
+                    extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                    if (strlen($response) < $length) {
+                        user_error('Malformed file attributes');
+                        return $attr;
+                    }
+                    $attr['untranslated-name'] = $this->_string_shift($response, $length);
+                    break;
+                case NET_SFTP_ATTR_CTIME:            // 0x00008000
+                    // 'ctime' contains the last time the file attributes were changed.  The
+                    // exact meaning of this field depends on the server.
+                    $attr+= $this->_parseTime('ctime', $flags, $response);
+                    break;
+                case NET_SFTP_ATTR_EXTENDED:         // 0x80000000
                     if (strlen($response) < 4) {
                         user_error('Malformed file attributes');
                         return $attr;
@@ -3038,6 +3640,7 @@ function _reset_connection($reason)
         $this->use_request_id = false;
         $this->pwd = false;
         $this->requestBuffer = array();
+        $this->partial_init = false;
     }
 
     /**
@@ -3055,6 +3658,8 @@ function _reset_connection($reason)
      */
     function _get_sftp_packet($request_id = null)
     {
+        $this->channel_close = false;
+
         if (isset($request_id) && isset($this->requestBuffer[$request_id])) {
             $this->packet_type = $this->requestBuffer[$request_id]['packet_type'];
             $temp = $this->requestBuffer[$request_id]['packet'];
@@ -3071,11 +3676,17 @@ function _get_sftp_packet($request_id = null)
         // SFTP packet length
         while (strlen($this->packet_buffer) < 4) {
             $temp = $this->_get_channel_packet(self::CHANNEL, true);
-            if (is_bool($temp)) {
+            if ($temp === true) {
+                if ($this->channel_status[self::CHANNEL] === NET_SSH2_MSG_CHANNEL_CLOSE) {
+                    $this->channel_close = true;
+                }
                 $this->packet_type = false;
                 $this->packet_buffer = '';
                 return false;
             }
+            if ($temp === false) {
+                return false;
+            }
             $this->packet_buffer.= $temp;
         }
         if (strlen($this->packet_buffer) < 4) {
@@ -3085,9 +3696,8 @@ function _get_sftp_packet($request_id = null)
         $tempLength = $length;
         $tempLength-= strlen($this->packet_buffer);
 
-
         // 256 * 1024 is what SFTP_MAX_MSG_LENGTH is set to in OpenSSH's sftp-common.h
-        if ($tempLength > 256 * 1024) {
+        if (!$this->allow_arbitrary_length_packets && !$this->use_request_id && $tempLength > 256 * 1024) {
             user_error('Invalid SFTP packet size');
             return false;
         }
@@ -3096,6 +3706,9 @@ function _get_sftp_packet($request_id = null)
         while ($tempLength > 0) {
             $temp = $this->_get_channel_packet(self::CHANNEL, true);
             if (is_bool($temp)) {
+                if ($temp && $this->channel_status[self::CHANNEL] === NET_SSH2_MSG_CHANNEL_CLOSE) {
+                    $this->channel_close = true;
+                }
                 $this->packet_type = false;
                 $this->packet_buffer = '';
                 return false;
@@ -3176,7 +3789,7 @@ function getSFTPLog()
     }
 
     /**
-     * Returns all errors
+     * Returns all errors on the SFTP layer
      *
      * @return array
      * @access public
@@ -3187,7 +3800,7 @@ function getSFTPErrors()
     }
 
     /**
-     * Returns the last error
+     * Returns the last error on the SFTP layer
      *
      * @return string
      * @access public
@@ -3205,13 +3818,51 @@ function getLastSFTPError()
      */
     function getSupportedVersions()
     {
-        $temp = array('version' => $this->version);
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+            return false;
+        }
+
+        if (!$this->partial_init) {
+            $this->_partial_init_sftp_connection();
+        }
+
+        $temp = array('version' => $this->defaultVersion);
         if (isset($this->extensions['versions'])) {
             $temp['extensions'] = $this->extensions['versions'];
         }
         return $temp;
     }
 
+    /**
+     * Get supported SFTP versions
+     *
+     * @return array
+     * @access public
+     */
+    function getNegotiatedVersion()
+    {
+        if (!$this->_precheck()) {
+            return false;
+        }
+
+        return $this->version;
+    }
+
+    /**
+     * Set preferred version
+     *
+     * If you're preferred version isn't supported then the highest supported
+     * version of SFTP will be utilized. Set to null or false or int(0) to
+     * unset the preferred version
+     *
+     * @param int $version
+     * @access public
+     */
+    function setPreferredVersion($version)
+    {
+        $this->preferredVersion = $version;
+    }
+
     /**
      * Disconnect
      *
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SSH1.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SSH1.php
index e372b8b92..fc8d2acd8 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SSH1.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SSH1.php
@@ -205,6 +205,10 @@ class SSH1
      * Dumps the content real-time to a file
      */
     const LOG_REALTIME_FILE = 4;
+    /**
+     * Make sure that the log never gets larger than this
+     */
+    const LOG_MAX_SIZE = 1048576; // 1024 * 1024
     /**#@-*/
 
     /**#@+
@@ -360,7 +364,7 @@ class SSH1
      * @var array
      * @access private
      */
-    var $protocol_flag_log = array();
+    var $protocol_flags_log = array();
 
     /**
      * Message Log
@@ -407,6 +411,18 @@ class SSH1
      */
     var $interactiveBuffer = '';
 
+    /**
+     * Current log size
+     *
+     * Should never exceed self::LOG_MAX_SIZE
+     *
+     * @see self::_send_binary_packet()
+     * @see self::_get_binary_packet()
+     * @var int
+     * @access private
+     */
+    var $log_size;
+
     /**
      * Timeout
      *
@@ -1418,7 +1434,7 @@ function getLog()
 
         switch (NET_SSH1_LOGGING) {
             case self::LOG_SIMPLE:
-                return $this->message_number_log;
+                return $this->protocol_flags_log;
                 break;
             case self::LOG_COMPLEX:
                 return $this->_format_log($this->message_log, $this->protocol_flags_log);
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php
index f8f8dcfde..607cc2145 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php
@@ -70,6 +70,25 @@
  */
 class SSH2
 {
+    /**#@+
+     * Compression Types
+     *
+     * @access private
+     */
+    /**
+     * No compression
+     */
+    const NET_SSH2_COMPRESSION_NONE = 1;
+    /**
+     * zlib compression
+     */
+    const NET_SSH2_COMPRESSION_ZLIB = 2;
+    /**
+     * zlib@openssh.com
+     */
+    const NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH = 3;
+    /**#@-*/
+
     /**#@+
      * Execution Bitmap Masks
      *
@@ -254,6 +273,18 @@ class SSH2
      */
     var $server_host_key_algorithms = false;
 
+    /**
+     * Supported Private Key Algorithms
+     *
+     * In theory this should be the same as the Server Host Key Algorithms but, in practice,
+     * some servers (eg. Azure) will support rsa-sha2-512 as a server host key algorithm but
+     * not a private key algorithm
+     *
+     * @see self::privatekey_login()
+     * @var array|false
+     */
+    var $supported_private_key_algorithms = false;
+
     /**
      * Encryption Algorithms: Client to Server
      *
@@ -371,6 +402,14 @@ class SSH2
      */
     var $decrypt = false;
 
+    /**
+     * Decryption Algorithm Name
+     *
+     * @var string|null
+     * @access private
+     */
+    var $decryptName;
+
     /**
      * Client to Server Encryption Object
      *
@@ -380,6 +419,14 @@ class SSH2
      */
     var $encrypt = false;
 
+    /**
+     * Encryption Algorithm Name
+     *
+     * @var string|null
+     * @access private
+     */
+    var $encryptName;
+
     /**
      * Client to Server HMAC Object
      *
@@ -389,6 +436,13 @@ class SSH2
      */
     var $hmac_create = false;
 
+    /**
+     * Client to Server HMAC Name
+     *
+     * @var string|false
+     */
+    private $hmac_create_name;
+
     /**
      * Server to Client HMAC Object
      *
@@ -398,6 +452,13 @@ class SSH2
      */
     var $hmac_check = false;
 
+    /**
+     * Server to Client HMAC Name
+     *
+     * @var string|false
+     */
+    var $hmac_check_name;
+
     /**
      * Size of server to client HMAC
      *
@@ -970,10 +1031,85 @@ class SSH2
      */
     var $auth = array();
 
+    /**
+     * The authentication methods that may productively continue authentication.
+     *
+     * @see https://tools.ietf.org/html/rfc4252#section-5.1
+     * @var array|null
+     * @access private
+     */
+    var $auth_methods_to_continue = null;
+
+    /**
+     * Compression method
+     *
+     * @var int
+     * @access private
+     */
+    var $compress = self::NET_SSH2_COMPRESSION_NONE;
+
+    /**
+     * Decompression method
+     *
+     * @var resource|object
+     * @access private
+     */
+    var $decompress = self::NET_SSH2_COMPRESSION_NONE;
+
+    /**
+     * Compression context
+     *
+     * @var int
+     * @access private
+     */
+    var $compress_context;
+
+    /**
+     * Decompression context
+     *
+     * @var resource|object
+     * @access private
+     */
+    var $decompress_context;
+
+    /**
+     * Regenerate Compression Context
+     *
+     * @var bool
+     * @access private
+     */
+    var $regenerate_compression_context = false;
+
+    /**
+     * Regenerate Decompression Context
+     *
+     * @var bool
+     * @access private
+     */
+    var $regenerate_decompression_context = false;
+
+    /**
+     * Smart multi-factor authentication flag
+     *
+     * @var bool
+     * @access private
+     */
+    var $smartMFA = true;
+
+    /**
+     * Extra packets counter
+     *
+     * @var bool
+     * @access private
+     */
+    var $extra_packets;
+
     /**
      * Default Constructor.
      *
      * $host can either be a string, representing the host, or a stream resource.
+     * If $host is a stream resource then $port doesn't do anything, altho $timeout
+     * still will be used
      *
      * @param mixed $host
      * @param int $port
@@ -991,6 +1127,7 @@ function __construct($host, $port = 22, $timeout = 10)
             4 => 'NET_SSH2_MSG_DEBUG',
             5 => 'NET_SSH2_MSG_SERVICE_REQUEST',
             6 => 'NET_SSH2_MSG_SERVICE_ACCEPT',
+            7 => 'NET_SSH2_MSG_EXT_INFO', // RFC 8308
             20 => 'NET_SSH2_MSG_KEXINIT',
             21 => 'NET_SSH2_MSG_NEWKEYS',
             30 => 'NET_SSH2_MSG_KEXDH_INIT',
@@ -1063,6 +1200,8 @@ function __construct($host, $port = 22, $timeout = 10)
                   31 => 'NET_SSH2_MSG_KEX_ECDH_REPLY')
         );
 
+        $this->timeout = $timeout;
+
         if (is_resource($host)) {
             $this->fsock = $host;
             return;
@@ -1071,7 +1210,6 @@ function __construct($host, $port = 22, $timeout = 10)
         if (is_string($host)) {
             $this->host = $host;
             $this->port = $port;
-            $this->timeout = $timeout;
         }
     }
 
@@ -1210,8 +1348,8 @@ function _connect()
                     $read = array($this->fsock);
                     $write = $except = null;
                     $start = microtime(true);
-                    $sec = floor($this->curTimeout);
-                    $usec = 1000000 * ($this->curTimeout - $sec);
+                    $sec = (int) floor($this->curTimeout);
+                    $usec = (int) (1000000 * ($this->curTimeout - $sec));
                     // on windows this returns a "Warning: Invalid CRT parameters detected" error
                     // the !count() is done as a workaround for <https://bugs.php.net/42682>
                     if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) {
@@ -1226,6 +1364,7 @@ function _connect()
                 if (strlen($temp) == 255) {
                     continue;
                 }
+
                 if ($temp === false) {
                     return false;
                 }
@@ -1347,6 +1486,7 @@ function _generate_identifier()
     function _key_exchange($kexinit_payload_server = false)
     {
         $preferred = $this->preferred;
+        $send_kex = true;
 
         $kex_algorithms = isset($preferred['kex']) ?
             $preferred['kex'] :
@@ -1373,6 +1513,8 @@ function _key_exchange($kexinit_payload_server = false)
             $preferred['client_to_server']['comp'] :
             $this->getSupportedCompressionAlgorithms();
 
+        $kex_algorithms = array_merge($kex_algorithms, array('ext-info-c', 'kex-strict-c-v00@openssh.com'));
+
         // some SSH servers have buggy implementations of some of the above algorithms
         switch (true) {
             case $this->server_identifier == 'SSH-2.0-SSHD':
@@ -1430,11 +1572,12 @@ function _key_exchange($kexinit_payload_server = false)
             0
         );
 
-        if ($this->send_kex_first) {
+        if ($kexinit_payload_server === false) {
             if (!$this->_send_binary_packet($kexinit_payload_client)) {
                 return false;
             }
 
+            $this->extra_packets = 0;
             $kexinit_payload_server = $this->_get_binary_packet();
             if ($kexinit_payload_server === false) {
                 $this->bitmap = 0;
@@ -1446,6 +1589,8 @@ function _key_exchange($kexinit_payload_server = false)
                 user_error('Expected SSH_MSG_KEXINIT');
                 return false;
             }
+
+            $send_kex = false;
         }
 
         $response = $kexinit_payload_server;
@@ -1457,6 +1602,12 @@ function _key_exchange($kexinit_payload_server = false)
         }
         $temp = unpack('Nlength', $this->_string_shift($response, 4));
         $this->kex_algorithms = explode(',', $this->_string_shift($response, $temp['length']));
+        if (in_array('kex-strict-s-v00@openssh.com', $this->kex_algorithms)) {
+            if ($this->session_id === false && $this->extra_packets) {
+                user_error('Possible Terrapin Attack detected');
+                return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
+            }
+        }
 
         if (strlen($response) < 4) {
             return false;
@@ -1464,6 +1615,8 @@ function _key_exchange($kexinit_payload_server = false)
         $temp = unpack('Nlength', $this->_string_shift($response, 4));
         $this->server_host_key_algorithms = explode(',', $this->_string_shift($response, $temp['length']));
 
+        $this->supported_private_key_algorithms = $this->server_host_key_algorithms;
+
         if (strlen($response) < 4) {
             return false;
         }
@@ -1518,7 +1671,7 @@ function _key_exchange($kexinit_payload_server = false)
         extract(unpack('Cfirst_kex_packet_follows', $this->_string_shift($response, 1)));
         $first_kex_packet_follows = $first_kex_packet_follows != 0;
 
-        if (!$this->send_kex_first && !$this->_send_binary_packet($kexinit_payload_client)) {
+        if ($send_kex && !$this->_send_binary_packet($kexinit_payload_client)) {
             return false;
         }
 
@@ -1558,19 +1711,25 @@ function _key_exchange($kexinit_payload_server = false)
             return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
         }
 
+        $compression_map = array(
+            'none' => self::NET_SSH2_COMPRESSION_NONE,
+            'zlib' => self::NET_SSH2_COMPRESSION_ZLIB,
+            'zlib@openssh.com' => self::NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH
+        );
+
         $compression_algorithm_out = $this->_array_intersect_first($c2s_compression_algorithms, $this->compression_algorithms_client_to_server);
         if ($compression_algorithm_out === false) {
             user_error('No compatible client to server compression algorithms found');
             return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
         }
-        //$this->decompress = $compression_algorithm_out == 'zlib';
+        $this->compress = $compression_map[$compression_algorithm_out];
 
-        $compression_algorithm_in = $this->_array_intersect_first($s2c_compression_algorithms, $this->compression_algorithms_client_to_server);
+        $compression_algorithm_in = $this->_array_intersect_first($s2c_compression_algorithms, $this->compression_algorithms_server_to_client);
         if ($compression_algorithm_in === false) {
             user_error('No compatible server to client compression algorithms found');
             return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
         }
-        //$this->compress = $compression_algorithm_in == 'zlib';
+        $this->decompress = $compression_map[$compression_algorithm_in];
 
         // Only relevant in diffie-hellman-group-exchange-sha{1,256}, otherwise empty.
         $exchange_hash_rfc4419 = '';
@@ -1855,6 +2014,10 @@ function _key_exchange($kexinit_payload_server = false)
             return false;
         }
 
+        if (in_array('kex-strict-s-v00@openssh.com', $this->kex_algorithms)) {
+            $this->get_seq_no = $this->send_seq_no = 0;
+        }
+
         $keyBytes = pack('Na*', strlen($keyBytes), $keyBytes);
 
         $this->encrypt = $this->_encryption_algorithm_to_crypt_instance($encrypt);
@@ -1884,7 +2047,7 @@ function _key_exchange($kexinit_payload_server = false)
             }
             $this->encrypt->setKey(substr($key, 0, $encryptKeyLength));
 
-            $this->encrypt->name = $decrypt;
+            $this->encryptName = $encrypt;
         }
 
         $this->decrypt = $this->_encryption_algorithm_to_crypt_instance($decrypt);
@@ -1914,7 +2077,7 @@ function _key_exchange($kexinit_payload_server = false)
             }
             $this->decrypt->setKey(substr($key, 0, $decryptKeyLength));
 
-            $this->decrypt->name = $decrypt;
+            $this->decryptName = $decrypt;
         }
 
         /* The "arcfour128" algorithm is the RC4 cipher, as described in
@@ -1959,7 +2122,7 @@ function _key_exchange($kexinit_payload_server = false)
                 $this->hmac_create = new Hash('md5-96');
                 $createKeyLength = 16;
         }
-        $this->hmac_create->name = $mac_algorithm_out;
+        $this->hmac_create_name = $mac_algorithm_out;
 
         $checkKeyLength = 0;
         $this->hmac_size = 0;
@@ -1989,7 +2152,7 @@ function _key_exchange($kexinit_payload_server = false)
                 $checkKeyLength = 16;
                 $this->hmac_size = 12;
         }
-        $this->hmac_check->name = $mac_algorithm_in;
+        $this->hmac_check_name = $mac_algorithm_in;
 
         $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'E' . $this->session_id);
         while ($createKeyLength > strlen($key)) {
@@ -2003,6 +2166,8 @@ function _key_exchange($kexinit_payload_server = false)
         }
         $this->hmac_check->setKey(substr($key, 0, $checkKeyLength));
 
+        $this->regenerate_compression_context = $this->regenerate_decompression_context = true;
+
         return true;
     }
 
@@ -2127,11 +2292,13 @@ function _bad_algorithm_candidate($algorithm)
     function login($username)
     {
         $args = func_get_args();
-        $this->auth[] = $args;
+        if (!$this->retry_connect) {
+            $this->auth[] = $args;
+        }
 
         // try logging with 'none' as an authentication method first since that's what
         // PuTTY does
-        if (substr($this->server_identifier, 0, 13) != 'SSH-2.0-CoreFTP') {
+        if (substr($this->server_identifier, 0, 15) != 'SSH-2.0-CoreFTP' && $this->auth_methods_to_continue === null) {
             if ($this->_login($username)) {
                 return true;
             }
@@ -2163,9 +2330,61 @@ function _login($username)
             return $this->_login_helper($username);
         }
 
-        foreach ($args as $arg) {
-            if ($this->_login_helper($username, $arg)) {
-                return true;
+        while (count($args)) {
+            if (!$this->auth_methods_to_continue || !$this->smartMFA) {
+                $newargs = $args;
+                $args = array();
+            } else {
+                $newargs = array();
+                foreach ($this->auth_methods_to_continue as $method) {
+                    switch ($method) {
+                        case 'publickey':
+                            foreach ($args as $key => $arg) {
+                                if (is_object($arg)) {
+                                    $newargs[] = $arg;
+                                    unset($args[$key]);
+                                    break;
+                                }
+                            }
+                            break;
+                        case 'keyboard-interactive':
+                            $hasArray = $hasString = false;
+                            foreach ($args as $arg) {
+                                if ($hasArray || is_array($arg)) {
+                                    $hasArray = true;
+                                    break;
+                                }
+                                if ($hasString || is_string($arg)) {
+                                    $hasString = true;
+                                    break;
+                                }
+                            }
+                            if ($hasArray && $hasString) {
+                                foreach ($args as $key => $arg) {
+                                    if (is_array($arg)) {
+                                        $newargs[] = $arg;
+                                        break 2;
+                                    }
+                                }
+                            }
+                        case 'password':
+                            foreach ($args as $key => $arg) {
+                                $newargs[] = $arg;
+                                unset($args[$key]);
+                                break;
+                            }
+                    }
+                }
+            }
+
+            if (!count($newargs)) {
+                return false;
+            }
+
+            foreach ($newargs as $arg) {
+                if ($this->_login_helper($username, $arg)) {
+                    return true;
+                }
             }
         }
         return false;
@@ -2218,6 +2437,35 @@ function _login_helper($username, $password = null)
             }
             extract(unpack('Ctype', $this->_string_shift($response, 1)));
 
+            if ($type == NET_SSH2_MSG_EXT_INFO) {
+                if (strlen($response) < 4) {
+                    return false;
+                }
+                $nr_extensions = unpack('Nlength', $this->_string_shift($response, 4));
+                for ($i = 0; $i < $nr_extensions['length']; $i++) {
+                    if (strlen($response) < 4) {
+                        return false;
+                    }
+                    $temp = unpack('Nlength', $this->_string_shift($response, 4));
+                    $extension_name = $this->_string_shift($response, $temp['length']);
+                    if ($extension_name == 'server-sig-algs') {
+                        if (strlen($response) < 4) {
+                            return false;
+                        }
+                        $temp = unpack('Nlength', $this->_string_shift($response, 4));
+                        $this->supported_private_key_algorithms = explode(',', $this->_string_shift($response, $temp['length']));
+                    }
+                }
+
+                $response = $this->_get_binary_packet();
+                if ($response === false) {
+                    $this->bitmap = 0;
+                    user_error('Connection closed by server');
+                    return false;
+                }
+                extract(unpack('Ctype', $this->_string_shift($response, 1)));
+            }
+
             if ($type != NET_SSH2_MSG_SERVICE_ACCEPT) {
                 user_error('Expected SSH_MSG_SERVICE_ACCEPT');
                 return false;
@@ -2275,7 +2523,9 @@ function _login_helper($username, $password = null)
                 case NET_SSH2_MSG_USERAUTH_SUCCESS:
                     $this->bitmap |= self::MASK_LOGIN;
                     return true;
-                //case NET_SSH2_MSG_USERAUTH_FAILURE:
+                case NET_SSH2_MSG_USERAUTH_FAILURE:
+                    extract(unpack('Nmethodlistlen', $this->_string_shift($response, 4)));
+                    $this->auth_methods_to_continue = explode(',', $this->_string_shift($response, $methodlistlen));
                 default:
                     return false;
             }
@@ -2347,6 +2597,7 @@ function _login_helper($username, $password = null)
                 }
                 extract(unpack('Nlength', $this->_string_shift($response, 4)));
                 $auth_methods = explode(',', $this->_string_shift($response, $length));
+                $this->auth_methods_to_continue = $auth_methods;
                 if (!strlen($response)) {
                     return false;
                 }
@@ -2519,6 +2770,8 @@ function _keyboard_interactive_process()
             case NET_SSH2_MSG_USERAUTH_SUCCESS:
                 return true;
             case NET_SSH2_MSG_USERAUTH_FAILURE:
+                extract(unpack('Nmethodlistlen', $this->_string_shift($response, 4)));
+                $this->auth_methods_to_continue = explode(',', $this->_string_shift($response, $methodlistlen));
                 return false;
         }
 
@@ -2578,7 +2831,13 @@ function _privatekey_login($username, $privatekey)
             $publickey['n']
         );
 
-        switch ($this->signature_format) {
+        $algos = array('rsa-sha2-256', 'rsa-sha2-512', 'ssh-rsa');
+        if (isset($this->preferred['hostkey'])) {
+            $algos = array_intersect($algos, $this->preferred['hostkey']);
+        }
+        $algo = $this->_array_intersect_first($algos, $this->supported_private_key_algorithms);
+
+        switch ($algo) {
             case 'rsa-sha2-512':
                 $hash = 'sha512';
                 $signatureType = 'rsa-sha2-512';
@@ -2627,8 +2886,14 @@ function _privatekey_login($username, $privatekey)
                 if (strlen($response) < 4) {
                     return false;
                 }
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $this->errors[] = 'SSH_MSG_USERAUTH_FAILURE: ' . $this->_string_shift($response, $length);
+                extract(unpack('Nmethodlistlen', $this->_string_shift($response, 4)));
+                $auth_methods = explode(',', $this->_string_shift($response, $methodlistlen));
+                if (in_array('publickey', $auth_methods) && substr($signatureType, 0, 9) == 'rsa-sha2-') {
+                    $this->supported_private_key_algorithms = array_diff($this->supported_private_key_algorithms, array('rsa-sha2-256', 'rsa-sha2-512'));
+                    return $this->_privatekey_login($username, $privatekey);
+                }
+                $this->auth_methods_to_continue = $auth_methods;
+                $this->errors[] = 'SSH_MSG_USERAUTH_FAILURE';
                 return false;
             case NET_SSH2_MSG_USERAUTH_PK_OK:
                 // we'll just take it on faith that the public key blob and the public key algorithm name are as
@@ -2669,6 +2934,8 @@ function _privatekey_login($username, $privatekey)
         switch ($type) {
             case NET_SSH2_MSG_USERAUTH_FAILURE:
                 // either the login is bad or the server employs multi-factor authentication
+                extract(unpack('Nmethodlistlen', $this->_string_shift($response, 4)));
+                $this->auth_methods_to_continue = explode(',', $this->_string_shift($response, $methodlistlen));
                 return false;
             case NET_SSH2_MSG_USERAUTH_SUCCESS:
                 $this->bitmap |= self::MASK_LOGIN;
@@ -2679,6 +2946,16 @@ function _privatekey_login($username, $privatekey)
         return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
     }
 
+    /**
+     * Return the currently configured timeout
+     *
+     * @return int
+     */
+    function getTimeout()
+    {
+        return $this->timeout;
+    }
+
     /**
      * Set Timeout
      *
@@ -2795,26 +3072,12 @@ function exec($command, $callback = null)
                 return false;
             }
 
-            $response = $this->_get_binary_packet();
-            if ($response === false) {
-                $this->bitmap = 0;
-                user_error('Connection closed by server');
-                return false;
-            }
-
-            if (!strlen($response)) {
-                return false;
+            $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_REQUEST;
+            if (!$this->_get_channel_packet(self::CHANNEL_EXEC)) {
+                user_error('Unable to request pseudo-terminal');
+                return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
             }
-            list(, $type) = unpack('C', $this->_string_shift($response, 1));
 
-            switch ($type) {
-                case NET_SSH2_MSG_CHANNEL_SUCCESS:
-                    break;
-                case NET_SSH2_MSG_CHANNEL_FAILURE:
-                default:
-                    user_error('Unable to request pseudo-terminal');
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-            }
             $this->in_request_pty_exec = true;
         }
 
@@ -2935,6 +3198,13 @@ function _initShell()
             return false;
         }
 
+        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_REQUEST;
+
+        if (!$this->_get_channel_packet(self::CHANNEL_SHELL)) {
+            user_error('Unable to request pseudo-terminal');
+            return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
+        }
+
         $packet = pack(
             'CNNa*C',
             NET_SSH2_MSG_CHANNEL_REQUEST,
@@ -2947,7 +3217,12 @@ function _initShell()
             return false;
         }
 
-        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_IGNORE;
+        $response = $this->_get_channel_packet(self::CHANNEL_SHELL);
+        if ($response === false) {
+            return false;
+        }
+
+        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_DATA;
 
         $this->bitmap |= self::MASK_SHELL;
 
@@ -3209,7 +3484,7 @@ function __destruct()
      */
     function isConnected()
     {
-        return (bool) ($this->bitmap & self::MASK_CONNECTED);
+        return ($this->bitmap & self::MASK_CONNECTED) && is_resource($this->fsock) && !feof($this->fsock);
     }
 
     /**
@@ -3319,7 +3594,7 @@ function _get_binary_packet($skip_channel_filter = false)
             $read = array($this->fsock);
             $write = $except = null;
 
-            if ($this->curTimeout <= 0) {
+            if (!$this->curTimeout) {
                 if ($this->keepAlive <= 0) {
                     @stream_select($read, $write, $except, null);
                 } else {
@@ -3350,8 +3625,8 @@ function _get_binary_packet($skip_channel_filter = false)
                     $this->curTimeout-= $elapsed;
                 }
 
-                $sec = floor($this->curTimeout);
-                $usec = 1000000 * ($this->curTimeout - $sec);
+                $sec = (int)floor($this->curTimeout);
+                $usec = (int)(1000000 * ($this->curTimeout - $sec));
 
                 // on windows this returns a "Warning: Invalid CRT parameters detected" error
                 if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) {
@@ -3365,15 +3640,23 @@ function _get_binary_packet($skip_channel_filter = false)
 
         if (!is_resource($this->fsock) || feof($this->fsock)) {
             $this->bitmap = 0;
-            user_error('Connection closed prematurely');
+            $str = 'Connection closed (by server) prematurely';
+            if (isset($elapsed)) {
+                $str.= ' ' . $elapsed . 's';
+            }
+            user_error($str);
             return false;
         }
 
         $start = microtime(true);
+        $sec = (int) floor($this->curTimeout);
+        $usec = (int) (1000000 * ($this->curTimeout - $sec));
+        stream_set_timeout($this->fsock, $sec, $usec);
         $raw = stream_get_contents($this->fsock, $this->decrypt_block_size);
 
         if (!strlen($raw)) {
-            return '';
+            user_error('No data received from server');
+            return false;
         }
 
         if ($this->decrypt !== false) {
@@ -3395,7 +3678,7 @@ function _get_binary_packet($skip_channel_filter = false)
         // "implementations SHOULD check that the packet length is reasonable"
         // PuTTY uses 0x9000 as the actual max packet size and so to shall we
         if ($remaining_length < -$this->decrypt_block_size || $remaining_length > 0x9000 || $remaining_length % $this->decrypt_block_size != 0) {
-            if (!$this->bad_key_size_fix && $this->_bad_algorithm_candidate($this->decrypt->name) && !($this->bitmap & SSH2::MASK_LOGIN)) {
+            if (!$this->bad_key_size_fix && $this->_bad_algorithm_candidate($this->decryptName) && !($this->bitmap & SSH2::MASK_LOGIN)) {
                 $this->bad_key_size_fix = true;
                 $this->_reset_connection(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
                 return false;
@@ -3436,9 +3719,41 @@ function _get_binary_packet($skip_channel_filter = false)
             }
         }
 
-        //if ($this->decompress) {
-        //    $payload = gzinflate(substr($payload, 2));
-        //}
+        switch ($this->decompress) {
+            case self::NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH:
+                if (!$this->isAuthenticated()) {
+                    break;
+                }
+            case self::NET_SSH2_COMPRESSION_ZLIB:
+                if ($this->regenerate_decompression_context) {
+                    $this->regenerate_decompression_context = false;
+
+                    $cmf = ord($payload[0]);
+                    $cm = $cmf & 0x0F;
+                    if ($cm != 8) { // deflate
+                        user_error("Only CM = 8 ('deflate') is supported ($cm)");
+                    }
+                    $cinfo = ($cmf & 0xF0) >> 4;
+                    if ($cinfo > 7) {
+                        user_error("CINFO above 7 is not allowed ($cinfo)");
+                    }
+                    $windowSize = 1 << ($cinfo + 8);
+
+                    $flg = ord($payload[1]);
+                    //$fcheck = $flg && 0x0F;
+                    if ((($cmf << 8) | $flg) % 31) {
+                        user_error('fcheck failed');
+                    }
+                    $fdict = boolval($flg & 0x20);
+                    $flevel = ($flg & 0xC0) >> 6;
+
+                    $this->decompress_context = inflate_init(ZLIB_ENCODING_RAW, array('window' => $cinfo + 8));
+                    $payload = substr($payload, 2);
+                }
+                if ($this->decompress_context) {
+                    $payload = inflate_add($this->decompress_context, $payload, ZLIB_PARTIAL_FLUSH);
+                }
+        }
 
         $this->get_seq_no++;
 
@@ -3476,9 +3791,11 @@ function _filter($payload, $skip_channel_filter)
                 $this->bitmap = 0;
                 return false;
             case NET_SSH2_MSG_IGNORE:
+                $this->extra_packets++;
                 $payload = $this->_get_binary_packet($skip_channel_filter);
                 break;
             case NET_SSH2_MSG_DEBUG:
+                $this->extra_packets++;
                 $this->_string_shift($payload, 2);
                 if (strlen($payload) < 4) {
                     return false;
@@ -3490,6 +3807,7 @@ function _filter($payload, $skip_channel_filter)
             case NET_SSH2_MSG_UNIMPLEMENTED:
                 return false;
             case NET_SSH2_MSG_KEXINIT:
+                // this is here for key re-exchanges after the initial key exchange
                 if ($this->session_id !== false) {
                     $this->send_kex_first = false;
                     if (!$this->_key_exchange($payload)) {
@@ -3513,6 +3831,10 @@ function _filter($payload, $skip_channel_filter)
 
         // only called when we've already logged in
         if (($this->bitmap & self::MASK_CONNECTED) && $this->isAuthenticated()) {
+            if (is_bool($payload)) {
+                return $payload;
+            }
+
             switch (ord($payload[0])) {
                 case NET_SSH2_MSG_CHANNEL_REQUEST:
                     if (strlen($payload) == 31) {
@@ -3714,7 +4036,20 @@ function isPTYEnabled()
     function _get_channel_packet($client_channel, $skip_extended = false)
     {
         if (!empty($this->channel_buffers[$client_channel])) {
-            return array_shift($this->channel_buffers[$client_channel]);
+            switch ($this->channel_status[$client_channel]) {
+                case NET_SSH2_MSG_CHANNEL_REQUEST:
+                    foreach ($this->channel_buffers[$client_channel] as $i => $packet) {
+                        switch (ord($packet[0])) {
+                            case NET_SSH2_MSG_CHANNEL_SUCCESS:
+                            case NET_SSH2_MSG_CHANNEL_FAILURE:
+                                unset($this->channel_buffers[$client_channel][$i]);
+                                return substr($packet, 1);
+                        }
+                    }
+                    break;
+                default:
+                    return substr(array_shift($this->channel_buffers[$client_channel]), 1);
+            }
         }
 
         while (true) {
@@ -3788,10 +4123,7 @@ function _get_channel_packet($client_channel, $skip_extended = false)
                         if ($client_channel == $channel && $this->channel_status[$channel] == NET_SSH2_MSG_CHANNEL_DATA) {
                             return $data;
                         }
-                        if (!isset($this->channel_buffers[$channel])) {
-                            $this->channel_buffers[$channel] = array();
-                        }
-                        $this->channel_buffers[$channel][] = $data;
+                        $this->channel_buffers[$channel][] = chr($type) . $data;
 
                         continue 2;
                     case NET_SSH2_MSG_CHANNEL_REQUEST:
@@ -3870,20 +4202,15 @@ function _get_channel_packet($client_channel, $skip_extended = false)
                                 $result = $client_channel == $channel ? true : $this->_get_channel_packet($client_channel, $skip_extended);
                                 $this->_on_channel_open();
                                 return $result;
-                            //case NET_SSH2_MSG_CHANNEL_OPEN_FAILURE:
-                            default:
+                            case NET_SSH2_MSG_CHANNEL_OPEN_FAILURE:
                                 user_error('Unable to open channel');
                                 return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                        }
-                        break;
-                    case NET_SSH2_MSG_IGNORE:
-                        switch ($type) {
-                            case NET_SSH2_MSG_CHANNEL_SUCCESS:
-                                //$this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_DATA;
-                                continue 3;
-                            case NET_SSH2_MSG_CHANNEL_FAILURE:
-                                user_error('Error opening channel');
-                                return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
+                            default:
+                                if ($client_channel == $channel) {
+                                    user_error('Unexpected response to open request');
+                                    return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
+                                }
+                                return $this->_get_channel_packet($client_channel, $skip_extended);
                         }
                         break;
                     case NET_SSH2_MSG_CHANNEL_REQUEST:
@@ -3892,6 +4219,14 @@ function _get_channel_packet($client_channel, $skip_extended = false)
                                 return true;
                             case NET_SSH2_MSG_CHANNEL_FAILURE:
                                 return false;
+                            case NET_SSH2_MSG_CHANNEL_DATA:
+                                if (strlen($response) < 4) {
+                                    return false;
+                                }
+                                extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                                $data = $this->_string_shift($response, $length);
+                                $this->channel_buffers[$channel][] = chr($type) . $data;
+                                return $this->_get_channel_packet($client_channel, $skip_extended);
                             default:
                                 user_error('Unable to fulfill channel request');
                                 return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
@@ -3905,10 +4240,6 @@ function _get_channel_packet($client_channel, $skip_extended = false)
 
             switch ($type) {
                 case NET_SSH2_MSG_CHANNEL_DATA:
-                    //if ($this->channel_status[$channel] == NET_SSH2_MSG_IGNORE) {
-                    //    $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_DATA;
-                    //}
-
                     /*
                     if ($channel == self::CHANNEL_EXEC) {
                         // SCP requires null packets, such as this, be sent.  further, in the case of the ssh.com SSH server
@@ -3935,10 +4266,7 @@ function _get_channel_packet($client_channel, $skip_extended = false)
                     if ($client_channel == $channel) {
                         return $data;
                     }
-                    if (!isset($this->channel_buffers[$channel])) {
-                        $this->channel_buffers[$channel] = array();
-                    }
-                    $this->channel_buffers[$channel][] = $data;
+                    $this->channel_buffers[$channel][] = chr($type) . $data;
                     break;
                 case NET_SSH2_MSG_CHANNEL_CLOSE:
                     $this->curTimeout = 5;
@@ -3957,7 +4285,7 @@ function _get_channel_packet($client_channel, $skip_extended = false)
                 case NET_SSH2_MSG_CHANNEL_EOF:
                     break;
                 default:
-                    user_error('Error reading channel data');
+                    user_error("Error reading channel data ($type)");
                     return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
             }
         }
@@ -3982,11 +4310,27 @@ function _send_binary_packet($data, $logged = null)
             return false;
         }
 
-        //if ($this->compress) {
-        //    // the -4 removes the checksum:
-        //    // http://php.net/function.gzcompress#57710
-        //    $data = substr(gzcompress($data), 0, -4);
-        //}
+        if (!isset($logged)) {
+            $logged = $data;
+        }
+
+        switch ($this->compress) {
+            case self::NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH:
+                if (!$this->isAuthenticated()) {
+                    break;
+                }
+            case self::NET_SSH2_COMPRESSION_ZLIB:
+                if (!$this->regenerate_compression_context) {
+                    $header = '';
+                } else {
+                    $this->regenerate_compression_context = false;
+                    $this->compress_context = deflate_init(ZLIB_ENCODING_RAW, array('window' => 15));
+                    $header = "\x78\x9C";
+                }
+                if ($this->compress_context) {
+                    $data = $header . deflate_add($this->compress_context, $data, ZLIB_PARTIAL_FLUSH);
+                }
+        }
 
         // 4 (packet length) + 1 (padding length) + 4 (minimal padding amount) == 9
         $packet_length = strlen($data) + 9;
@@ -4014,10 +4358,10 @@ function _send_binary_packet($data, $logged = null)
 
         if (defined('NET_SSH2_LOGGING')) {
             $current = microtime(true);
-            $message_number = isset($this->message_numbers[ord($data[0])]) ? $this->message_numbers[ord($data[0])] : 'UNKNOWN (' . ord($data[0]) . ')';
+            $message_number = isset($this->message_numbers[ord($logged[0])]) ? $this->message_numbers[ord($logged[0])] : 'UNKNOWN (' . ord($logged[0]) . ')';
             $message_number = '-> ' . $message_number .
                               ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
-            $this->_append_log($message_number, isset($logged) ? $logged : $data);
+            $this->_append_log($message_number, $logged);
             $this->last_packet = $current;
         }
 
@@ -4360,7 +4704,9 @@ function _array_intersect_first($array1, $array2)
     }
 
     /**
-     * Returns all errors
+     * Returns all errors / debug messages on the SSH layer
+     *
+     * If you are looking for messages from the SFTP layer, please see SFTP::getSFTPErrors()
      *
      * @return string[]
      * @access public
@@ -4371,7 +4717,9 @@ function getErrors()
     }
 
     /**
-     * Returns the last error
+     * Returns the last error received on the SSH layer
+     *
+     * If you are looking for messages from the SFTP layer, please see SFTP::getLastSFTPError()
      *
      * @return string
      * @access public
@@ -4712,10 +5060,12 @@ function getSupportedMACAlgorithms()
      */
     function getSupportedCompressionAlgorithms()
     {
-        return array(
-            'none'   // REQUIRED        no compression
-            //'zlib' // OPTIONAL        ZLIB (LZ77) compression
-        );
+        $algos = array('none'); // REQUIRED        no compression
+        if (function_exists('deflate_init')) {
+            $algos[] = 'zlib@openssh.com'; // https://datatracker.ietf.org/doc/html/draft-miller-secsh-compression-delayed
+            $algos[] = 'zlib';
+        }
+        return $algos;
     }
 
     /**
@@ -4730,18 +5080,24 @@ function getAlgorithmsNegotiated()
     {
         $this->_connect();
 
+        $compression_map = array(
+            self::NET_SSH2_COMPRESSION_NONE => 'none',
+            self::NET_SSH2_COMPRESSION_ZLIB => 'zlib',
+            self::NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH => 'zlib@openssh.com'
+        );
+
         return array(
             'kex' => $this->kex_algorithm,
             'hostkey' => $this->signature_format,
             'client_to_server' => array(
-                'crypt' => $this->encrypt->name,
-                'mac' => $this->hmac_create->name,
-                'comp' => 'none',
+                'crypt' => $this->encryptName,
+                'mac' => $this->hmac_create_name,
+                'comp' => $compression_map[$this->compress],
             ),
             'server_to_client' => array(
-                'crypt' => $this->decrypt->name,
-                'mac' => $this->hmac_check->name,
-                'comp' => 'none',
+                'crypt' => $this->decryptName,
+                'mac' => $this->hmac_check_name,
+                'comp' => $compression_map[$this->decompress],
             )
         );
     }
@@ -5143,4 +5499,31 @@ function _updateLogHistory($old, $new)
             );
         }
     }
+
+    /**
+     * Return the list of authentication methods that may productively continue authentication.
+     *
+     * @see https://tools.ietf.org/html/rfc4252#section-5.1
+     * @return array|null
+     */
+    function getAuthMethodsToContinue()
+    {
+        return $this->auth_methods_to_continue;
+    }
+
+    /**
+     * Enables "smart" multi-factor authentication (MFA)
+     */
+    function enableSmartMFA()
+    {
+        $this->smartMFA = true;
+    }
+
+    /**
+     * Disables "smart" multi-factor authentication (MFA)
+     */
+    function disableSmartMFA()
+    {
+        $this->smartMFA = false;
+    }
 }
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php
index 2b25250bd..ec1d9773e 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php
@@ -133,9 +133,20 @@ function __construct($address = null)
             }
         }
 
-        $this->fsock = fsockopen('unix://' . $address, 0, $errno, $errstr);
-        if (!$this->fsock) {
-            user_error("Unable to connect to ssh-agent (Error $errno: $errstr)");
+        if (in_array('unix', stream_get_transports())) {
+            $this->fsock = fsockopen('unix://' . $address, 0, $errno, $errstr);
+            if (!$this->fsock) {
+                user_error("Unable to connect to ssh-agent (Error $errno: $errstr)");
+            }
+        } else {
+            if (substr($address, 0, 9) != '\\\\.\\pipe\\' || strpos(substr($address, 9), '\\') !== false) {
+                user_error('Address is not formatted as a named pipe should be');
+            } else {
+                $this->fsock = fopen($address, 'r+b');
+                if (!$this->fsock) {
+                    user_error('Unable to open address');
+                }
+            }
         }
     }
 
@@ -234,11 +245,10 @@ function requestIdentities()
      * Signal that agent forwarding should
      * be requested when a channel is opened
      *
-     * @param Net_SSH2 $ssh
      * @return bool
      * @access public
      */
-    function startSSHForwarding($ssh)
+    function startSSHForwarding()
     {
         if ($this->forward_status == self::FORWARD_NONE) {
             $this->forward_status = self::FORWARD_REQUEST;
diff --git a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/bootstrap.php b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/bootstrap.php
index 0da0999fd..547688f9f 100644
--- a/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/bootstrap.php
+++ b/www/modules/civicrm/vendor/phpseclib/phpseclib/phpseclib/bootstrap.php
@@ -7,7 +7,8 @@
 
 if (extension_loaded('mbstring')) {
     // 2 - MB_OVERLOAD_STRING
-    if (ini_get('mbstring.func_overload') & 2) {
+    // mbstring.func_overload is deprecated in php 7.2 and removed in php 8.0.
+    if (version_compare(PHP_VERSION, '8.0.0') < 0 && ini_get('mbstring.func_overload') & 2) {
         throw new \UnexpectedValueException(
             'Overloading of string functions using mbstring.func_overload ' .
             'is not supported by phpseclib.'
diff --git a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/.php-cs-fixer.dist.php b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/.php-cs-fixer.dist.php
index 2c8be8e19..ee11608c7 100644
--- a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/.php-cs-fixer.dist.php
+++ b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/.php-cs-fixer.dist.php
@@ -6,6 +6,7 @@
 ;
 
 return (new PhpCsFixer\Config())
+    ->setFinder($finder)
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
@@ -13,8 +14,15 @@
         'array_syntax' => ['syntax' => 'short'],
         'concat_space' => ['spacing' => 'one'],
         'cast_spaces' => ['space' => 'none'],
-        'native_function_invocation' => false,
+        'types_spaces' => ['space' => 'none'],
         'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
+        'phpdoc_to_comment' => false,
+        'fopen_flags' => ['b_mode' => true],
+        'native_function_invocation' => ['include' => ['@all']],
+        'function_declaration' => ['closure_function_spacing' => 'none', 'closure_fn_spacing' => 'none'],
+        'method_argument_space' => [
+            'on_multiline' => 'ensure_fully_multiline',
+            'keep_multiple_spaces_after_comma' => false,
+        ],
     ])
-    ->setFinder($finder)
 ;
diff --git a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/CHANGELOG.md b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/CHANGELOG.md
index cd2f2e8fb..281e56721 100644
--- a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/CHANGELOG.md
+++ b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/CHANGELOG.md
@@ -6,6 +6,44 @@ and this project adheres to [Semantic Versioning(https://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.4.0 - 2023-11-20
+### Changed
+- Added support for Symfony 7.0 and PHP 8.3
+
+## 1.3.0 - 2023-10-07
+### Added
+- Support WeasyPrint 60.0 new option
+
+## 1.2.0 - 2023-05-11
+### Added
+- Support WeasyPrint 59.0b1 new options
+
+## 1.1.1 - 2023-04-27
+### Security
+- Implement countermeasures for CVE-2023-28115
+
+## 1.1.0 - 2023-04-03
+### Added
+- Support WeasyPrint 58 new option (--pdf-forms)
+### Changed
+- Always pass through timeout when creating a process (#7)
+
+## 1.0.1 - 2023-01-17
+### Fixed
+- Fix logging of errors
+
+## 1.0.0 - 2023-01-16
+### Fixed
+- Fixed handling of repeatable options (attachment and stylesheet)
+
+### Changed
+- Bump symfony/process up to ^6.2
+
+### Removed
+- Remove Image class
+- Remove Version class
+- Remove support for Symfony 4.4
+
 ## 0.13.0 - 2023-01-16
 ### Added
 - Support WeasyPrint 56 new options
diff --git a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/README.md b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/README.md
index 932c8095d..da56aa052 100644
--- a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/README.md
+++ b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/README.md
@@ -1,14 +1,14 @@
 # PhpWeasyPrint
 
-PhpWeasyPrint is a PHP library allowing PDF generation from an URL or an HTML page.
+PhpWeasyPrint is a PHP library allowing PDF generation from a URL or an HTML page.
 It's a wrapper for [WeasyPrint](https://weasyprint.org/), a smart solution helping web developers to create PDF documents, available everywhere Python runs.
 
-You will have to download and install WeasyPrint to use PhpWeasyPrint (version 53 or greater is recommended).
+You will have to download and install WeasyPrint to use PhpWeasyPrint (version 56 or greater is recommended).
 
 This library is massively inspired by [KnpLabs/snappy](https://github.com/KnpLabs/snappy), of which it aims to be a one-to-one substitute (`GeneratorInterface` is the same).
 See "[Differences with Snappy](#differences-with-snappy)" section to see how the two differs
 
-## Installation using [Composer](http://getcomposer.org/)
+## Installation using [Composer](https://getcomposer.org/)
 
 ```bash
 $ composer require pontedilana/php-weasyprint
@@ -37,7 +37,7 @@ $pdf->setBinary('/usr/local/bin/weasyprint');
 ```php
 $pdf = new Pdf('/usr/local/bin/weasyprint');
 header('Content-Type: application/pdf');
-echo $pdf->getOutput('http://www.github.com');
+echo $pdf->getOutput('https://www.github.com');
 ```
 
 ### Download the pdf from the browser
@@ -46,7 +46,7 @@ echo $pdf->getOutput('http://www.github.com');
 $pdf = new Pdf('/usr/local/bin/weasyprint');
 header('Content-Type: application/pdf');
 header('Content-Disposition: attachment; filename="file.pdf"');
-echo $pdf->getOutput('http://www.github.com');
+echo $pdf->getOutput('https://www.github.com');
 ```
 
 ### Generate local pdf file
@@ -86,12 +86,12 @@ $pdf->resetOptions();
 Although PhpWeasyPrint and Snappy are interchangeable, there are a couple of differences between the two, due to WeasyPrint cli API:
 
 * WeasyPrint doesn't support multiple sources to be merged in one single output pdf, so only one input source (string or URL) is accepted in PhpWeasyPrint;
-* WeasyPrint version >= 53 doesn't generate images, so image generation from HTML string or URL is possible only with WeasyPrint lower versions (`Pontedilana\PhpWeasyPrint\Image` has been successfully tested with Weasyprint 52.5).
+* WeasyPrint version >= 53 doesn't generate images, so image generation from HTML string or URL is possible only with WeasyPrint lower versions and an unsupported PhpWeasyPrint version (`Pontedilana\PhpWeasyPrint\Image` has been successfully tested with Weasyprint 52.5 on PhpWeasyPrint 0.13.0).
 
 ## Bugs & Support
 
 If you found a bug please fill a [detailed issue](https://github.com/pontedilana/php-weasyprint/issues) with all the following points.
-If you need some help, please at least provide a complete reproducer so we could help you based on facts rather than assumptions.
+If you need some help, please at least provide a complete reproducer, so we could help you based on facts rather than assumptions.
 
 * OS and its version
 * WeasyPrint, its version and how you installed it
@@ -102,5 +102,5 @@ If your reproducer is big, please try to shrink it. It will help everyone to nar
 ## Credits
 
 PhpWeasyPrint has been originally developed by the [Pontedilana](https://www.pontedilana.it) dev team.  
-Snappy has been originally developed by the [KnpLabs](http://knplabs.com) team.
+Snappy has been originally developed by the [KnpLabs](https://knplabs.com) team.
 
diff --git a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/composer.json b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/composer.json
index 839f3b2bf..50bc9842e 100644
--- a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/composer.json
+++ b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/composer.json
@@ -15,9 +15,9 @@
         }
     ],
     "require": {
-        "php": "7.4.* || 8.0.* || 8.1.* || 8.2.*",
+        "php": "7.4.* || 8.0.* || 8.1.* || 8.2.* || 8.3.*",
         "psr/log": "^1.1 || ^2.0 || ^3.0",
-        "symfony/process": "^4.4 || ^5.4 || ^6.0"
+        "symfony/process": "^5.4 || ^6.2  || ^7"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.4",
diff --git a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/AbstractGenerator.php b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/AbstractGenerator.php
index c6dd52fd2..f56473172 100644
--- a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/AbstractGenerator.php
+++ b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/AbstractGenerator.php
@@ -31,13 +31,13 @@ abstract class AbstractGenerator implements GeneratorInterface, LoggerAwareInter
     private ?array $env;
     private ?int $timeout = null;
 
-    /** @var array<string, mixed> */
+    /** @var array<string, bool|string|array|null> */
     private array $options = [];
     private ?string $binary = null;
 
     /**
-     * @param array<string, mixed>      $options
-     * @param array<string, mixed>|null $env
+     * @param array<string, bool|string|array|null> $options
+     * @param array<string, mixed>|null             $env
      */
     public function __construct(string $binary = null, array $options = [], array $env = null)
     {
@@ -81,6 +81,8 @@ public function generate(string $input, string $output, array $options = [], boo
             'timeout' => $this->timeout,
         ]);
 
+        $status = null;
+        $stdout = $stderr = '';
         try {
             [$status, $stdout, $stderr] = $this->executeCommand($command);
             $this->checkProcessStatus($status, $stdout, $stderr, $command);
@@ -88,7 +90,7 @@ public function generate(string $input, string $output, array $options = [], boo
         } catch (\Exception $e) {
             $this->logger->error(\sprintf('An error happened while generating "%s".', $output), [
                 'command' => $command,
-                'status' => $status ?? null,
+                'status' => $status,
                 'stdout' => $stdout,
                 'stderr' => $stderr,
             ]);
@@ -143,39 +145,41 @@ public function setLogger(LoggerInterface $logger): void
     /**
      * Builds the command string.
      *
-     * @param string               $binary  The binary path/name
-     * @param string               $input   Url or file location of the page to process
-     * @param string               $output  File location to the pdf-or-image-to-be
-     * @param array<string, mixed> $options An array of options
+     * @param string                                $binary  The binary path/name
+     * @param string                                $input   Url or file location of the page to process
+     * @param string                                $output  File location to the pdf-or-image-to-be
+     * @param array<string, bool|string|array|null> $options An array of options
      */
     protected function buildCommand(string $binary, string $input, string $output, array $options = []): string
     {
-        $command = $binary;
         $escapedBinary = \escapeshellarg($binary);
-        if (\is_executable($escapedBinary)) {
-            $command = $escapedBinary;
-        }
+        $command = \is_executable($escapedBinary) ? $escapedBinary : $binary;
 
         foreach ($options as $key => $option) {
-            if (null !== $option && false !== $option) {
-                if (true === $option) {
-                    $command .= ' --' . $key;
-                } elseif (\is_array($option)) {
-                    foreach ($option as $v) {
-                        $command .= ' --' . $key . ' ' . \escapeshellarg($v);
-                    }
-                } else {
-                    switch ($key) {
-                        case 'format':
-                            $command .= ' --' . $key . ' ' . $option;
-                            break;
-                        case 'resolution':
-                            $command .= ' --' . $key . ' ' . (int)$option;
-                            break;
-                        default:
-                            $command .= ' --' . $key . ' ' . \escapeshellarg($option);
-                            break;
-                    }
+            if (null === $option || false === $option) {
+                continue;
+            }
+
+            if (true === $option) {
+                $command .= ' --' . $key;
+                continue;
+            }
+
+            if (\is_array($option)) {
+                foreach ($option as $v) {
+                    $command .= ' --' . $key . ' ' . \escapeshellarg($v);
+                }
+            } else {
+                switch ($key) {
+                    case 'format':
+                        $command .= ' --' . $key . ' ' . $option;
+                        break;
+                    case 'resolution':
+                        $command .= ' --' . $key . ' ' . (int)$option;
+                        break;
+                    default:
+                        $command .= ' --' . $key . ' ' . \escapeshellarg((string)$option);
+                        break;
                 }
             }
         }
@@ -191,12 +195,7 @@ protected function buildCommand(string $binary, string $input, string $output, a
      */
     protected function executeCommand(string $command): array
     {
-        $process = Process::fromShellCommandline($command, null, $this->env);
-
-        if (null !== $this->timeout) {
-            $process->setTimeout($this->timeout);
-        }
-
+        $process = Process::fromShellCommandline($command, null, $this->env, null, $this->timeout);
         $process->run();
 
         return [
@@ -218,6 +217,10 @@ protected function executeCommand(string $command): array
      */
     protected function prepareOutput(string $filename, bool $overwrite): void
     {
+        if (0 === \strpos($filename, 'phar://')) {
+            throw new \InvalidArgumentException('The output file cannot be a phar archive.');
+        }
+
         $directory = \dirname($filename);
 
         if ($this->fileExists($filename)) {
@@ -277,9 +280,9 @@ public function getBinary(): ?string
     /**
      * Returns the command for the given input and output files.
      *
-     * @param string               $input   The input file
-     * @param string               $output  The ouput file
-     * @param array<string, mixed> $options An optional array of options that will be used only for this command
+     * @param string                                $input   The input file
+     * @param string                                $output  The ouput file
+     * @param array<string, bool|string|array|null> $options An optional array of options that will be used only for this command
      */
     public function getCommand(string $input, string $output, array $options = []): string
     {
@@ -360,8 +363,8 @@ protected function createTemporaryFile(?string $content = null, ?string $extensi
      * Sets an option. Be aware that option values are NOT validated and that
      * it is your responsibility to validate user inputs.
      *
-     * @param string $name  The option to set
-     * @param mixed  $value The value (NULL to unset)
+     * @param string                 $name  The option to set
+     * @param bool|string|array|null $value The value (NULL to unset)
      *
      * @throws \InvalidArgumentException
      */
@@ -381,7 +384,7 @@ public function setOption(string $name, $value): self
     /**
      * Sets an array of options.
      *
-     * @param array<string, mixed> $options An associative array of options as name/value
+     * @param array<string, bool|string|array|null> $options An associative array of options as name/value
      */
     public function setOptions(array $options): self
     {
@@ -395,7 +398,7 @@ public function setOptions(array $options): self
     /**
      * Returns all the options.
      *
-     * @return array<string, mixed>
+     * @return array<string, bool|string|array|null>
      */
     public function getOptions(): array
     {
@@ -405,8 +408,8 @@ public function getOptions(): array
     /**
      * Adds an option.
      *
-     * @param string $name    The name
-     * @param mixed  $default An optional default value
+     * @param string                 $name    The name
+     * @param bool|string|array|null $default An optional default value
      *
      * @throws \InvalidArgumentException
      */
@@ -424,7 +427,7 @@ protected function addOption(string $name, $default = null): self
     /**
      * Adds an array of options.
      *
-     * @param array<string, mixed> $options
+     * @param array<string, bool|string|array|null> $options
      */
     protected function addOptions(array $options): self
     {
@@ -439,9 +442,9 @@ protected function addOptions(array $options): self
      * Merges the given array of options to the instance options and returns
      * the result options array. It does NOT change the instance options.
      *
-     * @param array<string, mixed> $options
+     * @param array<string, bool|string|array|null> $options
      *
-     * @return array<string, mixed>
+     * @return array<string, bool|string|array|null>
      *
      * @throws \InvalidArgumentException
      */
@@ -503,7 +506,7 @@ protected function checkOutput(string $output, string $command): void
     protected function checkProcessStatus(?int $status, string $stdout, string $stderr, string $command): void
     {
         if (null === $status) {
-            throw new \RuntimeException(sprintf('The command is not terminated.' . "\n" . 'stderr: "%s"' . "\n" . 'stdout: "%s"' . "\n" . 'command: %s', $stderr, $stdout, $command));
+            throw new \RuntimeException(\sprintf('The command is not terminated.' . "\n" . 'stderr: "%s"' . "\n" . 'stdout: "%s"' . "\n" . 'command: %s', $stderr, $stdout, $command));
         }
 
         if (0 !== $status && '' !== $stderr) {
diff --git a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/GeneratorInterface.php b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/GeneratorInterface.php
index 5e306ffd1..7711c87ff 100644
--- a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/GeneratorInterface.php
+++ b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/GeneratorInterface.php
@@ -14,20 +14,20 @@ interface GeneratorInterface
     /**
      * Generates the output media file from the specified input HTML file.
      *
-     * @param string               $input     The input HTML filename or URL
-     * @param string               $output    The output media filename
-     * @param array<string, mixed> $options   An array of options for this generation only
-     * @param bool                 $overwrite Overwrite the file if it exists. If not, throw a FileAlreadyExistsException
+     * @param string                                $input     The input HTML filename or URL
+     * @param string                                $output    The output media filename
+     * @param array<string, bool|string|array|null> $options   An array of options for this generation only
+     * @param bool                                  $overwrite Overwrite the file if it exists. If not, throw a FileAlreadyExistsException
      */
     public function generate(string $input, string $output, array $options = [], bool $overwrite = false): void;
 
     /**
      * Generates the output media file from the given HTML.
      *
-     * @param string               $html      The HTML to be converted
-     * @param string               $output    The output media filename
-     * @param array<string, mixed> $options   An array of options for this generation only
-     * @param bool                 $overwrite Overwrite the file if it exists. If not, throw a FileAlreadyExistsException
+     * @param string                                $html      The HTML to be converted
+     * @param string                                $output    The output media filename
+     * @param array<string, bool|string|array|null> $options   An array of options for this generation only
+     * @param bool                                  $overwrite Overwrite the file if it exists. If not, throw a FileAlreadyExistsException
      */
     public function generateFromHtml(string $html, string $output, array $options = [], bool $overwrite = false): void;
 
@@ -35,16 +35,16 @@ public function generateFromHtml(string $html, string $output, array $options =
      * Returns the output of the media generated from the specified input HTML
      * file.
      *
-     * @param string               $input   The input HTML filename or URL
-     * @param array<string, mixed> $options An array of options for this output only
+     * @param string                                $input   The input HTML filename or URL
+     * @param array<string, bool|string|array|null> $options An array of options for this output only
      */
     public function getOutput(string $input, array $options = []): string;
 
     /**
      * Returns the output of the media generated from the given HTML.
      *
-     * @param string               $html    The HTML to be converted
-     * @param array<string, mixed> $options An array of options for this output only
+     * @param string                                $html    The HTML to be converted
+     * @param array<string, bool|string|array|null> $options An array of options for this output only
      */
     public function getOutputFromHtml(string $html, array $options = []): string;
 }
diff --git a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/Image.php b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/Image.php
deleted file mode 100644
index 3e82c403a..000000000
--- a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/Image.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace Pontedilana\PhpWeasyPrint;
-
-use Pontedilana\PhpWeasyPrint\Exception\UnsupportedWeasyPrintVersionException;
-
-/**
- * Use this class to create a snapshot / thumbnail from an HTML page.
- *
- * @author  Manuel Dalla Lana <manuel@pontedilana.it>
- *
- * @deprecated 1.0.0 WeasyPrint version 53 has deprecated image generation
- */
-class Image extends AbstractGenerator
-{
-    private Version $binaryVersion;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct(string $binary = null, array $options = [], array $env = null)
-    {
-        parent::__construct($binary, $options, $env);
-
-        $this->setDefaultExtension('png');
-        $this->binaryVersion = new Version($this->getBinary());
-    }
-
-    protected function configure(): void
-    {
-        $this->addOptions([
-            // Global options
-            'format' => 'png', // forced to 'png', should not be overridden
-            'encoding' => null,
-            'stylesheet' => [], // repeatable
-            'media-type' => null,
-            'resolution' => null, // png only
-            'base-url' => null,
-            'attachment' => [], // repeatable
-            'presentational-hints' => null,
-            'optimize-images' => null, // deprecated in 53.0b2
-            'optimize-size' => null, // from 53.0b2
-        ]);
-    }
-
-    public function generate(string $input, string $output, array $options = [], bool $overwrite = false): void
-    {
-        $this->assertVersionIsCompatible();
-        parent::generate($input, $output, $options, $overwrite);
-    }
-
-    public function generateFromHtml(string $html, string $output, array $options = [], bool $overwrite = false): void
-    {
-        $this->assertVersionIsCompatible();
-        parent::generateFromHtml($html, $output, $options, $overwrite);
-    }
-
-    public function getOutput(string $input, array $options = []): string
-    {
-        $this->assertVersionIsCompatible();
-
-        return parent::getOutput($input, $options);
-    }
-
-    public function getOutputFromHtml(string $html, array $options = []): string
-    {
-        $this->assertVersionIsCompatible();
-
-        return parent::getOutputFromHtml($html, $options);
-    }
-
-    private function assertVersionIsCompatible(): void
-    {
-        if ($this->binaryVersion->getMajorVersion() >= '53') {
-            throw new UnsupportedWeasyPrintVersionException('Image generation is unsupported in WeasyPrint >= 53');
-        }
-    }
-}
diff --git a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/Pdf.php b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/Pdf.php
index 9291a6b3c..2bf121e59 100644
--- a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/Pdf.php
+++ b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/Pdf.php
@@ -35,9 +35,9 @@ public function generate(string $input, string $output, array $options = [], boo
     }
 
     /**
-     * @param array<string, mixed> $options
+     * @param array<string, bool|string|array|null> $options
      *
-     * @return array<string, mixed>
+     * @return array<string, bool|string|array|null>
      */
     protected function handleOptions(array $options = []): array
     {
@@ -48,14 +48,10 @@ protected function handleOptions(array $options = []): array
                 continue;
             }
 
-            if (!empty($value) && \array_key_exists($option, $this->optionsWithContentCheck)) {
-                $saveToTempFile = !$this->isFile($value) && !$this->isOptionUrl($value);
-                $fetchUrlContent = 'attachment' === $option && $this->isOptionUrl($value);
-
-                if ($saveToTempFile || $fetchUrlContent) {
-                    $fileContent = $fetchUrlContent ? \file_get_contents($value) : $value;
-                    $options[$option] = $this->createTemporaryFile($fileContent,
-                        $this->optionsWithContentCheck[$option]);
+            if ('attachment' === $option || 'stylesheet' === $option) {
+                $handledOption = $this->handleArrayOptions($option, $value);
+                if (\count($handledOption) > 0) {
+                    $options[$option] = $handledOption;
                 }
             }
         }
@@ -63,6 +59,35 @@ protected function handleOptions(array $options = []): array
         return $options;
     }
 
+    /**
+     * @param mixed $value
+     *
+     * @return list<string>
+     */
+    private function handleArrayOptions(string $option, $value): array
+    {
+        if (!\is_array($value)) {
+            $value = [$value];
+        }
+
+        $returnOptions = [];
+        foreach ($value as $item) {
+            $saveToTempFile = !$this->isFile($item) && !$this->isOptionUrl($item);
+            $fetchUrlContent = 'attachment' === $option && $this->isOptionUrl($item);
+            if ($saveToTempFile || $fetchUrlContent) {
+                $fileContent = $fetchUrlContent ? \file_get_contents($item) : $item;
+                $returnOptions[] = $this->createTemporaryFile(
+                    $fileContent,
+                    $this->optionsWithContentCheck[$option] ?? 'temp'
+                );
+            } else {
+                $returnOptions[] = $item;
+            }
+        }
+
+        return $returnOptions;
+    }
+
     /**
      * Convert option content or url to file if it is needed.
      *
@@ -70,7 +95,7 @@ protected function handleOptions(array $options = []): array
      */
     protected function isOptionUrl($option): bool
     {
-        return (bool)\filter_var($option, \FILTER_VALIDATE_URL);
+        return false !== \filter_var($option, \FILTER_VALIDATE_URL);
     }
 
     protected function configure(): void
@@ -83,15 +108,23 @@ protected function configure(): void
             'base-url' => null,
             'attachment' => [], // repeatable
             'presentational-hints' => null,
-            'optimize-size' => null, // added in WeasyPrint 53.0b2
             'pdf-identifier' => null, // added in WeasyPrint 56.0b1
             'pdf-variant' => null, // added in WeasyPrint 56.0b1
             'pdf-version' => null, // added in WeasyPrint 56.0b1
+            'pdf-forms' => null, // added in WeasyPrint 58.0b1
             'custom-metadata' => null, // added in WeasyPrint 56.0b1
+            'uncompressed-pdf' => null, // added in WeasyPrint 59.0b1
+            'full-fonts' => null, // added in WeasyPrint 59.0b1
+            'hinting' => null, // added in WeasyPrint 59.0b1
+            'dpi' => null, // added in WeasyPrint 59.0b1
+            'jpeg-quality' => null, // added in WeasyPrint 59.0b1
+            'optimize-images' => null, // no longer deprecated in WeasyPrint 59.0b1
+            'cache-folder' => null, // added in WeasyPrint 59.0b1
+            'timeout' => null, // added in WeasyPrint 60.0
             // Deprecated
             'format' => null, // deprecated in WeasyPrint 53.0b2
-            'optimize-images' => null, // deprecated in WeasyPrint 53.0b2
             'resolution' => null, // deprecated - png only
+            'optimize-size' => null, // added in WeasyPrint 53.0b2, deprecated in 59.0b1
         ]);
     }
 
diff --git a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/Version.php b/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/Version.php
deleted file mode 100644
index f7fab3587..000000000
--- a/www/modules/civicrm/vendor/pontedilana/php-weasyprint/src/Version.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Pontedilana\PhpWeasyPrint;
-
-use Symfony\Component\Process\Exception\ProcessFailedException;
-use Symfony\Component\Process\Process;
-
-/**
- * @deprecated 1.0.0 This class is used only by Image class which is deprecated
- */
-class Version
-{
-    private ?string $binary;
-
-    public function __construct(?string $binary = '/usr/local/bin/weasyprint')
-    {
-        $this->binary = $binary;
-    }
-
-    public function getVersion(): array
-    {
-        $output = $this->runCommand();
-
-        return $this->parseOutput($output);
-    }
-
-    public function getMajorVersion(): string
-    {
-        $output = $this->runCommand();
-
-        return $this->parseOutput($output)['major'];
-    }
-
-    public function parseOutput(string $output): array
-    {
-        $re = '/^WeasyPrint version (?P<fullversion>((?P<major>\d+)\.?(?P<minor>.*)))$/';
-        preg_match($re, $output, $matches);
-
-        return [
-            'fullversion' => $matches['fullversion'],
-            'major' => $matches['major'],
-            'minor' => '' != $matches['minor'] ? $matches['minor'] : '0',
-        ];
-    }
-
-    private function runCommand(): string
-    {
-        $process = new Process([$this->binary, '--version']);
-        $process->run();
-        if (!$process->isSuccessful()) {
-            throw new ProcessFailedException($process);
-        }
-
-        return $process->getOutput();
-    }
-}
diff --git a/www/modules/civicrm/vendor/psr/log/Psr/Log/AbstractLogger.php b/www/modules/civicrm/vendor/psr/log/Psr/Log/AbstractLogger.php
index 90e721af2..e02f9daf3 100644
--- a/www/modules/civicrm/vendor/psr/log/Psr/Log/AbstractLogger.php
+++ b/www/modules/civicrm/vendor/psr/log/Psr/Log/AbstractLogger.php
@@ -14,8 +14,8 @@ abstract class AbstractLogger implements LoggerInterface
     /**
      * System is unusable.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -30,8 +30,8 @@ public function emergency($message, array $context = array())
      * Example: Entire website down, database unavailable, etc. This should
      * trigger the SMS alerts and wake you up.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -45,8 +45,8 @@ public function alert($message, array $context = array())
      *
      * Example: Application component unavailable, unexpected exception.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -59,8 +59,8 @@ public function critical($message, array $context = array())
      * Runtime errors that do not require immediate action but should typically
      * be logged and monitored.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -75,8 +75,8 @@ public function error($message, array $context = array())
      * Example: Use of deprecated APIs, poor use of an API, undesirable things
      * that are not necessarily wrong.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -88,8 +88,8 @@ public function warning($message, array $context = array())
     /**
      * Normal but significant events.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -103,8 +103,8 @@ public function notice($message, array $context = array())
      *
      * Example: User logs in, SQL logs.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -116,8 +116,8 @@ public function info($message, array $context = array())
     /**
      * Detailed debug information.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
diff --git a/www/modules/civicrm/vendor/psr/log/Psr/Log/LoggerAwareTrait.php b/www/modules/civicrm/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
index 639f79bda..82bf45c89 100644
--- a/www/modules/civicrm/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
+++ b/www/modules/civicrm/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
@@ -10,7 +10,7 @@ trait LoggerAwareTrait
     /**
      * The logger instance.
      *
-     * @var LoggerInterface
+     * @var LoggerInterface|null
      */
     protected $logger;
 
diff --git a/www/modules/civicrm/vendor/psr/log/composer.json b/www/modules/civicrm/vendor/psr/log/composer.json
index 3f6d4eea4..ca0569537 100644
--- a/www/modules/civicrm/vendor/psr/log/composer.json
+++ b/www/modules/civicrm/vendor/psr/log/composer.json
@@ -7,7 +7,7 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
+            "homepage": "https://www.php-fig.org/"
         }
     ],
     "require": {
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/CHANGELOG.md b/www/modules/civicrm/vendor/sabberworm/php-css-parser/CHANGELOG.md
index a23fd0e68..302cf1dd1 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/CHANGELOG.md
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/CHANGELOG.md
@@ -1,4 +1,41 @@
-# Revision History
+# Changelog
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](https://semver.org/).
+
+## x.y.z
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+## 8.5.1
+
+### Fixed
+
+- Fix (regression) failure to parse at-rules with strict parsing (#456)
+
+## 8.5.0
+
+### Added
+
+- Add a method to get an import's media queries (#384)
+- Add more unit tests (#381, #382)
+
+### Fixed
+
+- Retain CSSList and Rule comments when rendering CSS (#351)
+- Replace invalid `turns` unit with `turn` (#350)
+- Also allow string values for rules (#348)
+- Fix invalid calc parsing (#169)
+- Handle scientific notation when parsing sizes (#179)
+- Fix PHP 8.1 compatibility in `ParserState::strsplit()` (#344)
 
 ## 8.4.0
 
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/README.md b/www/modules/civicrm/vendor/sabberworm/php-css-parser/README.md
index 66fb1c655..90428cbf8 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/README.md
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/README.md
@@ -33,7 +33,7 @@ The resulting CSS document structure can be manipulated prior to being output.
 
 #### Charset
 
-The charset option is used only if no `@charset` declaration is found in the CSS file. UTF-8 is the default, so you won’t have to create a settings object at all if you don’t intend to change that.
+The charset option will only be used if the CSS file does not contain an `@charset` declaration. UTF-8 is the default, so you won’t have to create a settings object at all if you don’t intend to change that.
 
 ```php
 $settings = \Sabberworm\CSS\Settings::create()
@@ -43,7 +43,7 @@ $parser = new \Sabberworm\CSS\Parser($css, $settings);
 
 #### Strict parsing
 
-To have the parser choke on invalid rules, supply a thusly configured `\Sabberworm\CSS\Settings` object:
+To have the parser throw an exception when encountering invalid/unknown constructs (as opposed to trying to ignore them and carry on parsing), supply a thusly configured `\Sabberworm\CSS\Settings` object:
 
 ```php
 $parser = new \Sabberworm\CSS\Parser(
@@ -52,6 +52,8 @@ $parser = new \Sabberworm\CSS\Parser(
 );
 ```
 
+Note that this will also disable a workaround for parsing the unquoted variant of the legacy IE-specific `filter` rule.
+
 #### Disable multibyte functions
 
 To achieve faster parsing, you can choose to have PHP-CSS-Parser use regular string functions instead of `mb_*` functions. This should work fine in most cases, even for UTF-8 files, as all the multibyte characters are in string literals. Still it’s not recommended using this with input you have no control over as it’s not thoroughly covered by test cases.
@@ -67,12 +69,9 @@ The resulting data structure consists mainly of five basic types: `CSSList`, `Ru
 
 #### CSSList
 
-`CSSList` represents a generic CSS container, most likely containing declaration blocks (rule sets with a selector), but it may also contain at-rules, charset declarations, etc. `CSSList` has the following concrete subtypes:
-
-* `Document` – representing the root of a CSS file.
-* `MediaQuery` – represents a subsection of a `CSSList` that only applies to an output device matching the contained media query.
+`CSSList` represents a generic CSS container, most likely containing declaration blocks (rule sets with a selector), but it may also contain at-rules, charset declarations, etc.
 
-To access the items stored in a `CSSList` – like the document you got back when calling `$parser->parse()` –, use `getContents()`, then iterate over that collection and use instanceof to check whether you’re dealing with another `CSSList`, a `RuleSet`, a `Import` or a `Charset`.
+To access the items stored in a `CSSList` – like the document you got back when calling `$parser->parse()` –, use `getContents()`, then iterate over that collection and use `instanceof` to check whether you’re dealing with another `CSSList`, a `RuleSet`, a `Import` or a `Charset`.
 
 To append a new item (selector, media query, etc.) to an existing `CSSList`, construct it using the constructor for this class and use the `append($oItem)` method.
 
@@ -80,16 +79,16 @@ To append a new item (selector, media query, etc.) to an existing `CSSList`, con
 
 `RuleSet` is a container for individual rules. The most common form of a rule set is one constrained by a selector. The following concrete subtypes exist:
 
-* `AtRuleSet` – for generic at-rules which do not match the ones specifically mentioned like `@import`, `@charset` or `@media`. A common example for this is `@font-face`.
+* `AtRuleSet` – for generic at-rules for generic at-rules which are not covered by specific classes, i.e., not `@import`, `@charset` or `@media`. A common example for this is `@font-face`.
 * `DeclarationBlock` – a `RuleSet` constrained by a `Selector`; contains an array of selector objects (comma-separated in the CSS) as well as the rules to be applied to the matching elements.
 
 Note: A `CSSList` can contain other `CSSList`s (and `Import`s as well as a `Charset`), while a `RuleSet` can only contain `Rule`s.
 
-If you want to manipulate a `RuleSet`, use the methods `addRule(Rule $rule)`, `getRules()` and `removeRule($rule)` (which accepts either a `Rule` instance or a rule name; optionally suffixed by a dash to remove all related rules).
+If you want to manipulate a `RuleSet`, use the methods `addRule(Rule $rule)`, `getRules()` and `removeRule($rule)` (which accepts either a `Rule` or a rule name; optionally suffixed by a dash to remove all related rules).
 
 #### Rule
 
-`Rule`s just have a key (the rule) and a value. These values are all instances of a `Value`.
+`Rule`s just have a string key (the rule) and a `Value`.
 
 #### Value
 
@@ -98,19 +97,21 @@ If you want to manipulate a `RuleSet`, use the methods `addRule(Rule $rule)`, `g
 * `Size` – consists of a numeric `size` value and a unit.
 * `Color` – colors can be input in the form #rrggbb, #rgb or schema(val1, val2, …) but are always stored as an array of ('s' => val1, 'c' => val2, 'h' => val3, …) and output in the second form.
 * `CSSString` – this is just a wrapper for quoted strings to distinguish them from keywords; always output with double quotes.
-* `URL` – URLs in CSS; always output in URL("") notation.
+* `URL` – URLs in CSS; always output in `URL("")` notation.
+
+There is another abstract subclass of `Value`, `ValueList`: A `ValueList` represents a lists of `Value`s, separated by some separation character (mostly `,`, whitespace, or `/`).
 
-There is another abstract subclass of `Value`, `ValueList`. A `ValueList` represents a lists of `Value`s, separated by some separation character (mostly `,`, whitespace, or `/`). There are two types of `ValueList`s:
+There are two types of `ValueList`s:
 
-* `RuleValueList` – The default type, used to represent all multi-valued rules like `font: bold 12px/3 Helvetica, Verdana, sans-serif;` (where the value would be a whitespace-separated list of the primitive value `bold`, a slash-separated list and a comma-separated list).
+* `RuleValueList` – The default type, used to represent all multivalued rules like `font: bold 12px/3 Helvetica, Verdana, sans-serif;` (where the value would be a whitespace-separated list of the primitive value `bold`, a slash-separated list and a comma-separated list).
 * `CSSFunction` – A special kind of value that also contains a function name and where the values are the function’s arguments. Also handles equals-sign-separated argument lists like `filter: alpha(opacity=90);`.
 
 #### Convenience methods
 
-There are a few convenience methods on Document to ease finding, manipulating and deleting rules:
+There are a few convenience methods on `Document` to ease finding, manipulating and deleting rules:
 
-* `getAllDeclarationBlocks()` – does what it says; no matter how deeply nested your selectors are. Aliased as `getAllSelectors()`.
-* `getAllRuleSets()` – does what it says; no matter how deeply nested your rule sets are.
+* `getAllDeclarationBlocks()` – does what it says; no matter how deeply nested the selectors are. Aliased as `getAllSelectors()`.
+* `getAllRuleSets()` – does what it says; no matter how deeply nested the rule sets are.
 * `getAllValues()` – finds all `Value` objects inside `Rule`s.
 
 ## To-Do
@@ -156,7 +157,7 @@ $cssDocument = $parser->parse();
 foreach($cssDocument->getAllRuleSets() as $oRuleSet) {
     // Note that the added dash will make this remove all rules starting with
     // `font-` (like `font-size`, `font-weight`, etc.) as well as a potential
-    // `font-rule`.
+    // `font` rule.
     $oRuleSet->removeRule('font-'); 
     $oRuleSet->removeRule('cursor');
 }
@@ -214,7 +215,8 @@ html, body {
 
 ```
 
-#### Structure (`var_dump()`)
+<details>
+  <summary><b>Structure (<code>var_dump()</code>)</b></summary>
 
 ```php
 class Sabberworm\CSS\CSSList\Document#4 (2) {
@@ -435,6 +437,7 @@ class Sabberworm\CSS\CSSList\Document#4 (2) {
 }
 
 ```
+</details>
 
 #### Output (`render()`)
 
@@ -458,7 +461,8 @@ html, body {font-size: 1.6em;}
 
 ```
 
-#### Structure (`var_dump()`)
+<details>
+  <summary><b>Structure (<code>var_dump()</code>)</b></summary>
 
 ```php
 class Sabberworm\CSS\CSSList\Document#4 (2) {
@@ -603,6 +607,7 @@ class Sabberworm\CSS\CSSList\Document#4 (2) {
 }
 
 ```
+</details>
 
 #### Output (`render()`)
 
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/composer.json b/www/modules/civicrm/vendor/sabberworm/php-css-parser/composer.json
index e192dd56a..cf15a9442 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/composer.json
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/composer.json
@@ -12,6 +12,14 @@
     "authors": [
         {
             "name": "Raphael Schweikert"
+        },
+        {
+            "name": "Oliver Klee",
+            "email": "github@oliverklee.de"
+        },
+        {
+            "name": "Jake Hotson",
+            "email": "jake.github@qzdesign.co.uk"
         }
     ],
     "require": {
@@ -19,8 +27,7 @@
         "ext-iconv": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36",
-        "codacy/coverage": "^1.4"
+        "phpunit/phpunit": "^5.7.27"
     },
     "suggest": {
         "ext-mbstring": "for parsing UTF-8 CSS"
@@ -35,6 +42,11 @@
             "Sabberworm\\CSS\\Tests\\": "tests/"
         }
     },
+    "extra": {
+        "branch-alias": {
+            "dev-main": "9.0.x-dev"
+        }
+    },
     "scripts": {
         "ci": [
             "@ci:static"
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/AtRuleBlockList.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/AtRuleBlockList.php
index 218adb9a1..598fefc12 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/AtRuleBlockList.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/AtRuleBlockList.php
@@ -61,13 +61,14 @@ public function __toString()
      */
     public function render(OutputFormat $oOutputFormat)
     {
+        $sResult = $oOutputFormat->comments($this);
+        $sResult .= $oOutputFormat->sBeforeAtRuleBlock;
         $sArgs = $this->sArgs;
         if ($sArgs) {
             $sArgs = ' ' . $sArgs;
         }
-        $sResult = $oOutputFormat->sBeforeAtRuleBlock;
         $sResult .= "@{$this->sType}$sArgs{$oOutputFormat->spaceBeforeOpeningBrace()}{";
-        $sResult .= parent::render($oOutputFormat);
+        $sResult .= $this->renderListContents($oOutputFormat);
         $sResult .= '}';
         $sResult .= $oOutputFormat->sAfterAtRuleBlock;
         return $sResult;
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/CSSList.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/CSSList.php
index 946740a49..603f662b1 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/CSSList.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/CSSList.php
@@ -24,10 +24,10 @@
 use Sabberworm\CSS\Value\Value;
 
 /**
- * A `CSSList` is the most generic container available. Its contents include `RuleSet` as well as other `CSSList`
- * objects.
+ * This is the most generic container available. It can contain `DeclarationBlock`s (rule sets with a selector),
+ * `RuleSet`s as well as other `CSSList` objects.
  *
- * Also, it may contain `Import` and `Charset` objects stemming from at-rules.
+ * It can also contain `Import` and `Charset` objects stemming from at-rules.
  */
 abstract class CSSList implements Renderable, Commentable
 {
@@ -69,8 +69,9 @@ public static function parseList(ParserState $oParserState, CSSList $oList)
             $oParserState = new ParserState($oParserState, Settings::create());
         }
         $bLenientParsing = $oParserState->getSettings()->bLenientParsing;
+        $aComments = [];
         while (!$oParserState->isEnd()) {
-            $comments = $oParserState->consumeWhiteSpace();
+            $aComments = array_merge($aComments, $oParserState->consumeWhiteSpace());
             $oListItem = null;
             if ($bLenientParsing) {
                 try {
@@ -86,11 +87,12 @@ public static function parseList(ParserState $oParserState, CSSList $oList)
                 return;
             }
             if ($oListItem) {
-                $oListItem->setComments($comments);
+                $oListItem->addComments($aComments);
                 $oList->append($oListItem);
             }
-            $oParserState->consumeWhiteSpace();
+            $aComments = $oParserState->consumeWhiteSpace();
         }
+        $oList->addComments($aComments);
         if (!$bIsRoot && !$bLenientParsing) {
             throw new SourceException("Unexpected end of document", $oParserState->currentLine());
         }
@@ -125,22 +127,19 @@ private static function parseListItem(ParserState $oParserState, CSSList $oList)
                         $oParserState->currentLine()
                     );
                 }
-                $oParserState->setCharset($oAtRule->getCharset()->getString());
+                $oParserState->setCharset($oAtRule->getCharset());
             }
             return $oAtRule;
         } elseif ($oParserState->comes('}')) {
-            if (!$oParserState->getSettings()->bLenientParsing) {
-                throw new UnexpectedTokenException('CSS selector', '}', 'identifier', $oParserState->currentLine());
-            } else {
-                if ($bIsRoot) {
-                    if ($oParserState->getSettings()->bLenientParsing) {
-                        return DeclarationBlock::parse($oParserState);
-                    } else {
-                        throw new SourceException("Unopened {", $oParserState->currentLine());
-                    }
+            if ($bIsRoot) {
+                if ($oParserState->getSettings()->bLenientParsing) {
+                    return DeclarationBlock::parse($oParserState);
                 } else {
-                    return null;
+                    throw new SourceException("Unopened {", $oParserState->currentLine());
                 }
+            } else {
+                // End of list
+                return null;
             }
         } else {
             return DeclarationBlock::parse($oParserState, $oList);
@@ -172,10 +171,10 @@ private static function parseAtRule(ParserState $oParserState)
             $oParserState->consumeUntil([';', ParserState::EOF], true, true);
             return new Import($oLocation, $sMediaQuery ?: null, $iIdentifierLineNum);
         } elseif ($sIdentifier === 'charset') {
-            $sCharset = CSSString::parse($oParserState);
+            $oCharsetString = CSSString::parse($oParserState);
             $oParserState->consumeWhiteSpace();
             $oParserState->consumeUntil([';', ParserState::EOF], true, true);
-            return new Charset($sCharset, $iIdentifierLineNum);
+            return new Charset($oCharsetString, $iIdentifierLineNum);
         } elseif (self::identifierIs($sIdentifier, 'keyframes')) {
             $oResult = new KeyFrame($iIdentifierLineNum);
             $oResult->setVendorKeyFrame($sIdentifier);
@@ -272,7 +271,7 @@ public function prepend($oItem)
     }
 
     /**
-     * Appends an item to tje list of contents.
+     * Appends an item to the list of contents.
      *
      * @param RuleSet|CSSList|Import|Charset $oItem
      *
@@ -402,7 +401,7 @@ public function __toString()
     /**
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    protected function renderListContents(OutputFormat $oOutputFormat)
     {
         $sResult = '';
         $bIsFirst = true;
@@ -442,6 +441,8 @@ public function render(OutputFormat $oOutputFormat)
     abstract public function isRootList();
 
     /**
+     * Returns the stored items.
+     *
      * @return array<int, RuleSet|Import|Charset|CSSList>
      */
     public function getContents()
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/Document.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/Document.php
index 91ab2c6b2..bad998318 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/Document.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/Document.php
@@ -11,8 +11,8 @@
 use Sabberworm\CSS\Value\Value;
 
 /**
- * The root `CSSList` of a parsed file. Contains all top-level CSS contents, mostly declaration blocks,
- * but also any at-rules encountered.
+ * This class represents the root of a parsed CSS file. It contains all top-level CSS contents: mostly declaration
+ * blocks, but also any at-rules encountered (`Import` and `Charset`).
  */
 class Document extends CSSBlockList
 {
@@ -37,7 +37,8 @@ public static function parse(ParserState $oParserState)
     }
 
     /**
-     * Gets all `DeclarationBlock` objects recursively.
+     * Gets all `DeclarationBlock` objects recursively, no matter how deeply nested the selectors are.
+     * Aliased as `getAllSelectors()`.
      *
      * @return array<int, DeclarationBlock>
      */
@@ -62,7 +63,7 @@ public function getAllSelectors()
     }
 
     /**
-     * Returns all `RuleSet` objects found recursively in the tree.
+     * Returns all `RuleSet` objects recursively found in the tree, no matter how deeply nested the rule sets are.
      *
      * @return array<int, RuleSet>
      */
@@ -75,7 +76,7 @@ public function getAllRuleSets()
     }
 
     /**
-     * Returns all `Value` objects found recursively in the tree.
+     * Returns all `Value` objects found recursively in `Rule`s in the tree.
      *
      * @param CSSList|RuleSet|string $mElement
      *        the `CSSList` or `RuleSet` to start the search from (defaults to the whole document).
@@ -102,7 +103,7 @@ public function getAllValues($mElement = null, $bSearchInFunctionArguments = fal
     }
 
     /**
-     * Returns all `Selector` objects found recursively in the tree.
+     * Returns all `Selector` objects with the requested specificity found recursively in the tree.
      *
      * Note that this does not yield the full `DeclarationBlock` that the selector belongs to
      * (and, currently, there is no way to get to that).
@@ -159,7 +160,7 @@ public function render(OutputFormat $oOutputFormat = null)
         if ($oOutputFormat === null) {
             $oOutputFormat = new OutputFormat();
         }
-        return parent::render($oOutputFormat);
+        return $oOutputFormat->comments($this) . $this->renderListContents($oOutputFormat);
     }
 
     /**
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/KeyFrame.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/KeyFrame.php
index d9420e9c0..caef7b3d1 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/KeyFrame.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/CSSList/KeyFrame.php
@@ -72,8 +72,9 @@ public function __toString()
      */
     public function render(OutputFormat $oOutputFormat)
     {
-        $sResult = "@{$this->vendorKeyFrame} {$this->animationName}{$oOutputFormat->spaceBeforeOpeningBrace()}{";
-        $sResult .= parent::render($oOutputFormat);
+        $sResult = $oOutputFormat->comments($this);
+        $sResult .= "@{$this->vendorKeyFrame} {$this->animationName}{$oOutputFormat->spaceBeforeOpeningBrace()}{";
+        $sResult .= $this->renderListContents($oOutputFormat);
         $sResult .= '}';
         return $sResult;
     }
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/OutputFormat.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/OutputFormat.php
index 595d30643..96f26e147 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/OutputFormat.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/OutputFormat.php
@@ -143,6 +143,13 @@ class OutputFormat
      */
     public $bIgnoreExceptions = false;
 
+    /**
+     * Render comments for lists and RuleSets
+     *
+     * @var bool
+     */
+    public $bRenderComments = false;
+
     /**
      * @var OutputFormatter|null
      */
@@ -314,8 +321,12 @@ public static function create()
     public static function createCompact()
     {
         $format = self::create();
-        $format->set('Space*Rules', "")->set('Space*Blocks', "")->setSpaceAfterRuleName('')
-            ->setSpaceBeforeOpeningBrace('')->setSpaceAfterSelectorSeparator('');
+        $format->set('Space*Rules', "")
+            ->set('Space*Blocks', "")
+            ->setSpaceAfterRuleName('')
+            ->setSpaceBeforeOpeningBrace('')
+            ->setSpaceAfterSelectorSeparator('')
+            ->setRenderComments(false);
         return $format;
     }
 
@@ -327,8 +338,11 @@ public static function createCompact()
     public static function createPretty()
     {
         $format = self::create();
-        $format->set('Space*Rules', "\n")->set('Space*Blocks', "\n")
-            ->setSpaceBetweenBlocks("\n\n")->set('SpaceAfterListArgumentSeparator', ['default' => '', ',' => ' ']);
+        $format->set('Space*Rules', "\n")
+            ->set('Space*Blocks', "\n")
+            ->setSpaceBetweenBlocks("\n\n")
+            ->set('SpaceAfterListArgumentSeparator', ['default' => '', ',' => ' '])
+            ->setRenderComments(true);
         return $format;
     }
 }
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/OutputFormatter.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/OutputFormatter.php
index 535feca7f..501d15da3 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/OutputFormatter.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/OutputFormatter.php
@@ -2,6 +2,7 @@
 
 namespace Sabberworm\CSS;
 
+use Sabberworm\CSS\Comment\Commentable;
 use Sabberworm\CSS\Parsing\OutputException;
 
 class OutputFormatter
@@ -211,6 +212,29 @@ public function removeLastSemicolon($sString)
         return implode(';', $sString);
     }
 
+    /**
+     *
+     * @param array<Commentable> $aComments
+     *
+     * @return string
+     */
+    public function comments(Commentable $oCommentable)
+    {
+        if (!$this->oFormat->bRenderComments) {
+            return '';
+        }
+
+        $sResult = '';
+        $aComments = $oCommentable->getComments();
+        $iLastCommentIndex = count($aComments) - 1;
+
+        foreach ($aComments as $i => $oComment) {
+            $sResult .= $oComment->render($this->oFormat);
+            $sResult .= $i === $iLastCommentIndex ? $this->spaceAfterBlocks() : $this->spaceBetweenBlocks();
+        }
+        return $sResult;
+    }
+
     /**
      * @param string $sSpaceString
      *
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Parser.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Parser.php
index f3b0493a5..e582cfab3 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Parser.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Parser.php
@@ -17,7 +17,7 @@ class Parser
     private $oParserState;
 
     /**
-     * @param string $sText
+     * @param string $sText the complete CSS as text (i.e., usually the contents of a CSS file)
      * @param Settings|null $oParserSettings
      * @param int $iLineNo the line number (starting from 1, not from 0)
      */
@@ -30,6 +30,8 @@ public function __construct($sText, Settings $oParserSettings = null, $iLineNo =
     }
 
     /**
+     * Sets the charset to be used if the CSS does not contain an `@charset` declaration.
+     *
      * @param string $sCharset
      *
      * @return void
@@ -40,6 +42,8 @@ public function setCharset($sCharset)
     }
 
     /**
+     * Returns the charset that is used if the CSS does not contain an `@charset` declaration.
+     *
      * @return void
      */
     public function getCharset()
@@ -49,6 +53,8 @@ public function getCharset()
     }
 
     /**
+     * Parses the CSS provided to the constructor and creates a `Document` from it.
+     *
      * @return Document
      *
      * @throws SourceException
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Parsing/Anchor.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Parsing/Anchor.php
new file mode 100644
index 000000000..93789e26b
--- /dev/null
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Parsing/Anchor.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Sabberworm\CSS\Parsing;
+
+class Anchor
+{
+    /**
+     * @var int
+     */
+    private $iPosition;
+
+    /**
+     * @var \Sabberworm\CSS\Parsing\ParserState
+     */
+    private $oParserState;
+
+    /**
+     * @param int $iPosition
+     * @param \Sabberworm\CSS\Parsing\ParserState $oParserState
+     */
+    public function __construct($iPosition, ParserState $oParserState)
+    {
+        $this->iPosition = $iPosition;
+        $this->oParserState = $oParserState;
+    }
+
+    /**
+     * @return void
+     */
+    public function backtrack()
+    {
+        $this->oParserState->setPosition($this->iPosition);
+    }
+}
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Parsing/ParserState.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Parsing/ParserState.php
index e7d85ee0f..7a99f327b 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Parsing/ParserState.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Parsing/ParserState.php
@@ -33,6 +33,8 @@ class ParserState
     private $iCurrentPosition;
 
     /**
+     * will only be used if the CSS does not contain an `@charset` declaration
+     *
      * @var string
      */
     private $sCharset;
@@ -48,7 +50,7 @@ class ParserState
     private $iLineNo;
 
     /**
-     * @param string $sText
+     * @param string $sText the complete CSS as text (i.e., usually the contents of a CSS file)
      * @param int $iLineNo
      */
     public function __construct($sText, Settings $oParserSettings, $iLineNo = 1)
@@ -61,6 +63,8 @@ public function __construct($sText, Settings $oParserSettings, $iLineNo = 1)
     }
 
     /**
+     * Sets the charset to be used if the CSS does not contain an `@charset` declaration.
+     *
      * @param string $sCharset
      *
      * @return void
@@ -75,6 +79,8 @@ public function setCharset($sCharset)
     }
 
     /**
+     * Returns the charset that is used if the CSS does not contain an `@charset` declaration.
+     *
      * @return string
      */
     public function getCharset()
@@ -106,6 +112,24 @@ public function getSettings()
         return $this->oParserSettings;
     }
 
+    /**
+     * @return \Sabberworm\CSS\Parsing\Anchor
+     */
+    public function anchor()
+    {
+        return new Anchor($this->iCurrentPosition, $this);
+    }
+
+    /**
+     * @param int $iPosition
+     *
+     * @return void
+     */
+    public function setPosition($iPosition)
+    {
+        $this->iCurrentPosition = $iPosition;
+    }
+
     /**
      * @param bool $bIgnoreCase
      *
@@ -115,12 +139,15 @@ public function getSettings()
      */
     public function parseIdentifier($bIgnoreCase = true)
     {
+        if ($this->isEnd()) {
+            throw new UnexpectedEOFException('', '', 'identifier', $this->iLineNo);
+        }
         $sResult = $this->parseCharacter(true);
         if ($sResult === null) {
             throw new UnexpectedTokenException($sResult, $this->peek(5), 'identifier', $this->iLineNo);
         }
         $sCharacter = null;
-        while (($sCharacter = $this->parseCharacter(true)) !== null) {
+        while (!$this->isEnd() && ($sCharacter = $this->parseCharacter(true)) !== null) {
             if (preg_match('/[a-zA-Z0-9\x{00A0}-\x{FFFF}_-]/Sux', $sCharacter)) {
                 $sResult .= $sCharacter;
             } else {
@@ -204,7 +231,7 @@ public function parseCharacter($bIsForIdentifier)
      */
     public function consumeWhiteSpace()
     {
-        $comments = [];
+        $aComments = [];
         do {
             while (preg_match('/\\s/isSu', $this->peek()) === 1) {
                 $this->consume(1);
@@ -214,16 +241,16 @@ public function consumeWhiteSpace()
                     $oComment = $this->consumeComment();
                 } catch (UnexpectedEOFException $e) {
                     $this->iCurrentPosition = $this->iLength;
-                    return;
+                    return $aComments;
                 }
             } else {
                 $oComment = $this->consumeComment();
             }
             if ($oComment !== false) {
-                $comments[] = $oComment;
+                $aComments[] = $oComment;
             }
         } while ($oComment !== false);
-        return $comments;
+        return $aComments;
     }
 
     /**
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Property/Charset.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Property/Charset.php
index 3ee0c3d04..26e1b250a 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Property/Charset.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Property/Charset.php
@@ -4,6 +4,7 @@
 
 use Sabberworm\CSS\Comment\Comment;
 use Sabberworm\CSS\OutputFormat;
+use Sabberworm\CSS\Value\CSSString;
 
 /**
  * Class representing an `@charset` rule.
@@ -16,9 +17,9 @@
 class Charset implements AtRule
 {
     /**
-     * @var string
+     * @var CSSString
      */
-    private $sCharset;
+    private $oCharset;
 
     /**
      * @var int
@@ -31,12 +32,12 @@ class Charset implements AtRule
     protected $aComments;
 
     /**
-     * @param string $sCharset
+     * @param CSSString $oCharset
      * @param int $iLineNo
      */
-    public function __construct($sCharset, $iLineNo = 0)
+    public function __construct(CSSString $oCharset, $iLineNo = 0)
     {
-        $this->sCharset = $sCharset;
+        $this->oCharset = $oCharset;
         $this->iLineNo = $iLineNo;
         $this->aComments = [];
     }
@@ -50,13 +51,14 @@ public function getLineNo()
     }
 
     /**
-     * @param string $sCharset
+     * @param string|CSSString $oCharset
      *
      * @return void
      */
     public function setCharset($sCharset)
     {
-        $this->sCharset = $sCharset;
+        $sCharset = $sCharset instanceof CSSString ? $sCharset : new CSSString($sCharset);
+        $this->oCharset = $sCharset;
     }
 
     /**
@@ -64,7 +66,7 @@ public function setCharset($sCharset)
      */
     public function getCharset()
     {
-        return $this->sCharset;
+        return $this->oCharset->getString();
     }
 
     /**
@@ -80,7 +82,7 @@ public function __toString()
      */
     public function render(OutputFormat $oOutputFormat)
     {
-        return "@charset {$this->sCharset->render($oOutputFormat)};";
+        return "{$oOutputFormat->comments($this)}@charset {$this->oCharset->render($oOutputFormat)};";
     }
 
     /**
@@ -96,7 +98,7 @@ public function atRuleName()
      */
     public function atRuleArgs()
     {
-        return $this->sCharset;
+        return $this->oCharset;
     }
 
     /**
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Property/Import.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Property/Import.php
index a2253016b..d715a7a04 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Property/Import.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Property/Import.php
@@ -83,7 +83,7 @@ public function __toString()
      */
     public function render(OutputFormat $oOutputFormat)
     {
-        return "@import " . $this->oLocation->render($oOutputFormat)
+        return $oOutputFormat->comments($this) . "@import " . $this->oLocation->render($oOutputFormat)
             . ($this->sMediaQuery === null ? '' : ' ' . $this->sMediaQuery) . ';';
     }
 
@@ -134,4 +134,12 @@ public function setComments(array $aComments)
     {
         $this->aComments = $aComments;
     }
+
+    /**
+     * @return string
+     */
+    public function getMediaQuery()
+    {
+        return $this->sMediaQuery;
+    }
 }
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Rule/Rule.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Rule/Rule.php
index c1ea6df74..fc00c8808 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Rule/Rule.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Rule/Rule.php
@@ -13,8 +13,9 @@
 use Sabberworm\CSS\Value\Value;
 
 /**
- * RuleSets contains Rule objects which always have a key and a value.
- * In CSS, Rules are expressed as follows: “key: value[0][0] value[0][1], value[1][0] value[1][1];�
+ * `Rule`s just have a string key (the rule) and a 'Value'.
+ *
+ * In CSS, `Rule`s are expressed as follows: “key: value[0][0] value[0][1], value[1][0] value[1][1];�
  */
 class Rule implements Renderable, Commentable
 {
@@ -24,7 +25,7 @@ class Rule implements Renderable, Commentable
     private $sRule;
 
     /**
-     * @var RuleValueList|null
+     * @var RuleValueList|string|null
      */
     private $mValue;
 
@@ -171,7 +172,7 @@ public function getRule()
     }
 
     /**
-     * @return RuleValueList|null
+     * @return RuleValueList|string|null
      */
     public function getValue()
     {
@@ -179,7 +180,7 @@ public function getValue()
     }
 
     /**
-     * @param RuleValueList|null $mValue
+     * @param RuleValueList|string|null $mValue
      *
      * @return void
      */
@@ -346,8 +347,8 @@ public function __toString()
      */
     public function render(OutputFormat $oOutputFormat)
     {
-        $sResult = "{$this->sRule}:{$oOutputFormat->spaceAfterRuleName()}";
-        if ($this->mValue instanceof Value) { //Can also be a ValueList
+        $sResult = "{$oOutputFormat->comments($this)}{$this->sRule}:{$oOutputFormat->spaceAfterRuleName()}";
+        if ($this->mValue instanceof Value) { // Can also be a ValueList
             $sResult .= $this->mValue->render($oOutputFormat);
         } else {
             $sResult .= $this->mValue;
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/RuleSet/AtRuleSet.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/RuleSet/AtRuleSet.php
index 88bc5bd31..aab6d799d 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/RuleSet/AtRuleSet.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/RuleSet/AtRuleSet.php
@@ -6,7 +6,10 @@
 use Sabberworm\CSS\Property\AtRule;
 
 /**
- * A RuleSet constructed by an unknown at-rule. `@font-face` rules are rendered into AtRuleSet objects.
+ * This class represents rule sets for generic at-rules which are not covered by specific classes, i.e., not
+ * `@import`, `@charset` or `@media`.
+ *
+ * A common example for this is `@font-face`.
  */
 class AtRuleSet extends RuleSet implements AtRule
 {
@@ -61,12 +64,13 @@ public function __toString()
      */
     public function render(OutputFormat $oOutputFormat)
     {
+        $sResult = $oOutputFormat->comments($this);
         $sArgs = $this->sArgs;
         if ($sArgs) {
             $sArgs = ' ' . $sArgs;
         }
-        $sResult = "@{$this->sType}$sArgs{$oOutputFormat->spaceBeforeOpeningBrace()}{";
-        $sResult .= parent::render($oOutputFormat);
+        $sResult .= "@{$this->sType}$sArgs{$oOutputFormat->spaceBeforeOpeningBrace()}{";
+        $sResult .= $this->renderRules($oOutputFormat);
         $sResult .= '}';
         return $sResult;
     }
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/RuleSet/DeclarationBlock.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/RuleSet/DeclarationBlock.php
index c27cdd4c8..b218bd8c4 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/RuleSet/DeclarationBlock.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/RuleSet/DeclarationBlock.php
@@ -19,7 +19,10 @@
 use Sabberworm\CSS\Value\Value;
 
 /**
- * Declaration blocks are the parts of a CSS file which denote the rules belonging to a selector.
+ * This class represents a `RuleSet` constrained by a `Selector`.
+ *
+ * It contains an array of selector objects (comma-separated in the CSS) as well as the rules to be applied to the
+ * matching elements.
  *
  * Declaration blocks usually appear directly inside a `Document` or another `CSSList` (mostly a `MediaQuery`).
  */
@@ -562,6 +565,7 @@ public function expandListStyleShorthand()
     public function createShorthandProperties(array $aProperties, $sShorthand)
     {
         $aRules = $this->getRulesAssoc();
+        $oRule = null;
         $aNewValues = [];
         foreach ($aProperties as $sProperty) {
             if (!isset($aRules[$sProperty])) {
@@ -582,7 +586,7 @@ public function createShorthandProperties(array $aProperties, $sShorthand)
                 $this->removeRule($sProperty);
             }
         }
-        if (count($aNewValues)) {
+        if ($aNewValues !== [] && $oRule instanceof Rule) {
             $oNewRule = new Rule($sShorthand, $oRule->getLineNo(), $oRule->getColNo());
             foreach ($aNewValues as $mValue) {
                 $oNewRule->addValue($mValue);
@@ -812,18 +816,19 @@ public function __toString()
      */
     public function render(OutputFormat $oOutputFormat)
     {
+        $sResult = $oOutputFormat->comments($this);
         if (count($this->aSelectors) === 0) {
             // If all the selectors have been removed, this declaration block becomes invalid
             throw new OutputException("Attempt to print declaration block with missing selector", $this->iLineNo);
         }
-        $sResult = $oOutputFormat->sBeforeDeclarationBlock;
+        $sResult .= $oOutputFormat->sBeforeDeclarationBlock;
         $sResult .= $oOutputFormat->implode(
             $oOutputFormat->spaceBeforeSelectorSeparator() . ',' . $oOutputFormat->spaceAfterSelectorSeparator(),
             $this->aSelectors
         );
         $sResult .= $oOutputFormat->sAfterDeclarationBlockSelectors;
         $sResult .= $oOutputFormat->spaceBeforeOpeningBrace() . '{';
-        $sResult .= parent::render($oOutputFormat);
+        $sResult .= $this->renderRules($oOutputFormat);
         $sResult .= '}';
         $sResult .= $oOutputFormat->sAfterDeclarationBlock;
         return $sResult;
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/RuleSet/RuleSet.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/RuleSet/RuleSet.php
index 9404bb0bd..adb9be922 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/RuleSet/RuleSet.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/RuleSet/RuleSet.php
@@ -12,8 +12,13 @@
 use Sabberworm\CSS\Rule\Rule;
 
 /**
- * RuleSet is a generic superclass denoting rules. The typical example for rule sets are declaration block.
- * However, unknown At-Rules (like `@font-face`) are also rule sets.
+ * This class is a container for individual 'Rule's.
+ *
+ * The most common form of a rule set is one constrained by a selector, i.e., a `DeclarationBlock`.
+ * However, unknown `AtRule`s (like `@font-face`) are rule sets as well.
+ *
+ * If you want to manipulate a `RuleSet`, use the methods `addRule(Rule $rule)`, `getRules()` and `removeRule($rule)`
+ * (which accepts either a `Rule` or a rule name; optionally suffixed by a dash to remove all related rules).
  */
 abstract class RuleSet implements Renderable, Commentable
 {
@@ -266,23 +271,24 @@ public function __toString()
     /**
      * @return string
      */
-    public function render(OutputFormat $oOutputFormat)
+    protected function renderRules(OutputFormat $oOutputFormat)
     {
         $sResult = '';
         $bIsFirst = true;
+        $oNextLevel = $oOutputFormat->nextLevel();
         foreach ($this->aRules as $aRules) {
             foreach ($aRules as $oRule) {
-                $sRendered = $oOutputFormat->safely(function () use ($oRule, $oOutputFormat) {
-                    return $oRule->render($oOutputFormat->nextLevel());
+                $sRendered = $oNextLevel->safely(function () use ($oRule, $oNextLevel) {
+                    return $oRule->render($oNextLevel);
                 });
                 if ($sRendered === null) {
                     continue;
                 }
                 if ($bIsFirst) {
                     $bIsFirst = false;
-                    $sResult .= $oOutputFormat->nextLevel()->spaceBeforeRules();
+                    $sResult .= $oNextLevel->spaceBeforeRules();
                 } else {
-                    $sResult .= $oOutputFormat->nextLevel()->spaceBetweenRules();
+                    $sResult .= $oNextLevel->spaceBetweenRules();
                 }
                 $sResult .= $sRendered;
             }
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Settings.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Settings.php
index 7b8580962..79d99803c 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Settings.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Settings.php
@@ -11,7 +11,8 @@ class Settings
 {
     /**
      * Multi-byte string support.
-     * If true (mbstring extension must be enabled), will use (slower) `mb_strlen`, `mb_convert_case`, `mb_substr`
+     *
+     * If `true` (`mbstring` extension must be enabled), will use (slower) `mb_strlen`, `mb_convert_case`, `mb_substr`
      * and `mb_strpos` functions. Otherwise, the normal (ASCII-Only) functions will be used.
      *
      * @var bool
@@ -19,15 +20,14 @@ class Settings
     public $bMultibyteSupport;
 
     /**
-     * The default charset for the CSS if no `@charset` rule is found. Defaults to utf-8.
+     * The default charset for the CSS if no `@charset` declaration is found. Defaults to utf-8.
      *
      * @var string
      */
     public $sDefaultCharset = 'utf-8';
 
     /**
-     * Lenient parsing. When used (which is true by default), the parser will not choke
-     * on unexpected tokens but simply ignore them.
+     * Whether the parser silently ignore invalid rules instead of choking on them.
      *
      * @var bool
      */
@@ -47,6 +47,11 @@ public static function create()
     }
 
     /**
+     * Enables/disables multi-byte string support.
+     *
+     * If `true` (`mbstring` extension must be enabled), will use (slower) `mb_strlen`, `mb_convert_case`, `mb_substr`
+     * and `mb_strpos` functions. Otherwise, the normal (ASCII-Only) functions will be used.
+     *
      * @param bool $bMultibyteSupport
      *
      * @return self fluent interface
@@ -58,6 +63,8 @@ public function withMultibyteSupport($bMultibyteSupport = true)
     }
 
     /**
+     * Sets the charset to be used if the CSS does not contain an `@charset` declaration.
+     *
      * @param string $sDefaultCharset
      *
      * @return self fluent interface
@@ -69,6 +76,8 @@ public function withDefaultCharset($sDefaultCharset)
     }
 
     /**
+     * Configures whether the parser should silently ignore invalid rules.
+     *
      * @param bool $bLenientParsing
      *
      * @return self fluent interface
@@ -80,6 +89,8 @@ public function withLenientParsing($bLenientParsing = true)
     }
 
     /**
+     * Configures the parser to choke on invalid rules.
+     *
      * @return self fluent interface
      */
     public function beStrict()
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/CSSFunction.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/CSSFunction.php
index e6b8c1189..300dc3ec0 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/CSSFunction.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/CSSFunction.php
@@ -3,7 +3,12 @@
 namespace Sabberworm\CSS\Value;
 
 use Sabberworm\CSS\OutputFormat;
+use Sabberworm\CSS\Parsing\ParserState;
 
+/**
+ * A `CSSFunction` represents a special kind of value that also contains a function name and where the values are the
+ * function’s arguments. It also handles equals-sign-separated argument lists like `filter: alpha(opacity=90);`.
+ */
 class CSSFunction extends ValueList
 {
     /**
@@ -28,6 +33,26 @@ public function __construct($sName, $aArguments, $sSeparator = ',', $iLineNo = 0
         parent::__construct($aArguments, $sSeparator, $iLineNo);
     }
 
+    /**
+     * @param ParserState $oParserState
+     * @param bool $bIgnoreCase
+     *
+     * @return CSSFunction
+     *
+     * @throws SourceException
+     * @throws UnexpectedEOFException
+     * @throws UnexpectedTokenException
+     */
+    public static function parse(ParserState $oParserState, $bIgnoreCase = false)
+    {
+        $mResult = $oParserState->parseIdentifier($bIgnoreCase);
+        $oParserState->consume('(');
+        $aArguments = Value::parseValue($oParserState, ['=', ' ', ',']);
+        $mResult = new CSSFunction($mResult, $aArguments, ',', $oParserState->currentLine());
+        $oParserState->consume(')');
+        return $mResult;
+    }
+
     /**
      * @return string
      */
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/CSSString.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/CSSString.php
index 9fafedd7a..da498d411 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/CSSString.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/CSSString.php
@@ -8,6 +8,11 @@
 use Sabberworm\CSS\Parsing\UnexpectedEOFException;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 
+/**
+ * This class is a wrapper for quoted strings to distinguish them from keywords.
+ *
+ * `CSSString`s always output with double quotes.
+ */
 class CSSString extends PrimitiveValue
 {
     /**
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/CalcFunction.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/CalcFunction.php
index 5c92e0c08..5ffd071f9 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/CalcFunction.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/CalcFunction.php
@@ -19,20 +19,35 @@ class CalcFunction extends CSSFunction
     const T_OPERATOR = 2;
 
     /**
+     * @param ParserState $oParserState
+     * @param bool $bIgnoreCase
+     *
      * @return CalcFunction
      *
      * @throws UnexpectedTokenException
      * @throws UnexpectedEOFException
      */
-    public static function parse(ParserState $oParserState)
+    public static function parse(ParserState $oParserState, $bIgnoreCase = false)
     {
         $aOperators = ['+', '-', '*', '/'];
-        $sFunction = trim($oParserState->consumeUntil('(', false, true));
+        $sFunction = $oParserState->parseIdentifier();
+        if ($oParserState->peek() != '(') {
+            // Found ; or end of line before an opening bracket
+            throw new UnexpectedTokenException('(', $oParserState->peek(), 'literal', $oParserState->currentLine());
+        } elseif (!in_array($sFunction, ['calc', '-moz-calc', '-webkit-calc'])) {
+            // Found invalid calc definition. Example calc (...
+            throw new UnexpectedTokenException('calc', $sFunction, 'literal', $oParserState->currentLine());
+        }
+        $oParserState->consume('(');
         $oCalcList = new CalcRuleValueList($oParserState->currentLine());
         $oList = new RuleValueList(',', $oParserState->currentLine());
         $iNestingLevel = 0;
         $iLastComponentType = null;
         while (!$oParserState->comes(')') || $iNestingLevel > 0) {
+            if ($oParserState->isEnd() && $iNestingLevel === 0) {
+                break;
+            }
+
             $oParserState->consumeWhiteSpace();
             if ($oParserState->comes('(')) {
                 $iNestingLevel++;
@@ -83,7 +98,9 @@ public static function parse(ParserState $oParserState)
             $oParserState->consumeWhiteSpace();
         }
         $oList->addListComponent($oCalcList);
-        $oParserState->consume(')');
+        if (!$oParserState->isEnd()) {
+            $oParserState->consume(')');
+        }
         return new CalcFunction($sFunction, $oList, ',', $oParserState->currentLine());
     }
 }
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/Color.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/Color.php
index 8dc52960c..1cf00ccec 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/Color.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/Color.php
@@ -7,6 +7,10 @@
 use Sabberworm\CSS\Parsing\UnexpectedEOFException;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 
+/**
+ * `Color's can be input in the form #rrggbb, #rgb or schema(val1, val2, …) but are always stored as an array of
+ * ('s' => val1, 'c' => val2, 'h' => val3, …) and output in the second form.
+ */
 class Color extends CSSFunction
 {
     /**
@@ -19,12 +23,15 @@ public function __construct(array $aColor, $iLineNo = 0)
     }
 
     /**
+     * @param ParserState $oParserState
+     * @param bool $bIgnoreCase
+     *
      * @return Color|CSSFunction
      *
      * @throws UnexpectedEOFException
      * @throws UnexpectedTokenException
      */
-    public static function parse(ParserState $oParserState)
+    public static function parse(ParserState $oParserState, $bIgnoreCase = false)
     {
         $aColor = [];
         if ($oParserState->comes('#')) {
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/RuleValueList.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/RuleValueList.php
index 5d533a7cb..8fe88b610 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/RuleValueList.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/RuleValueList.php
@@ -2,6 +2,11 @@
 
 namespace Sabberworm\CSS\Value;
 
+/**
+ * This class is used to represent all multivalued rules like `font: bold 12px/3 Helvetica, Verdana, sans-serif;`
+ * (where the value would be a whitespace-separated list of the primitive value `bold`, a slash-separated list
+ * and a comma-separated list).
+ */
 class RuleValueList extends ValueList
 {
     /**
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/Size.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/Size.php
index b3801dc17..36a323814 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/Size.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/Size.php
@@ -7,6 +7,9 @@
 use Sabberworm\CSS\Parsing\UnexpectedEOFException;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 
+/**
+ * A `Size` consists of a numeric `size` value and a unit.
+ */
 class Size extends PrimitiveValue
 {
     /**
@@ -24,7 +27,7 @@ class Size extends PrimitiveValue
     /**
      * @var array<int, string>
      */
-    const NON_SIZE_UNITS = ['deg', 'grad', 'rad', 's', 'ms', 'turns', 'Hz', 'kHz'];
+    const NON_SIZE_UNITS = ['deg', 'grad', 'rad', 's', 'ms', 'turn', 'Hz', 'kHz'];
 
     /**
      * @var array<int, array<string, string>>|null
@@ -74,9 +77,16 @@ public static function parse(ParserState $oParserState, $bIsColorComponent = fal
         if ($oParserState->comes('-')) {
             $sSize .= $oParserState->consume('-');
         }
-        while (is_numeric($oParserState->peek()) || $oParserState->comes('.')) {
+        while (is_numeric($oParserState->peek()) || $oParserState->comes('.') || $oParserState->comes('e', true)) {
             if ($oParserState->comes('.')) {
                 $sSize .= $oParserState->consume('.');
+            } elseif ($oParserState->comes('e', true)) {
+                $sLookahead = $oParserState->peek(1, 1);
+                if (is_numeric($sLookahead) || $sLookahead === '+' || $sLookahead === '-') {
+                    $sSize .= $oParserState->consume(2);
+                } else {
+                    break; // Reached the unit part of the number like "em" or "ex"
+                }
             } else {
                 $sSize .= $oParserState->consume(1);
             }
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/URL.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/URL.php
index 1467d505c..cdb911c38 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/URL.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/URL.php
@@ -8,6 +8,9 @@
 use Sabberworm\CSS\Parsing\UnexpectedEOFException;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 
+/**
+ * This class represents URLs in CSS. `URL`s always output in `URL("")` notation.
+ */
 class URL extends PrimitiveValue
 {
     /**
@@ -33,11 +36,21 @@ public function __construct(CSSString $oURL, $iLineNo = 0)
      */
     public static function parse(ParserState $oParserState)
     {
-        $bUseUrl = $oParserState->comes('url', true);
+        $oAnchor = $oParserState->anchor();
+        $sIdentifier = '';
+        for ($i = 0; $i < 3; $i++) {
+            $sChar = $oParserState->parseCharacter(true);
+            if ($sChar === null) {
+                break;
+            }
+            $sIdentifier .= $sChar;
+        }
+        $bUseUrl = $oParserState->streql($sIdentifier, 'url');
         if ($bUseUrl) {
-            $oParserState->consume('url');
             $oParserState->consumeWhiteSpace();
             $oParserState->consume('(');
+        } else {
+            $oAnchor->backtrack();
         }
         $oParserState->consumeWhiteSpace();
         $oResult = new URL(CSSString::parse($oParserState), $oParserState->currentLine());
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/Value.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/Value.php
index 66cb9fd47..ce6d5790a 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/Value.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/Value.php
@@ -8,6 +8,10 @@
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 use Sabberworm\CSS\Renderable;
 
+/**
+ * Abstract base class for specific classes of CSS values: `Size`, `Color`, `CSSString` and `URL`, and another
+ * abstract subclass `ValueList`.
+ */
 abstract class Value implements Renderable
 {
     /**
@@ -39,8 +43,9 @@ public static function parseValue(ParserState $oParserState, array $aListDelimit
         //Build a list of delimiters and parsed values
         while (
             !($oParserState->comes('}') || $oParserState->comes(';') || $oParserState->comes('!')
-            || $oParserState->comes(')')
-            || $oParserState->comes('\\'))
+                || $oParserState->comes(')')
+                || $oParserState->comes('\\')
+                || $oParserState->isEnd())
         ) {
             if (count($aStack) > 0) {
                 $bFoundDelimiter = false;
@@ -101,16 +106,25 @@ public static function parseValue(ParserState $oParserState, array $aListDelimit
      */
     public static function parseIdentifierOrFunction(ParserState $oParserState, $bIgnoreCase = false)
     {
-        $sResult = $oParserState->parseIdentifier($bIgnoreCase);
+        $oAnchor = $oParserState->anchor();
+        $mResult = $oParserState->parseIdentifier($bIgnoreCase);
 
         if ($oParserState->comes('(')) {
-            $oParserState->consume('(');
-            $aArguments = Value::parseValue($oParserState, ['=', ' ', ',']);
-            $sResult = new CSSFunction($sResult, $aArguments, ',', $oParserState->currentLine());
-            $oParserState->consume(')');
+            $oAnchor->backtrack();
+            if ($oParserState->streql('url', $mResult)) {
+                $mResult = URL::parse($oParserState);
+            } elseif (
+                $oParserState->streql('calc', $mResult)
+                || $oParserState->streql('-webkit-calc', $mResult)
+                || $oParserState->streql('-moz-calc', $mResult)
+            ) {
+                $mResult = CalcFunction::parse($oParserState);
+            } else {
+                $mResult = CSSFunction::parse($oParserState, $bIgnoreCase);
+            }
         }
 
-        return $sResult;
+        return $mResult;
     }
 
     /**
@@ -133,13 +147,6 @@ public static function parsePrimitiveValue(ParserState $oParserState)
             $oValue = Size::parse($oParserState);
         } elseif ($oParserState->comes('#') || $oParserState->comes('rgb', true) || $oParserState->comes('hsl', true)) {
             $oValue = Color::parse($oParserState);
-        } elseif ($oParserState->comes('url', true)) {
-            $oValue = URL::parse($oParserState);
-        } elseif (
-            $oParserState->comes('calc', true) || $oParserState->comes('-webkit-calc', true)
-            || $oParserState->comes('-moz-calc', true)
-        ) {
-            $oValue = CalcFunction::parse($oParserState);
         } elseif ($oParserState->comes("'") || $oParserState->comes('"')) {
             $oValue = CSSString::parse($oParserState);
         } elseif ($oParserState->comes("progid:") && $oParserState->getSettings()->bLenientParsing) {
diff --git a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/ValueList.php b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/ValueList.php
index af5348b96..a93acc7b6 100644
--- a/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/ValueList.php
+++ b/www/modules/civicrm/vendor/sabberworm/php-css-parser/src/Value/ValueList.php
@@ -4,6 +4,12 @@
 
 use Sabberworm\CSS\OutputFormat;
 
+/**
+ * A `ValueList` represents a lists of `Value`s, separated by some separation character
+ * (mostly `,`, whitespace, or `/`).
+ *
+ * There are two types of `ValueList`s: `RuleValueList` and `CSSFunction`
+ */
 abstract class ValueList extends Value
 {
     /**
diff --git a/www/modules/civicrm/vendor/symfony/polyfill-php80/LICENSE b/www/modules/civicrm/vendor/symfony/polyfill-php80/LICENSE
index 5593b1d84..0ed3a2465 100644
--- a/www/modules/civicrm/vendor/symfony/polyfill-php80/LICENSE
+++ b/www/modules/civicrm/vendor/symfony/polyfill-php80/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2020 Fabien Potencier
+Copyright (c) 2020-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/www/modules/civicrm/vendor/symfony/polyfill-php80/composer.json b/www/modules/civicrm/vendor/symfony/polyfill-php80/composer.json
index bd9a3262a..46ccde203 100644
--- a/www/modules/civicrm/vendor/symfony/polyfill-php80/composer.json
+++ b/www/modules/civicrm/vendor/symfony/polyfill-php80/composer.json
@@ -29,9 +29,6 @@
     },
     "minimum-stability": "dev",
     "extra": {
-        "branch-alias": {
-            "dev-main": "1.27-dev"
-        },
         "thanks": {
             "name": "symfony/polyfill",
             "url": "https://github.com/symfony/polyfill"
diff --git a/www/modules/civicrm/vendor/symfony/process/CHANGELOG.md b/www/modules/civicrm/vendor/symfony/process/CHANGELOG.md
index 69d4cbd77..31b9ee6a2 100644
--- a/www/modules/civicrm/vendor/symfony/process/CHANGELOG.md
+++ b/www/modules/civicrm/vendor/symfony/process/CHANGELOG.md
@@ -1,6 +1,26 @@
 CHANGELOG
 =========
 
+5.2.0
+-----
+
+ * added `Process::setOptions()` to set `Process` specific options
+ * added option `create_new_console` to allow a subprocess to continue
+   to run after the main script exited, both on Linux and on Windows
+
+5.1.0
+-----
+
+ * added `Process::getStartTime()` to retrieve the start time of the process as float
+
+5.0.0
+-----
+
+ * removed `Process::inheritEnvironmentVariables()`
+ * removed `PhpProcess::setPhpBinary()`
+ * `Process` must be instantiated with a command array, use `Process::fromShellCommandline()` when the command should be parsed by the shell
+ * removed `Process::setCommandLine()`
+
 4.4.0
 -----
 
diff --git a/www/modules/civicrm/vendor/symfony/process/ExecutableFinder.php b/www/modules/civicrm/vendor/symfony/process/ExecutableFinder.php
index ff68ed331..f392c962e 100644
--- a/www/modules/civicrm/vendor/symfony/process/ExecutableFinder.php
+++ b/www/modules/civicrm/vendor/symfony/process/ExecutableFinder.php
@@ -31,10 +31,8 @@ public function setSuffixes(array $suffixes)
 
     /**
      * Adds new possible suffix to check for executable.
-     *
-     * @param string $suffix
      */
-    public function addSuffix($suffix)
+    public function addSuffix(string $suffix)
     {
         $this->suffixes[] = $suffix;
     }
@@ -46,12 +44,12 @@ public function addSuffix($suffix)
      * @param string|null $default   The default to return if no executable is found
      * @param array       $extraDirs Additional dirs to check into
      *
-     * @return string|null The executable path or default value
+     * @return string|null
      */
-    public function find($name, $default = null, array $extraDirs = [])
+    public function find(string $name, ?string $default = null, array $extraDirs = [])
     {
-        if (ini_get('open_basedir')) {
-            $searchPath = array_merge(explode(\PATH_SEPARATOR, ini_get('open_basedir')), $extraDirs);
+        if (\ini_get('open_basedir')) {
+            $searchPath = array_merge(explode(\PATH_SEPARATOR, \ini_get('open_basedir')), $extraDirs);
             $dirs = [];
             foreach ($searchPath as $path) {
                 // Silencing against https://bugs.php.net/69240
diff --git a/www/modules/civicrm/vendor/symfony/process/InputStream.php b/www/modules/civicrm/vendor/symfony/process/InputStream.php
index 4f8f71331..0c45b5245 100644
--- a/www/modules/civicrm/vendor/symfony/process/InputStream.php
+++ b/www/modules/civicrm/vendor/symfony/process/InputStream.php
@@ -17,6 +17,8 @@
  * Provides a way to continuously write to the input of a Process until the InputStream is closed.
  *
  * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @implements \IteratorAggregate<int, string>
  */
 class InputStream implements \IteratorAggregate
 {
@@ -28,7 +30,7 @@ class InputStream implements \IteratorAggregate
     /**
      * Sets a callback that is called when the write buffer becomes empty.
      */
-    public function onEmpty(callable $onEmpty = null)
+    public function onEmpty(?callable $onEmpty = null)
     {
         $this->onEmpty = $onEmpty;
     }
@@ -67,7 +69,7 @@ public function isClosed()
     }
 
     /**
-     * @return \Traversable
+     * @return \Traversable<int, string>
      */
     #[\ReturnTypeWillChange]
     public function getIterator()
diff --git a/www/modules/civicrm/vendor/symfony/process/LICENSE b/www/modules/civicrm/vendor/symfony/process/LICENSE
index 88bf75bb4..0138f8f07 100644
--- a/www/modules/civicrm/vendor/symfony/process/LICENSE
+++ b/www/modules/civicrm/vendor/symfony/process/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2022 Fabien Potencier
+Copyright (c) 2004-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/www/modules/civicrm/vendor/symfony/process/PhpExecutableFinder.php b/www/modules/civicrm/vendor/symfony/process/PhpExecutableFinder.php
index 92e0262ad..45dbcca43 100644
--- a/www/modules/civicrm/vendor/symfony/process/PhpExecutableFinder.php
+++ b/www/modules/civicrm/vendor/symfony/process/PhpExecutableFinder.php
@@ -29,15 +29,13 @@ public function __construct()
     /**
      * Finds The PHP executable.
      *
-     * @param bool $includeArgs Whether or not include command arguments
-     *
-     * @return string|false The PHP executable path or false if it cannot be found
+     * @return string|false
      */
-    public function find($includeArgs = true)
+    public function find(bool $includeArgs = true)
     {
         if ($php = getenv('PHP_BINARY')) {
             if (!is_executable($php)) {
-                $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v';
+                $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v --';
                 if ($php = strtok(exec($command.' '.escapeshellarg($php)), \PHP_EOL)) {
                     if (!is_executable($php)) {
                         return false;
@@ -58,7 +56,7 @@ public function find($includeArgs = true)
         $args = $includeArgs && $args ? ' '.implode(' ', $args) : '';
 
         // PHP_BINARY return the current sapi executable
-        if (\PHP_BINARY && \in_array(\PHP_SAPI, ['cgi-fcgi', 'cli', 'cli-server', 'phpdbg'], true)) {
+        if (\PHP_BINARY && \in_array(\PHP_SAPI, ['cli', 'cli-server', 'phpdbg'], true)) {
             return \PHP_BINARY.$args;
         }
 
@@ -91,7 +89,7 @@ public function find($includeArgs = true)
     /**
      * Finds the PHP executable arguments.
      *
-     * @return array The PHP executable arguments
+     * @return array
      */
     public function findArguments()
     {
diff --git a/www/modules/civicrm/vendor/symfony/process/PhpProcess.php b/www/modules/civicrm/vendor/symfony/process/PhpProcess.php
index dc064e0b8..3a1d147c8 100644
--- a/www/modules/civicrm/vendor/symfony/process/PhpProcess.php
+++ b/www/modules/civicrm/vendor/symfony/process/PhpProcess.php
@@ -32,7 +32,7 @@ class PhpProcess extends Process
      * @param int         $timeout The timeout in seconds
      * @param array|null  $php     Path to the PHP binary to use with any additional arguments
      */
-    public function __construct(string $script, string $cwd = null, array $env = null, int $timeout = 60, array $php = null)
+    public function __construct(string $script, ?string $cwd = null, ?array $env = null, int $timeout = 60, ?array $php = null)
     {
         if (null === $php) {
             $executableFinder = new PhpExecutableFinder();
@@ -53,27 +53,15 @@ public function __construct(string $script, string $cwd = null, array $env = nul
     /**
      * {@inheritdoc}
      */
-    public static function fromShellCommandline(string $command, string $cwd = null, array $env = null, $input = null, ?float $timeout = 60)
+    public static function fromShellCommandline(string $command, ?string $cwd = null, ?array $env = null, $input = null, ?float $timeout = 60)
     {
         throw new LogicException(sprintf('The "%s()" method cannot be called when using "%s".', __METHOD__, self::class));
     }
 
-    /**
-     * Sets the path to the PHP binary to use.
-     *
-     * @deprecated since Symfony 4.2, use the $php argument of the constructor instead.
-     */
-    public function setPhpBinary($php)
-    {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2, use the $php argument of the constructor instead.', __METHOD__), \E_USER_DEPRECATED);
-
-        $this->setCommandLine($php);
-    }
-
     /**
      * {@inheritdoc}
      */
-    public function start(callable $callback = null, array $env = [])
+    public function start(?callable $callback = null, array $env = [])
     {
         if (null === $this->getCommandLine()) {
             throw new RuntimeException('Unable to find the PHP executable.');
diff --git a/www/modules/civicrm/vendor/symfony/process/Pipes/AbstractPipes.php b/www/modules/civicrm/vendor/symfony/process/Pipes/AbstractPipes.php
index ab65866c2..656dc0328 100644
--- a/www/modules/civicrm/vendor/symfony/process/Pipes/AbstractPipes.php
+++ b/www/modules/civicrm/vendor/symfony/process/Pipes/AbstractPipes.php
@@ -104,8 +104,8 @@ protected function write(): ?array
                 stream_set_blocking($input, 0);
             } elseif (!isset($this->inputBuffer[0])) {
                 if (!\is_string($input)) {
-                    if (!is_scalar($input)) {
-                        throw new InvalidArgumentException(sprintf('"%s" yielded a value of type "%s", but only scalars and stream resources are supported.', \get_class($this->input), \gettype($input)));
+                    if (!\is_scalar($input)) {
+                        throw new InvalidArgumentException(sprintf('"%s" yielded a value of type "%s", but only scalars and stream resources are supported.', get_debug_type($this->input), get_debug_type($input)));
                     }
                     $input = (string) $input;
                 }
diff --git a/www/modules/civicrm/vendor/symfony/process/Pipes/UnixPipes.php b/www/modules/civicrm/vendor/symfony/process/Pipes/UnixPipes.php
index 58a8da07c..5a0e9d47f 100644
--- a/www/modules/civicrm/vendor/symfony/process/Pipes/UnixPipes.php
+++ b/www/modules/civicrm/vendor/symfony/process/Pipes/UnixPipes.php
@@ -35,10 +35,7 @@ public function __construct(?bool $ttyMode, bool $ptyMode, $input, bool $haveRea
         parent::__construct($input);
     }
 
-    /**
-     * @return array
-     */
-    public function __sleep()
+    public function __sleep(): array
     {
         throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
     }
diff --git a/www/modules/civicrm/vendor/symfony/process/Pipes/WindowsPipes.php b/www/modules/civicrm/vendor/symfony/process/Pipes/WindowsPipes.php
index 69768f3d8..968dd0262 100644
--- a/www/modules/civicrm/vendor/symfony/process/Pipes/WindowsPipes.php
+++ b/www/modules/civicrm/vendor/symfony/process/Pipes/WindowsPipes.php
@@ -88,10 +88,7 @@ public function __construct($input, bool $haveReadSupport)
         parent::__construct($input);
     }
 
-    /**
-     * @return array
-     */
-    public function __sleep()
+    public function __sleep(): array
     {
         throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
     }
@@ -152,7 +149,7 @@ public function readAndWrite(bool $blocking, bool $close = false): array
             if ($w) {
                 @stream_select($r, $w, $e, 0, Process::TIMEOUT_PRECISION * 1E6);
             } elseif ($this->fileHandles) {
-                usleep(Process::TIMEOUT_PRECISION * 1E6);
+                usleep((int) (Process::TIMEOUT_PRECISION * 1E6));
             }
         }
         foreach ($this->fileHandles as $type => $fileHandle) {
diff --git a/www/modules/civicrm/vendor/symfony/process/Process.php b/www/modules/civicrm/vendor/symfony/process/Process.php
index 09cd9602a..a4b0a784c 100644
--- a/www/modules/civicrm/vendor/symfony/process/Process.php
+++ b/www/modules/civicrm/vendor/symfony/process/Process.php
@@ -27,6 +27,8 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Romain Neutron <imprec@gmail.com>
+ *
+ * @implements \IteratorAggregate<string, string>
  */
 class Process implements \IteratorAggregate
 {
@@ -71,12 +73,14 @@ class Process implements \IteratorAggregate
     private $incrementalErrorOutputOffset = 0;
     private $tty = false;
     private $pty;
+    private $options = ['suppress_errors' => true, 'bypass_shell' => true];
 
     private $useFileHandles = false;
     /** @var PipesInterface */
     private $processPipes;
 
     private $latestSignal;
+    private $cachedExitCode;
 
     private static $sigchild;
 
@@ -137,16 +141,12 @@ class Process implements \IteratorAggregate
      *
      * @throws LogicException When proc_open is not installed
      */
-    public function __construct($command, string $cwd = null, array $env = null, $input = null, ?float $timeout = 60)
+    public function __construct(array $command, ?string $cwd = null, ?array $env = null, $input = null, ?float $timeout = 60)
     {
         if (!\function_exists('proc_open')) {
             throw new LogicException('The Process class relies on proc_open, which is not available on your PHP installation.');
         }
 
-        if (!\is_array($command)) {
-            @trigger_error(sprintf('Passing a command as string when creating a "%s" instance is deprecated since Symfony 4.2, pass it as an array of its arguments instead, or use the "Process::fromShellCommandline()" constructor if you need features provided by the shell.', __CLASS__), \E_USER_DEPRECATED);
-        }
-
         $this->commandline = $command;
         $this->cwd = $cwd;
 
@@ -190,7 +190,7 @@ public function __construct($command, string $cwd = null, array $env = null, $in
      *
      * @throws LogicException When proc_open is not installed
      */
-    public static function fromShellCommandline(string $command, string $cwd = null, array $env = null, $input = null, ?float $timeout = 60)
+    public static function fromShellCommandline(string $command, ?string $cwd = null, ?array $env = null, $input = null, ?float $timeout = 60)
     {
         $process = new static([], $cwd, $env, $input, $timeout);
         $process->commandline = $command;
@@ -213,7 +213,11 @@ public function __wakeup()
 
     public function __destruct()
     {
-        $this->stop(0);
+        if ($this->options['create_new_console'] ?? false) {
+            $this->processPipes->close();
+        } else {
+            $this->stop(0);
+        }
     }
 
     public function __clone()
@@ -244,7 +248,7 @@ public function __clone()
      *
      * @final
      */
-    public function run(callable $callback = null, array $env = []): int
+    public function run(?callable $callback = null, array $env = []): int
     {
         $this->start($callback, $env);
 
@@ -263,7 +267,7 @@ public function run(callable $callback = null, array $env = []): int
      *
      * @final
      */
-    public function mustRun(callable $callback = null, array $env = []): self
+    public function mustRun(?callable $callback = null, array $env = []): self
     {
         if (0 !== $this->run($callback, $env)) {
             throw new ProcessFailedException($this);
@@ -291,7 +295,7 @@ public function mustRun(callable $callback = null, array $env = []): self
      * @throws RuntimeException When process is already running
      * @throws LogicException   In case a callback is provided and output has been disabled
      */
-    public function start(callable $callback = null, array $env = [])
+    public function start(?callable $callback = null, array $env = [])
     {
         if ($this->isRunning()) {
             throw new RuntimeException('Process is already running.');
@@ -320,10 +324,7 @@ public function start(callable $callback = null, array $env = [])
             $commandline = $this->replacePlaceholders($commandline, $env);
         }
 
-        $options = ['suppress_errors' => true];
-
         if ('\\' === \DIRECTORY_SEPARATOR) {
-            $options['bypass_shell'] = true;
             $commandline = $this->prepareWindowsCommandLine($commandline, $env);
         } elseif (!$this->useFileHandles && $this->isSigchildEnabled()) {
             // last exit code is output on the fourth pipe and caught to work around --enable-sigchild
@@ -331,7 +332,7 @@ public function start(callable $callback = null, array $env = [])
 
             // See https://unix.stackexchange.com/questions/71205/background-process-pipe-input
             $commandline = '{ ('.$commandline.') <&3 3<&- 3>/dev/null & } 3<&0;';
-            $commandline .= 'pid=$!; echo $pid >&3; wait $pid; code=$?; echo $code >&3; exit $code';
+            $commandline .= 'pid=$!; echo $pid >&3; wait $pid 2>/dev/null; code=$?; echo $code >&3; exit $code';
 
             // Workaround for the bug, when PTS functionality is enabled.
             // @see : https://bugs.php.net/69442
@@ -349,7 +350,7 @@ public function start(callable $callback = null, array $env = [])
             throw new RuntimeException(sprintf('The provided cwd "%s" does not exist.', $this->cwd));
         }
 
-        $this->process = @proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $envPairs, $options);
+        $this->process = @proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $envPairs, $this->options);
 
         if (!\is_resource($this->process)) {
             throw new RuntimeException('Unable to launch a new process.');
@@ -385,7 +386,7 @@ public function start(callable $callback = null, array $env = [])
      *
      * @final
      */
-    public function restart(callable $callback = null, array $env = []): self
+    public function restart(?callable $callback = null, array $env = []): self
     {
         if ($this->isRunning()) {
             throw new RuntimeException('Process is already running.');
@@ -412,7 +413,7 @@ public function restart(callable $callback = null, array $env = []): self
      * @throws ProcessSignaledException When process stopped after receiving signal
      * @throws LogicException           When process is not yet started
      */
-    public function wait(callable $callback = null)
+    public function wait(?callable $callback = null)
     {
         $this->requireProcessIsStarted(__FUNCTION__);
 
@@ -428,7 +429,7 @@ public function wait(callable $callback = null)
 
         do {
             $this->checkTimeout();
-            $running = '\\' === \DIRECTORY_SEPARATOR ? $this->isRunning() : $this->processPipes->areOpen();
+            $running = $this->isRunning() && ('\\' === \DIRECTORY_SEPARATOR || $this->processPipes->areOpen());
             $this->readPipes($running, '\\' !== \DIRECTORY_SEPARATOR || !$running);
         } while ($running);
 
@@ -511,7 +512,7 @@ public function getPid()
      * @throws RuntimeException In case --enable-sigchild is activated and the process can't be killed
      * @throws RuntimeException In case of failure
      */
-    public function signal($signal)
+    public function signal(int $signal)
     {
         $this->doSignal($signal, true);
 
@@ -532,7 +533,7 @@ public function disableOutput()
             throw new RuntimeException('Disabling output while the process is running is not possible.');
         }
         if (null !== $this->idleTimeout) {
-            throw new LogicException('Output can not be disabled while an idle timeout is set.');
+            throw new LogicException('Output cannot be disabled while an idle timeout is set.');
         }
 
         $this->outputDisabled = true;
@@ -571,7 +572,7 @@ public function isOutputDisabled()
     /**
      * Returns the current output of the process (STDOUT).
      *
-     * @return string The process output
+     * @return string
      *
      * @throws LogicException in case the output has been disabled
      * @throws LogicException In case the process is not started
@@ -593,7 +594,7 @@ public function getOutput()
      * In comparison with the getOutput method which always return the whole
      * output, this one returns the new output since the last call.
      *
-     * @return string The process output since the last call
+     * @return string
      *
      * @throws LogicException in case the output has been disabled
      * @throws LogicException In case the process is not started
@@ -617,13 +618,13 @@ public function getIncrementalOutput()
      *
      * @param int $flags A bit field of Process::ITER_* flags
      *
+     * @return \Generator<string, string>
+     *
      * @throws LogicException in case the output has been disabled
      * @throws LogicException In case the process is not started
-     *
-     * @return \Generator
      */
     #[\ReturnTypeWillChange]
-    public function getIterator($flags = 0)
+    public function getIterator(int $flags = 0)
     {
         $this->readPipesForOutput(__FUNCTION__, false);
 
@@ -687,7 +688,7 @@ public function clearOutput()
     /**
      * Returns the current error output of the process (STDERR).
      *
-     * @return string The process error output
+     * @return string
      *
      * @throws LogicException in case the output has been disabled
      * @throws LogicException In case the process is not started
@@ -710,7 +711,7 @@ public function getErrorOutput()
      * whole error output, this one returns the new error output since the last
      * call.
      *
-     * @return string The process error output since the last call
+     * @return string
      *
      * @throws LogicException in case the output has been disabled
      * @throws LogicException In case the process is not started
@@ -778,7 +779,7 @@ public function getExitCodeText()
     /**
      * Checks if the process ended successfully.
      *
-     * @return bool true if the process ended successfully, false otherwise
+     * @return bool
      */
     public function isSuccessful()
     {
@@ -816,7 +817,7 @@ public function getTermSignal()
         $this->requireProcessIsTerminated(__FUNCTION__);
 
         if ($this->isSigchildEnabled() && -1 === $this->processInformation['termsig']) {
-            throw new RuntimeException('This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.');
+            throw new RuntimeException('This PHP has been compiled with --enable-sigchild. Term signal cannot be retrieved.');
         }
 
         return $this->processInformation['termsig'];
@@ -857,7 +858,7 @@ public function getStopSignal()
     /**
      * Checks if the process is currently running.
      *
-     * @return bool true if the process is currently running, false otherwise
+     * @return bool
      */
     public function isRunning()
     {
@@ -873,7 +874,7 @@ public function isRunning()
     /**
      * Checks if the process has been started with no regard to the current state.
      *
-     * @return bool true if status is ready, false otherwise
+     * @return bool
      */
     public function isStarted()
     {
@@ -883,7 +884,7 @@ public function isStarted()
     /**
      * Checks if the process is terminated.
      *
-     * @return bool true if process is terminated, false otherwise
+     * @return bool
      */
     public function isTerminated()
     {
@@ -897,7 +898,7 @@ public function isTerminated()
      *
      * The status is one of: ready, started, terminated.
      *
-     * @return string The current process status
+     * @return string
      */
     public function getStatus()
     {
@@ -910,11 +911,11 @@ public function getStatus()
      * Stops the process.
      *
      * @param int|float $timeout The timeout in seconds
-     * @param int       $signal  A POSIX signal to send in case the process has not stop at timeout, default is SIGKILL (9)
+     * @param int|null  $signal  A POSIX signal to send in case the process has not stop at timeout, default is SIGKILL (9)
      *
      * @return int|null The exit-code of the process or null if it's not running
      */
-    public function stop($timeout = 10, $signal = null)
+    public function stop(float $timeout = 10, ?int $signal = null)
     {
         $timeoutMicro = microtime(true) + $timeout;
         if ($this->isRunning()) {
@@ -982,7 +983,7 @@ public function getLastOutputTime(): ?float
     /**
      * Gets the command line to be executed.
      *
-     * @return string The command to execute
+     * @return string
      */
     public function getCommandLine()
     {
@@ -990,27 +991,9 @@ public function getCommandLine()
     }
 
     /**
-     * Sets the command line to be executed.
-     *
-     * @param string|array $commandline The command to execute
-     *
-     * @return $this
-     *
-     * @deprecated since Symfony 4.2.
-     */
-    public function setCommandLine($commandline)
-    {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), \E_USER_DEPRECATED);
-
-        $this->commandline = $commandline;
-
-        return $this;
-    }
-
-    /**
-     * Gets the process timeout (max. runtime).
+     * Gets the process timeout in seconds (max. runtime).
      *
-     * @return float|null The timeout in seconds or null if it's disabled
+     * @return float|null
      */
     public function getTimeout()
     {
@@ -1018,9 +1001,9 @@ public function getTimeout()
     }
 
     /**
-     * Gets the process idle timeout (max. time since last output).
+     * Gets the process idle timeout in seconds (max. time since last output).
      *
-     * @return float|null The timeout in seconds or null if it's disabled
+     * @return float|null
      */
     public function getIdleTimeout()
     {
@@ -1032,13 +1015,11 @@ public function getIdleTimeout()
      *
      * To disable the timeout, set this value to null.
      *
-     * @param int|float|null $timeout The timeout in seconds
-     *
      * @return $this
      *
      * @throws InvalidArgumentException if the timeout is negative
      */
-    public function setTimeout($timeout)
+    public function setTimeout(?float $timeout)
     {
         $this->timeout = $this->validateTimeout($timeout);
 
@@ -1046,21 +1027,19 @@ public function setTimeout($timeout)
     }
 
     /**
-     * Sets the process idle timeout (max. time since last output).
+     * Sets the process idle timeout (max. time since last output) in seconds.
      *
      * To disable the timeout, set this value to null.
      *
-     * @param int|float|null $timeout The timeout in seconds
-     *
      * @return $this
      *
      * @throws LogicException           if the output is disabled
      * @throws InvalidArgumentException if the timeout is negative
      */
-    public function setIdleTimeout($timeout)
+    public function setIdleTimeout(?float $timeout)
     {
         if (null !== $timeout && $this->outputDisabled) {
-            throw new LogicException('Idle timeout can not be set while the output is disabled.');
+            throw new LogicException('Idle timeout cannot be set while the output is disabled.');
         }
 
         $this->idleTimeout = $this->validateTimeout($timeout);
@@ -1071,13 +1050,11 @@ public function setIdleTimeout($timeout)
     /**
      * Enables or disables the TTY mode.
      *
-     * @param bool $tty True to enabled and false to disable
-     *
      * @return $this
      *
      * @throws RuntimeException In case the TTY mode is not supported
      */
-    public function setTty($tty)
+    public function setTty(bool $tty)
     {
         if ('\\' === \DIRECTORY_SEPARATOR && $tty) {
             throw new RuntimeException('TTY mode is not supported on Windows platform.');
@@ -1087,7 +1064,7 @@ public function setTty($tty)
             throw new RuntimeException('TTY mode requires /dev/tty to be read/writable.');
         }
 
-        $this->tty = (bool) $tty;
+        $this->tty = $tty;
 
         return $this;
     }
@@ -1095,7 +1072,7 @@ public function setTty($tty)
     /**
      * Checks if the TTY mode is enabled.
      *
-     * @return bool true if the TTY mode is enabled, false otherwise
+     * @return bool
      */
     public function isTty()
     {
@@ -1105,13 +1082,11 @@ public function isTty()
     /**
      * Sets PTY mode.
      *
-     * @param bool $bool
-     *
      * @return $this
      */
-    public function setPty($bool)
+    public function setPty(bool $bool)
     {
-        $this->pty = (bool) $bool;
+        $this->pty = $bool;
 
         return $this;
     }
@@ -1129,7 +1104,7 @@ public function isPty()
     /**
      * Gets the working directory.
      *
-     * @return string|null The current working directory or null on failure
+     * @return string|null
      */
     public function getWorkingDirectory()
     {
@@ -1145,11 +1120,9 @@ public function getWorkingDirectory()
     /**
      * Sets the current working directory.
      *
-     * @param string $cwd The new working directory
-     *
      * @return $this
      */
-    public function setWorkingDirectory($cwd)
+    public function setWorkingDirectory(string $cwd)
     {
         $this->cwd = $cwd;
 
@@ -1159,7 +1132,7 @@ public function setWorkingDirectory($cwd)
     /**
      * Gets the environment variables.
      *
-     * @return array The current environment variables
+     * @return array
      */
     public function getEnv()
     {
@@ -1183,7 +1156,7 @@ public function setEnv(array $env)
     /**
      * Gets the Process input.
      *
-     * @return resource|string|\Iterator|null The Process input
+     * @return resource|string|\Iterator|null
      */
     public function getInput()
     {
@@ -1204,7 +1177,7 @@ public function getInput()
     public function setInput($input)
     {
         if ($this->isRunning()) {
-            throw new LogicException('Input can not be set while the process is running.');
+            throw new LogicException('Input cannot be set while the process is running.');
         }
 
         $this->input = ProcessUtils::validateInput(__METHOD__, $input);
@@ -1212,26 +1185,6 @@ public function setInput($input)
         return $this;
     }
 
-    /**
-     * Sets whether environment variables will be inherited or not.
-     *
-     * @param bool $inheritEnv
-     *
-     * @return $this
-     *
-     * @deprecated since Symfony 4.4, env variables are always inherited
-     */
-    public function inheritEnvironmentVariables($inheritEnv = true)
-    {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.4, env variables are always inherited.', __METHOD__), \E_USER_DEPRECATED);
-
-        if (!$inheritEnv) {
-            throw new InvalidArgumentException('Not inheriting environment variables is not supported.');
-        }
-
-        return $this;
-    }
-
     /**
      * Performs a check between the timeout definition and the time the process started.
      *
@@ -1259,6 +1212,44 @@ public function checkTimeout()
         }
     }
 
+    /**
+     * @throws LogicException in case process is not started
+     */
+    public function getStartTime(): float
+    {
+        if (!$this->isStarted()) {
+            throw new LogicException('Start time is only available after process start.');
+        }
+
+        return $this->starttime;
+    }
+
+    /**
+     * Defines options to pass to the underlying proc_open().
+     *
+     * @see https://php.net/proc_open for the options supported by PHP.
+     *
+     * Enabling the "create_new_console" option allows a subprocess to continue
+     * to run after the main process exited, on both Windows and *nix
+     */
+    public function setOptions(array $options)
+    {
+        if ($this->isRunning()) {
+            throw new RuntimeException('Setting options while the process is running is not possible.');
+        }
+
+        $defaultOptions = $this->options;
+        $existingOptions = ['blocking_pipes', 'create_process_group', 'create_new_console'];
+
+        foreach ($options as $key => $value) {
+            if (!\in_array($key, $existingOptions)) {
+                $this->options = $defaultOptions;
+                throw new LogicException(sprintf('Invalid option "%s" passed to "%s()". Supported options are "%s".', $key, __METHOD__, implode('", "', $existingOptions)));
+            }
+            $this->options[$key] = $value;
+        }
+    }
+
     /**
      * Returns whether TTY is supported on the current operating system.
      */
@@ -1318,9 +1309,9 @@ private function getDescriptors(): array
      *
      * @param callable|null $callback The user defined PHP callback
      *
-     * @return \Closure A PHP closure
+     * @return \Closure
      */
-    protected function buildCallback(callable $callback = null)
+    protected function buildCallback(?callable $callback = null)
     {
         if ($this->outputDisabled) {
             return function ($type, $data) use ($callback): bool {
@@ -1346,7 +1337,7 @@ protected function buildCallback(callable $callback = null)
      *
      * @param bool $blocking Whether to use a blocking read call
      */
-    protected function updateStatus($blocking)
+    protected function updateStatus(bool $blocking)
     {
         if (self::STATUS_STARTED !== $this->status) {
             return;
@@ -1355,6 +1346,19 @@ protected function updateStatus($blocking)
         $this->processInformation = proc_get_status($this->process);
         $running = $this->processInformation['running'];
 
+        // In PHP < 8.3, "proc_get_status" only returns the correct exit status on the first call.
+        // Subsequent calls return -1 as the process is discarded. This workaround caches the first
+        // retrieved exit status for consistent results in later calls, mimicking PHP 8.3 behavior.
+        if (\PHP_VERSION_ID < 80300) {
+            if (!isset($this->cachedExitCode) && !$running && -1 !== $this->processInformation['exitcode']) {
+                $this->cachedExitCode = $this->processInformation['exitcode'];
+            }
+
+            if (isset($this->cachedExitCode) && !$running && -1 === $this->processInformation['exitcode']) {
+                $this->processInformation['exitcode'] = $this->cachedExitCode;
+            }
+        }
+
         $this->readPipes($running && $blocking, '\\' !== \DIRECTORY_SEPARATOR || !$running);
 
         if ($this->fallbackStatus && $this->isSigchildEnabled()) {
@@ -1509,7 +1513,7 @@ private function doSignal(int $signal, bool $throwException): bool
     {
         if (null === $pid = $this->getPid()) {
             if ($throwException) {
-                throw new LogicException('Can not send signal on a non running process.');
+                throw new LogicException('Cannot send signal on a non running process.');
             }
 
             return false;
diff --git a/www/modules/civicrm/vendor/symfony/process/ProcessUtils.php b/www/modules/civicrm/vendor/symfony/process/ProcessUtils.php
index eb39a4a9e..2a7aff71b 100644
--- a/www/modules/civicrm/vendor/symfony/process/ProcessUtils.php
+++ b/www/modules/civicrm/vendor/symfony/process/ProcessUtils.php
@@ -35,11 +35,11 @@ private function __construct()
      * @param string $caller The name of method call that validates the input
      * @param mixed  $input  The input to validate
      *
-     * @return mixed The validated input
+     * @return mixed
      *
      * @throws InvalidArgumentException In case the input is not valid
      */
-    public static function validateInput($caller, $input)
+    public static function validateInput(string $caller, $input)
     {
         if (null !== $input) {
             if (\is_resource($input)) {
@@ -48,7 +48,7 @@ public static function validateInput($caller, $input)
             if (\is_string($input)) {
                 return $input;
             }
-            if (is_scalar($input)) {
+            if (\is_scalar($input)) {
                 return (string) $input;
             }
             if ($input instanceof Process) {
diff --git a/www/modules/civicrm/vendor/symfony/process/README.md b/www/modules/civicrm/vendor/symfony/process/README.md
index afce5e45e..8777de4a6 100644
--- a/www/modules/civicrm/vendor/symfony/process/README.md
+++ b/www/modules/civicrm/vendor/symfony/process/README.md
@@ -3,6 +3,17 @@ Process Component
 
 The Process component executes commands in sub-processes.
 
+Sponsor
+-------
+
+The Process component for Symfony 5.4/6.0 is [backed][1] by [SensioLabs][2].
+
+As the creator of Symfony, SensioLabs supports companies using Symfony, with an
+offering encompassing consultancy, expertise, services, training, and technical
+assistance to ensure the success of web application development projects.
+
+Help Symfony by [sponsoring][3] its development!
+
 Resources
 ---------
 
@@ -11,3 +22,7 @@ Resources
  * [Report issues](https://github.com/symfony/symfony/issues) and
    [send Pull Requests](https://github.com/symfony/symfony/pulls)
    in the [main Symfony repository](https://github.com/symfony/symfony)
+
+[1]: https://symfony.com/backers
+[2]: https://sensiolabs.com
+[3]: https://symfony.com/sponsor
diff --git a/www/modules/civicrm/vendor/symfony/process/composer.json b/www/modules/civicrm/vendor/symfony/process/composer.json
index c0f7599f2..1669eba57 100644
--- a/www/modules/civicrm/vendor/symfony/process/composer.json
+++ b/www/modules/civicrm/vendor/symfony/process/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1.3",
+        "php": ">=7.2.5",
         "symfony/polyfill-php80": "^1.16"
     },
     "autoload": {
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/CHANGELOG.TXT b/www/modules/civicrm/vendor/tecnickcom/tcpdf/CHANGELOG.TXT
index e90bd161a..4a845350e 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/CHANGELOG.TXT
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/CHANGELOG.TXT
@@ -1,3 +1,63 @@
+6.7.5 (2024-04-20)
+	- Update GitHub actions
+	- fix: CSV-2024-22640 (#712)
+
+6.7.4 (2024-03-24)
+	- Upgrade tcpdf tag encryption algorithm.
+	- Fix regression issue #699.
+	- Fix security issue.
+	- [BREAKING CHANGE] The tcpdf HTML tag syntax has changed, see example_049.php.
+	- New K_ALLOWED_TCPDF_TAGS configuration constant to set the allowed methods for the tcdpf HTML tag.
+	- Raised minimum PHP version to PHP 5.5.0.
+
+6.6.5 (2023-09-02)
+	- Fix corrupted file.
+	- Fix GitHub automation tests.
+	- Fix SPDX license ID (#591)
+	- Fix warning "array offset on value of type null" (#620)
+	- Improve the README about the status of this library (#589)
+	- Fix deprecation warning with PHP 8.1 (#614)
+	- Fixes for PHP 8.2 in tcpdf_fonts.php (#632)
+	- Fix some php 8+ edge cases (#630)
+	- Fix composite glyph output (#581)
+	- Fix "access array offset on value of type bool" with PDF/A (#583)
+	- Fix non-numeric value warning (#627)
+	- Fix issues with S25 barcode (#611)
+	- Fix return type annotations (#613)
+	- Fix some inconsistencies in type hints (#598)
+
+6.6.2 (2022-12-17)
+	- Ensure pregSplit return type is always array.
+	- Add ability to run tests on various operating systems (#566)
+	- Avoid a deprecated error from PHP8.1 (#573)
+
+6.6.1 (2022-12-12)
+	- Add PHPStan and fix level 1 errors (#307)
+
+6.6.0 (2022-12-06)
+	- Multi-byte character support for filename during output (#561). (#562)
+	- Fix garbage collection (#509)
+	- FIX: PDF417 corrupt output problem, solution set bcmath scale parameter to zero (#534)
+	- Fix TypeError: count() in PHP8 (#556)
+	- Fix-getHTMLFontUnits (#547)
+	- Improved embedded image in HTML allowing src="data:..." format (#552)
+	- Fix image abscissa when in RTL (#510)
+	- fix: php 8.1 notices (#548)
+	- Optimize PNG files (#563)
+	- Update documentation for a known issue. (#569)
+	- Fix for PHP 8.1 (#571)
+
+6.5.0 (2022-08-12)
+	- encodeUrlQuery takes into account the port (#493)
+	- Fixing undefined offset error in writeHTML() when last DOM element ha…
+	- correct some type hints (#495)
+	- fix: php 8.1 notices (#481)
+	- Fixed: null check for PHP 8.1 (#476)
+	- Fix Infinite Loop in Multicell with Auto Page Breaks Off (#473)
+	- GetCssBorderStyle Has Problem When !important Is Specified (#467)
+	- Support Apache 2.4 directives in htaccess file (#530)
+	- Remove examples from dist package (#542)
+
 6.4.4 (2021-12-31)
 	- PHP 8.1 fixes
 
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/LICENSE.TXT b/www/modules/civicrm/vendor/tecnickcom/tcpdf/LICENSE.TXT
index 49147d01a..ec7968a7e 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/LICENSE.TXT
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/LICENSE.TXT
@@ -7,7 +7,7 @@
   published by the Free Software Foundation, either version 3 of the
   License, or (at your option) any later version.
   
-  2002-2019 Nicola Asuni - Tecnick.com LTD
+  2002-2024 Nicola Asuni - Tecnick.com LTD
 
 **********************************************************************
 **********************************************************************
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/README.md b/www/modules/civicrm/vendor/tecnickcom/tcpdf/README.md
index 0fb94009b..f59f66339 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/README.md
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/README.md
@@ -6,15 +6,14 @@
 
 * **category**    Library
 * **author**      Nicola Asuni <info@tecnick.com>
-* **copyright**   2002-2021 Nicola Asuni - Tecnick.com LTD
+* **copyright**   2002-2024 Nicola Asuni - Tecnick.com LTD
 * **license**     http://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT)
 * **link**        http://www.tcpdf.org
 * **source**      https://github.com/tecnickcom/TCPDF
 
 
-## IMPORTANT
-A new version of this library is under development at https://github.com/tecnickcom/tc-lib-pdf and as a consequence this version will not receive any additional development or support.
-This version should be considered obsolete, new projects should use the new version as soon it will become stable.
+## NOTE
+A new version of this library is under development at https://github.com/tecnickcom/tc-lib-pdf and as a consequence this library is in support only mode.
 
 
 
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/VERSION b/www/modules/civicrm/vendor/tecnickcom/tcpdf/VERSION
index 49df80bfe..c56facf89 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/VERSION
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/VERSION
@@ -1 +1 @@
-6.4.4
+6.7.5
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/composer.json b/www/modules/civicrm/vendor/tecnickcom/tcpdf/composer.json
index c31514bba..7389d0900 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/composer.json
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/composer.json
@@ -12,8 +12,8 @@
         "barcodes"
     ],
     "homepage": "http://www.tcpdf.org/",
-    "version": "6.4.4",
-    "license": "LGPL-3.0-only",
+    "version": "6.7.5",
+    "license": "LGPL-3.0-or-later",
     "authors": [
         {
             "name": "Nicola Asuni",
@@ -22,7 +22,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=5.5.0"
     },
     "autoload": {
         "classmap": [
@@ -43,5 +43,10 @@
             "include/barcodes/pdf417.php",
             "include/barcodes/qrcode.php"
         ]
+    },
+    "archive": {
+        "exclude": [
+            "/examples"
+        ]
     }
 }
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/config/tcpdf_config.php b/www/modules/civicrm/vendor/tecnickcom/tcpdf/config/tcpdf_config.php
index 92317b121..9888a6778 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/config/tcpdf_config.php
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/config/tcpdf_config.php
@@ -212,6 +212,14 @@
  */
 define('K_TCPDF_CALLS_IN_HTML', false);
 
+/**
+ * List of TCPDF methods that are allowed to be called using HTML syntax.
+ * Note: each method name must end with surrounded with | (pipe) character.
+ * The constant K_TCPDF_CALLS_IN_HTML must be set to true.
+ * IMPORTANT: For security reason, disable this feature if you are allowing user HTML content.
+ */
+define('K_ALLOWED_TCPDF_TAGS', '');
+
 /**
  * If true and PHP version is greater than 5, then the Error() method throw new exception instead of terminating the execution.
  */
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/barcodes/datamatrix.php b/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/barcodes/datamatrix.php
index 38bd625f7..d1cc6d2a9 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/barcodes/datamatrix.php
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/barcodes/datamatrix.php
@@ -778,7 +778,7 @@ protected function getHighLevelEncoding($data) {
 							if (isset($this->chset['SH1'][$chr])) {
 								$temp_cw[] = 0; // shift 1
 								$shiftset = $this->chset['SH1'];
-							} elseif (isset($chr, $this->chset['SH2'][$chr])) {
+							} elseif (isset($this->chset['SH2'][$chr])) {
 								$temp_cw[] = 1; // shift 2
 								$shiftset = $this->chset['SH2'];
 							} elseif (($enc == ENC_C40) AND isset($this->chset['S3C'][$chr])) {
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/barcodes/pdf417.php b/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/barcodes/pdf417.php
index 742802e1f..bda24822f 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/barcodes/pdf417.php
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/barcodes/pdf417.php
@@ -943,8 +943,8 @@ protected function getCompaction($mode, $code, $addmode=true) {
 						// tmp array for the 6 bytes block
 						$cw6 = array();
 						do {
-							$d = bcmod($t, '900');
-							$t = bcdiv($t, '900');
+							$d = bcmod($t, '900', 0);
+							$t = bcdiv($t, '900', 0);
 							// prepend the value to the beginning of the array
 							array_unshift($cw6, $d);
 						} while ($t != '0');
@@ -969,8 +969,8 @@ protected function getCompaction($mode, $code, $addmode=true) {
 					}
 					$t = '1'.$code;
 					do {
-						$d = bcmod($t, '900');
-						$t = bcdiv($t, '900');
+						$d = bcmod($t, '900', 0);
+						$t = bcdiv($t, '900', 0);
 						array_unshift($cw, $d);
 					} while ($t != '0');
 					$code = $rest;
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/barcodes/qrcode.php b/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/barcodes/qrcode.php
index 2e7f2f576..1a64a4cb5 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/barcodes/qrcode.php
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/barcodes/qrcode.php
@@ -884,14 +884,15 @@ protected function init($spec) {
 	protected function getCode() {
 		if ($this->count < $this->dataLength) {
 			$row = $this->count % $this->blocks;
-			$col = $this->count / $this->blocks;
+			$col = (int)($this->count / $this->blocks);
 			if ($col >= $this->rsblocks[0]['dataLength']) {
 				$row += $this->b1;
 			}
+			$row = (int) $row;
 			$ret = $this->rsblocks[$row]['data'][$col];
 		} elseif ($this->count < $this->dataLength + $this->eccLength) {
 			$row = ($this->count - $this->dataLength) % $this->blocks;
-			$col = ($this->count - $this->dataLength) / $this->blocks;
+			$col = (int)(($this->count - $this->dataLength) / $this->blocks);
 			$ret = $this->rsblocks[$row]['ecc'][$col];
 		} else {
 			return 0;
@@ -1062,7 +1063,7 @@ protected function generateMaskNo($maskNo, $width, $frame) {
 	 protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly=false) {
 		$b = 0;
 		$bitMask = array();
-		$bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
+		$bitMask = $this->generateMaskNo($maskNo, $width, $s);
 		if ($maskGenOnly) {
 			return;
 		}
@@ -1460,7 +1461,7 @@ protected function toUpper() {
 		$stringLen = strlen($this->dataStr);
 		$p = 0;
 		while ($p < $stringLen) {
-			$mode = $this->identifyMode(substr($this->dataStr, $p), $this->hint);
+			$mode = $this->identifyMode(substr($this->dataStr, $p));
 			if ($mode == QR_MODE_KJ) {
 				$p += 2;
 			} else {
@@ -1692,7 +1693,7 @@ protected function insertStructuredAppendHeader($items, $size, $index, $parity)
 			return -1;
 		}
 		$buf = array($size, $index, $parity);
-		$entry = $this->newInputItem(QR_MODE_ST, 3, buf);
+		$entry = $this->newInputItem(QR_MODE_ST, 3, $buf);
 		array_unshift($items, $entry);
 		return $items;
 	}
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/tcpdf_colors.php b/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/tcpdf_colors.php
index 7f337f31a..5a51594c3 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/tcpdf_colors.php
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/tcpdf_colors.php
@@ -275,7 +275,7 @@ public static function convertHTMLColorToDec($hcolor, &$spotc, $defcol=array('R'
 		$color = strtolower($color);
 		// check for javascript color array syntax
 		if (strpos($color, '[') !== false) {
-			if (preg_match('/[\[][\"\'](t|g|rgb|cmyk)[\"\'][\,]?([0-9\.]*)[\,]?([0-9\.]*)[\,]?([0-9\.]*)[\,]?([0-9\.]*)[\]]/', $color, $m) > 0) {
+			if (preg_match('/[\[][\"\'](t|g|rgb|cmyk)[\"\'][\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\]]/', $color, $m) > 0) {
 				$returncolor = array();
 				switch ($m[1]) {
 					case 'cmyk': {
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/tcpdf_fonts.php b/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/tcpdf_fonts.php
index c692ef87d..a71c84b7e 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/tcpdf_fonts.php
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/tcpdf_fonts.php
@@ -1151,7 +1151,7 @@ public static function _getTrueTypeFontSubset($font, $subsetchars) {
 								$subsetglyphs[$g] = true;
 							}
 						}
-					}	
+					}
 					break;
 				}
 				case 6: { // Format 6: Trimmed table mapping
@@ -1323,43 +1323,43 @@ public static function _getTrueTypeFontSubset($font, $subsetchars) {
 					// set the checkSumAdjustment to 0
 					$table[$tag]['data'] = substr($table[$tag]['data'], 0, 8)."\x0\x0\x0\x0".substr($table[$tag]['data'], 12);
 				}
-				$pad = 4 - ($table[$tag]['length'] % 4);
-				if ($pad != 4) {
-					// the length of a table must be a multiple of four bytes
-					$table[$tag]['length'] += $pad;
-					$table[$tag]['data'] .= str_repeat("\x0", $pad);
-				}
 				$table[$tag]['offset'] = $offset;
 				$offset += $table[$tag]['length'];
+				$numPad = ($offset + 3 & ~3) - $offset;
+				if($numPad > 0) {
+					$table[$tag]['data'] .= str_repeat("\x0", $numPad);
+					$offset += $numPad;
+				}
 				// check sum is not changed (so keep the following line commented)
-				//$table[$tag]['checkSum'] = self::_getTTFtableChecksum($table[$tag]['data'], $table[$tag]['length']);
+				//$table[$tag]['checkSum'] = self::_getTTFtableChecksum($table[$tag]['data'], $table[$tag]['length'] + $numPad);
 			} else {
 				unset($table[$tag]);
 			}
 		}
 		// add loca
+		$table['loca'] = array();
 		$table['loca']['data'] = $loca;
 		$table['loca']['length'] = strlen($loca);
-		$pad = 4 - ($table['loca']['length'] % 4);
-		if ($pad != 4) {
-			// the length of a table must be a multiple of four bytes
-			$table['loca']['length'] += $pad;
-			$table['loca']['data'] .= str_repeat("\x0", $pad);
-		}
 		$table['loca']['offset'] = $offset;
-		$table['loca']['checkSum'] = self::_getTTFtableChecksum($table['loca']['data'], $table['loca']['length']);
 		$offset += $table['loca']['length'];
+		$numPad = ($offset + 3 & ~3) - $offset;
+		if($numPad > 0) {
+			$table['loca']['data'] .= str_repeat("\x0", $numPad);
+			$offset += $numPad;
+		}
+		$table['loca']['checkSum'] = self::_getTTFtableChecksum($table['loca']['data'], $table['loca']['length'] + $numPad);
 		// add glyf
+		$table['glyf'] = array();
 		$table['glyf']['data'] = $glyf;
 		$table['glyf']['length'] = strlen($glyf);
-		$pad = 4 - ($table['glyf']['length'] % 4);
-		if ($pad != 4) {
-			// the length of a table must be a multiple of four bytes
-			$table['glyf']['length'] += $pad;
-			$table['glyf']['data'] .= str_repeat("\x0", $pad);
-		}
 		$table['glyf']['offset'] = $offset;
-		$table['glyf']['checkSum'] = self::_getTTFtableChecksum($table['glyf']['data'], $table['glyf']['length']);
+		$offset += $table['glyf']['length'];
+		$numPad = ($offset + 3 & ~3) - $offset;
+		if($numPad > 0) {
+			$table['glyf']['data'] .= str_repeat("\x0", $numPad);
+			$offset += $numPad;
+		}
+		$table['glyf']['checkSum'] = self::_getTTFtableChecksum($table['glyf']['data'], $table['glyf']['length'] + $numPad);
 		// rebuild font
 		$font = '';
 		$font .= pack('N', 0x10000); // sfnt version
@@ -1383,7 +1383,7 @@ public static function _getTrueTypeFontSubset($font, $subsetchars) {
 		}
 		// set checkSumAdjustment on head table
 		$checkSumAdjustment = 0xB1B0AFBA - self::_getTTFtableChecksum($font, strlen($font));
-		$font = substr($font, 0, $table['head']['offset'] + 8).pack('N', $checkSumAdjustment).substr($font, $table['head']['offset'] + 12);
+		$font = substr($font, 0, $table['head']['offset'] + $offset + 8).pack('N', $checkSumAdjustment).substr($font, $table['head']['offset'] + $offset + 12);
 		return $font;
 	}
 
@@ -1780,9 +1780,9 @@ public static function arrUTF8ToUTF16BE($unicode, $setbom=false) {
 	 */
 	public static function UTF8ArrayToUniArray($ta, $isunicode=true) {
 		if ($isunicode) {
-			return array_map(array('TCPDF_FONTS', 'unichrUnicode'), $ta);
+			return array_map(get_called_class().'::unichrUnicode', $ta);
 		}
-		return array_map(array('TCPDF_FONTS', 'unichrASCII'), $ta);
+		return array_map(get_called_class().'::unichrASCII', $ta);
 	}
 
 	/**
@@ -1998,10 +1998,11 @@ public static function getUniord($uch) {
 	 * @public static
 	 */
 	public static function UTF8StringToArray($str, $isunicode, &$currentfont) {
+		$str = is_null($str) ? '' : $str;
 		if ($isunicode) {
 			// requires PCRE unicode support turned on
 			$chars = TCPDF_STATIC::pregSplit('//','u', $str, -1, PREG_SPLIT_NO_EMPTY);
-			$carr = array_map(array('TCPDF_FONTS', 'uniord'), $chars);
+			$carr = array_map(get_called_class().'::uniord', $chars);
 		} else {
 			$chars = str_split($str);
 			$carr = array_map('ord', $chars);
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/tcpdf_static.php b/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/tcpdf_static.php
index a118d0588..04f74461f 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/tcpdf_static.php
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/include/tcpdf_static.php
@@ -3,11 +3,11 @@
 // File name   : tcpdf_static.php
 // Version     : 1.1.4
 // Begin       : 2002-08-03
-// Last Update : 2019-11-01
+// Last Update : 2023-09-06
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
-// Copyright (C) 2002-2021 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2002-2023 Nicola Asuni - Tecnick.com LTD
 //
 // This file is part of TCPDF software library.
 //
@@ -55,7 +55,7 @@ class TCPDF_STATIC {
 	 * Current TCPDF version.
 	 * @private static
 	 */
-	private static $tcpdf_version = '6.4.4';
+	private static $tcpdf_version = '6.7.5';
 
 	/**
 	 * String alias for total number of pages.
@@ -128,39 +128,6 @@ public static function getTCPDFProducer() {
 		return "\x54\x43\x50\x44\x46\x20".self::getTCPDFVersion()."\x20\x28\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67\x29";
 	}
 
-	/**
-	 * Sets the current active configuration setting of magic_quotes_runtime (if the set_magic_quotes_runtime function exist)
-	 * @param boolean $mqr FALSE for off, TRUE for on.
-	 * @since 4.6.025 (2009-08-17)
-	 * @public static
-	 */
-	public static function set_mqr($mqr) {
-		if (!defined('PHP_VERSION_ID')) {
-			$version = PHP_VERSION;
-			define('PHP_VERSION_ID', (($version[0] * 10000) + ($version[2] * 100) + $version[4]));
-		}
-		if (PHP_VERSION_ID < 50300) {
-			@set_magic_quotes_runtime($mqr);
-		}
-	}
-
-	/**
-	 * Gets the current active configuration setting of magic_quotes_runtime (if the get_magic_quotes_runtime function exist)
-	 * @return int Returns 0 if magic quotes runtime is off or get_magic_quotes_runtime doesn't exist, 1 otherwise.
-	 * @since 4.6.025 (2009-08-17)
-	 * @public static
-	 */
-	public static function get_mqr() {
-		if (!defined('PHP_VERSION_ID')) {
-			$version = PHP_VERSION;
-			define('PHP_VERSION_ID', (($version[0] * 10000) + ($version[2] * 100) + $version[4]));
-		}
-		if (PHP_VERSION_ID < 50300) {
-			return @get_magic_quotes_runtime();
-		}
-		return 0;
-	}
-
 	/**
 	 * Check if the URL exist.
 	 * @param string $url URL to check.
@@ -319,7 +286,7 @@ public static function _escape($s) {
 	 */
 	public static function _escapeXML($str) {
 		$replaceTable = array("\0" => '', '&' => '&amp;', '<' => '&lt;', '>' => '&gt;');
-		$str = strtr($str, $replaceTable);
+		$str = strtr($str === null ? '' : $str, $replaceTable);
 		return $str;
 	}
 
@@ -852,9 +819,7 @@ public static function getAnnotOptFromJSProp($prop, &$spot_colors, $rtl=false) {
 		if (isset($prop['charLimit'])) {
 			$opt['maxlen'] = intval($prop['charLimit']);
 		}
-		if (!isset($ff)) {
-			$ff = 0; // default value
-		}
+		$ff = 0;
 		// readonly: The read-only characteristic of a field. If a field is read-only, the user can see the field but cannot change it.
 		if (isset($prop['readonly']) AND ($prop['readonly'] == 'true')) {
 			$ff += 1 << 0;
@@ -1811,7 +1776,11 @@ public static function pregSplit($pattern, $modifiers, $subject, $limit=NULL, $f
 		$flags = $flags === null ? 0 : $flags;
 		// the bug only happens on PHP 5.2 when using the u modifier
 		if ((strpos($modifiers, 'u') === FALSE) OR (count(preg_split('//u', "\n\t", -1, PREG_SPLIT_NO_EMPTY)) == 2)) {
-			return preg_split($pattern.$modifiers, $subject, $limit, $flags);
+			$ret = preg_split($pattern.$modifiers, $subject, $limit, $flags);
+			if ($ret === false) {
+				return array();
+			}
+			return is_array($ret) ? $ret : array();
 		}
 		// preg_split is bugged - try alternative solution
 		$ret = array();
@@ -1887,7 +1856,8 @@ public static function encodeUrlQuery($url) {
 		if (isset($urlData['query']) && $urlData['query']) {
 			$urlQueryData = array();
 			parse_str(urldecode($urlData['query']), $urlQueryData);
-			$updatedUrl = $urlData['scheme'] . '://' . $urlData['host'] . $urlData['path'] . '?' . http_build_query($urlQueryData);
+			$port = isset($urlData['port']) ? ':'.$urlData['port'] : '';
+			$updatedUrl = $urlData['scheme'].'://'.$urlData['host'].$port.$urlData['path'].'?'.http_build_query($urlQueryData);
 		} else {
 			$updatedUrl = $url;
 		}
@@ -2154,7 +2124,7 @@ public static function _freadint($f) {
 	 * Array of page formats
 	 * measures are calculated in this way: (inches * 72) or (millimeters * 72 / 25.4)
 	 * @public static
-	 * 
+	 *
      * @var array<string,float[]>
 	 */
 	public static $page_formats = array(
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf.php b/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf.php
index 400434730..60f93c416 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf.php
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf.php
@@ -1,13 +1,13 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 6.4.4
+// Version     : 6.7.5
 // Begin       : 2002-08-03
-// Last Update : 2021-12-31
+// Last Update : 2024-03-18
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
-// Copyright (C) 2002-2021 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2002-2024 Nicola Asuni - Tecnick.com LTD
 //
 // This file is part of TCPDF software library.
 //
@@ -104,7 +104,7 @@
  * Tools to encode your unicode fonts are on fonts/utils directory.</p>
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 6.3.2
+ * @version 6.6.5
  */
 
 // TCPDF configuration
@@ -128,7 +128,7 @@
  * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
  * @package com.tecnick.tcpdf
  * @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 6.3.2
+ * @version 6.7.5
  * @author Nicola Asuni - info@tecnick.com
  * @IgnoreAnnotation("protected")
  * @IgnoreAnnotation("public")
@@ -574,12 +574,14 @@ class TCPDF {
 	/**
 	 * Minimum distance between header and top page margin.
 	 * @protected
+	 * @var float
 	 */
 	protected $header_margin;
 
 	/**
 	 * Minimum distance between footer and bottom page margin.
 	 * @protected
+	 * @var float
 	 */
 	protected $footer_margin;
 
@@ -836,6 +838,13 @@ class TCPDF {
 	 */
 	protected $file_id;
 
+	/**
+	 * Internal secret used to encrypt data.
+	 * @protected
+	 * @since 6.7.5 (2024-03-21)
+	 */
+	protected $hash_key;
+
 	// --- bookmark ---
 
 	/**
@@ -1878,10 +1887,10 @@ public function __construct($orientation='P', $unit='mm', $format='A4', $unicode
 		// set file ID for trailer
 		$serformat = (is_array($format) ? json_encode($format) : $format);
 		$this->file_id = md5(TCPDF_STATIC::getRandomSeed('TCPDF'.$orientation.$unit.$serformat.$encoding));
+		$this->hash_key = hash_hmac('sha256', TCPDF_STATIC::getRandomSeed($this->file_id), TCPDF_STATIC::getRandomSeed('TCPDF'), false);
 		$this->font_obj_ids = array();
 		$this->page_obj_id = array();
 		$this->form_obj_id = array();
-
 		// set pdf/a mode
 		if ($pdfa != false) {
 			$this->pdfa_mode = true;
@@ -2024,9 +2033,6 @@ public function __construct($orientation='P', $unit='mm', $format='A4', $unicode
 		$this->header_xobj_autoreset = false;
 		$this->custom_xmp = '';
 		$this->custom_xmp_rdf = '';
-		// Call cleanup method after script execution finishes or exit() is called.
-		// NOTE: This will not be executed if the process is killed with a SIGTERM or SIGKILL signal.
-		register_shutdown_function(array($this, '_destroy'), true);
 	}
 
 	/**
@@ -2464,7 +2470,7 @@ public function setLastH($h) {
 	 */
 	public function getCellHeight($fontsize, $padding=TRUE) {
 		$height = ($fontsize * $this->cell_height_ratio);
-		if ($padding) {
+		if ($padding && !empty($this->cell_padding)) {
 			$height += ($this->cell_padding['T'] + $this->cell_padding['B']);
 		}
 		return round($height, 6);
@@ -2530,7 +2536,7 @@ public function getPageDimensions($pagenum=null) {
 	/**
 	 * Returns the page width in units.
 	 * @param int|null $pagenum page number (empty = current page)
-	 * @return int page width.
+	 * @return int|float page width.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 1.5.2
@@ -2546,7 +2552,7 @@ public function getPageWidth($pagenum=null) {
 	/**
 	 * Returns the page height in units.
 	 * @param int|null $pagenum page number (empty = current page)
-	 * @return int page height.
+	 * @return int|float page height.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 1.5.2
@@ -2562,7 +2568,7 @@ public function getPageHeight($pagenum=null) {
 	/**
 	 * Returns the page break margin.
 	 * @param int|null $pagenum page number (empty = current page)
-	 * @return int page break margin.
+	 * @return int|float page break margin.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 1.5.2
@@ -2588,9 +2594,9 @@ public function getScaleFactor() {
 
 	/**
 	 * Defines the left, top and right margins.
-	 * @param float $left Left margin.
-	 * @param float $top Top margin.
-	 * @param float $right Right margin. Default value is the left one.
+	 * @param int|float $left Left margin.
+	 * @param int|float $top Top margin.
+	 * @param int|float|null $right Right margin. Default value is the left one.
 	 * @param boolean $keepmargins if true overwrites the default page margins
 	 * @public
 	 * @since 1.0
@@ -2613,7 +2619,7 @@ public function setMargins($left, $top, $right=null, $keepmargins=false) {
 
 	/**
 	 * Defines the left margin. The method can be called before creating the first page. If the current abscissa gets out of page, it is brought back to the margin.
-	 * @param float $margin The margin.
+	 * @param int|float $margin The margin.
 	 * @public
 	 * @since 1.4
 	 * @see SetTopMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
@@ -2628,7 +2634,7 @@ public function setLeftMargin($margin) {
 
 	/**
 	 * Defines the top margin. The method can be called before creating the first page.
-	 * @param float $margin The margin.
+	 * @param int|float $margin The margin.
 	 * @public
 	 * @since 1.5
 	 * @see SetLeftMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
@@ -2643,7 +2649,7 @@ public function setTopMargin($margin) {
 
 	/**
 	 * Defines the right margin. The method can be called before creating the first page.
-	 * @param float $margin The margin.
+	 * @param int|float $margin The margin.
 	 * @public
 	 * @since 1.5
 	 * @see SetLeftMargin(), SetTopMargin(), SetAutoPageBreak(), SetMargins()
@@ -2657,7 +2663,7 @@ public function setRightMargin($margin) {
 
 	/**
 	 * Set the same internal Cell padding for top, right, bottom, left-
-	 * @param float $pad internal padding.
+	 * @param int|float $pad internal padding.
 	 * @public
 	 * @since 2.1.000 (2008-01-09)
 	 * @see getCellPaddings(), setCellPaddings()
@@ -2673,10 +2679,10 @@ public function setCellPadding($pad) {
 
 	/**
 	 * Set the internal Cell paddings.
-	 * @param float|null $left left padding
-	 * @param float|null $top top padding
-	 * @param float|null $right right padding
-	 * @param float|null $bottom bottom padding
+	 * @param int|float|null $left left padding
+	 * @param int|float|null $top top padding
+	 * @param int|float|null $right right padding
+	 * @param int|float|null $bottom bottom padding
 	 * @public
 	 * @since 5.9.000 (2010-10-03)
 	 * @see getCellPaddings(), SetCellPadding()
@@ -2709,10 +2715,10 @@ public function getCellPaddings() {
 
 	/**
 	 * Set the internal Cell margins.
-	 * @param float|null $left left margin
-	 * @param float|null $top top margin
-	 * @param float|null $right right margin
-	 * @param float|null $bottom bottom margin
+	 * @param int|float|null $left left margin
+	 * @param int|float|null $top top margin
+	 * @param int|float|null $right right margin
+	 * @param int|float|null $bottom bottom margin
 	 * @public
 	 * @since 5.9.000 (2010-10-03)
 	 * @see getCellMargins()
@@ -2745,7 +2751,7 @@ public function getCellMargins() {
 
 	/**
 	 * Adjust the internal Cell padding array to take account of the line width.
-	 * @param string|array|int $brd Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
+	 * @param string|array|int|bool $brd Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
 	 * @return void|array array of adjustments
 	 * @public
 	 * @since 5.9.000 (2010-10-03)
@@ -3375,7 +3381,7 @@ public function getHeaderData() {
 	/**
 	 * Set header margin.
 	 * (minimum distance between header and top page margin)
-	 * @param int $hm distance in user units
+	 * @param float $hm distance in user units
 	 * @public
 	 */
 	public function setHeaderMargin($hm=10) {
@@ -3395,7 +3401,7 @@ public function getHeaderMargin() {
 	/**
 	 * Set footer margin.
 	 * (minimum distance between footer and bottom page margin)
-	 * @param int $fm distance in user units
+	 * @param float $fm distance in user units
 	 * @public
 	 */
 	public function setFooterMargin($fm=10) {
@@ -4105,6 +4111,7 @@ public function setTextColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false,
 	 * @param float $fontsize Font size in points. The default value is the current size.
 	 * @param boolean $getarray if true returns an array of characters widths, if false returns the total length.
 	 * @return float[]|float total string length or array of characted widths
+	 * @phpstan-return ($getarray is true ? float[] : float) total string length or array of characted widths
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 1.2
@@ -4121,6 +4128,7 @@ public function GetStringWidth($s, $fontname='', $fontstyle='', $fontsize=0, $ge
 	 * @param float $fontsize Font size in points. The default value is the current size.
 	 * @param boolean $getarray if true returns an array of characters widths, if false returns the total length.
 	 * @return float[]|float total string length or array of characted widths
+	 * @phpstan-return ($getarray is true ? float[] : float) total string length or array of characted widths
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 2.4.000 (2008-03-06)
@@ -4283,7 +4291,7 @@ public function AddFont($family, $style='', $fontfile='', $subset='default') {
 			// all fonts must be embedded
 			$family = 'pdfa'.$family;
 		}
-		$tempstyle = strtoupper($style);
+		$tempstyle = strtoupper($style === null ? '' : $style);
 		$style = '';
 		// underline
 		if (strpos($tempstyle, 'U') !== false) {
@@ -4350,6 +4358,22 @@ public function AddFont($family, $style='', $fontfile='', $subset='default') {
 		}
 		// include font file
 		if (!TCPDF_STATIC::empty_string($fontfile) AND (@TCPDF_STATIC::file_exists($fontfile))) {
+			$type=null;
+			$name=null;
+			$desc=null;
+			$up=-null;
+			$ut=null;
+			$cw=null;
+			$cbbox=null;
+			$dw=null;
+			$enc=null;
+			$cidinfo=null;
+			$file=null;
+			$ctg=null;
+			$diff=null;
+			$originalsize=null;
+			$size1=null;
+			$size2=null;
 			include($fontfile);
 		} else {
 			$this->Error('Could not include font definition file: '.$family.'');
@@ -4410,7 +4434,7 @@ public function AddFont($family, $style='', $fontfile='', $subset='default') {
 			$this->Error('Unknow font type: '.$type.'');
 		}
 		// set name if unset
-		if (!isset($name) OR empty($name)) {
+		if (empty($name)) {
 			$name = $fontkey;
 		}
 		// create artificial font style variations if missing (only works with non-embedded fonts)
@@ -4453,7 +4477,7 @@ public function AddFont($family, $style='', $fontfile='', $subset='default') {
 			// we are inside an XObject template
 			$this->xobjects[$this->xobjid]['fonts'][$fontkey] = $this->numfonts;
 		}
-		if (isset($diff) AND (!empty($diff))) {
+		if (!empty($diff)) {
 			//Search existing encodings
 			$d = 0;
 			$nb = count($this->diffs);
@@ -5151,6 +5175,7 @@ public function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false
 	 */
 	protected function getCellCode($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
 		// replace 'NO-BREAK SPACE' (U+00A0) character with a simple space
+		$txt = is_null($txt) ? '' : $txt;
 		$txt = str_replace(TCPDF_FONTS::unichr(160, $this->isunicode), ' ', $txt);
 		$prev_cell_margin = $this->cell_margin;
 		$prev_cell_padding = $this->cell_padding;
@@ -5526,12 +5551,12 @@ protected function getCellCode($w, $h=0, $txt='', $border=0, $ln=0, $align='', $
 			$xdk = $xdx * $k;
 			// print text
 			$s .= sprintf('BT %F %F Td [(%s)] TJ ET', $xdk, (($this->h - $basefonty) * $k), $txt2);
-			if (isset($uniblock)) {
+			if (isset($uniblock)) { // @phpstan-ignore-line
 				// print overlapping characters as separate string
 				$xshift = 0; // horizontal shift
 				$ty = (($this->h - $basefonty + (0.2 * $this->FontSize)) * $k);
 				$spw = (($w - $txwidth - $this->cell_padding['L'] - $this->cell_padding['R']) / ($ns?$ns:1));
-				foreach ($uniblock as $uk => $uniarr) {
+				foreach ($uniblock as $uk => $uniarr) { // @phpstan-ignore-line
 					if (($uk % 2) == 0) {
 						// x space to skip
 						if ($spacewidth != 0) {
@@ -6395,7 +6420,7 @@ public function Write($h, $txt, $link='', $fill=false, $align='', $ln=false, $st
 		// calculate maximum width for a single character on string
 		$chrw = $this->GetArrStringWidth($chars, '', '', 0, true);
 		array_walk($chrw, array($this, 'getRawCharWidth'));
-		$maxchwidth = max($chrw);
+		$maxchwidth = ((is_array($chrw) || $chrw instanceof Countable) && count($chrw) > 0) ? max($chrw) : 0;
 		// get array of chars
 		$uchars = TCPDF_FONTS::UTF8ArrayToUniArray($chars, $this->isunicode);
 		// get the number of characters
@@ -6495,14 +6520,16 @@ public function Write($h, $txt, $link='', $fill=false, $align='', $ln=false, $st
 				$shy = false;
 				// account for margin changes
 				if ((($this->y + $this->lasth) > $this->PageBreakTrigger) AND ($this->inPageBody())) {
-					$this->AcceptPageBreak();
-					if ($this->rtl) {
-						$this->x -= $margin['R'];
-					} else {
-						$this->x += $margin['L'];
+					if ($this->AcceptPageBreak())
+					{
+						if ($this->rtl) {
+							$this->x -= $margin['R'];
+						} else {
+							$this->x += $margin['L'];
+						}
+						$this->lMargin += $margin['L'];
+						$this->rMargin += $margin['R'];
 					}
-					$this->lMargin += $margin['L'];
-					$this->rMargin += $margin['R'];
 				}
 				$w = $this->getRemainingWidth();
 				$wmax = ($w - $this->cell_padding['L'] - $this->cell_padding['R']);
@@ -6700,14 +6727,16 @@ public function Write($h, $txt, $link='', $fill=false, $align='', $ln=false, $st
 					}
 					// account for margin changes
 					if ((($this->y + $this->lasth) > $this->PageBreakTrigger) AND ($this->inPageBody())) {
-						$this->AcceptPageBreak();
-						if ($this->rtl) {
-							$this->x -= $margin['R'];
-						} else {
-							$this->x += $margin['L'];
+						if ($this->AcceptPageBreak())
+						{
+							if ($this->rtl) {
+								$this->x -= $margin['R'];
+							} else {
+								$this->x += $margin['L'];
+							}
+							$this->lMargin += $margin['L'];
+							$this->rMargin += $margin['R'];
 						}
-						$this->lMargin += $margin['L'];
-						$this->rMargin += $margin['R'];
 					}
 					$w = $this->getRemainingWidth();
 					$wmax = $w - $this->cell_padding['L'] - $this->cell_padding['R'];
@@ -6854,6 +6883,8 @@ protected function fitBlock($w, $h, $x, $y, $fitonpage=false) {
 		}
 		// resize the block to be contained on the remaining available page or column space
 		if ($fitonpage) {
+			// fallback to avoid division by zero
+			$h = $h == 0 ? 1 : $h;
 			$ratio_wh = ($w / $h);
 			if (($y + $h) > $this->PageBreakTrigger) {
 				$h = $this->PageBreakTrigger - $y;
@@ -7099,8 +7130,6 @@ public function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='', $
 			} elseif ($type == 'jpg') {
 				$type = 'jpeg';
 			}
-			$mqr = TCPDF_STATIC::get_mqr();
-			TCPDF_STATIC::set_mqr(false);
 			// Specific image handlers (defined on TCPDF_IMAGES CLASS)
 			$mtd = '_parse'.$type;
 			// GD image handler function
@@ -7202,7 +7231,6 @@ public function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='', $
 				// unable to process image
 				return false;
 			}
-			TCPDF_STATIC::set_mqr($mqr);
 			if ($ismask) {
 				// force grayscale
 				$info['cs'] = 'DeviceGray';
@@ -7230,7 +7258,7 @@ public function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='', $
 		} elseif ($palign == 'R') {
 			$ximg = $this->w - $this->rMargin - $w;
 		} else {
-			$ximg = $x;
+			$ximg = $this->rtl ? $x - $w : $x;
 		}
 
 		if ($ismask OR $hidden) {
@@ -7614,7 +7642,7 @@ public function setAbsXY($x, $y) {
 	 * Send the document to a given destination: string, local file or browser.
 	 * In the last case, the plug-in may be used (if present) or a download ("Save as" dialog box) may be forced.<br />
 	 * The method first calls Close() if necessary to terminate the document.
-	 * @param string $name The name of the file when saved. Note that special characters are removed and blanks characters are replaced with the underscore character.
+	 * @param string $name The name of the file when saved
 	 * @param string $dest Destination where to send the document. It can take one of the following values:<ul><li>I: send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.</li><li>D: send to the browser and force a file download with the name given by name.</li><li>F: save to a local server file with the name given by name.</li><li>S: return the document as a string (name is ignored).</li><li>FI: equivalent to F + I option</li><li>FD: equivalent to F + D option</li><li>E: return the document as base64 mime multi-part email attachment (RFC 2045)</li></ul>
 	 * @return string
 	 * @public
@@ -7632,10 +7660,7 @@ public function Output($name='doc.pdf', $dest='I') {
 			$dest = $dest ? 'D' : 'F';
 		}
 		$dest = strtoupper($dest);
-		if ($dest[0] != 'F') {
-			$name = preg_replace('/[\s]+/', '_', $name);
-			$name = preg_replace('/[^a-zA-Z0-9_\.-]/', '', $name);
-		}
+
 		if ($this->sign) {
 			// *** apply digital signature to the document ***
 			// get the document content
@@ -7706,7 +7731,8 @@ public function Output($name='doc.pdf', $dest='I') {
 					header('Pragma: public');
 					header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
 					header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-					header('Content-Disposition: inline; filename="'.basename($name).'"');
+					header('Content-Disposition: inline; filename="' . rawurlencode(basename($name)) . '"; ' .
+						'filename*=UTF-8\'\'' . rawurlencode(basename($name)));
 					TCPDF_STATIC::sendOutputData($this->getBuffer(), $this->bufferlen);
 				} else {
 					echo $this->getBuffer();
@@ -7737,7 +7763,8 @@ public function Output($name='doc.pdf', $dest='I') {
 					header('Content-Type: application/pdf');
 				}
 				// use the Content-Disposition header to supply a recommended filename
-				header('Content-Disposition: attachment; filename="'.basename($name).'"');
+				header('Content-Disposition: attachment; filename="' . rawurlencode(basename($name)) . '"; ' .
+					'filename*=UTF-8\'\'' . rawurlencode(basename($name)));
 				header('Content-Transfer-Encoding: binary');
 				TCPDF_STATIC::sendOutputData($this->getBuffer(), $this->bufferlen);
 				break;
@@ -8429,7 +8456,7 @@ protected function _putannotsobjs() {
 								$annots .= ' /Name /Note';
 							}
 							$hasStateModel = isset($pl['opt']['statemodel']);
-							$hasState = isset($pl['opt']['state']); 
+							$hasState = isset($pl['opt']['state']);
 							$statemodels = array('Marked', 'Review');
 							if (!$hasStateModel && !$hasState) {
 								break;
@@ -8867,8 +8894,6 @@ protected function _putfonts() {
 			$this->_newobj();
 			$this->_out('<< /Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.'] >>'."\n".'endobj');
 		}
-		$mqr = TCPDF_STATIC::get_mqr();
-		TCPDF_STATIC::set_mqr(false);
 		foreach ($this->FontFiles as $file => $info) {
 			// search and get font file to embedd
 			$fontfile = TCPDF_FONTS::getFontFullPath($file, $info['fontdir']);
@@ -8922,7 +8947,6 @@ protected function _putfonts() {
 				$this->_out($out);
 			}
 		}
-		TCPDF_STATIC::set_mqr($mqr);
 		foreach ($this->fontkeys as $k) {
 			//Font objects
 			$font = $this->getFontBuffer($k);
@@ -9191,6 +9215,7 @@ protected function _putimages() {
 		foreach ($this->imagekeys as $file) {
 			$info = $this->getImageBuffer($file);
 			// set object for alternate images array
+			$altoid = null;
 			if ((!$this->pdfa_mode) AND isset($info['altimgs']) AND !empty($info['altimgs'])) {
 				$altoid = $this->_newobj();
 				$out = '[';
@@ -9238,7 +9263,7 @@ protected function _putimages() {
 				$out .= ' /Decode [1 0 1 0 1 0 1 0]';
 			}
 			$out .= ' /BitsPerComponent '.$info['bpc'];
-			if (isset($altoid) AND ($altoid > 0)) {
+			if ($altoid > 0) {
 				// reference to alternate images dictionary
 				$out .= ' /Alternates '.$altoid.' 0 R';
 			}
@@ -9913,7 +9938,7 @@ protected function _putcatalog() {
 				}
 				$out .= ' >> >>';
 			}
-			$font = $this->getFontBuffer('helvetica');
+			$font = $this->getFontBuffer((($this->pdfa_mode) ? 'pdfa' : '') .'helvetica');
 			$out .= ' /DA (/F'.$font['i'].' 0 Tf 0 g)';
 			$out .= ' /Q '.(($this->rtl)?'2':'0');
 			//$out .= ' /XFA ';
@@ -11698,7 +11723,7 @@ public function Curve($x0, $y0, $x1, $y1, $x2, $y2, $x3, $y3, $style='', $line_s
 		if ($this->state != 2) {
 			return;
 		}
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
+		if (!(false === strpos($style, 'F')) AND is_array($fill_color)) {
 			$this->setFillColorArray($fill_color);
 		}
 		$op = TCPDF_STATIC::getPathPaintOperator($style);
@@ -11728,7 +11753,7 @@ public function Polycurve($x0, $y0, $segments, $style='', $line_style=array(), $
 		if ($this->state != 2) {
 			return;
 		}
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
+		if (!(false === strpos($style, 'F')) AND is_array($fill_color)) {
 			$this->setFillColorArray($fill_color);
 		}
 		$op = TCPDF_STATIC::getPathPaintOperator($style);
@@ -11771,7 +11796,7 @@ public function Ellipse($x0, $y0, $rx, $ry=0, $angle=0, $astart=0, $afinish=360,
 		if (TCPDF_STATIC::empty_string($ry) OR ($ry == 0)) {
 			$ry = $rx;
 		}
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
+		if (!(false === strpos($style, 'F')) AND is_array($fill_color)) {
 			$this->setFillColorArray($fill_color);
 		}
 		$op = TCPDF_STATIC::getPathPaintOperator($style);
@@ -11990,7 +12015,7 @@ public function Polygon($p, $style='', $line_style=array(), $fill_color=array(),
 			}
 			$nc += 4;
 		}
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
+		if (!(false === strpos($style, 'F')) AND is_array($fill_color)) {
 			$this->setFillColorArray($fill_color);
 		}
 		$op = TCPDF_STATIC::getPathPaintOperator($style);
@@ -12193,7 +12218,7 @@ public function RoundedRectXY($x, $y, $w, $h, $rx, $ry, $round_corner='1111', $s
 			return;
 		}
 		// Rounded
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
+		if (!(false === strpos($style, 'F')) AND is_array($fill_color)) {
 			$this->setFillColorArray($fill_color);
 		}
 		$op = TCPDF_STATIC::getPathPaintOperator($style);
@@ -15072,9 +15097,7 @@ public function ImageEps($file, $x=null, $y=null, $w=0, $h=0, $link='', $useBoun
 		// translate
 		$this->_out(sprintf('%F %F %F %F %F %F cm', 1, 0, 0, 1, $dx, $dy + ($this->hPt - (2 * $y * $k) - ($y2 - $y1))));
 		// scale
-		if (isset($scale_x)) {
-			$this->_out(sprintf('%F %F %F %F %F %F cm', $scale_x, 0, 0, $scale_y, $x1 * (1 - $scale_x), $y2 * (1 - $scale_y)));
-		}
+		$this->_out(sprintf('%F %F %F %F %F %F cm', $scale_x, 0, 0, $scale_y, $x1 * (1 - $scale_x), $y2 * (1 - $scale_y)));
 		// handle pc/unix/mac line endings
 		$lines = preg_split('/[\r\n]+/si', $data, -1, PREG_SPLIT_NO_EMPTY);
 		$u=0;
@@ -16017,14 +16040,14 @@ protected function getCSSBorderDashStyle($style) {
 	 */
 	protected function getCSSBorderStyle($cssborder) {
 		$bprop = preg_split('/[\s]+/', trim($cssborder));
+		$count = count($bprop);
+		if ($count > 0 && $bprop[$count - 1] === '!important') {
+			unset($bprop[$count - 1]);
+			--$count;
+		}
+
 		$border = array(); // value to be returned
-		switch (count($bprop)) {
-			case 3: {
-				$width = $bprop[0];
-				$style = $bprop[1];
-				$color = $bprop[2];
-				break;
-			}
+		switch ($count) {
 			case 2: {
 				$width = 'medium';
 				$style = $bprop[0];
@@ -16037,12 +16060,18 @@ protected function getCSSBorderStyle($cssborder) {
 				$color = 'black';
 				break;
 			}
-			default: {
+			case 0: {
 				$width = 'medium';
 				$style = 'solid';
 				$color = 'black';
 				break;
 			}
+			default: {
+				$width = $bprop[0];
+				$style = $bprop[1];
+				$color = $bprop[2];
+				break;
+			}
 		}
 		if ($style == 'none') {
 			return array();
@@ -16352,6 +16381,7 @@ public function getHTMLFontUnits($val, $refsize=12, $parent_size=12, $defaultuni
 				break;
 			}
 			default: {
+				$parentSize = $this->getHTMLUnitToUnits($parent_size, $refsize, $defaultunit, true);
 				$size = $this->getHTMLUnitToUnits($val, $parent_size, $defaultunit, true);
 			}
 		}
@@ -16366,6 +16396,53 @@ public function getHTMLFontUnits($val, $refsize=12, $parent_size=12, $defaultuni
 	 * @since 3.2.000 (2008-06-20)
 	 */
 	protected function getHtmlDomArray($html) {
+		// set inheritable properties fot the first void element
+		// possible inheritable properties are: azimuth, border-collapse, border-spacing, caption-side, color, cursor, direction, empty-cells, font, font-family, font-stretch, font-size, font-size-adjust, font-style, font-variant, font-weight, letter-spacing, line-height, list-style, list-style-image, list-style-position, list-style-type, orphans, page, page-break-inside, quotes, speak, speak-header, text-align, text-indent, text-transform, volume, white-space, widows, word-spacing
+		$dom = array(
+			array(
+				'tag' => false,
+				'block' => false,
+				'value' => '',
+				'parent' => 0,
+				'hide' => false,
+				'fontname' => $this->FontFamily,
+				'fontstyle' => $this->FontStyle,
+				'fontsize' => $this->FontSizePt,
+				'font-stretch' => $this->font_stretching,
+				'letter-spacing' => $this->font_spacing,
+				'stroke' => $this->textstrokewidth,
+				'fill' => (($this->textrendermode % 2) == 0),
+				'clip' => ($this->textrendermode > 3),
+				'line-height' => $this->cell_height_ratio,
+				'bgcolor' => false,
+				'fgcolor' => $this->fgcolor, // color
+				'strokecolor' => $this->strokecolor,
+				'align' => '',
+				'listtype' => '',
+				'text-indent' => 0,
+				'text-transform' => '',
+				'border' => array(),
+				'dir' => $this->rtl?'rtl':'ltr',
+				'width' => 0,
+				'height' => 0,
+				'x' => 0,
+				'y' => 0,
+				'w' => 0,
+				'h' => 0,
+				'l' => 0,
+				't' => 0,
+				'r' => 0,
+				'b' => 0,
+				'padding' => array('T' => 0, 'R' => 0, 'B' => 0, 'L' => 0),
+				'margin' => array('T' => 0, 'R' => 0, 'B' => 0, 'L' => 0),
+				'border-spacing' => array('H' => 0, 'V' => 0),
+				'border-collapse' => 'separate',
+			)
+		);
+
+		if(empty($html)) {
+			return $dom;
+		}
 		// array of CSS styles ( selector => properties).
 		$css = array();
 		// get CSS array defined at previous call
@@ -16510,37 +16587,8 @@ protected function getHtmlDomArray($html) {
 		// count elements
 		$maxel = count($a);
 		$elkey = 0;
-		$key = 0;
-		// create an array of elements
-		$dom = array();
-		$dom[$key] = array();
-		// set inheritable properties fot the first void element
-		// possible inheritable properties are: azimuth, border-collapse, border-spacing, caption-side, color, cursor, direction, empty-cells, font, font-family, font-stretch, font-size, font-size-adjust, font-style, font-variant, font-weight, letter-spacing, line-height, list-style, list-style-image, list-style-position, list-style-type, orphans, page, page-break-inside, quotes, speak, speak-header, text-align, text-indent, text-transform, volume, white-space, widows, word-spacing
-		$dom[$key]['tag'] = false;
-		$dom[$key]['block'] = false;
-		$dom[$key]['value'] = '';
-		$dom[$key]['parent'] = 0;
-		$dom[$key]['hide'] = false;
-		$dom[$key]['fontname'] = $this->FontFamily;
-		$dom[$key]['fontstyle'] = $this->FontStyle;
-		$dom[$key]['fontsize'] = $this->FontSizePt;
-		$dom[$key]['font-stretch'] = $this->font_stretching;
-		$dom[$key]['letter-spacing'] = $this->font_spacing;
-		$dom[$key]['stroke'] = $this->textstrokewidth;
-		$dom[$key]['fill'] = (($this->textrendermode % 2) == 0);
-		$dom[$key]['clip'] = ($this->textrendermode > 3);
-		$dom[$key]['line-height'] = $this->cell_height_ratio;
-		$dom[$key]['bgcolor'] = false;
-		$dom[$key]['fgcolor'] = $this->fgcolor; // color
-		$dom[$key]['strokecolor'] = $this->strokecolor;
-		$dom[$key]['align'] = '';
-		$dom[$key]['listtype'] = '';
-		$dom[$key]['text-indent'] = 0;
-		$dom[$key]['text-transform'] = '';
-		$dom[$key]['border'] = array();
-		$dom[$key]['dir'] = $this->rtl?'rtl':'ltr';
 		$thead = false; // true when we are inside the THEAD tag
-		++$key;
+		$key = 1;
 		$level = array();
 		array_push($level, 0); // root
 		while ($elkey < $maxel) {
@@ -17177,41 +17225,59 @@ protected function getSpaceString() {
 	}
 
 	/**
-	 * Return an hash code used to ensure that the serialized data has been generated by this TCPDF instance.
-	 * @param string $data serialized data
-	 * @return string
-	 * @public static
+	 * Calculates the hash value of the given data.
+	 *
+	 * @param string $data The data to be hashed.
+	 * @return string The hashed value of the data.
 	 */
-	protected function getHashForTCPDFtagParams($data) {
-		return md5(strlen($data).$this->file_id.$data);
+	protected function hashTCPDFtag($data) {
+		return hash_hmac('sha256', $data, $this->hash_key, false);
 	}
 
 	/**
-	 * Serialize an array of parameters to be used with TCPDF tag in HTML code.
-	 * @param array $data parameters array
-	 * @return string containing serialized data
+	 * Serialize data to be used with TCPDF tag in HTML code.
+	 * @param string $method TCPDF method name
+	 * @param array $params Method parameters
+	 * @return string Serialized data
 	 * @public static
 	 */
-	public function serializeTCPDFtagParameters($data) {
+	public function serializeTCPDFtag($method, $params=array()) {
+		$data = array('m' => $method, 'p' => $params);
 		$encoded = urlencode(json_encode($data));
-		return $this->getHashForTCPDFtagParams($encoded).$encoded;
+		$hash = $this->hashTCPDFtag($encoded);
+		return strlen($hash).'+'.$hash.'+'.$encoded;
 	}
 
 	/**
-	 * Unserialize parameters to be used with TCPDF tag in HTML code.
+	 * Unserialize data to be used with TCPDF tag in HTML code.
 	 * @param string $data serialized data
 	 * @return array containing unserialized data
 	 * @protected static
 	 */
-	protected function unserializeTCPDFtagParameters($data) {
-		$hash = substr($data, 0, 32);
-		$encoded = substr($data, 32);
-		if ($hash != $this->getHashForTCPDFtagParams($encoded)) {
+	protected function unserializeTCPDFtag($data) {
+		$hpos = strpos($data, '+');
+		$hlen = intval(substr($data, 0, $hpos));
+		$hash = substr($data, $hpos + 1, $hlen);
+		$encoded = substr($data, $hpos + 2 + $hlen);
+		if ($hash != $this->hashTCPDFtag($encoded)) {
 			$this->Error('Invalid parameters');
 		}
 		return json_decode(urldecode($encoded), true);
 	}
 
+	/**
+	 * Check if a TCPDF tag is allowed
+	 * @param string $method TCPDF method name
+	 * @return boolean
+	 * @protected
+	 */
+	protected function allowedTCPDFtag($method) {
+		if (defined('K_ALLOWED_TCPDF_TAGS')) {
+			return (strpos(K_ALLOWED_TCPDF_TAGS, '|'.$method.'|') !== false);
+		}
+		return false;
+	}
+
 	/**
 	 * Prints a cell (rectangular area) with optional borders, background color and html text string.
 	 * The upper-left corner of the cell corresponds to the current position. After the call, the current position moves to the right or to the next line.<br />
@@ -17225,8 +17291,7 @@ protected function unserializeTCPDFtagParameters($data) {
 	 * @param float|null $y upper-left corner Y coordinate
 	 * @param string $html html text to print. Default value: empty string.
 	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL language)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
-Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
+	 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL language)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul> Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
 	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
 	 * @param boolean $reseth if true reset the last cell height (default true).
 	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
@@ -17359,6 +17424,7 @@ public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=fal
 					++$key;
 				}
 			}
+			if ($key == $maxel) break;
 			if ($dom[$key]['tag'] AND isset($dom[$key]['attribute']['pagebreak'])) {
 				// check for pagebreak
 				if (($dom[$key]['attribute']['pagebreak'] == 'true') OR ($dom[$key]['attribute']['pagebreak'] == 'left') OR ($dom[$key]['attribute']['pagebreak'] == 'right')) {
@@ -17732,7 +17798,7 @@ public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=fal
 							$pend = '';
 						}
 					}
-					if ((isset($plalign) AND ((($plalign == 'C') OR ($plalign == 'J') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl)))))) {
+					if ((((($plalign == 'C') OR ($plalign == 'J') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl)))))) {
 						// calculate shifting amount
 						$tw = $w;
 						if (($plalign == 'J') AND $this->isRTLTextDir() AND ($this->num_columns > 1)) {
@@ -18338,7 +18404,7 @@ public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=fal
 							$dom[$trid]['cellpos'][($cellid - 1)]['bgcolor'] = $dom[$parentid]['bgcolor'];
 						}
 						// store border info
-						if (isset($tdborder) AND !empty($tdborder)) {
+						if (!empty($tdborder)) {
 							$dom[$trid]['cellpos'][($cellid - 1)]['border'] = $tdborder;
 						}
 						$prevLastH = $this->lasth;
@@ -18574,7 +18640,7 @@ public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=fal
 						$strrest = $this->Write($this->lasth, $dom[$key]['value'], '', $wfill, '', false, 0, true, $firstblock, 0, $wadj);
 						// restore default direction
 						if ($reverse_dir AND ($wadj == 0)) {
-							$this->x = $xws;
+							$this->x = $xws; // @phpstan-ignore-line
 							$this->rtl = !$this->rtl;
 							$reverse_dir = false;
 						}
@@ -18683,7 +18749,7 @@ public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=fal
 					$pend = '';
 				}
 			}
-			if ((isset($plalign) AND ((($plalign == 'C') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl)))))) {
+			if ((((($plalign == 'C') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl)))))) {
 				// calculate shifting amount
 				$tw = $w;
 				if ($this->lMargin != $prevlMargin) {
@@ -18990,6 +19056,9 @@ protected function openHTMLTagHandler($dom, $key, $cell) {
 					// data stream
 					$imgsrc = '@'.base64_decode(substr($imgsrc, 1));
 					$type = '';
+				} else if (preg_match('@^data:image/([^;]*);base64,(.*)@', $imgsrc, $reg)) {
+					$imgsrc = '@'.base64_decode($reg[2]);
+					$type = $reg[1];
 				} elseif ( $this->allowLocalFiles && substr($imgsrc, 0, 7) === 'file://') {
                     // get image type from a local file path
                     $imgsrc = substr($imgsrc, 7);
@@ -19483,17 +19552,14 @@ protected function openHTMLTagHandler($dom, $key, $cell) {
 			case 'tcpdf': {
 				if (defined('K_TCPDF_CALLS_IN_HTML') AND (K_TCPDF_CALLS_IN_HTML === true)) {
 					// Special tag used to call TCPDF methods
-					if (isset($tag['attribute']['method'])) {
-						$tcpdf_method = $tag['attribute']['method'];
-						if (method_exists($this, $tcpdf_method)) {
-							if (isset($tag['attribute']['params']) AND (!empty($tag['attribute']['params']))) {
-								$params = $this->unserializeTCPDFtagParameters($tag['attribute']['params']);
-								call_user_func_array(array($this, $tcpdf_method), $params);
-							} else {
-								$this->$tcpdf_method();
-							}
-							$this->newline = true;
+					// This tag is disabled by default by the K_TCPDF_CALLS_IN_HTML constant on TCPDF configuration file.
+					// Please use this feature only if you are in control of the HTML content and you are sure that it does not contain any harmful code.
+					if (!empty($tag['attribute']['data'])) {
+						$tcpdf_tag_data = $this->unserializeTCPDFtag($tag['attribute']['data']);
+						if ($this->allowedTCPDFtag($tcpdf_tag_data['m'])) {
+							call_user_func_array(array($this, $tcpdf_tag_data['m']), $tcpdf_tag_data['p']);
 						}
+						$this->newline = true;
 					}
 				}
 				break;
@@ -19703,7 +19769,7 @@ protected function closeHTMLTagHandler($dom, $key, $cell, $maxbottomliney=0) {
 					$table_el = $dom[($dom[$key]['parent'])];
 				}
 				// for each row
-				if (count($table_el['trids']) > 0) {
+				if (!empty($table_el['trids'])) {
 					unset($xmax);
 				}
 				foreach ($table_el['trids'] as $j => $trkey) {
@@ -21840,25 +21906,23 @@ public function commitTransaction() {
 	 * @since 4.5.029 (2009-03-19)
 	 */
 	public function rollbackTransaction($self=false) {
-		if (isset($this->objcopy)) {
-			$objcopy = $this->objcopy;
-			$this->_destroy(true, true);
-			if ($self) {
-				$objvars = get_object_vars($objcopy);
-				foreach ($objvars as $key => $value) {
-					$this->$key = $value;
-				}
-				$objcopy->_destroy(true, true);
-				/* The unique file_id should not be used during cleanup again */
-				$objcopy->file_id = NULL;
-				unset($objcopy);
-				return $this;
+		if (!isset($this->objcopy)) {
+			return $this;
+		}
+		$file_id = $this->file_id;
+		$objcopy = $this->objcopy;
+		$this->_destroy(true, true);
+		if ($self) {
+			$objvars = get_object_vars($objcopy);
+			foreach ($objvars as $key => $value) {
+				$this->$key = $value;
 			}
-			/* The unique file_id should not be used during cleanup again */
-			$this->file_id = NULL;
-			return $objcopy;
+			$objcopy->_destroy(true, true);
+			unset($objcopy);
+			return $this;
 		}
-		return $this;
+		$this->file_id = $file_id;
+		return $objcopy;
 	}
 
 	// --- MULTI COLUMNS METHODS -----------------------
@@ -22034,7 +22098,7 @@ public function getNumberOfColumns() {
 	public function setTextRenderingMode($stroke=0, $fill=true, $clip=false) {
 		// Ref.: PDF 32000-1:2008 - 9.3.6 Text Rendering Mode
 		// convert text rendering parameters
-		if ($stroke < 0) {
+		if ($stroke < 0 || !is_numeric($stroke)) {
 			$stroke = 0;
 		}
 		if ($fill === true) {
@@ -23883,9 +23947,7 @@ protected function SVGPath($d, $style='') {
 			}
 			$firstcmd = false;
 		} // end foreach
-		if (!empty($op)) {
-			$this->_out($op);
-		}
+		$this->_out($op);
 		return array($xmin, $ymin, ($xmax - $xmin), ($ymax - $ymin));
 	}
 
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf_autoconfig.php b/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf_autoconfig.php
index 6ec9ce83b..2bcfccb82 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf_autoconfig.php
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf_autoconfig.php
@@ -228,6 +228,10 @@
 	define('K_TCPDF_CALLS_IN_HTML', false);
 }
 
+if (!defined('K_ALLOWED_TCPDF_TAGS')) {
+	define('K_ALLOWED_TCPDF_TAGS', '');
+}
+
 if (!defined('K_TCPDF_THROW_EXCEPTION_ERROR')) {
 	define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
 }
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf_barcodes_1d.php b/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf_barcodes_1d.php
index 10a79a72e..45d35616c 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf_barcodes_1d.php
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf_barcodes_1d.php
@@ -828,7 +828,7 @@ protected function barcode_s25($code, $checksum=false) {
 		$chr['5'] = '11101011101010';
 		$chr['6'] = '10111011101010';
 		$chr['7'] = '10101011101110';
-		$chr['8'] = '10101110111010';
+		$chr['8'] = '11101010111010';
 		$chr['9'] = '10111010111010';
 		if ($checksum) {
 			// add checksum
@@ -838,7 +838,7 @@ protected function barcode_s25($code, $checksum=false) {
 			// add leading zero if code-length is odd
 			$code = '0'.$code;
 		}
-		$seq = '11011010';
+		$seq = '1110111010';
 		$clen = strlen($code);
 		for ($i = 0; $i < $clen; ++$i) {
 			$digit = $code[$i];
@@ -848,7 +848,7 @@ protected function barcode_s25($code, $checksum=false) {
 			}
 			$seq .= $chr[$digit];
 		}
-		$seq .= '1101011';
+		$seq .= '111010111';
 		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
 		return $this->binseq_to_array($seq, $bararray);
 	}
diff --git a/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf_import.php b/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf_import.php
index cc6fda780..57f9f4f4b 100644
--- a/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf_import.php
+++ b/www/modules/civicrm/vendor/tecnickcom/tcpdf/tcpdf_import.php
@@ -61,7 +61,7 @@ class TCPDF_IMPORT extends TCPDF {
 	/**
 	 * Import an existing PDF document
 	 * @param string $filename Filename of the PDF document to import.
-	 * @return true in case of success, false otherwise
+	 * @return void
 	 * @public
 	 * @since 1.0.000 (2011-05-24)
 	 */
diff --git a/www/modules/civicrm/xml/schema/Contact/SavedSearch.xml b/www/modules/civicrm/xml/schema/Contact/SavedSearch.xml
index c26b8ded1..17ec417fe 100644
--- a/www/modules/civicrm/xml/schema/Contact/SavedSearch.xml
+++ b/www/modules/civicrm/xml/schema/Contact/SavedSearch.xml
@@ -22,7 +22,7 @@
   </field>
   <primaryKey>
     <name>id</name>
-    <autoincrement>false</autoincrement>
+    <autoincrement>true</autoincrement>
   </primaryKey>
 
   <field>
diff --git a/www/modules/civicrm/xml/schema/Contribute/Product.xml b/www/modules/civicrm/xml/schema/Contribute/Product.xml
index 1849fbfb5..35c29c91f 100644
--- a/www/modules/civicrm/xml/schema/Contribute/Product.xml
+++ b/www/modules/civicrm/xml/schema/Contribute/Product.xml
@@ -65,6 +65,7 @@
     <type>text</type>
     <localizable>true</localizable>
     <comment>Store comma-delimited list of color, size, etc. options for the product.</comment>
+    <serialize>COMMA</serialize>
     <add>1.4</add>
   </field>
   <field>
@@ -166,8 +167,7 @@
     <type>varchar</type>
     <length>8</length>
     <default>'rolling'</default>
-    <comment>Rolling means we set start/end based on current day, fixed means we set start/end for current year or month
-      (e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006) </comment>
+    <comment>Rolling means we set start/end based on current day, fixed means we set start/end for current year or month (e.g. 1 year + fixed -> we would set start/end for 1/1/06 thru 12/31/06 for any premium chosen in 2006)</comment>
     <pseudoconstant>
       <callback>CRM_Core_SelectValues::periodType</callback>
     </pseudoconstant>
diff --git a/www/modules/civicrm/xml/schema/Core/County.xml b/www/modules/civicrm/xml/schema/Core/County.xml
index 690b7ee03..278b7120f 100644
--- a/www/modules/civicrm/xml/schema/Core/County.xml
+++ b/www/modules/civicrm/xml/schema/Core/County.xml
@@ -19,7 +19,7 @@
   </field>
   <primaryKey>
     <name>id</name>
-    <autoincrement>false</autoincrement>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
     <name>name</name>
diff --git a/www/modules/civicrm/xml/schema/Core/CustomField.xml b/www/modules/civicrm/xml/schema/Core/CustomField.xml
index e33c2a71c..4f712467a 100644
--- a/www/modules/civicrm/xml/schema/Core/CustomField.xml
+++ b/www/modules/civicrm/xml/schema/Core/CustomField.xml
@@ -345,6 +345,22 @@
     <comment>Name of entity being referenced.</comment>
     <add>5.60</add>
   </field>
+  <field>
+    <name>fk_entity_on_delete</name>
+    <type>varchar</type>
+    <title>On Referenced Entity Delete</title>
+    <length>255</length>
+    <default>'set_null'</default>
+    <required>true</required>
+    <comment>Behavior if referenced entity is deleted.</comment>
+    <pseudoconstant>
+      <callback>CRM_Core_BAO_CustomField::getFkEntityOnDeleteOptions</callback>
+    </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
+    <add>5.71</add>
+  </field>
   <index>
     <name>UI_label_custom_group_id</name>
     <fieldName>label</fieldName>
diff --git a/www/modules/civicrm/xml/schema/Core/Job.xml b/www/modules/civicrm/xml/schema/Core/Job.xml
index ac0aa6674..2d15d1c69 100644
--- a/www/modules/civicrm/xml/schema/Core/Job.xml
+++ b/www/modules/civicrm/xml/schema/Core/Job.xml
@@ -77,6 +77,17 @@
     </html>
     <add>4.1</add>
   </field>
+  <field>
+    <name>last_run_end</name>
+    <type>timestamp</type>
+    <default>NULL</default>
+    <required>false</required>
+    <comment>When did this cron entry last finish running</comment>
+    <html>
+      <label>Last Run End</label>
+    </html>
+    <add>5.72</add>
+  </field>
   <field>
     <name>scheduled_run_date</name>
     <type>timestamp</type>
diff --git a/www/modules/civicrm/xml/schema/Core/MailSettings.xml b/www/modules/civicrm/xml/schema/Core/MailSettings.xml
index 9ef04279d..3ed20d4ce 100644
--- a/www/modules/civicrm/xml/schema/Core/MailSettings.xml
+++ b/www/modules/civicrm/xml/schema/Core/MailSettings.xml
@@ -192,7 +192,7 @@
     <html>
       <type>CheckBox</type>
     </html>
-    <description>If this option is enabled, CiviCRM will not create new contacts when filing emails.</description>
+    <comment>If this option is enabled, CiviCRM will not create new contacts when filing emails.</comment>
     <add>5.31</add>
   </field>
   <field>
@@ -235,7 +235,7 @@
       <table>civicrm_campaign</table>
       <keyColumn>id</keyColumn>
       <labelColumn>title</labelColumn>
-      <prefetch>FALSE</prefetch>
+      <prefetch>disabled</prefetch>
     </pseudoconstant>
   </field>
   <foreignKey>
diff --git a/www/modules/civicrm/xml/schema/Core/OpenID.xml b/www/modules/civicrm/xml/schema/Core/OpenID.xml
index d7687868c..297d741d9 100644
--- a/www/modules/civicrm/xml/schema/Core/OpenID.xml
+++ b/www/modules/civicrm/xml/schema/Core/OpenID.xml
@@ -68,6 +68,9 @@
     <dataPattern>/^[\w\/\:\.]+$/</dataPattern>
     <comment>the OpenID (or OpenID-style http://username.domain/) unique identifier for this contact mainly used for logging in to CiviCRM</comment>
     <rule>url</rule>
+    <html>
+      <type>Url</type>
+    </html>
     <comment>OpenID</comment>
     <add>2.0</add>
   </field>
diff --git a/www/modules/civicrm/xml/schema/Core/Persistent.xml b/www/modules/civicrm/xml/schema/Core/Persistent.xml
index 05295c096..a104c73f0 100644
--- a/www/modules/civicrm/xml/schema/Core/Persistent.xml
+++ b/www/modules/civicrm/xml/schema/Core/Persistent.xml
@@ -19,7 +19,7 @@
   </field>
   <primaryKey>
     <name>id</name>
-    <autoincrement>false</autoincrement>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
     <name>context</name>
diff --git a/www/modules/civicrm/xml/schema/Core/StateProvince.xml b/www/modules/civicrm/xml/schema/Core/StateProvince.xml
index 337872969..59630b6a3 100644
--- a/www/modules/civicrm/xml/schema/Core/StateProvince.xml
+++ b/www/modules/civicrm/xml/schema/Core/StateProvince.xml
@@ -21,7 +21,7 @@
   </field>
   <primaryKey>
     <name>id</name>
-    <autoincrement>false</autoincrement>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
     <name>name</name>
diff --git a/www/modules/civicrm/xml/schema/Core/UFGroup.xml b/www/modules/civicrm/xml/schema/Core/UFGroup.xml
index 4f4bbfd2e..0844e76af 100644
--- a/www/modules/civicrm/xml/schema/Core/UFGroup.xml
+++ b/www/modules/civicrm/xml/schema/Core/UFGroup.xml
@@ -27,6 +27,24 @@
     </html>
     <add>1.1</add>
   </field>
+  <field>
+    <name>name</name>
+    <title>Profile Name</title>
+    <type>varchar</type>
+    <length>64</length>
+    <required>true</required>
+    <html>
+      <type>Text</type>
+    </html>
+    <comment>Name of the UF group for directly addressing it in the codebase</comment>
+    <add>3.0</add>
+  </field>
+  <index>
+    <name>UI_name</name>
+    <fieldName>name</fieldName>
+    <unique>true</unique>
+    <add>4.7</add>
+  </index>
   <primaryKey>
     <name>id</name>
     <autoincrement>true</autoincrement>
@@ -56,7 +74,7 @@
   </field>
   <field>
     <name>title</name>
-    <title>Profile Name</title>
+    <title>Profile Title</title>
     <type>varchar</type>
     <length>64</length>
     <localizable>true</localizable>
@@ -72,6 +90,7 @@
     <title>Public Title</title>
     <type>varchar</type>
     <length>64</length>
+    <required>true</required>
     <localizable>true</localizable>
     <comment>Profile Form Public title</comment>
     <html>
@@ -242,20 +261,6 @@
     <comment>Is this group reserved for use by some other CiviCRM functionality?</comment>
     <add>3.0</add>
   </field>
-  <field>
-    <name>name</name>
-    <title>Profile Name</title>
-    <type>varchar</type>
-    <length>64</length>
-    <comment>Name of the UF group for directly addressing it in the codebase</comment>
-    <add>3.0</add>
-  </field>
-  <index>
-    <name>UI_name</name>
-    <fieldName>name</fieldName>
-    <unique>true</unique>
-    <add>4.7</add>
-  </index>
   <field>
     <name>created_id</name>
     <title>Created By Contact ID</title>
diff --git a/www/modules/civicrm/xml/schema/Cxn/Cxn.xml b/www/modules/civicrm/xml/schema/Cxn/Cxn.xml
index 124b4579d..34b29c844 100644
--- a/www/modules/civicrm/xml/schema/Cxn/Cxn.xml
+++ b/www/modules/civicrm/xml/schema/Cxn/Cxn.xml
@@ -16,7 +16,7 @@
   </field>
   <primaryKey>
     <name>id</name>
-    <autoincrement>false</autoincrement>
+    <autoincrement>true</autoincrement>
   </primaryKey>
 
   <!-- Application identification -->
diff --git a/www/modules/civicrm/xml/schema/Event/Event.xml b/www/modules/civicrm/xml/schema/Event/Event.xml
index f2dfe5141..e4ad18c16 100644
--- a/www/modules/civicrm/xml/schema/Event/Event.xml
+++ b/www/modules/civicrm/xml/schema/Event/Event.xml
@@ -444,7 +444,7 @@
     <type>text</type>
     <title>Confirmation Email Text</title>
     <html>
-      <type>TextArea</type>
+      <type>RichTextEditor</type>
       <rows>4</rows>
       <cols>50</cols>
     </html>
@@ -711,6 +711,7 @@
     <name>selfcancelxfer_time</name>
     <type>int</type>
     <default>0</default>
+    <required>true</required>
     <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>
     <add>4.7</add>
diff --git a/www/modules/civicrm/xml/schema/Event/Participant.xml b/www/modules/civicrm/xml/schema/Event/Participant.xml
index 52ec82d87..1e57d1ed5 100644
--- a/www/modules/civicrm/xml/schema/Event/Participant.xml
+++ b/www/modules/civicrm/xml/schema/Event/Participant.xml
@@ -13,6 +13,7 @@
     <add>civicrm/participant/add?action=add&amp;context=standalone&amp;reset=1</add>
     <view>civicrm/contact/view/participant?id=[id]&amp;cid=[contact_id]&amp;action=view&amp;reset=1</view>
     <update>civicrm/contact/view/participant?id=[id]&amp;cid=[contact_id]&amp;action=update&amp;reset=1</update>
+    <detach>civicrm/event/selfsvcupdate?reset=1&amp;pid=[id]&amp;is_backoffice=1</detach>
     <delete>civicrm/participant/delete?id=[id]&amp;reset=1</delete>
   </paths>
   <field>
@@ -182,6 +183,9 @@
     <default>0</default>
     <required>true</required>
     <import>true</import>
+    <html>
+      <type>Radio</type>
+    </html>
     <add>1.7</add>
   </field>
   <field>
@@ -193,6 +197,9 @@
     <required>true</required>
     <import>true</import>
     <headerPattern>/(is.)?(pay(.)?later)$/i</headerPattern>
+    <html>
+      <type>Radio</type>
+    </html>
     <add>2.1</add>
   </field>
 
@@ -205,6 +212,9 @@
     <headerPattern>/fee(.?am(ou)?nt)?/i</headerPattern>
     <dataPattern>/^\d+(\.\d{2})?$/</dataPattern>
     <comment>actual processor fee if known - may be 0.</comment>
+    <html>
+      <type>Text</type>
+    </html>
     <add>2.1</add>
   </field>
   <field>
diff --git a/www/modules/civicrm/xml/schema/Mailing/Event/MailingEventQueue.xml b/www/modules/civicrm/xml/schema/Mailing/Event/MailingEventQueue.xml
index 3850ee28f..47ac09bf6 100644
--- a/www/modules/civicrm/xml/schema/Mailing/Event/MailingEventQueue.xml
+++ b/www/modules/civicrm/xml/schema/Mailing/Event/MailingEventQueue.xml
@@ -77,6 +77,7 @@
     <comment>FK to Email</comment>
     <html>
       <label>Email</label>
+      <type>EntityRef</type>
     </html>
   </field>
   <foreignKey>
diff --git a/www/modules/civicrm/xml/schema/Member/MembershipStatus.xml b/www/modules/civicrm/xml/schema/Member/MembershipStatus.xml
index ee7f1d93c..9c4ddfd57 100644
--- a/www/modules/civicrm/xml/schema/Member/MembershipStatus.xml
+++ b/www/modules/civicrm/xml/schema/Member/MembershipStatus.xml
@@ -134,6 +134,9 @@
     <required>true</required>
     <comment>Does this status aggregate to current members (e.g. New, Renewed, Grace might all be TRUE... while Unrenewed, Lapsed, Inactive would be FALSE).</comment>
     <add>1.5</add>
+    <html>
+      <type>CheckBox</type>
+    </html>
   </field>
   <field>
     <name>is_admin</name>
diff --git a/www/modules/civicrm/xml/schema/Member/MembershipType.xml b/www/modules/civicrm/xml/schema/Member/MembershipType.xml
index df82e707f..ae0328dbf 100644
--- a/www/modules/civicrm/xml/schema/Member/MembershipType.xml
+++ b/www/modules/civicrm/xml/schema/Member/MembershipType.xml
@@ -9,6 +9,11 @@
   <log>true</log>
   <component>CiviMember</component>
   <labelField>name</labelField>
+  <paths>
+    <add>civicrm/admin/member/membershipType/add?action=add&amp;reset=1</add>
+    <update>civicrm/admin/member/membershipType/add?action=update&amp;id=[id]&amp;reset=1</update>
+    <delete>civicrm/admin/member/membershipType/add?action=delete&amp;id=[id]&amp;reset=1</delete>
+  </paths>
   <field>
     <name>id</name>
     <title>Membership Type ID</title>
diff --git a/www/modules/civicrm/xml/schema/PCP/PCP.xml b/www/modules/civicrm/xml/schema/PCP/PCP.xml
index 6c8ab75bb..1b0cd1dd3 100644
--- a/www/modules/civicrm/xml/schema/PCP/PCP.xml
+++ b/www/modules/civicrm/xml/schema/PCP/PCP.xml
@@ -118,8 +118,16 @@
     <html>
       <type>Select</type>
     </html>
+    <pseudoconstant>
+      <callback>CRM_PCP_BAO_PCP::pageTypeOptions</callback>
+    </pseudoconstant>
     <add>2.2</add>
   </field>
+  <dynamicForeignKey>
+    <idColumn>page_id</idColumn>
+    <typeColumn>page_type</typeColumn>
+    <add>2.1</add>
+  </dynamicForeignKey>
   <field>
     <name>pcp_block_id</name>
     <title>PCP Block</title>
diff --git a/www/modules/civicrm/xml/schema/Report/ReportInstance.xml b/www/modules/civicrm/xml/schema/Report/ReportInstance.xml
index e4e1c5896..98d366587 100644
--- a/www/modules/civicrm/xml/schema/Report/ReportInstance.xml
+++ b/www/modules/civicrm/xml/schema/Report/ReportInstance.xml
@@ -22,7 +22,7 @@
   </field>
   <primaryKey>
     <name>id</name>
-    <autoincrement>false</autoincrement>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
     <name>domain_id</name>
diff --git a/www/modules/civicrm/xml/schema/SMS/Provider.xml b/www/modules/civicrm/xml/schema/SMS/Provider.xml
index c9df774a4..eb2c39476 100644
--- a/www/modules/civicrm/xml/schema/SMS/Provider.xml
+++ b/www/modules/civicrm/xml/schema/SMS/Provider.xml
@@ -2,7 +2,7 @@
 
 <table>
   <base>CRM/SMS</base>
-  <class>Provider</class>
+  <class>SmsProvider</class>
   <name>civicrm_sms_provider</name>
   <comment>Table to add different sms providers </comment>
   <add>4.2</add>
diff --git a/www/modules/civicrm/xml/templates/civicrm_navigation.tpl b/www/modules/civicrm/xml/templates/civicrm_navigation.tpl
index f3428eeb3..e95101f6b 100644
--- a/www/modules/civicrm/xml/templates/civicrm_navigation.tpl
+++ b/www/modules/civicrm/xml/templates/civicrm_navigation.tpl
@@ -154,7 +154,7 @@ VALUES
     ( @domainID, 'civicrm/participant/add?reset=1&action=add&context=standalone', '{ts escape="sql" skip="true"}Register Event Participant{/ts}', 'Register Event Participant', 'access CiviEvent,edit event participants', 'AND', @eventlastID, '1', NULL, 2 ),
     ( @domainID, 'civicrm/event/search?reset=1',                            '{ts escape="sql" skip="true"}Find Participants{/ts}',  'Find Participants',    'access CiviEvent', '',    @eventlastID, '1', NULL, 3 ),
     ( @domainID, 'civicrm/report/list?compid=1&reset=1', '{ts escape="sql" skip="true"}Event Reports{/ts}', 'Event Reports', 'access CiviEvent', '', @eventlastID, '1', 1,    4 ),
-    ( @domainID, 'civicrm/event/import?reset=1',                            '{ts escape="sql" skip="true"}Import Participants{/ts}','Import Participants',  'access CiviEvent,edit event participants', 'AND',    @eventlastID, '1', '1',  5 ),
+    ( @domainID, 'civicrm/import/participant?reset=1',                            '{ts escape="sql" skip="true"}Import Participants{/ts}','Import Participants',  'access CiviEvent,edit event participants', 'AND',    @eventlastID, '1', '1',  5 ),
     ( @domainID, 'civicrm/event/add?reset=1&action=add',                    '{ts escape="sql" skip="true"}New Event{/ts}',          'New Event',            'access CiviEvent,edit all events', 'AND',    @eventlastID, '0', NULL, 6 ),
     ( @domainID, 'civicrm/event/manage?reset=1',                            '{ts escape="sql" skip="true"}Manage Events{/ts}',      'Manage Events',        'access CiviEvent,edit all events', 'AND',    @eventlastID, '1', 1, 7 ),
     ( @domainID, 'civicrm/admin/pcp?reset=1&page_type=event',               '{ts escape="sql" skip="true"}Personal Campaign Pages{/ts}',    'Personal Campaign Pages',   'access CiviEvent,administer CiviCRM', 'AND', @eventlastID, '1', 1, 8 ),
@@ -198,7 +198,7 @@ VALUES
     ( @domainID, 'civicrm/member/search?reset=1',                       '{ts escape="sql" skip="true"}Find Memberships{/ts}',    'Find Memberships','access CiviMember', '', @memberlastID, '1', NULL, 3 ),
     ( @domainID, 'civicrm/report/list?compid=3&reset=1',                '{ts escape="sql" skip="true"}Membership Reports{/ts}',  'Membership Reports', 'access CiviMember', '', @memberlastID, '1', 1,    4 ),
     ( @domainID, 'civicrm/batch?reset=1',                               '{ts escape="sql" skip="true"}Batch Data Entry{/ts}',     'Batch Data Entry','access CiviContribute', '', @memberlastID, '1', NULL, 5 ),
-    ( @domainID, 'civicrm/member/import?reset=1',                       '{ts escape="sql" skip="true"}Import Memberships{/ts}',  'Import Members',  'access CiviMember,edit memberships', 'AND', @memberlastID, '1', 1, 6 ),
+    ( @domainID, 'civicrm/import/membership?reset=1',                       '{ts escape="sql" skip="true"}Import Memberships{/ts}',  'Import Members',  'access CiviMember,edit memberships', 'AND', @memberlastID, '1', 1, 6 ),
     ( @domainID, 'civicrm/admin/price/edit?reset=1&action=add',         '{ts escape="sql" skip="true"}New Price Set{/ts}',       'New Price Set',   'access CiviMember,administer CiviCRM', 'AND',  @memberlastID, '0', NULL, 7 ),
     ( @domainID, 'civicrm/admin/price?reset=1',                         '{ts escape="sql" skip="true"}Manage Price Sets{/ts}',   'Manage Price Sets', 'access CiviMember,administer CiviCRM', 'AND',  @memberlastID, '1', NULL, 8 );
 
@@ -527,7 +527,7 @@ 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
-    ( @domainID, 'civicrm/report/list?compid=99&reset=1', '{ts escape="sql" skip="true"}Contact Reports{/ts}', 'Contact Reports', 'administer CiviCRM', '', @reportlastID, '1', 0,    1 );
+    ( @domainID, 'civicrm/report/list?compid=99&reset=1', '{ts escape="sql" skip="true"}Contact Reports{/ts}', 'Contact Reports', 'access CiviReport', '', @reportlastID, '1', 0,    1 );
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
 VALUES
diff --git a/www/modules/civicrm/xml/templates/dao.tpl b/www/modules/civicrm/xml/templates/dao.tpl
index f7d0e83d5..e1e96f080 100644
--- a/www/modules/civicrm/xml/templates/dao.tpl
+++ b/www/modules/civicrm/xml/templates/dao.tpl
@@ -56,7 +56,7 @@ class {$table.className} extends CRM_Core_DAO {ldelim}
        *
        * @var bool
        */
-      public static $_log = {$table.log|strtoupper};
+      public static $_log = {$table.log|upper};
       {if $table.paths}
      /**
       * Paths for accessing this entity in the UI.
@@ -111,7 +111,7 @@ class {$table.className} extends CRM_Core_DAO {ldelim}
   * @return string
   */
   public static function getEntityDescription() {ldelim}
-    return {$tsFunctionName}('{$table.description|replace:"'":"\'"}');
+    return {$tsFunctionName}('{$table.description|crmEscapeSingleQuotes}');
   {rdelim}
 {/if}
 
@@ -137,16 +137,16 @@ class {$table.className} extends CRM_Core_DAO {ldelim}
                                                                       'title'     => {$tsFunctionName}('{$field.title}'),
 {/if}
 {if $field.comment}
-                                                                      'description'     => {$tsFunctionName}('{$field.comment|replace:"'":"\'"}'),
+                                                                      'description'     => {$tsFunctionName}('{$field.comment|crmEscapeSingleQuotes}'),
 {/if}
 {if $field.required}
-                                        'required'  => {$field.required|strtoupper},
+                                        'required'  => {$field.required|upper},
 {/if} {* field.required *}
 {if isset($field.length)}
                       'maxlength' => {$field.length},
 {/if} {* field.length *}
 {if isset($field.precision)}
-                      'precision'      => array({$field.precision}),
+                      'precision'      => array({$field.precision},),
 {/if}
 {if isset($field.size)}
                       'size'      => {$field.size},
@@ -158,17 +158,16 @@ class {$table.className} extends CRM_Core_DAO {ldelim}
                       'cols'      => {$field.cols},
 {/if} {* field.cols *}
                       'usage'     => array(
-                                       {foreach from=$field.usage key=usage item=isUsed}'{$usage}' => {$isUsed},
+                                       {foreach from=$field.usage key="usage" item="isUsed"}'{$usage}' => {if $isUsed}TRUE{else}FALSE{/if},
                                        {/foreach}),
-{if $field.import === 'TRUE'}
+{if $field.usage.import}
                       'import'    => TRUE,
-
 {/if} {* field.import *}
   'where'     => '{$table.name}.{$field.name}',
   {if $field.headerPattern}'headerPattern' => '{$field.headerPattern}',{/if}
   {if $field.dataPattern}'dataPattern' => '{$field.dataPattern}',{/if}
-{if $field.export === 'TRUE' || ($field.export === 'FALSE' && $field.import === 'TRUE')}
-                      'export'    => {$field.export},
+{if $field.usage.export || (!$field.usage.export && $field.usage.import)}
+                      'export'    => {if $field.usage.export}TRUE{else}FALSE{/if},
 {/if} {* field.export - only show if meaningful, deprecated for usage *}
 {if $field.contactType}
                       'contactType' => {if $field.contactType == 'null'}NULL{else}'{$field.contactType}'{/if},
@@ -202,7 +201,7 @@ class {$table.className} extends CRM_Core_DAO {ldelim}
                       'component' => '{$field.component}',
 {/if}
 {if $field.serialize}
-  'serialize' => self::SERIALIZE_{$field.serialize|strtoupper},
+  'serialize' => self::SERIALIZE_{$field.serialize|upper},
 {/if}
 {if $field.uniqueTitle}
   'unique_title' => {$tsFunctionName}('{$field.uniqueTitle}'),
diff --git a/www/modules/civicrm/xml/templates/message_templates/case_activity_html.tpl b/www/modules/civicrm/xml/templates/message_templates/case_activity_html.tpl
index cdaa45683..6ee987e60 100644
--- a/www/modules/civicrm/xml/templates/message_templates/case_activity_html.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/case_activity_html.tpl
@@ -23,7 +23,7 @@
           <table style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;">
             <tr>
               <th {$headerStyle}>
-                {ts}Activity Summary{/ts} - {$activityTypeName}
+                {ts}Activity Summary{/ts} - {activity.activity_type_id:label}
               </th>
             </tr>
             {if !empty($isCaseActivity)}
diff --git a/www/modules/civicrm/xml/templates/message_templates/case_activity_text.tpl b/www/modules/civicrm/xml/templates/message_templates/case_activity_text.tpl
index 685848c83..e69de29bb 100644
--- a/www/modules/civicrm/xml/templates/message_templates/case_activity_text.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/case_activity_text.tpl
@@ -1,40 +0,0 @@
-===========================================================
-{ts}Activity Summary{/ts} - {$activityTypeName}
-===========================================================
-{if !empty($isCaseActivity)}
-{ts}Your Case Role(s){/ts} : {$contact.role|default:''}
-{if !empty($manageCaseURL)}
-{ts}Manage Case{/ts} : {$manageCaseURL}
-{/if}
-{/if}
-
-{if !empty($editActURL)}
-{ts}Edit activity{/ts} : {$editActURL}
-{/if}
-{if !empty($viewActURL)}
-{ts}View activity{/ts} : {$viewActURL}
-{/if}
-
-{foreach from=$activity.fields item=field}
-{if $field.type eq 'Date'}
-{$field.label} : {$field.value|crmDate:$config->dateformatDatetime}
-{else}
-{$field.label} : {$field.value}
-{/if}
-{/foreach}
-
-{if !empty($activity.customGroups)}
-{foreach from=$activity.customGroups key=customGroupName item=customGroup}
-==========================================================
-{$customGroupName}
-==========================================================
-{foreach from=$customGroup item=field}
-{if $field.type eq 'Date'}
-{$field.label} : {$field.value|crmDate:$config->dateformatDatetime}
-{else}
-{$field.label} : {$field.value}
-{/if}
-{/foreach}
-
-{/foreach}
-{/if}
diff --git a/www/modules/civicrm/xml/templates/message_templates/contribution_dupalert_text.tpl b/www/modules/civicrm/xml/templates/message_templates/contribution_dupalert_text.tpl
index 28b2a37f2..e69de29bb 100644
--- a/www/modules/civicrm/xml/templates/message_templates/contribution_dupalert_text.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/contribution_dupalert_text.tpl
@@ -1,17 +0,0 @@
-{ts}A contribution / membership signup was made on behalf of the organization listed below.{/ts}
-{ts}The information provided matched multiple existing database records based on the configured Duplicate Matching Rules for your site.{/ts}
-
-{ts}Organization Name{/ts}: {$onBehalfName}
-{ts}Organization Email{/ts}: {$onBehalfEmail}
-{ts}Organization Contact ID{/ts}: {$onBehalfID}
-
-{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}
-
-{if $receiptMessage}
-###########################################################
-{ts}Copy of Contribution Receipt{/ts}
-
-###########################################################
-{$receiptMessage}
-
-{/if}
diff --git a/www/modules/civicrm/xml/templates/message_templates/contribution_invoice_receipt_html.tpl b/www/modules/civicrm/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
index 213665d7e..c2742578f 100644
--- a/www/modules/civicrm/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
@@ -26,14 +26,14 @@
       </tr>
       <tr>
         <td><font size="1" align="center">{contact.display_name}{if '{contact.current_employer}'} ({contact.current_employer}){/if}</font></td>
-        <td><font size="1" align="right">{$invoice_date}</font></td>
+        <td><font size="1" align="right">{contribution.receive_date|crmDate:"Full"}</font></td>
         <td style="white-space: nowrap"><font size="1" align="right">
           {domain.street_address}
           {domain.supplemental_address_1}
         </font></td>
       </tr>
       <tr>
-        <td><font size="1" align="center">{$street_address} {$supplemental_address_1}</font></td>
+        <td><font size="1" align="center">{contact.address_billing.street_address} {contact.address_billing.supplemental_address_1}</font></td>
         <td><b><font size="1" align="right">{ts}Invoice Number:{/ts}</font></b></td>
         <td><font size="1" align="right">
           {domain.supplemental_address_2}
@@ -41,7 +41,7 @@
         </font></td>
       </tr>
       <tr>
-        <td><font size="1" align="center">{$supplemental_address_2} {$stateProvinceAbbreviation}</font></td>
+        <td><font size="1" align="center">{contact.address_billing.supplemental_address_2} {contact.address_billing.state_province_id:abbr}</font></td>
         <td><font size="1" align="right">{contribution.invoice_number}</font></td>
         <td style="white-space: nowrap"><font size="1" align="right">
           {domain.city}
@@ -49,12 +49,12 @@
         </font></td>
       </tr>
       <tr>
-        <td><font size="1" align="right">{$city}  {$postal_code}</font></td>
+        <td><font size="1" align="right">{contact.address_billing.city}  {contact.address_billing.postal_code}</font></td>
         <td height="10"><b><font size="1" align="right">{ts}Reference:{/ts}</font></b></td>
         <td><font size="1" align="right">{domain.country_id:label}</font></td>
       </tr>
       <tr>
-        <td><font size="1" align="right"> {$country}</font></td>
+        <td><font size="1" align="right"> {contact.address_billing.country_id:label}</font></td>
         <td><font size="1" align="right">{contribution.source}</font></td>
         <td valign="top" style="white-space: nowrap"><font size="1" align="right">{domain.email}</font> </td>
       </tr>
@@ -71,7 +71,7 @@
         <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{ts}Quantity{/ts}</font></th>
         <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{ts}Unit Price{/ts}</font></th>
         <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{domain.tax_term}</font></th>
-        <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{ts 1=$currency}Amount %1{/ts}</font></th>
+        <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{ts 1='{contribution.currency}'}Amount %1{/ts}</font></th>
       </tr>
       {foreach from=$lineItems item=line}
         <tr>
@@ -91,7 +91,7 @@
       <tr>
         <td colspan="3"></td>
         <td style="text-align:right;"><font size="1">{ts}Sub Total{/ts}</font></td>
-        <td style="text-align:right;"><font size="1">{$subTotal|crmMoney:$currency}</font></td>
+        <td style="text-align:right;"><font size="1">{contribution.tax_exclusive_amount}</font></td>
       </tr>
       {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}
         {if $taxRate != 0}
@@ -104,8 +104,8 @@
       {/foreach}
       <tr>
         <td colspan="3"></td>
-        <td style="text-align:right;white-space: nowrap"><b><font size="1">{ts 1=$currency}TOTAL %1{/ts}</font></b></td>
-        <td style="text-align:right;"><font size="1">{$amount|crmMoney:$currency}</font></td>
+        <td style="text-align:right;white-space: nowrap"><b><font size="1">{ts 1='{contribution.currency}'}TOTAL %1{/ts}</font></b></td>
+        <td style="text-align:right;"><font size="1">{contribution.total_amount}</font></td>
       </tr>
       <tr>
         <td colspan="3"></td>
@@ -116,7 +116,7 @@
             {ts}Amount Paid{/ts}
           {/if}
         </font></td>
-        <td style="text-align:right;"><font size="1">{$amountPaid|crmMoney:$currency}</font></td>
+        <td style="text-align:right;"><font size="1">{contribution.paid_amount}</font></td>
       </tr>
       <tr>
         <td colspan="3"></td>
@@ -125,7 +125,7 @@
       <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>
+        <td style="text-align:right;"><b><font size="1">{contribution.balance_amount}</font></b></td>
       </tr>
       <tr>
         <td colspan="5"></td>
@@ -170,15 +170,15 @@
                 <td><font size="1" align="right">{contribution.invoice_number}</font></td>
               </tr>
               <tr><td colspan="5" style="color:#F5F5F5;"><hr></td></tr>
-              {if $is_pay_later == 1}
+              {if {contribution.is_pay_later|boolean}}
                 <tr>
                   <td><font size="1" align="right" style="font-weight:bold;">{ts}Amount Due:{/ts}</font></td>
-                  <td><font size="1" align="right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td>
+                  <td><font size="1" align="right" style="font-weight:bold;">{contribution.total_amount}</font></td>
                 </tr>
               {else}
                 <tr>
                   <td><font size="1" align="right" style="font-weight:bold;">{ts}Amount Due:{/ts}</font></td>
-                  <td><font size="1" align="right" style="font-weight:bold;">{$amountDue|crmMoney:$currency}</font></td>
+                  <td><font size="1" align="right" style="font-weight:bold;">{contribution.paid_amount}</font></td>
                 </tr>
               {/if}
               <tr>
@@ -211,14 +211,14 @@
       </tr>
       <tr>
         <td style="padding-left:17px;"><font size="1" align="center">{contact.display_name}{if '{contact.current_employer}'} ({contact.current_employer}){/if}</font></td>
-        <td style="padding-left:30px;"><font size="1" align="right">{$invoice_date}</font></td>
+        <td style="padding-left:30px;"><font size="1" align="right">{contribution.receive_date|crmDate:"Full"}</font></td>
         <td><font size="1" align="right">
           {domain.street_address}
           {domain.supplemental_address_1}
          </font></td>
       </tr>
       <tr>
-        <td style="padding-left:17px;"><font size="1" align="center">{$street_address}   {$supplemental_address_1}</font></td>
+        <td style="padding-left:17px;"><font size="1" align="center">{contact.address_billing.street_address}   {contact.address_billing.supplemental_address_1}</font></td>
         <td style="padding-left:30px;"><b><font size="1" align="right">{ts}Credit Note Number:{/ts}</font></b></td>
         <td><font size="1" align="right">
           {domain.supplemental_address_2}
@@ -226,7 +226,7 @@
         </font></td>
       </tr>
       <tr>
-        <td style="padding-left:17px;"><font size="1" align="center">{$supplemental_address_2}  {$stateProvinceAbbreviation}</font></td>
+        <td style="padding-left:17px;"><font size="1" align="center">{contact.address_billing.supplemental_address_2} {contact.address_billing.state_province_id:abbr}</font></td>
         <td style="padding-left:30px;"><font size="1" align="right">{contribution.creditnote_id}</font></td>
         <td><font size="1" align="right">
           {domain.city}
@@ -234,7 +234,7 @@
         </font></td>
       </tr>
       <tr>
-        <td style="padding-left:17px;"><font size="1" align="right">{$city}  {$postal_code}</font></td>
+        <td style="padding-left:17px;"><font size="1" align="right">{contact.address_billing.city}  {contact.address_billing.postal_code}</font></td>
         <td height="10" style="padding-left:30px;"><b><font size="1" align="right">{ts}Reference:{/ts}</font></b></td>
         <td><font size="1" align="right">
           {domain.country_id:label}
@@ -265,7 +265,7 @@
               <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{ts}Quantity{/ts}</font></th>
               <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{ts}Unit Price{/ts}</font></th>
               <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{domain.tax_term}</font></th>
-              <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{ts 1=$currency}Amount %1{/ts}</font></th>
+              <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{ts 1="{contribution.currency}"}Amount %1{/ts}</font></th>
             </tr>
             {foreach from=$lineItems item=line key=index}
               <tr><td colspan="5"><hr {if $index == 0}size="3" style="color:#000;"{else}style="color:#F5F5F5;"{/if}></hr></td></tr>
@@ -274,7 +274,7 @@
                   {$line.title}
                 </font></td>
                 <td style="padding-left:28px;text-align:right;"><font size="1">{$line.qty}</font></td>
-                <td style="padding-left:28px;text-align:right;"><font size="1">{$line.unit_price|crmMoney:$currency}</font></td>
+                <td style="padding-left:28px;text-align:right;"><font size="1">{$line.unit_price|crmMoney:'{contribution.currency}'}</font></td>
                 {if $line.tax_amount != ''}
                   <td style="padding-left:28px;text-align:right;"><font size="1">{if $line.tax_rate}{$line.tax_rate|crmNumberFormat}%{/if}</font></td>
                 {else}
@@ -287,7 +287,7 @@
             <tr>
               <td colspan="3"></td>
               <td style="padding-left:28px;text-align:right;"><font size="1">{ts}Sub Total{/ts}</font></td>
-              <td style="padding-left:28px;text-align:right;"><font size="1">{$subTotal|crmMoney:$currency}</font></td>
+              <td style="padding-left:28px;text-align:right;"><font size="1">{contribution.tax_exclusive_amount}</font></td>
             </tr>
             {foreach from=$taxRateBreakdown item=taxDetail key=taxRate}
                 {if $taxRate != 0}
@@ -304,14 +304,14 @@
             </tr>
             <tr>
               <td colspan="3"></td>
-              <td style="padding-left:28px;text-align:right;"><b><font size="1">{ts 1=$currency}TOTAL %1{/ts}</font></b></td>
-              <td style="padding-left:28px;text-align:right;"><font size="1">{$amount|crmMoney:$currency}</font></td>
+              <td style="padding-left:28px;text-align:right;"><b><font size="1">{ts 1='{contribution.currency}'}TOTAL %1{/ts}</font></b></td>
+              <td style="padding-left:28px;text-align:right;"><font size="1">{contribution.total_amount}</font></td>
             </tr>
-            {if '{contribution.is_pay_later}' == 0}
+            {if !'{contribution.is_pay_later|boolean}'}
               <tr>
                 <td colspan="3"></td>
                 <td style="padding-left:28px;text-align:right;"><font size="1">{ts}LESS Credit to invoice(s){/ts}</font></td>
-                <td style="padding-left:28px;text-align:right;"><font size="1">{$amount|crmMoney:$currency}</font></td>
+                <td style="padding-left:28px;text-align:right;"><font size="1">{contribution.total_amount}</font></td>
               </tr>
               <tr>
                 <td colspan="3"></td>
@@ -320,7 +320,7 @@
               <tr>
                 <td colspan="3"></td>
                 <td style="padding-left:28px;text-align:right;"><b><font size="1">{ts}REMAINING CREDIT{/ts}</font></b></td>
-                <td style="padding-left:28px;text-align:right;"><b><font size="1">{$amountDue|crmMoney:$currency}</font></b></td>
+                <td style="padding-left:28px;text-align:right;"><b><font size="1">{contribution.balance_amount}</font></b></td>
                 <td style="padding-left:28px;"><font size="1" align="right"></font></td>
               </tr>
             {/if}
@@ -362,7 +362,7 @@
             <tr>
               <td colspan="2"></td>
               <td><font size="1" align="right" style="font-weight:bold;">{ts}Credit Amount:{/ts}</font></td>
-              <td width='50px'><font size="1" align="right" style="font-weight:bold;">{$amount|crmMoney:$currency}</font></td>
+              <td width='50px'><font size="1" align="right" style="font-weight:bold;">{contribution.total_amount}</font></td>
             </tr>
           </table>
         </td>
diff --git a/www/modules/civicrm/xml/templates/message_templates/contribution_invoice_receipt_text.tpl b/www/modules/civicrm/xml/templates/message_templates/contribution_invoice_receipt_text.tpl
index 37e2edf09..e69de29bb 100644
--- a/www/modules/civicrm/xml/templates/message_templates/contribution_invoice_receipt_text.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/contribution_invoice_receipt_text.tpl
@@ -1 +0,0 @@
-{ts}Contribution Invoice{/ts}
diff --git a/www/modules/civicrm/xml/templates/message_templates/contribution_offline_receipt_text.tpl b/www/modules/civicrm/xml/templates/message_templates/contribution_offline_receipt_text.tpl
index 2049f4508..e69de29bb 100644
--- a/www/modules/civicrm/xml/templates/message_templates/contribution_offline_receipt_text.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/contribution_offline_receipt_text.tpl
@@ -1,115 +0,0 @@
-{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{if {contribution.contribution_page_id.receipt_text|boolean}}
-{contribution.contribution_page_id.receipt_text}
-{elseif {contribution.paid_amount|boolean}} {ts}Below you will find a receipt for this contribution.{/ts}
-{/if}
-
-===========================================================
-{ts}Contribution Information{/ts}
-
-===========================================================
-{ts}Contributor{/ts}: {contact.display_name}
-{if '{contribution.financial_type_id}'}
-{ts}Financial Type{/ts}: {contribution.financial_type_id:label}
-{/if}
-{if $isShowLineItems}
----------------------------------------------------------
-{capture assign=ts_item}{ts}Item{/ts}{/capture}
-{capture assign=ts_qty}{ts}Qty{/ts}{/capture}
-{capture assign=ts_each}{ts}Each{/ts}{/capture}
-{if $isShowTax && {contribution.tax_amount|boolean}}
-{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}
-{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}
-{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}
-{/if}
-{capture assign=ts_total}{ts}Total{/ts}{/capture}
-{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $isShowTax && {contribution.tax_amount|boolean}} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"}
-----------------------------------------------------------
-{foreach from=$lineItems item=line}
-{capture assign=ts_item}{$line.title}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.qty|string_format:"%5s"} {$line.unit_price|crmMoney:'{contribution.currency}'|string_format:"%10s"} {if $isShowTax && {contribution.tax_amount|boolean}}{$line.line_total|crmMoney:'{contribution.currency}'|string_format:"%10s"} {if $line.tax_rate || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} %   {$line.tax_amount|crmMoney:'{contribution.currency}'|string_format:"%10s"} {else}                  {/if} {/if}   {$line.line_total_inclusive|crmMoney:'{contribution.currency}'|string_format:"%10s"}
-{/foreach}
-{/if}
-
-
-{if $isShowTax && {contribution.tax_amount|boolean}}
-{ts}Amount before Tax{/ts} : {contribution.tax_exclusive_amount}
-{/if}
-{foreach from=$taxRateBreakdown item=taxDetail key=taxRate}
-{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else}{$taxTerm} {$taxDetail.percentage}%{/if} : {$taxDetail.amount|crmMoney:'{contribution.currency}'}
-{/foreach}
-
-{if $isShowTax}
-{ts}Total Tax Amount{/ts} : {contribution.tax_amount}
-{/if}
-{ts}Total Amount{/ts} : {contribution.total_amount}
-{if '{contribution.receive_date}'}
-{ts}Contribution Date{/ts}: {contribution.receive_date|crmDate:"shortdate"}
-{/if}
-{if '{contribution.receipt_date}'}
-{ts}Receipt Date{/ts}: {contribution.receipt_date|crmDate:"shortdate"}
-{/if}
-{if {contribution.payment_instrument_id|boolean} && {contribution.paid_amount|boolean}}
-{ts}Paid By{/ts}: {contribution.payment_instrument_id:label}
-{if '{contribution.check_number}'}
-{ts}Check Number{/ts}: {contribution.check_number}
-{/if}
-{/if}
-{if '{contribution.trxn_id}'}
-{ts}Transaction ID{/ts}: {contribution.trxn_id}
-{/if}
-
-{if !empty($ccContribution)}
-===========================================================
-{ts}Billing Name and Address{/ts}
-
-===========================================================
-{$billingName}
-{$address}
-
-===========================================================
-{ts}Credit Card Information{/ts}
-
-===========================================================
-{$credit_card_type}
-{$credit_card_number}
-{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
-{/if}
-{if !empty($customGroup)}
-{foreach from=$customGroup item=value key=customName}
-===========================================================
-{$customName}
-===========================================================
-{foreach from=$value item=v key=n}
-{$n}: {$v}
-{/foreach}
-{/foreach}
-{/if}
-
-{if !empty($softCreditTypes) and !empty($softCredits)}
-{foreach from=$softCreditTypes item=softCreditType key=n}
-===========================================================
-{$softCreditType}
-===========================================================
-{foreach from=$softCredits.$n item=value key=label}
-{$label}: {$value}
-{/foreach}
-{/foreach}
-{/if}
-
-{if !empty($formValues.product_name)}
-===========================================================
-{ts}Premium Information{/ts}
-
-===========================================================
-{$formValues.product_name}
-{if $formValues.product_option}
-{ts}Option{/ts}: {$formValues.product_option}
-{/if}
-{if $formValues.product_sku}
-{ts}SKU{/ts}: {$formValues.product_sku}
-{/if}
-{if !empty($fulfilled_date)}
-{ts}Sent{/ts}: {$fulfilled_date|crmDate}
-{/if}
-{/if}
diff --git a/www/modules/civicrm/xml/templates/message_templates/contribution_recurring_edit_text.tpl b/www/modules/civicrm/xml/templates/message_templates/contribution_recurring_edit_text.tpl
index 1d20d08f6..e69de29bb 100644
--- a/www/modules/civicrm/xml/templates/message_templates/contribution_recurring_edit_text.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/contribution_recurring_edit_text.tpl
@@ -1,8 +0,0 @@
-{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{ts}Your recurring contribution has been updated as requested:{/ts}
-
-{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}
-
-{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts}
diff --git a/www/modules/civicrm/xml/templates/message_templates/event_online_receipt_html.tpl b/www/modules/civicrm/xml/templates/message_templates/event_online_receipt_html.tpl
index 9e650d8e6..f70fa77eb 100644
--- a/www/modules/civicrm/xml/templates/message_templates/event_online_receipt_html.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/event_online_receipt_html.tpl
@@ -27,9 +27,9 @@
         <p>{event.confirm_email_text}</p>
       {else}
         <p>{ts}Thank you for your registration.{/ts}
-            {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}
+            {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}
             {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}
+              {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}
@@ -349,7 +349,7 @@
                     {ts}Transaction #{/ts}
                   </td>
                   <td {$valueStyle}>
-                    {contribution.trxn_id|boolean}
+                    {contribution.trxn_id}
                   </td>
                 </tr>
               {/if}
diff --git a/www/modules/civicrm/xml/templates/message_templates/friend_text.tpl b/www/modules/civicrm/xml/templates/message_templates/friend_text.tpl
index 2712ae35d..e69de29bb 100644
--- a/www/modules/civicrm/xml/templates/message_templates/friend_text.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/friend_text.tpl
@@ -1,15 +0,0 @@
-{$senderMessage}
-
-{if $generalLink}{ts}For more information, visit:{/ts}
->> {$generalLink}
-
-{/if}
-{if $contribute}{ts}To make a contribution, go to:{/ts}
->> {$pageURL}
-
-{/if}
-{if $event}{ts}To find out more about this event, go to:{/ts}
->> {$pageURL}
-{/if}
-
-
diff --git a/www/modules/civicrm/xml/templates/message_templates/membership_autorenew_billing_text.tpl b/www/modules/civicrm/xml/templates/message_templates/membership_autorenew_billing_text.tpl
index 437fc2872..e69de29bb 100644
--- a/www/modules/civicrm/xml/templates/message_templates/membership_autorenew_billing_text.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/membership_autorenew_billing_text.tpl
@@ -1,23 +0,0 @@
-{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts}
-
-===========================================================
-{ts}Billing Name and Address{/ts}
-
-===========================================================
-{$billingName}
-{$address}
-
-{$email}
-
-===========================================================
-{ts}Credit Card Information{/ts}
-
-===========================================================
-{$credit_card_type}
-{$credit_card_number}
-{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
-
-
-{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}
diff --git a/www/modules/civicrm/xml/templates/message_templates/membership_autorenew_cancelled_text.tpl b/www/modules/civicrm/xml/templates/message_templates/membership_autorenew_cancelled_text.tpl
index ca6d827bd..e69de29bb 100644
--- a/www/modules/civicrm/xml/templates/message_templates/membership_autorenew_cancelled_text.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/membership_autorenew_cancelled_text.tpl
@@ -1,14 +0,0 @@
-{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{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}
-
-===========================================================
-{ts}Membership Information{/ts}
-
-===========================================================
-{ts}Membership Status{/ts}: {$membership_status}
-{if $mem_start_date}{ts}Membership Start Date{/ts}: {$mem_start_date|crmDate}
-{/if}
-{if $mem_end_date}{ts}Membership Expiration Date{/ts}: {$mem_end_date|crmDate}
-{/if}
-
diff --git a/www/modules/civicrm/xml/templates/message_templates/membership_offline_receipt_text.tpl b/www/modules/civicrm/xml/templates/message_templates/membership_offline_receipt_text.tpl
index e5c60081e..e69de29bb 100644
--- a/www/modules/civicrm/xml/templates/message_templates/membership_offline_receipt_text.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/membership_offline_receipt_text.tpl
@@ -1,103 +0,0 @@
-{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{if $userTextPlain}
-{$userTextPlain}
-{else}{ts}Thank you for this contribution.{/ts}{/if}
-
-{if !$isShowLineItems}
-===========================================================
-{ts}Membership Information{/ts}
-
-===========================================================
-{ts}Membership Type{/ts}: {membership.membership_type_id:name}
-{/if}
-{if '{membership.status_id:name}' !== 'Cancelled'}
-{if !$isShowLineItems}
-{ts}Membership Start Date{/ts}: {membership.start_date|crmDate:"Full"}
-{ts}Membership Expiration Date{/ts}: {membership.end_date|crmDate:"Full"}
-{/if}
-
-{if {contribution.total_amount|boolean}}
-===========================================================
-{ts}Membership Fee{/ts}
-
-===========================================================
-{if {contribution.financial_type_id|boolean}}
-{ts}Financial Type{/ts}: {contribution.financial_type_id:label}
-{/if}
-{if $isShowLineItems}
-{capture assign=ts_item}{ts}Item{/ts}{/capture}
-{capture assign=ts_total}{ts}Fee{/ts}{/capture}
-{if $isShowTax && '{contribution.tax_amount|boolean}'}
-{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}
-{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}
-{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}
-{capture assign=ts_total}{ts}Total{/ts}{/capture}
-{/if}
-{capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture}
-{capture assign=ts_end_date}{ts}Membership Expiration Date{/ts}{/capture}
-{$ts_item|string_format:"%-30s"} {$ts_total|string_format:"%10s"} {if $isShowTax && {contribution.tax_amount|boolean}} {$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"}
---------------------------------------------------------------------------------------------------
-
-{foreach from=$lineItems item=line}
-{line.title} {$line.line_total|crmMoney|string_format:"%10s"}  {if $isShowTax && {contribution.tax_amount|boolean}} {$line.line_total|crmMoney:'{contribution.currency}'|string_format:"%10s"} {if $line.tax_rate || $line.tax_amount != ""}  {$line.tax_rate|string_format:"%.2f"} %  {$line.tax_amount|crmMoney:'{contribution.currency}'|string_format:"%10s"}  {else}                  {/if}   {$line.line_total_inclusive|crmMoney|string_format:"%10s"} {/if} {$line.membership.start_date|string_format:"%20s"} {$line.membership.end_date|string_format:"%20s"}
-{/foreach}
-
-{if $isShowTax && {contribution.tax_amount|boolean}}
-{ts}Amount before Tax:{/ts} {contribution.tax_exclusive_amount}
-
-{foreach from=$taxRateBreakdown item=taxDetail key=taxRate}
-{if $taxRate == 0}{ts}No{/ts} {$taxTerm}{else} {$taxTerm} {$taxDetail.percentage}%{/if}: {$taxDetail.amount|crmMoney:'{contribution.currency}'}
-{/foreach}
-{/if}
---------------------------------------------------------------------------------------------------
-{/if}
-
-{if {contribution.tax_amount|boolean}}
-{ts}Total Tax Amount{/ts}: {contribution.tax_amount}
-{/if}
-
-{ts}Amount{/ts}: {contribution.total_amount}
-{if {contribution.receive_date|boolean}}
-{ts}Contribution Date{/ts}: {contribution.receive_date}
-{/if}
-{if {contribution.payment_instrument_id|boolean}}
-{ts}Paid By{/ts}: {contribution.payment_instrument_id:label}
-{if {contribution.check_number|boolean}}
-{ts}Check Number{/ts}: {contribution.check_number|boolean}
-{/if}
-{/if}
-{/if}
-{/if}
-
-{if !empty($isPrimary)}
-{if !empty($billingName)}
-
-===========================================================
-{ts}Billing Name and Address{/ts}
-
-===========================================================
-{$billingName}
-{$address}
-{/if}
-
-{if !empty($credit_card_type)}
-===========================================================
-{ts}Credit Card Information{/ts}
-
-===========================================================
-{$credit_card_type}
-{$credit_card_number}
-{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
-{/if}
-{/if}
-
-{if !empty($customValues)}
-===========================================================
-{ts}Membership Options{/ts}
-
-===========================================================
-{foreach from=$customValues item=value key=customName}
- {$customName} : {$value}
-{/foreach}
-{/if}
diff --git a/www/modules/civicrm/xml/templates/message_templates/membership_online_receipt_html.tpl b/www/modules/civicrm/xml/templates/message_templates/membership_online_receipt_html.tpl
index 44c328b1e..eb9fc4b6a 100644
--- a/www/modules/civicrm/xml/templates/message_templates/membership_online_receipt_html.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/membership_online_receipt_html.tpl
@@ -21,9 +21,11 @@
   <tr>
    <td>
      {assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}<p>{$greeting},</p>{/if}
-    {if $userText}
-     <p>{$userText}</p>
-    {/if}
+     {if $userText}
+       <p>{$userText}</p>
+     {elseif {contribution.contribution_page_id.receipt_text|boolean}}
+       <p>{contribution.contribution_page_id.receipt_text}</p>
+     {/if}
     {if {contribution.balance_amount|boolean} && {contribution.is_pay_later|boolean}}
       <p>{contribution.contribution_page_id.pay_later_receipt}</p>
     {/if}
diff --git a/www/modules/civicrm/xml/templates/message_templates/participant_cancelled_html.tpl b/www/modules/civicrm/xml/templates/message_templates/participant_cancelled_html.tpl
index 90f4a1022..b9fc4739d 100644
--- a/www/modules/civicrm/xml/templates/message_templates/participant_cancelled_html.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/participant_cancelled_html.tpl
@@ -46,71 +46,72 @@
        {participant.role_id:label}
       </td>
      </tr>
+    {if {event.is_show_location|boolean}}
+        <tr>
+          <td colspan="2" {$valueStyle}>
+            {event.location}
+          </td>
+        </tr>
+      {/if}
 
-    {if !empty($isShowLocation)}
+    {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}
+        <tr>
+          <td colspan="2" {$labelStyle}>
+            {ts}Event Contacts:{/ts}
+          </td>
+        </tr>
+
+        {if {event.loc_block_id.phone_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+        {if {event.loc_block_id.phone_2_id.phone|boolean}}
           <tr>
-            <td colspan="2" {$valueStyle}>
-                {event.location}
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_2_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}
             </td>
           </tr>
         {/if}
 
-    {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}
+        {if {event.loc_block_id.email_id.email|boolean}}
           <tr>
-            <td colspan="2" {$labelStyle}>
-                {ts}Event Contacts:{/ts}
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_id.email}
             </td>
           </tr>
+        {/if}
 
-            {if {event.loc_block_id.phone_id.phone|boolean}}
-              <tr>
-                <td {$labelStyle}>
-                    {if {event.loc_block_id.phone_id.phone_type_id|boolean}}
-                        {event.loc_block_id.phone_id.phone_type_id:label}
-                    {else}
-                        {ts}Phone{/ts}
-                    {/if}
-                </td>
-                <td {$valueStyle}>
-                    {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}
-                </td>
-              </tr>
-            {/if}
-            {if {event.loc_block_id.phone_2_id.phone|boolean}}
-              <tr>
-                <td {$labelStyle}>
-                    {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}
-                        {event.loc_block_id.phone_2_id.phone_type_id:label}
-                    {else}
-                        {ts}Phone{/ts}
-                    {/if}
-                </td>
-                <td {$valueStyle}>
-                    {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}
-                </td>
-              </tr>
-            {/if}
-            {if {event.loc_block_id.email_id.email|boolean}}
-              <tr>
-                <td {$labelStyle}>
-                    {ts}Email{/ts}
-                </td>
-                <td {$valueStyle}>
-                    {event.loc_block_id.email_id.email}
-                </td>
-              </tr>
-            {/if}
-            {if {event.loc_block_id.email_2_id.email|boolean}}
-              <tr>
-                <td {$labelStyle}>
-                    {ts}Email{/ts}
-                </td>
-                <td {$valueStyle}>
-                    {event.loc_block_id.email_2_id.email}
-                </td>
-              </tr>
-            {/if}
+        {if {event.loc_block_id.email_2_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_2_id.email}
+            </td>
+          </tr>
         {/if}
+      {/if}
 
     {if '{contact.email}'}
       <tr>
diff --git a/www/modules/civicrm/xml/templates/message_templates/participant_confirm_html.tpl b/www/modules/civicrm/xml/templates/message_templates/participant_confirm_html.tpl
index 9adb27725..12787c9d9 100644
--- a/www/modules/civicrm/xml/templates/message_templates/participant_confirm_html.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/participant_confirm_html.tpl
@@ -23,7 +23,7 @@
     <p>{ts}This is an invitation to complete your registration that was initially waitlisted.{/ts}</p>
    </td>
   </tr>
-  {if !$isAdditional and $participant.id}
+  {if !$isAdditional and {participant.id|boolean}}
    <tr>
     <th {$headerStyle}>
      {ts}Confirm Your Registration{/ts}
@@ -31,14 +31,14 @@
    </tr>
    <tr>
     <td colspan="2" {$valueStyle}>
-     {capture assign=confirmUrl}{crmURL p='civicrm/event/confirm' q="reset=1&participantId=`$participant.id`&cs=`$checksumValue`" a=true h=0 fe=1}{/capture}
+     {capture assign=confirmUrl}{crmURL p='civicrm/event/confirm' q="reset=1&participantId={participant.id}&cs=`$checksumValue`" a=true h=0 fe=1}{/capture}
      <a href="{$confirmUrl}">{ts}Click here to confirm and complete your registration{/ts}</a>
     </td>
    </tr>
   {/if}
-  {if $event.allow_selfcancelxfer}
+  {if {event.allow_selfcancelxfer|boolean}}
   {ts}This event allows for{/ts}
-  {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participant.id`&{contact.checksum}" h=0 a=1 fe=1}{/capture}
+  {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}self service cancel or transfer{/ts}</a>
   {/if}
 
@@ -52,8 +52,8 @@
      </tr>
      <tr>
       <td colspan="2" {$valueStyle}>
-       {$event.event_title}<br />
-       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|crmDate:"%Y%m%d" == $event.event_start_date|crmDate:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}
+       {event.title}<br />
+       {event.start_date|crmDate:"%A"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if '{event.end_date|crmDate:"%Y%m%d"}' === '{event.start_date|crmDate:"%Y%m%d"}'}{event.end_date|crmDate:"Time"}{else}{event.end_date|crmDate:"%A"} {event.end_date|crmDate}{/if}{/if}
       </td>
      </tr>
      <tr>
@@ -61,60 +61,86 @@
        {ts}Participant Role{/ts}:
       </td>
       <td {$valueStyle}>
-       {$participant.role}
+        {participant.role_id:label}
       </td>
      </tr>
-
-     {if $isShowLocation}
-      <tr>
-       <td colspan="2" {$valueStyle}>
-        {$event.location.address.1.display|nl2br}
-       </td>
-      </tr>
-     {/if}
-
-     {if $event.location.phone.1.phone || $event.location.email.1.email}
-      <tr>
-       <td colspan="2" {$labelStyle}>
-        {ts}Event Contacts:{/ts}
-       </td>
-      </tr>
-      {foreach from=$event.location.phone item=phone}
-       {if $phone.phone}
+     {if {event.is_show_location|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}
-         </td>
-         <td {$valueStyle}>
-          {$phone.phone}
-         </td>
+          <td colspan="2" {$valueStyle}>
+            {event.location}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-      {foreach from=$event.location.email item=eventEmail}
-       {if $eventEmail.email}
+      {/if}
+
+     {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {ts}Email{/ts}
-         </td>
-         <td {$valueStyle}>
-          {$eventEmail.email}
-         </td>
+          <td colspan="2" {$labelStyle}>
+            {ts}Event Contacts:{/ts}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-     {/if}
 
-     {if $event.is_public}
+        {if {event.loc_block_id.phone_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+        {if {event.loc_block_id.phone_2_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_2_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_id.email}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_2_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_2_id.email}
+            </td>
+          </tr>
+        {/if}
+      {/if}
+
+     {if {event.is_public|boolean}}
      <tr>
        <td colspan="2" {$valueStyle}>
-           {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
+           {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id={event.id}" h=0 a=1 fe=1}{/capture}
          <a href="{$icalFeed}">{ts}Download iCalendar entry for this event.{/ts}</a>
        </td>
      </tr>
      <tr>
        <td colspan="2" {$valueStyle}>
-           {capture assign=gCalendar}{crmURL p='civicrm/event/ical' q="gCalendar=1&reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
+           {capture assign=gCalendar}{crmURL p='civicrm/event/ical' q="gCalendar=1&reset=1&id={event.id}" h=0 a=1 fe=1}{/capture}
          <a href="{$gCalendar}">{ts}Add event to Google Calendar{/ts}</a>
        </td>
      </tr>
@@ -133,13 +159,13 @@
       </tr>
      {/if}
 
-     {if $register_date}
+     {if {participant.register_date|boolean}}
       <tr>
        <td {$labelStyle}>
         {ts}Registration Date{/ts}
        </td>
        <td {$valueStyle}>
-        {$participant.register_date|crmDate}
+         {participant.register_date}
        </td>
       </tr>
      {/if}
@@ -147,11 +173,11 @@
     </table>
    </td>
   </tr>
-  {if $event.allow_selfcancelxfer}
+  {if {event.allow_selfcancelxfer|boolean}}
    <tr>
      <td colspan="2" {$valueStyle}>
-       {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}
+       {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}<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>
    </tr>
diff --git a/www/modules/civicrm/xml/templates/message_templates/participant_expired_html.tpl b/www/modules/civicrm/xml/templates/message_templates/participant_expired_html.tpl
index 194519865..e8e94e946 100644
--- a/www/modules/civicrm/xml/templates/message_templates/participant_expired_html.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/participant_expired_html.tpl
@@ -21,7 +21,7 @@
   <tr>
    <td>
     {assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}<p>{$greeting},</p>{/if}
-    <p>{ts 1=$event.event_title}Your pending event registration for %1 has expired
+    <p>{ts 1="{event.title}"}Your pending event registration for %1 has expired
 because you did not confirm your registration.{/ts}</p>
     <p>{ts 1='{domain.phone}' 2='{domain.email}'}Please contact us at %1 or send email to %2 if you have questions
 or want to inquire about reinstating your registration for this event.{/ts}</p>
@@ -37,8 +37,8 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
      </tr>
      <tr>
       <td colspan="2" {$valueStyle}>
-       {$event.event_title}<br />
-       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|crmDate:"%Y%m%d" == $event.event_start_date|crmDate:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}
+       {event.title}<br />
+       {event.start_date|crmDate:"%A"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if '{event.end_date|crmDate:"%Y%m%d"}' === '{event.start_date|crmDate:"%Y%m%d"}'}{event.end_date|crmDate:"Time"}{else}{event.end_date|crmDate:"%A"} {event.end_date|crmDate}{/if}{/if}
       </td>
      </tr>
      <tr>
@@ -46,70 +46,84 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
        {ts}Participant Role{/ts}:
       </td>
       <td {$valueStyle}>
-       {$participant.role}
+        {participant.role_id:label}
       </td>
      </tr>
 
-     {if $isShowLocation}
-      <tr>
-       <td colspan="2" {$valueStyle}>
-        {$event.location.address.1.display|nl2br}
-       </td>
-      </tr>
-     {/if}
-
-     {if !empty($event.location.phone.1.phone) || !empty($event.location.email.1.email)}
-      <tr>
-       <td colspan="2" {$labelStyle}>
-        {ts}Event Contacts:{/ts}
-       </td>
-      </tr>
-      {foreach from=$event.location.phone item=phone}
-       {if $phone.phone}
+    {if {event.is_show_location|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}
-         </td>
-         <td {$valueStyle}>
-          {$phone.phone}
-         </td>
+          <td colspan="2" {$valueStyle}>
+            {event.location}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-      {foreach from=$event.location.email item=eventEmail}
-       {if $eventEmail.email}
+      {/if}
+
+    {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {ts}Email{/ts}
-         </td>
-         <td {$valueStyle}>
-          {$eventEmail.email}
-         </td>
+          <td colspan="2" {$labelStyle}>
+            {ts}Event Contacts:{/ts}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-     {/if}
 
-     {if '{contact.email}'}
-      <tr>
-       <th {$headerStyle}>
-        {ts}Registered Email{/ts}
-       </th>
-      </tr>
-      <tr>
-       <td colspan="2" {$valueStyle}>
-        {contact.email}
-       </td>
-      </tr>
-     {/if}
+        {if {event.loc_block_id.phone_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+        {if {event.loc_block_id.phone_2_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_2_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_id.email}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_2_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_2_id.email}
+            </td>
+          </tr>
+        {/if}
+      {/if}
 
-     {if $register_date}
+    {if {participant.register_date|boolean}}
       <tr>
        <td {$labelStyle}>
         {ts}Registration Date{/ts}
        </td>
        <td {$valueStyle}>
-        {$participant.register_date|crmDate}
+        {participant.register_date}
        </td>
       </tr>
      {/if}
diff --git a/www/modules/civicrm/xml/templates/message_templates/participant_transferred_html.tpl b/www/modules/civicrm/xml/templates/message_templates/participant_transferred_html.tpl
index ecd2e9e62..e9fa085fd 100644
--- a/www/modules/civicrm/xml/templates/message_templates/participant_transferred_html.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/participant_transferred_html.tpl
@@ -34,8 +34,8 @@
      </tr>
      <tr>
       <td colspan="2" {$valueStyle}>
-       {$event.event_title}<br />
-       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|crmDate:"%Y%m%d" == $event.event_start_date|crmDate:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}
+       {event.title}<br />
+       {event.start_date|crmDate:"%A"} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if '{event.end_date|crmDate:"%Y%m%d"}' === '{event.start_date|crmDate:"%Y%m%d"}'}{event.end_date|crmDate:"Time"}{else}{event.end_date|crmDate:"%A"} {event.end_date|crmDate}{/if}{/if}
       </td>
      </tr>
      <tr>
@@ -43,49 +43,76 @@
        {ts}Participant Role{/ts}:
       </td>
       <td {$valueStyle}>
-       {$participant.role}
+       {participant.role_id:label}
       </td>
      </tr>
 
-     {if $isShowLocation}
-      <tr>
-       <td colspan="2" {$valueStyle}>
-        {$event.location.address.1.display|nl2br}
-       </td>
-      </tr>
-     {/if}
-
-     {if !empty($event.location.phone.1.phone) || !empty($event.location.email.1.email)}
-      <tr>
-       <td colspan="2" {$labelStyle}>
-        {ts}Event Contacts:{/ts}
-       </td>
-      </tr>
-      {foreach from=$event.location.phone item=phone}
-       {if $phone.phone}
+     {if {event.is_show_location|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}
-         </td>
-         <td {$valueStyle}>
-          {$phone.phone}
-         </td>
+          <td colspan="2" {$valueStyle}>
+            {event.location}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-      {foreach from=$event.location.email item=eventEmail}
-       {if $eventEmail.email}
+      {/if}
+
+     {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}}
         <tr>
-         <td {$labelStyle}>
-          {ts}Email{/ts}
-         </td>
-         <td {$valueStyle}>
-          {$eventEmail.email}
-         </td>
+          <td colspan="2" {$labelStyle}>
+            {ts}Event Contacts:{/ts}
+          </td>
         </tr>
-       {/if}
-      {/foreach}
-     {/if}
+
+        {if {event.loc_block_id.phone_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+        {if {event.loc_block_id.phone_2_id.phone|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}
+                {event.loc_block_id.phone_2_id.phone_type_id:label}
+              {else}
+                {ts}Phone{/ts}
+              {/if}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}}&nbsp;{ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_id.email}
+            </td>
+          </tr>
+        {/if}
+
+        {if {event.loc_block_id.email_2_id.email|boolean}}
+          <tr>
+            <td {$labelStyle}>
+              {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+              {event.loc_block_id.email_2_id.email}
+            </td>
+          </tr>
+        {/if}
+      {/if}
 
      {if '{contact.email}'}
       <tr>
@@ -100,13 +127,13 @@
       </tr>
      {/if}
 
-     {if $register_date}
+      {if {participant.register_date|boolean}}
       <tr>
        <td {$labelStyle}>
         {ts}Registration Date{/ts}
        </td>
        <td {$valueStyle}>
-        {$participant.register_date|crmDate}
+        {participant.register_date}
        </td>
       </tr>
      {/if}
diff --git a/www/modules/civicrm/xml/templates/message_templates/pcp_owner_notify_text.tpl b/www/modules/civicrm/xml/templates/message_templates/pcp_owner_notify_text.tpl
index 89f3dea5f..e69de29bb 100644
--- a/www/modules/civicrm/xml/templates/message_templates/pcp_owner_notify_text.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/pcp_owner_notify_text.tpl
@@ -1,22 +0,0 @@
-===========================================================
-{ts}Personal Campaign Page Owner Notification{/ts}
-
-===========================================================
-{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
-
-{ts}You have received a donation at your personal page{/ts}: {$page_title}
->> {$pcpInfoURL}
-
-{ts}Your fundraising total has been updated.{/ts}
-{ts}The donor's information is listed below.  You can choose to contact them and convey your thanks if you wish.{/ts}
-{if $is_honor_roll_enabled}
-    {ts}The donor's name has been added to your honor roll unless they asked not to be included.{/ts}
-{/if}
-
-{ts}Contribution Date{/ts}: {$receive_date|crmDate}
-
-{ts}Amount{/ts}: {$total_amount|crmMoney:$currency}
-
-{ts}Name{/ts}: {$donors_display_name}
-
-{ts}Email{/ts}: {$donors_email}
diff --git a/www/modules/civicrm/xml/templates/message_templates/uf_notify_html.tpl b/www/modules/civicrm/xml/templates/message_templates/uf_notify_html.tpl
index 09e6b3153..72a5bf852 100644
--- a/www/modules/civicrm/xml/templates/message_templates/uf_notify_html.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/uf_notify_html.tpl
@@ -26,7 +26,7 @@
        {ts}Submitted For{/ts}
       </td>
       <td {$valueStyle}>
-       {$displayName}
+       {contact.display_name}
       </td>
      </tr>
      <tr>
@@ -34,7 +34,7 @@
        {ts}Date{/ts}
       </td>
       <td {$valueStyle}>
-       {$currentDate}
+       {domain.now|crmDate:"Full"}
       </td>
      </tr>
      <tr>
diff --git a/www/modules/civicrm/xml/templates/message_templates/uf_notify_subject.tpl b/www/modules/civicrm/xml/templates/message_templates/uf_notify_subject.tpl
index 0fd90f776..fc1d4694e 100644
--- a/www/modules/civicrm/xml/templates/message_templates/uf_notify_subject.tpl
+++ b/www/modules/civicrm/xml/templates/message_templates/uf_notify_subject.tpl
@@ -1 +1 @@
-{$grouptitle} {ts 1=$displayName}Submitted by %1{/ts} - {contact.display_name}
+{$grouptitle} {ts 1=$userDisplayName}Submitted by %1{/ts} - {contact.display_name}
diff --git a/www/modules/civicrm/xml/version.xml b/www/modules/civicrm/xml/version.xml
index 3c987c0e8..e953f2179 100644
--- a/www/modules/civicrm/xml/version.xml
+++ b/www/modules/civicrm/xml/version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <version>
-  <version_no>5.70.2</version_no>
+  <version_no>5.74.4</version_no>
 </version>